Merge branch 'gt-update-new-password-breadcrumb' into 'master'
Update new password breadcrumb See merge request gitlab-org/gitlab-ce!25037
This commit is contained in:
commit
5bf3b33dee
|
@ -1,12 +1,13 @@
|
|||
- page_title "New Password"
|
||||
- header_title "New Password"
|
||||
%h3.page-title Set up new password
|
||||
- page_title _('New Password')
|
||||
- breadcrumb_title _('New Password')
|
||||
|
||||
%h3.page-title= _('Set up new password')
|
||||
%hr
|
||||
= form_for @user, url: profile_password_path, method: :post do |f|
|
||||
%p.slead
|
||||
Please set a new password before proceeding.
|
||||
= _('Please set a new password before proceeding.')
|
||||
%br
|
||||
After a successful password update you will be redirected to login screen.
|
||||
= _('After a successful password update you will be redirected to login screen.')
|
||||
|
||||
= form_errors(@user)
|
||||
|
||||
|
@ -22,4 +23,4 @@
|
|||
.col-sm-10
|
||||
= f.password_field :password_confirmation, required: true, class: 'form-control'
|
||||
.form-actions
|
||||
= f.submit 'Set new password', class: "btn btn-success"
|
||||
= f.submit _('Set new password'), class: 'btn btn-success'
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Update new password breadcrumb
|
||||
merge_request: 25037
|
||||
author: George Tsiolis
|
||||
type: fixed
|
|
@ -531,6 +531,9 @@ msgstr ""
|
|||
msgid "Advanced settings"
|
||||
msgstr ""
|
||||
|
||||
msgid "After a successful password update you will be redirected to login screen."
|
||||
msgstr ""
|
||||
|
||||
msgid "All"
|
||||
msgstr ""
|
||||
|
||||
|
@ -4832,6 +4835,9 @@ msgstr ""
|
|||
msgid "New Pages Domain"
|
||||
msgstr ""
|
||||
|
||||
msgid "New Password"
|
||||
msgstr ""
|
||||
|
||||
msgid "New Pipeline Schedule"
|
||||
msgstr ""
|
||||
|
||||
|
@ -5503,6 +5509,9 @@ msgstr ""
|
|||
msgid "Please select at least one filter to see results"
|
||||
msgstr ""
|
||||
|
||||
msgid "Please set a new password before proceeding."
|
||||
msgstr ""
|
||||
|
||||
msgid "Please solve the reCAPTCHA"
|
||||
msgstr ""
|
||||
|
||||
|
@ -6632,6 +6641,9 @@ msgstr ""
|
|||
msgid "Set max session time for web terminal."
|
||||
msgstr ""
|
||||
|
||||
msgid "Set new password"
|
||||
msgstr ""
|
||||
|
||||
msgid "Set notification email for abuse reports."
|
||||
msgstr ""
|
||||
|
||||
|
@ -6650,6 +6662,9 @@ msgstr ""
|
|||
msgid "Set up new U2F device"
|
||||
msgstr ""
|
||||
|
||||
msgid "Set up new password"
|
||||
msgstr ""
|
||||
|
||||
msgid "Set up your project to automatically push and/or pull changes to/from another repository. Branches, tags, and commits will be synced automatically."
|
||||
msgstr ""
|
||||
|
||||
|
|
Loading…
Reference in New Issue