diff options
author | James Lopez <james@jameslopez.es> | 2016-12-21 17:41:33 +0100 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2017-01-03 13:01:46 +0100 |
commit | 112f47057275312daa876bee5bd74d5464410bc5 (patch) | |
tree | 257495d658a39b8e31c3407498ec248cb97976a6 /app/models/merge_request.rb | |
parent | de25604fbca2f7005754d821d571bbcb1cc510ac (diff) | |
download | gitlab-ce-112f47057275312daa876bee5bd74d5464410bc5.tar.gz |
Fix cross-project references copy to include the project referencefix/cross-project-ref-path
Also added relevant specs and refactored to_references in a bunch of places to be more consistent.
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 61845bf4036..926944bc3b3 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -175,10 +175,10 @@ class MergeRequest < ActiveRecord::Base work_in_progress?(title) ? title : "WIP: #{title}" end - def to_reference(from_project = nil) + def to_reference(from_project = nil, full: false) reference = "#{self.class.reference_prefix}#{iid}" - "#{project.to_reference(from_project)}#{reference}" + "#{project.to_reference(from_project, full: full)}#{reference}" end def first_commit |