Skip to content

G
gitlab-ce
Commit 6a5b3a5c authored by Phil Hughes's avatar Phil Hughes
Browse files
Options

Shows password form when signed in with linked account 

Closes #14379
parent ffe5ac41
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 8 deletions
app/views/profiles/passwords/edit.html.haml
View file @ 6a5b3a5c
...@@ -32,4 +32,5 @@ ...@@ -32,4 +32,5 @@
= 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"
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7