Commit 448e5c133a3c0b475ad28f4483d70cf65db73b76
Exists in
spb-stable
and in
3 other branches
Merge branch 'satellite_exists_in_automerge_check' into 'master'
Satellite exists in automerge check
Showing
2 changed files
with
0 additions
and
8 deletions
Show diff stats
app/controllers/projects/merge_requests_controller.rb
| @@ -108,8 +108,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController | @@ -108,8 +108,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController | ||
| 108 | @merge_request.check_if_can_be_merged | 108 | @merge_request.check_if_can_be_merged |
| 109 | end | 109 | end |
| 110 | render json: {merge_status: @merge_request.merge_status_name} | 110 | render json: {merge_status: @merge_request.merge_status_name} |
| 111 | - rescue Gitlab::SatelliteNotExistError | ||
| 112 | - render json: {merge_status: :no_satellite} | ||
| 113 | end | 111 | end |
| 114 | 112 | ||
| 115 | def automerge | 113 | def automerge |
lib/gitlab/satellite/satellite.rb