diff options
| author | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-08-17 22:51:13 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-08-17 22:51:13 -0300 |
| commit | cdc00aba62ffb0f0af452f5152aafeb5e490962e (patch) | |
| tree | 071ca4766dd07b9af34bbebf902c50a27c5c2b4d /actionview/lib/action_view.rb | |
| parent | cc9091c3e719facd0f73c8ab425a5bb9a7d0a65b (diff) | |
| parent | c78da4d5c472f7254ed609ef753d7b1719732802 (diff) | |
| download | rails-cdc00aba62ffb0f0af452f5152aafeb5e490962e.tar.gz rails-cdc00aba62ffb0f0af452f5152aafeb5e490962e.tar.bz2 rails-cdc00aba62ffb0f0af452f5152aafeb5e490962e.zip | |
Merge branch 'loofah'
Conflicts:
Gemfile
Diffstat (limited to 'actionview/lib/action_view.rb')
| -rw-r--r-- | actionview/lib/action_view.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionview/lib/action_view.rb b/actionview/lib/action_view.rb index 50712e0830..6a1837c6e2 100644 --- a/actionview/lib/action_view.rb +++ b/actionview/lib/action_view.rb @@ -86,7 +86,6 @@ module ActionView super ActionView::Helpers.eager_load! ActionView::Template.eager_load! - HTML.eager_load! end end |