aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2011-04-12 22:35:24 -0500
committerJoshua Peek <josh@joshpeek.com>2011-04-12 22:35:24 -0500
commitf004c8868196f62a6810bc7e693b407fd27a5fa7 (patch)
tree53b05e2adf195880080e4758254dcccf49219611 /actionpack/lib/action_view/helpers.rb
parent1b5b53da5e4beb24dc7d41a1e9e5d72b82586985 (diff)
parenta4518517f77055cea0d9fe552d2df393140679de (diff)
downloadrails-f004c8868196f62a6810bc7e693b407fd27a5fa7.tar.gz
rails-f004c8868196f62a6810bc7e693b407fd27a5fa7.tar.bz2
rails-f004c8868196f62a6810bc7e693b407fd27a5fa7.zip
Merge branch 'sprockets'
Diffstat (limited to 'actionpack/lib/action_view/helpers.rb')
-rw-r--r--actionpack/lib/action_view/helpers.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/helpers.rb b/actionpack/lib/action_view/helpers.rb
index d338ce616a..cb1ab64121 100644
--- a/actionpack/lib/action_view/helpers.rb
+++ b/actionpack/lib/action_view/helpers.rb
@@ -22,6 +22,7 @@ module ActionView #:nodoc:
autoload :RecordTagHelper
autoload :SanitizeHelper
autoload :ScriptaculousHelper
+ autoload :SprocketsHelper
autoload :TagHelper
autoload :TextHelper
autoload :TranslationHelper
@@ -52,6 +53,7 @@ module ActionView #:nodoc:
include RecordTagHelper
include SanitizeHelper
include ScriptaculousHelper
+ include SprocketsHelper
include TagHelper
include TextHelper
include TranslationHelper