Merge branch 'govendor' into 'master'

Switch to govendor

See merge request gitlab-org/gitlab-pages!54

10 files changed, 105 insertions, 105 deletions

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
deleted file mode 100644
index 0332abf3..00000000
--- a/Godeps/Godeps.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-	"ImportPath": "gitlab.com/gitlab-org/gitlab-pages",
-	"GoVersion": "go1.8",
-	"GodepVersion": "v79",
-	"Deps": [
-		{
-			"ImportPath": "github.com/beorn7/perks/quantile",
-			"Rev": "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
-		},
-		{
-			"ImportPath": "github.com/golang/protobuf/proto",
-			"Rev": "f592bd283e9ef86337a432eb50e592278c3d534d"
-		},
-		{
-			"ImportPath": "github.com/kardianos/osext",
-			"Rev": "efacde03154693404c65e7aa7d461ac9014acd0c"
-		},
-		{
-			"ImportPath": "github.com/matttproud/golang_protobuf_extensions/pbutil",
-			"Comment": "v1.0.0-2-gc12348c",
-			"Rev": "c12348ce28de40eed0136aa2b644d0ee0650e56c"
-		},
-		{
-			"ImportPath": "github.com/namsral/flag",
-			"Comment": "v1.7.4-alpha-4-g67f268f",
-			"Rev": "67f268f20922975c067ed799e4be6bacf152208c"
-		},
-		{
-			"ImportPath": "github.com/prometheus/client_golang/prometheus",
-			"Comment": "v0.8.0-9-g334af01",
-			"Rev": "334af0119a8f8fb6af5bb950d535c482cac7f836"
-		},
-		{
-			"ImportPath": "github.com/prometheus/client_golang/prometheus/promhttp",
-			"Comment": "v0.8.0-9-g334af01",
-			"Rev": "334af0119a8f8fb6af5bb950d535c482cac7f836"
-		},
-		{
-			"ImportPath": "github.com/prometheus/client_model/go",
-			"Comment": "model-0.0.2-12-gfa8ad6f",
-			"Rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
-		},
-		{
-			"ImportPath": "github.com/prometheus/common/expfmt",
-			"Rev": "ebdfc6da46522d58825777cf1f90490a5b1ef1d8"
-		},
-		{
-			"ImportPath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg",
-			"Rev": "ebdfc6da46522d58825777cf1f90490a5b1ef1d8"
-		},
-		{
-			"ImportPath": "github.com/prometheus/common/model",
-			"Rev": "ebdfc6da46522d58825777cf1f90490a5b1ef1d8"
-		},
-		{
-			"ImportPath": "github.com/prometheus/procfs",
-			"Rev": "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5"
-		},
-		{
-			"ImportPath": "github.com/rs/cors",
-			"Comment": "v1.0-5-g8dd4211",
-			"Rev": "8dd4211afb5d08dbb39a533b9bb9e4b486351df6"
-		},
-		{
-			"ImportPath": "github.com/stretchr/testify/assert",
-			"Rev": "1297dc01ed0a819ff634c89707081a4df43baf6b"
-		},
-		{
-			"ImportPath": "github.com/stretchr/testify/require",
-			"Rev": "1297dc01ed0a819ff634c89707081a4df43baf6b"
-		},
-		{
-			"ImportPath": "golang.org/x/net/http2",
-			"Rev": "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"
-		},
-		{
-			"ImportPath": "golang.org/x/net/http2/hpack",
-			"Rev": "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"
-		},
-		{
-			"ImportPath": "golang.org/x/net/lex/httplex",
-			"Rev": "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"
-		}
-	]
-}
diff --git a/Godeps/Readme b/Godeps/Readme
deleted file mode 100644
index 4cdaa53d..00000000
--- a/Godeps/Readme
+++ /dev/null
@@ -1,5 +0,0 @@
-This directory tree is generated automatically by godep.
-
-Please do not edit.
-
-See https://github.com/tools/godep for more information.
diff --git a/vendor/github.com/kardianos/osext/osext.go b/vendor/github.com/kardianos/osext/osext.go
index 4ed4b9aa..18f1e39c 100644
--- a/vendor/github.com/kardianos/osext/osext.go
+++ b/vendor/github.com/kardianos/osext/osext.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Extensions to the standard "os" package.
-package osext
+package osext // import "github.com/kardianos/osext"
 
 import "path/filepath"
 
diff --git a/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/.gitignore b/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/.gitignore
deleted file mode 100644
index e16fb946..00000000
--- a/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-cover.dat
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/.gitignore b/vendor/github.com/prometheus/client_golang/prometheus/.gitignore
deleted file mode 100644
index 3460f034..00000000
--- a/vendor/github.com/prometheus/client_golang/prometheus/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-command-line-arguments.test
diff --git a/vendor/github.com/prometheus/procfs/.travis.yml b/vendor/github.com/prometheus/procfs/.travis.yml
deleted file mode 100644
index 2b4554da..00000000
--- a/vendor/github.com/prometheus/procfs/.travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-sudo: false
-language: go
-go:
-    - 1.5
-    - 1.6
diff --git a/vendor/github.com/rs/cors/.travis.yml b/vendor/github.com/rs/cors/.travis.yml
deleted file mode 100644
index bbb5185a..00000000
--- a/vendor/github.com/rs/cors/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-language: go
-go:
-- 1.3
-- 1.4
diff --git a/vendor/golang.org/x/net/http2/.gitignore b/vendor/golang.org/x/net/http2/.gitignore
deleted file mode 100644
index 190f1223..00000000
--- a/vendor/golang.org/x/net/http2/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*~
-h2i/h2i
diff --git a/vendor/golang.org/x/net/http2/http2.go b/vendor/golang.org/x/net/http2/http2.go
index a9053eec..f06e87b3 100644
--- a/vendor/golang.org/x/net/http2/http2.go
+++ b/vendor/golang.org/x/net/http2/http2.go
@@ -14,7 +14,7 @@
 //
 // See https://http2.golang.org/ for a test server running this code.
 //
-package http2
+package http2 // import "golang.org/x/net/http2"
 
 import (
 	"bufio"
diff --git a/vendor/vendor.json b/vendor/vendor.json
new file mode 100644
index 00000000..d3c32b41
--- /dev/null
+++ b/vendor/vendor.json
@@ -0,0 +1,103 @@
+{
+	"comment": "",
+	"ignore": "test",
+	"package": [
+		{
+			"checksumSHA1": "spyv5/YFBjYyZLZa1U2LBfDR8PM=",
+			"path": "github.com/beorn7/perks/quantile",
+			"revision": "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
+		},
+		{
+			"checksumSHA1": "XnbEHQRzINRKXKmu9GcaqGkK4Lg=",
+			"path": "github.com/golang/protobuf/proto",
+			"revision": "f592bd283e9ef86337a432eb50e592278c3d534d"
+		},
+		{
+			"checksumSHA1": "LJA9zeZ+AZS9LHDacPd9OemVRDk=",
+			"path": "github.com/kardianos/osext",
+			"revision": "efacde03154693404c65e7aa7d461ac9014acd0c"
+		},
+		{
+			"checksumSHA1": "bKMZjd2wPw13VwoE7mBeSv5djFA=",
+			"comment": "v1.0.0-2-gc12348c",
+			"path": "github.com/matttproud/golang_protobuf_extensions/pbutil",
+			"revision": "c12348ce28de40eed0136aa2b644d0ee0650e56c"
+		},
+		{
+			"checksumSHA1": "l53Jm3mtlea/RzeydlryqPLeuL0=",
+			"comment": "v1.7.4-alpha-4-g67f268f",
+			"path": "github.com/namsral/flag",
+			"revision": "67f268f20922975c067ed799e4be6bacf152208c"
+		},
+		{
+			"checksumSHA1": "Ph+qmEo8RdBKBHZUhx0y5Oyk/U0=",
+			"comment": "v0.8.0-9-g334af01",
+			"path": "github.com/prometheus/client_golang/prometheus",
+			"revision": "334af0119a8f8fb6af5bb950d535c482cac7f836"
+		},
+		{
+			"checksumSHA1": "lG3//eDlwqA4IOuAPrNtLh9G0TA=",
+			"comment": "v0.8.0-9-g334af01",
+			"path": "github.com/prometheus/client_golang/prometheus/promhttp",
+			"revision": "334af0119a8f8fb6af5bb950d535c482cac7f836"
+		},
+		{
+			"checksumSHA1": "DvwvOlPNAgRntBzt3b3OSRMS2N4=",
+			"comment": "model-0.0.2-12-gfa8ad6f",
+			"path": "github.com/prometheus/client_model/go",
+			"revision": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+		},
+		{
+			"checksumSHA1": "OFZ6f2tsxQ+pk+wl7474eIxBs80=",
+			"path": "github.com/prometheus/common/expfmt",
+			"revision": "ebdfc6da46522d58825777cf1f90490a5b1ef1d8"
+		},
+		{
+			"checksumSHA1": "GWlM3d2vPYyNATtTFgftS10/A9w=",
+			"path": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg",
+			"revision": "ebdfc6da46522d58825777cf1f90490a5b1ef1d8"
+		},
+		{
+			"checksumSHA1": "Jx0GXl5hGnO25s3ryyvtdWHdCpw=",
+			"path": "github.com/prometheus/common/model",
+			"revision": "ebdfc6da46522d58825777cf1f90490a5b1ef1d8"
+		},
+		{
+			"checksumSHA1": "W218eJZPXJG783fUr/z6IaAZyes=",
+			"path": "github.com/prometheus/procfs",
+			"revision": "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5"
+		},
+		{
+			"checksumSHA1": "lZmPAbekxLbMFQirB/vzbdI+5O8=",
+			"comment": "v1.0-5-g8dd4211",
+			"path": "github.com/rs/cors",
+			"revision": "8dd4211afb5d08dbb39a533b9bb9e4b486351df6"
+		},
+		{
+			"checksumSHA1": "4uEmekuD2eHuhPbwKVh/X9Y/ESo=",
+			"path": "github.com/stretchr/testify/assert",
+			"revision": "1297dc01ed0a819ff634c89707081a4df43baf6b"
+		},
+		{
+			"checksumSHA1": "6uKFd53ZAwUlXLwarorVT6upajU=",
+			"path": "github.com/stretchr/testify/require",
+			"revision": "1297dc01ed0a819ff634c89707081a4df43baf6b"
+		},
+		{
+			"checksumSHA1": "g4lA8FNetHh8as26V8cLl5EGy78=",
+			"path": "golang.org/x/net/http2",
+			"revision": "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"
+		},
+		{
+			"checksumSHA1": "EYNaHp7XdLWRydUCE0amEkKAtgk=",
+			"path": "golang.org/x/net/http2/hpack",
+			"revision": "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"
+		},
+		{
+			"checksumSHA1": "yhndhWXMs/VSEDLks4dNyFMQStA=",
+			"path": "golang.org/x/net/lex/httplex",
+			"revision": "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"
+		}
+	],
+	"rootPath": "gitlab.com/gitlab-org/gitlab-pages"
+}