Merge branch 'master' into create_pwa

routers/routes/routes.go

@@ -799,6 +799,14 @@ func RegisterRoutes(m *macaron.Macaron) {
  ctx.HTML(200, "pwa/serviceworker_js")
  })
 
+ // prometheus metrics endpoint
+ if setting.Metrics.Enabled {
+ c := metrics.NewCollector()
+ prometheus.MustRegister(c)
+
+ m.Get("/metrics", routers.Metrics)
+ }
+
  // Not found handler.
  m.NotFound(routers.NotFound)
 }