From df805bd7f598463d79177d8915bd06e7874a87d1 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 13 2014 07:33:34 +0000
Subject: Have notify on merge and cancel pull-request require the fas_user that performed the action


---

diff --git a/progit/notify.py b/progit/notify.py
index 1b5292b..4ad1b18 100644
--- a/progit/notify.py
+++ b/progit/notify.py
@@ -165,7 +165,7 @@ New pull-request:
     )
 
 
-def notify_merge_pull_request(request):
+def notify_merge_pull_request(request, user):
     ''' Notify the people following a project that a pull-request was merged
     in it.
     '''
@@ -180,7 +180,7 @@ Merged pull-request:
 
 %s
 """ % (
-    request.user.user,
+    user.username,
     request.repo.name,
     request.title,
     '%s/%s/request-pull/%s' % (
@@ -203,7 +203,7 @@ Merged pull-request:
     )
 
 
-def notify_cancelled_pull_request(request):
+def notify_cancelled_pull_request(request, user):
     ''' Notify the people following a project that a pull-request was
     cancelled in it.
     '''
@@ -218,7 +218,7 @@ Cancelled pull-request:
 
 %s
 """ % (
-    request.user.user,
+    user.username,
     request.repo.name,
     request.title,
     '%s/%s/request-pull/%s' % (