summaryrefslogtreecommitdiff
path: root/app/models/repository.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-17 09:09:43 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-17 09:09:43 +0000
commitfe29f106cd41b3c57b0266f3de6470cffee587ea (patch)
treef8d9cbc771b4a642c2fe59929dd6cc07a922cadd /app/models/repository.rb
parent6110935892876a26d8dfcb919d8c955c92ecc1e5 (diff)
downloadgitlab-ce-fe29f106cd41b3c57b0266f3de6470cffee587ea.tar.gz
Add latest changes from gitlab-org/gitlab@master
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 6d167700ff4..48e96d4c193 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -713,8 +713,8 @@ class Repository
"#{name}-#{highest_branch_id + 1}"
end
- def branches_sorted_by(value)
- raw_repository.local_branches(sort_by: value)
+ def branches_sorted_by(sort_by, pagination_params = nil)
+ raw_repository.local_branches(sort_by: sort_by, pagination_params: pagination_params)
end
def tags_sorted_by(value)