]> source.dussan.org Git - redmine.git/commitdiff
Merged r9450 from trunk.
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Thu, 19 Apr 2012 09:23:27 +0000 (09:23 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Thu, 19 Apr 2012 09:23:27 +0000 (09:23 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9451 e93f8b46-1217-0410-a6f0-8f06a7374b81

Gemfile

diff --git a/Gemfile b/Gemfile
index 3ede2d4b3683f82d1d10cc65e1ff2c9ba065b56d..fdb7f8bd66b7d9a1227d2ccf1615471fd807d91a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -75,9 +75,10 @@ group :test do
   gem "mocha"
 end
 
-if File.exists?('Gemfile.local')
+local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
+if File.exists?(local_gemfile)
   puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
-  instance_eval File.read('Gemfile.local')
+  instance_eval File.read(local_gemfile)
 end
 
 # Load plugins' Gemfiles