summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-06-17 17:55:46 +0000
committerStan Hu <stanhu@gmail.com>2016-06-17 17:55:46 +0000
commit022dfd8eec211e6effaac0927da543109ecdf812 (patch)
tree3fc53f04dafcacddddba3fc973f1454194002210
parenta6e8ff21f61d5c148d54a2f63c9ecdae94fedcd2 (diff)
parent266fd1161c8cf3490432430c4f724f0a8335a39a (diff)
downloadgitlab-ce-022dfd8eec211e6effaac0927da543109ecdf812.tar.gz
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
-rw-r--r--app/services/notification_service.rb2
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)