Download as
Browse Code »

Commit 448e5c133a3c0b475ad28f4483d70cf65db73b76

Authored by Dmitriy Zaporozhets
2 parents 2ed56ce9 aa6426f4
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

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
  Diff comments   View file @448e5c1
... ... @@ -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
... ...
lib/gitlab/satellite/satellite.rb
  Diff comments   View file @448e5c1
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
... ...