From 91c39fd8c70e45aeb2d39f4f2b08164d01300b89 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 9 Apr 2015 13:56:38 -0400
Subject: [PATCH] Add lib/gitlab.rb to autoload non-conventional paths

---
 config/initializers/1_settings.rb | 2 ++
 lib/gitlab.rb                     | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 lib/gitlab.rb

diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index de79595d031..e6b00c531ac 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -1,3 +1,5 @@
+require 'gitlab' # Load lib/gitlab.rb as soon as possible
+
 class Settings < Settingslogic
   source ENV.fetch('GITLAB_CONFIG') { "#{Rails.root}/config/gitlab.yml" }
   namespace Rails.env
diff --git a/lib/gitlab.rb b/lib/gitlab.rb
new file mode 100644
index 00000000000..5fc1862c3e9
--- /dev/null
+++ b/lib/gitlab.rb
@@ -0,0 +1,5 @@
+require 'gitlab/git'
+
+module Gitlab
+  autoload :Satellite, 'gitlab/satellite/satellite'
+end