Skip to content

chore: cherry pick PRs for 2.17 #15339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Nov 1, 2024
Merged

chore: cherry pick PRs for 2.17 #15339

merged 10 commits into from
Nov 1, 2024

Conversation

Emyrk and others added 10 commits November 1, 2024 16:31
…5305)

The subquery on the users table was incorrectly using the username from
the `workspaces` table, not the `users` table.

This passed `sqlc-vet` because the column did exist in the query, it
just was not the correct one.

(cherry picked from commit 9d03e04)
…15307)

Related to
[https://github.com/coder/coder/issues/15297](https://github.com/coder/coder/issues/15297#issuecomment-2450052538)

- Clearly display this as Daily Active Users
- Remove the user limit bar at the top for licensed deployments
- Explain in the tooltip that this is for measuring user activity and
has no connection to license consumption

(cherry picked from commit 4849b4d)
…orgs (#15261)

The failure condition being fixed is `w1` and `w2` could belong
to different users, organizations, and templates and still cause a
serializable failure if run concurrently. This is because the old query
did a `seq scan` on the `workspace_builds` table. Since that is the
table being updated, we really want to prevent that.

So before this would fail for any 2 workspaces. Now it only fails if
`w1` and `w2` are owned by the same user and organization.

(cherry picked from commit 854044e)
…15296)

closes #14858

- [x] TODO: update `build-timeline.png`
- [x] TODO: `Best practices` doesn't show up in the sidebar until you're
actually in the doc 🤔

[preview](https://coder.com/docs/@bp-speed-up-templates/tutorials/best-practices/speed-up-templates)

---------

Co-authored-by: EdwardAngert <17991901+EdwardAngert@users.noreply.github.com>
Co-authored-by: Muhammad Atif Ali <atif@coder.com>
Co-authored-by: Ben Potter <ben@coder.com>
(cherry picked from commit 18ef954)
These docs were overwritten in the restructure merge.

(cherry picked from commit 2573838)
…set (#15294)

Added example custom roles for admin inspiration, mention of headless
authentication use case, and user-activated password reset.

(cherry picked from commit e9fbfcc)
Adds information on workspace build timings in workspace lifecycle and
template troubleshooting docs.

(cherry picked from commit 399c830)
@stirby stirby changed the title chore(release): Cherry pick PRs for 2.17 chore(release): cherry pick PRs for 2.17 Nov 1, 2024
@stirby stirby changed the title chore(release): cherry pick PRs for 2.17 chore: cherry pick PRs for 2.17 Nov 1, 2024
@stirby stirby requested review from bpmct, sreya and matifali November 1, 2024 17:28
@stirby stirby merged commit 9a444b3 into release/2.17 Nov 1, 2024
35 of 36 checks passed
@stirby stirby deleted the cherry-217 branch November 1, 2024 18:39
@github-actions github-actions bot locked and limited conversation to collaborators Nov 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants