Merge pull request #2609 from tboerger/enable-queue

Reenable queue list to get autoscaler working
This commit is contained in:
Brad Rydzewski 2019-02-26 12:51:41 -08:00 committed by GitHub
commit 5e3c7699fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -14,6 +14,7 @@ import (
globalbuilds "github.com/drone/drone/handler/api/builds" globalbuilds "github.com/drone/drone/handler/api/builds"
"github.com/drone/drone/handler/api/ccmenu" "github.com/drone/drone/handler/api/ccmenu"
"github.com/drone/drone/handler/api/events" "github.com/drone/drone/handler/api/events"
"github.com/drone/drone/handler/api/queue"
"github.com/drone/drone/handler/api/repos" "github.com/drone/drone/handler/api/repos"
"github.com/drone/drone/handler/api/repos/builds" "github.com/drone/drone/handler/api/repos/builds"
"github.com/drone/drone/handler/api/repos/builds/logs" "github.com/drone/drone/handler/api/repos/builds/logs"
@ -229,12 +230,12 @@ func (s Server) Handler() http.Handler {
).Get("/cc.xml", ccmenu.Handler(s.Repos, s.Builds, s.System.Link)) ).Get("/cc.xml", ccmenu.Handler(s.Repos, s.Builds, s.System.Link))
}) })
// r.Route("/queue", func(r chi.Router) { r.Route("/queue", func(r chi.Router) {
// r.Use(acl.AuthorizeAdmin) r.Use(acl.AuthorizeAdmin)
// r.Get("/", queue.HandleItems(s.Stages)) r.Get("/", queue.HandleItems(s.Stages))
// r.Post("/", queue.HandleResume(s.Queue)) // r.Post("/", queue.HandleResume(s.Queue))
// r.Delete("/", queue.HandlePause(s.Queue)) // r.Delete("/", queue.HandlePause(s.Queue))
// }) })
r.Route("/user", func(r chi.Router) { r.Route("/user", func(r chi.Router) {
r.Use(acl.AuthorizeUser) r.Use(acl.AuthorizeUser)