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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
ed82b804
Commit
ed82b804
authored
Mar 19, 2016
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Gracefully handle deleted user in audit event
Closes gitlab-org/gitlab-ce#14425
parent
a2669e85
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
1 deletion
+23
-1
app/services/audit_event_service.rb
app/services/audit_event_service.rb
+1
-1
spec/services/audit_event_service_spec.rb
spec/services/audit_event_service_spec.rb
+22
-0
No files found.
app/services/audit_event_service.rb
View file @
ed82b804
...
...
@@ -8,7 +8,7 @@ class AuditEventService
old_access_level
=
@details
[
:old_access_level
]
author_name
=
@author
.
name
user_id
=
member
.
id
user_name
=
member
.
user
.
name
user_name
=
member
.
user
?
member
.
user
.
name
:
'Deleted User'
@details
=
case
action
...
...
spec/services/audit_event_service_spec.rb
0 → 100644
View file @
ed82b804
require
'spec_helper'
describe
AuditEventService
,
services:
true
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project_member
)
{
create
(
:project_member
,
user:
user
)
}
let
(
:service
)
{
described_class
.
new
(
user
,
project
,
{
action: :destroy
})
}
describe
'#for_member'
do
it
'generates event'
do
event
=
service
.
for_member
(
project_member
).
security_event
expect
(
event
[
:details
][
:target_details
]).
to
eq
(
user
.
name
)
end
it
'handles deleted users'
do
expect
(
project_member
).
to
receive
(
:user
).
and_return
(
nil
)
event
=
service
.
for_member
(
project_member
).
security_event
expect
(
event
[
:details
][
:target_details
]).
to
eq
(
'Deleted User'
)
end
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