Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
c37a9ef3
Commit
c37a9ef3
authored
May 31, 2018
by
Jarka Kadlecová
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make ActiveRecordSubscriber rails 5 compatible
parent
b8198897
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
changelogs/unreleased/rails5-active-sup-subscriber.yml
changelogs/unreleased/rails5-active-sup-subscriber.yml
+5
-0
lib/gitlab/query_limiting/active_support_subscriber.rb
lib/gitlab/query_limiting/active_support_subscriber.rb
+1
-1
No files found.
changelogs/unreleased/rails5-active-sup-subscriber.yml
0 → 100644
View file @
c37a9ef3
---
title
:
Make ActiveRecordSubscriber rails 5 compatible
merge_request
:
author
:
type
:
other
lib/gitlab/query_limiting/active_support_subscriber.rb
View file @
c37a9ef3
...
@@ -4,7 +4,7 @@ module Gitlab
...
@@ -4,7 +4,7 @@ module Gitlab
attach_to
:active_record
attach_to
:active_record
def
sql
(
event
)
def
sql
(
event
)
unless
event
.
payload
[
:name
]
==
'CACHE'
unless
event
.
payload
.
fetch
(
:cached
,
event
.
payload
[
:name
]
==
'CACHE'
)
Transaction
.
current
&
.
increment
Transaction
.
current
&
.
increment
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment