From c978ab99b502f56d2eca62d1ee531547f9b17a41 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Tue, 19 Aug 2025 19:24:20 +0100 Subject: [PATCH 1/4] fix(scripts/check_unstaged.sh): modify shebang (#19419) --- scripts/check_unstaged.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_unstaged.sh b/scripts/check_unstaged.sh index 90d4cad87e4fc..715c84c374acf 100755 --- a/scripts/check_unstaged.sh +++ b/scripts/check_unstaged.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail # shellcheck source=scripts/lib.sh From 7bcbb83c7ca41564792084c64ea59a398e0da0dc Mon Sep 17 00:00:00 2001 From: DevCats Date: Tue, 19 Aug 2025 13:58:17 -0500 Subject: [PATCH 2/4] feat: add amp logo sourced from presskit (#19421) Added logo sourcegraph-amp.svg to site/static/icon Add icon to icons.json Logo is sourced from: https://ampcode.com/press-kit --- site/src/theme/icons.json | 1 + site/static/icon/sourcegraph-amp.svg | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 site/static/icon/sourcegraph-amp.svg diff --git a/site/src/theme/icons.json b/site/src/theme/icons.json index 79a76b4c8918f..a9ed1ef361370 100644 --- a/site/src/theme/icons.json +++ b/site/src/theme/icons.json @@ -103,6 +103,7 @@ "rust.svg", "rustrover.svg", "slack.svg", + "sourcegraph-amp.svg", "swift.svg", "tensorflow.svg", "terminal.svg", diff --git a/site/static/icon/sourcegraph-amp.svg b/site/static/icon/sourcegraph-amp.svg new file mode 100644 index 0000000000000..83777bd2d9662 --- /dev/null +++ b/site/static/icon/sourcegraph-amp.svg @@ -0,0 +1,5 @@ + + + + + From c70a786e07fd1f9a6efa1099f0417aac2f5ae544 Mon Sep 17 00:00:00 2001 From: Bruno Quaresma Date: Tue, 19 Aug 2025 16:09:07 -0300 Subject: [PATCH 3/4] chore: ignore dynamic expiration date on story (#19425) Fixes https://github.com/coder/coder/issues/19410 --- .../pages/CreateTokenPage/CreateTokenForm.tsx | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/site/src/pages/CreateTokenPage/CreateTokenForm.tsx b/site/src/pages/CreateTokenPage/CreateTokenForm.tsx index be8fd4614f20f..c414adf1672cd 100644 --- a/site/src/pages/CreateTokenPage/CreateTokenForm.tsx +++ b/site/src/pages/CreateTokenPage/CreateTokenForm.tsx @@ -80,15 +80,21 @@ export const CreateTokenForm: FC = ({ + The token will expire on{" "} + + {dayjs() + .add(form.values.lifetime, "days") + .utc() + .format("MMMM DD, YYYY")} + + + ) : ( + "Please set a token expiration." + ) } classes={{ sectionInfo: classNames.sectionInfo }} > From 60d611fc78fdbd85618b49f489e1ef022003568f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Aug 2025 03:11:11 +0000 Subject: [PATCH 4/4] chore: bump github.com/hashicorp/go-getter from 1.7.8 to 1.7.9 (#19433) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [github.com/hashicorp/go-getter](https://github.com/hashicorp/go-getter) from 1.7.8 to 1.7.9.
Release notes

Sourced from github.com/hashicorp/go-getter's releases.

v1.7.9

What's Changed

New Contributors

Full Changelog: https://github.com/hashicorp/go-getter/compare/v1.7.8...v1.7.9

Commits
  • e702211 Merge pull request #532 from hashicorp/dependabot/github_actions/actions-8948...
  • df0a14f [chore] : Bump the actions group with 8 updates
  • 87541b2 fix: go-getter subdir paths (#540)
  • 3713030 [Compliance] - PR Template Changes Required
  • af2dd3c Merge pull request #529 from hashicorp/dependabot-intge
  • bf52629 updating dependabot.yml
  • 1f63e10 changelog added, updated dependabot.yaml
  • 45af459 fix additional lint errors and increase linter scope
  • c8c6aba fix errcheck lint errors and run it as part of pr checks
  • 9b76f98 copywrite header added
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/hashicorp/go-getter&package-manager=go_modules&previous-version=1.7.8&new-version=1.7.9)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/coder/coder/network/alerts).
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6d703cdd1245e..7c2dd7bc02f48 100644 --- a/go.mod +++ b/go.mod @@ -516,7 +516,7 @@ require ( github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.6.2 // indirect github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect - github.com/hashicorp/go-getter v1.7.8 // indirect + github.com/hashicorp/go-getter v1.7.9 // indirect github.com/hashicorp/go-safetemp v1.0.0 // indirect github.com/invopop/jsonschema v0.13.0 // indirect github.com/jackmordaunt/icns/v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 3575f35177154..bf33f1772dcd0 100644 --- a/go.sum +++ b/go.sum @@ -1353,8 +1353,8 @@ github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9n github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-cty v1.5.0 h1:EkQ/v+dDNUqnuVpmS5fPqyY71NXVgT5gf32+57xY8g0= github.com/hashicorp/go-cty v1.5.0/go.mod h1:lFUCG5kd8exDobgSfyj4ONE/dc822kiYMguVKdHGMLM= -github.com/hashicorp/go-getter v1.7.8 h1:mshVHx1Fto0/MydBekWan5zUipGq7jO0novchgMmSiY= -github.com/hashicorp/go-getter v1.7.8/go.mod h1:2c6CboOEb9jG6YvmC9xdD+tyAFsrUaJPedwXDGr0TM4= +github.com/hashicorp/go-getter v1.7.9 h1:G9gcjrDixz7glqJ+ll5IWvggSBR+R0B54DSRt4qfdC4= +github.com/hashicorp/go-getter v1.7.9/go.mod h1:dyFCmT1AQkDfOIt9NH8pw9XBDqNrIKJT5ylbpi7zPNE= github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=