Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c5acf26e
Commit
c5acf26e
authored
Aug 23, 2019
by
Thong Kuah
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix frozen string errors
parent
8c42a0ea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
lib/gitlab/profiler.rb
lib/gitlab/profiler.rb
+1
-1
spec/lib/gitlab/search/found_blob_spec.rb
spec/lib/gitlab/search/found_blob_spec.rb
+1
-1
No files found.
lib/gitlab/profiler.rb
View file @
c5acf26e
...
...
@@ -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\)/
)
...
...
spec/lib/gitlab/search/found_blob_spec.rb
View file @
c5acf26e
...
...
@@ -109,7 +109,7 @@ describe Gitlab::Search::FoundBlob do
end
context
'with ISO-8859-1'
do
let
(
:search_result
)
{
"master:encoding/iso8859.txt
\x00
1
\x00\xC4\xFC\n
master:encoding/iso8859.txt
\x00
2
\x00\n
master:encoding/iso8859.txt
\x00
3
\x00
foo
\n
"
.
force_encoding
(
Encoding
::
ASCII_8BIT
)
}
let
(
:search_result
)
{
(
+
"master:encoding/iso8859.txt
\x00
1
\x00\xC4\xFC\n
master:encoding/iso8859.txt
\x00
2
\x00\n
master:encoding/iso8859.txt
\x00
3
\x00
foo
\n
"
)
.
force_encoding
(
Encoding
::
ASCII_8BIT
)
}
it
'returns results as UTF-8'
do
expect
(
subject
.
filename
).
to
eq
(
'encoding/iso8859.txt'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment