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
Jérome Perrin
gitlab-ce
Commits
09cb2ba8
Commit
09cb2ba8
authored
Sep 24, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix password update
parent
ffd0a985
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
app/controllers/profiles_controller.rb
app/controllers/profiles_controller.rb
+3
-3
No files found.
app/controllers/profiles_controller.rb
View file @
09cb2ba8
...
@@ -33,8 +33,8 @@ class ProfilesController < ApplicationController
...
@@ -33,8 +33,8 @@ class ProfilesController < ApplicationController
end
end
def
update_password
def
update_password
pa
rams
[
:user
].
select!
do
|
key
,
value
|
pa
ssword_attributes
=
params
[
:user
].
select
do
|
key
,
value
|
%w(
current_password
password password_confirmation)
.
include?
(
key
.
to_s
)
%w(password password_confirmation)
.
include?
(
key
.
to_s
)
end
end
unless
@user
.
valid_password?
(
params
[
:user
][
:current_password
])
unless
@user
.
valid_password?
(
params
[
:user
][
:current_password
])
...
@@ -42,7 +42,7 @@ class ProfilesController < ApplicationController
...
@@ -42,7 +42,7 @@ class ProfilesController < ApplicationController
return
return
end
end
if
@user
.
update_attributes
(
pa
rams
[
:user
]
)
if
@user
.
update_attributes
(
pa
ssword_attributes
)
flash
[
:notice
]
=
"Password was successfully updated. Please login with it"
flash
[
:notice
]
=
"Password was successfully updated. Please login with it"
redirect_to
new_user_session_path
redirect_to
new_user_session_path
else
else
...
...
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