diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-03 21:06:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-03 21:06:49 +0300 |
| commit | ab7cf450ba19cf80b9534f25dc707b33845e3014 (patch) | |
| tree | bbfa6aba83c48aea68d79c4179ce576b6eec326d /app/controllers/projects/branches_controller.rb | |
| parent | 4204cf308596e0e26f578a6e2da88f49c0f4aad9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/branches_controller.rb')
| -rw-r--r-- | app/controllers/projects/branches_controller.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index a908da08f57..09754409104 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -46,7 +46,7 @@ class Projects::BranchesController < Projects::ApplicationController def diverging_commit_counts respond_to do |format| format.json do - service = Branches::DivergingCommitCountsService.new(repository) + service = ::Branches::DivergingCommitCountsService.new(repository) branches = BranchesFinder.new(repository, params.permit(names: [])).execute Gitlab::GitalyClient.allow_n_plus_1_calls do @@ -63,7 +63,7 @@ class Projects::BranchesController < Projects::ApplicationController redirect_to_autodeploy = project.empty_repo? && project.deployment_platform.present? - result = CreateBranchService.new(project, current_user) + result = ::Branches::CreateService.new(project, current_user) .execute(branch_name, ref) success = (result[:status] == :success) @@ -102,7 +102,7 @@ class Projects::BranchesController < Projects::ApplicationController def destroy @branch_name = Addressable::URI.unescape(params[:id]) - result = DeleteBranchService.new(project, current_user).execute(@branch_name) + result = ::Branches::DeleteService.new(project, current_user).execute(@branch_name) respond_to do |format| format.html do @@ -118,7 +118,7 @@ class Projects::BranchesController < Projects::ApplicationController end def destroy_all_merged - DeleteMergedBranchesService.new(@project, current_user).async_execute + ::Branches::DeleteMergedService.new(@project, current_user).async_execute redirect_to project_branches_path(@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.') |