diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 12:27:38 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 12:27:38 +0000 |
| commit | 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa (patch) | |
| tree | dbf754ad57c523759284cf5d8af84fd9f096701a /lib/gitlab.rb | |
| parent | 2f706fbd231cabe7a76a5d17ac44285aaaf8592c (diff) | |
| parent | 3a63c00505307a1d1e8196c0eae72a79b2a6885f (diff) | |
| download | gitlab-ce-5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa.tar.gz | |
Merge branch 'revert-satellites' into 'master'
Revert satellites
Return satellites to master for 7.14
We remove satellites in next release (8.0)
See merge request !1136
Diffstat (limited to 'lib/gitlab.rb')
| -rw-r--r-- | lib/gitlab.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb index 6108697bc20..5fc1862c3e9 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -1,4 +1,5 @@ require 'gitlab/git' module Gitlab + autoload :Satellite, 'gitlab/satellite/satellite' end |