Commit 55d4e2647d10a237705a1e2a65e24f33f654c75b
Exists in
spb-stable
and in
2 other branches
Merge branch 'ce_issues_sentence' into 'master'
Issues sentence helper This will make merging CE into EE later easier.
Showing
3 changed files
with
17 additions
and
1 deletions
Show diff stats
app/helpers/merge_requests_helper.rb
| @@ -42,4 +42,8 @@ module MergeRequestsHelper | @@ -42,4 +42,8 @@ module MergeRequestsHelper | ||
| 42 | "Branches: #{@merge_request.source_branch} #{separator} #{@merge_request.target_branch}" | 42 | "Branches: #{@merge_request.source_branch} #{separator} #{@merge_request.target_branch}" |
| 43 | end | 43 | end |
| 44 | end | 44 | end |
| 45 | + | ||
| 46 | + def issues_sentence(issues) | ||
| 47 | + issues.map { |i| "##{i.iid}" }.to_sentence | ||
| 48 | + end | ||
| 45 | end | 49 | end |
app/views/projects/merge_requests/show/_state_widget.html.haml
| @@ -37,5 +37,5 @@ | @@ -37,5 +37,5 @@ | ||
| 37 | %i.icon-ok | 37 | %i.icon-ok |
| 38 | Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'} | 38 | Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'} |
| 39 | = succeed '.' do | 39 | = succeed '.' do |
| 40 | - != gfm(@closes_issues.map { |i| "##{i.iid}" }.to_sentence) | 40 | + != gfm(issues_sentence(@closes_issues)) |
| 41 | 41 |
| @@ -0,0 +1,12 @@ | @@ -0,0 +1,12 @@ | ||
| 1 | +require 'spec_helper' | ||
| 2 | + | ||
| 3 | +describe MergeRequestsHelper do | ||
| 4 | + describe :issues_sentence do | ||
| 5 | + subject { issues_sentence(issues) } | ||
| 6 | + let(:issues) do | ||
| 7 | + [build(:issue, iid: 1), build(:issue, iid: 2), build(:issue, iid: 3)] | ||
| 8 | + end | ||
| 9 | + | ||
| 10 | + it { should eq('#1, #2, and #3') } | ||
| 11 | + end | ||
| 12 | +end |