summaryrefslogtreecommitdiff
path: root/app/models/repository.rb
diff options
context:
space:
mode:
authorAndrew McCallum <andrew.mccallum@semafone.com>2018-01-16 09:40:51 +0000
committerAndrew McCallum <andrew.mccallum@semafone.com>2018-01-16 09:40:51 +0000
commitb1cf3225dbb6b897a8be405d599714b74cbfb547 (patch)
tree97c02388bb402395eeaade84279a6bda6f3dafb4 /app/models/repository.rb
parenta539e03d7e4f12cfaa3ae7998dd111f498f4c8dc (diff)
downloadgitlab-ce-b1cf3225dbb6b897a8be405d599714b74cbfb547.tar.gz
Move Regexp.escape(), fix formatting on tests.
Diffstat (limited to 'app/models/repository.rb')
-rw-r--r--app/models/repository.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index c258cffb274..a67bb7294e6 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -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