diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-14 13:50:37 +0000 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-12-19 14:04:42 -0200 |
| commit | ed23957d2f78e0dc46aaaf6f98c2053e7fa2bdcf (patch) | |
| tree | 74dbfd3f1b677b9163ee6383aa18c16914d39c21 /spec | |
| parent | f95acda00abf2a5bc17ab8de79efb4d7e2e0cc29 (diff) | |
| download | gitlab-ce-ed23957d2f78e0dc46aaaf6f98c2053e7fa2bdcf.tar.gz | |
Merge branch 'dm-batchloader-project' into 'master'
Include project in BatchLoader key to prevent returning blobs for the wrong project
Closes gitlab-ee#4325
See merge request gitlab-org/gitlab-ce!15936
(cherry picked from commit f51141878171c1162818f8fa0133125a5e92d3eb)
6c4f6d37 Include project in BatchLoader key to prevent returning blobs for the wrong project
f871027e Clear BatchLoader after each spec to prevent holding onto records longer than necessary
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/support/batch_loader.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/support/batch_loader.rb b/spec/support/batch_loader.rb new file mode 100644 index 00000000000..bb790e660a6 --- /dev/null +++ b/spec/support/batch_loader.rb @@ -0,0 +1,5 @@ +RSpec.configure do |config| + config.after do + BatchLoader::Executor.clear_current + end +end |