You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/04/22 12:27:43 UTC
[7/9] allura git commit: [#7836] ticket:739 Use c.app in the
merge_request_commits for git
[#7836] ticket:739 Use c.app in the merge_request_commits for git
It executes in the downstream context, so we need to use downstream app to
generate a list of commits. If we don't do that, we will see empty list on the
first request to the page (right after user creates merge request).
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/0fb2c76e
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/0fb2c76e
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/0fb2c76e
Branch: refs/heads/ib/7836
Commit: 0fb2c76ee57bd9126868f0819f6b75c82ffbf801
Parents: 57e0e94
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Apr 21 14:01:17 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Wed Apr 22 09:44:42 2015 +0000
----------------------------------------------------------------------
ForgeGit/forgegit/model/git_repo.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/0fb2c76e/ForgeGit/forgegit/model/git_repo.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/model/git_repo.py b/ForgeGit/forgegit/model/git_repo.py
index 99c5afe..aeb5734 100644
--- a/ForgeGit/forgegit/model/git_repo.py
+++ b/ForgeGit/forgegit/model/git_repo.py
@@ -643,7 +643,7 @@ class GitImplementation(M.RepositoryImplementation):
Must be called within mr.push_downstream_context()
"""
base = self.merge_base(mr)
- return list(mr.app.repo.log(
+ return list(c.app.repo.log(
mr.downstream.commit_id,
exclude=base,
id_only=False))