diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-11-12 15:06:46 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-11-12 15:06:46 +0000 |
| commit | a1ca0f9123a3aea843ba35508a97d5a4fd5cb0db (patch) | |
| tree | b9d3c1390f6b9c8b201e47507f26829b239f2773 /lib/configuration.rb | |
| parent | 8271b2c664f04d1b68a8b4d4fdb801f5c6b00b8c (diff) | |
| parent | c96b27c301023a6a1f50c12f0c387205b0255836 (diff) | |
Merge remote-tracking branch 'origin/release/0.6.8'0.6.8
Conflicts:
locale/cs/app.po
locale/sl/app.po
locale/sq/app.po
locale/tr/app.po
locale/uk/app.po
Diffstat (limited to 'lib/configuration.rb')
| -rw-r--r-- | lib/configuration.rb | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/configuration.rb b/lib/configuration.rb index 5f761a1f6..abd0f5cdc 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -17,19 +17,20 @@ 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 => '', :RAW_EMAILS_LOCATION => 'files/raw_emails', @@ -41,15 +42,18 @@ module Configuration :SITE_NAME => 'Alaveteli', :SKIP_ADMIN_AUTH => false, :SPECIAL_REPLY_VERY_LATE_AFTER_DAYS => 60, + :THEME_BRANCH => false, :THEME_URL => "", :THEME_URLS => [], + :TIME_ZONE => "UTC", :TRACK_SENDER_EMAIL => 'contact@localhost', :TRACK_SENDER_NAME => 'Alaveteli', :TWITTER_USERNAME => '', + :TWITTER_WIDGET_ID => false, :USE_DEFAULT_BROWSER_LANGUAGE => true, - :USE_GHOSTSCRIPT_COMPRESSION => nil, + :USE_GHOSTSCRIPT_COMPRESSION => false, :UTILITY_SEARCH_PATH => ["/usr/bin", "/usr/local/bin"], - :VARNISH_HOST => nil, + :VARNISH_HOST => '', :WORKING_OR_CALENDAR_DAYS => 'working', } |