diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-12-21 00:04:55 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-21 00:04:55 +0900 |
| commit | 9c87474d82165277a6a5ed3e04b6b88402968134 (patch) | |
| tree | b81f4d3fdf5cbcfad38e3763a2bde19ed5655269 /actionpack | |
| parent | 3e50a1bcd4b5f3ce26ec94ba061d039c0a6f8062 (diff) | |
| parent | d5197d59a112581e8838f6867c0a02806bace46a (diff) | |
| download | rails-9c87474d82165277a6a5ed3e04b6b88402968134.tar.gz rails-9c87474d82165277a6a5ed3e04b6b88402968134.tar.bz2 rails-9c87474d82165277a6a5ed3e04b6b88402968134.zip | |
Merge pull request #34761 from kamipo/require-ruby-2.5
Use native `Array#append`, `Array#prepend`, `Hash#transform_keys`, and `Hash#transform_keys!`
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal/conditional_get.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/renderer.rb | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb index d6911ee2b5..29d1919ec5 100644 --- a/actionpack/lib/action_controller/metal/conditional_get.rb +++ b/actionpack/lib/action_controller/metal/conditional_get.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "active_support/core_ext/hash/keys" - module ActionController module ConditionalGet extend ActiveSupport::Concern diff --git a/actionpack/lib/action_controller/renderer.rb b/actionpack/lib/action_controller/renderer.rb index 2b4559c760..cf8c0159e2 100644 --- a/actionpack/lib/action_controller/renderer.rb +++ b/actionpack/lib/action_controller/renderer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "active_support/core_ext/hash/keys" - module ActionController # ActionController::Renderer allows you to render arbitrary templates # without requirement of being in controller actions. |