Commitce62ff2

authored

Merge branch 'main' into restructure-new

2 parentsc466c9f +5cffac2 commitce62ff2Copy full SHA for ce62ff2

File tree

+21

-21

lines changed

+21

-21

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import (`
`10`	`10`	`"golang.org/x/xerrors"`
`11`	`11`
`12`	`12`	`"github.com/coder/coder/v2/coderd/rbac/policy"`
`13`		`-"github.com/coder/coder/v2/codersdk/healthsdk"`
`14`	`13`	`)`
`15`	`14`
`16`	`15`	`// AuditOAuthConvertState is never stored in the database. It is stored in a cookie`
`@@ -26,8 +25,8 @@ type AuditOAuthConvertState struct {`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`typeHealthSettingsstruct {`
`29`		-ID uuid.UUID`db:"id" json:"id"`
`30`		-DismissedHealthchecks []healthsdk.HealthSection`db:"dismissed_healthchecks" json:"dismissed_healthchecks"`
	`28`	+ID uuid.UUID`db:"id" json:"id"`
	`29`	+DismissedHealthchecks []string`db:"dismissed_healthchecks" json:"dismissed_healthchecks"`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`typeNotificationsSettingsstruct {`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import (`
`20`	`20`	`"github.com/coder/coder/v2/coderd/httpmw"`
`21`	`21`	`"github.com/coder/coder/v2/coderd/rbac"`
`22`	`22`	`"github.com/coder/coder/v2/coderd/rbac/policy"`
	`23`	`+"github.com/coder/coder/v2/coderd/util/slice"`
`23`	`24`	`"github.com/coder/coder/v2/codersdk"`
`24`	`25`	`"github.com/coder/coder/v2/codersdk/healthsdk"`
`25`	`26`	`)`
`@@ -250,7 +251,7 @@ func (api API) putDeploymentHealthSettings(rw http.ResponseWriter, r http.Requ`
`250`	`251`
`251`	`252`	`aReq.New= database.HealthSettings{`
`252`	`253`	`ID:uuid.New(),`
`253`		`-DismissedHealthchecks:settings.DismissedHealthchecks,`
	`254`	`+DismissedHealthchecks:slice.ToStrings(settings.DismissedHealthchecks),`
`254`	`255`	`}`
`255`	`256`
`256`	`257`	`err=api.Database.UpsertHealthSettings(ctx,string(settingsJSON))`

Lines changed: 12 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -125,23 +125,23 @@ For the mainline Coder release:`
`125`	`125`
`126`	`126`	`<!-- autoversion(mainline): "--version [version]"-->`
`127`	`127`
`128`		-```shell
`129`		`-helm install coder coder-v2/coder \`
`130`		`---namespace coder \`
`131`		`---values values.yaml \`
`132`		`---version 2.14.2`
`133`		-```
	`128`	+```shell
	`129`	`+ helm install coder coder-v2/coder \`
	`130`	`+--namespace coder \`
	`131`	`+--values values.yaml \`
	`132`	`+--version 2.15.0`
	`133`	+```
`134`	`134`
`135`	`135`	`For the stable Coder release:`
`136`	`136`
`137`	`137`	`<!-- autoversion(stable): "--version [version]" -->`
`138`	`138`
`139`		-```shell
`140`		`-helm install coder coder-v2/coder \`
`141`		`---namespace coder \`
`142`		`---values values.yaml \`
`143`		`---version 2.13.5`
`144`		-```
	`139`	+```shell
	`140`	`+ helm install coder coder-v2/coder \`
	`141`	`+--namespace coder \`
	`142`	`+--values values.yaml \`
	`143`	`+--version 2.14.2`
	`144`	+```
`145`	`145`
`146`	`146`	You can watch Coder start up by running`kubectl get pods -n coder`. Once Coder
`147`	`147`	has started, the`coder-*` pods should enter the`Running` state.

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,14 +47,14 @@ pages.`
`47`	`47`
`48`	`48`	`\| Release name\| Release Date\| Status\|`
`49`	`49`	`\| ------------\| ------------------\| ----------------\|`
`50`		`-\| 2.8.x\| February 06, 2024\| Not Supported\|`
`51`	`50`	`\| 2.9.x\| March 07, 2024\| Not Supported\|`
`52`	`51`	`\| 2.10.x\| April 03, 2024\| Not Supported\|`
`53`	`52`	`\| 2.11.x\| May 07, 2024\| Not Supported\|`
`54`		`-\| 2.12.x\| June 04, 2024\| Security Support\|`
`55`		`-\| 2.13.x\| July 02, 2024\| Stable\|`
`56`		`-\| 2.14.x\| August 06, 2024\| Mainline\|`
`57`		`-\| 2.15.x\| September 03, 2024\| Not Released\|`
	`53`	`+\| 2.12.x\| June 04, 2024\| Not Supported\|`
	`54`	`+\| 2.13.x\| July 02, 2024\| Security Support\|`
	`55`	`+\| 2.14.x\| August 06, 2024\| Stable\|`
	`56`	`+\| 2.15.x\| September 03, 2024\| Mainline\|`
	`57`	`+\| 2.16.x\| October 01, 2024\| Not Released\|`
`58`	`58`
`59`	`59`	`>Tip: We publish a`
`60`	`60`	>[`preview`](https://github.com/coder/coder/pkgs/container/coder-preview) image

Comments

(0)