summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-07 14:48:53 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-07 14:48:53 +0100
commitd611a3879816d07f5842e2bdcea69b0813777107 (patch)
tree5f0df5c5d68731198b74b2df3d27070ef632d79c /app/models/merge_request.rb
parent0dcff1342b38c093a05c9edd13d422ee0b37b7bd (diff)
parente88fd58671f5407d80fafe1070d48b750b9f2e50 (diff)
downloadgitlab-ce-d611a3879816d07f5842e2bdcea69b0813777107.tar.gz
Merge branch 'master' into reference-pipeline-and-caching
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 1b3d6079d2c..2a4aee7e5d9 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -151,6 +151,10 @@ class MergeRequest < ActiveRecord::Base
}x
end
+ def self.link_reference_pattern
+ super("merge_requests", /(?<merge_request>\d+)/)
+ end
+
def to_reference(from_project = nil)
reference = "#{self.class.reference_prefix}#{iid}"
@@ -316,7 +320,7 @@ class MergeRequest < ActiveRecord::Base
issues = commits.flat_map { |c| c.closes_issues(current_user) }
issues.push(*Gitlab::ClosingIssueExtractor.new(project, current_user).
closed_by_message(description))
- issues.uniq.sort_by(&:id)
+ issues.uniq
else
[]
end