Merged r9450 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9451 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-04-19 09:23:27 +00:00
parent 4f48d1b4dd
commit 62114336cf
1 changed files with 3 additions and 2 deletions

View File

@ -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