Commit 0c69e888 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'gt-update-new-password-breadcrumb-ee' into 'master'

Update new password breadcrumb

See merge request gitlab-org/gitlab-ee!9595
parents d77a2ab6 c292e2d3
- page_title "New Password" - page_title _('New Password')
- header_title "New Password" - breadcrumb_title _('New Password')
%h3.page-title Set up new password
%h3.page-title= _('Set up new password')
%hr %hr
= form_for @user, url: profile_password_path, method: :post do |f| = form_for @user, url: profile_password_path, method: :post do |f|
%p.slead %p.slead
Please set a new password before proceeding. = _('Please set a new password before proceeding.')
%br %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) = form_errors(@user)
...@@ -22,4 +23,4 @@ ...@@ -22,4 +23,4 @@
.col-sm-10 .col-sm-10
= f.password_field :password_confirmation, required: true, class: 'form-control' = f.password_field :password_confirmation, required: true, class: 'form-control'
.form-actions .form-actions
= f.submit 'Set new password', class: "btn btn-success" = f.submit _('Set new password'), class: 'btn btn-success'
---
title: Update new password breadcrumb
merge_request: 25037
author: George Tsiolis
type: fixed
...@@ -661,6 +661,9 @@ msgstr "" ...@@ -661,6 +661,9 @@ msgstr ""
msgid "Advanced settings" msgid "Advanced settings"
msgstr "" msgstr ""
msgid "After a successful password update you will be redirected to login screen."
msgstr ""
msgid "Alert" msgid "Alert"
msgid_plural "Alerts" msgid_plural "Alerts"
msgstr[0] "" msgstr[0] ""
...@@ -6408,6 +6411,9 @@ msgstr "" ...@@ -6408,6 +6411,9 @@ msgstr ""
msgid "New Pages Domain" msgid "New Pages Domain"
msgstr "" msgstr ""
msgid "New Password"
msgstr ""
msgid "New Pipeline Schedule" msgid "New Pipeline Schedule"
msgstr "" msgstr ""
...@@ -7190,6 +7196,9 @@ msgstr "" ...@@ -7190,6 +7196,9 @@ msgstr ""
msgid "Please select at least one filter to see results" msgid "Please select at least one filter to see results"
msgstr "" msgstr ""
msgid "Please set a new password before proceeding."
msgstr ""
msgid "Please solve the reCAPTCHA" msgid "Please solve the reCAPTCHA"
msgstr "" msgstr ""
...@@ -8716,6 +8725,9 @@ msgstr "" ...@@ -8716,6 +8725,9 @@ msgstr ""
msgid "Set max session time for web terminal." msgid "Set max session time for web terminal."
msgstr "" msgstr ""
msgid "Set new password"
msgstr ""
msgid "Set notification email for abuse reports." msgid "Set notification email for abuse reports."
msgstr "" msgstr ""
...@@ -8740,6 +8752,9 @@ msgstr "" ...@@ -8740,6 +8752,9 @@ msgstr ""
msgid "Set up new U2F device" msgid "Set up new U2F device"
msgstr "" 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." 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 "" msgstr ""
......
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