Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit15b4dc9

Browse files
committed
Merge branch 'main' into revert-external-auth-wall
2 parents36191ce +475c365 commit15b4dc9

File tree

72 files changed

+2800
-1679
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+2800
-1679
lines changed

‎.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ coderd/apidoc/swagger.json linguist-generated=true
66
coderd/database/dump.sqllinguist-generated=true
77
peerbroker/proto/*.golinguist-generated=true
88
provisionerd/proto/*.golinguist-generated=true
9+
provisionerd/proto/version.golinguist-generated=false
910
provisionersdk/proto/*.golinguist-generated=true
1011
*.tfplan.jsonlinguist-generated=true
1112
*.tfstate.jsonlinguist-generated=true
1213
*.tfstate.dotlinguist-generated=true
1314
*.tfplan.dotlinguist-generated=true
15+
site/e2e/provisionerGenerated.tslinguist-generated=true
1416
site/src/api/typesGenerated.tslinguist-generated=true
1517
site/src/pages/SetupPage/countries.tsxlinguist-generated=true

‎.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
"Signup",
115115
"slogtest",
116116
"sourcemapped",
117+
"spinbutton",
117118
"Srcs",
118119
"stdbuf",
119120
"stretchr",

‎cli/create_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ func TestCreateWithGitAuth(t *testing.T) {
803803
{
804804
Type:&proto.Response_Plan{
805805
Plan:&proto.PlanComplete{
806-
ExternalAuthProviders: []string{"github"},
806+
ExternalAuthProviders: []*proto.ExternalAuthProviderResource{{Id:"github"}},
807807
},
808808
},
809809
},

‎coderd/apidoc/docs.go

Lines changed: 148 additions & 142 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp