diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-19 14:02:25 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-19 14:02:25 -0700 |
| commit | b394b67663916c865452cc784d8642f72a305be5 (patch) | |
| tree | 63c92172fe7813e6354da0ead628ed2192ef0ee2 /lib/configuration.rb | |
| parent | 8d21293461ce4b564261686ab8d6460f5fe51259 (diff) | |
| parent | f83b917ec2c59da0ce7c27da19b740366da58419 (diff) | |
Merge branch 'release/0.8' into wdtk
Conflicts:
app/controllers/admin_request_controller.rb
app/views/contact_mailer/from_admin_message.rhtml
Diffstat (limited to 'lib/configuration.rb')
| -rw-r--r-- | lib/configuration.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/configuration.rb b/lib/configuration.rb index 11fe1c56e..fca48782e 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -4,10 +4,9 @@ module Configuration DEFAULTS = { - :ADMIN_BASE_URL => '', :ADMIN_PASSWORD => '', - :ADMIN_PUBLIC_URL => '', :ADMIN_USERNAME => '', + :DISABLE_EMERGENCY_USER => false, :AVAILABLE_LOCALES => '', :BLACKHOLE_PREFIX => 'do-not-reply-to-this-address', :BLOG_FEED => '', @@ -20,6 +19,7 @@ module Configuration :EXCEPTION_NOTIFICATIONS_FROM => '', :EXCEPTION_NOTIFICATIONS_TO => '', :FORCE_REGISTRATION_ON_NEW_REQUEST => false, + :FORCE_SSL => true, :FORWARD_NONBOUNCE_RESPONSES_TO => 'user-support@localhost', :FRONTPAGE_PUBLICBODY_EXAMPLES => '', :GA_CODE => '', |