diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 12:09:08 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 12:09:08 +0000 |
| commit | 7cc6872401eb487ed20dbb9d455f8bb9c97d9e39 (patch) | |
| tree | 63f6ed5d4e6c5cec31c43363626d9f5b178eddf8 /lib/banzai | |
| parent | 46b10c0fc884400941c17e2777b242ac54d111e5 (diff) | |
| download | gitlab-ce-7cc6872401eb487ed20dbb9d455f8bb9c97d9e39.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/banzai')
| -rw-r--r-- | lib/banzai/filter/milestone_reference_filter.rb | 2 | ||||
| -rw-r--r-- | lib/banzai/filter/project_reference_filter.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/banzai/filter/milestone_reference_filter.rb b/lib/banzai/filter/milestone_reference_filter.rb index 4c47ee4dba1..126208db935 100644 --- a/lib/banzai/filter/milestone_reference_filter.rb +++ b/lib/banzai/filter/milestone_reference_filter.rb @@ -121,7 +121,7 @@ module Banzai def object_link_text(object, matches) milestone_link = escape_once(super) - reference = object.project&.to_reference(project) + reference = object.project&.to_reference_base(project) if reference.present? "#{milestone_link} <i>in #{reference}</i>".html_safe diff --git a/lib/banzai/filter/project_reference_filter.rb b/lib/banzai/filter/project_reference_filter.rb index 83cf45097ed..292d4b1d56c 100644 --- a/lib/banzai/filter/project_reference_filter.rb +++ b/lib/banzai/filter/project_reference_filter.rb @@ -104,7 +104,7 @@ module Banzai def link_to_project(project, link_content: nil) url = urls.project_url(project, only_path: context[:only_path]) data = data_attribute(project: project.id) - content = link_content || project.to_reference_with_postfix + content = link_content || project.to_reference link_tag(url, data, content, project.name) end |