Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-09-03 10:08:40 +0300
committerRémy Coutable <remy@rymai.me>2019-09-03 10:08:40 +0300
commitaf5f2424cace62f8712dbabfd60bb0f1c36f1590 (patch)
treeffeb17d182d5832081b80c0c3d80d6d7bd25f277 /app
parentabd9e842720fc434c643cfe3f1662923c92f68f3 (diff)
parent2bd4d580d17e91605b4f350eafb2e9a50d6181c7 (diff)
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')
-rw-r--r--app/models/member.rb2
-rw-r--r--app/services/system_hooks_service.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/member.rb b/app/models/member.rb
index dbae1076670..6457fe9ef0c 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -399,7 +399,7 @@ class Member < ApplicationRecord
end
def post_update_hook
- # override in sub class
+ system_hook_service.execute_hooks_for(self, :update)
end
def post_destroy_hook
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