diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-07-31 16:48:28 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-07-31 16:48:28 +0000 |
| commit | 3e63fe70ccff3dc477a1740c0a7f164b7caada1f (patch) | |
| tree | 90aa0883035826a7b2222f2f4a99a845aed9a660 | |
| parent | 2e7f4bbb66b4bae61c9dd09234e8435c91e7e986 (diff) | |
| parent | 20ad0cb330ab972fd840c4e188d29f6caaa0e43e (diff) | |
| download | gitlab-ce-3e63fe70ccff3dc477a1740c0a7f164b7caada1f.tar.gz | |
Merge branch '61776-fixing-the-U2F-warning-message-text-colour' into 'master'
Remove the warning style from the "U2F device message" paragraph
Closes #61776
See merge request gitlab-org/gitlab-ce!30119
| -rw-r--r-- | app/views/u2f/_register.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/61776-fixing-the-U2F-warning-message-text-colour.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/u2f/_register.html.haml b/app/views/u2f/_register.html.haml index f6724f72307..ef3835332a7 100644 --- a/app/views/u2f/_register.html.haml +++ b/app/views/u2f/_register.html.haml @@ -16,7 +16,7 @@ .col-md-4 %button#js-setup-u2f-device.btn.btn-info.btn-block{ disabled: true }= _("Set up new U2F device") .col-md-8 - %p.text-warning= _("You need to register a two-factor authentication app before you can set up a U2F device.") + %p= _("You need to register a two-factor authentication app before you can set up a U2F device.") %script#js-register-u2f-in-progress{ type: "text/template" } %p= _("Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now.") diff --git a/changelogs/unreleased/61776-fixing-the-U2F-warning-message-text-colour.yml b/changelogs/unreleased/61776-fixing-the-U2F-warning-message-text-colour.yml new file mode 100644 index 00000000000..988eb77db12 --- /dev/null +++ b/changelogs/unreleased/61776-fixing-the-U2F-warning-message-text-colour.yml @@ -0,0 +1,5 @@ +--- +title: Remove the warning style from the U2F device message in user settings > account +merge_request: 30119 +author: matejlatin +type: other |