diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-16 21:08:53 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-16 21:08:53 +0000 |
| commit | cfaf1cca4403b826af2286b1ab0a69ad01c58738 (patch) | |
| tree | 89a4456977185bbe993ea091a3f5b13412bc811a /lib/gitlab/git | |
| parent | 57e39452d861ff01ccd4c09243c0bd2a0947ad07 (diff) | |
| download | gitlab-ce-cfaf1cca4403b826af2286b1ab0a69ad01c58738.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/git')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 840a70e3ae5..6bfe744a5cd 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -956,13 +956,13 @@ module Gitlab gitaly_ref_client.tag_names_contains_sha(sha) end - def search_files_by_content(query, ref) + def search_files_by_content(query, ref, options = {}) return [] if empty? || query.blank? safe_query = Regexp.escape(query) ref ||= root_ref - gitaly_repository_client.search_files_by_content(ref, safe_query) + gitaly_repository_client.search_files_by_content(ref, safe_query, options) end def can_be_merged?(source_sha, target_branch) |