diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-07-21 08:50:46 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-07-21 08:50:46 +0300 |
| commit | 22548dcc0fa28ab5b151b68e856b8d64a0026621 (patch) | |
| tree | e4c68181164d69ac5d4aa9ea784d23c55f3ce2f8 | |
| parent | 499b72a41063d61dbb8a73ed7ffa7aa42f1584fd (diff) | |
| parent | 2211513fecbb62b0e42f8dffffcffa8618e3a443 (diff) | |
Merge branch 'sh-enable-resolve-conflicts-with-hooks-flag' into 'master'
Enable ResolveConflictsWithHooks feature flag by default
See merge request gitlab-org/gitaly!3639
| -rw-r--r-- | internal/metadata/featureflag/feature_flags.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/internal/metadata/featureflag/feature_flags.go b/internal/metadata/featureflag/feature_flags.go index f8fe3dc0c..fa7dfa814 100644 --- a/internal/metadata/featureflag/feature_flags.go +++ b/internal/metadata/featureflag/feature_flags.go @@ -14,7 +14,9 @@ var ( // CreateRepositoryFromBundleAtomicFetch will add the `--atomic` flag to git-fetch(1) in // order to reduce the number of transactional votes. CreateRepositoryFromBundleAtomicFetch = FeatureFlag{Name: "create_repository_from_bundle_atomic_fetch", OnByDefault: false} - ResolveConflictsWithHooks = FeatureFlag{Name: "resolve_conflicts_with_hooks", OnByDefault: false} + // ResolveConflictsWithHooks will cause the ResolveConflicts RPC to run Git hooks after committing changes + // to the branch. + ResolveConflictsWithHooks = FeatureFlag{Name: "resolve_conflicts_with_hooks", OnByDefault: true} // ReplicateRepositoryDirectFetch will cause the ReplicateRepository RPC to perform fetches // via a direct call instead of doing an RPC call to its own server. This fixes calls of // `ReplicateRepository()` in case it's invoked via Praefect with transactions enabled. |