[#6125] Remove 'committed' from email subject
Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>
diff --git a/Allura/allura/model/repo_refresh.py b/Allura/allura/model/repo_refresh.py
index e2821f6..52855b5 100644
--- a/Allura/allura/model/repo_refresh.py
+++ b/Allura/allura/model/repo_refresh.py
@@ -420,7 +420,7 @@
len(commit_msgs), repo.app.project.name, repo.app.config.options.mount_label)
text='\n\n'.join(commit_msgs)
else:
- subject = '{0} - {1} committed: {2}'.format(
+ subject = '{0} - {1}: {2}'.format(
repo.shorthand_for_commit(ci._id),
ci.authored.name,
summary)
diff --git a/ForgeGit/forgegit/tests/model/test_repository.py b/ForgeGit/forgegit/tests/model/test_repository.py
index 2eb90da..316f202 100644
--- a/ForgeGit/forgegit/tests/model/test_repository.py
+++ b/ForgeGit/forgegit/tests/model/test_repository.py
@@ -264,7 +264,7 @@
ThreadLocalORMSession.flush_all()
notifications = M.Notification.query.find().sort('pubdate')
n = notifications.all()[2]
- assert_equal(n.subject, '[test:src-git] [1e146e] - Rick Copeland committed: Change README')
+ assert_equal(n.subject, '[test:src-git] [1e146e] - Rick Copeland: Change README')
assert 'master,zz: ' in n.text
send_notifications(self.repo, ['1e146e67985dcd71c74de79613719bef7bddca4a', 'df30427c488aeab84b2352bdf88a3b19223f9d7a'])
ThreadLocalORMSession.flush_all()
diff --git a/ForgeSVN/forgesvn/tests/model/test_repository.py b/ForgeSVN/forgesvn/tests/model/test_repository.py
index 082d423..6026125 100644
--- a/ForgeSVN/forgesvn/tests/model/test_repository.py
+++ b/ForgeSVN/forgesvn/tests/model/test_repository.py
@@ -419,7 +419,7 @@
ThreadLocalORMSession.flush_all()
notifications = M.Notification.query.find().sort('pubdate')
n = notifications.all()[3]
- assert_equal(n.subject, '[test:src] [r1] - rick446 committed: Create readme')
+ assert_equal(n.subject, '[test:src] [r1] - rick446: Create readme')
assert_equal(n.text, 'Create readme http://localhost//p/test/src/1/')
