summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatej Latin <mlatin@gitlab.com>2019-06-27 11:23:08 +0000
committermatejlatin <mlatin@gitlab.com>2019-07-12 09:07:11 +0200
commit20ad0cb330ab972fd840c4e188d29f6caaa0e43e (patch)
tree435134bc005f4ef35a5e1375fe51759a4cfbe62a
parent03756a312bea2966d9f6ff26c798679fff87d731 (diff)
downloadgitlab-ce-61776-fixing-the-U2F-warning-message-text-colour.tar.gz
Removes the warning style from the paragraph61776-fixing-the-U2F-warning-message-text-colour
In U2F device message, removes warning style
-rw-r--r--app/views/u2f/_register.html.haml2
-rw-r--r--changelogs/unreleased/61776-fixing-the-U2F-warning-message-text-colour.yml5
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