diff options
author | Ryan T. Hosford <tad.hosford@gmail.com> | 2016-03-24 12:11:51 -0500 |
---|---|---|
committer | Ryan T. Hosford <tad.hosford@gmail.com> | 2016-04-04 08:51:29 -0500 |
commit | f99106805d7275c790466b31514e52544ee1a8d6 (patch) | |
tree | 3cf2e494efabdb81716b6b6ade3834faa4ea5747 /actionpack/lib/action_controller | |
parent | 8040e55063abde6eeaac2702ca9961ce34a2d6c7 (diff) | |
download | rails-f99106805d7275c790466b31514e52544ee1a8d6.tar.gz rails-f99106805d7275c790466b31514e52544ee1a8d6.tar.bz2 rails-f99106805d7275c790466b31514e52544ee1a8d6.zip |
Fixes #24239
- skip calling helper_method if it's not there: if we don't have helpers, we needn't define one.
- tests that an api controller can include and use ActionController::Cookies
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/metal/cookies.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/cookies.rb b/actionpack/lib/action_controller/metal/cookies.rb index f8efb2b076..44925641a1 100644 --- a/actionpack/lib/action_controller/metal/cookies.rb +++ b/actionpack/lib/action_controller/metal/cookies.rb @@ -3,7 +3,7 @@ module ActionController #:nodoc: extend ActiveSupport::Concern included do - helper_method :cookies + helper_method :cookies if defined?(helper_method) end private |