Skip to content
Snippets Groups Projects
Commit 0b948526 authored by Phil Hughes's avatar Phil Hughes
Browse files

Merge branch '30827-changes-to-audit-log' into 'master'

Rename Personal Audit Log

Closes #30827

See merge request !11400

Former-commit-id: c6fd3b6a
parents ec15af11 3f7b01b4
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -19,6 +19,8 @@ module IconsHelper
case names
when "standard"
names = "key"
when "two-factor"
names = "key"
end
 
options.include?(:base) ? fa_stacked_icon(names, options) : fa_icon(names, options)
Loading
Loading
Loading
Loading
@@ -48,6 +48,6 @@
%span
Preferences
= nav_link(path: 'profiles#audit_log') do
= link_to audit_log_profile_path, title: 'Audit Log' do
= link_to audit_log_profile_path, title: 'Authentication log' do
%span
Audit Log
Authentication log
Loading
Loading
@@ -9,7 +9,6 @@
Signed in with
= event.details[:with]
authentication
%span.pull-right
#{time_ago_in_words event.created_at} ago
%span.pull-right= time_ago_with_tooltip(event.created_at)
 
= paginate events, theme: "gitlab"
- page_title "Audit Log"
- page_title "Authentication log"
= render 'profiles/head'
 
.row.prepend-top-default
Loading
Loading
---
title: Renamed users 'Audit Log'' to 'Authentication Log'
merge_request: 11400
author:
Loading
Loading
@@ -23,7 +23,7 @@ Feature: Profile Active Tab
Then the active main tab should be Preferences
And no other main tabs should be active
 
Scenario: On Profile Audit Log
Given I visit Audit Log page
Then the active main tab should be Audit Log
Scenario: On Profile Authentication log
Given I visit Authentication log page
Then the active main tab should be Authentication log
And no other main tabs should be active
Loading
Loading
@@ -63,7 +63,7 @@ Feature: Profile
Given I logout
And I sign in via the UI
And I have activity
When I visit Audit Log page
When I visit Authentication log page
Then I should see my activity
 
Scenario: I visit my user page
Loading
Loading
Loading
Loading
@@ -19,7 +19,7 @@ class Spinach::Features::ProfileActiveTab < Spinach::FeatureSteps
ensure_active_main_tab('Preferences')
end
 
step 'the active main tab should be Audit Log' do
ensure_active_main_tab('Audit Log')
step 'the active main tab should be Authentication log' do
ensure_active_main_tab('Authentication log')
end
end
Loading
Loading
@@ -152,7 +152,7 @@ module SharedPaths
visit profile_preferences_path
end
 
step 'I visit Audit Log page' do
step 'I visit Authentication log page' do
visit audit_log_profile_path
end
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment