You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ke...@apache.org on 2018/01/30 14:58:00 UTC

[2/2] allura git commit: Merge commit '4a5d2002607b6c13cfe466c082295a96aacd88d9'

Merge commit '4a5d2002607b6c13cfe466c082295a96aacd88d9'


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/8666cbb1
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/8666cbb1
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/8666cbb1

Branch: refs/heads/master
Commit: 8666cbb175c9568298c5adac6d5abd127a4f657a
Parents: 9a30fec 4a5d200
Author: Kenton Taylor <kt...@slashdotmedia.com>
Authored: Tue Jan 30 14:08:30 2018 +0000
Committer: Kenton Taylor <kt...@slashdotmedia.com>
Committed: Tue Jan 30 14:08:30 2018 +0000

----------------------------------------------------------------------
 Allura/allura/controllers/rest.py               | 35 ++++++++---------
 Allura/allura/tests/functional/test_admin.py    | 28 +++++---------
 Allura/allura/tests/functional/test_auth.py     | 14 +++----
 Allura/allura/tests/functional/test_home.py     |  5 +--
 Allura/allura/tests/functional/test_rest.py     | 40 +++++++++-----------
 Allura/allura/tests/test_webhooks.py            |  3 +-
 AlluraTest/alluratest/controller.py             |  2 +-
 .../forgeblog/tests/functional/test_rest.py     |  6 +--
 .../forgeblog/tests/functional/test_root.py     |  1 -
 .../tests/functional/test_import.py             |  4 +-
 .../tests/functional/test_controllers.py        |  2 -
 .../forgewiki/tests/functional/test_rest.py     |  3 +-
 12 files changed, 61 insertions(+), 82 deletions(-)
----------------------------------------------------------------------