diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-10-22 15:50:35 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-10-22 16:14:44 +0300 |
| commit | 4c8c79f9a0e48114d6f882fd073e612df851a2ab (patch) | |
| tree | 6694b4e0f01b2525dbedd08051ca446168f17086 /internal/gitaly/service/operations/merge.go | |
| parent | 0ebfb705b79a8baecc1db46f31761f83f4e471f9 (diff) | |
operations: Fix feature flag for UserMergeToRef
The UserMergeToRef RPC is using the wrong feature flag by accident,
which causes it to be enabled together with UserMergeBranch. Fix this by
using the correct one.
Diffstat (limited to 'internal/gitaly/service/operations/merge.go')
| -rw-r--r-- | internal/gitaly/service/operations/merge.go | 2 |
1 files changed, 1 insertions, 1 deletions
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) } |