BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
85b5a8cf
Commit
85b5a8cf
authored
Jun 14, 2017
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update users controller
parent
1c14805f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
users_controller.rb
app/controllers/admin/users_controller.rb
+5
-2
No files found.
app/controllers/admin/users_controller.rb
View file @
85b5a8cf
...
@@ -125,14 +125,17 @@ class Admin::UsersController < Admin::ApplicationController
...
@@ -125,14 +125,17 @@ class Admin::UsersController < Admin::ApplicationController
respond_to
do
|
format
|
respond_to
do
|
format
|
user
.
skip_reconfirmation!
user
.
skip_reconfirmation!
if
user
.
update_attributes
(
user_params_with_pass
)
result
=
Users
::
UpdateService
.
new
(
current_user
,
@user
,
user_params_with_pass
).
execute
if
result
[
:succcess
]
format
.
html
{
redirect_to
[
:admin
,
user
],
notice:
'User was successfully updated.'
}
format
.
html
{
redirect_to
[
:admin
,
user
],
notice:
'User was successfully updated.'
}
format
.
json
{
head
:ok
}
format
.
json
{
head
:ok
}
else
else
# restore username to keep form action url.
# restore username to keep form action url.
user
.
username
=
params
[
:id
]
user
.
username
=
params
[
:id
]
format
.
html
{
render
"edit"
}
format
.
html
{
render
"edit"
}
format
.
json
{
render
json:
user
.
errors
,
status: :unprocessable_entity
}
format
.
json
{
render
json:
result
[
:message
],
status:
result
[
:status
]
}
end
end
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