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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
3806c008
Commit
3806c008
authored
Feb 29, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Password settings page
Closes #13858
parent
1fe9b933
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
34 deletions
+28
-34
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+5
-6
app/views/profiles/passwords/edit.html.haml
app/views/profiles/passwords/edit.html.haml
+23
-28
No files found.
app/assets/stylesheets/pages/profile.scss
View file @
3806c008
...
@@ -5,12 +5,6 @@
...
@@ -5,12 +5,6 @@
}
}
}
}
.profile-settings-sidebar
{
a
{
color
:
$profile-settings-link-color
;
}
}
.avatar-image
{
.avatar-image
{
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
float
:
left
;
float
:
left
;
...
@@ -24,6 +18,11 @@
...
@@ -24,6 +18,11 @@
display
:
inline-block
;
display
:
inline-block
;
}
}
.account-btn-link
,
.profile-settings-sidebar
a
{
color
:
$profile-settings-link-color
;
}
.oauth-buttons
{
.oauth-buttons
{
.btn-group
{
.btn-group
{
margin-right
:
10px
;
margin-right
:
10px
;
...
...
app/views/profiles/passwords/edit.html.haml
View file @
3806c008
-
page_title
"Password"
-
page_title
"Password"
-
header_title
page_title
,
edit_profile_password_path
-
header_title
page_title
,
edit_profile_password_path
.alert.alert-help.prepend-top-default
.row.prepend-top-default
-
if
@user
.
password_automatically_set?
.col-lg-3.profile-settings-sidebar
Set your password.
%h4
.prepend-top-0
-
else
=
page_title
Change your password or recover your current one.
%p
.update-password.prepend-top-default
=
form_for
@user
,
url:
profile_password_path
,
method: :put
,
html:
{
class:
'form-horizontal'
}
do
|
f
|
%div
%p
.slead
-
unless
@user
.
password_automatically_set?
You must provide current password in order to change it.
%br
After a successful password update, you will be redirected to the login page where you can log in with your new password.
After a successful password update, you will be redirected to the login page where you can log in with your new password.
.col-lg-9
%p
Change your password
-
unless
@user
.
password_automatically_set?
or recover your current one
=
form_for
@user
,
url:
profile_password_path
,
method: :put
do
|
f
|
-
if
@user
.
errors
.
any?
-
if
@user
.
errors
.
any?
.alert.alert-danger
.alert.alert-danger
%ul
%ul
...
@@ -22,19 +20,16 @@
...
@@ -22,19 +20,16 @@
%li
=
msg
%li
=
msg
-
unless
@user
.
password_automatically_set?
-
unless
@user
.
password_automatically_set?
.form-group
.form-group
=
f
.
label
:current_password
,
class:
'control-label'
=
f
.
label
:current_password
,
class:
'label-light'
.col-sm-10
=
f
.
password_field
:current_password
,
required:
true
,
class:
'form-control'
=
f
.
password_field
:current_password
,
required:
true
,
class:
'form-control'
%div
%p
.help-block
=
link_to
"Forgot your password?"
,
reset_profile_password_path
,
method: :put
You must provide your current password in order to change it.
.form-group
.form-group
=
f
.
label
:password
,
'New password'
,
class:
'control-label'
=
f
.
label
:password
,
'New password'
,
class:
'label-light'
.col-sm-10
=
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:
'control-label'
=
f
.
label
:password_confirmation
,
class:
'label-light'
.col-sm-10
=
f
.
password_field
:password_confirmation
,
required:
true
,
class:
'form-control'
=
f
.
password_field
:password_confirmation
,
required:
true
,
class:
'form-control'
.form-actions
.prepend-top-default.append-bottom-default
=
f
.
submit
'Save password'
,
class:
"btn btn-create"
=
f
.
submit
'Save password'
,
class:
"btn btn-create append-right-10"
=
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