Skip to content
Snippets Groups Projects

Add support to configure webhook_timeout in gitlab.yaml

Closed gitlab-qa-bot requested to merge github/fork/wesgurn/master into master
2 files
+ 24
30
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -23,18 +23,21 @@ class SystemHooksService
@@ -23,18 +23,21 @@ class SystemHooksService
case model
case model
when Project
when Project
 
owner = model.owner
 
data.merge!({
data.merge!({
name: model.name,
name: model.name,
path: model.path,
path: model.path,
path_with_namespace: model.path_with_namespace,
path_with_namespace: model.path_with_namespace,
project_id: model.id,
project_id: model.id,
owner_name: model.owner.name,
owner_name: owner.name,
owner_email: model.owner.email
owner_email: owner.respond_to?(:email) ? owner.email : nil
})
})
when User
when User
data.merge!({
data.merge!({
name: model.name,
name: model.name,
email: model.email
email: model.email,
 
user_id: model.id
})
})
when UsersProject
when UsersProject
data.merge!({
data.merge!({
Loading