Bläddra i källkod

Replaced slug dependency with one that did not use gopkgs.com

Torkel Ödegaard 10 år sedan
förälder
incheckning
4fd2c0570c

+ 9 - 9
Godeps/Godeps.json

@@ -1,6 +1,6 @@
 {
 	"ImportPath": "github.com/grafana/grafana",
-	"GoVersion": "go1.4.2",
+	"GoVersion": "go1.3",
 	"Packages": [
 		"./pkg/..."
 	],
@@ -13,6 +13,14 @@
 			"ImportPath": "github.com/Unknwon/macaron",
 			"Rev": "93de4f3fad97bf246b838f828e2348f46f21f20a"
 		},
+		{
+			"ImportPath": "github.com/dalu/slug",
+			"Rev": "6dbd13912e9be466e2c1de349a2c7d1466c97e07"
+		},
+		{
+			"ImportPath": "github.com/dalu/unidecode",
+			"Rev": "339814d47f3e32a6f7036a0a4c56ed9b373dd755"
+		},
 		{
 			"ImportPath": "github.com/go-sql-driver/mysql",
 			"Comment": "v1.2-26-g9543750",
@@ -27,10 +35,6 @@
 			"Comment": "v0.4.2-58-ge2889e5",
 			"Rev": "e2889e5517600b82905f1d2ba8b70deb71823ffe"
 		},
-		{
-			"ImportPath": "github.com/gosimple/slug",
-			"Rev": "a2392a4a87fa0366cbff131d3fd421f83f52492f"
-		},
 		{
 			"ImportPath": "github.com/jtolds/gls",
 			"Rev": "f1ac7f4f24f50328e6bc838ca4437d1612a0243c"
@@ -87,10 +91,6 @@
 		{
 			"ImportPath": "gopkgs.com/pool.v1",
 			"Rev": "c850f092aad1780cbffff25f471c5cc32097932a"
-		},
-		{
-			"ImportPath": "gopkgs.com/unidecode.v1",
-			"Rev": "4deae2c05236b41cc39f8144ac87a837ba974d40"
 		}
 	]
 }

+ 3 - 7
Godeps/_workspace/src/github.com/gosimple/slug/README.md → Godeps/_workspace/src/github.com/dalu/slug/README.md

@@ -4,10 +4,9 @@ slug
 Package `slug` generate slug from unicode string, URL-friendly slugify with
 multiple languages support.
 
-[![GoDoc](https://godoc.org/github.com/gosimple/slug?status.png)](https://godoc.org/github.com/gosimple/slug)
-[![Build Status](https://drone.io/github.com/gosimple/slug/status.png)](https://drone.io/github.com/gosimple/slug/latest)
+[![GoDoc](https://godoc.org/github.com/dalu/slug?status.png)](https://godoc.org/github.com/dalu/slug)
 
-[Documentation online](http://godoc.org/github.com/gosimple/slug)
+[Documentation online](http://godoc.org/github.com/dalu/slug)
 
 ## Example
 
@@ -38,12 +37,9 @@ multiple languages support.
 		fmt.Println(textSub) // Will print 'sand-is-hot'
 	}
 
-### Requests or bugs?
-<https://github.com/gosimple/slug/issues>
-
 ## Installation
 
-	go get -u github.com/gosimple/slug
+	go get -u github.com/dalu/slug
 
 ## License
 

+ 0 - 0
Godeps/_workspace/src/github.com/gosimple/slug/default_substitution.go → Godeps/_workspace/src/github.com/dalu/slug/default_substitution.go


+ 1 - 5
Godeps/_workspace/src/github.com/gosimple/slug/doc.go → Godeps/_workspace/src/github.com/dalu/slug/doc.go

@@ -12,7 +12,7 @@ Example:
 	package main
 
 	import(
-		"github.com/gosimple/slug"
+		"github.com/dalu/slug"
 		"fmt"
 	)
 
@@ -35,9 +35,5 @@ Example:
 		textSub := slug.Make("water is hot")
 		fmt.Println(textSub) // Will print 'sand-is-hot'
 	}
-
-Requests or bugs?
-
-https://github.com/gosimple/slug/issues
 */
 package slug

+ 0 - 0
Godeps/_workspace/src/github.com/gosimple/slug/languages_substitution.go → Godeps/_workspace/src/github.com/dalu/slug/languages_substitution.go


+ 1 - 1
Godeps/_workspace/src/github.com/gosimple/slug/slug.go → Godeps/_workspace/src/github.com/dalu/slug/slug.go

@@ -6,7 +6,7 @@
 package slug
 
 import (
-	"gopkgs.com/unidecode.v1"
+	"github.com/dalu/unidecode"
 	"regexp"
 	"strings"
 )

+ 0 - 0
Godeps/_workspace/src/github.com/gosimple/slug/slug_test.go → Godeps/_workspace/src/github.com/dalu/slug/slug_test.go


+ 0 - 0
Godeps/_workspace/src/gopkgs.com/unidecode.v1/.gitignore → Godeps/_workspace/src/github.com/dalu/unidecode/.gitignore


+ 0 - 0
Godeps/_workspace/src/gopkgs.com/unidecode.v1/LICENSE → Godeps/_workspace/src/github.com/dalu/unidecode/LICENSE


+ 0 - 6
Godeps/_workspace/src/gopkgs.com/unidecode.v1/README.md → Godeps/_workspace/src/github.com/dalu/unidecode/README.md

@@ -3,10 +3,4 @@ unidecode
 
 Unicode transliterator in Golang - Replaces non-ASCII characters with their ASCII approximations.
 
-Please, use the following import path to ensure a stable API:
-
-```go
-    import "gopkgs.com/unidecode.v1"
-```
-
 View other available versions, documentation and examples at http://gopkgs.com/unidecode

+ 0 - 0
Godeps/_workspace/src/gopkgs.com/unidecode.v1/decode.go → Godeps/_workspace/src/github.com/dalu/unidecode/decode.go


+ 0 - 0
Godeps/_workspace/src/gopkgs.com/unidecode.v1/make_table.go → Godeps/_workspace/src/github.com/dalu/unidecode/make_table.go


+ 0 - 0
Godeps/_workspace/src/gopkgs.com/unidecode.v1/table.go → Godeps/_workspace/src/github.com/dalu/unidecode/table.go


+ 0 - 0
Godeps/_workspace/src/gopkgs.com/unidecode.v1/table.txt → Godeps/_workspace/src/github.com/dalu/unidecode/table.txt


+ 0 - 0
Godeps/_workspace/src/gopkgs.com/unidecode.v1/unidecode.go → Godeps/_workspace/src/github.com/dalu/unidecode/unidecode.go


+ 0 - 0
Godeps/_workspace/src/gopkgs.com/unidecode.v1/unidecode_test.go → Godeps/_workspace/src/github.com/dalu/unidecode/unidecode_test.go


+ 0 - 2
Godeps/_workspace/src/github.com/gosimple/slug/.gitignore

@@ -1,2 +0,0 @@
-_*
-cover*.out

+ 0 - 24
Godeps/_workspace/src/gopkgs.com/unidecode.v1/gopkgs.go

@@ -1,24 +0,0 @@
-package unidecode
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// gopkgs.go: v1
-
-// NOTE: This file is autogenerated by gopkgs.com.
-const (
-	goPkgsSrcPath = "github.com/rainycape/unidecode"
-	goPkgsName    = "unidecode"
-	goPkgsErrFmt  = "invalid import path %s - please use gopkgs.com/%s.v1 or see http://gopkgs.com/%s"
-)
-
-type goPkgsCheck struct{}
-
-func init() {
-	typ := reflect.TypeOf(goPkgsCheck{})
-	if typ.PkgPath() == goPkgsSrcPath {
-		panic(fmt.Errorf(goPkgsErrFmt, typ.PkgPath(), goPkgsName, goPkgsName))
-	}
-}

+ 1 - 1
pkg/models/dashboards.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gosimple/slug"
+	"github.com/dalu/slug"
 )
 
 // Typed errors