diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-15 15:45:57 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-15 15:45:57 +0200 |
| commit | a87989fb7d0c4f05658ba29dec48ecefedf32334 (patch) | |
| tree | c47c0ad8662105b0e711947c2833a1c45159cc49 /app/services/merge_requests/build_service.rb | |
| parent | 277f311f20739bd97f4059b51dfa1dbc38aa38e1 (diff) | |
| download | gitlab-ce-a87989fb7d0c4f05658ba29dec48ecefedf32334.tar.gz | |
Remove satellites
Diffstat (limited to 'app/services/merge_requests/build_service.rb')
| -rw-r--r-- | app/services/merge_requests/build_service.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb index 956480938c3..5ef1cd2caa0 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -40,7 +40,6 @@ module MergeRequests merge_request.compare_diffs = diffs elsif diffs == false - # satellite timeout return false merge_request.can_be_created = false merge_request.compare_failed = true end @@ -59,9 +58,6 @@ module MergeRequests end merge_request - - rescue Gitlab::Satellite::BranchesWithoutParent - return build_failed(merge_request, "Selected branches have no common commit so they cannot be merged.") end def build_failed(merge_request, message) |