diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-07 17:12:29 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-07 17:12:29 +0100 |
commit | 5a9a8d03a798c8dfe154e5db4ddf6bcb7a14fa2c (patch) | |
tree | de42e220cf35f130e2d2d3d6b2290e639d959d6d /app/models/merge_request.rb | |
parent | cbcb8dbe702c0b1532327aeb2dc53caffb6e8ed9 (diff) | |
parent | bd5fb1b479f29df3c2150b6c375c1b7bffd28931 (diff) | |
download | gitlab-ce-5a9a8d03a798c8dfe154e5db4ddf6bcb7a14fa2c.tar.gz |
Merge branch 'master' into ui/dashboard-new-issue
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r-- | app/models/merge_request.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 1b3d6079d2c..080b7f7fb88 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}" @@ -291,7 +295,7 @@ class MergeRequest < ActiveRecord::Base work_in_progress: work_in_progress? } - unless last_commit.nil? + if last_commit attrs.merge!(last_commit: last_commit.hook_attrs) end @@ -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 |