Commit fedba9fc authored by Gabriel Gizotti's avatar Gabriel Gizotti

add mentioned but not closed message to the same line as closes issueswq

parent 9e321043
...@@ -30,19 +30,20 @@ ...@@ -30,19 +30,20 @@
- elsif @merge_request.can_be_merged? || resolved_conflicts - elsif @merge_request.can_be_merged? || resolved_conflicts
= render 'projects/merge_requests/widget/open/accept' = render 'projects/merge_requests/widget/open/accept'
- if mr_issues_mentioned_but_not_closing.present? - if mr_closes_issues.present? || mr_issues_mentioned_but_not_closing
.mr-widget-footer
%span
%i.fa.fa-info-circle
#{"Issue".pluralize(mr_issues_mentioned_but_not_closing.size)} mentioned but not being closed:
= succeed '.' do
!= markdown issues_sentence(mr_issues_mentioned_but_not_closing), pipeline: :gfm, author: @merge_request.author
- if mr_closes_issues.present?
.mr-widget-footer .mr-widget-footer
%span %span
= icon('check') = icon('check')
Accepting this merge request will close #{"issue".pluralize(mr_closes_issues.size)} - if mr_closes_issues.present?
= succeed '.' do Accepting this merge request will close #{"issue".pluralize(mr_closes_issues.size)}
!= markdown issues_sentence(mr_closes_issues), pipeline: :gfm, author: @merge_request.author = succeed '.' do
= mr_assign_issues_link != markdown issues_sentence(mr_closes_issues), pipeline: :gfm, author: @merge_request.author
= mr_assign_issues_link
- if mr_issues_mentioned_but_not_closing.present?
#{"Issue".pluralize(mr_issues_mentioned_but_not_closing.size)}
= succeed '' do
!= markdown issues_sentence(mr_issues_mentioned_but_not_closing), pipeline: :gfm, author: @merge_request.author
= succeed '' do
mentioned but not closed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment