Commit 4ac56fa1db2286848b1bed9df3aeec8685c4cbd3
1 parent
d0e794cc
Exists in
spb-stable
and in
2 other branches
Changed some stuff around after rebase
Showing
2 changed files
with
3 additions
and
5 deletions
Show diff stats
app/controllers/projects/branches_controller.rb
| @@ -23,8 +23,8 @@ class Projects::BranchesController < Projects::ApplicationController | @@ -23,8 +23,8 @@ class Projects::BranchesController < Projects::ApplicationController | ||
| 23 | end | 23 | end |
| 24 | 24 | ||
| 25 | def destroy | 25 | def destroy |
| 26 | - @branch = @repository.find_branch(params[:id]) | ||
| 27 | DeleteBranchService.new.execute(project, params[:id], current_user) | 26 | DeleteBranchService.new.execute(project, params[:id], current_user) |
| 27 | + @branch_name = params[:id] | ||
| 28 | 28 | ||
| 29 | respond_to do |format| | 29 | respond_to do |format| |
| 30 | format.html { redirect_to project_branches_path(@project) } | 30 | format.html { redirect_to project_branches_path(@project) } |
app/views/projects/branches/destroy.js.haml
| 1 | :plain | 1 | :plain |
| 2 | - $(".js-branch-#{@branch.name}").remove(); | ||
| 3 | - $('.js-recentbranch-count').html("#{@repository.recent_branches.count}") | ||
| 4 | - $('.js-protectedbranch-count').html("#{@project.protected_branches.count}") | ||
| 5 | - $('.js-totalbranch-count').html("#{@repository.branch_names.count}") | 2 | + $(".js-branch-#{@branch_name}").remove(); |
| 3 | + $('.js-totalbranch-count').html("#{@repository.branches.size}") |