Skip to content

Commit 1c6671e

Browse files
BrunoQuaresmaBrunoQuaresma
committed
Merge branch 'main' of https://github.com/coder/coder into bq/feat-agent-timings
2 parents 3daab59 + 52f03db commit 1c6671e

File tree

122 files changed

+2946
-3006
lines changed

Some content is hidden

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

122 files changed

+2946
-3006
lines changed

‎.github/workflows/contrib.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
steps:
3737
- name: cla
3838
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
39-
uses: contributor-assistant/github-action@v2.6.0
39+
uses: contributor-assistant/github-action@v2.6.1
4040
env:
4141
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4242
# the below token should have repo scope and must be manually added by you in the repository's secret

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ gen: \
488488
agent/proto/agent.pb.go \
489489
provisionersdk/proto/provisioner.pb.go \
490490
provisionerd/proto/provisionerd.pb.go \
491-
vpn/vpn.proto \
491+
vpn/vpn.pb.go \
492492
coderd/database/dump.sql \
493493
$(DB_GEN_FILES) \
494494
site/src/api/typesGenerated.ts \
@@ -518,7 +518,7 @@ gen/mark-fresh:
518518
agent/proto/agent.pb.go \
519519
provisionersdk/proto/provisioner.pb.go \
520520
provisionerd/proto/provisionerd.pb.go \
521-
vpn/vpn.proto \
521+
vpn/vpn.pb.go \
522522
coderd/database/dump.sql \
523523
$(DB_GEN_FILES) \
524524
site/src/api/typesGenerated.ts \

‎coderd/apidoc/docs.go

Lines changed: 36 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 32 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)