diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-12-29 02:18:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-29 02:18:38 -0500 |
| commit | eb6a6141a66e052deb58580448d7c0fa6aa675ba (patch) | |
| tree | 0017a57044ec8e466c97cc6b7879d39caa6c1ffa /actionpack/lib/action_controller/metal/conditional_get.rb | |
| parent | 447e1a48811fa053e8bef954376d1ad47bdb5cef (diff) | |
| parent | fcec126eaa4f835c837bc75efa78008667b2ec5b (diff) | |
| download | rails-eb6a6141a66e052deb58580448d7c0fa6aa675ba.tar.gz rails-eb6a6141a66e052deb58580448d7c0fa6aa675ba.tar.bz2 rails-eb6a6141a66e052deb58580448d7c0fa6aa675ba.zip | |
Merge branch 'master' into clear_all_environments_log_by_default
Diffstat (limited to 'actionpack/lib/action_controller/metal/conditional_get.rb')
| -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 89bf60a0bb..eb636fa3f6 100644 --- a/actionpack/lib/action_controller/metal/conditional_get.rb +++ b/actionpack/lib/action_controller/metal/conditional_get.rb @@ -238,7 +238,7 @@ module ActionController ) options.delete(:private) - response.cache_control[:extras] = options.map { |k,v| "#{k}=#{v}" } + response.cache_control[:extras] = options.map { |k, v| "#{k}=#{v}" } response.date = Time.now unless response.date? end |