Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
82077dbd
Commit
82077dbd
authored
Nov 26, 2018
by
Jasper Maes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix deprecation: You are passing an instance of ActiveRecord::Base to find
parent
deaf3af7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
changelogs/unreleased/deprecated-instance-find.yml
changelogs/unreleased/deprecated-instance-find.yml
+5
-0
spec/workers/rebase_worker_spec.rb
spec/workers/rebase_worker_spec.rb
+1
-1
No files found.
changelogs/unreleased/deprecated-instance-find.yml
0 → 100644
View file @
82077dbd
---
title
:
'
Fix
deprecation:
You
are
passing
an
instance
of
ActiveRecord::Base
to'
merge_request
:
23369
author
:
Jasper Maes
type
:
other
spec/workers/rebase_worker_spec.rb
View file @
82077dbd
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment