Commit adc34e1c authored by Tim Zallmann's avatar Tim Zallmann Committed by Phil Hughes

Rename Personal Audit Log

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