diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-17 23:26:22 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-17 23:42:42 -0700 |
| commit | 7254517f1efe896c53330d4ac0c4a48cd6559614 (patch) | |
| tree | 43d32f68150aad890ee23bf73c76236a9531747e /activesupport/lib/active_support/option_merger.rb | |
| parent | cdce6131500820c9fd88709c46d84e57a9fd3f90 (diff) | |
| parent | 1bf9fe75a6473cb7501cae544cab772713e68cef (diff) | |
| download | rails-7254517f1efe896c53330d4ac0c4a48cd6559614.tar.gz rails-7254517f1efe896c53330d4ac0c4a48cd6559614.tar.bz2 rails-7254517f1efe896c53330d4ac0c4a48cd6559614.zip | |
Merge pull request #22806 from Envek/solid_durations
Introduce weeks and hours periods to Duration.
Change 1.week to create a 1 week duration instead of 7 days and 1.hour
to create a 1 hour duration instead of 3600 seconds.
Diffstat (limited to 'activesupport/lib/active_support/option_merger.rb')
0 files changed, 0 insertions, 0 deletions