diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-31 08:04:32 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-31 08:04:32 +0000 |
| commit | ea5d35f6722a5027f919eba061a38b1b5be4a85a (patch) | |
| tree | 44eca3dce95bf29ec7dd9562a2a1a8fc5388a99f | |
| parent | ee3b5923a55b94631fa31bb1e8c1a5d7774bda71 (diff) | |
| parent | e31717f490c5b75f65121b14c34a327737ba9ac5 (diff) | |
| download | gitlab-ce-ea5d35f6722a5027f919eba061a38b1b5be4a85a.tar.gz | |
Merge branch 'rails5-cattr' into 'master'
Fix cattr_accessor definition
Closes #46282
See merge request gitlab-org/gitlab-ce!19192
| -rw-r--r-- | spec/workers/concerns/waitable_worker_spec.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/spec/workers/concerns/waitable_worker_spec.rb b/spec/workers/concerns/waitable_worker_spec.rb index 54ab07981a4..199825b5097 100644 --- 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 |