Satellite will exist when doing automerge_check.

Marin Jankovski
1 parent 415c0f4b
Showing 2 changed files with 0 additions and 8 deletions Show diff stats
app/controllers/projects/merge_requests_controller.rb
lib/gitlab/satellite/satellite.rb
@@ -108,8 +108,6 @@ class Projects::MergeRequestsController &lt; Projects::ApplicationController
       @merge_request.check_if_can_be_merged
     end
     render json: {merge_status: @merge_request.merge_status_name}
-  rescue Gitlab::SatelliteNotExistError
-    render json: {merge_status: :no_satellite}
   end
  
   def automerge
 module Gitlab
-  class SatelliteNotExistError < StandardError
-    def initialize(msg = "Satellite doesn't exist")
-      super
-    end
-  end
-
   module Satellite
     class Satellite
       include Gitlab::Popen
...	...	@@ -108,8 +108,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
108	108	@merge_request.check_if_can_be_merged
109	109	end
110	110	render json: {merge_status: @merge_request.merge_status_name}
111		- rescue Gitlab::SatelliteNotExistError
112		- render json: {merge_status: :no_satellite}
113	111	end
114	112
115	113	def automerge
...	...
1	1	module Gitlab
2		- class SatelliteNotExistError < StandardError
3		- def initialize(msg = "Satellite doesn't exist")
4		- super
5		- end
6		- end
7		-
8	2	module Satellite
9	3	class Satellite
10	4	include Gitlab::Popen
...	...