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.22.1
Choose a base ref
...
head repository: coder/coder
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release/2.22
Choose a head ref
  • 4 commits
  • 9 files changed
  • 5 contributors

Commits on May 21, 2025

  1. fix: stop extending API key access if OIDC refresh is available (cher… 

    …ry-pick #17878) (#17960)

Cherry-picked fix: stop extending API key access if OIDC refresh is
available (#17878)

fixes #17070

Cleans up our handling of APIKey expiration and OIDC to keep them
separate concepts. For an OIDC-login APIKey, both the APIKey and OIDC
link must be valid to login. If the OIDC link is expired and we have a
refresh token, we will attempt to refresh.

OIDC refreshes do not have any effect on APIKey expiry.

#17070 (comment)
explains why this is the correct behavior.

Co-authored-by: Spike Curtis <spike@coder.com>
    @gcp-cherry-pick-bot @spikecurtis
    gcp-cherry-pick-bot[bot] and spikecurtis authored May 21, 2025
    Configuration menu
    Copy the full SHA
    4fe7ee2 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2025

  1. fix: handle workspace.agent and agent.workspace.owner in `coder s… 

    …sh` (cherry-pick #18093) (#18096)

Co-authored-by: Ethan <39577870+ethanndickson@users.noreply.github.com>
Closes #18088.
    @gcp-cherry-pick-bot @ethanndickson
    gcp-cherry-pick-bot[bot] and ethanndickson authored May 29, 2025
    Configuration menu
    Copy the full SHA
    a9b1ccd View commit details
    Browse the repository at this point in the history

  2. chore: add JetBrains icon (cherry-pick #18073) (#18097) 

    Co-authored-by: Atif Ali <atif@coder.com>
    @gcp-cherry-pick-bot @matifali
    gcp-cherry-pick-bot[bot] and matifali authored May 29, 2025
    Configuration menu
    Copy the full SHA
    0156f0f View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2025

  1. chore: add windows icon (cherry-pick #18312) (#18321) 

    Co-authored-by: ケイラ <mckayla@hey.com>
    @gcp-cherry-pick-bot @aslilac
    gcp-cherry-pick-bot[bot] and aslilac authored Jun 11, 2025
    Configuration menu
    Copy the full SHA
    37de9f3 View commit details
    Browse the repository at this point in the history
Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy