From b45b5f4322e8c418b8505f881c2d8332abeece08 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 6 Apr 2012 11:17:31 +0000
Subject: [PATCH] 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
---
 Gemfile     | 5 +++++
 doc/INSTALL | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/Gemfile b/Gemfile
index 50439f10a..2ffe22427 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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
-- 
2.39.5