Commit ea5d35f6 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'rails5-cattr' into 'master'

Fix cattr_accessor definition

Closes #46282

See merge request gitlab-org/gitlab-ce!19192
parents ee3b5923 e31717f4
...@@ -7,9 +7,7 @@ describe WaitableWorker do ...@@ -7,9 +7,7 @@ describe WaitableWorker do
'Gitlab::Foo::Bar::DummyWorker' 'Gitlab::Foo::Bar::DummyWorker'
end end
class << self cattr_accessor(:counter) { 0 }
cattr_accessor(:counter) { 0 }
end
include ApplicationWorker include ApplicationWorker
prepend WaitableWorker prepend WaitableWorker
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment