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
d64e5f62
Commit
d64e5f62
authored
Dec 18, 2018
by
Jasper Maes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix deprecation: Comparing equality between ActionController::Parameters and a Hash is deprecated
parent
853a365c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
ee/changelogs/unreleased/deprecated-comparing-actioncontroller-params-hash.yml
...sed/deprecated-comparing-actioncontroller-params-hash.yml
+6
-0
ee/spec/controllers/oauth/jira/authorizations_controller_spec.rb
.../controllers/oauth/jira/authorizations_controller_spec.rb
+1
-1
ee/spec/controllers/projects/vulnerability_feedback_controller_spec.rb
...ollers/projects/vulnerability_feedback_controller_spec.rb
+1
-1
No files found.
ee/changelogs/unreleased/deprecated-comparing-actioncontroller-params-hash.yml
0 → 100644
View file @
d64e5f62
---
title
:
'
Fix
deprecation:
Comparing
equality
between
ActionController::Parameters
and
a
Hash
is
deprecated'
merge_request
:
8914
author
:
Jasper Maes
type
:
other
ee/spec/controllers/oauth/jira/authorizations_controller_spec.rb
View file @
d64e5f62
...
...
@@ -37,7 +37,7 @@ describe Oauth::Jira::AuthorizationsController do
'grant_type'
=>
'authorization_code'
,
'redirect_uri'
=>
'http://test.host/login/oauth/callback'
}
expect
(
Gitlab
::
HTTP
).
to
receive
(
:post
).
with
(
oauth_token_url
,
allow_local_requests:
true
,
body:
expected_auth_params
)
do
expect
(
Gitlab
::
HTTP
).
to
receive
(
:post
).
with
(
oauth_token_url
,
allow_local_requests:
true
,
body:
ActionController
::
Parameters
.
new
(
expected_auth_params
)
)
do
{
'access_token'
=>
'fake-123'
,
'scope'
=>
'foo'
,
'token_type'
=>
'bar'
}
end
...
...
ee/spec/controllers/projects/vulnerability_feedback_controller_spec.rb
View file @
d64e5f62
...
...
@@ -114,7 +114,7 @@ describe Projects::VulnerabilityFeedbackController do
context
'with valid params'
do
it
'returns the created feedback'
do
allow
(
VulnerabilityFeedbackModule
::
CreateService
)
.
to
receive
(
:new
).
with
(
project
,
user
,
create_params
)
.
to
receive
(
:new
).
with
(
project
,
user
,
ActionController
::
Parameters
.
new
(
create_params
).
permit!
)
.
and_call_original
create_feedback
user:
user
,
project:
project
,
params:
create_params
...
...
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