diff options
Diffstat (limited to 'config/feature_flags/development/display_merge_conflicts_in_diff.yml')
-rw-r--r-- | config/feature_flags/development/display_merge_conflicts_in_diff.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/feature_flags/development/display_merge_conflicts_in_diff.yml b/config/feature_flags/development/display_merge_conflicts_in_diff.yml index b81b6b25473..50c22b52d11 100644 --- a/config/feature_flags/development/display_merge_conflicts_in_diff.yml +++ b/config/feature_flags/development/display_merge_conflicts_in_diff.yml @@ -1,7 +1,7 @@ --- name: display_merge_conflicts_in_diff introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45008 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/277097 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276918 milestone: '13.5' type: development group: group::code review |