diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-12-10 19:47:15 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-12-11 22:49:52 +0300 |
| commit | e309bf894cbee4570a2e477daa64606990fff361 (patch) | |
| tree | ed46e59089c6df6b98543008c29027bbc6002a83 /lib | |
| parent | 7fba1cce1643627d6ecf627149afb565e8f8f40e (diff) | |
Merge branch '55116-runtimeerror-can-t-modify-frozen-string' into 'master'
Fix a frozen string error in lib/gitlab/utils.rb
Closes #55116
See merge request gitlab-org/gitlab-ce!23690
(cherry picked from commit e1064f16a8230396f16b175108ac54cdfefe212f)
f233c3bc Fix a frozen string error in lib/gitlab/utils.rb
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/utils.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/utils.rb b/lib/gitlab/utils.rb index 26fc56227a2..a81cee0d6d2 100644 --- a/lib/gitlab/utils.rb +++ b/lib/gitlab/utils.rb @@ -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) |