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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
c7894521
Commit
c7894521
authored
Oct 08, 2015
by
Stan Hu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'XenGi/gitlab-ce-master'
parents
d4892e41
42be5ee1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
22 deletions
+26
-22
CHANGELOG
CHANGELOG
+1
-0
app/services/system_hooks_service.rb
app/services/system_hooks_service.rb
+1
-0
doc/system_hooks/system_hooks.md
doc/system_hooks/system_hooks.md
+22
-20
spec/services/system_hooks_service_spec.rb
spec/services/system_hooks_service_spec.rb
+2
-2
No files found.
CHANGELOG
View file @
c7894521
...
...
@@ -47,6 +47,7 @@ v 8.0.4
- Remove CI token from build traces
- Fix "Assign All" button on Runner admin page
- Fix search in Files
- Add full project namespace to payload of system webhooks (Ricardo Band)
v 8.0.3
- Fix URL shown in Slack notifications
...
...
app/services/system_hooks_service.rb
View file @
c7894521
...
...
@@ -54,6 +54,7 @@ class SystemHooksService
data
.
merge!
({
project_name:
model
.
project
.
name
,
project_path:
model
.
project
.
path
,
project_path_with_namespace:
model
.
project
.
path_with_namespace
,
project_id:
model
.
project
.
id
,
user_name:
model
.
user
.
name
,
user_email:
model
.
user
.
email
,
...
...
doc/system_hooks/system_hooks.md
View file @
c7894521
...
...
@@ -48,16 +48,17 @@ X-Gitlab-Event: System Hook
```
json
{
"created_at"
:
"2012-07-21T07:30:56Z"
,
"event_name"
:
"user_add_to_team"
,
"project_access"
:
"Master"
,
"project_id"
:
74
,
"project_name"
:
"StoreCloud"
,
"project_path"
:
"storecloud"
,
"user_email"
:
"johnsmith@gmail.com"
,
"user_name"
:
"John Smith"
,
"user_id"
:
41
,
"project_visibility"
:
"private"
,
"created_at"
:
"2012-07-21T07:30:56Z"
,
"event_name"
:
"user_add_to_team"
,
"project_access"
:
"Master"
,
"project_id"
:
74
,
"project_name"
:
"StoreCloud"
,
"project_path"
:
"storecloud"
,
"project_path_with_namespace"
:
"jsmith/storecloud"
,
"user_email"
:
"johnsmith@gmail.com"
,
"user_name"
:
"John Smith"
,
"user_id"
:
41
,
"project_visibility"
:
"private"
,
}
```
...
...
@@ -65,16 +66,17 @@ X-Gitlab-Event: System Hook
```
json
{
"created_at"
:
"2012-07-21T07:30:56Z"
,
"event_name"
:
"user_remove_from_team"
,
"project_access"
:
"Master"
,
"project_id"
:
74
,
"project_name"
:
"StoreCloud"
,
"project_path"
:
"storecloud"
,
"user_email"
:
"johnsmith@gmail.com"
,
"user_name"
:
"John Smith"
,
"user_id"
:
41
,
"project_visibility"
:
"private"
,
"created_at"
:
"2012-07-21T07:30:56Z"
,
"event_name"
:
"user_remove_from_team"
,
"project_access"
:
"Master"
,
"project_id"
:
74
,
"project_name"
:
"StoreCloud"
,
"project_path"
:
"storecloud"
,
"project_path_with_namespace"
:
"jsmith/storecloud"
,
"user_email"
:
"johnsmith@gmail.com"
,
"user_name"
:
"John Smith"
,
"user_id"
:
41
,
"project_visibility"
:
"private"
,
}
```
...
...
spec/services/system_hooks_service_spec.rb
View file @
c7894521
...
...
@@ -13,8 +13,8 @@ describe SystemHooksService do
it
{
expect
(
event_data
(
user
,
:destroy
)).
to
include
(
:event_name
,
:name
,
:created_at
,
:email
,
:user_id
)
}
it
{
expect
(
event_data
(
project
,
:create
)).
to
include
(
:event_name
,
:name
,
:created_at
,
:path
,
:project_id
,
:owner_name
,
:owner_email
,
:project_visibility
)
}
it
{
expect
(
event_data
(
project
,
:destroy
)).
to
include
(
:event_name
,
:name
,
:created_at
,
:path
,
:project_id
,
:owner_name
,
:owner_email
,
:project_visibility
)
}
it
{
expect
(
event_data
(
project_member
,
:create
)).
to
include
(
:event_name
,
:created_at
,
:project_name
,
:project_path
,
:project_id
,
:user_name
,
:user_email
,
:access_level
,
:project_visibility
)
}
it
{
expect
(
event_data
(
project_member
,
:destroy
)).
to
include
(
:event_name
,
:created_at
,
:project_name
,
:project_path
,
:project_id
,
:user_name
,
:user_email
,
:access_level
,
:project_visibility
)
}
it
{
expect
(
event_data
(
project_member
,
:create
)).
to
include
(
:event_name
,
:created_at
,
:project_name
,
:project_path
,
:project_
path_with_namespace
,
:project_
id
,
:user_name
,
:user_email
,
:access_level
,
:project_visibility
)
}
it
{
expect
(
event_data
(
project_member
,
:destroy
)).
to
include
(
:event_name
,
:created_at
,
:project_name
,
:project_path
,
:project_
path_with_namespace
,
:project_
id
,
:user_name
,
:user_email
,
: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
)
}
...
...
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