diff options
author | Louise Crow <louise.crow@gmail.com> | 2012-10-17 15:05:37 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2012-10-17 15:05:37 +0100 |
commit | c8a203e221a55a5653596f5a8e092bd3877df9c4 (patch) | |
tree | 3de4ac1214eca2c12a357e5f338b0d3055e79721 /config/initializers/session_store.rb | |
parent | e6dc0f6606b26e13cb0cd16124fdb2aad3c1b5a6 (diff) | |
parent | cc7bc36d5748c9baa0cfd8e44395923cc5792f32 (diff) |
Merge branch 'release/0.6.7'
Conflicts:
locale/cs/app.po
locale/ro_RO/app.po
Diffstat (limited to 'config/initializers/session_store.rb')
-rw-r--r-- | config/initializers/session_store.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index a05d2c7d1..8cfa333f2 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -7,7 +7,7 @@ ActionController::Base.session = { :key => '_wdtk_cookie_session', - :secret => MySociety::Config.get("COOKIE_STORE_SESSION_SECRET", 'this default is insecure as code is open source, please override for live sites in config/general; this will do for local development') + :secret => Configuration::cookie_store_session_secret } ActionController::Base.session_store = :cookie_store |