diff options
| author | Callum Dryden <callum.dryden@rightscale.com> | 2016-10-06 15:19:27 +0000 |
|---|---|---|
| committer | Callum Dryden <callum.dryden@rightscale.com> | 2016-10-20 00:26:45 +0000 |
| commit | 9124310f2871117acaac98781be84c9fc016e2ad (patch) | |
| tree | 3bb94c532a5f52dc27f483ab6de0a829f6831c19 /app/models/members | |
| parent | c08435e3c25f0a7a705ed8a49b16dde176b41a40 (diff) | |
| download | gitlab-ce-9124310f2871117acaac98781be84c9fc016e2ad.tar.gz | |
Differentiate the expire from leave event
At the moment we cannot see weather a user left a project due to their
membership expiring of if they themselves opted to leave the project.
This adds a new event type that allows us to make this differentiation.
Note that is not really feasable to go back and reliably fix up the
previous events. As a result the events for previous expire removals
will remain the same however events of this nature going forward will be
correctly represented.
Diffstat (limited to 'app/models/members')
| -rw-r--r-- | app/models/members/project_member.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb index 125f26369d7..e4880973117 100644 --- a/app/models/members/project_member.rb +++ b/app/models/members/project_member.rb @@ -121,7 +121,11 @@ class ProjectMember < Member end def post_destroy_hook - event_service.leave_project(self.project, self.user) + if expired? + event_service.expired_leave_project(self.project, self.user) + else + event_service.leave_project(self.project, self.user) + end super end |