diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-04-02 10:01:58 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-04-02 10:01:58 +0100 |
| commit | ed61622e263a8e2958dca87ace1de9a72c6e1cd8 (patch) | |
| tree | e944e14d61d179edd606d733309ea63b632749be /lib/configuration.rb | |
| parent | 82f2c3cb9dace0722532cf220ea146443b097264 (diff) | |
| parent | e6f59296a3e89276a3c9511ec61023d0f54c27e3 (diff) | |
Merge branch 'hotfix/0.8.0.1'0.8.0.1
Diffstat (limited to 'lib/configuration.rb')
| -rw-r--r-- | lib/configuration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/configuration.rb b/lib/configuration.rb index fca48782e..4a0e0339b 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -6,7 +6,6 @@ module Configuration DEFAULTS = { :ADMIN_PASSWORD => '', :ADMIN_USERNAME => '', - :DISABLE_EMERGENCY_USER => false, :AVAILABLE_LOCALES => '', :BLACKHOLE_PREFIX => 'do-not-reply-to-this-address', :BLOG_FEED => '', @@ -15,6 +14,7 @@ module Configuration :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', :DEBUG_RECORD_MEMORY => false, :DEFAULT_LOCALE => '', + :DISABLE_EMERGENCY_USER => false, :DOMAIN => 'localhost:3000', :EXCEPTION_NOTIFICATIONS_FROM => '', :EXCEPTION_NOTIFICATIONS_TO => '', |