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 | 3 |
1 files changed, 2 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 678037fa366..d460e491480 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,8 @@ --- name: display_merge_conflicts_in_diff introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45008 -rollout_issue_url: +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/277097 +milestone: '13.5' type: development group: group::source code default_enabled: false |