diff options
author | Stan Hu <stanhu@gmail.com> | 2016-06-17 20:55:46 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-17 21:23:17 +0300 |
commit | 16171b7d2cf1cc31af626da81ff50daac50560d9 (patch) | |
tree | 60b2aae26cc427dd5a67f2301390e1074ad910db /app | |
parent | c6b9925335f283977ca97c321f8d6bf8e962b32a (diff) |
Merge branch '18745-fix' into 'master'
Fix a 'wrong number of arguments' error
## What does this MR do?
Fixes #18745.
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
To fix #18745.
## What are the relevant issue numbers?
Fixes #18745.
## Does this MR meet the acceptance criteria?
- [ ] Tests
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4757
Diffstat (limited to 'app')
-rw-r--r-- | app/services/notification_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb index e70b400829a..c125b8aff29 100644 --- a/app/services/notification_service.rb +++ b/app/services/notification_service.rb @@ -222,7 +222,7 @@ class NotificationService end def accept_group_invite(group_member) - mailer.member_invite_accepted_email(group_member.id).deliver_later + mailer.member_invite_accepted_email(group_member.real_source_type, group_member.id).deliver_later end def decline_group_invite(group_member) |