diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-13 10:12:30 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-13 10:12:30 +0100 |
| commit | 32a5b741c2cc46c97e905154920e74fbb2c2ac90 (patch) | |
| tree | 01991de10177ecd14a3d1b13e0a676ce196440ec /app/services/system_hooks_service.rb | |
| parent | 678ee247eebcaa5759ddb607d80fee64cf643753 (diff) | |
| parent | 1f64332e11949a5954b1e4ac7c6667b03ea70a0b (diff) | |
| download | gitlab-ce-32a5b741c2cc46c97e905154920e74fbb2c2ac90.tar.gz | |
Merge branch 'add_username_to_user_system_hooks' of https://github.com/tbeadle/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/services/system_hooks_service.rb')
| -rw-r--r-- | app/services/system_hooks_service.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/services/system_hooks_service.rb b/app/services/system_hooks_service.rb index 9f677444f1f..ea2b26ccb52 100644 --- a/app/services/system_hooks_service.rb +++ b/app/services/system_hooks_service.rb @@ -47,7 +47,8 @@ class SystemHooksService data.merge!({ name: model.name, email: model.email, - user_id: model.id + user_id: model.id, + username: model.username }) when ProjectMember data.merge!(project_member_data(model)) @@ -99,6 +100,7 @@ class SystemHooksService project_path: model.project.path, project_path_with_namespace: model.project.path_with_namespace, project_id: model.project.id, + user_username: model.user.username, user_name: model.user.name, user_email: model.user.email, user_id: model.user.id, @@ -112,6 +114,7 @@ class SystemHooksService group_name: model.group.name, group_path: model.group.path, group_id: model.group.id, + user_username: model.user.username, user_name: model.user.name, user_email: model.user.email, user_id: model.user.id, |