From 339b79b07e6262e856332057dc73eca7a293dcc5 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Thu, 23 Jun 2016 11:04:37 +0200
Subject: Put Redis loading code in one place

---
 lib/gitlab_config.rb | 1 -
 lib/gitlab_net.rb    | 2 +-
 lib/gitlab_redis.rb  | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 lib/gitlab_redis.rb

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'
-- 
cgit v1.2.1