diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-02 13:20:51 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-02 13:20:51 +0300 |
commit | 2955ca613bfe13cd15c43d082be934075636ae0e (patch) | |
tree | 4c367f600ff0b7f273c3b4194e97060141b54b02 /config/environments/test.rb | |
parent | e1e67d383e4b56c9e1848aebc175402a71502e82 (diff) | |
parent | 09e712c0fb721059e4b2619eb9fc104257fc492d (diff) |
Merge branch 'master' into reference-pipeline-and-caching
Diffstat (limited to 'config/environments/test.rb')
-rw-r--r-- | config/environments/test.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/environments/test.rb b/config/environments/test.rb index 2ff1b83482f..d6842affa6c 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,4 +1,4 @@ -Gitlab::Application.configure do +Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb # The test environment is used exclusively to run your application's @@ -10,7 +10,7 @@ Gitlab::Application.configure do config.cache_store = :null_store # Configure static asset server for tests with Cache-Control for performance - config.serve_static_assets = true + config.serve_static_files = true config.static_cache_control = "public, max-age=3600" # Show full error reports and disable caching @@ -34,4 +34,6 @@ Gitlab::Application.configure do config.eager_load = false config.cache_store = :null_store + + config.active_job.queue_adapter = :test end |