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
b4e682ee
Commit
b4e682ee
authored
Aug 14, 2018
by
Jan Beckmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix missing Google icon in audit log
Fixes #50180
parent
e610b41e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
0 deletions
+27
-0
app/helpers/icons_helper.rb
app/helpers/icons_helper.rb
+2
-0
changelogs/unreleased/50180-fa-icon-google-audit.yml
changelogs/unreleased/50180-fa-icon-google-audit.yml
+5
-0
spec/helpers/icons_helper_spec.rb
spec/helpers/icons_helper_spec.rb
+20
-0
No files found.
app/helpers/icons_helper.rb
View file @
b4e682ee
...
...
@@ -62,6 +62,8 @@ module IconsHelper
names
=
"key"
when
"two-factor"
names
=
"key"
when
"google_oauth2"
names
=
"google"
end
options
.
include?
(
:base
)
?
fa_stacked_icon
(
names
,
options
)
:
fa_icon
(
names
,
options
)
...
...
changelogs/unreleased/50180-fa-icon-google-audit.yml
0 → 100644
View file @
b4e682ee
---
title
:
Show google icon in audit log
merge_request
:
author
:
Jan Beckmann
type
:
fixed
spec/helpers/icons_helper_spec.rb
View file @
b4e682ee
...
...
@@ -80,6 +80,26 @@ describe IconsHelper do
end
end
describe
'audit icon'
do
it
'returns right icon name for standard auth'
do
icon_name
=
'standard'
expect
(
audit_icon
(
icon_name
).
to_s
)
.
to
eq
'<i class="fa fa-key"></i>'
end
it
'returns right icon name for two-factor auth'
do
icon_name
=
'two-factor'
expect
(
audit_icon
(
icon_name
).
to_s
)
.
to
eq
'<i class="fa fa-key"></i>'
end
it
'returns right icon name for google_oauth2 auth'
do
icon_name
=
'google_oauth2'
expect
(
audit_icon
(
icon_name
).
to_s
)
.
to
eq
'<i class="fa fa-google"></i>'
end
end
describe
'file_type_icon_class'
do
it
'returns folder class'
do
expect
(
file_type_icon_class
(
'folder'
,
0
,
'folder_name'
)).
to
eq
'folder'
...
...
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