summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswluizf@gmail.com>2016-11-02 21:49:13 -0200
committerOswaldo Ferreira <oswluizf@gmail.com>2016-12-02 19:18:17 -0200
commitf272ee6eba37548cbd8919139d583a71ffdac8dc (patch)
tree78d1e9a5e7bcf4935e8efbe4e5e6e4b976dfc9e8 /app/models/merge_request.rb
parent3ebb815a38ba86e4133557f77b94c292c8fc2e7e (diff)
downloadgitlab-ce-f272ee6eba37548cbd8919139d583a71ffdac8dc.tar.gz
Add shorthand support to gitlab markdown references
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index bfb016df46d..4de4a83a041 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -176,11 +176,7 @@ class MergeRequest < ActiveRecord::Base
def to_reference(from_project = nil)
reference = "#{self.class.reference_prefix}#{iid}"
- if cross_project_reference?(from_project)
- reference = project.to_reference + reference
- end
-
- reference
+ "#{project.to_reference(from_project)}#{reference}"
end
def first_commit