summaryrefslogtreecommitdiff
path: root/lib/gitlab.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-06 12:16:36 +0200
committerDouwe Maan <douwe@gitlab.com>2015-08-06 12:16:36 +0200
commit4f24eb2aa670877faeef0f486af00d74e007ad01 (patch)
tree3b8c9ccbe779050db829565910e8652392af4dcf /lib/gitlab.rb
parentc6799b0e1ecd1b7373f0ea23195e18c7ad5c199d (diff)
parentfff36a8b8965e4bddd8020caf5072e79bf131a74 (diff)
downloadgitlab-ce-4f24eb2aa670877faeef0f486af00d74e007ad01.tar.gz
Merge branch 'master' into merge-notifsmerge-notifs
Diffstat (limited to 'lib/gitlab.rb')
-rw-r--r--lib/gitlab.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb
index 5fc1862c3e9..6108697bc20 100644
--- a/lib/gitlab.rb
+++ b/lib/gitlab.rb
@@ -1,5 +1,4 @@
require 'gitlab/git'
module Gitlab
- autoload :Satellite, 'gitlab/satellite/satellite'
end