Automatic merge of gitlab-org/gitlab-ce master

changelogs/unreleased/sh-fix-branches-api-timeout.yml

+---
+title: Fix timeout issues retrieving branches via API
+merge_request: 24034
+author:
+type: performance

lib/api/branches.rb

@@ -34,11 +34,11 @@ module API
         repository = user_project.repository
 
         branches = BranchesFinder.new(repository, declared_params(include_missing: false)).execute
-
+        branches = ::Kaminari.paginate_array(branches)
         merged_branch_names = repository.merged_branch_names(branches.map(&:name))
 
         present(
-          paginate(::Kaminari.paginate_array(branches)),
+          paginate(branches),
           with: Entities::Branch,
           current_user: current_user,
           project: user_project,

spec/requests/api/branches_spec.rb

@@ -20,6 +20,12 @@ describe API::Branches do
     let(:route) { "/projects/#{project_id}/repository/branches" }
 
     shared_examples_for 'repository branches' do
+      RSpec::Matchers.define :has_merged_branch_names_count do |expected|
+        match do |actual|
+          actual[:merged_branch_names].count == expected
+        end
+      end
+
       it 'returns the repository branches' do
         get api(route, current_user), params: { per_page: 100 }
 
@@ -30,6 +36,12 @@ describe API::Branches do
         expect(branch_names).to match_array(project.repository.branch_names)
       end
 
+      it 'determines only a limited number of merged branch names' do
+        expect(API::Entities::Branch).to receive(:represent).with(anything, has_merged_branch_names_count(2))
+
+        get api(route, current_user), params: { per_page: 2 }
+      end
+
       context 'when repository is disabled' do
         include_context 'disabled repository'
 

spec/support/helpers/kubernetes_helpers.rb

@@ -69,6 +69,11 @@ module KubernetesHelpers
       .to_return(status: [status, "Internal Server Error"])
   end
 
+  def stub_kubeclient_get_service_account(api_url, name, namespace: 'default')
+    WebMock.stub_request(:get, api_url + "/api/v1/namespaces/#{namespace}/serviceaccounts/#{name}")
+      .to_return(kube_response({}))
+  end
+
   def stub_kubeclient_get_service_account_error(api_url, name, namespace: 'default', status: 404)
     WebMock.stub_request(:get, api_url + "/api/v1/namespaces/#{namespace}/serviceaccounts/#{name}")
       .to_return(status: [status, "Internal Server Error"])
@@ -84,6 +89,11 @@ module KubernetesHelpers
       .to_return(status: [500, "Internal Server Error"])
   end
 
+  def stub_kubeclient_put_service_account(api_url, name, namespace: 'default')
+    WebMock.stub_request(:put, api_url + "/api/v1/namespaces/#{namespace}/serviceaccounts/#{name}")
+      .to_return(kube_response({}))
+  end
+
   def stub_kubeclient_create_secret(api_url, namespace: 'default')
     WebMock.stub_request(:post, api_url + "/api/v1/namespaces/#{namespace}/secrets")
       .to_return(kube_response({}))
@@ -104,6 +114,11 @@ module KubernetesHelpers
       .to_return(kube_response({}))
   end
 
+  def stub_kubeclient_get_role_binding(api_url, name, namespace: 'default')
+    WebMock.stub_request(:get, api_url + "/apis/rbac.authorization.k8s.io/v1/namespaces/#{namespace}/rolebindings/#{name}")
+      .to_return(kube_response({}))
+  end
+
   def stub_kubeclient_get_role_binding_error(api_url, name, namespace: 'default', status: 404)
     WebMock.stub_request(:get, api_url + "/apis/rbac.authorization.k8s.io/v1/namespaces/#{namespace}/rolebindings/#{name}")
       .to_return(status: [status, "Internal Server Error"])
@@ -114,6 +129,11 @@ module KubernetesHelpers
       .to_return(kube_response({}))
   end
 
+  def stub_kubeclient_put_role_binding(api_url, name, namespace: 'default')
+    WebMock.stub_request(:put, api_url + "/apis/rbac.authorization.k8s.io/v1/namespaces/#{namespace}/rolebindings/#{name}")
+      .to_return(kube_response({}))
+  end
+
   def stub_kubeclient_create_namespace(api_url)
     WebMock.stub_request(:post, api_url + "/api/v1/namespaces")
       .to_return(kube_response({}))