aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-06-07 16:26:28 +0200
committerYves Senn <yves.senn@gmail.com>2014-06-07 16:26:28 +0200
commit16f595f1b6cb8d248c93c5fd2c7033771edf2426 (patch)
treecd6b396c2a770bbc12ec195e62232a483f58042f /activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
parent23a751c2e15800c1b4aa96c10d1bfebc56fa30b9 (diff)
downloadrails-16f595f1b6cb8d248c93c5fd2c7033771edf2426.tar.gz
rails-16f595f1b6cb8d248c93c5fd2c7033771edf2426.tar.bz2
rails-16f595f1b6cb8d248c93c5fd2c7033771edf2426.zip
changelog for #15556 and credit @kuldeepaggarwal [Kuldeep Aggarwal]
This is a follow up to #15556 @kuldeepaggarwal did submit this patch way back (#13624).
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb')
-rw-r--r--activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
index 7db7d306a4..44a679a550 100644
--- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
+++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
@@ -60,8 +60,6 @@ module ActiveRecord
value.map { |v| convert_value_to_time_zone(v) }
elsif value.respond_to?(:in_time_zone)
value.in_time_zone
- else
- nil
end
end
end