[MediaWiki-commits] [Gerrit] integration/config[master]: Revert "Drop /php directory from MediaWiki core code coverage"

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387771 )

Change subject: Revert "Drop /php directory from MediaWiki core code coverage"
..


Revert "Drop /php directory from MediaWiki core code coverage"

This reverts commit 6876bae36db9df0dbdac2b21f80138abd62ff769.

Change-Id: I1265950c53d067593eabdaa988d72951ed8cd6a2
---
M jjb/mediawiki.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 7ee7407..5976419 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -379,7 +379,7 @@
 
  - cover-publish:
  src: 'cover'
- dest: 'mediawiki-core/$ZUUL_BRANCH'
+ dest: 'mediawiki-core/$ZUUL_BRANCH/php'
 publishers:
  - archive:
  artifacts: 'log/*'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1265950c53d067593eabdaa988d72951ed8cd6a2
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Revert "Drop /php directory from MediaWiki core code coverage"

[Legoktm (Code Review)]

Hello jenkins-bot,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "Drop /php directory from MediaWiki core code coverage"
..

Revert "Drop /php directory from MediaWiki core code coverage"

This reverts commit 6876bae36db9df0dbdac2b21f80138abd62ff769.

Change-Id: I1265950c53d067593eabdaa988d72951ed8cd6a2
---
M jjb/mediawiki.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/71/387771/1

diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 7ee7407..5976419 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -379,7 +379,7 @@
 
  - cover-publish:
  src: 'cover'
- dest: 'mediawiki-core/$ZUUL_BRANCH'
+ dest: 'mediawiki-core/$ZUUL_BRANCH/php'
 publishers:
  - archive:
  artifacts: 'log/*'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1265950c53d067593eabdaa988d72951ed8cd6a2
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Don't allow new translation button to be clicked until lang ...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387585 )

Change subject: Don't allow new translation button to be clicked until lang 
pairs have loaded
..


Don't allow new translation button to be clicked until lang pairs have loaded

Also store button as OOUI widget, not jQuery element.

Change-Id: Ic8cd37e0ec695fae684aafcf56ca7526e39f1f12
---
M modules/base/ext.cx.sitemapper.js
M modules/dashboard/ext.cx.dashboard.js
2 files changed, 12 insertions(+), 11 deletions(-)

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



diff --git a/modules/base/ext.cx.sitemapper.js 
b/modules/base/ext.cx.sitemapper.js
index 4852cdb..9c4871b 100644
--- a/modules/base/ext.cx.sitemapper.js
+++ b/modules/base/ext.cx.sitemapper.js
@@ -177,6 +177,7 @@
);
mw.hook( 'mw.cx.error' ).fire( mw.msg( 
'cx-error-server-connection' ) );
self.languagePairsPromise = null;
+   return $.Deferred().reject().promise();
} );
}
return this.languagePairsPromise;
diff --git a/modules/dashboard/ext.cx.dashboard.js 
b/modules/dashboard/ext.cx.dashboard.js
index 8e8d908..12dfc15 100644
--- a/modules/dashboard/ext.cx.dashboard.js
+++ b/modules/dashboard/ext.cx.dashboard.js
@@ -24,7 +24,7 @@
this.$publishedArticlesButton = null;
this.lists = {};
this.$translationListContainer = null;
-   this.$newTranslationButton = null;
+   this.newTranslationButton = null;
this.$listHeader = null;
this.$sourceSelector = null;
this.narrowLimit = 700;
@@ -338,7 +338,7 @@
};
 
CXDashboard.prototype.buildTranslationList = function () {
-   var newTranslationButton, size,
+   var size,
filterButtons = [];
 
// document.documentElement.clientWidth performs faster than $( 
window ).width()
@@ -358,7 +358,7 @@
items: filterButtons
} );
 
-   newTranslationButton = new OO.ui.ButtonWidget( {
+   this.newTranslationButton = new OO.ui.ButtonWidget( {
label: mw.msg( 'cx-create-new-translation' ),
icon: 'add',
flags: [
@@ -366,11 +366,10 @@
'progressive'
]
} );
-   this.$newTranslationButton = newTranslationButton.$element;
 
this.$listHeader = $( '' ).addClass( 'translation-filter' 
);
this.$listHeader.append(
-   this.$newTranslationButton,
+   this.newTranslationButton.$element,
this.filter.$element
);
 
@@ -413,11 +412,12 @@
} );
 
this.initSourceSelector();
-   this.$newTranslationButton.on( 'click', function ( e ) {
-   self.$listHeader.hide();
-   e.stopPropagation();
-
-   $( window ).scrollTop( 0 );
+   // Translation button can't be clicked until language pairs 
have been loaded
+   this.siteMapper.getLanguagePairs().then( function () {
+   self.newTranslationButton.$element.on( 'click', 
function () {
+   self.$listHeader.hide();
+   $( window ).scrollTop( 0 );
+   } );
} );
// Scroll handler
$( window ).scroll( $.throttle( 250, this.scroll.bind( this ) ) 
);
@@ -580,7 +580,7 @@
sourceSelectorOptions.targetLanguage = query.to;
sourceSelectorOptions.sourceTitle = query.page;
sourceSelectorOptions.container = this.$sourceSelector;
-   this.$newTranslationButton.cxSourceSelector( 
sourceSelectorOptions );
+   this.newTranslationButton.$element.cxSourceSelector( 
sourceSelectorOptions );
 
if ( query.campaign ) {
mw.hook( 'mw.cx.cta.accept' ).fire( query.campaign, 
query.from, query.page, query.to );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8cd37e0ec695fae684aafcf56ca7526e39f1f12
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.or

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Hack proximity search to support entering lat& long directly

[Eileen (Code Review)]

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387770 )

Change subject: Hack proximity search to support entering lat& long directly
..

Hack proximity search to support entering lat& long directly

If we push this out I suggest we treat it as short-term until early next year & 
let it lapse when we
upgrade, possibly keeping the ticket open or opening another to figure out a 
more appropriate fix that
does not require a core hack

Bug: T179344
Change-Id: Ia3d29b8a8a048bdea27300cf4b75ce8b171923da
---
M CRM/Contact/Form/Search/Custom/Proximity.php
M templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
2 files changed, 8 insertions(+), 53 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/70/387770/1

diff --git a/CRM/Contact/Form/Search/Custom/Proximity.php 
b/CRM/Contact/Form/Search/Custom/Proximity.php
index 8375ade..d0f7a91 100644
--- a/CRM/Contact/Form/Search/Custom/Proximity.php
+++ b/CRM/Contact/Form/Search/Custom/Proximity.php
@@ -54,27 +54,8 @@
 unset($this->_formValues['operator']);
 
 if (!empty($this->_formValues)) {
-  // add the country and state
-  if (!empty($this->_formValues['country_id'])) {
-$this->_formValues['country'] = 
CRM_Core_PseudoConstant::country($this->_formValues['country_id']);
-  }
-
-  if (!empty($this->_formValues['state_province_id'])) {
-$this->_formValues['state_province'] = 
CRM_Core_PseudoConstant::stateProvince($this->_formValues['state_province_id']);
-  }
-
-  // use the address to get the latitude and longitude
-  CRM_Utils_Geocode_Google::format($this->_formValues);
-
-  if (!is_numeric(CRM_Utils_Array::value('geo_code_1', 
$this->_formValues)) ||
-!is_numeric(CRM_Utils_Array::value('geo_code_2', $this->_formValues)) 
||
-!isset($this->_formValues['distance'])
-  ) {
-CRM_Core_Error::fatal(ts('Could not geocode input'));
-  }
-
-  $this->_latitude = $this->_formValues['geo_code_1'];
-  $this->_longitude = $this->_formValues['geo_code_2'];
+  $this->_latitude = $this->_formValues['geocode_1'];
+  $this->_longitude = $this->_formValues['geocode_2'];
 
   if ($this->_formValues['prox_distance_unit'] == "miles") {
 $conversionFactor = 1609.344;
@@ -111,29 +92,9 @@
 $proxUnits = array('km' => ts('km'), 'miles' => ts('miles'));
 $form->add('select', 'prox_distance_unit', ts('Units'), $proxUnits, TRUE);
 
-$form->add('text',
-  'street_address',
-  ts('Street Address')
-);
+$form->add('text', 'geocode_1', ts('Latitude'), NULL, TRUE);
 
-$form->add('text',
-  'city',
-  ts('City')
-);
-
-$form->add('text',
-  'postal_code',
-  ts('Postal Code')
-);
-
-$defaults = array();
-if ($countryDefault) {
-  $defaults['country_id'] = $countryDefault;
-}
-$form->addChainSelect('state_province_id');
-
-$country = array('' => ts('- select -')) + 
CRM_Core_PseudoConstant::country();
-$form->add('select', 'country_id', ts('Country'), $country, TRUE, 
array('class' => 'crm-select2'));
+$form->add('text', 'geocode_2', ts('Longitude'), NULL, TRUE);
 
 $group = array('' => ts('- any group -')) + 
CRM_Core_PseudoConstant::nestedGroup();
 $form->addElement('select', 'group', ts('Group'), $group, array('class' => 
'crm-select2 huge'));
@@ -153,11 +114,8 @@
 $form->assign('elements', array(
   'distance',
   'prox_distance_unit',
-  'street_address',
-  'city',
-  'postal_code',
-  'country_id',
-  'state_province_id',
+  'geocode_1',
+  'geocode_2',
   'group',
   'tag',
 ));
diff --git a/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl 
b/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
index 2382577..533a60c 100644
--- a/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
+++ b/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
@@ -36,11 +36,8 @@
 
{$form.distance.label}{$form.distance.html|crmAddClass:four}
 {$form.prox_distance_unit.html}
FROM...
-   {$form.street_address.label}{$form.street_address.html}
-   {$form.city.label}{$form.city.html}
-   {$form.postal_code.label}{$form.postal_code.html}
-   {$form.country_id.label}{$form.country_id.html}
-   {$form.state_province_id.label}{$form.state_province_id.html}
+   {$form.geocode_1.label}{$form.geocode_1.html}
+   {$form.geocode_2.label}{$form.geocode_2.html}
AND ...
{$form.group.label}{$form.group.html}
{$form.tag.label}{$form.tag.html}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3d29b8a8a048bdea27300cf4b75ce8b171923da
Gerrit-PatchSet: 1
Gerrit-Project:

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Refactor setDefaultLanguages

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387644 )

Change subject: Refactor setDefaultLanguages
..


Refactor setDefaultLanguages

- Move code that finds valid source and target languages, which
are different from each other, to separate method.

Change-Id: I5550aa603db31862016b6d54c82abf3722d9b5e5
---
M modules/source/ext.cx.source.selector.js
1 file changed, 22 insertions(+), 16 deletions(-)

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



diff --git a/modules/source/ext.cx.source.selector.js 
b/modules/source/ext.cx.source.selector.js
index 77eec21..90d68a0 100644
--- a/modules/source/ext.cx.source.selector.js
+++ b/modules/source/ext.cx.source.selector.js
@@ -908,22 +908,31 @@
};
 
CXSourceSelector.prototype.setDefaultLanguages = function () {
-   var storedTargetLanguage, storedSourceLanguage,
-   targetLanguage, sourceLanguage,
-   commonSourceLanguages, i;
+   var validDefaultLanguagePair = 
this.findValidDefaultLanguagePair();
 
-   storedTargetLanguage = mw.storage.get( 'cxTargetLanguage' );
-   storedSourceLanguage = mw.storage.get( 'cxSourceLanguage' );
+   this.setSourceLanguage( validDefaultLanguagePair.sourceLanguage 
);
+   this.setTargetLanguage( validDefaultLanguagePair.targetLanguage 
);
+   };
 
-   targetLanguage = storedTargetLanguage || mw.config.get( 
'wgContentLanguage' );
-   sourceLanguage = storedSourceLanguage;
+   /**
+* Find valid source and target language pair, with different source 
and target language
+*
+* @return {Object} languages Valid and different source and target 
languages
+*/
+   CXSourceSelector.prototype.findValidDefaultLanguagePair = function () {
+   var sourceLanguage,
+   targetLanguage,
+   commonSourceLanguages, i, length;
+
+   sourceLanguage = mw.storage.get( 'cxSourceLanguage' );
+   targetLanguage = mw.storage.get( 'cxTargetLanguage' ) || 
mw.config.get( 'wgContentLanguage' );
 
if ( !this.isValidSource( sourceLanguage ) || sourceLanguage 
=== targetLanguage ) {
commonSourceLanguages = this.$sourceLanguage.data( 
'uls' ).options.quickList();
 
-   for ( i = 0; i < commonSourceLanguages.length; i++ ) {
+   for ( i = 0, length = commonSourceLanguages.length; i < 
length; i++ ) {
if ( commonSourceLanguages[ i ] !== 
targetLanguage &&
-   this.isValidSource( 
commonSourceLanguages[ i ], targetLanguage )
+   this.isValidSource( 
commonSourceLanguages[ i ] )
) {
sourceLanguage = commonSourceLanguages[ 
i ];
 
@@ -932,13 +941,10 @@
}
}
 
-   // Still couldn't find a valid source language?
-   if ( !this.isValidSource( sourceLanguage ) || sourceLanguage 
=== targetLanguage ) {
-   sourceLanguage = mw.config.get( 
'wgContentTranslationDefaultSourceLanguage' );
-   }
-
-   this.setSourceLanguage( sourceLanguage );
-   this.setTargetLanguage( targetLanguage );
+   return {
+   sourceLanguage: sourceLanguage,
+   targetLanguage: targetLanguage
+   };
};
 
CXSourceSelector.prototype.setSelectedItem = function ( item ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5550aa603db31862016b6d54c82abf3722d9b5e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Petar.petkovic 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: cover: Render progress-bar before directory names

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387769 )

Change subject: cover: Render progress-bar before directory names
..

cover: Render progress-bar before directory names

This should improve visual alignment.

Bug: T146970
Change-Id: Ibc1bf81e45de45c36ffa7b1e1f6146fd07cefe64
---
M org/wikimedia/doc/cover/cover.css
M org/wikimedia/doc/cover/index.php
2 files changed, 13 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/69/387769/1

diff --git a/org/wikimedia/doc/cover/cover.css 
b/org/wikimedia/doc/cover/cover.css
index eae10d6..8146254 100644
--- a/org/wikimedia/doc/cover/cover.css
+++ b/org/wikimedia/doc/cover/cover.css
@@ -1,9 +1,14 @@
-.progress {
-   width: 100px;
-   margin: 0;
+/* Override Bootstrap ".nav>li>a" selector */
+.cover-list .cover-item {
+   display: inline-flex;
 }
 
-.progress-name {
-   float: left;
+.cover-item .progress {
+   display: inline-block;
+   order: -1;
+   vertical-align: middle;
+   width: 100px;
margin-right: 1em;
+   /* Override Bootstrap ".progress" margin */
+   margin-bottom: 0;
 }
diff --git a/org/wikimedia/doc/cover/index.php 
b/org/wikimedia/doc/cover/index.php
index d82a623..7e52ca3 100644
--- a/org/wikimedia/doc/cover/index.php
+++ b/org/wikimedia/doc/cover/index.php
@@ -39,7 +39,7 @@
// Get list of directories with clover.xml
$results = glob( __DIR__ . '/*/clover.xml' );
$this->embedCSS( file_get_contents( __DIR__ . '/cover.css' ) );
-   $this->addHtmlContent( '' 
);
+   $this->addHtmlContent( '' );
$html = '';
foreach ( $results as $clover ) {
$info = $this->parseClover( $clover );
@@ -49,8 +49,8 @@
$minWidth = $percent >= 10 ? '3em' : '2em';
$html .= <<
-   
-   $dirName
+   
+   $dirName



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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc1bf81e45de45c36ffa7b1e1f6146fd07cefe64
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Drop /php directory from MediaWiki core code coverage

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387768 )

Change subject: Drop /php directory from MediaWiki core code coverage
..


Drop /php directory from MediaWiki core code coverage

There's no js coverage yet so move it for now to make the coverage listing
work properly.

Change-Id: I5d455ac70ca0415e687b5dc98b189262bc585e22
---
M jjb/mediawiki.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 5976419..7ee7407 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -379,7 +379,7 @@
 
  - cover-publish:
  src: 'cover'
- dest: 'mediawiki-core/$ZUUL_BRANCH/php'
+ dest: 'mediawiki-core/$ZUUL_BRANCH'
 publishers:
  - archive:
  artifacts: 'log/*'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d455ac70ca0415e687b5dc98b189262bc585e22
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Show a loading indicator for suggestions

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/385145 )

Change subject: Show a loading indicator for suggestions
..


Show a loading indicator for suggestions

* Show the three pulsing circles spinner indicator below the suggestion
list header, as part of a new element, using Base90 (#F8F9FA) as background.

Bug: T178145
Change-Id: Iae9c69f75d4c1b6663125c3ed0758084c7c3494e
---
M extension.json
M modules/dashboard/ext.cx.suggestionlist.js
M modules/dashboard/styles/ext.cx.suggestionlist.less
3 files changed, 33 insertions(+), 4 deletions(-)

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



diff --git a/extension.json b/extension.json
index 868d83a..1796827 100644
--- a/extension.json
+++ b/extension.json
@@ -945,6 +945,7 @@
"dependencies": [
"ext.cx.recommendtool.client",
"ext.cx.util",
+   "ext.cx.widgets.spinner",
"jquery.uls.data",
"mediawiki.storage",
"mediawiki.widgets",
diff --git a/modules/dashboard/ext.cx.suggestionlist.js 
b/modules/dashboard/ext.cx.suggestionlist.js
index 4891018..61ab412 100644
--- a/modules/dashboard/ext.cx.suggestionlist.js
+++ b/modules/dashboard/ext.cx.suggestionlist.js
@@ -74,6 +74,8 @@
this.$publicCollectionContainer = null;
this.refreshTrigger = null;
this.$headerContainer = null;
+   this.$loadingIndicatorSpinner = null;
+   this.pendingRequests = 0;
this.seed = null;
this.init();
this.listen();
@@ -88,12 +90,15 @@
.text( mw.msg( 'cx-suggestionlist-title' ) )
.addClass( 'cx-suggestionlist__public-title' ),
this.languageFilter.$element );
+   this.$loadingIndicatorSpinner = $( '' )
+   .addClass( 'cx-suggestionlist__loading-indicator' )
+   .append( mw.cx.widgets.spinner() );
this.$publicCollectionContainer = $( '' )
.addClass( 'cx-suggestionlist__public' )
-   .append( this.$headerContainer );
+   .append( this.$headerContainer, 
this.$loadingIndicatorSpinner );
this.$publicCollection = $( '' )
.addClass( 'cx-suggestionlist__public-items' );
-   this.$publicCollectionContainer.append( this.$publicCollection 
).hide();
+   this.$publicCollectionContainer.append( this.$publicCollection 
);
this.$suggestionsContainer = $( '' )
.addClass( 'cx-suggestionlist-container' )
.append( this.$personalCollection, 
this.$publicCollectionContainer );
@@ -129,6 +134,9 @@
var lists, promise,
isEmpty = true,
self = this;
+
+   this.$loadingIndicatorSpinner.show();
+   this.pendingRequests++;
 
if ( !list ) {
// Initial load, load available lists and couple of 
suggestions for them
@@ -173,8 +181,13 @@
}
 
return isEmpty;
-   } );
+   } ).always( function () {
+   self.pendingRequests--;
 
+   if ( self.pendingRequests === 0 ) {
+   self.$loadingIndicatorSpinner.hide();
+   }
+   } );
};
 
/**
@@ -194,7 +207,7 @@
self.showEmptySuggestionList();
}
}, function () {
-   // On Fail, show empty list
+   // On fail, show empty list
self.showEmptySuggestionList();
} );
};
diff --git a/modules/dashboard/styles/ext.cx.suggestionlist.less 
b/modules/dashboard/styles/ext.cx.suggestionlist.less
index de69d19..83dcdcf 100644
--- a/modules/dashboard/styles/ext.cx.suggestionlist.less
+++ b/modules/dashboard/styles/ext.cx.suggestionlist.less
@@ -31,6 +31,21 @@
}
 }
 
+.cx-suggestionlist__loading-indicator {
+   @dot-size: 16px;
+   @verticalPadding: 15px;
+
+   background-color: @colorGray15;
+   height: @dot-size + @verticalPadding;
+   padding-top: @verticalPadding;
+
+   .cx-spinner {
+   width: 3 * @dot-size;
+   height: @dot-size;
+   margin: 0 auto;
+   }
+}
+
 // stylelint-disable indentation
 // At any time display only two suggestion lists
 .cx-suggestionlist-type-4:nth-child( n+3 ),

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Drop /php directory from MediaWiki core code coverage

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387768 )

Change subject: Drop /php directory from MediaWiki core code coverage
..

Drop /php directory from MediaWiki core code coverage

There's no js coverage yet so move it for now to make the coverage listing
work properly.

Change-Id: I5d455ac70ca0415e687b5dc98b189262bc585e22
---
M jjb/mediawiki.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/68/387768/1

diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 5976419..7ee7407 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -379,7 +379,7 @@
 
  - cover-publish:
  src: 'cover'
- dest: 'mediawiki-core/$ZUUL_BRANCH/php'
+ dest: 'mediawiki-core/$ZUUL_BRANCH'
 publishers:
  - archive:
  artifacts: 'log/*'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d455ac70ca0415e687b5dc98b189262bc585e22
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Sync MediaWiki core's clover.xml to docs.wm.o

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386580 )

Change subject: Sync MediaWiki core's clover.xml to docs.wm.o
..


Sync MediaWiki core's clover.xml to docs.wm.o

Use clover-edit.py to shrink it down first.

Change-Id: I8f450c1ac3a63cca1b8c398a4e82bbf91f9ed765
---
M jjb/mediawiki.yaml
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 3c8bbe5..5976419 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -373,6 +373,10 @@
 # can be a PHP Fatal error, of a segfault, for example.
 test -f cover/index.html
 
+if [ -s "log/clover.xml" ]; then
+/srv/deployment/integration/slave-scripts/bin/clover-edit.py 
log/clover.xml --name "MediaWiki core" --remove-full-info --save 
"$WORKSPACE/cover/clover.xml"
+fi
+
  - cover-publish:
  src: 'cover'
  dest: 'mediawiki-core/$ZUUL_BRANCH/php'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8f450c1ac3a63cca1b8c398a4e82bbf91f9ed765
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ShoutWikiAds[master]: Add existing extensionname message to extension.json

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387651 )

Change subject: Add existing extensionname message to extension.json
..


Add existing extensionname message to extension.json

Change-Id: Ieb65d5d01b35c2d558165411164ce87a01419487
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/extension.json b/extension.json
index 2757474..0f55a22 100644
--- a/extension.json
+++ b/extension.json
@@ -4,6 +4,7 @@
"author": [
"Jack Phoenix"
],
+   "namemsg": "shoutwikiads-extensionname",
"descriptionmsg": "shoutwikiads-desc",
"type": "other",
"url": "https://www.mediawiki.org/wiki/Extension:ShoutWiki_Ads";,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb65d5d01b35c2d558165411164ce87a01419487
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ShoutWikiAds
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtendedSearch[master]: Add name message to extension.json

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387641 )

Change subject: Add name message to extension.json
..


Add name message to extension.json

Also rename the existing message to match standard,
https://www.mediawiki.org/wiki/Manual:$wgExtensionCredits#namemsg

Change-Id: I8cf8a2ad69e0ccd6a76f1fa2db6299c062675142
---
M extension.json
M i18n/en.json
M i18n/qqq.json
3 files changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index ba66631..29e2c66 100644
--- a/extension.json
+++ b/extension.json
@@ -6,6 +6,7 @@
],
"url": 
"https://www.mediawiki.org/wiki/Extension:BlueSpiceExtendedSearch";,
"descriptionmsg": "bs-extsearch-desc",
+   "namemsg": "bs-extsearch-extensionname",
"license-name": "GPL-2.0",
"type": "other",
"MessagesDirs": {
diff --git a/i18n/en.json b/i18n/en.json
index 7cb0431..d3c9bdc 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,7 +4,7 @@
"Robert Vogel "
]
},
-   "extensionname-bsextendedsearch": "BlueSpice ExtendedSearch",
+   "bs-extsearch-extensionname": "BlueSpice ExtendedSearch",
"bs-extsearch-desc": "Elasticsearch search backend",
"bssearchadmin": "Search admin",
"bssearchadmin-desc": "Provides a management interface of the search",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 4e27a06..3c59d5c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -4,7 +4,7 @@
"Robert Vogel "
]
},
-   "extensionname-bsextendedsearch": "{{name}}",
+   "bs-extsearch-extensionname": "{{name}}",
"bs-extsearch-desc": "{{desc|name=BlueSpiceExtendedSearch}}",
"bssearchadmin": "Special page name for Special:BSSearchAdmin",
"bssearchadmin-desc": "Description text for title attribute in menu 
link",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8cf8a2ad69e0ccd6a76f1fa2db6299c062675142
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtendedSearch
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Replace various subtle colors with WikimediaUI palette ones

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387766 )

Change subject: Replace various subtle colors with WikimediaUI palette ones
..


Replace various subtle colors with WikimediaUI palette ones

Change-Id: I96363124e21152b091ccd4143b9bece0c67e59fa
---
M modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
M modules/dashboard/styles/ext.cx.lists.common.less
M modules/dashboard/styles/ext.cx.suggestionlist.less
M modules/source/styles/ext.cx.source.selector.less
M modules/tools/styles/ext.cx.tools.categories.less
M modules/tools/styles/ext.cx.tools.formatter.less
M modules/widgets/common/ext.cx.highlight.less
7 files changed, 10 insertions(+), 10 deletions(-)

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



diff --git a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less 
b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
index fdcc285..825fe6c 100644
--- a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
+++ b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
@@ -50,7 +50,7 @@
}
 
.cx-campaign-contributionsmenu__expansion {
-   background-color: #ecf5ff;
+   background-color: #eaf3ff;
.background-image-svg( '../images/question.svg', 
'../images/question.png' );
background-position: left 8px center;
background-repeat: no-repeat;
diff --git a/modules/dashboard/styles/ext.cx.lists.common.less 
b/modules/dashboard/styles/ext.cx.lists.common.less
index 3c2df5c..3c51aaa 100644
--- a/modules/dashboard/styles/ext.cx.lists.common.less
+++ b/modules/dashboard/styles/ext.cx.lists.common.less
@@ -14,11 +14,11 @@
.flex-center;
 
&:hover {
-   background-color: #eff3fb;
+   background-color: #eaf3ff;
 
.cx-tlitem__languages__language--source:after,
.cx-slitem__languages__language--source:after {
-   border-left-color: #eff3fb;
+   border-left-color: #eaf3ff;
}
}
 
diff --git a/modules/dashboard/styles/ext.cx.suggestionlist.less 
b/modules/dashboard/styles/ext.cx.suggestionlist.less
index de69d19..8d3278c 100644
--- a/modules/dashboard/styles/ext.cx.suggestionlist.less
+++ b/modules/dashboard/styles/ext.cx.suggestionlist.less
@@ -69,7 +69,7 @@
cursor: pointer;
 
&:hover {
-   background-color: #eff3fb;
+   background-color: #eaf3ff;
}
 }
 
@@ -97,7 +97,7 @@
 .cx-slitem {
&:hover {
.cx-slitem__desc:after {
-   background-color: #eff3fb;
+   background-color: #eaf3ff;
.transition( background-color 100ms );
}
}
diff --git a/modules/source/styles/ext.cx.source.selector.less 
b/modules/source/styles/ext.cx.source.selector.less
index da7e61c..3739e37 100644
--- a/modules/source/styles/ext.cx.source.selector.less
+++ b/modules/source/styles/ext.cx.source.selector.less
@@ -19,7 +19,7 @@
.cx-sourceselector-dialog__heading {
.mw-ui-one-whole;
 
-   border-bottom: 1px solid #eee;
+   border-bottom: 1px solid #eaecf0;
padding: 0.4em 0.6em;
font-size: 1.6em;
line-height: 1.5;
@@ -128,7 +128,7 @@
.flex-center;
 
height: 40px;
-   border-bottom: 1px solid #eee;
+   border-bottom: 1px solid #eaecf0;
padding: 10px;
 
&--focused {
diff --git a/modules/tools/styles/ext.cx.tools.categories.less 
b/modules/tools/styles/ext.cx.tools.categories.less
index 5f3e464..a388421 100644
--- a/modules/tools/styles/ext.cx.tools.categories.less
+++ b/modules/tools/styles/ext.cx.tools.categories.less
@@ -1,7 +1,7 @@
 @import '../../widgets/common/ext.cx.common.less';
 @import 'mediawiki.mixins';
 
-@text-highlight-color: #fefce0;
+@text-highlight-color: #fef6e7;
 
 .cx-category-widget {
.mw-ui-item;
diff --git a/modules/tools/styles/ext.cx.tools.formatter.less 
b/modules/tools/styles/ext.cx.tools.formatter.less
index 4c48335..7e5a456 100644
--- a/modules/tools/styles/ext.cx.tools.formatter.less
+++ b/modules/tools/styles/ext.cx.tools.formatter.less
@@ -11,7 +11,7 @@
min-width: 30px;
height: 30px;
border: 0;
-   border-right: 1px solid #fbfbfb;
+   border-right: 1px solid #f8f9fa;
background-color: transparent;
color: @gray-dark;
.box-sizing( border-box );
diff --git a/modules/widgets/common/ext.cx.highlight.less 
b/modules/widgets/common/ext.cx.highlight.less
index af3ad0b..615751b 100644
--- a/modules/wid

[MediaWiki-commits] [Gerrit] oojs/ui[master]: onMenuToggle: isVilible is the state of the menu, not an eve...

[Prtksxna (Code Review)]

Prtksxna has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387767 )

Change subject: onMenuToggle: isVilible is the state of the menu, not an event 
obejct
..

onMenuToggle: isVilible is the state of the menu, not an event obejct

Follows-up on I2ce131cdafed5feaf8f3e42164801c042c844711

Change-Id: I0cc7e7592941110d0c56dcd98937e8686030f37b
---
M src/widgets/CapsuleMultiselectWidget.js
M src/widgets/ComboBoxInputWidget.js
M src/widgets/DropdownWidget.js
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/67/387767/1

diff --git a/src/widgets/CapsuleMultiselectWidget.js 
b/src/widgets/CapsuleMultiselectWidget.js
index f4a398a..5509050 100644
--- a/src/widgets/CapsuleMultiselectWidget.js
+++ b/src/widgets/CapsuleMultiselectWidget.js
@@ -734,7 +734,7 @@
  * Handle menu toggle events.
  *
  * @private
- * @param {boolean} isVisible Menu toggle event
+ * @param {boolean} isVisible Open state of the menu
  */
 OO.ui.CapsuleMultiselectWidget.prototype.onMenuToggle = function ( isVisible ) 
{
this.$element.toggleClass( 'oo-ui-capsuleMultiselectWidget-open', 
isVisible );
diff --git a/src/widgets/ComboBoxInputWidget.js 
b/src/widgets/ComboBoxInputWidget.js
index 10ff531..f4206f3 100644
--- a/src/widgets/ComboBoxInputWidget.js
+++ b/src/widgets/ComboBoxInputWidget.js
@@ -224,7 +224,7 @@
  * Handle menu toggle events.
  *
  * @private
- * @param {boolean} isVisible Menu toggle event
+ * @param {boolean} isVisible Open state of the menu
  */
 OO.ui.ComboBoxInputWidget.prototype.onMenuToggle = function ( isVisible ) {
this.$element.toggleClass( 'oo-ui-comboBoxInputWidget-open', isVisible 
);
diff --git a/src/widgets/DropdownWidget.js b/src/widgets/DropdownWidget.js
index ca96223..09a157f 100644
--- a/src/widgets/DropdownWidget.js
+++ b/src/widgets/DropdownWidget.js
@@ -154,7 +154,7 @@
  * Handle menu toggle events.
  *
  * @private
- * @param {boolean} isVisible Menu toggle event
+ * @param {boolean} isVisible Open state of the menu
  */
 OO.ui.DropdownWidget.prototype.onMenuToggle = function ( isVisible ) {
this.$element.toggleClass( 'oo-ui-dropdownWidget-open', isVisible );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cc7e7592941110d0c56dcd98937e8686030f37b
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna 

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Use scriptpath instead of wgScriptPath

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387684 )

Change subject: Use scriptpath instead of wgScriptPath
..


Use scriptpath instead of wgScriptPath

 * Also, get rid of this as a cli argument since its usecase seems
   long gone.

Change-Id: I2c8771d25c27581b8ef160f77fb206e254b8f1ef
---
M bin/parse.js
M bin/parserTests.js
M lib/wt2html/tt/ParserFunctions.js
3 files changed, 2 insertions(+), 9 deletions(-)

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



diff --git a/bin/parse.js b/bin/parse.js
index 4988209..effdc81 100755
--- a/bin/parse.js
+++ b/bin/parse.js
@@ -259,11 +259,6 @@
env.bumpTimeUse("Init", initTime);
}
 
-   // fetch templates from enwiki by default.
-   if (argv.wgScriptPath) {
-   env.conf.wiki.wgScriptPath = argv.wgScriptPath;
-   }
-
// Enable wikitext scrubbing
env.scrubWikitext = argv.scrubWikitext;
 
diff --git a/bin/parserTests.js b/bin/parserTests.js
index 01e2ac5..e855292 100755
--- a/bin/parserTests.js
+++ b/bin/parserTests.js
@@ -1443,7 +1443,7 @@
wikiConf.fakeTimestamp = 123;
wikiConf.timezoneOffset = 0; // force utc for parsertests
wikiConf.server = 'http://example.org';
-   wikiConf.wgScriptPath = '/';
+   wikiConf.scriptpath = '/';
wikiConf.script = '/index.php';
wikiConf.articlePath = '/wiki/$1';
wikiConf.interwikiMap.clear();
diff --git a/lib/wt2html/tt/ParserFunctions.js 
b/lib/wt2html/tt/ParserFunctions.js
index ca86752..4304d2a 100644
--- a/lib/wt2html/tt/ParserFunctions.js
+++ b/lib/wt2html/tt/ParserFunctions.js
@@ -704,8 +704,6 @@
}
cb({
tokens: [
-   // FIXME! Figure out correct prefix to 
use
-   // this.env.conf.wiki.wgScriptPath +
env.conf.wiki.script + '?title=' +
env.normalizedTitleKey(target) + '&' +
expandedArgs.join('&'),
@@ -845,7 +843,7 @@
cb({ tokens: [this.env.page.name || ''] });
 };
 ParserFunctions.prototype.pf_scriptpath = function(token, frame, cb, args) {
-   cb({ tokens: [this.env.conf.wiki.wgScriptPath] });
+   cb({ tokens: [this.env.conf.wiki.scriptpath] });
 };
 ParserFunctions.prototype.pf_server = function(token, frame, cb, args) {
var dataAttribs = Util.clone(token.dataAttribs);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c8771d25c27581b8ef160f77fb206e254b8f1ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Sbailey 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Replace various subtle colors with WikimediaUI palette ones

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387766 )

Change subject: Replace various subtle colors with WikimediaUI palette ones
..

Replace various subtle colors with WikimediaUI palette ones

Change-Id: I96363124e21152b091ccd4143b9bece0c67e59fa
---
M modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
M modules/dashboard/styles/ext.cx.lists.common.less
M modules/dashboard/styles/ext.cx.suggestionlist.less
M modules/source/styles/ext.cx.source.selector.less
M modules/tools/styles/ext.cx.tools.categories.less
M modules/tools/styles/ext.cx.tools.formatter.less
M modules/widgets/common/ext.cx.highlight.less
7 files changed, 10 insertions(+), 10 deletions(-)


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

diff --git a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less 
b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
index fdcc285..825fe6c 100644
--- a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
+++ b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less
@@ -50,7 +50,7 @@
}
 
.cx-campaign-contributionsmenu__expansion {
-   background-color: #ecf5ff;
+   background-color: #eaf3ff;
.background-image-svg( '../images/question.svg', 
'../images/question.png' );
background-position: left 8px center;
background-repeat: no-repeat;
diff --git a/modules/dashboard/styles/ext.cx.lists.common.less 
b/modules/dashboard/styles/ext.cx.lists.common.less
index 3c2df5c..3c51aaa 100644
--- a/modules/dashboard/styles/ext.cx.lists.common.less
+++ b/modules/dashboard/styles/ext.cx.lists.common.less
@@ -14,11 +14,11 @@
.flex-center;
 
&:hover {
-   background-color: #eff3fb;
+   background-color: #eaf3ff;
 
.cx-tlitem__languages__language--source:after,
.cx-slitem__languages__language--source:after {
-   border-left-color: #eff3fb;
+   border-left-color: #eaf3ff;
}
}
 
diff --git a/modules/dashboard/styles/ext.cx.suggestionlist.less 
b/modules/dashboard/styles/ext.cx.suggestionlist.less
index de69d19..8d3278c 100644
--- a/modules/dashboard/styles/ext.cx.suggestionlist.less
+++ b/modules/dashboard/styles/ext.cx.suggestionlist.less
@@ -69,7 +69,7 @@
cursor: pointer;
 
&:hover {
-   background-color: #eff3fb;
+   background-color: #eaf3ff;
}
 }
 
@@ -97,7 +97,7 @@
 .cx-slitem {
&:hover {
.cx-slitem__desc:after {
-   background-color: #eff3fb;
+   background-color: #eaf3ff;
.transition( background-color 100ms );
}
}
diff --git a/modules/source/styles/ext.cx.source.selector.less 
b/modules/source/styles/ext.cx.source.selector.less
index da7e61c..3739e37 100644
--- a/modules/source/styles/ext.cx.source.selector.less
+++ b/modules/source/styles/ext.cx.source.selector.less
@@ -19,7 +19,7 @@
.cx-sourceselector-dialog__heading {
.mw-ui-one-whole;
 
-   border-bottom: 1px solid #eee;
+   border-bottom: 1px solid #eaecf0;
padding: 0.4em 0.6em;
font-size: 1.6em;
line-height: 1.5;
@@ -128,7 +128,7 @@
.flex-center;
 
height: 40px;
-   border-bottom: 1px solid #eee;
+   border-bottom: 1px solid #eaecf0;
padding: 10px;
 
&--focused {
diff --git a/modules/tools/styles/ext.cx.tools.categories.less 
b/modules/tools/styles/ext.cx.tools.categories.less
index 5f3e464..a388421 100644
--- a/modules/tools/styles/ext.cx.tools.categories.less
+++ b/modules/tools/styles/ext.cx.tools.categories.less
@@ -1,7 +1,7 @@
 @import '../../widgets/common/ext.cx.common.less';
 @import 'mediawiki.mixins';
 
-@text-highlight-color: #fefce0;
+@text-highlight-color: #fef6e7;
 
 .cx-category-widget {
.mw-ui-item;
diff --git a/modules/tools/styles/ext.cx.tools.formatter.less 
b/modules/tools/styles/ext.cx.tools.formatter.less
index 4c48335..7e5a456 100644
--- a/modules/tools/styles/ext.cx.tools.formatter.less
+++ b/modules/tools/styles/ext.cx.tools.formatter.less
@@ -11,7 +11,7 @@
min-width: 30px;
height: 30px;
border: 0;
-   border-right: 1px solid #fbfbfb;
+   border-right: 1px solid #f8f9fa;
background-color: transparent;
color: @gray-dark;
.box-sizing( border-box );
diff --git a/modules/widgets/common/ext.cx.highlight.less 
b/modules/widgets/common/ext.cx.highlight.less
index af3ad0b..615751b 

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Remove a trailing space

[Eileen (Code Review)]

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387764 )

Change subject: Remove a trailing space
..

Remove a trailing space

Change-Id: Idf7aea647142cf7f259b63270287be129f60509e
---
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnirecipients.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/64/387764/1

diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnirecipients.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnirecipients.php
index 4a0d91a..5e3fda0 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnirecipients.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnirecipients.php
@@ -13,7 +13,7 @@
 class CRM_Omnimail_Omnirecipients extends CRM_Omnimail_Omnimail{
 
   /**
-   * @var 
+   * @var
*/
   protected $request;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf7aea647142cf7f259b63270287be129f60509e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Make tests more readable by using dates

[Eileen (Code Review)]

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387765 )

Change subject: Make tests more readable by using dates
..

Make tests more readable by using dates

Bug: T179357

Change-Id: I462802f847d3ce9477aff9fd8e76ced38b450d74
---
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailBaseTestClass.php
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientLoadTest.php
3 files changed, 44 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/65/387765/1

diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
index 237df9b..814e231 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
@@ -97,14 +97,14 @@
 $this->cleanupGroup($group);
 
 $this->assertEquals(array(
-  'last_timestamp' => '1487890800',
+  'last_timestamp' => '2017-02-23 11:00:00',
   'offset' => 2,
   'retrieval_parameters' => array(
 'jobId' => '101719657',
 'filePath' => '/download/20170509_noCID - All - Jul 5 2017 06-27-45 
AM.csv',
   ),
-  'progress_end_timestamp' => '1488495600',
-), $this->getJobSettings());
+  'progress_end_timestamp' => '2017-03-02 11:00:00',
+), $this->getUtcDateFormattedJobSettings());
 
   }
 
@@ -132,14 +132,14 @@
 $this->assertEquals(0, $groupMembers['count']);
 
 $this->assertEquals(array(
-  'last_timestamp' => '1487890800',
+  'last_timestamp' => '2017-02-23 11:00:00',
   'retrieval_parameters' => array(
 'jobId' => '101719657',
 'filePath' => '/download/20170509_noCID - All - Jul 5 2017 06-27-45 
AM.csv',
   ),
-  'progress_end_timestamp' => '1488495600',
+  'progress_end_timestamp' => '2017-03-02 11:00:00',
   'offset' => 0,
-), $this->getJobSettings());
+), $this->getUtcDateFormattedJobSettings());
 $this->cleanupGroup($group);
   }
 
@@ -176,14 +176,14 @@
 $this->assertEquals(0, $groupMembers['count']);
 
 $this->assertEquals(array(
-  'last_timestamp' => '1487890800',
+  'last_timestamp' => '2017-02-23 11:00:00',
   'retrieval_parameters' => array(
 'jobId' => '101719657',
 'filePath' => '/download/20170509_noCID - All - Jul 5 2017 06-27-45 
AM.csv',
   ),
-  'progress_end_timestamp' => '1488495600',
+  'progress_end_timestamp' => '2017-03-02 11:00:00',
   'offset' => 0,
-), $this->getJobSettings(array('mail_provider' => 'Silverpop', 
'job_identifier' => '_woot')));
+), $this->getUtcDateFormattedJobSettings(array('mail_provider' => 
'Silverpop', 'job_identifier' => '_woot')));
 $this->cleanupGroup($group);
   }
 
@@ -218,8 +218,8 @@
 $this->assertEquals(3, $groupMembers['count']);
 
 $this->assertEquals(array(
-  'last_timestamp' => '1488495600',
-), $this->getJobSettings(array('mail_provider' => 'Silverpop')));
+  'last_timestamp' => '2017-03-02 11:00:00',
+), $this->getUtcDateFormattedJobSettings(array('mail_provider' => 
'Silverpop')));
 $this->cleanupGroup($group);
   }
 
diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailBaseTestClass.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailBaseTestClass.php
index 6e814e8..6830f14 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailBaseTestClass.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailBaseTestClass.php
@@ -82,7 +82,7 @@
   protected function createSetting($values) {
 foreach (array('last_timestamp', 'progress_end_timestamp') as $dateField) {
   if (!empty($values[$dateField])) {
-$values[$dateField] = date('YmdHis', $values[$dateField]);
+$values[$dateField] = gmdate('YmdHis', $values[$dateField]);
   }
 }
 try {
@@ -92,4 +92,23 @@
   $this->fail(print_r($values, 1), $e->getMessage() . 
$e->getTraceAsString() . print_r($e->getExtraParams(), TRUE));
 }
   }
+
+  /**
+   * Get job settings with dates rendered to UTC string.
+   *
+   * @param array $params
+   *
+   * @return array
+   */
+  public function getUtcDateFormattedJobSettings($params = 
array('mail_provider' => 'Silverpop')) {
+ $settings = $this->getJobSettings($params);
+ $dateFields = array('last_timestamp', 'progress_end_timestamp');
+ foreach ($dateFields as $dateField) {
+   if (!empty($settings[$dateField])) {
+ $setting

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Replace `border-color` with WikimediaUI palette one

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387763 )

Change subject: Replace `border-color` with WikimediaUI palette one
..

Replace `border-color` with WikimediaUI palette one

Replacing `#ccc` with WikimediaUI color palette's `#c8ccd1`.

Change-Id: Idb7f7b67c2df7a2dac61d09de46bf527713ab465
---
M modules/ext.RevisionSlider.lazy.css
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/63/387763/1

diff --git a/modules/ext.RevisionSlider.lazy.css 
b/modules/ext.RevisionSlider.lazy.css
index 549aff1..62228d8 100644
--- a/modules/ext.RevisionSlider.lazy.css
+++ b/modules/ext.RevisionSlider.lazy.css
@@ -9,12 +9,12 @@
/* the interface is in RTL */
direction: ltr;
position: relative;
-   border: 1px solid #ccc;
+   border: 1px solid #c8ccd1;
 }
 
 .mw-revslider-slider-wrapper {
min-height: 142px;
-   border-top: 1px solid #ccc;
+   border-top: 1px solid #c8ccd1;
padding: 20px 10px;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb7f7b67c2df7a2dac61d09de46bf527713ab465
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Overrule `margin` of frameless OOUI `mw-revslider-toggle-but...

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387762 )

Change subject: Overrule `margin` of frameless OOUI `mw-revslider-toggle-button`
..

Overrule `margin` of frameless OOUI `mw-revslider-toggle-button`

Setting horizontal `margin` to `0` on `.mw-revslider-toggle-button`.

Change-Id: I1ba01061ebafe799ca62dbb6ce5e79459612af23
---
M modules/ext.RevisionSlider.less
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/modules/ext.RevisionSlider.less b/modules/ext.RevisionSlider.less
index ad0f409..928a753 100644
--- a/modules/ext.RevisionSlider.less
+++ b/modules/ext.RevisionSlider.less
@@ -5,6 +5,14 @@
 /* Use darker color for handle */
 @oldHandle: darken( @old, 18% );
 
+.mw-revslider-container {
+   // Overrule OOUI frameless button `margin`
+   
.mw-revslider-toggle-button.oo-ui-buttonElement-frameless.oo-ui-labelElement.oo-ui-iconElement
 {
+   margin-left: 0;
+   margin-right: 0;
+   }
+}
+
 .mw-revslider-container-expanded {
margin-bottom: 15px;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ba01061ebafe799ca62dbb6ce5e79459612af23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] labs/invisible-unicorn[refs/meta/config]: Mark repository as read only

[BryanDavis (Code Review)]

BryanDavis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387026 )

Change subject: Mark repository as read only
..


Mark repository as read only

Bug: T154099
Change-Id: Ie2c2ec4bef95e51e48c30434bd53d4c4ccb80855
---
M project.config
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/project.config b/project.config
index 5131d78..89f406b 100644
--- a/project.config
+++ b/project.config
@@ -1,6 +1,6 @@
 [project]
-   state = active
-   description = API for dynamicproxy module.
+   state = Read Only
+   description = [ARCHIVED] Moved to 
operations/puppet/modules/dynamicproxy/files/invisible-unicorn.py
 [access "refs/*"]
owner = group Project and Group Creators
owner = group ldap/wmf

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2c2ec4bef95e51e48c30434bd53d4c4ccb80855
Gerrit-PatchSet: 4
Gerrit-Project: labs/invisible-unicorn
Gerrit-Branch: refs/meta/config
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: MarcoAurelio 
Gerrit-Reviewer: Tim Landscheidt 

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Filter ID should always go through formatNum()

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387755 )

Change subject: Filter ID should always go through formatNum()
..


Filter ID should always go through formatNum()

Change-Id: I2bd833c35128b3c39c7882321747837184095bef
---
M includes/special/SpecialAbuseLog.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/includes/special/SpecialAbuseLog.php 
b/includes/special/SpecialAbuseLog.php
index 16529d3..ea98bb7 100644
--- a/includes/special/SpecialAbuseLog.php
+++ b/includes/special/SpecialAbuseLog.php
@@ -353,7 +353,9 @@
$output = Xml::element(
'legend',
null,
-   $this->msg( 'abusefilter-log-details-legend', $id 
)->text()
+   $this->msg( 'abusefilter-log-details-legend' )
+   ->numParams( $id )
+   ->text()
);
$output .= Xml::tags( 'p', null, $this->formatRow( $row, false 
) );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2bd833c35128b3c39c7882321747837184095bef
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Huji 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Huji 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Matěj Suchánek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: AbuseFilter block range should not exceed wgBlockCIDRLimit

[Huji (Code Review)]

Huji has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387761 )

Change subject: AbuseFilter block range should not exceed wgBlockCIDRLimit
..

AbuseFilter block range should not exceed wgBlockCIDRLimit

This patch introduces a config variable for the range block sizes.
It changes the defaut IPv6 block from /16 to /19 using the same
reasoning as  Ia25e156fd8234519c4d74f1d41d93f94a313ce14

Using a config var (as opposed to hardcoded range size) allows
future changes proposed in T179454 to make the range size vary
for different IPs, based on the actual subnet they belong to.

Bug: T179455, T179456
Change-Id: I8dfa17f553a7af524f0a11c0fd51c48773e27be5
---
M extension.json
M includes/AbuseFilter.class.php
2 files changed, 12 insertions(+), 2 deletions(-)


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

diff --git a/extension.json b/extension.json
index 4bbb34f..8a9dfc7 100644
--- a/extension.json
+++ b/extension.json
@@ -250,7 +250,11 @@
"AbuseFilterLogIPMaxAge": 7776000,
"AbuseFilterProfile": false,
"AbuseFilterRuntimeProfile": false,
-   "AbuseFilterSlowFilterRuntimeLimit": 500
+   "AbuseFilterSlowFilterRuntimeLimit": 500,
+   "AbuseFilterRangeBlockSize" : {
+   "IPv4": 16,
+   "IPv6": 19
+   }
},
"load_composer_autoloader": true,
"manifest_version": 1
diff --git a/includes/AbuseFilter.class.php b/includes/AbuseFilter.class.php
index 0487452..22b9ad5 100644
--- a/includes/AbuseFilter.class.php
+++ b/includes/AbuseFilter.class.php
@@ -1447,12 +1447,18 @@
];
break;
case 'rangeblock':
+   if ( IP::isIPv6( $wgRequest->getIP() ) ) {
+   $CIDRsize = max( 
$wgAbuseFilterRangeBlockSize['IPv6'], $wgBlockCIDRLimit['IPv6'] );
+   } else {
+   $CIDRsize = max( 
$wgAbuseFilterRangeBlockSize['IPv4'], $wgBlockCIDRLimit['IPv4'] );
+   }
+   $blockCIDR = $wgRequest->getIP() . '/' . 
$CIDRsize;
self::doAbuseFilterBlock(
[
'desc' => $rule_desc,
'number' => $rule_number
],
-   IP::sanitizeRange( $wgRequest->getIP() 
. '/16' ),
+   IP::sanitizeRange( $blockCIDR ),
'1 week',
false
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8dfa17f553a7af524f0a11c0fd51c48773e27be5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Huji 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Remove obsolete CSS `.mw-revslider-button-active` rule

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387760 )

Change subject: Remove obsolete CSS `.mw-revslider-button-active` rule
..

Remove obsolete CSS `.mw-revslider-button-active` rule

Removing unused CSS rule for `.mw-revslider-button-active`, which
is not in use anywhere.

Change-Id: Id1c7e8e17b03b54105266bca0418b285840de4f7
---
M modules/ext.RevisionSlider.less
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/60/387760/1

diff --git a/modules/ext.RevisionSlider.less b/modules/ext.RevisionSlider.less
index 87150bb..ad0f409 100644
--- a/modules/ext.RevisionSlider.less
+++ b/modules/ext.RevisionSlider.less
@@ -20,10 +20,6 @@
right: 2.109375em;
 }
 
-.mw-revslider-button-active {
-   background-color: #999;
-}
-
 .mw-revslider-revision {
position: relative;
margin-top: 70px;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1c7e8e17b03b54105266bca0418b285840de4f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resources: Remove deprecated 'mediawiki.widgets.CategorySele...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386472 )

Change subject: resources: Remove deprecated 
'mediawiki.widgets.CategorySelector' module alias
..


resources: Remove deprecated 'mediawiki.widgets.CategorySelector' module alias

Change-Id: I28557186a6cfe45b2a378f06ca59848be3f8e781
---
M RELEASE-NOTES-1.31
M resources/Resources.php
2 files changed, 2 insertions(+), 6 deletions(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 2f2ba8f..4bfcfcb 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -36,6 +36,8 @@
 * The deprecated 'jquery.placeholder' module was removed.
 * The deprecated 'jquery.appear' module was removed. Use the
   'mediawiki.viewport' module instead.
+* The deprecated 'mediawiki.widgets.CategorySelector' module alias was removed.
+  Use the 'mediawiki.widgets.CategoryMultiselectWidget' module directly 
instead.
 * …
 
 === Bug fixes in 1.31 ===
diff --git a/resources/Resources.php b/resources/Resources.php
index 940dbe4..eb33ff7 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2506,12 +2506,6 @@
],
'targets' => [ 'desktop', 'mobile' ],
],
-   'mediawiki.widgets.CategorySelector' => [
-   'deprecated' => 'Use "mw.widgets.CategoryMultiselectWidget" 
instead. See T161285.',
-   'dependencies' => [
-   'mediawiki.widgets.CategoryMultiselectWidget',
-   ],
-   ],
'mediawiki.widgets.CategoryMultiselectWidget' => [
'scripts' => [

'resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I28557186a6cfe45b2a378f06ca59848be3f8e781
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add statsd metric support to WANObjectCache

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/385122 )

Change subject: Add statsd metric support to WANObjectCache
..


Add statsd metric support to WANObjectCache

Bug: T178531
Change-Id: I3037281d09cd5195347789f544deae89711f128b
---
M includes/DefaultSettings.php
M includes/libs/objectcache/WANObjectCache.php
M includes/objectcache/ObjectCache.php
M tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
4 files changed, 60 insertions(+), 5 deletions(-)

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



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 040f1ce..7127803 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6351,7 +6351,9 @@
  * Rates are sampling probabilities (e.g. 0.1 means 1 in 10 events are 
sampled).
  * @since 1.28
  */
-$wgStatsdSamplingRates = [];
+$wgStatsdSamplingRates = [
+   'wanobjectcache:*' => 0.001
+];
 
 /**
  * InfoAction retrieves a list of transclusion links (both to and from).
diff --git a/includes/libs/objectcache/WANObjectCache.php 
b/includes/libs/objectcache/WANObjectCache.php
index 0531d7f7..79f2e44 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -19,6 +19,7 @@
  * @ingroup Cache
  */
 
+use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
@@ -88,6 +89,8 @@
protected $purgeRelayer;
/** @var LoggerInterface */
protected $logger;
+   /** @var StatsdDataFactoryInterface */
+   protected $stats;
 
/** @var int ERR_* constant for the "last error" registry */
protected $lastRelayError = self::ERR_NONE;
@@ -177,6 +180,7 @@
 *   - channels : Map of (action => channel string). Actions include 
"purge".
 *   - relayers : Map of (action => EventRelayer object). Actions 
include "purge".
 *   - logger   : LoggerInterface object
+*   - stats: LoggerInterface object
 */
public function __construct( array $params ) {
$this->cache = $params['cache'];
@@ -187,6 +191,7 @@
? $params['relayers']['purge']
: new EventRelayerNull( [] );
$this->setLogger( isset( $params['logger'] ) ? 
$params['logger'] : new NullLogger() );
+   $this->stats = isset( $params['stats'] ) ? $params['stats'] : 
new NullStatsdDataFactory();
}
 
public function setLogger( LoggerInterface $logger ) {
@@ -239,7 +244,7 @@
 * Consider using getWithSetCallback() instead of get() and set() 
cycles.
 * That method has cache slam avoiding features for hot/expensive keys.
 *
-* @param string $key Cache key
+* @param string $key Cache key made from makeKey() or makeGlobalKey()
 * @param mixed &$curTTL Approximate TTL left on the key if 
present/tombstoned [returned]
 * @param array $checkKeys List of "check" keys
 * @param float &$asOf UNIX timestamp of cached value; null on failure 
[returned]
@@ -260,7 +265,7 @@
 *
 * @see WANObjectCache::get()
 *
-* @param array $keys List of cache keys
+* @param array $keys List of cache keys made from makeKey() or 
makeGlobalKey()
 * @param array &$curTTLs Map of (key => approximate TTL left) for 
existing keys [returned]
 * @param array $checkKeys List of check keys to apply to all $keys. 
May also apply "check"
 *  keys to specific cache keys only by using cache keys as keys in the 
$checkKeys array.
@@ -799,7 +804,7 @@
 * @see WANObjectCache::get()
 * @see WANObjectCache::set()
 *
-* @param string $key Cache key
+* @param string $key Cache key made from makeKey() or makeGlobalKey()
 * @param int $ttl Seconds to live for key updates. Special values are:
 *   - WANObjectCache::TTL_INDEFINITE: Cache forever
 *   - WANObjectCache::TTL_UNCACHEABLE: Do not cache at all
@@ -951,6 +956,9 @@
$minTime = isset( $opts['minAsOf'] ) ? $opts['minAsOf'] : 
self::MIN_TIMESTAMP_NONE;
$versioned = isset( $opts['version'] );
 
+   // Get a collection name to describe this class of key
+   $kClass = $this->determineKeyClass( $key );
+
// Get the current key value
$curTTL = null;
$cValue = $this->get( $key, $curTTL, $checkKeys, $asOf ); // 
current value
@@ -964,6 +972,8 @@
&& !$this->worthRefreshExpiring( $curTTL, $lowTTL )
&& !$this->worthRefreshPopular( $asOf, $ageNew, 
$popWindow, $preCallbackTime )
) {
+   $this->stats->increment( 
"wanobjectcache.$kClass.h

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resources: Remove deprecated 'jquery.placeholder' module

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386470 )

Change subject: resources: Remove deprecated 'jquery.placeholder' module
..


resources: Remove deprecated 'jquery.placeholder' module

Change-Id: I1f14561e54df477067460411ff155e3f2eeb167a
---
M RELEASE-NOTES-1.31
M resources/Resources.php
D resources/src/jquery/jquery.placeholder.js
M resources/src/mediawiki.less/mediawiki.mixins.less
4 files changed, 1 insertion(+), 28 deletions(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 17dba87..5e2df5f 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -33,6 +33,7 @@
 * (T17845) The deprecated 'jquery.badge' module was removed.
 * The deprecated 'jquery.autoEllipsis' module was removed. Use the CSS
   text-overflow property instead.
+* The deprecated 'jquery.placeholder' module was removed.
 * …
 
 === Bug fixes in 1.31 ===
diff --git a/resources/Resources.php b/resources/Resources.php
index 545a84c..9acc0ef 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -286,12 +286,6 @@
'scripts' => 'resources/src/jquery/jquery.mw-jump.js',
'targets' => [ 'desktop', 'mobile' ],
],
-   'jquery.placeholder' => [
-   'deprecated' => 'Use of "jquery.placeholder" is deprecated 
since MediaWiki 1.29.0',
-
-   'scripts' => 'resources/src/jquery/jquery.placeholder.js',
-   'targets' => [ 'desktop', 'mobile' ],
-   ],
'jquery.qunit' => [
'scripts' => 'resources/lib/qunitjs/qunit.js',
'styles' => 'resources/lib/qunitjs/qunit.css',
diff --git a/resources/src/jquery/jquery.placeholder.js 
b/resources/src/jquery/jquery.placeholder.js
deleted file mode 100644
index afb8837..000
--- a/resources/src/jquery/jquery.placeholder.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*!
- * No-op for compatibility with code from before we used
- * native placeholder in all supported browsers.
- */
-
-( function ( $ ) {
-   var placeholder;
-
-   placeholder = $.fn.placeholder = function ( text ) {
-   if ( arguments.length ) {
-   this.prop( 'placeholder', text );
-   }
-   return this;
-   };
-
-   placeholder.input = placeholder.textarea = true;
-
-}( jQuery ) );
diff --git a/resources/src/mediawiki.less/mediawiki.mixins.less 
b/resources/src/mediawiki.less/mediawiki.mixins.less
index fb3b00e..ea0b959 100644
--- a/resources/src/mediawiki.less/mediawiki.mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.mixins.less
@@ -171,10 +171,6 @@
&::placeholder {
@rules();
}
-   // For inputs that use jquery.placeholder.js e.g. IE9
-   &.placeholder {
-   @rules();
-   }
 }
 /* stylelint-enable selector-no-vendor-prefix, at-rule-no-unknown */
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f14561e54df477067460411ff155e3f2eeb167a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resources: Remove deprecated 'jquery.appear' module

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386471 )

Change subject: resources: Remove deprecated 'jquery.appear' module
..


resources: Remove deprecated 'jquery.appear' module

Change-Id: Ifce63eb64c94203acb049d3f588e75f18123f12e
---
M RELEASE-NOTES-1.31
M resources/Resources.php
D resources/lib/jquery/jquery.appear.js
3 files changed, 2 insertions(+), 142 deletions(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 5e2df5f..2f2ba8f 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -34,6 +34,8 @@
 * The deprecated 'jquery.autoEllipsis' module was removed. Use the CSS
   text-overflow property instead.
 * The deprecated 'jquery.placeholder' module was removed.
+* The deprecated 'jquery.appear' module was removed. Use the
+  'mediawiki.viewport' module instead.
 * …
 
 === Bug fixes in 1.31 ===
diff --git a/resources/Resources.php b/resources/Resources.php
index 9acc0ef..940dbe4 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -151,10 +151,6 @@
'messages' => [ 'brackets', 'word-separator' ],
'targets' => [ 'mobile', 'desktop' ],
],
-   'jquery.appear' => [
-   'deprecated' => 'Please use "mediawiki.viewport" instead.',
-   'scripts' => 'resources/lib/jquery/jquery.appear.js',
-   ],
'jquery.async' => [
'scripts' => 'resources/lib/jquery/jquery.async.js',
],
diff --git a/resources/lib/jquery/jquery.appear.js 
b/resources/lib/jquery/jquery.appear.js
deleted file mode 100644
index 4f77886..000
--- a/resources/lib/jquery/jquery.appear.js
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * jQuery.appear
- * http://code.google.com/p/jquery-appear/
- *
- * Copyright (c) 2009 Michael Hixson
- * Licensed under the MIT license 
(http://www.opensource.org/licenses/mit-license.php)
-*/
-(function($) {
-
-   $.fn.appear = function(fn, options) {
-
-   var settings = $.extend({
- 
-   //arbitrary data to pass to fn
-   data: undefined,
- 
-   //call fn only on the first appear?
-   one: true
-
-   }, options);
-
-   return this.each(function() {
-
-   var t = $(this);
-
-   //whether the element is currently visible
-   t.appeared = false;
-
-   if (!fn) {
- 
-   //trigger the custom event
-   t.trigger('appear', settings.data);
-   return;
-   }
-
-   var w = $(window);
-
-   //fires the appear event when appropriate
-   var check = function() {
- 
-   //is the element hidden?
-   if (!t.is(':visible')) {
-
-   //it became hidden
-   t.appeared = false;
-   return;
-   }
- 
-   //is the element inside the visible window?
-   var a = w.scrollLeft();
-   var b = w.scrollTop();
-   var o = t.offset();
-   var x = o.left;
-   var y = o.top;
-
-   if (y + t.height() >= b && 
-   y <= b + w.height() &&
-   x + t.width() >= a && 
-   x <= a + w.width()) {
- 
-   //trigger the custom event
-   if (!t.appeared) t.trigger('appear', 
settings.data);
-
-   } else {
- 
-   //it scrolled out of view
-   t.appeared = false;
-   }
-   };
- 
-   //create a modified fn with some additional logic
-   var modifiedFn = function() {
-
-   //mark the element as visible
-   t.appeared = true;
- 
-   //is this supposed to happen only once?
-   if (settings.one) {
- 
-  

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resources: Remove deprecated 'jquery.autoEllipsis' module

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386469 )

Change subject: resources: Remove deprecated 'jquery.autoEllipsis' module
..


resources: Remove deprecated 'jquery.autoEllipsis' module

Change-Id: Ib181b814953bac0153dead95a25040ed2d4ca7ca
---
M RELEASE-NOTES-1.31
M jsduck.json
M resources/Resources.php
D resources/src/jquery/jquery.autoEllipsis.js
M tests/qunit/QUnitTestResources.php
D tests/qunit/suites/resources/jquery/jquery.autoEllipsis.test.js
6 files changed, 2 insertions(+), 233 deletions(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index add2ee9..17dba87 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -31,6 +31,8 @@
 
  Removed and replaced external libraries 
 * (T17845) The deprecated 'jquery.badge' module was removed.
+* The deprecated 'jquery.autoEllipsis' module was removed. Use the CSS
+  text-overflow property instead.
 * …
 
 === Bug fixes in 1.31 ===
diff --git a/jsduck.json b/jsduck.json
index 0f8daf8..0021f37 100644
--- a/jsduck.json
+++ b/jsduck.json
@@ -21,7 +21,6 @@
"resources/src/mediawiki.toolbar",
"resources/src/mediawiki.widgets",
"resources/src/jquery/jquery.accessKeyLabel.js",
-   "resources/src/jquery/jquery.autoEllipsis.js",
"resources/src/jquery/jquery.byteLength.js",
"resources/src/jquery/jquery.byteLimit.js",
"resources/src/jquery/jquery.checkboxShiftClick.js",
diff --git a/resources/Resources.php b/resources/Resources.php
index ec995bc..545a84c 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -158,12 +158,6 @@
'jquery.async' => [
'scripts' => 'resources/lib/jquery/jquery.async.js',
],
-   'jquery.autoEllipsis' => [
-   'deprecated' => 'Use CSS text-overflow instead.',
-   'scripts' => 'resources/src/jquery/jquery.autoEllipsis.js',
-   'dependencies' => 'jquery.highlightText',
-   'targets' => [ 'desktop', 'mobile' ],
-   ],
'jquery.byteLength' => [
'scripts' => 'resources/src/jquery/jquery.byteLength.js',
'targets' => [ 'desktop', 'mobile' ],
diff --git a/resources/src/jquery/jquery.autoEllipsis.js 
b/resources/src/jquery/jquery.autoEllipsis.js
deleted file mode 100644
index 8716b69..000
--- a/resources/src/jquery/jquery.autoEllipsis.js
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * @class jQuery.plugin.autoEllipsis
- */
-( function ( $ ) {
-
-   var
-   // Cache ellipsed substrings for every string-width-position 
combination
-   cache = {},
-
-   // Use a separate cache when match highlighting is enabled
-   matchTextCache = {};
-
-   // Due to 
-   // jscs:disable jsDoc
-   /**
-* Automatically truncate the plain text contents of an element and add 
an ellipsis
-*
-* @param {Object} options
-* @param {'left'|'center'|'right'} [options.position='center'] Where 
to remove text.
-* @param {boolean} [options.tooltip=false] Whether to show a tooltip 
with the remainder
-* of the text.
-* @param {boolean} [options.restoreText=false] Whether to save the 
text for restoring
-* later.
-* @param {boolean} [options.hasSpan=false] Whether the element is 
already a container,
-* or if the library should create a new container for it.
-* @param {string|null} [options.matchText=null] Text to highlight, 
e.g. search terms.
-* @return {jQuery}
-* @chainable
-*/
-   $.fn.autoEllipsis = function ( options ) {
-   options = $.extend( {
-   position: 'center',
-   tooltip: false,
-   restoreText: false,
-   hasSpan: false,
-   matchText: null
-   }, options );
-
-   return this.each( function () {
-   var $trimmableText,
-   text, trimmableText, w, pw,
-   l, r, i, side, m,
-   // container element - used for measuring 
against
-   $container = $( this );
-
-   if ( options.restoreText ) {
-   if ( !$container.data( 
'autoEllipsis.originalText' ) ) {
-   $container.data( 
'autoEllipsis.originalText', $container.text() );
-   } else {
-   $container.text( $container.data( 
'autoEllipsis.originalText' ) );
-   }
-   }
-
-   

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add option for layer column(s) of map view

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386356 )

Change subject: Add option for layer column(s) of map view
..


Add option for layer column(s) of map view

The “layer” option can be either a single string or an array of strings,
specifying the selected variable(s) to use for the layer of a result
(the first nonempty variable in a result is used for the actual layer).
The variable must be specified with a leading question mark – other
values are reserved for future expansion.

Example:

#defaultView:Map{"layer": "?partyLabel"}

Change-Id: Ided10bb8c8ae279ab51e245b1df95f85e6fc0bd1
---
M wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
1 file changed, 6 insertions(+), 4 deletions(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js 
b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
index f790c03..1dbae88 100644
--- a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
@@ -29,7 +29,7 @@
var PREFIX_COMMONS_DATA = 'http://commons.wikimedia.org/data/main/';
var SUFFIX_COMMONS_MAP = '.map';
 
-   var LAYER_COLUMNS = [ 'layerLabel', 'layer' ];
+   var DEFAULT_LAYER_VARIABLES = [ '?layerLabel', '?layer' ];
var LAYER_DEFAULT_GROUP = '_LAYER_DEFAULT_GROUP';
 
var TILE_LAYER = {
@@ -348,9 +348,11 @@
 * @private
 */
SELF.prototype._getMarkerGroupsLayer = function( row ) {
-   var column = LAYER_COLUMNS.find( function( column ) {
-   return row[column];
-   } );
+   var variables = this.getOption( 'layer', 
DEFAULT_LAYER_VARIABLES ),
+   columns = this._getFormatter().getColumnNamesOption( 
variables ),
+   column = columns.find( function( column ) {
+   return row[column];
+   } );
 
return column ? row[column].value : LAYER_DEFAULT_GROUP;
};

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ided10bb8c8ae279ab51e245b1df95f85e6fc0bd1
Gerrit-PatchSet: 5
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add helper functions related to options

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386610 )

Change subject: Add helper functions related to options
..


Add helper functions related to options

AbstractResultBrowser.getOption() returns a single option, falling back
to a provided default value if the option is not specified.

FormatterHelper.getColumnNamesOption() turns one or more variable names
into the corresponding column names. The variable names can be specified
as a single value or as an array, and should start with a question mark.
Example:

#defaultView:Map{"layer": "?partyLabel"}

Change-Id: I78cfb4d8d53806146e3c27cef8a6aec7e35f9291
---
M wikibase/queryService/ui/resultBrowser/AbstractResultBrowser.js
M wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
M wikibase/tests/queryService/ui/resultBrowser/helper/FormatterHelper.test.js
3 files changed, 62 insertions(+), 0 deletions(-)

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



diff --git a/wikibase/queryService/ui/resultBrowser/AbstractResultBrowser.js 
b/wikibase/queryService/ui/resultBrowser/AbstractResultBrowser.js
index cbd2faf..65813f0 100644
--- a/wikibase/queryService/ui/resultBrowser/AbstractResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/AbstractResultBrowser.js
@@ -85,6 +85,29 @@
};
 
/**
+* Get a single option,
+* using a certain default value
+* if the option is not specified.
+*
+* @param {string} name The name of the option.
+* @param {*} defaultValue The default value to use if the option is 
not specified.
+* This parameter is not optional – if the option may be absent,
+* explicitly pass undefined as the default value.
+* @return {*}
+*/
+   SELF.prototype.getOption = function( name, defaultValue ) {
+   if ( arguments.length !== 2 ) {
+   throw new Error( 'getOption must be called with exactly 
two arguments' );
+   }
+
+   if ( name in this._options ) {
+   return this._options[ name ];
+   } else {
+   return defaultValue;
+   }
+   };
+
+   /**
 * Sets the SPARQL API
 *
 * @param {wikibase.queryService.api.Sparql} sparqlApi
diff --git a/wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js 
b/wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
index 69fde1b..5a5f6ac 100644
--- a/wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
+++ b/wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
@@ -457,6 +457,33 @@
};
 
/**
+* Gets a list of column names from a result browser option
+* specifying one or more corresponding variable names.
+* (The variable names start with a question mark,
+* the returned column names don’t.)
+*
+* @param {string[]|string} optionValue
+* @return {string[]}
+*/
+   SELF.prototype.getColumnNamesOption = function( optionValue ) {
+   if ( !Array.isArray( optionValue ) ) {
+   optionValue = [ optionValue ];
+   }
+   optionValue = optionValue.filter( function( variableName ) {
+   if ( !variableName.startsWith( '?' ) ) {
+   window.console.warn(
+   'column name ' + variableName + ' is 
not a variable name, ignoring'
+   );
+   return false;
+   }
+   return true;
+   } );
+   return optionValue.map( function( variableName ) {
+   return variableName.substring( 1 );
+   } );
+   };
+
+   /**
 * @see AbstractResultBrowser._i18n
 */
SELF.prototype._i18n = null;
diff --git 
a/wikibase/tests/queryService/ui/resultBrowser/helper/FormatterHelper.test.js 
b/wikibase/tests/queryService/ui/resultBrowser/helper/FormatterHelper.test.js
index b08858a..fc0a9ab 100644
--- 
a/wikibase/tests/queryService/ui/resultBrowser/helper/FormatterHelper.test.js
+++ 
b/wikibase/tests/queryService/ui/resultBrowser/helper/FormatterHelper.test.js
@@ -86,4 +86,16 @@
} );
} );
 
+   QUnit.test( 'getColumnNamesOption', function( assert ) {
+   assert.deepEqual( helper.getColumnNamesOption( '?foo' ), [ 
'foo' ], 'message foo' );
+
+   assert.deepEqual( helper.getColumnNamesOption( [ '?bar', '?baz' 
] ), [ 'bar', 'baz' ] );
+
+   var realWarn = window.console.warn;
+   window.console.warn = sinon.spy();
+   assert.deepEqual( helper.getColumnNamesOption( 'reserved' ), [] 
);
+   assert.ok( window.console.warn.ca

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: search: Hyphen to dash for range in results message

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/372453 )

Change subject: search: Hyphen to dash for range in results message
..


search: Hyphen to dash for range in results message

Change-Id: I0ace65b08a21b4024f7c9825173dc17b7f408d3d
---
M languages/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index de493ef..8015c3d 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -987,7 +987,7 @@
"searchall": "all",
"showingresults": "Showing below up to {{PLURAL:$1|1 
result|$1 results}} starting with #$2.",
"showingresultsinrange": "Showing below up to 
{{PLURAL:$1|1 result|$1 results}} in range 
#$2 to #$3.",
-   "search-showingresults": "{{PLURAL:$4|Result $1 of 
$3|Results $1 - $2 of $3}}",
+   "search-showingresults": "{{PLURAL:$4|Result $1 of 
$3|Results $1 – $2 of $3}}",
"search-nonefound": "There were no results matching the query.",
"search-nonefound-thiswiki": "There were no results matching the query 
in this site.",
"powersearch-legend": "Advanced search",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ace65b08a21b4024f7c9825173dc17b7f408d3d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: Gerrit Patch Uploader 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: TerraCodes 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ArticleFeedbackv5[master]: Remove reference to jquery.placeholder

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387757 )

Change subject: Remove reference to jquery.placeholder
..


Remove reference to jquery.placeholder

The module has been a deprecated no-op since MediaWiki 1.29.

Change-Id: I2c89d9384cfe6fb3b64f6dc10743223373ea0b97
---
M extension.json
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
2 files changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index c88a6a2..cd8ff0a 100644
--- a/extension.json
+++ b/extension.json
@@ -276,7 +276,6 @@
"jquery.localize",
"jquery.ui.button",
"jquery.cookie",
-   "jquery.placeholder",
"mediawiki.cookie",
"mediawiki.jqueryMsg",
"jquery.effects.highlight",
diff --git a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js 
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
index c4776ae..0a896c0 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
@@ -766,7 +766,7 @@
// 
articlefeedbackv5-bucket6-question-placeholder-yes, 
articlefeedbackv5-bucket6-question-placeholder-no
$element = 
$.articleFeedbackv5.$holder.find( '.articleFeedbackv5-comment textarea' );
text = mw.msg( 
'articlefeedbackv5-bucket6-question-placeholder-' + newVal );
-   $element.attr( 'placeholder', 
text ).placeholder();
+   $element.attr( 'placeholder', 
text );
 
// allow feedback submission if 
there is feedback (or if Y/N was positive)

$.articleFeedbackv5.enableSubmission( true );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c89d9384cfe6fb3b64f6dc10743223373ea0b97
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...DisplayTitle[master]: Fix link to user page in header (personal URLs)

[Cicalese (Code Review)]

Cicalese has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387759 )

Change subject: Fix link to user page in header (personal URLs)
..


Fix link to user page in header (personal URLs)

Change-Id: Ic7f26c2f84a4d240feab784901cad3d634f0eb46
---
M extension.json
M includes/DisplayTitleHooks.php
2 files changed, 25 insertions(+), 3 deletions(-)

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



diff --git a/extension.json b/extension.json
index 2c4a8ec..23f0ea2 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "DisplayTitle",
-   "version": "1.4",
+   "version": "1.5",
"author": [
"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy 
Cicalese]",
"[https://www.semantic-mediawiki.org/wiki/User:Oetterer Tobias 
Oetterer]"
@@ -25,6 +25,7 @@
"ParserFirstCallInit": 
"DisplayTitleHooks::onParserFirstCallInit",
"ParserBeforeStrip": "DisplayTitleHooks::onParserBeforeStrip",
"BeforePageDisplay": "DisplayTitleHooks::onBeforePageDisplay",
+   "PersonalUrls": "DisplayTitleHooks::onPersonalUrls",
"HtmlPageLinkRendererBegin": 
"DisplayTitleHooks::onHtmlPageLinkRendererBegin",
"ScribuntoExternalLibraries": 
"DisplayTitleHooks::onScribuntoExternalLibraries",
"SelfLinkBegin": "DisplayTitleHooks::onSelfLinkBegin"
diff --git a/includes/DisplayTitleHooks.php b/includes/DisplayTitleHooks.php
index 88694fb..4e45b2f 100644
--- a/includes/DisplayTitleHooks.php
+++ b/includes/DisplayTitleHooks.php
@@ -34,9 +34,30 @@
}
 
/**
+* Implements PersonalUrls hook.
+* See https://www.mediawiki.org/wiki/Manual:Hooks/PersonalUrls
+* Handle links. Implements HtmlPageLinkRendererBegin hook of 
LinkRenderer class.
+*
+* @since 1.5
+* @param array &$personal_urls the array of URLs set up so far
+* @param Title $title the Title object of the current article
+* @param SkinTemplate $skin SkinTemplate object providing context
+*/
+   public static function onPersonalUrls( array &$personal_urls, Title 
$title,
+   SkinTemplate $skin ) {
+   if ( $skin->getUser()->isLoggedIn() &&
+   isset( $personal_urls['userpage'] ) ) {
+   $pagename = $personal_urls['userpage']['text'];
+   $title = $skin->getUser()->getUserPage();
+   self::getDisplayTitle( $title, $pagename );
+   $personal_urls['userpage']['text'] = $pagename;
+   }
+   }
+
+   /**
 * Implements HtmlPageLinkRendererBegin hook.
 * See 
https://www.mediawiki.org/wiki/Manual:Hooks/HtmlPageLinkRendererBegin
-* Handle links. Implements HtmlPageLinkRendererBegin hook of 
LinkRenderer class.
+* Handle links to other pages.
 *
 * @since 1.4
 * @param LinkRenderer $linkRenderer the LinkRenderer object
@@ -90,7 +111,7 @@
$title = null;
if ( is_string( $html ) ) {
$title = Title::newFromText( $html );
-   } else if ( get_class( $html ) == 'HtmlArmor' ) {
+   } elseif ( get_class( $html ) == 'HtmlArmor' ) {
$title = Title::newFromText( 
HtmlArmor::getHtml( $html ) );
}
if ( !is_null( $title ) &&

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7f26c2f84a4d240feab784901cad3d634f0eb46
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DisplayTitle
Gerrit-Branch: master
Gerrit-Owner: Cicalese 
Gerrit-Reviewer: Cicalese 

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

[MediaWiki-commits] [Gerrit] mediawiki...DisplayTitle[master]: Fix link to user page in header (personal URLs)

[Cicalese (Code Review)]

Cicalese has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387759 )

Change subject: Fix link to user page in header (personal URLs)
..

Fix link to user page in header (personal URLs)

Change-Id: Ic7f26c2f84a4d240feab784901cad3d634f0eb46
---
M extension.json
M includes/DisplayTitleHooks.php
2 files changed, 24 insertions(+), 2 deletions(-)


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

diff --git a/extension.json b/extension.json
index 2c4a8ec..23f0ea2 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "DisplayTitle",
-   "version": "1.4",
+   "version": "1.5",
"author": [
"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy 
Cicalese]",
"[https://www.semantic-mediawiki.org/wiki/User:Oetterer Tobias 
Oetterer]"
@@ -25,6 +25,7 @@
"ParserFirstCallInit": 
"DisplayTitleHooks::onParserFirstCallInit",
"ParserBeforeStrip": "DisplayTitleHooks::onParserBeforeStrip",
"BeforePageDisplay": "DisplayTitleHooks::onBeforePageDisplay",
+   "PersonalUrls": "DisplayTitleHooks::onPersonalUrls",
"HtmlPageLinkRendererBegin": 
"DisplayTitleHooks::onHtmlPageLinkRendererBegin",
"ScribuntoExternalLibraries": 
"DisplayTitleHooks::onScribuntoExternalLibraries",
"SelfLinkBegin": "DisplayTitleHooks::onSelfLinkBegin"
diff --git a/includes/DisplayTitleHooks.php b/includes/DisplayTitleHooks.php
index 88694fb..0a9f249 100644
--- a/includes/DisplayTitleHooks.php
+++ b/includes/DisplayTitleHooks.php
@@ -34,9 +34,30 @@
}
 
/**
+* Implements PersonalUrls hook.
+* See https://www.mediawiki.org/wiki/Manual:Hooks/PersonalUrls
+* Handle links. Implements HtmlPageLinkRendererBegin hook of 
LinkRenderer class.
+*
+* @since 1.5
+* @param array &$personal_urls the array of URLs set up so far
+* @param Title $title the Title object of the current article
+* @param SkinTemplate $skin SkinTemplate object providing context
+*/
+   public static function onPersonalUrls( array &$personal_urls, Title 
$title,
+   SkinTemplate $skin ) {
+   if ( $skin->getUser()->isLoggedIn() &&
+   isset( $personal_urls['userpage'] ) ) {
+   $pagename = $personal_urls['userpage']['text'];
+   $title = $skin->getUser()->getUserPage();
+   self::getDisplayTitle( $title, $pagename );
+   $personal_urls['userpage']['text'] = $pagename;
+   }
+   }
+
+   /**
 * Implements HtmlPageLinkRendererBegin hook.
 * See 
https://www.mediawiki.org/wiki/Manual:Hooks/HtmlPageLinkRendererBegin
-* Handle links. Implements HtmlPageLinkRendererBegin hook of 
LinkRenderer class.
+* Handle links to other pages.
 *
 * @since 1.4
 * @param LinkRenderer $linkRenderer the LinkRenderer object

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7f26c2f84a4d240feab784901cad3d634f0eb46
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DisplayTitle
Gerrit-Branch: master
Gerrit-Owner: Cicalese 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use "should" instead of "must" in query

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387758 )

Change subject: Use "should" instead of "must" in query
..

Use "should" instead of "must" in query

Bug: T179453
Change-Id: I0c2afd66ddaab39a9377506f39d6926364e4a0b6
---
M repo/includes/Search/Elastic/EntitySearchElastic.php
M repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
M repo/tests/phpunit/data/entitySearch/search_de-ch.expected
M repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
M repo/tests/phpunit/data/entitySearch/search_en.expected
M repo/tests/phpunit/data/entitySearch/search_en_strict.expected
M repo/tests/phpunit/data/entitySearch/search_id.expected
M repo/tests/phpunit/data/entitySearch/search_zh-de-ch.expected
M repo/tests/phpunit/data/entitySearch/search_zh.expected
9 files changed, 9 insertions(+), 9 deletions(-)


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

diff --git a/repo/includes/Search/Elastic/EntitySearchElastic.php 
b/repo/includes/Search/Elastic/EntitySearchElastic.php
index 84474c2..f0f32b0 100644
--- a/repo/includes/Search/Elastic/EntitySearchElastic.php
+++ b/repo/includes/Search/Elastic/EntitySearchElastic.php
@@ -189,7 +189,7 @@
 
$labelsQuery = new BoolQuery();
$labelsQuery->addFilter( $labelsFilter );
-   $labelsQuery->addMust( $dismax );
+   $labelsQuery->addShould( $dismax );
// TODO: this is a bit hacky, better way would be to make the 
field case-insensitive
// or add new subfield which is case-insensitive
$titleMatch = new Term( [ 'title.keyword' => strtoupper( $text 
) ] );
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected 
b/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
index 4a28724..2c222be 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
@@ -16,7 +16,7 @@
 }
 }
 ],
-"must": [
+"should": [
 {
 "dis_max": {
 "tie_breaker": 0,
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch.expected 
b/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
index 81b6ba1..a2450b1 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
@@ -16,7 +16,7 @@
 }
 }
 ],
-"must": [
+"should": [
 {
 "dis_max": {
 "tie_breaker": 0,
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected 
b/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
index 2163aca..d46535c 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
@@ -16,7 +16,7 @@
 }
 }
 ],
-"must": [
+"should": [
 {
 "dis_max": {
 "tie_breaker": 0,
diff --git a/repo/tests/phpunit/data/entitySearch/search_en.expected 
b/repo/tests/phpunit/data/entitySearch/search_en.expected
index e745659..48c02b3 100644
--- a/repo/tests/phpunit/data/entitySearch/search_en.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_en.expected
@@ -16,7 +16,7 @@
 }
 }
 ],
-"must": [
+"should": [
 {
 "dis_max": {
 "tie_breaker": 0,
diff --git a/repo/tests/phpunit/data/entitySearch/search_en_strict.expected 
b/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
index 939a7d7..dcfa947 100644
--- a/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
@@ -16,7 +16,7 @@
 }
 }
 ],
-"must": [
+"should": [
 {
 "dis_max": {

[MediaWiki-commits] [Gerrit] mediawiki...ImageMetrics[master]: Remove use of 'mediaWikiLoadStart'

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387510 )

Change subject: Remove use of 'mediaWikiLoadStart'
..


Remove use of 'mediaWikiLoadStart'

Schema 'ImageMetricsLoadingTime' documents fallbackFullLoadingTime as
relating to the "page load start" (best reflected by navigationStart).
However, mediaWikiLoadStart measures when the async startup.js script
starts executing, which is quite unrelated given its low priority
in the page load process.

Either way, this is deprecated. Update the current code to use navStart
as offset instead, which subsequently makes this code behave like the
native performance.now() and performance.mark() methods, which should
probably used instead at some point. mw.now() quite literally adds
navigationStart to performance.now(), which we then substract again
here.

Bug: T160315
Change-Id: I5d94d4842858660a223174ba8510345b7364f9de
---
M .jshintrc
M resources/head.js
M resources/logger/LoadingTimeLogger.js
3 files changed, 5 insertions(+), 7 deletions(-)

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



diff --git a/.jshintrc b/.jshintrc
index 03280d7..7c440c0 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -26,7 +26,6 @@
"QUnit",
"jQuery",
"mediaWiki",
-   "mediaWikiLoadStart",
"OO"
]
 }
diff --git a/resources/head.js b/resources/head.js
index 44b935a..7a5b882 100644
--- a/resources/head.js
+++ b/resources/head.js
@@ -33,10 +33,8 @@
return;
}
 
-   $file.load( function () {
-   if ( window.mediaWikiLoadStart ) {
-   mw.imageMetricsLoadTime = mw.now() - 
window.mediaWikiLoadStart;
-   }
+   $file.on( 'load', function () {
+   mw.imageMetricsLoadTime = mw.now();
} );
} );
 }( mediaWiki, jQuery ) );
diff --git a/resources/logger/LoadingTimeLogger.js 
b/resources/logger/LoadingTimeLogger.js
index 6d686e2..72f666d 100644
--- a/resources/logger/LoadingTimeLogger.js
+++ b/resources/logger/LoadingTimeLogger.js
@@ -164,11 +164,12 @@
 * @param {jQuery} $file jQuery object containing the img element
 */
LoadingTimeLogger.prototype.addOtherData = function ( data, $file ) {
+   var navStart = this.performance && this.performance.timing && 
this.performance.timing.navigationStart;
if ( $file.attr( 'alt' ) ) {
data.fileType = $file.attr( 'alt' ).split( '.' ).pop();
}
-   if ( typeof mw.imageMetricsLoadTime === 'number' ) {
-   data.fallbackFullLoadingTime = mw.imageMetricsLoadTime;
+   if ( typeof mw.imageMetricsLoadTime === 'number' && navStart ) {
+   data.fallbackFullLoadingTime = mw.imageMetricsLoadTime 
=== 0 ? 0 : imageMetricsLoadTime - navStart;
}
};
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d94d4842858660a223174ba8510345b7364f9de
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ImageMetrics
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...DisplayTitle[master]: Text that should have overridden link text was being ignored.

[Cicalese (Code Review)]

Cicalese has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387750 )

Change subject: Text that should have overridden link text was being ignored.
..


Text that should have overridden link text was being ignored.

Change-Id: Ia04c0a7371edffa4512100f1cd6d884ae49e6701
---
M includes/DisplayTitleHooks.php
1 file changed, 8 insertions(+), 3 deletions(-)

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



diff --git a/includes/DisplayTitleHooks.php b/includes/DisplayTitleHooks.php
index 280b331..88694fb 100644
--- a/includes/DisplayTitleHooks.php
+++ b/includes/DisplayTitleHooks.php
@@ -82,12 +82,17 @@
 *
 * @since 1.3
 * @param Title $target the Title object that the link is pointing to
-* @param string &$html the HTML of the link text
+* @param string|HtmlArmor &$html the HTML of the link text
 * @return bool continue checking hooks
 */
private static function handleLink( Title $target, &$html ) {
-   if ( isset( $html ) && is_string( $html ) ) {
-   $title = Title::newFromText( $html );
+   if ( isset( $html ) ) {
+   $title = null;
+   if ( is_string( $html ) ) {
+   $title = Title::newFromText( $html );
+   } else if ( get_class( $html ) == 'HtmlArmor' ) {
+   $title = Title::newFromText( 
HtmlArmor::getHtml( $html ) );
+   }
if ( !is_null( $title ) &&
$title->getText() === $target->getText() &&
( $title->getSubjectNsText() === 
$target->getSubjectNsText() ||

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia04c0a7371edffa4512100f1cd6d884ae49e6701
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DisplayTitle
Gerrit-Branch: master
Gerrit-Owner: Cicalese 
Gerrit-Reviewer: Cicalese 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ArticleFeedbackv5[master]: Remove reference to jquery.placeholder

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387757 )

Change subject: Remove reference to jquery.placeholder
..

Remove reference to jquery.placeholder

This module isn't actually used, but still listed as a dependency.

The module has been a deprecated since MediaWiki 1.29.

Change-Id: I2c89d9384cfe6fb3b64f6dc10743223373ea0b97
---
M extension.json
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 
refs/changes/57/387757/2

diff --git a/extension.json b/extension.json
index c88a6a2..cd8ff0a 100644
--- a/extension.json
+++ b/extension.json
@@ -276,7 +276,6 @@
"jquery.localize",
"jquery.ui.button",
"jquery.cookie",
-   "jquery.placeholder",
"mediawiki.cookie",
"mediawiki.jqueryMsg",
"jquery.effects.highlight",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c89d9384cfe6fb3b64f6dc10743223373ea0b97
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jforrester 

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

[MediaWiki-commits] [Gerrit] mediawiki...ImageMetrics[master]: Update tests to be compatible with QUnit 2

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387756 )

Change subject: Update tests to be compatible with QUnit 2
..


Update tests to be compatible with QUnit 2

Remove deprecated expectCount parameter to QUnit.test().

Change-Id: I9c3663bc1cd255f6143ab32da711e22404bc3d5b
---
M tests/qunit/logger/LoadingTimeLogger.test.js
1 file changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/tests/qunit/logger/LoadingTimeLogger.test.js 
b/tests/qunit/logger/LoadingTimeLogger.test.js
index c066ffd..cd5ab70 100644
--- a/tests/qunit/logger/LoadingTimeLogger.test.js
+++ b/tests/qunit/logger/LoadingTimeLogger.test.js
@@ -16,12 +16,12 @@
return logger;
}
 
-   QUnit.test( 'Constructor sanity test', 1, function ( assert ) {
+   QUnit.test( 'Constructor sanity test', function ( assert ) {
var logger = createLoadingTimeLogger( this.sandbox, {} );
-   assert.ok( logger, 'Object created' );
+   assert.equal( typeof logger, 'object', 'Object created' );
} );
 
-   QUnit.test( 'Minimal logging scenario', 12, function ( assert ) {
+   QUnit.test( 'Minimal logging scenario', function ( assert ) {
var data,
options = {
samplingFactor: 1,
@@ -53,7 +53,7 @@
assert.strictEqual( data.isAnon, false, 'isAnon is logged 
correctly' );
} );
 
-   QUnit.test( 'Geo logging', 1, function ( assert ) {
+   QUnit.test( 'Geo logging', function ( assert ) {
var data,
options = {
samplingFactor: 1,
@@ -70,7 +70,7 @@
 
// no test for onload time logging - it is set up in a head script, 
difficult to simulate
 
-   QUnit.test( 'Navigation Timing logging', 1, function ( assert ) {
+   QUnit.test( 'Navigation Timing logging', function ( assert ) {
var data,
options = {
performance: { navigation: { type: 0 } },
@@ -85,7 +85,7 @@
assert.strictEqual( data.navigationType, 'navigate', 
'navigationType is logged correctly' );
} );
 
-   QUnit.test( 'Resource Timing logging', 3, function ( assert ) {
+   QUnit.test( 'Resource Timing logging', function ( assert ) {
var data,
options = {
performance: { getEntriesByName: 
this.sandbox.stub().returns( [{
@@ -107,7 +107,7 @@
assert.strictEqual( data.fetchDelay, 89, 'fetchDelay is logged 
correctly' );
} );
 
-   QUnit.test( 'No image, no logging', 1, function ( assert ) {
+   QUnit.test( 'No image, no logging', function ( assert ) {
var options = {
performance: { navigation: { type: 0 } },
samplingFactor: 1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c3663bc1cd255f6143ab32da711e22404bc3d5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageMetrics
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ImageMetrics[master]: Update tests to be compatible with QUnit 2

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387756 )

Change subject: Update tests to be compatible with QUnit 2
..

Update tests to be compatible with QUnit 2

Remove deprecated expectCount parameter to QUnit.test().

Change-Id: I9c3663bc1cd255f6143ab32da711e22404bc3d5b
---
M tests/qunit/logger/LoadingTimeLogger.test.js
1 file changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/tests/qunit/logger/LoadingTimeLogger.test.js 
b/tests/qunit/logger/LoadingTimeLogger.test.js
index c066ffd..cd5ab70 100644
--- a/tests/qunit/logger/LoadingTimeLogger.test.js
+++ b/tests/qunit/logger/LoadingTimeLogger.test.js
@@ -16,12 +16,12 @@
return logger;
}
 
-   QUnit.test( 'Constructor sanity test', 1, function ( assert ) {
+   QUnit.test( 'Constructor sanity test', function ( assert ) {
var logger = createLoadingTimeLogger( this.sandbox, {} );
-   assert.ok( logger, 'Object created' );
+   assert.equal( typeof logger, 'object', 'Object created' );
} );
 
-   QUnit.test( 'Minimal logging scenario', 12, function ( assert ) {
+   QUnit.test( 'Minimal logging scenario', function ( assert ) {
var data,
options = {
samplingFactor: 1,
@@ -53,7 +53,7 @@
assert.strictEqual( data.isAnon, false, 'isAnon is logged 
correctly' );
} );
 
-   QUnit.test( 'Geo logging', 1, function ( assert ) {
+   QUnit.test( 'Geo logging', function ( assert ) {
var data,
options = {
samplingFactor: 1,
@@ -70,7 +70,7 @@
 
// no test for onload time logging - it is set up in a head script, 
difficult to simulate
 
-   QUnit.test( 'Navigation Timing logging', 1, function ( assert ) {
+   QUnit.test( 'Navigation Timing logging', function ( assert ) {
var data,
options = {
performance: { navigation: { type: 0 } },
@@ -85,7 +85,7 @@
assert.strictEqual( data.navigationType, 'navigate', 
'navigationType is logged correctly' );
} );
 
-   QUnit.test( 'Resource Timing logging', 3, function ( assert ) {
+   QUnit.test( 'Resource Timing logging', function ( assert ) {
var data,
options = {
performance: { getEntriesByName: 
this.sandbox.stub().returns( [{
@@ -107,7 +107,7 @@
assert.strictEqual( data.fetchDelay, 89, 'fetchDelay is logged 
correctly' );
} );
 
-   QUnit.test( 'No image, no logging', 1, function ( assert ) {
+   QUnit.test( 'No image, no logging', function ( assert ) {
var options = {
performance: { navigation: { type: 0 } },
samplingFactor: 1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c3663bc1cd255f6143ab32da711e22404bc3d5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageMetrics
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Filter ID should always go through formatNum()

[Huji (Code Review)]

Huji has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387755 )

Change subject: Filter ID should always go through formatNum()
..

Filter ID should always go through formatNum()

Change-Id: I2bd833c35128b3c39c7882321747837184095bef
---
M includes/special/SpecialAbuseLog.php
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/includes/special/SpecialAbuseLog.php 
b/includes/special/SpecialAbuseLog.php
index 16529d3..00aebcb 100644
--- a/includes/special/SpecialAbuseLog.php
+++ b/includes/special/SpecialAbuseLog.php
@@ -353,7 +353,10 @@
$output = Xml::element(
'legend',
null,
-   $this->msg( 'abusefilter-log-details-legend', $id 
)->text()
+   $this->msg(
+   'abusefilter-log-details-legend',
+   $this->getLanguage()->formatNum( $id )
+   )->text()
);
$output .= Xml::tags( 'p', null, $this->formatRow( $row, false 
) );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bd833c35128b3c39c7882321747837184095bef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Huji 

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Update gadget warning to mention global gadgets

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387751 )

Change subject: Update gadget warning to mention global gadgets
..


Update gadget warning to mention global gadgets

Bug: T178566
Change-Id: I783a4dacfedd32adbc39b6c9dbb03eff36f2c3d8
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 5de5ccd..08a3bb0 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -25,5 +25,5 @@
"popups-prefs-optin-enabled-label": "Enable",
"popups-prefs-optin-disabled-label": "Disable",
"popups-prefs-disable-nav-gadgets-info": "You have to [[$1 | disable 
Navigation Popups Gadget]] from Gadgets tab to enable Page Previews",
-   "popups-prefs-conflicting-gadgets-info": "Certain gadgets and other 
customizations may affect the performance of this feature. If you experience 
problems please review your gadgets and user scripts."
+   "popups-prefs-conflicting-gadgets-info": "Certain gadgets and other 
customizations may affect the performance of this feature. If you experience 
problems please review your gadgets and user scripts, including global ones."
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I783a4dacfedd32adbc39b6c9dbb03eff36f2c3d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resources: Remove the deprecated 'jquery.badge' module

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386029 )

Change subject: resources: Remove the deprecated 'jquery.badge' module
..


resources: Remove the deprecated 'jquery.badge' module

Bug: T178450
Change-Id: I4540e5959ea15323b1f54be51fbeea6ca3f35169
Depends-On: I78543abe412d04d61a05e76702cb7681d5fad61d
---
M RELEASE-NOTES-1.31
M jsduck.json
M resources/Resources.php
D resources/src/jquery/jquery.badge.css
D resources/src/jquery/jquery.badge.js
5 files changed, 1 insertion(+), 130 deletions(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 042af6e..86d887b 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -28,6 +28,7 @@
 * …
 
  Removed and replaced external libraries 
+* (T17845) The deprecated 'jquery.badge' module was removed.
 * …
 
 === Bug fixes in 1.31 ===
diff --git a/jsduck.json b/jsduck.json
index 7e59432..0f8daf8 100644
--- a/jsduck.json
+++ b/jsduck.json
@@ -22,7 +22,6 @@
"resources/src/mediawiki.widgets",
"resources/src/jquery/jquery.accessKeyLabel.js",
"resources/src/jquery/jquery.autoEllipsis.js",
-   "resources/src/jquery/jquery.badge.js",
"resources/src/jquery/jquery.byteLength.js",
"resources/src/jquery/jquery.byteLimit.js",
"resources/src/jquery/jquery.checkboxShiftClick.js",
diff --git a/resources/Resources.php b/resources/Resources.php
index b9986fe..ca24922 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -164,12 +164,6 @@
'dependencies' => 'jquery.highlightText',
'targets' => [ 'desktop', 'mobile' ],
],
-   'jquery.badge' => [
-   'deprecated' => 'Please use Notifications instead.',
-   'scripts' => 'resources/src/jquery/jquery.badge.js',
-   'styles' => 'resources/src/jquery/jquery.badge.css',
-   'dependencies' => 'mediawiki.language',
-   ],
'jquery.byteLength' => [
'scripts' => 'resources/src/jquery/jquery.byteLength.js',
'targets' => [ 'desktop', 'mobile' ],
diff --git a/resources/src/jquery/jquery.badge.css 
b/resources/src/jquery/jquery.badge.css
deleted file mode 100644
index 1157c27..000
--- a/resources/src/jquery/jquery.badge.css
+++ /dev/null
@@ -1,35 +0,0 @@
-.mw-badge {
-   background-color: #72777d;
-   min-width: 7px;
-   border-radius: 2px;
-   padding: 1px 4px;
-   text-align: center;
-   font-size: 12px;
-   line-height: 12px;
-   cursor: pointer;
-}
-
-.mw-badge-content {
-   font-weight: bold;
-   color: #fff;
-   vertical-align: baseline;
-}
-
-.mw-badge-inline {
-   margin-left: 3px;
-   display: inline-block;
-   /* Hack for IE6 and IE7 (T49926) */
-   zoom: 1;
-   *display: inline; /* stylelint-disable-line 
declaration-block-no-duplicate-properties */
-
-}
-.mw-badge-overlay {
-   position: absolute;
-   bottom: -1px;
-   right: -3px;
-   z-index: 50;
-}
-
-.mw-badge-important {
-   background-color: #d33;
-}
diff --git a/resources/src/jquery/jquery.badge.js 
b/resources/src/jquery/jquery.badge.js
deleted file mode 100644
index 40b3baf..000
--- a/resources/src/jquery/jquery.badge.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/*!
- * jQuery Badge plugin
- *
- * @license MIT
- *
- * @author Ryan Kaldari , 2012
- * @author Andrew Garrett , 2012
- * @author Marius Hoch , 2012
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to 
deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * This program is distributed WITHOUT ANY WARRANTY.
- */
-
-/**
- * @class jQuery.plugin.badge
- */
-( function ( $, mw ) {
-   /**
-* Put a badge on an item on the page. The badge container will be 
appended to the selected element(s).
-*
-* $element.badge( text );
-* $element.badge( 5 );
-* $element.badge( '100+' );
-* $element.badge( text, inline );
-* $element.badge( 'New', true );
-*
-* @param {number|string} text The value to display in the badge. If 
the value is falsey (0,
-*  null, false, '', etc.), any existing badge will be removed.
-* @param {boolean} [inline=true] True if the badge should be displayed 
inline, false

[MediaWiki-commits] [Gerrit] integration/config[master]: [MediaViewer] Run jsduck in gate

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387650 )

Change subject: [MediaViewer] Run jsduck in gate
..


[MediaViewer] Run jsduck in gate

Rather than just having the publish task fail.

Repos which are fine:
* MediaWiki
* EventLogging
* Flow
* GuidedTour
* TemplateData

Repos which seem to have the same issue:
* CollaborationKit
* Kartographer
* MobileFrontend
* Wikibase
* MinervaNeue

Change-Id: If9ab1ed4c37d08506202d67ff38ffbc4021ca41f
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index b28d35c..c5e4200 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3792,6 +3792,7 @@
   - name: extension-unittests-generic
   - name: mwgate-npm
   - name: extension-selenium
+  - name: extension-jsduck
 postmerge:
   - mwext-jsduck-publish
 experimental:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If9ab1ed4c37d08506202d67ff38ffbc4021ca41f
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Type GlobeCoordinate values as floats which they are

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387754 )

Change subject: Type GlobeCoordinate values as floats which they are
..

Type GlobeCoordinate values as floats which they are

Better solution would be to print them according to precision
(see also T179228) but as a first step, we should at least stop
producing invalid RDF.

Bug: T179228
Change-Id: I34983dffe9518a3c50e9cfc1c9b027c19bc9f49e
---
M repo/includes/Rdf/Values/GlobeCoordinateRdfBuilder.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/repo/includes/Rdf/Values/GlobeCoordinateRdfBuilder.php 
b/repo/includes/Rdf/Values/GlobeCoordinateRdfBuilder.php
index 80465c0..cdcbfa0 100644
--- a/repo/includes/Rdf/Values/GlobeCoordinateRdfBuilder.php
+++ b/repo/includes/Rdf/Values/GlobeCoordinateRdfBuilder.php
@@ -101,10 +101,10 @@
$valueWriter = $this->complexValueHelper->getValueNodeWriter();
 
$valueWriter->say( RdfVocabulary::NS_ONTOLOGY, 'geoLatitude' )
-   ->value( $value->getLatitude(), 'xsd', 'decimal' );
+   ->value( $value->getLatitude(), 'xsd', 'double' );
 
$valueWriter->say( RdfVocabulary::NS_ONTOLOGY, 'geoLongitude' )
-   ->value( $value->getLongitude(), 'xsd', 'decimal' );
+   ->value( $value->getLongitude(), 'xsd', 'double' );
 
// Disallow nulls in precision, see T123392
$precision = $value->getPrecision();
@@ -114,7 +114,7 @@
$precision = 1 / 3600;
}
$valueWriter->say( RdfVocabulary::NS_ONTOLOGY, 'geoPrecision' )
-   ->value( $precision, 'xsd', 'decimal' );
+   ->value( $precision, 'xsd', 'double' );
 
$valueWriter->say( RdfVocabulary::NS_ONTOLOGY, 'geoGlobe' )
->is( trim( $value->getGlobe() ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34983dffe9518a3c50e9cfc1c9b027c19bc9f49e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] mediawiki...MultimediaViewer[master]: Follow-up 3e5ad4c8: Fix jsduck for introduction of mw.storage

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387647 )

Change subject: Follow-up 3e5ad4c8: Fix jsduck for introduction of mw.storage
..


Follow-up 3e5ad4c8: Fix jsduck for introduction of mw.storage

Change-Id: I1aebfa88fb6fc567c035cb47f2a71d88e23f2827
---
M jsduck.categories.json
M jsduck.external.js
2 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/jsduck.categories.json b/jsduck.categories.json
index bbc3dc7..b994017 100644
--- a/jsduck.categories.json
+++ b/jsduck.categories.json
@@ -87,6 +87,7 @@
"mw.Api",
"mw.Title",
"mw.Map",
+   "mw.storage",
"mw.eventLog"
]
},
diff --git a/jsduck.external.js b/jsduck.external.js
index 8f4e9ae..45c713d 100644
--- a/jsduck.external.js
+++ b/jsduck.external.js
@@ -26,6 +26,11 @@
  */
 
 /**
+ * @class mw.storage
+ * 
+ */
+
+/**
  * @class HTMLElement
  * An HTML element.
  */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1aebfa88fb6fc567c035cb47f2a71d88e23f2827
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Revert "README: Fix Doxygen markup"

[Krinkle (Code Review)]

Hello jenkins-bot, VolkerE, Jforrester,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "README: Fix Doxygen markup"
..

Revert "README: Fix Doxygen markup"

Previous rendering didn't result in unparsed backticks showing up,
and did use preformatted rendering.

Looks like either version causes the headings to be parsed, which
seems like a bug and is contrary to how Doxygen's own manual
explains the rendering behaviour.

This reverts commit ec3bea795756b3f7784b601a170b2f6992f450e7.

Change-Id: I62045ad670e730ec66b149b7d2ea4f5b56b58d8e
---
M README.md
1 file changed, 30 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/53/387753/1

diff --git a/README.md b/README.md
index 8439be9..2f7711b 100644
--- a/README.md
+++ b/README.md
@@ -79,39 +79,39 @@
 --
 
 Release process:
-```bash
-$ cd path/to/oojs-ui/
-$ git remote update
-$ git checkout -B release -t origin/master
+
+$ cd path/to/oojs-ui/
+$ git remote update
+$ git checkout -B release -t origin/master
 
-# Ensure tests pass
-$ npm install && composer update && npm test && composer test
+# Ensure tests pass
+$ npm install && composer update && npm test && composer test
 
-# Avoid using "npm version patch" because that creates
-# both a commit and a tag, and we shouldn't tag until after
-# the commit is merged.
+# Avoid using "npm version patch" because that creates
+# both a commit and a tag, and we shouldn't tag until after
+# the commit is merged.
 
-# Update release notes
-# Copy the resulting list into a new section at the top of History.md and 
edit
-# into five sub-sections, in order:
-# * Breaking changes
-# * Deprecations
-# * Features
-# * Styles
-# * Code
-$ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e 
'console.log(require("./package.json").version);')...HEAD | grep -v 
"Localisation updates from" | sort
-$ edit History.md
+# Update release notes
+# Copy the resulting list into a new section at the top of History.md and edit
+# into five sub-sections, in order:
+# * Breaking changes
+# * Deprecations
+# * Features
+# * Styles
+# * Code
+$ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e 
'console.log(require("./package.json").version);')...HEAD | grep -v 
"Localisation updates from" | sort
+$ edit History.md
 
-# Update the version number
-$ edit package.json
+# Update the version number
+$ edit package.json
 
-$ git add -p
-$ git commit -m "Tag vX.X.X"
-$ git review
+$ git add -p
+$ git commit -m "Tag vX.X.X"
+$ git review
 
-# After merging:
-$ git remote update
-$ git checkout origin/master
-$ git tag "vX.X.X"
-$ npm run publish-build && git push --tags && npm publish
-```
+# After merging:
+$ git remote update
+$ git checkout origin/master
+$ git tag "vX.X.X"
+$ npm run publish-build && git push --tags && npm publish
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62045ad670e730ec66b149b7d2ea4f5b56b58d8e
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: cirrus interleave config should not be wg prefixed

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387752 )

Change subject: cirrus interleave config should not be wg prefixed
..


cirrus interleave config should not be wg prefixed

Change-Id: I5ba8f63f54608cbea48bf6dc6062611454f9c7cf
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 44e32aa..ef69812 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18639,7 +18639,7 @@
'trigger' => 'dbn20-i',
'globals' => [

'wgCirrusSearchInterleaveConfig' => [
-   
'wgCirrusSearchRescoreProfile' => 'dbn20',
+   
'CirrusSearchRescoreProfile' => 'dbn20',
],
]
],
@@ -18653,7 +18653,7 @@
'trigger' => 'dbn35-i',
'globals' => [

'wgCirrusSearchInterleaveConfig' => [
-   
'wgCirrusSearchRescoreProfile' => 'dbn35',
+   
'CirrusSearchRescoreProfile' => 'dbn35',
],
]
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ba8f63f54608cbea48bf6dc6062611454f9c7cf
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: cirrus interleave config should not be wg prefixed

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387752 )

Change subject: cirrus interleave config should not be wg prefixed
..

cirrus interleave config should not be wg prefixed

Change-Id: I5ba8f63f54608cbea48bf6dc6062611454f9c7cf
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/52/387752/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5e1cd76..3e03f2e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18639,7 +18639,7 @@
'trigger' => 'dbn20-i',
'globals' => [

'wgCirrusSearchInterleaveConfig' => [
-   
'wgCirrusSearchRescoreProfile' => 'dbn20',
+   
'CirrusSearchRescoreProfile' => 'dbn20',
],
]
],
@@ -18653,7 +18653,7 @@
'trigger' => 'dbn35-i',
'globals' => [

'wgCirrusSearchInterleaveConfig' => [
-   
'wgCirrusSearchRescoreProfile' => 'dbn35',
+   
'CirrusSearchRescoreProfile' => 'dbn35',
],
]
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ba8f63f54608cbea48bf6dc6062611454f9c7cf
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Update gadget warning to mention global gadgets

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387751 )

Change subject: Update gadget warning to mention global gadgets
..

Update gadget warning to mention global gadgets

Bug: T178566
Change-Id: I783a4dacfedd32adbc39b6c9dbb03eff36f2c3d8
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/51/387751/1

diff --git a/i18n/en.json b/i18n/en.json
index 5de5ccd..08a3bb0 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -25,5 +25,5 @@
"popups-prefs-optin-enabled-label": "Enable",
"popups-prefs-optin-disabled-label": "Disable",
"popups-prefs-disable-nav-gadgets-info": "You have to [[$1 | disable 
Navigation Popups Gadget]] from Gadgets tab to enable Page Previews",
-   "popups-prefs-conflicting-gadgets-info": "Certain gadgets and other 
customizations may affect the performance of this feature. If you experience 
problems please review your gadgets and user scripts."
+   "popups-prefs-conflicting-gadgets-info": "Certain gadgets and other 
customizations may affect the performance of this feature. If you experience 
problems please review your gadgets and user scripts, including global ones."
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I783a4dacfedd32adbc39b6c9dbb03eff36f2c3d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] mediawiki...DisplayTitle[master]: Text that should have overridden link text was being ignored.

[Cicalese (Code Review)]

Cicalese has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387750 )

Change subject: Text that should have overridden link text was being ignored.
..

Text that should have overridden link text was being ignored.

Change-Id: Ia04c0a7371edffa4512100f1cd6d884ae49e6701
---
M extension.json
M includes/DisplayTitleHooks.php
2 files changed, 9 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DisplayTitle 
refs/changes/50/387750/1

diff --git a/extension.json b/extension.json
index 2c4a8ec..22e9444 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "DisplayTitle",
-   "version": "1.4",
+   "version": "1.4.1",
"author": [
"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy 
Cicalese]",
"[https://www.semantic-mediawiki.org/wiki/User:Oetterer Tobias 
Oetterer]"
diff --git a/includes/DisplayTitleHooks.php b/includes/DisplayTitleHooks.php
index 280b331..88694fb 100644
--- a/includes/DisplayTitleHooks.php
+++ b/includes/DisplayTitleHooks.php
@@ -82,12 +82,17 @@
 *
 * @since 1.3
 * @param Title $target the Title object that the link is pointing to
-* @param string &$html the HTML of the link text
+* @param string|HtmlArmor &$html the HTML of the link text
 * @return bool continue checking hooks
 */
private static function handleLink( Title $target, &$html ) {
-   if ( isset( $html ) && is_string( $html ) ) {
-   $title = Title::newFromText( $html );
+   if ( isset( $html ) ) {
+   $title = null;
+   if ( is_string( $html ) ) {
+   $title = Title::newFromText( $html );
+   } else if ( get_class( $html ) == 'HtmlArmor' ) {
+   $title = Title::newFromText( 
HtmlArmor::getHtml( $html ) );
+   }
if ( !is_null( $title ) &&
$title->getText() === $target->getText() &&
( $title->getSubjectNsText() === 
$target->getSubjectNsText() ||

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia04c0a7371edffa4512100f1cd6d884ae49e6701
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DisplayTitle
Gerrit-Branch: master
Gerrit-Owner: Cicalese 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Scap prep: check reference directory exists

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387743 )

Change subject: Scap prep: check reference directory exists
..


Scap prep: check reference directory exists

To setup scap testing environments, we need to be able to run scap prep
without having any prior wikiversions. We currently assume that the last
wikiversion from wikiversions.json is checked out on disk. This isn't
the case for new servers or for testing environments.

Change-Id: Ib83952ad1c475b06d268d3fa719c01e3fd6624be
---
M scap/plugins/prep.py
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/scap/plugins/prep.py b/scap/plugins/prep.py
index c87d8f0..b207f9c 100644
--- a/scap/plugins/prep.py
+++ b/scap/plugins/prep.py
@@ -100,7 +100,11 @@
 self.get_logger().info('Version already checked out')
 return 0
 
-git.fetch(dest_dir, GERRIT_URL + 'mediawiki/core', copy_dir)
+reference_dir = None
+if os.path.isdir(copy_dir):
+reference_dir = copy_dir
+
+git.fetch(dest_dir, GERRIT_URL + 'mediawiki/core', reference_dir)
 
 with utils.cd(dest_dir):
 if subprocess.call(['/usr/bin/git', 'config',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib83952ad1c475b06d268d3fa719c01e3fd6624be
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[wmf/1.31.0-wmf.6]: Allow turning Cirrus usage off from query

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387749 )

Change subject: Allow turning Cirrus usage off from query
..

Allow turning Cirrus usage off from query

Bug: T179428
Change-Id: I653384345315884dbf94a770f83aac2558d16b17
(cherry picked from commit 2c80695f9e7275915aef000d50270ebb9d28a931)
---
M extensions/Wikibase/repo/Wikibase.hooks.php
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/49/387749/1

diff --git a/extensions/Wikibase/repo/Wikibase.hooks.php 
b/extensions/Wikibase/repo/Wikibase.hooks.php
index dd41057..0d6eb3d 100644
--- a/extensions/Wikibase/repo/Wikibase.hooks.php
+++ b/extensions/Wikibase/repo/Wikibase.hooks.php
@@ -113,8 +113,13 @@
$request = RequestContext::getMain()->getRequest();
$settings = $wikibaseRepo->getSettings();
$searchSettings = $settings->getSetting( 'entitySearch' );
-   if ( $searchSettings['useCirrus'] === null && $request->getVal( 
'useCirrus' ) ) {
-   $searchSettings['useCirrus'] = true;
+   $useCirrus = $request->getVal( 'useCirrus' );
+   if ( $useCirrus !== null ) {
+   // if we have request one, use it
+   $searchSettings['useCirrus'] =
+   // This really should be global utility function
+   ( $useCirrus === 'on' || $useCirrus === 'true' 
|| $useCirrus === 'yes' ||
+ $useCirrus === '1' );
$settings->setSetting( 'entitySearch', $searchSettings 
);
}
if ( $searchSettings['useCirrus'] ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I653384345315884dbf94a770f83aac2558d16b17
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.31.0-wmf.6
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Align anonymous settings dialog appearance with style guide

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/385223 )

Change subject: Align anonymous settings dialog appearance with style guide
..


Align anonymous settings dialog appearance with style guide

Aligning anonymous settings dialog appearance with dialogs
elsewhere by
- setting base `font-size` to 14px to conform with Vector elsewhere –
  size is not inherited to the dialog as it's a direct child of `body`
- increasing contrast on descriptive paragraphs to conform with
  WCAG level AA
- reducing inner `padding`s slighty to conform with 8px grid
- aligning `border-color` and `box-shadow` values
- replacing static value with LESS variable

Also removing stylelintrc override rule which has been only around
for the old `box-shadow` value.

Bug: T178607
Change-Id: I738e0be11f3d1c94ea03288e0dddc1b983a6c729
---
M .stylelintrc.json
M extension.json
M resources/ext.popups/styles/ext.popups.settings.less
A resources/ext.popups/styles/ext.popups.settings.vector.less
4 files changed, 20 insertions(+), 8 deletions(-)

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



diff --git a/.stylelintrc.json b/.stylelintrc.json
index b5ef06f..449f45b 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -2,7 +2,6 @@
"extends": "stylelint-config-wikimedia",
"rules": {
"selector-no-id": null,
-   "length-zero-no-unit": null,
"no-descending-specificity": null
}
 }
diff --git a/extension.json b/extension.json
index 501aef3..173f797 100644
--- a/extension.json
+++ b/extension.json
@@ -99,6 +99,11 @@

"resources/ext.popups/styles/ext.popups.animation.less",

"resources/ext.popups/styles/ext.popups.settings.less"
],
+   "skinStyles": {
+   "vector": [
+   
"resources/ext.popups/styles/ext.popups.settings.vector.less"
+   ]
+   },
"messages": [
"popups-settings-title",
"popups-settings-description",
diff --git a/resources/ext.popups/styles/ext.popups.settings.less 
b/resources/ext.popups/styles/ext.popups.settings.less
index cf87440..6416f91 100644
--- a/resources/ext.popups/styles/ext.popups.settings.less
+++ b/resources/ext.popups/styles/ext.popups.settings.less
@@ -5,10 +5,10 @@
position: fixed;
z-index: 1000;
background: #fff;
-   width: 450px;
-   border: 1px solid #ccc;
-   box-shadow: 0px 1px 1px rgba( 0, 0, 0, 0.1 );
-   border-radius: 2px;
+   width: 420px;
+   border: 1px solid #a2a9b1;
+   box-shadow: 0 2px 2px 0 rgba( 0, 0, 0, 0.25 );
+   border-radius: @borderRadius;
 
header {
.box-sizing( border-box );
@@ -30,6 +30,7 @@
width: 100%;
font-family: sans-serif;
font-size: 18px;
+   font-weight: bold;
text-align: center;
}
}
@@ -37,13 +38,17 @@
main {
display: block;
width: 350px;
-   padding: 50px 0 40px;
+   padding: 32px 0 24px;
margin: 0 auto;
 
p {
-   color: #999;
+   color: #54595d;
font-size: 17px;
-   margin: 0 0 20px 0;
+   margin: 16px 0 0;
+
+   &:first-child {
+   margin-top: 0;
+   }
}
 
form {
diff --git a/resources/ext.popups/styles/ext.popups.settings.vector.less 
b/resources/ext.popups/styles/ext.popups.settings.vector.less
new file mode 100644
index 000..6e8e731
--- /dev/null
+++ b/resources/ext.popups/styles/ext.popups.settings.vector.less
@@ -0,0 +1,3 @@
+#mwe-popups-settings {
+   font-size: 0.875em; // not inherited from `.mw-body-content`, as we 
insert at `body`
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I738e0be11f3d1c94ea03288e0dddc1b983a6c729
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Fix for overwriting of start_time.

[Eileen (Code Review)]

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387748 )

Change subject: Fix for overwriting of start_time.
..

Fix for overwriting of start_time.

On investigation I found the timezone was not problematic but the start time
was being overwritten.

Bug: T179357
Change-Id: I8ef3814c5b1a983116e57db7c62b18bf9b874eb7
---
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
1 file changed, 14 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/48/387748/1

diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
index 9c023bb..67e57d7 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnimail.php
@@ -27,6 +27,11 @@
   public $endTimeStamp;
 
   /**
+   * @var string
+   */
+  public $startTimeStamp;
+
+  /**
* @var int
*/
   protected $offset;
@@ -99,13 +104,16 @@
* @return string
*/
   public function getStartTimestamp($params) {
-if (isset($params['start_date'])) {
-  return strtotime($params['start_date']);
+if (!$this->startTimeStamp) {
+  if (isset($params['start_date'])) {
+$this->startTimeStamp = strtotime($params['start_date']);
+  }
+  if (!empty($this->jobSettings['last_timestamp'])) {
+$this->startTimeStamp = $this->jobSettings['last_timestamp'];
+  }
+  $this->startTimeStamp = strtotime('450 days ago');
 }
-if (!empty($this->jobSettings['last_timestamp'])) {
-  return $this->jobSettings['last_timestamp'];
-}
-return strtotime('450 days ago');
+return $this->startTimeStamp;
   }
 
   /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ef3814c5b1a983116e57db7c62b18bf9b874eb7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOjs UI to v0.24.1

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387746 )

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


Update OOjs UI to v0.24.1

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.24.1

Change-Id: I9ebdc86488c4eda7c524fb6004ea6a124a63d7ab
---
M composer.json
M composer.lock
M composer/installed.json
A oojs/oojs-ui/.phpcs.xml
M oojs/oojs-ui/History.md
M oojs/oojs-ui/README.md
M oojs/oojs-ui/demos/classes/FloatableTest.css
M oojs/oojs-ui/demos/classes/PositionSelectWidget.css
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/i18n/ais.json
M oojs/oojs-ui/i18n/id.json
M oojs/oojs-ui/i18n/skr-arab.json
M oojs/oojs-ui/i18n/ur.json
M oojs/oojs-ui/i18n/zh-hant.json
M oojs/oojs-ui/package.json
15 files changed, 205 insertions(+), 152 deletions(-)

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



diff --git a/composer.json b/composer.json
index d5f8c91..8fcad1d 100644
--- a/composer.json
+++ b/composer.json
@@ -74,7 +74,7 @@
"mustangostang/spyc": "0.6.2",
"nikic/php-parser": "3.0.6",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.24.0",
+   "oojs/oojs-ui": "0.24.1",
"oyejorge/less.php": "1.7.0.14",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.4.1",
diff --git a/composer.lock b/composer.lock
index adeccd7..e7d6033 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"
 ],
-"content-hash": "dc944fad09b4f0eea8581b87645d7747",
+"content-hash": "547ea39a262b2ce34f2187d8a1a0e107",
 "packages": [
 {
 "name": "composer/semver",
@@ -711,16 +711,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.24.0",
+"version": "v0.24.1",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git";,
-"reference": "702a48a61bc597a4053c19dd4e8767461c71fb12"
+"reference": "460b3700d80073dad91de8391eb7975c9a1ba34b"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/702a48a61bc597a4053c19dd4e8767461c71fb12";,
-"reference": "702a48a61bc597a4053c19dd4e8767461c71fb12",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/460b3700d80073dad91de8391eb7975c9a1ba34b";,
+"reference": "460b3700d80073dad91de8391eb7975c9a1ba34b",
 "shasum": ""
 },
 "require": {
@@ -729,7 +729,7 @@
 },
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "0.9.2",
-"mediawiki/mediawiki-codesniffer": "0.12.0",
+"mediawiki/mediawiki-codesniffer": "14.1.0",
 "phpunit/phpunit": "4.8.21"
 },
 "type": "library",
@@ -786,7 +786,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI";,
-"time": "2017-10-17T22:42:34+00:00"
+"time": "2017-10-31T22:31:08+00:00"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index 7e3a274..3e31b83 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -2833,18 +2833,70 @@
 ]
 },
 {
-"name": "oojs/oojs-ui",
-"version": "v0.24.0",
-"version_normalized": "0.24.0.0",
+"name": "wikimedia/equivset",
+"version": "1.0.0",
+"version_normalized": "1.0.0.0",
 "source": {
 "type": "git",
-"url": "https://github.com/wikimedia/oojs-ui.git";,
-"reference": "702a48a61bc597a4053c19dd4e8767461c71fb12"
+"url": "https://github.com/wikimedia/Equivset.git";,
+"reference": "70d97de8339da54889a6d7e7ef9d438775cd286b"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/702a48a61bc597a4053c19dd4e8767461c71fb12";,
-"reference": "702a48a61bc597a4053c19dd4e8767461c71fb12",
+"url": 
"https://api.github.com/repos/wikimedia/Equivset/zipball/70d97de8339da54889a6d7e7ef9d438775cd286b";,
+"reference": "70d97de8339da54889a6d7e7ef9d438775cd286b",
+"shasum": ""
+},
+"require": {
+"php": ">=5.5.9",
+"wikimedia/utfnormal": "^1.1.0"
+},
+"require-dev": {
+"jakub-onderka/

[MediaWiki-commits] [Gerrit] oojs/ui[master]: README: Consistently refer to OOUI as library

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387744 )

Change subject: README: Consistently refer to OOUI as library
..


README: Consistently refer to OOUI as library

Bug: T179111
Change-Id: Ib8e33498b1df3f5bbcc4b0c02e4eadefb2f5a997
---
M README.md
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/README.md b/README.md
index 8439be9..7f9dcca 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 OOjs UI
 =
 
-OOjs UI is a modern JavaScript UI toolkit. It provides common widgets, 
layouts, dialogs and icons that are ready to use, as well as many useful and 
convenient classes for constructing custom user interfaces. It is the standard 
user-interface library in Wikimedia Foundation Web products, having been 
originally created for use by 
[VisualEditor](https://www.mediawiki.org/wiki/VisualEditor), which uses it for 
its entire user interface.
+OOjs UI is a modern JavaScript UI library. It provides common widgets, 
layouts, dialogs and icons that are ready to use, as well as many useful and 
convenient classes for constructing custom user interfaces. It is the standard 
user-interface library in Wikimedia Foundation Web products, having been 
originally created for use by 
[VisualEditor](https://www.mediawiki.org/wiki/VisualEditor), which uses it for 
its entire user interface.
 
 Quick start
 --

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8e33498b1df3f5bbcc4b0c02e4eadefb2f5a997
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.24.1

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387745 )

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


Update OOjs UI to v0.24.1

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.24.1

Change-Id: I9ebdc86488c4eda7c524fb6004ea6a124a63d7da
---
M lib/oojs-ui/README.md
M lib/oojs-ui/i18n/ais.json
M lib/oojs-ui/i18n/id.json
M lib/oojs-ui/i18n/skr-arab.json
M lib/oojs-ui/i18n/ur.json
M lib/oojs-ui/i18n/zh-hant.json
M lib/oojs-ui/oojs-ui-apex-icons-accessibility.css
M lib/oojs-ui/oojs-ui-apex-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-content.css
M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-media.css
M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-user.css
M lib/oojs-ui/oojs-ui-apex-icons-user.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.rtl.css
M lib/oojs-ui/oojs-ui-core-apex.css
M lib/oojs-ui/oojs-ui-core-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-core.js
M lib/oojs-ui/oojs-ui-core.js.map
M lib/oojs-ui/oojs-ui-images-apex.css
M lib/oojs-ui/oojs-ui-images-apex.rtl.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-apex.css
M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-toolbars.js
M lib/oojs-ui/oojs-ui-widgets-apex.css
M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-widgets.js
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui.css
M lib/oojs-ui/oojs-ui-wikimediaui.js
M lib/oojs-ui/oojs-ui-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-windows-apex.css
M lib/oojs-ui/oojs-ui-windows-apex.rtl.css
M lib/oojs-ui/oojs-ui-windows-wikimediaui.css
M lib/oojs-ui/oojs-ui-windows-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-windows.js
M lib/oojs-ui/themes/apex/images/icons/add.svg
M lib/oojs-ui/themes/apex/images/icons/advanced.svg
M lib/oojs-ui/themes/apex/images/icons/alert.svg
M lib/oojs-ui/themes/apex/images/icon

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Setup CirrusSearch AB test on dbn group sizing

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387586 )

Change subject: Setup CirrusSearch AB test on dbn group sizing
..


Setup CirrusSearch AB test on dbn group sizing

Setup AB normal and interleaved testing profiles for cirrussearch
minimum dbn group sizings of 20 and 35.

Change-Id: I32df6bf349f14f069568c324247a35bb821a07af
---
M wmf-config/CirrusSearch-common.php
M wmf-config/InitialiseSettings.php
2 files changed, 31 insertions(+), 8 deletions(-)

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



diff --git a/wmf-config/CirrusSearch-common.php 
b/wmf-config/CirrusSearch-common.php
index 1e269c8..5ead601 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -296,6 +296,13 @@
],
],
];
+
+   $wgCirrusSearchRescoreProfiles['dbn20'] = 
$wgCirrusSearchRescoreProfiles['mlr-1024rs'];
+   $wgCirrusSearchRescoreProfiles['dbn20']['rescore'][2]['model'] = 
'dbn20_enwiki_v1';
+
+   $wgCirrusSearchRescoreProfiles['dbn35'] = 
$wgCirrusSearchRescoreProfiles['mlr-1024rs'];
+   $wgCirrusSearchRescoreProfiles['dbn35']['rescore'][2]['model'] = 
'dbn35_enwiki_v1';
+
 }
 
 # needed for recall A/B test (T177502)
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 3fc0533..44e32aa 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18622,23 +18622,39 @@
 
 'wmgCirrusSearchUserTesting' => [
'default' => [],
-   // Recal A/B test (T177502)
+   // DBN sizing AB test
'enwiki' => [
-   'recall' => [
+   'dbn_sizing' => [
'buckets' => [
'control' => [
'trigger' => 'control',
],
-   'rec_3t_80_66' => [
-   'trigger' => 'rec_3t_80_66',
+   'dbn20' => [
+   'trigger' => 'dbn20',
'globals' => [
-   
'wgCirrusSearchFullTextQueryBuilderProfile' => 'rec_3t_80_66',
+   'wgCirrusSearchRescoreProfile' 
=> 'dbn20',
]
],
-   'rec_4t_80_66' => [
-   'trigger' => 'rec_4t_80_66',
+   'dbn20-i' => [
+   'trigger' => 'dbn20-i',
'globals' => [
-   
'wgCirrusSearchFullTextQueryBuilderProfile' => 'rec_4t_80_66',
+   
'wgCirrusSearchInterleaveConfig' => [
+   
'wgCirrusSearchRescoreProfile' => 'dbn20',
+   ],
+   ]
+   ],
+   'dbn35' => [
+   'trigger' => 'dbn35',
+   'globals' => [
+   'wgCirrusSearchRescoreProfile' 
=> 'dbn35',
+   ]
+   ],
+   'dbn35-i' => [
+   'trigger' => 'dbn35-i',
+   'globals' => [
+   
'wgCirrusSearchInterleaveConfig' => [
+   
'wgCirrusSearchRescoreProfile' => 'dbn35',
+   ],
]
],
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I32df6bf349f14f069568c324247a35bb821a07af
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: docker: pass all env variables to tox

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387682 )

Change subject: docker: pass all env variables to tox
..


docker: pass all env variables to tox

That will let us add extra environment variables from a job definition
and also let child images add extra variables before the entrypoint.

Requires tox to be bumped to 2.6.0:

From https://tox.readthedocs.io/en/latest/changelog.html

> 2.6.0
> fix glob resolution from TOX_TESTENV_PASSENV env variable
> pass setenv variables to setup.py during a usedevelop install.

Change-Id: I70334e52c2e3a4754c80cd0886c41a2f3e1ad937
---
M dockerfiles/tox/Dockerfile
M dockerfiles/tox/run.sh
M jjb/python-jobs.yaml
3 files changed, 5 insertions(+), 4 deletions(-)

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



diff --git a/dockerfiles/tox/Dockerfile b/dockerfiles/tox/Dockerfile
index ab346b0..88131c2 100644
--- a/dockerfiles/tox/Dockerfile
+++ b/dockerfiles/tox/Dockerfile
@@ -13,7 +13,7 @@
 RUN pip install pip==8.1.2 && \
 apt-get remove --yes --purge python-pip python3-pip && \
 ln -s /usr/local/bin/pip /usr/bin/pip && \
-pip install tox==2.5.0 && \
+pip install tox==2.6.0 && \
 pip install setuptools && \
 rm -fR "$XDG_CACHE_HOME/pip"
 
diff --git a/dockerfiles/tox/run.sh b/dockerfiles/tox/run.sh
index f9a3d0f..73df486 100644
--- a/dockerfiles/tox/run.sh
+++ b/dockerfiles/tox/run.sh
@@ -26,5 +26,6 @@
 git checkout --quiet FETCH_HEAD
 git submodule --quiet update --init --recursive
 
-# Run tests
-TOX_TESTENV_PASSENV="PY_COLORS XDG_CACHE_HOME" PY_COLORS=1 tox -v | tee 
"${LOG_DIR}/stdout.log"
+# Run tests. Pass all environment variables to tox since the environment here
+# is already pretty restrictive.
+TOX_TESTENV_PASSENV="*" PY_COLORS=1 tox -v | tee "${LOG_DIR}/stdout.log"
diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index 618d098..eaef708 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -75,7 +75,7 @@
 - docker-zuul-env
 - docker-log-dir
 - docker-run-with-log-and-workspace-cache:
-image: 'wmfreleng/tox:v2017.10.31.15.21'
+image: 'wmfreleng/tox:v2017.10.31.22.51'
 logdir: '/log'
 wrappers:
 - timeout:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I70334e52c2e3a4754c80cd0886c41a2f3e1ad937
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOjs UI to v0.24.1

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387746 )

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

Update OOjs UI to v0.24.1

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.24.1

Change-Id: I9ebdc86488c4eda7c524fb6004ea6a124a63d7ab
---
M composer.json
M composer.lock
M composer/installed.json
A oojs/oojs-ui/.phpcs.xml
M oojs/oojs-ui/History.md
M oojs/oojs-ui/README.md
M oojs/oojs-ui/demos/classes/FloatableTest.css
M oojs/oojs-ui/demos/classes/PositionSelectWidget.css
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/i18n/ais.json
M oojs/oojs-ui/i18n/id.json
M oojs/oojs-ui/i18n/skr-arab.json
M oojs/oojs-ui/i18n/ur.json
M oojs/oojs-ui/i18n/zh-hant.json
M oojs/oojs-ui/package.json
15 files changed, 205 insertions(+), 152 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/46/387746/1

diff --git a/composer.json b/composer.json
index d5f8c91..8fcad1d 100644
--- a/composer.json
+++ b/composer.json
@@ -74,7 +74,7 @@
"mustangostang/spyc": "0.6.2",
"nikic/php-parser": "3.0.6",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.24.0",
+   "oojs/oojs-ui": "0.24.1",
"oyejorge/less.php": "1.7.0.14",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.4.1",
diff --git a/composer.lock b/composer.lock
index adeccd7..e7d6033 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"
 ],
-"content-hash": "dc944fad09b4f0eea8581b87645d7747",
+"content-hash": "547ea39a262b2ce34f2187d8a1a0e107",
 "packages": [
 {
 "name": "composer/semver",
@@ -711,16 +711,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.24.0",
+"version": "v0.24.1",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git";,
-"reference": "702a48a61bc597a4053c19dd4e8767461c71fb12"
+"reference": "460b3700d80073dad91de8391eb7975c9a1ba34b"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/702a48a61bc597a4053c19dd4e8767461c71fb12";,
-"reference": "702a48a61bc597a4053c19dd4e8767461c71fb12",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/460b3700d80073dad91de8391eb7975c9a1ba34b";,
+"reference": "460b3700d80073dad91de8391eb7975c9a1ba34b",
 "shasum": ""
 },
 "require": {
@@ -729,7 +729,7 @@
 },
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "0.9.2",
-"mediawiki/mediawiki-codesniffer": "0.12.0",
+"mediawiki/mediawiki-codesniffer": "14.1.0",
 "phpunit/phpunit": "4.8.21"
 },
 "type": "library",
@@ -786,7 +786,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI";,
-"time": "2017-10-17T22:42:34+00:00"
+"time": "2017-10-31T22:31:08+00:00"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index 7e3a274..3e31b83 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -2833,18 +2833,70 @@
 ]
 },
 {
-"name": "oojs/oojs-ui",
-"version": "v0.24.0",
-"version_normalized": "0.24.0.0",
+"name": "wikimedia/equivset",
+"version": "1.0.0",
+"version_normalized": "1.0.0.0",
 "source": {
 "type": "git",
-"url": "https://github.com/wikimedia/oojs-ui.git";,
-"reference": "702a48a61bc597a4053c19dd4e8767461c71fb12"
+"url": "https://github.com/wikimedia/Equivset.git";,
+"reference": "70d97de8339da54889a6d7e7ef9d438775cd286b"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/702a48a61bc597a4053c19dd4e8767461c71fb12";,
-"reference": "702a48a61bc597a4053c19dd4e8767461c71fb12",
+"url": 
"https://api.github.com/repos/wikimedia/Equivset/zipball/70d97de8339da54889a6d7e7ef9d438775cd286b";,
+"reference": "70d97de8339da54889a6d7e7ef9d438775cd286b",
+"shasum": ""
+},
+"require": {
+"php": ">=5.5.9",
+"wikimedia/utfnormal": "^1.1.0"
+},
+"require-dev": {
+"jakub-onde

[MediaWiki-commits] [Gerrit] oojs/ui[master]: README: Consistently refert to OOUI as library

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387744 )

Change subject: README: Consistently refert to OOUI as library
..

README: Consistently refert to OOUI as library

Bug: T179111
Change-Id: Ib8e33498b1df3f5bbcc4b0c02e4eadefb2f5a997
---
M README.md
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/44/387744/1

diff --git a/README.md b/README.md
index 8439be9..7f9dcca 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 OOjs UI
 =
 
-OOjs UI is a modern JavaScript UI toolkit. It provides common widgets, 
layouts, dialogs and icons that are ready to use, as well as many useful and 
convenient classes for constructing custom user interfaces. It is the standard 
user-interface library in Wikimedia Foundation Web products, having been 
originally created for use by 
[VisualEditor](https://www.mediawiki.org/wiki/VisualEditor), which uses it for 
its entire user interface.
+OOjs UI is a modern JavaScript UI library. It provides common widgets, 
layouts, dialogs and icons that are ready to use, as well as many useful and 
convenient classes for constructing custom user interfaces. It is the standard 
user-interface library in Wikimedia Foundation Web products, having been 
originally created for use by 
[VisualEditor](https://www.mediawiki.org/wiki/VisualEditor), which uses it for 
its entire user interface.
 
 Quick start
 --

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8e33498b1df3f5bbcc4b0c02e4eadefb2f5a997
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.24.1

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387745 )

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

Update OOjs UI to v0.24.1

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.24.1

Change-Id: I9ebdc86488c4eda7c524fb6004ea6a124a63d7da
---
M lib/oojs-ui/README.md
M lib/oojs-ui/i18n/ais.json
M lib/oojs-ui/i18n/id.json
M lib/oojs-ui/i18n/skr-arab.json
M lib/oojs-ui/i18n/ur.json
M lib/oojs-ui/i18n/zh-hant.json
M lib/oojs-ui/oojs-ui-apex-icons-accessibility.css
M lib/oojs-ui/oojs-ui-apex-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-content.css
M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-media.css
M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-user.css
M lib/oojs-ui/oojs-ui-apex-icons-user.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.rtl.css
M lib/oojs-ui/oojs-ui-core-apex.css
M lib/oojs-ui/oojs-ui-core-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-core.js
M lib/oojs-ui/oojs-ui-core.js.map
M lib/oojs-ui/oojs-ui-images-apex.css
M lib/oojs-ui/oojs-ui-images-apex.rtl.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-apex.css
M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-toolbars.js
M lib/oojs-ui/oojs-ui-widgets-apex.css
M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-widgets.js
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui.css
M lib/oojs-ui/oojs-ui-wikimediaui.js
M lib/oojs-ui/oojs-ui-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-windows-apex.css
M lib/oojs-ui/oojs-ui-windows-apex.rtl.css
M lib/oojs-ui/oojs-ui-windows-wikimediaui.css
M lib/oojs-ui/oojs-ui-windows-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-windows.js
M lib/oojs-ui/themes/apex/images/icons/add.svg
M lib/oojs-ui/themes/apex/images/icons/advanced.svg
M lib/oojs-ui/themes/apex/images/icons/alert.svg
M lib/oojs-ui/themes/apex/images/icons/align-c

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.24.1

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387742 )

Change subject: Tag v0.24.1
..


Tag v0.24.1

Change-Id: I1f5d4da756518204ce2e05bde002a0a5a4df450d
---
M History.md
M package.json
2 files changed, 22 insertions(+), 1 deletion(-)

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



diff --git a/History.md b/History.md
index 72a25d0..e74043f 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,25 @@
 # OOjs UI Release History
+## v0.24.1 / 2017-10-31
+### Features
+* DropdownWidget: Allow pressing Space to close the widget, as well as open 
(Bartosz Dziewoński)
+
+### Styles
+* WikimediaUI theme: Visually improve MenuSectionOptionWidget MenuOptions 
(Volker E.)
+
+### Code
+* ComboBoxInputWidget: Add `.oo-ui-comboBoxInputWidget-open` class to widget 
(Volker E.)
+* Generate clover.xml with code coverage results (Kunal Mehta)
+* WikimediaUI theme: Use child selectors for styling toolbar action buttons 
(Bartosz Dziewoński)
+* README: Simplify and move “Versioning” section (Volker E.)
+* README: Simplify “Contributing” section slightly and add LESS lint hint 
(Volker E.)
+* build: Bump stylelint devDependencies (James D. Forrester)
+* build: Bump various devDependencies to latest (James D. Forrester)
+* build: Downgrade 'grunt-exec' to 1.0.1 (again) (Bartosz Dziewoński)
+* build: Update grunt-image to version 4.0.0 (Ed Sanders)
+* build: Update mediawiki/mediawiki-codesniffer to 14.1.0 (libraryupgrader)
+* icons: Unify SVG markup (Volker E.)
+
+
 ## v0.24.0 / 2017-10-17
 ### Breaking changes
 * [BREAKING CHANGE] Drop 'MediaWiki' backwards-compatibility theme (James D. 
Forrester)
diff --git a/package.json b/package.json
index 8033e37..33a9326 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.24.0",
+  "version": "0.24.1",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f5d4da756518204ce2e05bde002a0a5a4df450d
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Scap prep: check reference directory exists

[Thcipriani (Code Review)]

Thcipriani has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387743 )

Change subject: Scap prep: check reference directory exists
..

Scap prep: check reference directory exists

To setup scap testing environments, we need to be able to run scap prep
without having any prior wikiversions. We currently assume that the last
wikiversion from wikiversions.json is checked out on disk. This isn't
the case for new servers or for testing environments.

Change-Id: Ib83952ad1c475b06d268d3fa719c01e3fd6624be
---
M scap/plugins/prep.py
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/43/387743/1

diff --git a/scap/plugins/prep.py b/scap/plugins/prep.py
index c87d8f0..b207f9c 100644
--- a/scap/plugins/prep.py
+++ b/scap/plugins/prep.py
@@ -100,7 +100,11 @@
 self.get_logger().info('Version already checked out')
 return 0
 
-git.fetch(dest_dir, GERRIT_URL + 'mediawiki/core', copy_dir)
+reference_dir = None
+if os.path.isdir(copy_dir):
+reference_dir = copy_dir
+
+git.fetch(dest_dir, GERRIT_URL + 'mediawiki/core', reference_dir)
 
 with utils.cd(dest_dir):
 if subprocess.call(['/usr/bin/git', 'config',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib83952ad1c475b06d268d3fa719c01e3fd6624be
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.24.1

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387742 )

Change subject: Tag v0.24.1
..

Tag v0.24.1

Change-Id: I1f5d4da756518204ce2e05bde002a0a5a4df450d
---
M History.md
M package.json
2 files changed, 22 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/42/387742/1

diff --git a/History.md b/History.md
index 72a25d0..e74043f 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,25 @@
 # OOjs UI Release History
+## v0.24.1 / 2017-10-31
+### Features
+* DropdownWidget: Allow pressing Space to close the widget, as well as open 
(Bartosz Dziewoński)
+
+### Styles
+* WikimediaUI theme: Visually improve MenuSectionOptionWidget MenuOptions 
(Volker E.)
+
+### Code
+* ComboBoxInputWidget: Add `.oo-ui-comboBoxInputWidget-open` class to widget 
(Volker E.)
+* Generate clover.xml with code coverage results (Kunal Mehta)
+* WikimediaUI theme: Use child selectors for styling toolbar action buttons 
(Bartosz Dziewoński)
+* README: Simplify and move “Versioning” section (Volker E.)
+* README: Simplify “Contributing” section slightly and add LESS lint hint 
(Volker E.)
+* build: Bump stylelint devDependencies (James D. Forrester)
+* build: Bump various devDependencies to latest (James D. Forrester)
+* build: Downgrade 'grunt-exec' to 1.0.1 (again) (Bartosz Dziewoński)
+* build: Update grunt-image to version 4.0.0 (Ed Sanders)
+* build: Update mediawiki/mediawiki-codesniffer to 14.1.0 (libraryupgrader)
+* icons: Unify SVG markup (Volker E.)
+
+
 ## v0.24.0 / 2017-10-17
 ### Breaking changes
 * [BREAKING CHANGE] Drop 'MediaWiki' backwards-compatibility theme (James D. 
Forrester)
diff --git a/package.json b/package.json
index 8033e37..33a9326 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.24.0",
+  "version": "0.24.1",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f5d4da756518204ce2e05bde002a0a5a4df450d
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable NewUserMessage on fawikiquote

[Ladsgroup (Code Review)]

Ladsgroup has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387741 )

Change subject: Enable NewUserMessage on fawikiquote
..

Enable NewUserMessage on fawikiquote

Bug: T179442
Change-Id: I7a97552657c30cff8a3206ddba1460caa42a7088
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/41/387741/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 3fc0533..ffd65b4 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12797,6 +12797,7 @@
'fawiki' => true, // T55981
'fawikibooks' => true, // T91861
'fawikinews' => true,
+   'fawikiquote' => true, // T179442
'fawikivoyage' => true, // T76716
'fawiktionary' => true, // T90831
// 'gomwiki' => true, // T106169.  Disabled until T131957 is fixed.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a97552657c30cff8a3206ddba1460caa42a7088
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Adyen transitional code - revert a day after deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387740 )

Change subject: Adyen transitional code - revert a day after deployment
..

Adyen transitional code - revert a day after deployment

For old javascript that doesn't set the processor_form, set a
default value.

Bug: T176913
Change-Id: Id41e6492329b6a325b01d7a6af6077eca9b08858
---
M adyen_gateway/AdyenHostedSignature.php
M gateway_common/donation.api.php
2 files changed, 11 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/40/387740/1

diff --git a/adyen_gateway/AdyenHostedSignature.php 
b/adyen_gateway/AdyenHostedSignature.php
index 7027b91..25a23e5 100644
--- a/adyen_gateway/AdyenHostedSignature.php
+++ b/adyen_gateway/AdyenHostedSignature.php
@@ -46,16 +46,19 @@
$merged = array_merge( array_keys( $values ), array_values( 
$values ) );
$joined = implode( ':', $merged );
$skinCode = $values['skinCode'];
-   if ( array_key_exists( $skinCode, $adapter->getAccountConfig( 
'Skins' ) ) ) {
+   // Transitional code, get rid of this first condition before 
next deploy
+   if ( !$skinCode && $adapter->getAccountConfig( 'SkinCode' ) ) {
+   $secret = $adapter->getAccountConfig( 'SharedSecret' );
+   } elseif ( array_key_exists( $skinCode, 
$adapter->getAccountConfig( 'Skins' ) ) ) {
$secret = $adapter->getAccountConfig( 'Skins' 
)[$skinCode]['SharedSecret'];
-   return base64_encode(
-   hash_hmac( 'sha256', $joined, pack( "H*", 
$secret ), true )
-   );
} else {
throw new RuntimeException(
'Skin code not configured',
ResponseCodes::BAD_SIGNATURE
);
}
+   return base64_encode(
+   hash_hmac( 'sha256', $joined, pack( "H*", $secret ), 
true )
+   );
}
 }
diff --git a/gateway_common/donation.api.php b/gateway_common/donation.api.php
index 71e8545..dd1888e 100644
--- a/gateway_common/donation.api.php
+++ b/gateway_common/donation.api.php
@@ -52,6 +52,10 @@
$result = $gatewayObj->do_transaction( 
'createHostedCheckout' );
break;
case 'adyen':
+   // transitional code, delete before next deploy
+   if ( empty( 
$this->donationData['processor_form'] ) && $gatewayObj->getAccountConfig( 
'SkinCode' ) ) {
+   $gatewayObj->addRequestData( array( 
'processor_form' => $gatewayObj->getAccountConfig( 'SkinCode' ) ) );
+   }
$result = $gatewayObj->do_transaction( 'donate' 
);
break;
case 'paypal_ec':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id41e6492329b6a325b01d7a6af6077eca9b08858
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] mediawiki...ShowMe[master]: Add unordered list type

[tosfos (Code Review)]

tosfos has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387739 )

Change subject: Add unordered list type
..

Add unordered list type

Change-Id: I21f1a98e6aaa81f15f7dca91cc496b0b0c229770
---
M ShowMe.class.php
M ShowMe.hooks.php
M extension.json
A modules/ext.showMe.css
M modules/ext.showMe.js
5 files changed, 83 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ShowMe 
refs/changes/39/387739/1

diff --git a/ShowMe.class.php b/ShowMe.class.php
index 45b2a06..5352cf5 100644
--- a/ShowMe.class.php
+++ b/ShowMe.class.php
@@ -11,7 +11,7 @@
 
/**
 *
-* @param string $type The type of input field, currently must be 
'dropdown'
+* @param string $type The type of input field, currently may be 
'dropdown' or 'ul'
 * @param string $name The name and ID to be assigned to the input field
 * @param array $options Use the form label => value
 * @param ParserOutput $out
@@ -21,10 +21,12 @@
$this->name = $name;
$this->options = $options;
 
-   // Add this $name to he array of ShowMe field IDs that exist on 
this page
-   $configVars = $out->getJsConfigVars();
-   $configVars['wgShowMeDropdownIDs'][] = $name;
-   $out->addJsConfigVars( 'wgShowMeDropdownIDs', 
$configVars['wgShowMeDropdownIDs'] );
+   // Add this $name to the array of ShowMe field IDs that exist 
on this page
+   if ( $type == 'dropdown' ) {
+   $this->addVar( 'wgShowMeDropdownIDs', $name, $out );
+   } elseif ( $type == 'ul' ) {
+   $this->addVar( 'wgShowMeUnorderedListIDs', $name, $out 
);
+   }
}
 
/**
@@ -34,8 +36,11 @@
 */
public function getHTML() {
// Theoretically, other types may be added in the future, such 
as radio buttons.
-   if ( $this->type == 'dropdown' ) {
-   return $this->getDropdownHTML();
+   switch ( $this->type ) {
+   case 'dropdown':
+   return $this->getDropdownHTML();
+   case 'ul':
+   return $this->getUnorderedListHTML();
}
// invalid type
return ''; // Throw error?
@@ -51,4 +56,33 @@
$select->addOptions( $this->options );
return $select->getHTML();
}
+
+   /**
+* Get the output HTML for a ul
+*
+* @return string
+*/
+   protected function getUnorderedListHTML() {
+   $html = Html::openElement( 'ul', [ 'id' => $this->name, 'class' 
=> 'showme-ul' ] );
+   foreach ( $this->options as $label => $value ) {
+   $anchor = Html::rawElement( 'a', [ 'href' => '#' ], 
$label );
+   $html .= Html::rawElement( 'li', [ 'id' => $value ], 
$anchor );
+   }
+   $html .= Html::closeElement( 'ul' );
+
+   return $html;
+   }
+
+   /**
+* Add the name of an element to the JS vars
+*
+* @param string $varName
+* @param string $name
+* @param ParserOutput $out
+*/
+   private function addVar( $varName, $name, ParserOutput $out ) {
+   $configVars = $out->getJsConfigVars();
+   $configVars[$varName][] = $name;
+   $out->addJsConfigVars( $varName, $configVars[$varName] );
+   }
 }
diff --git a/ShowMe.hooks.php b/ShowMe.hooks.php
index 4109ced..0f65cef 100644
--- a/ShowMe.hooks.php
+++ b/ShowMe.hooks.php
@@ -28,7 +28,7 @@
 * @return string Output HTML
 */
public static function showMeRender( $input, array $args, Parser 
$parser, PPFrame $frame ) {
-   $parser->getOutput()->addModuleScripts( 'ext.showMe' );
+   $parser->getOutput()->addModules( 'ext.showMe' );
 
$options = [];
$lines = StringUtils::explode( "\n", $input );
@@ -41,6 +41,13 @@
$options[$bits[0]] = $bits[1];
}
 
+   $validTypes = [ 'dropdown', 'ul' ];
+   if ( isset( $args['type'] ) && in_array( $args['type'], 
$validTypes ) ) {
+   $type = $args['type'];
+   } else {
+   $type = 'dropdown';
+   }
+
// If the user supplied an ID, use it. Otherwise, generate one.
if ( isset( $args['name'] ) ) {
$name = $args['name'];
@@ -48,10 +55,10 @@
static $num = 0;
// Add a num to the HTML ID in case there is more than 
one ShowMe field on this page.
// Iterate after getting num.
-   $nam

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: build: Organise Gruntfile.js more consistently

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387732 )

Change subject: build: Organise Gruntfile.js more consistently
..


build: Organise Gruntfile.js more consistently

This also adds linting for skinStyles, with a few fixes to make these pass.

Change-Id: Id26b0bad21850d985eaaceda24fa50ad6f886458
---
M Gruntfile.js
M skinStyles/mediawiki.hlist/minerva.less
M skinStyles/mediawiki.special.preferences.styles/styles.less
M skinStyles/mobile.startup/Overlay.less
4 files changed, 28 insertions(+), 24 deletions(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
index c4352eb..a0f8cd2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,10 +13,10 @@
eslint: {
all: [
'**/*.js',
-   '!libs/**',
-   '!vendor/**',
'!docs/**',
-   '!node_modules/**'
+   '!libs/**',
+   '!node_modules/**',
+   '!vendor/**'
]
},
stylelint: {
@@ -24,17 +24,30 @@
syntax: 'less'
},
all: [
-   'minerva.less/**/*.less',
-   'resources/**/*.less'
+   '**/*.less',
+   '!docs/**',
+   '!libs/**',
+   '!node_modules/**',
+   '!vendor/**'
]
},
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!docs/**',
+   '!libs/**',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   },
+   banana: conf.MessagesDirs,
watch: {
lint: {
-   files: [ 'resources/**/*.js', 
'tests/qunit/**/*.js' ],
+   files: [ 
'{resources,tests/qunit}/**/*.{js,less}' ],
tasks: [ 'lint' ]
},
scripts: {
-   files: [ 'resources/**/*.js', 
'tests/qunit/**/*.js' ],
+   files: [ '{resources,tests/qunit}/**/*.js' ],
tasks: [ 'test' ]
},
configFiles: {
@@ -43,19 +56,10 @@
reload: true
}
}
-   },
-   banana: conf.MessagesDirs,
-   jsonlint: {
-   all: [
-   '*.json',
-   '**/*.json',
-   '!node_modules/**',
-   '!vendor/**'
-   ]
}
} );
 
-   grunt.registerTask( 'lint', [ 'eslint', 'jsonlint', 'banana', 
'stylelint' ] );
+   grunt.registerTask( 'lint', [ 'eslint', 'stylelint', 'jsonlint', 
'banana' ] );
grunt.registerTask( 'test', [ 'lint' ] );
 
grunt.registerTask( 'default', [ 'test' ] );
diff --git a/skinStyles/mediawiki.hlist/minerva.less 
b/skinStyles/mediawiki.hlist/minerva.less
index abe6279..a436568 100644
--- a/skinStyles/mediawiki.hlist/minerva.less
+++ b/skinStyles/mediawiki.hlist/minerva.less
@@ -1,4 +1,4 @@
- @import 'minerva.variables.less';
+@import 'minerva.variables.less';
 
 /**
  * This tweaks the default mediawiki.hlist module to provide performance 
optimisations
@@ -7,7 +7,7 @@
 
 // FIXME: to support hlists on enwiki projects - this should be deprecated
 .hlist > ul,
-.hlist > dl,.hlist > ul,
+.hlist > dl,
 // Horizontal Lists
 //
 // Use hlist class when dealing with lists where items should be horizontal.
diff --git a/skinStyles/mediawiki.special.preferences.styles/styles.less 
b/skinStyles/mediawiki.special.preferences.styles/styles.less
index 2e6814d..7e5599b 100644
--- a/skinStyles/mediawiki.special.preferences.styles/styles.less
+++ b/skinStyles/mediawiki.special.preferences.styles/styles.less
@@ -46,4 +46,4 @@
border: solid 1px @colorFieldBorder;
padding: 8px;
}
-}
\ No newline at end of file
+}
diff --git a/skinStyles/mobile.startup/Overlay.less 
b/skinStyles/mobile.startup/Overlay.less
index c0b123c..3d44a02 100644
--- a/skinStyles/mobile.startup/Overlay.less
+++ b/skinStyles/mobile.startup/Overlay.less
@@ -4,6 +4,10 @@
 .overlay {
padding-top: @headerHei

[MediaWiki-commits] [Gerrit] oojs/ui[master]: demos: Align to CSS coding guidelines and color palette

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387497 )

Change subject: demos: Align to CSS coding guidelines and color palette
..


demos: Align to CSS coding guidelines and color palette

Aligning demo CSS to coding guidelines and colors to color palette.

Change-Id: If1e9a7b79e374619483532c72a4e10397493d7e6
---
M demos/classes/FloatableTest.css
M demos/classes/PositionSelectWidget.css
2 files changed, 15 insertions(+), 15 deletions(-)

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



diff --git a/demos/classes/FloatableTest.css b/demos/classes/FloatableTest.css
index 3842259..d5c0c84 100644
--- a/demos/classes/FloatableTest.css
+++ b/demos/classes/FloatableTest.css
@@ -1,10 +1,10 @@
 .demo-floatableTest-floatable,
 .demo-floatableTest-container {
-   border: 1px #000 solid;
+   border: 1px solid #000;
 }
 
 .demo-floatableTest-floatable {
-   border: 1px #f00 solid;
+   border: 1px solid #d33;
width: 200px;
height: 200px;
position: absolute;
diff --git a/demos/classes/PositionSelectWidget.css 
b/demos/classes/PositionSelectWidget.css
index f175df4..eb60d77 100644
--- a/demos/classes/PositionSelectWidget.css
+++ b/demos/classes/PositionSelectWidget.css
@@ -2,33 +2,33 @@
border-collapse: collapse;
 }
 .demo-positionSelectWidget tr:nth-child( 2 ) td:nth-child( 2 ) {
-   border-top: 1px #000 solid;
-   border-left: 1px #000 solid;
+   border-top: 1px solid #000;
+   border-left: 1px solid #000;
 }
 .demo-positionSelectWidget tr:nth-child( 2 ) td:nth-child( 3 ) {
-   border-top: 1px #000 solid;
+   border-top: 1px solid #000;
 }
 .demo-positionSelectWidget tr:nth-child( 2 ) td:nth-child( 4 ) {
-   border-top: 1px #000 solid;
-   border-right: 1px #000 solid;
+   border-top: 1px solid #000;
+   border-right: 1px solid #000;
 }
 .demo-positionSelectWidget tr:nth-child( 3 ) td:nth-child( 2 ) {
-   border-left: 1px #000 solid;
+   border-left: 1px solid #000;
 }
 .demo-positionSelectWidget tr:nth-child( 3 ) td:nth-child( 4 ) {
-   border-right: 1px #000 solid;
+   border-right: 1px solid #000;
 }
 .demo-positionSelectWidget tr:nth-child( 4 ) td:nth-child( 2 ) {
-   border-bottom: 1px #000 solid;
-   border-left: 1px #000 solid;
+   border-bottom: 1px solid #000;
+   border-left: 1px solid #000;
 }
 .demo-positionSelectWidget tr:nth-child( 4 ) td:nth-child( 3 ) {
-   border-bottom: 1px #000 solid;
+   border-bottom: 1px solid #000;
 }
 .demo-positionSelectWidget tr:nth-child( 4 ) td:nth-child( 4 ) {
-   border-bottom: 1px #000 solid;
-   border-right: 1px #000 solid;
+   border-bottom: 1px solid #000;
+   border-right: 1px solid #000;
 }
 .demo-positionSelectWidget 
.oo-ui-radioOptionWidget.oo-ui-optionWidget-selected {
-   outline: 1px #f00 solid;
+   outline: 1px solid #d33;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If1e9a7b79e374619483532c72a4e10397493d7e6
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: icons: Unify SVG markup

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387372 )

Change subject: icons: Unify SVG markup
..


icons: Unify SVG markup

Align SVG markup across Foundation products by:
- unifying XML declaration,
- removing unnecessary `standalone="no"` attribute as it's default,
- adding `width` and `height` attributes where missing,
- removing all `g` group elements except where necessary for transforms,
- putting attributes on `path`,
- removing unnecessary ids, and
- unifying whitespace.

Also changing 'attachment*' icons to use same `viewBox` logic as anywhere
else.

Saving between 2-27% file size before gzipping.

Bug: T178867
Change-Id: I1a684f1351fc03161eeb579a37e6f54faa30012d
---
M src/themes/apex/images/icons/add.svg
M src/themes/apex/images/icons/advanced.svg
M src/themes/apex/images/icons/alert.svg
M src/themes/apex/images/icons/align-center.svg
M src/themes/apex/images/icons/align-float-left.svg
M src/themes/apex/images/icons/align-float-right.svg
M src/themes/apex/images/icons/arched-arrow-ltr.svg
M src/themes/apex/images/icons/arched-arrow-rtl.svg
M src/themes/apex/images/icons/arrow-ltr.svg
M src/themes/apex/images/icons/arrow-rtl.svg
M src/themes/apex/images/icons/article-ltr.svg
M src/themes/apex/images/icons/article-rtl.svg
M src/themes/apex/images/icons/articleRedirect-ltr.svg
M src/themes/apex/images/icons/articleRedirect-rtl.svg
M src/themes/apex/images/icons/articles-ltr.svg
M src/themes/apex/images/icons/articles-rtl.svg
M src/themes/apex/images/icons/attachment-ltr.svg
M src/themes/apex/images/icons/attachment-rtl.svg
M src/themes/apex/images/icons/bell.svg
M src/themes/apex/images/icons/bellOn-ltr.svg
M src/themes/apex/images/icons/bellOn-rtl.svg
M src/themes/apex/images/icons/bigger-ltr.svg
M src/themes/apex/images/icons/bigger-rtl.svg
M src/themes/apex/images/icons/block.svg
M src/themes/apex/images/icons/bold-a.svg
M src/themes/apex/images/icons/bold-arab-ain.svg
M src/themes/apex/images/icons/bold-arab-dad.svg
M src/themes/apex/images/icons/bold-armn-to.svg
M src/themes/apex/images/icons/bold-b.svg
M src/themes/apex/images/icons/bold-cyrl-be.svg
M src/themes/apex/images/icons/bold-cyrl-te.svg
M src/themes/apex/images/icons/bold-cyrl-zhe.svg
M src/themes/apex/images/icons/bold-f.svg
M src/themes/apex/images/icons/bold-g.svg
M src/themes/apex/images/icons/bold-geor-man.svg
M src/themes/apex/images/icons/bold-l.svg
M src/themes/apex/images/icons/bold-n.svg
M src/themes/apex/images/icons/bold-v.svg
M src/themes/apex/images/icons/bookmark-ltr.svg
M src/themes/apex/images/icons/bookmark-rtl.svg
M src/themes/apex/images/icons/bright.svg
M src/themes/apex/images/icons/browser-ltr.svg
M src/themes/apex/images/icons/browser-rtl.svg
M src/themes/apex/images/icons/calendar-ltr.svg
M src/themes/apex/images/icons/calendar-rtl.svg
M src/themes/apex/images/icons/cancel.svg
M src/themes/apex/images/icons/case-sensitive.svg
M src/themes/apex/images/icons/check.svg
M src/themes/apex/images/icons/circle.svg
M src/themes/apex/images/icons/clear.svg
M src/themes/apex/images/icons/clip.svg
M src/themes/apex/images/icons/clock.svg
M src/themes/apex/images/icons/close.svg
M src/themes/apex/images/icons/code.svg
M src/themes/apex/images/icons/collapse.svg
M src/themes/apex/images/icons/comment.svg
M src/themes/apex/images/icons/diacritic.svg
M src/themes/apex/images/icons/downTriangle.svg
M src/themes/apex/images/icons/draggable.svg
M src/themes/apex/images/icons/edit-ltr.svg
M src/themes/apex/images/icons/edit-rtl.svg
M src/themes/apex/images/icons/editLock-ltr.svg
M src/themes/apex/images/icons/editLock-rtl.svg
M src/themes/apex/images/icons/editUndo-ltr.svg
M src/themes/apex/images/icons/editUndo-rtl.svg
M src/themes/apex/images/icons/ellipsis.svg
M src/themes/apex/images/icons/expand.svg
M src/themes/apex/images/icons/external-link-ltr.svg
M src/themes/apex/images/icons/external-link-rtl.svg
M src/themes/apex/images/icons/eye.svg
M src/themes/apex/images/icons/eyeClosed.svg
M src/themes/apex/images/icons/feedback-ltr.svg
M src/themes/apex/images/icons/feedback-rtl.svg
M src/themes/apex/images/icons/find-ltr.svg
M src/themes/apex/images/icons/find-rtl.svg
M src/themes/apex/images/icons/flag-ltr.svg
M src/themes/apex/images/icons/flag-rtl.svg
M src/themes/apex/images/icons/fullScreen.svg
M src/themes/apex/images/icons/funnel-ltr.svg
M src/themes/apex/images/icons/funnel-rtl.svg
M src/themes/apex/images/icons/halfBright.svg
M src/themes/apex/images/icons/halfStar-ltr.svg
M src/themes/apex/images/icons/halfStar-rtl.svg
M src/themes/apex/images/icons/heart.svg
M src/themes/apex/images/icons/help-ltr.svg
M src/themes/apex/images/icons/help-rtl.svg
M src/themes/apex/images/icons/highlight-ltr.svg
M src/themes/apex/images/icons/highlight-rtl.svg
M src/themes/apex/images/icons/history.svg
M src/themes/apex/images/icons/image.svg
M src/themes/apex/images/icons/imageGallery-ltr.svg
M src/themes/apex/images/ic

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: build: Organise Gruntfile.js more consistently

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387732 )

Change subject: build: Organise Gruntfile.js more consistently
..

build: Organise Gruntfile.js more consistently

This also adds linting for skinStyles, with a few fixes to make these pass.

Change-Id: Id26b0bad21850d985eaaceda24fa50ad6f886458
---
M Gruntfile.js
M skinStyles/mediawiki.hlist/minerva.less
M skinStyles/mediawiki.special.preferences.styles/styles.less
M skinStyles/mobile.startup/Overlay.less
4 files changed, 28 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/32/387732/1

diff --git a/Gruntfile.js b/Gruntfile.js
index c4352eb..a0f8cd2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,10 +13,10 @@
eslint: {
all: [
'**/*.js',
-   '!libs/**',
-   '!vendor/**',
'!docs/**',
-   '!node_modules/**'
+   '!libs/**',
+   '!node_modules/**',
+   '!vendor/**'
]
},
stylelint: {
@@ -24,17 +24,30 @@
syntax: 'less'
},
all: [
-   'minerva.less/**/*.less',
-   'resources/**/*.less'
+   '**/*.less',
+   '!docs/**',
+   '!libs/**',
+   '!node_modules/**',
+   '!vendor/**'
]
},
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!docs/**',
+   '!libs/**',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   },
+   banana: conf.MessagesDirs,
watch: {
lint: {
-   files: [ 'resources/**/*.js', 
'tests/qunit/**/*.js' ],
+   files: [ 
'{resources,tests/qunit}/**/*.{js,less}' ],
tasks: [ 'lint' ]
},
scripts: {
-   files: [ 'resources/**/*.js', 
'tests/qunit/**/*.js' ],
+   files: [ '{resources,tests/qunit}/**/*.js' ],
tasks: [ 'test' ]
},
configFiles: {
@@ -43,19 +56,10 @@
reload: true
}
}
-   },
-   banana: conf.MessagesDirs,
-   jsonlint: {
-   all: [
-   '*.json',
-   '**/*.json',
-   '!node_modules/**',
-   '!vendor/**'
-   ]
}
} );
 
-   grunt.registerTask( 'lint', [ 'eslint', 'jsonlint', 'banana', 
'stylelint' ] );
+   grunt.registerTask( 'lint', [ 'eslint', 'stylelint', 'jsonlint', 
'banana' ] );
grunt.registerTask( 'test', [ 'lint' ] );
 
grunt.registerTask( 'default', [ 'test' ] );
diff --git a/skinStyles/mediawiki.hlist/minerva.less 
b/skinStyles/mediawiki.hlist/minerva.less
index abe6279..a436568 100644
--- a/skinStyles/mediawiki.hlist/minerva.less
+++ b/skinStyles/mediawiki.hlist/minerva.less
@@ -1,4 +1,4 @@
- @import 'minerva.variables.less';
+@import 'minerva.variables.less';
 
 /**
  * This tweaks the default mediawiki.hlist module to provide performance 
optimisations
@@ -7,7 +7,7 @@
 
 // FIXME: to support hlists on enwiki projects - this should be deprecated
 .hlist > ul,
-.hlist > dl,.hlist > ul,
+.hlist > dl,
 // Horizontal Lists
 //
 // Use hlist class when dealing with lists where items should be horizontal.
diff --git a/skinStyles/mediawiki.special.preferences.styles/styles.less 
b/skinStyles/mediawiki.special.preferences.styles/styles.less
index 2e6814d..7e5599b 100644
--- a/skinStyles/mediawiki.special.preferences.styles/styles.less
+++ b/skinStyles/mediawiki.special.preferences.styles/styles.less
@@ -46,4 +46,4 @@
border: solid 1px @colorFieldBorder;
padding: 8px;
}
-}
\ No newline at end of file
+}
diff --git a/skinStyles/mobile.startup/Overlay.less 
b/skinStyles/mobile.startup/Overlay.less
index c0b123c..3d44a02 100644
--- a/skinStyles/mobile.startup/Overlay.less
+++ b/skinStyles/mobile.startup/Overlay.less
@@ -4,6 +4,10 @@
 .overlay {
padding-to

[MediaWiki-commits] [Gerrit] integration/config[master]: dockerfile: add libmysqlclient-dev to tox

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387728 )

Change subject: dockerfile: add libmysqlclient-dev to tox
..

dockerfile: add libmysqlclient-dev to tox

Some repositories require mysql_config.
Add wikimedia/fundraising/tools as a run test for the tox docker image.
Note it fails since the repo requires mysql.

Bug: T179392
Change-Id: I2b1648663a2a5de3e651122410126290840cb84d
---
M dockerfiles/tox/Dockerfile
M dockerfiles/tox/example-run.sh
2 files changed, 10 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/28/387728/1

diff --git a/dockerfiles/tox/Dockerfile b/dockerfiles/tox/Dockerfile
index 6e4bdfa..1601275 100644
--- a/dockerfiles/tox/Dockerfile
+++ b/dockerfiles/tox/Dockerfile
@@ -8,6 +8,7 @@
 python3-dev \
 pypy \
 gcc g++ libc-dev make \
+libmysqlclient-dev \
 && \
 rm -rf /var/lib/apt/lists/*
 
diff --git a/dockerfiles/tox/example-run.sh b/dockerfiles/tox/example-run.sh
index 3408752..e61f85b 100644
--- a/dockerfiles/tox/example-run.sh
+++ b/dockerfiles/tox/example-run.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-install --mode 2777 --directory log
-docker run \
---rm --tty \
---env ZUUL_URL=https://gerrit.wikimedia.org/r \
---env ZUUL_PROJECT=analytics/quarry/web \
---env ZUUL_COMMIT=master \
---env ZUUL_REF=master \
---volume /"$(pwd)"/log://log \
- wmfreleng/tox:latest
+for project in analytics/quarry/web wikimedia/fundraising/tools; do
+docker run \
+--rm --tty \
+--env ZUUL_URL=https://gerrit.wikimedia.org/r \
+--env ZUUL_PROJECT="$project" \
+--env ZUUL_COMMIT=master \
+--env ZUUL_REF=master \
+ wmfreleng/tox:latest
+done

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b1648663a2a5de3e651122410126290840cb84d
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Fix exception signature

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387727 )

Change subject: Fix exception signature
..

Fix exception signature

Bug: T176913
Change-Id: I2a7edf5f0853fd1dfd5bc72471756b2ad8914889
---
M adyen_gateway/AdyenHostedSignature.php
1 file changed, 1 insertion(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/27/387727/1

diff --git a/adyen_gateway/AdyenHostedSignature.php 
b/adyen_gateway/AdyenHostedSignature.php
index 7027b91..ee926c3 100644
--- a/adyen_gateway/AdyenHostedSignature.php
+++ b/adyen_gateway/AdyenHostedSignature.php
@@ -52,10 +52,7 @@
hash_hmac( 'sha256', $joined, pack( "H*", 
$secret ), true )
);
} else {
-   throw new RuntimeException(
-   'Skin code not configured',
-   ResponseCodes::BAD_SIGNATURE
-   );
+   throw new RuntimeException( "Skin code $skinCode not 
configured" );
}
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a7edf5f0853fd1dfd5bc72471756b2ad8914889
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: docker: add dev dependencies to tox

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387723 )

Change subject: docker: add dev dependencies to tox
..

docker: add dev dependencies to tox

Required to build some modules. That is only the basis though, most
probably we would need additional libraries.

Change-Id: I6c0e7b00f8d7f3541be475f72144a8932d6b693e
---
M dockerfiles/tox/Dockerfile
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/23/387723/1

diff --git a/dockerfiles/tox/Dockerfile b/dockerfiles/tox/Dockerfile
index ab346b0..6e4bdfa 100644
--- a/dockerfiles/tox/Dockerfile
+++ b/dockerfiles/tox/Dockerfile
@@ -3,8 +3,11 @@
 RUN apt-get update && \
 apt-get install --yes \
 python-pip \
+python-dev \
 python3-pip \
+python3-dev \
 pypy \
+gcc g++ libc-dev make \
 && \
 rm -rf /var/lib/apt/lists/*
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c0e7b00f8d7f3541be475f72144a8932d6b693e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Adyen: deal with non-iframe return

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387717 )

Change subject: Adyen: deal with non-iframe return
..

Adyen: deal with non-iframe return

We need to return false here when we're dealing with the
full-redirect version.

TODO: maybe the 'skins' values should have a generic 'isFramed'
property rather than depending on name.

Bug: T176913
Change-Id: I5c5327e4eea0a048bd8206def26adc8055b5ed67
---
M adyen_gateway/adyen_resultswitcher.body.php
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/17/387717/1

diff --git a/adyen_gateway/adyen_resultswitcher.body.php 
b/adyen_gateway/adyen_resultswitcher.body.php
index e2b24bd..4118bd7 100644
--- a/adyen_gateway/adyen_resultswitcher.body.php
+++ b/adyen_gateway/adyen_resultswitcher.body.php
@@ -9,6 +9,11 @@
}
 
protected function isReturnFramed() {
-   return true;
+   $skinCode = $this->getRequest()->getVal( 'skinCode' );
+   $skinConfig = $this->adapter->getAccountConfig( 'Skins' );
+   if ( array_key_exists( $skinCode, $skinConfig ) ) {
+   return $skinConfig[$skinCode]['Name'] === 'base';
+   }
+   throw new RuntimeException( "Skin code $skinCode not 
configured." );
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c5327e4eea0a048bd8206def26adc8055b5ed67
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] purtle[master]: Fix bug in JSON-LD output when alternating values are specif...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387661 )

Change subject: Fix bug in JSON-LD output when alternating values are specified.
..


Fix bug in JSON-LD output when alternating values are specified.

If an existing predicate is reopened to add new values, the simple
array cast could misinterpret an array-valued singleton.

Change-Id: I6c9ee4f824b9b7666334734878685d9ec61387ee
---
M src/JsonLdRdfWriter.php
M tests/data/AlternatingValues.jsonld
2 files changed, 23 insertions(+), 12 deletions(-)

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



diff --git a/src/JsonLdRdfWriter.php b/src/JsonLdRdfWriter.php
index d2735a3..e94a68d 100644
--- a/src/JsonLdRdfWriter.php
+++ b/src/JsonLdRdfWriter.php
@@ -332,7 +332,14 @@
$name = $this->compactify( $base, $local );
}
if ( isset( $this->predicates[$name] ) ) {
-   $this->values = array_merge( 
(array)$this->predicates[$name], $this->values );
+   $was = $this->predicates[$name];
+   // Wrap $was into a numeric indexed array if it isn't 
already.
+   // Note that $was could have non-numeric indices, eg
+   // [ "@id" => "foo" ], in which was it still needs to 
be wrapped.
+   if ( !( is_array( $was ) && isset( $was[0] ) ) ) {
+   $was = [ $was ];
+   }
+   $this->values = array_merge( $was, $this->values );
}
 
$cnt = count( $this->values );
diff --git a/tests/data/AlternatingValues.jsonld 
b/tests/data/AlternatingValues.jsonld
index 3654234..ce7ed09 100644
--- a/tests/data/AlternatingValues.jsonld
+++ b/tests/data/AlternatingValues.jsonld
@@ -1,26 +1,30 @@
 {
 "@id": "wikibase:Dump",
-"owl:foo": {
-"@id": "owl:A",
-"0": {
+"owl:foo": [
+{
+"@id": "owl:A"
+},
+{
 "@id": "owl:B"
 },
-"1": {
+{
 "@id": "owl:C"
 }
-},
-"owl:bar": {
-"@type": "xsd:decimal",
-"@value": "5",
-"0": {
+],
+"owl:bar": [
+{
+"@type": "xsd:decimal",
+"@value": "5"
+},
+{
 "@type": "xsd:decimal",
 "@value": "6"
 },
-"1": {
+{
 "@type": "xsd:decimal",
 "@value": "7"
 }
-},
+],
 "@context": {
 "wikibase": "http://wikiba.se/ontology-beta#";,
 "owl": "http://www.w3.org/2002/07/owl#";,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c9ee4f824b9b7666334734878685d9ec61387ee
Gerrit-PatchSet: 2
Gerrit-Project: purtle
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Kludge a keyholder thing for deployment

[Ladsgroup (Code Review)]

Ladsgroup has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387665 )

Change subject: Kludge a keyholder thing for deployment
..


Kludge a keyholder thing for deployment

Change-Id: I8747c4c5fc8e9e688f038ecf9f7246404daf0444
---
M scap/scap.cfg
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Thcipriani: Looks good to me, but someone else must approve
  Ladsgroup: Verified; Looks good to me, approved



diff --git a/scap/scap.cfg b/scap/scap.cfg
index 8c0e547..b796790 100755
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -12,6 +12,8 @@
 service_port: 8081
 batch_size: 1
 max_failures: 1
+# Will be deprecated in the next scap release.
+keyholder_key: deploy_service
 
 [wmnet]
 canary_dsh_targets: ores-canary

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8747c4c5fc8e9e688f038ecf9f7246404daf0444
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ores/deploy
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Thcipriani 

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

[MediaWiki-commits] [Gerrit] purtle[master]: Add new test case to demonstrate bug in JSON-LD output

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387660 )

Change subject: Add new test case to demonstrate bug in JSON-LD output
..


Add new test case to demonstrate bug in JSON-LD output

This documents a bug found by Smalyshev, caused by appending new values
to an existing statement, so it can be fixed in a follow-up patch.

The NTuples/RDF/Turtle output is correct.  The JSON-LD output is invalid.

Change-Id: I74cfd972a47698456232a74dea2e988f02d85b50
---
A tests/data/AlternatingValues.jsonld
A tests/data/AlternatingValues.nt
A tests/data/AlternatingValues.rdf
A tests/data/AlternatingValues.ttl
M tests/phpunit/RdfWriterTestBase.php
5 files changed, 74 insertions(+), 0 deletions(-)

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



diff --git a/tests/data/AlternatingValues.jsonld 
b/tests/data/AlternatingValues.jsonld
new file mode 100644
index 000..3654234
--- /dev/null
+++ b/tests/data/AlternatingValues.jsonld
@@ -0,0 +1,29 @@
+{
+"@id": "wikibase:Dump",
+"owl:foo": {
+"@id": "owl:A",
+"0": {
+"@id": "owl:B"
+},
+"1": {
+"@id": "owl:C"
+}
+},
+"owl:bar": {
+"@type": "xsd:decimal",
+"@value": "5",
+"0": {
+"@type": "xsd:decimal",
+"@value": "6"
+},
+"1": {
+"@type": "xsd:decimal",
+"@value": "7"
+}
+},
+"@context": {
+"wikibase": "http://wikiba.se/ontology-beta#";,
+"owl": "http://www.w3.org/2002/07/owl#";,
+"xsd": "http://www.w3.org/2001/XMLSchema#";
+}
+}
\ No newline at end of file
diff --git a/tests/data/AlternatingValues.nt b/tests/data/AlternatingValues.nt
new file mode 100644
index 000..916590b
--- /dev/null
+++ b/tests/data/AlternatingValues.nt
@@ -0,0 +1,6 @@
+  
 .
+  
"5"^^ .
+  
 .
+  
"6"^^ .
+  
 .
+  
"7"^^ .
diff --git a/tests/data/AlternatingValues.rdf b/tests/data/AlternatingValues.rdf
new file mode 100644
index 000..63d5ccb
--- /dev/null
+++ b/tests/data/AlternatingValues.rdf
@@ -0,0 +1,11 @@
+
+http://www.w3.org/1999/02/22-rdf-syntax-ns#"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema#"; 
xmlns:wikibase="http://wikiba.se/ontology-beta#"; 
xmlns:owl="http://www.w3.org/2002/07/owl#";>
+   http://wikiba.se/ontology-beta#Dump";>
+   http://www.w3.org/2002/07/owl#A"/>
+   http://www.w3.org/2001/XMLSchema#decimal";>5
+   http://www.w3.org/2002/07/owl#B"/>
+   http://www.w3.org/2001/XMLSchema#decimal";>6
+   http://www.w3.org/2002/07/owl#C"/>
+   http://www.w3.org/2001/XMLSchema#decimal";>7
+   
+
diff --git a/tests/data/AlternatingValues.ttl b/tests/data/AlternatingValues.ttl
new file mode 100644
index 000..a5ca670
--- /dev/null
+++ b/tests/data/AlternatingValues.ttl
@@ -0,0 +1,11 @@
+@prefix rdf:  .
+@prefix xsd:  .
+@prefix wikibase:  .
+@prefix owl:  .
+
+wikibase:Dump owl:foo owl:A ;
+   owl:bar "5"^^xsd:decimal ;
+   owl:foo owl:B ;
+   owl:bar "6"^^xsd:decimal ;
+   owl:foo owl:C ;
+   owl:bar "7"^^xsd:decimal .
diff --git a/tests/phpunit/RdfWriterTestBase.php 
b/tests/phpunit/RdfWriterTestBase.php
index 54f1877..7d1bb58 100644
--- a/tests/phpunit/RdfWriterTestBase.php
+++ b/tests/phpunit/RdfWriterTestBase.php
@@ -355,6 +355,23 @@
$this->assertOutputLines( 'DumpHeader', $rdf );
}
 
+   public function testAlternatingValues() {
+   $writer = $this->newWriter();
+   $writer->prefix( 'wikibase', 'http://wikiba.se/ontology-beta#' 
);
+   $writer->prefix( 'owl', 'http://www.w3.org/2002/07/owl#' );
+   $writer->start();
+   $writer->about( 'wikibase', 'Dump' )
+  ->say( 'owl', 'foo' )->is( 'owl', 'A' )
+  ->say( 'owl', 'bar' )->value( '5', 'xsd', 'decimal' )
+  ->say( 'owl', 'foo' )->is( 'owl', 'B' )
+  ->say( 'owl', 'bar' )->value( '6', 'xsd', 'decimal' )
+ 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Install Spark 2 for Hadoop clients

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387680 )

Change subject: Install Spark 2 for Hadoop clients
..


Install Spark 2 for Hadoop clients

Bug: T158334
Change-Id: I2bb8a50914543f2359f04fb390588e695b7a523d
---
M modules/role/manifests/analytics_cluster/client.pp
M modules/role/manifests/analytics_cluster/hadoop/worker.pp
2 files changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/modules/role/manifests/analytics_cluster/client.pp 
b/modules/role/manifests/analytics_cluster/client.pp
index 89ccdbd..4a70eec 100644
--- a/modules/role/manifests/analytics_cluster/client.pp
+++ b/modules/role/manifests/analytics_cluster/client.pp
@@ -19,6 +19,9 @@
 require ::cdh::mahout
 require ::cdh::spark
 
+# Spark 2 is manually packaged by us, it is not part of CDH.
+require_package('spark2')
+
 # Mount HDFS via Fuse on Analytics client nodes.
 # This will mount HDFS at /mnt/hdfs read only.
 class { '::cdh::hadoop::mount': }
diff --git a/modules/role/manifests/analytics_cluster/hadoop/worker.pp 
b/modules/role/manifests/analytics_cluster/hadoop/worker.pp
index 4471a92..feef748 100644
--- a/modules/role/manifests/analytics_cluster/hadoop/worker.pp
+++ b/modules/role/manifests/analytics_cluster/hadoop/worker.pp
@@ -150,8 +150,6 @@
 require => Package['python3-numpy'],
 }
 
-
-
 # This allows Hadoop daemons to talk to each other.
 ferm::service{ 'hadoop-access':
 proto  => 'tcp',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2bb8a50914543f2359f04fb390588e695b7a523d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Don't include 'debug' in signature fields

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387697 )

Change subject: Don't include 'debug' in signature fields
..

Don't include 'debug' in signature fields

Change-Id: Ic04ab78018b568dc4d02855d41521e2d6b59b17d
---
M adyen_gateway/AdyenHostedSignature.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/97/387697/1

diff --git a/adyen_gateway/AdyenHostedSignature.php 
b/adyen_gateway/AdyenHostedSignature.php
index 7027b91..502c3cd 100644
--- a/adyen_gateway/AdyenHostedSignature.php
+++ b/adyen_gateway/AdyenHostedSignature.php
@@ -27,6 +27,7 @@
'merchantSig',
'title',
'liberated',
+   'debug',
);
 
foreach ( array_keys( $values ) as $key ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic04ab78018b568dc4d02855d41521e2d6b59b17d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Deprecate methods in Article that delegate to WikiPage

[Daniel Kinzler (Code Review)]

Daniel Kinzler has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387685 )

Change subject: Deprecate methods in Article that delegate to WikiPage
..

Deprecate methods in Article that delegate to WikiPage

The intent of this patch is to free us of the need to mirror
WikiPage's interface in the old Article class. This is a precondition
to splitting WikiPage into PageRecord, PageStore, and PageUpdater
for MCR.

Change-Id: I0335100b2bb41b783b73487b083b7fdef76e7ad9
---
M autoload.php
M includes/MediaWiki.php
M includes/actions/Action.php
M includes/actions/CachedAction.php
M includes/actions/CreditsAction.php
M includes/actions/DeleteAction.php
M includes/actions/EditAction.php
M includes/actions/FormAction.php
M includes/actions/HistoryAction.php
M includes/actions/InfoAction.php
M includes/actions/ProtectAction.php
M includes/actions/PurgeAction.php
M includes/actions/RawAction.php
M includes/actions/RenderAction.php
M includes/actions/RevertAction.php
M includes/actions/RollbackAction.php
M includes/actions/ViewAction.php
M includes/page/Article.php
M includes/page/Page.php
A includes/page/PageDisplayController.php
M includes/page/WikiPage.php
M tests/phpunit/includes/actions/ActionTest.php
22 files changed, 280 insertions(+), 73 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/85/387685/1

diff --git a/autoload.php b/autoload.php
index 3bee411..2d2111b 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1084,6 +1084,7 @@
'Page' => __DIR__ . '/includes/page/Page.php',
'PageArchive' => __DIR__ . '/includes/page/PageArchive.php',
'PageDataRequestHandler' => __DIR__ . 
'/includes/linkeddata/PageDataRequestHandler.php',
+   'PageDisplayController' => __DIR__ . 
'/includes/page/PageDisplayController.php',
'PageExists' => __DIR__ . '/maintenance/pageExists.php',
'PageLangLogFormatter' => __DIR__ . 
'/includes/logging/PageLangLogFormatter.php',
'PageProps' => __DIR__ . '/includes/PageProps.php',
diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 43de4ba..9f06a7e 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -458,23 +458,23 @@
/**
 * Perform one of the "standard" actions
 *
-* @param Page $page
+* @param Article $article
 * @param Title $requestTitle The original title, before any redirects 
were applied
 */
-   private function performAction( Page $page, Title $requestTitle ) {
+   private function performAction( Article $article, Title $requestTitle ) 
{
$request = $this->context->getRequest();
$output = $this->context->getOutput();
$title = $this->context->getTitle();
$user = $this->context->getUser();
 
if ( !Hooks::run( 'MediaWikiPerformAction',
-   [ $output, $page, $title, $user, $request, 
$this ] )
+   [ $output, $article, $title, $user, $request, 
$this ] )
) {
return;
}
 
$act = $this->getAction();
-   $action = Action::factory( $act, $page, $this->context );
+   $action = Action::factory( $act, $article, $this->context );
 
if ( $action instanceof Action ) {
// Narrow DB query expectations for this HTTP request
@@ -504,7 +504,7 @@
'UnknownAction',
[
$request->getVal( 'action', 'view' ),
-   $page
+   $article
],
'1.19'
) ) {
diff --git a/includes/actions/Action.php b/includes/actions/Action.php
index e8d9a3e..c8a72fa 100644
--- a/includes/actions/Action.php
+++ b/includes/actions/Action.php
@@ -39,7 +39,7 @@
/**
 * Page on which we're performing the action
 * @since 1.17
-* @var WikiPage|Article|ImagePage|CategoryPage|Page $page
+* @var Article
 */
protected $page;
 
@@ -84,27 +84,47 @@
}
 
/**
+* @param WikiPage $page
+*
+* @return array
+*/
+   private static function getActionOverrides( WikiPage $page ) {
+   // TODO: action overrides need to take into account the target 
slot and the namespace.
+   return $page->getContentHandler()->getActionOverrides();
+   }
+
+   /**
 * Get an appropriate Action subclass for the given action
 * @since 1.17
 * @param string $action
-* @param Page $page
+* @param WikiPage|Article $article
 * @param IContextSource|null $context
 * @return Action|bool|null False if the action is disabled, null
 * if it is not recognised
 

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Use scriptpath instead of wgScriptPath

[Arlolra (Code Review)]

Arlolra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387684 )

Change subject: Use scriptpath instead of wgScriptPath
..

Use scriptpath instead of wgScriptPath

 * Also, get rid of this as a cli argument since its usecase seems
   long gone.

Change-Id: I2c8771d25c27581b8ef160f77fb206e254b8f1ef
---
M bin/parse.js
M bin/parserTests.js
M lib/wt2html/tt/ParserFunctions.js
3 files changed, 2 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/84/387684/1

diff --git a/bin/parse.js b/bin/parse.js
index 4988209..effdc81 100755
--- a/bin/parse.js
+++ b/bin/parse.js
@@ -259,11 +259,6 @@
env.bumpTimeUse("Init", initTime);
}
 
-   // fetch templates from enwiki by default.
-   if (argv.wgScriptPath) {
-   env.conf.wiki.wgScriptPath = argv.wgScriptPath;
-   }
-
// Enable wikitext scrubbing
env.scrubWikitext = argv.scrubWikitext;
 
diff --git a/bin/parserTests.js b/bin/parserTests.js
index 01e2ac5..e855292 100755
--- a/bin/parserTests.js
+++ b/bin/parserTests.js
@@ -1443,7 +1443,7 @@
wikiConf.fakeTimestamp = 123;
wikiConf.timezoneOffset = 0; // force utc for parsertests
wikiConf.server = 'http://example.org';
-   wikiConf.wgScriptPath = '/';
+   wikiConf.scriptpath = '/';
wikiConf.script = '/index.php';
wikiConf.articlePath = '/wiki/$1';
wikiConf.interwikiMap.clear();
diff --git a/lib/wt2html/tt/ParserFunctions.js 
b/lib/wt2html/tt/ParserFunctions.js
index ca86752..4304d2a 100644
--- a/lib/wt2html/tt/ParserFunctions.js
+++ b/lib/wt2html/tt/ParserFunctions.js
@@ -704,8 +704,6 @@
}
cb({
tokens: [
-   // FIXME! Figure out correct prefix to 
use
-   // this.env.conf.wiki.wgScriptPath +
env.conf.wiki.script + '?title=' +
env.normalizedTitleKey(target) + '&' +
expandedArgs.join('&'),
@@ -845,7 +843,7 @@
cb({ tokens: [this.env.page.name || ''] });
 };
 ParserFunctions.prototype.pf_scriptpath = function(token, frame, cb, args) {
-   cb({ tokens: [this.env.conf.wiki.wgScriptPath] });
+   cb({ tokens: [this.env.conf.wiki.scriptpath] });
 };
 ParserFunctions.prototype.pf_server = function(token, frame, cb, args) {
var dataAttribs = Util.clone(token.dataAttribs);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c8771d25c27581b8ef160f77fb206e254b8f1ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Expose string->bool conversion as function

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387683 )

Change subject: Expose string->bool conversion as function
..

Expose string->bool conversion as function

There is code in several places in extensions which converts
setting or parameter string (such as "true", "yes", "false", "no")
to boolean. Since we already have the code that does in global
functions in wfStringToBool(), it makes sense to expose this code
and reuse it.

Change-Id: I88d98b012ff4bf14fd64a05a9135a6e75cf2d4e7
---
M includes/GlobalFunctions.php
A tests/phpunit/includes/GlobalFunctions/wfStringToBoolTest.php
2 files changed, 71 insertions(+), 5 deletions(-)


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

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 1cff881..2a62812 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2225,12 +2225,27 @@
  * @return bool
  */
 function wfIniGetBool( $setting ) {
-   $val = strtolower( ini_get( $setting ) );
-   // 'on' and 'true' can't have whitespace around them, but '1' can.
+   return wfStringToBool( ini_get( $setting ) );
+}
+
+/**
+ * Convert string value to boolean, when the following are interpreted as true:
+ * - on
+ * - true
+ * - yes
+ * - Any number, except 0
+ * All other strings are interpreted as false.
+ *
+ * @param string $val
+ * @return bool
+ * @since 1.31
+ */
+function wfStringToBool( $val ) {
+   $val = strtolower( $val );
return $val == 'on'
-   || $val == 'true'
-   || $val == 'yes'
-   || preg_match( "/^\s*[+-]?0*[1-9]/", $val ); // approx C atoi() 
function
+  || $val == 'true'
+  || $val == 'yes'
+  || preg_match( "/^\s*[+-]?0*[1-9]/", $val ); // approx C atoi() 
function
 }
 
 /**
diff --git a/tests/phpunit/includes/GlobalFunctions/wfStringToBoolTest.php 
b/tests/phpunit/includes/GlobalFunctions/wfStringToBoolTest.php
new file mode 100644
index 000..e037ccd
--- /dev/null
+++ b/tests/phpunit/includes/GlobalFunctions/wfStringToBoolTest.php
@@ -0,0 +1,51 @@
+assertTrue( wfStringToBool( $str ) );
+   } else {
+   $this->assertFalse( wfStringToBool( $str ) );
+   }
+
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I88d98b012ff4bf14fd64a05a9135a6e75cf2d4e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[STABLE_REVSCORING_1]: Revert "Blindly choose a timeout of 15 seconds"

[Ladsgroup (Code Review)]

Ladsgroup has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387681 )

Change subject: Revert "Blindly choose a timeout of 15 seconds"
..


Revert "Blindly choose a timeout of 15 seconds"

This reverts commit 98d02d9fc56b165ad92f4d1d43e18477de0694e9.

Change-Id: I6cece13dbf599c7b7220bd06b38cf80a1b8e5f03
---
M config/00-main.yaml
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/config/00-main.yaml b/config/00-main.yaml
index dbbd581..67ff44e 100644
--- a/config/00-main.yaml
+++ b/config/00-main.yaml
@@ -440,7 +440,6 @@
 host: https://vi.wikipedia.org
   wikidata_api:
 host: https://wikidata.org
-timeout: 15
 
 # Scorer models
 scorer_models:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6cece13dbf599c7b7220bd06b38cf80a1b8e5f03
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/ores/deploy
Gerrit-Branch: STABLE_REVSCORING_1
Gerrit-Owner: Awight 
Gerrit-Reviewer: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: DropdownWidget: Allow pressing Space to close the widget, as...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386415 )

Change subject: DropdownWidget: Allow pressing Space to close the widget, as 
well as open
..


DropdownWidget: Allow pressing Space to close the widget, as well as open

For any other widget with keyboard handling we treat Space and Enter
the same. This was an exception because Space conflicted with
type-to-search (see 2650383e), but I think I managed to solve that.

(The old code was additionally problematic because since 7e442e09
we allow type-to-search even when the menu is closed, so it would
suddenly pop open when you typed a space.)

Change-Id: I44b98c63d026630350c975eeb5ef2616c3b31717
---
M src/widgets/DropdownWidget.js
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/src/widgets/DropdownWidget.js b/src/widgets/DropdownWidget.js
index 22f8745..ca96223 100644
--- a/src/widgets/DropdownWidget.js
+++ b/src/widgets/DropdownWidget.js
@@ -189,9 +189,14 @@
(
e.which === OO.ui.Keys.ENTER ||
(
+   e.which === OO.ui.Keys.SPACE &&
+   // Avoid conflicts with type-to-search, see 
SelectWidget#onKeyPress.
+   // Space only closes the menu is the user is 
not typing to search.
+   this.menu.keyPressBuffer === ''
+   ) ||
+   (
!this.menu.isVisible() &&
(
-   e.which === OO.ui.Keys.SPACE ||
e.which === OO.ui.Keys.UP ||
e.which === OO.ui.Keys.DOWN
)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I44b98c63d026630350c975eeb5ef2616c3b31717
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: ComboBoxInputWidget: Add `.oo-ui-comboBoxInputWidget-open` c...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386970 )

Change subject: ComboBoxInputWidget: Add `.oo-ui-comboBoxInputWidget-open` 
class to widget
..


ComboBoxInputWidget: Add `.oo-ui-comboBoxInputWidget-open` class to widget

Adding a class similar to DropdownWidget to be able to indicate
that connected menu is open. Also adding styles to WikimediaUI theme
for this specific indication.

Bug: T179213
Change-Id: I2ce131cdafed5feaf8f3e42164801c042c844711
---
M src/themes/wikimediaui/widgets.less
M src/widgets/ComboBoxInputWidget.js
2 files changed, 22 insertions(+), 1 deletion(-)

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



diff --git a/src/themes/wikimediaui/widgets.less 
b/src/themes/wikimediaui/widgets.less
index d4e3785..0ed699f 100644
--- a/src/themes/wikimediaui/widgets.less
+++ b/src/themes/wikimediaui/widgets.less
@@ -501,6 +501,16 @@
margin: 0;
}
 
+   &-open &-dropdownButton {
+   > .oo-ui-buttonElement-button {
+   background-color: @background-color-framed--hover;
+
+   .oo-ui-indicatorElement-indicator {
+   opacity: @opacity-icon-base--selected;
+   }
+   }
+   }
+
&.oo-ui-widget-disabled {
.oo-ui-indicatorElement-indicator {
opacity: @opacity-filled--disabled;
diff --git a/src/widgets/ComboBoxInputWidget.js 
b/src/widgets/ComboBoxInputWidget.js
index cfba538..10ff531 100644
--- a/src/widgets/ComboBoxInputWidget.js
+++ b/src/widgets/ComboBoxInputWidget.js
@@ -108,7 +108,8 @@
this.menu.connect( this, {
choose: 'onMenuChoose',
add: 'onMenuItemsChange',
-   remove: 'onMenuItemsChange'
+   remove: 'onMenuItemsChange',
+   toggle: 'onMenuToggle'
} );
 
// Initialization
@@ -220,6 +221,16 @@
 };
 
 /**
+ * Handle menu toggle events.
+ *
+ * @private
+ * @param {boolean} isVisible Menu toggle event
+ */
+OO.ui.ComboBoxInputWidget.prototype.onMenuToggle = function ( isVisible ) {
+   this.$element.toggleClass( 'oo-ui-comboBoxInputWidget-open', isVisible 
);
+};
+
+/**
  * @inheritdoc
  */
 OO.ui.ComboBoxInputWidget.prototype.setDisabled = function ( disabled ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ce131cdafed5feaf8f3e42164801c042c844711
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: docker: pass all env variables to tox

[Hashar (Code Review)]

Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387682 )

Change subject: docker: pass all env variables to tox
..

docker: pass all env variables to tox

That will let us add extra environment variables from a job definition
and also let child images add extra variables before the entrypoint.

Change-Id: I70334e52c2e3a4754c80cd0886c41a2f3e1ad937
---
M dockerfiles/tox/run.sh
M jjb/python-jobs.yaml
2 files changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/82/387682/1

diff --git a/dockerfiles/tox/run.sh b/dockerfiles/tox/run.sh
index f9a3d0f..73df486 100644
--- a/dockerfiles/tox/run.sh
+++ b/dockerfiles/tox/run.sh
@@ -26,5 +26,6 @@
 git checkout --quiet FETCH_HEAD
 git submodule --quiet update --init --recursive
 
-# Run tests
-TOX_TESTENV_PASSENV="PY_COLORS XDG_CACHE_HOME" PY_COLORS=1 tox -v | tee 
"${LOG_DIR}/stdout.log"
+# Run tests. Pass all environment variables to tox since the environment here
+# is already pretty restrictive.
+TOX_TESTENV_PASSENV="*" PY_COLORS=1 tox -v | tee "${LOG_DIR}/stdout.log"
diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index 618d098..da52b24 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -75,7 +75,7 @@
 - docker-zuul-env
 - docker-log-dir
 - docker-run-with-log-and-workspace-cache:
-image: 'wmfreleng/tox:v2017.10.31.15.21'
+image: 'wmfreleng/tox:v2017.10.31.21.03'
 logdir: '/log'
 wrappers:
 - timeout:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I70334e52c2e3a4754c80cd0886c41a2f3e1ad937
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Unicode section links on mediawiki.org

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386710 )

Change subject: Enable Unicode section links on mediawiki.org
..


Enable Unicode section links on mediawiki.org

Bug: T175725
Change-Id: I5ddd24b90d62734f9b328e407699ce3ebeea1d99
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 354edfc..3fc0533 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19666,6 +19666,7 @@
'default' => [ 'legacy', 'html5' ],
'testwiki' => [ 'html5', 'legacy' ],
'test2wiki' => [ 'html5', 'legacy' ],
+   'mediawikiwiki' => [ 'html5', 'legacy' ],
'ruwiki' => [ 'html5', 'legacy' ],
'ruwikibooks' => [ 'html5', 'legacy' ],
'ruwikimedia' => [ 'html5', 'legacy' ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ddd24b90d62734f9b328e407699ce3ebeea1d99
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[STABLE_REVSCORING_1]: Revert "Blindly choose a timeout of 15 seconds"

[Awight (Code Review)]

Awight has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387681 )

Change subject: Revert "Blindly choose a timeout of 15 seconds"
..

Revert "Blindly choose a timeout of 15 seconds"

This reverts commit 98d02d9fc56b165ad92f4d1d43e18477de0694e9.

Change-Id: I6cece13dbf599c7b7220bd06b38cf80a1b8e5f03
---
M config/00-main.yaml
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ores/deploy 
refs/changes/81/387681/1

diff --git a/config/00-main.yaml b/config/00-main.yaml
index dbbd581..67ff44e 100644
--- a/config/00-main.yaml
+++ b/config/00-main.yaml
@@ -440,7 +440,6 @@
 host: https://vi.wikipedia.org
   wikidata_api:
 host: https://wikidata.org
-timeout: 15
 
 # Scorer models
 scorer_models:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cece13dbf599c7b7220bd06b38cf80a1b8e5f03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ores/deploy
Gerrit-Branch: STABLE_REVSCORING_1
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Unicode section links on Russian projects

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386553 )

Change subject: Enable Unicode section links on Russian projects
..


Enable Unicode section links on Russian projects

Bug: T175725
Change-Id: Ie11263618c4ce413557c2a8a58214f1987ec0bcb
---
M wmf-config/InitialiseSettings.php
1 file changed, 9 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index fc6e37b..354edfc 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19666,6 +19666,15 @@
'default' => [ 'legacy', 'html5' ],
'testwiki' => [ 'html5', 'legacy' ],
'test2wiki' => [ 'html5', 'legacy' ],
+   'ruwiki' => [ 'html5', 'legacy' ],
+   'ruwikibooks' => [ 'html5', 'legacy' ],
+   'ruwikimedia' => [ 'html5', 'legacy' ],
+   'ruwikinews' => [ 'html5', 'legacy' ],
+   'ruwikiquote' => [ 'html5', 'legacy' ],
+   'ruwikisource' => [ 'html5', 'legacy' ],
+   'ruwikiversity' => [ 'html5', 'legacy' ],
+   'ruwikivoyage' => [ 'html5', 'legacy' ],
+   'ruwiktionary' => [ 'html5', 'legacy' ],
 ],
 
 'wmgUse3d' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie11263618c4ce413557c2a8a58214f1987ec0bcb
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[STABLE_REVSCORING_1]: Remove the virtualenv directory each time

[Ladsgroup (Code Review)]

Ladsgroup has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387622 )

Change subject: Remove the virtualenv directory each time
..


Remove the virtualenv directory each time

Since we remove all the wheels, this doesn't add much overhead.  I was
having some trouble with downgrading pip, so this change should make
it safer to roll back across revscoring 2 -> 1.

Bug: T179095
Bug: T175180
Change-Id: Ifa99119863ceb13b44fc2b1358dc5f644c96f030
---
M scap/cmd_worker.sh
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/scap/cmd_worker.sh b/scap/cmd_worker.sh
index 04163ed..cb098f8 100644
--- a/scap/cmd_worker.sh
+++ b/scap/cmd_worker.sh
@@ -3,6 +3,7 @@
 cd $deploy_dir
 git submodule sync
 git submodule update --init
+rm -rf $venv
 mkdir -p $venv
 virtualenv --python python3 --system-site-packages $venv
 $venv/bin/pip freeze | xargs $venv/bin/pip uninstall -y

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa99119863ceb13b44fc2b1358dc5f644c96f030
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ores/deploy
Gerrit-Branch: STABLE_REVSCORING_1
Gerrit-Owner: Awight 
Gerrit-Reviewer: Halfak 
Gerrit-Reviewer: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] operations...spark2[debian]: Initial debian release (2.1.2-bin-hadoop2.6-1)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387663 )

Change subject: Initial debian release (2.1.2-bin-hadoop2.6-1)
..


Initial debian release (2.1.2-bin-hadoop2.6-1)

Bug: T158334
Change-Id: I33d7d1329499d3bfd47fb6a2b3944b3b7b879f9b
---
A debian/README.Debian
A debian/bin/pyspark2
A debian/bin/spark2-beeline
A debian/bin/spark2-shell
A debian/bin/spark2-sql
A debian/bin/spark2-submit
A debian/bin/spark2R
A debian/changelog
A debian/compat
A debian/conf/log4j.properties
A debian/conf/spark-defaults.conf
A debian/conf/spark-env.sh
A debian/control
A debian/copyright
A debian/gbp.conf
A debian/rules
A debian/source/format
A debian/source/include-binaries
A debian/source/options
A debian/spark2.dirs
A debian/spark2.install
A debian/spark2.links
A debian/spark2.postinst
A debian/spark2.postrm
24 files changed, 566 insertions(+), 0 deletions(-)

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



diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 000..e929737
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,23 @@
+Druid for Debian
+
+
+This package is created from the release tarballs provided from
+https://spark.apache.org/downloads.html. It does not build Spark from source.
+
+This repository was created using git-import-orig:
+
+  VERSION=2.1.2-bin-hadoop2.6
+  gbp import-orig -u $VERSION --upstream-branch=master --debian-branch=debian 
../spark-$VERSION.tgz
+
+You should be able to import a new upstream release using the same command 
again.
+
+Once you've imported the Spark 2 tarball, you need to explicitly declare all
+binary files that need to be included in the package. The following command 
should do the trick.
+
+  find {jars,python/lib,yarn,R} -type f -exec file {} \; | grep -v text | awk 
-F ':' '{print $1}' | sort > debian/source/include-binaries
+
+Finally, to build --include-removal needs to be passed to dpkg-source so that 
any removed binaries
+will be removed from the source package.  You can do so by passing 
--source-option="--include-removal"
+to git-buildpackage or dpkg-buildpackage.  On a Wikimedia build server:
+
+  GIT_PBUILDER_AUTOCONF=no DIST=jessie WIKIMEDIA=yes gbp buildpackage -sa -us 
-uc --git-builder=git-pbuilder --source-option="--include-removal"
diff --git a/debian/bin/pyspark2 b/debian/bin/pyspark2
new file mode 100755
index 000..a051128
--- /dev/null
+++ b/debian/bin/pyspark2
@@ -0,0 +1 @@
+exec /usr/lib/spark2/bin/pyspark "$@"
diff --git a/debian/bin/spark2-beeline b/debian/bin/spark2-beeline
new file mode 100755
index 000..d94a75b
--- /dev/null
+++ b/debian/bin/spark2-beeline
@@ -0,0 +1 @@
+exec /usr/lib/spark2/bin/beeline "$@"
diff --git a/debian/bin/spark2-shell b/debian/bin/spark2-shell
new file mode 100755
index 000..1b93163
--- /dev/null
+++ b/debian/bin/spark2-shell
@@ -0,0 +1 @@
+exec /usr/lib/spark2/bin/spark-shell "$@"
diff --git a/debian/bin/spark2-sql b/debian/bin/spark2-sql
new file mode 100755
index 000..9a1b180
--- /dev/null
+++ b/debian/bin/spark2-sql
@@ -0,0 +1 @@
+exec /usr/lib/spark2/bin/spark-sql "$@"
diff --git a/debian/bin/spark2-submit b/debian/bin/spark2-submit
new file mode 100755
index 000..1b6952c
--- /dev/null
+++ b/debian/bin/spark2-submit
@@ -0,0 +1 @@
+exec /usr/lib/spark2/bin/spark-submit "$@"
diff --git a/debian/bin/spark2R b/debian/bin/spark2R
new file mode 100755
index 000..318d730
--- /dev/null
+++ b/debian/bin/spark2R
@@ -0,0 +1 @@
+exec /usr/lib/spark2/bin/sparkR "$@"
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..7697342
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+spark2 (2.1.2-bin-hadoop2.6-1) jessie-wikimedia; urgency=low
+
+  * 2.1.2 binary release for Hadoop 2.6
+
+ -- Andrew Otto (WMF)   Tue, 31 Oct 2017 18:04:29 +
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/conf/log4j.properties b/debian/conf/log4j.properties
new file mode 100644
index 000..ec1aa18
--- /dev/null
+++ b/debian/conf/log4j.properties
@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions an

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Install Spark 2 in Hadoop Cluster

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387680 )

Change subject: Install Spark 2 in Hadoop Cluster
..

Install Spark 2 in Hadoop Cluster

Bug: T158334
Change-Id: I2bb8a50914543f2359f04fb390588e695b7a523d
---
M modules/role/manifests/analytics_cluster/hadoop/worker.pp
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/387680/1

diff --git a/modules/role/manifests/analytics_cluster/hadoop/worker.pp 
b/modules/role/manifests/analytics_cluster/hadoop/worker.pp
index 4471a92..f6ebab8 100644
--- a/modules/role/manifests/analytics_cluster/hadoop/worker.pp
+++ b/modules/role/manifests/analytics_cluster/hadoop/worker.pp
@@ -106,6 +106,9 @@
 # in order load Spark Python dependencies.
 include ::cdh::spark
 
+# Spark 2 is manually packaged by us, it is not part of CDH.
+require_package('spark2')
+
 # sqoop needs to be on worker nodes if Oozie is to
 # launch sqoop jobs.
 include ::cdh::sqoop
@@ -149,8 +152,6 @@
 ensure  => 'installed',
 require => Package['python3-numpy'],
 }
-
-
 
 # This allows Hadoop daemons to talk to each other.
 ferm::service{ 'hadoop-access':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bb8a50914543f2359f04fb390588e695b7a523d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update frozen-requirements.txt to match wheels

[Ladsgroup (Code Review)]

Ladsgroup has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386646 )

Change subject: Update frozen-requirements.txt to match wheels
..


Update frozen-requirements.txt to match wheels

Change-Id: Id84f98acb8a515944c3fe54f553764688efeb41f
---
M frozen-requirements.txt
1 file changed, 40 insertions(+), 31 deletions(-)

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



diff --git a/frozen-requirements.txt b/frozen-requirements.txt
index 051cca2..c72ccc9 100644
--- a/frozen-requirements.txt
+++ b/frozen-requirements.txt
@@ -1,53 +1,62 @@
-Babel==2.2.0
+amqp==2.2.2
+billiard==3.5.0.3
+celery==4.1.0
+certifi==2017.7.27.1
+chardet==3.0.4
+deltas==0.4.6
+docopt==0.6.2
+docutils==0.14
+flake8==3.3.0
 Flask==0.10.1
 Flask-Jsonpify==1.5.0
-Jinja2==2.8
-MarkupSafe==0.23
-PyYAML==3.11
-Werkzeug==0.11.4
-amqp==1.4.9
-anyjson==0.3.3
-billiard==3.3.0.23
-celery==3.1.23
-deltas==0.4.5
-docopt==0.6.2
-editquality==0.4.0
 flask-swaggerui==0.0.1
 flask-wikimediaui==0.0.1
-flower==0.8.4
+idna==2.6
 itsdangerous==0.24
+Jinja2==2.9.6
+json2tsv==0.1.2
 jsonable==0.3.1
-jsonschema==2.5.1
-kombu==3.0.34
+jsonschema==2.6.0
+kombu==4.1.0
+MarkupSafe==1.0
+mccabe==0.6.1
 mmh3==2.3.1
 more-itertools==2.2
 mwapi==0.5.1
+mwbase==0.0.6
 mwcli==0.0.2
-mwparserfromhell==0.4.3
+mwparserfromhell==0.4.4
 mwreverts==0.0.6
 mwtypes==0.3.0
-mwxml==0.2.1
+mwxml==0.3.3
 mysqltsv==0.0.7
 nltk==3.0.5
 nose==1.3.7
 numpy==1.10.4
 para==0.0.5
 pip==9.0.1
-pyenchant==1.6.8
-pytz==2012c
-pywikibase==0.0.4
-redis==2.10.5
-requests==2.9.1
-revscoring==1.3.10
+pycodestyle==2.3.1
+pyenchant==1.6.11
+pyflakes==1.5.0
+pytz==2017.2
+pywikibase==0.0.5
+PyYAML==3.11
+redis==2.10.6
+requests==2.18.4
+revscoring==2.0.8
 scikit-learn==0.17.1
-scipy==0.17.0
-six==1.10.0
+scipy==0.17.1
+six==1.11.0
 socketIO-client==0.5.6
+sseclient==0.0.18
+statistics==1.0.3.5
 statsd==3.2.1
 stopit==1.1.1
-tabulate==0.7.5
-tornado==4.2
-wb-vandalism==0.1.8
-websocket-client==0.35.0
-wikiclass==0.3.0
-yamlconf==0.2.2
+tabulate==0.7.7
+textstat==0.3.1
+tqdm==4.15.0
+urllib3==1.22
+vine==1.1.4
+websocket-client==0.44.0
+Werkzeug==0.12.2
+yamlconf==0.2.3

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id84f98acb8a515944c3fe54f553764688efeb41f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/ores/deploy
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Halfak 
Gerrit-Reviewer: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] mediawiki...ZeroBanner[master]: Further clarify extending ApiBase

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387629 )

Change subject: Further clarify extending ApiBase
..


Further clarify extending ApiBase

Bug T91456

Change-Id: I1b6fc3a9d2a9485da035c82ddf7cdfea31ccc506
---
M includes/ApiZeroBanner.php
1 file changed, 17 insertions(+), 3 deletions(-)

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



diff --git a/includes/ApiZeroBanner.php b/includes/ApiZeroBanner.php
index 6e30bf0..b539672 100644
--- a/includes/ApiZeroBanner.php
+++ b/includes/ApiZeroBanner.php
@@ -10,6 +10,15 @@
  * Utility class to avoid any warnings or any other additions by the
  * API framework. This class extends ApiBase in order to shrink
  * responses for clients.
+ * As mentioned in https://gerrit.wikimedia.org/r/#/c/102850/
+ * one goal was to reduce the likelihood that the netmapper job, see
+ * "https://gerrit.wikimedia.org/r/#/admin/projects/operations/software/
+ * varnish/libvmod-netmapper", which parses JSON responses as part of
+ * a scheduled server job, would enter an unreliable state. Additionally,
+ * dr0ptp4kt's recollection is that another goal was to remove
+ * any Action API wrapping envelope material to reduce the need to traverse
+ * the JSON object properties, as well as to have a minor (albeit
+ * arguably negligible) reduction in response payload size.
  * Class ApiRawJsonPrinter
  * @package ZeroBanner
  */
@@ -39,13 +48,18 @@
}
 }
 
+/**
+ * This class extends ApiBase in order to generate Wikipedia Zero specific API
+ * responses. Clients, such as the native apps and JavaScript-capable clients,
+ * consume this API. The contract for the shape of the request/response has
+ * been solidified, and only additional fields should be *added* to the
+ * response (i.e., in a backward compatible manner) if at all in order to
+ * reduce the likelihood of breaking changes on legacy clients.
+ */
 class ApiZeroBanner extends ApiBase {
/**
 * Override built-in handling of format parameter.
 * Only JSON is supported.
-* This class extends ApiBase in order to generate Wikipedia Zero
-* specific output, as used for example by native apps and
-* JavaScript-capable clients.
 * @return ApiFormatBase
 */
public function getCustomPrinter() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b6fc3a9d2a9485da035c82ddf7cdfea31ccc506
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikiEditor[master]: More alignment with WikimediaUI color style

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387664 )

Change subject: More alignment with WikimediaUI color style
..


More alignment with WikimediaUI color style

Bug: T174119
Change-Id: I4ae87be955ef60e5cad45133c9b0118e1cf246be
---
M modules/jquery.wikiEditor.toolbar.less
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/jquery.wikiEditor.toolbar.less 
b/modules/jquery.wikiEditor.toolbar.less
index fcd1068..a774fc3 100644
--- a/modules/jquery.wikiEditor.toolbar.less
+++ b/modules/jquery.wikiEditor.toolbar.less
@@ -213,14 +213,14 @@
}
 
.current {
-   background-color: #fafafa;
+   background-color: #eaecf0;
color: #222;
cursor: default;
}
}
 
.pages {
-   background-color: #fafafa;
+   background-color: #f8f9fa;
height: 125px;
overflow: auto;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ae87be955ef60e5cad45133c9b0118e1cf246be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ZeroPortal[master]: Further clarify extending ApiBase

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387628 )

Change subject: Further clarify extending ApiBase
..


Further clarify extending ApiBase

Bug T91456

Change-Id: Ie913c6c280af563feb8f2c672e2700d65f50c0c8
---
M includes/ApiZeroPortal.php
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/includes/ApiZeroPortal.php b/includes/ApiZeroPortal.php
index 0d0a09f..674d451 100644
--- a/includes/ApiZeroPortal.php
+++ b/includes/ApiZeroPortal.php
@@ -23,7 +23,10 @@
 
/**
 * Override built-in handling of format parameter.
-* Only JSON is supported.
+* Only JSON is supported. Refer to the class documentation for 
ZeroBanner's
+* APIZeroBanner.php class ApiRawJsonPrinter for more information 
concerning
+* avoidance of faults in the netmapper routine (and, historically, 
other
+* maintenance type scripted processes).
 * @return ApiFormatBase
 */
public function getCustomPrinter() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie913c6c280af563feb8f2c672e2700d65f50c0c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroPortal
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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