diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-11-30 21:09:36 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-11-30 21:09:36 +0100 |
| commit | 8f43298d967d715628b9b17d357cb9169a3606bf (patch) | |
| tree | 9f2f859813f175eb25a87985643404322cb3aac7 /app/helpers/merge_requests_helper.rb | |
| parent | a8e05cec000f3d2b17b966115c9d7b69629498db (diff) | |
| download | gitlab-ce-8f43298d967d715628b9b17d357cb9169a3606bf.tar.gz | |
Show local issues and MRs in "This X closes... / closed by..." sentence
Diffstat (limited to 'app/helpers/merge_requests_helper.rb')
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index b804d4f4e3b..a6010721dff 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -39,7 +39,11 @@ module MergeRequestsHelper end def issues_sentence(issues) - issues.map(&:to_reference).to_sentence + # Sorting based on the `#123` or `group/project#123` reference will sort + # local issues first. + issues.map do |issue| + issue.to_reference(@project) + end.sort.to_sentence end def mr_change_branches_path(merge_request) |