Commit c5acf26e authored by Thong Kuah's avatar Thong Kuah

Fix frozen string errors

parent 8c42a0ea
...@@ -97,7 +97,7 @@ module Gitlab ...@@ -97,7 +97,7 @@ module Gitlab
attr_reader :load_times_by_model, :private_token attr_reader :load_times_by_model, :private_token
def debug(message, *) 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\)/) _, type, time = *message.match(/(\w+) Load \(([0-9.]+)ms\)/)
......
...@@ -109,7 +109,7 @@ describe Gitlab::Search::FoundBlob do ...@@ -109,7 +109,7 @@ describe Gitlab::Search::FoundBlob do
end end
context 'with ISO-8859-1' do 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 it 'returns results as UTF-8' do
expect(subject.filename).to eq('encoding/iso8859.txt') expect(subject.filename).to eq('encoding/iso8859.txt')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment