##// END OF EJS Templates
Merged r9346 and r9347 from trunk....
Jean-Philippe Lang -
r9214:b45b5f4322e8
parent child
Show More
@@ -75,6 +75,11 group :test do
75 gem "mocha"
75 gem "mocha"
76 end
76 end
77
77
78 if File.exists?('Gemfile.local')
79 puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
80 instance_eval File.read('Gemfile.local')
81 end
82
78 # Load plugins' Gemfiles
83 # Load plugins' Gemfiles
79 Dir.glob File.expand_path("../vendor/plugins/*/Gemfile", __FILE__) do |file|
84 Dir.glob File.expand_path("../vendor/plugins/*/Gemfile", __FILE__) do |file|
80 puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
85 puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
@@ -31,6 +31,10 Optional:
31 of the rmagick gem using:
31 of the rmagick gem using:
32 bundle install --without development test rmagick
32 bundle install --without development test rmagick
33
33
34 If you need to load some gems that are not required by Redmine core (eg. fcgi),
35 you can create a file named Gemfile.local at the root of your redmine directory.
36 It will be loaded automatically when running `bundle install`.
37
34 3. Create an empty utf8 encoded database: "redmine" for example
38 3. Create an empty utf8 encoded database: "redmine" for example
35
39
36 4. Configure the database parameters in config/database.yml
40 4. Configure the database parameters in config/database.yml
General Comments 0
You need to be logged in to leave comments. Login now