diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-07-12 03:07:22 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-12 03:07:22 -0300 |
| commit | 2afd5e78b842a84e401a030bc747bf60879863e2 (patch) | |
| tree | 4447425d796bd6223f3df4f334c86b3b77a099c5 /activesupport/lib/active_support/values/time_zone.rb | |
| parent | 108a407b7d41ba47317cf448dbb5e032ba1b039f (diff) | |
| parent | 424e961be776d9918f39660d43439fc1973f680e (diff) | |
| download | rails-2afd5e78b842a84e401a030bc747bf60879863e2.tar.gz rails-2afd5e78b842a84e401a030bc747bf60879863e2.tar.bz2 rails-2afd5e78b842a84e401a030bc747bf60879863e2.zip | |
Merge pull request #25793 from jmondo/strptime
Raise ArgumentError for bad strptime arguments
Diffstat (limited to 'activesupport/lib/active_support/values/time_zone.rb')
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index 19420cee5e..eb89a6d4c5 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -447,6 +447,7 @@ module ActiveSupport private def parts_to_time(parts, now) + raise ArgumentError, "invalid date" if parts.nil? return if parts.empty? time = Time.new( |