diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-12-10 19:47:15 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-12-10 19:47:15 +0300 |
| commit | e1064f16a8230396f16b175108ac54cdfefe212f (patch) | |
| tree | 567b4c465bd898e4e129f761fbce06d645c0fc04 /lib | |
| parent | eadd53b969da2704d7551069eda0b416ffb7b0e2 (diff) | |
| parent | f233c3bce08acc99d98d79f6b357e437aad3146e (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
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) |