diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-08-23 00:17:11 +1200 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-08-23 00:17:11 +1200 |
| commit | c5acf26e0609ec0c5e16b2fb232d7058e6c066cd (patch) | |
| tree | e0795905f4f750f6314ae3e8c64207c1f704ce73 | |
| parent | 8c42a0eac09cb349789c963d38ee4e3ff5ecc0a8 (diff) | |
| download | gitlab-ce-c5acf26e0609ec0c5e16b2fb232d7058e6c066cd.tar.gz | |
Fix frozen string errors
| -rw-r--r-- | lib/gitlab/profiler.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/search/found_blob_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/profiler.rb b/lib/gitlab/profiler.rb index ec7671f9a8b..425c30d67fe 100644 --- a/lib/gitlab/profiler.rb +++ b/lib/gitlab/profiler.rb @@ -97,7 +97,7 @@ module Gitlab attr_reader :load_times_by_model, :private_token def debug(message, *) - message.gsub!(private_token, FILTERED_STRING) if private_token + message = message.gsub(private_token, FILTERED_STRING) if private_token _, type, time = *message.match(/(\w+) Load \(([0-9.]+)ms\)/) diff --git a/spec/lib/gitlab/search/found_blob_spec.rb b/spec/lib/gitlab/search/found_blob_spec.rb index 58784706c24..3496fb29836 100644 --- a/spec/lib/gitlab/search/found_blob_spec.rb +++ b/spec/lib/gitlab/search/found_blob_spec.rb @@ -109,7 +109,7 @@ describe Gitlab::Search::FoundBlob do end context 'with ISO-8859-1' do - let(:search_result) { "master:encoding/iso8859.txt\x001\x00\xC4\xFC\nmaster:encoding/iso8859.txt\x002\x00\nmaster:encoding/iso8859.txt\x003\x00foo\n".force_encoding(Encoding::ASCII_8BIT) } + let(:search_result) { (+"master:encoding/iso8859.txt\x001\x00\xC4\xFC\nmaster:encoding/iso8859.txt\x002\x00\nmaster:encoding/iso8859.txt\x003\x00foo\n").force_encoding(Encoding::ASCII_8BIT) } it 'returns results as UTF-8' do expect(subject.filename).to eq('encoding/iso8859.txt') |