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
bc253849
Commit
bc253849
authored
Dec 17, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce difference with CE in ServiceParams
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
de62d2c4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
app/controllers/concerns/service_params.rb
app/controllers/concerns/service_params.rb
+1
-0
ee/app/controllers/concerns/ee/service_params.rb
ee/app/controllers/concerns/ee/service_params.rb
+3
-0
No files found.
app/controllers/concerns/service_params.rb
View file @
bc253849
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
module
ServiceParams
module
ServiceParams
extend
ActiveSupport
::
Concern
extend
ActiveSupport
::
Concern
ALLOWED_PARAMS_CE
=
[
ALLOWED_PARAMS_CE
=
[
:active
,
:active
,
:add_pusher
,
:add_pusher
,
...
...
ee/app/controllers/concerns/ee/service_params.rb
View file @
bc253849
...
@@ -2,6 +2,8 @@
...
@@ -2,6 +2,8 @@
module
EE
module
EE
module
ServiceParams
module
ServiceParams
extend
::
Gitlab
::
Utils
::
Override
ALLOWED_PARAMS_EE
=
[
ALLOWED_PARAMS_EE
=
[
:jenkins_url
,
:jenkins_url
,
:multiproject_enabled
,
:multiproject_enabled
,
...
@@ -11,6 +13,7 @@ module EE
...
@@ -11,6 +13,7 @@ module EE
:static_context
:static_context
].
freeze
].
freeze
override
:allowed_service_params
def
allowed_service_params
def
allowed_service_params
super
+
ALLOWED_PARAMS_EE
super
+
ALLOWED_PARAMS_EE
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