diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-19 18:56:20 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-19 18:56:20 -0700 |
| commit | 56127c664a4f51e18728ed08bdf00064efee89c2 (patch) | |
| tree | cd04bdcc929ea4232d44d02f51192f6459928769 /lib/configuration.rb | |
| parent | f7878a229b597b5fc7ba8172c8e8c94a8fd9d7b6 (diff) | |
| parent | dc71db3f98c64fb93ac7d74b8a424f7849a33786 (diff) | |
Merge branch 'develop' into rails-3-develop
Conflicts:
Gemfile
Gemfile.lock
app/views/admin_request/show.html.erb
config/environment.rb
Diffstat (limited to 'lib/configuration.rb')
| -rw-r--r-- | lib/configuration.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/configuration.rb b/lib/configuration.rb index f76a1f533..cc85f0db3 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -24,6 +24,7 @@ module AlaveteliConfiguration :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 => '', |