diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-14 17:21:49 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-14 17:21:49 +0400 |
| commit | 448e5c133a3c0b475ad28f4483d70cf65db73b76 (patch) | |
| tree | ba310a0aa94b8ce94f678e8ae514cc3cd203fb6f /lib/gitlab | |
| parent | 2ed56ce9d445e0ab22b5c20ec0d28342396d01cf (diff) | |
| parent | aa6426f46dd615cdb30d8806567c1291a5c97fe1 (diff) | |
Merge branch 'satellite_exists_in_automerge_check' into 'master'
Satellite exists in automerge check
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/satellite/satellite.rb | 6 |
1 files changed, 0 insertions, 6 deletions
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 |