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
dea58cb8
Commit
dea58cb8
authored
May 29, 2019
by
antonyliu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply suggestion to app/views/profiles/passwords/edit.html.haml
Apply @reprazent suggestion. See gitlab-org/gitlab-ee!13339
parent
abd456ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
app/views/profiles/passwords/edit.html.haml
app/views/profiles/passwords/edit.html.haml
+4
-3
locale/gitlab.pot
locale/gitlab.pot
+3
-3
No files found.
app/views/profiles/passwords/edit.html.haml
View file @
dea58cb8
...
...
@@ -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
)
...
...
locale/gitlab.pot
View file @
dea58cb8
...
...
@@ -1776,6 +1776,9 @@ msgstr ""
msgid "Change your password"
msgstr ""
msgid "Change your password or recover your current one"
msgstr ""
msgid "ChangeTypeActionLabel|Pick into branch"
msgstr ""
...
...
@@ -12102,9 +12105,6 @@ msgstr ""
msgid "or"
msgstr ""
msgid "or recover your current one"
msgstr ""
msgid "out of %d total test"
msgid_plural "out of %d total tests"
msgstr[0] ""
...
...
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