Skip to content

Improve text of MR merge widget and manual merge modal

Douwe Maan requested to merge mr-widget-text into master

Modal with manual merge instructions:

Screen_Shot_2015-08-08_at_21.30.23

Archived:

archived

WIP:

wip

Missing target branch:

missing_branch

Missing source branch:

missing_branch_source

Nothing to merge:

nothing

Checking ability to merge:

check

Conflicts when allowed to merge:

conflicts

Conflicts when not allowed to merge:

conflicts_not_allowed

Mergeable when allowed to merge:

accept

Mergeable when not allowed to merge:

not_allowed

Merge in progress:

locked

Merge failed:

failed_2

Merged:

merged

Closed:

closed

cc @dzaporozhets @rspeicher

Merge request reports