aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-06-01 07:49:25 -0700
committerJosé Valim <jose.valim@gmail.com>2011-06-01 07:49:25 -0700
commitfba977dfa359f23b88908462869eb1c2bee6b78c (patch)
tree43d6dfccf5413edb07067cc59ffffd6b730f0cce /actionpack/lib
parent1ff4bfc147d301d37fe3f9c5f1d081dcd16ec35d (diff)
parent3a2ef52ad6cede6a4bab48e4689f2466c10cb6b8 (diff)
downloadrails-fba977dfa359f23b88908462869eb1c2bee6b78c.tar.gz
rails-fba977dfa359f23b88908462869eb1c2bee6b78c.tar.bz2
rails-fba977dfa359f23b88908462869eb1c2bee6b78c.zip
Merge pull request #1448 from ernie/attr_internal_require
Require attr_internal before using in ActionView::Helpers
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/controller_helper.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/helpers/controller_helper.rb b/actionpack/lib/action_view/helpers/controller_helper.rb
index e22331cb3c..db59bca159 100644
--- a/actionpack/lib/action_view/helpers/controller_helper.rb
+++ b/actionpack/lib/action_view/helpers/controller_helper.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/module/attr_internal'
+
module ActionView
module Helpers
# This module keeps all methods and behavior in ActionView