From aa6426f46dd615cdb30d8806567c1291a5c97fe1 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <marin@gitlab.com>
Date: Fri, 11 Apr 2014 10:22:32 +0200
Subject: [PATCH] Satellite will exist when doing automerge_check.

---
 app/controllers/projects/merge_requests_controller.rb | 2 --
 lib/gitlab/satellite/satellite.rb                     | 6 ------
 2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 872b950..745da9c 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/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
diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb
index 8c62778..c6e4d33 100644
--- a/lib/gitlab/satellite/satellite.rb
+++ b/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
--
libgit2 0.21.2