diff options
| author | Gabriel Gizotti <gabriel@gizotti.com> | 2016-11-25 06:46:16 +1000 |
|---|---|---|
| committer | Gabriel Gizotti <gabriel@gizotti.com> | 2016-12-16 19:13:17 +1000 |
| commit | c1515cd865ec11110f9b34c41a41747dcbc3b402 (patch) | |
| tree | c7403a0de3279aedb3a258d9f7566905cc9bd312 | |
| parent | 80915c35f48463c3a983129961f3130bd9703754 (diff) | |
| download | gitlab-ce-c1515cd865ec11110f9b34c41a41747dcbc3b402.tar.gz | |
better mentioned but not closing message and icon
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 7 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/_open.html.haml | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index dcd35dc6282..20218775659 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -63,13 +63,6 @@ module MergeRequestsHelper @mr_issues_mentioned_but_not_closing ||= @merge_request.issues_mentioned_but_not_closing 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) new_namespace_project_merge_request_path( @project.namespace, @project, diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml index 1f794cad663..ebea48a4321 100644 --- a/app/views/projects/merge_requests/widget/_open.html.haml +++ b/app/views/projects/merge_requests/widget/_open.html.haml @@ -33,8 +33,8 @@ - if mr_issues_mentioned_but_not_closing.present? .mr-widget-footer %span - %i.fa.fa-warning - = mr_issues_mentioned_but_not_closing_message + %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 = mr_assign_issues_link |