Permalink
Browse files

Merge branch 'master' of git@github.com:lifo/docrails

  • Loading branch information...
2 parents f16c220 + 4e2bc02 commit fa0cca368f74119b561595cc6ca7454f7debdf6b @TomK32 TomK32 committed May 16, 2008
Showing with 868 additions and 535 deletions.
  1. +1 −1 actionmailer/CHANGELOG
  2. +1 −1 actionmailer/MIT-LICENSE
  3. +8 −9 actionmailer/README
  4. +1 −1 actionmailer/Rakefile
  5. +1 −1 actionmailer/lib/action_mailer.rb
  6. +72 −66 actionmailer/lib/action_mailer/base.rb
  7. +1 −1 actionmailer/lib/action_mailer/version.rb
  8. +2 −1 actionpack/CHANGELOG
  9. +1 −1 actionpack/MIT-LICENSE
  10. +1 −1 actionpack/Rakefile
  11. +1 −1 actionpack/lib/action_controller.rb
  12. +26 −25 actionpack/lib/action_controller/base.rb
  13. +19 −18 actionpack/lib/action_controller/caching/actions.rb
  14. +3 −3 actionpack/lib/action_controller/caching/sweeping.rb
  15. +1 −1 actionpack/lib/action_controller/cgi_ext/cookie.rb
  16. +16 −3 actionpack/lib/action_controller/mime_type.rb
  17. +1 −1 actionpack/lib/action_controller/mime_types.rb
  18. +1 −1 actionpack/lib/action_controller/request_forgery_protection.rb
  19. +2 −4 actionpack/lib/action_controller/rescue.rb
  20. +6 −3 actionpack/lib/action_controller/session/cookie_store.rb
  21. +1 −1 actionpack/lib/action_pack.rb
  22. +1 −1 actionpack/lib/action_pack/version.rb
  23. +1 −1 actionpack/lib/action_view.rb
  24. +1 −1 actionpack/lib/action_view/helpers/javascripts/controls.js
  25. +1 −1 actionpack/lib/action_view/helpers/javascripts/dragdrop.js
  26. +1 −1 actionpack/lib/action_view/helpers/javascripts/effects.js
  27. +1 −1 actionpack/lib/action_view/helpers/prototype_helper.rb
  28. +59 −68 actionpack/lib/action_view/helpers/text_helper.rb
  29. +59 −4 actionpack/lib/action_view/helpers/url_helper.rb
  30. +67 −13 actionpack/test/controller/caching_test.rb
  31. +6 −0 actionpack/test/controller/cookie_test.rb
  32. +13 −7 actionpack/test/controller/filter_params_test.rb
  33. +21 −4 actionpack/test/controller/mime_type_test.rb
  34. +67 −4 actionpack/test/controller/request_forgery_protection_test.rb
  35. +14 −2 actionpack/test/controller/session/cookie_store_test.rb
  36. +5 −0 actionpack/test/template/prototype_helper_test.rb
  37. +16 −25 actionpack/test/template/text_helper_test.rb
  38. +1 −1 activerecord/CHANGELOG
  39. +1 −1 activerecord/MIT-LICENSE
  40. +1 −1 activerecord/Rakefile
  41. +1 −1 activerecord/lib/active_record.rb
  42. +15 −16 activerecord/lib/active_record/associations.rb
  43. +24 −18 activerecord/lib/active_record/attribute_methods.rb
  44. +28 −24 activerecord/lib/active_record/base.rb
  45. +8 −8 activerecord/lib/active_record/dirty.rb
  46. +7 −7 activerecord/lib/active_record/fixtures.rb
  47. +1 −1 activerecord/lib/active_record/version.rb
  48. +20 −1 activerecord/test/cases/dirty_test.rb
  49. +9 −3 activerecord/test/cases/finder_test.rb
  50. +11 −9 activerecord/test/cases/fixtures_test.rb
  51. +28 −0 activerecord/test/cases/inheritance_test.rb
  52. +4 −0 activerecord/test/models/company.rb
  53. +2 −0 activerecord/test/models/pirate.rb
  54. +1 −1 activeresource/CHANGELOG
  55. +1 −1 activeresource/Rakefile
  56. +1 −1 activeresource/lib/active_resource/version.rb
  57. +1 −1 activesupport/CHANGELOG
  58. +1 −1 activesupport/MIT-LICENSE
  59. +1 −0 activesupport/lib/active_support.rb
  60. +1 −1 activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
  61. +0 −13 activesupport/lib/active_support/deprecation.rb
  62. +7 −0 activesupport/lib/active_support/inflector.rb
  63. +43 −0 activesupport/lib/active_support/ordered_hash.rb
  64. +0 −44 activesupport/lib/active_support/ordered_options.rb
  65. +1 −1 activesupport/lib/active_support/time_with_zone.rb
  66. +4 −5 activesupport/lib/active_support/values/time_zone.rb
  67. +1 −1 activesupport/lib/active_support/version.rb
  68. +1 −1 activesupport/test/core_ext/time_with_zone_test.rb
  69. +0 −10 activesupport/test/deprecation_test.rb
  70. +45 −0 activesupport/test/ordered_hash_test.rb
  71. +0 −44 activesupport/test/ordered_options_test.rb
  72. +1 −1 pushgems.rb
  73. +1 −1 railties/CHANGELOG
  74. +1 −1 railties/MIT-LICENSE
  75. +13 −3 railties/README
  76. +6 −6 railties/Rakefile
  77. +3 −0 railties/configs/initializers/new_rails_defaults.rb
  78. +1 −1 railties/html/javascripts/controls.js
  79. +1 −1 railties/html/javascripts/dragdrop.js
  80. +1 −1 railties/html/javascripts/effects.js
  81. +2 −1 railties/lib/commands/dbconsole.rb
  82. +1 −1 railties/lib/dispatcher.rb
  83. +3 −2 railties/lib/rails/plugin/locator.rb
  84. +1 −1 railties/lib/rails/version.rb
  85. +16 −9 railties/lib/rails_generator/commands.rb
  86. +2 −1 railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
  87. +2 −2 railties/lib/tasks/databases.rake
  88. +24 −10 railties/test/generators/generator_test_helper.rb
  89. +20 −0 railties/test/generators/rails_controller_generator_test.rb
View
@@ -1,4 +1,4 @@
-*SVN*
+*2.1.0 RC1 (May 11th, 2008)*
* Fixed that a return-path header would be ignored #7572 [joost]
View
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2007 David Heinemeier Hansson
+Copyright (c) 2004-2008 David Heinemeier Hansson
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
View
@@ -19,8 +19,7 @@ are all set up this way. An example of such a method:
recipients recipient
subject "[Signed up] Welcome #{recipient}"
from "system@loudthinking.com"
-
- body(:recipient => recipient)
+ body :recipient => recipient
end
The body of the email is created by using an Action View template (regular
@@ -91,13 +90,13 @@ a limited number of email.
The Base class has the full list of configuration options. Here's an example:
-ActionMailer::Base.smtp_settings = {
- :address=>'smtp.yourserver.com', # default: localhost
- :port=>'25', # default: 25
- :user_name=>'user',
- :password=>'pass',
- :authentication=>:plain # :plain, :login or :cram_md5
-}
+ ActionMailer::Base.smtp_settings = {
+ :address => 'smtp.yourserver.com', # default: localhost
+ :port => '25', # default: 25
+ :user_name => 'user',
+ :password => 'pass',
+ :authentication => :plain # :plain, :login or :cram_md5
+ }
== Dependencies
View
@@ -55,7 +55,7 @@ spec = Gem::Specification.new do |s|
s.rubyforge_project = "actionmailer"
s.homepage = "http://www.rubyonrails.org"
- s.add_dependency('actionpack', '= 2.0.2' + PKG_BUILD)
+ s.add_dependency('actionpack', '= 2.0.991' + PKG_BUILD)
s.has_rdoc = true
s.requirements << 'none'
@@ -1,5 +1,5 @@
#--
-# Copyright (c) 2004-2007 David Heinemeier Hansson
+# Copyright (c) 2004-2008 David Heinemeier Hansson
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
Oops, something went wrong.

0 comments on commit fa0cca3

Please sign in to comment.