[4/8] allura git commit: [#7866] ticket:754 Fix error in can_merge task

[br...@apache.org]

[#7866] ticket:754 Fix error in can_merge task


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/93a4230a
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/93a4230a
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/93a4230a

Branch: refs/heads/master
Commit: 93a4230a87df0785c31faf21a5f7c9e1ccbc17c1
Parents: 0be08e5
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Apr 17 13:43:52 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue Apr 21 08:15:32 2015 +0000

----------------------------------------------------------------------
 Allura/allura/tasks/repo_tasks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/93a4230a/Allura/allura/tasks/repo_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/repo_tasks.py b/Allura/allura/tasks/repo_tasks.py
index d16755c..8191b54 100644
--- a/Allura/allura/tasks/repo_tasks.py
+++ b/Allura/allura/tasks/repo_tasks.py
@@ -168,5 +168,5 @@ def merge(merge_request_id):
 def can_merge(merge_request_id):
     from allura import model as M
     mr = M.MergeRequest.query.get(_id=merge_request_id)
-    result = self.app.repo.can_merge(self)
-    # TODO: set cache
+    result = mr.app.repo.can_merge(mr)
+    # TODO: set cache (or inside repo's can_merge?)