diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2016-04-04 21:50:26 +0100 |
|---|---|---|
| committer | Andrew White <pixeltrix@users.noreply.github.com> | 2016-04-04 21:50:26 +0100 |
| commit | 0f51dda718696b67b5e98b748e75ea49fc05b360 (patch) | |
| tree | b51fa31fb8b8a4df4211fd9af12573760408cacf /actionpack/lib/action_controller | |
| parent | 426458d50cc0ef5b25d42572c46dac1001fc8007 (diff) | |
| parent | f99106805d7275c790466b31514e52544ee1a8d6 (diff) | |
| download | rails-0f51dda718696b67b5e98b748e75ea49fc05b360.tar.gz rails-0f51dda718696b67b5e98b748e75ea49fc05b360.tar.bz2 rails-0f51dda718696b67b5e98b748e75ea49fc05b360.zip | |
Merge pull request #24304 from rthbound/24239-work
Fixes #24239
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 |