diff options
author | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-12-03 19:30:35 +0100 |
---|---|---|
committer | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-12-03 19:30:35 +0100 |
commit | ccb96f2297e8783165cba764e9b5d51e1a15ff87 (patch) | |
tree | 3229e6fdddc42054615514d843c555e341003033 /railties/builtin/rails_info/rails | |
parent | fb2325e35855d62abd2c76ce03feaa3ca7992e4f (diff) | |
parent | 761a633a9c0a45d76ef3ed10da97e3696c3ded79 (diff) | |
download | rails-ccb96f2297e8783165cba764e9b5d51e1a15ff87.tar.gz rails-ccb96f2297e8783165cba764e9b5d51e1a15ff87.tar.bz2 rails-ccb96f2297e8783165cba764e9b5d51e1a15ff87.zip |
Merge commit 'origin/master' into savepoints
Conflicts:
activerecord/lib/active_record/fixtures.rb
activerecord/test/cases/defaults_test.rb
Diffstat (limited to 'railties/builtin/rails_info/rails')
-rw-r--r-- | railties/builtin/rails_info/rails/info.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/railties/builtin/rails_info/rails/info.rb b/railties/builtin/rails_info/rails/info.rb index 4cbd2cca4a..7b6f09ac69 100644 --- a/railties/builtin/rails_info/rails/info.rb +++ b/railties/builtin/rails_info/rails/info.rb @@ -20,13 +20,13 @@ module Rails rescue Exception end - def components + def frameworks %w( active_record action_pack active_resource action_mailer active_support ) end - def component_version(component) - require "#{component}/version" - "#{component.classify}::VERSION::STRING".constantize + def framework_version(framework) + require "#{framework}/version" + "#{framework.classify}::VERSION::STRING".constantize end def edge_rails_revision(info = git_info) @@ -90,11 +90,11 @@ module Rails Rails::VERSION::STRING end - # Versions of each Rails component (Active Record, Action Pack, + # Versions of each Rails framework (Active Record, Action Pack, # Active Resource, Action Mailer, and Active Support). - components.each do |component| - property "#{component.titlecase} version" do - component_version(component) + frameworks.each do |framework| + property "#{framework.titlecase} version" do + framework_version(framework) end end |