diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2021-01-18 15:23:25 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2021-01-18 15:23:25 +0300 |
| commit | 369b434775050c48cddebf8dba41abeb12293091 (patch) | |
| tree | 74343aee89f2f76ba0ad3b916088821731476ab0 | |
| parent | adfa1692fd9dfde07b89609a05b8801a40c18fd2 (diff) | |
| parent | c38e720c361d3e17322ed11e2ced8984a213c69f (diff) | |
Merge branch 'pks-revert-go-resolve-conflicts-default' into 'master'
Revert "Merge branch 'po-resolve-conflicts-featureflag-removal' into 'master'"
Closes #3419
See merge request gitlab-org/gitaly!3012
| -rw-r--r-- | changelogs/unreleased/po-resolve-conflicts-featureflag-removal.yml | 5 | ||||
| -rw-r--r-- | internal/metadata/featureflag/feature_flags.go | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/changelogs/unreleased/po-resolve-conflicts-featureflag-removal.yml b/changelogs/unreleased/po-resolve-conflicts-featureflag-removal.yml deleted file mode 100644 index eb6ac6024..000000000 --- a/changelogs/unreleased/po-resolve-conflicts-featureflag-removal.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Enable Go version of ResolveConflicts by default -merge_request: 3007 -author: -type: performance diff --git a/internal/metadata/featureflag/feature_flags.go b/internal/metadata/featureflag/feature_flags.go index 10e8598aa..54f1b613a 100644 --- a/internal/metadata/featureflag/feature_flags.go +++ b/internal/metadata/featureflag/feature_flags.go @@ -30,7 +30,7 @@ var ( // GoUserCommitFiles enables the Go implementation of UserCommitFiles GoUserCommitFiles = FeatureFlag{Name: "go_user_commit_files", OnByDefault: false} // GoResolveConflicts enables the Go implementation of ResolveConflicts - GoResolveConflicts = FeatureFlag{Name: "go_resolve_conflicts", OnByDefault: true} + GoResolveConflicts = FeatureFlag{Name: "go_resolve_conflicts", OnByDefault: false} // GoUserDeleteTag enables the Go implementation of UserDeleteTag GoUserDeleteTag = FeatureFlag{Name: "go_user_delete_tag", OnByDefault: true} // GoUserCreateTag enables the Go implementation of UserCreateTag |