Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gpt
large_projects
gitlabhq1
Commits
21b31a67
Commit
21b31a67
authored
13 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Download
Plain Diff
Merge pull request #280 from vesln/password-present
Fixing an issue in users#update when password is not present.
parents
bed882e6
22e7f8ff
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/controllers/admin/users_controller.rb
app/controllers/admin/users_controller.rb
+1
-1
No files found.
app/controllers/admin/users_controller.rb
View file @
21b31a67
...
...
@@ -38,7 +38,7 @@ class Admin::UsersController < ApplicationController
def
update
admin
=
params
[
:user
].
delete
(
"admin"
)
if
params
[
:user
][
:password
].
empty
?
if
params
[
:user
][
:password
].
blank
?
params
[
:user
].
delete
(
:password
)
params
[
:user
].
delete
(
:password_confirmation
)
end
...
...
This diff is collapsed.
Click to expand it.
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