Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6b02d4d1
Commit
6b02d4d1
authored
Jul 31, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
260635a7
3e63fe70
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
app/views/u2f/_register.html.haml
app/views/u2f/_register.html.haml
+1
-1
changelogs/unreleased/61776-fixing-the-U2F-warning-message-text-colour.yml
...ased/61776-fixing-the-U2F-warning-message-text-colour.yml
+5
-0
No files found.
app/views/u2f/_register.html.haml
View file @
6b02d4d1
...
...
@@ -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."
)
...
...
changelogs/unreleased/61776-fixing-the-U2F-warning-message-text-colour.yml
0 → 100644
View file @
6b02d4d1
---
title
:
Remove the warning style from the U2F device message in user settings > account
merge_request
:
30119
author
:
matejlatin
type
:
other
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment