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/03/13 10:40:53 UTC
allura git commit: Add trailing slash on merge request list,
so links to individual MRs always work
Repository: allura
Updated Branches:
refs/heads/master 0126faa1d -> 228f9bc8c
Add trailing slash on merge request list, so links to individual MRs always work
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/228f9bc8
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/228f9bc8
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/228f9bc8
Branch: refs/heads/master
Commit: 228f9bc8c73305468098d6405e1ae31a790b160d
Parents: 0126faa
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Wed Mar 11 17:35:44 2015 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Mar 11 17:35:44 2015 +0000
----------------------------------------------------------------------
Allura/allura/controllers/repository.py | 1 +
ForgeGit/forgegit/tests/functional/test_controllers.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/228f9bc8/Allura/allura/controllers/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/repository.py b/Allura/allura/controllers/repository.py
index 1e1e840..a3c1541 100644
--- a/Allura/allura/controllers/repository.py
+++ b/Allura/allura/controllers/repository.py
@@ -324,6 +324,7 @@ class RepoRestController(RepoRootController):
class MergeRequestsController(object):
mr_filter = SCMMergeRequestFilterWidget()
+ @with_trailing_slash
@expose('jinja:allura:templates/repo/merge_requests.html')
@validate(mr_filter)
def index(self, status=None, **kw):
http://git-wip-us.apache.org/repos/asf/allura/blob/228f9bc8/ForgeGit/forgegit/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index c048599..772ac05 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -663,7 +663,7 @@ class TestFork(_TestCase):
</div>
""".strip())
- r = self.app.get('/p/test/src-git/merge-requests')
+ r = self.app.get('/p/test/src-git/merge-requests').follow()
assert '<a href="1/">changed summary</a>' in r