diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 15:09:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 15:09:08 +0300 |
| commit | 7cc6872401eb487ed20dbb9d455f8bb9c97d9e39 (patch) | |
| tree | 63f6ed5d4e6c5cec31c43363626d9f5b178eddf8 /app/models/commit.rb | |
| parent | 46b10c0fc884400941c17e2777b242ac54d111e5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 460725b2016..31a890096e9 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -484,10 +484,10 @@ class Commit end def commit_reference(from, referable_commit_id, full: false) - reference = project.to_reference(from, full: full) + base = project.to_reference_base(from, full: full) - if reference.present? - "#{reference}#{self.class.reference_prefix}#{referable_commit_id}" + if base.present? + "#{base}#{self.class.reference_prefix}#{referable_commit_id}" else referable_commit_id end |