You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/07/08 21:28:23 UTC

[11/25] 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/cj/4656
Commit: 7fc9b7de2cd168436d9f16add9e55c47eb5d4a2b
Parents: 19c7673 6901e8a
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Sun Jul 7 04:28:49 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
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
----------------------------------------------------------------------