summaryrefslogtreecommitdiffstats
path: root/vendor/plugins/engines/boot.rb
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/plugins/engines/boot.rb')
-rw-r--r--vendor/plugins/engines/boot.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/plugins/engines/boot.rb b/vendor/plugins/engines/boot.rb
index 1c55e2139..7dd90d17a 100644
--- a/vendor/plugins/engines/boot.rb
+++ b/vendor/plugins/engines/boot.rb
@@ -10,7 +10,7 @@ require File.join(File.dirname(__FILE__), 'lib/engines')
# initialize Rails::Configuration with our own default values to spare users
# some hassle with the installation and keep the environment cleaner
-{ :default_plugin_locators => [Engines::Plugin::FileSystemLocator],
+{ :default_plugin_locators => (defined?(Gem) ? [Rails::Plugin::GemLocator] : []).push(Engines::Plugin::FileSystemLocator),
:default_plugin_loader => Engines::Plugin::Loader,
:default_plugins => [:engines, :all] }.each do |name, default|
Rails::Configuration.send(:define_method, name) { default }