Changeset 348

Timestamp:

04/07/06 00:42:26 (3 years ago)

Author:

lazyatom

Message:

Seat-of-my-pants bugfix for gem loading error

Files:

• plugins/engines/CHANGELOG (modified) (2 diffs)
• plugins/engines/init.rb (modified) (1 diff)
• plugins/engines/lib/engines.rb (modified) (1 diff)

plugins/engines/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
-
------
@@ -14 +15 @@
-- Fixed the test_helper.erb file to use the correct testing extensions and not load any schema - the schema will be cloned automatically via rake test:engines
-- Fixed problem when running with Rails 1.1.1 where version wasn't determined correctly (Ticket #129)
+- Fixed bug preventing engines from loading when both Rails 1.1.0 and 1.1.1 gems are installed and in use.
+- Updated version (d'oh!)
+
-
------

plugins/engines/init.rb

@@ -36 +36 @@
-  Major = 1 # change implies compatibility breaking with previous versions
-  Minor = 1 # change implies backwards-compatible change to API
-0
+1
-end
-

plugins/engines/lib/engines.rb

@@ -4 +4 @@
-begin
-  require 'rails_version' # Rails 1.0, 1.1.0
-
+, Gem::Exception
-  require 'rails/version' # renamed as of Rails 1.1.1
-end