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
Jérome Perrin
gitlab-ce
Commits
0de8dccd
Commit
0de8dccd
authored
7 years ago
by
billy.lb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug when system hook for deploy key
parent
4a81867d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
app/services/system_hooks_service.rb
app/services/system_hooks_service.rb
+4
-5
changelogs/unreleased/bugfix-systemhook.yml
changelogs/unreleased/bugfix-systemhook.yml
+4
-0
spec/services/system_hooks_service_spec.rb
spec/services/system_hooks_service_spec.rb
+3
-0
No files found.
app/services/system_hooks_service.rb
View file @
0de8dccd
...
...
@@ -24,10 +24,9 @@ class SystemHooksService
key:
model
.
key
,
id:
model
.
id
)
if
model
.
user
data
.
merge!
(
username:
model
.
user
.
username
)
data
[
:username
]
=
model
.
user
.
username
end
when
Project
data
.
merge!
(
project_data
(
model
))
...
...
@@ -35,8 +34,6 @@ class SystemHooksService
if
event
==
:rename
||
event
==
:transfer
data
[
:old_path_with_namespace
]
=
model
.
old_path_with_namespace
end
data
when
User
data
.
merge!
({
name:
model
.
name
,
...
...
@@ -59,6 +56,8 @@ class SystemHooksService
when
GroupMember
data
.
merge!
(
group_member_data
(
model
))
end
data
end
def
build_event_name
(
model
,
event
)
...
...
This diff is collapsed.
Click to expand it.
changelogs/unreleased/bugfix-systemhook.yml
0 → 100644
View file @
0de8dccd
---
title
:
Fix bug when system hook for deploy key
merge_request
:
9796
author
:
billy.lb
This diff is collapsed.
Click to expand it.
spec/services/system_hooks_service_spec.rb
View file @
0de8dccd
...
...
@@ -5,6 +5,7 @@ describe SystemHooksService, services: true do
let
(
:project
)
{
create
:project
}
let
(
:project_member
)
{
create
:project_member
}
let
(
:key
)
{
create
(
:key
,
user:
user
)
}
let
(
:deploy_key
)
{
create
(
:key
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:group_member
)
{
create
(
:group_member
)
}
...
...
@@ -18,6 +19,8 @@ describe SystemHooksService, services: true do
it
{
expect
(
event_data
(
project_member
,
:destroy
)).
to
include
(
:event_name
,
:created_at
,
:updated_at
,
:project_name
,
:project_path
,
:project_path_with_namespace
,
:project_id
,
:user_name
,
:user_username
,
:user_email
,
:user_id
,
:access_level
,
:project_visibility
)
}
it
{
expect
(
event_data
(
key
,
:create
)).
to
include
(
:username
,
:key
,
:id
)
}
it
{
expect
(
event_data
(
key
,
:destroy
)).
to
include
(
:username
,
:key
,
:id
)
}
it
{
expect
(
event_data
(
deploy_key
,
:create
)).
to
include
(
:key
,
:id
)
}
it
{
expect
(
event_data
(
deploy_key
,
:destroy
)).
to
include
(
:key
,
:id
)
}
it
do
project
.
old_path_with_namespace
=
'renamed_from_path'
...
...
This diff is collapsed.
Click to expand it.
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