Commit 1f35e5bd authored by Rémy Coutable's avatar Rémy Coutable

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
parents fa3528ee 82077dbd
---
title: 'Fix deprecation: You are passing an instance of ActiveRecord::Base to'
merge_request: 23369
author: Jasper Maes
type: other
...@@ -19,7 +19,7 @@ describe RebaseWorker, '#perform' do ...@@ -19,7 +19,7 @@ describe RebaseWorker, '#perform' do
expect(MergeRequests::RebaseService) expect(MergeRequests::RebaseService)
.to receive(:new).with(forked_project, merge_request.author).and_call_original .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 end
end end
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