diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-14 13:39:19 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-14 13:39:19 +0400 |
| commit | 55d4e2647d10a237705a1e2a65e24f33f654c75b (patch) | |
| tree | b12dfc279b303286635fd569a2f8599ab20e7851 /app | |
| parent | 87fd342a2317567f7854570dd5624dd64dffebd4 (diff) | |
| parent | d69853585415c1fa89a9e39e4f2e0853412b047b (diff) | |
Merge branch 'ce_issues_sentence' into 'master'
Issues sentence helper
This will make merging CE into EE later easier.
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_state_widget.html.haml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index f3c3d437710..cc63db2035e 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -42,4 +42,8 @@ module MergeRequestsHelper "Branches: #{@merge_request.source_branch} #{separator} #{@merge_request.target_branch}" end end + + def issues_sentence(issues) + issues.map { |i| "##{i.iid}" }.to_sentence + end end diff --git a/app/views/projects/merge_requests/show/_state_widget.html.haml b/app/views/projects/merge_requests/show/_state_widget.html.haml index bff5b36821d..c30310f1258 100644 --- a/app/views/projects/merge_requests/show/_state_widget.html.haml +++ b/app/views/projects/merge_requests/show/_state_widget.html.haml @@ -37,5 +37,5 @@ %i.icon-ok Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'} = succeed '.' do - != gfm(@closes_issues.map { |i| "##{i.iid}" }.to_sentence) + != gfm(issues_sentence(@closes_issues)) |