Fix a frozen string error in lib/gitlab/utils.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
parent
80eebd8e33
commit
f233c3bce0
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix a frozen string error in lib/gitlab/utils.rb
|
||||
merge_request: 23690
|
||||
author:
|
||||
type: fixed
|
|
@ -60,7 +60,7 @@ module Gitlab
|
|||
|
||||
# Converts newlines into HTML line break elements
|
||||
def nlbr(str)
|
||||
ActionView::Base.full_sanitizer.sanitize(str, tags: []).gsub(/\r?\n/, '<br>').html_safe
|
||||
ActionView::Base.full_sanitizer.sanitize(+str, tags: []).gsub(/\r?\n/, '<br>').html_safe
|
||||
end
|
||||
|
||||
def remove_line_breaks(str)
|
||||
|
|
|
@ -44,6 +44,12 @@ describe Gitlab::Utils do
|
|||
end
|
||||
end
|
||||
|
||||
describe '.nlbr' do
|
||||
it 'replaces new lines with <br>' do
|
||||
expect(described_class.nlbr("<b>hello</b>\n<i>world</i>".freeze)).to eq("hello<br>world")
|
||||
end
|
||||
end
|
||||
|
||||
describe '.remove_line_breaks' do
|
||||
using RSpec::Parameterized::TableSyntax
|
||||
|
||||
|
|
Loading…
Reference in New Issue