incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tvansteenbu...@apache.org
Subject [31/50] [abbrv] git commit: [#2502] ticket:300 Add \n before lists, thus markdown will render them properly
Date Wed, 24 Apr 2013 04:54:36 GMT
[#2502] ticket:300 Add \n before lists, thus markdown will render them properly


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

Branch: refs/heads/tv/docs
Commit: 1f298f19d78a08706136747b6ccff8d1e3e0691e
Parents: 92f0595
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Tue Apr 16 12:38:47 2013 +0000
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Mon Apr 22 19:40:27 2013 +0000

----------------------------------------------------------------------
 ForgeTracker/forgetracker/data/mass_report         |    1 +
 .../forgetracker/tests/functional/test_root.py     |    4 ++++
 ForgeTracker/forgetracker/tracker_main.py          |    2 +-
 3 files changed, 6 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/1f298f19/ForgeTracker/forgetracker/data/mass_report
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/data/mass_report b/ForgeTracker/forgetracker/data/mass_report
index 629a1e2..72ae642 100644
--- a/ForgeTracker/forgetracker/data/mass_report
+++ b/ForgeTracker/forgetracker/data/mass_report
@@ -2,5 +2,6 @@
 
 {% for t_num, change_text in data.changes %}
 ticket: [{{ context.app.config.options.mount_point }}:#{{ t_num }}]
+
 {{ change_text }}
 {% endfor %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/1f298f19/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index 760f740..1321e6f 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -1141,17 +1141,21 @@ class TestFunctionalController(TrackerTestController):
 
         # Expected data
         email_header = '''Mass edit changing:
+
 - **Status**: accepted
 - **Milestone**: 2.0
 
 '''
         first_ticket_changes = '''ticket: [bugs:#1]
+
 - **Status**: open --> accepted
 '''
         second_ticket_changes = '''ticket: [bugs:#2]
+
 - **Milestone**: 1.0 --> 2.0
 '''
         third_ticket_changes = '''ticket: [bugs:#3]
+
 - **Status**: unread --> accepted
 - **Milestone**: 1.0 --> 2.0
 '''

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/1f298f19/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 132f9ec..01b9f45 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -865,7 +865,7 @@ class RootController(BaseController):
         ).get_template('mass_report')
         head = ['- **%s**: %s' % (get_label(f), v) for f, v in values.iteritems()]
         head += ['- **%s**: %s' % (get_label(f), v) for f, v in custom_values.iteritems()]
-        tmpl_context = {'context': c, 'data': {'header': '\n'.join(['Mass edit changing:']
+ head)}}
+        tmpl_context = {'context': c, 'data': {'header': '\n'.join(['Mass edit changing:',
''] + head)}}
         for user in users:
             tmpl_context['data'].update({'changes': changes_iter(user)})
             mail.update(dict(


Mime
View raw message