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
46231f0f
Commit
46231f0f
authored
Jun 13, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix password set form and infinite loop
parent
fbf69899
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
app/controllers/passwords_controller.rb
app/controllers/passwords_controller.rb
+2
-0
app/views/passwords/new.html.haml
app/views/passwords/new.html.haml
+7
-8
No files found.
app/controllers/passwords_controller.rb
View file @
46231f0f
class
PasswordsController
<
ApplicationController
class
PasswordsController
<
ApplicationController
layout
'navless'
layout
'navless'
skip_before_filter
:check_password_expiration
before_filter
:set_user
before_filter
:set_user
before_filter
:set_title
before_filter
:set_title
...
...
app/views/passwords/new.html.haml
View file @
46231f0f
%h3
.page_title
Setup your new password
=
form_for
@user
,
url:
profile_password_path
,
method: :post
do
|
f
|
.light-well.padded
%br
%p
.slead
Please set new password before proceed.
=
form_for
@user
,
url:
profile_password_path
,
method: :put
do
|
f
|
%br
.padded
After successful password update you will be redirected to login screen
%p
.slead
After successful password update you will be redirected to dashboard
-
if
@user
.
errors
.
any?
-
if
@user
.
errors
.
any?
.alert.alert-error
.alert.alert-error
%ul
%ul
...
@@ -20,4 +19,4 @@
...
@@ -20,4 +19,4 @@
=
f
.
password_field
:password_confirmation
,
required:
true
=
f
.
password_field
:password_confirmation
,
required:
true
.clearfix
.clearfix
.input
.input
=
f
.
submit
'S
ave password'
,
class:
"btn btn-sav
e"
=
f
.
submit
'S
et new password'
,
class:
"btn btn-creat
e"
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