operations: Wire up AllowConflicts handling for Go

Originally, handling of the "AllowConflicts" parameter for the UserMergeToRef RPC was only implemented in Ruby and not in Go because efforts to port to Go and to implement this new flag crossed. This has changed with the previous commit so that we can now switch over to fully use the Go port instead of the Ruby code in all cases.

Note that this directly removes the Ruby codepath without any kind of feature flag. This is done because first, the UserMergeToRef RPC has been tested already and rolled out by default. And second, all callers in GitLab Rails which make use of "AllowConflicts" are already hidden behind the "display_merge_conflicts_in_diff" feature flag which is currently disabled by default. Introducing another feature flag for this parameter thus doesn't seem necessary.

changed milestone to %13.8

added devopscreate groupgitaly sectiondev workflowready for review labels

assigned to @igor.drozdov

mentioned in merge request !2642 (closed)

	1 Message
	Suggested maintainers: @proglottis, and @pokstad1

Generated by Danger

@igor.drozdov I've taken a stab at implementing Ruby-equivalent AllowConflicts handling in Go. Please let me know what you think of this. If you're happy to pursue this MR, do you agree with my sentiment that no new feature flag is needed because you've already got one in Rails?

@pks-t sorry for the delay, I'm fine with this MR, I'll go ahead and close this one !2642 (closed)

If you're happy to pursue this MR, do you agree with my sentiment that no new feature flag is needed because you've already got one in Rails?

I agree, we can control the behavior via Rails feature flag

added 1 commit

• 2a41c276 - operations: Wire up AllowConflicts handling for Go

Compare with previous version

added featureaddition typefeature labels

added 45 commits

• 2a41c276...b10b939c - 42 commits from branch master
• 8e54400d - conflicts: Expose helper to merge a conflicting index entry
• 9835d30c - git2go: Implement handling of AllowConflicts for UserMergeToRef
• 672559bb - operations: Wire up AllowConflicts handling for Go

Compare with previous version

Setting label(s) Category:Gitaly based on groupgitaly.

added Category:Gitaly label

assigned to @proglottis and @pokstad1 and unassigned @igor.drozdov

approved this merge request

LGTM. Ironically, there are conflicts 🤨.

Thanks! I've rebased the MR

@pks-t LGTM but has conflicts again... sorry!

No worries, rebased again and set to MWPS Thanks for your reviews!

assigned to @pks-t and unassigned @pokstad1

added 83 commits

• 672559bb...e212a61a - 80 commits from branch master
• cfbe9dee - conflicts: Expose helper to merge a conflicting index entry
• 05563dcc - git2go: Implement handling of AllowConflicts for UserMergeToRef
• 3b7e6f05 - operations: Wire up AllowConflicts handling for Go

Compare with previous version

unassigned @pks-t

changed milestone to %13.9

added 1 commit

• d2799cb4 - operations: Wire up AllowConflicts handling for Go

Compare with previous version

approved this merge request