summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-09-03 07:08:40 +0000
committerRémy Coutable <remy@rymai.me>2019-09-03 07:08:40 +0000
commitaf5f2424cace62f8712dbabfd60bb0f1c36f1590 (patch)
treeffeb17d182d5832081b80c0c3d80d6d7bd25f277 /app/services
parentabd9e842720fc434c643cfe3f1662923c92f68f3 (diff)
parent2bd4d580d17e91605b4f350eafb2e9a50d6181c7 (diff)
downloadgitlab-ce-af5f2424cace62f8712dbabfd60bb0f1c36f1590.tar.gz
Merge branch 'change-role-system-hook' into 'master'
Add system hooks for project/group membership updates Closes gitlab-ee#12252 See merge request gitlab-org/gitlab-ce!32371
Diffstat (limited to 'app/services')
-rw-r--r--app/services/system_hooks_service.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/services/system_hooks_service.rb b/app/services/system_hooks_service.rb
index 858e04f43b2..34260d12a62 100644
--- a/app/services/system_hooks_service.rb
+++ b/app/services/system_hooks_service.rb
@@ -74,9 +74,11 @@ class SystemHooksService
when ProjectMember
return "user_add_to_team" if event == :create
return "user_remove_from_team" if event == :destroy
+ return "user_update_for_team" if event == :update
when GroupMember
return 'user_add_to_group' if event == :create
return 'user_remove_from_group' if event == :destroy
+ return 'user_update_for_group' if event == :update
else
"#{model.class.name.downcase}_#{event}"
end