update to current master and fix conflictsissue-title-vue

1 files changed, 8 insertions, 2 deletions

diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index 22714d9c5a4..840405f38cb 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -11,16 +11,18 @@ class Projects::BranchesController < Projects::ApplicationController
     @sort = params[:sort].presence || sort_value_name
     @branches = BranchesFinder.new(@repository, params).execute
 
-    @branches = Kaminari.paginate_array(@branches).page(params[:page]) unless params[:show_all].present?
-
     respond_to do |format|
       format.html do
+        paginate_branches
+        @refs_pipelines = @project.pipelines.latest_successful_for_refs(@branches.map(&:name))
+
         @max_commits = @branches.reduce(0) do |memo, branch|
           diverging_commit_counts = repository.diverging_commit_counts(branch)
           [memo, diverging_commit_counts[:behind], diverging_commit_counts[:ahead]].max
         end
       end
       format.json do
+        paginate_branches unless params[:show_all]
         render json: @branches.map(&:name)
       end
     end
@@ -91,6 +93,10 @@ class Projects::BranchesController < Projects::ApplicationController
     end
   end
 
+  def paginate_branches
+    @branches = Kaminari.paginate_array(@branches).page(params[:page])
+  end
+
   def url_to_autodeploy_setup(project, branch_name)
     namespace_project_new_blob_path(
       project.namespace,