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

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:

After:

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

cc @dzaporozhets @rspeicher

Added 1 commit:

• 956446e7 - Fix changelog.

@DouweM I agree.

mentioned in merge request !1116 (merged)

I get what you're going for with the ellipsis at the end of "Merge manually" since it opens a modal, but because it's at the end of the widget it kind of looks like we're truncating something. Maybe it would look better with the … HTML entity?

Added 1 commit:

• ffb244a5 - Use proper ellipsis rather than three periods.

@rspeicher I see what you mean, but not how using ellipsis rather than periods would help with that. I've made the change anyway, since it's more correct.

I don't think it will be confusing, because people are used to "..." in context menus (whether subconsciously or not), and "Merge manually" is a complete phrase without an obviously truncated part.

Added 13 commits:

• ffb244a5...b833f208 - 12 commits from branch master
• d81419c1 - Merge branch 'master' into mr-merge-manually

Reassigned to @rspeicher

Reassigned to @dzaporozhets

@DouweM I dont like it. Now command line instructions are available to everyone. You make it visible only to people who can merge it. Also in 90% I use command line instructions to try merge request - not to merge it. So link name makes no sense to me

Also it makes no sense to have merge manually instructions inside form with automatically merge UI.

@dzaporozhets In combination with !1116 (merged), the command line instructions will be available to everyone again, but with the name "Check out branch" (which applies to everyone) rather than the text saying it's about merging using the command line.

Also it makes no sense to have merge manually instructions inside form with automatically merge UI.

@dzaporozhets I agree it's odd. I was mostly trying to get rid of the extra line under "From A to B" which looks bad. Do you have other suggestions?

mentioned in merge request !1116 (merged)

I agree it's odd.

@DouweM then why do it?

@dzaporozhets Because I think it's better than the current look, even if the location doesn't make perfect sense. But remember that before you moved it below "From A to B", the text about merging on the command line was inside the accept widget as well.

Because I think it's better than the current look

@DouweM I dont agree. both looks bad.

But remember that before you moved it below "From A to B", the text about merging on the command line was inside the accept widget as well.

yes it was bad before, bad now and you propose to make it differently bad in future 😃

I think checkout button makes sense. But this MR - not. Propose better implementation.

mentioned in merge request !1116 (merged)

yes it was bad before, bad now and you propose to make it differently bad in future 😃

I think it's a different level of bad, but I can accept that you disagree :) I'll close this MR for now and will think of a better way to solve it.

Status changed to closed

mentioned in merge request !1116 (merged)

mentioned in merge request !1116 (merged)

mentioned in merge request !1116 (merged)

Status changed to reopened

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

@dzaporozhets Would it be an option to move the sentence back below "Accept Merge Request", so it is only shown for people with the ability to merge, and other users will use the "Check out branch" button?

@DouweM inside the widget or below it?

Because I like the clean look of merge widget now:

Like this?

hm looks nice. It adds separation between merge widget and tabs. Both are heavy elements so it feels good.

If you do go with that, the text should be corrected to "If you want to try to merge this..."

That said, are we set on the wording? Read a certain way, it's almost condescending, like "If you think you can handle working on the command line...". Maybe "You can also accept this merge request manually using the [command line]."?

@rspeicher makes sense to change wording since we would have checkout button

👍 for the "merge manually" wording and the location behind the widget! I'd implement it myself, but I'm not working this week; any of you up to do it? :)

@DouweM I will do.

mentioned in commit cb6ad67f

mentioned in merge request !1141 (merged)

Close in favor of !1141 (merged)

Status changed to closed

mentioned in commit 6a82c9f0