diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-06 11:17:31 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-06 11:17:31 +0000 |
| commit | b45b5f4322e8c418b8505f881c2d8332abeece08 (patch) | |
| tree | 8c6ffd3d96584f3722d778e2d688cb097c07f778 | |
| parent | 8addbc537a660d6919ac8100ce479df0bf91edbe (diff) | |
| download | redmine-b45b5f4322e8c418b8505f881c2d8332abeece08.tar.gz redmine-b45b5f4322e8c418b8505f881c2d8332abeece08.zip | |
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
| -rw-r--r-- | Gemfile | 5 | ||||
| -rw-r--r-- | doc/INSTALL | 4 |
2 files changed, 9 insertions, 0 deletions
@@ -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` diff --git a/doc/INSTALL b/doc/INSTALL index e7badf150..ea31d0dcf 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -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 |