diff options
author | Sean McGivern <sean@gitlab.com> | 2019-06-21 10:51:58 +0300 |
---|---|---|
committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-06-25 19:24:05 +0300 |
commit | 2d545957031ac51d6994014850b72edc05779d1c (patch) | |
tree | 04b5b837155bb53de9603d3bfa85d1d37249b54a /lib | |
parent | 5a5db0508a4dad5f0ddda6f3565152e00faebc47 (diff) |
Merge branch 'bug/63162-duplicate_path_in_links' into 'master'
Do not rewrite relative links for system notes
Closes #63162
See merge request gitlab-org/gitlab-ce!29825
(cherry picked from commit 51df2ca5c5a1b18155b7bba9bdc26c165533428b)
35a39c1d Do not rewrite relative links for system notes
Diffstat (limited to 'lib')
-rw-r--r-- | lib/banzai/filter/relative_link_filter.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/banzai/filter/relative_link_filter.rb b/lib/banzai/filter/relative_link_filter.rb index 199b3533cf4..80c84c0f622 100644 --- a/lib/banzai/filter/relative_link_filter.rb +++ b/lib/banzai/filter/relative_link_filter.rb @@ -17,6 +17,8 @@ module Banzai include Gitlab::Utils::StrongMemoize def call + return doc if context[:system_note] + @uri_types = {} clear_memoization(:linkable_files) |