summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-08 10:54:40 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-08 10:54:40 +0300
commit3d51147de18b7e1725ace4be52f9a4fd684e4f35 (patch)
treee53f9637191dc52537195acb80cf1a07fdfcfb73
parent07437ac3d436d427e4e8554f685f09a17d31e171 (diff)
downloadgitlab-ce-3d51147de18b7e1725ace4be52f9a4fd684e4f35.tar.gz
Add user_id to system hook when new user created
-rw-r--r--app/services/system_hooks_service.rb3
-rw-r--r--spec/services/system_hooks_service_spec.rb2
2 files changed, 3 insertions, 2 deletions
diff --git a/app/services/system_hooks_service.rb b/app/services/system_hooks_service.rb
index 39aec943f75..de4fa9b79e7 100644
--- a/app/services/system_hooks_service.rb
+++ b/app/services/system_hooks_service.rb
@@ -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!({
diff --git a/spec/services/system_hooks_service_spec.rb b/spec/services/system_hooks_service_spec.rb
index 7f1590f559e..fb52b216cb4 100644
--- a/spec/services/system_hooks_service_spec.rb
+++ b/spec/services/system_hooks_service_spec.rb
@@ -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