From adc34e1cfe971c9a186791be607f47977c003f73 Mon Sep 17 00:00:00 2001
From: Tim Zallmann <tzallmann@gitlab.com>
Date: Tue, 16 May 2017 12:54:57 +0000
Subject: [PATCH] Rename Personal Audit Log

---
 app/helpers/icons_helper.rb                          | 2 ++
 app/views/layouts/nav/_profile.html.haml             | 4 ++--
 app/views/profiles/_event_table.html.haml            | 3 +--
 app/views/profiles/audit_log.html.haml               | 2 +-
 changelogs/unreleased/30827-changes-to-audit-log.yml | 4 ++++
 features/profile/active_tab.feature                  | 6 +++---
 features/profile/profile.feature                     | 2 +-
 features/steps/profile/active_tab.rb                 | 4 ++--
 features/steps/shared/paths.rb                       | 2 +-
 9 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 changelogs/unreleased/30827-changes-to-audit-log.yml

diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb
index 55fa81e95ef..ef96a554b7e 100644
--- a/app/helpers/icons_helper.rb
+++ b/app/helpers/icons_helper.rb
@@ -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)
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index e06301bda14..ae1e1361f0f 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -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
diff --git a/app/views/profiles/_event_table.html.haml b/app/views/profiles/_event_table.html.haml
index 879fc170f92..d0ad90ac6cc 100644
--- a/app/views/profiles/_event_table.html.haml
+++ b/app/views/profiles/_event_table.html.haml
@@ -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"
diff --git a/app/views/profiles/audit_log.html.haml b/app/views/profiles/audit_log.html.haml
index 9fe86e6b291..a24b7fd101d 100644
--- a/app/views/profiles/audit_log.html.haml
+++ b/app/views/profiles/audit_log.html.haml
@@ -1,4 +1,4 @@
-- page_title "Audit Log"
+- page_title "Authentication log"
 = render 'profiles/head'
 
 .row.prepend-top-default
diff --git a/changelogs/unreleased/30827-changes-to-audit-log.yml b/changelogs/unreleased/30827-changes-to-audit-log.yml
new file mode 100644
index 00000000000..32db3bf8e95
--- /dev/null
+++ b/changelogs/unreleased/30827-changes-to-audit-log.yml
@@ -0,0 +1,4 @@
+---
+title: Renamed users 'Audit Log'' to 'Authentication Log'
+merge_request: 11400
+author:
diff --git a/features/profile/active_tab.feature b/features/profile/active_tab.feature
index 788b7895d72..21d7d6c3800 100644
--- a/features/profile/active_tab.feature
+++ b/features/profile/active_tab.feature
@@ -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
diff --git a/features/profile/profile.feature b/features/profile/profile.feature
index 70f47c97173..3263d3e212b 100644
--- a/features/profile/profile.feature
+++ b/features/profile/profile.feature
@@ -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
diff --git a/features/steps/profile/active_tab.rb b/features/steps/profile/active_tab.rb
index 4724a326277..069d4e6a23d 100644
--- a/features/steps/profile/active_tab.rb
+++ b/features/steps/profile/active_tab.rb
@@ -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
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index 46b3cb79af2..bef3eac4d26 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -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