diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-16 00:15:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-16 00:15:19 +0000 |
| commit | b57f24ba167742f7665a02cd7113d700197ac4a7 (patch) | |
| tree | 81f737ccf94a661affe5dc277be1ed08d1c2c91c /lib/api/branches.rb | |
| parent | 1760f824bb6bcac278e95493805dff70a5b2a75b (diff) | |
| download | gitlab-ce-b57f24ba167742f7665a02cd7113d700197ac4a7.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/branches.rb')
| -rw-r--r-- | lib/api/branches.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/api/branches.rb b/lib/api/branches.rb index 600973ac120..a2c9020ac84 100644 --- a/lib/api/branches.rb +++ b/lib/api/branches.rb @@ -42,9 +42,7 @@ module API optional :page_token, type: String, desc: 'Name of branch to start the paginaition from' end get ':id/repository/branches', urgency: :low do - ff_enabled = Feature.enabled?(:api_caching_rate_limit_branches, user_project, default_enabled: :yaml) - - cache_action_if(ff_enabled, [user_project, :branches, current_user, declared_params], expires_in: 30.seconds) do + cache_action([user_project, :branches, current_user, declared_params], expires_in: 30.seconds) do user_project.preload_protected_branches repository = user_project.repository |