diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-10-23 10:17:51 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-10-23 10:17:51 +0300 |
| commit | 8be33e72f963571691cb6af0b483058f2488ae1a (patch) | |
| tree | 01fca974da342ecc7bbc1e471562a9028c9bb36a | |
| parent | 0d9df7ce8b8f6e795582ac61934a911c6cc45127 (diff) | |
| parent | 4c8c79f9a0e48114d6f882fd073e612df851a2ab (diff) | |
Merge branch 'pks-go-user-merge-to-ref-ff' into 'master'
operations: Fix feature flag for UserMergeToRef
See merge request gitlab-org/gitaly!2689
| -rw-r--r-- | changelogs/unreleased/pks-go-user-merge-to-ref-ff.yml | 5 | ||||
| -rw-r--r-- | internal/gitaly/service/operations/merge.go | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/pks-go-user-merge-to-ref-ff.yml b/changelogs/unreleased/pks-go-user-merge-to-ref-ff.yml new file mode 100644 index 000000000..33cc03491 --- /dev/null +++ b/changelogs/unreleased/pks-go-user-merge-to-ref-ff.yml @@ -0,0 +1,5 @@ +--- +title: 'operations: Fix feature flag for UserMergeToRef' +merge_request: 2689 +author: +type: fixed diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go index 194d48786..f062d8197 100644 --- a/internal/gitaly/service/operations/merge.go +++ b/internal/gitaly/service/operations/merge.go @@ -480,7 +480,7 @@ func (s *server) UserMergeToRef(ctx context.Context, in *gitalypb.UserMergeToRef return nil, helper.ErrInvalidArgument(err) } - if featureflag.IsEnabled(ctx, featureflag.GoUserMergeBranch) && !in.AllowConflicts { + if featureflag.IsEnabled(ctx, featureflag.GoUserMergeToRef) && !in.AllowConflicts { return s.userMergeToRef(ctx, in) } |