<!-- Title suggestion: [FF] `auto_merge_abort_uses_target_project` - persist the auto-merge abort note on fork merge requests --> ## Summary Roll out [the feature](https://gitlab.com/gitlab-org/gitlab/-/work_items/614048) currently behind the `auto_merge_abort_uses_target_project` feature flag. - DRI: @zhaochen_li - Team Slack channel: `#g_code-review` > [!note] > Process and guidance live in the docs — this issue is just the commands and a place to track the rollout. > "Rolling out" means incrementally enabling the flag on GitLab.com to validate stability — it is not the same as releasing the feature, which happens when the flag is removed. > [Feature flag controls](https://docs.gitlab.com/development/feature_flags/controls/) · [Feature flag lifecycle](https://handbook.gitlab.com/handbook/product-development/how-we-work/product-development-flow/feature-flag-lifecycle/#feature-flag-lifecycle) ## What could go wrong? The blast radius is limited to one system note on merge requests that were opened from a fork and have a pending auto-merge or merge train. The flag only changes which project that note is filed under. It does not change whether the auto-merge itself is aborted, because clearing the auto-merge parameters never reads a project. If something is wrong, the failure mode is a note filed against the wrong project or, as happens today, no note at all. Neither of those blocks a merge, so there is no data-loss risk and no risk to the merge itself. To watch the rollout, track the volume of `SystemNotes::BaseService::UnpersistedSystemNoteError` in the `pubsub-sidekiq-inf-gprd*` Kibana data view, filtered to `json.extra.note_action: "merge"`. This is the direct success signal for this rollout, and it should fall as the rollout progresses. ## Rollout Run all production `/chatops` in [`#production`](https://gitlab.slack.com/archives/C101F3796) and cross-post the results to `#g_code-review`. Background: [incremental rollout process](https://docs.gitlab.com/development/feature_flags/controls/#process), [feature actors](https://docs.gitlab.com/development/feature_flags/#feature-actors). **Non-production** ``` /chatops gitlab run feature set auto_merge_abort_uses_target_project 50 --actors --dev --pre --staging --staging-ref /chatops gitlab run feature set auto_merge_abort_uses_target_project true --dev --pre --staging --staging-ref ``` **Production** — percentage rollout (wait ≥15 min between steps, watch dashboards): ``` /chatops gitlab run feature set auto_merge_abort_uses_target_project <percentage> --actors ``` Or target specific actors instead: ``` /chatops gitlab run feature set --project=gitlab-org/gitlab,gitlab-org/gitlab-foss auto_merge_abort_uses_target_project true /chatops gitlab run feature set --group=gitlab-org,gitlab-com auto_merge_abort_uses_target_project true /chatops gitlab run feature set --user=zhaochen_li auto_merge_abort_uses_target_project true ``` ## Before global rollout Confirm the relevant gotchas before going to 100% — see [enabling a feature for GitLab.com](https://docs.gitlab.com/development/feature_flags/controls/#enabling-a-feature-for-gitlabcom): - [Docs + version history](https://docs.gitlab.com/development/documentation/feature_flags/) updated - [Breaking changes](https://docs.gitlab.com/development/documentation/release_notes/#deprecations-removals-and-breaking-changes) announced, if any - [Change management issue](https://handbook.gitlab.com/handbook/engineering/infrastructure-platforms/change-management/#feature-flags-and-the-change-management-process) opened, if required - [External API consumers](https://docs.gitlab.com/development/feature_flags/#do-not-use-feature-flags-in-external-api-consumers) handled with a fail-open mechanism, if applicable ## Cleanup Remove the flag once [deemed stable](https://handbook.gitlab.com/handbook/product-development/how-we-work/product-development-flow/feature-flag-lifecycle/#feature-flag-lifecycle) — see [cleaning up](https://docs.gitlab.com/development/feature_flags/controls/#cleaning-up). Track it here, or open a follow-up [Feature Flag Cleanup issue](https://gitlab.com/gitlab-org/gitlab/-/work_items/new?description_template=Feature%20Flag%20Cleanup). Remove the flag and its YAML definition from the codebase, then: ``` /chatops gitlab run release check <merge-request-url> 19.4 /chatops gitlab run feature delete auto_merge_abort_uses_target_project --dev --pre --staging --staging-ref --production ``` ## Rollback ``` /chatops gitlab run feature set auto_merge_abort_uses_target_project false # production /chatops gitlab run feature set auto_merge_abort_uses_target_project false --dev --pre --staging --staging-ref # non-production /chatops gitlab run feature delete auto_merge_abort_uses_target_project --dev --pre --staging --staging-ref --production # remove entirely ```