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
9a562d94
Commit
9a562d94
authored
Dec 17, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the EE version of ServiceParams
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
d82b6d12
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
app/controllers/concerns/service_params.rb
app/controllers/concerns/service_params.rb
+5
-1
No files found.
app/controllers/concerns/service_params.rb
View file @
9a562d94
...
@@ -70,7 +70,7 @@ module ServiceParams
...
@@ -70,7 +70,7 @@ module ServiceParams
def
service_params
def
service_params
dynamic_params
=
@service
.
event_channel_names
+
@service
.
event_names
# rubocop:disable Gitlab/ModuleWithInstanceVariables
dynamic_params
=
@service
.
event_channel_names
+
@service
.
event_names
# rubocop:disable Gitlab/ModuleWithInstanceVariables
service_params
=
params
.
permit
(
:id
,
service:
ALLOWED_PARAMS_CE
+
dynamic_params
)
service_params
=
params
.
permit
(
:id
,
service:
allowed_service_params
+
dynamic_params
)
if
service_params
[
:service
].
is_a?
(
Hash
)
if
service_params
[
:service
].
is_a?
(
Hash
)
FILTER_BLANK_PARAMS
.
each
do
|
param
|
FILTER_BLANK_PARAMS
.
each
do
|
param
|
...
@@ -80,4 +80,8 @@ module ServiceParams
...
@@ -80,4 +80,8 @@ module ServiceParams
service_params
service_params
end
end
def
allowed_service_params
ALLOWED_PARAMS_CE
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