mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-11 13:46:11 +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
28 lines
1.2 KiB
Plaintext
28 lines
1.2 KiB
Plaintext
.mr-state-widget
|
|
= render 'projects/merge_requests/widget/heading'
|
|
.mr-widget-body
|
|
- if @project.archived?
|
|
= render 'projects/merge_requests/widget/open/archived'
|
|
- elsif @merge_request.commits.blank?
|
|
= render 'projects/merge_requests/widget/open/nothing'
|
|
- elsif @merge_request.branch_missing?
|
|
= render 'projects/merge_requests/widget/open/missing_branch'
|
|
- elsif @merge_request.unchecked?
|
|
= render 'projects/merge_requests/widget/open/check'
|
|
- elsif @merge_request.cannot_be_merged?
|
|
= render 'projects/merge_requests/widget/open/conflicts'
|
|
- elsif @merge_request.work_in_progress?
|
|
= render 'projects/merge_requests/widget/open/wip'
|
|
- elsif !@merge_request.can_be_merged_by?(current_user)
|
|
= render 'projects/merge_requests/widget/open/not_allowed'
|
|
- elsif @merge_request.can_be_merged?
|
|
= render 'projects/merge_requests/widget/open/accept'
|
|
|
|
- if @closes_issues.present?
|
|
.mr-widget-footer
|
|
%span
|
|
%i.fa.fa-check
|
|
Accepting this merge request will close #{"issue".pluralize(@closes_issues.size)}
|
|
= succeed '.' do
|
|
!= gfm(issues_sentence(@closes_issues))
|