aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorSergey Nartimov <just.lest@gmail.com>2011-12-24 16:04:41 +0300
committerSergey Nartimov <just.lest@gmail.com>2011-12-24 16:04:41 +0300
commitb340f889ff469fa64466aafbb61986058c3afda5 (patch)
tree0795e0170b7e36e1d1e35d10f689a0feb2502d6d /actionmailer
parenta5fa310f406e299a1ac54d1a227bde93b7ce282b (diff)
downloadrails-b340f889ff469fa64466aafbb61986058c3afda5.tar.gz
rails-b340f889ff469fa64466aafbb61986058c3afda5.tar.bz2
rails-b340f889ff469fa64466aafbb61986058c3afda5.zip
use Array#uniq in AM instead of deprecated Array#uniq_by
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer.rb1
-rw-r--r--actionmailer/lib/action_mailer/base.rb2
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: