diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-12-04 11:25:37 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-12-04 15:35:58 +0300 |
| commit | c47dd732f03780b67133e57b04b9c003f5a1b0a5 (patch) | |
| tree | af14b29bda33492a5f3ae080bf56bcacb75630a5 /internal/gitaly/service/operations/merge.go | |
| parent | 65cef6e601f996fbbeaed5332dda5719b9021d3c (diff) | |
operations: Remove GoUserMergeToRef feature flag
The Go port of UserMergeToRef has been introduced in 13.5, enabled by
default in 13.6 and until now didn't cause any known bugs or
regressions. So let's remove the feature flag altogether.
Note that we still cannot completely get rid of the Ruby codepath. After
porting the feature to Go, the Ruby codepath grew another feature which
is to accept conflicts. As Go doesn't handle this yet, we thus need to
retain the Ruby codepath for now.
Diffstat (limited to 'internal/gitaly/service/operations/merge.go')
| -rw-r--r-- | internal/gitaly/service/operations/merge.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go index 3cbd0a465..f4c729bb8 100644 --- a/internal/gitaly/service/operations/merge.go +++ b/internal/gitaly/service/operations/merge.go @@ -350,7 +350,9 @@ func (s *Server) UserMergeToRef(ctx context.Context, in *gitalypb.UserMergeToRef return nil, helper.ErrInvalidArgument(err) } - if featureflag.IsEnabled(ctx, featureflag.GoUserMergeToRef) && !in.AllowConflicts { + // Ruby has grown a new feature since being ported to Go, and we don't + // handle that yet. + if !in.AllowConflicts { return s.userMergeToRef(ctx, in) } |