Merge branch 'rails5-cattr' into 'master'

Fix cattr_accessor definition Closes #46282 See merge request gitlab-org/gitlab-ce!19192

Merge branch 'rails5-cattr' into 'master'
ea5d35f6 · Douwe Maan · ee3b5923 · e31717f4 · ea5d35f6
Commit ea5d35f6 authored May 31, 2018 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

waitable_worker_spec.rb spec/workers/concerns/waitable_worker_spec.rb +1 -3

No files found.
--- a/spec/workers/concerns/waitable_worker_spec.rb
+++ b/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