diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-24 05:48:13 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-24 05:48:13 -0800 |
| commit | 6696f7e01026a9199d899f0b0a88763ba5bc020e (patch) | |
| tree | 12b8aa69cda16330e4ebac696ca9808ff66c31c1 | |
| parent | f5b9aefb574bf3cf1d3779606e54bd0a0a73d2aa (diff) | |
| parent | b340f889ff469fa64466aafbb61986058c3afda5 (diff) | |
| download | rails-6696f7e01026a9199d899f0b0a88763ba5bc020e.tar.gz rails-6696f7e01026a9199d899f0b0a88763ba5bc020e.tar.bz2 rails-6696f7e01026a9199d899f0b0a88763ba5bc020e.zip | |
Merge pull request #4161 from lest/remove-uniq-by-usage
use Array#uniq in AM instead of deprecated Array#uniq_by
| -rw-r--r-- | actionmailer/lib/action_mailer.rb | 1 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 9bd73dd740..2ac4f3f681 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -31,7 +31,6 @@ require 'action_mailer/version' # Common Active Support usage in Action Mailer require 'active_support/core_ext/class' require 'active_support/core_ext/object/blank' -require 'active_support/core_ext/array/uniq_by' require 'active_support/core_ext/module/attr_internal' require 'active_support/core_ext/module/delegation' require 'active_support/core_ext/string/inflections' diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 71c156f1a2..2f9fff0f97 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -708,7 +708,7 @@ module ActionMailer #:nodoc: def each_template(paths, name, &block) #:nodoc: templates = lookup_context.find_all(name, Array.wrap(paths)) - templates.uniq_by { |t| t.formats }.each(&block) + templates.uniq { |t| t.formats }.each(&block) end def create_parts_from_responses(m, responses) #:nodoc: |