Commit cab00513 authored by Stan Hu's avatar Stan Hu

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
parents c5f2cffb 339b79b0
$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'vendor/redis/lib')))
require 'yaml'
class GitlabConfig
......
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
......
$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'vendor/redis/lib')))
require 'redis'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment