You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2014/02/20 23:20:05 UTC
[2/3] git commit: [#5176] ticket:538 Fix layout a bit
[#5176] ticket:538 Fix layout a bit
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/cf9ae3a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/cf9ae3a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/cf9ae3a3
Branch: refs/heads/master
Commit: cf9ae3a35957148b4ca388d78455e253117bb114
Parents: 28265bb
Author: Igor Bondarenko <je...@gmail.com>
Authored: Mon Feb 17 09:24:34 2014 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Thu Feb 20 22:19:28 2014 +0000
----------------------------------------------------------------------
Allura/allura/templates/repo/merge_request.html | 8 +++-----
ForgeGit/forgegit/tests/functional/test_controllers.py | 3 ++-
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/cf9ae3a3/Allura/allura/templates/repo/merge_request.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/merge_request.html b/Allura/allura/templates/repo/merge_request.html
index 7d8aec3..4750a31 100644
--- a/Allura/allura/templates/repo/merge_request.html
+++ b/Allura/allura/templates/repo/merge_request.html
@@ -39,14 +39,12 @@ Merge Request #{{req.request_number}}: {{req.summary}} ({{req.status}})
to {{ req.target_branch }}
</p>
+ <p><strong>Created:</strong> {{lib.abbr_date(req.created)}}</p>
+ <p><strong>Updated:</strong> {{lib.abbr_date(req.mod_date)}}</p>
+
<div>{{g.markdown.convert(req.description)}}</div>
{{ c.log_widget.display(value=req.commits, app=downstream_app) }}
- <p>
- Created: {{lib.abbr_date(req.created)}}
- <br style="clear:both">
- Updated: {{lib.abbr_date(req.mod_date)}}
- </p>
<div class="grid-19"><a href="#discussion_holder">Discuss</a></div>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/cf9ae3a3/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 99ea99e..fd731ae 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -536,7 +536,8 @@ class TestFork(_TestCase):
assert 'git checkout master' in merge_instructions
assert 'git fetch git://git.localhost/p/test2/code master' in merge_instructions
assert 'git merge {}'.format(c_id) in merge_instructions
- assert_equal(r.html.findAll('p')[2].getText(), 'Created:less than 1 minute agoUpdated:less than 1 minute ago')
+ assert_equal(r.html.findAll('p')[1].getText(), 'Created:less than 1 minute ago')
+ assert_equal(r.html.findAll('p')[2].getText(), 'Updated:less than 1 minute ago')
def test_merge_request_with_deleted_repo(self):
self._request_merge()