diff options
| author | Toon Claes <toon@iotcl.com> | 2016-09-21 16:15:12 +0200 |
|---|---|---|
| committer | Toon Claes <toon@iotcl.com> | 2016-11-09 21:04:03 +0100 |
| commit | 1afab9eb79c87f32c7b899e58bc9a0ea8a113594 (patch) | |
| tree | 33068aabffdb6b76c0489246429a3a71c2b748a4 /app/controllers/projects/branches_controller.rb | |
| parent | c392b0cc24ba40e3fed920c6c693cb24665193af (diff) | |
| download | gitlab-ce-1afab9eb79c87f32c7b899e58bc9a0ea8a113594.tar.gz | |
Add button to delete all merged branches
It adds a button to the branches page that the user can use to delete
all the branches that are already merged. This can be used to clean up
all the branches that were forgotten to delete while merging MRs.
Fixes #21076.
Diffstat (limited to 'app/controllers/projects/branches_controller.rb')
| -rw-r--r-- | app/controllers/projects/branches_controller.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index 2de8ada3e29..6b9f37983c4 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -4,7 +4,7 @@ class Projects::BranchesController < Projects::ApplicationController # Authorize before_action :require_non_empty_project before_action :authorize_download_code! - before_action :authorize_push_code!, only: [:new, :create, :destroy] + before_action :authorize_push_code!, only: [:new, :create, :destroy, :destroy_all_merged] def index @sort = params[:sort].presence || sort_value_name @@ -62,6 +62,13 @@ class Projects::BranchesController < Projects::ApplicationController end end + def destroy_all_merged + DeleteMergedBranchesService.new(@project, current_user).async_execute + + redirect_to namespace_project_branches_path(@project.namespace, @project), + notice: 'Merged branches are being deleted. This can take some time depending on the number of branches. Please refresh the page to see changes.' + end + private def ref |