diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-12-04 20:58:45 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-12-04 20:58:45 +0000 |
| commit | d2f9a9012d55a7dc9c8e9e61b946c52836a1d8f1 (patch) | |
| tree | 2d9a005407b7556a8383b08d841feef49653d63b /app/helpers/issues_helper.rb | |
| parent | 3c8051776b25add2e2845344a328328db33d1671 (diff) | |
| parent | f9d954fae71d40a314a5812c1a7eec5a601d1575 (diff) | |
| download | gitlab-ce-d2f9a9012d55a7dc9c8e9e61b946c52836a1d8f1.tar.gz | |
Merge branch 'link-refs' into 'master'
Recognize issue/MR/snippet/commit links as references.
Fixes #3744 and #3745
See merge request !1933
Diffstat (limited to 'app/helpers/issues_helper.rb')
| -rw-r--r-- | app/helpers/issues_helper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 931d52055f8..e66b9c628c7 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -87,7 +87,11 @@ module IssuesHelper end def merge_requests_sentence(merge_requests) - merge_requests.map(&:to_reference).to_sentence(last_word_connector: ', or ') + # Sorting based on the `!123` or `group/project!123` reference will sort + # local merge requests first. + merge_requests.map do |merge_request| + merge_request.to_reference(@project) + end.sort.to_sentence(last_word_connector: ', or ') end def url_to_emoji(name) |