kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Move Regexp.escape(), fix formatting on tests.

This commit is contained in:
Andrew McCallum 2018-01-16 09:40:51 +00:00
parent a539e03d7e
commit b1cf3225db
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/repository.rb
View File

@ -938,11 +938,11 @@ class Repository
end
def search_files_by_name(query, ref)
safe_query = query.sub(/^\/*/, "")
safe_query = Regexp.escape(query.sub(/^\/*/, ""))
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)
end

4
spec/models/repository_spec.rb
View File

@ -675,9 +675,9 @@ describe Repository do
end
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
it 'properly handles when query is not present' do