summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorantonyliu <sun_apollo@yeah.net>2019-05-29 12:36:33 +0800
committerantonyliu <sun_apollo@yeah.net>2019-05-29 19:39:01 +0800
commit2e8c592e2322b413f14d6fe02290f2aa593fdbfa (patch)
tree55d68c95caf561140279f4bcc6ae7a808c1f91d3 /app
parent90db26194011a67013d91902ce1031bd1dee5ed0 (diff)
downloadgitlab-ce-2e8c592e2322b413f14d6fe02290f2aa593fdbfa.tar.gz
Apply suggestion to app/views/profiles/passwords/edit.html.haml
Apply @reprazent suggestion. See gitlab-org/gitlab-ee!13339
Diffstat (limited to 'app')
-rw-r--r--app/views/profiles/passwords/edit.html.haml7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml
index 9f4f0ac2019..031f0524094 100644
--- a/app/views/profiles/passwords/edit.html.haml
+++ b/app/views/profiles/passwords/edit.html.haml
@@ -10,9 +10,10 @@
= _('After a successful password update, you will be redirected to the login page where you can log in with your new password.')
.col-lg-8
%h5.prepend-top-0
- = _('Change your password')
- - unless @user.password_automatically_set?
- = _('or recover your current one')
+ - if @user.password_automatically set
+ = _('Change your password')
+ - else
+ = _('Change your password or recover your current one')
= form_for @user, url: profile_password_path, method: :put, html: {class: "update-password"} do |f|
= form_errors(@user)