diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-23 14:04:42 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-23 14:04:42 +0000 |
| commit | 038f5a412d0085f2d9610c77cea37cec75572b27 (patch) | |
| tree | 5a3ba500992d5c9409cf52fa8c15e9d9a9b39549 /app/models/commit_range.rb | |
| parent | b8db9c8c8c406d4abc03ba7246bbfecbecfbc784 (diff) | |
| parent | e826c5d0917a7fe2225fb6ba0862bc56c1ef3fc2 (diff) | |
| download | gitlab-ce-038f5a412d0085f2d9610c77cea37cec75572b27.tar.gz | |
Merge branch 'jk-group-mentions-fix' into 'master'
Fix link text from group context
Closes gitlab-ee#4100
See merge request gitlab-org/gitlab-ce!15565
Diffstat (limited to 'app/models/commit_range.rb')
| -rw-r--r-- | app/models/commit_range.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/commit_range.rb b/app/models/commit_range.rb index 84e2e8a5dd5..b93c111dabc 100644 --- a/app/models/commit_range.rb +++ b/app/models/commit_range.rb @@ -89,8 +89,8 @@ class CommitRange alias_method :id, :to_s - def to_reference(from_project = nil, full: false) - project_reference = project.to_reference(from_project, full: full) + def to_reference(from = nil, full: false) + project_reference = project.to_reference(from, full: full) if project_reference.present? project_reference + self.class.reference_prefix + self.id @@ -99,8 +99,8 @@ class CommitRange end end - def reference_link_text(from_project = nil) - project_reference = project.to_reference(from_project) + def reference_link_text(from = nil) + project_reference = project.to_reference(from) reference = ref_from + notation + ref_to if project_reference.present? |