From f91d13b7b0236d6a2d1425919a6498aa2fcfce93 Mon Sep 17 00:00:00 2001 From: Joe Woodward Date: Wed, 16 Aug 2023 17:29:32 +0000 Subject: [PATCH] Revert "Merge branch 'chore/set-merge_commit_diff_modes-default-enabled' into 'master'" This reverts merge request !129465 --- .../development/merge_commit_diff_modes.yml | 2 +- doc/user/project/file_lock.md | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/config/feature_flags/development/merge_commit_diff_modes.yml b/config/feature_flags/development/merge_commit_diff_modes.yml index d550ae9aba0d48..2da966e1cbbaf6 100644 --- a/config/feature_flags/development/merge_commit_diff_modes.yml +++ b/config/feature_flags/development/merge_commit_diff_modes.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415579 milestone: '16.1' type: development group: group::source code -default_enabled: true +default_enabled: false diff --git a/doc/user/project/file_lock.md b/doc/user/project/file_lock.md index a0058c8b8b0081..2a23bf57786517 100644 --- a/doc/user/project/file_lock.md +++ b/doc/user/project/file_lock.md @@ -40,16 +40,6 @@ users are prevented from modifying locked files by pushing, merging, or any other means, and are shown an error like: `The path '.gitignore' is locked by Administrator`. -NOTE: -There is a bug which blocks changes which include a merged file locked by -another user. In 16.1 we introduced `merge_commit_diff_modes` feature flag, -disabled by default. When `merge_commit_diff_modes` is enabled merge commits -with no additional changes are not evaluated. Merge commits with additional -changes only evaluate the changes that were added by the committer. -In 16.3 `merge_commit_diff_modes` is enabled by default for self-managed -instances. -For more information see [Issue 23625](https://gitlab.com/gitlab-org/gitlab/-/issues/23625). - ## Exclusive file locks This process allows you to lock single files or file extensions and it is -- GitLab