diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-02-22 12:00:56 -0800 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-02-22 12:00:56 -0800 |
commit | e4c2a13b1be2aa22c98b9581110aa72b39176c47 (patch) | |
tree | 52222e1cfb03d776d71b5b9e1789f35cc44a4f3d /activesupport/lib/active_support/core_ext | |
parent | c5a9c02e01040831f7e00d3dfa0cfe423f7eb1f9 (diff) | |
parent | eb1c5c4ae47c3a6b4ec97ac4cec18f6d92162a33 (diff) | |
download | rails-e4c2a13b1be2aa22c98b9581110aa72b39176c47.tar.gz rails-e4c2a13b1be2aa22c98b9581110aa72b39176c47.tar.bz2 rails-e4c2a13b1be2aa22c98b9581110aa72b39176c47.zip |
Merge pull request #9384 from eval/documentation_of_minute
Correct comment for (beginning|end)_of_minute [ci skip]
Diffstat (limited to 'activesupport/lib/active_support/core_ext')
-rw-r--r-- | activesupport/lib/active_support/core_ext/date_time/calculations.rb | 4 | ||||
-rw-r--r-- | activesupport/lib/active_support/core_ext/time/calculations.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time/calculations.rb b/activesupport/lib/active_support/core_ext/date_time/calculations.rb index 82cc46aa37..97aad008f5 100644 --- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb @@ -123,8 +123,8 @@ class DateTime change(:min => 59, :sec => 59) end alias :at_end_of_hour :end_of_hour - - # Returns a new DateTime representing the start of the hour (hh:mm:00). + + # Returns a new DateTime representing the start of the minute (hh:mm:00). def beginning_of_minute change(:sec => 0) end diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index c18169fab5..a3ce7dbe3f 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -188,13 +188,13 @@ class Time end alias :at_end_of_hour :end_of_hour - # Returns a new Time representing the start of the hour (x:xx:00) + # Returns a new Time representing the start of the minute (x:xx:00) def beginning_of_minute change(:sec => 0) end alias :at_beginning_of_minute :beginning_of_minute - # Returns a new Time representing the end of the hour, x:59:59.999999 (.999999999 in ruby1.9) + # Returns a new Time representing the end of the minute, x:xx:59.999999 (.999999999 in ruby1.9) def end_of_minute change( :sec => 59, |