Commit ba869ae5 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'password-settings' into 'master'

Password settings page

Closes #13858 

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ebb9b67d69daa8872d79626b85f99b52/password-settings.png)

See merge request !3033
parents bd269eaa 8df4a708
......@@ -5,12 +5,6 @@
}
}
.profile-settings-sidebar {
a {
color: $profile-settings-link-color;
}
}
.avatar-image {
@media (min-width: $screen-sm-min) {
float: left;
......@@ -24,6 +18,11 @@
display: inline-block;
}
.account-btn-link,
.profile-settings-sidebar a {
color: $profile-settings-link-color;
}
.oauth-buttons {
.btn-group {
margin-right: 10px;
......
- page_title "Password"
- header_title page_title, edit_profile_password_path
.alert.alert-help.prepend-top-default
- if @user.password_automatically_set?
Set your password.
- else
Change your password or recover your current one.
.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
.row.prepend-top-default
.col-lg-3.profile-settings-sidebar
%h4.prepend-top-0
= page_title
%p
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
%h5.prepend-top-0
Change your password
- unless @user.password_automatically_set?
or recover your current one
= form_for @user, url: profile_password_path, method: :put, html: {class: "update-password"} do |f|
-if @user.errors.any?
.alert.alert-danger
%ul
......@@ -22,19 +20,16 @@
%li= msg
- unless @user.password_automatically_set?
.form-group
= f.label :current_password, class: 'control-label'
.col-sm-10
= f.label :current_password, class: 'label-light'
= f.password_field :current_password, required: true, class: 'form-control'
%div
= link_to "Forgot your password?", reset_profile_password_path, method: :put
%p.help-block
You must provide your current password in order to change it.
.form-group
= f.label :password, 'New password', class: 'control-label'
.col-sm-10
= f.label :password, 'New password', class: 'label-light'
= f.password_field :password, required: true, class: 'form-control'
.form-group
= f.label :password_confirmation, class: 'control-label'
.col-sm-10
= f.label :password_confirmation, class: 'label-light'
= f.password_field :password_confirmation, required: true, class: 'form-control'
.form-actions
= f.submit 'Save password', class: "btn btn-create"
.prepend-top-default.append-bottom-default
= 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"
......@@ -64,7 +64,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
page.within '.update-password' do
fill_in "user_password", with: "22233344"
fill_in "user_password_confirmation", with: "22233344"
click_button "Save"
click_button "Save password"
end
end
......@@ -73,7 +73,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
fill_in "user_current_password", with: "12345678"
fill_in "user_password", with: "22233344"
fill_in "user_password_confirmation", with: "22233344"
click_button "Save"
click_button "Save password"
end
end
......@@ -82,7 +82,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
fill_in "user_current_password", with: "12345678"
fill_in "user_password", with: "password"
fill_in "user_password_confirmation", with: "confirmation"
click_button "Save"
click_button "Save password"
end
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment