diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /config/feature_flags/development/display_merge_conflicts_in_diff.yml | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
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 d460e491480..b81b6b25473 100644 --- a/config/feature_flags/development/display_merge_conflicts_in_diff.yml +++ b/config/feature_flags/development/display_merge_conflicts_in_diff.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45008 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/277097 milestone: '13.5' type: development -group: group::source code +group: group::code review default_enabled: false |