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
43d13a5f
Commit
43d13a5f
authored
Oct 11, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Introduce a new EE::Admin::GroupsController module
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
ad2d9189
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
10 deletions
+19
-10
app/controllers/admin/groups_controller.rb
app/controllers/admin/groups_controller.rb
+4
-10
ee/app/controllers/ee/admin/groups_controller.rb
ee/app/controllers/ee/admin/groups_controller.rb
+15
-0
No files found.
app/controllers/admin/groups_controller.rb
View file @
43d13a5f
class
Admin::GroupsController
<
Admin
::
ApplicationController
prepend
EE
::
Admin
::
GroupsController
before_action
:group
,
only:
[
:edit
,
:update
,
:destroy
,
:project_update
,
:members_update
]
def
index
...
...
@@ -68,10 +70,10 @@ class Admin::GroupsController < Admin::ApplicationController
end
def
group_params
params
.
require
(
:group
).
permit
(
group_params_ce
<<
group_params_ee
)
params
.
require
(
:group
).
permit
(
allowed_group_params
)
end
def
group_params_ce
def
allowed_group_params
[
:avatar
,
:description
,
...
...
@@ -84,12 +86,4 @@ class Admin::GroupsController < Admin::ApplicationController
:two_factor_grace_period
]
end
def
group_params_ee
[
:repository_size_limit
,
:shared_runners_minutes_limit
,
:plan_id
]
end
end
ee/app/controllers/ee/admin/groups_controller.rb
0 → 100644
View file @
43d13a5f
module
EE
module
Admin
module
GroupsController
private
def
allowed_group_params
super
+
[
:repository_size_limit
,
:shared_runners_minutes_limit
,
:plan_id
]
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