Merge branch 'zj-prometheus' into 'master'

Prometheus monitoring for GitLab Pages Closes #42 See merge request !11

Merge branch 'zj-prometheus' into 'master'
eae671b2 · Nick Thomas · bc4aa822 · ddff37bc · bc4aa822 · bc4aa822
Commit eae671b2 authored 8 years ago by Nick Thomas
--- a/vendor/golang.org/x/net/http2/h2demo/rootCA.pem
+++ b/vendor/golang.org/x/net/http2/h2demo/rootCA.pem
--- a/vendor/golang.org/x/net/http2/h2demo/rootCA.srl
+++ b/vendor/golang.org/x/net/http2/h2demo/rootCA.srl
--- a/vendor/golang.org/x/net/http2/h2demo/server.crt
+++ b/vendor/golang.org/x/net/http2/h2demo/server.crt
--- a/vendor/golang.org/x/net/http2/h2demo/server.key
+++ b/vendor/golang.org/x/net/http2/h2demo/server.key
--- a/vendor/golang.org/x/net/http2/h2i/README.md
+++ b/vendor/golang.org/x/net/http2/h2i/README.md
--- a/vendor/golang.org/x/net/http2/h2i/h2i.go
+++ b/vendor/golang.org/x/net/http2/h2i/h2i.go
--- a/vendor/golang.org/x/net/http2/headermap.go
+++ b/vendor/golang.org/x/net/http2/headermap.go
--- a/vendor/golang.org/x/net/http2/hpack/encode.go
+++ b/vendor/golang.org/x/net/http2/hpack/encode.go
--- a/vendor/golang.org/x/net/http2/hpack/hpack.go
+++ b/vendor/golang.org/x/net/http2/hpack/hpack.go
--- a/vendor/golang.org/x/net/http2/hpack/huffman.go
+++ b/vendor/golang.org/x/net/http2/hpack/huffman.go
--- a/vendor/golang.org/x/net/http2/http2.go
+++ b/vendor/golang.org/x/net/http2/http2.go
--- a/vendor/golang.org/x/net/http2/not_go16.go
+++ b/vendor/golang.org/x/net/http2/not_go16.go
--- a/vendor/golang.org/x/net/http2/not_go17.go
+++ b/vendor/golang.org/x/net/http2/not_go17.go
--- a/vendor/golang.org/x/net/http2/pipe.go
+++ b/vendor/golang.org/x/net/http2/pipe.go
--- a/vendor/golang.org/x/net/http2/server.go
+++ b/vendor/golang.org/x/net/http2/server.go
--- a/vendor/golang.org/x/net/http2/transport.go
+++ b/vendor/golang.org/x/net/http2/transport.go
--- a/vendor/golang.org/x/net/http2/write.go
+++ b/vendor/golang.org/x/net/http2/write.go
--- a/vendor/golang.org/x/net/lex/httplex/httplex.go
+++ b/vendor/golang.org/x/net/lex/httplex/httplex.go