Merge branch 'satellite_exists_in_automerge_check' into 'master'

Satellite exists in automerge check

app/controllers/projects/merge_requests_controller.rb

@@ -108,8 +108,6 @@ class Projects::MergeRequestsController < 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

lib/gitlab/satellite/satellite.rb

@@ -1,10 +1,4 @@
 module Gitlab
-  class SatelliteNotExistError < StandardError
-    def initialize(msg = "Satellite doesn't exist")
-      super
-    end
-  end
-
   module Satellite
     class Satellite
       include Gitlab::Popen