Skip to content

Commit 7b5cf9e

Browse files
aslilacaslilac
committed
Merge branch 'main' into reland-activity-and-autostop-changes
2 parents ed8f526 + 79480ca commit 7b5cf9e

File tree

300 files changed

+18007
-10105
lines changed

Some content is hidden

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

300 files changed

+18007
-10105
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.sql linguist-generated=true
77
peerbroker/proto/*.go linguist-generated=true
88
provisionerd/proto/*.go linguist-generated=true
9+
provisionerd/proto/version.go linguist-generated=false
910
provisionersdk/proto/*.go linguist-generated=true
1011
*.tfplan.json linguist-generated=true
1112
*.tfstate.json linguist-generated=true
1213
*.tfstate.dot linguist-generated=true
1314
*.tfplan.dot linguist-generated=true
15+
site/e2e/provisionerGenerated.ts linguist-generated=true
1416
site/src/api/typesGenerated.ts linguist-generated=true
1517
site/src/pages/SetupPage/countries.tsx linguist-generated=true

‎.github/workflows/dogfood.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
- name: "Push template"
110110
if: github.ref == 'refs/heads/main'
111111
run: |
112-
./coder templates push $CODER_TEMPLATE_NAME --directory $CODER_TEMPLATE_DIR --yes --name=$CODER_TEMPLATE_VERSION --message="$CODER_TEMPLATE_MESSAGE" --variable jfrog_url=${{ secrets.JFROG_URL }}
112+
./coder templates push $CODER_TEMPLATE_NAME --directory $CODER_TEMPLATE_DIR --yes --name=$CODER_TEMPLATE_VERSION --message="$CODER_TEMPLATE_MESSAGE"
113113
env:
114114
# Consumed by Coder CLI
115115
CODER_URL: https://dev.coder.com

‎.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",

0 commit comments

Comments
 (0)