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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
30e2a8f0
Commit
30e2a8f0
authored
Jan 02, 2019
by
Jasper Maes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix several ActionController::Parameters deprecations
parent
fe4f8cad
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
12 additions
and
7 deletions
+12
-7
app/controllers/groups/children_controller.rb
app/controllers/groups/children_controller.rb
+1
-1
app/controllers/projects/blob_controller.rb
app/controllers/projects/blob_controller.rb
+1
-1
app/controllers/projects/pipelines_settings_controller.rb
app/controllers/projects/pipelines_settings_controller.rb
+1
-1
app/services/labels/create_service.rb
app/services/labels/create_service.rb
+1
-1
app/services/labels/update_service.rb
app/services/labels/update_service.rb
+1
-1
app/services/lfs/locks_finder_service.rb
app/services/lfs/locks_finder_service.rb
+1
-1
app/services/users/update_service.rb
app/services/users/update_service.rb
+1
-1
changelogs/unreleased/actioncontroller-parameters-deprecations.yml
...s/unreleased/actioncontroller-parameters-deprecations.yml
+5
-0
No files found.
app/controllers/groups/children_controller.rb
View file @
30e2a8f0
...
@@ -35,7 +35,7 @@ module Groups
...
@@ -35,7 +35,7 @@ module Groups
def
setup_children
(
parent
)
def
setup_children
(
parent
)
@children
=
GroupDescendantsFinder
.
new
(
current_user:
current_user
,
@children
=
GroupDescendantsFinder
.
new
(
current_user:
current_user
,
parent_group:
parent
,
parent_group:
parent
,
params:
params
).
execute
params:
params
.
to_unsafe_h
).
execute
@children
=
@children
.
page
(
params
[
:page
])
@children
=
@children
.
page
(
params
[
:page
])
end
end
end
end
...
...
app/controllers/projects/blob_controller.rb
View file @
30e2a8f0
...
@@ -93,7 +93,7 @@ class Projects::BlobController < Projects::ApplicationController
...
@@ -93,7 +93,7 @@ class Projects::BlobController < Projects::ApplicationController
@blob
.
load_all_data!
@blob
.
load_all_data!
@lines
=
@blob
.
present
.
highlight
.
lines
@lines
=
@blob
.
present
.
highlight
.
lines
@form
=
UnfoldForm
.
new
(
params
)
@form
=
UnfoldForm
.
new
(
params
.
to_unsafe_h
)
@lines
=
@lines
[
@form
.
since
-
1
..
@form
.
to
-
1
].
map
(
&
:html_safe
)
@lines
=
@lines
[
@form
.
since
-
1
..
@form
.
to
-
1
].
map
(
&
:html_safe
)
...
...
app/controllers/projects/pipelines_settings_controller.rb
View file @
30e2a8f0
...
@@ -4,6 +4,6 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController
...
@@ -4,6 +4,6 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController
before_action
:authorize_admin_pipeline!
before_action
:authorize_admin_pipeline!
def
show
def
show
redirect_to
project_settings_ci_cd_path
(
@project
,
params:
params
)
redirect_to
project_settings_ci_cd_path
(
@project
,
params:
params
.
to_unsafe_h
)
end
end
end
end
app/services/labels/create_service.rb
View file @
30e2a8f0
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
module
Labels
module
Labels
class
CreateService
<
Labels
::
BaseService
class
CreateService
<
Labels
::
BaseService
def
initialize
(
params
=
{})
def
initialize
(
params
=
{})
@params
=
params
.
dup
.
with_indifferent_access
@params
=
params
.
to_h
.
dup
.
with_indifferent_access
end
end
# returns the created label
# returns the created label
...
...
app/services/labels/update_service.rb
View file @
30e2a8f0
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
module
Labels
module
Labels
class
UpdateService
<
Labels
::
BaseService
class
UpdateService
<
Labels
::
BaseService
def
initialize
(
params
=
{})
def
initialize
(
params
=
{})
@params
=
params
.
dup
.
with_indifferent_access
@params
=
params
.
to_h
.
dup
.
with_indifferent_access
end
end
# returns the updated label
# returns the updated label
...
...
app/services/lfs/locks_finder_service.rb
View file @
30e2a8f0
...
@@ -12,7 +12,7 @@ module Lfs
...
@@ -12,7 +12,7 @@ module Lfs
# rubocop: disable CodeReuse/ActiveRecord
# rubocop: disable CodeReuse/ActiveRecord
def
find_locks
def
find_locks
options
=
params
.
slice
(
:id
,
:path
).
compact
.
symbolize_keys
options
=
params
.
slice
(
:id
,
:path
).
to_h
.
compact
.
symbolize_keys
project
.
lfs_file_locks
.
where
(
options
)
project
.
lfs_file_locks
.
where
(
options
)
end
end
...
...
app/services/users/update_service.rb
View file @
30e2a8f0
...
@@ -55,7 +55,7 @@ module Users
...
@@ -55,7 +55,7 @@ module Users
params
.
reject!
{
|
key
,
_
|
read_only
.
include?
(
key
.
to_sym
)
}
params
.
reject!
{
|
key
,
_
|
read_only
.
include?
(
key
.
to_sym
)
}
end
end
@user
.
assign_attributes
(
params
)
if
params
.
an
y?
@user
.
assign_attributes
(
params
)
unless
params
.
empt
y?
end
end
end
end
end
end
changelogs/unreleased/actioncontroller-parameters-deprecations.yml
0 → 100644
View file @
30e2a8f0
---
title
:
Fix several ActionController::Parameters deprecations
merge_request
:
24332
author
:
Jasper Maes
type
:
other
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