diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2015-12-30 17:45:23 -0200 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2015-12-30 17:45:23 -0200 |
| commit | 136e5ea15818573701a389715af7e725bd4aea82 (patch) | |
| tree | c86183c4360b76901173846cbf6cc5dfe48b638e /actionpack/lib | |
| parent | 692bb7cebc7df6494adf6b068321eb3fc29acaf9 (diff) | |
| parent | 040ed26656589b9e61dbb05cd57476b7c4a5b807 (diff) | |
| download | rails-136e5ea15818573701a389715af7e725bd4aea82.tar.gz rails-136e5ea15818573701a389715af7e725bd4aea82.tar.bz2 rails-136e5ea15818573701a389715af7e725bd4aea82.zip | |
Merge pull request #22855 from rafbm/avoid-time-parse
Avoid `Time.parse` for static date
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/metal/conditional_get.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb index d86a793e4c..f8e0d9cf6c 100644 --- a/actionpack/lib/action_controller/metal/conditional_get.rb +++ b/actionpack/lib/action_controller/metal/conditional_get.rb @@ -228,7 +228,7 @@ module ActionController expires_in 100.years, public: public yield if stale?(etag: "#{version}-#{request.fullpath}", - last_modified: Time.parse('2011-01-01').utc, + last_modified: Time.new(2011, 1, 1).utc, public: public) end |