summaryrefslogtreecommitdiff
path: root/lib/gitlab/wiki_file_finder.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-24 00:07:18 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-24 00:07:18 +0000
commitc77dd0995c19bd0d3a4203192f0710623e8f93be (patch)
tree90a7c773450f10031e2d53a8a126e84913224e6c /lib/gitlab/wiki_file_finder.rb
parent11faf8ae72dcdbaff31f97410a3a9319324438fd (diff)
downloadgitlab-ce-c77dd0995c19bd0d3a4203192f0710623e8f93be.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/wiki_file_finder.rb')
-rw-r--r--lib/gitlab/wiki_file_finder.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/wiki_file_finder.rb b/lib/gitlab/wiki_file_finder.rb
index e9be6db50da..a963cc7954f 100644
--- a/lib/gitlab/wiki_file_finder.rb
+++ b/lib/gitlab/wiki_file_finder.rb
@@ -12,12 +12,12 @@ module Gitlab
private
- def search_filenames(query)
+ def search_paths(query)
safe_query = Regexp.escape(query.tr(' ', '-'))
safe_query = Regexp.new(safe_query, Regexp::IGNORECASE)
- filenames = repository.ls_files(ref)
+ paths = repository.ls_files(ref)
- filenames.grep(safe_query)
+ paths.grep(safe_query)
end
end
end