diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-23 14:04:42 +0000 |
|---|---|---|
| committer | Tiago <tiagonbotelho@hotmail.com> | 2017-11-28 12:26:39 +0000 |
| commit | 83fa6cb897738accece5dc6c4558fa1f3b07e914 (patch) | |
| tree | 839e493b8d34d787ae638d2e43ce9fa570cec391 /lib | |
| parent | da70bc43bff32a928485ba1202b76387f8e22b90 (diff) | |
| download | gitlab-ce-83fa6cb897738accece5dc6c4558fa1f3b07e914.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
(cherry picked from commit 038f5a412d0085f2d9610c77cea37cec75572b27)
e826c5d0 Fix link text from group context
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/banzai/filter/abstract_reference_filter.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/banzai/filter/abstract_reference_filter.rb b/lib/banzai/filter/abstract_reference_filter.rb index 9fef386de16..8975395aff1 100644 --- a/lib/banzai/filter/abstract_reference_filter.rb +++ b/lib/banzai/filter/abstract_reference_filter.rb @@ -213,7 +213,8 @@ module Banzai end def object_link_text(object, matches) - text = object.reference_link_text(context[:project]) + parent = context[:project] || context[:group] + text = object.reference_link_text(parent) extras = object_link_text_extras(object, matches) text += " (#{extras.join(", ")})" if extras.any? |