diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-14 13:21:49 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-14 13:21:49 +0000 |
| commit | 448e5c133a3c0b475ad28f4483d70cf65db73b76 (patch) | |
| tree | ba310a0aa94b8ce94f678e8ae514cc3cd203fb6f | |
| parent | 2ed56ce9d445e0ab22b5c20ec0d28342396d01cf (diff) | |
| parent | aa6426f46dd615cdb30d8806567c1291a5c97fe1 (diff) | |
| download | gitlab-ce-448e5c133a3c0b475ad28f4483d70cf65db73b76.tar.gz | |
Merge branch 'satellite_exists_in_automerge_check' into 'master'
Satellite exists in automerge check
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 | ||||
| -rw-r--r-- | 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 872b9500130..745da9c49e4 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 8c62778d90d..c6e4d3351cf 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 |