Skip to content
Snippets Groups Projects
Commit d7fb4e4f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets Committed by Wes Gurney
Browse files

Add user_id to system hook when new user created

parent 7ce73222
No related branches found
No related tags found
1 merge request!4954Add support to configure webhook_timeout in gitlab.yaml
This commit is part of merge request !4954. Comments created here will be created in the context of that merge request.
Loading
Loading
@@ -36,7 +36,8 @@ class SystemHooksService
when User
data.merge!({
name: model.name,
email: model.email
email: model.email,
user_id: model.id
})
when UsersProject
data.merge!({
Loading
Loading
Loading
Loading
@@ -7,7 +7,7 @@ describe SystemHooksService do
 
context 'it should build event data' do
it 'should build event data for user' do
SystemHooksService.build_event_data(user, :create).should include(:event_name, :name, :created_at, :email)
SystemHooksService.build_event_data(user, :create).should include(:event_name, :name, :created_at, :email, :user_id)
end
 
it 'should build event data for project' do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment