Put Redis loading code in one place

339b79b0 · Jacob Vosmaer · c6f14956 · 339b79b0 · 339b79b0 · 339b79b0
Commit 339b79b0 authored Jun 23, 2016 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

lib/gitlab_config.rb lib/gitlab_config.rb +0 -1

lib/gitlab_net.rb lib/gitlab_net.rb +1 -1

lib/gitlab_redis.rb lib/gitlab_redis.rb +2 -0

No files found.
--- a/lib/gitlab_config.rb
+++ b/lib/gitlab_config.rb
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'vendor/redis/lib')))
 require 'yaml'

 class GitlabConfig

--- a/lib/gitlab_net.rb
+++ b/lib/gitlab_net.rb
 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

--- a/lib/gitlab_redis.rb
+++ b/lib/gitlab_redis.rb
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'vendor/redis/lib')))
+require 'redis'