diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2020-12-16 14:19:04 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-12-16 14:48:00 +0300 |
| commit | d17490f3fe3bfd1302c764cd1b4355f17403454c (patch) | |
| tree | d13fba3619cf4283b92e9d790c91d4cbbacb11bc | |
| parent | 97b0280d97d847e9c09948d17587cc20398907c0 (diff) | |
Revert "Merge branch 'smh-enable-user-commit-files' into 'master'"
This reverts commit c6d679391328796f4679542ab651b39de75e7a23, reversing
changes made to 993f4ccd104882e0766bd1377f24642603bd558f.
| -rw-r--r-- | changelogs/unreleased/smh-enable-user-commit-files.yml | 5 | ||||
| -rw-r--r-- | internal/metadata/featureflag/feature_flags.go | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/changelogs/unreleased/smh-enable-user-commit-files.yml b/changelogs/unreleased/smh-enable-user-commit-files.yml deleted file mode 100644 index 2334da4d3..000000000 --- a/changelogs/unreleased/smh-enable-user-commit-files.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Enable Go port of UserCommitFiles by default -merge_request: 2922 -author: -type: performance diff --git a/internal/metadata/featureflag/feature_flags.go b/internal/metadata/featureflag/feature_flags.go index d9e2fb9f2..d4f33cc58 100644 --- a/internal/metadata/featureflag/feature_flags.go +++ b/internal/metadata/featureflag/feature_flags.go @@ -28,7 +28,7 @@ var ( // GoUserSquash enables the Go implementation of UserSquash GoUserSquash = FeatureFlag{Name: "go_user_squash", OnByDefault: true} // GoUserCommitFiles enables the Go implementation of UserCommitFiles - GoUserCommitFiles = FeatureFlag{Name: "go_user_commit_files", OnByDefault: true} + GoUserCommitFiles = FeatureFlag{Name: "go_user_commit_files", OnByDefault: false} // GoResolveConflicts enables the Go implementation of ResolveConflicts GoResolveConflicts = FeatureFlag{Name: "go_resolve_conflicts", OnByDefault: false} // GoUserUpdateSubmodule enables the Go implementation of |