diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-31 16:21:13 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-31 16:21:13 +0000 |
| commit | 02f8f900da8bc6f1c0b964ee46f53a765d0d4de2 (patch) | |
| tree | 8d4fa71359de9f703f1f636bc6d54b8150717f9a | |
| parent | df164bb9f10d3e89a9cc0121ee29252a5f12115d (diff) | |
| parent | c37a9ef3c5cb5233c4a296fad2260c57c84f12ed (diff) | |
| download | gitlab-ce-02f8f900da8bc6f1c0b964ee46f53a765d0d4de2.tar.gz | |
Merge branch 'rails5-active-sup-subscriber' into 'master'
Make ActiveRecordSubscriber rails 5 compatible
Closes #44702
See merge request gitlab-org/gitlab-ce!19276
| -rw-r--r-- | changelogs/unreleased/rails5-active-sup-subscriber.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/query_limiting/active_support_subscriber.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/rails5-active-sup-subscriber.yml b/changelogs/unreleased/rails5-active-sup-subscriber.yml new file mode 100644 index 00000000000..439fa6f428e --- /dev/null +++ b/changelogs/unreleased/rails5-active-sup-subscriber.yml @@ -0,0 +1,5 @@ +--- +title: Make ActiveRecordSubscriber rails 5 compatible +merge_request: +author: +type: other diff --git a/lib/gitlab/query_limiting/active_support_subscriber.rb b/lib/gitlab/query_limiting/active_support_subscriber.rb index 4c83581c4b1..3c4ff5d1928 100644 --- a/lib/gitlab/query_limiting/active_support_subscriber.rb +++ b/lib/gitlab/query_limiting/active_support_subscriber.rb @@ -4,7 +4,7 @@ module Gitlab attach_to :active_record def sql(event) - unless event.payload[:name] == 'CACHE' + unless event.payload.fetch(:cached, event.payload[:name] == 'CACHE') Transaction.current&.increment end end |