-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Comparing changes
Open a pull request
base repository: coder/coder
base: v2.35.6
head repository: coder/coder
compare: v2.35.7
- 5 commits
- 63 files changed
- 5 contributors
Commits on Aug 26, 2026
-
fix: prevent markdown injection in notifications (#28340) (#28611)
Configuration menu - View commit details
-
Copy full SHA for 90970fd - Browse repository at this point
Copy the full SHA 90970fdView commit details -
fix(coderd/notifications): HTML-escape the email template values (#28397
) (#28644) Backport of #28397 Original PR: #28397 — fix(coderd/notifications): HTML-escape the email template values Merge commit: 2236710 Requested by: @BobbyHo Opened manually because the Backport workflow run for `release/2.35` failed: https://github.com/coder/coder/actions/runs/32985803559/job/98231735668 ## Why the automatic backport failed Two separate things went wrong in that run, and only one of them is about conflicts. The cherry-pick hit seven `modify/delete` conflicts (below). That alone is not fatal — the same happened for `release/2.36` and `release/2.37`, where the job still pushed a placeholder branch and opened a PR for manual resolution. What actually failed the job was the push: ``` ! [remote rejected] backport/28397-to-2.35 -> backport/28397-to-2.35 (Unable to determine if workflow can be created or updated due to timeout; `workflows` scope may be required.) ``` This cherry-pick touches no files under `.github/workflows/`, so this is GitHub timing out while determining scope rather than a genuine permission gap. The push was retried by hand for this PR and succeeded unchanged. The net effect of the failure was that no branch and no PR were created for 2.35 at all, so this one is opened from scratch rather than fixed up in place. ## Manual resolution: 7 golden files dropped `release/2.35` already carries #28611 (the 2.35 backport of #28340), so the `notifier.go` hunk applies cleanly. What remains is a genuine `modify/delete` conflict on seven golden files: ``` TemplateAIBudgetLimitReachedUser.html.golden TemplateAIBudgetWarningUser.html.golden TemplateUserAccountActivatedServiceAccount.html.golden TemplateUserAccountCreatedServiceAccount.html.golden TemplateUserAccountCreatedWithoutAccountType.html.golden TemplateUserAccountDeletedServiceAccount.html.golden TemplateUserAccountSuspendedServiceAccount.html.golden ``` These are fixtures for the AI budget and service-account notification templates, both of which postdate the 2.35 branch point. `coderd/notifications/` on `release/2.35` contains no reference to `AIBudget`, `BudgetLimitReached`, `BudgetWarning`, `ServiceAccount` or `AccountType`, so there is no template to render them and no test case that reads them. **All seven were removed rather than added**; carrying them over would leave orphan fixtures. This is the only deviation from the original PR. Verified with a diff-of-diffs: excluding those seven paths, this commit is byte-identical to #28397. The escaping changes to `html.gotmpl`, `notifier.go` and `smtp_internal_test.go` are fully intact. Net: 32 files, +230/−75 (upstream: 39 files, +244/−89 — the delta is exactly the seven goldens). The smtp golden directory holds 38 files before and after, so nothing was added or lost. ## Verification - `go vet ./coderd/notifications/...` — clean - `go test ./coderd/notifications/dispatch/...` — pass, including the three new `TestSMTPHTMLTemplateEscapes*` tests - `go test ./coderd/notifications/ -run TestNotificationTemplates_Golden` — pass across all affected goldens ## Related backports - #28603 — `release/2.37` - #28604 — `release/2.36` - #28643 — `release/2.29` (still needs manual resolution)
Configuration menu - View commit details
-
Copy full SHA for fcacdea - Browse repository at this point
Copy the full SHA fcacdeaView commit details -
fix(coderd): reject agent requests from suspended owners (#28513) (#2…
Configuration menu - View commit details
-
Copy full SHA for 5a07bdf - Browse repository at this point
Copy the full SHA 5a07bdfView commit details
Commits on Aug 27, 2026
-
fix: enable Copilot HTTP transport fallback (#28494) (#28722)
Backport of #28494 Original PR: #28494 — fix: enable Copilot HTTP transport fallback Merge commit: 849543d Requested by: @ssncferreira > [!NOTE] > This pull request was generated by Coder Agents on behalf of @ssncferreira.
Configuration menu - View commit details
-
Copy full SHA for d8e69d3 - Browse repository at this point
Copy the full SHA d8e69d3View commit details
Commits on Sep 1, 2026
-
chore: purge identified terraform modules via dbpurge (#28802) (#28814)
Cherry-pick of [#28802](#28802) (`e2a856d42b`), matching [#28810](#28810) for `release/2.37`. Deletes cached Terraform module archives ingested during the identified window and clears the template version references to them. Runs from `dbpurge` rather than a migration, because migrations cannot be backported: the version table records a single high-water mark, so a migration cherry-picked here would cause later upgrades to skip every migration in between. ## Conflict resolution The commit did not apply cleanly. This branch predates the chat search work on `main`, so the incoming hunks carried unrelated context that was dropped: - `dbpurge.go`: took only the module cache block, the `ranModuleCachePurge` latch, the window constants, the `identified_module_files` log field and metric, and the `identifiedModuleCachePurged` instance field. Dropped the `chat_messages.search_tsv` backfill and stale reindex, along with `staleDrained` and the `chatSearch*` fields, none of which exist on this branch. - `dbpurge_test.go`: took `TestDeleteIdentifiedModuleCacheFiles` and the `awaitDoTicks` helper it depends on. Dropped `TestBackfillChatMessagesSearchTsv`. In the two `TestMetrics` mock setups, added only the `DeleteCachedModuleFilesCreatedBetween` expectation. - Generated files (`querier.go`, `queries.sql.go`, `dbmetrics`, `dbmock`, and the `dbauthz` stub) were reset to the branch state and regenerated from `queries/files.sql`, rather than taking the diff from `main`. Taking `main`'s versions would have introduced methods for queries that do not exist on this branch. ## Testing `coderd/database/dbpurge` and `TestMethodTestSuite` in `coderd/database/dbauthz` pass against Postgres. `make gen` is clean and pre-commit hooks pass. --- Opened by Coder Agents on behalf of @Emyrk.
Configuration menu - View commit details
-
Copy full SHA for 7b95f85 - Browse repository at this point
Copy the full SHA 7b95f85View commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff v2.35.6...v2.35.7