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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
adc34e1c
Commit
adc34e1c
authored
May 16, 2017
by
Tim Zallmann
Committed by
Phil Hughes
May 16, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename Personal Audit Log
parent
e407279f
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
17 additions
and
12 deletions
+17
-12
app/helpers/icons_helper.rb
app/helpers/icons_helper.rb
+2
-0
app/views/layouts/nav/_profile.html.haml
app/views/layouts/nav/_profile.html.haml
+2
-2
app/views/profiles/_event_table.html.haml
app/views/profiles/_event_table.html.haml
+1
-2
app/views/profiles/audit_log.html.haml
app/views/profiles/audit_log.html.haml
+1
-1
changelogs/unreleased/30827-changes-to-audit-log.yml
changelogs/unreleased/30827-changes-to-audit-log.yml
+4
-0
features/profile/active_tab.feature
features/profile/active_tab.feature
+3
-3
features/profile/profile.feature
features/profile/profile.feature
+1
-1
features/steps/profile/active_tab.rb
features/steps/profile/active_tab.rb
+2
-2
features/steps/shared/paths.rb
features/steps/shared/paths.rb
+1
-1
No files found.
app/helpers/icons_helper.rb
View file @
adc34e1c
...
@@ -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
)
...
...
app/views/layouts/nav/_profile.html.haml
View file @
adc34e1c
...
@@ -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:
'Au
dit L
og'
do
=
link_to
audit_log_profile_path
,
title:
'Au
thentication l
og'
do
%span
%span
Au
dit L
og
Au
thentication l
og
app/views/profiles/_event_table.html.haml
View file @
adc34e1c
...
@@ -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"
app/views/profiles/audit_log.html.haml
View file @
adc34e1c
-
page_title
"Au
dit L
og"
-
page_title
"Au
thentication l
og"
=
render
'profiles/head'
=
render
'profiles/head'
.row.prepend-top-default
.row.prepend-top-default
...
...
changelogs/unreleased/30827-changes-to-audit-log.yml
0 → 100644
View file @
adc34e1c
---
title
:
Renamed users 'Audit Log'' to 'Authentication Log'
merge_request
:
11400
author
:
features/profile/active_tab.feature
View file @
adc34e1c
...
@@ -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 Au
dit L
og
Scenario
:
On Profile Au
thentication l
og
Given
I visit Au
dit L
og page
Given
I visit Au
thentication l
og page
Then
the active main tab should be Au
dit L
og
Then
the active main tab should be Au
thentication l
og
And
no other main tabs should be active
And
no other main tabs should be active
features/profile/profile.feature
View file @
adc34e1c
...
@@ -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 Au
dit L
og page
When
I visit Au
thentication l
og 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
...
...
features/steps/profile/active_tab.rb
View file @
adc34e1c
...
@@ -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 Au
dit L
og'
do
step
'the active main tab should be Au
thentication l
og'
do
ensure_active_main_tab
(
'Au
dit L
og'
)
ensure_active_main_tab
(
'Au
thentication l
og'
)
end
end
end
end
features/steps/shared/paths.rb
View file @
adc34e1c
...
@@ -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 Au
dit L
og page'
do
step
'I visit Au
thentication l
og page'
do
visit
audit_log_profile_path
visit
audit_log_profile_path
end
end
...
...
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