summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorJean-Baptiste Barth <jeanbaptiste.barth@gmail.com>2014-08-13 09:07:34 +0000
committerJean-Baptiste Barth <jeanbaptiste.barth@gmail.com>2014-08-13 09:07:34 +0000
commit81f165966e1978ebde09b4ff88aadaacb42f442f (patch)
treed7e5144345c4e7a2079963427b71a16635715bec /Gemfile
parent1617ee7bd8b0df0aaf13fcd8a66c07864182381d (diff)
downloadredmine-81f165966e1978ebde09b4ff88aadaacb42f442f.tar.gz
redmine-81f165966e1978ebde09b4ff88aadaacb42f442f.zip
Add ability to define plugins' gem dependencies in PluginGemfile (#14030).
git-svn-id: http://svn.redmine.org/redmine/trunk@13337 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 343b699d7..6f641deb3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -99,7 +99,7 @@ if File.exists?(local_gemfile)
end
# Load plugins' Gemfiles
-Dir.glob File.expand_path("../plugins/*/Gemfile", __FILE__) do |file|
+Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file|
puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
#TODO: switch to "eval_gemfile file" when bundler >= 1.2.0 will be required (rails 4)
instance_eval File.read(file), file