You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/05/02 23:20:38 UTC
[1/6] git commit: [#5773] ticket:314 added full commit message,
full date, download link in History view
Updated Branches:
refs/heads/master a9b5b119b -> ba100cc3f
[#5773] ticket:314 added full commit message, full date, download link in History view
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/e14b56ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/e14b56ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/e14b56ee
Branch: refs/heads/master
Commit: e14b56ee7bcdc4a1abca954351caa5ef1135cfc2
Parents: a9b5b11
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Fri Apr 19 11:38:44 2013 +0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu May 2 20:37:02 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/widgets/repo/log.html | 59 ++++++++++----
.../forgegit/tests/functional/test_controllers.py | 12 ++-
.../forgesvn/tests/functional/test_controllers.py | 4 +-
3 files changed, 53 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e14b56ee/Allura/allura/templates/widgets/repo/log.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/repo/log.html b/Allura/allura/templates/widgets/repo/log.html
index d7307a5..11fa918 100644
--- a/Allura/allura/templates/widgets/repo/log.html
+++ b/Allura/allura/templates/widgets/repo/log.html
@@ -33,30 +33,55 @@
{% for commit in value %}
<tr class="rev">
<td>
- {%if is_file%}
+ <div class="grid-14">
+ {%if is_file%}
<div class="grid-1"><input type="checkbox" class="revision" revision="{{commit._id.split(':')[-1]}}" url_commit="{{commit.url()}}"></div>
- {%endif%}
- {{commit.summary}}
- <br/>
- {% if commit.committed.email != commit.authored.email %}
- {% if commit.committer_url %}
+ {%endif%}
+ {%for tag in c.app.repo.symbolics_for_commit(commit)[1]%}
+ <a href="{{c.app.repo.url()}}ci/{{tag}}/tree{{request.params.get('path')}}">{{tag}}</a>
+ {%endfor%}
+ {% if commit.committed.email != commit.authored.email %}
+ {% if commit.committer_url %}
<a href="{{commit.committer_url}}">{{email_gravatar(commit.committed.email, title=commit.committed.name, size=16)}}
- {{commit.committed.name}}</a>
+ {{commit.committed.name}}</a>
pushed
- {% else %}
+ {% else %}
{{email_gravatar(commit.committed.email, title=commit.committed.name, size=16)}} {{commit.committed.name}}
pushed
- {% endif %}
- {% endif %}
- <a href="{{commit.url()}}">{{commit.shorthand_id()}}</a>
- by
- {{email_gravatar(commit.authored.email, title=commit.authored.name, size=16)}} {{commit.authored.name}}
+ {% endif %}
+ {% endif %}
+ <a href="{{commit.url()}}">{{commit.shorthand_id()}}</a>
+ by
+ {{email_gravatar(commit.authored.email, title=commit.authored.name, size=16)}} {{commit.authored.name}}
+ {%if is_file%}
+ {%if request.params.get('path')[:1]=='/'%}
+ {%set path = request.params.get('path')[1:]%}
+ {%else%}
+ {%set path = request.params.get('path')%}
+ {%endif%}
+
+ {{commit.tree.get_blob(path).size}} Bytes
+ {%endif%}
+ </div>
+ <div>
+ {{g.markdown.convert(commit.message)}}
+ </div>
</td>
- <td>
- {% if commit.committed.date %}{{abbr_date(commit.committed.date)}}{% endif %}
+ <td style="vertical-align: text-top">
+ {% if commit.committed.date %}{{commit.committed.date}}{% endif %}
</td>
- <td style="text-align: right">
- <a href="{{commit.url()}}tree/">Tree</a>
+ <td style="text-align: left; vertical-align: text-top">
+ <a href="{{commit.url()}}tree{{request.params.get('path')}}">
+ {%if is_file%}
+ View
+ {% else %}
+ Tree
+ {%endif%}
+ </a>
+ {%if is_file%}
+ <br/>
+ <a href="{{commit.url()}}tree{{request.params.get('path')}}?format=raw ">Download</a>
+ {%endif%}
</td>
</tr>
{% endfor %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e14b56ee/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 186b46a..78ff5a9 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -110,10 +110,16 @@ class TestRootController(_TestCase):
def test_log(self):
resp = self.app.get('/src-git/ci/1e146e67985dcd71c74de79613719bef7bddca4a/log/')
assert 'Initial commit' in resp
- assert 'Change README' in resp
+ assert '<div class="markdown_content"><p>Change README</p></div>' in resp
+ assert 'tree/README?format=raw ">Download</a>' not in resp
+ assert'28 Bytes' not in resp.html.find('td').contents[1].text
+ assert 'Tree' in resp.html.findAll('td')[2].text, resp.html.findAll('td')[2].text
resp = self.app.get('/src-git/ci/1e146e67985dcd71c74de79613719bef7bddca4a/log/?path=/README')
- assert 'Change README ' in resp
- assert 'Add README ' in resp
+ assert'28 Bytes' in resp.html.find('td').contents[1].text
+ assert 'View' in resp.html.findAll('td')[2].text
+ assert 'Change README' in resp
+ assert 'tree/README?format=raw ">Download</a>' in resp
+ assert 'Add README' in resp
assert "Initial commit " not in resp
resp = self.app.get('/src-git/ci/1e146e67985dcd71c74de79613719bef7bddca4a/log/?path=/a/b/c/')
assert 'Remove file' in resp
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e14b56ee/ForgeSVN/forgesvn/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/functional/test_controllers.py b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
index 90af545..9ab3b57 100644
--- a/ForgeSVN/forgesvn/tests/functional/test_controllers.py
+++ b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
@@ -138,10 +138,10 @@ class TestRootController(SVNTestController):
assert 'Create readme' in r
r = self.app.get('/src/2/log/?path=')
assert "Create readme" in r
- assert "Add path " in r
+ assert "Add path" in r
r = self.app.get('/src/2/log/?path=README')
assert "Modify readme" not in r
- assert "Create readme " in r
+ assert "Create readme" in r
r = self.app.get('/src/2/log/?path=/a/b/c/')
assert 'Add path' in r
assert 'Remove hello.txt' not in r
[4/6] git commit: [#5773] ticket:328 refactored log widget
Posted by br...@apache.org.
[#5773] ticket:328 refactored log widget
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/cf331123
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/cf331123
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/cf331123
Branch: refs/heads/master
Commit: cf33112318ea778be43d46fa1827a26c016b75a6
Parents: d7bcc22
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Wed May 1 14:50:55 2013 +0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu May 2 20:37:05 2013 +0000
----------------------------------------------------------------------
Allura/allura/config/app_cfg.py | 1 +
Allura/allura/lib/helpers.py | 6 +++++-
Allura/allura/nf/allura/css/allura.css | 3 +++
Allura/allura/templates/widgets/repo/log.html | 16 ++++++++--------
Allura/allura/tests/test_helpers.py | 4 ++++
5 files changed, 21 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/cf331123/Allura/allura/config/app_cfg.py
----------------------------------------------------------------------
diff --git a/Allura/allura/config/app_cfg.py b/Allura/allura/config/app_cfg.py
index f6b11e4..86c65b4 100644
--- a/Allura/allura/config/app_cfg.py
+++ b/Allura/allura/config/app_cfg.py
@@ -101,6 +101,7 @@ class ForgeConfig(AppConfig):
extensions=['jinja2.ext.do', 'jinja2.ext.i18n'])
jinja2_env.install_gettext_translations(pylons.i18n)
jinja2_env.filters['filesizeformat'] = helpers.do_filesizeformat
+ jinja2_env.filters['datetimeformat'] = helpers.datetimeformat
jinja2_env.globals.update({'hasattr': hasattr})
config['pylons.app_globals'].jinja2_env = jinja2_env
# Jinja's unable to request c's attributes without strict_c
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/cf331123/Allura/allura/lib/helpers.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py
index 29cf44e..9d97c02 100644
--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -701,4 +701,8 @@ def get_first(d, key):
v = d.get(key)
if isinstance(v, list):
return v[0] if len(v) > 0 else None
- return v
\ No newline at end of file
+ return v
+
+
+def datetimeformat(value, format='%Y-%m-%d %H:%M:%S'):
+ return value.strftime(format)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/cf331123/Allura/allura/nf/allura/css/allura.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/allura.css b/Allura/allura/nf/allura/css/allura.css
index d468b1a..7b0471c 100644
--- a/Allura/allura/nf/allura/css/allura.css
+++ b/Allura/allura/nf/allura/css/allura.css
@@ -211,3 +211,6 @@ b.ico.ico-vote-down { background-image: url('../images/vote_down.png'); }
.pagination_size {
height: 40px;
}
+tr.rev div.markdown_content p {
+ padding: 0;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/cf331123/Allura/allura/templates/widgets/repo/log.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/repo/log.html b/Allura/allura/templates/widgets/repo/log.html
index bdeeda2..50affe6 100644
--- a/Allura/allura/templates/widgets/repo/log.html
+++ b/Allura/allura/templates/widgets/repo/log.html
@@ -33,10 +33,16 @@
{% for commit in value %}
<tr class="rev">
<td>
- <div class="grid-14">
+ <div>
{%if is_file%}
<div class="grid-1"><input type="checkbox" class="revision" revision="{{commit._id.split(':')[-1]}}" url_commit="{{commit.url()}}"></div>
{%endif%}
+ <a href="{{c.app.repo.url_for_commit(commit)}}">{{commit.shorthand_id()}}</a>
+ {% if c.app.repo.symbolics_for_commit(commit)[1] %}
+ ({% for tag in c.app.repo.symbolics_for_commit(commit)[1] -%}
+ <a href="{{c.app.repo.url_for_commit(tag)}}">{{tag}}</a>{% if not loop.last %} {% endif %}
+ {%- endfor %})
+ {% endif %}
{% if commit.committed.email != commit.authored.email %}
{% if commit.committer_url %}
<a href="{{commit.committer_url}}">{{email_gravatar(commit.committed.email, title=commit.committed.name, size=16)}}
@@ -47,12 +53,6 @@
pushed
{% endif %}
{% endif %}
- <a href="{{commit.url()}}">{{commit.shorthand_id()}}</a>
- {% if c.app.repo.symbolics_for_commit(commit)[1] %}
- ({% for tag in c.app.repo.symbolics_for_commit(commit)[1] -%}
- <a href="{{c.app.repo.url()}}ci/{{tag}}/tree{{request.params.get('path')}}">{{tag}}</a>{% if not loop.last %} {% endif %}
- {%- endfor %})
- {% endif %}
by
{{email_gravatar(commit.authored.email, title=commit.authored.name, size=16)}} {{commit.authored.name}}
{%if is_file%}
@@ -62,7 +62,7 @@
</div>
</td>
<td style="vertical-align: text-top">
- {% if commit.committed.date %}{{commit.committed.date}}{% endif %}
+ {% if commit.committed.date %}{{commit.committed.date|datetimeformat}}{% endif %}
</td>
<td style="text-align: left; vertical-align: text-top">
<a href="{{commit.url()}}tree{{request.params.get('path')}}">
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/cf331123/Allura/allura/tests/test_helpers.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_helpers.py b/Allura/allura/tests/test_helpers.py
index ed40cfc..40c0e96 100644
--- a/Allura/allura/tests/test_helpers.py
+++ b/Allura/allura/tests/test_helpers.py
@@ -238,3 +238,7 @@ def test_inject_user(context):
context.user = Mock(username='*anonymous')
result = inject_user('reported_by_s:$USER OR assigned_to_s:$USER')
assert_equals(result, 'reported_by_s:"*anonymous" OR assigned_to_s:"*anonymous"')
+
+def test_datetimeformat():
+ from datetime import date
+ assert h.datetimeformat(date(2013, 01, 01)) == '2013-01-01 00:00:00'
[5/6] git commit: [#5773] ticket:328 fixed css for log widget
Posted by br...@apache.org.
[#5773] ticket:328 fixed css for log widget
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/5a51840a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/5a51840a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/5a51840a
Branch: refs/heads/master
Commit: 5a51840a77960d13fe96f897290d0eee09fbe963
Parents: cf33112
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Wed May 1 18:19:25 2013 +0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu May 2 20:37:05 2013 +0000
----------------------------------------------------------------------
Allura/allura/nf/allura/css/allura.css | 2 ++
Allura/allura/templates/widgets/repo/log.html | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5a51840a/Allura/allura/nf/allura/css/allura.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/allura.css b/Allura/allura/nf/allura/css/allura.css
index 7b0471c..1334b0c 100644
--- a/Allura/allura/nf/allura/css/allura.css
+++ b/Allura/allura/nf/allura/css/allura.css
@@ -211,6 +211,8 @@ b.ico.ico-vote-down { background-image: url('../images/vote_down.png'); }
.pagination_size {
height: 40px;
}
+
tr.rev div.markdown_content p {
padding: 0;
+ margin-bottom: 0;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5a51840a/Allura/allura/templates/widgets/repo/log.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/repo/log.html b/Allura/allura/templates/widgets/repo/log.html
index 50affe6..c46b425 100644
--- a/Allura/allura/templates/widgets/repo/log.html
+++ b/Allura/allura/templates/widgets/repo/log.html
@@ -45,11 +45,13 @@
{% endif %}
{% if commit.committed.email != commit.authored.email %}
{% if commit.committer_url %}
+ by
<a href="{{commit.committer_url}}">{{email_gravatar(commit.committed.email, title=commit.committed.name, size=16)}}
- {{commit.committed.name}}</a>
+ {{commit.committed.name}}</a>,
pushed
{% else %}
- {{email_gravatar(commit.committed.email, title=commit.committed.name, size=16)}} {{commit.committed.name}}
+ by
+ {{email_gravatar(commit.committed.email, title=commit.committed.name, size=16)}} {{commit.committed.name}},
pushed
{% endif %}
{% endif %}
[6/6] git commit: [#5773] ticket:328 fixed authored.name and
committed name
Posted by br...@apache.org.
[#5773] ticket:328 fixed authored.name and committed name
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/ba100cc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/ba100cc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/ba100cc3
Branch: refs/heads/master
Commit: ba100cc3fa89641552ec2618d97bbe6d1cf25acd
Parents: 5a51840
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Thu May 2 09:53:31 2013 +0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu May 2 20:37:06 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/widgets/repo/log.html | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ba100cc3/Allura/allura/templates/widgets/repo/log.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/repo/log.html b/Allura/allura/templates/widgets/repo/log.html
index c46b425..1d2c24d 100644
--- a/Allura/allura/templates/widgets/repo/log.html
+++ b/Allura/allura/templates/widgets/repo/log.html
@@ -43,23 +43,19 @@
<a href="{{c.app.repo.url_for_commit(tag)}}">{{tag}}</a>{% if not loop.last %} {% endif %}
{%- endfor %})
{% endif %}
- {% if commit.committed.email != commit.authored.email %}
- {% if commit.committer_url %}
+ {%if is_file%}
+ ({{commit.tree.get_obj_by_path(request.params.get('path')).size|filesizeformat}})
+ {%endif%}
by
+ {{email_gravatar(commit.authored.email, title=commit.authored.name, size=16)}} {{commit.authored.name}}{%if commit.committed.email != commit.authored.email %}, pushed by
+ {% if commit.committer_url %}
<a href="{{commit.committer_url}}">{{email_gravatar(commit.committed.email, title=commit.committed.name, size=16)}}
{{commit.committed.name}}</a>,
pushed
{% else %}
- by
- {{email_gravatar(commit.committed.email, title=commit.committed.name, size=16)}} {{commit.committed.name}},
- pushed
+ {{email_gravatar(commit.committed.email, title=commit.committed.name, size=16)}} {{commit.committed.name}}
{% endif %}
{% endif %}
- by
- {{email_gravatar(commit.authored.email, title=commit.authored.name, size=16)}} {{commit.authored.name}}
- {%if is_file%}
- ({{commit.tree.get_obj_by_path(request.params.get('path')).size|filesizeformat}})
- {%endif%}
{{g.markdown.convert(commit.message)}}
</div>
</td>
[3/6] git commit: [#5773] ticket:314 fixed filesize errors
Posted by br...@apache.org.
[#5773] ticket:314 fixed filesize errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/94b70cea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/94b70cea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/94b70cea
Branch: refs/heads/master
Commit: 94b70cea70a115851b40446780efc17fc96222be
Parents: e14b56e
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Fri Apr 19 17:11:58 2013 +0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu May 2 20:37:04 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/widgets/repo/log.html | 24 +++++---------
.../forgegit/tests/functional/test_controllers.py | 8 ++--
2 files changed, 13 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/94b70cea/Allura/allura/templates/widgets/repo/log.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/repo/log.html b/Allura/allura/templates/widgets/repo/log.html
index 11fa918..086b0b3 100644
--- a/Allura/allura/templates/widgets/repo/log.html
+++ b/Allura/allura/templates/widgets/repo/log.html
@@ -34,12 +34,10 @@
<tr class="rev">
<td>
<div class="grid-14">
+ {{g.markdown.convert(commit.message)}}
{%if is_file%}
- <div class="grid-1"><input type="checkbox" class="revision" revision="{{commit._id.split(':')[-1]}}" url_commit="{{commit.url()}}"></div>
+ <div class="grid-1"><input type="checkbox" class="revision" revision="{{commit._id.split(':')[-1]}}" url_commit="{{commit.url()}}"></div>
{%endif%}
- {%for tag in c.app.repo.symbolics_for_commit(commit)[1]%}
- <a href="{{c.app.repo.url()}}ci/{{tag}}/tree{{request.params.get('path')}}">{{tag}}</a>
- {%endfor%}
{% if commit.committed.email != commit.authored.email %}
{% if commit.committer_url %}
<a href="{{commit.committer_url}}">{{email_gravatar(commit.committed.email, title=commit.committed.name, size=16)}}
@@ -51,21 +49,17 @@
{% endif %}
{% endif %}
<a href="{{commit.url()}}">{{commit.shorthand_id()}}</a>
+ {% if c.app.repo.symbolics_for_commit(commit)[1] %}
+ ({% for tag in c.app.repo.symbolics_for_commit(commit)[1] -%}
+ <a href="{{c.app.repo.url()}}ci/{{tag}}/tree{{request.params.get('path')}}">{{tag}}</a>{% if not loop.last %} {% endif %}
+ {%- endfor %})
+ {% endif %}
by
{{email_gravatar(commit.authored.email, title=commit.authored.name, size=16)}} {{commit.authored.name}}
{%if is_file%}
- {%if request.params.get('path')[:1]=='/'%}
- {%set path = request.params.get('path')[1:]%}
- {%else%}
- {%set path = request.params.get('path')%}
- {%endif%}
-
- {{commit.tree.get_blob(path).size}} Bytes
+ ({{commit.tree.get_obj_by_path(request.params.get('path')).size|filesizeformat}})
{%endif%}
</div>
- <div>
- {{g.markdown.convert(commit.message)}}
- </div>
</td>
<td style="vertical-align: text-top">
{% if commit.committed.date %}{{commit.committed.date}}{% endif %}
@@ -80,7 +74,7 @@
</a>
{%if is_file%}
<br/>
- <a href="{{commit.url()}}tree{{request.params.get('path')}}?format=raw ">Download</a>
+ <a href="{{commit.url()}}tree{{request.params.get('path')}}?format=raw">Download</a>
{%endif%}
</td>
</tr>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/94b70cea/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 78ff5a9..d5c8365 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -111,14 +111,14 @@ class TestRootController(_TestCase):
resp = self.app.get('/src-git/ci/1e146e67985dcd71c74de79613719bef7bddca4a/log/')
assert 'Initial commit' in resp
assert '<div class="markdown_content"><p>Change README</p></div>' in resp
- assert 'tree/README?format=raw ">Download</a>' not in resp
- assert'28 Bytes' not in resp.html.find('td').contents[1].text
+ assert 'tree/README?format=raw">Download</a>' not in resp
+ assert '28 Bytes' not in resp.html.find('td').contents[1].text
assert 'Tree' in resp.html.findAll('td')[2].text, resp.html.findAll('td')[2].text
resp = self.app.get('/src-git/ci/1e146e67985dcd71c74de79613719bef7bddca4a/log/?path=/README')
- assert'28 Bytes' in resp.html.find('td').contents[1].text
+ assert '28 Bytes' in resp.html.find('td').contents[1].text
assert 'View' in resp.html.findAll('td')[2].text
assert 'Change README' in resp
- assert 'tree/README?format=raw ">Download</a>' in resp
+ assert 'tree/README?format=raw">Download</a>' in resp
assert 'Add README' in resp
assert "Initial commit " not in resp
resp = self.app.get('/src-git/ci/1e146e67985dcd71c74de79613719bef7bddca4a/log/?path=/a/b/c/')
[2/6] git commit: [#5773] ticket:314 Move commit message back to the
bottom
Posted by br...@apache.org.
[#5773] ticket:314 Move commit message back to the bottom
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/d7bcc228
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/d7bcc228
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/d7bcc228
Branch: refs/heads/master
Commit: d7bcc2286ea81d13dab8019df40db657531e83c6
Parents: 94b70ce
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Apr 19 14:15:14 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu May 2 20:37:04 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/widgets/repo/log.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d7bcc228/Allura/allura/templates/widgets/repo/log.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/repo/log.html b/Allura/allura/templates/widgets/repo/log.html
index 086b0b3..bdeeda2 100644
--- a/Allura/allura/templates/widgets/repo/log.html
+++ b/Allura/allura/templates/widgets/repo/log.html
@@ -34,7 +34,6 @@
<tr class="rev">
<td>
<div class="grid-14">
- {{g.markdown.convert(commit.message)}}
{%if is_file%}
<div class="grid-1"><input type="checkbox" class="revision" revision="{{commit._id.split(':')[-1]}}" url_commit="{{commit.url()}}"></div>
{%endif%}
@@ -59,6 +58,7 @@
{%if is_file%}
({{commit.tree.get_obj_by_path(request.params.get('path')).size|filesizeformat}})
{%endif%}
+ {{g.markdown.convert(commit.message)}}
</div>
</td>
<td style="vertical-align: text-top">