rebase and fix tests

f0ssel · f0ssel · commit 534bcdba192d · 2022-05-18T16:44:12.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -310,8 +310,8 @@ func New(options *Options) (http.Handler, func()) {
 				r.Route("/autostop", func(r chi.Router) {
 					r.Put("/", api.putWorkspaceAutostop)
 				})
+				r.Get("/watch", api.watchWorkspace)
 			})
-			r.Get("/watch", api.watchWorkspace)
 		})
 		r.Route("/workspacebuilds/{workspacebuild}", func(r chi.Router) {
 			r.Use(
