aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/date_time/calculations.rb
diff options
context:
space:
mode:
authorWillian Gustavo Veiga <beberveiga@gmail.com>2018-10-17 20:24:44 -0300
committerWillian Gustavo Veiga <beberveiga@gmail.com>2018-10-17 20:24:44 -0300
commitc8ff9bd63a2371b6f0f0b4f48abf29cf89a1d397 (patch)
treee72e4476555fbee75961e473ce336c08fdd10fa6 /activesupport/lib/active_support/core_ext/date_time/calculations.rb
parent99bd626885b72acd44861727918ee107a649e2b4 (diff)
parentead868315f9b0fedb351c9b451aa1f66a2dc8038 (diff)
downloadrails-c8ff9bd63a2371b6f0f0b4f48abf29cf89a1d397.tar.gz
rails-c8ff9bd63a2371b6f0f0b4f48abf29cf89a1d397.tar.bz2
rails-c8ff9bd63a2371b6f0f0b4f48abf29cf89a1d397.zip
Merge branch 'master' into feature/reselect-method
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date_time/calculations.rb')
-rw-r--r--activesupport/lib/active_support/core_ext/date_time/calculations.rb2
1 files changed, 1 insertions, 1 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 e61b23f842..bc670c3e76 100644
--- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb
@@ -110,7 +110,7 @@ class DateTime
# instance time. Do not use this method in combination with x.months, use
# months_since instead!
def since(seconds)
- self + Rational(seconds.round, 86400)
+ self + Rational(seconds, 86400)
end
alias :in :since