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 E6A33102A2 for ; Mon, 15 Jul 2013 21:03:58 +0000 (UTC) Received: (qmail 94887 invoked by uid 500); 15 Jul 2013 21:03:58 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 94823 invoked by uid 500); 15 Jul 2013 21:03:58 -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 94183 invoked by uid 99); 15 Jul 2013 21:03:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Jul 2013 21:03:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9C5448A821C; Mon, 15 Jul 2013 21:03:57 +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: Mon, 15 Jul 2013 21:04:15 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [19/50] [abbrv] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-allura Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-allura Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/7fc9b7de Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/7fc9b7de Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/7fc9b7de Branch: refs/heads/tv/6355 Commit: 7fc9b7de2cd168436d9f16add9e55c47eb5d4a2b Parents: 19c7673 6901e8a Author: Tim Van Steenburgh Authored: Sun Jul 7 04:28:49 2013 +0000 Committer: Tim Van Steenburgh Committed: Sun Jul 7 04:28:49 2013 +0000 ---------------------------------------------------------------------- Allura/allura/controllers/discuss.py | 11 ++++--- Allura/allura/controllers/repository.py | 33 ++++++++++---------- ForgeBlog/forgeblog/main.py | 4 ++- .../forgeblog/tests/functional/test_root.py | 6 +++- .../tests/functional/test_controllers.py | 7 +++++ ForgeWiki/forgewiki/wiki_main.py | 2 +- requirements-sf.txt | 2 +- 7 files changed, 40 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7fc9b7de/ForgeGit/forgegit/tests/functional/test_controllers.py ----------------------------------------------------------------------