diff options
| author | Raphael Sofaer <raphael@joindiaspora.com> | 2011-07-21 00:10:29 +0400 |
|---|---|---|
| committer | Raphael Sofaer <raphael@joindiaspora.com> | 2011-07-22 05:23:33 +0400 |
| commit | 7382dfb7be498d3c9d2b37311fd88ac98158074d (patch) | |
| tree | ed8be141398dcfe4d06323b4805f614f52e85fe6 /config | |
| parent | e19fb6d0f885afaaaa48708da2f29f60ecfc2bed (diff) | |
Multi-server spec now successfully passes along a reshare
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.yml.example | 2 | ||||
| -rw-r--r-- | config/environments/integration_1.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/application.yml.example b/config/application.yml.example index ea01833be..6577ffd9d 100644 --- a/config/application.yml.example +++ b/config/application.yml.example @@ -157,7 +157,9 @@ test: integration_1: <<: *defaults pod_url: "http://localhost:45789" + enable_splunk_logging: false integration_2: <<: *defaults pod_url: "http://localhost:34658" + enable_splunk_logging: false diff --git a/config/environments/integration_1.rb b/config/environments/integration_1.rb index 1279e645a..86f1c3043 100644 --- a/config/environments/integration_1.rb +++ b/config/environments/integration_1.rb @@ -15,13 +15,12 @@ Diaspora::Application.configure do # Show full error reports and disable caching config.consider_all_requests_local = true - config.action_view.debug_rjs = true config.action_controller.perform_caching = false # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = false config.active_support.deprecation = :log - #config.threadsafe! + config.threadsafe! # Monkeypatch around the nasty "2.5MB exception page" issue, caused by very large environment vars # This snippet via: http://stackoverflow.com/questions/3114993/exception-pages-in-development-mode-take-upwards-of-15-30-seconds-to-render-why |