VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-07-25 16:03:48 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge branch '55116-runtimeerror-can-t-modify-frozen-string' into 'master'

Browse Source 
Fix a frozen string error in lib/gitlab/utils.rb

Closes #55116

See merge request gitlab-org/gitlab-ce!23690
This commit is contained in:
Douwe Maan
2018-12-10 16:47:15 +00:00
parent eadd53b969 f233c3bce0
commit e1064f16a8
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/55116-runtimeerror-can-t-modify-frozen-string.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix a frozen string error in lib/gitlab/utils.rb
merge_request: 23690
author:
type: fixed

2
lib/gitlab/utils.rb
View File

@ -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)

6
spec/lib/gitlab/utils_spec.rb
View File

@ -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