summaryrefslogtreecommitdiff
path: root/lib/api/branches.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-12 09:06:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-12 09:06:14 +0000
commit7801d133b6c33917a3a151c7a8db5243b148a487 (patch)
tree7a8fbb7dd66875acd0adb490dc91aa91c0802987 /lib/api/branches.rb
parent60877d1bff65fa4d2b74409d343d5b7615478891 (diff)
downloadgitlab-ce-7801d133b6c33917a3a151c7a8db5243b148a487.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/branches.rb')
-rw-r--r--lib/api/branches.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/branches.rb b/lib/api/branches.rb
index f8f79ab6f5a..054242dca4c 100644
--- a/lib/api/branches.rb
+++ b/lib/api/branches.rb
@@ -32,7 +32,7 @@ module API
use :filter_params
end
get ':id/repository/branches' do
- Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42329')
+ user_project.preload_protected_branches
repository = user_project.repository