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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
6a5b3a5c
Commit
6a5b3a5c
authored
Mar 24, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Shows password form when signed in with linked account
Closes #14379
parent
ffe5ac41
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
8 deletions
+9
-8
app/views/profiles/passwords/edit.html.haml
app/views/profiles/passwords/edit.html.haml
+9
-8
No files found.
app/views/profiles/passwords/edit.html.haml
View file @
6a5b3a5c
...
@@ -24,12 +24,13 @@
...
@@ -24,12 +24,13 @@
=
f
.
password_field
:current_password
,
required:
true
,
class:
'form-control'
=
f
.
password_field
:current_password
,
required:
true
,
class:
'form-control'
%p
.help-block
%p
.help-block
You must provide your current password in order to change it.
You must provide your current password in order to change it.
.form-group
.form-group
=
f
.
label
:password
,
'New password'
,
class:
'label-light'
=
f
.
label
:password
,
'New password'
,
class:
'label-light'
=
f
.
password_field
:password
,
required:
true
,
class:
'form-control'
=
f
.
password_field
:password
,
required:
true
,
class:
'form-control'
.form-group
.form-group
=
f
.
label
:password_confirmation
,
class:
'label-light'
=
f
.
label
:password_confirmation
,
class:
'label-light'
=
f
.
password_field
:password_confirmation
,
required:
true
,
class:
'form-control'
=
f
.
password_field
:password_confirmation
,
required:
true
,
class:
'form-control'
.prepend-top-default.append-bottom-default
.prepend-top-default.append-bottom-default
=
f
.
submit
'Save password'
,
class:
"btn btn-create append-right-10"
=
f
.
submit
'Save password'
,
class:
"btn btn-create append-right-10"
-
unless
@user
.
password_automatically_set?
=
link_to
"I forgot my password"
,
reset_profile_password_path
,
method: :put
,
class:
"account-btn-link"
=
link_to
"I forgot my password"
,
reset_profile_password_path
,
method: :put
,
class:
"account-btn-link"
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