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

[je...@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/9e958830
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/9e958830
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/9e958830

Branch: refs/heads/ib/7866
Commit: 9e958830e8d956e527ea6ab5fb1e493a8c002462
Parents: 9406558
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Apr 17 13:43:52 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Fri Apr 17 13:43:52 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/9e958830/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?)