diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-07-04 19:57:00 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-07-04 19:57:00 +0300 |
| commit | ecded054f1b64a39c59777cd8943f97a6c130e01 (patch) | |
| tree | 13ffe8d3f284b3b845ce2eb067027711e07062dc /changelogs | |
| parent | a24c484cde8de5c526b9d0a11cdec5a8f58b7a7d (diff) | |
| parent | 133b9f41088288a53d0b7cca0e9d5bab4a633567 (diff) | |
Merge branch 'fix-sidekiq-transaction-check-race' into 'master'
Fix race in forbid_sidekiq_in_transactions.rb
Closes #64088
See merge request gitlab-org/gitlab-ce!30359
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/fix-sidekiq-transaction-check-race.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix-sidekiq-transaction-check-race.yml b/changelogs/unreleased/fix-sidekiq-transaction-check-race.yml new file mode 100644 index 00000000000..89ae4abfe11 --- /dev/null +++ b/changelogs/unreleased/fix-sidekiq-transaction-check-race.yml @@ -0,0 +1,5 @@ +--- +title: Fix race in forbid_sidekiq_in_transactions.rb +merge_request: 30359 +author: +type: fixed |