Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: coder/coder
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.33.8
Choose a base ref
...
head repository: coder/coder
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.33.9
Choose a head ref
  • 6 commits
  • 38 files changed
  • 8 contributors

Commits on Jun 17, 2026

  1. fix(coderd/httpmw): honor fixed lifetime for CLI API tokens (#26376) (#… 

    …26383)

Backport of #26376

Original PR: #26376 — fix(coderd/httpmw): honor fixed lifetime for CLI
API tokens
Merge commit: 450ddff
Requested by: @jdomeracki-coder

Co-authored-by: Jakub Domeracki <jakub@coder.com>
    @github-actions @jdomeracki-coder
    github-actions[bot] and jdomeracki-coder authored Jun 17, 2026
    Configuration menu
    Copy the full SHA
    e330564 View commit details
    Browse the repository at this point in the history

  2. chore(provisioner/terraform): preserve existing AWS_SDK_UA_APP_ID (#2… 

    …4606) (#26470)

Co-authored-by: blinkagent[bot] <237617714+blinkagent[bot]@users.noreply.github.com>
Co-authored-by: blink-so[bot] <211532188+blink-so[bot]@users.noreply.github.com>
Co-authored-by: Atif Ali <atif@coder.com>
    @github-actions @blinkagent
    @blink-so @matifali
    4 people authored Jun 17, 2026
    Configuration menu
    Copy the full SHA
    41ab770 View commit details
    Browse the repository at this point in the history

  3. fix(scripts/check_emdash.sh): skip emdash check when no diff base is … 

    …available (#26491)

Backport of #26489 to `release/2.33`.

## Problem

`scripts/check_emdash.sh` only resolves a base ref for pull requests
(`GITHUB_BASE_REF`) or when `origin/main` is present. The `lint` job
checks out with `fetch-depth: 1`, so on a release-branch push neither is
available, and the script falls back to scanning **every tracked file**,
flagging pre-existing emdash/endash characters the build did not
introduce. This is the same failure mode seen on the `release/2.34` push
build (run
[27704528068](https://github.com/coder/coder/actions/runs/27704528068/job/81949529546));
`release/2.33` carries the same script and the same bug.

## Fix

When no base ref can be determined (outside a pull request), skip the
check instead of scanning the whole tree. `--all` still forces a full
scan.

Note: this branch carries an older variant of the script than `main`, so
the change is applied by hand rather than cherry-picked, but the
behavior matches #26489.

## Testing

- Isolated no-base-ref repo (no `GITHUB_BASE_REF`, no `origin/main`):
old script scans all files and fails on a pre-existing emdash; patched
script skips and exits 0.
- `shellcheck`, `shfmt`, `bash -n` clean.

---
Generated by Coder Agents on behalf of @f0ssel.
    @f0ssel
    f0ssel authored Jun 17, 2026
    Configuration menu
    Copy the full SHA
    2e43114 View commit details
    Browse the repository at this point in the history

  4. feat: implement package and cli tool for repairing oidc links (#26418) ( 

    #26482)

Backport of #26418

Original PR: #26418 — feat: implement package and cli tool for repairing
oidc links
Merge commit: 1d03e63
Requested by: @f0ssel

> [!WARNING]
> The automatic cherry-pick had conflicts.
> Please resolve manually by cherry-picking the original merge commit:
>
> ```
> git fetch origin backport/26418-to-2.33
> git checkout backport/26418-to-2.33
> git reset --hard origin/release/2.33
> git cherry-pick -x -m1 1d03e63
> # resolve conflicts, then push
> ```

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Garrett Delfosse <garrett@coder.com>
Co-authored-by: Steven Masley <Emyrk@users.noreply.github.com>
    @github-actions @f0ssel @Emyrk
    3 people authored Jun 17, 2026
    Configuration menu
    Copy the full SHA
    d18ee68 View commit details
    Browse the repository at this point in the history

  5. feat: deployment flag to auto handle changed oidc providers (#26419) (#… 

    …26484)

Backport of #26419

Original PR: #26419 — feat: deployment flag to auto handle changed oidc
providers
Merge commit: 0e45ded
Requested by: @f0ssel

> [!WARNING]
> The automatic cherry-pick had conflicts.
> Please resolve manually by cherry-picking the original merge commit:
>
> ```
> git fetch origin backport/26419-to-2.33
> git checkout backport/26419-to-2.33
> git reset --hard origin/release/2.33
> git cherry-pick -x -m1 0e45ded
> # resolve conflicts, then push
> ```

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Garrett Delfosse <garrett@coder.com>
Co-authored-by: Steven Masley <Emyrk@users.noreply.github.com>
    @github-actions @f0ssel @Emyrk
    3 people authored Jun 17, 2026
    Configuration menu
    Copy the full SHA
    08cf114 View commit details
    Browse the repository at this point in the history

  6. docs: document VS Code local telemetry (#26215) (#26497) 

    Backport of #26215

Original PR: #26215 — docs: document VS Code local telemetry
Merge commit: c883db9
Requested by: @f0ssel

Co-authored-by: Ehab Younes <ehab.alyounes@gmail.com>
    @github-actions @EhabY
    github-actions[bot] and EhabY authored Jun 17, 2026
    Configuration menu
    Copy the full SHA
    355536e View commit details
    Browse the repository at this point in the history
Loading