Commit 4ac56fa1 authored by Jeroen van Baarsen's avatar Jeroen van Baarsen

Changed some stuff around after rebase

parent d0e794cc
......@@ -23,8 +23,8 @@ class Projects::BranchesController < Projects::ApplicationController
end
def destroy
@branch = @repository.find_branch(params[:id])
DeleteBranchService.new.execute(project, params[:id], current_user)
@branch_name = params[:id]
respond_to do |format|
format.html { redirect_to project_branches_path(@project) }
......
:plain
$(".js-branch-#{@branch.name}").remove();
$('.js-recentbranch-count').html("#{@repository.recent_branches.count}")
$('.js-protectedbranch-count').html("#{@project.protected_branches.count}")
$('.js-totalbranch-count').html("#{@repository.branch_names.count}")
$(".js-branch-#{@branch_name}").remove();
$('.js-totalbranch-count').html("#{@repository.branches.size}")
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment