diff options
| author | Xavier Noria <fxn@hashref.com> | 2017-07-02 13:50:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-02 13:50:25 -0700 |
| commit | 92c29d82eb2f323bb1338a039229a66057a7d137 (patch) | |
| tree | 050eea5a719faa416b64b804617f8755b6500e09 /activesupport/lib/active_support/duration | |
| parent | f851e1f705f26d8f92f0fc1b265b20bc389d23cb (diff) | |
| parent | f443460670576cd82a806a851b7124479e8325c9 (diff) | |
| download | rails-92c29d82eb2f323bb1338a039229a66057a7d137.tar.gz rails-92c29d82eb2f323bb1338a039229a66057a7d137.tar.bz2 rails-92c29d82eb2f323bb1338a039229a66057a7d137.zip | |
Merge branch 'master' into require_relative_2017
Diffstat (limited to 'activesupport/lib/active_support/duration')
| -rw-r--r-- | activesupport/lib/active_support/duration/iso8601_serializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/duration/iso8601_serializer.rb b/activesupport/lib/active_support/duration/iso8601_serializer.rb index 969e1a46c2..83c3a46692 100644 --- a/activesupport/lib/active_support/duration/iso8601_serializer.rb +++ b/activesupport/lib/active_support/duration/iso8601_serializer.rb @@ -15,12 +15,12 @@ module ActiveSupport parts, sign = normalize return "PT0S".freeze if parts.empty? - output = "P" + output = "P".dup output << "#{parts[:years]}Y" if parts.key?(:years) output << "#{parts[:months]}M" if parts.key?(:months) output << "#{parts[:weeks]}W" if parts.key?(:weeks) output << "#{parts[:days]}D" if parts.key?(:days) - time = "" + time = "".dup time << "#{parts[:hours]}H" if parts.key?(:hours) time << "#{parts[:minutes]}M" if parts.key?(:minutes) if parts.key?(:seconds) |