diff options
| author | Andreas Brandl <abrandl@gitlab.com> | 2019-07-12 13:30:42 +0000 |
|---|---|---|
| committer | Andreas Brandl <abrandl@gitlab.com> | 2019-07-12 13:30:42 +0000 |
| commit | e13f07f1954f9f4d1cffed0f4c6d63c8ee7aa2a6 (patch) | |
| tree | 147f8c4911f5efa9a4157103aa394f0a4bca4e4d /config | |
| parent | 5ea899d34f6332733bb5aee225c5f3ced340cb24 (diff) | |
| parent | d4a919679a1eb5d3e2aaed4b920e6027d2482971 (diff) | |
| download | gitlab-ce-e13f07f1954f9f4d1cffed0f4c6d63c8ee7aa2a6.tar.gz | |
Merge branch 'js-specs-transactions' into 'master'
Use transactions in JS feature specs
Closes #60207
See merge request gitlab-org/gitlab-ce!27496
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/test.rb | 2 | ||||
| -rw-r--r-- | config/initializers/active_record_query_cache.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config/environments/test.rb b/config/environments/test.rb index a564ef74734..153d16e4e55 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -41,7 +41,7 @@ Rails.application.configure do # Print deprecation notices to the stderr config.active_support.deprecation = :stderr - config.eager_load = false + config.eager_load = true config.cache_store = :null_store diff --git a/config/initializers/active_record_query_cache.rb b/config/initializers/active_record_query_cache.rb new file mode 100644 index 00000000000..61505a1edd3 --- /dev/null +++ b/config/initializers/active_record_query_cache.rb @@ -0,0 +1,3 @@ +# frozen_string_literal: true + +ActiveRecord::ConnectionAdapters::ConnectionPool.prepend Gitlab::Patch::ActiveRecordQueryCache |