[MediaWiki-commits] [Gerrit] allow mira to connect to tcpircbot on neon - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223469

Change subject: allow mira to connect to tcpircbot on neon
..

allow mira to connect to tcpircbot on neon

When deploying, the deployment server connects to tcpircbot on neon
to announce the sync.

This was allowed for tin and we want it to work for mira in codfw.

Add v4 AND v6 address.

Change-Id: I8df023c1a789c9a9f521211fa856759246c978a8
---
M manifests/role/tcpircbot.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/69/223469/1

diff --git a/manifests/role/tcpircbot.pp b/manifests/role/tcpircbot.pp
index a120ee7..06c0b60 100644
--- a/manifests/role/tcpircbot.pp
+++ b/manifests/role/tcpircbot.pp
@@ -24,6 +24,6 @@
 
 ferm::rule { 'tcpircbot_allowed':
 # eventlog1001, tin(v4), localhost, tin (v6)
-rule = 'proto tcp dport 9200 { saddr (10.64.32.167/32 10.64.0.196/32 
127.0.0.1 2620:0:861:101:10:64:0:196/128) ACCEPT; }',
+rule = 'proto tcp dport 9200 { saddr (10.64.32.167/32 10.64.0.196/32 
10.192.16.132/32 127.0.0.1 2620:0:861:101:10:64:0:196/128 
2620:0:860:102:10:192:16:132/128) ACCEPT; }',
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8df023c1a789c9a9f521211fa856759246c978a8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Retry composer install on travis - change (mediawiki...Wikibase)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223459

Change subject: Retry composer install on travis
..

Retry composer install on travis

This sometimes fails for no apparent reason, eg.
https://travis-ci.org/wikimedia/mediawiki-extensions-Wikibase/jobs/69970751

Change-Id: Ie6152a1523f25b271a3e4b1e02682c03dd9a552a
---
M build/travis/install.sh
1 file changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/59/223459/1

diff --git a/build/travis/install.sh b/build/travis/install.sh
index 495d345..6dbad81 100755
--- a/build/travis/install.sh
+++ b/build/travis/install.sh
@@ -21,7 +21,11 @@
 cd phase3
 composer self-update
 composer install
-composer dump-autoload -o # Workaround 
https://github.com/wikimedia/composer-merge-plugin/issues/41
+
+# Try composer install again... this tends to fail from time to time
+if [ $? -gt 0 ]; then
+   composer install
+fi
 
 mysql -e 'create database its_a_mw;'
 php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw 
--dbpath $(pwd) --pass nyan TravisWiki admin
@@ -38,3 +42,8 @@
 cd Wikibase
 
 composer install --prefer-source
+
+# Try composer install again... this tends to fail from time to time
+if [ $? -gt 0 ]; then
+   composer install --prefer-source
+fi

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6152a1523f25b271a3e4b1e02682c03dd9a552a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de

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

[MediaWiki-commits] [Gerrit] Track redirect revision info in RDF wdata - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Track redirect revision info in RDF wdata
..


Track redirect revision info in RDF wdata

This is a slightly refactored version of If32318d6e8f9

Bug: T100463
Change-Id: Ibe93c875e2d7ce5013c3c7004bed2bd4afa49c34
---
M lib/includes/store/EntityRevision.php
A lib/includes/store/RedirectRevision.php
A lib/includes/store/RevisionInfo.php
M lib/includes/store/UnresolvedRedirectException.php
M lib/includes/store/sql/WikiPageEntityRevisionLookup.php
M lib/tests/phpunit/EntityRevisionLookupTest.php
M lib/tests/phpunit/MockRepository.php
M lib/tests/phpunit/MockRepositoryTest.php
M repo/includes/Dumpers/RdfDumpGenerator.php
M repo/includes/LinkedData/EntityDataRequestHandler.php
M repo/includes/LinkedData/EntityDataSerializationService.php
M repo/includes/rdf/RdfBuilder.php
M repo/tests/phpunit/data/rdf/Q7_Q9_dedup.nt
M repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
14 files changed, 254 insertions(+), 60 deletions(-)

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



diff --git a/lib/includes/store/EntityRevision.php 
b/lib/includes/store/EntityRevision.php
index c49a791..955ae53 100644
--- a/lib/includes/store/EntityRevision.php
+++ b/lib/includes/store/EntityRevision.php
@@ -13,7 +13,7 @@
  * @licence GNU GPL v2+
  * @author Daniel Kinzler
  */
-class EntityRevision {
+class EntityRevision implements RevisionInfo {
 
/**
 * @var EntityDocument
diff --git a/lib/includes/store/RedirectRevision.php 
b/lib/includes/store/RedirectRevision.php
new file mode 100644
index 000..aa518cb
--- /dev/null
+++ b/lib/includes/store/RedirectRevision.php
@@ -0,0 +1,79 @@
+?php
+
+namespace Wikibase;
+
+use InvalidArgumentException;
+use Wikibase\Lib\Store\EntityRedirect;
+
+/**
+ * Represents a revision of a Wikibase redirect.
+ *
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
+ * @author Daniel Kinzler
+ */
+class RedirectRevision implements RevisionInfo {
+
+   /**
+* @var EntityRedirect
+*/
+   private $redirect;
+
+   /**
+* @var int
+*/
+   private $revisionId;
+
+   /**
+* @var string
+*/
+   private $mwTimestamp;
+
+   /**
+* @param EntityRedirect $redirect
+* @param int $revisionId Revision ID or 0 for none
+* @param string $mwTimestamp in MediaWiki format or an empty string 
for none
+*
+* @throws InvalidArgumentException
+*/
+   public function __construct( EntityRedirect $redirect, $revisionId = 0, 
$mwTimestamp = '' ) {
+   if ( !is_int( $revisionId ) || $revisionId  0 ) {
+   throw new InvalidArgumentException( 'Revision ID must 
be a non-negative integer.' );
+   }
+
+   if ( $mwTimestamp !== ''  !preg_match( '/^\d{14}$/', 
$mwTimestamp ) ) {
+   throw new InvalidArgumentException( 'Timestamp must be 
a string of 14 digits or empty.' );
+   }
+
+   $this-redirect = $redirect;
+   $this-revisionId = $revisionId;
+   $this-mwTimestamp = $mwTimestamp;
+   }
+
+   /**
+* @return EntityRedirect
+*/
+   public function getRedirect() {
+   return $this-redirect;
+   }
+
+   /**
+* @see Revision::getId
+*
+* @return int
+*/
+   public function getRevisionId() {
+   return $this-revisionId;
+   }
+
+   /**
+* @see Revision::getTimestamp
+*
+* @return string in MediaWiki format or an empty string
+*/
+   public function getTimestamp() {
+   return $this-mwTimestamp;
+   }
+
+}
diff --git a/lib/includes/store/RevisionInfo.php 
b/lib/includes/store/RevisionInfo.php
new file mode 100644
index 000..327283b
--- /dev/null
+++ b/lib/includes/store/RevisionInfo.php
@@ -0,0 +1,29 @@
+?php
+
+namespace Wikibase;
+
+/**
+ * Interface for value objects that hold basic revision info.
+ *
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
+ * @author Daniel Kinzler
+ */
+interface RevisionInfo {
+
+   /**
+* @see Revision::getId
+*
+* @return int
+*/
+   public function getRevisionId();
+
+   /**
+* @see Revision::getTimestamp
+*
+* @return string in MediaWiki format or an empty string
+*/
+   public function getTimestamp();
+
+}
diff --git a/lib/includes/store/UnresolvedRedirectException.php 
b/lib/includes/store/UnresolvedRedirectException.php
index 7478d37..f8eb87d 100644
--- a/lib/includes/store/UnresolvedRedirectException.php
+++ b/lib/includes/store/UnresolvedRedirectException.php
@@ -2,7 +2,6 @@
 
 namespace Wikibase\Lib\Store;
 
-use Exception;
 use Wikibase\DataModel\Entity\EntityId;
 
 /**
@@ -20,19 +19,26 @@
private 

[MediaWiki-commits] [Gerrit] Use db_name_format in Site.dbName() - change (pywikibot/core)

[Sn1per (Code Review)]

Sn1per has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223465

Change subject: Use db_name_format in Site.dbName()
..

Use db_name_format in Site.dbName()

* Change the db_name_format to use the WMF Labs '_p' suffix.
* Use db_name_format in the output of Site.dbName()

Change-Id: I4f9927f72d3f51057a2528bb292cbb6db374f8fc
---
M pywikibot/config2.py
M pywikibot/site.py
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/65/223465/1

diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 0acc717..47b0c16 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -608,7 +608,7 @@
 db_hostname = 'localhost'
 db_username = ''
 db_password = ''
-db_name_format = '{0}'
+db_name_format = '{0}_p'
 db_connect_file = user_home_path('.my.cnf')
 
 # # SEARCH ENGINE SETTINGS ##
diff --git a/pywikibot/site.py b/pywikibot/site.py
index afed231..25a1859 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -2395,7 +2395,7 @@
 
 def dbName(self):
 Return this site's internal id.
-return self.siteinfo['wikiid']
+return pywikibot.config.db_name_format.format(self.siteinfo['wikiid'])
 
 @deprecated('APISite.lang')
 def language(self):

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f9927f72d3f51057a2528bb292cbb6db374f8fc
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Sn1per geof...@gmail.com

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

[MediaWiki-commits] [Gerrit] Enable VisualEditor by default on labswiki - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Enable VisualEditor by default on labswiki
..


Enable VisualEditor by default on labswiki

Bug: T104961
Change-Id: I710c6a321009214d6892001f7afd8613d7ee6784
---
M visualeditor-default.dblist
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/visualeditor-default.dblist b/visualeditor-default.dblist
index b2e8454..96a534e 100644
--- a/visualeditor-default.dblist
+++ b/visualeditor-default.dblist
@@ -234,6 +234,7 @@
 wikimania2015wiki
 wikimania2016wiki
 # Other wikis (e.g. Commons, Meta, Wikimedias)
+labswiki
 # Private wikis
 boardwiki
 collabwiki

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I710c6a321009214d6892001f7afd8613d7ee6784
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Remove metadataonly parameter from JS - change (mediawiki...Flow)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223462

Change subject: Remove metadataonly parameter from JS
..

Remove metadataonly parameter from JS

Change-Id: If239d53881470d71143f718e69b475a7ec8c8f72
Follows-up: https://gerrit.wikimedia.org/r/#/c/210071/
---
M modules/engine/misc/flow-api.js
1 file changed, 0 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/62/223462/1

diff --git a/modules/engine/misc/flow-api.js b/modules/engine/misc/flow-api.js
index 39ce2f3..d094579 100644
--- a/modules/engine/misc/flow-api.js
+++ b/modules/engine/misc/flow-api.js
@@ -237,13 +237,6 @@
// Use the default submodule if no action in URL
queryMap.submodule = queryMap.submodule || 
this.defaultSubmodule;
 
-   // We will do a separate view request afterwards, so we don't 
want view data
-   // to be returned from POST.
-   // Can be removed when 
Iddd999536d1c37eedf5c61938e0c2b2f4bc66827 is merged.
-   if ( apiTransformMap[queryMap.submodule] ) {
-   queryMap[apiTransformMap[queryMap.submodule][0] + 
'metadataonly'] = true;
-   }
-
// Default action is flow
queryMap.action = queryMap.action || 'flow';
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If239d53881470d71143f718e69b475a7ec8c8f72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add CT_ID to Astropay audit refund messages - change (wikimedia...SmashPig)

[jenkins-bot (Code Review)]

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

Change subject: Add CT_ID to Astropay audit refund messages
..


Add CT_ID to Astropay audit refund messages

For Astropay, we need to look up log lines by CT_ID instead of
gateway_txn_id.

Bug: T90507
Change-Id: Iccb936309b0f1977b74fbc9aa9065b530a605da8
---
M PaymentProviders/Astropay/Audit/AstropayAudit.php
M PaymentProviders/Astropay/Tests/phpunit/AuditTest.php
2 files changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/PaymentProviders/Astropay/Audit/AstropayAudit.php 
b/PaymentProviders/Astropay/Audit/AstropayAudit.php
index 92ab85d..517fceb 100644
--- a/PaymentProviders/Astropay/Audit/AstropayAudit.php
+++ b/PaymentProviders/Astropay/Audit/AstropayAudit.php
@@ -93,6 +93,7 @@
}
 
protected function parseRefund( array $row, array $msg ) {
+   $msg['contribution_tracking_id'] = 
$this-getContributionTrackingId( $row['Transaction Invoice'] );
$msg['gateway_parent_id'] = $row['Transaction Reference'];
$msg['gateway_refund_id'] = 'RFD ' . $row['Reference'];
$msg['gross_currency'] = 'BRL'; // FIXME when AP adds this 
column!
@@ -100,8 +101,7 @@
}
 
protected function parseDonation( array $row, array $msg ) {
-   $parts = explode( '.', $row['Invoice'] );
-   $msg['contribution_tracking_id'] = $parts[0];
+   $msg['contribution_tracking_id'] = 
$this-getContributionTrackingId( $row['Invoice'] );
$msg['country'] = $row['Country'];
$msg['currency'] = 'BRL'; // FIXME when AP adds this column!
$msg['email'] = $row['User Mail'];
@@ -117,4 +117,9 @@
$msg['settled_gross'] = $row['Amount (USD)'];
}
}
+
+   protected function getContributionTrackingId( $invoice ) {
+   $parts = explode( '.', $invoice );
+   return $parts[0];
+   }
 }
diff --git a/PaymentProviders/Astropay/Tests/phpunit/AuditTest.php 
b/PaymentProviders/Astropay/Tests/phpunit/AuditTest.php
index bf02552..1669fcc 100644
--- a/PaymentProviders/Astropay/Tests/phpunit/AuditTest.php
+++ b/PaymentProviders/Astropay/Tests/phpunit/AuditTest.php
@@ -43,6 +43,7 @@
$actual = $output[0];
$expected = array(
'gateway' = 'astropay',
+   'contribution_tracking_id' = '314159265',
'date' = 1434747909,
'gross' = '5.00',
'gateway_parent_id' = '7654321',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iccb936309b0f1977b74fbc9aa9065b530a605da8
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Cdentinger cdentin...@wikimedia.org
Gerrit-Reviewer: XenoRyet dkozlow...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Correct placement of the scroll when we scroll to topic - change (mediawiki...Flow)

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223472

Change subject: Correct placement of the scroll when we scroll to topic
..

Correct placement of the scroll when we scroll to topic

Scroll a bit above the topic so the title is not obscured by the
ToC widget.

Bug: T96890
Change-Id: I7707dccef8a9a0fa535bc9beb9c445149878e9bc
---
M modules/flow/ui/widgets/mw.flow.ui.ToCWidget.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/72/223472/1

diff --git a/modules/flow/ui/widgets/mw.flow.ui.ToCWidget.js 
b/modules/flow/ui/widgets/mw.flow.ui.ToCWidget.js
index cff79c6..8eb178b 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.ToCWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.ToCWidget.js
@@ -84,7 +84,7 @@
if ( $topic.length  0 ) {
// Scroll down to the topic
$( 'html, body' ).animate( {
-   scrollTop: $topic.offset().top + 'px'
+   scrollTop: ( $topic.offset().top - 20 ) + 'px'
}, 'fast' );
} else {
// TODO: Widgetize board, topic and post so we can do 
this

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7707dccef8a9a0fa535bc9beb9c445149878e9bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo mor...@gmail.com

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

[MediaWiki-commits] [Gerrit] Get rid of disabled 'echo-notify-show-link' preference - change (mediawiki...Echo)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223471

Change subject: Get rid of disabled 'echo-notify-show-link' preference
..

Get rid of disabled 'echo-notify-show-link' preference

This preference has been disabled since bug 47562, and doesn't make
sense to keep around given that the flyout is the main interaction most
users have with Echo.

Change-Id: I7e8ddf96dbde9a95ac01a0cc83bad396151d01bd
---
M Echo.php
M Hooks.php
M i18n/en.json
M i18n/qqq.json
M includes/DiscussionParser.php
5 files changed, 25 insertions(+), 43 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/71/223471/1

diff --git a/Echo.php b/Echo.php
index d953995..ab06542 100644
--- a/Echo.php
+++ b/Echo.php
@@ -403,9 +403,6 @@
),
 );
 
-// Enable notifications for all logged in users by default
-$wgDefaultUserOptions['echo-notify-show-link'] = true;
-
 // Enable new talk page messages alert for all logged in users by default
 $wgDefaultUserOptions['echo-show-alert'] = true;
 
diff --git a/Hooks.php b/Hooks.php
index deccedd..98b53b7 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -375,14 +375,6 @@
unset( $preferences['enotifusertalkpages']['section'] );
}
 
-   // Show fly-out display prefs
-   // Per bug 47562, we're going to hide this pref for now until 
we see
-   // what the community reaction to Echo is on en.wiki.
-   $preferences['echo-notify-show-link'] = array(
-   'type' = 'hidden',
-   'label-message' = 'echo-pref-notify-show-link',
-   //'section' = 'echo/displaynotifications',
-   );
return true;
}
 
@@ -591,9 +583,7 @@
 * @return bool true in all cases
 */
static function beforePageDisplay( $out, $skin ) {
-   $user = $out-getUser();
-
-   if ( $user-isLoggedIn()  $user-getOption( 
'echo-notify-show-link' ) ) {
+   if ( $out-getUser()-isLoggedIn() ) {
// Load the module for the Notifications flyout
$out-addModules( array( 'ext.echo.overlay.init' ) );
// Load the styles for the Notifications badge
@@ -634,33 +624,31 @@
}
 
// Add a My notifications item to personal URLs
-   if ( $user-getOption( 'echo-notify-show-link' ) ) {
-   $notifUser = MWEchoNotifUser::newFromUser( $user );
-   $notificationCount = $notifUser-getNotificationCount();
-   $notificationTimestamp = 
$notifUser-getLastUnreadNotificationTime();
-   $seenTime = $user-getOption( 'echo-seen-time' );
-   $text = 
EchoNotificationController::formatNotificationCount( $notificationCount );
-   $url = SpecialPage::getTitleFor( 'Notifications' 
)-getLocalURL();
+   $notifUser = MWEchoNotifUser::newFromUser( $user );
+   $notificationCount = $notifUser-getNotificationCount();
+   $notificationTimestamp = 
$notifUser-getLastUnreadNotificationTime();
+   $seenTime = $user-getOption( 'echo-seen-time' );
+   $text = EchoNotificationController::formatNotificationCount( 
$notificationCount );
+   $url = SpecialPage::getTitleFor( 'Notifications' 
)-getLocalURL();
 
-   if (
-   $notificationCount == 0 || // no unread 
notifications
-   $notificationTimestamp === false || // should 
already always be false if count === 0
-   ( $seenTime !== null  
$notificationTimestamp-getTimestamp( TS_MW ) = $seenTime ) // all 
notifications have already been seen
-   ) {
-   $linkClasses = array( 
'mw-echo-notifications-badge' );
-   } else {
-   $linkClasses = array( 
'mw-echo-unread-notifications', 'mw-echo-notifications-badge' );
-   }
-   $notificationsLink = array(
-   'href' = $url,
-   'text' = $text,
-   'active' = ( $url == $title-getLocalUrl() ),
-   'class' = $linkClasses,
-   );
-
-   $insertUrls = array( 'notifications' = 
$notificationsLink );
-   $personal_urls = wfArrayInsertAfter( $personal_urls, 
$insertUrls, 'userpage' );
+   if (
+   $notificationCount == 0 || // no unread notifications
+   $notificationTimestamp === false || // should already 
always be false if count === 0
+   ( $seenTime !== null  

[MediaWiki-commits] [Gerrit] allow mira to connect to tcpircbot on neon - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: allow mira to connect to tcpircbot on neon
..


allow mira to connect to tcpircbot on neon

When deploying, the deployment server connects to tcpircbot on neon
to announce the sync.

This was allowed for tin and we want it to work for mira in codfw.

Add v4 AND v6 address.

Bug:T95436
Change-Id: I8df023c1a789c9a9f521211fa856759246c978a8
---
M manifests/role/tcpircbot.pp
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  BryanDavis: Looks good to me, but someone else must approve
  Alex Monk: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/role/tcpircbot.pp b/manifests/role/tcpircbot.pp
index a120ee7..ea46486 100644
--- a/manifests/role/tcpircbot.pp
+++ b/manifests/role/tcpircbot.pp
@@ -23,7 +23,7 @@
 }
 
 ferm::rule { 'tcpircbot_allowed':
-# eventlog1001, tin(v4), localhost, tin (v6)
-rule = 'proto tcp dport 9200 { saddr (10.64.32.167/32 10.64.0.196/32 
127.0.0.1 2620:0:861:101:10:64:0:196/128) ACCEPT; }',
+# eventlog1001, tin (v4), mira (v4), localhost, tin (v6), mira (v6)
+rule = 'proto tcp dport 9200 { saddr (10.64.32.167/32 10.64.0.196/32 
10.192.16.132/32 127.0.0.1 2620:0:861:101:10:64:0:196/128 
2620:0:860:102:10:192:16:132/128) ACCEPT; }',
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8df023c1a789c9a9f521211fa856759246c978a8
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Tag v0.11.8 - change (oojs/ui)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223474

Change subject: Tag v0.11.8
..

Tag v0.11.8

Change-Id: I5eb7bf92c0f9fa35e71bebdd3b685597999598cf
---
M History.md
M package.json
2 files changed, 78 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/74/223474/1

diff --git a/History.md b/History.md
index 86287ce..d3d9e2d 100644
--- a/History.md
+++ b/History.md
@@ -1,13 +1,33 @@
 # OOjs UI Release History
 
+## v0.11.8 / 2015-07-07
+### Features
+* TextInputWidget: Allow setting the HTML autocomplete attribute (Florian)
+* Make scroll into view work in scrollable divs in Firefox (Roan Kattouw)
+
+### Styles
+* MediaWiki theme: Remove support for frameless primary buttons (Bartosz 
Dziewoński)
+
+### Code
+* Use at-ease instead of PHP's @ (Kunal Mehta)
+* Use composer's autoloader in exec:phpGenerateJSPHPForKarma (Kunal Mehta)
+* build: Don't lint demos/{dist,node_modules,vendor} (Kunal Mehta)
+* build: Build demos as part of `grunt build` too (Kunal Mehta)
+* build: Build demos as part of `grunt quick-build` (Kunal Mehta)
+* demos: Make self-contained in demos/ directory (Kunal Mehta)
+* tests: Provide better output when running infusion test under Karma (Bartosz 
Dziewoński)
+
 ## v0.11.7 / 2015-07-01
+### Features
 * Element.php: Strip all namespaces from infused PHP widgets (Kunal Mehta)
 * OptionWidget: Explicitly set aria-selected to 'false' on init (Bartosz 
Dziewoński)
 
+### Styles
 * MediaWiki theme: Add support for frameless primary buttons (Ed Sanders)
 * MediaWiki theme: Align and center the advanced icon (Roan Kattouw)
 * MediaWiki, Apex themes: Fix styling for frameless process dialog actions (Ed 
Sanders)
 
+### Code
 * Element.php: Add test case to verify class name in infused widgets (Kunal 
Mehta)
 * Element.php: Only variables may be passed by reference (Kunal Mehta)
 * Theme.php: Actually make abstract in PHP (Kunal Mehta)
@@ -15,79 +35,89 @@
 * documentation: Use bold in comments instead of h4 (Ed Sanders)
 
 ## v0.11.6 / 2015-06-23
+### Features
 * NumberInputWidget: Don't use `Math.sign()` (Brad Jorsch)
 * SelectWidget: Fix invalid escape sequence '`\s`' (Roan Kattouw)
 
+### Styles
 * DropdownWidget: Add white background in MediaWiki theme (Prateek Saxena)
 * SelectFileWidget: Add white background in MediaWiki theme (Prateek Saxena)
 * MediaWiki theme: Add constructive variants for star and unStar icons (Roan 
Kattouw)
 * MediaWiki theme: Add invert variant to all icons (Roan Kattouw)
 * MediaWiki theme: Add progressive variant to ongoingConversation icon 
(Stephane Bisson)
 
+### Code
 * Use `.parent` instead of `.super` (Stephane Bisson)
 * build: Updating development dependencies (Kunal Mehta)
 
 ## v0.11.5 / 2015-06-16
+### Features
 * ButtonInputWidget: Render frameless button correctly (Bartosz Dziewoński)
 * ComboBoxWidget: Add a getter method for text inputs (Mr. Stradivarius)
 * FieldsetLayout: Make rule for disabled label color more precise (Bartosz 
Dziewoński)
 * MenuSelectWidget: Explain what the widget config option is for (Roan Kattouw)
 * RadioSelectInputWidget: Unbreak form submission in JS version (Bartosz 
Dziewoński)
 
+### Styles
 * MediaWiki theme: Add destructive variant to check icon (Matthew Flaschen)
 * MediaWiki, Apex themes: Add ongoingConversation icon (Matthew Flaschen)
 
+### Code
 * build: Configure jsonlint (Kunal Mehta)
 
 ## v0.11.4 / 2015-06-09
+### Deprecations
 * [DEPRECATING CHANGE] Introduce oo.ui.mixin namespace for mixins, and put 
them src/mixins (C. Scott Ananian)
 
+### Features
 * ActionFieldLayout: Add PHP version (Bartosz Dziewoński)
-* ActionFieldLayout: Dead code removal and cleanup (Bartosz Dziewoński)
-* BarToolGroup: Add description and example (Kirsten Menger-Anderson)
-* ButtonInputWidget and TextInputWidget: Document and enforce allowed types 
(Bartosz Dziewoński)
 * ButtonWidget: Fix not having tabindex updated when enabled/disabled (Brad 
Jorsch)
 * ClippableElement: Fix behavior of clippables in nested scrollables (Bartosz 
Dziewoński)
 * ClippableElement: Fix behavior of long clippables (Bartosz Dziewoński)
 * Dialog: Label in aria terms (Prateek Saxena)
-* DropdownInputWidget: Tweak documentation (Bartosz Dziewoński)
 * DropdownWidget: Adjust height to other widgets (Bartosz Dziewoński)
 * DropdownWidget: Blank widget when no item is selected (Brad Jorsch)
 * Element#reconsiderScrollbars: Preserve scroll position (Bartosz Dziewoński)
 * GroupElement: pass correct event name to disconnect() from aggregate() (Roan 
Kattouw)
-* InputWidget#getInputElement: Mark as `@protected`, not `@private` (Bartosz 
Dziewoński)
-* ListToolGroup: Add description and example (Kirsten Menger-Anderson)
-* MenuToolGroup: Add description, example and mark private method (Kirsten 
Menger-Anderson)
-* MessageDialog: Remove unintentional action button margin (Bartosz Dziewoński)
 * 

[MediaWiki-commits] [Gerrit] Get rid of disabled 'echo-notify-show-link' preference - change (mediawiki...Echo)

[jenkins-bot (Code Review)]

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

Change subject: Get rid of disabled 'echo-notify-show-link' preference
..


Get rid of disabled 'echo-notify-show-link' preference

This preference has been disabled since bug 47562, and doesn't make
sense to keep around given that the flyout is the main interaction most
users have with Echo.

Change-Id: I7e8ddf96dbde9a95ac01a0cc83bad396151d01bd
---
M Echo.php
M Hooks.php
M i18n/en.json
M i18n/qqq.json
M includes/DiscussionParser.php
5 files changed, 25 insertions(+), 43 deletions(-)

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



diff --git a/Echo.php b/Echo.php
index d953995..ab06542 100644
--- a/Echo.php
+++ b/Echo.php
@@ -403,9 +403,6 @@
),
 );
 
-// Enable notifications for all logged in users by default
-$wgDefaultUserOptions['echo-notify-show-link'] = true;
-
 // Enable new talk page messages alert for all logged in users by default
 $wgDefaultUserOptions['echo-show-alert'] = true;
 
diff --git a/Hooks.php b/Hooks.php
index deccedd..98b53b7 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -375,14 +375,6 @@
unset( $preferences['enotifusertalkpages']['section'] );
}
 
-   // Show fly-out display prefs
-   // Per bug 47562, we're going to hide this pref for now until 
we see
-   // what the community reaction to Echo is on en.wiki.
-   $preferences['echo-notify-show-link'] = array(
-   'type' = 'hidden',
-   'label-message' = 'echo-pref-notify-show-link',
-   //'section' = 'echo/displaynotifications',
-   );
return true;
}
 
@@ -591,9 +583,7 @@
 * @return bool true in all cases
 */
static function beforePageDisplay( $out, $skin ) {
-   $user = $out-getUser();
-
-   if ( $user-isLoggedIn()  $user-getOption( 
'echo-notify-show-link' ) ) {
+   if ( $out-getUser()-isLoggedIn() ) {
// Load the module for the Notifications flyout
$out-addModules( array( 'ext.echo.overlay.init' ) );
// Load the styles for the Notifications badge
@@ -634,33 +624,31 @@
}
 
// Add a My notifications item to personal URLs
-   if ( $user-getOption( 'echo-notify-show-link' ) ) {
-   $notifUser = MWEchoNotifUser::newFromUser( $user );
-   $notificationCount = $notifUser-getNotificationCount();
-   $notificationTimestamp = 
$notifUser-getLastUnreadNotificationTime();
-   $seenTime = $user-getOption( 'echo-seen-time' );
-   $text = 
EchoNotificationController::formatNotificationCount( $notificationCount );
-   $url = SpecialPage::getTitleFor( 'Notifications' 
)-getLocalURL();
+   $notifUser = MWEchoNotifUser::newFromUser( $user );
+   $notificationCount = $notifUser-getNotificationCount();
+   $notificationTimestamp = 
$notifUser-getLastUnreadNotificationTime();
+   $seenTime = $user-getOption( 'echo-seen-time' );
+   $text = EchoNotificationController::formatNotificationCount( 
$notificationCount );
+   $url = SpecialPage::getTitleFor( 'Notifications' 
)-getLocalURL();
 
-   if (
-   $notificationCount == 0 || // no unread 
notifications
-   $notificationTimestamp === false || // should 
already always be false if count === 0
-   ( $seenTime !== null  
$notificationTimestamp-getTimestamp( TS_MW ) = $seenTime ) // all 
notifications have already been seen
-   ) {
-   $linkClasses = array( 
'mw-echo-notifications-badge' );
-   } else {
-   $linkClasses = array( 
'mw-echo-unread-notifications', 'mw-echo-notifications-badge' );
-   }
-   $notificationsLink = array(
-   'href' = $url,
-   'text' = $text,
-   'active' = ( $url == $title-getLocalUrl() ),
-   'class' = $linkClasses,
-   );
-
-   $insertUrls = array( 'notifications' = 
$notificationsLink );
-   $personal_urls = wfArrayInsertAfter( $personal_urls, 
$insertUrls, 'userpage' );
+   if (
+   $notificationCount == 0 || // no unread notifications
+   $notificationTimestamp === false || // should already 
always be false if count === 0
+   ( $seenTime !== null  
$notificationTimestamp-getTimestamp( TS_MW ) = 

[MediaWiki-commits] [Gerrit] Revert Change mention inspector template - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Revert Change mention inspector template
..


Revert Change mention inspector template

This reverts commit b5d857f6d2c222caf5525efe42e309604575bcda.

Change-Id: Ifb5cb0dc06b250f4eaae961072c66f4db3b77b4c
---
M Hooks.php
M i18n/en.json
M i18n/qqq.json
D maintenance/FlowCreateMentionTemplate.php
M 
modules/editor/editors/visualeditor/ui/inspectors/mw.flow.ve.ui.MentionInspector.js
5 files changed, 8 insertions(+), 59 deletions(-)

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



diff --git a/Hooks.php b/Hooks.php
index 114f622..fe0988a 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -232,9 +232,6 @@
require_once 
__DIR__.'/maintenance/FlowUpdateWorkflowPageId.php';
$updater-addPostDatabaseUpdateMaintenance( 
'FlowUpdateWorkflowPageId' );
 
-   require_once 
__DIR__.'/maintenance/FlowCreateMentionTemplate.php';
-   $updater-addPostDatabaseUpdateMaintenance( 
'FlowCreateMentionTemplate' );
-
return true;
}
 
@@ -673,6 +670,7 @@
 
$vars['wgFlowEditorList'] = $wgFlowEditorList;
$vars['wgFlowMaxTopicLength'] = 
Flow\Model\PostRevision::MAX_TOPIC_LENGTH;
+   $vars['wgFlowMentionTemplate'] = wfMessage( 
'flow-ve-mention-template' )-inContentLanguage()-plain();
$vars['wgFlowAjaxTimeout'] = $wgFlowAjaxTimeout;
 
return true;
diff --git a/i18n/en.json b/i18n/en.json
index 2ac5ea4..e02f0f5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -529,6 +529,7 @@
flow-ve-mention-inspector-remove-label: Remove,
flow-ve-mention-placeholder: User name,
flow-ve-mention-tool-title: Mention a user,
+   flow-ve-mention-template: ping,
flow-ve-mention-inspector-invalid-user: The username \$1\ is not 
registered.,
flow-wikitext-editor-help: Wikitext $1.,
flow-wikitext-editor-help-and-preview: Wikitext $1 and you can $2 
anytime.,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 97f07dc..e48d547 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -535,6 +535,7 @@
flow-ve-mention-inspector-remove-label: Text of remove button on 
Flow's user mention panel (inspector) in the VisualEditor.,
flow-ve-mention-placeholder: Placeholder text for the input field in 
the user mention tool where the user can type a user 
name.\n{{Identical|Username}},
flow-ve-mention-tool-title: Title text for the user mention tool on 
Flow's VisualEditor toolbar.,
+   flow-ve-mention-template: Name of on-wiki template used for user 
mentions.  The template should accept a call in the form 
nowiki{{templatename|Username}}/nowiki, to mention Username.  It uses the 
content language.,
flow-ve-mention-inspector-invalid-user: Error shown when the poster 
attempts to mention a user that does not exist.  Parameters:\n$1: Username.  
The username is not registered; thus, gender is unknown.,
flow-wikitext-editor-help: Text shown at the bottom of a wikitext 
editing box when visualeditor is not available to switch to.\n\n$1 is 
{{msg-mw|Flow-wikitext-editor-help-uses-wikitext}}.,
flow-wikitext-editor-help-and-preview: Text shown at the bottom of a 
wikitext editing box when visualeditor is available to switch to.\n* $1 is 
{{msg-mw|flow-wikitext-editor-help-uses-wikitext}}\n* $2 is 
{{msg-mw|flow-wikitext-editor-help-preview-the-result}},
diff --git a/maintenance/FlowCreateMentionTemplate.php 
b/maintenance/FlowCreateMentionTemplate.php
deleted file mode 100644
index 7d34a92..000
--- a/maintenance/FlowCreateMentionTemplate.php
+++ /dev/null
@@ -1,52 +0,0 @@
-?php
-
-require_once ( getenv( 'MW_INSTALL_PATH' ) !== false
-? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
-: dirname( __FILE__ ) . '/../../../maintenance/Maintenance.php' );
-
-/**
- * Creates Template:FlowMention, which is used te render mentions in Flow's 
Visual Editor.
- * The template will be created with a default format, but can be customized.
- * If the template already exists, it will be left untouched.
- *
- * @ingroup Maintenance
- */
-class FlowCreateMentionTemplate extends LoggedUpdateMaintenance {
-public function __construct() {
-parent::__construct();
-
-$this-mDescription = Creates Template:FlowMention, which is used te 
render mentions in Flow's Visual Editor;
-}
-
-protected function getUpdateKey() {
-return __CLASS__;
-}
-
-protected function doDBUpdates() {
-// get User: namespace prefix in wiki language
-global $wgContLang;
-$namespaces = $wgContLang-getFormattedNamespaces();
-
-$title = Title::newFromText( 'FlowMention', NS_TEMPLATE );
-$article = new Article( $title );
-$page = $article-getPage();
-
-if ( $page-getRevision() !== null ) {
-   

[MediaWiki-commits] [Gerrit] Add IContextSource $context = null in WikibaseRepo - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Add IContextSource $context = null in WikibaseRepo
..


Add IContextSource $context = null in WikibaseRepo

This brings recently added methods in line with
the rest of WikibaseRepo, where $context is optional
to avoid making various things overly complex.

I am aware there is optional hidden global state
here, but this should be fixed in a seperate patch
as it would require touching lots of places.

Once the hiding of global state in various places is
fixed and they rewuire context to be passed down then
the can and should explicetly require context at
this higher level.

See also:
https://gerrit.wikimedia.org/r/#/c/223254/
https://gerrit.wikimedia.org/r/#/c/223262/

Change-Id: I677adb388d09b16e399734cab2f66f69c8a379ff
---
M repo/includes/WikibaseRepo.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Bene: Looks good to me, approved
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 3db405a..0f33a75 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -1070,11 +1070,11 @@
}
 
/**
-* @param IContextSource $context
+* @param IContextSource|null $context
 *
 * @return ApiHelperFactory
 */
-   public function getApiHelperFactory( $context ) {
+   public function getApiHelperFactory( IContextSource $context = null ) {
return new ApiHelperFactory(
$this-getEntityTitleLookup(),
$this-getExceptionLocalizer(),
@@ -1091,7 +1091,7 @@
 *
 * @return EditEntityFactory
 */
-   public function newEditEntityFactory( $context = null ) {
+   public function newEditEntityFactory( IContextSource $context = null ) {
return new EditEntityFactory(
$this-getEntityTitleLookup(),
$this-getEntityRevisionLookup( 'uncached' ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I677adb388d09b16e399734cab2f66f69c8a379ff
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Bene benestar.wikime...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Store default main context in WikibaseRepo singleton - change (mediawiki...Wikibase)

[Bene (Code Review)]

Bene has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223280

Change subject: Store default main context in WikibaseRepo singleton
..

Store default main context in WikibaseRepo singleton

Change-Id: I50424cd2e769fd5be4a6fe0491daeb7c84369af4
---
M repo/includes/WikibaseRepo.php
1 file changed, 22 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/80/223280/1

diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 0f33a75..e710354 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -8,6 +8,7 @@
 use DataValues\Serializers\DataValueSerializer;
 use Deserializers\Deserializer;
 use IContextSource;
+use RequestContext;
 use RuntimeException;
 use Serializers\Serializer;
 use SiteSQLStore;
@@ -16,9 +17,7 @@
 use User;
 use ValueFormatters\FormatterOptions;
 use ValueFormatters\ValueFormatter;
-use Wikibase\Repo\Api\ApiHelperFactory;
 use Wikibase\ChangeOp\ChangeOpFactoryProvider;
-use Wikibase\DataModel\Statement\StatementGuidParser;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
 use Wikibase\DataModel\Entity\Diff\EntityDiffer;
 use Wikibase\DataModel\Entity\DispatchingEntityIdParser;
@@ -26,6 +25,7 @@
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
+use Wikibase\DataModel\Statement\StatementGuidParser;
 use Wikibase\EditEntityFactory;
 use Wikibase\EntityFactory;
 use Wikibase\EntityParserOutputGeneratorFactory;
@@ -67,6 +67,7 @@
 use Wikibase\Lib\WikibaseSnakFormatterBuilders;
 use Wikibase\Lib\WikibaseValueFormatterBuilders;
 use Wikibase\ReferencedEntitiesFinder;
+use Wikibase\Repo\Api\ApiHelperFactory;
 use Wikibase\Repo\Content\EntityContentFactory;
 use Wikibase\Repo\Content\ItemHandler;
 use Wikibase\Repo\Content\PropertyHandler;
@@ -112,6 +113,11 @@
 * @var SettingsArray
 */
private $settings;
+
+   /**
+* @var IContextSource
+*/
+   private $context;
 
/**
 * @var DataTypeFactory|null
@@ -205,7 +211,10 @@
static $instance = null;
 
if ( $instance === null ) {
-   $instance = new self( new SettingsArray( 
$GLOBALS['wgWBRepoSettings'] ) );
+   $instance = new self(
+   new SettingsArray( $GLOBALS['wgWBRepoSettings'] 
),
+   RequestContext::getMain()
+   );
}
 
return $instance;
@@ -215,9 +224,11 @@
 * @since 0.4
 *
 * @param SettingsArray $settings
+* @param IContextSource $context
 */
-   public function __construct( SettingsArray $settings ) {
+   public function __construct( SettingsArray $settings, IContextSource 
$context ) {
$this-settings = $settings;
+   $this-context = $context;
}
 
/**
@@ -320,18 +331,18 @@
 * @since 0.5
 *
 * @param User $user
-* @param IContextSource $context
+* @param IContextSource|nulll $context
 *
 * @return RedirectCreationInteractor
 */
-   public function newRedirectCreationInteractor( User $user, 
IContextSource $context ) {
+   public function newRedirectCreationInteractor( User $user, 
IContextSource $context = null ) {
return new RedirectCreationInteractor(
$this-getEntityRevisionLookup( 'uncached' ),
$this-getEntityStore(),
$this-getEntityPermissionChecker(),
$this-getSummaryFormatter(),
$user,
-   $this-newEditFilterHookRunner( $context ),
+   $this-newEditFilterHookRunner( $context ?: 
$this-context ),
$this-getStore()-getEntityRedirectLookup()
);
}
@@ -345,7 +356,7 @@
return new EditFilterHookRunner(
$this-getEntityTitleLookup(),
$this-getEntityContentFactory(),
-   $context
+   $context ?: $this-context
);
}
 
@@ -1082,7 +1093,7 @@
$this-getEntityFactory(),
$this-getSummaryFormatter(),
$this-getEntityRevisionLookup( 'uncached' ),
-   $this-newEditEntityFactory( $context )
+   $this-newEditEntityFactory( $context ?: $this-context 
)
);
}
 
@@ -1097,8 +1108,8 @@
$this-getEntityRevisionLookup( 'uncached' ),
$this-getEntityStore(),
$this-getEntityPermissionChecker(),
-   

[MediaWiki-commits] [Gerrit] MergeItemsTest: assert redirect creation - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: MergeItemsTest: assert redirect creation
..


MergeItemsTest: assert redirect creation

Change-Id: Id6376fd16748a0f79f5c91de3a6a716d29ccf597
---
M repo/tests/phpunit/includes/api/MergeItemsTest.php
1 file changed, 41 insertions(+), 15 deletions(-)

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



diff --git a/repo/tests/phpunit/includes/api/MergeItemsTest.php 
b/repo/tests/phpunit/includes/api/MergeItemsTest.php
index c59c1fc..c2c15d5 100644
--- a/repo/tests/phpunit/includes/api/MergeItemsTest.php
+++ b/repo/tests/phpunit/includes/api/MergeItemsTest.php
@@ -9,7 +9,7 @@
 use Wikibase\Repo\Api\ApiErrorReporter;
 use Wikibase\Repo\Api\MergeItems;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
-use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\Repo\Interactors\ItemMergeInteractor;
 use Wikibase\Repo\Interactors\RedirectCreationInteractor;
 use Wikibase\Repo\WikibaseRepo;
@@ -101,25 +101,34 @@
}
 
/**
+* @param EntityRedirect|null $redirect
+*
 * @return RedirectCreationInteractor
 */
-   public function getMockRedirectCreationInteractor() {
+   public function getMockRedirectCreationInteractor( EntityRedirect 
$redirect = null ) {
$mock = $this-getMockBuilder( 
'Wikibase\Repo\Interactors\RedirectCreationInteractor' )
-disableOriginalConstructor()
-getMock();
 
-   $mock-expects( $this-any() )
-   -method( 'createRedirect' )
-   -will( $this-returnCallback( function( EntityId 
$fromId, EntityId $toId, $bot ) {
-   return new EntityRedirect( $fromId, $toId );
-   } ) );
+   if ( $redirect ) {
+   $mock-expects( $this-once() )
+   -method( 'createRedirect' )
+   -with( $redirect-getEntityId(), 
$redirect-getTargetId() )
+   -will( $this-returnCallback( function() use ( 
$redirect ) {
+   return $redirect;
+   } ) );
+   } else {
+   $mock-expects( $this-never() )
+   -method( 'createRedirect' );
+   }
+
return $mock;
}
 
/**
 * @param MergeItems $module
 */
-   private function overrideServices( MergeItems $module ) {
+   private function overrideServices( MergeItems $module, EntityRedirect 
$expectedRedirect = null ) {
$idParser = new BasicEntityIdParser();
 
$errorReporter = new ApiErrorReporter(
@@ -148,14 +157,14 @@
$this-getPermissionCheckers(),
$summaryFormatter,
$module-getUser(),
-   $this-getMockRedirectCreationInteractor()
+   $this-getMockRedirectCreationInteractor( 
$expectedRedirect )
)
);
}
 
-   private function callApiModule( $params, User $user = null ) {
-   $module = $this-apiModuleTestHelper-newApiModule( 
'Wikibase\Repo\Api\MergeItems', 'wbmergeitems', $params, $user );
-   $this-overrideServices( $module );
+   private function callApiModule( $params, EntityRedirect 
$expectedRedirect = null ) {
+   $module = $this-apiModuleTestHelper-newApiModule( 
'Wikibase\Repo\Api\MergeItems', 'wbmergeitems', $params );
+   $this-overrideServices( $module, $expectedRedirect );
 
$module-execute();
 
@@ -174,6 +183,7 @@
array(),
array(),
array( 'labels' = array( 'en' = array( 'language' = 
'en', 'value' = 'foo' ) ) ),
+   true,
);
$testCases['IgnoreConflictSitelinksMerge'] = array(
array( 'sitelinks' = array(
@@ -186,7 +196,8 @@
'dewiki' = array( 'site' = 'dewiki', 'title' 
= 'RemainTo' ),
'enwiki' = array( 'site' = 'enwiki', 'title' 
= 'PlFrom' ),
) ),
-   'sitelink'
+   false,
+   'sitelink',
);
$testCases['claimMerge'] = array(
array( 'claims' = array( 'P1' = array( array( 
'mainsnak' = array(
@@ -197,6 +208,7 @@
array( 'claims' = array( 'P1' = array( array( 
'mainsnak' = array(
'snaktype' = 'value', 'property' = 'P1', 
'datavalue' = array( 'value' = 'imastring', 'type' = 

[MediaWiki-commits] [Gerrit] [LIB] use calendar methods - change (pywikibot/core)

[Xqt (Code Review)]

Xqt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223287

Change subject: [LIB] use calendar methods
..

[LIB] use calendar methods

Change-Id: I584650a862dd6302ec7c46389fdf0cb1efc0828f
---
M pywikibot/date.py
M pywikibot/pagegenerators.py
M tests/pagegenerators_tests.py
3 files changed, 14 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/87/223287/1

diff --git a/pywikibot/date.py b/pywikibot/date.py
index 92ef02b..92225e7 100644
--- a/pywikibot/date.py
+++ b/pywikibot/date.py
@@ -20,7 +20,7 @@
 import re
 import sys
 
-from pywikibot.tools import first_lower, first_upper
+from pywikibot.tools import first_lower, first_upper, deprecated
 
 if sys.version_info[0]  2:
 unicode = str
@@ -29,9 +29,7 @@
 #
 # Different collections of well known formats
 #
-enMonthNames = [u'January', u'February', u'March', u'April', u'May', u'June',
-u'July', u'August', u'September', u'October', u'November',
-u'December']
+enMonthNames = list(calendar.month_name)
 dayMnthFmts = ['Day_' + str(s) for s in enMonthNames]  # e.g. 'Day_January'
 yrMnthFmts = ['Year_' + str(s) for s in enMonthNames]  # e.g. 'Year_January'
 
@@ -2313,9 +2311,14 @@
 formatLimits[dayMnthFmts[monthId]] = _formatLimit_DayOfMonth30
 
 
-def getNumberOfDaysInMonth(month):
-Return the number of days in a given month, 1 being January, etc.
-return formatLimits[dayMnthFmts[month - 1]][2] - 1
+@deprecated(calendar.monthrange)
+def getNumberOfDaysInMonth(month, year=2000):
+
+Return the number of days in a given month, 1 being January, etc.
+
+year is defaut to 2000 because it has 29 days in february
+
+return calendar.monthrange(year, month)[1]
 
 
 def getAutoFormat(lang, title, ignoreFirstLetterCase=True):
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 0489d59..b5a9729 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -23,6 +23,7 @@
 __version__ = '$Id$'
 #
 
+import calendar
 import codecs
 import datetime
 import itertools
@@ -2318,7 +2319,7 @@
 firstPage = pywikibot.Page(site, fd(startMonth, 1))
 pywikibot.output(uStarting with %s % firstPage.title(asLink=True))
 for month in range(startMonth, endMonth + 1):
-for day in range(1, date.getNumberOfDaysInMonth(month) + 1):
+for day in range(1, calendar.monthrange(2000, month)[1] + 1):
 yield pywikibot.Page(pywikibot.Link(fd(month, day), site))
 
 
diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py
index 5e20097..78c6132 100755
--- a/tests/pagegenerators_tests.py
+++ b/tests/pagegenerators_tests.py
@@ -9,6 +9,7 @@
 
 __version__ = '$Id$'
 
+import calendar
 import datetime
 import os
 import sys
@@ -332,7 +333,7 @@
 
 expected = []
 for month in range(startMonth, endMonth + 1):
-for day in range(1, date.getNumberOfDaysInMonth(month) + 1):
+for day in range(1, calendar.monthrange(2000, month)[1] + 1):
 expected.append(fd(month, day))
 
 self.assertPageTitlesEqual(gen, expected)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I584650a862dd6302ec7c46389fdf0cb1efc0828f
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de

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

[MediaWiki-commits] [Gerrit] Fix outdated LogicException messages in API modules - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223286

Change subject: Fix outdated LogicException messages in API modules
..

Fix outdated LogicException messages in API modules

Change-Id: I16d13912fda069571ee8e07ebba22b65d995c191
---
M repo/includes/api/EditEntity.php
M repo/includes/api/EntityLoadingHelper.php
M repo/includes/api/FormatSnakValue.php
M repo/includes/api/MergeItems.php
M repo/includes/api/SetClaim.php
5 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/86/223286/1

diff --git a/repo/includes/api/EditEntity.php b/repo/includes/api/EditEntity.php
index 38105e0..ce27551 100644
--- a/repo/includes/api/EditEntity.php
+++ b/repo/includes/api/EditEntity.php
@@ -155,7 +155,7 @@
$this-errorReporter-dieError( No such entity type: 
'$entityType', 'no-such-entity-type' );
}
 
-   throw new LogicException( 'ApiBase::dieUsage did not throw a 
UsageException' );
+   throw new LogicException( 'ApiErrorReporter::dieError did not 
throw an exception' );
}
 
/**
diff --git a/repo/includes/api/EntityLoadingHelper.php 
b/repo/includes/api/EntityLoadingHelper.php
index 508ef71..ba9213c 100644
--- a/repo/includes/api/EntityLoadingHelper.php
+++ b/repo/includes/api/EntityLoadingHelper.php
@@ -76,7 +76,7 @@
$this-errorReporter-dieException( $ex, 
'cant-load-entity-content' );
}
 
-   throw new LogicException( 'ApiErrorReporter::dieError did not 
throw a UsageException' );
+   throw new LogicException( 'ApiErrorReporter::dieException did 
not throw a UsageException' );
}
 
 }
diff --git a/repo/includes/api/FormatSnakValue.php 
b/repo/includes/api/FormatSnakValue.php
index e9c379b..419be58 100644
--- a/repo/includes/api/FormatSnakValue.php
+++ b/repo/includes/api/FormatSnakValue.php
@@ -143,7 +143,7 @@
$this-errorReporter-dieException( $ex, 'baddatavalue' 
);
}
 
-   throw new LogicException( 'ApiErrorReporter::dieUsage did not 
throw a UsageException' );
+   throw new LogicException( 'ApiErrorReporter::dieException did 
not throw a UsageException' );
}
 
/**
diff --git a/repo/includes/api/MergeItems.php b/repo/includes/api/MergeItems.php
index d275101..c366504 100644
--- a/repo/includes/api/MergeItems.php
+++ b/repo/includes/api/MergeItems.php
@@ -108,7 +108,7 @@
return new ItemId( $value );
} catch ( InvalidArgumentException $ex ) {
$this-errorReporter-dieError( $ex-getMessage(), 
'invalid-entity-id' );
-   throw new LogicException( 'ErrorReporter::dieError did 
not throw an exception' );
+   throw new LogicException( 'ApiErrorReporter::dieError 
did not throw an exception' );
}
}
 
diff --git a/repo/includes/api/SetClaim.php b/repo/includes/api/SetClaim.php
index 07b4233..834a61e 100644
--- a/repo/includes/api/SetClaim.php
+++ b/repo/includes/api/SetClaim.php
@@ -167,7 +167,7 @@
}
 
// Note: since dieUsage() never returns, this should be 
unreachable!
-   throw new LogicException( 'ApiBase::dieUsage did not throw a 
UsageException' );
+   throw new LogicException( 'ApiErrorReporter::dieError did not 
throw an exception' );
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I16d13912fda069571ee8e07ebba22b65d995c191
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] Add more tests for edge cases of references without text - change (mediawiki...Cite)

[Amire80 (Code Review)]

Amire80 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223281

Change subject: Add more tests for edge cases of references without text
..

Add more tests for edge cases of references without text

Change-Id: Ia6c10419a7a92dac642db6ea21908927a5830b69
---
M citeParserTests.txt
1 file changed, 22 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite 
refs/changes/81/223281/1

diff --git a/citeParserTests.txt b/citeParserTests.txt
index 944b28d..9e1a906 100644
--- a/citeParserTests.txt
+++ b/citeParserTests.txt
@@ -459,3 +459,25 @@
 refs with no name must have content/strong
 /p
 !! end
+
+!! test
+ref with an empty-string name parameter and no content.
+!! input
+Bla.ref name=/ref
+!! result
+pBla.strong class=error mw-ext-cite-errorCite error: Invalid 
codelt;refgt;/code tag;
+refs with no name must have content/strong
+/p
+!! end
+
+!! test
+ref with an empty-string name parameter and no content.
+!! input
+Bla.ref name=void/ref
+!! result
+Bla.sup id=cite_ref-void_1-0 class=referencea 
href=#cite_note-void-1[1]/a/supol class=references
+li id=cite_note-voidspan class=mw-cite-backlinka 
href=#cite_ref-void_0↑/a/span strong class=error 
mw-ext-cite-errorCite error: Invalid codelt;refgt;/code tag;
+no text was provided for refs named codevoid/code/strong/li
+/ol
+
+!! end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6c10419a7a92dac642db6ea21908927a5830b69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il

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

[MediaWiki-commits] [Gerrit] tests: Provide better output when running infusion test unde... - change (oojs/ui)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223283

Change subject: tests: Provide better output when running infusion test under 
Karma
..

tests: Provide better output when running infusion test under Karma

When running with Karma, the objects are not nicely stringified in the
output when the test fails, only showing Expected: [object Object],
Actual: [object Object] instead. Pass the last parameter to
assert.equalDomElement to stringify the output manually.

Follow-up to 4047a746432efb37dec56fc9e11e91d959bffacd.

Change-Id: I39573e99f0c8c07de8b2af3eafef4fee68452551
---
M tests/JSPHP.test.karma.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/83/223283/1

diff --git a/tests/JSPHP.test.karma.js b/tests/JSPHP.test.karma.js
index 1a1473c..5e181c0 100644
--- a/tests/JSPHP.test.karma.js
+++ b/tests/JSPHP.test.karma.js
@@ -40,7 +40,7 @@
infused = OO.ui.infuse( $fromPhp[ 0 ] );
infused.debouncedUpdateThemeClasses();
 
-   assert.equalDomElement( instance.$element[ 0 ], 
infused.$element[ 0 ], testName + ' (infuse)' );
+   assert.equalDomElement( instance.$element[ 0 ], 
infused.$element[ 0 ], testName + ' (infuse)', true );
instance.$element.add( infused.$element 
).detach();
}
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I39573e99f0c8c07de8b2af3eafef4fee68452551
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com

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

[MediaWiki-commits] [Gerrit] tests: Provide better output when running infusion test unde... - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: tests: Provide better output when running infusion test under 
Karma
..


tests: Provide better output when running infusion test under Karma

When running with Karma, the objects are not nicely stringified in the
output when the test fails, only showing Expected: [object Object],
Actual: [object Object] instead. Pass the last parameter to
assert.equalDomElement to stringify the output manually.

Follow-up to 4047a746432efb37dec56fc9e11e91d959bffacd.

Change-Id: I39573e99f0c8c07de8b2af3eafef4fee68452551
---
M tests/JSPHP.test.karma.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/JSPHP.test.karma.js b/tests/JSPHP.test.karma.js
index 1a1473c..5e181c0 100644
--- a/tests/JSPHP.test.karma.js
+++ b/tests/JSPHP.test.karma.js
@@ -40,7 +40,7 @@
infused = OO.ui.infuse( $fromPhp[ 0 ] );
infused.debouncedUpdateThemeClasses();
 
-   assert.equalDomElement( instance.$element[ 0 ], 
infused.$element[ 0 ], testName + ' (infuse)' );
+   assert.equalDomElement( instance.$element[ 0 ], 
infused.$element[ 0 ], testName + ' (infuse)', true );
instance.$element.add( infused.$element 
).detach();
}
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I39573e99f0c8c07de8b2af3eafef4fee68452551
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Options are optional in the wbformat/parsevalue API modules - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223256

Change subject: Options are optional in the wbformat/parsevalue API modules
..

Options are optional in the wbformat/parsevalue API modules

The 'options' parameter is optional and can be null in these API modules.
This should be documented and checked, even if json_decode does not fail
when called with null. It returns null in this case.

Change-Id: I7c523aaf565368668e77336d4877213136532034
---
M repo/includes/api/FormatSnakValue.php
M repo/includes/api/ParseValue.php
2 files changed, 9 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/56/223256/1

diff --git a/repo/includes/api/FormatSnakValue.php 
b/repo/includes/api/FormatSnakValue.php
index 00eb816..b29c83e 100644
--- a/repo/includes/api/FormatSnakValue.php
+++ b/repo/includes/api/FormatSnakValue.php
@@ -147,7 +147,7 @@
}
 
/**
-* @param string $optionsParam
+* @param string|null $optionsParam
 *
 * @return FormatterOptions
 */
@@ -155,11 +155,13 @@
$formatterOptions = new FormatterOptions();
$formatterOptions-setOption( ValueFormatter::OPT_LANG, 
$this-getLanguage()-getCode() );
 
-   $options = json_decode( $optionsParam, true );
+   if ( is_string( $optionsParam )  $optionsParam !== '' ) {
+   $options = json_decode( $optionsParam, true );
 
-   if ( is_array( $options ) ) {
-   foreach ( $options as $name = $value ) {
-   $formatterOptions-setOption( $name, $value );
+   if ( is_array( $options ) ) {
+   foreach ( $options as $name = $value ) {
+   $formatterOptions-setOption( $name, 
$value );
+   }
}
}
 
diff --git a/repo/includes/api/ParseValue.php b/repo/includes/api/ParseValue.php
index 98f2492..dae6544 100644
--- a/repo/includes/api/ParseValue.php
+++ b/repo/includes/api/ParseValue.php
@@ -162,7 +162,7 @@
}
 
/**
-* @param string $optionsParam
+* @param string|null $optionsParam
 *
 * @return ParserOptions
 */
@@ -170,7 +170,7 @@
$parserOptions = new ParserOptions();
$parserOptions-setOption( ValueParser::OPT_LANG, 
$this-getLanguage()-getCode() );
 
-   if ( $optionsParam !== null  $optionsParam !== '' ) {
+   if ( is_string( $optionsParam )  $optionsParam !== '' ) {
$options = json_decode( $optionsParam, true );
 
if ( !is_array( $options ) ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c523aaf565368668e77336d4877213136532034
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] Remove global state from EditFilterHookRunner - change (mediawiki...Wikibase)

[Bene (Code Review)]

Bene has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223258

Change subject: Remove global state from EditFilterHookRunner
..

Remove global state from EditFilterHookRunner

Change-Id: I408ad1fad75f0ecec708c0344e48c2181fe396e1
---
M repo/includes/Hooks/EditFilterHookRunner.php
M repo/includes/UpdateRepo/UpdateRepoJob.php
M repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php
M repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php
4 files changed, 8 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/58/223258/1

diff --git a/repo/includes/Hooks/EditFilterHookRunner.php 
b/repo/includes/Hooks/EditFilterHookRunner.php
index 9a3e16d..bb187c8 100644
--- a/repo/includes/Hooks/EditFilterHookRunner.php
+++ b/repo/includes/Hooks/EditFilterHookRunner.php
@@ -38,24 +38,15 @@
private $entityContentFactory;
 
/**
-* @var RequestContext|DerivativeContext
+* @var IContextSource
 */
private $context;
 
public function __construct(
EntityTitleLookup $titleLookup,
EntityContentFactory $entityContentFactory,
-   $context = null
+   IContextSource $context
) {
-   if ( $context !== null  !$context instanceof RequestContext 
 !$context instanceof DerivativeContext ) {
-   throw new InvalidArgumentException( '$context must be 
an instance of RequestContext'
-   . ' or DerivativeContext' );
-   }
-
-   if ( $context === null ) {
-   $context = RequestContext::getMain();
-   }
-
$this-titleLookup = $titleLookup;
$this-entityContentFactory = $entityContentFactory;
$this-context = $context;
diff --git a/repo/includes/UpdateRepo/UpdateRepoJob.php 
b/repo/includes/UpdateRepo/UpdateRepoJob.php
index b211277..cc58be3 100644
--- a/repo/includes/UpdateRepo/UpdateRepoJob.php
+++ b/repo/includes/UpdateRepo/UpdateRepoJob.php
@@ -80,7 +80,8 @@
$wikibaseRepo-getEntityPermissionChecker(),
new EditFilterHookRunner(
$titleLookup,
-   $wikibaseRepo-getEntityContentFactory()
+   $wikibaseRepo-getEntityContentFactory(),
+   RequestContext::getMain()
)
);
}
diff --git a/repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php 
b/repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php
index bc02a35..4fbce25 100644
--- a/repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php
+++ b/repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php
@@ -62,7 +62,8 @@
$wikibaseRepo-getSiteStore(),
new EditFilterHookRunner(
$titleLookup,
-   $wikibaseRepo-getEntityContentFactory()
+   $wikibaseRepo-getEntityContentFactory(),
+   RequestContext::getMain()
)
);
}
diff --git a/repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php 
b/repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php
index 824a84a..8744c01 100644
--- a/repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php
+++ b/repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php
@@ -67,7 +67,8 @@
$wikibaseRepo-getSiteStore(),
new EditFilterHookRunner(
$titleLookup,
-   $wikibaseRepo-getEntityContentFactory()
+   $wikibaseRepo-getEntityContentFactory(),
+   RequestContext::getMain()
)
);
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I408ad1fad75f0ecec708c0344e48c2181fe396e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene benestar.wikime...@gmail.com

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

[MediaWiki-commits] [Gerrit] [bugfix] Assign bot to ListAlternativesOption class - change (pywikibot/core)

[jenkins-bot (Code Review)]

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

Change subject: [bugfix] Assign bot to ListAlternativesOption class
..


[bugfix] Assign bot to ListAlternativesOption class

- remove obsolete comma

Bug: T104952
Change-Id: I5bfb4de682d7f592fd50be51ab231e471256eb5a
---
M scripts/solve_disambiguation.py
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py
index 4ac3b0d..0e108c5 100755
--- a/scripts/solve_disambiguation.py
+++ b/scripts/solve_disambiguation.py
@@ -737,7 +737,7 @@
   
len(self.dn_template_str) + 8]):
 continue
 
-edit = EditOption('edit page', 'e', text, m.start(), 
disambPage.title()),
+edit = EditOption('edit page', 'e', text, m.start(), 
disambPage.title())
 context_option = HighlightContextOption(
 'more context', 'm', text, 60, start=m.start(), 
end=m.end())
 context_option.before_question = True
@@ -756,8 +756,8 @@
 if not edited:
 options += [ShowPageOption('show disambiguation page', 'd',
m.start(), disambPage)]
-options += [ListAlternativesOption('list', 'l'),
-AddAlternativeOption('add new', 'a')]
+options += [ListAlternativesOption('list', 'l', self),
+AddAlternativeOption('add new', 'a', self)]
 if edited:
 options += [StandardOption('save in this form', 'x')]
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5bfb4de682d7f592fd50be51ab231e471256eb5a
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Version 1.4.0 - change (mediawiki...PrivateDomains)

[Jack Phoenix (Code Review)]

Jack Phoenix has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223266

Change subject: Version 1.4.0
..

Version 1.4.0

* extension.json added
* old, deprecated PHP i18n file removed
* changed errorbox to successbox in SpecialPrivateDomains.php because the 
message shown is more of a success than an error message
* moved hooks to their own file  wrapped 'em in a class
* set the correct page title(s) in PrivateDomainsHooks::onAlternateEdit()

Change-Id: Iae01f1662fb67e1cb2d1f1c33db11eac50e12fec
---
D PrivateDomains.i18n.php
M PrivateDomains.php
A PrivateDomainsHooks.php
M SpecialPrivateDomains.php
A extension.json
5 files changed, 167 insertions(+), 105 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PrivateDomains 
refs/changes/66/223266/1

diff --git a/PrivateDomains.i18n.php b/PrivateDomains.i18n.php
deleted file mode 100644
index fcab85b..000
--- a/PrivateDomains.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- * 
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShimb40a1f8a7d128c2e' ) ) {
-   function wfJsonI18nShimb40a1f8a7d128c2e( $cache, $code, $cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . /i18n/$csCode.json;
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShimb40a1f8a7d128c2e';
-}
diff --git a/PrivateDomains.php b/PrivateDomains.php
index 4ae5135..3607538 100644
--- a/PrivateDomains.php
+++ b/PrivateDomains.php
@@ -7,18 +7,14 @@
  * @ingroup Extensions
  * @author Inez Korczyński korczyn...@gmail.com
  * @author Jack Phoenix j...@countervandalism.net
- * @link http://www.mediawiki.org/wiki/Extension:PrivateDomains Documentation
+ * @link https://www.mediawiki.org/wiki/Extension:PrivateDomains Documentation
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
  */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-   die( This is not a valid entry point.\n );
-}
 
 // Extension credits that will show up on Special:Version
 $wgExtensionCredits['specialpage'][] = array(
'name' = 'PrivateDomains',
-   'version' = '1.3.0',
+   'version' = '1.4.0',
'author' = array( 'Inez Korczyński', 'Jack Phoenix' ),
'description' = 'Allows to restrict editing to users with a certain 
e-mail address',
'url' = 'https://www.mediawiki.org/wiki/Extension:PrivateDomains',
@@ -26,15 +22,14 @@
 );
 
 // Set up the new special page
-$dir = dirname( __FILE__ ) . '/';
-$wgAutoloadClasses['PrivateDomains'] = $dir . 'SpecialPrivateDomains.php';
+$wgAutoloadClasses['PrivateDomains'] = __DIR__ . '/SpecialPrivateDomains.php';
 $wgMessagesDirs['PrivateDomains'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['PrivateDomains'] = $dir . 'PrivateDomains.i18n.php';
 $wgSpecialPages['PrivateDomains'] = 'PrivateDomains';
 
-$wgHooks['AlternateEdit'][] = 'pd_AlternateEdit'; // Occurs whenever 
action=edit is called
-$wgHooks['UserLoginComplete'][] = 'pd_UserLoginComplete'; // Occurs after a 
user has successfully logged in
-$wgHooks['ConfirmEmailComplete'][] = 'pd_UserLoginComplete'; // Occurs after a 
user has successfully confirm email
+$wgAutoloadClasses['PrivateDomainsHooks'] = __DIR__ . 
'/PrivateDomainsHooks.php';
+$wgHooks['AlternateEdit'][] = 'PrivateDomainsHooks::onAlternateEdit';
+$wgHooks['UserLoginComplete'][] = 'PrivateDomainsHooks::onUserLoginComplete';
+$wgHooks['ConfirmEmailComplete'][] = 
'PrivateDomainsHooks::onUserLoginComplete';
 
 # set 'privatedomains' right to 

[MediaWiki-commits] [Gerrit] Merging items creates redirect - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Merging items creates redirect
..


Merging items creates redirect

Add the creation of redirects when items are merged, adjust and improve the 
tests.
Test the ItemMergeInteractor.

Bug: T59745
Change-Id: I5093a09455b5dffa7c1c3f98c240fe356a3756ff
---
M repo/i18n/en.json
M repo/i18n/qqq.json
M repo/includes/Interactors/ItemMergeInteractor.php
M repo/includes/api/MergeItems.php
M repo/includes/specials/SpecialMergeItems.php
M repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
M repo/tests/phpunit/includes/api/BotEditTest.php
M repo/tests/phpunit/includes/api/MergeItemsTest.php
M repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
9 files changed, 199 insertions(+), 36 deletions(-)

Approvals:
  Daniel Kinzler: Checked; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/i18n/en.json b/repo/i18n/en.json
index 6e8d65d..b00f3cb 100644
--- a/repo/i18n/en.json
+++ b/repo/i18n/en.json
@@ -210,7 +210,7 @@
wikibase-mergeitems-fromid: The id to merge from,
wikibase-mergeitems-toid: The id to merge to,
wikibase-mergeitems-submit: Merge items,
-   wikibase-mergeitems-success: $1 was successfully merged into $3.,
+   wikibase-mergeitems-success: $1 was successfully merged into $3 and 
redirected.,
wikibase-itemmerge-missing-parameter: Incomplete input.,
wikibase-itemmerge-not-item: The specified entity is not an Item.,
wikibase-itemmerge-failed-save: Failed to save item.,
diff --git a/repo/i18n/qqq.json b/repo/i18n/qqq.json
index be2aa04..af535cc 100644
--- a/repo/i18n/qqq.json
+++ b/repo/i18n/qqq.json
@@ -238,7 +238,7 @@
wikibase-mergeitems-fromid: Label for the input field to select the 
ID of the entity to merge from. See also:\n* 
{{msg-mw|Wikibase-mergeitems-toid}},
wikibase-mergeitems-toid: Label for the input field to select the ID 
of the entity to merge to. See also:\n* {{msg-mw|Wikibase-mergeitems-fromid}},
wikibase-mergeitems-submit: Label for the button that activates the 
action.\n\nPreceded by the following input box labels:\n* 
{{msg-mw|Wikibase-mergeitems-fromid}}\n* 
{{msg-mw|Wikibase-mergeitems-toid}}\n{{Identical|Merge item}},
-   wikibase-mergeitems-success: Message shown when an item has 
successfully been merged into another item.\nParameters:\n* $1: the ID of the 
source item\n* $2: the new revision ID of the source item\n* $3: the ID of the 
item where the pages has been merged,
+   wikibase-mergeitems-success: Message shown when an item has 
successfully been merged and redirected into another item.\nParameters:\n* $1: 
the ID of the source item\n* $2: the new revision ID of the source item\n* $3: 
the ID of the item where the pages has been merged,
wikibase-itemmerge-missing-parameter: Error message shown when a 
required field was not provided.,
wikibase-itemmerge-not-item: Error message shown when a provided 
entity id did not refer to an item.,
wikibase-itemmerge-failed-save: Error message shown when the merged 
items could not be saved.,
diff --git a/repo/includes/Interactors/ItemMergeInteractor.php 
b/repo/includes/Interactors/ItemMergeInteractor.php
index 9530479..22bff09 100644
--- a/repo/includes/Interactors/ItemMergeInteractor.php
+++ b/repo/includes/Interactors/ItemMergeInteractor.php
@@ -17,6 +17,7 @@
 use Wikibase\Repo\Store\EntityPermissionChecker;
 use Wikibase\Summary;
 use Wikibase\SummaryFormatter;
+use Wikibase\Repo\Interactors\RedirectCreationInteractor;
 
 /**
  * @since 0.5
@@ -24,9 +25,7 @@
  * @licence GNU GPL v2+
  * @author Adam Shorland
  * @author Daniel Kinzler
- *
- * @todo allow merging of specific parts of an item only (eg. 
sitelinks,aliases,claims)
- * @todo allow optional redirect creation after merging
+ * @author Lucie-Aimée Kaffee
  */
 class ItemMergeInteractor {
 
@@ -61,12 +60,18 @@
private $user;
 
/**
+   * @var RedirectCreationInteractor
+   */
+   private $interactorRedirect;
+
+   /**
 * @param MergeChangeOpsFactory $changeOpFactory
 * @param EntityRevisionLookup $entityRevisionLookup
 * @param EntityStore $entityStore
 * @param EntityPermissionChecker $permissionChecker
 * @param SummaryFormatter $summaryFormatter
 * @param User $user
+* @param RedirectCreationInteractor $interactorRedirect
 */
public function __construct(
MergeChangeOpsFactory $changeOpFactory,
@@ -74,7 +79,8 @@
EntityStore $entityStore,
EntityPermissionChecker $permissionChecker,
SummaryFormatter $summaryFormatter,
-   User $user
+   User $user,
+   RedirectCreationInteractor $interactorRedirect
) {
 
$this-changeOpFactory = $changeOpFactory;
@@ -83,6 +89,7 

[MediaWiki-commits] [Gerrit] Add IContextSource $context = null in WikibaseRepo - change (mediawiki...Wikibase)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223268

Change subject: Add IContextSource $context = null in WikibaseRepo
..

Add IContextSource $context = null in WikibaseRepo

Change-Id: I677adb388d09b16e399734cab2f66f69c8a379ff
---
M repo/includes/WikibaseRepo.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/68/223268/1

diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 3db405a..0f33a75 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -1070,11 +1070,11 @@
}
 
/**
-* @param IContextSource $context
+* @param IContextSource|null $context
 *
 * @return ApiHelperFactory
 */
-   public function getApiHelperFactory( $context ) {
+   public function getApiHelperFactory( IContextSource $context = null ) {
return new ApiHelperFactory(
$this-getEntityTitleLookup(),
$this-getExceptionLocalizer(),
@@ -1091,7 +1091,7 @@
 *
 * @return EditEntityFactory
 */
-   public function newEditEntityFactory( $context = null ) {
+   public function newEditEntityFactory( IContextSource $context = null ) {
return new EditEntityFactory(
$this-getEntityTitleLookup(),
$this-getEntityRevisionLookup( 'uncached' ),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I677adb388d09b16e399734cab2f66f69c8a379ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com

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

[MediaWiki-commits] [Gerrit] Revert Revert getApiHelperFactory in WikibaseRepo can be n... - change (mediawiki...Wikibase)

[Bene (Code Review)]

Bene has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223276

Change subject: Revert Revert getApiHelperFactory in WikibaseRepo can be 
null
..

Revert Revert getApiHelperFactory in WikibaseRepo can be null

This reverts commit c846062957e1605147e132bb9038e0bd7002ce5e.

Change-Id: I9954e973c128f57f6b9fa93c28d2dc7b3a491ae1
---
M repo/includes/WikibaseRepo.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/76/223276/1

diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 3db405a..a4b706f 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -1070,11 +1070,11 @@
}
 
/**
-* @param IContextSource $context
+* @param IContextSource|null $context
 *
 * @return ApiHelperFactory
 */
-   public function getApiHelperFactory( $context ) {
+   public function getApiHelperFactory( $context = null ) {
return new ApiHelperFactory(
$this-getEntityTitleLookup(),
$this-getExceptionLocalizer(),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9954e973c128f57f6b9fa93c28d2dc7b3a491ae1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene benestar.wikime...@gmail.com

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

[MediaWiki-commits] [Gerrit] Revert Change mention inspector template - change (mediawiki...Flow)

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223278

Change subject: Revert Change mention inspector template
..

Revert Change mention inspector template

This reverts commit b5d857f6d2c222caf5525efe42e309604575bcda.

Change-Id: Ifb5cb0dc06b250f4eaae961072c66f4db3b77b4c
---
M Hooks.php
M i18n/en.json
M i18n/qqq.json
D maintenance/FlowCreateMentionTemplate.php
M 
modules/editor/editors/visualeditor/ui/inspectors/mw.flow.ve.ui.MentionInspector.js
5 files changed, 8 insertions(+), 59 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/78/223278/1

diff --git a/Hooks.php b/Hooks.php
index 114f622..fe0988a 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -232,9 +232,6 @@
require_once 
__DIR__.'/maintenance/FlowUpdateWorkflowPageId.php';
$updater-addPostDatabaseUpdateMaintenance( 
'FlowUpdateWorkflowPageId' );
 
-   require_once 
__DIR__.'/maintenance/FlowCreateMentionTemplate.php';
-   $updater-addPostDatabaseUpdateMaintenance( 
'FlowCreateMentionTemplate' );
-
return true;
}
 
@@ -673,6 +670,7 @@
 
$vars['wgFlowEditorList'] = $wgFlowEditorList;
$vars['wgFlowMaxTopicLength'] = 
Flow\Model\PostRevision::MAX_TOPIC_LENGTH;
+   $vars['wgFlowMentionTemplate'] = wfMessage( 
'flow-ve-mention-template' )-inContentLanguage()-plain();
$vars['wgFlowAjaxTimeout'] = $wgFlowAjaxTimeout;
 
return true;
diff --git a/i18n/en.json b/i18n/en.json
index 2ac5ea4..e02f0f5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -529,6 +529,7 @@
flow-ve-mention-inspector-remove-label: Remove,
flow-ve-mention-placeholder: User name,
flow-ve-mention-tool-title: Mention a user,
+   flow-ve-mention-template: ping,
flow-ve-mention-inspector-invalid-user: The username \$1\ is not 
registered.,
flow-wikitext-editor-help: Wikitext $1.,
flow-wikitext-editor-help-and-preview: Wikitext $1 and you can $2 
anytime.,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 97f07dc..e48d547 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -535,6 +535,7 @@
flow-ve-mention-inspector-remove-label: Text of remove button on 
Flow's user mention panel (inspector) in the VisualEditor.,
flow-ve-mention-placeholder: Placeholder text for the input field in 
the user mention tool where the user can type a user 
name.\n{{Identical|Username}},
flow-ve-mention-tool-title: Title text for the user mention tool on 
Flow's VisualEditor toolbar.,
+   flow-ve-mention-template: Name of on-wiki template used for user 
mentions.  The template should accept a call in the form 
nowiki{{templatename|Username}}/nowiki, to mention Username.  It uses the 
content language.,
flow-ve-mention-inspector-invalid-user: Error shown when the poster 
attempts to mention a user that does not exist.  Parameters:\n$1: Username.  
The username is not registered; thus, gender is unknown.,
flow-wikitext-editor-help: Text shown at the bottom of a wikitext 
editing box when visualeditor is not available to switch to.\n\n$1 is 
{{msg-mw|Flow-wikitext-editor-help-uses-wikitext}}.,
flow-wikitext-editor-help-and-preview: Text shown at the bottom of a 
wikitext editing box when visualeditor is available to switch to.\n* $1 is 
{{msg-mw|flow-wikitext-editor-help-uses-wikitext}}\n* $2 is 
{{msg-mw|flow-wikitext-editor-help-preview-the-result}},
diff --git a/maintenance/FlowCreateMentionTemplate.php 
b/maintenance/FlowCreateMentionTemplate.php
deleted file mode 100644
index 7d34a92..000
--- a/maintenance/FlowCreateMentionTemplate.php
+++ /dev/null
@@ -1,52 +0,0 @@
-?php
-
-require_once ( getenv( 'MW_INSTALL_PATH' ) !== false
-? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
-: dirname( __FILE__ ) . '/../../../maintenance/Maintenance.php' );
-
-/**
- * Creates Template:FlowMention, which is used te render mentions in Flow's 
Visual Editor.
- * The template will be created with a default format, but can be customized.
- * If the template already exists, it will be left untouched.
- *
- * @ingroup Maintenance
- */
-class FlowCreateMentionTemplate extends LoggedUpdateMaintenance {
-public function __construct() {
-parent::__construct();
-
-$this-mDescription = Creates Template:FlowMention, which is used te 
render mentions in Flow's Visual Editor;
-}
-
-protected function getUpdateKey() {
-return __CLASS__;
-}
-
-protected function doDBUpdates() {
-// get User: namespace prefix in wiki language
-global $wgContLang;
-$namespaces = $wgContLang-getFormattedNamespaces();
-
-$title = Title::newFromText( 'FlowMention', NS_TEMPLATE );
-$article = new Article( $title );
-$page = $article-getPage();
-
-   

[MediaWiki-commits] [Gerrit] Enable packet filter for potassium - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223282

Change subject: Enable packet filter for potassium
..

Enable packet filter for potassium

Include base::firewall. role::poolcounter already provides the respective
ferm rules (which are also already in use on subra and suhail for codfw.

Change-Id: I5f76d1f491cbcb83b9f7cfeb64329baec8309a06
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/223282/1

diff --git a/manifests/site.pp b/manifests/site.pp
index e80801d..f9f1497 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2054,6 +2054,7 @@
 
 node 'potassium.eqiad.wmnet' {
 include standard
+include base::firewall
 include role::poolcounter
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f76d1f491cbcb83b9f7cfeb64329baec8309a06
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff mmuhlenh...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] mail: ferm rules for mailman - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223279

Change subject: mail: ferm rules for mailman
..

mail: ferm rules for mailman

Add basic ferm rules for mailman service (web and smtp). TODO: check if any
other ports are open on sodium and add them.

Bug: T104980
Change-Id: If26277b0322e01491236f037d6ab764d63e0f33e
---
M manifests/role/mail.pp
1 file changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/79/223279/1

diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index c58441e..dc6af82 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -193,4 +193,18 @@
 timeout   = '30',
 }
 
+ferm::service { 'mailman-smtp':
+proto = 'tcp',
+port  = '25',
+}
+
+ferm::service { 'mailman-http':
+proto = 'tcp',
+port  = '80',
+}
+
+ferm::service { 'mailman-https':
+proto = 'tcp',
+port  = '443',
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If26277b0322e01491236f037d6ab764d63e0f33e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] Use textarea for options parameter in wbparsevalue API - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Use textarea for options parameter in wbparsevalue API
..


Use textarea for options parameter in wbparsevalue API

The similar 'options' parameter in wbformatvalue is already a 'text'
parameter now. The only difference between 'string' and 'text' is
that the later is rendered as a textarea in the API sandbox.

Change-Id: I7273afe1cfdb15753c8a23e70c2d1ff6abf5235d
---
M repo/includes/api/ParseValue.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/repo/includes/api/ParseValue.php b/repo/includes/api/ParseValue.php
index 98f2492..bc06493 100644
--- a/repo/includes/api/ParseValue.php
+++ b/repo/includes/api/ParseValue.php
@@ -219,7 +219,7 @@
ApiBase::PARAM_ISMULTI = true,
),
'options' = array(
-   ApiBase::PARAM_TYPE = 'string',
+   ApiBase::PARAM_TYPE = 'text',
ApiBase::PARAM_REQUIRED = false,
),
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7273afe1cfdb15753c8a23e70c2d1ff6abf5235d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Change == to === according to PHP coding conventions - change (mediawiki...Cite)

[Amire80 (Code Review)]

Amire80 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223284

Change subject: Change == to === according to PHP coding conventions
..

Change == to === according to PHP coding conventions

Change-Id: I2a93194e3c216d30f2f2fd7717f4ba501c23
---
M Cite_body.php
1 file changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite 
refs/changes/84/223284/1

diff --git a/Cite_body.php b/Cite_body.php
index e800d94..9763555 100644
--- a/Cite_body.php
+++ b/Cite_body.php
@@ -364,7 +364,7 @@
--$cnt;
}
 
-   if ( $cnt == 0 ) {
+   if ( $cnt === 0 ) {
return array ( $key, $group, $follow );
} else {
// Invalid key
@@ -520,7 +520,7 @@
case 'new':
# Rollback the addition of new elements to the stack.
unset( $this-mRefs[$group][$key] );
-   if ( count( $this-mRefs[$group] ) == 0 ) {
+   if ( count( $this-mRefs[$group] ) === 0 ) {
unset( $this-mRefs[$group] );
unset( $this-mGroupCnt[$group] );
}
@@ -647,7 +647,7 @@
 * @return string XHTML ready for output
 */
function referencesFormat( $group ) {
-   if ( ( count( $this-mRefs ) == 0 ) || ( empty( 
$this-mRefs[$group] ) ) ) {
+   if ( ( count( $this-mRefs ) === 0 ) || ( empty( 
$this-mRefs[$group] ) ) ) {
return '';
}
 
@@ -935,7 +935,7 @@
$this-refKey( $key, $count ),
$this-referencesKey( $key . $subkey ),
$this-getLinkLabel( $label, $group,
-   ( ( $group == 
self::DEFAULT_GROUP ) ? '' : $group  ) . $wgContLang-formatNum( $label ) )
+   ( ( $group === 
self::DEFAULT_GROUP ) ? '' : $group  ) . $wgContLang-formatNum( $label ) )
)-inContentLanguage()-plain()
);
}
@@ -958,7 +958,7 @@
$sep = wfMessage( 'cite_references_link_many_sep' 
)-inContentLanguage()-plain();
$and = wfMessage( 'cite_references_link_many_and' 
)-inContentLanguage()-plain();
 
-   if ( $cnt == 1 ) {
+   if ( $cnt === 1 ) {
// Enforce always returning a string
return (string)$arr[0];
} else {
@@ -1074,10 +1074,10 @@
}
 
foreach ( $this-mRefs as $group = $refs ) {
-   if ( count( $refs ) == 0 ) {
+   if ( count( $refs ) === 0 ) {
continue;
}
-   if ( $group == self::DEFAULT_GROUP ) {
+   if ( $group === self::DEFAULT_GROUP ) {
$text .= $this-referencesFormat( $group, '', 
'' );
} else {
$text .= \nbr / .
@@ -1146,7 +1146,7 @@
 
$ret = 'strong class=error mw-ext-cite-error' . $msg . 
'/strong';
 
-   if ( $parse == 'parse' ) {
+   if ( $parse === 'parse' ) {
$ret = $this-mParser-recursiveTagParse( $ret );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a93194e3c216d30f2f2fd7717f4ba501c23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il

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

[MediaWiki-commits] [Gerrit] Refer to ApiBase constants via self instead of full class name - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223285

Change subject: Refer to ApiBase constants via self instead of full class name
..

Refer to ApiBase constants via self instead of full class name

I wonder why we ever did this? self is so much more convenient.

Change-Id: Ibeb6d1048d9cbbb81b6a445e2017650b42b1b881
---
M client/includes/api/ApiClientInfo.php
M client/includes/api/PageTerms.php
M repo/includes/api/CreateClaim.php
M repo/includes/api/CreateRedirect.php
M repo/includes/api/EditEntity.php
M repo/includes/api/FormatSnakValue.php
M repo/includes/api/GetClaims.php
M repo/includes/api/GetEntities.php
M repo/includes/api/LinkTitles.php
M repo/includes/api/MergeItems.php
M repo/includes/api/ModifyClaim.php
M repo/includes/api/ModifyEntity.php
M repo/includes/api/ModifyTerm.php
M repo/includes/api/ParseValue.php
M repo/includes/api/RemoveClaims.php
M repo/includes/api/RemoveQualifiers.php
M repo/includes/api/RemoveReferences.php
M repo/includes/api/SearchEntities.php
M repo/includes/api/SetAliases.php
M repo/includes/api/SetClaim.php
M repo/includes/api/SetClaimValue.php
M repo/includes/api/SetQualifier.php
M repo/includes/api/SetReference.php
M repo/includes/api/SetSiteLink.php
24 files changed, 168 insertions(+), 180 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/85/223285/1

diff --git a/client/includes/api/ApiClientInfo.php 
b/client/includes/api/ApiClientInfo.php
index 14c6f4e..9d65755 100644
--- a/client/includes/api/ApiClientInfo.php
+++ b/client/includes/api/ApiClientInfo.php
@@ -2,7 +2,6 @@
 
 namespace Wikibase;
 
-use ApiBase;
 use ApiQuery;
 use ApiQueryBase;
 
@@ -93,9 +92,9 @@
protected function getAllowedParams() {
return array(
'prop' = array(
-   ApiBase::PARAM_DFLT = 'url|siteid',
-   ApiBase::PARAM_ISMULTI = true,
-   ApiBase::PARAM_TYPE = array(
+   self::PARAM_DFLT = 'url|siteid',
+   self::PARAM_ISMULTI = true,
+   self::PARAM_TYPE = array(
'url', 'siteid'
)
),
diff --git a/client/includes/api/PageTerms.php 
b/client/includes/api/PageTerms.php
index 7844bb7..73cc4f6 100644
--- a/client/includes/api/PageTerms.php
+++ b/client/includes/api/PageTerms.php
@@ -2,7 +2,6 @@
 
 namespace Wikibase\Client\Api;
 
-use ApiBase;
 use ApiQuery;
 use ApiQueryBase;
 use ApiResult;
@@ -235,18 +234,18 @@
protected function getAllowedParams() {
return array(
'continue' = array(
-   ApiBase::PARAM_HELP_MSG = 
'api-help-param-continue',
-   ApiBase::PARAM_TYPE = 'integer',
+   self::PARAM_HELP_MSG = 
'api-help-param-continue',
+   self::PARAM_TYPE = 'integer',
),
'terms' = array(
// XXX Ought to get this list from 
Wikibase\TermIndexEntry, its setType() also hardcodes it.
-   ApiBase::PARAM_TYPE = array(
+   self::PARAM_TYPE = array(
TermIndexEntry::TYPE_ALIAS,
TermIndexEntry::TYPE_DESCRIPTION,
TermIndexEntry::TYPE_LABEL
),
-   ApiBase::PARAM_ISMULTI = true,
-   ApiBase::PARAM_HELP_MSG = 
'apihelp-query+pageterms-param-terms',
+   self::PARAM_ISMULTI = true,
+   self::PARAM_HELP_MSG = 
'apihelp-query+pageterms-param-terms',
),
);
}
diff --git a/repo/includes/api/CreateClaim.php 
b/repo/includes/api/CreateClaim.php
index bfabdbb..6201315 100644
--- a/repo/includes/api/CreateClaim.php
+++ b/repo/includes/api/CreateClaim.php
@@ -2,7 +2,6 @@
 
 namespace Wikibase\Repo\Api;
 
-use ApiBase;
 use ApiMain;
 use Wikibase\ChangeOp\ChangeOpMainSnak;
 use Wikibase\ChangeOp\StatementChangeOpFactory;
@@ -48,7 +47,7 @@
}
 
/**
-* @see \ApiBase::execute
+* @see ApiBase::execute
 *
 * @since 0.2
 */
@@ -129,20 +128,20 @@
return array_merge(
array(
'entity' = array(
-   ApiBase::PARAM_TYPE = 'string',
-   ApiBase::PARAM_REQUIRED = true,
+   self::PARAM_TYPE = 'string',
+   

[MediaWiki-commits] [Gerrit] Disallow qqq as interface language - change (mediawiki/core)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223288

Change subject: Disallow qqq as interface language
..

Disallow qqq as interface language

Any page on translatewiki with param setlang=qqq times. All messages
get parsed recursively until parser-template-loop-warning is reached.
uselang=qqq is already ignored, see RequestContext::sanitizeLangCode.

There is a counterpart to this patch in ULS, where it is changed
to use Language::isSupportedLanguage.

Bug: T104987
Change-Id: Ie77fe18681dfd5f9089fbaa8090dd9cc1c206da4
---
M languages/Language.php
1 file changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/88/223288/1

diff --git a/languages/Language.php b/languages/Language.php
index fe0bd7e..18442b3 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -254,10 +254,16 @@
 * @since 1.21
 */
public static function isSupportedLanguage( $code ) {
-   return self::isValidBuiltInCode( $code )
-( is_readable( self::getMessagesFileName( $code ) )
-   || is_readable( self::getJsonMessagesFileName( 
$code ) )
-   );
+   if ( !self::isValidBuiltInCode( $code ) ) {
+   return false;
+   }
+
+   if ( $code === 'qqq' ) {
+   #return false;
+   }
+
+   return is_readable( self::getMessagesFileName( $code ) ) ||
+   is_readable( self::getJsonMessagesFileName( $code ) );
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie77fe18681dfd5f9089fbaa8090dd9cc1c206da4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] While adapting references, validate whether the source has r... - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

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

Change subject: While adapting references, validate whether the source has 
references list
..


While adapting references, validate whether the source has references list

Testplan:
Translate the following article to any language
https://en.wikipedia.org/w/index.php?title=Samsung_Galaxy_A7oldid=668069510
You will notice that the references list is missing in loaded source article.
Use source as translation and translate all sections, publish.
Publish will fail without this patch.

Bug: T104947
Change-Id: I198f5c62b78a7b9e8cf0b613e3e5a870b4c8b2fd
---
M modules/tools/ext.cx.tools.reference.js
1 file changed, 14 insertions(+), 1 deletion(-)

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



diff --git a/modules/tools/ext.cx.tools.reference.js 
b/modules/tools/ext.cx.tools.reference.js
index f85293d..901eb94 100644
--- a/modules/tools/ext.cx.tools.reference.js
+++ b/modules/tools/ext.cx.tools.reference.js
@@ -323,7 +323,20 @@
}
 
function processReferences( $section ) {
-   var $sourceSection, referenceAdaptor, isRestoredFromDraft;
+   var $sourceSection, referenceAdaptor, isRestoredFromDraft, 
$referenceLists;
+
+   $referenceLists = $( '[typeof*=mw:Extension/references]' );
+   if ( !$referenceLists.length ) {
+   // No reference list! There can be multiple reasons for 
this.
+   // (a) Reference list section uses a template that we 
cannot adapt  filtered out from source.
+   // (b) References are in a multi-part template that we 
cannot process at this point.
+   // Or other unknown reason. But if we adapt a reference 
without a reference list at the
+   // translation, parsoid will fail causing a publishing 
failure. That is serious issue and
+   // we work around it by removing all references.
+   mw.log( '[CX] References list not found in source 
article. References will be removed' );
+   $section.find( '[typeof*=mw:Extension/ref]' 
).remove();
+   return;
+   }
 
isRestoredFromDraft = $section.data( 'cx-draft' ) === true;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I198f5c62b78a7b9e8cf0b613e3e5a870b4c8b2fd
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Revert getApiHelperFactory in WikibaseRepo can be null - change (mediawiki...Wikibase)

[Bene (Code Review)]

Bene has submitted this change and it was merged.

Change subject: Revert getApiHelperFactory in WikibaseRepo can be null
..


Revert getApiHelperFactory in WikibaseRepo can be null

This reverts commit a3fe5e4d06095f4172e1fa5a548911cc97cc6d06.

Change-Id: Iae198c03f20f00236a1a266771a864a78cb3401a
---
M repo/includes/WikibaseRepo.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Bene: Verified; Looks good to me, approved



diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index a4b706f..3db405a 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -1070,11 +1070,11 @@
}
 
/**
-* @param IContextSource|null $context
+* @param IContextSource $context
 *
 * @return ApiHelperFactory
 */
-   public function getApiHelperFactory( $context = null ) {
+   public function getApiHelperFactory( $context ) {
return new ApiHelperFactory(
$this-getEntityTitleLookup(),
$this-getExceptionLocalizer(),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae198c03f20f00236a1a266771a864a78cb3401a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene benestar.wikime...@gmail.com
Gerrit-Reviewer: Bene benestar.wikime...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Revert getApiHelperFactory in WikibaseRepo can be null - change (mediawiki...Wikibase)

[Bene (Code Review)]

Bene has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223262

Change subject: Revert getApiHelperFactory in WikibaseRepo can be null
..

Revert getApiHelperFactory in WikibaseRepo can be null

This reverts commit a3fe5e4d06095f4172e1fa5a548911cc97cc6d06.

Change-Id: Iae198c03f20f00236a1a266771a864a78cb3401a
---
M repo/includes/WikibaseRepo.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/62/223262/1

diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index a4b706f..3db405a 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -1070,11 +1070,11 @@
}
 
/**
-* @param IContextSource|null $context
+* @param IContextSource $context
 *
 * @return ApiHelperFactory
 */
-   public function getApiHelperFactory( $context = null ) {
+   public function getApiHelperFactory( $context ) {
return new ApiHelperFactory(
$this-getEntityTitleLookup(),
$this-getExceptionLocalizer(),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae198c03f20f00236a1a266771a864a78cb3401a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene benestar.wikime...@gmail.com

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

[MediaWiki-commits] [Gerrit] Override main page canonical url - change (translatewiki)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223267

Change subject: Override main page canonical url
..

Override main page canonical url

By overriding the main page local url (and by extension the canonical
url) to / we can have main page displayed on https://translatewiki.net
without any redirects. As an additional bonus, now all MediaWiki generated
links also point to this pretty url directly.

This is now necessary as MediaWiki started to always redirect to the
canonical urls. That also prevented Google indexing our main page as
special pages were forbidding from bots.

Setting $url to empty string did not work, but slash seems okay.

Bug: T104690
Change-Id: I380fbb9f4d81ce7c7cc4d57b2ff8afe6f2ed5f34
---
M TranslatewikiSettings.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/67/223267/1

diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php
index f16b2eb..feb4a66 100644
--- a/TranslatewikiSettings.php
+++ b/TranslatewikiSettings.php
@@ -386,9 +386,10 @@
if ( strpos( $dbkey, '%3F' ) !== false || strpos( $dbkey, '%26' 
) !== false || strpos( $dbkey, '//' ) !== false ) {
global $wgScript;
$url = $wgScript?title=$dbkey;
+   } elseif ( $title-isMainPage() ) {
+   $url = '/';
}
}
-   return true;
 };
 
 $wgExtensionFunctions[] = function () {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I380fbb9f4d81ce7c7cc4d57b2ff8afe6f2ed5f34
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] [bugfix] unbreak misspelling.py - change (pywikibot/core)

[Xqt (Code Review)]

Xqt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223270

Change subject: [bugfix] unbreak misspelling.py
..

[bugfix] unbreak misspelling.py

disambPage.templatesWithParams() return the template page and
page.title() includes the namespace. The misspellingTemplate names doesn't
include the namespace and comparing both does never fit.

Change-Id: I907bb4047d42afa4f9044a870f18cbaa724302c8
---
M scripts/misspelling.py
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/70/223270/1

diff --git a/scripts/misspelling.py b/scripts/misspelling.py
index 6285bb2..fc864a8 100755
--- a/scripts/misspelling.py
+++ b/scripts/misspelling.py
@@ -107,7 +107,8 @@
 return True
 elif self.misspellingTemplate[disambPage.site.lang] is not None:
 for template, params in disambPage.templatesWithParams():
-if template.title() in self.misspellingTemplate[self.mylang]:
+if (template.title(withNamespace=False)
+in self.misspellingTemplate[self.mylang]):
 # The correct spelling is in the last paramter.
 correctSpelling = params[-1]
 # On de.wikipedia, there are some cases where the

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I907bb4047d42afa4f9044a870f18cbaa724302c8
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de

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

[MediaWiki-commits] [Gerrit] Add support for Wikia's new Vignette system and work around ... - change (mediawiki...grabbers)

[Jack Phoenix (Code Review)]

Jack Phoenix has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223269

Change subject: Add support for Wikia's new Vignette system and work around 
some bullshit security redirect nonsense
..

Add support for Wikia's new Vignette system and work around some bullshit 
security redirect nonsense

Change-Id: I5d352625fbdbffd2a0d4c44871f1648098edb206
---
M grabImages.php
1 file changed, 20 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/grabbers 
refs/changes/69/223269/1

diff --git a/grabImages.php b/grabImages.php
index a43d98e..b363efd 100755
--- a/grabImages.php
+++ b/grabImages.php
@@ -7,8 +7,8 @@
  * @file
  * @ingroup Maintenance
  * @author Jack Phoenix j...@shoutwiki.com
- * @version 0.4
- * @date 20 June 2012
+ * @version 0.5
+ * @date 14 June 2015
  */
 
 /**
@@ -75,11 +75,21 @@
 
do {
if ( $aifrom === null ) {
+   $FUCKING_SECURITY_REDIRECT_BULLSHIT = '';
unset( $params['aifrom'] );
} else {
+   $FUCKING_SECURITY_REDIRECT_BULLSHIT = 'amp;*';
$params['aifrom'] = $aifrom;
}
-   $q = $this-getOption( 'url' ) . '?' . wfArrayToCGI( 
$params );
+   // Anno Domini 2015 and we (who's we?) still give a 
crap about IE6,
+   // apparently. Giving a crap about ancient IEs also 
means taking a
+   // dump over my API requests, it seems. Without this 
fucking bullshit
+   // param in the URL, $result will be the kind of HTML 
described in
+   // https://phabricator.wikimedia.org/T91439#1085120 
instead of the
+   // JSON we're expecting. Lovely. Just fucking lovely.
+   // --an angry ashley on 14 June 2015
+   // @see https://phabricator.wikimedia.org/T91439
+   $q = $this-getOption( 'url' ) . '?' . wfArrayToCGI( 
$params ) . $FUCKING_SECURITY_REDIRECT_BULLSHIT;
$this-output( 'Going to query the URL ' . $q . \n );
$result = Http::get( $q, 'default',
// Fake up the user agent string, just in 
case...
@@ -115,6 +125,13 @@
 
$imgGrabbed += 1;
 
+   // Check for the presence of Wikia's Vignette's 
parameters and
+   // if they're there, remove 'em to ensure that 
the files are
+   // saved under their correct names.
+   // @see 
http://community.wikia.com/wiki/User_blog:Nmonterroso/Introducing_Vignette,_Wikia%27s_New_Thumbnailer
+   if ( preg_match( 
'/\/revision\/latest\?cb=(.*)$/', $img['url'], $matches ) ) {
+   $img['url'] = preg_replace( 
'/\/revision\/latest\?cb=(.*)$/', '', $img['url'] );
+   }
$this-saveFile( $img['url'] );
 
$hash = sha1_file( $folder . '/' . $img['name'] 
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d352625fbdbffd2a0d4c44871f1648098edb206
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/grabbers
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net

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

[MediaWiki-commits] [Gerrit] reworked SaferEdit * now only brings up warning if unsaved c... - change (mediawiki...BlueSpiceExtensions)

[Tweichart (Code Review)]

Tweichart has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223255

Change subject: reworked SaferEdit * now only brings up warning if unsaved 
changes are in the editor and the user wants to leave the page * still shows 
the statebar notice that someone is currently editing the page
..

reworked SaferEdit
* now only brings up warning if unsaved changes are in the editor and the user 
wants to leave the page
* still shows the statebar notice that someone is currently editing the page

Change-Id: I576210f1f1578b3bf257a61d3c0f1f151ad6e20a
---
M SaferEdit/SaferEdit.class.php
M SaferEdit/SaferEdit.setup.php
A SaferEdit/db/mysql/SaferEdit.patch.se_text.sql
M SaferEdit/db/mysql/SaferEdit.sql
M SaferEdit/db/oracle/SaferEdit.oci.sql
M SaferEdit/db/postgres/SaferEdit.pg.sql
M SaferEdit/resources/bluespice.SaferEdit.editmode.js
M SaferEdit/resources/bluespice.SaferEdit.general.js
8 files changed, 112 insertions(+), 534 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/55/223255/1

diff --git a/SaferEdit/SaferEdit.class.php b/SaferEdit/SaferEdit.class.php
index bf0bcd1..cdb18de 100644
--- a/SaferEdit/SaferEdit.class.php
+++ b/SaferEdit/SaferEdit.class.php
@@ -22,6 +22,7 @@
  * For further information visit http://www.blue-spice.org
  *
  * @author Markus Glaser gla...@hallowelt.biz
+ * @author Tobias Weichart weich...@hallowelt.biz
  * @version2.23.1
  * @packageBlueSpice_Extensions
  * @subpackage SaferEdit
@@ -50,7 +51,7 @@
$this-mInfo = array(
EXTINFO::NAME= 'SaferEdit',
EXTINFO::DESCRIPTION = 'bs-saferedit-desc',
-   EXTINFO::AUTHOR  = 'Markus Glaser',
+   EXTINFO::AUTHOR  = array ( 'Markus Glaser', 
'Tobias Weichart' ),
EXTINFO::VERSION = 'default',
EXTINFO::STATUS  = 'default',
EXTINFO::PACKAGE = 'default',
@@ -71,23 +72,17 @@
protected function initExt() {
wfProfileIn( 'BS::'.__METHOD__ );
 
-   BsConfig::registerVar( 'MW::SaferEdit::UseSE', true, 
BsConfig::LEVEL_USER|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-saferedit-pref-usese', 'toggle' );
-   //BsConfig::registerVar( 'MW::SaferEdit::HasTexts', false, 
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-saferedit-pref-HasTexts', 'toggle' );
-   BsConfig::registerVar( 'MW::SaferEdit::EditSection', -1, 
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_INT|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-saferedit-pref-EditSection', 'int' );
BsConfig::registerVar( 'MW::SaferEdit::Interval', 10, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-saferedit-pref-interval', 'int' );
BsConfig::registerVar( 'MW::SaferEdit::ShowNameOfEditingUser', 
true, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-saferedit-pref-shownameofeditinguser', 'toggle' );
BsConfig::registerVar( 'MW::SaferEdit::WarnOnLeave', true, 
BsConfig::LEVEL_USER|BsConfig::TYPE_BOOL|BsConfig::RENDER_AS_JAVASCRIPT, 
'bs-saferedit-pref-warnonleave', 'toggle' );
 
$this-setHook( 'ArticleSaveComplete', 'clearSaferEdit' );
-   //$this-setHook( 'SkinTemplateOutputPageBeforeExec', 
'parseSaferEdit' );
$this-setHook( 'EditPage::showEditForm:initial', 
'setEditSection' );
$this-setHook( 'BSStateBarAddSortTopVars', 
'onStatebarAddSortTopVars' );
$this-setHook( 'BSStateBarBeforeTopViewAdd', 
'onStateBarBeforeTopViewAdd' );
$this-setHook( 'BeforeInitialize' );
$this-setHook( 'BeforePageDisplay' );
$this-setHook( 'BsAdapterAjaxPingResult' );
-
-   $this-mCore-registerBehaviorSwitch( 'NOSAFEREDIT', array( 
$this, 'noSaferEditCallback' ) ) ;
 
wfProfileOut( 'BS::'.__METHOD__ );
}
@@ -104,8 +99,6 @@
 
if ( BsExtensionManager::isContextActive( 
'MW::SaferEditEditMode' ) === false ) return true;
$oOutputPage-addModules('ext.bluespice.saferedit.editmode');
-
-   $this-parseSaferEdit( $oOutputPage-getTitle() );
return true;
}
 
@@ -139,17 +132,7 @@
$wgExtNewIndexes[] = array( 'bs_saferedit', 
'se_page_namespace', $sDir . 'SaferEdit.patch.se_page_namespace.index.oci.sql' 
);
*/
}
-   return true;
-   }
-
-   /**
-* Callback function for NOSAFEREDIT behavior switch
-* @return bool always true
-*/
-   public function noSaferEditCallback() {
-   BsExtensionManager::removeContext('MW::SaferEdit');
-   

[MediaWiki-commits] [Gerrit] Update ogv.js libraries to 0.9 release - change (mediawiki...TimedMediaHandler)

[Brion VIBBER (Code Review)]

Brion VIBBER has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223261

Change subject: Update ogv.js libraries to 0.9 release
..

Update ogv.js libraries to 0.9 release

From https://github.com/brion/ogv.js/releases/tag/0.9

Change-Id: I17e993965a4ed90c79b14318139b08d965b2e062
---
R MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/COPYING
D MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/README
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-codec.js
A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-support.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-version.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv.js
A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/readme.md
7 files changed, 766 insertions(+), 347 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/61/223261/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I17e993965a4ed90c79b14318139b08d965b2e062
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER br...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] OutputPage: Don't set link hreflang=x-default on all pages - change (mediawiki/core)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223265

Change subject: OutputPage: Don't set link hreflang=x-default on all pages
..

OutputPage: Don't set link hreflang=x-default on all pages

Follows-up 91d8a51825.

Having the default variant advertised seems useful, however for
wikis and/or pages that have no variants or translated versions,
outputting this header doesn't seem useful.

https://support.google.com/webmasters/answer/189077 doesn't
justify sending it unconditionally.

To try out, setting $wgLanguageCode = 'zh'; will result in all
pages having hreflang=x-default and all variants. And setting to
'en' or 'de' will result in none of those link tags.

Change-Id: I21cd072534ae1df960209e657b19c96889ece27c
---
M includes/OutputPage.php
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/65/223265/1

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 0ed847e..30ee19c 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3440,12 +3440,12 @@
'href' = 
$this-getTitle()-getLocalURL( array( 'variant' = $_v ) ) )
);
}
+   # x-default link per 
https://support.google.com/webmasters/answer/189077?hl=en
+   $tags[variant-x-default] = Html::element( 
'link', array(
+   'rel' = 'alternate',
+   'hreflang' = 'x-default',
+   'href' = 
$this-getTitle()-getLocalURL() ) );
}
-   # x-default link per 
https://support.google.com/webmasters/answer/189077?hl=en
-   $tags[variant-x-default] = Html::element( 'link', 
array(
-   'rel' = 'alternate',
-   'hreflang' = 'x-default',
-   'href' = $this-getTitle()-getLocalURL() ) );
}
 
# Copyright

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21cd072534ae1df960209e657b19c96889ece27c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fix tests due to namespace change of WikibaseApiTestCase - change (mediawiki...WikibaseQuality)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223273

Change subject: Fix tests due to namespace change of WikibaseApiTestCase
..

Fix tests due to namespace change of WikibaseApiTestCase

Change-Id: I71d132de8fa4c351c9d78daff286c4a99fde4617
---
M tests/phpunit/Api/GetViolationMessagesTest.php
M tests/phpunit/Api/GetViolationTypesTest.php
M tests/phpunit/Api/ModifyViolationTest.php
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQuality 
refs/changes/73/223273/1

diff --git a/tests/phpunit/Api/GetViolationMessagesTest.php 
b/tests/phpunit/Api/GetViolationMessagesTest.php
index 2024e65..0aa382e 100755
--- a/tests/phpunit/Api/GetViolationMessagesTest.php
+++ b/tests/phpunit/Api/GetViolationMessagesTest.php
@@ -2,7 +2,7 @@
 
 namespace WikibaseQuality\Tests\Api;
 
-use Wikibase\Test\Api\WikibaseApiTestCase;
+use Wikibase\Test\Repo\Api\WikibaseApiTestCase;
 use WikibaseQuality\Violations\SqlViolationRepo;
 
 
diff --git a/tests/phpunit/Api/GetViolationTypesTest.php 
b/tests/phpunit/Api/GetViolationTypesTest.php
index 79ebcf5..771d08e 100644
--- a/tests/phpunit/Api/GetViolationTypesTest.php
+++ b/tests/phpunit/Api/GetViolationTypesTest.php
@@ -2,7 +2,7 @@
 
 namespace WikibaseQuality\Tests\Api;
 
-use Wikibase\Test\Api\WikibaseApiTestCase;
+use Wikibase\Test\Repo\Api\WikibaseApiTestCase;
 
 
 /**
diff --git a/tests/phpunit/Api/ModifyViolationTest.php 
b/tests/phpunit/Api/ModifyViolationTest.php
index 91ebbec..31d4435 100755
--- a/tests/phpunit/Api/ModifyViolationTest.php
+++ b/tests/phpunit/Api/ModifyViolationTest.php
@@ -3,7 +3,7 @@
 namespace WikibaseQuality\Tests\Api;
 
 use TestUser;
-use Wikibase\Test\Api\WikibaseApiTestCase;
+use Wikibase\Test\Repo\Api\WikibaseApiTestCase;
 use WikibaseQuality\Violations\SqlViolationRepo;
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71d132de8fa4c351c9d78daff286c4a99fde4617
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQuality
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com

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

[MediaWiki-commits] [Gerrit] ve.SelectionState: DOM selection snapshot - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: ve.SelectionState: DOM selection snapshot
..


ve.SelectionState: DOM selection snapshot

ve.SelectionState
* Snapshot similar to native DOM Selection, with anchor/focus

ve.ce.Surface
* Refactor to use ve.SelectionState
* Fix bug restoring backwards selections in onCopy

ve.ce.RangeState
* Refactor to use ve.SelectionState

Bug: T104517
Change-Id: I33c8073592341d5b775e2839be0221662705a6df
---
M .jsduck/categories.json
M build/modules.json
M demos/ve/desktop.html
M demos/ve/mobile.html
M src/ce/ve.ce.RangeState.js
M src/ce/ve.ce.Surface.js
A src/ve.SelectionState.js
M tests/ce/ve.ce.Surface.test.js
M tests/index.html
9 files changed, 345 insertions(+), 249 deletions(-)

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



diff --git a/.jsduck/categories.json b/.jsduck/categories.json
index 0dde668..dccbece 100644
--- a/.jsduck/categories.json
+++ b/.jsduck/categories.json
@@ -4,7 +4,14 @@
groups: [
{
name: Utilities,
-   classes: [ve, ve.Range, 
ve.EventSequencer, ve.Filibuster, ve.TriggerListener]
+   classes: [
+   ve,
+   ve.Range,
+   ve.SelectionState,
+   ve.EventSequencer,
+   ve.Filibuster,
+   ve.TriggerListener
+   ]
},
{
name: Nodes,
diff --git a/build/modules.json b/build/modules.json
index ff6437f..07c662f 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -196,6 +196,7 @@
visualEditor.core.build: {
scripts: [
src/ve.Range.js,
+   src/ve.SelectionState.js,
src/ve.Node.js,
src/ve.BranchNode.js,
src/ve.LeafNode.js,
diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html
index 3d72adf..1cc9210 100644
--- a/demos/ve/desktop.html
+++ b/demos/ve/desktop.html
@@ -157,6 +157,7 @@
 
!-- visualEditor.core.build --
script src=../../src/ve.Range.js/script
+   script src=../../src/ve.SelectionState.js/script
script src=../../src/ve.Node.js/script
script src=../../src/ve.BranchNode.js/script
script src=../../src/ve.LeafNode.js/script
diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html
index 1b22432..69e5243 100644
--- a/demos/ve/mobile.html
+++ b/demos/ve/mobile.html
@@ -158,6 +158,7 @@
 
!-- visualEditor.core.build --
script src=../../src/ve.Range.js/script
+   script src=../../src/ve.SelectionState.js/script
script src=../../src/ve.Node.js/script
script src=../../src/ve.BranchNode.js/script
script src=../../src/ve.LeafNode.js/script
diff --git a/src/ce/ve.ce.RangeState.js b/src/ce/ve.ce.RangeState.js
index 2bda46d..b98fd9b 100644
--- a/src/ce/ve.ce.RangeState.js
+++ b/src/ce/ve.ce.RangeState.js
@@ -57,37 +57,6 @@
 
 OO.initClass( ve.ce.RangeState );
 
-/* Static methods */
-
-/**
- * Create a plain selection object equivalent to no selection
- *
- * @return {Object} Plain selection object
- */
-ve.ce.RangeState.static.createNullSelection = function () {
-   return {
-   focusNode: null,
-   focusOffset: 0,
-   anchorNode: null,
-   anchorOffset: 0
-   };
-};
-
-/**
- * Compare two plain selection objects, checking that all values are equal
- * and all nodes are reference-equal.
- *
- * @param {Object} a First plain selection object
- * @param {Object} b First plain selection object
- * @return {boolean} Selections are identical
- */
-ve.ce.RangeState.static.compareSelections = function ( a, b ) {
-   return a.focusNode === b.focusNode 
-   a.focusOffset === b.focusOffset 
-   a.anchorNode === b.anchorNode 
-   a.anchorOffset === b.anchorOffset;
-};
-
 /* Methods */
 
 /**
@@ -99,7 +68,7 @@
  */
 ve.ce.RangeState.prototype.saveState = function ( old, documentNode, 
selectionOnly ) {
var $node, selection, anchorNodeChanged,
-   oldSelection = old ? old.misleadingSelection : 
this.constructor.static.createNullSelection(),
+   oldSelection = old ? old.misleadingSelection : 
ve.SelectionState.static.newNullSelection(),
nativeSelection = 
documentNode.getElementDocument().getSelection();
 
if (
@@ -107,19 +76,14 @@
OO.ui.contains( documentNode.$element[0], 
nativeSelection.anchorNode, true )
) {
  

[MediaWiki-commits] [Gerrit] Version 1.4.0 - change (mediawiki...PrivateDomains)

[jenkins-bot (Code Review)]

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

Change subject: Version 1.4.0
..


Version 1.4.0

* extension.json added
* old, deprecated PHP i18n file removed
* changed errorbox to successbox in SpecialPrivateDomains.php because the 
message shown is more of a success than an error message
* moved hooks to their own file  wrapped 'em in a class
* set the correct page title(s) in PrivateDomainsHooks::onAlternateEdit()

Change-Id: Iae01f1662fb67e1cb2d1f1c33db11eac50e12fec
---
D PrivateDomains.i18n.php
M PrivateDomains.php
A PrivateDomainsHooks.php
M SpecialPrivateDomains.php
A extension.json
5 files changed, 167 insertions(+), 105 deletions(-)

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



diff --git a/PrivateDomains.i18n.php b/PrivateDomains.i18n.php
deleted file mode 100644
index fcab85b..000
--- a/PrivateDomains.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- * 
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShimb40a1f8a7d128c2e' ) ) {
-   function wfJsonI18nShimb40a1f8a7d128c2e( $cache, $code, $cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . /i18n/$csCode.json;
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShimb40a1f8a7d128c2e';
-}
diff --git a/PrivateDomains.php b/PrivateDomains.php
index 4ae5135..3607538 100644
--- a/PrivateDomains.php
+++ b/PrivateDomains.php
@@ -7,18 +7,14 @@
  * @ingroup Extensions
  * @author Inez Korczyński korczyn...@gmail.com
  * @author Jack Phoenix j...@countervandalism.net
- * @link http://www.mediawiki.org/wiki/Extension:PrivateDomains Documentation
+ * @link https://www.mediawiki.org/wiki/Extension:PrivateDomains Documentation
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
  */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-   die( This is not a valid entry point.\n );
-}
 
 // Extension credits that will show up on Special:Version
 $wgExtensionCredits['specialpage'][] = array(
'name' = 'PrivateDomains',
-   'version' = '1.3.0',
+   'version' = '1.4.0',
'author' = array( 'Inez Korczyński', 'Jack Phoenix' ),
'description' = 'Allows to restrict editing to users with a certain 
e-mail address',
'url' = 'https://www.mediawiki.org/wiki/Extension:PrivateDomains',
@@ -26,15 +22,14 @@
 );
 
 // Set up the new special page
-$dir = dirname( __FILE__ ) . '/';
-$wgAutoloadClasses['PrivateDomains'] = $dir . 'SpecialPrivateDomains.php';
+$wgAutoloadClasses['PrivateDomains'] = __DIR__ . '/SpecialPrivateDomains.php';
 $wgMessagesDirs['PrivateDomains'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['PrivateDomains'] = $dir . 'PrivateDomains.i18n.php';
 $wgSpecialPages['PrivateDomains'] = 'PrivateDomains';
 
-$wgHooks['AlternateEdit'][] = 'pd_AlternateEdit'; // Occurs whenever 
action=edit is called
-$wgHooks['UserLoginComplete'][] = 'pd_UserLoginComplete'; // Occurs after a 
user has successfully logged in
-$wgHooks['ConfirmEmailComplete'][] = 'pd_UserLoginComplete'; // Occurs after a 
user has successfully confirm email
+$wgAutoloadClasses['PrivateDomainsHooks'] = __DIR__ . 
'/PrivateDomainsHooks.php';
+$wgHooks['AlternateEdit'][] = 'PrivateDomainsHooks::onAlternateEdit';
+$wgHooks['UserLoginComplete'][] = 'PrivateDomainsHooks::onUserLoginComplete';
+$wgHooks['ConfirmEmailComplete'][] = 
'PrivateDomainsHooks::onUserLoginComplete';
 
 # set 'privatedomains' right to users in staff or bureaucrat group
 $wgAvailableRights[] = 

[MediaWiki-commits] [Gerrit] Fix tests due to namespace change of WikibaseApiTestCase - change (mediawiki...WikibaseQualityExternalValidation)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223274

Change subject: Fix tests due to namespace change of WikibaseApiTestCase
..

Fix tests due to namespace change of WikibaseApiTestCase

Change-Id: I2a21b7e9490c55c13e504780076cc72af0d600e8
---
M tests/phpunit/Api/RunCrossCheckTest.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
 refs/changes/74/223274/1

diff --git a/tests/phpunit/Api/RunCrossCheckTest.php 
b/tests/phpunit/Api/RunCrossCheckTest.php
index c280bbe..535744e 100755
--- a/tests/phpunit/Api/RunCrossCheckTest.php
+++ b/tests/phpunit/Api/RunCrossCheckTest.php
@@ -12,7 +12,7 @@
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikibase\Lib\ClaimGuidGenerator;
 use Wikibase\Repo\WikibaseRepo;
-use Wikibase\Test\Api\WikibaseApiTestCase;
+use Wikibase\Test\Repo\Api\WikibaseApiTestCase;
 use 
WikibaseQuality\ExternalValidation\DumpMetaInformation\SqlDumpMetaInformationRepo;
 use WikibaseQuality\ExternalValidation\ExternalDataRepo;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a21b7e9490c55c13e504780076cc72af0d600e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fix tests due to namespace change of WikibaseApiTestCase - change (mediawiki...WikibaseQualityExternalValidation)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223275

Change subject: Fix tests due to namespace change of WikibaseApiTestCase
..

Fix tests due to namespace change of WikibaseApiTestCase

Change-Id: I2a21b7e9490c55c13e504780076cc72af0d600e8
---
M tests/phpunit/Api/RunCrossCheckTest.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
 refs/changes/75/223275/1

diff --git a/tests/phpunit/Api/RunCrossCheckTest.php 
b/tests/phpunit/Api/RunCrossCheckTest.php
index 9a92267..4911c10 100755
--- a/tests/phpunit/Api/RunCrossCheckTest.php
+++ b/tests/phpunit/Api/RunCrossCheckTest.php
@@ -12,7 +12,7 @@
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikibase\Lib\ClaimGuidGenerator;
 use Wikibase\Repo\WikibaseRepo;
-use Wikibase\Test\Api\WikibaseApiTestCase;
+use Wikibase\Test\Repo\Api\WikibaseApiTestCase;
 use 
WikibaseQuality\ExternalValidation\DumpMetaInformation\SqlDumpMetaInformationRepo;
 use WikibaseQuality\ExternalValidation\ExternalDataRepo;
 
@@ -267,4 +267,4 @@
$this-doApiRequest( $params );
}
 
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a21b7e9490c55c13e504780076cc72af0d600e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: v1
Gerrit-Owner: Addshore addshorew...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fix tests due to namespace change of WikibaseApiTestCase - change (mediawiki...WikibaseQuality)

[WMDE]

Thiemo Mättig (WMDE) has submitted this change and it was merged.

Change subject: Fix tests due to namespace change of WikibaseApiTestCase
..


Fix tests due to namespace change of WikibaseApiTestCase

Change-Id: I71d132de8fa4c351c9d78daff286c4a99fde4617
---
M tests/phpunit/Api/GetViolationMessagesTest.php
M tests/phpunit/Api/GetViolationTypesTest.php
M tests/phpunit/Api/ModifyViolationTest.php
3 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Verified; Looks good to me, approved



diff --git a/tests/phpunit/Api/GetViolationMessagesTest.php 
b/tests/phpunit/Api/GetViolationMessagesTest.php
index 2024e65..0aa382e 100755
--- a/tests/phpunit/Api/GetViolationMessagesTest.php
+++ b/tests/phpunit/Api/GetViolationMessagesTest.php
@@ -2,7 +2,7 @@
 
 namespace WikibaseQuality\Tests\Api;
 
-use Wikibase\Test\Api\WikibaseApiTestCase;
+use Wikibase\Test\Repo\Api\WikibaseApiTestCase;
 use WikibaseQuality\Violations\SqlViolationRepo;
 
 
diff --git a/tests/phpunit/Api/GetViolationTypesTest.php 
b/tests/phpunit/Api/GetViolationTypesTest.php
index 79ebcf5..771d08e 100644
--- a/tests/phpunit/Api/GetViolationTypesTest.php
+++ b/tests/phpunit/Api/GetViolationTypesTest.php
@@ -2,7 +2,7 @@
 
 namespace WikibaseQuality\Tests\Api;
 
-use Wikibase\Test\Api\WikibaseApiTestCase;
+use Wikibase\Test\Repo\Api\WikibaseApiTestCase;
 
 
 /**
diff --git a/tests/phpunit/Api/ModifyViolationTest.php 
b/tests/phpunit/Api/ModifyViolationTest.php
index 91ebbec..31d4435 100755
--- a/tests/phpunit/Api/ModifyViolationTest.php
+++ b/tests/phpunit/Api/ModifyViolationTest.php
@@ -3,7 +3,7 @@
 namespace WikibaseQuality\Tests\Api;
 
 use TestUser;
-use Wikibase\Test\Api\WikibaseApiTestCase;
+use Wikibase\Test\Repo\Api\WikibaseApiTestCase;
 use WikibaseQuality\Violations\SqlViolationRepo;
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71d132de8fa4c351c9d78daff286c4a99fde4617
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQuality
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fix browser tests - change (mediawiki...Flow)

[Sbisson (Code Review)]

Sbisson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223277

Change subject: Fix browser tests
..

Fix browser tests

* Fix selectors for new ToC
* find titles by h2 instead of div to make it work in firefox
* scroll to top after inserting a comment to prevent scroll_into_view
  from placing the element under the fixed nav bar.

Change-Id: I40d74897b15d5c8328956c56df6fb107a75a0e80
---
M tests/browser/features/step_definitions/reply_steps.rb
M tests/browser/features/support/pages/flow_page.rb
2 files changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/77/223277/1

diff --git a/tests/browser/features/step_definitions/reply_steps.rb 
b/tests/browser/features/step_definitions/reply_steps.rb
index b85895e..9aa5472 100644
--- a/tests/browser/features/step_definitions/reply_steps.rb
+++ b/tests/browser/features/step_definitions/reply_steps.rb
@@ -21,6 +21,7 @@
 page.new_reply_save_element.when_present.click
 page.new_reply_save_element.when_not_present
 page.flow_first_topic_element.paragraph_element(text: content).when_present
+page.scroll_to_top
   end
 end
 
diff --git a/tests/browser/features/support/pages/flow_page.rb 
b/tests/browser/features/support/pages/flow_page.rb
index e47a4c9..8337db2 100644
--- a/tests/browser/features/support/pages/flow_page.rb
+++ b/tests/browser/features/support/pages/flow_page.rb
@@ -45,7 +45,7 @@
   div(:highlighted_post, css: .flow-post-highlighted)
 
   def topic_with_title(title)
-div_element(text: title)
+h2_element(text: title)
   end
 
   ## First topic
@@ -284,9 +284,9 @@
 
   # Sorting
   span(:newest_topics_link, text: Newest topics)
-  a(:recently_active_topics_choice, href: /topiclist_sortby=updated/)
+  span(:recently_active_topics_choice, text: Recently active topics)
   span(:recently_active_topics_link, text: Recently active topics)
-  a(:newest_topics_choice, href: /topiclist_sortby=newest/)
+  span(:newest_topics_choice, text: Newest topics)
 
   ## Watch and unwatch links
   div(:first_topic_watchlist_container, css: .flow-topic-watchlist, index: 0)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I40d74897b15d5c8328956c56df6fb107a75a0e80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Sbisson sbis...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Options are optional in the wbformat/parsevalue API modules - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Options are optional in the wbformat/parsevalue API modules
..


Options are optional in the wbformat/parsevalue API modules

The 'options' parameter is optional and can be null in these API modules.
This should be documented and checked, even if json_decode does not fail
when called with null. It returns null in this case.

Change-Id: I7c523aaf565368668e77336d4877213136532034
---
M repo/includes/api/FormatSnakValue.php
M repo/includes/api/ParseValue.php
2 files changed, 9 insertions(+), 7 deletions(-)

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



diff --git a/repo/includes/api/FormatSnakValue.php 
b/repo/includes/api/FormatSnakValue.php
index 00eb816..b29c83e 100644
--- a/repo/includes/api/FormatSnakValue.php
+++ b/repo/includes/api/FormatSnakValue.php
@@ -147,7 +147,7 @@
}
 
/**
-* @param string $optionsParam
+* @param string|null $optionsParam
 *
 * @return FormatterOptions
 */
@@ -155,11 +155,13 @@
$formatterOptions = new FormatterOptions();
$formatterOptions-setOption( ValueFormatter::OPT_LANG, 
$this-getLanguage()-getCode() );
 
-   $options = json_decode( $optionsParam, true );
+   if ( is_string( $optionsParam )  $optionsParam !== '' ) {
+   $options = json_decode( $optionsParam, true );
 
-   if ( is_array( $options ) ) {
-   foreach ( $options as $name = $value ) {
-   $formatterOptions-setOption( $name, $value );
+   if ( is_array( $options ) ) {
+   foreach ( $options as $name = $value ) {
+   $formatterOptions-setOption( $name, 
$value );
+   }
}
}
 
diff --git a/repo/includes/api/ParseValue.php b/repo/includes/api/ParseValue.php
index 98f2492..dae6544 100644
--- a/repo/includes/api/ParseValue.php
+++ b/repo/includes/api/ParseValue.php
@@ -162,7 +162,7 @@
}
 
/**
-* @param string $optionsParam
+* @param string|null $optionsParam
 *
 * @return ParserOptions
 */
@@ -170,7 +170,7 @@
$parserOptions = new ParserOptions();
$parserOptions-setOption( ValueParser::OPT_LANG, 
$this-getLanguage()-getCode() );
 
-   if ( $optionsParam !== null  $optionsParam !== '' ) {
+   if ( is_string( $optionsParam )  $optionsParam !== '' ) {
$options = json_decode( $optionsParam, true );
 
if ( !is_array( $options ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c523aaf565368668e77336d4877213136532034
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] [bugfix] Assign bot to ListAlternativesOption class - change (pywikibot/core)

[Xqt (Code Review)]

Xqt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223259

Change subject: [bugfix] Assign bot to ListAlternativesOption class
..

[bugfix] Assign bot to ListAlternativesOption class

- remove obsolete comma

Bug: T104952
Change-Id: I5bfb4de682d7f592fd50be51ab231e471256eb5a
---
M scripts/solve_disambiguation.py
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/59/223259/1

diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py
index 4ac3b0d..0e108c5 100755
--- a/scripts/solve_disambiguation.py
+++ b/scripts/solve_disambiguation.py
@@ -737,7 +737,7 @@
   
len(self.dn_template_str) + 8]):
 continue
 
-edit = EditOption('edit page', 'e', text, m.start(), 
disambPage.title()),
+edit = EditOption('edit page', 'e', text, m.start(), 
disambPage.title())
 context_option = HighlightContextOption(
 'more context', 'm', text, 60, start=m.start(), 
end=m.end())
 context_option.before_question = True
@@ -756,8 +756,8 @@
 if not edited:
 options += [ShowPageOption('show disambiguation page', 'd',
m.start(), disambPage)]
-options += [ListAlternativesOption('list', 'l'),
-AddAlternativeOption('add new', 'a')]
+options += [ListAlternativesOption('list', 'l', self),
+AddAlternativeOption('add new', 'a', self)]
 if edited:
 options += [StandardOption('save in this form', 'x')]
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bfb4de682d7f592fd50be51ab231e471256eb5a
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de

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

[MediaWiki-commits] [Gerrit] getApiHelperFactory in WikibaseRepo can be null - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has submitted this change and it was merged.

Change subject: getApiHelperFactory in WikibaseRepo can be null
..


getApiHelperFactory in WikibaseRepo can be null

Change-Id: I10b43d0c32f7b3b5b98b05154a83ecbfec25
---
M repo/includes/WikibaseRepo.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 3db405a..a4b706f 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -1070,11 +1070,11 @@
}
 
/**
-* @param IContextSource $context
+* @param IContextSource|null $context
 *
 * @return ApiHelperFactory
 */
-   public function getApiHelperFactory( $context ) {
+   public function getApiHelperFactory( $context = null ) {
return new ApiHelperFactory(
$this-getEntityTitleLookup(),
$this-getExceptionLocalizer(),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I10b43d0c32f7b3b5b98b05154a83ecbfec25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update ogv.js libraries to 0.9 release - change (mediawiki...TimedMediaHandler)

[jenkins-bot (Code Review)]

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

Change subject: Update ogv.js libraries to 0.9 release
..


Update ogv.js libraries to 0.9 release

From https://github.com/brion/ogv.js/releases/tag/0.9

Change-Id: I17e993965a4ed90c79b14318139b08d965b2e062
---
R MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/COPYING
D MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/README
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-codec.js
A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-support.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-version.js
M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv.js
A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/readme.md
7 files changed, 766 insertions(+), 347 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I17e993965a4ed90c79b14318139b08d965b2e062
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Only use global state in global state functions - change (mediawiki...Wikibase)

[Bene (Code Review)]

Bene has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223271

Change subject: Only use global state in global state functions
..

Only use global state in global state functions

Change-Id: I3484a5e9945545a93e9e6ca1f2911b607e35d710
---
M repo/includes/EditEntity.php
M repo/includes/EditEntityFactory.php
M repo/includes/Hooks/EditFilterHookRunner.php
M repo/includes/UpdateRepo/UpdateRepoJob.php
M repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php
M repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteJobTest.php
M repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveJobTest.php
M repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
10 files changed, 35 insertions(+), 42 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/71/223271/1

diff --git a/repo/includes/EditEntity.php b/repo/includes/EditEntity.php
index e1e7c1d..b6bec53 100644
--- a/repo/includes/EditEntity.php
+++ b/repo/includes/EditEntity.php
@@ -2,12 +2,11 @@
 
 namespace Wikibase;
 
-use DerivativeContext;
 use Html;
+use IContextSource;
 use InvalidArgumentException;
 use MWException;
 use ReadOnlyError;
-use RequestContext;
 use Status;
 use Title;
 use User;
@@ -19,6 +18,7 @@
 use Wikibase\Lib\Store\StorageException;
 use Wikibase\Repo\Hooks\EditFilterHookRunner;
 use Wikibase\Repo\Store\EntityPermissionChecker;
+use WikiPage;
 
 /**
  * Handler for editing activity, providing a unified interface for saving 
modified entities while performing
@@ -91,7 +91,7 @@
private $title = null;
 
/**
-* @var RequestContext|DerivativeContext
+* @var IContextSource
 */
private $context;
 
@@ -168,8 +168,7 @@
 *This will detect late edit conflicts, i.e. someone 
squeezing in an edit
 *just before the actual database transaction for saving beings.
 *The empty string and 0 are both treated as `false`, disabling 
conflict checks.
-* @param RequestContext|DerivativeContext|null $context the context to 
use while processing
-*the edit; defaults to RequestContext::getMain().
+* @param IContextSource $context the context to use while processing 
the edit
 *
 * @throws InvalidArgumentException
 */
@@ -182,7 +181,7 @@
User $user,
EditFilterHookRunner $editFilterHookRunner,
$baseRevId = false,
-   $context = null
+   IContextSource$context
) {
$this-newEntity = $newEntity;
 
@@ -199,15 +198,6 @@
 
$this-errorType = 0;
$this-status = Status::newGood();
-
-   if ( $context !== null  !$context instanceof RequestContext 
 !$context instanceof DerivativeContext ) {
-   throw new InvalidArgumentException( '$context must be 
an instance of RequestContext'
-. ' or DerivativeContext' );
-   }
-
-   if ( $context === null ) {
-   $context = RequestContext::getMain();
-   }
 
$this-context = $context;
 
diff --git a/repo/includes/EditEntityFactory.php 
b/repo/includes/EditEntityFactory.php
index 78eab2f..881ebdc 100644
--- a/repo/includes/EditEntityFactory.php
+++ b/repo/includes/EditEntityFactory.php
@@ -2,8 +2,7 @@
 
 namespace Wikibase;
 
-use DerivativeContext;
-use RequestContext;
+use IContextSource;
 use User;
 use Wikibase\DataModel\Entity\Entity;
 use Wikibase\Lib\Store\EntityRevisionLookup;
@@ -46,7 +45,7 @@
private $editFilterHookRunner;
 
/**
-* @var RequestContext|DerivativeContext|null
+* @var IContextSource
 */
private $context;
 
@@ -56,7 +55,7 @@
 * @param EntityStore $entityStore
 * @param EntityPermissionChecker $permissionChecker
 * @param EditFilterHookRunner $editFilterHookRunner
-* @param RequestContext|DerivativeContext|null $context
+* @param IContextSource $context
 */
public function __construct(
EntityTitleLookup $titleLookup,
@@ -64,7 +63,7 @@
EntityStore $entityStore,
EntityPermissionChecker $permissionChecker,
EditFilterHookRunner $editFilterHookRunner,
-   $context = null
+   IContextSource $context
) {
$this-titleLookup = $titleLookup;
$this-entityRevisionLookup = $entityLookup;
diff --git a/repo/includes/Hooks/EditFilterHookRunner.php 
b/repo/includes/Hooks/EditFilterHookRunner.php
index 9a3e16d..bb187c8 100644
--- a/repo/includes/Hooks/EditFilterHookRunner.php
+++ b/repo/includes/Hooks/EditFilterHookRunner.php
@@ -38,24 +38,15 @@
private 

[MediaWiki-commits] [Gerrit] Use textarea for options parameter in wbparsevalue API - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223257

Change subject: Use textarea for options parameter in wbparsevalue API
..

Use textarea for options parameter in wbparsevalue API

The similar 'options' parameter in wbformatvalue is already a 'text'
parameter now. The only difference between 'string' and 'text' is
that the later is rendered as a textarea in the API sandbox.

Change-Id: I7273afe1cfdb15753c8a23e70c2d1ff6abf5235d
---
M repo/includes/api/ParseValue.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/57/223257/1

diff --git a/repo/includes/api/ParseValue.php b/repo/includes/api/ParseValue.php
index 98f2492..bc06493 100644
--- a/repo/includes/api/ParseValue.php
+++ b/repo/includes/api/ParseValue.php
@@ -219,7 +219,7 @@
ApiBase::PARAM_ISMULTI = true,
),
'options' = array(
-   ApiBase::PARAM_TYPE = 'string',
+   ApiBase::PARAM_TYPE = 'text',
ApiBase::PARAM_REQUIRED = false,
),
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7273afe1cfdb15753c8a23e70c2d1ff6abf5235d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] MergeItemsTest: assert redirect creation - change (mediawiki...Wikibase)

[Daniel Kinzler (Code Review)]

Daniel Kinzler has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223264

Change subject: MergeItemsTest: assert redirect creation
..

MergeItemsTest: assert redirect creation

Change-Id: Id6376fd16748a0f79f5c91de3a6a716d29ccf597
---
M repo/tests/phpunit/includes/api/MergeItemsTest.php
1 file changed, 41 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/64/223264/1

diff --git a/repo/tests/phpunit/includes/api/MergeItemsTest.php 
b/repo/tests/phpunit/includes/api/MergeItemsTest.php
index e0a88bf..f885b76 100644
--- a/repo/tests/phpunit/includes/api/MergeItemsTest.php
+++ b/repo/tests/phpunit/includes/api/MergeItemsTest.php
@@ -9,7 +9,7 @@
 use Wikibase\Api\ApiErrorReporter;
 use Wikibase\Api\MergeItems;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
-use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\Repo\Interactors\ItemMergeInteractor;
 use Wikibase\Repo\Interactors\RedirectCreationInteractor;
 use Wikibase\Repo\WikibaseRepo;
@@ -101,25 +101,34 @@
}
 
/**
+* @param EntityRedirect|null $redirect
+*
 * @return RedirectCreationInteractor
 */
-   public function getMockRedirectCreationInteractor() {
+   public function getMockRedirectCreationInteractor( EntityRedirect 
$redirect = null ) {
$mock = $this-getMockBuilder( 
'Wikibase\Repo\Interactors\RedirectCreationInteractor' )
-disableOriginalConstructor()
-getMock();
 
-   $mock-expects( $this-any() )
-   -method( 'createRedirect' )
-   -will( $this-returnCallback( function( EntityId 
$fromId, EntityId $toId, $bot ) {
-   return new EntityRedirect( $fromId, $toId );
-   } ) );
+   if ( $redirect ) {
+   $mock-expects( $this-once() )
+   -method( 'createRedirect' )
+   -with( $redirect-getEntityId(), 
$redirect-getTargetId() )
+   -will( $this-returnCallback( function() use ( 
$redirect ) {
+   return $redirect;
+   } ) );
+   } else {
+   $mock-expects( $this-never() )
+   -method( 'createRedirect' );
+   }
+
return $mock;
}
 
/**
 * @param MergeItems $module
 */
-   private function overrideServices( MergeItems $module ) {
+   private function overrideServices( MergeItems $module, EntityRedirect 
$expectedRedirect = null ) {
$idParser = new BasicEntityIdParser();
 
$errorReporter = new ApiErrorReporter(
@@ -148,14 +157,14 @@
$this-getPermissionCheckers(),
$summaryFormatter,
$module-getUser(),
-   $this-getMockRedirectCreationInteractor()
+   $this-getMockRedirectCreationInteractor( 
$expectedRedirect )
)
);
}
 
-   private function callApiModule( $params, User $user = null ) {
-   $module = $this-apiModuleTestHelper-newApiModule( 
'Wikibase\Api\MergeItems', 'wbmergeitems', $params, $user );
-   $this-overrideServices( $module );
+   private function callApiModule( $params, EntityRedirect 
$expectedRedirect = null ) {
+   $module = $this-apiModuleTestHelper-newApiModule( 
'Wikibase\Api\MergeItems', 'wbmergeitems', $params );
+   $this-overrideServices( $module, $expectedRedirect );
 
$module-execute();
 
@@ -174,6 +183,7 @@
array(),
array(),
array( 'labels' = array( 'en' = array( 'language' = 
'en', 'value' = 'foo' ) ) ),
+   true,
);
$testCases['IgnoreConflictSitelinksMerge'] = array(
array( 'sitelinks' = array(
@@ -186,7 +196,8 @@
'dewiki' = array( 'site' = 'dewiki', 'title' 
= 'RemainTo' ),
'enwiki' = array( 'site' = 'enwiki', 'title' 
= 'PlFrom' ),
) ),
-   'sitelink'
+   false,
+   'sitelink',
);
$testCases['claimMerge'] = array(
array( 'claims' = array( 'P1' = array( array( 
'mainsnak' = array(
@@ -197,6 +208,7 @@
array( 'claims' = array( 'P1' = array( array( 
'mainsnak' = array(
'snaktype' = 'value', 'property' = 'P1', 
'datavalue' 

[MediaWiki-commits] [Gerrit] Remove hidden Context in EditStuff - change (mediawiki...Wikibase)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223272

Change subject: Remove hidden Context in EditStuff
..

Remove hidden Context in EditStuff

EditEntity
EditFilterHookRunner

Change-Id: Idb0bb818bfe9f7140a161675ca2fc08d720fccab
---
M repo/includes/EditEntity.php
M repo/includes/EditEntityFactory.php
M repo/includes/Hooks/EditFilterHookRunner.php
M repo/includes/UpdateRepo/UpdateRepoJob.php
M repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php
M repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/EditEntityTest.php
M repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteJobTest.php
M repo/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveJobTest.php
M repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
11 files changed, 41 insertions(+), 46 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/72/223272/4

diff --git a/repo/includes/EditEntity.php b/repo/includes/EditEntity.php
index e1e7c1d..d25c86e 100644
--- a/repo/includes/EditEntity.php
+++ b/repo/includes/EditEntity.php
@@ -4,6 +4,7 @@
 
 use DerivativeContext;
 use Html;
+use IContextSource;
 use InvalidArgumentException;
 use MWException;
 use ReadOnlyError;
@@ -162,16 +163,14 @@
 * @param Entity $newEntity the new entity object
 * @param User $user the user performing the edit
 * @param EditFilterHookRunner $editFilterHookRunner
+* @param IContextSource $context the context to use while processing 
the edit
+*
 * @param int|bool $baseRevId the base revision ID for conflict 
checking.
 *Defaults to false, disabling conflict checks.
 *`true` can be used to set the base revision to the latest 
revision:
 *This will detect late edit conflicts, i.e. someone 
squeezing in an edit
 *just before the actual database transaction for saving beings.
 *The empty string and 0 are both treated as `false`, disabling 
conflict checks.
-* @param RequestContext|DerivativeContext|null $context the context to 
use while processing
-*the edit; defaults to RequestContext::getMain().
-*
-* @throws InvalidArgumentException
 */
public function __construct(
EntityTitleLookup $titleLookup,
@@ -181,8 +180,8 @@
Entity $newEntity,
User $user,
EditFilterHookRunner $editFilterHookRunner,
-   $baseRevId = false,
-   $context = null
+   IContextSource $context,
+   $baseRevId = false
) {
$this-newEntity = $newEntity;
 
@@ -199,15 +198,6 @@
 
$this-errorType = 0;
$this-status = Status::newGood();
-
-   if ( $context !== null  !$context instanceof RequestContext 
 !$context instanceof DerivativeContext ) {
-   throw new InvalidArgumentException( '$context must be 
an instance of RequestContext'
-. ' or DerivativeContext' );
-   }
-
-   if ( $context === null ) {
-   $context = RequestContext::getMain();
-   }
 
$this-context = $context;
 
diff --git a/repo/includes/EditEntityFactory.php 
b/repo/includes/EditEntityFactory.php
index 78eab2f..b8c0c09 100644
--- a/repo/includes/EditEntityFactory.php
+++ b/repo/includes/EditEntityFactory.php
@@ -3,6 +3,7 @@
 namespace Wikibase;
 
 use DerivativeContext;
+use IContextSource;
 use RequestContext;
 use User;
 use Wikibase\DataModel\Entity\Entity;
@@ -46,7 +47,7 @@
private $editFilterHookRunner;
 
/**
-* @var RequestContext|DerivativeContext|null
+* @var IContextSource
 */
private $context;
 
@@ -56,7 +57,7 @@
 * @param EntityStore $entityStore
 * @param EntityPermissionChecker $permissionChecker
 * @param EditFilterHookRunner $editFilterHookRunner
-* @param RequestContext|DerivativeContext|null $context
+* @param IContextSource $context
 */
public function __construct(
EntityTitleLookup $titleLookup,
@@ -64,7 +65,7 @@
EntityStore $entityStore,
EntityPermissionChecker $permissionChecker,
EditFilterHookRunner $editFilterHookRunner,
-   $context = null
+   IContextSource $context
) {
$this-titleLookup = $titleLookup;
$this-entityRevisionLookup = $entityLookup;
@@ -95,8 +96,8 @@
$entity,
$user,
$this-editFilterHookRunner,
-   $baseRevId,
-   $this-context
+   

[MediaWiki-commits] [Gerrit] Explain API action=parsedisablepp option more clearly - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Explain API action=parsedisablepp option more clearly
..


Explain API action=parsedisablepp option more clearly

Brought up by Purodha on translatewiki.net Support page.

Also change a few ungrammatical Disables to Omits.

Change-Id: I9a14fa16cc166471d66c53489e8186ec09297399
---
M includes/api/i18n/en.json
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 28eddf4..2d1dadd 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -310,12 +310,12 @@
apihelp-parse-param-effectivelanglinks: Includes language links 
supplied by extensions (for use with kbd$1prop=langlinks/kbd).,
apihelp-parse-param-section: Only retrieve the content of this 
section number or when kbdnew/kbd generate a new section.\n\nkbdnew/kbd 
section is only honored when specifying vartext/var.,
apihelp-parse-param-sectiontitle: New section title when 
varsection/var is kbdnew/kbd.\n\nUnlike page editing, this does not 
fall back to varsummary/var when omitted or empty.,
-   apihelp-parse-param-disablepp: Disable the PP Report from the parser 
output.,
-   apihelp-parse-param-disableeditsection: Disable edit section links 
from the parser output.,
+   apihelp-parse-param-disablepp: Omit the preprocessor report (\NewPP 
limit report\) from the parser output.,
+   apihelp-parse-param-disableeditsection: Omit edit section links from 
the parser output.,
apihelp-parse-param-generatexml: Generate XML parse tree (requires 
content model code$1/code; replaced by kbd$2prop=parsetree/kbd).,
apihelp-parse-param-preview: Parse in preview mode.,
apihelp-parse-param-sectionpreview: Parse in section preview mode 
(enables preview mode too).,
-   apihelp-parse-param-disabletoc: Disable table of contents in 
output.,
+   apihelp-parse-param-disabletoc: Omit table of contents in output.,
apihelp-parse-param-contentformat: Content serialization format used 
for the input text. Only valid when used with $1text.,
apihelp-parse-param-contentmodel: Content model of the input text. 
If omitted, $1title must be specified, and default will be the model of the 
specified title. Only valid when used with $1text.,
apihelp-parse-example-page: Parse a page.,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a14fa16cc166471d66c53489e8186ec09297399
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TTO at.li...@live.com.au
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Purodha puro...@blissenbach.org
Gerrit-Reviewer: Ricordisamoa ricordisa...@openmailbox.org
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Set overflow auto on the ToC wrapper - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Set overflow auto on the ToC wrapper
..


Set overflow auto on the ToC wrapper

This is to make sure that the clippable element in OOUI treats the
wrapper as its clippable container rather than the window.

Change-Id: I06c093a7d2e0bf90f6457361ab277754f04a0dcb
---
M modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less 
b/modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less
index 88c771b..feac122 100644
--- a/modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less
+++ b/modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less
@@ -30,7 +30,7 @@
width: 100%;
max-height: 400px;
position: absolute;
-   overflow: hidden;
+   overflow-y: auto;
 
/* Workaround for flicker and 
https://code.google.com/p/chromium/issues/detail?id=343244 */
-webkit-transform: translateZ(0);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I06c093a7d2e0bf90f6457361ab277754f04a0dcb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo mor...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] DropdownInputWidget, RadioSelectInputWidget: Consistently ca... - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: DropdownInputWidget, RadioSelectInputWidget: Consistently call 
#cleanUpValue
..


DropdownInputWidget, RadioSelectInputWidget: Consistently call #cleanUpValue

By default, the primary purpose of #cleanUpValue is to cast everything
to strings.

On PHP side, we were calling #cleanUpValue when setting a value, but
not when building the list of possible values. This meant that, for
example, if all values were consistently passed in as integers, the
given 'value' would essentially be ignored.

On JS side, we weren't calling #cleanUpValue at all anywhere. This
meant that #getValue would return whatever was passed in to widget
config and not strings, contrary to documentation.

Reported by Florian when working on I47a86492.

Change-Id: I2d35669dadc355b443472c12b9e489a5accf4b43
---
M php/widgets/DropdownInputWidget.php
M php/widgets/RadioSelectInputWidget.php
M src/widgets/DropdownInputWidget.js
M src/widgets/RadioSelectInputWidget.js
4 files changed, 22 insertions(+), 12 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  Florianschmidtwelzow: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/php/widgets/DropdownInputWidget.php 
b/php/widgets/DropdownInputWidget.php
index ae541a6..1e099a2 100644
--- a/php/widgets/DropdownInputWidget.php
+++ b/php/widgets/DropdownInputWidget.php
@@ -60,11 +60,12 @@
// Rebuild the dropdown menu
$this-input-clearContent();
foreach ( $options as $opt ) {
+   $optValue = $this-cleanUpValue( $opt['data'] );
$option = new Tag( 'option' );
-   $option-setAttributes( array( 'value' = $opt['data'] 
) );
-   $option-appendContent( isset( $opt['label'] ) ? 
$opt['label'] : $opt['data'] );
+   $option-setAttributes( array( 'value' = $optValue ) );
+   $option-appendContent( isset( $opt['label'] ) ? 
$opt['label'] : $optValue );
 
-   if ( $value === $opt['data'] ) {
+   if ( $value === $optValue ) {
$isValueAvailable = true;
}
 
diff --git a/php/widgets/RadioSelectInputWidget.php 
b/php/widgets/RadioSelectInputWidget.php
index 7d9f2c8..923578d 100644
--- a/php/widgets/RadioSelectInputWidget.php
+++ b/php/widgets/RadioSelectInputWidget.php
@@ -71,19 +71,20 @@
// Need a unique name, otherwise more than one radio will be 
selectable
$name = $this-name ?: 'oo-ui-radioSelectInputWidget' . 
mt_rand();
foreach ( $options as $opt ) {
+   $optValue = $this-cleanUpValue( $opt['data'] );
$field = new FieldLayout(
new RadioInputWidget( array(
'name' = $name,
-   'value' = $opt['data'],
+   'value' = $optValue,
'disabled' = $this-isDisabled(),
) ),
array(
-   'label' = isset( $opt['label'] ) ? 
$opt['label'] : $opt['data'],
+   'label' = isset( $opt['label'] ) ? 
$opt['label'] : $optValue,
'align' = 'inline',
)
);
 
-   if ( $value === $opt['data'] ) {
+   if ( $value === $optValue ) {
$isValueAvailable = true;
}
 
diff --git a/src/widgets/DropdownInputWidget.js 
b/src/widgets/DropdownInputWidget.js
index fc6ab4b..bf08b3b 100644
--- a/src/widgets/DropdownInputWidget.js
+++ b/src/widgets/DropdownInputWidget.js
@@ -78,6 +78,7 @@
  * @inheritdoc
  */
 OO.ui.DropdownInputWidget.prototype.setValue = function ( value ) {
+   value = this.cleanUpValue( value );
this.dropdownWidget.getMenu().selectItemByData( value );
OO.ui.DropdownInputWidget.parent.prototype.setValue.call( this, value );
return this;
@@ -99,15 +100,18 @@
  * @chainable
  */
 OO.ui.DropdownInputWidget.prototype.setOptions = function ( options ) {
-   var value = this.getValue();
+   var
+   value = this.getValue(),
+   widget = this;
 
// Rebuild the dropdown menu
this.dropdownWidget.getMenu()
.clearItems()
.addItems( options.map( function ( opt ) {
+   var optValue = widget.cleanUpValue( opt.data );
return new OO.ui.MenuOptionWidget( {
-   data: opt.data,
-   label: opt.label !== undefined ? 

[MediaWiki-commits] [Gerrit] Correct placement of the scroll when we scroll to topic - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Correct placement of the scroll when we scroll to topic
..


Correct placement of the scroll when we scroll to topic

Scroll a bit above the topic so the title is not obscured by the
ToC widget.

Bug: T96890
Change-Id: I7707dccef8a9a0fa535bc9beb9c445149878e9bc
---
M modules/flow/ui/widgets/mw.flow.ui.ToCWidget.js
M modules/styles/common.less
2 files changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/modules/flow/ui/widgets/mw.flow.ui.ToCWidget.js 
b/modules/flow/ui/widgets/mw.flow.ui.ToCWidget.js
index cff79c6..9365da3 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.ToCWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.ToCWidget.js
@@ -84,7 +84,7 @@
if ( $topic.length  0 ) {
// Scroll down to the topic
$( 'html, body' ).animate( {
-   scrollTop: $topic.offset().top + 'px'
+   scrollTop: ( $topic.offset().top - 
this.$element.height() ) + 'px'
}, 'fast' );
} else {
// TODO: Widgetize board, topic and post so we can do 
this
diff --git a/modules/styles/common.less b/modules/styles/common.less
index 3fb0f30..7b105b7 100644
--- a/modules/styles/common.less
+++ b/modules/styles/common.less
@@ -52,7 +52,8 @@
 
 // Individual topic containers
 .flow-topic {
-   padding: 1.6em 0 1.4em;
+   padding: 1em 0 1.4em;
+   margin-top: 0.6em;
 }
 
 // Revision view

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7707dccef8a9a0fa535bc9beb9c445149878e9bc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo mor...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Add text-overflow: ellipsis to the ToC widget - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Add text-overflow: ellipsis to the ToC widget
..


Add text-overflow: ellipsis to the ToC widget

This is especially important when the user scrolls the page and the
ToC widget is populated with whatever topic is selected. If the topic
is too long, the widget should clip it with an ellipsis.

Change-Id: I2b70bc3193e669260221a5fb8f52545954d5e1ca
---
M modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less
1 file changed, 14 insertions(+), 0 deletions(-)

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



diff --git a/modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less 
b/modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less
index feac122..54e60f5 100644
--- a/modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less
+++ b/modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less
@@ -25,6 +25,20 @@
.flow-ui-tocWidget {
display: inline-block;
float: left;
+   width: 100%;
+
+   -button {
+   width: 100%;
+   .oo-ui-buttonElement-button {
+   width: 100%;
+   .oo-ui-labelElement-label {
+   text-overflow: ellipsis;
+   overflow: hidden;
+   // Prevent less compiler from 
precalculating this expression
+   width: ~calc(100% - 1.875em);
+   }
+   }
+   }
 
-wrapper {
width: 100%;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b70bc3193e669260221a5fb8f52545954d5e1ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo mor...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] tcpircbot: allow connections from mira - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223478

Change subject: tcpircbot: allow connections from mira
..

tcpircbot: allow connections from mira

Change-Id: I722e91a9b21f60e4c57e0d3ee1c6ac9c71ddd180
---
M manifests/role/tcpircbot.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/223478/1

diff --git a/manifests/role/tcpircbot.pp b/manifests/role/tcpircbot.pp
index ea46486..09cfc1d 100644
--- a/manifests/role/tcpircbot.pp
+++ b/manifests/role/tcpircbot.pp
@@ -19,6 +19,7 @@
 ':::10.64.0.196/128', # tin
 ':::127.0.0.1/128',   # loopback
 '2620:0:861:101:10:64:0:196/128', # tin
+'2620:0:860:102:10:192:16:132/128', # mira
 ],
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I722e91a9b21f60e4c57e0d3ee1c6ac9c71ddd180
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.11.8 - change (mediawiki/vendor)

[Catrope (Code Review)]

Catrope has submitted this change and it was merged.

Change subject: Update OOjs UI to v0.11.8
..


Update OOjs UI to v0.11.8

Release notes:
 https://git.wikimedia.org/blob/oojs%2Fui.git/v0.11.8/History.md

Change-Id: I701c504acf0d527916f1925bbf49177cc9c0d883
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/.gitignore
M oojs/oojs-ui/AUTHORS.txt
M oojs/oojs-ui/Gruntfile.js
M oojs/oojs-ui/History.md
M oojs/oojs-ui/README.md
M oojs/oojs-ui/bin/generate-JSPHP-for-karma.php
M oojs/oojs-ui/build/tasks/typos.js
M oojs/oojs-ui/composer.json
M oojs/oojs-ui/demos/demo.js
M oojs/oojs-ui/demos/index.html
M oojs/oojs-ui/demos/pages/toolbars.js
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/demos/widgets.php
M oojs/oojs-ui/i18n/fa.json
M oojs/oojs-ui/i18n/lt.json
M oojs/oojs-ui/i18n/pa.json
M oojs/oojs-ui/i18n/ps.json
M oojs/oojs-ui/i18n/ru.json
M oojs/oojs-ui/i18n/yi.json
M oojs/oojs-ui/i18n/yue.json
M oojs/oojs-ui/package.json
M oojs/oojs-ui/php/Tag.php
M oojs/oojs-ui/php/widgets/DropdownInputWidget.php
M oojs/oojs-ui/php/widgets/RadioSelectInputWidget.php
M oojs/oojs-ui/php/widgets/TextInputWidget.php
M oojs/oojs-ui/src/Element.js
M oojs/oojs-ui/src/styles/common.less
M oojs/oojs-ui/src/themes/apex/icons-editing-core.json
M oojs/oojs-ui/src/themes/apex/windows.less
M oojs/oojs-ui/src/themes/mediawiki/elements.less
M oojs/oojs-ui/src/themes/mediawiki/tools.less
M oojs/oojs-ui/src/widgets/DropdownInputWidget.js
M oojs/oojs-ui/src/widgets/RadioSelectInputWidget.js
M oojs/oojs-ui/src/widgets/TextInputWidget.js
M oojs/oojs-ui/tests/JSPHP.test.karma.js
38 files changed, 340 insertions(+), 190 deletions(-)

Approvals:
  Catrope: Verified; Looks good to me, approved



diff --git a/composer.json b/composer.json
index 28b0680..1b29488 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
mediawiki/at-ease: 1.0.0,
monolog/monolog: 1.14.0,
ruflin/elastica: 1.3.0.0,
-   oojs/oojs-ui: 0.11.7,
+   oojs/oojs-ui: 0.11.8,
wikimedia/cdb: 1.0.1,
wikimedia/ip-set: 1.0.0,
wikimedia/assert: 0.2.2,
diff --git a/composer.lock b/composer.lock
index e8264ba..b7e4831 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 This file is @generated automatically
 ],
-hash: 3ea8bfa5bc62fdc11043e06e2bf29b40,
+hash: 698d01963a7a8e0ec2d5107672b6ddb0,
 packages: [
 {
 name: cssjanus/cssjanus,
@@ -287,19 +287,20 @@
 },
 {
 name: oojs/oojs-ui,
-version: v0.11.7,
+version: v0.11.8,
 source: {
 type: git,
 url: https://github.com/wikimedia/oojs-ui.git;,
-reference: 6b0f7ec2c918db5029f697d0a3bc152991dbfc98
+reference: 0f86f7fd72cdccd2a2b18a18db13da00c91938c5
 },
 dist: {
 type: zip,
-url: 
https://api.github.com/repos/wikimedia/oojs-ui/zipball/6b0f7ec2c918db5029f697d0a3bc152991dbfc98;,
-reference: 6b0f7ec2c918db5029f697d0a3bc152991dbfc98,
+url: 
https://api.github.com/repos/wikimedia/oojs-ui/zipball/0f86f7fd72cdccd2a2b18a18db13da00c91938c5;,
+reference: 0f86f7fd72cdccd2a2b18a18db13da00c91938c5,
 shasum: 
 },
 require: {
+mediawiki/at-ease: 1.0.0,
 php: =5.3.3
 },
 require-dev: {
@@ -319,7 +320,7 @@
 ],
 description: Provides library of common widgets, layouts, and 
windows.,
 homepage: https://www.mediawiki.org/wiki/OOjs_UI;,
-time: 2015-07-01 18:19:38
+time: 2015-07-08 01:19:00
 },
 {
 name: psr/log,
diff --git a/composer/installed.json b/composer/installed.json
index f7054ea..518b015 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -674,44 +674,6 @@
 homepage: https://github.com/wikimedia/IPSet;
 },
 {
-name: oojs/oojs-ui,
-version: v0.11.7,
-version_normalized: 0.11.7.0,
-source: {
-type: git,
-url: https://github.com/wikimedia/oojs-ui.git;,
-reference: 6b0f7ec2c918db5029f697d0a3bc152991dbfc98
-},
-dist: {
-type: zip,
-url: 
https://api.github.com/repos/wikimedia/oojs-ui/zipball/6b0f7ec2c918db5029f697d0a3bc152991dbfc98;,
-reference: 6b0f7ec2c918db5029f697d0a3bc152991dbfc98,
-shasum: 
-},
-require: {
-php: =5.3.3
-},
-require-dev: {
-jakub-onderka/php-parallel-lint: 0.9,
-mediawiki/mediawiki-codesniffer: 0.3.0,
-

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.11.8 - change (mediawiki/core)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223483

Change subject: Update OOjs UI to v0.11.8
..

Update OOjs UI to v0.11.8

Release notes:
 https://git.wikimedia.org/blob/oojs%2Fui.git/v0.11.8/History.md

Change-Id: I701c504acf0d527916f1925bbf49177cc9c0d883
---
M composer.json
M resources/lib/oojs-ui/i18n/fa.json
M resources/lib/oojs-ui/i18n/lt.json
M resources/lib/oojs-ui/i18n/pa.json
M resources/lib/oojs-ui/i18n/ps.json
M resources/lib/oojs-ui/i18n/ru.json
M resources/lib/oojs-ui/i18n/yi.json
M resources/lib/oojs-ui/i18n/yue.json
M resources/lib/oojs-ui/oojs-ui-apex-noimages.css
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui.js
M resources/lib/oojs-ui/themes/apex/icons-editing-core.json
14 files changed, 161 insertions(+), 174 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/83/223483/1

diff --git a/composer.json b/composer.json
index 9595082..2570a40 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
leafo/lessphp: 0.5.0,
liuggio/statsd-php-client: 1.0.12,
mediawiki/at-ease: 1.0.0,
-   oojs/oojs-ui: 0.11.7,
+   oojs/oojs-ui: 0.11.8,
php: =5.3.3,
psr/log: 1.0.0,
wikimedia/cdb: 1.0.1,
diff --git a/resources/lib/oojs-ui/i18n/fa.json 
b/resources/lib/oojs-ui/i18n/fa.json
index 7cfcfa2..62198f4 100644
--- a/resources/lib/oojs-ui/i18n/fa.json
+++ b/resources/lib/oojs-ui/i18n/fa.json
@@ -11,7 +11,8 @@
Taha,
درفش کاویانی,
Armin1392,
-   Alirezaaa
+   Alirezaaa,
+   Leyth
]
},
ooui-outline-control-move-down: انتقال مورد به پایین,
@@ -25,5 +26,7 @@
ooui-dialog-process-error: مشکلی وجود دارد,
ooui-dialog-process-dismiss: نپذیرفتن,
ooui-dialog-process-retry: دوباره امتحان کن,
-   ooui-dialog-process-continue: ادامه
+   ooui-dialog-process-continue: ادامه,
+   ooui-selectfile-not-supported: انتخاب پرونده پشتیبانی نمی‌شود,
+   ooui-selectfile-placeholder: هیچ پرونده‌ای انتخاب نشده‌است
 }
diff --git a/resources/lib/oojs-ui/i18n/lt.json 
b/resources/lib/oojs-ui/i18n/lt.json
index ecd06a8..4334efb 100644
--- a/resources/lib/oojs-ui/i18n/lt.json
+++ b/resources/lib/oojs-ui/i18n/lt.json
@@ -3,8 +3,22 @@
authors: [
Audriusa,
Eitvys200,
-   Mantak111
+   Mantak111,
+   Albertas
]
},
-   ooui-outline-control-remove: Šalinti elementus
+   ooui-outline-control-move-down: Perkelti elementą žemyn,
+   ooui-outline-control-move-up: Perkelti elementą aukštyn,
+   ooui-outline-control-remove: Šalinti elementus,
+   ooui-toolbar-more: Daugiau,
+   ooui-toolgroup-expand: Daugiau,
+   ooui-toolgroup-collapse: Mažiau,
+   ooui-dialog-message-accept: Gerai,
+   ooui-dialog-message-reject: Atšaukti,
+   ooui-dialog-process-error: Kažkas nutiko ne taip,
+   ooui-dialog-process-dismiss: Paslėpti,
+   ooui-dialog-process-retry: Bandykite dar kartą,
+   ooui-dialog-process-continue: Tęsti,
+   ooui-selectfile-not-supported: Failų pasirinkimas nepalaikomas,
+   ooui-selectfile-placeholder: Nėra pasirinktų failų
 }
diff --git a/resources/lib/oojs-ui/i18n/pa.json 
b/resources/lib/oojs-ui/i18n/pa.json
index 8c7a1e7..0661b3f 100644
--- a/resources/lib/oojs-ui/i18n/pa.json
+++ b/resources/lib/oojs-ui/i18n/pa.json
@@ -12,7 +12,7 @@
ooui-outline-control-move-up: ਉੱਤੇ ਲੈਕੇ ਜਾਓ,
ooui-toolbar-more: ਹੋਰ,
ooui-toolgroup-expand: ਹੋਰ,
-   ooui-toolgroup-collapse: ਥੋੜੇ,
+   ooui-toolgroup-collapse: ਥੋੜ੍ਹੇ,
ooui-dialog-message-accept: ਠੀਕ ਹੈ,
ooui-dialog-message-reject: ਰੱਦ ਕਰੋ,
ooui-dialog-process-error: ਕੁਝ ਗਲਤ ਹੋ ਗਿਆ,
diff --git a/resources/lib/oojs-ui/i18n/ps.json 
b/resources/lib/oojs-ui/i18n/ps.json
index ebffe53..c371bbc 100644
--- a/resources/lib/oojs-ui/i18n/ps.json
+++ b/resources/lib/oojs-ui/i18n/ps.json
@@ -14,5 +14,8 @@
ooui-dialog-message-reject: ناگارل,
ooui-dialog-process-error: يوه ستونزه رامنځ ته شوه,
ooui-dialog-process-dismiss: تړل,
-   ooui-dialog-process-retry: بيا هڅه
+   ooui-dialog-process-retry: بيا هڅه,
+   ooui-dialog-process-continue: پرله پورې,
+   ooui-selectfile-not-supported: د دوتنې د ټاکنې ملاتړ نه دی شوی,
+   ooui-selectfile-placeholder: کومه دوتنه نه ده ټاکل شوې
 }
diff --git a/resources/lib/oojs-ui/i18n/ru.json 
b/resources/lib/oojs-ui/i18n/ru.json
index 129dd6a..f5674b3 100644
--- a/resources/lib/oojs-ui/i18n/ru.json

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.11.8 - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Update OOjs UI to v0.11.8
..


Update OOjs UI to v0.11.8

Release notes:
 https://git.wikimedia.org/blob/oojs%2Fui.git/v0.11.8/History.md

Change-Id: I701c504acf0d527916f1925bbf49177cc9c0d883
---
M composer.json
M resources/lib/oojs-ui/i18n/fa.json
M resources/lib/oojs-ui/i18n/lt.json
M resources/lib/oojs-ui/i18n/pa.json
M resources/lib/oojs-ui/i18n/ps.json
M resources/lib/oojs-ui/i18n/ru.json
M resources/lib/oojs-ui/i18n/yi.json
M resources/lib/oojs-ui/i18n/yue.json
M resources/lib/oojs-ui/oojs-ui-apex-noimages.css
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui.js
M resources/lib/oojs-ui/themes/apex/icons-editing-core.json
14 files changed, 161 insertions(+), 174 deletions(-)

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



diff --git a/composer.json b/composer.json
index 9595082..2570a40 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
leafo/lessphp: 0.5.0,
liuggio/statsd-php-client: 1.0.12,
mediawiki/at-ease: 1.0.0,
-   oojs/oojs-ui: 0.11.7,
+   oojs/oojs-ui: 0.11.8,
php: =5.3.3,
psr/log: 1.0.0,
wikimedia/cdb: 1.0.1,
diff --git a/resources/lib/oojs-ui/i18n/fa.json 
b/resources/lib/oojs-ui/i18n/fa.json
index 7cfcfa2..62198f4 100644
--- a/resources/lib/oojs-ui/i18n/fa.json
+++ b/resources/lib/oojs-ui/i18n/fa.json
@@ -11,7 +11,8 @@
Taha,
درفش کاویانی,
Armin1392,
-   Alirezaaa
+   Alirezaaa,
+   Leyth
]
},
ooui-outline-control-move-down: انتقال مورد به پایین,
@@ -25,5 +26,7 @@
ooui-dialog-process-error: مشکلی وجود دارد,
ooui-dialog-process-dismiss: نپذیرفتن,
ooui-dialog-process-retry: دوباره امتحان کن,
-   ooui-dialog-process-continue: ادامه
+   ooui-dialog-process-continue: ادامه,
+   ooui-selectfile-not-supported: انتخاب پرونده پشتیبانی نمی‌شود,
+   ooui-selectfile-placeholder: هیچ پرونده‌ای انتخاب نشده‌است
 }
diff --git a/resources/lib/oojs-ui/i18n/lt.json 
b/resources/lib/oojs-ui/i18n/lt.json
index ecd06a8..4334efb 100644
--- a/resources/lib/oojs-ui/i18n/lt.json
+++ b/resources/lib/oojs-ui/i18n/lt.json
@@ -3,8 +3,22 @@
authors: [
Audriusa,
Eitvys200,
-   Mantak111
+   Mantak111,
+   Albertas
]
},
-   ooui-outline-control-remove: Šalinti elementus
+   ooui-outline-control-move-down: Perkelti elementą žemyn,
+   ooui-outline-control-move-up: Perkelti elementą aukštyn,
+   ooui-outline-control-remove: Šalinti elementus,
+   ooui-toolbar-more: Daugiau,
+   ooui-toolgroup-expand: Daugiau,
+   ooui-toolgroup-collapse: Mažiau,
+   ooui-dialog-message-accept: Gerai,
+   ooui-dialog-message-reject: Atšaukti,
+   ooui-dialog-process-error: Kažkas nutiko ne taip,
+   ooui-dialog-process-dismiss: Paslėpti,
+   ooui-dialog-process-retry: Bandykite dar kartą,
+   ooui-dialog-process-continue: Tęsti,
+   ooui-selectfile-not-supported: Failų pasirinkimas nepalaikomas,
+   ooui-selectfile-placeholder: Nėra pasirinktų failų
 }
diff --git a/resources/lib/oojs-ui/i18n/pa.json 
b/resources/lib/oojs-ui/i18n/pa.json
index 8c7a1e7..0661b3f 100644
--- a/resources/lib/oojs-ui/i18n/pa.json
+++ b/resources/lib/oojs-ui/i18n/pa.json
@@ -12,7 +12,7 @@
ooui-outline-control-move-up: ਉੱਤੇ ਲੈਕੇ ਜਾਓ,
ooui-toolbar-more: ਹੋਰ,
ooui-toolgroup-expand: ਹੋਰ,
-   ooui-toolgroup-collapse: ਥੋੜੇ,
+   ooui-toolgroup-collapse: ਥੋੜ੍ਹੇ,
ooui-dialog-message-accept: ਠੀਕ ਹੈ,
ooui-dialog-message-reject: ਰੱਦ ਕਰੋ,
ooui-dialog-process-error: ਕੁਝ ਗਲਤ ਹੋ ਗਿਆ,
diff --git a/resources/lib/oojs-ui/i18n/ps.json 
b/resources/lib/oojs-ui/i18n/ps.json
index ebffe53..c371bbc 100644
--- a/resources/lib/oojs-ui/i18n/ps.json
+++ b/resources/lib/oojs-ui/i18n/ps.json
@@ -14,5 +14,8 @@
ooui-dialog-message-reject: ناگارل,
ooui-dialog-process-error: يوه ستونزه رامنځ ته شوه,
ooui-dialog-process-dismiss: تړل,
-   ooui-dialog-process-retry: بيا هڅه
+   ooui-dialog-process-retry: بيا هڅه,
+   ooui-dialog-process-continue: پرله پورې,
+   ooui-selectfile-not-supported: د دوتنې د ټاکنې ملاتړ نه دی شوی,
+   ooui-selectfile-placeholder: کومه دوتنه نه ده ټاکل شوې
 }
diff --git a/resources/lib/oojs-ui/i18n/ru.json 
b/resources/lib/oojs-ui/i18n/ru.json
index 129dd6a..f5674b3 100644
--- a/resources/lib/oojs-ui/i18n/ru.json
+++ b/resources/lib/oojs-ui/i18n/ru.json
@@ 

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.11.8 - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Update OOjs UI to v0.11.8
..


Update OOjs UI to v0.11.8

Release notes:
 https://git.wikimedia.org/blob/oojs%2Fui.git/v0.11.8/History.md

Change-Id: I701c504acf0d527916f1925bbf49177cc9c0d883
---
M lib/oojs-ui/i18n/fa.json
M lib/oojs-ui/i18n/lt.json
M lib/oojs-ui/i18n/pa.json
M lib/oojs-ui/i18n/ps.json
M lib/oojs-ui/i18n/ru.json
M lib/oojs-ui/i18n/yi.json
M lib/oojs-ui/i18n/yue.json
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-noimages.css
M lib/oojs-ui/oojs-ui-apex-noimages.raster.css
M lib/oojs-ui/oojs-ui-apex-noimages.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-noimages.rtl.css
M lib/oojs-ui/oojs-ui-apex-noimages.vector.css
M lib/oojs-ui/oojs-ui-apex-noimages.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.raster.css
M lib/oojs-ui/oojs-ui-apex.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-apex.vector.css
M lib/oojs-ui/oojs-ui-apex.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.raster.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.raster.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.vector.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.raster.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.raster.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.vector.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.raster.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.raster.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.vector.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.raster.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.raster.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.vector.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.raster.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.raster.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.vector.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css
M 

[MediaWiki-commits] [Gerrit] misc-web varnish: switch annualreport to bromine - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: misc-web varnish: switch annualreport to bromine
..


misc-web varnish: switch annualreport to bromine

Bug:T104936
Change-Id: I421c9f8fbbbf12309a0118df860dd8d9d07addcb
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  John F. Lewis: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/templates/varnish/misc.inc.vcl.erb 
b/templates/varnish/misc.inc.vcl.erb
index c7340e6..2aee6b5 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -20,7 +20,7 @@
set req.backend = logstash;
} elsif (req.http.Host == releases.wikimedia.org) {
set req.backend = caesium;
-   } elsif (req.http.Host == scholarships.wikimedia.org || req.http.Host 
== transparency.wikimedia.org || req.http.Host == grafana.wikimedia.org || 
req.http.Host == iegreview.wikimedia.org || req.http.Host == 
annual.wikimedia.org || req.http.Host == policy.wikimedia.org) {
+   } elsif (req.http.Host == scholarships.wikimedia.org || req.http.Host 
== transparency.wikimedia.org || req.http.Host == grafana.wikimedia.org || 
req.http.Host == iegreview.wikimedia.org || req.http.Host == 
policy.wikimedia.org) {
set req.backend = zirconium;
} elsif (req.http.Host == parsoid-tests.wikimedia.org) {
set req.backend = ruthenium;
@@ -28,7 +28,7 @@
set req.backend = californium;
} elsif (req.http.Host == phabricator.wikimedia.org || req.http.Host 
== phab.wmfusercontent.org || req.http.Host == bugzilla.wikimedia.org || 
req.http.Host == bugs.wikimedia.org) {
set req.backend = iridium;
-   } elsif (req.http.Host == static-bugzilla.wikimedia.org) {
+   } elsif (req.http.Host == static-bugzilla.wikimedia.org || 
req.http.Host == annual.wikimedia.org) {
set req.backend = bromine;
return (pass);
} elsif (req.http.Host == servermon.wikimedia.org) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I421c9f8fbbbf12309a0118df860dd8d9d07addcb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: John F. Lewis johnflewi...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] annualreport: remove role from zirconium - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: annualreport: remove role from zirconium
..


annualreport: remove role from zirconium

Bug:T104936
Change-Id: I12fd4f064be3cc9b9358ad70eb5de05150b89da0
---
M manifests/site.pp
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 3c6f452..dce935a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2391,7 +2391,6 @@
 include role::transparency
 include role::grafana
 include role::iegreview
-include role::annualreport
 include role::policysite
 
 interface::add_ip6_mapped { 'main':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I12fd4f064be3cc9b9358ad70eb5de05150b89da0
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fix thumb rewrite rules - change (mediawiki/vagrant)

[Code Review]

Gergő Tisza has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223477

Change subject: Fix thumb rewrite rules
..

Fix thumb rewrite rules

Since 2.3, Apache might or might not resolve REQUEST_FILENAME to an actual
filesystem path (as opposed to an URI), depending on the context.
Putting the rewrite rules in a Location block ensures that the resolution
does happen.

Bug: T56202
Change-Id: Ia89058f2abdd925a1c6145108d21e1cb02faf989
---
M puppet/modules/role/templates/thumb_on_404/apache2.conf.erb
1 file changed, 11 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/77/223477/1

diff --git a/puppet/modules/role/templates/thumb_on_404/apache2.conf.erb 
b/puppet/modules/role/templates/thumb_on_404/apache2.conf.erb
index 5989d90..b34b4ed 100644
--- a/puppet/modules/role/templates/thumb_on_404/apache2.conf.erb
+++ b/puppet/modules/role/templates/thumb_on_404/apache2.conf.erb
@@ -1,13 +1,15 @@
 RewriteEngine On
 
-# call thumb.php for thumb images not on disk
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^%= @images_path 
%/thumb/[0-9a-f]/[0-9a-f][0-9a-f]/([^/]+)/[^/]*([0-9]+)px-.*$ 
/w/thumb_handler.php [PT,QSA,B]
+# needs to be in a location block otherwise apache would not apply aliases 
before testing the RewriteCond
+Location %= @images_path %
+  # call thumb.php for thumb images not on disk
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule ^%= @images_path 
%/thumb/[0-9a-f]/[0-9a-f][0-9a-f]/([^/]+)/[^/]*([0-9]+)px-.*$ 
/w/thumb_handler.php [PT,QSA,B]
 
-
-# call thumb.php for thumb archive images not on disk
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^%= @images_path 
%/thumb/archive/[0-9a-f]/[0-9a-f][0-9a-f]/([^/]+)/[^/]*([0-9]+)px-.*$ 
/w/thumb_handler.php [PT,QSA,B]
+  # call thumb.php for thumb archive images not on disk
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule ^%= @images_path 
%/thumb/archive/[0-9a-f]/[0-9a-f][0-9a-f]/([^/]+)/[^/]*([0-9]+)px-.*$ 
/w/thumb_handler.php [PT,QSA,B]
+/Location
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia89058f2abdd925a1c6145108d21e1cb02faf989
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] icinga: fix ferm rules on neon - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: icinga: fix ferm rules on neon
..


icinga: fix ferm rules on neon

In I667a95ec7e5d79ebd2 the ESAMS public network was renamed, leading
to this when trying to apply an unrelated change:

 * Stopping Firewall ferm   
 Error in /etc/ferm/conf.d/10_ncsa_allowed line 8:  

no such variable: $ESAMS_PUBLIC_PUBLIC_SERVICES

Change-Id: I6670906c18ac56d939f94681e84e48649efd163f
---
M modules/icinga/manifests/nsca/firewall.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/icinga/manifests/nsca/firewall.pp 
b/modules/icinga/manifests/nsca/firewall.pp
index bf56762..cd792f2 100644
--- a/modules/icinga/manifests/nsca/firewall.pp
+++ b/modules/icinga/manifests/nsca/firewall.pp
@@ -4,6 +4,6 @@
 class icinga::nsca::firewall {
 # NSCA on port 5667
 ferm::rule { 'ncsa_allowed':
-rule = 'saddr (127.0.0.1 $EQIAD_PRIVATE_ANALYTICS1_A_EQIAD 
$EQIAD_PRIVATE_ANALYTICS1_B_EQIAD $EQIAD_PRIVATE_ANALYTICS1_C_EQIAD 
$EQIAD_PRIVATE_ANALYTICS1_D_EQIAD $EQIAD_PRIVATE_LABS_HOSTS1_A_EQIAD 
$EQIAD_PRIVATE_LABS_HOSTS1_B_EQIAD $EQIAD_PRIVATE_LABS_HOSTS1_D_EQIAD 
$EQIAD_PRIVATE_LABS_SUPPORT1_C_EQIAD $EQIAD_PRIVATE_PRIVATE1_A_EQIAD 
$EQIAD_PRIVATE_PRIVATE1_B_EQIAD $EQIAD_PRIVATE_PRIVATE1_C_EQIAD 
$EQIAD_PRIVATE_PRIVATE1_D_EQIAD $EQIAD_PUBLIC_PUBLIC1_A_EQIAD 
$EQIAD_PUBLIC_PUBLIC1_B_EQIAD $EQIAD_PUBLIC_PUBLIC1_C_EQIAD 
$EQIAD_PUBLIC_PUBLIC1_D_EQIAD $ESAMS_PRIVATE_PRIVATE1_ESAMS 
$ESAMS_PUBLIC_PUBLIC_SERVICES $ULSFO_PRIVATE_PRIVATE1_ULSFO 
$ULSFO_PUBLIC_PUBLIC1_ULSFO 208.80.155.0/27 10.64.40.0/24) proto tcp dport 5667 
ACCEPT;'
+rule = 'saddr (127.0.0.1 $EQIAD_PRIVATE_ANALYTICS1_A_EQIAD 
$EQIAD_PRIVATE_ANALYTICS1_B_EQIAD $EQIAD_PRIVATE_ANALYTICS1_C_EQIAD 
$EQIAD_PRIVATE_ANALYTICS1_D_EQIAD $EQIAD_PRIVATE_LABS_HOSTS1_A_EQIAD 
$EQIAD_PRIVATE_LABS_HOSTS1_B_EQIAD $EQIAD_PRIVATE_LABS_HOSTS1_D_EQIAD 
$EQIAD_PRIVATE_LABS_SUPPORT1_C_EQIAD $EQIAD_PRIVATE_PRIVATE1_A_EQIAD 
$EQIAD_PRIVATE_PRIVATE1_B_EQIAD $EQIAD_PRIVATE_PRIVATE1_C_EQIAD 
$EQIAD_PRIVATE_PRIVATE1_D_EQIAD $EQIAD_PUBLIC_PUBLIC1_A_EQIAD 
$EQIAD_PUBLIC_PUBLIC1_B_EQIAD $EQIAD_PUBLIC_PUBLIC1_C_EQIAD 
$EQIAD_PUBLIC_PUBLIC1_D_EQIAD $ESAMS_PRIVATE_PRIVATE1_ESAMS 
$ESAMS_PUBLIC_PUBLIC1_ESAMS $ULSFO_PRIVATE_PRIVATE1_ULSFO 
$ULSFO_PUBLIC_PUBLIC1_ULSFO 208.80.155.0/27 10.64.40.0/24) proto tcp dport 5667 
ACCEPT;'
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6670906c18ac56d939f94681e84e48649efd163f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.11.8 - change (mediawiki/vendor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223482

Change subject: Update OOjs UI to v0.11.8
..

Update OOjs UI to v0.11.8

Release notes:
 https://git.wikimedia.org/blob/oojs%2Fui.git/v0.11.8/History.md

Change-Id: I701c504acf0d527916f1925bbf49177cc9c0d883
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/.gitignore
M oojs/oojs-ui/AUTHORS.txt
M oojs/oojs-ui/Gruntfile.js
M oojs/oojs-ui/History.md
M oojs/oojs-ui/README.md
M oojs/oojs-ui/bin/generate-JSPHP-for-karma.php
M oojs/oojs-ui/build/tasks/typos.js
M oojs/oojs-ui/composer.json
M oojs/oojs-ui/demos/demo.js
M oojs/oojs-ui/demos/index.html
M oojs/oojs-ui/demos/pages/toolbars.js
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/demos/widgets.php
M oojs/oojs-ui/i18n/fa.json
M oojs/oojs-ui/i18n/lt.json
M oojs/oojs-ui/i18n/pa.json
M oojs/oojs-ui/i18n/ps.json
M oojs/oojs-ui/i18n/ru.json
M oojs/oojs-ui/i18n/yi.json
M oojs/oojs-ui/i18n/yue.json
M oojs/oojs-ui/package.json
M oojs/oojs-ui/php/Tag.php
M oojs/oojs-ui/php/widgets/DropdownInputWidget.php
M oojs/oojs-ui/php/widgets/RadioSelectInputWidget.php
M oojs/oojs-ui/php/widgets/TextInputWidget.php
M oojs/oojs-ui/src/Element.js
M oojs/oojs-ui/src/styles/common.less
M oojs/oojs-ui/src/themes/apex/icons-editing-core.json
M oojs/oojs-ui/src/themes/apex/windows.less
M oojs/oojs-ui/src/themes/mediawiki/elements.less
M oojs/oojs-ui/src/themes/mediawiki/tools.less
M oojs/oojs-ui/src/widgets/DropdownInputWidget.js
M oojs/oojs-ui/src/widgets/RadioSelectInputWidget.js
M oojs/oojs-ui/src/widgets/TextInputWidget.js
M oojs/oojs-ui/tests/JSPHP.test.karma.js
38 files changed, 340 insertions(+), 190 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/82/223482/1

diff --git a/composer.json b/composer.json
index 28b0680..1b29488 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
mediawiki/at-ease: 1.0.0,
monolog/monolog: 1.14.0,
ruflin/elastica: 1.3.0.0,
-   oojs/oojs-ui: 0.11.7,
+   oojs/oojs-ui: 0.11.8,
wikimedia/cdb: 1.0.1,
wikimedia/ip-set: 1.0.0,
wikimedia/assert: 0.2.2,
diff --git a/composer.lock b/composer.lock
index e8264ba..b7e4831 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 This file is @generated automatically
 ],
-hash: 3ea8bfa5bc62fdc11043e06e2bf29b40,
+hash: 698d01963a7a8e0ec2d5107672b6ddb0,
 packages: [
 {
 name: cssjanus/cssjanus,
@@ -287,19 +287,20 @@
 },
 {
 name: oojs/oojs-ui,
-version: v0.11.7,
+version: v0.11.8,
 source: {
 type: git,
 url: https://github.com/wikimedia/oojs-ui.git;,
-reference: 6b0f7ec2c918db5029f697d0a3bc152991dbfc98
+reference: 0f86f7fd72cdccd2a2b18a18db13da00c91938c5
 },
 dist: {
 type: zip,
-url: 
https://api.github.com/repos/wikimedia/oojs-ui/zipball/6b0f7ec2c918db5029f697d0a3bc152991dbfc98;,
-reference: 6b0f7ec2c918db5029f697d0a3bc152991dbfc98,
+url: 
https://api.github.com/repos/wikimedia/oojs-ui/zipball/0f86f7fd72cdccd2a2b18a18db13da00c91938c5;,
+reference: 0f86f7fd72cdccd2a2b18a18db13da00c91938c5,
 shasum: 
 },
 require: {
+mediawiki/at-ease: 1.0.0,
 php: =5.3.3
 },
 require-dev: {
@@ -319,7 +320,7 @@
 ],
 description: Provides library of common widgets, layouts, and 
windows.,
 homepage: https://www.mediawiki.org/wiki/OOjs_UI;,
-time: 2015-07-01 18:19:38
+time: 2015-07-08 01:19:00
 },
 {
 name: psr/log,
diff --git a/composer/installed.json b/composer/installed.json
index f7054ea..518b015 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -674,44 +674,6 @@
 homepage: https://github.com/wikimedia/IPSet;
 },
 {
-name: oojs/oojs-ui,
-version: v0.11.7,
-version_normalized: 0.11.7.0,
-source: {
-type: git,
-url: https://github.com/wikimedia/oojs-ui.git;,
-reference: 6b0f7ec2c918db5029f697d0a3bc152991dbfc98
-},
-dist: {
-type: zip,
-url: 
https://api.github.com/repos/wikimedia/oojs-ui/zipball/6b0f7ec2c918db5029f697d0a3bc152991dbfc98;,
-reference: 6b0f7ec2c918db5029f697d0a3bc152991dbfc98,
-shasum: 
-},
-require: {
-php: =5.3.3
-},
-require-dev: {
-jakub-onderka/php-parallel-lint: 0.9,
-  

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.11.8 - change (VisualEditor/VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223481

Change subject: Update OOjs UI to v0.11.8
..

Update OOjs UI to v0.11.8

Release notes:
 https://git.wikimedia.org/blob/oojs%2Fui.git/v0.11.8/History.md

Change-Id: I701c504acf0d527916f1925bbf49177cc9c0d883
---
M lib/oojs-ui/i18n/fa.json
M lib/oojs-ui/i18n/lt.json
M lib/oojs-ui/i18n/pa.json
M lib/oojs-ui/i18n/ps.json
M lib/oojs-ui/i18n/ru.json
M lib/oojs-ui/i18n/yi.json
M lib/oojs-ui/i18n/yue.json
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-noimages.css
M lib/oojs-ui/oojs-ui-apex-noimages.raster.css
M lib/oojs-ui/oojs-ui-apex-noimages.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-noimages.rtl.css
M lib/oojs-ui/oojs-ui-apex-noimages.vector.css
M lib/oojs-ui/oojs-ui-apex-noimages.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.raster.css
M lib/oojs-ui/oojs-ui-apex.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-apex.vector.css
M lib/oojs-ui/oojs-ui-apex.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.raster.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.raster.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.vector.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.raster.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.raster.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.vector.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.raster.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.raster.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.vector.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.raster.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.raster.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.vector.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.raster.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.raster.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.vector.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.vector.rtl.css
M 

[MediaWiki-commits] [Gerrit] tcpircbot: allow v4 connections from mira - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: tcpircbot: allow v4 connections from mira
..


tcpircbot: allow v4 connections from mira

follow-up to I722e91a9b21f60e4c57e

also allow the v4 address

Change-Id: I9a1ccd5643804ea9f84fd7aee44f56d864a4ce71
---
M manifests/role/tcpircbot.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/manifests/role/tcpircbot.pp b/manifests/role/tcpircbot.pp
index 09cfc1d..60d6fb6 100644
--- a/manifests/role/tcpircbot.pp
+++ b/manifests/role/tcpircbot.pp
@@ -17,6 +17,7 @@
 cidr = [
 ':::10.64.32.167/128',# eventlog1001
 ':::10.64.0.196/128', # tin
+':::10.192.16.132/128',   # mira
 ':::127.0.0.1/128',   # loopback
 '2620:0:861:101:10:64:0:196/128', # tin
 '2620:0:860:102:10:192:16:132/128', # mira

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a1ccd5643804ea9f84fd7aee44f56d864a4ce71
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update VE core submodule to master (479d962) - change (mediawiki...VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223485

Change subject: Update VE core submodule to master (479d962)
..

Update VE core submodule to master (479d962)

New changes:
dc27315 ve.SelectionState: DOM selection snapshot
6cd7d91 Emit context change when any annotations change, not just covered.
d2c98d5 demos: Default to 'simple.html' instead of 'aliens.html'
3685d17 Emit change when selection changes from collapsed to not

Change-Id: I8a1032263f84fc2bf3aa1495229ffab8f50589d6
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/85/223485/1

diff --git a/lib/ve b/lib/ve
index e628ef0..479d962 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit e628ef02e4c25d06c51561f81dfaa7bf7d11f561
+Subproject commit 479d9627d889080a099d3c194fea3b27258378c8

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a1032263f84fc2bf3aa1495229ffab8f50589d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] tcpircbot: allow v4 connections from mira - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223484

Change subject: tcpircbot: allow v4 connections from mira
..

tcpircbot: allow v4 connections from mira

follow-up to I722e91a9b21f60e4c57e

also allow the v4 address

Change-Id: I9a1ccd5643804ea9f84fd7aee44f56d864a4ce71
---
M manifests/role/tcpircbot.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/223484/1

diff --git a/manifests/role/tcpircbot.pp b/manifests/role/tcpircbot.pp
index 09cfc1d..60d6fb6 100644
--- a/manifests/role/tcpircbot.pp
+++ b/manifests/role/tcpircbot.pp
@@ -17,6 +17,7 @@
 cidr = [
 ':::10.64.32.167/128',# eventlog1001
 ':::10.64.0.196/128', # tin
+':::10.192.16.132/128',   # mira
 ':::127.0.0.1/128',   # loopback
 '2620:0:861:101:10:64:0:196/128', # tin
 '2620:0:860:102:10:192:16:132/128', # mira

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a1ccd5643804ea9f84fd7aee44f56d864a4ce71
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add text-overflow: ellipsis to the ToC widget - change (mediawiki...Flow)

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223475

Change subject: Add text-overflow: ellipsis to the ToC widget
..

Add text-overflow: ellipsis to the ToC widget

This is especially important when the user scrolls the page and the
ToC widget is populated with whatever topic is selected. If the topic
is too long, the widget should clip it with an ellipsis.

Change-Id: I2b70bc3193e669260221a5fb8f52545954d5e1ca
---
M modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less
1 file changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/75/223475/1

diff --git a/modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less 
b/modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less
index feac122..54e60f5 100644
--- a/modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less
+++ b/modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less
@@ -25,6 +25,20 @@
.flow-ui-tocWidget {
display: inline-block;
float: left;
+   width: 100%;
+
+   -button {
+   width: 100%;
+   .oo-ui-buttonElement-button {
+   width: 100%;
+   .oo-ui-labelElement-label {
+   text-overflow: ellipsis;
+   overflow: hidden;
+   // Prevent less compiler from 
precalculating this expression
+   width: ~calc(100% - 1.875em);
+   }
+   }
+   }
 
-wrapper {
width: 100%;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b70bc3193e669260221a5fb8f52545954d5e1ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo mor...@gmail.com

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

[MediaWiki-commits] [Gerrit] build: Only build test files ('build-tests' task) when going... - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: build: Only build test files ('build-tests' task) when going to 
run tests
..


build: Only build test files ('build-tests' task) when going to run tests

`grunt build` shouldn't be creating these, especially since these
tasks have some monstrous dependencies (Ruby, PHP, Composer and the
kitchen sink). We shouldn't require potential contributors to set up
them all to, say, submit some CSS changes.

Also rename 'pre-test' to 'enable-source-maps' since that's what it
does, and move it from 'test' to 'git-build' dependencies.

Change-Id: I1a0a4f45dff5708f42c5d74ba7b31dc96b1ecf8b
---
M Gruntfile.js
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
index 324a714..1e62f8c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -375,7 +375,7 @@
}
} );
 
-   grunt.registerTask( 'pre-test', function () {
+   grunt.registerTask( 'enable-source-maps', function () {
// Only create Source maps when doing a git-build for testing 
and local
// development. Distributions for export should not, as the map 
would
// be pointing at ../src.
@@ -407,10 +407,10 @@
grunt.registerTask( 'build-tests', [ 'exec:rubyTestSuiteGenerator', 
'exec:phpGenerateJSPHPForKarma' ] );
grunt.registerTask( 'build', [
'clean:build', 'fileExists', 'typos', 'build-code', 
'build-styling', 'build-i18n',
-   'build-tests', 'clean:tmp', 'demos'
+   'clean:tmp', 'demos'
] );
 
-   grunt.registerTask( 'git-build', [ 'pre-git-build', 'build' ] );
+   grunt.registerTask( 'git-build', [ 'enable-source-maps', 
'pre-git-build', 'build' ] );
 
// Quickly build a no-frills vector-only ltr-only version for 
development
grunt.registerTask( 'quick-build', [
@@ -422,7 +422,7 @@
] );
 
grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'csslint', 'jsonlint', 
'banana' ] );
-   grunt.registerTask( 'test', [ 'lint', 'pre-test', 'git-build', 
'karma:main', 'karma:other' ] );
+   grunt.registerTask( 'test', [ 'lint', 'git-build', 'build-tests', 
'karma:main', 'karma:other' ] );
grunt.registerTask( 'demos', [ 'copy:demos', 'exec:demos' ] );
 
grunt.registerTask( 'default', 'test' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1a0a4f45dff5708f42c5d74ba7b31dc96b1ecf8b
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] icinga: fix ferm rules on neon - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223476

Change subject: icinga: fix ferm rules on neon
..

icinga: fix ferm rules on neon

In I667a95ec7e5d79ebd2 the ESAMS public network was renamed, leading
to this when trying to apply an unrelated change:

 * Stopping Firewall ferm   
   Error in 
/etc/ferm/conf.d/10_ncsa_allowed line 8:

no such variable: $ESAMS_PUBLIC_PUBLIC_SERVICES

Change-Id: I6670906c18ac56d939f94681e84e48649efd163f
---
M modules/icinga/manifests/nsca/firewall.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/223476/1

diff --git a/modules/icinga/manifests/nsca/firewall.pp 
b/modules/icinga/manifests/nsca/firewall.pp
index bf56762..cd792f2 100644
--- a/modules/icinga/manifests/nsca/firewall.pp
+++ b/modules/icinga/manifests/nsca/firewall.pp
@@ -4,6 +4,6 @@
 class icinga::nsca::firewall {
 # NSCA on port 5667
 ferm::rule { 'ncsa_allowed':
-rule = 'saddr (127.0.0.1 $EQIAD_PRIVATE_ANALYTICS1_A_EQIAD 
$EQIAD_PRIVATE_ANALYTICS1_B_EQIAD $EQIAD_PRIVATE_ANALYTICS1_C_EQIAD 
$EQIAD_PRIVATE_ANALYTICS1_D_EQIAD $EQIAD_PRIVATE_LABS_HOSTS1_A_EQIAD 
$EQIAD_PRIVATE_LABS_HOSTS1_B_EQIAD $EQIAD_PRIVATE_LABS_HOSTS1_D_EQIAD 
$EQIAD_PRIVATE_LABS_SUPPORT1_C_EQIAD $EQIAD_PRIVATE_PRIVATE1_A_EQIAD 
$EQIAD_PRIVATE_PRIVATE1_B_EQIAD $EQIAD_PRIVATE_PRIVATE1_C_EQIAD 
$EQIAD_PRIVATE_PRIVATE1_D_EQIAD $EQIAD_PUBLIC_PUBLIC1_A_EQIAD 
$EQIAD_PUBLIC_PUBLIC1_B_EQIAD $EQIAD_PUBLIC_PUBLIC1_C_EQIAD 
$EQIAD_PUBLIC_PUBLIC1_D_EQIAD $ESAMS_PRIVATE_PRIVATE1_ESAMS 
$ESAMS_PUBLIC_PUBLIC_SERVICES $ULSFO_PRIVATE_PRIVATE1_ULSFO 
$ULSFO_PUBLIC_PUBLIC1_ULSFO 208.80.155.0/27 10.64.40.0/24) proto tcp dport 5667 
ACCEPT;'
+rule = 'saddr (127.0.0.1 $EQIAD_PRIVATE_ANALYTICS1_A_EQIAD 
$EQIAD_PRIVATE_ANALYTICS1_B_EQIAD $EQIAD_PRIVATE_ANALYTICS1_C_EQIAD 
$EQIAD_PRIVATE_ANALYTICS1_D_EQIAD $EQIAD_PRIVATE_LABS_HOSTS1_A_EQIAD 
$EQIAD_PRIVATE_LABS_HOSTS1_B_EQIAD $EQIAD_PRIVATE_LABS_HOSTS1_D_EQIAD 
$EQIAD_PRIVATE_LABS_SUPPORT1_C_EQIAD $EQIAD_PRIVATE_PRIVATE1_A_EQIAD 
$EQIAD_PRIVATE_PRIVATE1_B_EQIAD $EQIAD_PRIVATE_PRIVATE1_C_EQIAD 
$EQIAD_PRIVATE_PRIVATE1_D_EQIAD $EQIAD_PUBLIC_PUBLIC1_A_EQIAD 
$EQIAD_PUBLIC_PUBLIC1_B_EQIAD $EQIAD_PUBLIC_PUBLIC1_C_EQIAD 
$EQIAD_PUBLIC_PUBLIC1_D_EQIAD $ESAMS_PRIVATE_PRIVATE1_ESAMS 
$ESAMS_PUBLIC_PUBLIC1_ESAMS $ULSFO_PRIVATE_PRIVATE1_ULSFO 
$ULSFO_PUBLIC_PUBLIC1_ULSFO 208.80.155.0/27 10.64.40.0/24) proto tcp dport 5667 
ACCEPT;'
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6670906c18ac56d939f94681e84e48649efd163f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Use 404 handler for all wikis when the role is enabled - change (mediawiki/vagrant)

[Code Review]

Gergő Tisza has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223480

Change subject: Use 404 handler for all wikis when the role is enabled
..

Use 404 handler for all wikis when the role is enabled

Bug: T56202
Change-Id: I568b8f23892e5833ee3c4e1abfc18496bbe0f726
---
M puppet/modules/role/manifests/thumb_on_404.pp
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/80/223480/1

diff --git a/puppet/modules/role/manifests/thumb_on_404.pp 
b/puppet/modules/role/manifests/thumb_on_404.pp
index 07f9407..d2df9ea 100644
--- a/puppet/modules/role/manifests/thumb_on_404.pp
+++ b/puppet/modules/role/manifests/thumb_on_404.pp
@@ -17,8 +17,7 @@
 }
 
 $images_path = '/images'
-apache::site_conf { 'thumb.php on 404':
-site= $::mediawiki::wiki_name,
+apache::site { 'thumb.php on 404':
 content = template('role/thumb_on_404/apache2.conf.erb'),
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I568b8f23892e5833ee3c4e1abfc18496bbe0f726
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] HTMLTextAreaField: Honor 'rows' setting in OOUI format - change (mediawiki/core)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223479

Change subject: HTMLTextAreaField: Honor 'rows' setting in OOUI format
..

HTMLTextAreaField: Honor 'rows' setting in OOUI format

And throw an exception if 'cols' is set, since it won't work.

Requires eed0f5294b0080 in OOUI.

Bug: T104682
Change-Id: I8e09402a01cecac8a90497d31b3b1ca15ff2d949
---
M includes/htmlform/HTMLTextAreaField.php
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/79/223479/1

diff --git a/includes/htmlform/HTMLTextAreaField.php 
b/includes/htmlform/HTMLTextAreaField.php
index e4f78b2..aeb4b7c 100644
--- a/includes/htmlform/HTMLTextAreaField.php
+++ b/includes/htmlform/HTMLTextAreaField.php
@@ -47,6 +47,10 @@
}
 
function getInputOOUI( $value ) {
+   if ( isset( $this-mParams['cols'] ) ) {
+   throw new Exception( OOUIHTMLForm does not support the 
'cols' parameter for textareas );
+   }
+
$attribs = $this-getTooltipAndAccessKey();
 
if ( $this-mClass !== '' ) {
@@ -72,6 +76,7 @@
'name' = $this-mName,
'multiline' = true,
'value' = $value,
+   'rows' = $this-getRows(),
) + $attribs );
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e09402a01cecac8a90497d31b3b1ca15ff2d949
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] annualreport: update Apache config for 2.4 - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: annualreport: update Apache config for 2.4
..


annualreport: update Apache config for 2.4

syntax changed from Apache 2.2 to Apache 2.4
http://httpd.apache.org/docs/2.4/upgrading.html

Do i need to have a Directory / at all?

Bug:T104936
Change-Id: I12bcf3651b36b6705fee8acf81b9e662f78c93f2
---
M modules/annualreport/files/annual.wikimedia.org
1 file changed, 1 insertion(+), 6 deletions(-)

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



diff --git a/modules/annualreport/files/annual.wikimedia.org 
b/modules/annualreport/files/annual.wikimedia.org
index e3e5642..147acb1 100644
--- a/modules/annualreport/files/annual.wikimedia.org
+++ b/modules/annualreport/files/annual.wikimedia.org
@@ -17,13 +17,8 @@
 Header always merge Vary X-Forwarded-Proto
 Header always set Strict-Transport-Security max-age=31536000
 
-Directory /
-Order Deny,Allow
-AllowOverride All
-/Directory
-
 Directory /srv/org/wikimedia/annualreport
-Allow from all
+Require all granted
 /Directory
 
 /VirtualHost

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I12bcf3651b36b6705fee8acf81b9e662f78c93f2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] TextInputWidget: Support 'rows' option when in multiline mode - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: TextInputWidget: Support 'rows' option when in multiline mode
..


TextInputWidget: Support 'rows' option when in multiline mode

Bug: T104682
Change-Id: I6a8ec1f7d00e73e89b9d25718eac2a547b1e2ba6
---
M demos/pages/widgets.js
M demos/widgets.php
M php/widgets/TextInputWidget.php
M src/widgets/TextInputWidget.js
4 files changed, 53 insertions(+), 5 deletions(-)

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



diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 5c0843c..74a0497 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -827,6 +827,17 @@
new OO.ui.FieldLayout(
new OO.ui.TextInputWidget( {
multiline: true,
+   rows: 15,
+   value: 'Multiline\nMultiline'
+   } ),
+   {
+   label: 'TextInputWidget 
(multiline, rows=15)\u200E',
+   align: 'top'
+   }
+   ),
+   new OO.ui.FieldLayout(
+   new OO.ui.TextInputWidget( {
+   multiline: true,
autosize: true,
value: 
'Autosize\nAutosize\nAutosize\nAutosize'
} ),
@@ -837,6 +848,18 @@
),
new OO.ui.FieldLayout(
new OO.ui.TextInputWidget( {
+   multiline: true,
+   rows: 10,
+   autosize: true,
+   value: 
'Autosize\nAutosize\nAutosize\nAutosize'
+   } ),
+   {
+   label: 'TextInputWidget 
(autosize, rows=10)\u200E',
+   align: 'top'
+   }
+   ),
+   new OO.ui.FieldLayout(
+   new OO.ui.TextInputWidget( {
icon: 'tag',
indicator: 'alert',
value: 'Text input with label',
diff --git a/demos/widgets.php b/demos/widgets.php
index d4adbaa..64ade93 100644
--- a/demos/widgets.php
+++ b/demos/widgets.php
@@ -619,6 +619,17 @@
)
),
new OOUI\FieldLayout(
+   new 
OOUI\TextInputWidget( array(
+   'multiline' = 
true,
+   'rows' = 15,
+   'value' = 
Multiline\nMultiline
+   ) ),
+   array(
+   'label' = 
TextInputWidget (multiline, rows=15)\xE2\x80\x8E,
+   'align' = 'top'
+   )
+   ),
+   new OOUI\FieldLayout(
new 
OOUI\DropdownInputWidget( array(
'options' = 
array(
array(
diff --git a/php/widgets/TextInputWidget.php b/php/widgets/TextInputWidget.php
index 3412639..7305521 100644
--- a/php/widgets/TextInputWidget.php
+++ b/php/widgets/TextInputWidget.php
@@ -33,6 +33,7 @@
 * @param boolean $config['readOnly'] Prevent changes (default: false)
 * @param number $config['maxLength'] Maximum allowed number of 
characters to input
 * @param boolean $config['multiline'] Allow multiple lines of text 
(default: false)
+* @param int $config['rows'] If multiline, number of visible lines in 
textarea
 * @param boolean $config['required'] Mark the field as required 

[MediaWiki-commits] [Gerrit] Tag v0.11.8 - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: Tag v0.11.8
..


Tag v0.11.8

Change-Id: I5eb7bf92c0f9fa35e71bebdd3b685597999598cf
---
M History.md
M package.json
2 files changed, 81 insertions(+), 28 deletions(-)

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



diff --git a/History.md b/History.md
index 86287ce..bd6652d 100644
--- a/History.md
+++ b/History.md
@@ -1,13 +1,36 @@
 # OOjs UI Release History
 
+## v0.11.8 / 2015-07-07
+### Features
+* DropdownInputWidget, RadioSelectInputWidget: Consistently call #cleanUpValue 
(Bartosz Dziewoński)
+* TextInputWidget: Allow setting the HTML autocomplete attribute (Florian)
+* TextInputWidget: Support 'rows' option when in multiline mode (Kunal Mehta)
+* Make scroll into view work in scrollable divs in Firefox (Roan Kattouw)
+
+### Styles
+* MediaWiki theme: Remove support for frameless primary buttons (Bartosz 
Dziewoński)
+
+### Code
+* Use at-ease instead of PHP's @ (Kunal Mehta)
+* Use composer's autoloader in exec:phpGenerateJSPHPForKarma (Kunal Mehta)
+* build: Don't lint demos/{dist,node_modules,vendor} (Kunal Mehta)
+* build: Build demos as part of `grunt build` too (Kunal Mehta)
+* build: Build demos as part of `grunt quick-build` (Kunal Mehta)
+* build: Only build test files (`build-tests` task) when going to run tests 
(Bartosz Dziewoński)
+* demos: Make self-contained in demos/ directory (Kunal Mehta)
+* tests: Provide better output when running infusion test under Karma (Bartosz 
Dziewoński)
+
 ## v0.11.7 / 2015-07-01
+### Features
 * Element.php: Strip all namespaces from infused PHP widgets (Kunal Mehta)
 * OptionWidget: Explicitly set aria-selected to 'false' on init (Bartosz 
Dziewoński)
 
+### Styles
 * MediaWiki theme: Add support for frameless primary buttons (Ed Sanders)
 * MediaWiki theme: Align and center the advanced icon (Roan Kattouw)
 * MediaWiki, Apex themes: Fix styling for frameless process dialog actions (Ed 
Sanders)
 
+### Code
 * Element.php: Add test case to verify class name in infused widgets (Kunal 
Mehta)
 * Element.php: Only variables may be passed by reference (Kunal Mehta)
 * Theme.php: Actually make abstract in PHP (Kunal Mehta)
@@ -15,79 +38,89 @@
 * documentation: Use bold in comments instead of h4 (Ed Sanders)
 
 ## v0.11.6 / 2015-06-23
+### Features
 * NumberInputWidget: Don't use `Math.sign()` (Brad Jorsch)
 * SelectWidget: Fix invalid escape sequence '`\s`' (Roan Kattouw)
 
+### Styles
 * DropdownWidget: Add white background in MediaWiki theme (Prateek Saxena)
 * SelectFileWidget: Add white background in MediaWiki theme (Prateek Saxena)
 * MediaWiki theme: Add constructive variants for star and unStar icons (Roan 
Kattouw)
 * MediaWiki theme: Add invert variant to all icons (Roan Kattouw)
 * MediaWiki theme: Add progressive variant to ongoingConversation icon 
(Stephane Bisson)
 
+### Code
 * Use `.parent` instead of `.super` (Stephane Bisson)
 * build: Updating development dependencies (Kunal Mehta)
 
 ## v0.11.5 / 2015-06-16
+### Features
 * ButtonInputWidget: Render frameless button correctly (Bartosz Dziewoński)
 * ComboBoxWidget: Add a getter method for text inputs (Mr. Stradivarius)
 * FieldsetLayout: Make rule for disabled label color more precise (Bartosz 
Dziewoński)
 * MenuSelectWidget: Explain what the widget config option is for (Roan Kattouw)
 * RadioSelectInputWidget: Unbreak form submission in JS version (Bartosz 
Dziewoński)
 
+### Styles
 * MediaWiki theme: Add destructive variant to check icon (Matthew Flaschen)
 * MediaWiki, Apex themes: Add ongoingConversation icon (Matthew Flaschen)
 
+### Code
 * build: Configure jsonlint (Kunal Mehta)
 
 ## v0.11.4 / 2015-06-09
+### Deprecations
 * [DEPRECATING CHANGE] Introduce oo.ui.mixin namespace for mixins, and put 
them src/mixins (C. Scott Ananian)
 
+### Features
 * ActionFieldLayout: Add PHP version (Bartosz Dziewoński)
-* ActionFieldLayout: Dead code removal and cleanup (Bartosz Dziewoński)
-* BarToolGroup: Add description and example (Kirsten Menger-Anderson)
-* ButtonInputWidget and TextInputWidget: Document and enforce allowed types 
(Bartosz Dziewoński)
 * ButtonWidget: Fix not having tabindex updated when enabled/disabled (Brad 
Jorsch)
 * ClippableElement: Fix behavior of clippables in nested scrollables (Bartosz 
Dziewoński)
 * ClippableElement: Fix behavior of long clippables (Bartosz Dziewoński)
 * Dialog: Label in aria terms (Prateek Saxena)
-* DropdownInputWidget: Tweak documentation (Bartosz Dziewoński)
 * DropdownWidget: Adjust height to other widgets (Bartosz Dziewoński)
 * DropdownWidget: Blank widget when no item is selected (Brad Jorsch)
 * Element#reconsiderScrollbars: Preserve scroll position (Bartosz Dziewoński)
 * GroupElement: pass correct event name to disconnect() from aggregate() (Roan 
Kattouw)
-* InputWidget#getInputElement: Mark as `@protected`, not `@private` (Bartosz 
Dziewoński)
-* 

[MediaWiki-commits] [Gerrit] tcpircbot: allow connections from mira - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: tcpircbot: allow connections from mira
..


tcpircbot: allow connections from mira

On top of ferm rules (I8df023c1a789c) we also need to allow
mira to connect in tcpircbot config itself so we can let the bot
report deployments from codfw.


Bug:T95436
Change-Id: I722e91a9b21f60e4c57e0d3ee1c6ac9c71ddd180
---
M manifests/role/tcpircbot.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/manifests/role/tcpircbot.pp b/manifests/role/tcpircbot.pp
index ea46486..09cfc1d 100644
--- a/manifests/role/tcpircbot.pp
+++ b/manifests/role/tcpircbot.pp
@@ -19,6 +19,7 @@
 ':::10.64.0.196/128', # tin
 ':::127.0.0.1/128',   # loopback
 '2620:0:861:101:10:64:0:196/128', # tin
+'2620:0:860:102:10:192:16:132/128', # mira
 ],
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I722e91a9b21f60e4c57e0d3ee1c6ac9c71ddd180
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] test secret() - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: test secret()
..


test secret()

Change-Id: Ie0fb28cf0303e588092aa1860ed8b70722ddbf05
---
M manifests/site.pp
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index dce935a..04feff3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -369,6 +369,12 @@
 node 'cp1008.wikimedia.org' {
 role cache::text, authdns::testns
 interface::add_ip6_mapped { 'main': }
+file { '/tmp/secme':
+owner = 'root',
+group = 'root',
+mode  = '0400',
+content = secret('ssl/testme')
+}
 }
 
 node /^cp104[34]\.eqiad\.wmnet$/ {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0fb28cf0303e588092aa1860ed8b70722ddbf05
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] test secret() - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223486

Change subject: test secret()
..

test secret()

Change-Id: Ie0fb28cf0303e588092aa1860ed8b70722ddbf05
---
M manifests/site.pp
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/223486/1

diff --git a/manifests/site.pp b/manifests/site.pp
index dce935a..04feff3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -369,6 +369,12 @@
 node 'cp1008.wikimedia.org' {
 role cache::text, authdns::testns
 interface::add_ip6_mapped { 'main': }
+file { '/tmp/secme':
+owner = 'root',
+group = 'root',
+mode  = '0400',
+content = secret('ssl/testme')
+}
 }
 
 node /^cp104[34]\.eqiad\.wmnet$/ {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0fb28cf0303e588092aa1860ed8b70722ddbf05
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Revert Set overflow auto on the ToC wrapper - change (mediawiki...Flow)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223487

Change subject: Revert Set overflow auto on the ToC wrapper
..

Revert Set overflow auto on the ToC wrapper

This reverts commit 2b8f2fede7a52d001843243adcefa9ac7db93fdd.

This fixes a problem that makes the TOC disappear completely
in certain browsers.  We'll have to retest to see how to solve
the original issue.

Bug: T105113
Change-Id: Ia1229c13e0f71e5849d1d24762d719ebdb0a1941
---
M modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/87/223487/1

diff --git a/modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less 
b/modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less
index 54e60f5..1f5ad26 100644
--- a/modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less
+++ b/modules/styles/flow/widgets/mw.flow.ui.NavigationWidget.less
@@ -44,7 +44,7 @@
width: 100%;
max-height: 400px;
position: absolute;
-   overflow-y: auto;
+   overflow: hidden;
 
/* Workaround for flicker and 
https://code.google.com/p/chromium/issues/detail?id=343244 */
-webkit-transform: translateZ(0);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1229c13e0f71e5849d1d24762d719ebdb0a1941
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] API: Use ApiBase::PARAM_HELP_MSG_PER_VALUE for 'prop' in que... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: API: Use ApiBase::PARAM_HELP_MSG_PER_VALUE for 'prop' in 
query+watchlist
..


API: Use ApiBase::PARAM_HELP_MSG_PER_VALUE for 'prop' in query+watchlist

Change-Id: I5e956f4b4dccb2b109d514332e4347252ce846c4
---
M includes/api/ApiQueryWatchlist.php
M includes/api/i18n/en.json
M includes/api/i18n/qqq.json
3 files changed, 28 insertions(+), 2 deletions(-)

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



diff --git a/includes/api/ApiQueryWatchlist.php 
b/includes/api/ApiQueryWatchlist.php
index 3eb57fd..648d259 100644
--- a/includes/api/ApiQueryWatchlist.php
+++ b/includes/api/ApiQueryWatchlist.php
@@ -451,6 +451,7 @@
'prop' = array(
ApiBase::PARAM_ISMULTI = true,
ApiBase::PARAM_DFLT = 'ids|title|flags',
+   ApiBase::PARAM_HELP_MSG_PER_VALUE = array(),
ApiBase::PARAM_TYPE = array(
'ids',
'title',
diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 792febc..907950a 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -986,7 +986,20 @@
apihelp-query+watchlist-param-user: Only list changes by this user.,
apihelp-query+watchlist-param-excludeuser: Don't list changes by 
this user.,
apihelp-query+watchlist-param-limit: How many total results to 
return per request.,
-   apihelp-query+watchlist-param-prop: Which additional items to 
get:\n;ids:Adds revision IDs and page IDs.\n;title:Adds title of the 
page.\n;flags:Adds flags for the edit.\n;user:Adds the user who made the 
edit.\n;userid:Adds user ID of whom made the edit.\n;comment:Adds comment of 
the edit.\n;parsedcomment:Adds parsed comment of the edit.\n;timestamp:Adds 
timestamp of the edit.\n;patrol:Tags edits that are patrolled.\n;sizes:Adds the 
old and new lengths of the page.\n;notificationtimestamp:Adds timestamp of when 
the user was last notified about the edit.\n;loginfo:Adds log information where 
appropriate.,
+   apihelp-query+watchlist-param-prop: Which additional properties to 
get:,
+   apihelp-query+watchlist-paramvalue-prop-ids: Adds revision IDs and 
page IDs.,
+   apihelp-query+watchlist-paramvalue-prop-title: Adds title of the 
page.,
+   apihelp-query+watchlist-paramvalue-prop-flags: Adds flags for the 
edit.,
+   apihelp-query+watchlist-paramvalue-prop-user: Adds the user who made 
the edit.,
+   apihelp-query+watchlist-paramvalue-prop-userid: Adds user ID of 
whoever made the edit.,
+   apihelp-query+watchlist-paramvalue-prop-comment: Adds comment of the 
edit.,
+   apihelp-query+watchlist-paramvalue-prop-parsedcomment: Adds parsed 
comment of the edit.,
+   apihelp-query+watchlist-paramvalue-prop-timestamp: Adds timestamp of 
the edit.,
+   apihelp-query+watchlist-paramvalue-prop-patrol: Tags edits that are 
patrolled.,
+   apihelp-query+watchlist-paramvalue-prop-sizes: Adds the old and new 
lengths of the page.,
+   apihelp-query+watchlist-paramvalue-prop-notificationtimestamp: Adds 
timestamp of when the user was last notified about the edit.,
+   apihelp-query+watchlist-paramvalue-prop-loginfo: Adds log 
information where appropriate.,
+
apihelp-query+watchlist-param-show: Show only items that meet these 
criteria. For example, to see only minor edits done by logged-in users, set 
$1show=minor|!anon.,
apihelp-query+watchlist-param-type: Which types of changes to 
show:\n;edit:Regular page edits.\n;external:External changes.\n;new:Page 
creations.\n;log:Log entries.,
apihelp-query+watchlist-param-owner: Used along with $1token to 
access a different user's watchlist.,
diff --git a/includes/api/i18n/qqq.json b/includes/api/i18n/qqq.json
index 051ef07..2b05bf3 100644
--- a/includes/api/i18n/qqq.json
+++ b/includes/api/i18n/qqq.json
@@ -905,7 +905,19 @@
apihelp-query+watchlist-param-user: 
{{doc-apihelp-param|query+watchlist|user}},
apihelp-query+watchlist-param-excludeuser: 
{{doc-apihelp-param|query+watchlist|excludeuser}},
apihelp-query+watchlist-param-limit: 
{{doc-apihelp-param|query+watchlist|limit}},
-   apihelp-query+watchlist-param-prop: 
{{doc-apihelp-param|query+watchlist|prop}},
+   apihelp-query+watchlist-param-prop: 
{{doc-apihelp-param|query+watchlist|prop|paramvalues=1}},
+   apihelp-query+watchlist-paramvalue-prop-ids: 
{{doc-apihelp-paramvalue|query+watchlist|prop|ids}},
+   apihelp-query+watchlist-paramvalue-prop-title: 
{{doc-apihelp-paramvalue|query+watchlist|prop|title}},
+   apihelp-query+watchlist-paramvalue-prop-flags: 
{{doc-apihelp-paramvalue|query+watchlist|prop|flags}},
+   apihelp-query+watchlist-paramvalue-prop-user: 

[MediaWiki-commits] [Gerrit] Remove spaces from the end of the line - change (mediawiki...Cite)

[jenkins-bot (Code Review)]

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

Change subject: Remove spaces from the end of the line
..


Remove spaces from the end of the line

Spaces in the end of the line are usually unnecessary,
and they doesn't seem to do anything useful here.

Change-Id: Ib4d1b72aafd80f36ddf198f3924e5ebbeba79aa5
---
M citeParserTests.txt
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  KartikMistry: Looks good to me, approved
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/citeParserTests.txt b/citeParserTests.txt
index 047b11a..98ad713 100644
--- a/citeParserTests.txt
+++ b/citeParserTests.txt
@@ -304,7 +304,7 @@
 !! end
 
 !! test
-Simple ref, with references/ in group, with groupname in chinese 
+Simple ref, with references/ in group, with groupname in chinese
 !! input
 AAAref group=参ref a/refBBBref group=注note b/refCCCref 
group=参ref c/ref
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4d1b72aafd80f36ddf198f3924e5ebbeba79aa5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Polish parser test titles - change (mediawiki...Cite)

[Amire80 (Code Review)]

Amire80 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223299

Change subject: Polish parser test titles
..

Polish parser test titles

* Capitalization of Chinese
* Explanation about the usage of Klingon numbers
  (the purposes of this test puzzled me until I understood that
  wa'cha' wej, etc., are numerals in the Klingon language).

Change-Id: I81237f98136de2e22b6ff5acc202a668e28b8810
---
M citeParserTests.txt
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite 
refs/changes/99/223299/1

diff --git a/citeParserTests.txt b/citeParserTests.txt
index 98ad713..08ff004 100644
--- a/citeParserTests.txt
+++ b/citeParserTests.txt
@@ -304,7 +304,7 @@
 !! end
 
 !! test
-Simple ref, with references/ in group, with groupname in chinese
+Simple ref, with references/ in group, with groupname in Chinese
 !! input
 AAAref group=参ref a/refBBBref group=注note b/refCCCref 
group=参ref c/ref
 
@@ -397,7 +397,7 @@
 !! endarticle
 
 !! test
-ref with custom group link
+ref with custom group link with number names in Klingon
 !! input
 Wikipedia rocks!ref group=klingonProceeds of Rockology, vol. XXI/ref
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81237f98136de2e22b6ff5acc202a668e28b8810
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il

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

[MediaWiki-commits] [Gerrit] Revert Make toolbar save button frameless - change (mediawiki...VisualEditor)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223300

Change subject: Revert Make toolbar save button frameless
..

Revert Make toolbar save button frameless

This reverts commit cb11cbd2f5e3dd09c5af8ca0cc19b3071ec63f9a.

Actually not needed after 3d36cac7fc4808f708f03b66f5c099de440e4569
in OOjs UI, and would change the UI in unexpected way.

Bug: T103403
Change-Id: Ia30b168ea29d03aa76ad81d1f9894a67604fdc08
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/00/223300/1

diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 019477f..deeb0d2 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -1195,7 +1195,6 @@
 ve.init.mw.ViewPageTarget.prototype.setupToolbarSaveButton = function () {
this.toolbarSaveButton = new OO.ui.ButtonWidget( {
label: ve.msg( 'visualeditor-toolbar-savedialog' ),
-   framed: false,
flags: [ 'progressive', 'primary' ],
disabled: !this.restoring
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia30b168ea29d03aa76ad81d1f9894a67604fdc08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com

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

[MediaWiki-commits] [Gerrit] Logstash: Cleanup exclusion of API continuation logging - change (operations/puppet)

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223301

Change subject: Logstash: Cleanup exclusion of API continuation logging
..

Logstash: Cleanup exclusion of API continuation logging

These log messages are no longer generated since I984e6358, so there's
no point in cluttering the logstash config with rules to ignore them
anymore.

Change-Id: I44e9881d67345205e5ec97e0aab0f58ecb9ac751
---
M files/logstash/filter-mediawiki.conf
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/223301/1

diff --git a/files/logstash/filter-mediawiki.conf 
b/files/logstash/filter-mediawiki.conf
index e7c0776..3373774 100644
--- a/files/logstash/filter-mediawiki.conf
+++ b/files/logstash/filter-mediawiki.conf
@@ -92,11 +92,6 @@
   source = agent
   prefix = ua_
 }
-
-# Ignore this one for now, too many hits
-if [feature] == action=query!rawcontinue!continue {
-  drop {}
-}
   }
 } # end [channel] == api-feature-usage
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44e9881d67345205e5ec97e0aab0f58ecb9ac751
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Anomie bjor...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Use Language::isSupportedLanguage for language code validation - change (mediawiki...UniversalLanguageSelector)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223289

Change subject: Use Language::isSupportedLanguage for language code validation
..

Use Language::isSupportedLanguage for language code validation

Aforementioned function is faster and available since 1.21 so we
can start using it. In addition it is needed to fix T104987.

Bug: T104987
Change-Id: Ie944f5c8af0c825546f9fab660451f41ab7dde3c
---
M UniversalLanguageSelector.hooks.php
1 file changed, 3 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/89/223289/1

diff --git a/UniversalLanguageSelector.hooks.php 
b/UniversalLanguageSelector.hooks.php
index 4c7a553..7e0eca5 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -146,12 +146,6 @@
return true;
}
 
-   protected static function isSupportedLanguage( $language ) {
-   $supported = Language::fetchLanguageNames( null, 'mwfile' ); // 
since 1.20
-
-   return isset( $supported[$language] );
-   }
-
/**
 * @param array $preferred
 * @return string
@@ -206,7 +200,7 @@
// Registered users - simple
if ( !$user-isAnon() ) {
// Language change
-   if ( self::isSupportedLanguage( $languageToSave ) ) {
+   if ( Language::isSupportedLanguage( $languageToSave ) ) 
{
$user-setOption( 'language', $languageToSave );
$user-saveSettings();
// Apply immediately
@@ -223,7 +217,7 @@
}
 
// Language change
-   if ( self::isSupportedLanguage( $languageToSave ) ) {
+   if ( Language::isSupportedLanguage( $languageToSave ) ) {
$request-response()-setcookie( 'language', 
$languageToSave );
$code = $languageToSave;
 
@@ -232,7 +226,7 @@
 
// Try cookie
$languageToUse = $request-getCookie( 'language' );
-   if ( self::isSupportedLanguage( $languageToUse ) ) {
+   if ( Language::isSupportedLanguage( $languageToUse ) ) {
$code = $languageToUse;
 
return true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie944f5c8af0c825546f9fab660451f41ab7dde3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] [DOC] bugzilla is deprecated. Phabricator is used instead - change (pywikibot/core)

[jenkins-bot (Code Review)]

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

Change subject: [DOC] bugzilla is deprecated. Phabricator is used instead
..


[DOC] bugzilla is deprecated. Phabricator is used instead

Change help string to the new platform.

Change-Id: I234b069cd8bcb5b47c195f54648cc4329f681ad5
---
M scripts/misspelling.py
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/scripts/misspelling.py b/scripts/misspelling.py
index 6285bb2..c94bc26 100755
--- a/scripts/misspelling.py
+++ b/scripts/misspelling.py
@@ -22,7 +22,7 @@
wikipedia, user, etc. namespaces.
 
 # (C) Daniel Herding, 2007
-# (C) Pywikibot team, 2007-2014
+# (C) Pywikibot team, 2007-2015
 #
 # Distributed under the terms of the MIT license.
 #
@@ -40,7 +40,7 @@
 
 Help Pywikibot team to provide support for your wiki by submitting
 a bug to:
-https://bugzilla.wikimedia.org/enter_bug.cgi?product=Pywikibot
+https://phabricator.wikimedia.org/maniphest/task/create/?projects=pywikibot-core
 with category containing misspelling pages or a template for
 these misspellings.\n
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I234b069cd8bcb5b47c195f54648cc4329f681ad5
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Ricordisamoa ricordisa...@openmailbox.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Grammar and spelling fixes in the long morelike message - change (mediawiki...CirrusSearch)

[jenkins-bot (Code Review)]

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

Change subject: Grammar and spelling fixes in the long morelike message
..


Grammar and spelling fixes in the long morelike message

Change-Id: Ibd0be4e171dd282688f966f0efa4fed02267cf04
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Manybubbles: Looks good to me, approved
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/i18n/en.json b/i18n/en.json
index 712a0b9..5ec1c81 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -20,5 +20,5 @@
apihelp-cirrus-mapping-dump-description: Dump of CirrusSearch 
mapping for this wiki.,
apihelp-cirrus-settings-dump-description: Dump of CirrusSearch 
settings for this wiki.,
cirrussearch-give-feedback: Give us your feedback,
-   cirrussearch-morelikethis-settings:  #!-- leave this line exactly 
as it is -- pre\n# This message let you configure the settings of the \more 
like this\ feature.\n# Changes to this take effect immediately.\n# Syntax is 
as follows:\n#   * Everything from a \#\ character to the end of the line is 
a comment.\n#   * Every non-blank line is the setting name followed by a \:\ 
character followed by the setting value\n# Settings are :\n#   * min_doc_freq 
(integer): Minimum number of documents (per shard) that need a term for it to 
be considered.\n#   * max_doc_freq (integer): Maximum number of documents (per 
shard) that have a term for it to be considered.\n#   High 
frequency terms are generally \stopwords\.\n#   * max_query_terms (integer): 
Maximum number of terms to be considered. This value is limited to 
$wgCirrusSearchMoreLikeThisMaxQueryTermsLimit (100).\n#   * min_term_freq 
(integer): Minimun number of times the term appears in the input to doc to be 
considered. For small fields (title) this value should be 1.\n#   * 
percent_terms_to_match (float 0 to 1): The percentage of terms to match on. 
Defaults to 0.3 (30 percent).\n#   * min_word_len (integer): This minimal 
length of a term to be considered. Defaults to 0.\n#   * max_word_len 
(integer): The maximum word length above which words will be ignored. Defaults 
to unbounded (0).\n#   * fields (comma separated list of value): these are the 
fields to use. Allowed fields are title, text, auxiliary_text, opening_text, 
headings and all.\n#   * use_fields (true|false) : Tell the more like this 
query to use only the field data. Defaults to false: the system extract the 
content of the text field to build the query.\n# Examples of good lines:\n# 
min_doc_freq:2\n# max_doc_freq:2\n# max_query_terms:25\n# 
min_term_freq:2\n# percent_terms_to_match:0.3\n# min_word_len:2\n# 
max_word_len:40\n# fields:text,opening_text\n# use_fields:true\n# /pre !-- 
leave this line exactly as it is --
+   cirrussearch-morelikethis-settings:  #!-- leave this line exactly 
as it is -- pre\n# This message let you configure the settings of the \more 
like this\ feature.\n# Changes to this take effect immediately.\n# Syntax is 
as follows:\n#   * Everything from a \#\ character to the end of the line is 
a comment.\n#   * Every non-blank line is the setting name followed by a \:\ 
character followed by the setting value\n# Settings are :\n#   * min_doc_freq 
(integer): Minimum number of documents (per shard) that need a term for it to 
be considered.\n#   * max_doc_freq (integer): Maximum number of documents (per 
shard) that have a term for it to be considered.\n#   High 
frequency terms are generally \stop words\.\n#   * max_query_terms (integer): 
Maximum number of terms to be considered. This value is limited to 
$wgCirrusSearchMoreLikeThisMaxQueryTermsLimit (100).\n#   * min_term_freq 
(integer): Minimum number of times the term appears in the input to doc to be 
considered. For small fields (title) this value should be 1.\n#   * 
percent_terms_to_match (float 0 to 1): The percentage of terms to match on. 
Defaults to 0.3 (30 percent).\n#   * min_word_len (integer): Minimal length of 
a term to be considered. Defaults to 0.\n#   * max_word_len (integer): The 
maximum word length above which words will be ignored. Defaults to unbounded 
(0).\n#   * fields (comma separated list of values): These are the fields to 
use. Allowed fields are title, text, auxiliary_text, opening_text, headings and 
all.\n#   * use_fields (true|false) : Tell the \more like this\ query to use 
only the field data. Defaults to false: the system will extract the content of 
the text field to build the query.\n# Examples of good lines:\n# 
min_doc_freq:2\n# max_doc_freq:2\n# max_query_terms:25\n# 
min_term_freq:2\n# percent_terms_to_match:0.3\n# min_word_len:2\n# 
max_word_len:40\n# fields:text,opening_text\n# use_fields:true\n# /pre !-- 
leave this line exactly as it is --
 

[MediaWiki-commits] [Gerrit] Generalize MW-Selenium job for MediaWiki extensions - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Generalize MW-Selenium job for MediaWiki extensions
..


Generalize MW-Selenium job for MediaWiki extensions

Refactored mw-selenium job to work with prepare-mediawiki-zuul-project
builder and to infer the default tests directory from EXT_NAME, allowing
for reuse of this job across any MediaWiki extension that uses a
standard tests directory (`tests/browser`).

Reconfigured MobileFrontend to use the generic job.

Added additional runtime options to Cucumber for JUnit logging.

Bug: T103039
Change-Id: Ie4636ed8fa836e7740d9d66e352472258db6935e
---
M jjb/macro.yaml
M jjb/mediawiki-extensions.yaml
M jjb/ruby-jobs.yaml
M zuul/layout.yaml
4 files changed, 21 insertions(+), 36 deletions(-)

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



diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 4e14f97..dd3cd01 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -378,15 +378,27 @@
 # - tests-dir: Parent of the `features` directory. Usually `tests/browser`.
 #
 - builder:
-name: mw-selenium
+name: mw-selenium-with-dir
 builders:
  - prepare-localhost
  - bundle-with-options:
 initialization: 
'/srv/deployment/integration/slave-scripts/bin/mw-set-env-mw-selenium.sh'
-command: 'cucumber --color --tags @integration --tags ~@skip'
+command: |
+  cucumber --color --tags @integration --tags ~@skip --format pretty \
+--format junit --out $WORKSPACE/log/junit
 dir: '{tests-dir}'
 bundler-version: ''
 
+# Run MW-Selenium tests located in a standard location, `tests/browser` beneath
+# the MW extension directory. Note that EXT_NAME is set by
+# zuul/ext_dependencies.py
+#
+- builder:
+name: mw-selenium
+builders:
+ - mw-selenium-with-dir:
+tests-dir: 'src/extensions/$EXT_NAME/tests/browser'
+
 # - src: (without trailing slash)
 # - project: (usually repo name or a custom title like VisualEditor) - will 
be escaped
 # - version: (usually branch name) - will be escaped
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index e090bd1..50803c2 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -187,8 +187,7 @@
  - mw-teardown-mysql
  - archive-log-dir
 
-# Generic mw-selenium job for extensions. Can only be used by those that
-# currently don't have dependencies or a non-standard tests directory.
+# Generic mw-selenium job for extensions.
 - job:
 name: 'mwext-mw-selenium'
 node: contintLabsSlave  UbuntuTrusty
@@ -197,27 +196,9 @@
  - zuul
 builders:
  - prepare-mediawiki-zuul-project
- - mw-selenium:
- tests-dir: 'tests/browser'
-publishers:
- - localhost-cleanup
- - mw-teardown-mysql
- - archive-log-dir
-
-# mw-selenium template for extensions that have dependencies or a non-standard
-# test directory.
-- job-template:
-name: '{name}-{ext-name}-mw-selenium'
-node: contintLabsSlave  UbuntuTrusty
-concurrent: true
-triggers:
- - zuul
-builders:
- - prepare-mediawiki:
- ext-name: '{ext-name}'
- dependencies: '{dependencies}'
- - mw-selenium:
- tests-dir: 'tests/browser'
+ - zuul-cloner:
+ projects: mediawiki/skins/Vector
+ - mw-selenium
 publishers:
  - localhost-cleanup
  - mw-teardown-mysql
@@ -663,14 +644,6 @@
 name: mwext
 ext-name: Thanks
 dependencies: 
'Echo,Flow,Mantle,MobileFrontend,VisualEditor,AbuseFilter,SpamBlacklist,CheckUser,EventLogging,ConfirmEdit'
-
- # mw-selenium jobs for MediaWiki extensions
- # Only extensions that have dependencies should be listed here.
- # Others should use the generic 'mwext-mw-selenium' job.
- - '{name}-{ext-name}-mw-selenium':
-name: mwext
-ext-name: MobileFrontend
-dependencies: Mantle
 
  - '{name}-{ext-name}-npm':
 ext-name: VisualEditor
diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml
index c89d28d..a5ccfbf 100644
--- a/jjb/ruby-jobs.yaml
+++ b/jjb/ruby-jobs.yaml
@@ -26,7 +26,7 @@
  fi
 
  # Change to the given working directory
- cd '{dir}'
+ cd {dir}
 
  mkdir -p vendor
  gem2.0 install --env-shebang -i vendor --no-document 
${{version[@]}} bundler
@@ -154,7 +154,7 @@
  mediawiki/vendor
  - mw-install-mysql
  - mw-apply-settings
- - mw-selenium:
+ - mw-selenium-with-dir:
  tests-dir: '.'
 publishers:
  - localhost-cleanup
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index bc4c9ef..c4c09b4 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4095,7 +4095,7 @@
   - mwext-MobileFrontend-publish
 experimental:
   - mwext-MobileFrontend-testextension-hhvm
-  - 

[MediaWiki-commits] [Gerrit] Adding dns entries for 4 new analytics machines - change (operations/dns)

[Cmjohnson (Code Review)]

Cmjohnson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223295

Change subject: Adding dns entries for 4 new analytics machines
..

Adding dns entries for 4 new analytics machines

Change-Id: I9b593ee6e274fb0cdb5e2549d012a5e87cf1a322
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 16 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/95/223295/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 9786cb8..5f975f0 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -1049,7 +1049,10 @@
 19  1H IN PTR   analytics1040.eqiad.wmnet.
 20  1H IN PTR   analytics1041.eqiad.wmnet.
 21  1H IN PTR   analytics1002.eqiad.wmnet.
-
+22  1H IN PTR   analytics1042.eqiad.wmnet.
+23  1H IN PTR   analytics1043.eqiad.wmnet.
+24  1H IN PTR   analytics1044.eqiad.wmnet.
+25  1H IN PTR   analytics1045.eqiad.wmnet.
 
 ; 10.65.0.0/16 is eqiad management network
 
@@ -2061,6 +2064,10 @@
 12  1H  IN PTR  wmf4676.mgmt.eqiad.wmnet.
 13  1H  IN PTR  logstash1006.mgmt.eqiad.wmnet.
 13  1H  IN PTR  wmf4677.mgmt.eqiad.wmnet.
+14  1H  IN PTR  analytics1042.mgmt.eqiad.wmnet.
+15  1H  IN PTR  analytics1043.mgmt.eqiad.wmnet.
+16  1H  IN PTR  analytics1044.mgmt.eqiad.wmnet.
+17  1H  IN PTR  analytics1045.mgmt.eqiad.wmnet.
 
 $ORIGIN 5.65.{{ zonename }}.
 
diff --git a/templates/wmnet b/templates/wmnet
index f2d408b..ea53b29 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -136,6 +136,10 @@
 analytics10391H IN A 10.64.53.18
 analytics10401H IN A 10.64.53.19
 analytics10411H IN A 10.64.53.20
+analytics10421H IN A 10.64.53.22
+analytics10431H IN A 10.64.53.23
+analytics10441H IN A 10.64.53.24
+analytics10451H IN A 10.64.53.25
 berkelium1H IN A 10.64.0.169
  1H IN  2620:0:861:101:10:64:0:169
 caesium  1H IN A 10.64.32.145
@@ -1024,6 +1028,10 @@
 analytics1039   1H  IN A10.65.3.222
 analytics1040   1H  IN A10.65.3.223
 analytics1041   1H  IN A10.65.3.224
+analytics1042   1H  IN A10.65.4.14
+analytics1043   1H  IN A10.65.4.15
+analytics1044   1H  IN A10.65.4.16
+analytics1045   1H  IN A10.65.4.17
 dataset1001 1H  IN A10.65.3.85
 WMF3471 1H  IN A10.65.3.85
 db1001  1H  IN A10.65.6.1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b593ee6e274fb0cdb5e2549d012a5e87cf1a322
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org

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