diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
| commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
| tree | 5423a1c7516cffe36384133ade12572cf709398d /lib/after_commit_queue.rb | |
| parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'lib/after_commit_queue.rb')
| -rw-r--r-- | lib/after_commit_queue.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/after_commit_queue.rb b/lib/after_commit_queue.rb index 6a180fdf338..aea4231205d 100644 --- a/lib/after_commit_queue.rb +++ b/lib/after_commit_queue.rb @@ -16,7 +16,7 @@ module AfterCommitQueue def run_after_commit_or_now(&block) if Gitlab::Database.inside_transaction? - if ActiveRecord::Base.connection.current_transaction.records.include?(self) + if ActiveRecord::Base.connection.current_transaction.records&.include?(self) run_after_commit(&block) else # If the current transaction does not include this record, we can run |