Lighthouse has a new layout. Prefer the old one? Return to the old layout, and switch back any time from the link at the top of each page.

This project is archived and is in readonly mode.

All changesets

Changeset [207fa59675cb624dde0e01c1d57597f752cdf095] by Xavier Noria

Revision 207fa59675cb624dde0e01c1d57597f752cdf095, committed by Xavier Noria · June 20th, 2010 @ 10:13 PM

Merge remote branch 'rails/master'

Conflicts:

actionpack/lib/abstract_controller/base.rb

http://github.com/rails/rails/commit/207fa59675cb624dde0e01c1d57597...

117 changed files

  • A actionpack/test/fixtures/fun/games/_form.erb
  • A activemodel/lib/active_model/validations/callbacks.rb
  • A activemodel/test/cases/validations/callbacks_test.rb
  • A activesupport/lib/active_support/descendants_tracker.rb
  • A activesupport/lib/active_support/file_update_checker.rb
  • A activesupport/lib/active_support/i18n_railtie.rb
  • A activesupport/test/descendants_tracker_test.rb
  • A activesupport/test/file_update_checker_test.rb
  • A railties/test/application/loading_test.rb
  • R railties/lib/rails/application/routes_reloader.rb
  • R railties/test/application/model_initialization_test.rb
  • R railties/test/railties/i18n_railtie_test.rb
  • M Gemfile
  • M Rakefile
  • M actionmailer/Rakefile
  • M actionpack/CHANGELOG
  • M actionpack/Rakefile
  • M actionpack/lib/abstract_controller/base.rb
  • M actionpack/lib/action_controller/metal.rb
  • M actionpack/lib/action_controller/metal/rack_delegation.rb
  • M actionpack/lib/action_controller/polymorphic_routes.rb
  • M actionpack/lib/action_controller/record_identifier.rb
  • M actionpack/lib/action_dispatch/http/request.rb
  • M actionpack/lib/action_dispatch/middleware/callbacks.rb
  • M actionpack/lib/action_dispatch/middleware/show_exceptions.rb
  • M actionpack/lib/action_dispatch/railtie.rb
  • M actionpack/lib/action_dispatch/routing/mapper.rb
  • M actionpack/lib/action_view/helpers/date_helper.rb
  • M actionpack/lib/action_view/helpers/form_helper.rb
  • M actionpack/lib/action_view/helpers/form_options_helper.rb
  • M actionpack/lib/action_view/helpers/text_helper.rb
  • M actionpack/lib/action_view/render/partials.rb
  • M actionpack/lib/action_view/test_case.rb
  • M actionpack/test/activerecord/polymorphic_routes_test.rb
  • M actionpack/test/controller/record_identifier_test.rb
  • M actionpack/test/controller/render_test.rb
  • M actionpack/test/dispatch/routing_test.rb
  • M actionpack/test/template/date_helper_test.rb
  • M actionpack/test/template/form_helper_test.rb
  • M actionpack/test/template/form_options_helper_test.rb
  • M actionpack/test/template/test_case_test.rb
  • M actionpack/test/template/text_helper_test.rb
  • M activemodel/Rakefile
  • M activemodel/lib/active_model/validations.rb
  • M activerecord/CHANGELOG
  • M activerecord/RUNNING_UNIT_TESTS
  • M activerecord/Rakefile
  • M activerecord/examples/performance.rb
  • M activerecord/lib/active_record/associations.rb
  • M activerecord/lib/active_record/associations/association_collection.rb
  • M activerecord/lib/active_record/base.rb
  • M activerecord/lib/active_record/callbacks.rb
  • M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
  • M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
  • M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
  • M activerecord/lib/active_record/observer.rb
  • M activerecord/lib/active_record/railtie.rb
  • M activerecord/lib/active_record/relation/query_methods.rb
  • M activerecord/lib/active_record/transactions.rb
  • M activerecord/lib/active_record/validations.rb
  • M activerecord/lib/rails/generators/active_record/migration/templates/migration.rb
  • M activerecord/test/cases/adapter_test.rb
  • M activerecord/test/cases/autosave_association_test.rb
  • M activerecord/test/cases/base_test.rb
  • M activerecord/test/cases/counter_cache_test.rb
  • M activerecord/test/cases/migration_test.rb
  • M activerecord/test/cases/nested_attributes_test.rb
  • M activerecord/test/cases/transaction_callbacks_test.rb
  • M activerecord/test/models/pirate.rb
  • M activeresource/Rakefile
  • M activesupport/CHANGELOG
  • M activesupport/Rakefile
  • M activesupport/bin/generate_tables
  • M activesupport/lib/active_support.rb
  • M activesupport/lib/active_support/callbacks.rb
  • M activesupport/lib/active_support/core_ext/class/subclasses.rb
  • M activesupport/lib/active_support/core_ext/date_time/zones.rb
  • M activesupport/lib/active_support/core_ext/object/to_param.rb
  • M activesupport/lib/active_support/core_ext/time/zones.rb
  • M activesupport/lib/active_support/i18n.rb
  • M activesupport/lib/active_support/json/backends/yajl.rb
  • M activesupport/lib/active_support/multibyte/chars.rb
  • M activesupport/lib/active_support/railtie.rb
  • M activesupport/lib/active_support/testing/performance.rb
  • M activesupport/test/core_ext/time_with_zone_test.rb
  • M activesupport/test/multibyte_chars_test.rb
  • M bin/rails
  • M doc/template/horo.rb
  • M railties/Rakefile
  • M railties/guides/assets/javascripts/code_highlighter.js
  • M railties/guides/assets/javascripts/guides.js
  • M railties/guides/assets/stylesheets/print.css
  • M railties/guides/assets/stylesheets/reset.css
  • M railties/guides/assets/stylesheets/style.css
  • M railties/lib/rails/application.rb
  • M railties/lib/rails/application/bootstrap.rb
  • M railties/lib/rails/commands/generate.rb
  • M railties/lib/rails/commands/server.rb
  • M railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb
  • M railties/lib/rails/generators/erb/scaffold/templates/new.html.erb
  • M railties/lib/rails/generators/erb/scaffold/templates/show.html.erb
  • M railties/lib/rails/generators/named_base.rb
  • M railties/lib/rails/generators/rails/app/templates/README
  • M railties/lib/rails/generators/rails/app/templates/Rakefile
  • M railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
  • M railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
  • M railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml
  • M railties/lib/rails/generators/rails/app/templates/config/initializers/inflections.rb
  • M railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt
  • M railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
  • M railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
  • M railties/test/application/initializers/i18n_test.rb
  • M railties/test/application/initializers/load_path_test.rb
  • M railties/test/application/rake_test.rb
  • M railties/test/application/routing_test.rb
  • M railties/test/generators/migration_generator_test.rb
  • M railties/test/generators/named_base_test.rb