mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-12 06:06:05 +10:00
Dmitriy Zaporozhets
91836272fe
Improve text of MR merge widget and manual merge modal Modal with manual merge instructions:  Archived:  WIP:  Missing target branch:  Missing source branch:  Nothing to merge:  Checking ability to merge:  Conflicts when allowed to merge:  Conflicts when not allowed to merge:  Mergeable when allowed to merge:  Mergeable when not allowed to merge:  Merge in progress:  Merge failed:  Merged:  Closed:  cc @dzaporozhets @rspeicher See merge request !1120
13 lines
438 B
Plaintext
13 lines
438 B
Plaintext
.mr-state-widget
|
|
= render 'projects/merge_requests/widget/heading'
|
|
.mr-widget-body
|
|
%h4
|
|
Closed
|
|
- if @merge_request.closed_event
|
|
by #{link_to_member(@project, @merge_request.closed_event.author, avatar: true)}
|
|
#{time_ago_with_tooltip(@merge_request.closed_event.created_at)}
|
|
%p
|
|
= succeed '.' do
|
|
The changes were not merged into
|
|
%span.label-branch= @merge_request.target_branch
|