diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-12-06 08:42:19 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-12-06 08:42:19 +0000 |
| commit | 1f35e5bd64ab2f5bc7d6e4a8f2c4cfeb6c813190 (patch) | |
| tree | 15e25d63c709ad0d9b098ba984eaaeaaf19cd085 | |
| parent | fa3528ee5a0cedf10a05035ce5c713c3fea0ec6f (diff) | |
| parent | 82077dbdb7de40216c3d37333342d42ef61de88e (diff) | |
| download | gitlab-ce-1f35e5bd64ab2f5bc7d6e4a8f2c4cfeb6c813190.tar.gz | |
Merge branch 'deprecated-instance-find' into 'master'
Fix deprecation: You are passing an instance of ActiveRecord::Base to find
See merge request gitlab-org/gitlab-ce!23369
| -rw-r--r-- | changelogs/unreleased/deprecated-instance-find.yml | 5 | ||||
| -rw-r--r-- | spec/workers/rebase_worker_spec.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/deprecated-instance-find.yml b/changelogs/unreleased/deprecated-instance-find.yml new file mode 100644 index 00000000000..d2ba821e124 --- /dev/null +++ b/changelogs/unreleased/deprecated-instance-find.yml @@ -0,0 +1,5 @@ +--- +title: 'Fix deprecation: You are passing an instance of ActiveRecord::Base to' +merge_request: 23369 +author: Jasper Maes +type: other diff --git a/spec/workers/rebase_worker_spec.rb b/spec/workers/rebase_worker_spec.rb index 936b9deaecc..900332ed6b3 100644 --- a/spec/workers/rebase_worker_spec.rb +++ b/spec/workers/rebase_worker_spec.rb @@ -19,7 +19,7 @@ describe RebaseWorker, '#perform' do expect(MergeRequests::RebaseService) .to receive(:new).with(forked_project, merge_request.author).and_call_original - subject.perform(merge_request, merge_request.author) + subject.perform(merge_request.id, merge_request.author.id) end end end |