diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-10-13 09:41:46 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-10-16 09:59:32 +0200 |
| commit | 94a788f66dfcc13ad02855b05c38826f958038af (patch) | |
| tree | e99ed267a2e646607f05a7632feefd3a776b5d0b /app/helpers | |
| parent | 9f9f0c35ecd9f7a5a057030253791d051f832f6d (diff) | |
| download | gitlab-ce-94a788f66dfcc13ad02855b05c38826f958038af.tar.gz | |
Only accept open issues and merge requests
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/issues_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 1adbf3a79b1..fda18e7b316 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -84,7 +84,7 @@ module IssuesHelper end def merge_requests_sentence(merge_requests) - merge_requests.map(&:to_reference).to_sentence + merge_requests.map(&:to_reference).to_sentence(last_word_connector: ', or ') end # Required for Gitlab::Markdown::IssueReferenceFilter |