Merge branch 'main' into colin/rm-wsconncache2

coder · coadler · Jul 12, 2023 · Jun 26, 2023 · Jun 26, 2023 · Jun 26, 2023
commit 10d44fe7a35710a211a086b76eee40ac30691388
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -1769,6 +1769,7 @@ const (
 	// WARNING: This cannot be enabled when using HA.
 	ExperimentSingleTailnet Experiment = "single_tailnet"
 
+	ExperimentWorkspaceBuildLogsUI Experiment = "workspace_build_logs_ui"
 	// Add new experiments here!
 	// ExperimentExample Experiment = "example"
 )

diff --git a/docs/api/schemas.md b/docs/api/schemas.md
@@ -2539,13 +2539,14 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in
 
 #### Enumerated Values
 
-| Value                    |
-| ------------------------ |
-| `moons`                  |
-| `workspace_actions`      |
-| `tailnet_pg_coordinator` |
-| `convert-to-oidc`        |
-| `single_tailnet`         |
+| Value                     |
+| ------------------------- |
+| `moons`                   |
+| `workspace_actions`       |
+| `tailnet_pg_coordinator`  |
+| `convert-to-oidc`         |
+| `single_tailnet`          |
+| `workspace_build_logs_ui` |
 
 ## codersdk.Feature