From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Fri, 13 Jul 2012 13:08:57 +0000 (+0200)
Subject: SONAR-3579 New way to fix conflict with local ruby installations
X-Git-Tag: 3.2~88
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6df8db4603834eeb4d3b897487650ff6348da1d5;p=sonarqube.git

SONAR-3579 New way to fix conflict with local ruby installations
---

diff --git a/sonar-server/src/main/webapp/WEB-INF/config/environment.rb b/sonar-server/src/main/webapp/WEB-INF/config/environment.rb
index 019a57bbbfe..34b1f761c3c 100644
--- a/sonar-server/src/main/webapp/WEB-INF/config/environment.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/config/environment.rb
@@ -3,7 +3,7 @@
 
 # Avoid conflict with local ruby installations
 # See http://jira.codehaus.org/browse/SONAR-3579
-ENV["GEM_HOME"]= ENV.fetch("GEM_PATH", []).first
+ENV["GEM_HOME"] = ENV["GEM_PATH"] = nil
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')