[MediaWiki-commits] [Gerrit] bugfix to HTTPS redirect regex - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227729
Change subject: bugfix to HTTPS redirect regex
..
bugfix to HTTPS redirect regex
Change-Id: I1c9d07af9eec05b1a7f439cdb0d5ab77a39deb82
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/29/227729/1
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 15d4ab8..7ede611 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -194,7 +194,7 @@
if (req.http.X-Forwarded-Proto != https) {
// This is all of our unified cert wildcard domains
which are TLS-clean (cert matches all extant hostnames within)
// The lone exception now is wikimedia.org, in the next
block
- if (req.http.Host ~
(?i)^(^|\.)(wikipedia|wikibooks|wikinews|wikiquote|wikisource|wikiversity|wikivoyage|wikidata|wikimediafoundation|wiktionary|mediawiki)\.org$)
{
+ if (req.http.Host ~
(?i)(^|\.)(wikipedia|wikibooks|wikinews|wikiquote|wikisource|wikiversity|wikivoyage|wikidata|wikimediafoundation|wiktionary|mediawiki)\.org$)
{
set req.http.Location = https://; +
req.http.Host + req.url;
error 751 TLS Redirect;
}
--
To view, visit https://gerrit.wikimedia.org/r/227729
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c9d07af9eec05b1a7f439cdb0d5ab77a39deb82
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] disable ipsec config for cp3011 (down for hw issue) - change (operations/puppet)
BBlack has submitted this change and it was merged. Change subject: disable ipsec config for cp3011 (down for hw issue) .. disable ipsec config for cp3011 (down for hw issue) Change-Id: I8ccd16b3f71fb0e8ce9900a262e0b6212aa9f2ec --- M hieradata/common/cache/ipsec/text.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/hieradata/common/cache/ipsec/text.yaml b/hieradata/common/cache/ipsec/text.yaml index 06671a9..3455f27 100644 --- a/hieradata/common/cache/ipsec/text.yaml +++ b/hieradata/common/cache/ipsec/text.yaml @@ -26,7 +26,7 @@ - 'cp3008.esams.wmnet' - 'cp3009.esams.wmnet' - 'cp3010.esams.wmnet' -- 'cp3011.esams.wmnet' +# - 'cp3011.esams.wmnet' # T92306 - 'cp3012.esams.wmnet' - 'cp3013.esams.wmnet' - 'cp3014.esams.wmnet' -- To view, visit https://gerrit.wikimedia.org/r/227730 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8ccd16b3f71fb0e8ce9900a262e0b6212aa9f2ec Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved coordinate-related static functions from CargoStore to... - change (mediawiki...Cargo)
Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227731
Change subject: Moved coordinate-related static functions from CargoStore to
CargoUtils
..
Moved coordinate-related static functions from CargoStore to CargoUtils
Change-Id: I22cb47f4ea89c145b09f3643045ec1a1f3999340
---
M CargoSQLQuery.php
M CargoUtils.php
M parserfunctions/CargoDisplayMap.php
M parserfunctions/CargoStore.php
4 files changed, 124 insertions(+), 124 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo
refs/changes/31/227731/1
diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php
index 5734dc9..6044228 100644
--- a/CargoSQLQuery.php
+++ b/CargoSQLQuery.php
@@ -881,7 +881,7 @@
$latDistance = $distanceInKM / 111;
// Convert the latitude string to a latitude number - code is
- // copied from CargoStore::parseCoordinatesString().
+ // copied from CargoUtils::parseCoordinatesString().
$latIsNegative = false;
if ( strpos( $latString, 'S' ) 0 ) {
$latIsNegative = true;
@@ -890,7 +890,7 @@
if ( is_numeric( $latString ) ) {
$latNum = floatval( $latString );
} else {
- $latNum = CargoStore::coordinatePartToNumber(
$latString );
+ $latNum = CargoUtils::coordinatePartToNumber(
$latString );
}
if ( $latIsNegative ) {
$latNum *= -1;
diff --git a/CargoUtils.php b/CargoUtils.php
index 3966fe5..1d6ed2c 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -537,4 +537,123 @@
}
}
+ /**
+* Parses one half of a set of coordinates into a number.
+*
+* Copied from Miga, also written by Yaron Koren
+* (https://github.com/yaronkoren/miga/blob/master/MDVCoordinates.js)
+* - though that one is in Javascript.
+*/
+ public static function coordinatePartToNumber( $coordinateStr ) {
+ $degreesSymbols = array( \x{00B0}, d );
+ $minutesSymbols = array( ', \x{2032}, \x{00B4} );
+ $secondsSymbols = array( '', \x{2033}, \x{00B4}\x{00B4} );
+
+ $numDegrees = null;
+ $numMinutes = null;
+ $numSeconds = null;
+
+ foreach ( $degreesSymbols as $degreesSymbol ) {
+ $pattern = '/([\d\.]+)' . $degreesSymbol . '/u';
+ if ( preg_match( $pattern, $coordinateStr, $matches ) )
{
+ $numDegrees = floatval( $matches[1] );
+ break;
+ }
+ }
+ if ( $numDegrees == null ) {
+ throw new MWException( Error: could not parse degrees
in \$coordinateStr\. );
+ }
+
+ foreach ( $minutesSymbols as $minutesSymbol ) {
+ $pattern = '/([\d\.]+)' . $minutesSymbol . '/u';
+ if ( preg_match( $pattern, $coordinateStr, $matches ) )
{
+ $numMinutes = floatval( $matches[1] );
+ break;
+ }
+ }
+ if ( $numMinutes == null ) {
+ // This might not be an error - the number of minutes
+ // might just not have been set.
+ $numMinutes = 0;
+ }
+
+ foreach ( $secondsSymbols as $secondsSymbol ) {
+ $pattern = '/(\d+)' . $secondsSymbol . '/u';
+ if ( preg_match( $pattern, $coordinateStr, $matches ) )
{
+ $numSeconds = floatval( $matches[1] );
+ break;
+ }
+ }
+ if ( $numSeconds == null ) {
+ // This might not be an error - the number of seconds
+ // might just not have been set.
+ $numSeconds = 0;
+ }
+
+ return ( $numDegrees + ( $numMinutes / 60 ) + ( $numSeconds /
3600 ) );
+ }
+
+ /**
+* Parses a coordinate string in (hopefully) any standard format.
+*
+* Copied from Miga, also written by Yaron Koren
+* (https://github.com/yaronkoren/miga/blob/master/MDVCoordinates.js)
+* - though that one is in Javascript.
+*/
+ public static function parseCoordinatesString( $coordinatesString ) {
+ $coordinatesString = trim( $coordinatesString );
+ if ( $coordinatesString == null ) {
+ return;
+ }
+
+ // This is safe to do, right?
+ $coordinatesString = str_replace( array( '[', ']' ), '',
[MediaWiki-commits] [Gerrit] bugfix to HTTPS redirect regex - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: bugfix to HTTPS redirect regex
..
bugfix to HTTPS redirect regex
Change-Id: I1c9d07af9eec05b1a7f439cdb0d5ab77a39deb82
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 15d4ab8..7ede611 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -194,7 +194,7 @@
if (req.http.X-Forwarded-Proto != https) {
// This is all of our unified cert wildcard domains
which are TLS-clean (cert matches all extant hostnames within)
// The lone exception now is wikimedia.org, in the next
block
- if (req.http.Host ~
(?i)^(^|\.)(wikipedia|wikibooks|wikinews|wikiquote|wikisource|wikiversity|wikivoyage|wikidata|wikimediafoundation|wiktionary|mediawiki)\.org$)
{
+ if (req.http.Host ~
(?i)(^|\.)(wikipedia|wikibooks|wikinews|wikiquote|wikisource|wikiversity|wikivoyage|wikidata|wikimediafoundation|wiktionary|mediawiki)\.org$)
{
set req.http.Location = https://; +
req.http.Host + req.url;
error 751 TLS Redirect;
}
--
To view, visit https://gerrit.wikimedia.org/r/227729
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c9d07af9eec05b1a7f439cdb0d5ab77a39deb82
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] disable ipsec config for cp3011 (down for hw issue) - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/227730 Change subject: disable ipsec config for cp3011 (down for hw issue) .. disable ipsec config for cp3011 (down for hw issue) Change-Id: I8ccd16b3f71fb0e8ce9900a262e0b6212aa9f2ec --- M hieradata/common/cache/ipsec/text.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/30/227730/1 diff --git a/hieradata/common/cache/ipsec/text.yaml b/hieradata/common/cache/ipsec/text.yaml index 06671a9..3455f27 100644 --- a/hieradata/common/cache/ipsec/text.yaml +++ b/hieradata/common/cache/ipsec/text.yaml @@ -26,7 +26,7 @@ - 'cp3008.esams.wmnet' - 'cp3009.esams.wmnet' - 'cp3010.esams.wmnet' -- 'cp3011.esams.wmnet' +# - 'cp3011.esams.wmnet' # T92306 - 'cp3012.esams.wmnet' - 'cp3013.esams.wmnet' - 'cp3014.esams.wmnet' -- To view, visit https://gerrit.wikimedia.org/r/227730 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8ccd16b3f71fb0e8ce9900a262e0b6212aa9f2ec Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Follow-up cf3e8e5aee: fix styling of auto-numbered external ... - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Follow-up cf3e8e5aee: fix styling of auto-numbered external
links
..
Follow-up cf3e8e5aee: fix styling of auto-numbered external links
When adding rel=nofollow to external links, we also overwrote
the rel=mw:Extlink attribute that Parsoid put there, and the
CSS for auto-numbered links relies on this.
Bug: T106684
Change-Id: I148e567ea103293fde01e9edc811a90a2c73b32d
---
M includes/Parsoid/Fixer/ExtLinkFixer.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Matthias Mullie: Looks good to me, approved
Eranroz: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/Parsoid/Fixer/ExtLinkFixer.php
b/includes/Parsoid/Fixer/ExtLinkFixer.php
index 9562e58..f8a7fc2 100644
--- a/includes/Parsoid/Fixer/ExtLinkFixer.php
+++ b/includes/Parsoid/Fixer/ExtLinkFixer.php
@@ -33,7 +33,8 @@
global $wgNoFollowLinks, $wgNoFollowDomainExceptions;
if ( $wgNoFollowLinks !wfMatchesDomainList(
$node-getAttribute( 'href' ), $wgNoFollowDomainExceptions ) ) {
- $node-setAttribute( 'rel', 'nofollow' );
+ $oldRel = $node-getAttribute( 'rel' );
+ $node-setAttribute( 'rel', 'nofollow' . ( $oldRel !==
'' ? ' ' . $oldRel : '' ) );
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/226599
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I148e567ea103293fde01e9edc811a90a2c73b32d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Eranroz eranro...@gmail.com
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Sbisson sbis...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Collapse text style buttons in mobile - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227742
Change subject: Collapse text style buttons in mobile
..
Collapse text style buttons in mobile
B/I doesn't fit with link cite on a iPhone 6
Bug: T93325
Change-Id: Ib23b2f8540425ee5d8265f369aea250e900a0c5f
---
M modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
1 file changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/42/227742/1
diff --git a/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
index 2925a9f..0fd5126 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
@@ -46,7 +46,17 @@
// Link
{ include: [ 'back' ] },
// Style
- { include: [ 'bold', 'italic' ] },
+ {
+ classes: [ 've-test-toolbar-style' ],
+ type: 'list',
+ icon: 'textStyle',
+ indicator: 'down',
+ title: OO.ui.deferMsg( 'visualeditor-toolbar-style-tooltip' ),
+ include: [ { group: 'textStyle' }, 'language', 'clear' ],
+ forceExpand: [ 'bold', 'italic', 'clear' ],
+ promote: [ 'bold', 'italic' ],
+ demote: [ 'strikethrough', 'code', 'underline', 'language',
'clear' ]
+ },
// Link
{ include: [ 'link' ] },
// Cite
--
To view, visit https://gerrit.wikimedia.org/r/227742
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib23b2f8540425ee5d8265f369aea250e900a0c5f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow 0's {{useliquidthreads:01}} when handling magic word. - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow 0's {{useliquidthreads:01}} when handling magic word.
..
Allow 0's {{useliquidthreads:01}} when handling magic word.
Bug: T92303
Change-Id: I0658e2b6b93beb69a98bad65bc98a9d09afc18ec
---
M includes/Import/LiquidThreadsApi/ConversionStrategy.php
M includes/Import/LiquidThreadsApi/Objects.php
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Import/LiquidThreadsApi/ConversionStrategy.php
b/includes/Import/LiquidThreadsApi/ConversionStrategy.php
index cb77dc8..fb06563 100644
--- a/includes/Import/LiquidThreadsApi/ConversionStrategy.php
+++ b/includes/Import/LiquidThreadsApi/ConversionStrategy.php
@@ -58,6 +58,8 @@
*/
protected $notificationController;
+ const LQT_ENABLE_MAGIC_WORD_REGEX =
'/{{\s*#useliquidthreads:\s*0*1\s*}}/i';
+
public function __construct(
DatabaseBase $dbw,
ImportSourceStore $sourceStore,
@@ -132,7 +134,7 @@
) );
$newWikitext = preg_replace(
- '/{{\s*#useliquidthreads:\s*1\s*}}/i',
+ self::LQT_ENABLE_MAGIC_WORD_REGEX,
'',
$content-getNativeData()
);
diff --git a/includes/Import/LiquidThreadsApi/Objects.php
b/includes/Import/LiquidThreadsApi/Objects.php
index d491a63..b3b7848 100644
--- a/includes/Import/LiquidThreadsApi/Objects.php
+++ b/includes/Import/LiquidThreadsApi/Objects.php
@@ -13,6 +13,7 @@
use Flow\Import\ImportException;
use Flow\Import\IObjectRevision;
use Flow\Import\IRevisionableObject;
+use Flow\Import\LiquidThreadsApi\ConversionStrategy;
use Iterator;
use MWTimestamp;
use Title;
@@ -526,7 +527,7 @@
// nowiki, etc. It also ignores case and spaces in places
where it doesn't
// matter.
$newWikitext = preg_replace(
- '/{{\s*#useliquidthreads:\s*1\s*}}/i',
+ ConversionStrategy::LQT_ENABLE_MAGIC_WORD_REGEX,
'',
$wikitextForLastRevision
);
--
To view, visit https://gerrit.wikimedia.org/r/227407
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0658e2b6b93beb69a98bad65bc98a9d09afc18ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Sbisson sbis...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add ferm rules for jobrunners - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: Add ferm rules for jobrunners
..
Add ferm rules for jobrunners
Bug: T104972
Change-Id: I0b2c9cb74deece18daef0a184525b580d827023d
---
M modules/mediawiki/manifests/jobrunner.pp
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
Objections:
Giuseppe Lavagetto: There's a problem with this change, please improve
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index 7c7427d..feea0f8 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -76,6 +76,12 @@
provider = 'upstart',
}
+ferm::service { 'mediawiki-jobrunner':
+proto = 'tcp',
+port = $port,
+srange = '$INTERNAL',
+}
+
file { '/etc/logrotate.d/mediawiki_jobrunner':
source =
'puppet:///modules/mediawiki/logrotate.d_mediawiki_jobrunner',
owner = 'root',
--
To view, visit https://gerrit.wikimedia.org/r/226506
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b2c9cb74deece18daef0a184525b580d827023d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff mmuhlenh...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Muehlenhoff mmuhlenh...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make scrollIntoView a VE utility function - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227751
Change subject: Make scrollIntoView a VE utility function
..
Make scrollIntoView a VE utility function
This allows it to be disabled in test mode
Bug: T107122
Change-Id: Id9b460f1a3baf6568c4634c1494c44cb54d51387
---
M src/ce/nodes/ve.ce.TableNode.js
M src/ce/ve.ce.Surface.js
M src/ve.utils.js
M tests/ve.test.utils.js
4 files changed, 12 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/51/227751/1
diff --git a/src/ce/nodes/ve.ce.TableNode.js b/src/ce/nodes/ve.ce.TableNode.js
index 913ccad..deb56de 100644
--- a/src/ce/nodes/ve.ce.TableNode.js
+++ b/src/ce/nodes/ve.ce.TableNode.js
@@ -432,7 +432,7 @@
.toggleClass( 've-ce-tableNodeOverlay-selection-box-fullCol',
selection.isFullCol() );
if ( selectionChanged ) {
- OO.ui.Element.static.scrollIntoView( this.$selectionBox.get( 0
) );
+ ve.scrollIntoView( this.$selectionBox.get( 0 ) );
}
};
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 3b0281a..281d033 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -2327,7 +2327,7 @@
this.surfaceObserver.clear();
}
// If the node is outside the view, scroll to it
- OO.ui.Element.static.scrollIntoView(
this.focusedNode.$element.get( 0 ) );
+ ve.scrollIntoView(
this.focusedNode.$element.get( 0 ) );
}
}
} else {
@@ -3865,7 +3865,7 @@
$( newSel.focusNode ).closest( '[contenteditable=true]'
).focus();
} else {
// Scroll the node into view
- OO.ui.Element.static.scrollIntoView(
+ ve.scrollIntoView(
$( newSel.focusNode ).closest( '*' ).get( 0 )
);
}
diff --git a/src/ve.utils.js b/src/ve.utils.js
index 81a0ef6..4cf791e 100644
--- a/src/ve.utils.js
+++ b/src/ve.utils.js
@@ -69,6 +69,12 @@
ve.debounce = OO.ui.debounce;
/**
+ * @method
+ * @inheritdoc OO.ui.Element#scrollIntoView
+ */
+ve.scrollIntoView = OO.ui.Element.static.scrollIntoView;
+
+/**
* Copy an array of DOM elements, optionally into a different document.
*
* @param {HTMLElement[]} domElements DOM elements to copy
diff --git a/tests/ve.test.utils.js b/tests/ve.test.utils.js
index 2503da4..466c452 100644
--- a/tests/ve.test.utils.js
+++ b/tests/ve.test.utils.js
@@ -15,6 +15,9 @@
// Configure QUnit
QUnit.config.requireExpects = true;
+ // Disable scroll animatinos
+ ve.scrollIntoView = function () {};
+
// Extend QUnit.module to provide a fixture element. This used to be in
tests/index.html, but
// dynamic test runners like Karma build their own web page.
( function () {
--
To view, visit https://gerrit.wikimedia.org/r/227751
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9b460f1a3baf6568c4634c1494c44cb54d51387
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove set focus to page - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove set focus to page
..
Remove set focus to page
Removed set focus to page after selecting site, because if tab key is
used for selecting the focus is set wrong.
Bug: T107063
Change-Id: I8eb4667fa1a5834259ee774e181e610b4439566a
---
M view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
index e7789e8..fd7d0fb 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
@@ -300,8 +300,7 @@
$pageNameInput
.attr( 'lang', site.getLanguageCode() )
.attr( 'dir', site.getLanguageDirection() )
- .show()
- .focus();
+ .show();
} else {
$pageNameInput.hide();
}
--
To view, visit https://gerrit.wikimedia.org/r/227666
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8eb4667fa1a5834259ee774e181e610b4439566a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) jonas.kr...@wikimedia.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata - rm set focus on page in sitelinks ui - change (mediawiki...Wikidata)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227753
Change subject: Update Wikidata - rm set focus on page in sitelinks ui
..
Update Wikidata - rm set focus on page in sitelinks ui
Change-Id: Ifc3ae46b164e471b97a96ef79defd1ecbea87924
---
M composer.lock
M
extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
M vendor/composer/installed.json
3 files changed, 5 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/53/227753/1
diff --git a/composer.lock b/composer.lock
index b9eb7f6..18290e0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1325,7 +1325,7 @@
source: {
type: git,
url:
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Wikibase.git;,
-reference: b73bc168435a1214956543d94ccfc00e8902a566
+reference: 8d8991d0c651dfe2f0e023516bd7a5a93d3e23fa
},
require: {
data-values/common: ~0.2.0,
@@ -1403,7 +1403,7 @@
issues: https://phabricator.wikimedia.org/;,
irc: irc://irc.freenode.net/wikidata
},
-time: 2015-07-29 02:00:56
+time: 2015-07-29 16:54:34
},
{
name: wikibase/wikimedia-badges,
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
index e7789e8..fd7d0fb 100644
---
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
+++
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
@@ -300,8 +300,7 @@
$pageNameInput
.attr( 'lang', site.getLanguageCode() )
.attr( 'dir', site.getLanguageDirection() )
- .show()
- .focus();
+ .show();
} else {
$pageNameInput.hide();
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 048eaa1..2f0b713 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1417,7 +1417,7 @@
source: {
type: git,
url:
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Wikibase.git;,
-reference: b73bc168435a1214956543d94ccfc00e8902a566
+reference: 8d8991d0c651dfe2f0e023516bd7a5a93d3e23fa
},
require: {
data-values/common: ~0.2.0,
@@ -1446,7 +1446,7 @@
require-dev: {
squizlabs/php_codesniffer: ~2.1
},
-time: 2015-07-28 17:31:42,
+time: 2015-07-29 09:28:08,
type: mediawiki-extension,
installation-source: source,
autoload: {
--
To view, visit https://gerrit.wikimedia.org/r/227753
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc3ae46b164e471b97a96ef79defd1ecbea87924
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.26wmf16
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move sourceswiki special.dblist-wikisource.dblist - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Move sourceswiki special.dblist-wikisource.dblist
..
Move sourceswiki special.dblist-wikisource.dblist
sourceswiki is a wikisource: the default language-variant
wikisource that predates the language-specific ones and still
in active use for multilingual documents.
Includes handling of the special case in
DbListTests::testDatabaseNamesUseProjectNameAsSuffix
because the database does not match the standard pattern.
InitialiseSettings.php has been modified to remove much of
the special casing of sourceswiki and fold it back within
'wikisource'; but because of the separation some
existing divergent config will be changed:
* Visual Editor will be turned off by default.
Already the case on every other Wikisource, cleared
by James F as having been intended.
* DynamicPageList extension will be enabled
T14423 intended to turn it on for 'all wikisource'
* wmgMFRemovePageActions set to 'upload' disabling
file uploads. https://gerrit.wikimedia.org/r/142155
intended to do so for all wikisources.
At least one divergence remains explicit:
* wgEnotifMinorEdits remains 'true'. (No changeset to
be found, no bug located).
Bug: T14423
Bug: T68958
Bug: T91534
Change-Id: Idb72066aa4d877753f75e79f6bf0bde4a16e36b1
---
M special.dblist
M tests/dblistTest.php
D w/static/images/project-logos/sourceswiki.png
M wikisource.dblist
M wmf-config/InitialiseSettings.php
5 files changed, 10 insertions(+), 9 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/special.dblist b/special.dblist
index 4cfc8a9..b365248 100644
--- a/special.dblist
+++ b/special.dblist
@@ -32,7 +32,6 @@
outreachwiki
qualitywiki
searchcomwiki
-sourceswiki
spcomwiki
specieswiki
stewardwiki
diff --git a/tests/dblistTest.php b/tests/dblistTest.php
index 155a5d8..8b8791e 100644
--- a/tests/dblistTest.php
+++ b/tests/dblistTest.php
@@ -31,6 +31,13 @@
: $projectname
;
+ # Sadly, we end up with an exception because hysterical raisins
+ # sourceswiki is the original Wikisource and is still active
+ if ( $database === 'sourceswiki' ) {
+ $this-assertEquals( $projectname, 'wikisource' );
+ return;
+ }
+
# Verifiy the databasename suffix
$this-assertStringEndsWith( $dbsuffix, $database,
Database name $database lacks db suffix $dbsuffix of
$projectname
diff --git a/w/static/images/project-logos/sourceswiki.png
b/w/static/images/project-logos/sourceswiki.png
deleted file mode 100644
index 290f254..000
--- a/w/static/images/project-logos/sourceswiki.png
+++ /dev/null
Binary files differ
diff --git a/wikisource.dblist b/wikisource.dblist
index 2505b13..9204b16 100644
--- a/wikisource.dblist
+++ b/wikisource.dblist
@@ -51,6 +51,7 @@
sawikisource
skwikisource
slwikisource
+sourceswiki
srwikisource
svwikisource
tawikisource
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 1feab08..5ee8410 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -144,6 +144,7 @@
'otrs_wikiwiki' = 'en',
'qualitywiki' = 'en',
'searchcomwiki' = 'en',
+ 'sourceswiki' = 'en',
'stewardwiki' = 'en',
'strategywiki' = 'en',
'tenwiki' = 'en',
@@ -934,7 +935,6 @@
'thwikinews' = '/static/images/project-logos/thwikinews.png',
// Wikisource
- 'sourceswiki' = '/static/images/project-logos/sourceswiki.png',
'arwikisource' = '/static/images/project-logos/arwikisource.png',
'aswikisource' = '/static/images/project-logos/aswikisource.png', //
T45129
'azwikisource' = '/static/images/project-logos/azwikisource.png', //
T54019
@@ -1833,7 +1833,6 @@
'slwikisource' = 'Wikivir',
'slwiktionary' = 'Wikislovar',
'slwikiversity' = 'Wikiverza',
- 'sourceswiki' = 'Wikisource',
'spcomwiki' = 'Spcom',
'specieswiki' = 'Wikispecies',
'sqwikinews' = 'Wikilajme',
@@ -2311,7 +2310,6 @@
'slwikisource' = 'Wikivir',
'slwiktionary' = 'Wikislovar',
'slwikiversity' = 'Wikiverza',
- 'sourceswiki' = 'Wikisource',
'spcomwiki' = 'Spcom',
'specieswiki' = 'Wikispecies',
'sqwikinews' = 'Wikilajme',
@@ -4238,7 +4236,7 @@
'outreachwiki' = 'wikimedia',
'usabilitywiki' = 'wikimedia',
'strategywiki' = 'wikimedia',
- 'sourceswiki' = 'wikisource',
+ 'sourceswiki' = 'wikisource', // $site is wikipedia for this
'specieswiki' = 'wikispecies',
'testwiki' = 'test',
'wikimania' = 'wikimedia',
@@ -10422,7 +10420,6 @@
'wmgUseProofreadPage' = array(
'default' = false,
'wikisource' =
[MediaWiki-commits] [Gerrit] nodepool: stop using diskimage - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: nodepool: stop using diskimage
..
nodepool: stop using diskimage
Diskimage is yet another image creation tool and we probably have
enough. Moreover Nodepool would require root access on the machine to
rebuild image periodically (T102281).
Stop using diskimage-builder
Switch to `base-image` which instructs Nodepool to use the given image
name provided by the cloud provider (wmflabs)
Change image name from ci-dib-jessie-wikimedia to ci-jessie-wikimedia
RelEng will build and upload the image manually for now.
Bug: T102281
Change-Id: I27fb0bf5843bfad53ba610da948bc4935f0391df
---
D modules/nodepool/files/elements/nodepool-base/README.rst
D modules/nodepool/files/elements/nodepool-base/element-deps
D
modules/nodepool/files/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts
D modules/nodepool/files/elements/nodepool-base/finalise.d/99-nodepool-dir
D modules/nodepool/files/elements/nodepool-base/install.d/05-record-details
D modules/nodepool/files/elements/nodepool-base/install.d/package-installs-java
D modules/nodepool/files/elements/wikimedia-networking/element-deps
D
modules/nodepool/files/elements/wikimedia-networking/install.d/package-installs-dhcp-client
D
modules/nodepool/files/elements/wikimedia-networking/install.d/package-installs-net-tools
M modules/nodepool/manifests/init.pp
M modules/nodepool/templates/nodepool.yaml.erb
11 files changed, 6 insertions(+), 135 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/nodepool/files/elements/nodepool-base/README.rst
b/modules/nodepool/files/elements/nodepool-base/README.rst
deleted file mode 100644
index 75ee300..000
--- a/modules/nodepool/files/elements/nodepool-base/README.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-nodepool-base
--
-
-NodePool element to prepare an image to be connected with Jenkins.
diff --git a/modules/nodepool/files/elements/nodepool-base/element-deps
b/modules/nodepool/files/elements/nodepool-base/element-deps
deleted file mode 100644
index 7076aba..000
--- a/modules/nodepool/files/elements/nodepool-base/element-deps
+++ /dev/null
@@ -1 +0,0 @@
-package-installs
diff --git
a/modules/nodepool/files/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts
b/modules/nodepool/files/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts
deleted file mode 100755
index e1ce4bb..000
---
a/modules/nodepool/files/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
-#
-# Licensed 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 and
-# limitations under the License.
-
-# Copy the nodepools scripts into the image
-
-# This is 99 because it needs to depend on source-repositories having been
-# run, because the default fallthrough location for the nodepool scripts
-# is the git repo that's been cloned into the image.
-
-# During a nodepool run, it's expected that NODEPOOL_SCRIPTDIR is set, in
-# which case ordering doesn't matter - but for a developer hacking locally
-# who is not hacking on those scripts, it's an imposition to make them
-# set an env var.
-
-if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
-set -x
-fi
-set -eu
-set -o pipefail
-
-NODEPOOL_SCRIPTDIR=${NODEPOOL_SCRIPTDIR:-$TMP_MOUNT_PATH/opt/git/openstack-infra/project-config/nodepool/scripts}
-
-sudo cp -a $NODEPOOL_SCRIPTDIR $TMP_MOUNT_PATH/opt/nodepool-scripts
-sudo chmod -R a+rx $TMP_MOUNT_PATH/opt/nodepool-scripts
diff --git
a/modules/nodepool/files/elements/nodepool-base/finalise.d/99-nodepool-dir
b/modules/nodepool/files/elements/nodepool-base/finalise.d/99-nodepool-dir
deleted file mode 100755
index 7e36a2d..000
--- a/modules/nodepool/files/elements/nodepool-base/finalise.d/99-nodepool-dir
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2011-2013 OpenStack Foundation
-#
-# Licensed 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
[MediaWiki-commits] [Gerrit] Remove mobileViewTarget alias hack - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227754
Change subject: Remove mobileViewTarget alias hack
..
Remove mobileViewTarget alias hack
Was required to pass tests until MF fix got merged.
Change-Id: I15a4c7de8135f25aa729ae052583b803ca44570d
---
M extension.json
1 file changed, 0 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/54/227754/1
diff --git a/extension.json b/extension.json
index 640c9d1..edd3eac 100644
--- a/extension.json
+++ b/extension.json
@@ -330,14 +330,6 @@
visualeditor-saveerror-titleblacklist
]
},
- ext.visualEditor.mobileViewTarget: {
- dependencies: [
- ext.visualEditor.mobileArticleTarget
- ],
- targets: [
- mobile
- ]
- },
ext.visualEditor.mobileArticleTarget: {
scripts: [
modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
--
To view, visit https://gerrit.wikimedia.org/r/227754
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I15a4c7de8135f25aa729ae052583b803ca44570d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Move sourceswiki special.dblist-wikisource.dblist - change (operations/mediawiki-config)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227734
Change subject: Revert Move sourceswiki special.dblist-wikisource.dblist
..
Revert Move sourceswiki special.dblist-wikisource.dblist
This reverts commit 14722449d5b9ab524414d06fa9410c659e1d3b56.
Change-Id: I54a9a31d9a7104841963d860ffc855bdd539ac37
---
M special.dblist
M tests/dblistTest.php
A w/static/images/project-logos/sourceswiki.png
M wikisource.dblist
M wmf-config/InitialiseSettings.php
5 files changed, 9 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/34/227734/1
diff --git a/special.dblist b/special.dblist
index b365248..4cfc8a9 100644
--- a/special.dblist
+++ b/special.dblist
@@ -32,6 +32,7 @@
outreachwiki
qualitywiki
searchcomwiki
+sourceswiki
spcomwiki
specieswiki
stewardwiki
diff --git a/tests/dblistTest.php b/tests/dblistTest.php
index 8b8791e..155a5d8 100644
--- a/tests/dblistTest.php
+++ b/tests/dblistTest.php
@@ -31,13 +31,6 @@
: $projectname
;
- # Sadly, we end up with an exception because hysterical raisins
- # sourceswiki is the original Wikisource and is still active
- if ( $database === 'sourceswiki' ) {
- $this-assertEquals( $projectname, 'wikisource' );
- return;
- }
-
# Verifiy the databasename suffix
$this-assertStringEndsWith( $dbsuffix, $database,
Database name $database lacks db suffix $dbsuffix of
$projectname
diff --git a/w/static/images/project-logos/sourceswiki.png
b/w/static/images/project-logos/sourceswiki.png
new file mode 100644
index 000..290f254
--- /dev/null
+++ b/w/static/images/project-logos/sourceswiki.png
Binary files differ
diff --git a/wikisource.dblist b/wikisource.dblist
index 9204b16..2505b13 100644
--- a/wikisource.dblist
+++ b/wikisource.dblist
@@ -51,7 +51,6 @@
sawikisource
skwikisource
slwikisource
-sourceswiki
srwikisource
svwikisource
tawikisource
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 5ee8410..1feab08 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -144,7 +144,6 @@
'otrs_wikiwiki' = 'en',
'qualitywiki' = 'en',
'searchcomwiki' = 'en',
- 'sourceswiki' = 'en',
'stewardwiki' = 'en',
'strategywiki' = 'en',
'tenwiki' = 'en',
@@ -935,6 +934,7 @@
'thwikinews' = '/static/images/project-logos/thwikinews.png',
// Wikisource
+ 'sourceswiki' = '/static/images/project-logos/sourceswiki.png',
'arwikisource' = '/static/images/project-logos/arwikisource.png',
'aswikisource' = '/static/images/project-logos/aswikisource.png', //
T45129
'azwikisource' = '/static/images/project-logos/azwikisource.png', //
T54019
@@ -1833,6 +1833,7 @@
'slwikisource' = 'Wikivir',
'slwiktionary' = 'Wikislovar',
'slwikiversity' = 'Wikiverza',
+ 'sourceswiki' = 'Wikisource',
'spcomwiki' = 'Spcom',
'specieswiki' = 'Wikispecies',
'sqwikinews' = 'Wikilajme',
@@ -2310,6 +2311,7 @@
'slwikisource' = 'Wikivir',
'slwiktionary' = 'Wikislovar',
'slwikiversity' = 'Wikiverza',
+ 'sourceswiki' = 'Wikisource',
'spcomwiki' = 'Spcom',
'specieswiki' = 'Wikispecies',
'sqwikinews' = 'Wikilajme',
@@ -4236,7 +4238,7 @@
'outreachwiki' = 'wikimedia',
'usabilitywiki' = 'wikimedia',
'strategywiki' = 'wikimedia',
- 'sourceswiki' = 'wikisource', // $site is wikipedia for this
+ 'sourceswiki' = 'wikisource',
'specieswiki' = 'wikispecies',
'testwiki' = 'test',
'wikimania' = 'wikimedia',
@@ -10420,6 +10422,7 @@
'wmgUseProofreadPage' = array(
'default' = false,
'wikisource' = true,
+ 'sourceswiki' = true, // FIXME: Why isn't this part of wikisource?
'test2wiki' = true,
'frrwiki' = true, // T40023
),
@@ -10715,6 +10718,7 @@
'otrs_wikiwiki' = '/static/favicon/wmf.ico',
'outreachwiki' = '/static/favicon/community.ico',
'searchcomwiki' = '/static/favicon/wmf.ico',
+ 'sourceswiki' = '/static/favicon/wikisource.ico',
'spcomwiki' = '/static/favicon/spcom.ico',
'specieswiki' = '/static/favicon/wikispecies.ico',
'stewardwiki' = '/static/favicon/community.ico',
@@ -10875,6 +10879,7 @@
'wikinews' = '/srv/mediawiki/w/static/images/sul/wikinews.png',
'wikiquote' = '/srv/mediawiki/w/static/images/sul/wikiquote.png',
'wikisource' = '/srv/mediawiki/w/static/images/sul/wikisource.png',
+ 'sourceswiki' = '/srv/mediawiki/w/static/images/sul/wikisource.png',
'wikiversity' =
[MediaWiki-commits] [Gerrit] nodepool: use OpenStack modules from jessie-backports - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: nodepool: use OpenStack modules from jessie-backports
..
nodepool: use OpenStack modules from jessie-backports
Nodepool 0.1.0 requires python-novaclient = 2.21.0 while Jessie
provides 2.18.1.
Pin python-novaclient to jessie-backports which has 2.23.0.
The OpenStack client utility needs to be backported as well or it emits
a warning and errors out:
$ openstack server list
/usr/lib/python2.7/dist-packages/novaclient/v1_1/__init__.py:30:
UserWarning: Module novaclient.v1_1 is deprecated (taken as a basis
for novaclient.v2). The preferable way to get client class or object
you can find in novaclient.client module.
warnings.warn(Module novaclient.v1_1 is deprecated (taken as a basis
for
ERROR: openstack url_for() got an unexpected keyword argument
'volume_service_name'
$
Bug: T104971
Change-Id: I4a787185bdcb6b12566c85687b2139858c4dc04c
---
M modules/nodepool/manifests/init.pp
1 file changed, 19 insertions(+), 5 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/nodepool/manifests/init.pp
b/modules/nodepool/manifests/init.pp
index 99a0015..ac15dc5 100644
--- a/modules/nodepool/manifests/init.pp
+++ b/modules/nodepool/manifests/init.pp
@@ -56,6 +56,25 @@
package { 'nodepool':
ensure = present,
}
+# Nodepool 0.1.0 requires novaclient=2.21.0
+# Jessie has 2.18.1 (T104971)
+apt::pin { 'python-novaclient':
+pin = 'release a=jessie-backports',
+priority = '1001',
+before = Package['nodepool'],
+}
+apt::pin { 'python-openstackclient':
+pin = 'release a=jessie-backports',
+priority = '1001',
+before = Package['nodepool'],
+}
+
+# OpenStack CLI
+package { 'python-openstackclient':
+ensure = present,
+require = Apt::Pin['python-openstackclient'],
+}
+
# python-diskimage-builder 0.1.46 missing dependency:
# https://bugs.debian.org/791655
package { 'uuid-runtime':
@@ -138,11 +157,6 @@
group = 'nodepool',
mode= '0440',
content = shell_exports($nodepool_user_env),
-}
-
-# OpenStack CLI
-package { 'python-openstackclient':
-ensure = present,
}
file { '/var/lib/nodepool/.ssh':
--
To view, visit https://gerrit.wikimedia.org/r/227663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a787185bdcb6b12566c85687b2139858c4dc04c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mw.widgets.CalendarWidget: Silence jshint for one line, not ... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mw.widgets.CalendarWidget: Silence jshint for one line, not
entire file
..
mw.widgets.CalendarWidget: Silence jshint for one line, not entire file
Follows up I6f760f7c32e2e6ed2008e897af72fb9e17dd663b
Suppress warning at the specific line that uses the static keyword
rather than the entire file.
Expected an identifier and instead saw 'static' (a reserved word). (W024)
Change-Id: I0e4f9062b01b82893205da9e72c41acae3d6967f
---
M resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
index 0d743e4..9016e89 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
@@ -5,7 +5,6 @@
* @license The MIT License (MIT); see LICENSE.txt
*/
/*global moment */
-/*jshint es3: false */
( function ( $, mw ) {
/**
@@ -474,7 +473,9 @@
*/
mw.widgets.CalendarWidget.prototype.onKeyDown = function ( e ) {
var
+ /*jshint -W024*/
dir = OO.ui.Element.static.getDir( this.$element ),
+ /*jshint +W024*/
nextDirectionKey = dir === 'ltr' ? OO.ui.Keys.RIGHT :
OO.ui.Keys.LEFT,
prevDirectionKey = dir === 'ltr' ? OO.ui.Keys.LEFT :
OO.ui.Keys.RIGHT,
updateInDirection = null;
--
To view, visit https://gerrit.wikimedia.org/r/227628
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e4f9062b01b82893205da9e72c41acae3d6967f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Edokter er...@darcoury.nl
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Mooeypoo mor...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert No need for wgSecureLogin on our wikis, HTTPS is for... - change (operations/mediawiki-config)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/227740 Change subject: Revert No need for wgSecureLogin on our wikis, HTTPS is forced everywhere .. Revert No need for wgSecureLogin on our wikis, HTTPS is forced everywhere This reverts commit 638afe4b9db47bb35d30a4fbb0a7db9745812e7b. Change-Id: I3a3f173d937aa43abdb87b935d70f6b5d841bffd --- M wmf-config/InitialiseSettings-labs.php M wmf-config/InitialiseSettings.php 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/40/227740/1 diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index f89c6cd..ce96ad8 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -979,6 +979,13 @@ 'default' = true, ), + 'wgSecureLogin' = array( + // Setting false throughout Labs for now due to untrusted SSL certificate + // T50501 + 'default' = false, + 'loginwiki' = false, + ), + 'wgSearchSuggestCacheExpiry' = array( 'default' = 300, ), diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index a108019..e1a715c 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -15352,6 +15352,10 @@ 'test2wiki' = false, // T67011 ), +'wgSecureLogin' = array( + 'default' = true, +), + 'wgRightsUrl' = array( 'default' = '//creativecommons.org/licenses/by-sa/3.0/', 'huwikinews' = '//creativecommons.org/licenses/by/3.0/', -- To view, visit https://gerrit.wikimedia.org/r/227740 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3a3f173d937aa43abdb87b935d70f6b5d841bffd Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] When saving from review screen, swap to main save screen - change (mediawiki...VisualEditor)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227747
Change subject: When saving from review screen, swap to main save screen
..
When saving from review screen, swap to main save screen
Bug: T107251
Change-Id: I78fb0b8804ffa4b8accd4d2619d7bbd34e2c4f1e
---
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/47/227747/1
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 5b53078..8ce1118 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -505,6 +505,7 @@
if ( action === 'save' ) {
return new OO.ui.Process( function () {
var saveDeferred = $.Deferred();
+ this.swapPanel( 'save' );
this.emit( 'save', saveDeferred );
return saveDeferred.promise();
}, this );
--
To view, visit https://gerrit.wikimedia.org/r/227747
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I78fb0b8804ffa4b8accd4d2619d7bbd34e2c4f1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Update Wikidata - add usage tracking job - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert Update Wikidata - add usage tracking job
..
Revert Update Wikidata - add usage tracking job
investigating if something is wrong here.
This reverts commit 7bc731811b848570133e2cf97f775d293ab8cac1.
Change-Id: I4f32726c5747d7bd68d7bcf9934e006695697441
---
M composer.lock
M extensions/Wikibase/.jscsrc
M extensions/Wikibase/client/WikibaseClient.php
M extensions/Wikibase/client/includes/Hooks/DataUpdateHookHandlers.php
M extensions/Wikibase/client/includes/Usage/EntityUsage.php
D extensions/Wikibase/client/includes/store/AddUsagesForPageJob.php
M extensions/Wikibase/client/includes/store/ClientStore.php
M extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php
M extensions/Wikibase/client/tests/phpunit/MockClientStore.php
M
extensions/Wikibase/client/tests/phpunit/includes/Hooks/DataUpdateHookHandlersTest.php
M extensions/Wikibase/client/tests/phpunit/includes/Usage/EntityUsageTest.php
D
extensions/Wikibase/client/tests/phpunit/includes/store/AddUsagesForPageJobTest.php
M extensions/Wikibase/composer.json
M extensions/Wikibase/package.json
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
16 files changed, 47 insertions(+), 523 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 07826bc..717f103 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1326,12 +1326,12 @@
source: {
type: git,
url:
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: 7ed9b2a65f6ff6be7293d796b01e597dd9164c81
+reference: 2498f76188fe714f19fdd68ca89a6ac34ecd4e4c
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/7ed9b2a65f6ff6be7293d796b01e597dd9164c81;,
-reference: 7ed9b2a65f6ff6be7293d796b01e597dd9164c81,
+url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/2498f76188fe714f19fdd68ca89a6ac34ecd4e4c;,
+reference: 2498f76188fe714f19fdd68ca89a6ac34ecd4e4c,
shasum:
},
require: {
@@ -1350,8 +1350,8 @@
php: =5.3.2,
wikibase/data-model: ~3.0,
wikibase/data-model-javascript: ^1.0.2,
-wikibase/data-model-serialization: ~1.4.0,
-wikibase/internal-serialization: ~1.4.0,
+wikibase/data-model-serialization: ~1.4,
+wikibase/internal-serialization: ~1.4,
wikibase/javascript-api: ~1.0,
wikibase/serialization-javascript: ~2.0
},
@@ -1399,7 +1399,7 @@
wikibaserepo,
wikidata
],
-time: 2015-07-29 02:42:33
+time: 2015-07-23 01:52:42
},
{
name: wikibase/wikimedia-badges,
diff --git a/extensions/Wikibase/.jscsrc b/extensions/Wikibase/.jscsrc
index 312c030..f66f6bd 100644
--- a/extensions/Wikibase/.jscsrc
+++ b/extensions/Wikibase/.jscsrc
@@ -3,26 +3,12 @@
preset: wikimedia,
//
- // Rules from wikimedia preset we don't yet? follow
+ // Rules from wikimedia preset we don't follow
validateIndentation: null,
requireMultipleVarDecl: null,
disallowDanglingUnderscores: null,
- requireSpacesInsideBrackets: null,
- requireVarDeclFirst: null,
- jsDoc: {
- // what we don't yet follow is commented out
- //checkAnnotations: jsduck5,
- //checkParamNames: true,
- requireParamTypes: true,
- checkRedundantParams: true,
- //checkReturnTypes: true,
- checkRedundantReturns: true,
- //requireReturnTypes: true,
- //checkTypes: capitalizedNativeCase,
- checkRedundantAccess: true
- //requireNewlineAfterDescription: true
- },
+ requireSpacesInsideArrayBrackets: null,
//
// Own rules
@@ -38,5 +24,5 @@
else
],
- excludeFiles: [ node_modules/**, vendor/**, extensions/** ]
+ excludeFiles: [ node_modules/**, vendor/** ]
}
diff --git a/extensions/Wikibase/client/WikibaseClient.php
b/extensions/Wikibase/client/WikibaseClient.php
index deefc1f..4c48108 100644
--- a/extensions/Wikibase/client/WikibaseClient.php
+++ b/extensions/Wikibase/client/WikibaseClient.php
@@ -67,7 +67,6 @@
global $wgExtensionCredits, $wgExtensionMessagesFiles, $wgHooks;
global $wgAPIMetaModules, $wgAPIPropModules, $wgSpecialPages,
$wgResourceModules;
global $wgWBClientSettings, $wgRecentChangesFlags, $wgMessagesDirs;
- global
[MediaWiki-commits] [Gerrit] Moved coordinate-related static functions from CargoStore to... - change (mediawiki...Cargo)
Yaron Koren has submitted this change and it was merged.
Change subject: Moved coordinate-related static functions from CargoStore to
CargoUtils
..
Moved coordinate-related static functions from CargoStore to CargoUtils
Change-Id: I22cb47f4ea89c145b09f3643045ec1a1f3999340
---
M CargoSQLQuery.php
M CargoUtils.php
M parserfunctions/CargoDisplayMap.php
M parserfunctions/CargoStore.php
4 files changed, 124 insertions(+), 124 deletions(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php
index 5734dc9..6044228 100644
--- a/CargoSQLQuery.php
+++ b/CargoSQLQuery.php
@@ -881,7 +881,7 @@
$latDistance = $distanceInKM / 111;
// Convert the latitude string to a latitude number - code is
- // copied from CargoStore::parseCoordinatesString().
+ // copied from CargoUtils::parseCoordinatesString().
$latIsNegative = false;
if ( strpos( $latString, 'S' ) 0 ) {
$latIsNegative = true;
@@ -890,7 +890,7 @@
if ( is_numeric( $latString ) ) {
$latNum = floatval( $latString );
} else {
- $latNum = CargoStore::coordinatePartToNumber(
$latString );
+ $latNum = CargoUtils::coordinatePartToNumber(
$latString );
}
if ( $latIsNegative ) {
$latNum *= -1;
diff --git a/CargoUtils.php b/CargoUtils.php
index 3966fe5..1d6ed2c 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -537,4 +537,123 @@
}
}
+ /**
+* Parses one half of a set of coordinates into a number.
+*
+* Copied from Miga, also written by Yaron Koren
+* (https://github.com/yaronkoren/miga/blob/master/MDVCoordinates.js)
+* - though that one is in Javascript.
+*/
+ public static function coordinatePartToNumber( $coordinateStr ) {
+ $degreesSymbols = array( \x{00B0}, d );
+ $minutesSymbols = array( ', \x{2032}, \x{00B4} );
+ $secondsSymbols = array( '', \x{2033}, \x{00B4}\x{00B4} );
+
+ $numDegrees = null;
+ $numMinutes = null;
+ $numSeconds = null;
+
+ foreach ( $degreesSymbols as $degreesSymbol ) {
+ $pattern = '/([\d\.]+)' . $degreesSymbol . '/u';
+ if ( preg_match( $pattern, $coordinateStr, $matches ) )
{
+ $numDegrees = floatval( $matches[1] );
+ break;
+ }
+ }
+ if ( $numDegrees == null ) {
+ throw new MWException( Error: could not parse degrees
in \$coordinateStr\. );
+ }
+
+ foreach ( $minutesSymbols as $minutesSymbol ) {
+ $pattern = '/([\d\.]+)' . $minutesSymbol . '/u';
+ if ( preg_match( $pattern, $coordinateStr, $matches ) )
{
+ $numMinutes = floatval( $matches[1] );
+ break;
+ }
+ }
+ if ( $numMinutes == null ) {
+ // This might not be an error - the number of minutes
+ // might just not have been set.
+ $numMinutes = 0;
+ }
+
+ foreach ( $secondsSymbols as $secondsSymbol ) {
+ $pattern = '/(\d+)' . $secondsSymbol . '/u';
+ if ( preg_match( $pattern, $coordinateStr, $matches ) )
{
+ $numSeconds = floatval( $matches[1] );
+ break;
+ }
+ }
+ if ( $numSeconds == null ) {
+ // This might not be an error - the number of seconds
+ // might just not have been set.
+ $numSeconds = 0;
+ }
+
+ return ( $numDegrees + ( $numMinutes / 60 ) + ( $numSeconds /
3600 ) );
+ }
+
+ /**
+* Parses a coordinate string in (hopefully) any standard format.
+*
+* Copied from Miga, also written by Yaron Koren
+* (https://github.com/yaronkoren/miga/blob/master/MDVCoordinates.js)
+* - though that one is in Javascript.
+*/
+ public static function parseCoordinatesString( $coordinatesString ) {
+ $coordinatesString = trim( $coordinatesString );
+ if ( $coordinatesString == null ) {
+ return;
+ }
+
+ // This is safe to do, right?
+ $coordinatesString = str_replace( array( '[', ']' ), '',
$coordinatesString );
+ // See if they're separated by commas.
+
[MediaWiki-commits] [Gerrit] Add Content-Length header to thumb.php redirects - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Add Content-Length header to thumb.php redirects
..
Add Content-Length header to thumb.php redirects
Without the Content-Length header, the response is sent with
Transfer-Encoding: Chunked, which is somehow mangled by
mod_fastcgi. Varnish then claims the response is malformed and declines
to process it, sending the client a 503 instead.
This is a followup of 0ee9e717f49b9e15bd63fd66f3d0967939c35b05
Bug: T84842
Change-Id: Ia610a43789e6ff14cfc0964f285bbec39c890152
---
M thumb.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/thumb.php b/thumb.php
index 3b7ff43..7d00abe 100644
--- a/thumb.php
+++ b/thumb.php
@@ -213,6 +213,7 @@
if ( count( $varyHeader ) ) {
$response-header( 'Vary: ' . implode( ', ',
$varyHeader ) );
}
+ $response-header( 'Content-Length: 0');
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/227732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia610a43789e6ff14cfc0964f285bbec39c890152
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf15
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert No need for wgSecureLogin on our wikis, HTTPS is for... - change (operations/mediawiki-config)
BBlack has submitted this change and it was merged. Change subject: Revert No need for wgSecureLogin on our wikis, HTTPS is forced everywhere .. Revert No need for wgSecureLogin on our wikis, HTTPS is forced everywhere This reverts commit 638afe4b9db47bb35d30a4fbb0a7db9745812e7b. Bug: T103021 Change-Id: I3a3f173d937aa43abdb87b935d70f6b5d841bffd --- M wmf-config/InitialiseSettings-labs.php M wmf-config/InitialiseSettings.php 2 files changed, 11 insertions(+), 0 deletions(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index f89c6cd..ce96ad8 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -979,6 +979,13 @@ 'default' = true, ), + 'wgSecureLogin' = array( + // Setting false throughout Labs for now due to untrusted SSL certificate + // T50501 + 'default' = false, + 'loginwiki' = false, + ), + 'wgSearchSuggestCacheExpiry' = array( 'default' = 300, ), diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index de15a68..ea5323e 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -15338,6 +15338,10 @@ 'test2wiki' = false, // T67011 ), +'wgSecureLogin' = array( + 'default' = true, +), + 'wgRightsUrl' = array( 'default' = '//creativecommons.org/licenses/by-sa/3.0/', 'huwikinews' = '//creativecommons.org/licenses/by/3.0/', -- To view, visit https://gerrit.wikimedia.org/r/227740 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3a3f173d937aa43abdb87b935d70f6b5d841bffd Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove set focus to page - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove set focus to page
..
Remove set focus to page
Removed set focus to page after selecting site, because if tab key is
used for selecting the focus is set wrong.
Bug: T107063
Change-Id: I8eb4667fa1a5834259ee774e181e610b4439566a
---
M view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
index e7789e8..fd7d0fb 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
@@ -300,8 +300,7 @@
$pageNameInput
.attr( 'lang', site.getLanguageCode() )
.attr( 'dir', site.getLanguageDirection() )
- .show()
- .focus();
+ .show();
} else {
$pageNameInput.hide();
}
--
To view, visit https://gerrit.wikimedia.org/r/227750
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8eb4667fa1a5834259ee774e181e610b4439566a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.26wmf16
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Jonas Kress (WMDE) jonas.kr...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Revert Add special wikipedias to wikipedia.dblist - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Revert Revert Add special wikipedias to wikipedia.dblist .. Revert Revert Add special wikipedias to wikipedia.dblist could get weird? We have almost all wikis in more than one dblist. This reverts commit 3173e3b64c003be7f54dd3ccb7af4c6466e96008. Change-Id: I729041afb3504a8fb0f73f0abd216834c4814ab5 --- M wikipedia.dblist M wmf-config/InitialiseSettings.php 2 files changed, 19 insertions(+), 24 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia.dblist b/wikipedia.dblist index 2b8ff21..71e58ec 100644 --- a/wikipedia.dblist +++ b/wikipedia.dblist @@ -7,6 +7,10 @@ amwiki angwiki anwiki +arbcom_dewiki +arbcom_enwiki +arbcom_fiwiki +arbcom_nlwiki arcwiki arwiki arzwiki @@ -245,6 +249,9 @@ swwiki szlwiki tawiki +tenwiki +testwiki +test2wiki tetwiki tewiki tgwiki @@ -275,6 +282,7 @@ vowiki warwiki wawiki +wg_enwiki wowiki wuuwiki xalwiki diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 1feab08..c0fc0a8 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -1310,10 +1310,6 @@ // Individual wikis 'advisorywiki' = '//advisory.wikimedia.org', - 'arbcom_dewiki' = '//arbcom-de.wikipedia.org', - 'arbcom_enwiki' = '//arbcom-en.wikipedia.org', - 'arbcom_fiwiki' = '//arbcom-fi.wikipedia.org', - 'arbcom_nlwiki' = '//arbcom-nl.wikipedia.org', 'arwikimedia' = '//ar.wikimedia.org', 'auditcomwiki' = '//auditcom.wikimedia.org', 'boardgovcomwiki' = '//boardgovcom.wikimedia.org', @@ -1355,14 +1351,10 @@ 'specieswiki' = '//species.wikimedia.org', 'stewardwiki' = '//steward.wikimedia.org', 'strategywiki' = '//strategy.wikimedia.org', - 'tenwiki' = '//ten.wikipedia.org', - 'testwiki' = '//test.wikipedia.org', 'testwikidatawiki' = '//test.wikidata.org', - 'test2wiki' = '//test2.wikipedia.org', 'transitionteamwiki' = '//transitionteam.wikimedia.org', 'usabilitywiki' = '//usability.wikimedia.org', 'votewiki' = '//vote.wikimedia.org', - 'wg_enwiki' = '//wg-en.wikipedia.org', 'wikidatawiki' = '//www.wikidata.org', 'wikimania2005wiki' = '//wikimania2005.wikimedia.org', 'wikimania2006wiki' = '//wikimania2006.wikimedia.org', @@ -1398,10 +1390,6 @@ // Individual wikis 'advisorywiki' = 'https://advisory.wikimedia.org', - 'arbcom_dewiki' = 'https://arbcom-de.wikipedia.org', - 'arbcom_enwiki' = 'https://arbcom-en.wikipedia.org', - 'arbcom_fiwiki' = 'https://arbcom-fi.wikipedia.org', - 'arbcom_nlwiki' = 'https://arbcom-nl.wikipedia.org', 'arwikimedia' = 'https://ar.wikimedia.org', 'auditcomwiki' = 'https://auditcom.wikimedia.org', 'boardgovcomwiki' = 'https://boardgovcom.wikimedia.org', @@ -1443,14 +1431,10 @@ 'specieswiki' = 'https://species.wikimedia.org', 'stewardwiki' = 'https://steward.wikimedia.org', 'strategywiki' = 'https://strategy.wikimedia.org', - 'tenwiki' = 'https://ten.wikipedia.org', - 'testwiki' = 'https://test.wikipedia.org', 'testwikidatawiki' = 'https://test.wikidata.org', - 'test2wiki' = 'https://test2.wikipedia.org', 'transitionteamwiki' = 'https://transitionteam.wikimedia.org', 'usabilitywiki' = 'https://usability.wikimedia.org', 'votewiki' = 'https://vote.wikimedia.org', - 'wg_enwiki' = 'https://wg-en.wikipedia.org', 'wikidatawiki' = 'https://www.wikidata.org', 'wikimania2005wiki' = 'https://wikimania2005.wikimedia.org', 'wikimania2006wiki' = 'https://wikimania2006.wikimedia.org', @@ -1849,8 +1833,6 @@ 'tawiktionary' = 'விக்சனரி', 'tawikiquote' = 'விக்கிமேற்கோள்', 'tawikisource' = 'விக்கிமூலம்', - 'testwiki' = 'Wikipedia', - 'test2wiki' = 'Wikipedia', 'tewiki' = 'వికీపీడియా', 'tewikiquote' = 'వికీవ్యాఖ్య', // T89332 'tewikisource' = 'వికీసోర్స్', // T52357 @@ -2329,9 +2311,6 @@ 'tawikisource' = 'விக்கிமூலம்', 'tawiktionary' = 'விக்சனரி', 'tawikiquote' = 'விக்கிமேற்கோள்', - 'tenwiki' = 'Wikipedia', - 'testwiki' = 'Wikipedia', - 'test2wiki' = 'Wikipedia', 'tewiki' = 'వికీపీడియా', 'tewikiquote' = 'వికీవ్యాఖ్య', // T89332 'tewikisource' = 'వికీసోర్స్', @@ -2378,7 +2357,6 @@ 'vowiki' = 'Vükiped', 'vowikibooks' = 'Vükibuks', 'vowiktionary' = 'Vükivödabuk', - 'wg_enwiki' = 'Wikipedia', 'wikimaniateamwiki' = 'WikimaniaTeam', 'xmfwiki' = 'ვიკიპედია', 'yiwiki' = 'װיקיפּעדיע', @@ -14350,8 +14328,13 @@ 'cawikibooks' = true, // T93637 'wikivoyage' = true, 'commonswiki' = true, + 'arbcom_dewiki' =
[MediaWiki-commits] [Gerrit] add krinkle ot statistics-privatedata-users - change (operations/puppet)
RobH has uploaded a new change for review. https://gerrit.wikimedia.org/r/227728 Change subject: add krinkle ot statistics-privatedata-users .. add krinkle ot statistics-privatedata-users request to escalate krinkle's account to include statistics-privatedata-users. DO NOT MERGE UNLESS YOU ARE OPERATIONS. There are potential ops-only blockers. Only ops should merge this, and no sooner than 2015-08-03 to recognize the 3 day waiting period for escalation review. T107243 Change-Id: I06586249cb04ab43c2eaba39f260fc58ad7ecc54 --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/28/227728/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 181faa8..e432421 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -163,7 +163,7 @@ halfak, awight, dr0ptp4kt, tnegrin, nuria, leila, manybubbles, ironholds, kleduc, ellery, nettrom, mforns, spage, bmansurov, rmoen, tbayer, joal, ashwinpp, - madhuvishy, jdouglas, tjones, legoktm, dcausse] + madhuvishy, jdouglas, tjones, legoktm, dcausse, krinkle] statistics-users: gid: 726 description: Access hosts with a mysql client for research. NO PRIVS. -- To view, visit https://gerrit.wikimedia.org/r/227728 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06586249cb04ab43c2eaba39f260fc58ad7ecc54 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: RobH r...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Move sourceswiki special.dblist-wikisource.dblist - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert Move sourceswiki special.dblist-wikisource.dblist
..
Revert Move sourceswiki special.dblist-wikisource.dblist
Seems to break in production. Not sure why yet, but the 'wikisource'
tag doesn't get applied to sourceswiki properly
This reverts commit 14722449d5b9ab524414d06fa9410c659e1d3b56.
Change-Id: I54a9a31d9a7104841963d860ffc855bdd539ac37
---
M special.dblist
M tests/dblistTest.php
A w/static/images/project-logos/sourceswiki.png
M wikisource.dblist
M wmf-config/InitialiseSettings.php
5 files changed, 9 insertions(+), 10 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/special.dblist b/special.dblist
index b365248..4cfc8a9 100644
--- a/special.dblist
+++ b/special.dblist
@@ -32,6 +32,7 @@
outreachwiki
qualitywiki
searchcomwiki
+sourceswiki
spcomwiki
specieswiki
stewardwiki
diff --git a/tests/dblistTest.php b/tests/dblistTest.php
index 8b8791e..155a5d8 100644
--- a/tests/dblistTest.php
+++ b/tests/dblistTest.php
@@ -31,13 +31,6 @@
: $projectname
;
- # Sadly, we end up with an exception because hysterical raisins
- # sourceswiki is the original Wikisource and is still active
- if ( $database === 'sourceswiki' ) {
- $this-assertEquals( $projectname, 'wikisource' );
- return;
- }
-
# Verifiy the databasename suffix
$this-assertStringEndsWith( $dbsuffix, $database,
Database name $database lacks db suffix $dbsuffix of
$projectname
diff --git a/w/static/images/project-logos/sourceswiki.png
b/w/static/images/project-logos/sourceswiki.png
new file mode 100644
index 000..290f254
--- /dev/null
+++ b/w/static/images/project-logos/sourceswiki.png
Binary files differ
diff --git a/wikisource.dblist b/wikisource.dblist
index 9204b16..2505b13 100644
--- a/wikisource.dblist
+++ b/wikisource.dblist
@@ -51,7 +51,6 @@
sawikisource
skwikisource
slwikisource
-sourceswiki
srwikisource
svwikisource
tawikisource
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 5ee8410..1feab08 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -144,7 +144,6 @@
'otrs_wikiwiki' = 'en',
'qualitywiki' = 'en',
'searchcomwiki' = 'en',
- 'sourceswiki' = 'en',
'stewardwiki' = 'en',
'strategywiki' = 'en',
'tenwiki' = 'en',
@@ -935,6 +934,7 @@
'thwikinews' = '/static/images/project-logos/thwikinews.png',
// Wikisource
+ 'sourceswiki' = '/static/images/project-logos/sourceswiki.png',
'arwikisource' = '/static/images/project-logos/arwikisource.png',
'aswikisource' = '/static/images/project-logos/aswikisource.png', //
T45129
'azwikisource' = '/static/images/project-logos/azwikisource.png', //
T54019
@@ -1833,6 +1833,7 @@
'slwikisource' = 'Wikivir',
'slwiktionary' = 'Wikislovar',
'slwikiversity' = 'Wikiverza',
+ 'sourceswiki' = 'Wikisource',
'spcomwiki' = 'Spcom',
'specieswiki' = 'Wikispecies',
'sqwikinews' = 'Wikilajme',
@@ -2310,6 +2311,7 @@
'slwikisource' = 'Wikivir',
'slwiktionary' = 'Wikislovar',
'slwikiversity' = 'Wikiverza',
+ 'sourceswiki' = 'Wikisource',
'spcomwiki' = 'Spcom',
'specieswiki' = 'Wikispecies',
'sqwikinews' = 'Wikilajme',
@@ -4236,7 +4238,7 @@
'outreachwiki' = 'wikimedia',
'usabilitywiki' = 'wikimedia',
'strategywiki' = 'wikimedia',
- 'sourceswiki' = 'wikisource', // $site is wikipedia for this
+ 'sourceswiki' = 'wikisource',
'specieswiki' = 'wikispecies',
'testwiki' = 'test',
'wikimania' = 'wikimedia',
@@ -10420,6 +10422,7 @@
'wmgUseProofreadPage' = array(
'default' = false,
'wikisource' = true,
+ 'sourceswiki' = true, // FIXME: Why isn't this part of wikisource?
'test2wiki' = true,
'frrwiki' = true, // T40023
),
@@ -10715,6 +10718,7 @@
'otrs_wikiwiki' = '/static/favicon/wmf.ico',
'outreachwiki' = '/static/favicon/community.ico',
'searchcomwiki' = '/static/favicon/wmf.ico',
+ 'sourceswiki' = '/static/favicon/wikisource.ico',
'spcomwiki' = '/static/favicon/spcom.ico',
'specieswiki' = '/static/favicon/wikispecies.ico',
'stewardwiki' = '/static/favicon/community.ico',
@@ -10875,6 +10879,7 @@
'wikinews' = '/srv/mediawiki/w/static/images/sul/wikinews.png',
'wikiquote' = '/srv/mediawiki/w/static/images/sul/wikiquote.png',
'wikisource' = '/srv/mediawiki/w/static/images/sul/wikisource.png',
+ 'sourceswiki' = '/srv/mediawiki/w/static/images/sul/wikisource.png',
[MediaWiki-commits] [Gerrit] maintain-replicas: Don't try to create _p DBs for private/de... - change (operations/software)
coren has submitted this change and it was merged.
Change subject: maintain-replicas: Don't try to create _p DBs for
private/deleted wikis
..
maintain-replicas: Don't try to create _p DBs for private/deleted wikis
Change-Id: I375cba288740b1585be435e6ee16a00e44c15897
---
M maintain-replicas/maintain-replicas.pl
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Chad: Looks good to me, but someone else must approve
coren: Verified; Looks good to me, approved
diff --git a/maintain-replicas/maintain-replicas.pl
b/maintain-replicas/maintain-replicas.pl
index 87890cd..c7d43e2 100755
--- a/maintain-replicas/maintain-replicas.pl
+++ b/maintain-replicas/maintain-replicas.pl
@@ -487,6 +487,9 @@
$| = 1;
foreach my $dbk (keys %db) {
+my $db = $db{$dbk};
+next if defined $db-{'deleted'};
+next if defined $db-{'private'};
sql(CREATE DATABASE ${dbk}_p;) if sql(SHOW DATABASES LIKE
'${dbk}_p';) == 0;
print Views for ${dbk}: ;
foreach my $view (@fullviews) {
--
To view, visit https://gerrit.wikimedia.org/r/227735
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I375cba288740b1585be435e6ee16a00e44c15897
Gerrit-PatchSet: 2
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support other types of 'empty' document placeholders - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227736
Change subject: Support other types of 'empty' document placeholders
..
Support other types of 'empty' document placeholders
Currently we assueme an empty document is p/p, but it could
be h2/h2 or pre/pre, so clone the first node for the
placeholder rendering.
Bug: T106582
Change-Id: Idd38b7d53d4f04d8612f5eafe34740f047c648ca
---
M src/ui/ve.ui.Surface.js
1 file changed, 25 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/36/227736/1
diff --git a/src/ui/ve.ui.Surface.js b/src/ui/ve.ui.Surface.js
index 7d2aef1..56e3b74 100644
--- a/src/ui/ve.ui.Surface.js
+++ b/src/ui/ve.ui.Surface.js
@@ -315,7 +315,7 @@
*/
ve.ui.Surface.prototype.onDocumentTransact = function () {
if ( this.placeholder ) {
- this.$placeholder.toggleClass( 'oo-ui-element-hidden',
this.getModel().getDocument().data.hasContent() );
+ this.updatePlaceholder();
}
};
@@ -327,17 +327,36 @@
ve.ui.Surface.prototype.setPlaceholder = function ( placeholder ) {
this.placeholder = placeholder;
if ( this.placeholder ) {
- this.$placeholder
- .toggleClass( 'oo-ui-element-hidden',
this.getModel().getDocument().data.hasContent() )
- // Requires a paragraph to match margins
- .empty().append( $( 'p' ).text( this.placeholder ) )
- .prependTo( this.$element );
+ this.$placeholder.prependTo( this.$element );
+ this.updatePlaceholder();
} else {
this.$placeholder.detach();
}
};
/**
+ * Update placeholder rendering
+ */
+ve.ui.Surface.prototype.updatePlaceholder = function () {
+ var firstNode, $wrapper,
+ hasContent = this.getModel().getDocument().data.hasContent();
+
+ this.$placeholder.toggleClass( 'oo-ui-element-hidden', hasContent );
+ if ( !hasContent ) {
+ firstNode =
this.getView().documentView.documentNode.getNodeFromOffset( 1 );
+ if ( firstNode ) {
+ $wrapper = firstNode.$element.clone();
+ if ( ve.debug ) {
+ $wrapper.removeAttr( 'style' );
+ }
+ } else {
+ $wrapper = $( 'p' );
+ }
+ this.$placeholder.empty().append( $wrapper.text(
this.placeholder ) );
+ }
+};
+
+/**
* Execute an action or command.
*
* @method
--
To view, visit https://gerrit.wikimedia.org/r/227736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd38b7d53d4f04d8612f5eafe34740f047c648ca
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Filter WMDE- out of #wikimedia-fundraising - change (labs...wikibugs2)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/227746 Change subject: Filter WMDE- out of #wikimedia-fundraising .. Filter WMDE- out of #wikimedia-fundraising As far as I know, WMDE isn't hanging out there. Maybe they should? Change-Id: I0a0827bb8e44c73376e6dc9cab804d9ecdab6b6f --- M channels.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 refs/changes/46/227746/1 diff --git a/channels.yaml b/channels.yaml index 08c6770..5b1aafe 100644 --- a/channels.yaml +++ b/channels.yaml @@ -151,7 +151,7 @@ - UI-Standardization #wikimedia-fundraising: -- .*Fundraising.* +- .*(?!WMDE-)Fundraising.* #wikimedia-operations: - ops(-.*)? -- To view, visit https://gerrit.wikimedia.org/r/227746 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a0827bb8e44c73376e6dc9cab804d9ecdab6b6f Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move quickLookup to beta and rename to Hovercards - change (mediawiki...MobileFrontend)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227748
Change subject: Move quickLookup to beta and rename to Hovercards
..
Move quickLookup to beta and rename to Hovercards
Also: Fix white cancel button on grey background. It's not really
visible, especially on some low resolution devices. Use a black close
button, instead of a white one.
Bug: T100726
Change-Id: I27e852bc2185c8498023729ea03aa3dbd10ec856
---
M includes/Resources.php
M resources/mobile.drawers/Drawer.js
R resources/mobile.hovercards/Drawer.hogan
R resources/mobile.hovercards/HovercardsDrawer.js
R resources/mobile.hovercards/hovercards.less
R resources/mobile.hovercards/init.js
6 files changed, 36 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/48/227748/1
diff --git a/includes/Resources.php b/includes/Resources.php
index b6dfa1e..4f2a5f3 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -1130,7 +1130,7 @@
),
),
- 'mobile.quickLookup' = $wgMFResourceParsedMessageModuleBoilerplate +
array(
+ 'mobile.hovercards' = $wgMFResourceParsedMessageModuleBoilerplate +
array(
'dependencies' = array(
'mobile.startup',
'mobile.drawers',
@@ -1138,14 +1138,14 @@
'mobile.swipe',
),
'scripts' = array(
- 'resources/mobile.quickLookup/QuickLookupDrawer.js',
- 'resources/mobile.quickLookup/init.js',
+ 'resources/mobile.hovercards/HovercardsDrawer.js',
+ 'resources/mobile.hovercards/init.js',
),
'templates' = array(
- 'Drawer.hogan' =
'resources/mobile.quickLookup/Drawer.hogan',
+ 'Drawer.hogan' =
'resources/mobile.hovercards/Drawer.hogan',
),
'styles' = array(
- 'resources/mobile.quickLookup/quickLookup.less',
+ 'resources/mobile.hovercards/hovercards.less',
),
'messages' = array(
mobile-frontend-quick-lookup-looking,
@@ -1807,6 +1807,7 @@
// load code under certain conditions.
'mobile.bannerImage',
'mobile.search.beta',
+ 'mobile.hovercards',
),
'scripts' = array(
'resources/skins.minerva.beta.scripts/bannerImage.js',
@@ -1819,7 +1820,6 @@
// Feature modules that should be loaded in alpha
should be listed below here.
'mobile.infobox',
'mobile.errorReport',
- 'mobile.quickLookup',
'mobile.fontchanger',
),
'scripts' = array(
diff --git a/resources/mobile.drawers/Drawer.js
b/resources/mobile.drawers/Drawer.js
index ba09a17..a2c7f6f 100644
--- a/resources/mobile.drawers/Drawer.js
+++ b/resources/mobile.drawers/Drawer.js
@@ -10,20 +10,18 @@
* @extends Panel
*/
Drawer = Panel.extend( {
- /**
-* @inheritdoc
-* @cfg {Object} defaults Default options hash.
-* @cfg {String} defaults.cancelButton HTML of the button that
closes the drawer.
-*/
- defaults: {
- cancelButton: new Icon( {
+ className: 'drawer position-fixed',
+ /** @inheritdoc */
+ preRender: function ( options ) {
+ Panel.prototype.preRender.apply( this, options );
+
+ this.options.cancelButton = new Icon( {
tagName: 'a',
- name: 'close-invert',
+ name: this.cancelName,
additionalClassNames: 'cancel',
label: mw.msg( 'mobile-frontend-overlay-close' )
- } ).toHtmlString()
+ } ).toHtmlString();
},
- className: 'drawer position-fixed',
/**
* Defines an element that the Drawer should automatically be
appended to.
* @property {String}
@@ -34,6 +32,11 @@
* @property {Boolean}
*/
closeOnScroll: true,
+ /**
+* Name of the icon used for the close button.
+* @property {String}
+*/
+ cancelName: 'close-invert',
events: $.extend( {}, Panel.prototype.events, {
click: 'stopPropagation'
} ),
[MediaWiki-commits] [Gerrit] Setup LVS for mobileapps service on sca cluster - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/227727 Change subject: Setup LVS for mobileapps service on sca cluster .. Setup LVS for mobileapps service on sca cluster Change-Id: Ibdf39512fd9be16538c2515bef3a3e73f066f529 --- M hieradata/common/lvs/configuration.yaml M hieradata/role/common/sca.yaml 2 files changed, 664 insertions(+), 640 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/27/227727/1 diff --git a/hieradata/common/lvs/configuration.yaml b/hieradata/common/lvs/configuration.yaml index 6a8b898..4d9e758 100644 --- a/hieradata/common/lvs/configuration.yaml +++ b/hieradata/common/lvs/configuration.yaml @@ -1,21 +1,11 @@ lvs_service_ips: - text: text -codfw: - textlb: 208.80.153.224 - textlb6: 2620:0:860:ed1a::1 -eqiad: - textsvc: 10.2.2.25 - textlb: 208.80.154.224 - textlb6: 2620:0:861:ed1a::1 -esams: - textsvc: 10.2.3.25 - textlb: 91.198.174.192 - textlb6: 2620:0:862:ed1a::1 -ulsfo: - textsvc: 10.2.4.25 - textlb: 198.35.26.96 - textlb6: 2620:0:863:ed1a::1 - bits: bits + apaches: id001 +codfw: 10.2.1.1 +eqiad: 10.2.2.1 + api: id002 +codfw: 10.2.1.22 +eqiad: 10.2.2.22 + bits: id003 codfw: bitslb: 208.80.153.234 bitslb6: 2620:0:860:ed1a::1:a @@ -31,32 +21,31 @@ bitslb: 198.35.26.106 bitslb6: 2620:0:863:ed1a::1:a bitssvc: 10.2.4.23 - upload: upload + citoid: id004 +eqiad: 10.2.2.19 + cxserver: id005 +eqiad: 10.2.2.18 + dns_rec: id006 codfw: - uploadlb: 208.80.153.240 - uploadlb6: 2620:0:860:ed1a::2:b + dns_rec: 208.80.153.254 + dns_rec6: 2620:0:860:ed1a::3:fe eqiad: - uploadlb: 208.80.154.240 - uploadlb6: 2620:0:861:ed1a::2:b - uploadsvc: 10.2.2.24 + dns_rec: 208.80.154.239 + dns_rec6: 2620:0:861:ed1a::3:fe esams: - uploadlb: 91.198.174.208 - uploadlb6: 2620:0:862:ed1a::2:b - uploadsvc: 10.2.3.24 -ulsfo: - uploadlb: 198.35.26.112 - uploadlb6: 2620:0:863:ed1a::2:b - uploadsvc: 10.2.4.24 - apaches: apaches -eqiad: 10.2.2.1 -codfw: 10.2.1.1 - rendering: rendering -eqiad: 10.2.2.21 -codfw: 10.2.1.21 - api: api -eqiad: 10.2.2.22 -codfw: 10.2.1.22 - mobile: mobile + dns_rec: 91.198.174.216 + dns_rec6: 2620:0:862:ed1a::3:fe + graphoid: id007 +eqiad: 10.2.2.15 + kartotherian: id008 +codfw: 10.2.1.13 + mathoid: id009 +eqiad: 10.2.2.20 + misc_web: id010 +eqiad: + misc_weblb: 208.80.154.241 + misc_weblb6: 2620:0:861:ed1a::11 + mobile: id011 codfw: mobilelb: 208.80.153.236 mobilelb6: 2620:0:860:ed1a::1:c @@ -72,125 +61,135 @@ mobilelb: 198.35.26.108 mobilelb6: 2620:0:863:ed1a::1:c mobilesvc: 10.2.4.26 - swift: swift -eqiad: 10.2.2.27 -codfw: 10.2.1.27 - dns_rec: dns_rec -eqiad: - dns_rec: 208.80.154.239 - dns_rec6: 2620:0:861:ed1a::3:fe -codfw: - dns_rec: 208.80.153.254 - dns_rec6: 2620:0:860:ed1a::3:fe -esams: - dns_rec: 91.198.174.216 - dns_rec6: 2620:0:862:ed1a::3:fe - osm: osm + mobileapps: id012 +eqiad: 10.2.2.32 + ocg: id013 +eqiad: 10.2.2.31 + osm: id014 eqiad: 208.80.154.244 - misc_web: misc_web -eqiad: - misc_weblb: 208.80.154.241 - misc_weblb6: 2620:0:861:ed1a::11 - parsoid: parsoid + parsoid: id015 eqiad: 10.2.2.28 - parsoidcache: parsoidcache + parsoidcache: id016 eqiad: parsoidcachelb: 208.80.154.248 parsoidcachelb6: 2620:0:861:ed1a::3:14 parsoidsvc: 10.2.2.29 - search: search + rendering: id017 +codfw: 10.2.1.21 +eqiad: 10.2.2.21 + restbase: id018 +eqiad: 10.2.2.17 + search: id019 eqiad: 10.2.2.30 - stream: stream + stream: id020 eqiad: streamlb: 208.80.154.249 streamlb6: 2620:0:861:ed1a::3:15 - ocg: ocg -eqiad: 10.2.2.31 - mathoid: mathoid -eqiad: 10.2.2.20 - citoid: citoid -eqiad: 10.2.2.19 - cxserver: cxserver -eqiad: 10.2.2.18 - graphoid: graphoid -eqiad: 10.2.2.15 - restbase: restbase -eqiad: 10.2.2.17 - zotero: zotero + swift: id021 +codfw: 10.2.1.27 +eqiad: 10.2.2.27 + text: id022 +codfw: + textlb: 208.80.153.224 + textlb6: 2620:0:860:ed1a::1 +eqiad: + textlb: 208.80.154.224 + textlb6: 2620:0:861:ed1a::1 + textsvc: 10.2.2.25 +esams: + textlb: 91.198.174.192 + textlb6: 2620:0:862:ed1a::1 + textsvc: 10.2.3.25 +ulsfo: + textlb: 198.35.26.96 + textlb6: 2620:0:863:ed1a::1 + textsvc: 10.2.4.25 + upload: id023 +codfw: + uploadlb: 208.80.153.240 + uploadlb6: 2620:0:860:ed1a::2:b +eqiad: + uploadlb: 208.80.154.240 + uploadlb6: 2620:0:861:ed1a::2:b + uploadsvc: 10.2.2.24 +esams: + uploadlb:
[MediaWiki-commits] [Gerrit] Added validation to CargoUtils::getTableSchemas() - change (mediawiki...Cargo)
Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227737
Change subject: Added validation to CargoUtils::getTableSchemas()
..
Added validation to CargoUtils::getTableSchemas()
Change-Id: I0db525403eaf6151faf69c5173c7bb3dbc2d1744
---
M CargoSQLQuery.php
M CargoUtils.php
2 files changed, 14 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo
refs/changes/37/227737/1
diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php
index 6044228..6b14ce9 100644
--- a/CargoSQLQuery.php
+++ b/CargoSQLQuery.php
@@ -101,8 +101,10 @@
* some of the parameters need to be checked for these strings,
* but we might as well validate all of them.
*
-* The function setDescriptionsForFields() also does specific
-* validation of the tables= and fields= parameters.
+* The function CargoUtils::getTableSchemas() also does specific
+* validation of the tables parameter, while this class's
+* setDescriptionsForFields() does validation of the fields=
+* parameter.
*/
public static function validateValues( $tablesStr, $fieldsStr,
$whereStr, $joinOnStr, $groupByStr,
$havingStr, $orderByStr, $limitStr ) {
diff --git a/CargoUtils.php b/CargoUtils.php
index 1d6ed2c..f971e02 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -149,6 +149,16 @@
$tableSchemaString = $row['table_schema'];
$tableSchemas[$tableName] =
CargoTableSchema::newFromDBString( $tableSchemaString );
}
+
+ // Validate the table names.
+ if ( count( $tableSchemas ) count( $mainTableNames ) ) {
+ foreach ( $mainTableNames as $tableName ) {
+ if ( !array_key_exists( $tableName,
$tableSchemas ) ) {
+ throw new MWException( Error: table
\$tableName\ not found. );
+ }
+ }
+ }
+
return $tableSchemas;
}
--
To view, visit https://gerrit.wikimedia.org/r/227737
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0db525403eaf6151faf69c5173c7bb3dbc2d1744
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added validation to CargoUtils::getTableSchemas() - change (mediawiki...Cargo)
Yaron Koren has submitted this change and it was merged.
Change subject: Added validation to CargoUtils::getTableSchemas()
..
Added validation to CargoUtils::getTableSchemas()
Change-Id: I0db525403eaf6151faf69c5173c7bb3dbc2d1744
---
M CargoSQLQuery.php
M CargoUtils.php
2 files changed, 14 insertions(+), 2 deletions(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php
index 6044228..6b14ce9 100644
--- a/CargoSQLQuery.php
+++ b/CargoSQLQuery.php
@@ -101,8 +101,10 @@
* some of the parameters need to be checked for these strings,
* but we might as well validate all of them.
*
-* The function setDescriptionsForFields() also does specific
-* validation of the tables= and fields= parameters.
+* The function CargoUtils::getTableSchemas() also does specific
+* validation of the tables parameter, while this class's
+* setDescriptionsForFields() does validation of the fields=
+* parameter.
*/
public static function validateValues( $tablesStr, $fieldsStr,
$whereStr, $joinOnStr, $groupByStr,
$havingStr, $orderByStr, $limitStr ) {
diff --git a/CargoUtils.php b/CargoUtils.php
index 1d6ed2c..f971e02 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -149,6 +149,16 @@
$tableSchemaString = $row['table_schema'];
$tableSchemas[$tableName] =
CargoTableSchema::newFromDBString( $tableSchemaString );
}
+
+ // Validate the table names.
+ if ( count( $tableSchemas ) count( $mainTableNames ) ) {
+ foreach ( $mainTableNames as $tableName ) {
+ if ( !array_key_exists( $tableName,
$tableSchemas ) ) {
+ throw new MWException( Error: table
\$tableName\ not found. );
+ }
+ }
+ }
+
return $tableSchemas;
}
--
To view, visit https://gerrit.wikimedia.org/r/227737
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0db525403eaf6151faf69c5173c7bb3dbc2d1744
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com
Gerrit-Reviewer: Yaron Koren yaro...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable scroll animation when running tests - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227745
Change subject: Disable scroll animation when running tests
..
Disable scroll animation when running tests
MW test runner doesn't like animations that haven't finished
when the test complete.
Bug: T107122
Change-Id: I30a022d1ca0e0556f0fde4e6b6a8bd357cc884e3
---
M modules/ve-mw/tests/ve.test.utils.js
1 file changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/45/227745/1
diff --git a/modules/ve-mw/tests/ve.test.utils.js
b/modules/ve-mw/tests/ve.test.utils.js
index 9d370ca..f27a3f4 100644
--- a/modules/ve-mw/tests/ve.test.utils.js
+++ b/modules/ve-mw/tests/ve.test.utils.js
@@ -32,7 +32,8 @@
ve.dm.modelRegistry.register( ve.dm.BlockImageNode );
ve.test.utils.mwEnvironment = ( function () {
- var overrides = [
+ var scrollIntoView,
+ overrides = [
ve.dm.MWHeadingNode,
ve.dm.MWPreformattedNode,
ve.dm.MWTableNode
@@ -50,6 +51,9 @@
for ( i = 0; i overridden.length; i++ ) {
ve.dm.modelRegistry.unregister( overridden[i] );
}
+ // Disable scroll animations
+ scrollIntoView = OO.ui.Element.static.scrollIntoView;
+ OO.ui.Element.static.scrollIntoView = function () {};
}
function teardownOverrides() {
@@ -60,6 +64,10 @@
for ( i = 0; i overridden.length; i++ ) {
ve.dm.modelRegistry.register( overridden[i] );
}
+ // Restore scroll animations
+ if ( scrollIntoView ) {
+ OO.ui.Element.static.scrollIntoView = scrollIntoView;
+ }
}
// On load, teardown overrides so the first core tests run correctly
--
To view, visit https://gerrit.wikimedia.org/r/227745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30a022d1ca0e0556f0fde4e6b6a8bd357cc884e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove set focus to page - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227750
Change subject: Remove set focus to page
..
Remove set focus to page
Removed set focus to page after selecting site, because if tab key is
used for selecting the focus is set wrong.
Bug: T107063
Change-Id: I8eb4667fa1a5834259ee774e181e610b4439566a
---
M view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/50/227750/1
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
index e7789e8..fd7d0fb 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
@@ -300,8 +300,7 @@
$pageNameInput
.attr( 'lang', site.getLanguageCode() )
.attr( 'dir', site.getLanguageDirection() )
- .show()
- .focus();
+ .show();
} else {
$pageNameInput.hide();
}
--
To view, visit https://gerrit.wikimedia.org/r/227750
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8eb4667fa1a5834259ee774e181e610b4439566a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.26wmf16
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Jonas Kress (WMDE) jonas.kr...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add mobileapps LVS IP - change (operations/dns)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/227724 Change subject: Add mobileapps LVS IP .. Add mobileapps LVS IP Bug: T92627 Change-Id: Ibeb92ede63b58d064a3ee940ea8231ea44f8d3f9 --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/24/227724/1 diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 6bb1489..fbbbf41 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -48,6 +48,7 @@ 29 1H IN PTR parsoidcache.svc.eqiad.wmnet. 30 1H IN PTR search.svc.eqiad.wmnet. 31 1H IN PTR ocg.svc.eqiad.wmnet. +32 1H IN PTR mobileapps.svc.eqiad.wmnet. ; esams svc ips diff --git a/templates/wmnet b/templates/wmnet index 24e9a12..cca052d 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -3756,7 +3756,8 @@ parsoid 1H IN A10.2.2.28 parsoidcache1H IN A10.2.2.29 search 1H IN A10.2.2.30 -ocg 1H IN A10.2.2.31 +ocg 1H IN A10.2.2.31 +mobileapps 1H IN A10.2.2.32 labstore1H IN A10.64.37.10 apertium1H IN A10.64.32.153 -- To view, visit https://gerrit.wikimedia.org/r/227724 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibeb92ede63b58d064a3ee940ea8231ea44f8d3f9 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't try to create views for private/deleted wikis - change (operations/software)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227735
Change subject: Don't try to create views for private/deleted wikis
..
Don't try to create views for private/deleted wikis
Change-Id: I375cba288740b1585be435e6ee16a00e44c15897
---
M maintain-replicas/maintain-replicas.pl
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software
refs/changes/35/227735/1
diff --git a/maintain-replicas/maintain-replicas.pl
b/maintain-replicas/maintain-replicas.pl
index 87890cd..c7d43e2 100755
--- a/maintain-replicas/maintain-replicas.pl
+++ b/maintain-replicas/maintain-replicas.pl
@@ -487,6 +487,9 @@
$| = 1;
foreach my $dbk (keys %db) {
+my $db = $db{$dbk};
+next if defined $db-{'deleted'};
+next if defined $db-{'private'};
sql(CREATE DATABASE ${dbk}_p;) if sql(SHOW DATABASES LIKE
'${dbk}_p';) == 0;
print Views for ${dbk}: ;
foreach my $view (@fullviews) {
--
To view, visit https://gerrit.wikimedia.org/r/227735
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I375cba288740b1585be435e6ee16a00e44c15897
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [IMPR] Drop a script from the throttle log while waiting. - change (pywikibot/core)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/227741 Change subject: [IMPR] Drop a script from the throttle log while waiting. .. [IMPR] Drop a script from the throttle log while waiting. checkimages.py and welcome.py may run in a loop and start over and over again after a delay time. Drop these script from throttle control as long as they are waiting to allow other scripts decreasing throttle write delay. Change-Id: Ic3f141fe01e7b837d7f34037e7eb8a4ab865984d --- M scripts/checkimages.py M scripts/welcome.py 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/41/227741/1 diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 4afe309..8588e11 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -1832,6 +1832,7 @@ if repeat: pywikibot.output(uWaiting for %s seconds, % time_sleep) +pywikibot.stopme() time.sleep(time_sleep) else: break diff --git a/scripts/welcome.py b/scripts/welcome.py index 2176767..bc3ae1f 100755 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -854,6 +854,7 @@ u%d %b %Y %H:%M:%S (UTC), time.gmtime()) pywikibot.output(u'Sleeping %d seconds before rerun. %s' % (globalvar.timeRecur, strfstr)) +pywikibot.stopme() time.sleep(globalvar.timeRecur) else: raise KeyboardInterrupt -- To view, visit https://gerrit.wikimedia.org/r/227741 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic3f141fe01e7b837d7f34037e7eb8a4ab865984d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switch the deploy target to 'debian' - change (mediawiki...mobileapps)
Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227752
Change subject: Switch the deploy target to 'debian'
..
Switch the deploy target to 'debian'
The service is going to run on Debian Jessie in production, so we need
to switch from the default 'trusty' target to 'debian'.
Bug: T107315
Change-Id: I6876e452954d693f3541371493c76f8dc6723a1e
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/52/227752/1
diff --git a/package.json b/package.json
index 73e5c40..d58387c 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
swagger-router: ^0.1.1
},
deploy: {
-target: ubuntu,
+target: debian,
dependencies: {
_all: []
}
--
To view, visit https://gerrit.wikimedia.org/r/227752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6876e452954d693f3541371493c76f8dc6723a1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mobrovac mobro...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Content-Length header to thumb.php redirects - change (mediawiki/core)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227732
Change subject: Add Content-Length header to thumb.php redirects
..
Add Content-Length header to thumb.php redirects
Without the Content-Length header, the response is sent with
Transfer-Encoding: Chunked, which is somehow mangled by
mod_fastcgi. Varnish then claims the response is malformed and declines
to process it, sending the client a 503 instead.
This is a followup of 0ee9e717f49b9e15bd63fd66f3d0967939c35b05
Bug: T84842
Change-Id: Ia610a43789e6ff14cfc0964f285bbec39c890152
---
M thumb.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/32/227732/1
diff --git a/thumb.php b/thumb.php
index 3b7ff43..7d00abe 100644
--- a/thumb.php
+++ b/thumb.php
@@ -213,6 +213,7 @@
if ( count( $varyHeader ) ) {
$response-header( 'Vary: ' . implode( ', ',
$varyHeader ) );
}
+ $response-header( 'Content-Length: 0');
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/227732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia610a43789e6ff14cfc0964f285bbec39c890152
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf15
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Content-Length header to thumb.php redirects - change (mediawiki/core)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227733
Change subject: Add Content-Length header to thumb.php redirects
..
Add Content-Length header to thumb.php redirects
Without the Content-Length header, the response is sent with
Transfer-Encoding: Chunked, which is somehow mangled by
mod_fastcgi. Varnish then claims the response is malformed and declines
to process it, sending the client a 503 instead.
This is a followup of 0ee9e717f49b9e15bd63fd66f3d0967939c35b05
Bug: T84842
Change-Id: Ia610a43789e6ff14cfc0964f285bbec39c890152
---
M thumb.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/33/227733/1
diff --git a/thumb.php b/thumb.php
index 3b7ff43..7d00abe 100644
--- a/thumb.php
+++ b/thumb.php
@@ -213,6 +213,7 @@
if ( count( $varyHeader ) ) {
$response-header( 'Vary: ' . implode( ', ',
$varyHeader ) );
}
+ $response-header( 'Content-Length: 0');
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/227733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia610a43789e6ff14cfc0964f285bbec39c890152
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf16
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump src to 6e095a92 for deploy - change (mediawiki...deploy)
Subramanya Sastry has uploaded a new change for review. https://gerrit.wikimedia.org/r/227739 Change subject: Bump src to 6e095a92 for deploy .. Bump src to 6e095a92 for deploy Change-Id: I6faddb97f8fd68fe5233a9914f4c3b62326fb8d7 --- M src 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy refs/changes/39/227739/1 diff --git a/src b/src index 92f1cd6..6e095a9 16 --- a/src +++ b/src -Subproject commit 92f1cd6d87a0b233edcc15b999e9bfab34b23da6 +Subproject commit 6e095a9280411c52e61d63ba81de2e292e6f0576 -- To view, visit https://gerrit.wikimedia.org/r/227739 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6faddb97f8fd68fe5233a9914f4c3b62326fb8d7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Content-Length header to thumb.php redirects - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Add Content-Length header to thumb.php redirects
..
Add Content-Length header to thumb.php redirects
Without the Content-Length header, the response is sent with
Transfer-Encoding: Chunked, which is somehow mangled by
mod_fastcgi. Varnish then claims the response is malformed and declines
to process it, sending the client a 503 instead.
This is a followup of 0ee9e717f49b9e15bd63fd66f3d0967939c35b05
Bug: T84842
Change-Id: Ia610a43789e6ff14cfc0964f285bbec39c890152
---
M thumb.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/thumb.php b/thumb.php
index 3b7ff43..7d00abe 100644
--- a/thumb.php
+++ b/thumb.php
@@ -213,6 +213,7 @@
if ( count( $varyHeader ) ) {
$response-header( 'Vary: ' . implode( ', ',
$varyHeader ) );
}
+ $response-header( 'Content-Length: 0');
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/227733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia610a43789e6ff14cfc0964f285bbec39c890152
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf16
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Content-Length header to thumb.php redirects - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Add Content-Length header to thumb.php redirects
..
Add Content-Length header to thumb.php redirects
Without the Content-Length header, the response is sent with
Transfer-Encoding: Chunked, which is somehow mangled by
mod_fastcgi. Varnish then claims the response is malformed and declines
to process it, sending the client a 503 instead.
This is a followup of 0ee9e717f49b9e15bd63fd66f3d0967939c35b05
Bug: T84842
Change-Id: Ia610a43789e6ff14cfc0964f285bbec39c890152
---
M thumb.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/thumb.php b/thumb.php
index 3b7ff43..03a3f35 100644
--- a/thumb.php
+++ b/thumb.php
@@ -213,6 +213,7 @@
if ( count( $varyHeader ) ) {
$response-header( 'Vary: ' . implode( ', ',
$varyHeader ) );
}
+ $response-header( 'Content-Length: 0' );
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/227676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia610a43789e6ff14cfc0964f285bbec39c890152
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add ferm rules for new Logstash ingestion module logstash::i... - change (operations/puppet)
Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227723
Change subject: Add ferm rules for new Logstash ingestion module
logstash::input::udp
..
Add ferm rules for new Logstash ingestion module logstash::input::udp
Bug: T104964
Change-Id: Ic1b73d42e87b36e4f9a73e5a40ea4622da970f90
---
M modules/logstash/manifests/input/udp.pp
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/227723/1
diff --git a/modules/logstash/manifests/input/udp.pp
b/modules/logstash/manifests/input/udp.pp
index 917961c..b2675a2 100644
--- a/modules/logstash/manifests/input/udp.pp
+++ b/modules/logstash/manifests/input/udp.pp
@@ -30,4 +30,10 @@
content = template('logstash/input/udp.erb'),
priority = $priority,
}
+
+ferm::service { logstash_udp_${title}:
+proto = 'udp',
+port = $port,
+srange = '$INTERNAL',
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/227723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1b73d42e87b36e4f9a73e5a40ea4622da970f90
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff mmuhlenh...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introducing mobileapps role and puppet module - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/227725 Change subject: Introducing mobileapps role and puppet module .. Introducing mobileapps role and puppet module Change-Id: I32441eb5807726471134bdd2a8d4e85a268cdb61 --- M hieradata/common/role/deployment.yaml A manifests/role/mobileapps.pp A modules/mobileapps/manifests/init.pp A modules/mobileapps/templates/config.yaml.erb A modules/mobileapps/tests/Makefile A modules/mobileapps/tests/init.pp 6 files changed, 140 insertions(+), 95 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/25/227725/1 diff --git a/hieradata/common/role/deployment.yaml b/hieradata/common/role/deployment.yaml index 9c07329..2b6276e 100644 --- a/hieradata/common/role/deployment.yaml +++ b/hieradata/common/role/deployment.yaml @@ -1,104 +1,106 @@ repo_config: - integration/mediawiki-tools-codesniffer: -upstream: https://gerrit.wikimedia.org/r/mediawiki/tools/codesniffer - integration/phpunit: -upstream: https://gerrit.wikimedia.org/r/integration/phpunit - integration/phpcs: -upstream: https://gerrit.wikimedia.org/r/integration/phpcs - integration/php-coveralls: -upstream: https://gerrit.wikimedia.org/r/integration/php-coveralls - integration/slave-scripts: -upstream: https://gerrit.wikimedia.org/r/integration/jenkins -checkout_submodules: true - gdash/gdash: -upstream: https://gerrit.wikimedia.org/r/operations/software/gdash - jobrunner/jobrunner: -upstream: https://gerrit.wikimedia.org/r/mediawiki/services/jobrunner -service_name: jobrunner - tessera/tessera: -upstream: https://gerrit.wikimedia.org/r/operations/software/tessera - grafana/grafana: -upstream: https://gerrit.wikimedia.org/r/operations/software/grafana - parsoid/deploy: -upstream: https://gerrit.wikimedia.org/r/p/mediawiki/services/parsoid/deploy -checkout_submodules: true -service_name: parsoid - eventlogging/EventLogging: -upstream: https://gerrit.wikimedia.org/r/mediawiki/extensions/EventLogging - ocg/ocg: -upstream: https://gerrit.wikimedia.org/r/mediawiki/services/ocg-collection -service_name: ocg -checkout_submodules: true - mathoid/deploy: -upstream: https://gerrit.wikimedia.org/r/mediawiki/services/mathoid/deploy -service_name: mathoid -checkout_submodules: true - citoid/deploy: -upstream: https://gerrit.wikimedia.org/r/mediawiki/services/citoid/deploy -service_name: citoid -checkout_submodules: true - zotero/translation-server: -upstream: https://gerrit.wikimedia.org/r/mediawiki/services/zotero/translation-server -service_name: zotero - zotero/translators: -upstream: https://gerrit.wikimedia.org/r/mediawiki/services/zotero/translators - graphoid/deploy: -upstream: https://gerrit.wikimedia.org/r/mediawiki/services/graphoid/deploy -service_name: graphoid -checkout_submodules: true - rcstream/rcstream: -upstream: https://gerrit.wikimedia.org/r/mediawiki/services/rcstream -service_name: rcstream - restbase/deploy: -upstream: https://gerrit.wikimedia.org/r/mediawiki/services/restbase/deploy -service_name: restbase -checkout_submodules: true - fluoride/fluoride: -upstream: https://gerrit.wikimedia.org/r/mediawiki/tools/fluoride - statsv/statsv: -upstream: https://gerrit.wikimedia.org/r/analytics/statsv abacist/abacist: upstream: https://gerrit.wikimedia.org/r/analytics/abacist - test/testrepo: -service_name: puppet -checkout_submodules: true - elasticsearch/plugins: -gitfat_enabled: true -upstream: https://gerrit.wikimedia.org/r/operations/software/elasticsearch/plugins analytics/refinery: gitfat_enabled: true upstream: https://gerrit.wikimedia.org/r/analytics/refinery - scholarships/scholarships: -upstream: https://gerrit.wikimedia.org/r/wikimedia/wikimania-scholarships - librenms/librenms: -upstream: https://gerrit.wikimedia.org/r/operations/software/librenms - kibana/kibana: -upstream: https://gerrit.wikimedia.org/r/operations/software/kibana - scap/scap: -upstream: https://gerrit.wikimedia.org/r/mediawiki/tools/scap - servermon/servermon: -service_name: gunicorn - iegreview/iegreview: -grain: iegreview -upstream: https://gerrit.wikimedia.org/r/wikimedia/iegreview - cxserver/deploy: -service_name: cxserver -upstream: https://gerrit.wikimedia.org/r/mediawiki/services/cxserver/deploy -checkout_submodules: true - dropwizard/metrics: -gitfat_enabled: true -upstream: https://gerrit.wikimedia.org/r/operations/software/dropwizard-metrics - cassandra/metrics-collector: -gitfat_enabled: true -upstream: https://gerrit.wikimedia.org/r/operations/software/cassandra-metrics-collector - wdqs/wdqs: -gitfat_enabled: true -upstream: https://gerrit.wikimedia.org/r/wikidata/query/deploy -
[MediaWiki-commits] [Gerrit] Revert Revert Move sourceswiki special.dblist-wikisource.... - change (operations/mediawiki-config)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227738
Change subject: Revert Revert Move sourceswiki
special.dblist-wikisource.dblist
..
Revert Revert Move sourceswiki special.dblist-wikisource.dblist
This reverts commit c4260a5ecd64fe873c58f65f4201a60bfc429b58.
Change-Id: I3a5c0b175466f0e1eda52141ae9286174a7356d7
---
M special.dblist
M tests/dblistTest.php
D w/static/images/project-logos/sourceswiki.png
M wikisource.dblist
M wmf-config/InitialiseSettings.php
5 files changed, 10 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/38/227738/1
diff --git a/special.dblist b/special.dblist
index 4cfc8a9..b365248 100644
--- a/special.dblist
+++ b/special.dblist
@@ -32,7 +32,6 @@
outreachwiki
qualitywiki
searchcomwiki
-sourceswiki
spcomwiki
specieswiki
stewardwiki
diff --git a/tests/dblistTest.php b/tests/dblistTest.php
index 155a5d8..8b8791e 100644
--- a/tests/dblistTest.php
+++ b/tests/dblistTest.php
@@ -31,6 +31,13 @@
: $projectname
;
+ # Sadly, we end up with an exception because hysterical raisins
+ # sourceswiki is the original Wikisource and is still active
+ if ( $database === 'sourceswiki' ) {
+ $this-assertEquals( $projectname, 'wikisource' );
+ return;
+ }
+
# Verifiy the databasename suffix
$this-assertStringEndsWith( $dbsuffix, $database,
Database name $database lacks db suffix $dbsuffix of
$projectname
diff --git a/w/static/images/project-logos/sourceswiki.png
b/w/static/images/project-logos/sourceswiki.png
deleted file mode 100644
index 290f254..000
--- a/w/static/images/project-logos/sourceswiki.png
+++ /dev/null
Binary files differ
diff --git a/wikisource.dblist b/wikisource.dblist
index 2505b13..9204b16 100644
--- a/wikisource.dblist
+++ b/wikisource.dblist
@@ -51,6 +51,7 @@
sawikisource
skwikisource
slwikisource
+sourceswiki
srwikisource
svwikisource
tawikisource
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 1feab08..5ee8410 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -144,6 +144,7 @@
'otrs_wikiwiki' = 'en',
'qualitywiki' = 'en',
'searchcomwiki' = 'en',
+ 'sourceswiki' = 'en',
'stewardwiki' = 'en',
'strategywiki' = 'en',
'tenwiki' = 'en',
@@ -934,7 +935,6 @@
'thwikinews' = '/static/images/project-logos/thwikinews.png',
// Wikisource
- 'sourceswiki' = '/static/images/project-logos/sourceswiki.png',
'arwikisource' = '/static/images/project-logos/arwikisource.png',
'aswikisource' = '/static/images/project-logos/aswikisource.png', //
T45129
'azwikisource' = '/static/images/project-logos/azwikisource.png', //
T54019
@@ -1833,7 +1833,6 @@
'slwikisource' = 'Wikivir',
'slwiktionary' = 'Wikislovar',
'slwikiversity' = 'Wikiverza',
- 'sourceswiki' = 'Wikisource',
'spcomwiki' = 'Spcom',
'specieswiki' = 'Wikispecies',
'sqwikinews' = 'Wikilajme',
@@ -2311,7 +2310,6 @@
'slwikisource' = 'Wikivir',
'slwiktionary' = 'Wikislovar',
'slwikiversity' = 'Wikiverza',
- 'sourceswiki' = 'Wikisource',
'spcomwiki' = 'Spcom',
'specieswiki' = 'Wikispecies',
'sqwikinews' = 'Wikilajme',
@@ -4238,7 +4236,7 @@
'outreachwiki' = 'wikimedia',
'usabilitywiki' = 'wikimedia',
'strategywiki' = 'wikimedia',
- 'sourceswiki' = 'wikisource',
+ 'sourceswiki' = 'wikisource', // $site is wikipedia for this
'specieswiki' = 'wikispecies',
'testwiki' = 'test',
'wikimania' = 'wikimedia',
@@ -10422,7 +10420,6 @@
'wmgUseProofreadPage' = array(
'default' = false,
'wikisource' = true,
- 'sourceswiki' = true, // FIXME: Why isn't this part of wikisource?
'test2wiki' = true,
'frrwiki' = true, // T40023
),
@@ -10718,7 +10715,6 @@
'otrs_wikiwiki' = '/static/favicon/wmf.ico',
'outreachwiki' = '/static/favicon/community.ico',
'searchcomwiki' = '/static/favicon/wmf.ico',
- 'sourceswiki' = '/static/favicon/wikisource.ico',
'spcomwiki' = '/static/favicon/spcom.ico',
'specieswiki' = '/static/favicon/wikispecies.ico',
'stewardwiki' = '/static/favicon/community.ico',
@@ -10879,7 +10875,6 @@
'wikinews' = '/srv/mediawiki/w/static/images/sul/wikinews.png',
'wikiquote' = '/srv/mediawiki/w/static/images/sul/wikiquote.png',
'wikisource' = '/srv/mediawiki/w/static/images/sul/wikisource.png',
- 'sourceswiki' = '/srv/mediawiki/w/static/images/sul/wikisource.png',
'wikiversity' =
[MediaWiki-commits] [Gerrit] beta: Swap text caches to -text04, which is jessie - change (operations/mediawiki-config)
Chad has uploaded a new change for review. https://gerrit.wikimedia.org/r/227743 Change subject: beta: Swap text caches to -text04, which is jessie .. beta: Swap text caches to -text04, which is jessie Bug: T98758 Change-Id: Ie96bef9c8aa681308813fc06ba24fcbdd44b2ad8 --- M wmf-config/squid-labs.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/43/227743/1 diff --git a/wmf-config/squid-labs.php b/wmf-config/squid-labs.php index d0f5eb6..911ee9b 100644 --- a/wmf-config/squid-labs.php +++ b/wmf-config/squid-labs.php @@ -10,7 +10,7 @@ # on UDP port 4827. $wgSquidServersNoPurge = array( '127.0.0.1', - '10.68.16.16', # deployment-cache-text02 + '10.68.18.103', # deployment-cache-text04 '10.68.17.51', # deployment-cache-upload02 '10.68.16.12', # deployment-cache-bits01 '10.68.16.13', # deployment-cache-mobile03 @@ -24,7 +24,7 @@ # Fallback (text+mobile) '' = array( array( - 'host' = '10.68.16.16', # deployment-cache-text02 + 'host' = '10.68.18.103', # deployment-cache-text04 'port' = 4827, ), array( -- To view, visit https://gerrit.wikimedia.org/r/227743 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie96bef9c8aa681308813fc06ba24fcbdd44b2ad8 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Chad ch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: swap text caches to text04, which is jessie - change (operations/puppet)
Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227744
Change subject: beta: swap text caches to text04, which is jessie
..
beta: swap text caches to text04, which is jessie
Bug: T98758
Change-Id: I29615c497281c116c13adc99b0ecf00a44a6d3a5
---
M manifests/role/labsdns.pp
M modules/dnsrecursor/templates/ip-alias.lua.erb
M modules/openstack/manifests/nova/network.pp
3 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/227744/1
diff --git a/manifests/role/labsdns.pp b/manifests/role/labsdns.pp
index 37d4112..3d6257f 100644
--- a/manifests/role/labsdns.pp
+++ b/manifests/role/labsdns.pp
@@ -71,8 +71,8 @@
# FIXME: these should be automatically synced rather than hard-coded.
$nova_floating_ip_aliases = {
# eqiad
-'deployment-cache-text02' = {public_ip = '208.80.155.135',
-private_ip = '10.68.16.16' },
+'deployment-cache-text04' = {public_ip = '208.80.155.135',
+private_ip = '10.68.18.103' },
'deployment-cache-upload02' = {public_ip = '208.80.155.136',
private_ip = '10.68.17.51' },
'deployment-cache-bits01' = {public_ip = '208.80.155.137',
diff --git a/modules/dnsrecursor/templates/ip-alias.lua.erb
b/modules/dnsrecursor/templates/ip-alias.lua.erb
index 3c0ce9f..eba89eb 100644
--- a/modules/dnsrecursor/templates/ip-alias.lua.erb
+++ b/modules/dnsrecursor/templates/ip-alias.lua.erb
@@ -8,15 +8,15 @@
--
-- From puppet we're getting a fancy data structure like this:
--{
---'deployment-cache-text02' = {public_ip = '208.80.155.135',
---private_ip = '10.68.16.16' },
+--'deployment-cache-text04' = {public_ip = '208.80.155.135',
+--private_ip = '10.68.18.103' },
--'deployment-cache-upload02' = {public_ip = '208.80.155.136',
--private_ip = '10.68.17.51' },
--}
-- The following .erb magic pulls that apart and reconstructs it into a
-- lua table with entries like:
--- aliastable['deployment-cache-text02']['public_ip'] = '208.80.155.135'
--- aliastable['deployment-cache-text02']['private_ip'] = '10.68.16.16'
+-- aliastable['deployment-cache-text04']['public_ip'] = '208.80.155.135'
+-- aliastable['deployment-cache-text04']['private_ip'] = '10.68.18.103'
-- aliastable['deployment-cache-upload02']['public_ip'] =
'208.80.155.136'
-- aliastable['deployment-cache-upload02']['private_ip'] = '10.68.17.51'
--
@@ -33,7 +33,7 @@
% end -%
-- Flatten our table into a simple mapping with entries like this:
---aliasmapping['208.80.155.135'] = '10.68.16.16'
+--aliasmapping['208.80.155.135'] = '10.68.18.103'
--aliasmapping['208.80.155.136'] = '10.68.17.51'
aliasmapping = {}
for name,entries in pairs(aliastable) do
diff --git a/modules/openstack/manifests/nova/network.pp
b/modules/openstack/manifests/nova/network.pp
index 383b0e5..34470cc 100644
--- a/modules/openstack/manifests/nova/network.pp
+++ b/modules/openstack/manifests/nova/network.pp
@@ -21,8 +21,8 @@
$nova_dnsmasq_aliases = {
# eqiad
-'deployment-cache-text02' = {public_ip = '208.80.155.135',
-private_ip = '10.68.16.16' },
+'deployment-cache-text04' = {public_ip = '208.80.155.135',
+private_ip = '10.68.18.103' },
'deployment-cache-upload02' = {public_ip = '208.80.155.136',
private_ip = '10.68.17.51' },
'deployment-cache-bits01' = {public_ip = '208.80.155.137',
--
To view, visit https://gerrit.wikimedia.org/r/227744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I29615c497281c116c13adc99b0ecf00a44a6d3a5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad ch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add Square gateway to reconciliation report - change (wikimedia...crm)
Cdentinger has uploaded a new change for review. https://gerrit.wikimedia.org/r/227749 Change subject: add Square gateway to reconciliation report .. add Square gateway to reconciliation report Change-Id: I468b9a54887484d17d77a0048beb063f153ac86d --- M sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/49/227749/1 diff --git a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php index 04fba63..7a18bb1 100644 --- a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php +++ b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php @@ -17,6 +17,7 @@ 'GLOBALCOLLECT' = 'GlobalCollect', 'JPMORGAN' = 'JP Morgan', 'PAYPAL' = 'PayPal', +'SQUARE' = 'Square', 'WORLDPAY' = 'Worldpay', ); -- To view, visit https://gerrit.wikimedia.org/r/227749 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I468b9a54887484d17d77a0048beb063f153ac86d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Cdentinger cdentin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Populate rev_content_model when a move causes default conten... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Populate rev_content_model when a move causes default content
model to change
..
Populate rev_content_model when a move causes default content model to change
If the default content model changes due to a page move, a NULL in
rev_content_model will now reference the new default, which is not how
the revision was serialized, causing an exception to be thrown.
This was caused by a5bc9f49cd01e, since previously NULL would use the
correct, but techncially inaccurate, page_content_model.
Bug: T105260
Change-Id: I0c29d0e657ad0b656e5da6ba365f337229ad4dfd
---
M includes/MovePage.php
1 file changed, 17 insertions(+), 0 deletions(-)
Approvals:
Catrope: Looks good to me, approved
Matthias Mullie: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/MovePage.php b/includes/MovePage.php
index 9891106..964fbff 100644
--- a/includes/MovePage.php
+++ b/includes/MovePage.php
@@ -416,6 +416,13 @@
$redirectContent = null;
}
+ // Figure out whether the content model is no longer the default
+ $oldDefault = ContentHandler::getDefaultModelFor(
$this-oldTitle );
+ $contentModel = $this-oldTitle-getContentModel();
+ $newDefault = ContentHandler::getDefaultModelFor( $nt );
+ $defaultContentModelChanging = ( $oldDefault !== $newDefault
+$oldDefault === $contentModel );
+
// bug 57084: log_page should be the ID of the *moved* page
$oldid = $this-oldTitle-getArticleID();
$logTitle = clone $this-oldTitle;
@@ -493,6 +500,16 @@
$newpage-doEditUpdates( $nullRevision, $user,
array( 'changed' = false, 'moved' = true,
'oldcountable' = $oldcountable ) );
+ // If the default content model changes, we need to populate
rev_content_model
+ if ( $defaultContentModelChanging ) {
+ $dbw-update(
+ 'revision',
+ array( 'rev_content_model' = $contentModel ),
+ array( 'rev_page' = $nt-getArticleID(),
'rev_content_model IS NULL' ),
+ __METHOD__
+ );
+ }
+
if ( !$moveOverRedirect ) {
WikiPage::onArticleCreate( $nt );
}
--
To view, visit https://gerrit.wikimedia.org/r/226938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c29d0e657ad0b656e5da6ba365f337229ad4dfd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 85ca7d3..b5de6fa - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 85ca7d3..b5de6fa .. Syncronize VisualEditor: 85ca7d3..b5de6fa Change-Id: Ia6c2beebf156565fc6e24211751ec97adc725afb --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 85ca7d3..b5de6fa 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 85ca7d3e94234463733c4c903ccbdb247d634511 +Subproject commit b5de6fa575c2d9cc06054cc13652b6eb692dc5c1 -- To view, visit https://gerrit.wikimedia.org/r/227755 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia6c2beebf156565fc6e24211751ec97adc725afb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BREAKING CHANGE] Rename (View|Mobile)PageTarget to (Desktop... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BREAKING CHANGE] Rename (View|Mobile)PageTarget to
(Desktop|Mobile)ArticleTarget
..
[BREAKING CHANGE] Rename (View|Mobile)PageTarget to
(Desktop|Mobile)ArticleTarget
Change-Id: I6a8fa76dc4d70cc04722e30e3fea6a6112d56b40
---
M VisualEditor.hooks.php
R VisualEditorDesktopArticleTargetInitModule.php
M extension.json
R modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-apex.css
R modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css
R modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-shared.css
R modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
R modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
R modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css
R modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.noscript.css
R modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.css
R modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
R modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
R modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/tests/browser/features/support/pages/dummy_page.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
R modules/ve-mw/tests/init/targets/ve.init.mw.DesktopArticleTarget.test.js
18 files changed, 179 insertions(+), 171 deletions(-)
Approvals:
Jforrester: Looks good to me, but someone else must approve
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 17e5117..8a3f3d5 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -53,10 +53,10 @@
*/
public static function onBeforePageDisplay( OutputPage $output, Skin
$skin ) {
$output-addModules( array(
- 'ext.visualEditor.viewPageTarget.init',
+ 'ext.visualEditor.desktopArticleTarget.init',
'ext.visualEditor.targetLoader'
) );
- $output-addModuleStyles( array(
'ext.visualEditor.viewPageTarget.noscript' ) );
+ $output-addModuleStyles( array(
'ext.visualEditor.desktopArticleTarget.noscript' ) );
// add scroll offset js variable to output
$veConfig = ConfigFactory::getDefaultInstance()-makeConfig(
'visualeditor' );
$skinsToolbarScrollOffset = $veConfig-get(
'VisualEditorSkinToolbarScrollOffset' );
@@ -586,7 +586,7 @@
'lib/ve/tests/ui/actions/ve.ui.ListAction.test.js',
// VisualEditor initialization Tests
'lib/ve/tests/init/ve.init.Platform.test.js',
-
'modules/ve-mw/tests/init/targets/ve.init.mw.ViewPageTarget.test.js',
+
'modules/ve-mw/tests/init/targets/ve.init.mw.DesktopArticleTarget.test.js',
// IME tests
'lib/ve/tests/ce/ve.ce.TestRunner.js',
'lib/ve/tests/ce/ve.ce.imetests.test.js',
@@ -636,8 +636,8 @@
'ext.visualEditor.mwtransclusion',
'ext.visualEditor.mwalienextension',
'ext.visualEditor.experimental',
- 'ext.visualEditor.viewPageTarget.init',
- 'ext.visualEditor.viewPageTarget',
+ 'ext.visualEditor.desktopArticleTarget.init',
+ 'ext.visualEditor.desktopArticleTarget',
),
'localBasePath' = __DIR__,
'remoteExtPath' = 'VisualEditor',
diff --git a/VisualEditorViewPageTargetInitModule.php
b/VisualEditorDesktopArticleTargetInitModule.php
similarity index 80%
rename from VisualEditorViewPageTargetInitModule.php
rename to VisualEditorDesktopArticleTargetInitModule.php
index c1ba093..295c5ca 100644
--- a/VisualEditorViewPageTargetInitModule.php
+++ b/VisualEditorDesktopArticleTargetInitModule.php
@@ -1,6 +1,6 @@
?php
/**
- * ResourceLoader module for the 'ext.visualEditor.viewPageTarget.init'
+ * ResourceLoader module for the 'ext.visualEditor.desktopArticleTarget.init'
* module. Necessary to incorporate the VisualEditorTabMessages
* configuration setting.
*
@@ -10,7 +10,7 @@
* @license The MIT License (MIT); see LICENSE.txt
*/
-class VisualEditorViewPageTargetInitModule extends ResourceLoaderFileModule {
+class VisualEditorDesktopArticleTargetInitModule extends
ResourceLoaderFileModule {
public function __construct(
$options = array(),
diff --git a/extension.json b/extension.json
index 99b8040..640c9d1 100644
---
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 85ca7d3..b5de6fa - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/227755 Change subject: Syncronize VisualEditor: 85ca7d3..b5de6fa .. Syncronize VisualEditor: 85ca7d3..b5de6fa Change-Id: Ia6c2beebf156565fc6e24211751ec97adc725afb --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/55/227755/1 diff --git a/VisualEditor b/VisualEditor index 85ca7d3..b5de6fa 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 85ca7d3e94234463733c4c903ccbdb247d634511 +Subproject commit b5de6fa575c2d9cc06054cc13652b6eb692dc5c1 -- To view, visit https://gerrit.wikimedia.org/r/227755 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6c2beebf156565fc6e24211751ec97adc725afb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ignore warnings about URLs without modules for private repos... - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: Ignore warnings about URLs without modules for private
repository
..
Ignore warnings about URLs without modules for private repository
In most cases, the warnings generated by puppet-lint about puppet://
URLs without modules/
(cf.
https://integration.wikimedia.org/ci/job/operations-puppet-puppetlint-strict/)
are caused by manifests that have not been converted to modules yet.
An exception are URLs that refer to the private repository; these are
here to stay. This change marks them so that they are ignored by
puppet-lint.
Bug: T87132
Change-Id: I76d788f86f14bcf008b7ac4c06bcd53eac7b5a32
---
M manifests/role/deployment.pp
M modules/releases/manifests/reprepro.pp
M modules/releases/manifests/reprepro/upload.pp
3 files changed, 6 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 86b91de..b739a2c 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -6,7 +6,9 @@
class role::deployment::server(
# Source of the key, change this if not in production, with hiera.
+# lint:ignore:puppet_url_without_modules
$key_source = 'puppet:///private/ssh/tin/mwdeploy_rsa',
+# lint:endignore
$apache_fqdn = $::fqdn,
$deployment_group = 'wikidev',
) {
diff --git a/modules/releases/manifests/reprepro.pp
b/modules/releases/manifests/reprepro.pp
index 104c3f8..02e0cd0 100644
--- a/modules/releases/manifests/reprepro.pp
+++ b/modules/releases/manifests/reprepro.pp
@@ -24,7 +24,9 @@
homedir = $homedir,
options = [outdir ${outdir}],
gpg_pubring = 'puppet:///modules/releases/pubring.gpg',
+# lint:ignore:puppet_url_without_modules
gpg_secring = 'puppet:///private/releases/secring.gpg',
+# lint:endignore
incomingdir = $incomingdir,
authorized_keys = ['ssh-rsa
B3NzaC1yc2EDAQABAAABAQDIRN3017QJUoewK7PIKwMo2ojSl4Mu/YxDZC4NsryXmi4kKlCTN0DTeyVSlnDei56EngwYP1crshCCDZAzFECRMV5Hr3NmS/J+ICR0z6GQztd7bQEORot38wxOkOCXBtmqMgztAqyYv6SH3Qfn9qmjrw6/yW0lLqg6cejmYXF61YEYrXyZJm+hjOD1oaYsCdjkuE+3Ob+8t6KvTcvjxarr99RRcuKp67j+7g/HRzxDKGi8/Z8/wFIBu50W/6idhjyPzYIunU5ThFmcpHUdry4jTB1/whuec70wsgcdC6EKPVVp00BfSwBaRJKlVCMWvI1VilLpMC2WtLZXpSQ5iTJ1'],
}
diff --git a/modules/releases/manifests/reprepro/upload.pp
b/modules/releases/manifests/reprepro/upload.pp
index b96213c..9089cba 100644
--- a/modules/releases/manifests/reprepro/upload.pp
+++ b/modules/releases/manifests/reprepro/upload.pp
@@ -1,5 +1,7 @@
class releases::reprepro::upload (
+# lint:ignore:puppet_url_without_modules
$private_key = 'puppet:///private/releases/id_rsa.upload',
+# lint:endignore
$user = 'releases',
$group= 'releases',
$sudo_user= '%wikidev',
--
To view, visit https://gerrit.wikimedia.org/r/198116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I76d788f86f14bcf008b7ac4c06bcd53eac7b5a32
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt t...@tim-landscheidt.de
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Tim Landscheidt t...@tim-landscheidt.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Guard NotPatrollablePage negative caching against slave lag - change (mediawiki/core)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227760
Change subject: Guard NotPatrollablePage negative caching against slave lag
..
Guard NotPatrollablePage negative caching against slave lag
After some poking I'm fairly sure this is why pages get
unpatrollable.
Bug: T100986
Change-Id: I137b25ec0538dcc7ad8b6f1b32d5103fd256462c
---
M includes/page/Article.php
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/60/227760/1
diff --git a/includes/page/Article.php b/includes/page/Article.php
index e58ffc8..5f1f1d7 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1129,8 +1129,11 @@
);
}
- if ( !$rc ) {
- // No RC entry around
+ $lagArray = wfGetLB()-getMaxLag();
+ $revisionAge = time() - wfTimestamp( TS_UNIX,
$oldestRevisionTimestamp );
+
+ if ( !$rc $revisionAge $lagArray[1] $revisionAge 1 ) {
+ // No RC entry around, and we can be sure that the miss
above wasn't caused by slave lag.
// Cache the information we gathered above in case we
can't patrol
// Don't cache in case we can patrol as this could
change
--
To view, visit https://gerrit.wikimedia.org/r/227760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I137b25ec0538dcc7ad8b6f1b32d5103fd256462c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labstore: fix typo in package name - change (operations/puppet)
coren has submitted this change and it was merged.
Change subject: labstore: fix typo in package name
..
labstore: fix typo in package name
Change-Id: I33d0d00cfecb59f40cf6dc2375adc60175e74033
---
M modules/labstore/manifests/fileserver.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Yuvipanda: Looks good to me, but someone else must approve
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/labstore/manifests/fileserver.pp
b/modules/labstore/manifests/fileserver.pp
index ae37345..1e4d573 100644
--- a/modules/labstore/manifests/fileserver.pp
+++ b/modules/labstore/manifests/fileserver.pp
@@ -11,7 +11,7 @@
require_package('lvm2')
require_package('python3-paramiko')
-require_package('python3-pymsql')
+require_package('python3-pymysql')
file { '/usr/local/sbin/replica-addusers.pl':
source = 'puppet:///modules/labstore/replica-addusers.pl',
--
To view, visit https://gerrit.wikimedia.org/r/227767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I33d0d00cfecb59f40cf6dc2375adc60175e74033
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump cache epoche for wikidata - change (operations/mediawiki-config)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/227815 Change subject: Bump cache epoche for wikidata .. Bump cache epoche for wikidata there were some changes in the site links ui that need this. Change-Id: I1784b05fd7c79a143ad27844130649a6729c091a --- M wmf-config/Wikibase.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/15/227815/1 diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php index dee9b9c..1e42afe 100644 --- a/wmf-config/Wikibase.php +++ b/wmf-config/Wikibase.php @@ -90,7 +90,7 @@ // T53637 and T48953 $wgGroupPermissions['*']['property-create'] = ( $wgDBname === 'testwikidatawiki' ); - $wgCacheEpoch = '20150602190200'; + $wgCacheEpoch = '20150729194912'; $wgWBRepoSettings['dataSquidMaxage'] = 1 * 60 * 60; $wgWBRepoSettings['sharedCacheDuration'] = 60 * 60 * 24; -- To view, visit https://gerrit.wikimedia.org/r/227815 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1784b05fd7c79a143ad27844130649a6729c091a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump src to 6e095a92 for deploy - change (mediawiki...deploy)
jenkins-bot has submitted this change and it was merged. Change subject: Bump src to 6e095a92 for deploy .. Bump src to 6e095a92 for deploy Change-Id: I6faddb97f8fd68fe5233a9914f4c3b62326fb8d7 --- M src 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Arlolra: Looks good to me, approved jenkins-bot: Verified diff --git a/src b/src index 92f1cd6..6e095a9 16 --- a/src +++ b/src -Subproject commit 92f1cd6d87a0b233edcc15b999e9bfab34b23da6 +Subproject commit 6e095a9280411c52e61d63ba81de2e292e6f0576 -- To view, visit https://gerrit.wikimedia.org/r/227739 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6faddb97f8fd68fe5233a9914f4c3b62326fb8d7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org Gerrit-Reviewer: Arlolra abrea...@wikimedia.org Gerrit-Reviewer: Cscott canan...@wikimedia.org Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] docparser: Add rudimentary error handling - change (oojs/ui)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227866
Change subject: docparser: Add rudimentary error handling
..
docparser: Add rudimentary error handling
I know you've all been waiting for this.
* Detect invalid input before it explodes the script, outputting the
problematic file name and code snippet (no line numbers though).
* Exit with error code if invalid input found to continue failing the
job when something's wrong.
* Do not immediately die after encountering invalid input; complain
about it, ignore, and continue to find all invalid things at once.
Change-Id: Idfda8eee1805df7e1734bb9ce175f2a3652be80f
---
M bin/docparser.rb
1 file changed, 45 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/66/227866/1
diff --git a/bin/docparser.rb b/bin/docparser.rb
index 9f58549..78e85eb 100644
--- a/bin/docparser.rb
+++ b/bin/docparser.rb
@@ -1,6 +1,12 @@
require 'pp'
require 'json'
+$bad_input = false
+def bad_input file, text
+ $bad_input = true
+ $stderr.puts #{file}: unrecognized input: #{text}
+end
+
def parse_dir dirname
Dir.entries(dirname).map{|filename|
if filename == '.' || filename == '..'
@@ -63,13 +69,13 @@
ignore = false
comment, code_line = d.split '*/'
- comment.split(\n).each{|c|
- next if c.strip == '/**'
- c.sub!(/^[ \t]*\*[ \t]?/, '') # strip leading *
+ comment.split(\n).each{|comment_line|
+ next if comment_line.strip == '/**'
+ comment_line.sub!(/^[ \t]*\*[ \t]?/, '') # strip
leading '*' and whitespace
- m = c.match(/^@(\w+)[ \t]*(.*)/)
+ m = comment_line.match(/^@(\w+)[ \t]*(.*)/)
unless m
- previous_item[:description] c + \n
+ previous_item[:description] comment_line +
\n
next
end
@@ -93,11 +99,13 @@
when 'property', 'var'
kind = :property
m = content.match(/^\{?(.+?)\}?( .+)?$/)
- if m.captures
- type, description = m.captures
- data[:type] = type
- data[:description] = description if
description
+ if !m
+ bad_input filename, comment_line
+ next
end
+ type, description = m.captures
+ data[:type] = type
+ data[:description] = description if description
when 'event'
kind = :event
data[:name] = content.strip
@@ -124,20 +132,28 @@
end
end
when 'cfg' # JS only
- type, name, default, description =
content.match(/^\{(.+?)\} \[?([\w.$]+?)(?:=(.+?))?\]?( .+)?$/).captures
+ m = content.match(/^\{(.+?)\}
\[?([\w.$]+?)(?:=(.+?))?\]?( .+)?$/)
+ if !m
+ bad_input filename, comment_line
+ next
+ end
+ type, name, default, description = m.captures
data[:config] {name: name, type:
cleanup_class_name(type), description: description || '', default: default}
previous_item = data[:config][-1]
when 'return'
case filetype
when :js
- type, description =
content.match(/^\{(.+?)\}( .+)?$/).captures
- data[:return] = {type:
cleanup_class_name(type), description: description || ''}
- previous_item = data[:return]
+ m = content.match(/^\{(.+?)\}( .+)?$/)
when :php
- type, description =
content.match(/^(\S+)( .+)?$/).captures
- data[:return] = {type:
cleanup_class_name(type), description: description || ''}
- previous_item = data[:return]
+ m = content.match(/^(\S+)( .+)?$/)
end
+
[MediaWiki-commits] [Gerrit] add wmf-officeit group to metawiki - change (operations/mediawiki-config)
John F. Lewis has uploaded a new change for review. https://gerrit.wikimedia.org/r/227879 Change subject: add wmf-officeit group to metawiki .. add wmf-officeit group to metawiki Per request by James Alexander on IRC, adding a group for wmf-officeit with createaccount, centralauth-lock, noratelimit and tboverride. Rights added were specifically requested. Bug: T106724 Change-Id: I824bd2136c88d57f69b9c8d08e9304dc89088703 --- M wmf-config/InitialiseSettings.php 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/79/227879/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ea5323e..1669f84 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -7743,6 +7743,12 @@ 'reupload' = true, 'reupload-own' = true, ), + 'wmf-officeit' = array( // T106724 + 'centralauth-lock' = true, + 'createaccount' = true, + 'noratelimit' = true, + 'tboverride' = true, + ), ), 'mkwiki' = array( 'autopatrolled' = array( 'autopatrol' = true ), -- To view, visit https://gerrit.wikimedia.org/r/227879 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I824bd2136c88d57f69b9c8d08e9304dc89088703 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: John F. Lewis johnflewi...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Bump grunt-jscs to 2.0.0 and make pass - change (VisualEditor/VisualEditor)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227885
Change subject: build: Bump grunt-jscs to 2.0.0 and make pass
..
build: Bump grunt-jscs to 2.0.0 and make pass
Change-Id: Idea268b0b7df9b032a99c0ae94dff75cf2c3ac4d
---
M .jscsrc
M Gruntfile.js
M build/moduleUtils.js
M build/tasks/buildloader.js
M demos/trigger/trigger.js
M package.json
M src/ve.BranchNode.js
7 files changed, 37 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/85/227885/1
diff --git a/.jscsrc b/.jscsrc
index 9d22e3f..e11d3be 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,3 +1,10 @@
{
- preset: wikimedia
+ preset: wikimedia,
+
+ checkAnnotations: {
+ preset: JSDuck5,
+ extra: {
+ source: true
+ }
+ }
}
diff --git a/Gruntfile.js b/Gruntfile.js
index 1364179..41ce873 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -34,10 +34,10 @@
files = grunt.file.expand(
'demos/ve/pages/*.html' );
files.forEach( function ( file ) {
var matches = file.match(
/^.*(pages\/(.+).html)$/ ),
- path = matches[1],
- name = matches[2];
+ path = matches[ 1 ],
+ name = matches[ 2 ];
- pages[name] = path;
+ pages[ name ] = path;
} );
return pages;
} )();
@@ -72,11 +72,11 @@
// HACK: Ideally these libraries would provide their
own distribution files (T95667)
'jquery.i18n': {
dest: 'dist/lib/jquery.i18n.js',
- src: modules['jquery.i18n'].scripts
+ src: modules[ 'jquery.i18n' ].scripts
},
'jquery.uls.data': {
dest: 'dist/lib/jquery.uls.data.js',
- src: modules['jquery.uls.data'].scripts
+ src: modules[ 'jquery.uls.data' ].scripts
}
},
cssjanus: {
@@ -240,6 +240,7 @@
},
all: [
'*.js',
+ '{.jsduck,build,demos,src,tests}/*.js',
'{.jsduck,build,demos,src,tests}/**/*.js'
]
},
diff --git a/build/moduleUtils.js b/build/moduleUtils.js
index f42701d..4c604a5 100644
--- a/build/moduleUtils.js
+++ b/build/moduleUtils.js
@@ -122,15 +122,15 @@
list = list || [];
for ( i = 0; i load.length; i++ ) {
- module = load[i];
+ module = load[ i ];
if ( !modules.hasOwnProperty( module ) ) {
throw new Error( 'Dependency ' + module + ' not
found' );
}
// Add in any dependencies
- if ( modules[module].hasOwnProperty( 'dependencies' ) )
{
- self.buildDependencyList( modules,
modules[module].dependencies, list );
+ if ( modules[ module ].hasOwnProperty( 'dependencies' )
) {
+ self.buildDependencyList( modules, modules[
module ].dependencies, list );
}
// Append target load module to the end of the current
list
diff --git a/build/tasks/buildloader.js b/build/tasks/buildloader.js
index b306801..5ebcb1b 100644
--- a/build/tasks/buildloader.js
+++ b/build/tasks/buildloader.js
@@ -81,22 +81,22 @@
var module, moduleStyles, moduleScripts, dependency,
dependencies;
dependencies = moduleUtils.buildDependencyList(
modules, load );
for ( dependency in dependencies ) {
- module = dependencies[dependency];
+ module = dependencies[ dependency ];
if ( loadedModules.indexOf( module ) -1 ) {
continue;
}
loadedModules.push( module );
- if ( modules[module].scripts ) {
- moduleScripts = modules[module].scripts
+ if ( modules[ module ].scripts ) {
+ moduleScripts = modules[ module
].scripts
.map( expand
[MediaWiki-commits] [Gerrit] build: Bump various devDependencies to latest - change (VisualEditor/VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/227884 Change subject: build: Bump various devDependencies to latest .. build: Bump various devDependencies to latest * grunt-contrib-csslint 0.4.0 - 0.5.0 * grunt-css-url-embed 1.5.2 - 1.6.1 * grunt-karma 0.10.1 - 0.12.0 * karma 0.12.31 - 0.13.3 * karma-chrome-launcher 0.1.8 - 0.2.0 * karma-coverage0.3.1 - 0.4.2 * karma-firefox-launcher0.1.4 - 0.1.6 * karma-qunit 0.1.4 - 0.1.5 * karma-sauce-launcher 0.2.10 - 0.2.14 Change-Id: I80ed1aa6bfc364634e357896a6a339dcfe7243c1 --- M package.json 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/84/227884/1 diff --git a/package.json b/package.json index 6536242..3985c50 100644 --- a/package.json +++ b/package.json @@ -25,20 +25,20 @@ grunt-contrib-clean: 0.6.0, grunt-contrib-concat: 0.5.1, grunt-contrib-copy: 0.8.0, -grunt-contrib-csslint: 0.4.0, +grunt-contrib-csslint: 0.5.0, grunt-contrib-jshint: 0.11.2, grunt-jsonlint: 1.0.4, grunt-contrib-watch: 0.6.1, -grunt-css-url-embed: 1.5.2, +grunt-css-url-embed: 1.6.1, grunt-cssjanus: 0.2.4, grunt-jscs: 1.8.0, -grunt-karma: 0.10.1, -karma: 0.12.31, -karma-chrome-launcher: 0.1.8, -karma-coverage: 0.3.1, -karma-firefox-launcher: 0.1.4, -karma-qunit: 0.1.4, -karma-sauce-launcher: 0.2.10, +grunt-karma: 0.12.0, +karma: 0.13.3, +karma-chrome-launcher: 0.2.0, +karma-coverage: 0.4.2, +karma-firefox-launcher: 0.1.6, +karma-qunit: 0.1.5, +karma-sauce-launcher: 0.2.14, qunitjs: 1.18.0 } } -- To view, visit https://gerrit.wikimedia.org/r/227884 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I80ed1aa6bfc364634e357896a6a339dcfe7243c1 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update mobileapps to 77181ea - change (mediawiki...deploy)
BearND has uploaded a new change for review. https://gerrit.wikimedia.org/r/227874 Change subject: Update mobileapps to 77181ea .. Update mobileapps to 77181ea List of changes: 65db9d9 Get JSON metadata embedded in HTML 9ea5c3a Prefix JSON metadata embed id with mw- 170808a Expanded the Lite service to break down sections into paragraphs. 8b9a992 Added ds_store to gitignore. 79d8602 Added hatnote processing. f27d886 Start using Parsoid HTML via RESTBase ff796e4 Add some examples of leveraging Parsoid metadata c807854 Add tests for mobileapp-page 00148e7 Add tests for Lite route. f1ce983 Update to service-template-node bd23818 53ccc98 Update package.json 2d40c8c Add monitoring spec and update to template v0.2.1 72a5d60 html route: make RESTBase host configurable 77181ea Switch the deploy target to 'debian' xxx Update node module dependencies Change-Id: I8fed9aa55f0a9d2190337ac8bce9cbcfa6481de9 --- M node_modules/bluebird/js/browser/bluebird.js M node_modules/bluebird/js/browser/bluebird.min.js M node_modules/bluebird/js/main/any.js M node_modules/bluebird/js/main/assert.js M node_modules/bluebird/js/main/async.js D node_modules/bluebird/js/main/bind.js M node_modules/bluebird/js/main/call_get.js M node_modules/bluebird/js/main/cancel.js M node_modules/bluebird/js/main/captured_trace.js D node_modules/bluebird/js/main/debuggability.js M node_modules/bluebird/js/main/direct_resolve.js M node_modules/bluebird/js/main/errors.js M node_modules/bluebird/js/main/es5.js M node_modules/bluebird/js/main/generators.js M node_modules/bluebird/js/main/join.js M node_modules/bluebird/js/main/map.js M node_modules/bluebird/js/main/nodeify.js M node_modules/bluebird/js/main/promise.js M node_modules/bluebird/js/main/promise_array.js M node_modules/bluebird/js/main/promise_resolver.js M node_modules/bluebird/js/main/promisify.js M node_modules/bluebird/js/main/queue.js M node_modules/bluebird/js/main/reduce.js M node_modules/bluebird/js/main/schedule.js M node_modules/bluebird/js/main/settle.js M node_modules/bluebird/js/main/some.js M node_modules/bluebird/js/main/synchronous_inspection.js M node_modules/bluebird/js/main/thenables.js M node_modules/bluebird/js/main/timers.js M node_modules/bluebird/js/main/using.js M node_modules/bluebird/js/main/util.js A node_modules/bluebird/js/zalgo/any.js A node_modules/bluebird/js/zalgo/assert.js A node_modules/bluebird/js/zalgo/async.js A node_modules/bluebird/js/zalgo/bluebird.js A node_modules/bluebird/js/zalgo/call_get.js A node_modules/bluebird/js/zalgo/cancel.js A node_modules/bluebird/js/zalgo/captured_trace.js A node_modules/bluebird/js/zalgo/catch_filter.js A node_modules/bluebird/js/zalgo/direct_resolve.js A node_modules/bluebird/js/zalgo/each.js A node_modules/bluebird/js/zalgo/errors.js A node_modules/bluebird/js/zalgo/es5.js A node_modules/bluebird/js/zalgo/filter.js A node_modules/bluebird/js/zalgo/finally.js A node_modules/bluebird/js/zalgo/generators.js A node_modules/bluebird/js/zalgo/join.js A node_modules/bluebird/js/zalgo/map.js A node_modules/bluebird/js/zalgo/nodeify.js A node_modules/bluebird/js/zalgo/progress.js A node_modules/bluebird/js/zalgo/promise.js A node_modules/bluebird/js/zalgo/promise_array.js A node_modules/bluebird/js/zalgo/promise_resolver.js A node_modules/bluebird/js/zalgo/promisify.js A node_modules/bluebird/js/zalgo/props.js A node_modules/bluebird/js/zalgo/queue.js A node_modules/bluebird/js/zalgo/race.js A node_modules/bluebird/js/zalgo/reduce.js A node_modules/bluebird/js/zalgo/schedule.js A node_modules/bluebird/js/zalgo/settle.js A node_modules/bluebird/js/zalgo/some.js A node_modules/bluebird/js/zalgo/synchronous_inspection.js A node_modules/bluebird/js/zalgo/thenables.js A node_modules/bluebird/js/zalgo/timers.js A node_modules/bluebird/js/zalgo/using.js A node_modules/bluebird/js/zalgo/util.js M node_modules/bluebird/package.json A node_modules/bluebird/zalgo.js M node_modules/body-parser/index.js M node_modules/body-parser/lib/read.js M node_modules/body-parser/lib/types/json.js M node_modules/body-parser/lib/types/raw.js M node_modules/body-parser/lib/types/text.js M node_modules/body-parser/lib/types/urlencoded.js D node_modules/body-parser/node_modules/bytes/.npmignore D node_modules/body-parser/node_modules/bytes/Makefile D node_modules/body-parser/node_modules/bytes/component.json M node_modules/body-parser/node_modules/bytes/index.js M node_modules/body-parser/node_modules/bytes/package.json M node_modules/body-parser/node_modules/content-type/package.json M node_modules/body-parser/node_modules/debug/node_modules/ms/package.json M node_modules/body-parser/node_modules/debug/package.json M node_modules/body-parser/node_modules/depd/package.json A node_modules/body-parser/node_modules/http-errors/LICENSE A node_modules/body-parser/node_modules/http-errors/index.js A node_modules/body-parser/node_modules/http-errors/node_modules/inherits/LICENSE A
[MediaWiki-commits] [Gerrit] Rework styling of tool buttons on the NavbarHorizontal - change (mediawiki...chameleon)
Foxtrott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227875
Change subject: Rework styling of tool buttons on the NavbarHorizontal
..
Rework styling of tool buttons on the NavbarHorizontal
Change-Id: I4687048f2aa80c81d9a1e0dadb1e52faa0e2ad7f
---
M docs/release-notes.md
M resources/styles/Components/NavbarHorizontal.less
M src/Components/NavbarHorizontal.php
3 files changed, 46 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/chameleon
refs/changes/75/227875/1
diff --git a/docs/release-notes.md b/docs/release-notes.md
index f92f725..14f1e58 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -4,6 +4,8 @@
Released on (tbd)
+This release may break customized styles for the NavbarHorizontal component.
+
Changes:
* Restructured the Page Tools on Navbars: The 'Edit' action and the Page Tools'
menu button got icons and were offset from the rest of the menus.
@@ -12,6 +14,10 @@
* 'Edit' link links to the proper Semantic Forms action if the
[SF extension](https://www.mediawiki.org/wiki/Extension:Semantic_Forms) is
present and `$sfgRenameEditTabs` is set
+* Improve styleability of tool buttons in NavbarHorizontal (wrap the button
+ label in a span) and rework rework styling of the buttons
+* Add ChameleonNavbarHorizontalPersonalToolsLinkText hook
+* Add ChameleonNavbarHorizontalNewTalkLinkText hook
* New less style variables @toolbar-height, @toolbar-padding-vertical,
@toolbar-padding-horizontal
diff --git a/resources/styles/Components/NavbarHorizontal.less
b/resources/styles/Components/NavbarHorizontal.less
index ea1dede..42c3486 100644
--- a/resources/styles/Components/NavbarHorizontal.less
+++ b/resources/styles/Components/NavbarHorizontal.less
@@ -99,12 +99,13 @@
border-right: none;
li:first-child a {
- border-radius: 0 @navbar-border-radius 0 0;
+ border-top-right-radius: @navbar-border-radius;
}
li:last-child a {
- border-radius: 0 0 @navbar-border-radius 0;
+ border-bottom-right-radius:
@navbar-border-radius;
}
+
}
}
}
@@ -163,34 +164,38 @@
float: none;
height: @navbar-height/2;
+ min-width: 2 * @navbar-height/3;
text-align: center;
+
+ border-color: @navbar-default-border;
+ border-bottom: 1px solid @navbar-default-border;
:last-child {
border: none;
}
- span, a {
- line-height: @line-height-computed/2;
- }
-
-
-
a, a:hover, a:focus {
- height: @navbar-height/2;
- padding: @navbar-padding-vertical/2
@navbar-padding-vertical/2;
-
- border-color: @navbar-default-border;
- border-bottom: 1px solid @navbar-default-border;
+ height: 100%;
+ padding: 0;
overflow: hidden;
- img {
+* {
+ padding: @navbar-padding-vertical/2
@navbar-padding-vertical/2;
+ display: inline-block;
+ line-height: @line-height-computed/2;
+ }
+
+img {
top: 50%;
left: 50%;
position: absolute;
- margin-right: -@navbar-padding-vertical;
.translate(-50%; -50%);
+
+ padding: 0;
+ min-height: 101%;
+ min-width: 101%;
:hover, :focus {
opacity: .7;
@@ -199,13 +204,14 @@
}
:first-child:last-child {
- span, a {
- line-height: @line-height-computed;
- }
+
+ height: @navbar-height;
a, a:hover, a:focus {
- height: @navbar-height;
- padding:
[MediaWiki-commits] [Gerrit] Missing argument exception on accessing Aggregated Scores page - change (wikimedia/iegreview)
Niharika29 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227876
Change subject: Missing argument exception on accessing Aggregated Scores page
..
Missing argument exception on accessing Aggregated Scores page
Change-Id: Ib726343b21221f47ecf5aa42fe770390665bacd4
---
M src/Controllers/Reports/AbstractReport.php
M src/Controllers/Reports/Aggregated.php
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/iegreview
refs/changes/76/227876/1
diff --git a/src/Controllers/Reports/AbstractReport.php
b/src/Controllers/Reports/AbstractReport.php
index ce71593..b53f298 100644
--- a/src/Controllers/Reports/AbstractReport.php
+++ b/src/Controllers/Reports/AbstractReport.php
@@ -43,7 +43,7 @@
* 'sortable' = true/false
* @return array Column descriptions
*/
- abstract protected function describeColumns();
+ abstract protected function describeColumns( $campaign );
/**
* @return stdClass Results object
@@ -91,7 +91,7 @@
$this-setupForm();
$this-form-validate( $_GET );
- $this-view-setData( 'columns', $this-describeColumns() );
+ $this-view-setData( 'columns', $this-describeColumns(
$campaign ) );
$this-view-set( 'items', $this-form-get( 'items' ) );
$this-view-set( 'p', $this-form-get( 'p' ) );
diff --git a/src/Controllers/Reports/Aggregated.php
b/src/Controllers/Reports/Aggregated.php
index 5ca63af..75ce639 100644
--- a/src/Controllers/Reports/Aggregated.php
+++ b/src/Controllers/Reports/Aggregated.php
@@ -42,7 +42,7 @@
/**
* @return array Column descriptions
*/
- protected function describeColumns() {
+ protected function describeColumns( $campaign ) {
$columns = array(
'report-aggregated-proposal' = array(
'column' = 'id',
@@ -65,7 +65,7 @@
),
);
- foreach ( $this-getQuestions() as $question ) {
+ foreach ( $this-getQuestions( $this-$campaign ) as $question
) {
if ( $question['type'] === 'score' ) {
$columns[q{$question['id']}] = array(
'header' = $question['report_head'],
--
To view, visit https://gerrit.wikimedia.org/r/227876
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib726343b21221f47ecf5aa42fe770390665bacd4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/iegreview
Gerrit-Branch: master
Gerrit-Owner: Niharika29 niharikakohl...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] accidental sudo escalation for bearloga - change (operations/puppet)
RobH has uploaded a new change for review. https://gerrit.wikimedia.org/r/227880 Change subject: accidental sudo escalation for bearloga .. accidental sudo escalation for bearloga robh accidentally added to a restricted group that needs sudo ops meeting review, reverting the bad part of the change. T107043 Change-Id: Ia61cfc98edd41eb7bfa687859ecd56a766f239b0 --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/80/227880/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index fbd9aec..8db74ed 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -58,7 +58,7 @@ gid: 706 description: access to terbium, fluorine (private data) and bastion hosts restricted folks use sudo to access apache / www-data resources -members: [daniel, dartar, ellery, bearloga, +members: [daniel, dartar, ellery, ezachte, hoo, jamesur, jdlrobson, khorn, tparscal, tnegrin, ssastry, ironholds, nuria, leila, santhosh, amire80, legoktm, jsahleen] privileges: ['ALL = (www-data,apache) NOPASSWD: ALL'] -- To view, visit https://gerrit.wikimedia.org/r/227880 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia61cfc98edd41eb7bfa687859ecd56a766f239b0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: RobH r...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (43652b6) - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227890
Change subject: Update VE core submodule to master (43652b6)
..
Update VE core submodule to master (43652b6)
New changes:
11953f7 Localisation updates from https://translatewiki.net.
0dbafb0 Update OOjs UI to v0.12.2
cbd0982 Replace placeholder color with opacity
087365c Support other types of 'empty' document placeholders
7692890 Make scrollIntoView a VE utility function
5a1a159 Localisation updates from https://translatewiki.net.
8edf71e [BREAKING CHANGE] Kill ve.indexOf and thus @until
Change-Id: I312dbd12d5291b7039067cb28b661319dc786a9c
---
M .jsduck/CustomTags.rb
M lib/ve
2 files changed, 0 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/90/227890/1
diff --git a/.jsduck/CustomTags.rb b/.jsduck/CustomTags.rb
index 5e32a89..346079b 100644
--- a/.jsduck/CustomTags.rb
+++ b/.jsduck/CustomTags.rb
@@ -48,24 +48,6 @@
end
end
-class UntilTag CommonTag
- def initialize
-@tagname = :until
-@pattern = until
-super
- end
-
- def to_html(context)
--EOHTML
- h3Until/h3
- div class=signature-boxp
- This method provides strongbrowser compatibility/strong for:
- #{ context[@tagname].map {|tag| tag[:doc] }.join(\n) }
- /p/div
-EOHTML
- end
-end
-
class SeeTag CommonTag
def initialize
@tagname = :see
diff --git a/lib/ve b/lib/ve
index cb14f66..43652b6 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit cb14f66f50ace8069ba3646293cb27069b30f24c
+Subproject commit 43652b6d7b8bc9f3682e2211548d499372db971a
--
To view, visit https://gerrit.wikimedia.org/r/227890
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I312dbd12d5291b7039067cb28b661319dc786a9c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Increase usage of assert_valid_iter_params - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227888
Change subject: Increase usage of assert_valid_iter_params
..
Increase usage of assert_valid_iter_params
Also rename APISite.loadrevisions rvdir to reverse and
provide backwards compatability for APISite.recentchanges rcdir.
Change-Id: Ia7a7620c53aa26d4fc4ae6870d275c8b73bcaf65
---
M pywikibot/page.py
M pywikibot/site.py
2 files changed, 60 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/88/227888/1
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 278ed54..7f8be0d 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -1472,7 +1472,7 @@
rollback=False, starttime=None, endtime=None):
Generator which loads the version history as Revision instances.
# TODO: Only request uncached revisions
-self.site.loadrevisions(self, getText=content, rvdir=reverse,
+self.site.loadrevisions(self, getText=content, reverse=reverse,
starttime=starttime, endtime=endtime,
step=step, total=total, rollback=rollback)
return (self._revisions[rev] for rev in
diff --git a/pywikibot/site.py b/pywikibot/site.py
index e77315c..d5164b3 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -1979,16 +1979,21 @@
'articlepath must end with /$1'
return self.siteinfo['general']['articlepath'][:-2]
-def assert_valid_iter_params(self, msg_prefix, start, end, reverse):
+def assert_valid_iter_params(self, msg_prefix, start, end, reverse,
+ suffix='', exception=Error):
Validate iterating API parameters.
+start_name = 'start' + suffix
+end_name = 'end' + suffix
if reverse:
if end start:
-raise Error(
-%s: end must be later than start with reverse=True %
msg_prefix)
+raise exception(
+'%s: %s(%r) must be greater than %s(%r) with reverse=True'
+% (msg_prefix, end_name, end, start_name, start))
else:
if start end:
-raise Error(
-%s: start must be later than end with reverse=False %
msg_prefix)
+raise exception(
+'%s: %s(%r) must be greater than %s(%r) with reverse=False'
+% (msg_prefix, start_name, start, end_name, end))
def has_right(self, right, sysop=False):
Return true if and only if the user has a specific right.
@@ -3278,6 +3283,7 @@
@type sortby: str
@param reverse: if True, generate results in reverse order
(default False)
+@type reverse: bool
@param starttime: if provided, only generate pages added after this
time; not valid unless sortby=timestamp
@type starttime: pywikibot.Timestamp
@@ -3316,12 +3322,15 @@
raise ValueError(
categorymembers: invalid sortby value '%s'
% sortby)
-if starttime and endtime and starttime endtime:
-raise ValueError(
-categorymembers: starttime must be before endtime)
-if startsort and endsort and startsort endsort:
-raise ValueError(
-categorymembers: startsort must be less than endsort)
+if starttime and endtime:
+self.assert_valid_iter_params('categorymembers',
+ starttime, endtime, reverse,
+ suffix='time', exception=ValueError)
+
+if startsort and endsort:
+self.assert_valid_iter_params('categorymembers',
+ startsort, endsort, reverse,
+ suffix='sort', exception=ValueError)
if isinstance(member_type, basestring):
member_type = set([member_type])
@@ -3401,21 +3410,22 @@
**cmargs)
return cmgen
+@deprecated_args(rvdir='reverse')
def loadrevisions(self, page, getText=False, revids=None,
startid=None, endid=None, starttime=None,
- endtime=None, rvdir=None, user=None, excludeuser=None,
+ endtime=None, reverse=False, user=None, excludeuser=None,
section=None, sysop=False, step=None, total=None,
rollback=False):
Retrieve and store revision information.
By default, retrieves the last (current) revision of the page,
unless any of the optional parameters revids, startid, endid,
-starttime, endtime, rvdir, user, excludeuser, or limit are
+starttime, endtime, reverse, user, excludeuser, or limit are
specified. Unless noted below,
[MediaWiki-commits] [Gerrit] adds geoIP tests - change (mediawiki...CentralNotice)
Cdentinger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227889
Change subject: adds geoIP tests
..
adds geoIP tests
Change-Id: Ia9e47eb8efd25e2a76279cea7fda847c09fa9c01
---
A tests/qunit/subscribing/ext.centralNotice.geoIP.tests.js
1 file changed, 100 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/89/227889/1
diff --git a/tests/qunit/subscribing/ext.centralNotice.geoIP.tests.js
b/tests/qunit/subscribing/ext.centralNotice.geoIP.tests.js
new file mode 100644
index 000..8c867ab
--- /dev/null
+++ b/tests/qunit/subscribing/ext.centralNotice.geoIP.tests.js
@@ -0,0 +1,100 @@
+( function ( me, $ ) {
+ 'use strict';
+
+ var badCookie = 'the car is on fire',
+ blankGeo = { country: '', region: '', city: '', lat: '', lon:
'', af: 'vx' },
+ cookieName = 'GeoIP',
+ madeAjaxCall = false,
+ realAjax = $.ajax;
+
+ QUnit.module( 'ext.centralNotice.geoIP', QUnit.newMwEnvironment( {
+ setup: function () {
+ },
+ teardown: function () {
+ $.ajax = realAjax;
+ }
+ } ) );
+
+ QUnit.test( 'validCookie', 3, function ( assert ) {
+ // Geo info should already be present here.
+ assert.ok( typeof window.Geo === 'object' );
+
+ // Nuke it.
+ window.Geo = null;
+
+ // Set up the ajax smoke signal.
+ $.ajax = function () {
+ madeAjaxCall = true;
+ // .always() gets called, so support it.
+ var p = $.Deferred();
+ p.resolve();
+ return p.promise();
+ }
+
+ // Running again should reparse the cookie.
+ mw.geoIP.setWindowGeo();
+
+ // When the promise resolves, you will find these things to be
true.
+ $.when( mw.geoIP.getPromise() ).then( function () {
+ // Should not make a background call when cookie is
present.
+ assert.equal( madeAjaxCall, false );
+ // Should re-add geo info.
+ assert.equal( typeof window.Geo, 'object' );
+ } );
+
+ } );
+
+ QUnit.test( 'invalidCookie', 3, function ( assert ) {
+ // Save the cookie and kill it.
+ var goodCookie = $.cookie( cookieName );
+ $.removeCookie( cookieName );
+
+ // Make a broken one.
+ $.cookie( cookieName, badCookie );
+
+ // Set the ajax call up to restore it.
+ $.ajax = function () {
+ madeAjaxCall = true;
+ $.removeCookie( cookieName );
+ $.cookie( cookieName, goodCookie );
+ var p = $.Deferred();
+ p.resolve();
+ return p.promise();
+ }
+
+ // Get busy.
+ window.Geo = null;
+ mw.geoIP.setWindowGeo();
+ $.when( mw.geoIP.getPromise() ).then( function () {
+ assert.equal( madeAjaxCall, true );
+ assert.equal( $.cookie( cookieName ), goodCookie );
+ assert.equal( typeof window.Geo, 'object' );
+ } );
+ } );
+
+ QUnit.test( 'requestFails', 4, function ( assert ) {
+ // Nuke the cookie.
+ $.removeCookie( cookieName );
+
+ // Set the ajax call to fail and leave the geo data blank
+ $.ajax = function () {
+ madeAjaxCall = true;
+ var p = $.Deferred();
+ p.resolve();
+ return p.promise();
+ }
+
+ window.Geo = null;
+ mw.geoIP.setWindowGeo();
+ $.when( mw.geoIP.getPromise() ).then( function () {
+ // TODO I don't think this callback should be firing.
+ assert.equal( JSON.stringify( window.Geo ),
JSON.stringify( blankGeo ) );
+ assert.equal( madeAjaxCall, true );
+ assert.equal( $.cookie( cookieName ), null );
+ assert.equal( typeof window.Geo, 'object' );
+ }, function () {
+ // TODO I think it should be this one as the promise
gets rejected.
+ } );
+ } );
+
+}( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/227889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9e47eb8efd25e2a76279cea7fda847c09fa9c01
Gerrit-PatchSet: 1
Gerrit-Project:
[MediaWiki-commits] [Gerrit] Rework styling of tool buttons on the NavbarHorizontal - change (mediawiki...chameleon)
Foxtrott has submitted this change and it was merged.
Change subject: Rework styling of tool buttons on the NavbarHorizontal
..
Rework styling of tool buttons on the NavbarHorizontal
Change-Id: I4687048f2aa80c81d9a1e0dadb1e52faa0e2ad7f
---
M docs/release-notes.md
M resources/styles/Components/NavbarHorizontal.less
M src/Components/NavbarHorizontal.php
3 files changed, 46 insertions(+), 24 deletions(-)
Approvals:
Foxtrott: Verified; Looks good to me, approved
diff --git a/docs/release-notes.md b/docs/release-notes.md
index f92f725..06a5164 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -4,6 +4,8 @@
Released on (tbd)
+This release may break customized styles for the NavbarHorizontal component.
+
Changes:
* Restructured the Page Tools on Navbars: The 'Edit' action and the Page Tools'
menu button got icons and were offset from the rest of the menus.
@@ -12,6 +14,10 @@
* 'Edit' link links to the proper Semantic Forms action if the
[SF extension](https://www.mediawiki.org/wiki/Extension:Semantic_Forms) is
present and `$sfgRenameEditTabs` is set
+* Improve styleability of tool buttons in NavbarHorizontal (wrap the button
+ label in a span) and rework rework styling of the buttons
+* Add ChameleonNavbarHorizontalPersonalToolsLinkText hook
+* Add ChameleonNavbarHorizontalNewTalkLinkText hook
* New less style variables @toolbar-height, @toolbar-padding-vertical,
@toolbar-padding-horizontal
diff --git a/resources/styles/Components/NavbarHorizontal.less
b/resources/styles/Components/NavbarHorizontal.less
index ea1dede..42c3486 100644
--- a/resources/styles/Components/NavbarHorizontal.less
+++ b/resources/styles/Components/NavbarHorizontal.less
@@ -99,12 +99,13 @@
border-right: none;
li:first-child a {
- border-radius: 0 @navbar-border-radius 0 0;
+ border-top-right-radius: @navbar-border-radius;
}
li:last-child a {
- border-radius: 0 0 @navbar-border-radius 0;
+ border-bottom-right-radius:
@navbar-border-radius;
}
+
}
}
}
@@ -163,34 +164,38 @@
float: none;
height: @navbar-height/2;
+ min-width: 2 * @navbar-height/3;
text-align: center;
+
+ border-color: @navbar-default-border;
+ border-bottom: 1px solid @navbar-default-border;
:last-child {
border: none;
}
- span, a {
- line-height: @line-height-computed/2;
- }
-
-
-
a, a:hover, a:focus {
- height: @navbar-height/2;
- padding: @navbar-padding-vertical/2
@navbar-padding-vertical/2;
-
- border-color: @navbar-default-border;
- border-bottom: 1px solid @navbar-default-border;
+ height: 100%;
+ padding: 0;
overflow: hidden;
- img {
+* {
+ padding: @navbar-padding-vertical/2
@navbar-padding-vertical/2;
+ display: inline-block;
+ line-height: @line-height-computed/2;
+ }
+
+img {
top: 50%;
left: 50%;
position: absolute;
- margin-right: -@navbar-padding-vertical;
.translate(-50%; -50%);
+
+ padding: 0;
+ min-height: 101%;
+ min-width: 101%;
:hover, :focus {
opacity: .7;
@@ -199,13 +204,14 @@
}
:first-child:last-child {
- span, a {
- line-height: @line-height-computed;
- }
+
+ height: @navbar-height;
a, a:hover, a:focus {
- height: @navbar-height;
- padding: @navbar-padding-vertical
@navbar-padding-vertical/2;
+
[MediaWiki-commits] [Gerrit] adding new employee Mikhail Popov to discovery hosts - change (operations/puppet)
RobH has submitted this change and it was merged. Change subject: adding new employee Mikhail Popov to discovery hosts .. adding new employee Mikhail Popov to discovery hosts Adding Mikhail's user to shell access and related discovery hosts requested. The initial request wasn't entirely clear at first, but this will also include admin rights to restart some services. As those rights require ops meeting review, non sudo groups have been included in this patchset, along with the inital user. T107043 Change-Id: Ibf94803b4b4bdd8d3ddffb1258a10b417021079d --- M modules/admin/data/data.yaml 1 file changed, 12 insertions(+), 5 deletions(-) Approvals: RobH: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 181faa8..fbd9aec 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -58,7 +58,7 @@ gid: 706 description: access to terbium, fluorine (private data) and bastion hosts restricted folks use sudo to access apache / www-data resources -members: [daniel, dartar, ellery, +members: [daniel, dartar, ellery, bearloga, ezachte, hoo, jamesur, jdlrobson, khorn, tparscal, tnegrin, ssastry, ironholds, nuria, leila, santhosh, amire80, legoktm, jsahleen] privileges: ['ALL = (www-data,apache) NOPASSWD: ALL'] @@ -104,7 +104,7 @@ members: [awight, bmansurov, catrope, dartar, declerambaul, deskana, dduvall, ellery, ezachte, gage, gilles, haithams, halfak, handrade, ironholds, jforrester, jkatz, jmorgan, jzerebecki, kaldari, - kleduc, leila, mattflaschen, milimetric, nettrom, + kleduc, leila, mattflaschen, milimetric, nettrom, bearloga, nuria, ori, otto, springle, tnegrin, yurik, yuvipanda, mforns, jdlrobson, dr0ptp4kt, tgr, marktraceur, jhernandez, joal, daisy, tomasz, mholloway-shell, madhuvishy, ebernhardson, niedzielski, @@ -163,11 +163,11 @@ halfak, awight, dr0ptp4kt, tnegrin, nuria, leila, manybubbles, ironholds, kleduc, ellery, nettrom, mforns, spage, bmansurov, rmoen, tbayer, joal, ashwinpp, - madhuvishy, jdouglas, tjones, legoktm, dcausse] + madhuvishy, jdouglas, tjones, legoktm, dcausse, bearloga] statistics-users: gid: 726 description: Access hosts with a mysql client for research. NO PRIVS. -members: [dartar, halfak, ironholds, jdlrobson, jmorgan, +members: [dartar, halfak, ironholds, jdlrobson, jmorgan, bearloga, mattflaschen, mhurd, yurik, awight, jforrester, tnegrin, marktraceur, msyed, nuria, leila, gilles, haithams, dbrant, tgr, haithams, handrade, dr0ptp4kt, brion, bsitzmann, @@ -212,7 +212,7 @@ Hadoop NameNodes. Some files in HDFS have sensitive data in them. Those files are group readable by the analytics-privatedata-users group. members: [dartar, milimetric, yurik, - halfak, dr0ptp4kt, tnegrin, ironholds, + halfak, dr0ptp4kt, tnegrin, ironholds, bearloga, kleduc, nuria, haithams, otto, deskana, bsitzmann, dbrant, declerambaul, ellery, nettrom, leila, ezachte, mforns, reedy, west1, phuedx, ananthrk, awight, @@ -1509,3 +1509,10 @@ realname: Srijan Kumar ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQDe6n6czECv3pzmwxKgfdd9A/XWmoqssk2MByt/Tra4DihPF25EhbcsoyeqosGcgCmkaDXZCQj6BfOh/VHGOUx6nkMf0bFkQrO25n8pdznMBnUfvGNAQUG2tWllA5q1uzmsQD80EqMtsbjr+Yl3HHE5StiqI6O9Ewxcsj2YsDA350ABzulcf4S81M7ej5ZIV/fmbNPJmCCKD3Ke33k3MCNJqCQpSDohKs9tZYKyhobb09n/OUsl+PNKn3VdDTPJMr+h0el8Y3QM1xHW2qbrUPg5qWSFHtLCBFhWlYhtciznhZTvdv7L7sOdwVCZahNNeAK5Cv4nyBHRjo09p7do9MSz srijanke...@gmail.com] uid: 12423 + bearloga: +ensure: present +gid: 500 +name: mpopov +realname: Mikhail Popov +ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAACAQC+3r+/y8Wsc4t6c18VXygHTLev9m6rLZqPUCSQdaH0qdyb97O3RlNdqoOZ0rbuPshFMyZjADlYT2TH/UX3fN/TkHJCQrJpk0L/Zc+NDbofejDs4TClbYYgcfZiBhLs7OylheM6Ut0KOmAQXE3qh6pUz1/U/fTwCtml6mFbbNaPPSq62eYNXYqTCGkTUXeuiodJ1bGRwDh1qmIlK5x657roNcJ1ADR7HCWZhnmLKPSOnjAIpN9ulZbvUiT98Pd4Bv4W0GZk6D8wMfbjKFmzv3XGdPjRrUo4JFVzwgJRXlzdEJKEn0v8yMSEthj0CygtUkWb104zgyw0756O9oxsQEI3jVHnb/4Z50xIL1AeuarO1Yi5xN2tTujACo9oAnuDKFqHY3vO6kv5kTZ61/2Foq5BIPA/SFSrSDuHWlveHxp2d2EYRf82E5gJ3ii0tVhSZKpIoiSjE2hGHBTN9iOumkSyL3wOT6YV+bGA4sKs5YgZl36xI8rT8hzBi0XLLy+6MfH+bGMhkBY+tLODj5hjcIBTt8iyjzQHhg2FqAKJX0unV2dTJxHmKLQBG5eVB89p7DKYBr5PhS7uC/zGIGHa08MsJUaWTCACY/jp0cln4MRt1/k4Mx+1Frb/bkzzO4IfchakMZX41m6hkKS29uWOXvTQtxwByamah/RsfhS5B+vI1Q== mpo...@wikimedia.org] +uid: 12625 -- To view, visit https://gerrit.wikimedia.org/r/227877 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged
[MediaWiki-commits] [Gerrit] Use STRAIGHT_JOIN in SpecialWhatlinkshere query - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227878
Change subject: Use STRAIGHT_JOIN in SpecialWhatlinkshere query
..
Use STRAIGHT_JOIN in SpecialWhatlinkshere query
* Also added a type hint to avoid IDE errors in this area
Bug: T106682
Change-Id: I825eedaceb0c0323de85466e48582d72c57b201a
---
M includes/specials/SpecialWhatlinkshere.php
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/78/227878/1
diff --git a/includes/specials/SpecialWhatlinkshere.php
b/includes/specials/SpecialWhatlinkshere.php
index 5db81d4..0df1c34 100644
--- a/includes/specials/SpecialWhatlinkshere.php
+++ b/includes/specials/SpecialWhatlinkshere.php
@@ -155,7 +155,7 @@
$conds['pagelinks'][] = 'rd_from is NOT NULL';
}
- $queryFunc = function ( $dbr, $table, $fromCol ) use (
+ $queryFunc = function ( IDatabase $dbr, $table, $fromCol ) use (
$conds, $target, $limit, $useLinkNamespaceDBFields
) {
// Read an extra row as an at-end check
@@ -174,7 +174,8 @@
array( $fromCol, 'rd_from' ),
$conds[$table],
__CLASS__ . '::showIndirectLinks',
- array( 'ORDER BY' = $fromCol, 'LIMIT' = 2 *
$queryLimit ),
+ // Force JOIN order per T106682 to avoid large
filesorts
+ array( 'ORDER BY' = $fromCol, 'LIMIT' = 2 *
$queryLimit, 'STRAIGHT_JOIN' ),
array(
'page' = array( 'INNER JOIN',
$fromCol = page_id ),
'redirect' = array( 'LEFT JOIN', $on )
--
To view, visit https://gerrit.wikimedia.org/r/227878
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I825eedaceb0c0323de85466e48582d72c57b201a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Stop running composer twice - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Stop running composer twice .. Stop running composer twice Since composer-merge-plugin v1.2.1 is used in core eba9321b2b75823f8e9797398f44944e8a05389a the bug which we worked around with this should not happen anymore. Change-Id: Ic8b37c0fb8c5afbbe9b115f49b016141e779b356 --- M jjb/wikidata.yaml 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Hashar: Looks good to me, but someone else must approve JanZerebecki: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml index 8ad0b49..3f3d8a9 100644 --- a/jjb/wikidata.yaml +++ b/jjb/wikidata.yaml @@ -6,8 +6,6 @@ cd $WORKSPACE/src/ /srv/deployment/integration/slave-scripts/bin/mw-create-composer-local.py ../deps.txt composer.local.json timeout 300 composer update --prefer-source -vvv -# FIXME BUG the first run just exits without error without finishing especially in a clean working copy -timeout 300 composer update --prefer-source -vvv - builder: name: wd-wikibase-apply-settings -- To view, visit https://gerrit.wikimedia.org/r/227631 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic8b37c0fb8c5afbbe9b115f49b016141e779b356 Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: JanZerebecki jan.wikime...@zerebecki.de Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] RedisConnectionPool: convert to PSR3 logging - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: RedisConnectionPool: convert to PSR3 logging
..
RedisConnectionPool: convert to PSR3 logging
Convert from wfDebug* logging to Psr\Log\LoggerInterface. Use structured
logging data to tag log messages the associated redis server.
Bug: T88649
Change-Id: I5fc4c68e52b13a688bdcc93d9defc9f973323241
---
M includes/clientpool/RedisConnectionPool.php
1 file changed, 87 insertions(+), 15 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/clientpool/RedisConnectionPool.php
b/includes/clientpool/RedisConnectionPool.php
index dc95727..0d00d11 100644
--- a/includes/clientpool/RedisConnectionPool.php
+++ b/includes/clientpool/RedisConnectionPool.php
@@ -22,6 +22,10 @@
* @author Aaron Schulz
*/
+use MediaWiki\Logger\LoggerFactory;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerInterface;
+
/**
* Helper class to manage Redis connections.
*
@@ -69,6 +73,11 @@
const SERVER_DOWN_TTL = 30;
/**
+* @var LoggerInterface
+*/
+ protected $logger;
+
+ /**
* @param array $options
* @throws MWException
*/
@@ -76,6 +85,11 @@
if ( !class_exists( 'Redis' ) ) {
throw new MWException( __CLASS__ . ' requires a Redis
client library. ' .
'See
https://www.mediawiki.org/wiki/Redis#Setup' );
+ }
+ if ( isset( $options['logger'] ) ) {
+ $this-setLogger( $options['logger'] );
+ } else {
+ $this-setLogger( LoggerFactory::getInstance( 'redis' )
);
}
$this-connectTimeout = $options['connectTimeout'];
$this-readTimeout = $options['readTimeout'];
@@ -90,6 +104,14 @@
} else {
throw new MWException( Invalid serializer specified.
);
}
+ }
+
+ /**
+* @param LoggerInterface $logger
+* @return null
+*/
+ public function setLogger( LoggerInterface $logger ) {
+ $this-logger = $logger;
}
/**
@@ -136,7 +158,9 @@
// Initialize the object at the hash as needed...
if ( !isset( self::$instances[$id] ) ) {
self::$instances[$id] = new self( $options );
- wfDebug( Creating a new . __CLASS__ . instance
with id $id.\n );
+ LoggerFactory::getInstance( 'redis' )-debug(
+ Creating a new . __CLASS__ . instance with
id $id.
+ );
}
return self::$instances[$id];
@@ -161,8 +185,11 @@
unset( $this-downServers[$server] );
} else {
// Server is dead
- wfDebug( server $server is marked down for
another .
- ( $this-downServers[$server] - $now )
. seconds, can't get connection\n );
+ $this-logger-debug(
+ 'Server {redis_server} is marked down
for another ' .
+ ( $this-downServers[$server] - $now )
. 'seconds',
+ array( 'redis_server' = $server )
+ );
return false;
}
@@ -175,7 +202,9 @@
$connection['free'] = false;
--$this-idlePoolSize;
- return new RedisConnRef( $this,
$server, $connection['conn'] );
+ return new RedisConnRef(
+ $this, $server,
$connection['conn'], $this-logger
+ );
}
}
}
@@ -206,7 +235,10 @@
$result = $conn-connect( $host, $port,
$this-connectTimeout );
}
if ( !$result ) {
- wfDebugLog( 'redis', Could not connect to
server $server );
+ $this-logger-error(
+ 'Could not connect to server
{redis_server}',
+ array( 'redis_server' = $server )
+ );
// Mark server down for some time to avoid
further timeouts
$this-downServers[$server] = time() +
self::SERVER_DOWN_TTL;
@@ -214,12 +246,21 @@
}
if (
[MediaWiki-commits] [Gerrit] nutcracker: prevent servers from being marked as dead indefi... - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227881
Change subject: nutcracker: prevent servers from being marked as dead
indefinitely
..
nutcracker: prevent servers from being marked as dead indefinitely
* Set a 30s server-retry-timeout. When this configuration option is unset, a
transient connection failure is liable to make Nutcracker mark a server as
dead forever (or at least until it is restarted).[1]
* Reduce the number of server connections from 1 to 2. Having more than one
server connections makes twemproxy reads and writes not repeatable, and I am
not persuaded that we correctly account for that everywhere.[2]
[1]:
https://github.com/twitter/twemproxy/blob/594105/notes/recommendation.md#liveness
[2]:
https://github.com/twitter/twemproxy/blob/594105/notes/recommendation.md#server_connections--1
Change-Id: I546c1606cd9ad91eb5c9a1160ed6599d3129
---
M manifests/role/mediawiki.pp
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/81/227881/1
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index 84e6d8a..81df319 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -25,8 +25,9 @@
hash = 'md5',
listen = '127.0.0.1:11212',
preconnect = true,
-server_connections = 2,
+server_connections = 1,
server_failure_limit = 3,
+server_retry_timeout = to_milliseconds('30s'),
timeout = 250,
servers = hiera('mediawiki_memcached_servers'),
},
@@ -36,8 +37,9 @@
hash = 'md5',
listen = '/var/run/nutcracker/nutcracker.sock 0666',
preconnect = true,
-server_connections = 2,
+server_connections = 1,
server_failure_limit = 3,
+server_retry_timeout = to_milliseconds('30s'),
timeout = 250,
servers = hiera('mediawiki_memcached_servers'),
},
@@ -49,8 +51,9 @@
hash = 'md5',
listen = '127.0.0.1:6380',
preconnect = true,
-server_connections = 2,
+server_connections = 1,
server_failure_limit = 3,
+server_retry_timeout = to_milliseconds('30s'),
timeout = 1000,
servers = hiera('mediawiki_session_redis_servers'),
},
--
To view, visit https://gerrit.wikimedia.org/r/227881
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I546c1606cd9ad91eb5c9a1160ed6599d3129
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] accidental sudo escalation for bearloga - change (operations/puppet)
RobH has submitted this change and it was merged. Change subject: accidental sudo escalation for bearloga .. accidental sudo escalation for bearloga robh accidentally added to a restricted group that needs sudo ops meeting review, reverting the bad part of the change. T107043 Change-Id: Ia61cfc98edd41eb7bfa687859ecd56a766f239b0 --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: RobH: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index fbd9aec..8db74ed 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -58,7 +58,7 @@ gid: 706 description: access to terbium, fluorine (private data) and bastion hosts restricted folks use sudo to access apache / www-data resources -members: [daniel, dartar, ellery, bearloga, +members: [daniel, dartar, ellery, ezachte, hoo, jamesur, jdlrobson, khorn, tparscal, tnegrin, ssastry, ironholds, nuria, leila, santhosh, amire80, legoktm, jsahleen] privileges: ['ALL = (www-data,apache) NOPASSWD: ALL'] -- To view, visit https://gerrit.wikimedia.org/r/227880 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia61cfc98edd41eb7bfa687859ecd56a766f239b0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: RobH r...@wikimedia.org Gerrit-Reviewer: RobH r...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish default error page: Convert literal utf8 nbsp to htm... - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/227882 Change subject: varnish default error page: Convert literal utf8 nbsp to html entities .. varnish default error page: Convert literal utf8 nbsp to html entities Change-Id: I87802d126141269e1a9b6dc40a422927948b7982 --- M templates/varnish/errorpage.inc.vcl.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/82/227882/1 diff --git a/templates/varnish/errorpage.inc.vcl.erb b/templates/varnish/errorpage.inc.vcl.erb index eaccbe4..92452a9 100644 --- a/templates/varnish/errorpage.inc.vcl.erb +++ b/templates/varnish/errorpage.inc.vcl.erb @@ -34,7 +34,7 @@ div class=content role=main a href=//www.wikimedia.orgimg src=%= wmf_png % srcset=//www.wikimedia.org/static/images/wmf-2x.png 2x alt=Wikimedia width=135 height=135/a h1Error/h1 -pOur servers are currently experiencing a technical problem. This is probably temporary and should be fixed soon.brPlease a href= title=Reload this page onclick=window.location.reload(false); return falsetry again/a in a few minutes./p +pOur servers are currently experiencing a technical problem. This is probably temporary and should be fixednbsp;soon.brPlease a href= title=Reload this page onclick=window.location.reload(false); return falsetry again/a in a fewnbsp;minutes./p /div div class=footer pIf you report this error to the Wikimedia System Administrators, please include the details below./p -- To view, visit https://gerrit.wikimedia.org/r/227882 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I87802d126141269e1a9b6dc40a422927948b7982 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish default error page: no linebreak before DOCTYPE - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227883
Change subject: varnish default error page: no linebreak before DOCTYPE
..
varnish default error page: no linebreak before DOCTYPE
Change-Id: Ib1ac16d6b02c4dc7ea9685b39c3e5b4b3406f16e
---
M templates/varnish/errorpage.inc.vcl.erb
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/227883/1
diff --git a/templates/varnish/errorpage.inc.vcl.erb
b/templates/varnish/errorpage.inc.vcl.erb
index 92452a9..c66c23c 100644
--- a/templates/varnish/errorpage.inc.vcl.erb
+++ b/templates/varnish/errorpage.inc.vcl.erb
@@ -12,8 +12,7 @@
sub synth_errorpage {
set obj.http.Content-Type = text/html; charset=utf-8;
- synthetic {
-!DOCTYPE html
+ synthetic {!DOCTYPE html
html lang=en
meta charset=utf-8
titleWikimedia Error/title
--
To view, visit https://gerrit.wikimedia.org/r/227883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1ac16d6b02c4dc7ea9685b39c3e5b4b3406f16e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish default error page: Convert literal utf8 nbsp to htm... - change (operations/puppet)
BBlack has submitted this change and it was merged. Change subject: varnish default error page: Convert literal utf8 nbsp to html entities .. varnish default error page: Convert literal utf8 nbsp to html entities Change-Id: I87802d126141269e1a9b6dc40a422927948b7982 --- M templates/varnish/errorpage.inc.vcl.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, but someone else must approve BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/varnish/errorpage.inc.vcl.erb b/templates/varnish/errorpage.inc.vcl.erb index eaccbe4..92452a9 100644 --- a/templates/varnish/errorpage.inc.vcl.erb +++ b/templates/varnish/errorpage.inc.vcl.erb @@ -34,7 +34,7 @@ div class=content role=main a href=//www.wikimedia.orgimg src=%= wmf_png % srcset=//www.wikimedia.org/static/images/wmf-2x.png 2x alt=Wikimedia width=135 height=135/a h1Error/h1 -pOur servers are currently experiencing a technical problem. This is probably temporary and should be fixed soon.brPlease a href= title=Reload this page onclick=window.location.reload(false); return falsetry again/a in a few minutes./p +pOur servers are currently experiencing a technical problem. This is probably temporary and should be fixednbsp;soon.brPlease a href= title=Reload this page onclick=window.location.reload(false); return falsetry again/a in a fewnbsp;minutes./p /div div class=footer pIf you report this error to the Wikimedia System Administrators, please include the details below./p -- To view, visit https://gerrit.wikimedia.org/r/227882 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I87802d126141269e1a9b6dc40a422927948b7982 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove p/p wrapping around label that shows in tooltip - change (mediawiki...SecurePoll)
jenkins-bot has submitted this change and it was merged. Change subject: Remove p/p wrapping around label that shows in tooltip .. Remove p/p wrapping around label that shows in tooltip Bug 30399 Change-Id: I45a7651803124e255105feb7d05a4bcd0dc9342c --- M includes/ballots/RadioRangeBallot.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Bartosz Dziewoński: Looks good to me, but someone else must approve Fhocutt: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/ballots/RadioRangeBallot.php b/includes/ballots/RadioRangeBallot.php index 5e3524d..48f854e 100644 --- a/includes/ballots/RadioRangeBallot.php +++ b/includes/ballots/RadioRangeBallot.php @@ -234,7 +234,7 @@ $s .= Xml::tags( 'td', array(), Xml::radio( $inputId, $score, !strcmp( $oldValue, $score ), - array( 'title' = $label ) ) + array( 'title' = Sanitizer::stripAllTags( $label ) ) ) ) . \n; } $s .= /tr\n; -- To view, visit https://gerrit.wikimedia.org/r/90555 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I45a7651803124e255105feb7d05a4bcd0dc9342c Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/SecurePoll Gerrit-Branch: master Gerrit-Owner: Diederik dvanli...@gmail.com Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Fhocutt fhoc...@wikimedia.org Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: Qgil q...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: Tim Starling tstarl...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make scrollIntoView a VE utility function - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Make scrollIntoView a VE utility function
..
Make scrollIntoView a VE utility function
This allows it to be disabled in test mode
Bug: T107122
Change-Id: Id9b460f1a3baf6568c4634c1494c44cb54d51387
---
M src/ce/nodes/ve.ce.TableNode.js
M src/ce/ve.ce.Surface.js
M src/ve.utils.js
M tests/ve.test.utils.js
4 files changed, 12 insertions(+), 3 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
Jforrester: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/src/ce/nodes/ve.ce.TableNode.js b/src/ce/nodes/ve.ce.TableNode.js
index 913ccad..deb56de 100644
--- a/src/ce/nodes/ve.ce.TableNode.js
+++ b/src/ce/nodes/ve.ce.TableNode.js
@@ -432,7 +432,7 @@
.toggleClass( 've-ce-tableNodeOverlay-selection-box-fullCol',
selection.isFullCol() );
if ( selectionChanged ) {
- OO.ui.Element.static.scrollIntoView( this.$selectionBox.get( 0
) );
+ ve.scrollIntoView( this.$selectionBox.get( 0 ) );
}
};
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 3b0281a..281d033 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -2327,7 +2327,7 @@
this.surfaceObserver.clear();
}
// If the node is outside the view, scroll to it
- OO.ui.Element.static.scrollIntoView(
this.focusedNode.$element.get( 0 ) );
+ ve.scrollIntoView(
this.focusedNode.$element.get( 0 ) );
}
}
} else {
@@ -3865,7 +3865,7 @@
$( newSel.focusNode ).closest( '[contenteditable=true]'
).focus();
} else {
// Scroll the node into view
- OO.ui.Element.static.scrollIntoView(
+ ve.scrollIntoView(
$( newSel.focusNode ).closest( '*' ).get( 0 )
);
}
diff --git a/src/ve.utils.js b/src/ve.utils.js
index 81a0ef6..4cf791e 100644
--- a/src/ve.utils.js
+++ b/src/ve.utils.js
@@ -69,6 +69,12 @@
ve.debounce = OO.ui.debounce;
/**
+ * @method
+ * @inheritdoc OO.ui.Element#scrollIntoView
+ */
+ve.scrollIntoView = OO.ui.Element.static.scrollIntoView;
+
+/**
* Copy an array of DOM elements, optionally into a different document.
*
* @param {HTMLElement[]} domElements DOM elements to copy
diff --git a/tests/ve.test.utils.js b/tests/ve.test.utils.js
index 2503da4..466c452 100644
--- a/tests/ve.test.utils.js
+++ b/tests/ve.test.utils.js
@@ -15,6 +15,9 @@
// Configure QUnit
QUnit.config.requireExpects = true;
+ // Disable scroll animatinos
+ ve.scrollIntoView = function () {};
+
// Extend QUnit.module to provide a fixture element. This used to be in
tests/index.html, but
// dynamic test runners like Karma build their own web page.
( function () {
--
To view, visit https://gerrit.wikimedia.org/r/227751
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id9b460f1a3baf6568c4634c1494c44cb54d51387
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] DesktopArticleTarget-*.css: Placeholder CSS fixes for skins - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: DesktopArticleTarget-*.css: Placeholder CSS fixes for skins
..
DesktopArticleTarget-*.css: Placeholder CSS fixes for skins
Change-Id: I8c7f98cc083c0811cd847a8b3874a586487658ca
---
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
2 files changed, 12 insertions(+), 2 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
Jforrester: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git
a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css
index a08114e..b760ee5 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css
@@ -40,8 +40,11 @@
padding: 0;
}
-.ve-init-mw-target-surface .ve-ui-surface-placeholder {
- margin-top: -0.45em;
+.mw-body .ve-init-mw-target-surface .ve-ui-surface-placeholder * {
+ /* Fix margin overlap */
+ margin-top: 0;
+ /* Placeholder doesn't need a border as well */
+ border: 0;
}
.ve-init-target .ve-ui-debugBar {
diff --git
a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
index af70b1f..548ef0d 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
@@ -28,6 +28,13 @@
padding: 0 1.143em; /* surface-margin-left (1em) / (mw-body-content
font-size) 0.875em */
}
+.mw-body .ve-init-mw-viewPageTarget-surface .ve-ui-surface-placeholder * {
+ /* Fix margin overlap */
+ margin-top: 0;
+ /* Placeholder doesn't need a border as well */
+ border: 0;
+}
+
.ve-init-target,
.ve-ui-overlay-global {
/* Enforce different font-size for all UI elements of VisualEditor */
--
To view, visit https://gerrit.wikimedia.org/r/227671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8c7f98cc083c0811cd847a8b3874a586487658ca
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ignore debug level messages from the 'redis' logging channel - change (operations/mediawiki-config)
BryanDavis has uploaded a new change for review. https://gerrit.wikimedia.org/r/227892 Change subject: Ignore debug level messages from the 'redis' logging channel .. Ignore debug level messages from the 'redis' logging channel Follow up I5fc4c68e52b13a688bdcc93d9defc9f973323241 which moved some redis related logging from wfDebug() to debug level on the redis channel. Change-Id: I2d3eebaf46521440b76f322faba07a13d24155a5 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/92/227892/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ea5323e..af303a1 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -4319,7 +4319,7 @@ 'FileOperation' = 'debug', 'SwiftBackend' = 'debug', // -aaron 5/15/12 'updateTranstagOnNullRevisions' = 'debug', - 'redis' = 'debug', // -asher 2012/10/12 + 'redis' = 'info', // -asher 2012/10/12 'memcached' = 'error', // -aaron 2012/10/24 '404' = 'debug', 'resourceloader' = 'debug', -- To view, visit https://gerrit.wikimedia.org/r/227892 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d3eebaf46521440b76f322faba07a13d24155a5 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: BryanDavis bda...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Version update: 7.6.2 - 7.7.0 - change (operations...sentry)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/227899 Change subject: Version update: 7.6.2 - 7.7.0 .. Version update: 7.6.2 - 7.7.0 The sentry maintainers suggested this might solve / make easier to debug a problem with Sentry caching. Change-Id: I7a0ce9e087dee1b95f916288785470b1423f5435 --- M README.md M bin/sentry A include/python2.7 M lib/python2.7/site-packages/_cffi_backend.so M lib/python2.7/site-packages/cryptography/_Cryptography_cffi_26cb75b8x62b488b1.so M lib/python2.7/site-packages/cryptography/_Cryptography_cffi_590da19fxffc7b1ce.so M lib/python2.7/site-packages/cryptography/_Cryptography_cffi_a269d620xd5c405b7.so M lib/python2.7/site-packages/lxml/etree.so M lib/python2.7/site-packages/lxml/objectify.so R lib/python2.7/site-packages/raven-5.5.0.dist-info/DESCRIPTION.rst R lib/python2.7/site-packages/raven-5.5.0.dist-info/METADATA R lib/python2.7/site-packages/raven-5.5.0.dist-info/RECORD R lib/python2.7/site-packages/raven-5.5.0.dist-info/WHEEL R lib/python2.7/site-packages/raven-5.5.0.dist-info/entry_points.txt R lib/python2.7/site-packages/raven-5.5.0.dist-info/metadata.json R lib/python2.7/site-packages/raven-5.5.0.dist-info/top_level.txt M lib/python2.7/site-packages/raven/base.py M lib/python2.7/site-packages/raven/conf/defaults.py M lib/python2.7/site-packages/raven/contrib/django/models.py M lib/python2.7/site-packages/raven/contrib/flask.py M lib/python2.7/site-packages/raven/contrib/zope/component.xml M lib/python2.7/site-packages/raven/handlers/logging.py R lib/python2.7/site-packages/sentry-7.7.0-py2.7.egg-info/PKG-INFO R lib/python2.7/site-packages/sentry-7.7.0-py2.7.egg-info/SOURCES.txt R lib/python2.7/site-packages/sentry-7.7.0-py2.7.egg-info/dependency_links.txt R lib/python2.7/site-packages/sentry-7.7.0-py2.7.egg-info/entry_points.txt R lib/python2.7/site-packages/sentry-7.7.0-py2.7.egg-info/installed-files.txt R lib/python2.7/site-packages/sentry-7.7.0-py2.7.egg-info/not-zip-safe R lib/python2.7/site-packages/sentry-7.7.0-py2.7.egg-info/requires.txt R lib/python2.7/site-packages/sentry-7.7.0-py2.7.egg-info/top_level.txt M lib/python2.7/site-packages/sentry/api/authentication.py M lib/python2.7/site-packages/sentry/api/base.py M lib/python2.7/site-packages/sentry/api/bases/group.py M lib/python2.7/site-packages/sentry/api/client.py M lib/python2.7/site-packages/sentry/api/endpoints/catchall.py M lib/python2.7/site-packages/sentry/api/endpoints/group_details.py M lib/python2.7/site-packages/sentry/api/endpoints/group_events_latest.py A lib/python2.7/site-packages/sentry/api/endpoints/group_index.py M lib/python2.7/site-packages/sentry/api/endpoints/group_tagkey_details.py M lib/python2.7/site-packages/sentry/api/endpoints/group_tags.py M lib/python2.7/site-packages/sentry/api/endpoints/organization_access_request_details.py M lib/python2.7/site-packages/sentry/api/endpoints/organization_details.py M lib/python2.7/site-packages/sentry/api/endpoints/organization_member_team_details.py M lib/python2.7/site-packages/sentry/api/endpoints/organization_teams.py M lib/python2.7/site-packages/sentry/api/endpoints/project_group_index.py M lib/python2.7/site-packages/sentry/api/endpoints/project_releases.py A lib/python2.7/site-packages/sentry/api/endpoints/project_search_details.py A lib/python2.7/site-packages/sentry/api/endpoints/project_searches.py M lib/python2.7/site-packages/sentry/api/permissions.py M lib/python2.7/site-packages/sentry/api/serializers/base.py M lib/python2.7/site-packages/sentry/api/serializers/models/group.py M lib/python2.7/site-packages/sentry/api/serializers/models/grouptagvalue.py M lib/python2.7/site-packages/sentry/api/serializers/models/release.py A lib/python2.7/site-packages/sentry/api/serializers/models/savedsearch.py M lib/python2.7/site-packages/sentry/api/urls.py M lib/python2.7/site-packages/sentry/api/views/help_base.py M lib/python2.7/site-packages/sentry/app.py M lib/python2.7/site-packages/sentry/auth/helper.py M lib/python2.7/site-packages/sentry/auth/providers/oauth2.py M lib/python2.7/site-packages/sentry/auth/view.py M lib/python2.7/site-packages/sentry/buffer/base.py M lib/python2.7/site-packages/sentry/buffer/redis.py M lib/python2.7/site-packages/sentry/conf/server.py M lib/python2.7/site-packages/sentry/conf/urls.py M lib/python2.7/site-packages/sentry/constants.py M lib/python2.7/site-packages/sentry/coreapi.py M lib/python2.7/site-packages/sentry/db/models/query.py M lib/python2.7/site-packages/sentry/db/postgres/base.py M lib/python2.7/site-packages/sentry/db/postgres/helpers.py M lib/python2.7/site-packages/sentry/event_manager.py M lib/python2.7/site-packages/sentry/exceptions.py M lib/python2.7/site-packages/sentry/http.py M lib/python2.7/site-packages/sentry/interfaces/stacktrace.py M lib/python2.7/site-packages/sentry/lang/javascript/processor.py M lib/python2.7/site-packages/sentry/lang/javascript/sourcemaps.py A
[MediaWiki-commits] [Gerrit] Promote Tabs to production. - change (apps...wikipedia)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227900
Change subject: Promote Tabs to production.
..
Promote Tabs to production.
almost forgot!
Change-Id: Id254296acfe2755c9aa59a1cb6a0069654beb0ea
---
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
1 file changed, 0 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/00/227900/1
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index ae8710b..e15333f 100755
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -691,12 +691,6 @@
MenuItem themeChooserMenu = menu.findItem(R.id.menu_themechooser);
MenuItem tabsMenu = menu.findItem(R.id.menu_show_tabs);
-//TODO: enable when ready for production!
-if (app.isProdRelease() tabsMenu != null) {
-// remove the tabs button in production, for now.
-menu.removeItem(tabsMenu.getItemId());
-}
-
if (pageLoadStrategy.isLoading()) {
savePageMenu.setEnabled(false);
shareMenu.setEnabled(false);
--
To view, visit https://gerrit.wikimedia.org/r/227900
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id254296acfe2755c9aa59a1cb6a0069654beb0ea
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Missing argument exception on accessing Aggregated Scores page - change (wikimedia/iegreview)
jenkins-bot has submitted this change and it was merged.
Change subject: Missing argument exception on accessing Aggregated Scores page
..
Missing argument exception on accessing Aggregated Scores page
Change-Id: Ib726343b21221f47ecf5aa42fe770390665bacd4
---
M src/Controllers/Reports/AbstractReport.php
M src/Controllers/Reports/Aggregated.php
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Niharika29: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/Controllers/Reports/AbstractReport.php
b/src/Controllers/Reports/AbstractReport.php
index ce71593..b53f298 100644
--- a/src/Controllers/Reports/AbstractReport.php
+++ b/src/Controllers/Reports/AbstractReport.php
@@ -43,7 +43,7 @@
* 'sortable' = true/false
* @return array Column descriptions
*/
- abstract protected function describeColumns();
+ abstract protected function describeColumns( $campaign );
/**
* @return stdClass Results object
@@ -91,7 +91,7 @@
$this-setupForm();
$this-form-validate( $_GET );
- $this-view-setData( 'columns', $this-describeColumns() );
+ $this-view-setData( 'columns', $this-describeColumns(
$campaign ) );
$this-view-set( 'items', $this-form-get( 'items' ) );
$this-view-set( 'p', $this-form-get( 'p' ) );
diff --git a/src/Controllers/Reports/Aggregated.php
b/src/Controllers/Reports/Aggregated.php
index 5ca63af..75ce639 100644
--- a/src/Controllers/Reports/Aggregated.php
+++ b/src/Controllers/Reports/Aggregated.php
@@ -42,7 +42,7 @@
/**
* @return array Column descriptions
*/
- protected function describeColumns() {
+ protected function describeColumns( $campaign ) {
$columns = array(
'report-aggregated-proposal' = array(
'column' = 'id',
@@ -65,7 +65,7 @@
),
);
- foreach ( $this-getQuestions() as $question ) {
+ foreach ( $this-getQuestions( $this-$campaign ) as $question
) {
if ( $question['type'] === 'score' ) {
$columns[q{$question['id']}] = array(
'header' = $question['report_head'],
--
To view, visit https://gerrit.wikimedia.org/r/227876
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib726343b21221f47ecf5aa42fe770390665bacd4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/iegreview
Gerrit-Branch: master
Gerrit-Owner: Niharika29 niharikakohl...@gmail.com
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Niharika29 niharikakohl...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish default error page: no linebreak before DOCTYPE - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: varnish default error page: no linebreak before DOCTYPE
..
varnish default error page: no linebreak before DOCTYPE
Change-Id: Ib1ac16d6b02c4dc7ea9685b39c3e5b4b3406f16e
---
M templates/varnish/errorpage.inc.vcl.erb
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/errorpage.inc.vcl.erb
b/templates/varnish/errorpage.inc.vcl.erb
index 92452a9..c66c23c 100644
--- a/templates/varnish/errorpage.inc.vcl.erb
+++ b/templates/varnish/errorpage.inc.vcl.erb
@@ -12,8 +12,7 @@
sub synth_errorpage {
set obj.http.Content-Type = text/html; charset=utf-8;
- synthetic {
-!DOCTYPE html
+ synthetic {!DOCTYPE html
html lang=en
meta charset=utf-8
titleWikimedia Error/title
--
To view, visit https://gerrit.wikimedia.org/r/227883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1ac16d6b02c4dc7ea9685b39c3e5b4b3406f16e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Text and Comment node support to JsApi. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227886
Change subject: Add Text and Comment node support to JsApi.
..
Add Text and Comment node support to JsApi.
Bump domino dependency to 1.0.19, due to fixes needed for the DOM
TreeWalker interface.
Change-Id: I3667af918035c721d40813d32e9063bf61404f39
---
M .jsduck/categories.json
M lib/jsapi.js
M package.json
M tests/mocha/jsapi.js
4 files changed, 154 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/86/227886/1
diff --git a/.jsduck/categories.json b/.jsduck/categories.json
index 56b89e7..7d8f247 100644
--- a/.jsduck/categories.json
+++ b/.jsduck/categories.json
@@ -6,6 +6,7 @@
name: Package Interface,
classes: [
Parsoid,
+ PComment,
PDoc,
PNodeList,
PNode,
@@ -13,6 +14,7 @@
PHeading,
PHtmlEntity,
PTemplate,
+ PText,
PWikiLink
]
},
diff --git a/lib/jsapi.js b/lib/jsapi.js
index c396bac..15b2e14 100644
--- a/lib/jsapi.js
+++ b/lib/jsapi.js
@@ -13,6 +13,9 @@
var WikitextSerializer =
require('../lib/mediawiki.WikitextSerializer.js').WikitextSerializer;
var DU = require('../lib/mediawiki.DOMUtils.js').DOMUtils;
+var DOMImpl = require('domino').impl;
+var Node = DOMImpl.Node;
+var NodeFilter = DOMImpl.NodeFilter;
var util = require('util');
// WTS helper
@@ -38,7 +41,7 @@
var noop = function() { };
// Forward declarations of Wrapper classes.
-var PNode, PNodeList, PExtLink, PHeading, PHtmlEntity, PTemplate, PWikiLink;
+var PNode, PNodeList, PComment, PExtLink, PHeading, PHtmlEntity, PTemplate,
PText, PWikiLink;
// HTML escape helper
var toHtmlStr = function(node, v) {
@@ -106,7 +109,47 @@
if (this.parent) { this.parent.update(); }
} },
_querySelectorAll: { value: function(selector) {
- return Array.from(this.container.querySelectorAll(selector));
+ var tweakedSelector = ',' + selector + ',';
+ if (!(/,(COMMENT|TEXT),/.test(tweakedSelector))) {
+ // Use fast native querySelectorAll
+ return
Array.from(this.container.querySelectorAll(selector));
+ }
+ // Implement comment/text node selector the hard way
+ /* jshint bitwise: false */
+ var whatToShow = NodeFilter.SHOW_ELEMENT; // always show
templates
+ if (/,COMMENT,/.test(tweakedSelector)) {
+ whatToShow = whatToShow | NodeFilter.SHOW_COMMENT;
+ }
+ if (/,TEXT,/.test(tweakedSelector)) {
+ whatToShow = whatToShow | NodeFilter.SHOW_TEXT;
+ }
+ var nodeFilter = function(node) {
+ if (node.nodeType !== Node.ELEMENT_NODE) {
+ return NodeFilter.FILTER_ACCEPT;
+ }
+ if
(/\bmw:Transclusion\b/.test(node.getAttribute('typeof') || '')) {
+ return NodeFilter.FILTER_ACCEPT;
+ }
+ return NodeFilter.FILTER_SKIP;
+ };
+ var result = [];
+ var includeTemplates =
+ /,\[typeof~=mw:Transclusion\],/.test(tweakedSelector);
+ var treeWalker = this.pdoc.document.createTreeWalker(
+ this.container, whatToShow, nodeFilter, false
+ );
+ while (treeWalker.nextNode()) {
+ var node = treeWalker.currentNode;
+ if (node.nodeType === Node.ELEMENT_NODE
+
/\bmw:Transclusion\b/.test(node.getAttribute('typeof') || '')) {
+ treeWalker.lastChild(); // always skip over all
children
+ if (!includeTemplates) {
+ continue; // skip template itself
+ }
+ }
+ result.push(node);
+ }
+ return result;
} },
_templatesForNode: { value: function(node) {
// each Transclusion node could represent multiple templates.
@@ -134,8 +177,8 @@
tSelector += ',' + selector;
}
this._querySelectorAll(tSelector).forEach(function(node) {
-
[MediaWiki-commits] [Gerrit] Do not show the article selector unless all params passed in... - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Do not show the article selector unless all params passed in URL
..
Do not show the article selector unless all params passed in URL
It seems that showing this dialog even with partially filled params
(for example, contribution menu entry point fills the target lang param)
creates confusion to users and they re-type title and end up in creating
a fresh translation that overwrites an in-progress translation.
Target title is not validated for this, since it is optional.
Bug: T104702
Change-Id: Iff73f4bedbb1038d70ca26e087550ddb64261220
---
M modules/source/ext.cx.source.selector.js
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/source/ext.cx.source.selector.js
b/modules/source/ext.cx.source.selector.js
index f32d532..c8c8ca3 100644
--- a/modules/source/ext.cx.source.selector.js
+++ b/modules/source/ext.cx.source.selector.js
@@ -100,10 +100,10 @@
this.$targetTitleInput.val( this.options.targetTitle
).trigger( 'input' );
}
- // If any of the values are already present,
+ // If all of the values are already present,
// show the dialog and initiate a validation.
- if ( this.options.sourceLanguage || this.options.targetLanguage
||
- this.options.sourceTitle || this.options.targetTitle
+ if ( this.options.sourceLanguage this.options.targetLanguage
+ this.options.sourceTitle
) {
this.show();
this.check();
--
To view, visit https://gerrit.wikimedia.org/r/227643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff73f4bedbb1038d70ca26e087550ddb64261220
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 7ae8321..f616edd - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/227891 Change subject: Syncronize VisualEditor: 7ae8321..f616edd .. Syncronize VisualEditor: 7ae8321..f616edd Change-Id: Ifaa71a5e5e19cfe7a2093b37c8b7e6a3113bf38f --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/91/227891/1 diff --git a/VisualEditor b/VisualEditor index 7ae8321..f616edd 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 7ae83213669ebba6d8ffea92c4fdef702ac35b33 +Subproject commit f616edd3105212d915b5eda2b06ac7efd0f5be83 -- To view, visit https://gerrit.wikimedia.org/r/227891 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifaa71a5e5e19cfe7a2093b37c8b7e6a3113bf38f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 7ae8321..f616edd - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 7ae8321..f616edd .. Syncronize VisualEditor: 7ae8321..f616edd Change-Id: Ifaa71a5e5e19cfe7a2093b37c8b7e6a3113bf38f --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 7ae8321..f616edd 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 7ae83213669ebba6d8ffea92c4fdef702ac35b33 +Subproject commit f616edd3105212d915b5eda2b06ac7efd0f5be83 -- To view, visit https://gerrit.wikimedia.org/r/227891 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifaa71a5e5e19cfe7a2093b37c8b7e6a3113bf38f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set nutcracker log verbosity to LOG_INFO, per deployment rec... - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227902
Change subject: Set nutcracker log verbosity to LOG_INFO, per deployment
recommendations
..
Set nutcracker log verbosity to LOG_INFO, per deployment recommendations
https://github.com/twitter/twemproxy/blob/master/notes/recommendation.md#log-level
Change-Id: Id946eb56c7ed45ad6d5b14cf839ebd130231c581
---
M manifests/role/mediawiki.pp
M modules/nutcracker/manifests/init.pp
M modules/nutcracker/templates/default.erb
3 files changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/02/227902/1
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index 81df319..99611ae 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -61,6 +61,7 @@
class { '::nutcracker':
mbuf_size = '64k',
+verbosity = 6, # LOG_INFO
pools = $nutcracker_pools,
}
diff --git a/modules/nutcracker/manifests/init.pp
b/modules/nutcracker/manifests/init.pp
index baf29e0..4884256 100644
--- a/modules/nutcracker/manifests/init.pp
+++ b/modules/nutcracker/manifests/init.pp
@@ -12,6 +12,9 @@
# /blob/b2cd3ad/notes/recommendation.md for a discussion of this
# option.
#
+# [*verbosity*]
+# Set logging level (default: 5, min: 0, max: 11).
+#
# [*pools*]
# A hash defining a nutcracker server pool.
# See https://github.com/twitter/twemproxy#configuration.
@@ -32,11 +35,13 @@
#
class nutcracker(
$pools,
-$mbuf_size = undef,
$ensure= present,
+$mbuf_size = undef,
+$verbosity = 5,
) {
validate_hash($pools)
validate_re($ensure, '^(present|absent)$')
+validate_integer($verbosity, 0, 11)
package { 'nutcracker':
ensure = $ensure,
diff --git a/modules/nutcracker/templates/default.erb
b/modules/nutcracker/templates/default.erb
index 417b7b8..731ce3a 100644
--- a/modules/nutcracker/templates/default.erb
+++ b/modules/nutcracker/templates/default.erb
@@ -1,3 +1,4 @@
# Default settings for nutcracker.
# This file is managed by Puppet.
-%- if @mbuf_size -%DAEMON_OPTS=--mbuf-size=%= scope.function_to_bytes
[@mbuf_size] %%- end %
+DAEMON_OPTS=--verbose=%= @verbosity %
+%- if @mbuf_size -%DAEMON_OPTS=$DAEMON_OPTS --mbuf-size=%=
scope.function_to_bytes [@mbuf_size] %%- end %
--
To view, visit https://gerrit.wikimedia.org/r/227902
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id946eb56c7ed45ad6d5b14cf839ebd130231c581
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BREAKING CHANGE] Kill ve.indexOf and thus @until - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BREAKING CHANGE] Kill ve.indexOf and thus @until
..
[BREAKING CHANGE] Kill ve.indexOf and thus @until
Change-Id: Ib6aca26b33c9c8c8541c5bc6753091481acb7531
---
M .jsduck/CustomTags.rb
M src/ve.utils.js
2 files changed, 0 insertions(+), 33 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jsduck/CustomTags.rb b/.jsduck/CustomTags.rb
index 26fe678..b37eab0 100644
--- a/.jsduck/CustomTags.rb
+++ b/.jsduck/CustomTags.rb
@@ -48,24 +48,6 @@
end
end
-class UntilTag CommonTag
- def initialize
-@tagname = :until
-@pattern = 'until'
-super
- end
-
- def to_html(context)
--EOHTML
- h3Until/h3
- div class=signature-boxp
- This method provides strongbrowser compatibility/strong for:
- #{ context[@tagname].map { |tag| tag[:doc] }.join(\n) }
- /p/div
-EOHTML
- end
-end
-
class SeeTag CommonTag
def initialize
@tagname = :see
diff --git a/src/ve.utils.js b/src/ve.utils.js
index 81a0ef6..a8a9ebe 100644
--- a/src/ve.utils.js
+++ b/src/ve.utils.js
@@ -146,21 +146,6 @@
ve.isEmptyObject = $.isEmptyObject;
/**
- * Wrapper for Array#indexOf.
- *
- * Values are compared without type coercion.
- *
- * @method
- * @source http://api.jquery.com/jQuery.inArray/
- * @until ES5: Array#indexOf
- * @param {Mixed} value Element to search for
- * @param {Array} array Array to search in
- * @param {number} [fromIndex=0] Index to being searching from
- * @returns {number} Index of value in array, or -1 if not found
- */
-ve.indexOf = $.inArray;
-
-/**
* Merge properties of one or more objects into another.
* Preserves original object's inheritance (e.g. Array, Object, whatever).
* In case of array or array-like objects only the indexed properties
--
To view, visit https://gerrit.wikimedia.org/r/227868
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6aca26b33c9c8c8541c5bc6753091481acb7531
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] RedisConnectionPool: convert to PSR3 logging - change (mediawiki/core)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227873
Change subject: RedisConnectionPool: convert to PSR3 logging
..
RedisConnectionPool: convert to PSR3 logging
Convert from wfDebug* logging to Psr\Log\LoggerInterface. Use structured
logging data to tag log messages the associated redis server.
Bug: T88649
Change-Id: I5fc4c68e52b13a688bdcc93d9defc9f973323241
---
M includes/clientpool/RedisConnectionPool.php
1 file changed, 86 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/73/227873/1
diff --git a/includes/clientpool/RedisConnectionPool.php
b/includes/clientpool/RedisConnectionPool.php
index dc95727..d932e24 100644
--- a/includes/clientpool/RedisConnectionPool.php
+++ b/includes/clientpool/RedisConnectionPool.php
@@ -22,6 +22,10 @@
* @author Aaron Schulz
*/
+use MediaWiki\Logger\LoggerFactory;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerInterface;
+
/**
* Helper class to manage Redis connections.
*
@@ -69,6 +73,11 @@
const SERVER_DOWN_TTL = 30;
/**
+* @var LoggerInterface
+*/
+ protected $logger;
+
+ /**
* @param array $options
* @throws MWException
*/
@@ -76,6 +85,11 @@
if ( !class_exists( 'Redis' ) ) {
throw new MWException( __CLASS__ . ' requires a Redis
client library. ' .
'See
https://www.mediawiki.org/wiki/Redis#Setup' );
+ }
+ if ( isset( $options['logger'] ) ) {
+ $this-setLogger( $options['logger'] );
+ } else {
+ $this-setLogger( LoggerFactory::getInstance( 'redis' )
);
}
$this-connectTimeout = $options['connectTimeout'];
$this-readTimeout = $options['readTimeout'];
@@ -90,6 +104,14 @@
} else {
throw new MWException( Invalid serializer specified.
);
}
+ }
+
+ /**
+* @param LoggerInterface $logger
+* @return null
+*/
+ public function setLogger( LoggerInterface $logger ) {
+ $this-logger = $logger;
}
/**
@@ -136,7 +158,9 @@
// Initialize the object at the hash as needed...
if ( !isset( self::$instances[$id] ) ) {
self::$instances[$id] = new self( $options );
- wfDebug( Creating a new . __CLASS__ . instance
with id $id.\n );
+ LoggerFactory::getInstance( 'redis' )-debug(
+ Creating a new . __CLASS__ . instance with
id $id.
+ );
}
return self::$instances[$id];
@@ -161,8 +185,11 @@
unset( $this-downServers[$server] );
} else {
// Server is dead
- wfDebug( server $server is marked down for
another .
- ( $this-downServers[$server] - $now )
. seconds, can't get connection\n );
+ $this-logger-debug(
+ 'server {redis_server} is marked down
for another ' .
+ ( $this-downServers[$server] - $now )
. 'seconds',
+ array( 'redis_server' = $server )
+ );
return false;
}
@@ -175,7 +202,9 @@
$connection['free'] = false;
--$this-idlePoolSize;
- return new RedisConnRef( $this,
$server, $connection['conn'] );
+ return new RedisConnRef(
+ $this, $server,
$connection['conn'], $this-logger
+ );
}
}
}
@@ -206,7 +235,10 @@
$result = $conn-connect( $host, $port,
$this-connectTimeout );
}
if ( !$result ) {
- wfDebugLog( 'redis', Could not connect to
server $server );
+ $this-logger-error(
+ 'Could not connect to server
{redis_server}',
+ array( 'redis_server' = $server )
+ );
// Mark server down for some time to avoid
further timeouts
$this-downServers[$server] = time() +
self::SERVER_DOWN_TTL;
@@ -214,12 +246,21 @@
[MediaWiki-commits] [Gerrit] adding new employee Mikhail Popov to discovery hosts - change (operations/puppet)
RobH has uploaded a new change for review. https://gerrit.wikimedia.org/r/227877 Change subject: adding new employee Mikhail Popov to discovery hosts .. adding new employee Mikhail Popov to discovery hosts Adding Mikhail's user to shell access and related discovery hosts requested. The initial request wasn't entirely clear at first, but this will also include admin rights to restart some services. As those rights require ops meeting review, non sudo groups have been included in this patchset, along with the inital user. T107043 Change-Id: Ibf94803b4b4bdd8d3ddffb1258a10b417021079d --- M modules/admin/data/data.yaml 1 file changed, 12 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/77/227877/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 181faa8..fbd9aec 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -58,7 +58,7 @@ gid: 706 description: access to terbium, fluorine (private data) and bastion hosts restricted folks use sudo to access apache / www-data resources -members: [daniel, dartar, ellery, +members: [daniel, dartar, ellery, bearloga, ezachte, hoo, jamesur, jdlrobson, khorn, tparscal, tnegrin, ssastry, ironholds, nuria, leila, santhosh, amire80, legoktm, jsahleen] privileges: ['ALL = (www-data,apache) NOPASSWD: ALL'] @@ -104,7 +104,7 @@ members: [awight, bmansurov, catrope, dartar, declerambaul, deskana, dduvall, ellery, ezachte, gage, gilles, haithams, halfak, handrade, ironholds, jforrester, jkatz, jmorgan, jzerebecki, kaldari, - kleduc, leila, mattflaschen, milimetric, nettrom, + kleduc, leila, mattflaschen, milimetric, nettrom, bearloga, nuria, ori, otto, springle, tnegrin, yurik, yuvipanda, mforns, jdlrobson, dr0ptp4kt, tgr, marktraceur, jhernandez, joal, daisy, tomasz, mholloway-shell, madhuvishy, ebernhardson, niedzielski, @@ -163,11 +163,11 @@ halfak, awight, dr0ptp4kt, tnegrin, nuria, leila, manybubbles, ironholds, kleduc, ellery, nettrom, mforns, spage, bmansurov, rmoen, tbayer, joal, ashwinpp, - madhuvishy, jdouglas, tjones, legoktm, dcausse] + madhuvishy, jdouglas, tjones, legoktm, dcausse, bearloga] statistics-users: gid: 726 description: Access hosts with a mysql client for research. NO PRIVS. -members: [dartar, halfak, ironholds, jdlrobson, jmorgan, +members: [dartar, halfak, ironholds, jdlrobson, jmorgan, bearloga, mattflaschen, mhurd, yurik, awight, jforrester, tnegrin, marktraceur, msyed, nuria, leila, gilles, haithams, dbrant, tgr, haithams, handrade, dr0ptp4kt, brion, bsitzmann, @@ -212,7 +212,7 @@ Hadoop NameNodes. Some files in HDFS have sensitive data in them. Those files are group readable by the analytics-privatedata-users group. members: [dartar, milimetric, yurik, - halfak, dr0ptp4kt, tnegrin, ironholds, + halfak, dr0ptp4kt, tnegrin, ironholds, bearloga, kleduc, nuria, haithams, otto, deskana, bsitzmann, dbrant, declerambaul, ellery, nettrom, leila, ezachte, mforns, reedy, west1, phuedx, ananthrk, awight, @@ -1509,3 +1509,10 @@ realname: Srijan Kumar ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQDe6n6czECv3pzmwxKgfdd9A/XWmoqssk2MByt/Tra4DihPF25EhbcsoyeqosGcgCmkaDXZCQj6BfOh/VHGOUx6nkMf0bFkQrO25n8pdznMBnUfvGNAQUG2tWllA5q1uzmsQD80EqMtsbjr+Yl3HHE5StiqI6O9Ewxcsj2YsDA350ABzulcf4S81M7ej5ZIV/fmbNPJmCCKD3Ke33k3MCNJqCQpSDohKs9tZYKyhobb09n/OUsl+PNKn3VdDTPJMr+h0el8Y3QM1xHW2qbrUPg5qWSFHtLCBFhWlYhtciznhZTvdv7L7sOdwVCZahNNeAK5Cv4nyBHRjo09p7do9MSz srijanke...@gmail.com] uid: 12423 + bearloga: +ensure: present +gid: 500 +name: mpopov +realname: Mikhail Popov +ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAACAQC+3r+/y8Wsc4t6c18VXygHTLev9m6rLZqPUCSQdaH0qdyb97O3RlNdqoOZ0rbuPshFMyZjADlYT2TH/UX3fN/TkHJCQrJpk0L/Zc+NDbofejDs4TClbYYgcfZiBhLs7OylheM6Ut0KOmAQXE3qh6pUz1/U/fTwCtml6mFbbNaPPSq62eYNXYqTCGkTUXeuiodJ1bGRwDh1qmIlK5x657roNcJ1ADR7HCWZhnmLKPSOnjAIpN9ulZbvUiT98Pd4Bv4W0GZk6D8wMfbjKFmzv3XGdPjRrUo4JFVzwgJRXlzdEJKEn0v8yMSEthj0CygtUkWb104zgyw0756O9oxsQEI3jVHnb/4Z50xIL1AeuarO1Yi5xN2tTujACo9oAnuDKFqHY3vO6kv5kTZ61/2Foq5BIPA/SFSrSDuHWlveHxp2d2EYRf82E5gJ3ii0tVhSZKpIoiSjE2hGHBTN9iOumkSyL3wOT6YV+bGA4sKs5YgZl36xI8rT8hzBi0XLLy+6MfH+bGMhkBY+tLODj5hjcIBTt8iyjzQHhg2FqAKJX0unV2dTJxHmKLQBG5eVB89p7DKYBr5PhS7uC/zGIGHa08MsJUaWTCACY/jp0cln4MRt1/k4Mx+1Frb/bkzzO4IfchakMZX41m6hkKS29uWOXvTQtxwByamah/RsfhS5B+vI1Q== mpo...@wikimedia.org] +uid: 12625 -- To view, visit https://gerrit.wikimedia.org/r/227877 To unsubscribe, visit
[MediaWiki-commits] [Gerrit] nutcracker: prevent servers from being marked as dead indefi... - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: nutcracker: prevent servers from being marked as dead
indefinitely
..
nutcracker: prevent servers from being marked as dead indefinitely
* Set a 30s server-retry-timeout. When this configuration option is unset, a
transient connection failure is liable to make Nutcracker mark a server as
dead forever (or at least until it is restarted).[1]
* Reduce the number of server connections from 1 to 2. Having more than one
server connections makes twemproxy reads and writes not repeatable, and I am
not persuaded that we correctly account for that everywhere.[2]
[1]:
https://github.com/twitter/twemproxy/blob/594105/notes/recommendation.md#liveness
[2]:
https://github.com/twitter/twemproxy/blob/594105/notes/recommendation.md#server_connections--1
Bug: T88730
Change-Id: I546c1606cd9ad91eb5c9a1160ed6599d3129
---
M manifests/role/mediawiki.pp
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index 84e6d8a..81df319 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -25,8 +25,9 @@
hash = 'md5',
listen = '127.0.0.1:11212',
preconnect = true,
-server_connections = 2,
+server_connections = 1,
server_failure_limit = 3,
+server_retry_timeout = to_milliseconds('30s'),
timeout = 250,
servers = hiera('mediawiki_memcached_servers'),
},
@@ -36,8 +37,9 @@
hash = 'md5',
listen = '/var/run/nutcracker/nutcracker.sock 0666',
preconnect = true,
-server_connections = 2,
+server_connections = 1,
server_failure_limit = 3,
+server_retry_timeout = to_milliseconds('30s'),
timeout = 250,
servers = hiera('mediawiki_memcached_servers'),
},
@@ -49,8 +51,9 @@
hash = 'md5',
listen = '127.0.0.1:6380',
preconnect = true,
-server_connections = 2,
+server_connections = 1,
server_failure_limit = 3,
+server_retry_timeout = to_milliseconds('30s'),
timeout = 1000,
servers = hiera('mediawiki_session_redis_servers'),
},
--
To view, visit https://gerrit.wikimedia.org/r/227881
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I546c1606cd9ad91eb5c9a1160ed6599d3129
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] End the A/B test of morelike vs. full-text. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: End the A/B test of morelike vs. full-text.
..
End the A/B test of morelike vs. full-text.
Change-Id: I638f0d9b66da4845434601fe3878f1b4808658de
---
M wikipedia/res/values/preference_keys.xml
M wikipedia/res/xml/developer_preferences.xml
M wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
M wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java
M
wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M wikipedia/src/main/java/org/wikipedia/settings/Prefs.java
7 files changed, 2 insertions(+), 34 deletions(-)
Approvals:
BearND: Looks good to me, but someone else must approve
Mholloway: Looks good to me, approved
Niedzielski: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wikipedia/res/values/preference_keys.xml
b/wikipedia/res/values/preference_keys.xml
index 2de5ee6..8267516 100644
--- a/wikipedia/res/values/preference_keys.xml
+++ b/wikipedia/res/values/preference_keys.xml
@@ -28,7 +28,6 @@
string name=preference_key_login_passwordpassword/string
string name=preference_key_login_user_iduserID/string
string
name=preference_key_link_preview_versionlinkPreviewVersion/string
-string
name=preference_key_more_like_search_enabledmoreLikeSearchEnabled/string
string
name=preference_key_show_developer_settingsshowDeveloperSettings/string
string name=preference_key_last_run_time_format%s-lastrun/string
/resources
diff --git a/wikipedia/res/xml/developer_preferences.xml
b/wikipedia/res/xml/developer_preferences.xml
index 5d91908..29470ac 100644
--- a/wikipedia/res/xml/developer_preferences.xml
+++ b/wikipedia/res/xml/developer_preferences.xml
@@ -7,10 +7,6 @@
android:key=@string/preference_key_feature_select_text_and_share_tutorials_enabled
android:title=@string/preference_key_feature_select_text_and_share_tutorials_enabled
/
-CheckBoxPreference
-android:key=@string/preference_key_more_like_search_enabled
-android:title=@string/preference_key_more_like_search_enabled /
-
!--suppress AndroidUnknownAttribute --
org.wikipedia.settings.IntPreference
style=@style/IntPreference
diff --git a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
index 43415ff..b1445fb 100644
--- a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
@@ -445,15 +445,6 @@
return version;
}
-public boolean isMoreLikeSearchEnabled() {
-if (Prefs.hasMoreLikeSearch()) {
-return Prefs.isMoreLikeSearchEnabled();
-}
-boolean enabled = new Random().nextInt(2) == 0;
-Prefs.setMoreLikeSearchEnabled(enabled);
-return enabled;
-}
-
public boolean isFeatureSelectTextAndShareTutorialEnabled() {
boolean enabled = false;
// Select text does not work on Gingerbread.
diff --git a/wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java
b/wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java
index 22eb3f0..65fa8e0 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java
@@ -23,8 +23,7 @@
public SuggestionsTask(Api api, Site site, String title,
int numRequestItems, int maxResultItems,
int thumbSize, boolean requireThumbnail) {
-super(api, site, title, numRequestItems, null,
- WikipediaApp.getInstance().isMoreLikeSearchEnabled(), thumbSize);
+super(api, site, title, numRequestItems, null, true, thumbSize);
this.title = title;
this.maxItems = maxResultItems;
this.requireThumbnail = requireThumbnail;
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index 054b505..5416eda 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -347,7 +347,7 @@
public void setTitle(PageTitle newTitle) {
pageTitle = newTitle;
-funnel = new SuggestedPagesFunnel(app,
WikipediaApp.getInstance().isMoreLikeSearchEnabled());
+funnel = new SuggestedPagesFunnel(app, true);
}
private void setUpReadMoreSection(LayoutInflater layoutInflater, final
SearchResults results) {
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
