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 | |
| 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')
| -rw-r--r-- | config/initializers/session_store.rb | 2 | ||||
| -rw-r--r-- | config/initializers/theme_loader.rb | 3 |
2 files changed, 2 insertions, 3 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 diff --git a/config/initializers/theme_loader.rb b/config/initializers/theme_loader.rb index 8908dc07e..877149e9d 100644 --- a/config/initializers/theme_loader.rb +++ b/config/initializers/theme_loader.rb @@ -2,9 +2,8 @@ # It is used by our config/routes.rb to decide which route extension files to load. $alaveteli_route_extensions = [] -theme_urls = MySociety::Config.get("THEME_URLS", []) if ENV["RAILS_ENV"] != "test" # Don't let the themes interfere with Alaveteli specs - for url in theme_urls.reverse + for url in Configuration::theme_urls.reverse theme_name = url.sub(/.*\/(.*).git/, "\\1") theme_main_include = File.expand_path "../../../vendor/plugins/#{theme_name}/lib/alavetelitheme.rb", __FILE__ if File.exists? theme_main_include |