Skip to content

Commit 53c607e

Browse files
dannykoppingdannykopping
committed
Update with main
Signed-off-by: Danny Kopping <danny@coder.com>
1 parent 9d64cf5 commit 53c607e

File tree

8 files changed

+5
-3
lines changed

8 files changed

+5
-3
lines changed

‎coderd/database/migrations/000278_workspace_app_cors_behavior.down.sql renamed to ‎coderd/database/migrations/000279_workspace_app_cors_behavior.down.sql

File renamed without changes.

‎coderd/database/migrations/000278_workspace_app_cors_behavior.up.sql renamed to ‎coderd/database/migrations/000279_workspace_app_cors_behavior.up.sql

File renamed without changes.

‎coderd/database/migrations/000279_template_level_cors.down.sql renamed to ‎coderd/database/migrations/000280_template_level_cors.down.sql

File renamed without changes.

‎coderd/database/migrations/000279_template_level_cors.up.sql renamed to ‎coderd/database/migrations/000280_template_level_cors.up.sql

File renamed without changes.

‎codersdk/templates.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ type UpdateTemplateMeta struct {
251251
// of the template.
252252
DisableEveryoneGroupAccess bool `json:"disable_everyone_group_access"`
253253
MaxPortShareLevel *WorkspaceAgentPortShareLevel `json:"max_port_share_level,omitempty"`
254-
CORSBehavior *AppCORSBehavior `json:"cors_behavior"`
254+
CORSBehavior *AppCORSBehavior `json:"cors_behavior,omitempty"`
255255
}
256256

257257
type TemplateExample struct {

‎site/e2e/tests/templates/updateTemplateSchedule.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ test("update template schedule settings without override other settings", async
2626
require_active_version: true,
2727
max_port_share_level: null,
2828
allow_user_cancel_workspace_jobs: null,
29+
cors_behavior: null,
2930
});
3031

3132
await page.goto(`${baseURL}/templates/${template.name}/settings/schedule`, {

‎site/src/api/typesGenerated.ts

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/src/pages/CreateTemplatePage/utils.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export const newTemplate = (
1818
const safeTemplateData = {
1919
name: formData.name,
2020
max_port_share_level: null,
21+
cors_behavior: null,
2122
display_name: formData.display_name,
2223
description: formData.description,
2324
icon: formData.icon,
@@ -41,7 +42,7 @@ export const newTemplate = (
4142
autostart_requirement: {
4243
days_of_week: formData.autostart_requirement_days_of_week,
4344
},
44-
require_active_version: false,
45+
require_active_version: false
4546
};
4647
};
4748

0 commit comments

Comments
 (0)