Permalink
Browse files

1.8.7 compat.

* 1.8 style hashes.
* Remove erroneous require of 'taggings' that was causing a double load.
  • Loading branch information...
1 parent 4c56c1f commit edc4add88140261530d20e5031fe1a452c3a88a4 @xaviershay committed Feb 19, 2012
View
1 config/initializers/acts_as_taggable_on_steroids.rb
@@ -8,5 +8,4 @@
$LOAD_PATH.unshift(File.expand_path('../../../lib/acts_as_taggable_on_steroids/lib', __FILE__))
require 'acts_as_taggable_on_steroids/init'
require 'tag_list'
-require 'tagging'
require 'tags_helper'
View
2 config/initializers/session_store.rb
@@ -1,6 +1,6 @@
# Be sure to restart your server when you modify this file.
-Enki::Application.config.session_store :cookie_store, key: '_enki_session'
+Enki::Application.config.session_store :cookie_store, :key => '_enki_session'
# Use the database for sessions instead of the cookie-based default,
# which shouldn't be used to store highly confidential information
View
2 config/initializers/wrap_parameters.rb
@@ -5,6 +5,6 @@
# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
ActiveSupport.on_load(:action_controller) do
- wrap_parameters format: [:json]
+ wrap_parameters :format => [:json]
end

0 comments on commit edc4add

Please sign in to comment.