aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-03-12 09:46:31 -0700
committerLouise Crow <louise.crow@gmail.com>2013-03-12 09:46:31 -0700
commitbf6fc976fb29adbc8d46336d3d010c99effcaef0 (patch)
tree4e74742f2806d06f0888e2a327c7dd0494986c9e /lib
parent0735585de2d037e3b7495d701f2f2e199f483889 (diff)
parent334769f7f261773d9c07a1b92c811ef588dd10b2 (diff)
Merge remote-tracking branch 'openaustralia_github/force-ssl' into develop
Conflicts: Gemfile.lock
Diffstat (limited to 'lib')
-rw-r--r--lib/configuration.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/configuration.rb b/lib/configuration.rb
index d1da45fcf..f155ed7a4 100644
--- a/lib/configuration.rb
+++ b/lib/configuration.rb
@@ -18,6 +18,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 => '',