diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-06-23 16:51:42 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-06-23 16:51:42 +0000 |
| commit | cab0051371fc6c583e0b64806b5a8e5ce0c8239a (patch) | |
| tree | cf6145a44c01732eb18af374c905c0efed1b310a /lib/gitlab_config.rb | |
| parent | c5f2cffb1b1efe0bb017839308f6da6291d9d40a (diff) | |
| parent | 339b79b07e6262e856332057dc73eca7a293dcc5 (diff) | |
| download | gitlab-shell-cab0051371fc6c583e0b64806b5a8e5ce0c8239a.tar.gz | |
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
Diffstat (limited to 'lib/gitlab_config.rb')
| -rw-r--r-- | lib/gitlab_config.rb | 1 |
1 files changed, 0 insertions, 1 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 |