Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Project Forum
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIP
Project Forum
Project Forum
Merge requests
!17
Clean up users controller for password updates.
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Clean up users controller for password updates.
password-clean-controllers
into
password-edit
Overview
7
Commits
1
Pipelines
0
Changes
2
Merged
Clean up users controller for password updates.
Jesse Tilro
requested to merge
password-clean-controllers
into
password-edit
May 20, 2017
Overview
7
Commits
1
Pipelines
0
Changes
2
0
0
Merge request reports
Compare
password-edit
password-edit (base)
and
latest version
latest version
db9f668e
1 commit,
May 20, 2017
2 files
+
22
−
26
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
app/controllers/admin/users_controller.rb
+
9
−
11
View file @ db9f668e
Edit in single-file editor
Open in Web IDE
Show full file
@@ -58,7 +58,7 @@ class Admin::UsersController < Admin::ApplicationController
end
def
update_user
if
@user
.
update
params
[
:user
][
:password
].
to_s
.
empty?
?
user_params
:
user_params_pwd
if
@user
.
update
user_
params
flash
[
:success
]
=
"Succesfully updated user"
redirect_to
admin_user_path
(
@user
)
else
@@ -118,23 +118,21 @@ class Admin::UsersController < Admin::ApplicationController
protected
def
user_params
params
.
require
(
:user
).
permit
(
prms
=
params
.
require
(
:user
).
permit
(
:first_name
,
:last_name
,
:email
,
:authorization_level
)
end
def
user_params_pwd
params
.
require
(
:user
).
permit
(
:first_name
,
:last_name
,
:password
,
:password_confirmation
,
:email
,
:authorization_level
)
if
prms
[
:password
].
blank?
prms
.
delete
:password
prms
.
delete
:password_confirmation
end
prms
end
def
group_params
Loading