aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-11-24 12:14:45 -0600
committerJoshua Peek <josh@joshpeek.com>2008-11-24 12:17:07 -0600
commit8aeed003f562fe9199614d013163c89b5182cd33 (patch)
tree3ecb15bacd08154420073952361422e09043d55a
parenta76351093c014029a8c9ec7c9c341dde11c57f4d (diff)
downloadrails-8aeed003f562fe9199614d013163c89b5182cd33.tar.gz
rails-8aeed003f562fe9199614d013163c89b5182cd33.tar.bz2
rails-8aeed003f562fe9199614d013163c89b5182cd33.zip
prototype and scripty helpers require json
-rw-r--r--actionpack/lib/action_view/helpers/prototype_helper.rb1
-rw-r--r--actionpack/lib/action_view/helpers/scriptaculous_helper.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index a3eccc741d..7fab3102e7 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -1,4 +1,5 @@
require 'set'
+require 'active_support/json'
module ActionView
module Helpers
diff --git a/actionpack/lib/action_view/helpers/scriptaculous_helper.rb b/actionpack/lib/action_view/helpers/scriptaculous_helper.rb
index 1d01dafd0e..e16935ea87 100644
--- a/actionpack/lib/action_view/helpers/scriptaculous_helper.rb
+++ b/actionpack/lib/action_view/helpers/scriptaculous_helper.rb
@@ -1,4 +1,5 @@
require 'action_view/helpers/javascript_helper'
+require 'active_support/json'
module ActionView
module Helpers