Merged r9346 and r9347 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9348 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-04-06 11:17:31 +00:00
parent 8addbc537a
commit b45b5f4322
2 changed files with 9 additions and 0 deletions

View File

@ -75,6 +75,11 @@ group :test do
gem "mocha"
end
if File.exists?('Gemfile.local')
puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
instance_eval File.read('Gemfile.local')
end
# Load plugins' Gemfiles
Dir.glob File.expand_path("../vendor/plugins/*/Gemfile", __FILE__) do |file|
puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`

View File

@ -31,6 +31,10 @@ Optional:
of the rmagick gem using:
bundle install --without development test rmagick
If you need to load some gems that are not required by Redmine core (eg. fcgi),
you can create a file named Gemfile.local at the root of your redmine directory.
It will be loaded automatically when running `bundle install`.
3. Create an empty utf8 encoded database: "redmine" for example
4. Configure the database parameters in config/database.yml