Skip to content
Snippets Groups Projects
Unverified Commit 35a39c1d authored by Mario de la Ossa's avatar Mario de la Ossa
Browse files

Do not rewrite relative links for system notes

parent ba952d53
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -457,7 +457,7 @@ class Note < ApplicationRecord
end
 
def banzai_render_context(field)
super.merge(noteable: noteable)
super.merge(noteable: noteable, system_note: system?)
end
 
def retrieve_upload(_identifier, paths)
Loading
Loading
---
title: Fixed 'diff version changes' link not working
merge_request: 29825
author:
type: fixed
Loading
Loading
@@ -17,6 +17,8 @@ module Banzai
include Gitlab::Utils::StrongMemoize
 
def call
return doc if context[:system_note]
@uri_types = {}
clear_memoization(:linkable_files)
 
Loading
Loading
Loading
Loading
@@ -101,6 +101,13 @@ describe Banzai::Filter::RelativeLinkFilter do
.to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
end
 
it 'does not modify relative URLs in system notes' do
path = "#{project_path}/merge_requests/1/diffs"
doc = filter(link(path), system_note: true)
expect(doc.at_css('a')['href']).to eq path
end
it 'ignores absolute URLs with two leading slashes' do
doc = filter(link('//doc/api/README.md'))
expect(doc.at_css('a')['href']).to eq '//doc/api/README.md'
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment