diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-12 15:05:10 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-12 15:05:10 +0100 |
| commit | f532377f9a183654bb2cd6c37134eaf24f64cbca (patch) | |
| tree | 77bfd186bf4cd4f892326250e310db2bd46b3b92 /lib/gitlab_init.rb | |
| parent | 9f53a532d4a0a565f591c62b5e62a2fb698a0fbe (diff) | |
| download | gitlab-shell-f532377f9a183654bb2cd6c37134eaf24f64cbca.tar.gz | |
Revert "Merge branch 'use-load-path' into 'master'
"
This reverts commit ae498b6cd4122d3d7f35e6b73b50c53615ca3488, reversing
changes made to 79fdf65c71e90773fbf52d6832b74cf5a7124755.
Diffstat (limited to 'lib/gitlab_init.rb')
| -rw-r--r-- | lib/gitlab_init.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab_init.rb b/lib/gitlab_init.rb index d2fa95d..c3f35a2 100644 --- a/lib/gitlab_init.rb +++ b/lib/gitlab_init.rb @@ -1,7 +1,3 @@ -if ENV['SHELL_ROOT_PATH'].nil? || ENV['SHELL_ROOT_PATH'].empty? - ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__), "..")) -else - ROOT_PATH = ENV['SHELL_ROOT_PATH'] -end +ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__), "..")) require_relative 'gitlab_config' |