From c86c2ed2377283e93d60100db6ae03717bc4cd9a Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Wed, 15 Oct 2014 23:58:34 -0700 Subject: [PATCH 1/3] fixed formatting issue on repo edit screen --- server/app/views/repo_edit.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/app/views/repo_edit.html b/server/app/views/repo_edit.html index bdc9ce9d..77cc7c44 100644 --- a/server/app/views/repo_edit.html +++ b/server/app/views/repo_edit.html @@ -87,7 +87,7 @@

Status Badge

-
{{ repo | badgeMarkdown }}
+
{{ repo | badgeMarkdown }}
@@ -97,7 +97,7 @@

Public Key

-
{{ repo.public_key }}
+
{{ repo.public_key }}
From b1300be9f0eb2f9b1f0493f67df4c1a89b6fefab Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 16 Oct 2014 00:00:31 -0700 Subject: [PATCH 2/3] fixed word wrap on user settings screen --- server/app/styles/drone.less | 1 + 1 file changed, 1 insertion(+) diff --git a/server/app/styles/drone.less b/server/app/styles/drone.less index 60338999..1c913dae 100644 --- a/server/app/styles/drone.less +++ b/server/app/styles/drone.less @@ -1039,6 +1039,7 @@ nav { color:#666; line-height:22px; font-size:14px; + word-break: break-all; } } From cc71957c8d1237099eca3e92984f83e45ee02731 Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Thu, 16 Oct 2014 11:35:25 -0700 Subject: [PATCH 3/3] moving websockets to subrouter --- server/router/router.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/router/router.go b/server/router/router.go index 78a7c5a7..ec8bd40b 100644 --- a/server/router/router.go +++ b/server/router/router.go @@ -11,8 +11,6 @@ func New() *web.Mux { mux := web.New() mux.Get("/api/logins", handler.GetLoginList) - mux.Get("/api/stream/stdout/:id", handler.WsConsole) - mux.Get("/api/stream/user", handler.WsUser) mux.Get("/api/auth/:host", handler.GetLogin) mux.Post("/api/auth/:host", handler.GetLogin) mux.Get("/api/badge/:host/:owner/:name/status.svg", handler.GetBadge) @@ -21,6 +19,11 @@ func New() *web.Mux { mux.Put("/api/hook/:host", handler.PostHook) mux.Post("/api/hook/:host", handler.PostHook) + streams := web.New() + streams.Get("/api/stream/stdout/:id", handler.WsConsole) + streams.Get("/api/stream/user", handler.WsUser) + mux.Handle("/api/stream/*", streams) + repos := web.New() repos.Use(middleware.SetRepo) repos.Use(middleware.RequireRepoRead)