diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-07-05 14:03:57 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-07-05 14:03:57 -0700 |
| commit | a7826bd8b7791284148c53eeefe35e8ab1185b31 (patch) | |
| tree | 86f55052e7b779af1730d7642db6ba61ff293201 /actionmailer/lib | |
| parent | c8d6dded997b46d0e1807fe295363fc5048a33ef (diff) | |
| parent | 6d0394ca28d68317d6119f28e9e07f48e6e5f50c (diff) | |
| download | rails-a7826bd8b7791284148c53eeefe35e8ab1185b31.tar.gz rails-a7826bd8b7791284148c53eeefe35e8ab1185b31.tar.bz2 rails-a7826bd8b7791284148c53eeefe35e8ab1185b31.zip | |
Merge branch 'master' into testclean
* master:
Add documentation for inheritance_column method
Use ArgumentError vs. RuntimeError, which is more precise.
CSV fixtures aren't supported by default anymore, update generated test_helper.rb to reflect that
fix quoting for ActiveSupport::Duration instances
Add few information on the field types
Add the options method to action_controller testcase.
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/collector.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/collector.rb b/actionmailer/lib/action_mailer/collector.rb index 17b22aea2a..b8d1db9558 100644 --- a/actionmailer/lib/action_mailer/collector.rb +++ b/actionmailer/lib/action_mailer/collector.rb @@ -15,7 +15,7 @@ module ActionMailer #:nodoc: def any(*args, &block) options = args.extract_options! - raise "You have to supply at least one format" if args.empty? + raise ArgumentError, "You have to supply at least one format" if args.empty? args.each { |type| send(type, options.dup, &block) } end alias :all :any |