diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-12 11:29:05 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-12 11:29:05 +0000 |
| commit | ae498b6cd4122d3d7f35e6b73b50c53615ca3488 (patch) | |
| tree | 5ff9b6f34ad8225b63ad24813a141bdc66c0de25 /lib/gitlab_init.rb | |
| parent | 79fdf65c71e90773fbf52d6832b74cf5a7124755 (diff) | |
| parent | 96f0845952391531cc8bfc6b5ae13a6a65772e05 (diff) | |
| download | gitlab-shell-ae498b6cd4122d3d7f35e6b73b50c53615ca3488.tar.gz | |
Merge branch 'use-load-path' into 'master'
Use load path, set ROOT_PATH via ENV
Uses load path instead of require_relative, adds an environment variable to set gitlab-shell ROOT_PATH variable (Fixes #30)
See merge request !28
Diffstat (limited to 'lib/gitlab_init.rb')
| -rw-r--r-- | lib/gitlab_init.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab_init.rb b/lib/gitlab_init.rb index c3f35a2..d2fa95d 100644 --- a/lib/gitlab_init.rb +++ b/lib/gitlab_init.rb @@ -1,3 +1,7 @@ -ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__), "..")) +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 require_relative 'gitlab_config' |