diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-05-11 12:40:44 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-05-11 12:40:44 -0700 |
| commit | e3bac7dffe87a6e5adb1b51700acedba09420515 (patch) | |
| tree | 3cad0696bdfeb79609c0442f79708fbbed2d93f1 /app/services/system_hooks_service.rb | |
| parent | f4b6bc06da18bce9553032463ca2012d7cad7268 (diff) | |
| parent | e7e132529bff3af38175076b84c818b6dea4b05f (diff) | |
| download | gitlab-ce-sh-ajax-tests.tar.gz | |
Merge branch 'master' into sh-ajax-testssh-ajax-tests
Diffstat (limited to 'app/services/system_hooks_service.rb')
| -rw-r--r-- | app/services/system_hooks_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/system_hooks_service.rb b/app/services/system_hooks_service.rb index af0ddbe5934..ed476fc9d0c 100644 --- a/app/services/system_hooks_service.rb +++ b/app/services/system_hooks_service.rb @@ -51,7 +51,7 @@ class SystemHooksService path: model.path, group_id: model.id, owner_name: owner.respond_to?(:name) ? owner.name : nil, - owner_email: owner.respond_to?(:email) ? owner.email : nil, + owner_email: owner.respond_to?(:email) ? owner.email : nil ) when GroupMember data.merge!(group_member_data(model)) @@ -113,7 +113,7 @@ class SystemHooksService user_name: model.user.name, user_email: model.user.email, user_id: model.user.id, - group_access: model.human_access, + group_access: model.human_access } end end |