Permalink
Browse files

Merge branch 'master' of git://github.com/rails/rails

  • Loading branch information...
2 parents e1c7730 + 6b4e0cc commit d148a6f6ba5f8ee65905f12cd2601fcc377d4852 @rizwanreza rizwanreza committed May 16, 2010
Showing with 1,357 additions and 475 deletions.
  1. +2 −1 Gemfile
  2. +4 −0 actionmailer/CHANGELOG
  3. +1 −1 actionmailer/actionmailer.gemspec
  4. +85 −62 actionmailer/lib/action_mailer/base.rb
  5. +2 −4 actionmailer/lib/action_mailer/railtie.rb
  6. +3 −3 actionmailer/test/old_base/mail_service_test.rb
  7. +0 −19 actionpack/Rakefile
  8. +10 −0 actionpack/lib/action_dispatch/middleware/flash.rb
  9. +1 −1 actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
  10. +4 −8 actionpack/lib/action_dispatch/middleware/show_exceptions.rb
  11. +11 −5 actionpack/lib/action_dispatch/testing/assertions/selector.rb
  12. +1 −1 actionpack/lib/action_view/helpers/asset_tag_helper.rb
  13. +41 −20 actionpack/lib/action_view/helpers/form_helper.rb
  14. +25 −2 actionpack/lib/action_view/helpers/form_options_helper.rb
  15. +7 −3 actionpack/lib/action_view/helpers/form_tag_helper.rb
  16. +19 −8 actionpack/lib/action_view/render/partials.rb
  17. +2 −3 actionpack/lib/action_view/template/error.rb
  18. +1 −1 actionpack/lib/action_view/template/handlers/erb.rb
  19. +16 −6 actionpack/test/controller/assert_select_test.rb
  20. +5 −0 actionpack/test/controller/capture_test.rb
  21. +20 −0 actionpack/test/controller/flash_test.rb
  22. +11 −2 actionpack/test/controller/render_test.rb
  23. +1 −1 actionpack/test/dispatch/request/xml_params_parsing_test.rb
  24. +1 −0 actionpack/test/fixtures/test/_customer_counter_with_as.erb
  25. +1 −0 actionpack/test/fixtures/test/proper_block_detection.erb
  26. +2 −1 actionpack/test/template/asset_tag_helper_test.rb
  27. +1 −1 actionpack/test/template/capture_helper_test.rb
  28. +114 −3 actionpack/test/template/form_helper_test.rb
  29. +56 −0 actionpack/test/template/form_options_helper_test.rb
  30. +14 −0 actionpack/test/template/form_tag_helper_test.rb
  31. +1 −0 actionpack/test/template/render_test.rb
  32. +5 −4 activemodel/lib/active_model/dirty.rb
  33. +1 −1 activemodel/lib/active_model/serializers/xml.rb
  34. +4 −6 activemodel/lib/active_model/validations.rb
  35. +1 −1 activemodel/lib/active_model/validations/acceptance.rb
  36. +1 −1 activemodel/lib/active_model/validations/confirmation.rb
  37. +1 −1 activemodel/lib/active_model/validations/exclusion.rb
  38. +1 −1 activemodel/lib/active_model/validations/format.rb
  39. +1 −1 activemodel/lib/active_model/validations/inclusion.rb
  40. +1 −1 activemodel/lib/active_model/validations/length.rb
  41. +1 −1 activemodel/lib/active_model/validations/numericality.rb
  42. +1 −1 activemodel/lib/active_model/validations/presence.rb
  43. +53 −0 activemodel/lib/active_model/validations/with.rb
  44. +3 −0 activemodel/lib/active_model/validator.rb
  45. +2 −2 activemodel/test/cases/serializeration/xml_serialization_test.rb
  46. +2 −2 activemodel/test/cases/validations/validates_test.rb
  47. +14 −1 activemodel/test/cases/validations_test.rb
  48. +12 −0 activemodel/test/models/automobile.rb
  49. +10 −0 activerecord/CHANGELOG
  50. +1 −1 activerecord/lib/active_record/associations.rb
  51. +1 −1 activerecord/lib/active_record/attribute_methods/dirty.rb
  52. +1 −1 activerecord/lib/active_record/attribute_methods/primary_key.rb
  53. +7 −2 activerecord/lib/active_record/base.rb
  54. +3 −3 activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
  55. +22 −1 activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
  56. +34 −17 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
  57. +1 −0 activerecord/lib/active_record/fixtures.rb
  58. +5 −6 activerecord/lib/active_record/locking/optimistic.rb
  59. +1 −5 activerecord/lib/active_record/named_scope.rb
  60. +8 −9 activerecord/lib/active_record/railtie.rb
  61. +6 −1 activerecord/lib/active_record/relation/batches.rb
  62. +5 −6 activerecord/lib/active_record/relation/calculations.rb
  63. +3 −3 activerecord/lib/active_record/relation/query_methods.rb
  64. +3 −0 activerecord/lib/active_record/schema_dumper.rb
  65. +22 −31 activerecord/lib/active_record/validations.rb
  66. +17 −0 activerecord/test/cases/active_schema_test_mysql.rb
  67. +7 −7 activerecord/test/cases/associations/eager_load_nested_include_test.rb
  68. +4 −0 activerecord/test/cases/associations/has_many_associations_test.rb
  69. +1 −1 activerecord/test/cases/associations/join_model_test.rb
  70. +2 −2 activerecord/test/cases/autosave_association_test.rb
  71. +12 −0 activerecord/test/cases/base_test.rb
  72. +14 −0 activerecord/test/cases/batches_test.rb
  73. +1 −2 activerecord/test/cases/calculations_test.rb
  74. +9 −0 activerecord/test/cases/dirty_test.rb
  75. +2 −2 activerecord/test/cases/finder_test.rb
  76. +5 −0 activerecord/test/cases/fixtures_test.rb
  77. +29 −2 activerecord/test/cases/method_scoping_test.rb
  78. +20 −0 activerecord/test/cases/migration_test.rb
  79. +6 −1 activerecord/test/cases/named_scope_test.rb
  80. +17 −6 activerecord/test/cases/validations_test.rb
  81. +1 −0 activerecord/test/models/post.rb
  82. +5 −0 activerecord/test/models/reply.rb
  83. +10 −4 activeresource/lib/active_resource/base.rb
  84. +1 −1 activeresource/lib/active_resource/schema.rb
  85. +48 −2 activeresource/test/cases/base_test.rb
  86. +5 −0 activeresource/test/fixtures/sound.rb
  87. +2 −0 activesupport/CHANGELOG
  88. +11 −1 activesupport/lib/active_support/core_ext/array/random_access.rb
  89. +16 −5 activesupport/lib/active_support/core_ext/date/calculations.rb
  90. +1 −1 activesupport/lib/active_support/core_ext/logger.rb
  91. +2 −0 activesupport/lib/active_support/core_ext/object/with_options.rb
  92. +12 −2 activesupport/lib/active_support/core_ext/time/calculations.rb
  93. +14 −4 activesupport/lib/active_support/lazy_load_hooks.rb
  94. +2 −2 activesupport/test/buffered_logger_test.rb
  95. +2 −2 activesupport/test/caching_test.rb
  96. +8 −4 activesupport/test/core_ext/array_ext_test.rb
  97. +17 −9 activesupport/test/core_ext/date_ext_test.rb
  98. +4 −4 activesupport/test/core_ext/date_time_ext_test.rb
  99. +13 −5 activesupport/test/core_ext/time_ext_test.rb
  100. +67 −0 activesupport/test/lazy_load_hooks_test.rb
  101. +9 −1 railties/guides/source/active_record_basics.textile
  102. +13 −9 railties/guides/source/active_support_core_extensions.textile
  103. +0 −2 railties/guides/source/initialization.textile
  104. +5 −4 railties/lib/rails/application.rb
  105. +4 −4 railties/lib/rails/application/bootstrap.rb
  106. +3 −3 railties/lib/rails/application/configuration.rb
  107. +8 −3 railties/lib/rails/application/finisher.rb
  108. +31 −0 railties/lib/rails/configuration.rb
  109. +19 −15 railties/lib/rails/engine.rb
  110. +2 −1 railties/lib/rails/generators/actions.rb
  111. +7 −6 railties/lib/rails/generators/generated_attribute.rb
  112. +1 −1 railties/lib/rails/generators/rails/app/app_generator.rb
  113. +12 −0 railties/lib/rails/generators/test_case.rb
  114. +0 −33 railties/lib/rails/info.rb
  115. +3 −0 railties/lib/rails/railtie.rb
  116. +21 −4 railties/lib/rails/railtie/configuration.rb
  117. +22 −0 railties/lib/rails/tasks/framework.rake
  118. +5 −1 railties/lib/rails/tasks/routes.rake
  119. +20 −15 railties/test/application/initializers/{initializers_test.rb → hooks_test.rb}
  120. +12 −2 railties/test/generators/actions_test.rb
  121. +7 −2 railties/test/generators/app_generator_test.rb
  122. +40 −0 railties/test/generators/generated_attribute_test.rb
  123. +1 −12 railties/test/generators_test.rb
  124. +0 −21 railties/test/rails_info_test.rb
  125. +26 −0 railties/test/railties/engine_test.rb
View
@@ -9,6 +9,7 @@ gem "mocha", ">= 0.9.8"
group :mri do
gem 'json'
gem 'yajl-ruby'
+ gem "nokogiri", ">= 1.4.0"
if RUBY_VERSION < '1.9'
gem "system_timer"
@@ -19,7 +20,7 @@ group :mri do
end
# AR
-gem "sqlite3-ruby", ">= 1.2.5", :require => 'sqlite3'
+gem "sqlite3-ruby", "= 1.3.0.beta.2", :require => 'sqlite3'
group :db do
gem "pg", ">= 0.9.0"
View
@@ -1,3 +1,7 @@
+* Changed encoding behaviour of mail, so updated tests in actionmailer and bumped mail version to 2.2.1 [ML]
+
+* Added ability to pass Proc objects to the defaults hash [ML]
+
*Rails 3.0.0 [beta 3] (April 13th, 2010)*
* Removed all quoting.rb type files from ActionMailer and put Mail 2.2.0 in instead [ML]
@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
s.has_rdoc = true
s.add_dependency('actionpack', version)
- s.add_dependency('mail', '~> 2.2.0')
+ s.add_dependency('mail', '~> 2.2.1')
s.add_dependency('text-format', '~> 1.0.0')
end
Oops, something went wrong.

0 comments on commit d148a6f

Please sign in to comment.