This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/master by this push: new 2af63f9 Notifications changes 2af63f9 is described below commit 2af63f9a824d1b0b181230e116934c635b254159 Author: Dmitriy Pavlov <dpav...@apache.org> AuthorDate: Sat Sep 22 15:01:33 2018 +0300 Notifications changes --- .../src/main/java/org/apache/ignite/ci/issue/Issue.java | 10 +++++----- .../main/java/org/apache/ignite/ci/issue/IssueDetector.java | 2 +- .../main/java/org/apache/ignite/ci/issue/Notification.java | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Issue.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Issue.java index b57adc0..391a76f 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Issue.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Issue.java @@ -74,10 +74,10 @@ public class Issue { if(includeChangesInfo) { if (changes.isEmpty()) - sb.append(" No changes in build"); + sb.append(" No changes in the build"); else { - sb.append(" Changes may led to failure were done by "); + sb.append(" Changes may lead to failure were done by "); for (Iterator<ChangeUi> iter = changes.iterator(); iter.hasNext(); ) { ChangeUi next = iter.next(); @@ -115,7 +115,7 @@ public class Issue { if(includeChangesInfo) { if (changes.isEmpty()) - sb.append("\n No changes in build"); + sb.append("\n No changes in the build"); else { sb.append("\n Changes may led to failure were done by "); @@ -172,10 +172,10 @@ public class Issue { if(includeChangesInfo) { if (changes.isEmpty()) - sb.append(" No changes in build"); + sb.append(" No changes in the build"); else { - sb.append(" Changes may led to failure were done by \n"); + sb.append(" Changes may lead to failure were done by \n"); for (Iterator<ChangeUi> iter = changes.iterator(); iter.hasNext(); ) { ChangeUi next = iter.next(); diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssueDetector.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssueDetector.java index eb12138..d4745fd 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssueDetector.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssueDetector.java @@ -307,7 +307,7 @@ public class IssueDetector { firstFailedTestId = null; } else - displayType = "New stable failure of flaky test"; + displayType = "New stable failure of a flaky test"; } } } diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Notification.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Notification.java index e64b841..4d94ddd 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Notification.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/Notification.java @@ -21,11 +21,11 @@ import java.util.*; import org.apache.ignite.ci.web.model.Version; public class Notification { - private static final String DETECTED_ISSUE = "I've detected some new issue on TeamCity to be addressed. " + + private static final String DETECTED_ISSUE = "I've detected some new issue on TeamCity to be handled. " + "You are more than welcomed to help."; private static final String IF_YOUR_CHANGES = "If your changes can lead to this failure(s): " + - "We're grateful that you were a volunteer to make the contribution to this project," + + "We're grateful that you were a volunteer to make the contribution to this project, " + "but things change and you may no longer be able to finalize your contribution."; private static final String YOUR_ACTION = "Could you respond to this email and indicate if you wish to continue and fix test failures" + @@ -116,19 +116,19 @@ public class Notification { private String messageTailPlainText() { - return "\t - Here’s a reminder of what contributors were agreed to do " + + return "\t - Here's a reminder of what contributors were agreed to do " + HTC_REF + " \n" + "\t - Should you have any questions please contact " + Version.DEFAULT_CONTACT + " \n\n" + - "Best Regards,\nIgnite Teamcity Bot \n" + + "Best Regards,\nApache Ignite TeamCity Bot \n" + "Notification generated at " + new Date(ts).toString() + " \n"; } private String messageTailHtml() { - return "<ul><li>Here’s a reminder of what contributors were agreed to do " + + return "<ul><li>Here's a reminder of what contributors were agreed to do " + "<a href='" + HTC_REF + "'>How to contribute</a>." + "</li>" + "<li>Should you have any questions please contact " + Version.DEFAULT_CONTACT + " </li></ul><br>" + - "Best Regards,<br>Ignite Teamcity Bot<br>" + + "Best Regards,<br>Apache Ignite TeamCity Bot<br>" + "Notification generated at " + new Date(ts).toString() + "<br>"; }