diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-01-25 20:30:29 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-01-25 20:30:29 +0000 |
| commit | e74c6ae6b60900c7f0b6a34c843fa2630a4685bc (patch) | |
| tree | a65191948ae860397df698dfbc85ba91c96f4e85 /Gemfile.lock | |
| parent | 844bf10847af67d2561ef137fcfbe6ba61204e6c (diff) | |
| parent | 88e627cf14b47ca5d63f2cb0ffe24124fb4b116a (diff) | |
| download | gitlab-ce-e74c6ae6b60900c7f0b6a34c843fa2630a4685bc.tar.gz | |
Merge branch 'refresh-authorizations-fork-join' into 'master'
Fix race conditions for AuthorizedProjectsWorker
Closes #26194 and #26310
See merge request !8701
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c9115982838..133e47e1ea4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -760,7 +760,7 @@ GEM teaspoon-jasmine (2.2.0) teaspoon (>= 1.0.0) temple (0.7.7) - test_after_commit (0.4.2) + test_after_commit (1.1.0) activerecord (>= 3.2) thin (1.7.0) daemons (~> 1.0, >= 1.0.9) @@ -997,7 +997,7 @@ DEPENDENCIES sys-filesystem (~> 1.1.6) teaspoon (~> 1.1.0) teaspoon-jasmine (~> 2.2.0) - test_after_commit (~> 0.4.2) + test_after_commit (~> 1.1) thin (~> 1.7.0) timecop (~> 0.8.0) truncato (~> 0.7.8) |