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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
b1cf3225
Commit
b1cf3225
authored
Jan 16, 2018
by
Andrew McCallum
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move Regexp.escape(), fix formatting on tests.
parent
a539e03d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/models/repository.rb
app/models/repository.rb
+2
-2
spec/models/repository_spec.rb
spec/models/repository_spec.rb
+2
-2
No files found.
app/models/repository.rb
View file @
b1cf3225
...
@@ -938,11 +938,11 @@ class Repository
...
@@ -938,11 +938,11 @@ class Repository
end
end
def
search_files_by_name
(
query
,
ref
)
def
search_files_by_name
(
query
,
ref
)
safe_query
=
query
.
sub
(
/^\/*/
,
""
)
safe_query
=
Regexp
.
escape
(
query
.
sub
(
/^\/*/
,
""
)
)
return
[]
if
empty?
||
safe_query
.
blank?
return
[]
if
empty?
||
safe_query
.
blank?
args
=
%W(ls-tree --full-tree -r
#{
ref
||
root_ref
}
--name-status |
#{
Regexp
.
escape
(
safe_query
)
}
)
args
=
%W(ls-tree --full-tree -r
#{
ref
||
root_ref
}
--name-status |
#{
safe_query
}
)
run_git
(
args
).
first
.
lines
.
map
(
&
:strip
)
run_git
(
args
).
first
.
lines
.
map
(
&
:strip
)
end
end
...
...
spec/models/repository_spec.rb
View file @
b1cf3225
...
@@ -675,9 +675,9 @@ describe Repository do
...
@@ -675,9 +675,9 @@ describe Repository do
end
end
it
'properly handles when query is only slashes'
do
it
'properly handles when query is only slashes'
do
results
=
repository
.
search_files_by_name
(
'//'
,
'master'
)
results
=
repository
.
search_files_by_name
(
'//'
,
'master'
)
expect
(
results
).
to
match_array
([])
expect
(
results
).
to
match_array
([])
end
end
it
'properly handles when query is not present'
do
it
'properly handles when query is not present'
do
...
...
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