diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-07 03:07:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-07 03:07:50 +0300 |
| commit | d95abc0bc994436aa963347bed29e264d5158fa5 (patch) | |
| tree | fe2aab72e133e2913cba0959efd88fdb75669b91 /app/services/members | |
| parent | 015663b70f1bcdae4483e38c2beac884f92da5b8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/members')
| -rw-r--r-- | app/services/members/update_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/members/update_service.rb b/app/services/members/update_service.rb index fdd2c62a452..b5c27caafa2 100644 --- a/app/services/members/update_service.rb +++ b/app/services/members/update_service.rb @@ -7,9 +7,10 @@ module Members raise Gitlab::Access::AccessDeniedError unless can?(current_user, action_member_permission(permission, member), member) old_access_level = member.human_access + old_expiry = member.expires_at if member.update(params) - after_execute(action: permission, old_access_level: old_access_level, member: member) + after_execute(action: permission, old_access_level: old_access_level, old_expiry: old_expiry, member: member) # Deletes only confidential issues todos for guests enqueue_delete_todos(member) if downgrading_to_guest? |