Skip to content

feat: add branch support to CDN content delivery configs - #3466

Merged
dkrizan merged 8 commits into
dkrizan/branching-improvementsfrom
dkrizan/cdn-branch-support
Feb 16, 2026
Merged

feat: add branch support to CDN content delivery configs#3466
dkrizan merged 8 commits into
dkrizan/branching-improvementsfrom
dkrizan/cdn-branch-support

Conversation

@dkrizan

@dkrizan dkrizan commented Feb 10, 2026

Copy link
Copy Markdown
Member

Summary

  • Links CDN configs to branches via a foreign key (branch_id) instead of the plain filterBranch string column
  • Adds branch selector to the CDN config dialog when branching is enabled
  • Shows branch name chip on CDN list items
  • Cleans up CDN configs when a branch is deleted
  • Migrates existing configs to the default branch during branching enablement
  • Feature guard rejects CDN create/update with filterBranch when BRANCHING feature is disabled

Test plan

  • All 12 ContentDeliveryConfigBranchingTest tests pass, including:
    • Create/update CDN config with specific branch
    • Create without branch defaults to default branch
    • Non-existent branch returns 404
    • Delete branch cascades to CDN configs
    • Feature guard rejects create when branching not enabled
    • Feature guard rejects update when branching not enabled

🤖 Generated with Claude Code

CDN configs are now linked to branches via a foreign key instead of a
plain string. When branching is enabled, users can select a branch per
CDN config; the feature guard rejects requests that specify a branch
when the BRANCHING feature is disabled.

- Replace `filterBranch` string column with `branch` FK on ContentDeliveryConfig
- Add branch selector to the CDN dialog in the webapp
- Show branch chip on CDN list items
- Clean up CDN configs when a branch is deleted
- Migrate existing configs to the default branch during branching setup
- Add comprehensive tests including feature-guard coverage

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Feb 10, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch dkrizan/cdn-branch-support

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@dkrizan
dkrizan changed the base branch from main to dkrizan/branching-improvements February 12, 2026 16:18
@dkrizan
dkrizan marked this pull request as ready for review February 16, 2026 08:37
@dkrizan
dkrizan requested a review from bdshadow February 16, 2026 08:37
Comment thread backend/data/src/main/resources/db/changelog/schema.xml
@dkrizan
dkrizan requested a review from bdshadow February 16, 2026 15:20
@dkrizan
dkrizan merged commit 44acafb into dkrizan/branching-improvements Feb 16, 2026
41 checks passed
@dkrizan
dkrizan deleted the dkrizan/cdn-branch-support branch February 16, 2026 19:45
dkrizan added a commit that referenced this pull request Feb 17, 2026
## Summary

- Links CDN configs to branches via a foreign key (`branch_id`) instead
of the plain `filterBranch` string column
- Adds branch selector to the CDN config dialog when branching is
enabled
- Shows branch name chip on CDN list items
- Cleans up CDN configs when a branch is deleted
- Migrates existing configs to the default branch during branching
enablement
- Feature guard rejects CDN create/update with `filterBranch` when
BRANCHING feature is disabled

## Test plan

- [x] All 12 `ContentDeliveryConfigBranchingTest` tests pass, including:
  - Create/update CDN config with specific branch
  - Create without branch defaults to default branch
  - Non-existent branch returns 404
  - Delete branch cascades to CDN configs
  - Feature guard rejects create when branching not enabled
  - Feature guard rejects update when branching not enabled

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
dkrizan added a commit that referenced this pull request Feb 19, 2026
## Summary

Consolidates several branching-related improvements:

- **Snapshot creation rewrite** — native SQL for better performance
(#3462)
- **Branch merge activity params fix** — projection queries in
`BranchMergeActivityParamsProvider` (#3469)
- **CDN branch support** — CDN content delivery configs can now be
scoped to a specific branch (#3466)

### Latest changes

- **CDN autopush branch filtering** — CDN configs with autopublish
enabled now only trigger when a translation change happens on the same
branch as the config. Previously all CDN configs in a project would
publish on any translation change regardless of branch.
- **Streamlined merge UI** — removed the confirmation dialog when
initiating a branch merge (merges start immediately) and removed the
option to delete a branch merge from the UI.

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **New Features**
* Content delivery configs can be assigned to specific branches when
branching is enabled.
* Branch-aware CDN publishing routes updates to the matching branch
config.
* UI: branch selector in create/edit dialogs, branch chip shown in
lists, and branch persisted after edits.
* Deleting a branch also removes its associated content delivery
configs.

* **Tests**
* Added unit and end-to-end tests covering branch-aware CDN publishing
and UI flows.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
TolgeeMachine added a commit that referenced this pull request Feb 19, 2026
# [3.160.0](v3.159.1...v3.160.0) (2026-02-19)

### Features

* branching improvements ([#3474](#3474)) ([255a5d0](255a5d0)), closes [#3462](#3462) [#3469](#3469) [#3466](#3466)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants