Skip to content

WIP: Add "Merge manually..." option to MR accept widget

Douwe Maan requested to merge mr-merge-manually into master

I really dislike having a line under the "From A to B" part. First is was the "Fetch this branch using ...", now it's "If you want to ...", which is better, but still looks bad.

Before:

Screen_Shot_2015-08-08_at_21.53.04

After:

Screen_Shot_2015-08-08_at_21.52.51

Like "command line" before, the "Merge manually" link opens the command line merge instructions modal.

cc @dzaporozhets @rspeicher

Merge request reports