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

Change subject: Add 2ColConflict extension to integration
......................................................................


Add 2ColConflict extension to integration

Bug: T145411
Change-Id: I6c7b1c5ff6af747cdd46b3323278b48db9133cf8
---
M zuul/layout.yaml
1 file changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Paladox: Looks good to me, but someone else must approve
  Hashar: Looks good to me, approved
  Addshore: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 57722c9..da66083 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2474,6 +2474,14 @@
 
 #### MediaWiki extensions ######################################
 
+  - name: mediawiki/extensions/2ColConflict
+    template:
+      - name: composer-test
+      - name: extension-unittests-generic
+      - name: npm
+    check:
+      - jsonlint
+      - jshint
 
   - name: mediawiki/extensions/AbuseFilter
     template:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c7b1c5ff6af747cdd46b3323278b48db9133cf8
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
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