Commit eb8418a8 authored by Simon Knox's avatar Simon Knox

Merge branch '247476-standardise-usage-of-angle-brackets' into 'master'

Remove angle brackets from empty name in U2F

See merge request gitlab-org/gitlab!42440
parents 7734355c 9f1fd84d
......@@ -102,7 +102,12 @@
%tbody
- @registrations.each do |registration|
%tr
%td= registration[:name].presence || html_escape_once(_("<no name set>")).html_safe
%td
- if registration[:name].present?
= registration[:name]
- else
%span.gl-text-gray-500
= _("no name set")
%td= registration[:created_at].to_date.to_s(:medium)
%td= link_to _('Delete'), registration[:delete_path], method: :delete, class: "btn btn-danger float-right", data: { confirm: _('Are you sure you want to delete this device? This action cannot be undone.') }
......
---
title: Remove angle brackets from empty name in U2F device settings
merge_request: 42440
author:
type: changed
......@@ -857,9 +857,6 @@ msgstr ""
msgid "< 1 hour"
msgstr ""
msgid "<no name set>"
msgstr ""
msgid "<no scopes selected>"
msgstr ""
......@@ -30684,6 +30681,9 @@ msgstr ""
msgid "no expiration"
msgstr ""
msgid "no name set"
msgstr ""
msgid "no one can merge"
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