Merge branch 'main' into 5980-manage-temp-variables

mtojek · mtojek · commit 930624aeafa9 · 2023-02-14T16:01:43.000Z
diff --git a/coderd/userauth.go b/coderd/userauth.go
@@ -23,6 +23,7 @@ import (
 	"github.com/coder/coder/coderd/database/dbauthz"
 	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/coderd/httpmw"
+	"github.com/coder/coder/coderd/rbac"
 	"github.com/coder/coder/coderd/userpassword"
 	"github.com/coder/coder/codersdk"
 )

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ import (`
`23`	`23`	`"github.com/coder/coder/coderd/database/dbauthz"`
`24`	`24`	`"github.com/coder/coder/coderd/httpapi"`
`25`	`25`	`"github.com/coder/coder/coderd/httpmw"`
	`26`	`+ "github.com/coder/coder/coderd/rbac"`
`26`	`27`	`"github.com/coder/coder/coderd/userpassword"`
`27`	`28`	`"github.com/coder/coder/codersdk"`
`28`	`29`	`)`