diff options
author | Jan Beckmann <king-jan1999@hotmail.de> | 2018-08-14 21:12:07 +0200 |
---|---|---|
committer | Jan Beckmann <king-jan1999@hotmail.de> | 2018-08-14 21:42:42 +0200 |
commit | b4e682eedd6b58f3f245fc1450675909fa0fa5de (patch) | |
tree | cc09a96a146292579623aadec8069f6607c6cdb3 | |
parent | e610b41e2458601fb1821dcf46a15dc758e032bd (diff) | |
download | gitlab-ce-b4e682eedd6b58f3f245fc1450675909fa0fa5de.tar.gz |
Fix missing Google icon in audit log
Fixes #50180
-rw-r--r-- | app/helpers/icons_helper.rb | 2 | ||||
-rw-r--r-- | changelogs/unreleased/50180-fa-icon-google-audit.yml | 5 | ||||
-rw-r--r-- | spec/helpers/icons_helper_spec.rb | 20 |
3 files changed, 27 insertions, 0 deletions
diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb index 41084ec686f..a8a10c98d69 100644 --- a/app/helpers/icons_helper.rb +++ b/app/helpers/icons_helper.rb @@ -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) diff --git a/changelogs/unreleased/50180-fa-icon-google-audit.yml b/changelogs/unreleased/50180-fa-icon-google-audit.yml new file mode 100644 index 00000000000..709e769eca1 --- /dev/null +++ b/changelogs/unreleased/50180-fa-icon-google-audit.yml @@ -0,0 +1,5 @@ +--- +title: Show google icon in audit log +merge_request: +author: Jan Beckmann +type: fixed diff --git a/spec/helpers/icons_helper_spec.rb b/spec/helpers/icons_helper_spec.rb index 82f588d1a08..e59f9a7bbe2 100644 --- a/spec/helpers/icons_helper_spec.rb +++ b/spec/helpers/icons_helper_spec.rb @@ -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' |