diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/branches_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/projects/protected_branches_controller.rb | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index dd9508da049..1f7a114fc3d 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -8,6 +8,9 @@ class Projects::BranchesController < Projects::ApplicationController def index @sort = params[:sort] || 'name' @branches = @repository.branches_sorted_by(@sort) + branch_names = @branches.map(&:name) + @protected_branches = @project.protected_branches.where(name: branch_names) + @branches = Kaminari.paginate_array(@branches).page(params[:page]) @max_commits = @branches.reduce(0) do |memo, branch| diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb index ed170bb5595..3f541fe18dc 100644 --- a/app/controllers/projects/protected_branches_controller.rb +++ b/app/controllers/projects/protected_branches_controller.rb @@ -11,7 +11,6 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController end def create - branch_params = protected_branch_params @project.protected_branches.create(protected_branch_params) if params[:protected_branch][:branch_index].nil? |