Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 26E81107D7 for ; Tue, 11 Feb 2014 05:13:52 +0000 (UTC) Received: (qmail 99920 invoked by uid 500); 11 Feb 2014 05:13:51 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 99869 invoked by uid 500); 11 Feb 2014 05:13:51 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 99807 invoked by uid 99); 11 Feb 2014 05:13:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Feb 2014 05:13:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8D47492335A; Tue, 11 Feb 2014 05:13:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tvansteenburgh@apache.org To: allura-commits@incubator.apache.org Date: Tue, 11 Feb 2014 05:13:47 -0000 Message-Id: In-Reply-To: <65959f72ab86499eb391da42a34e0ff0@git.apache.org> References: <65959f72ab86499eb391da42a34e0ff0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] git commit: [#7069] ticket:525 Use downstream_repo for clarity [#7069] ticket:525 Use downstream_repo for clarity Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/2b459735 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/2b459735 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/2b459735 Branch: refs/heads/master Commit: 2b4597359bc6566a65df92a9e725c74d94e9c8ba Parents: 4e2ec15 Author: Aleksey 'LXj' Alekseyev Authored: Thu Jan 30 23:41:43 2014 +0200 Committer: Tim Van Steenburgh Committed: Tue Feb 11 05:13:08 2014 +0000 ---------------------------------------------------------------------- Allura/allura/templates/repo/merge_requests.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2b459735/Allura/allura/templates/repo/merge_requests.html ---------------------------------------------------------------------- diff --git a/Allura/allura/templates/repo/merge_requests.html b/Allura/allura/templates/repo/merge_requests.html index 166be00..1b70881 100644 --- a/Allura/allura/templates/repo/merge_requests.html +++ b/Allura/allura/templates/repo/merge_requests.html @@ -48,7 +48,7 @@ {{req.request_number}} {{req.status}} {{req.summary}} - {% if req.downstream_url %} + {% if req.downstream_repo %} {{req.downstream_url}} {% else %} (deleted)