Upgrade to 3.1 step 1

This commit is contained in:
magnolia-fan
2011-09-08 02:40:59 +04:00
parent 495d0a08df
commit 6982e0cb32
11 changed files with 142 additions and 86 deletions
+1 -1
View File
@@ -4,4 +4,4 @@
# If you change this key, all old signed cookies will become invalid!
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
Beathaven::Application.config.secret_token = '9f7bfb8b5bebe7befaa38b67e70694dc98c19780eb161b75b1c7251a93874c27138865f5cc3319a72c244560c74994eb69f193f17333943f2a18b867389c48c7'
Beathaven::Application.config.secret_token = 'dfe93b51a8732e4060714fe1a7040bbf708cc724bea9dd91cba2ba4017c222b64240626eb3b71918fab0ea224e9c9b851e60bf8a57f7a4c2976dee14bcdda6ac'
+1 -1
View File
@@ -1,6 +1,6 @@
# Be sure to restart your server when you modify this file.
Beathaven::Application.config.session_store :cookie_store, :key => '_beathaven_session'
Beathaven::Application.config.session_store :cookie_store, key: '_beathaven_session'
# Use the database for sessions instead of the cookie-based default,
# which shouldn't be used to store highly confidential information
+14
View File
@@ -0,0 +1,14 @@
# Be sure to restart your server when you modify this file.
#
# This file contains settings for ActionController::ParamsWrapper which
# is enabled by default.
# 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]
end
# Disable root element in JSON by default.
ActiveSupport.on_load(:active_record) do
self.include_root_in_json = false
end