aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2016-04-25 18:54:17 +0100
committerAndrew White <pixeltrix@users.noreply.github.com>2016-04-25 18:54:17 +0100
commit3e4c6d1abab30c5b6a998083656ccf6786fcd2fe (patch)
treef4f94747a1bb479db9a65a9628f6f828ea97b946
parente007afd3cd7255c752fe8ab7fa24b59526ab95cb (diff)
parentde601699ba42f01999972741c44700d4a9e6d570 (diff)
downloadrails-3e4c6d1abab30c5b6a998083656ccf6786fcd2fe.tar.gz
rails-3e4c6d1abab30c5b6a998083656ccf6786fcd2fe.tar.bz2
rails-3e4c6d1abab30c5b6a998083656ccf6786fcd2fe.zip
Merge pull request #24729 from Fryguy/date_and_time_depends_on_mattr_accessor
Add require of mattr_accessor since Compatibility relies on it.
-rw-r--r--activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb b/activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb
index 59aa3ccac2..19e596a144 100644
--- a/activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb
+++ b/activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/module/attribute_accessors'
+
module DateAndTime
module Compatibility
# If true, +to_time+ preserves the timezone offset of receiver.