diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-25 17:54:24 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-25 17:54:24 +0100 |
| commit | 52eaa2f29da5346fd3d7e66d00fda220a6f9dd01 (patch) | |
| tree | b7175387211b15236fcecdb93547b44ba9b55390 /lib | |
| parent | 46c160d3b7b121ccda404c56e2cc54f48b16703d (diff) | |
| parent | 3474b961f86ad743b958e9fce2c39e8e54ac6a95 (diff) | |
Merge commit '3474b961f86ad743b958e9fce2c39e8e54ac6a95' into feature/nils_in_config
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/configuration.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/configuration.rb b/lib/configuration.rb index baec8b67a..0266d05a4 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -17,19 +17,19 @@ module Configuration :DEBUG_RECORD_MEMORY => false, :DEFAULT_LOCALE => '', :DOMAIN => 'localhost:3000', - :EXCEPTION_NOTIFICATIONS_FROM => nil, - :EXCEPTION_NOTIFICATIONS_TO => nil, + :EXCEPTION_NOTIFICATIONS_FROM => '', + :EXCEPTION_NOTIFICATIONS_TO => '', :FORCE_REGISTRATION_ON_NEW_REQUEST => false, :FORWARD_NONBOUNCE_RESPONSES_TO => 'user-support@localhost', :FRONTPAGE_PUBLICBODY_EXAMPLES => '', :GA_CODE => '', :GAZE_URL => '', - :HTML_TO_PDF_COMMAND => nil, + :HTML_TO_PDF_COMMAND => '', :INCOMING_EMAIL_DOMAIN => 'localhost', :INCOMING_EMAIL_PREFIX => '', :INCOMING_EMAIL_SECRET => 'dummysecret', :ISO_COUNTRY_CODE => 'GB', - :MAX_REQUESTS_PER_USER_PER_DAY => nil, + :MAX_REQUESTS_PER_USER_PER_DAY => '', :MTA_LOG_TYPE => 'exim', :NEW_RESPONSE_REMINDER_AFTER_DAYS => [3, 10, 24], :OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS => '', @@ -49,9 +49,9 @@ module Configuration :TRACK_SENDER_NAME => 'Alaveteli', :TWITTER_USERNAME => '', :USE_DEFAULT_BROWSER_LANGUAGE => true, - :USE_GHOSTSCRIPT_COMPRESSION => nil, + :USE_GHOSTSCRIPT_COMPRESSION => '', :UTILITY_SEARCH_PATH => ["/usr/bin", "/usr/local/bin"], - :VARNISH_HOST => nil, + :VARNISH_HOST => '', :WORKING_OR_CALENDAR_DAYS => 'working', } |