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
b23428d6
Commit
b23428d6
authored
Jun 25, 2018
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bring changes from EE
parent
901159bb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/controllers/admin/groups_controller.rb
app/controllers/admin/groups_controller.rb
+2
-2
app/controllers/admin/users_controller.rb
app/controllers/admin/users_controller.rb
+2
-2
No files found.
app/controllers/admin/groups_controller.rb
View file @
b23428d6
...
@@ -72,10 +72,10 @@ class Admin::GroupsController < Admin::ApplicationController
...
@@ -72,10 +72,10 @@ class Admin::GroupsController < Admin::ApplicationController
end
end
def
group_params
def
group_params
params
.
require
(
:group
).
permit
(
group_params_ce
)
params
.
require
(
:group
).
permit
(
allowed_group_params
)
end
end
def
group_params_ce
def
allowed_group_params
[
[
:avatar
,
:avatar
,
:description
,
:description
,
...
...
app/controllers/admin/users_controller.rb
View file @
b23428d6
...
@@ -187,10 +187,10 @@ class Admin::UsersController < Admin::ApplicationController
...
@@ -187,10 +187,10 @@ class Admin::UsersController < Admin::ApplicationController
end
end
def
user_params
def
user_params
params
.
require
(
:user
).
permit
(
user_params_ce
)
params
.
require
(
:user
).
permit
(
allowed_user_params
)
end
end
def
user_params_ce
def
allowed_user_params
[
[
:access_level
,
:access_level
,
:avatar
,
:avatar
,
...
...
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