Skip to content

O
OHR Support
Commit bcbf0801 authored by Eric Davis's avatar Eric Davis
Browse files
Options

Upgrade the Engines plugin to get the bugfix for Rails::Plugin::GemLocator 

This update will allow Rails Engines to be installed as gems.  For example:

    # config/environment.rb
    Rails::Initializer.run do |config|
      ...
      config.gem 'timesheet_plugin'
    end

Will load the timesheet_plugins's RubyGem and allow it to work as if it was
installed to vendor/plugins.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2904 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 4e811beb
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
vendor/plugins/engines/boot.rb
View file @ bcbf0801
......@@ -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 }
......
vendor/plugins/engines/generators/plugin_migration/plugin_migration_generator.rb
View file @ bcbf0801
......@@ -48,7 +48,7 @@ class PluginMigrationGenerator < Rails::Generator::Base
end
end
@plugins_to_migrate.reject! { |p| p.latest_migration.nil? }
@plugins_to_migrate.reject! { |p| !p.respond_to?(:latest_migration) || p.latest_migration.nil? }
# Then find the current versions from the database
@current_versions = {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment