Commit c1515cd8 authored by Gabriel Gizotti's avatar Gabriel Gizotti

better mentioned but not closing message and icon

parent 80915c35
...@@ -63,13 +63,6 @@ module MergeRequestsHelper ...@@ -63,13 +63,6 @@ module MergeRequestsHelper
@mr_issues_mentioned_but_not_closing ||= @merge_request.issues_mentioned_but_not_closing @mr_issues_mentioned_but_not_closing ||= @merge_request.issues_mentioned_but_not_closing
end end
def mr_issues_mentioned_but_not_closing_message
verb = mr_issues_mentioned_but_not_closing.size > 1 ? 'are' : 'is'
issue_text = 'issue'.pluralize(mr_issues_mentioned_but_not_closing.size)
"The following #{issue_text} #{verb} mentioned but not being closed:"
end
def mr_change_branches_path(merge_request) def mr_change_branches_path(merge_request)
new_namespace_project_merge_request_path( new_namespace_project_merge_request_path(
@project.namespace, @project, @project.namespace, @project,
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
- if mr_issues_mentioned_but_not_closing.present? - if mr_issues_mentioned_but_not_closing.present?
.mr-widget-footer .mr-widget-footer
%span %span
%i.fa.fa-warning %i.fa.fa-info-circle
= mr_issues_mentioned_but_not_closing_message #{"Issue".pluralize(mr_issues_mentioned_but_not_closing.size)} mentioned but not being closed:
= succeed '.' do = succeed '.' do
!= markdown issues_sentence(mr_issues_mentioned_but_not_closing), pipeline: :gfm, author: @merge_request.author != markdown issues_sentence(mr_issues_mentioned_but_not_closing), pipeline: :gfm, author: @merge_request.author
= mr_assign_issues_link = mr_assign_issues_link
......
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