diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-04-02 09:32:21 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-04-02 09:32:21 +0100 |
| commit | b2291c5d3e77c9d97a61bcb63cc4ee5449476a01 (patch) | |
| tree | d38d3b2a274556c3f566ddb13faa824828feb189 /lib | |
| parent | 82f2c3cb9dace0722532cf220ea146443b097264 (diff) | |
| parent | 4b0e6c09fc407f886ca3eb5cef8a09e05c984978 (diff) | |
Merge remote-tracking branch 'openaustralia_github/email_alert_path_fixes' into hotfix/0.8.0.1
Diffstat (limited to 'lib')
| -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 => '', |