Merge branch 'gitlab-redis' into 'master'

Put Redis loading code in one place

Before this change you could not run the gitlab_net specs in isolation.

See merge request !64

3 files changed, 3 insertions, 2 deletions

diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb
index 690c40e..ebf72d6 100644
--- a/lib/gitlab_config.rb
+++ b/lib/gitlab_config.rb
@@ -1,4 +1,3 @@
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'vendor/redis/lib')))
 require 'yaml'
 
 class GitlabConfig
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb
index 8e1fe39..e2bc2da 100644
--- a/lib/gitlab_net.rb
+++ b/lib/gitlab_net.rb
@@ -1,11 +1,11 @@
 require 'net/http'
 require 'openssl'
 require 'json'
-require 'redis'
 
 require_relative 'gitlab_config'
 require_relative 'gitlab_logger'
 require_relative 'gitlab_access'
+require_relative 'gitlab_redis'
 require_relative 'httpunix'
 
 class GitlabNet
diff --git a/lib/gitlab_redis.rb b/lib/gitlab_redis.rb
new file mode 100644
index 0000000..d34cc26
--- /dev/null
+++ b/lib/gitlab_redis.rb
@@ -0,0 +1,2 @@
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'vendor/redis/lib')))
+require 'redis'