diff options
| author | Ciro Santilli <ciro.santilli@gmail.com> | 2014-10-22 10:54:59 +0200 |
|---|---|---|
| committer | Ciro Santilli <ciro.santilli@gmail.com> | 2014-11-18 11:38:23 +0100 |
| commit | 533f4cdf30b38c587f7a91f0dfd898b907ecd944 (patch) | |
| tree | d7ff63cc56fa128bb6310496af9c44daa4d3d0b9 /config/application.rb | |
| parent | d803f210aa5e87a441fca562910122f2cfde9fa6 (diff) | |
| download | gitlab-ce-533f4cdf30b38c587f7a91f0dfd898b907ecd944.tar.gz | |
gitlab shell works if multiple rubies installed
Before this it would fail because git hooks automatically prepend
things to the path, which can lead the wrong Ruby version to be called
in which dependencies are not installed.
To make sure that this is correct, the forked_merge_requests commented
out test that depends on this change was uncommented.
For that test to pass, it is also necessary to setup the mock server
on port 3001 under test_env.rb.
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 44a5d68d126..8300cf57a61 100644 --- a/config/application.rb +++ b/config/application.rb @@ -92,5 +92,7 @@ module Gitlab redis_config_hash[:namespace] = 'cache:gitlab' config.cache_store = :redis_store, redis_config_hash + + ENV['GITLAB_PATH_OUTSIDE_HOOK'] = ENV['PATH'] end end |