diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-12-16 17:05:16 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-12-16 17:05:16 -0200 |
| commit | 4b669dbb9180c7f9740bc24dea403b82c8d6ddc9 (patch) | |
| tree | 3ccc754c7bf487be10b7e07f8226b6df502e890e /activesupport/lib/active_support/core_ext/time | |
| parent | 97e413002639c1e19503f9c9875fc83428c36f51 (diff) | |
| parent | b1c19eb05299fbae2a80beb4abacacc4b5340776 (diff) | |
| download | rails-4b669dbb9180c7f9740bc24dea403b82c8d6ddc9.tar.gz rails-4b669dbb9180c7f9740bc24dea403b82c8d6ddc9.tar.bz2 rails-4b669dbb9180c7f9740bc24dea403b82c8d6ddc9.zip | |
Merge branch 'master' into merge-action-cable
Diffstat (limited to 'activesupport/lib/active_support/core_ext/time')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/calculations.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index 675db8a36b..768c9a1b2c 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -162,7 +162,6 @@ class Time # Returns a new Time representing the start of the day (0:00) def beginning_of_day - #(self - seconds_since_midnight).change(usec: 0) change(:hour => 0) end alias :midnight :beginning_of_day |