From 11d02c98dccbbb145ba5229846c575759efb813f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 21 Mar 2022 03:08:23 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/projects/branches_controller.rb | 6 ++---- app/controllers/projects/commit_controller.rb | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'app/controllers/projects') diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index dad73c37fea..6264f10ce2d 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -34,11 +34,9 @@ class Projects::BranchesController < Projects::ApplicationController Gitlab::GitalyClient.allow_n_plus_1_calls do render end - rescue Gitlab::Git::CommandError => e - Gitlab::ErrorTracking.track_exception(e) - + rescue Gitlab::Git::CommandError @gitaly_unavailable = true - render + render status: :service_unavailable end format.json do branches = BranchesFinder.new(@repository, params).execute diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 0c26b402876..90d823423f3 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -106,6 +106,8 @@ class Projects::CommitController < Projects::ApplicationController end def revert + return render_404 unless @commit + assign_change_commit_vars return render_404 if @start_branch.blank? @@ -117,6 +119,8 @@ class Projects::CommitController < Projects::ApplicationController end def cherry_pick + return render_404 unless @commit + assign_change_commit_vars return render_404 if @start_branch.blank? -- cgit v1.2.3