summaryrefslogtreecommitdiff
path: root/app/models/repository.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/repository.rb')
-rw-r--r--app/models/repository.rb16
1 files changed, 10 insertions, 6 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 84ca8f0c12a..b2efc9b480b 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -288,6 +288,10 @@ class Repository
false
end
+ def search_branch_names(pattern)
+ redis_set_cache.search('branch_names', pattern) { branch_names }
+ end
+
def languages
return [] if empty?
@@ -829,12 +833,6 @@ class Repository
end
end
- def merge_to_ref(user, source_sha, merge_request, target_ref, message, first_parent_ref, allow_conflicts = false)
- branch = merge_request.target_branch
-
- raw.merge_to_ref(user, source_sha, branch, target_ref, message, first_parent_ref, allow_conflicts)
- end
-
def delete_refs(*ref_names)
raw.delete_refs(*ref_names)
end
@@ -995,6 +993,12 @@ class Repository
raw_repository.search_files_by_name(query, ref)
end
+ def search_files_by_wildcard_path(path, ref = 'HEAD')
+ # We need to use RE2 to match Gitaly's regexp engine
+ regexp_string = RE2::Regexp.escape(path).gsub('\*', '.*?')
+ raw_repository.search_files_by_regexp("^#{regexp_string}$", ref)
+ end
+
def copy_gitattributes(ref)
actual_ref = ref || root_ref
begin