Merge branch 'rails5-cattr' into 'master'

Fix cattr_accessor definition

Closes #46282

See merge request gitlab-org/gitlab-ce!19192

spec/workers/concerns/waitable_worker_spec.rb

@@ -7,9 +7,7 @@ describe WaitableWorker do
         'Gitlab::Foo::Bar::DummyWorker'
       end
 
-      class << self
-        cattr_accessor(:counter) { 0 }
-      end
+      cattr_accessor(:counter) { 0 }
 
       include ApplicationWorker
       prepend WaitableWorker