From e5d2513b4bef0374b768c1c76727e38842fdcf65 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 31 2014 10:50:16 +0000
Subject: Add fix merging a pull-request, now uses the new user model as well


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/progit/fork.py b/progit/fork.py
index 27da012..e2a549b 100644
--- a/progit/fork.py
+++ b/progit/fork.py
@@ -190,7 +190,7 @@ def merge_request_pull(repo, requestid, username=None):
 
     ori_remote = new_repo.remotes[0]
     # Add the fork as remote repo
-    reponame = '%s_%s' % (request.user, repo.name)
+    reponame = '%s_%s' % (request.user.user, repo.name)
     remote = new_repo.create_remote(reponame, repopath)
 
     # Fetch the commits