jenkins-bot has submitted this change and it was merged.

Change subject: Do not show merges by the L10n-bot
......................................................................


Do not show merges by the L10n-bot

Bug: T93082
Change-Id: I450515ea40ffe14cc5c6efe6e29a4f773ae9de3b
---
M src/preprocess.js
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/preprocess.js b/src/preprocess.js
index 2fc0402..ee4e20e 100644
--- a/src/preprocess.js
+++ b/src/preprocess.js
@@ -139,9 +139,11 @@
 
 exports['change-merged'] = function(message) {
     var ret = formatSimpleEvent('Merged', 'submitter')(message);
-    // Ignore any merges by anyone not jenkins-bot
+    // Ignore any merges by anyone that is not jenkins-bot
     // This is always preceded by a C:2 by them, so we need not spam
-    if(ret.user !== 'jenkins-bot') {
+    // Jenkins bot will be ignored when merging L10n-bot patches
+    if( ( ret.user === 'jenkins-bot' && ret.owner === 'L10n-bot' ) ||
+        ( ret.user !== 'jenkins-bot' ) ) {
         ret = undefined;
     }
     return ret;

-- 
To view, visit https://gerrit.wikimedia.org/r/308949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I450515ea40ffe14cc5c6efe6e29a4f773ae9de3b
Gerrit-PatchSet: 10
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to