[MediaWiki-commits] [Gerrit] Fix $streams emptiness check - change (mediawiki...TimedMediaHandler)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201676
Change subject: Fix $streams emptiness check
..
Fix $streams emptiness check
Because count( false ) === 1. Tricky!
Bug: T94902
Change-Id: I5eab216f3f30fd1f79da344247a871aac5e2e2be
---
M handlers/WebMHandler/WebMHandler.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/76/201676/1
diff --git a/handlers/WebMHandler/WebMHandler.php
b/handlers/WebMHandler/WebMHandler.php
index 3e89cef..9cee009 100644
--- a/handlers/WebMHandler/WebMHandler.php
+++ b/handlers/WebMHandler/WebMHandler.php
@@ -92,7 +92,7 @@
$baseType = ( $file-getWidth() == 0 $file-getHeight() ==
0 )? 'audio' : 'video';
$streams = $this-getStreamTypes( $file );
- if ( count( $streams ) === 0 ) {
+ if ( !$streams ) {
return $baseType . '/webm';
}
--
To view, visit https://gerrit.wikimedia.org/r/201676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5eab216f3f30fd1f79da344247a871aac5e2e2be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WindowManager: Add a $lastFocus property - change (oojs/ui)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201680
Change subject: WindowManager: Add a $lastFocus property
..
WindowManager: Add a $lastFocus property
This gets passed as an argument to openWindow. If defined, this
element gets the focus after the window has been closed.
Bug: T87714
Change-Id: I1199dfb5ef95ce35c0d6175fd70421a8c7407a09
---
M demos/pages/dialogs.js
M src/WindowManager.js
2 files changed, 10 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/80/201680/1
diff --git a/demos/pages/dialogs.js b/demos/pages/dialogs.js
index 12cf9f0..a85d156 100644
--- a/demos/pages/dialogs.js
+++ b/demos/pages/dialogs.js
@@ -518,8 +518,8 @@
}
];
- function openDialog( name, data ) {
- windowManager.openWindow( name, data );
+ function openDialog( name, data, $lastFocus ) {
+ windowManager.openWindow( name, data, $lastFocus );
}
for ( i = 0, l = config.length; i l; i++ ) {
@@ -532,7 +532,7 @@
label: $( 'span dir=ltr/span' ).text( config[ i
].name )
} );
openButton.on(
- 'click', OO.ui.bind( openDialog, this, name, config[ i
].data )
+ 'click', OO.ui.bind( openDialog, this, name, config[ i
].data, openButton.$button )
);
fieldset.addItems( [ new OO.ui.FieldLayout( openButton, {
align: 'inline' } ) ] );
}
diff --git a/src/WindowManager.js b/src/WindowManager.js
index 4731011..a99277c 100644
--- a/src/WindowManager.js
+++ b/src/WindowManager.js
@@ -75,6 +75,7 @@
this.preparingToClose = null;
this.currentWindow = null;
this.globalEvents = false;
+ this.$lastFocus = null;
this.$ariaHidden = null;
this.onWindowResizeTimeout = null;
this.onWindowResizeHandler = this.onWindowResize.bind( this );
@@ -336,14 +337,14 @@
* See {@link #event-opening 'opening' event} for more information about
`opening` promises.
* @fires opening
*/
-OO.ui.WindowManager.prototype.openWindow = function ( win, data ) {
+OO.ui.WindowManager.prototype.openWindow = function ( win, data, $lastFocus ) {
var manager = this,
opening = $.Deferred();
// Argument handling
if ( typeof win === 'string' ) {
return this.getWindow( win ).then( function ( win ) {
- return manager.openWindow( win, data );
+ return manager.openWindow( win, data, $lastFocus );
} );
}
@@ -368,6 +369,7 @@
manager.toggleGlobalEvents( true );
manager.toggleAriaIsolation( true );
}
+ manager.$lastFocus = $lastFocus;
manager.currentWindow = win;
manager.opening = opening;
manager.preparingToOpen = null;
@@ -451,6 +453,9 @@
manager.toggleGlobalEvents( false );
manager.toggleAriaIsolation( false );
}
+ if ( manager.$lastFocus
) {
+
manager.$lastFocus[0].focus();
+ }
manager.closing = null;
manager.currentWindow =
null;
closing.resolve( data );
--
To view, visit https://gerrit.wikimedia.org/r/201680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1199dfb5ef95ce35c0d6175fd70421a8c7407a09
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed BloomFilter classes - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201684
Change subject: Removed BloomFilter classes
..
Removed BloomFilter classes
* This ends up being more complex than its worth
and even more so fore multi-DC support
Bug: T93006
Change-Id: Iaa774fe69061e42955b11dc82d30dba93208e606
---
M RELEASE-NOTES-1.25
M autoload.php
M includes/DefaultSettings.php
D includes/cache/bloom/BloomCache.php
D includes/cache/bloom/BloomCacheRedis.php
D includes/cache/bloom/BloomFilters.php
M includes/logging/LogEntry.php
M includes/logging/LogEventsList.php
D tests/phpunit/includes/cache/RedisBloomCacheTest.php
9 files changed, 3 insertions(+), 901 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/84/201684/1
diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index a31461c..7b035ac 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -422,6 +422,7 @@
thisisdeleted, viewdeleted, editlink, retrievedfrom,
version-poweredby-others,
retrievedfrom, thisisdeleted, viewsourcelink, lastmodifiedat,
laggedslavemode,
protect-summary-cascade
+* All BloomCache related code has been removed. This was largely experimental.
== Compatibility ==
diff --git a/autoload.php b/autoload.php
index da661a2..3396738 100644
--- a/autoload.php
+++ b/autoload.php
@@ -170,9 +170,6 @@
'Block' = __DIR__ . '/includes/Block.php',
'BlockListPager' = __DIR__ . '/includes/specials/SpecialBlockList.php',
'BlockLogFormatter' = __DIR__ .
'/includes/logging/BlockLogFormatter.php',
- 'BloomCache' = __DIR__ . '/includes/cache/bloom/BloomCache.php',
- 'BloomCacheRedis' = __DIR__ .
'/includes/cache/bloom/BloomCacheRedis.php',
- 'BloomFilterTitleHasLogs' = __DIR__ .
'/includes/cache/bloom/BloomFilters.php',
'BmpHandler' = __DIR__ . '/includes/media/BMP.php',
'BrokenRedirectsPage' = __DIR__ .
'/includes/specials/SpecialBrokenRedirects.php',
'BufferingStatsdDataFactory' = __DIR__ .
'/includes/libs/BufferingStatsdDataFactory.php',
@@ -367,7 +364,6 @@
'EmailNotification' = __DIR__ . '/includes/mail/EmailNotification.php',
'EmaillingJob' = __DIR__ . '/includes/jobqueue/jobs/EmaillingJob.php',
'EmptyBagOStuff' = __DIR__ .
'/includes/libs/objectcache/EmptyBagOStuff.php',
- 'EmptyBloomCache' = __DIR__ . '/includes/cache/bloom/BloomCache.php',
'EncryptedPassword' = __DIR__ .
'/includes/password/EncryptedPassword.php',
'EnhancedChangesList' = __DIR__ .
'/includes/changes/EnhancedChangesList.php',
'EnotifNotifyJob' = __DIR__ .
'/includes/jobqueue/jobs/EnotifNotifyJob.php',
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index ef80c63..845c7f5 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2148,28 +2148,6 @@
);
/**
- * Map of bloom filter store names to configuration arrays.
- *
- * Example:
- * $wgBloomFilterStores['main'] = array(
- * 'cacheId' = 'main-v1',
- * 'class'= 'BloomCacheRedis',
- * 'redisServers' = array( '127.0.0.1:6379' ),
- * 'redisConfig' = array( 'connectTimeout' = 2 )
- * );
- *
- * A primary bloom filter must be created manually.
- * Example in eval.php:
- * code
- * BloomCache::get( 'main' )-init( 'shared', 10, .001 );
- * /code
- * The size should be as large as practical given wiki size and resources.
- *
- * @since 1.24
- */
-$wgBloomFilterStores = array();
-
-/**
* The expiry time for the parser cache, in seconds.
* The default is 86400 (one day).
*/
diff --git a/includes/cache/bloom/BloomCache.php
b/includes/cache/bloom/BloomCache.php
deleted file mode 100644
index 6ecaacb..000
--- a/includes/cache/bloom/BloomCache.php
+++ /dev/null
@@ -1,324 +0,0 @@
-?php
-/**
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @author Aaron Schulz
- */
-
-/**
- * Persistent bloom filter used to avoid expensive lookups
- *
- * @since 1.24
- */
-abstract class BloomCache {
- /** @var string Unique ID for key namespacing */
- protected $cacheID;
-
- /** @var array Map of (id = BloomCache) */
- protected static $instances =
[MediaWiki-commits] [Gerrit] ResourceLoaderGeSHiModule: Cache file mtime of __FILE__ - change (mediawiki...SyntaxHighlight_GeSHi)
jenkins-bot has submitted this change and it was merged.
Change subject: ResourceLoaderGeSHiModule: Cache file mtime of __FILE__
..
ResourceLoaderGeSHiModule: Cache file mtime of __FILE__
There are 100s of instances of this module. This can slow things
down quite a bit in Vagrant when it recomputes the same timestamp
many times.
Change-Id: Iaebafe1acf7a0e30ebf86179961ad52f56bb689f
---
M ResourceLoaderGeSHiModule.php
1 file changed, 8 insertions(+), 1 deletion(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ResourceLoaderGeSHiModule.php b/ResourceLoaderGeSHiModule.php
index 7455c3e..98c1c1e 100644
--- a/ResourceLoaderGeSHiModule.php
+++ b/ResourceLoaderGeSHiModule.php
@@ -51,9 +51,16 @@
* @return int
*/
public function getModifiedTime( ResourceLoaderContext $context ) {
+ static $selfmtime = null;
+ if ( $selfmtime === null ) {
+ // Cache this since there are 100s of instances of this
module
+ // See also T93025, T85794.
+ $selfmtime = self::safeFilemtime( __FILE__ );
+ }
+
return max( array(
$this-getDefinitionMtime( $context ),
- self::safeFilemtime( __FILE__ ),
+ $selfmtime,
self::safeFilemtime( GESHI_LANG_ROOT .
/{$this-lang}.php ),
) );
}
--
To view, visit https://gerrit.wikimedia.org/r/201670
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaebafe1acf7a0e30ebf86179961ad52f56bb689f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Aaron Schulz asch...@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] privacy: Flip the column of the govt_requests graph and fix ... - change (wikimedia/TransparencyReport-private)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201672
Change subject: privacy: Flip the column of the govt_requests graph and fix
borders
..
privacy: Flip the column of the govt_requests graph and fix borders
Change-Id: Ia857970f8999ab90a6ca8fea1ccf4dabcd7f
---
M source/localizable/privacy.html.erb
M source/stylesheets/master.css.scss
2 files changed, 22 insertions(+), 15 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private
refs/changes/72/201672/1
diff --git a/source/localizable/privacy.html.erb
b/source/localizable/privacy.html.erb
index 2199154..f07b11e 100644
--- a/source/localizable/privacy.html.erb
+++ b/source/localizable/privacy.html.erb
@@ -159,63 +159,63 @@
table
tr class=highlight
td%= t('graph.informal_government_requests')
%/td
+ tdTotal/td
td11/td
- td
/tr
tr
- td class=indent%= t('graph.usa') %/td
- td1/td
+ td class=indent noborder%= t('graph.usa')
%/td
td%= t('graph.local_police') %/td
+ td1/td
/tr
tr
td class=indent/td
- td1/td
td%= t('graph.federal_agency') %/td
+ td1/td
/tr
tr
td class=indent%= t('graph.france') %/td
- td4/td
td%= t('graph.local_police') %/td
+ td4/td
/tr
tr
- td class=indent%= t('graph.italy') %/td
- td1/td
+ td class=indent noborder%=
t('graph.italy') %/td
td%= t('graph.local_police') %/td
+ td1/td
/tr
tr
td class=indent/td
- td2/td
td%= t('graph.federal_police') %/td
+ td2/td
/tr
tr
td class=indent%= t('graph.brazil') %/td
- td1/td
td%= t('graph.executive_office') %/td
+ td1/td
/tr
tr
td class=indent%= t('graph.israel') %/td
- td1/td
td%= t('graph.municipal_government') %/td
+ td1/td
/tr
tr class=highlight
td%= t('graph.warrant') %/td
+ td/td
td1/td
- td
/tr
tr
td class=indent%= t('graph.usa') %/td
- td1/td
td%= t('graph.doj') %/td
+ td1/td
/tr
tr class=highlight
td%= t('graph.criminal_subpoenas') %/td
+ td/td
td1/td
- td
/tr
tr
td class=indent%= t('graph.usa') %/td
- td1/td
td%= t('graph.doj') %/td
+ td1/td
/tr
/table
/div
diff --git a/source/stylesheets/master.css.scss
b/source/stylesheets/master.css.scss
index 87bb1e0..5968856 100644
--- a/source/stylesheets/master.css.scss
+++ b/source/stylesheets/master.css.scss
@@ -226,7 +226,14 @@
tr {
height: 45px;
- border-bottom: 1px #EDEDED solid;
+
+ td {
+ border-bottom: 1px #EDEDED solid;
+ }
+
+ td.noborder {
+ border-bottom: none;
+ }
.last {
border-bottom: 2px #ABABAB solid;
--
To view, visit https://gerrit.wikimedia.org/r/201672
To unsubscribe, visit
[MediaWiki-commits] [Gerrit] Tools: Puppetize webservice2 requirement - change (operations/puppet)
Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201671
Change subject: Tools: Puppetize webservice2 requirement
..
Tools: Puppetize webservice2 requirement
Change-Id: Ice8caeb0242d21d961c51e77f79cd62ea72f03d9
---
M modules/toollabs/manifests/dev_environ.pp
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/201671/1
diff --git a/modules/toollabs/manifests/dev_environ.pp
b/modules/toollabs/manifests/dev_environ.pp
index 70e089f..5afb9cf 100644
--- a/modules/toollabs/manifests/dev_environ.pp
+++ b/modules/toollabs/manifests/dev_environ.pp
@@ -113,13 +113,13 @@
mode= '0444',
}
-# This requires pyyaml but that's installed on all labs machines for
puppet diamond collector
file { '/usr/local/bin/webservice2':
-ensure = present,
-source = 'puppet:///modules/toollabs/webservice2',
-owner = 'root',
-group = 'root',
-mode = '0555',
+ensure = present,
+source = 'puppet:///modules/toollabs/webservice2',
+owner = 'root',
+group = 'root',
+mode= '0555',
+require = Package['python-yaml'],
}
file { '/usr/local/bin/webservice':
--
To view, visit https://gerrit.wikimedia.org/r/201671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice8caeb0242d21d961c51e77f79cd62ea72f03d9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt t...@tim-landscheidt.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n compatibility shim (v1.6.2) - change (mediawiki...PhpTagsSMW)
JoelKP has submitted this change and it was merged.
Change subject: Remove i18n compatibility shim (v1.6.2)
..
Remove i18n compatibility shim (v1.6.2)
PhpTags requires MW 1.23+, so it's no longer needed.
Bug: T94976
Change-Id: Ib259c2c3ec0fe428a4248220ea5ab3eae5841642
---
D PhpTagsSMW.i18n.php
M PhpTagsSMW.php
2 files changed, 1 insertion(+), 33 deletions(-)
Approvals:
JoelKP: Verified; Looks good to me, approved
diff --git a/PhpTagsSMW.i18n.php b/PhpTagsSMW.i18n.php
deleted file mode 100644
index 8ee5f72..000
--- a/PhpTagsSMW.i18n.php
+++ /dev/null
@@ -1,31 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-$GLOBALS['wgHooks']['LocalisationCacheRecache'][] = function ( $cache, $code,
$cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = __DIR__ . /extensions/PhpTags/i18n/$csCode.json;
- if ( is_readable( $fileName ) ) {
- $data = FormatJson::decode( file_get_contents(
$fileName ), true );
- foreach ( array_keys( $data ) as $key ) {
- if ( $key === '' || $key[0] === '@' ) {
- unset( $data[$key] );
- }
- }
- $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
- }
-
- $cachedData['deps'][] = new FileDependency( $fileName );
- }
- return true;
-};
diff --git a/PhpTagsSMW.php b/PhpTagsSMW.php
index 0a75713..9e1ccaa 100644
--- a/PhpTagsSMW.php
+++ b/PhpTagsSMW.php
@@ -16,7 +16,7 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry
point.' );
}
-const PHPTAGS_SMW_VERSION = '1.4.1';
+const PHPTAGS_SMW_VERSION = '1.4.2';
// Register this extension on Special:Version
$wgExtensionCredits['phptags'][] = array(
@@ -31,7 +31,6 @@
// Register message files
$wgMessagesDirs['PhpTagsSMW'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['PhpTagsSMW'] = __DIR__ . '/PhpTagsSMW.i18n.php';
// Register hooks
--
To view, visit https://gerrit.wikimedia.org/r/201675
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib259c2c3ec0fe428a4248220ea5ab3eae5841642
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PhpTagsSMW
Gerrit-Branch: master
Gerrit-Owner: JoelKP joelkpetters...@gmail.com
Gerrit-Reviewer: JoelKP joelkpetters...@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 i18n compatibility shim (v1.6.2) - change (mediawiki...PhpTagsSMW)
JoelKP has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201675
Change subject: Remove i18n compatibility shim (v1.6.2)
..
Remove i18n compatibility shim (v1.6.2)
PhpTags requires MW 1.23+, so it's no longer needed.
Bug: T94976
Change-Id: Ib259c2c3ec0fe428a4248220ea5ab3eae5841642
---
D PhpTagsSMW.i18n.php
M PhpTagsSMW.php
2 files changed, 1 insertion(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PhpTagsSMW
refs/changes/75/201675/1
diff --git a/PhpTagsSMW.i18n.php b/PhpTagsSMW.i18n.php
deleted file mode 100644
index 8ee5f72..000
--- a/PhpTagsSMW.i18n.php
+++ /dev/null
@@ -1,31 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-$GLOBALS['wgHooks']['LocalisationCacheRecache'][] = function ( $cache, $code,
$cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = __DIR__ . /extensions/PhpTags/i18n/$csCode.json;
- if ( is_readable( $fileName ) ) {
- $data = FormatJson::decode( file_get_contents(
$fileName ), true );
- foreach ( array_keys( $data ) as $key ) {
- if ( $key === '' || $key[0] === '@' ) {
- unset( $data[$key] );
- }
- }
- $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
- }
-
- $cachedData['deps'][] = new FileDependency( $fileName );
- }
- return true;
-};
diff --git a/PhpTagsSMW.php b/PhpTagsSMW.php
index 0a75713..9e1ccaa 100644
--- a/PhpTagsSMW.php
+++ b/PhpTagsSMW.php
@@ -16,7 +16,7 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry
point.' );
}
-const PHPTAGS_SMW_VERSION = '1.4.1';
+const PHPTAGS_SMW_VERSION = '1.4.2';
// Register this extension on Special:Version
$wgExtensionCredits['phptags'][] = array(
@@ -31,7 +31,6 @@
// Register message files
$wgMessagesDirs['PhpTagsSMW'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['PhpTagsSMW'] = __DIR__ . '/PhpTagsSMW.i18n.php';
// Register hooks
--
To view, visit https://gerrit.wikimedia.org/r/201675
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib259c2c3ec0fe428a4248220ea5ab3eae5841642
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PhpTagsSMW
Gerrit-Branch: master
Gerrit-Owner: JoelKP joelkpetters...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Kill Dwimmerlaik - change (mediawiki/core)
MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201678
Change subject: Kill Dwimmerlaik
..
Kill Dwimmerlaik
Seriously, the ops team spent some time trying to find that page during an
outage,
while in fact it's an obscure Tolkien reference - better be clear.
Change-Id: I6f33a2ea5030f22a258830a33f7bcefa7f0acd85
---
M includes/cache/MessageCache.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/78/201678/1
diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 82919c7..cf009bf 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -1049,7 +1049,7 @@
if ( !$title ) {
# It's not uncommon having a null $wgTitle in scripts.
See r80898
# Create a ghost title in such case
- $title = Title::newFromText( 'Dwimmerlaik' );
+ $title = Title::newFromText( '(Title not set
internally)' );
}
$this-mInParser = true;
--
To view, visit https://gerrit.wikimedia.org/r/201678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f33a2ea5030f22a258830a33f7bcefa7f0acd85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem maxsem.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dox: Fix yaml to make line break real - change (integration/config)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201679
Change subject: dox: Fix yaml to make line break real
..
dox: Fix yaml to make line break real
Follows-up c9bd3ed.
Change-Id: Ibabed626b696a5810c361eee78849dff9812cba3
---
M jjb/doc.yaml
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/79/201679/1
diff --git a/jjb/doc.yaml b/jjb/doc.yaml
index f1ccf1d..7566aee 100644
--- a/jjb/doc.yaml
+++ b/jjb/doc.yaml
@@ -27,7 +27,7 @@
- project: publish-on-gallium
block: true
current-parameters: true # Pass Zuul parameters
- predefined-parameters:
+ predefined-parameters: |
WMF_CI_PUB_DOCROOT=org/wikimedia/doc
WMF_CI_PUB_DEST={docdest}
--
To view, visit https://gerrit.wikimedia.org/r/201679
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibabed626b696a5810c361eee78849dff9812cba3
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gitignore: Clean up to match prod so there's no dirty git st... - change (integration/docroot)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/201681 Change subject: gitignore: Clean up to match prod so there's no dirty git status .. gitignore: Clean up to match prod so there's no dirty git status Change-Id: Ibfe0c793cb0627240f9f0748a51d2fd6ac6a266d --- M .gitignore 1 file changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/docroot refs/changes/81/201681/1 diff --git a/.gitignore b/.gitignore index c92b0ad..d7d3b3f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,13 @@ +# Puppet (ops, jenkins, ..) +/deployment /ssd /localhost/qunit/ -/org/wikimedia/doc/VisualEditor/ -/org/wikimedia/doc/mediawiki-core/ -/org/wikimedia/doc/puppet/ -/org/wikimedia/doc/puppetsource/ -/org/wikimedia/integration/WLMMobile/nightly/ + +# Automated publications +/org/wikimedia/doc/* +/org/wikimedia/integration/cover +/org/wikimedia/integration/nightly /org/wikimedia/integration/WikipediaMobile/nightly/ /org/wikimedia/integration/WiktionaryMobile/nightly/ -/org/wikimedia/integration/nightly/ +/org/wikimedia/integration/WLMMobile/nightly/ jenkins-autodeploy -- To view, visit https://gerrit.wikimedia.org/r/201681 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibfe0c793cb0627240f9f0748a51d2fd6ac6a266d Gerrit-PatchSet: 1 Gerrit-Project: integration/docroot Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: f15ba5b..b8f9e43 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: f15ba5b..b8f9e43 .. Syncronize VisualEditor: f15ba5b..b8f9e43 Change-Id: Ice94279d566e0e8eec19268c1e39cab576d4b751 --- 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 f15ba5b..b8f9e43 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit f15ba5bf4553984844e6c92501de11570fd361de +Subproject commit b8f9e43187a75768eaf99e4b075262f38b0e0779 -- To view, visit https://gerrit.wikimedia.org/r/201682 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ice94279d566e0e8eec19268c1e39cab576d4b751 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] Syncronize VisualEditor: f15ba5b..b8f9e43 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/201682 Change subject: Syncronize VisualEditor: f15ba5b..b8f9e43 .. Syncronize VisualEditor: f15ba5b..b8f9e43 Change-Id: Ice94279d566e0e8eec19268c1e39cab576d4b751 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/82/201682/1 diff --git a/VisualEditor b/VisualEditor index f15ba5b..b8f9e43 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit f15ba5bf4553984844e6c92501de11570fd361de +Subproject commit b8f9e43187a75768eaf99e4b075262f38b0e0779 -- To view, visit https://gerrit.wikimedia.org/r/201682 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice94279d566e0e8eec19268c1e39cab576d4b751 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] ResourceLoaderGeSHiModule: Cache file mtime of __FILE__ - change (mediawiki...SyntaxHighlight_GeSHi)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201670
Change subject: ResourceLoaderGeSHiModule: Cache file mtime of __FILE__
..
ResourceLoaderGeSHiModule: Cache file mtime of __FILE__
There are 100s of instances of this module. This can slow things
down quite a bit in Vagrant when it recomputes the same timestamp
many times.
Change-Id: Iaebafe1acf7a0e30ebf86179961ad52f56bb689f
---
M ResourceLoaderGeSHiModule.php
1 file changed, 8 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi
refs/changes/70/201670/1
diff --git a/ResourceLoaderGeSHiModule.php b/ResourceLoaderGeSHiModule.php
index 7455c3e..64005b9 100644
--- a/ResourceLoaderGeSHiModule.php
+++ b/ResourceLoaderGeSHiModule.php
@@ -51,9 +51,16 @@
* @return int
*/
public function getModifiedTime( ResourceLoaderContext $context ) {
+ static $selfmtime = null;
+ if ( $selfmtime === null ) {
+ // Cache this since there are 100s of instances of this
module
+ // See also T93025, T85794.
+ $selfmtime = self::safeFilemtime( __FILE__ )
+ }
+
return max( array(
$this-getDefinitionMtime( $context ),
- self::safeFilemtime( __FILE__ ),
+ $selfmtime,
self::safeFilemtime( GESHI_LANG_ROOT .
/{$this-lang}.php ),
) );
}
--
To view, visit https://gerrit.wikimedia.org/r/201670
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaebafe1acf7a0e30ebf86179961ad52f56bb689f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n compatibility (v 1.6.2) - change (mediawiki...PhpTagsWiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove i18n compatibility (v 1.6.2)
..
Remove i18n compatibility (v 1.6.2)
Bug: T94976
Change-Id: Idd1f83fefa8f00f30a5ddf521112a5be9d7b3ed4
---
D PhpTagsWiki.i18n.php
M PhpTagsWiki.php
2 files changed, 1 insertion(+), 33 deletions(-)
Approvals:
Pastakhov: Looks good to me, approved
JoelKP: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/PhpTagsWiki.i18n.php b/PhpTagsWiki.i18n.php
deleted file mode 100644
index 8ee5f72..000
--- a/PhpTagsWiki.i18n.php
+++ /dev/null
@@ -1,31 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-$GLOBALS['wgHooks']['LocalisationCacheRecache'][] = function ( $cache, $code,
$cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = __DIR__ . /extensions/PhpTags/i18n/$csCode.json;
- if ( is_readable( $fileName ) ) {
- $data = FormatJson::decode( file_get_contents(
$fileName ), true );
- foreach ( array_keys( $data ) as $key ) {
- if ( $key === '' || $key[0] === '@' ) {
- unset( $data[$key] );
- }
- }
- $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
- }
-
- $cachedData['deps'][] = new FileDependency( $fileName );
- }
- return true;
-};
diff --git a/PhpTagsWiki.php b/PhpTagsWiki.php
index 11def50..bb97d35 100644
--- a/PhpTagsWiki.php
+++ b/PhpTagsWiki.php
@@ -15,7 +15,7 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry
point.' );
}
-define( 'PHPTAGS_WIKI_VERSION' , '1.6.1' );
+define( 'PHPTAGS_WIKI_VERSION' , '1.6.2' );
// Register this extension on Special:Version
$wgExtensionCredits['phptags'][] = array(
@@ -30,7 +30,6 @@
// Allow translations for this extension
$wgMessagesDirs['PhpTagsWiki'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['PhpTagsWiki'] = __DIR__ .
'/PhpTagsWiki.i18n.php';
/**
* @codeCoverageIgnore
--
To view, visit https://gerrit.wikimedia.org/r/201674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd1f83fefa8f00f30a5ddf521112a5be9d7b3ed4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PhpTagsWiki
Gerrit-Branch: master
Gerrit-Owner: Pastakhov pastak...@yandex.ru
Gerrit-Reviewer: JoelKP joelkpetters...@gmail.com
Gerrit-Reviewer: Pastakhov pastak...@yandex.ru
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Regenerate RuboCop TODO + fix StringLiterals - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: Regenerate RuboCop TODO + fix StringLiterals
..
Regenerate RuboCop TODO + fix StringLiterals
The new version of RuboCop enforces Style/StringLiterals check.
Make sure we use single quotes for strings and fix a bunch of related
warnings.
Bug: T94401
Change-Id: Ia36ea1dfdbbcb45a32db8a015c36e19a5cc10ac6
---
M .rubocop_todo.yml
M Gemfile
M tests/browser/features/step_definitions/global_account_manage.rb
M tests/browser/features/step_definitions/login_steps.rb
M tests/browser/features/support/env.rb
M tests/browser/features/support/pages/special_central_auth.rb
6 files changed, 15 insertions(+), 35 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c022ab3..97ed22d 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,5 +1,5 @@
# This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-10-20 17:36:38 +0200 using RuboCop version 0.26.1.
+# on 2015-04-02 14:52:23 +0200 using RuboCop version 0.29.1.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
@@ -7,22 +7,8 @@
# Offense count: 1
# Cop supports --auto-correct.
-Lint/UnusedBlockArgument:
- Enabled: false
-
-# Offense count: 2
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
- Max: 96
-
-# Offense count: 1
-# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/AlignParameters:
- Enabled: false
-
-# Offense count: 1
-Style/Documentation:
Enabled: false
# Offense count: 2
@@ -43,10 +29,4 @@
# Offense count: 2
# Cop supports --auto-correct.
Style/SpaceInsideParens:
- Enabled: false
-
-# Offense count: 22
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiterals:
Enabled: false
diff --git a/Gemfile b/Gemfile
index fe3be33..1e74901 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
#ruby=ruby-2.1.1
#ruby-gemset=CentralAuth
-source https://rubygems.org;
+source 'https://rubygems.org'
-gem mediawiki_selenium, ~ 1.0.0.pre.2
-gem rubocop, require: false
+gem 'mediawiki_selenium', '~ 1.0.0.pre.2'
+gem 'rubocop', require: false
diff --git a/tests/browser/features/step_definitions/global_account_manage.rb
b/tests/browser/features/step_definitions/global_account_manage.rb
index 7054353..1d1d07d 100644
--- a/tests/browser/features/step_definitions/global_account_manage.rb
+++ b/tests/browser/features/step_definitions/global_account_manage.rb
@@ -3,7 +3,7 @@
end
When(/^I lookup an invalid user$/) do
- on(SpecialCentralAuthPage).lookup_user(invalid centralauth user name)
+ on(SpecialCentralAuthPage).lookup_user('invalid centralauth user name')
end
When(/^I lookup a valid user$/) do
diff --git a/tests/browser/features/step_definitions/login_steps.rb
b/tests/browser/features/step_definitions/login_steps.rb
index 020ee78..f2cbde8 100644
--- a/tests/browser/features/step_definitions/login_steps.rb
+++ b/tests/browser/features/step_definitions/login_steps.rb
@@ -1,6 +1,6 @@
Given(/^I am using a global account$/) do
- expect(api.meta(globaluserinfo).data).to_not include(missing),
-the current acccount is not global
+ expect(api.meta('globaluserinfo').data).to_not include('missing'),
+'the current acccount is not global'
end
Given(/^I am logged in to the primary wiki domain$/) do
diff --git a/tests/browser/features/support/env.rb
b/tests/browser/features/support/env.rb
index 57f3e6b..5eff4ce 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -1,4 +1,4 @@
-require mediawiki_selenium
+require 'mediawiki_selenium'
-require mediawiki_selenium/support
-require mediawiki_selenium/step_definitions
+require 'mediawiki_selenium/support'
+require 'mediawiki_selenium/step_definitions'
diff --git a/tests/browser/features/support/pages/special_central_auth.rb
b/tests/browser/features/support/pages/special_central_auth.rb
index e110c56..91e9562 100644
--- a/tests/browser/features/support/pages/special_central_auth.rb
+++ b/tests/browser/features/support/pages/special_central_auth.rb
@@ -1,12 +1,12 @@
class SpecialCentralAuthPage
include PageObject
- page_url Special:CentralAuth
+ page_url 'Special:CentralAuth'
- text_field(:target_field, id: target)
- div(:error_box, class: error)
- button(:submit, id: centralauth-submit-find)
- fieldset(:centralauth_info, id:mw-centralauth-info)
+ text_field(:target_field, id: 'target')
+ div(:error_box, class: 'error')
+ button(:submit, id: 'centralauth-submit-find')
+ fieldset(:centralauth_info, id:'mw-centralauth-info')
def lookup_user( username )
[MediaWiki-commits] [Gerrit] Show the red interlanguage link only when reading the article - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Show the red interlanguage link only when reading the article
..
Show the red interlanguage link only when reading the article
Bug: T94845
Change-Id: I7700edc495c415e9d884599026f7f78c4ecd42b1
---
M ContentTranslation.hooks.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index 6563f41..2d2bc04 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -59,7 +59,9 @@
$out-addModules( 'ext.cx.eventlogging' );
}
- if ( $title-inNamespace( NS_MAIN ) ) {
+ if ( $title-inNamespace( NS_MAIN )
+ Action::getActionName( $out-getContext() ) === 'view'
+ ) {
$out-addModules( 'ext.cx.redlink' );
}
--
To view, visit https://gerrit.wikimedia.org/r/201480
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7700edc495c415e9d884599026f7f78c4ecd42b1
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@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] gitignore: Clean up to match prod so there's no dirty git st... - change (integration/docroot)
jenkins-bot has submitted this change and it was merged. Change subject: gitignore: Clean up to match prod so there's no dirty git status .. gitignore: Clean up to match prod so there's no dirty git status Change-Id: Ibfe0c793cb0627240f9f0748a51d2fd6ac6a266d --- M .gitignore 1 file changed, 8 insertions(+), 6 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index c92b0ad..d7d3b3f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,13 @@ +# Puppet (ops, jenkins, ..) +/deployment /ssd /localhost/qunit/ -/org/wikimedia/doc/VisualEditor/ -/org/wikimedia/doc/mediawiki-core/ -/org/wikimedia/doc/puppet/ -/org/wikimedia/doc/puppetsource/ -/org/wikimedia/integration/WLMMobile/nightly/ + +# Automated publications +/org/wikimedia/doc/* +/org/wikimedia/integration/cover +/org/wikimedia/integration/nightly /org/wikimedia/integration/WikipediaMobile/nightly/ /org/wikimedia/integration/WiktionaryMobile/nightly/ -/org/wikimedia/integration/nightly/ +/org/wikimedia/integration/WLMMobile/nightly/ jenkins-autodeploy -- To view, visit https://gerrit.wikimedia.org/r/201681 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibfe0c793cb0627240f9f0748a51d2fd6ac6a266d Gerrit-PatchSet: 1 Gerrit-Project: integration/docroot Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr 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] Move extensions to use generic jshint jsonlint jobs part 4 - change (integration/config)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/201669 Change subject: Move extensions to use generic jshint jsonlint jobs part 4 .. Move extensions to use generic jshint jsonlint jobs part 4 All voting mwext-*-jslint jobs are now using the generic jobs! Change-Id: Ia7d784e7d5ab800914b7a6f3d2e17226c71c2e82 --- M zuul/layout.yaml 1 file changed, 28 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/69/201669/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index c131b01..38071e5 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3059,14 +3059,16 @@ - name: mediawiki/extensions/BlameMaps check-only: - - mwext-BlameMaps-jslint + - jshint + - jsonlint - phplint - mwext-BlameMaps-pep8 - mwext-BlameMaps-pyflakes - php-composer-validate gate-and-submit: - mediawiki-gate - - mwext-BlameMaps-jslint + - jshint + - jsonlint - phplint - mwext-BlameMaps-pep8 - mwext-BlameMaps-pyflakes @@ -3768,13 +3770,15 @@ - name: mediawiki/extensions/Interwiki check-only: - mwext-Interwiki-phpcs-HEAD - - mwext-Interwiki-jslint + - jshint + - jsonlint - phplint - php-composer-validate gate-and-submit: - mediawiki-gate - mwext-Interwiki-phpcs-HEAD - - mwext-Interwiki-jslint + - jshint + - jsonlint - phplint - php-composer-validate experimental: @@ -4026,12 +4030,14 @@ - name: 'python-lint-checkonly' prefix: 'mwext-Offline' check-only: - - mwext-Offline-jslint + - jshint + - jsonlint - phplint - php-composer-validate gate-and-submit: - mediawiki-gate - - mwext-Offline-jslint + - jshint + - jsonlint - phplint - php-composer-validate @@ -4060,12 +4066,14 @@ - name: 'python-lint-checkonly' prefix: 'mwext-OpenStackManager' check-only: - - mwext-OpenStackManager-jslint + - jshint + - jsonlint - phplint - php-composer-validate gate-and-submit: - mediawiki-gate - - mwext-OpenStackManager-jslint + - jshint + - jsonlint - phplint - php-composer-validate @@ -6424,12 +6432,14 @@ - name: 'python-lint-checkonly' prefix: 'mwext-SemanticBundle' check-only: - - mwext-SemanticBundle-jslint + - jshint + - jsonlint - phplint - php-composer-validate gate-and-submit: - mediawiki-gate - - mwext-SemanticBundle-jslint + - jshint + - jsonlint - phplint - php-composer-validate @@ -6664,13 +6674,15 @@ - name: mediawiki/extensions/SyntaxHighlight_GeSHi check-only: - - mwext-SyntaxHighlight_GeSHi-jslint + - jshint + - jsonlint - mwext-SyntaxHighlight_GeSHi-phpcs-HEAD - phplint - php-composer-validate gate-and-submit: - mediawiki-gate - - mwext-SyntaxHighlight_GeSHi-jslint + - jshint + - jsonlint - mwext-SyntaxHighlight_GeSHi-phpcs-HEAD - phplint - php-composer-validate @@ -6842,13 +6854,15 @@ - name: mediawiki/extensions/Vector check-only: - - mwext-Vector-jslint + - jshint + - jsonlint - mwext-Vector-phpcs-HEAD - phplint - php-composer-validate gate-and-submit: - mediawiki-gate - - mwext-Vector-jslint + - jshint + - jsonlint - mwext-Vector-phpcs-HEAD - phplint - php-composer-validate -- To view, visit https://gerrit.wikimedia.org/r/201669 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia7d784e7d5ab800914b7a6f3d2e17226c71c2e82 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n compatibility (v 1.6.2) - change (mediawiki...PhpTagsWiki)
Pastakhov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201674
Change subject: Remove i18n compatibility (v 1.6.2)
..
Remove i18n compatibility (v 1.6.2)
Bug: T94976
Change-Id: Idd1f83fefa8f00f30a5ddf521112a5be9d7b3ed4
---
D PhpTagsWiki.i18n.php
M PhpTagsWiki.php
2 files changed, 1 insertion(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PhpTagsWiki
refs/changes/74/201674/1
diff --git a/PhpTagsWiki.i18n.php b/PhpTagsWiki.i18n.php
deleted file mode 100644
index 8ee5f72..000
--- a/PhpTagsWiki.i18n.php
+++ /dev/null
@@ -1,31 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-$GLOBALS['wgHooks']['LocalisationCacheRecache'][] = function ( $cache, $code,
$cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = __DIR__ . /extensions/PhpTags/i18n/$csCode.json;
- if ( is_readable( $fileName ) ) {
- $data = FormatJson::decode( file_get_contents(
$fileName ), true );
- foreach ( array_keys( $data ) as $key ) {
- if ( $key === '' || $key[0] === '@' ) {
- unset( $data[$key] );
- }
- }
- $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
- }
-
- $cachedData['deps'][] = new FileDependency( $fileName );
- }
- return true;
-};
diff --git a/PhpTagsWiki.php b/PhpTagsWiki.php
index 11def50..bb97d35 100644
--- a/PhpTagsWiki.php
+++ b/PhpTagsWiki.php
@@ -15,7 +15,7 @@
die( 'This file is an extension to MediaWiki and thus not a valid entry
point.' );
}
-define( 'PHPTAGS_WIKI_VERSION' , '1.6.1' );
+define( 'PHPTAGS_WIKI_VERSION' , '1.6.2' );
// Register this extension on Special:Version
$wgExtensionCredits['phptags'][] = array(
@@ -30,7 +30,6 @@
// Allow translations for this extension
$wgMessagesDirs['PhpTagsWiki'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['PhpTagsWiki'] = __DIR__ .
'/PhpTagsWiki.i18n.php';
/**
* @codeCoverageIgnore
--
To view, visit https://gerrit.wikimedia.org/r/201674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd1f83fefa8f00f30a5ddf521112a5be9d7b3ed4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PhpTagsWiki
Gerrit-Branch: master
Gerrit-Owner: Pastakhov pastak...@yandex.ru
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use ve.safeDecodeURIComponent() - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Use ve.safeDecodeURIComponent()
..
Use ve.safeDecodeURIComponent()
Depends on Iacc50230a in VE core.
Change-Id: I7fc505c261726f8d83c86a9cc352a0bf9fcb455a
---
M modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
M modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
M modules/ve-mw/dm/metaitems/ve.dm.MWCategoryMetaItem.js
M modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
4 files changed, 8 insertions(+), 14 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
Trevor Parscal: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
index a591715..94932bd 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
@@ -172,7 +172,7 @@
var targetData =
ve.dm.MWInternalLinkAnnotation.static.getTargetDataFromHref(
this.href,
transclusionNode.getModelHtmlDocument()
),
- normalisedHref = decodeURIComponent(
targetData.title );
+ normalisedHref =
ve.safeDecodeURIComponent( targetData.title );
if ( mw.Title.newFromText( normalisedHref ) ) {
normalisedHref = mw.Title.newFromText(
normalisedHref ).getPrefixedText();
}
diff --git a/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
b/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
index 7be92c3..99bc4ab 100644
--- a/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
+++ b/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
@@ -42,7 +42,7 @@
type: this.name,
attributes: {
hrefPrefix: targetData.hrefPrefix,
- title: decodeURIComponent( targetData.title ).replace(
/_/g, ' ' ),
+ title: ve.safeDecodeURIComponent( targetData.title
).replace( /_/g, ' ' ),
normalizedTitle: this.normalizeTitle( targetData.title
),
lookupTitle: this.getLookupTitle( targetData.title ),
origTitle: targetData.title
@@ -92,7 +92,7 @@
var href,
title = dataElement.attributes.title,
origTitle = dataElement.attributes.origTitle;
- if ( origTitle !== undefined decodeURIComponent( origTitle
).replace( /_/g, ' ' ) === title ) {
+ if ( origTitle !== undefined ve.safeDecodeURIComponent( origTitle
).replace( /_/g, ' ' ) === title ) {
// Restore href from origTitle
href = origTitle;
// Only use hrefPrefix if restoring from origTitle
diff --git a/modules/ve-mw/dm/metaitems/ve.dm.MWCategoryMetaItem.js
b/modules/ve-mw/dm/metaitems/ve.dm.MWCategoryMetaItem.js
index f0c6f3a..ad56235 100644
--- a/modules/ve-mw/dm/metaitems/ve.dm.MWCategoryMetaItem.js
+++ b/modules/ve-mw/dm/metaitems/ve.dm.MWCategoryMetaItem.js
@@ -41,9 +41,9 @@
type: this.name,
attributes: {
hrefPrefix: matches[1],
- category: decodeURIComponent( matches[2] ).replace(
/_/g, ' ' ),
+ category: ve.safeDecodeURIComponent( matches[2]
).replace( /_/g, ' ' ),
origCategory: matches[2],
- sortkey: decodeURIComponent( rawSortkey ).replace(
/_/g, ' ' ),
+ sortkey: ve.safeDecodeURIComponent( rawSortkey
).replace( /_/g, ' ' ),
origSortkey: rawSortkey
}
};
@@ -57,8 +57,8 @@
sortkey = dataElement.attributes.sortkey || '',
origCategory = dataElement.attributes.origCategory || '',
origSortkey = dataElement.attributes.origSortkey || '',
- normalizedOrigCategory = decodeURIComponent( origCategory
).replace( /_/g, ' ' ),
- normalizedOrigSortkey = decodeURIComponent( origSortkey
).replace( /_/g, ' ' );
+ normalizedOrigCategory = ve.safeDecodeURIComponent(
origCategory ).replace( /_/g, ' ' ),
+ normalizedOrigSortkey = ve.safeDecodeURIComponent( origSortkey
).replace( /_/g, ' ' );
if ( normalizedOrigSortkey === sortkey ) {
sortkey = origSortkey;
} else {
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
index ebb6e71..55a307a 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
@@ -206,13 +206,7 @@
var resource =
[MediaWiki-commits] [Gerrit] Adding Persian name for Western Balochi, Fixing Persian name... - change (mediawiki...cldr)
Mjbmr has uploaded a new change for review. https://gerrit.wikimedia.org/r/201695 Change subject: Adding Persian name for Western Balochi, Fixing Persian name for Southern Balochi from Southern to Makrani which is called locally .. Adding Persian name for Western Balochi, Fixing Persian name for Southern Balochi from Southern to Makrani which is called locally Change-Id: I24aa404f76026d2c7ced0ddcd4de6fd8788a78f1 --- M LocalNames/LocalNamesFa.php 1 file changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/cldr refs/changes/95/201695/1 diff --git a/LocalNames/LocalNamesFa.php b/LocalNames/LocalNamesFa.php index 9f7387f..80329c2 100644 --- a/LocalNames/LocalNamesFa.php +++ b/LocalNames/LocalNamesFa.php @@ -42,11 +42,17 @@ */ 'bar' = 'بایرنی', - /* Not in CLDR 21.0.1. Balochi language -* http://www.ethnologue.org/show_language.asp?code=bcc + /* Not in CLDR 21.0.1. Southern Balochi language +* http://www.ethnologue.com/language/bcc * Added 2008-07-02. */ - 'bcc' = 'بلوچی جنوبی', + 'bcc' = 'بلوچی مکرانی', + + /* Not in CLDR 26.0.1. Western Balochi language +* http://www.ethnologue.com/language/bgn +* Added 2015-01-18. +*/ + 'bgn' = 'بلوچی رخشانی', /* Not in CLDR 21.0.1. Betawi language. * http://www.ethnologue.com/show_language.asp?code=bew -- To view, visit https://gerrit.wikimedia.org/r/201695 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24aa404f76026d2c7ced0ddcd4de6fd8788a78f1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/cldr Gerrit-Branch: master Gerrit-Owner: Mjbmr mjb...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed BloomFilter classes - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Removed BloomFilter classes
..
Removed BloomFilter classes
* This ends up being more complex than its worth
and even more so for multi-DC support
Bug: T93006
Change-Id: Iaa774fe69061e42955b11dc82d30dba93208e606
---
M RELEASE-NOTES-1.25
M autoload.php
M includes/DefaultSettings.php
D includes/cache/bloom/BloomCache.php
D includes/cache/bloom/BloomCacheRedis.php
D includes/cache/bloom/BloomFilters.php
M includes/logging/LogEntry.php
M includes/logging/LogEventsList.php
D tests/phpunit/includes/cache/RedisBloomCacheTest.php
9 files changed, 3 insertions(+), 901 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index a31461c..7b035ac 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -422,6 +422,7 @@
thisisdeleted, viewdeleted, editlink, retrievedfrom,
version-poweredby-others,
retrievedfrom, thisisdeleted, viewsourcelink, lastmodifiedat,
laggedslavemode,
protect-summary-cascade
+* All BloomCache related code has been removed. This was largely experimental.
== Compatibility ==
diff --git a/autoload.php b/autoload.php
index da661a2..3396738 100644
--- a/autoload.php
+++ b/autoload.php
@@ -170,9 +170,6 @@
'Block' = __DIR__ . '/includes/Block.php',
'BlockListPager' = __DIR__ . '/includes/specials/SpecialBlockList.php',
'BlockLogFormatter' = __DIR__ .
'/includes/logging/BlockLogFormatter.php',
- 'BloomCache' = __DIR__ . '/includes/cache/bloom/BloomCache.php',
- 'BloomCacheRedis' = __DIR__ .
'/includes/cache/bloom/BloomCacheRedis.php',
- 'BloomFilterTitleHasLogs' = __DIR__ .
'/includes/cache/bloom/BloomFilters.php',
'BmpHandler' = __DIR__ . '/includes/media/BMP.php',
'BrokenRedirectsPage' = __DIR__ .
'/includes/specials/SpecialBrokenRedirects.php',
'BufferingStatsdDataFactory' = __DIR__ .
'/includes/libs/BufferingStatsdDataFactory.php',
@@ -367,7 +364,6 @@
'EmailNotification' = __DIR__ . '/includes/mail/EmailNotification.php',
'EmaillingJob' = __DIR__ . '/includes/jobqueue/jobs/EmaillingJob.php',
'EmptyBagOStuff' = __DIR__ .
'/includes/libs/objectcache/EmptyBagOStuff.php',
- 'EmptyBloomCache' = __DIR__ . '/includes/cache/bloom/BloomCache.php',
'EncryptedPassword' = __DIR__ .
'/includes/password/EncryptedPassword.php',
'EnhancedChangesList' = __DIR__ .
'/includes/changes/EnhancedChangesList.php',
'EnotifNotifyJob' = __DIR__ .
'/includes/jobqueue/jobs/EnotifNotifyJob.php',
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index ef80c63..845c7f5 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2148,28 +2148,6 @@
);
/**
- * Map of bloom filter store names to configuration arrays.
- *
- * Example:
- * $wgBloomFilterStores['main'] = array(
- * 'cacheId' = 'main-v1',
- * 'class'= 'BloomCacheRedis',
- * 'redisServers' = array( '127.0.0.1:6379' ),
- * 'redisConfig' = array( 'connectTimeout' = 2 )
- * );
- *
- * A primary bloom filter must be created manually.
- * Example in eval.php:
- * code
- * BloomCache::get( 'main' )-init( 'shared', 10, .001 );
- * /code
- * The size should be as large as practical given wiki size and resources.
- *
- * @since 1.24
- */
-$wgBloomFilterStores = array();
-
-/**
* The expiry time for the parser cache, in seconds.
* The default is 86400 (one day).
*/
diff --git a/includes/cache/bloom/BloomCache.php
b/includes/cache/bloom/BloomCache.php
deleted file mode 100644
index 6ecaacb..000
--- a/includes/cache/bloom/BloomCache.php
+++ /dev/null
@@ -1,324 +0,0 @@
-?php
-/**
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @author Aaron Schulz
- */
-
-/**
- * Persistent bloom filter used to avoid expensive lookups
- *
- * @since 1.24
- */
-abstract class BloomCache {
- /** @var string Unique ID for key namespacing */
- protected $cacheID;
-
- /** @var array Map of (id = BloomCache) */
- protected static $instances = array();
-
- /**
-* @param string $id
[MediaWiki-commits] [Gerrit] build: Use grunt-contrib-copy instead of our own implementation - change (VisualEditor/VisualEditor)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201687
Change subject: build: Use grunt-contrib-copy instead of our own implementation
..
build: Use grunt-contrib-copy instead of our own implementation
Minor technical debt. But important now because it blocks Ic6cdc9ac1.
Change-Id: Iac5e4340444791f48548a639c7feba20d004082e
---
M Gruntfile.js
D build/tasks/copy.js
M package.json
3 files changed, 4 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/87/201687/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 4226d22..b098087 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -9,6 +9,7 @@
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-contrib-clean' );
grunt.loadNpmTasks( 'grunt-contrib-concat' );
+ grunt.loadNpmTasks( 'grunt-contrib-copy' );
grunt.loadNpmTasks( 'grunt-contrib-csslint' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
@@ -79,7 +80,8 @@
copy: {
i18n: {
src: 'i18n/*.json',
- dest: 'dist/'
+ dest: 'dist/',
+ expand: true
}
},
buildloader: {
diff --git a/build/tasks/copy.js b/build/tasks/copy.js
deleted file mode 100644
index b4592d1..000
--- a/build/tasks/copy.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/*!
- * Build a distribution file
- *
- * Concatenates the list of input files, and performs
- * version/date placeholder replacements.
- */
-
-/*jshint node:true */
-module.exports = function ( grunt ) {
-
- grunt.registerMultiTask( 'copy', function () {
- var destDir = this.data.dest + '/',
- strip = this.data.strip;
- this.filesSrc.forEach( function ( fileName ) {
- var destFileName = strip ? fileName.replace( strip, ''
) : fileName;
- grunt.file.copy( fileName, destDir + destFileName );
- } );
- grunt.log.writeln( 'Copied ' + this.filesSrc.length + ' files.'
);
- } );
-
-};
diff --git a/package.json b/package.json
index 346cc89..c9d926f 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
grunt-banana-checker: 0.2.1,
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-jshint: 0.11.0,
grunt-contrib-watch: 0.6.1,
--
To view, visit https://gerrit.wikimedia.org/r/201687
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac5e4340444791f48548a639c7feba20d004082e
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Made Skin::getRelevantUser use READ_NORMAL - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201688
Change subject: Made Skin::getRelevantUser use READ_NORMAL
..
Made Skin::getRelevantUser use READ_NORMAL
Bug: T92357
Change-Id: I5089c99ae3a21bb8d41d488d18dd63fe1eaefea9
---
M includes/skins/Skin.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/88/201688/1
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 48bce67..600a942 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -339,6 +339,7 @@
$this-mRelevantUser = User::newFromName(
$rootUser, false );
} else {
$user = User::newFromName( $rootUser, false );
+ $user-load( User::READ_NORMAL );
if ( $user $user-isLoggedIn() ) {
$this-mRelevantUser = $user;
}
--
To view, visit https://gerrit.wikimedia.org/r/201688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5089c99ae3a21bb8d41d488d18dd63fe1eaefea9
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] buid: Include utils.js in jsduck and add 'doc' entry point - change (oojs/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201691
Change subject: buid: Include utils.js in jsduck and add 'doc' entry point
..
buid: Include utils.js in jsduck and add 'doc' entry point
Include utils.js in jsduck (OO.isPlainObject was not being
indexed previously because of this).
Add npm doc script for standard publishing via Jenkins.
Move coverage output directory out of dist/ to a standard
coverage directory. Nothing was stopping it from being published,
other than the fact that our prepublish build script doesn't run
unit tests (and as such doesn't produce a coverage report).
Also remove redundant node_modules and npm-debug from npmignore
as those are always ignored by npm (almost like adding '.git' to
'.gitignore').
https://docs.npmjs.com/misc/developers#keeping-files-out-of-your-package
Change-Id: I5dbd155ac94d0e6da20dda06b9762207dae580b7
---
M .gitignore
M .jshintignore
M .npmignore
M Gruntfile.js
M jsduck.json
M package.json
M src/util.js
7 files changed, 11 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/91/201691/1
diff --git a/.gitignore b/.gitignore
index a06d721..3a0f3b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/coverage
/dist/*
/docs
node_modules
diff --git a/.jshintignore b/.jshintignore
index 3613f5e..9aa34ea 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,3 +1,4 @@
-doc/
-lib/
+/coverage
+/docs
+/lib
node_modules
diff --git a/.npmignore b/.npmignore
index 323481d..31b2a9d 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,2 +1,2 @@
-dist/.*
-docs
+/coverage
+/docs
diff --git a/Gruntfile.js b/Gruntfile.js
index 155451f..cb48928 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -113,8 +113,8 @@
},
reporters: [ 'dots', 'coverage' ],
coverageReporter: { reporters: [
- { type: 'html', dir: 'dist/coverage/' },
- { type: 'text-summary', dir:
'dist/coverage/' }
+ { type: 'html', dir: 'coverage/' },
+ { type: 'text-summary', dir:
'coverage/' }
] }
},
jquery: {
diff --git a/jsduck.json b/jsduck.json
index e9f1cfe..1649e69 100644
--- a/jsduck.json
+++ b/jsduck.json
@@ -7,6 +7,7 @@
--builtin-classes: true,
--: [
src/core.js,
+ src/util.js,
src/EventEmitter.js,
src/Registry.js,
src/Factory.js
diff --git a/package.json b/package.json
index 8db9ae2..af11d3c 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
main: ./dist/oojs.js,
scripts: {
test: grunt test node tests/node-index.js,
+doc: jsduck,
prepublish: grunt build
},
dependencies: {},
diff --git a/src/util.js b/src/util.js
index 867a6d3..2783a8e 100644
--- a/src/util.js
+++ b/src/util.js
@@ -3,6 +3,7 @@
/**
* Assert whether a value is a plain object or not.
*
+ * @member OO
* @param {Mixed} obj
* @return {boolean}
*/
--
To view, visit https://gerrit.wikimedia.org/r/201691
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5dbd155ac94d0e6da20dda06b9762207dae580b7
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tablet styles for Special:Gather/by/User - change (mediawiki...Gather)
Jhernandez has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201690
Change subject: Tablet styles for Special:Gather/by/User
..
Tablet styles for Special:Gather/by/User
* And refactor columns styles to mixins
Visit Special:Gather/by/USERNAME with tablet width or bigger and see 2 columns
for the collections cards
Bug: T91384
Change-Id: Ic641d50ce2049f2a83fd1bb296aba96cfefbf2f0
---
M resources/ext.gather.styles/collections.less
1 file changed, 21 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/90/201690/1
diff --git a/resources/ext.gather.styles/collections.less
b/resources/ext.gather.styles/collections.less
index 9997422..aa2f42f 100644
--- a/resources/ext.gather.styles/collections.less
+++ b/resources/ext.gather.styles/collections.less
@@ -16,6 +16,19 @@
}
}
+.tablet-columns(@columns: 2) {
+ @media all and (min-width: @wgMFDeviceWidthTablet) {
+ -webkit-columns: @columns;
+ -moz-columns: @columns;
+ columns: @columns;
+ }
+}
+.column-item() {
+ // Don't split items between css columns
+ display: inline-block;
+ width: 100%;
+}
+
/*
* Collection page
*/
@@ -80,11 +93,7 @@
}
.collection-items {
- @media all and (min-width: @wgMFDeviceWidthTablet) {
- -webkit-columns: 2;
- -moz-columns: 2;
- columns: 2;
- }
+ .tablet-columns();
}
.collection-item {
@@ -94,8 +103,7 @@
padding: 0 @collectionItemPadding;
margin-bottom: 2em;
- display: inline-block;
- width: 100%;
+ .column-item();
.list-thumb {
height: 300px;
@@ -157,6 +165,10 @@
*/
.collections-list {
+ .collection-cards {
+ .tablet-columns();
+ }
+
@overlayHeight: 6em;
.collection-card {
@@ -165,6 +177,8 @@
position: relative;
margin-bottom: 1em;
+ .column-item();
+
.without-image {
// If there is no image on the card, then make it as
big as the overlay
height: @overlayHeight;
--
To view, visit https://gerrit.wikimedia.org/r/201690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic641d50ce2049f2a83fd1bb296aba96cfefbf2f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jhernandez jhernan...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Qunit core tests borked b/c missing resource dependency - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged. Change subject: Qunit core tests borked b/c missing resource dependency .. Qunit core tests borked b/c missing resource dependency Change-Id: If1175ad5fef44687480e118773a795b22e4b502e --- M resources/Resources.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Phuedx: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/Resources.php b/resources/Resources.php index 42a9dbe..abe60c4 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -118,6 +118,7 @@ 'dependencies' = array( 'mediawiki.util', 'mobile.watchstar', + 'mobile.settings', 'ext.gather.api', 'ext.gather.collection.base', 'ext.gather.watchstar.icons', -- To view, visit https://gerrit.wikimedia.org/r/201697 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If1175ad5fef44687480e118773a795b22e4b502e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Jhernandez jhernan...@wikimedia.org Gerrit-Reviewer: Phuedx g...@samsmith.io Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Move pre/post 'doc' task into package.json - change (mediawiki...VisualEditor)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201685
Change subject: build: Move pre/post 'doc' task into package.json
..
build: Move pre/post 'doc' task into package.json
Standard entry point.
Change-Id: Ic6cdc9ac1b266a64dcb1522ac36132c5ef844d3c
---
M Gruntfile.js
M bin/generateDocs.sh
M jsduck.json
M package.json
4 files changed, 24 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/85/201685/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 6c369d1..214c2e2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -8,6 +8,7 @@
module.exports = function ( grunt ) {
var modules = grunt.file.readJSON( 'lib/ve/build/modules.json' );
+ grunt.loadNpmTasks( 'grunt-contrib-copy' );
grunt.loadNpmTasks( 'grunt-contrib-csslint' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
@@ -72,6 +73,15 @@
banana: {
all: 'modules/ve-{mw,wmf}/i18n/'
},
+ copy: {
+ jsduck: {
+ // Skip lib/Base64.js
+ //
https://github.com/gruntjs/grunt-contrib-copy/issues/226
+ src: 'lib/ve/**/*',
+ dest: 'docs/',
+ expand: true
+ }
+ },
watch: {
files: [
'.{csslintrc,jscsrc,jshintignore,jshintrc}',
diff --git a/bin/generateDocs.sh b/bin/generateDocs.sh
index eeba646..4f0c5d5 100755
--- a/bin/generateDocs.sh
+++ b/bin/generateDocs.sh
@@ -1,4 +1,11 @@
#!/usr/bin/env bash
+#
+# DEPRECATED: Use 'npm run-script doc' instead.
+#
+# This is kept as-is for back-compat with Jenkins jobs.
+# Don't forward to 'npm run-script' since Jenkins relies on it
+# being a symlink.
+#
set -e
cd $(dirname $0)/..
jsduck
diff --git a/jsduck.json b/jsduck.json
index 33b4972..cb0ae96 100644
--- a/jsduck.json
+++ b/jsduck.json
@@ -1,14 +1,14 @@
{
--title: VisualEditor - Documentation,
+ --output: docs,
--categories: .jsduck/categories.json,
--eg-iframe: .jsduck/eg-iframe.html,
--tags: .jsduck/CustomTags.rb,
- --warnings: [-nodoc(class,public)],
- --builtin-classes: true,
--processes: 0,
--warnings-exit-nonzero: true,
+ --builtin-classes: true,
--external:
HTMLDocument,Window,Node,Set,Range,Selection,ClientRect,File,Blob,DataTransfer,DataTransferItem,KeyboardEvent,MouseEvent,
- --output: docs,
+ --warnings: [-nodoc(class,public)],
--: [
.jsduck/external.js,
lib/ve/.jsduck/external.js,
diff --git a/package.json b/package.json
index 8de3028..ae605a7 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,14 @@
private: true,
description: Build tools for the VisualEditor-MediaWiki extension.,
scripts: {
-test: grunt test
+test: grunt test,
+doc: jsduck,
+postdoc: grunt copy:jsduck
},
devDependencies: {
grunt: 0.4.5,
grunt-banana-checker: 0.2.1,
+grunt-contrib-copy: 0.8.0,
grunt-contrib-csslint: 0.4.0,
grunt-contrib-jshint: 0.11.0,
grunt-contrib-watch: 0.6.1,
--
To view, visit https://gerrit.wikimedia.org/r/201685
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6cdc9ac1b266a64dcb1522ac36132c5ef844d3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Declare grunt-cli dependency - change (mediawiki...VisualEditor)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201686
Change subject: build: Declare grunt-cli dependency
..
build: Declare grunt-cli dependency
Change-Id: I6a7fafa3c6e40d2407f07c514167ab9fc7661685
---
M package.json
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/86/201686/1
diff --git a/package.json b/package.json
index ae605a7..be77642 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
},
devDependencies: {
grunt: 0.4.5,
+grunt-cli: 0.1.13,
grunt-banana-checker: 0.2.1,
grunt-contrib-copy: 0.8.0,
grunt-contrib-csslint: 0.4.0,
--
To view, visit https://gerrit.wikimedia.org/r/201686
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a7fafa3c6e40d2407f07c514167ab9fc7661685
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [wip] Make PopupsWidget and FlaggedElement - change (oojs/ui)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201693
Change subject: [wip] Make PopupsWidget and FlaggedElement
..
[wip] Make PopupsWidget and FlaggedElement
…and add styles for the warning flag.
Bug: T92026
Change-Id: I09d165e597f0b37fb061f3ced54360adb83ca4e7
---
M demos/pages/widgets.js
M src/themes/mediawiki/common.less
M src/themes/mediawiki/widgets.less
M src/widgets/PopupWidget.js
4 files changed, 22 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/93/201693/1
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 75de527..dd69374 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -1214,6 +1214,7 @@
label: 'More
information',
$content: $( 'pExtra
information here./p' ),
padded: true,
+ flags: [ 'warning' ],
align: 'left'
}
} ),
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index 0985eec..04f1b81 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -15,6 +15,9 @@
@destructive: #d11d13;
@destructive-selected: #a7170f;
+@warning: #ff5d00;
+@warning-selected: #b23b00;
+
@text: #55;
@pressed-text: #44;
@pressed-color: #d0d0d0; // Used for borders and backgrounds
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index 4a284a1..4c82eed 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -750,6 +750,21 @@
}
}
+ .oo-ui-flaggedElement {
+ -warning {
+ .oo-ui-popupWidget-popup {
+ color: #fff;
+ background: @warning;
+ }
+
+ .oo-ui-popupWidget-anchor {
+ :after {
+ border-bottom-color: @warning;
+ }
+ }
+ }
+ }
+
-body-padded {
padding: 0 1em;
}
diff --git a/src/widgets/PopupWidget.js b/src/widgets/PopupWidget.js
index 59d7035..2130686 100644
--- a/src/widgets/PopupWidget.js
+++ b/src/widgets/PopupWidget.js
@@ -20,6 +20,7 @@
* @class
* @extends OO.ui.Widget
* @mixins OO.ui.LabelElement
+ * @mixins OO.ui.FlaggedElement
*
* @constructor
* @param {Object} [config] Configuration options
@@ -55,6 +56,7 @@
// Mixin constructors
OO.ui.LabelElement.call( this, config );
+ OO.ui.FlaggedElement.call( this, config );
OO.ui.ClippableElement.call( this, $.extend( {}, config, { $clippable:
this.$body } ) );
// Properties
@@ -113,6 +115,7 @@
OO.inheritClass( OO.ui.PopupWidget, OO.ui.Widget );
OO.mixinClass( OO.ui.PopupWidget, OO.ui.LabelElement );
+OO.mixinClass( OO.ui.PopupWidget, OO.ui.FlaggedElement );
OO.mixinClass( OO.ui.PopupWidget, OO.ui.ClippableElement );
/* Methods */
--
To view, visit https://gerrit.wikimedia.org/r/201693
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I09d165e597f0b37fb061f3ced54360adb83ca4e7
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for multiple virtual hosts to doc publisher - change (integration/config)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201677
Change subject: Add support for multiple virtual hosts to doc publisher
..
Add support for multiple virtual hosts to doc publisher
Bug: T93558
Change-Id: Ic42645ba3a8f3821ff4c12e4d0bcff1b20976902
---
M jjb/doc.yaml
1 file changed, 48 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/77/201677/1
diff --git a/jjb/doc.yaml b/jjb/doc.yaml
index 10562fc..f1ccf1d 100644
--- a/jjb/doc.yaml
+++ b/jjb/doc.yaml
@@ -17,30 +17,50 @@
# rsync {docsrc} folder to integration-publisher.eqiad.wmflabs
- shell: |
if [ -z $ZUUL_UUID ]; then
-echo Parameter \$ZUUL_UUID is missing!
-echo Can not rsync the documentation, aborting.
+echo Error: ZUUL_UUID must be set, aborting.
exit 1
fi
rsync --recursive {docsrc}/ rsync://10.68.16.255/doc/$ZUUL_UUID
+ echo
+ echo Publishing to https://doc.wikimedia.org/{docdest}/;
- trigger-builds:
- - project: doc-publish-sync
+ - project: publish-on-gallium
block: true
current-parameters: true # Pass Zuul parameters
predefined-parameters:
- WMF_CI_DOC_DEST={docdest}
+ WMF_CI_PUB_DOCROOT=org/wikimedia/doc
+ WMF_CI_PUB_DEST={docdest}
-# rsync a folder from integration-publisher.eqiad.wmflabs to the docroot
-# of doc.wikimedia.org on gallium.
+# rsync a directory from integration-publisher.eqiad.wmflabs to a website on
gallium.
+#
+# Serves:
+#
+# - doc.wikimedia.org/:project/:version
+# * docroot: org/wikimedia/doc
+# * dest: PROJECT/$DOC_SUBPATH[/subdir]
+#
+# - integration.wikimedia.org/cover/:project
+# * docroot: org/wikimedia/integration
+# * dest: cover/PROJECT
#
# Uses $ZUUL_UUID as a unique identifier.
- job:
-name: doc-publish-sync
-node: gallium # hosts doc.wikimedia.org
+name: publish-on-gallium
+node: gallium
parameters:
- string:
- name: 'WMF_CI_DOC_DEST'
- description: 'Sub folder under /srv/org/wikimedia/doc/ to copy doc to'
+ # MUST NOT have leading slash.
+ # MUST NOT have trailing slash.
+ # MUST exist on gallium.
+ name: 'WMF_CI_PUB_DOCROOT'
+ description: 'A document root under /srv, such as org/wikimedia/doc'
+ - string:
+ # MUST NOT have leading slash.
+ # MUST NOT have trailing slash.
+ # WILL be auto-created if non-existent.
+ name: 'WMF_CI_PUB_DEST'
+ description: 'Sub directory path under the chosen document root, such
as mediawiki-core/DOC_SUBPATH/js'
triggers:
- zuul
@@ -50,23 +70,31 @@
echo Zuul UUID: $ZUUL_UUID
echo ...
- shell: |
- if [ $WMF_CI_DOC_DEST == ]; then
- echo WMF_CI_DOC_DEST parameter is empty. Aborting
- exit 1
- fi
- if [ -z $ZUUL_UUID ]; then
-echo Parameter \$ZUUL_UUID is missing!
-echo Can not rsync the documentation, aborting.
+ if [ $WMF_CI_PUB_DOCROOT == ]; then
+echo Error: WMF_CI_PUB_DOCROOT must be set, aborting.
exit 1
fi
- LOCAL_DEST=/srv/org/wikimedia/doc/$WMF_CI_DOC_DEST
+ if [ $WMF_CI_PUB_DEST == ]; then
+echo Error: WMF_CI_PUB_DEST must be set, aborting.
+exit 1
+ fi
+ if [ -z $ZUUL_UUID ]; then
+echo Error: ZUUL_UUID must be set, aborting.
+exit 1
+ fi
+ LOCAL_DOCROOT=/srv/$WMF_CI_PUB_DOCROOT
+ if [ ! -d $LOCAL_DOCROOT ]; then
+echo Error: Invalid docroot. Directory $LOCAL_DOCROOT must exist,
aborting.
+exit 1
+ fi
+ LOCAL_DEST=$LOCAL_DOCROOT/$WMF_CI_PUB_DEST
mkdir -p $LOCAL_DEST
rsync --recursive --delete-after
rsync://10.68.16.255/doc/$ZUUL_UUID/ $LOCAL_DEST
- shell: |
set +x
+ LOCAL_VHOST=$(echo $WMF_CI_PUB_DOCROOT | awk -F'/' '{ print
$3.$2.$1 }')
echo
- # Strip trailing slash from WMF_CI_DOC_DEST to avoid double slashes
- echo Doc published under
https://doc.wikimedia.org/${WMF_CI_DOC_DEST%/}/;
+ echo Published to https://$LOCAL_VHOST/$WMF_CI_PUB_DEST/;
publishers:
- postbuildscript:
builders:
--
To view, visit https://gerrit.wikimedia.org/r/201677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic42645ba3a8f3821ff4c12e4d0bcff1b20976902
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for multiple virtual hosts to doc publisher - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Add support for multiple virtual hosts to doc publisher
..
Add support for multiple virtual hosts to doc publisher
Bug: T93558
Change-Id: Ic42645ba3a8f3821ff4c12e4d0bcff1b20976902
---
M jjb/doc.yaml
1 file changed, 48 insertions(+), 20 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/doc.yaml b/jjb/doc.yaml
index 10562fc..f1ccf1d 100644
--- a/jjb/doc.yaml
+++ b/jjb/doc.yaml
@@ -17,30 +17,50 @@
# rsync {docsrc} folder to integration-publisher.eqiad.wmflabs
- shell: |
if [ -z $ZUUL_UUID ]; then
-echo Parameter \$ZUUL_UUID is missing!
-echo Can not rsync the documentation, aborting.
+echo Error: ZUUL_UUID must be set, aborting.
exit 1
fi
rsync --recursive {docsrc}/ rsync://10.68.16.255/doc/$ZUUL_UUID
+ echo
+ echo Publishing to https://doc.wikimedia.org/{docdest}/;
- trigger-builds:
- - project: doc-publish-sync
+ - project: publish-on-gallium
block: true
current-parameters: true # Pass Zuul parameters
predefined-parameters:
- WMF_CI_DOC_DEST={docdest}
+ WMF_CI_PUB_DOCROOT=org/wikimedia/doc
+ WMF_CI_PUB_DEST={docdest}
-# rsync a folder from integration-publisher.eqiad.wmflabs to the docroot
-# of doc.wikimedia.org on gallium.
+# rsync a directory from integration-publisher.eqiad.wmflabs to a website on
gallium.
+#
+# Serves:
+#
+# - doc.wikimedia.org/:project/:version
+# * docroot: org/wikimedia/doc
+# * dest: PROJECT/$DOC_SUBPATH[/subdir]
+#
+# - integration.wikimedia.org/cover/:project
+# * docroot: org/wikimedia/integration
+# * dest: cover/PROJECT
#
# Uses $ZUUL_UUID as a unique identifier.
- job:
-name: doc-publish-sync
-node: gallium # hosts doc.wikimedia.org
+name: publish-on-gallium
+node: gallium
parameters:
- string:
- name: 'WMF_CI_DOC_DEST'
- description: 'Sub folder under /srv/org/wikimedia/doc/ to copy doc to'
+ # MUST NOT have leading slash.
+ # MUST NOT have trailing slash.
+ # MUST exist on gallium.
+ name: 'WMF_CI_PUB_DOCROOT'
+ description: 'A document root under /srv, such as org/wikimedia/doc'
+ - string:
+ # MUST NOT have leading slash.
+ # MUST NOT have trailing slash.
+ # WILL be auto-created if non-existent.
+ name: 'WMF_CI_PUB_DEST'
+ description: 'Sub directory path under the chosen document root, such
as mediawiki-core/DOC_SUBPATH/js'
triggers:
- zuul
@@ -50,23 +70,31 @@
echo Zuul UUID: $ZUUL_UUID
echo ...
- shell: |
- if [ $WMF_CI_DOC_DEST == ]; then
- echo WMF_CI_DOC_DEST parameter is empty. Aborting
- exit 1
- fi
- if [ -z $ZUUL_UUID ]; then
-echo Parameter \$ZUUL_UUID is missing!
-echo Can not rsync the documentation, aborting.
+ if [ $WMF_CI_PUB_DOCROOT == ]; then
+echo Error: WMF_CI_PUB_DOCROOT must be set, aborting.
exit 1
fi
- LOCAL_DEST=/srv/org/wikimedia/doc/$WMF_CI_DOC_DEST
+ if [ $WMF_CI_PUB_DEST == ]; then
+echo Error: WMF_CI_PUB_DEST must be set, aborting.
+exit 1
+ fi
+ if [ -z $ZUUL_UUID ]; then
+echo Error: ZUUL_UUID must be set, aborting.
+exit 1
+ fi
+ LOCAL_DOCROOT=/srv/$WMF_CI_PUB_DOCROOT
+ if [ ! -d $LOCAL_DOCROOT ]; then
+echo Error: Invalid docroot. Directory $LOCAL_DOCROOT must exist,
aborting.
+exit 1
+ fi
+ LOCAL_DEST=$LOCAL_DOCROOT/$WMF_CI_PUB_DEST
mkdir -p $LOCAL_DEST
rsync --recursive --delete-after
rsync://10.68.16.255/doc/$ZUUL_UUID/ $LOCAL_DEST
- shell: |
set +x
+ LOCAL_VHOST=$(echo $WMF_CI_PUB_DOCROOT | awk -F'/' '{ print
$3.$2.$1 }')
echo
- # Strip trailing slash from WMF_CI_DOC_DEST to avoid double slashes
- echo Doc published under
https://doc.wikimedia.org/${WMF_CI_DOC_DEST%/}/;
+ echo Published to https://$LOCAL_VHOST/$WMF_CI_PUB_DEST/;
publishers:
- postbuildscript:
builders:
--
To view, visit https://gerrit.wikimedia.org/r/201677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic42645ba3a8f3821ff4c12e4d0bcff1b20976902
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
[MediaWiki-commits] [Gerrit] SkinFallback: Recommend using wfLoadSkin() if possible - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: SkinFallback: Recommend using wfLoadSkin() if possible
..
SkinFallback: Recommend using wfLoadSkin() if possible
Change-Id: I4f3841029578305ab692d853c45678f487adbc78
---
M includes/skins/SkinFallbackTemplate.php
1 file changed, 20 insertions(+), 3 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/SkinFallbackTemplate.php
b/includes/skins/SkinFallbackTemplate.php
index 9cb4ea0..1c5f3a6 100644
--- a/includes/skins/SkinFallbackTemplate.php
+++ b/includes/skins/SkinFallbackTemplate.php
@@ -24,9 +24,11 @@
return $maybeDir !== '.' $maybeDir !== '..'
is_dir( $styleDirectory/$maybeDir );
} );
- // Only keep the ones that contain a .php file with the same
name inside
+ // Filter out skins that aren't installed
$possibleSkins = array_filter( $possibleSkins, function (
$skinDir ) use ( $styleDirectory ) {
- return is_file( $styleDirectory/$skinDir/$skinDir.php
);
+ return
+ is_file( $styleDirectory/$skinDir/skin.json )
+ || is_file(
$styleDirectory/$skinDir/$skinDir.php );
} );
return $possibleSkins;
@@ -56,7 +58,7 @@
} else {
$skinsInstalledText[] = $this-getMsg(
'default-skin-not-found-row-disabled' )
-params( $normalizedKey, $skin
)-plain();
- $skinsInstalledSnippet[] =
require_once \\$IP/skins/$skin/$skin.php\;;
+ $skinsInstalledSnippet[] =
$this-getSnippetForSkin( $skin );
}
}
@@ -73,6 +75,21 @@
}
/**
+* Get the appropriate LocalSettings.php snippet to enable the given
skin
+*
+* @param string $skin
+* @return string
+*/
+ private function getSnippetForSkin( $skin ) {
+ global $IP;
+ if ( file_exists( $IP/skins/$skin/skin.json ) ) {
+ return wfLoadSkin( '$skin' );;
+ } else {
+ return require_once \\$IP/skins/$skin/$skin.php\;;
+ }
+ }
+
+ /**
* Outputs the entire contents of the page. No navigation (other than
search box), just the big
* warning message and page content.
*/
--
To view, visit https://gerrit.wikimedia.org/r/201663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f3841029578305ab692d853c45678f487adbc78
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
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] Fixed Style/AlignParameters RuboCop offense - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixed Style/AlignParameters RuboCop offense
..
Fixed Style/AlignParameters RuboCop offense
Bug: T94401
Change-Id: Ia3ae40105f7327b58eb8ce00304e6257a2a0c06c
---
M .rubocop_todo.yml
M tests/browser/features/step_definitions/login_steps.rb
2 files changed, 4 insertions(+), 8 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 97ed22d..0205672 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -5,12 +5,6 @@
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/AlignParameters:
- Enabled: false
-
# Offense count: 2
# Cop supports --auto-correct.
Style/LeadingCommentSpace:
diff --git a/tests/browser/features/step_definitions/login_steps.rb
b/tests/browser/features/step_definitions/login_steps.rb
index f2cbde8..55b36a5 100644
--- a/tests/browser/features/step_definitions/login_steps.rb
+++ b/tests/browser/features/step_definitions/login_steps.rb
@@ -1,6 +1,8 @@
Given(/^I am using a global account$/) do
- expect(api.meta('globaluserinfo').data).to_not include('missing'),
-'the current acccount is not global'
+ expect(api.meta('globaluserinfo').data).to_not(
+ include('missing'),
+ 'the current acccount is not global'
+ )
end
Given(/^I am logged in to the primary wiki domain$/) do
--
To view, visit https://gerrit.wikimedia.org/r/200558
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3ae40105f7327b58eb8ce00304e6257a2a0c06c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Zfilipin zfili...@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] Fixed Style/RedundantSelf RuboCop offense - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged. Change subject: Fixed Style/RedundantSelf RuboCop offense .. Fixed Style/RedundantSelf RuboCop offense Bug: T94401 Change-Id: I31552604b183b631d2f2c73649e2f729e0d4d538 --- M .rubocop_todo.yml M tests/browser/features/support/pages/special_central_auth.rb 2 files changed, 1 insertion(+), 6 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 60df79a..af8baf2 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -7,11 +7,6 @@ # Offense count: 1 # Cop supports --auto-correct. -Style/RedundantSelf: - Enabled: false - -# Offense count: 1 -# Cop supports --auto-correct. Style/SpaceAfterColon: Enabled: false diff --git a/tests/browser/features/support/pages/special_central_auth.rb b/tests/browser/features/support/pages/special_central_auth.rb index 91e9562..780e2b2 100644 --- a/tests/browser/features/support/pages/special_central_auth.rb +++ b/tests/browser/features/support/pages/special_central_auth.rb @@ -9,7 +9,7 @@ fieldset(:centralauth_info, id:'mw-centralauth-info') def lookup_user( username ) -self.target_field_element.when_present.send_keys(username) +target_field_element.when_present.send_keys(username) submit_element.when_present.click end end -- To view, visit https://gerrit.wikimedia.org/r/200560 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I31552604b183b631d2f2c73649e2f729e0d4d538 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Dduvall dduv...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Zfilipin zfili...@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: b8f9e43..dd56085 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: b8f9e43..dd56085 .. Syncronize VisualEditor: b8f9e43..dd56085 Change-Id: I36844d21cd283da86a72da3908c81e974fee9b14 --- 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 b8f9e43..dd56085 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit b8f9e43187a75768eaf99e4b075262f38b0e0779 +Subproject commit dd5608598fe7ecbaf7f5d374843013680d9974bb -- To view, visit https://gerrit.wikimedia.org/r/201683 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I36844d21cd283da86a72da3908c81e974fee9b14 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] Fixed Style/SpaceAfterColon RuboCop offense - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged. Change subject: Fixed Style/SpaceAfterColon RuboCop offense .. Fixed Style/SpaceAfterColon RuboCop offense Bug: T94401 Change-Id: I501f1eebff5696e9c1d14cd60c36882b6f3de748 --- M .rubocop_todo.yml M tests/browser/features/support/pages/special_central_auth.rb 2 files changed, 1 insertion(+), 6 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index af8baf2..c259c77 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -5,11 +5,6 @@ # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. -# Offense count: 1 -# Cop supports --auto-correct. -Style/SpaceAfterColon: - Enabled: false - # Offense count: 2 # Cop supports --auto-correct. Style/SpaceInsideParens: diff --git a/tests/browser/features/support/pages/special_central_auth.rb b/tests/browser/features/support/pages/special_central_auth.rb index 780e2b2..e5a39df 100644 --- a/tests/browser/features/support/pages/special_central_auth.rb +++ b/tests/browser/features/support/pages/special_central_auth.rb @@ -6,7 +6,7 @@ text_field(:target_field, id: 'target') div(:error_box, class: 'error') button(:submit, id: 'centralauth-submit-find') - fieldset(:centralauth_info, id:'mw-centralauth-info') + fieldset(:centralauth_info, id: 'mw-centralauth-info') def lookup_user( username ) target_field_element.when_present.send_keys(username) -- To view, visit https://gerrit.wikimedia.org/r/200561 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I501f1eebff5696e9c1d14cd60c36882b6f3de748 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Dduvall dduv...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Legoktm legoktm.wikipe...@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] Use .apply() in MWInternalLinkAnnotation.static.toDomElements - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Use .apply() in MWInternalLinkAnnotation.static.toDomElements
..
Use .apply() in MWInternalLinkAnnotation.static.toDomElements
Otherwise other parameters (there are 4 in total) get dropped.
Change-Id: I91cbb8391218cb7e9179b6b655bbfe22d21ade26
---
M modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
b/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
index 99bc4ab..7c2cc30 100644
--- a/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
+++ b/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
@@ -82,8 +82,8 @@
return { title: matches[2], hrefPrefix: matches[1] };
};
-ve.dm.MWInternalLinkAnnotation.static.toDomElements = function ( dataElement,
doc ) {
- var parentResult = ve.dm.LinkAnnotation.static.toDomElements.call(
this, dataElement, doc );
+ve.dm.MWInternalLinkAnnotation.static.toDomElements = function () {
+ var parentResult = ve.dm.LinkAnnotation.static.toDomElements.apply(
this, arguments );
parentResult[0].setAttribute( 'rel', 'mw:WikiLink' );
return parentResult;
};
--
To view, visit https://gerrit.wikimedia.org/r/201390
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I91cbb8391218cb7e9179b6b655bbfe22d21ade26
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
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] Syncronize VisualEditor: b8f9e43..dd56085 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/201683 Change subject: Syncronize VisualEditor: b8f9e43..dd56085 .. Syncronize VisualEditor: b8f9e43..dd56085 Change-Id: I36844d21cd283da86a72da3908c81e974fee9b14 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/83/201683/1 diff --git a/VisualEditor b/VisualEditor index b8f9e43..dd56085 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit b8f9e43187a75768eaf99e4b075262f38b0e0779 +Subproject commit dd5608598fe7ecbaf7f5d374843013680d9974bb -- To view, visit https://gerrit.wikimedia.org/r/201683 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I36844d21cd283da86a72da3908c81e974fee9b14 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] Fixed Style/LeadingCommentSpace RuboCop offense - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged. Change subject: Fixed Style/LeadingCommentSpace RuboCop offense .. Fixed Style/LeadingCommentSpace RuboCop offense ruby and ruby-gemset comments are used by Ruby version managers. We no longer recommend using them. Bug: T94401 Change-Id: I20cd5ee8d051610b061a3971f4941a32ecda09da --- M .rubocop_todo.yml M Gemfile 2 files changed, 0 insertions(+), 8 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 0205672..60df79a 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -5,11 +5,6 @@ # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. -# Offense count: 2 -# Cop supports --auto-correct. -Style/LeadingCommentSpace: - Enabled: false - # Offense count: 1 # Cop supports --auto-correct. Style/RedundantSelf: diff --git a/Gemfile b/Gemfile index 1e74901..8844737 100755 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,3 @@ -#ruby=ruby-2.1.1 -#ruby-gemset=CentralAuth - source 'https://rubygems.org' gem 'mediawiki_selenium', '~ 1.0.0.pre.2' -- To view, visit https://gerrit.wikimedia.org/r/200559 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I20cd5ee8d051610b061a3971f4941a32ecda09da Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Dduvall dduv...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Legoktm legoktm.wikipe...@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 missing QQQ codes - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Add missing QQQ codes
..
Add missing QQQ codes
Bug: T94545
Change-Id: Ie8bfa71543dba6dd01cd7a1898af8b67a75d327f
---
M i18n/qqq.json
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/qqq.json b/i18n/qqq.json
index c700eb4..327bd6b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -13,6 +13,8 @@
Florian Schmidt
]
},
+ gather: Title of special page shown on Special:SpecialPages for
viewing your own lists.,
+ gatherlists: Title of special page shown on Special:SpecialPages
that allows you to view all publicly created lists.,
gather-lists-showhidden: Link title to show hidden lists on
[[Special:GatherLists]].,
gather-lists-showvisible: Link title to show visible lists on
[[Special:GatherLists]].,
gather-lists-collection-owner: Table column header in a list of all
collections. The column will list usernames of people who own
collection.\n{{Identical|Owner}},
--
To view, visit https://gerrit.wikimedia.org/r/201601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8bfa71543dba6dd01cd7a1898af8b67a75d327f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Jhernandez jhernan...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] zuul: Include jquery-visibility.js - change (integration/docroot)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201699
Change subject: zuul: Include jquery-visibility.js
..
zuul: Include jquery-visibility.js
It was in the local copy, but supressed by gitignore.
Follows-up 71a5a4f.
Change-Id: I6b7e8c0b5ac10209df59da685aacff91249fe514
---
M zuul-status/.gitignore
A zuul-status/public_html/jquery-visibility.js
2 files changed, 65 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/docroot
refs/changes/99/201699/1
diff --git a/zuul-status/.gitignore b/zuul-status/.gitignore
index 1ecdbed..39e5d74 100644
--- a/zuul-status/.gitignore
+++ b/zuul-status/.gitignore
@@ -1,4 +1,3 @@
public_html/jquery.min.js
-public_html/jquery-visibility.js
public_html/bootstrap
public_html/jquery.graphite.js
diff --git a/zuul-status/public_html/jquery-visibility.js
b/zuul-status/public_html/jquery-visibility.js
new file mode 100644
index 000..b1f6c29
--- /dev/null
+++ b/zuul-status/public_html/jquery-visibility.js
@@ -0,0 +1,65 @@
+/*! http://mths.be/visibility v1.0.8 by @mathias | MIT license */
+;(function(window, document, $, undefined) {
+ use strict;
+
+ var prefix;
+ var property;
+ // In Opera, `'onfocusin' in document == true`, hence the extra
`hasFocus` check to detect IE-like behavior
+ var eventName = 'onfocusin' in document 'hasFocus' in document ?
+ 'focusin focusout' :
+ 'focus blur';
+ var prefixes = ['webkit', 'o', 'ms', 'moz', ''];
+ var $support = $.support;
+ var $event = $.event;
+
+ while ((prefix = prefixes.pop()) !== undefined) {
+ property = (prefix ? prefix + 'H': 'h') + 'idden';
+ $support.pageVisibility = document[property] !== undefined;
+ if ($support.pageVisibility) {
+ eventName = prefix + 'visibilitychange';
+ break;
+ }
+ }
+
+ // normalize to and update document hidden property
+ function updateState() {
+ if (property !== 'hidden') {
+ document.hidden = $support.pageVisibility ?
document[property] : undefined;
+ }
+ }
+ updateState();
+
+ $(/blur$/.test(eventName) ? window : document).on(eventName,
function(event) {
+ var type = event.type;
+ var originalEvent = event.originalEvent;
+
+ // Avoid errors from triggered native events for which
`originalEvent` is
+ // not available.
+ if (!originalEvent) {
+ return;
+ }
+
+ var toElement = originalEvent.toElement;
+
+ // If it’s a `{focusin,focusout}` event (IE), `fromElement` and
`toElement`
+ // should both be `null` or `undefined`; else, the page
visibility hasn’t
+ // changed, but the user just clicked somewhere in the doc. In
IE9, we need
+ // to check the `relatedTarget` property instead.
+ if (
+ !/^focus./.test(type) || (
+ toElement === undefined
+ originalEvent.fromElement === undefined
+ originalEvent.relatedTarget === undefined
+ )
+ ) {
+ $event.trigger(
+ property document[property] ||
/^(?:blur|focusout)$/.test(type) ?
+ 'hide' :
+ 'show'
+ );
+ }
+ // and update the current state
+ updateState();
+ });
+
+}(this, document, jQuery));
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/201699
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b7e8c0b5ac10209df59da685aacff91249fe514
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Abuse the hook to add all icons to Minerva - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Abuse the hook to add all icons to Minerva
..
Abuse the hook to add all icons to Minerva
The collection icon needs to be on all pages, not just the special
pages
Bug: T93813
Change-Id: I052fa66e836efbfc60205a43ba385b32de59364f
---
M includes/Gather.hooks.php
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Gather.hooks.php b/includes/Gather.hooks.php
index 564e399..87b8bc0 100644
--- a/includes/Gather.hooks.php
+++ b/includes/Gather.hooks.php
@@ -84,6 +84,8 @@
if ( MobileContext::singleton()-isBetaGroupMember() ) {
$modules['watch'] = array( 'ext.gather.watchstar' );
}
+ // FIXME: abuse of the hook.
+ $skin-getOutput()-addModules( 'ext.gather.icons' );
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/201592
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I052fa66e836efbfc60205a43ba385b32de59364f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Jhernandez jhernan...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update watchstar correctly - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Update watchstar correctly
..
Update watchstar correctly
On collection-unwatch event set watched status to false of star
Bug: T94508
Change-Id: I368f2f4e127a67b1898bae890ec002022a79fa85
---
M resources/ext.gather.watchstar/CollectionsWatchstar.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.gather.watchstar/CollectionsWatchstar.js
b/resources/ext.gather.watchstar/CollectionsWatchstar.js
index 4b1c78a..d8a42fb 100644
--- a/resources/ext.gather.watchstar/CollectionsWatchstar.js
+++ b/resources/ext.gather.watchstar/CollectionsWatchstar.js
@@ -94,7 +94,7 @@
} );
overlay.on( 'collection-unwatch', function (
collection ) {
if ( collection.isWatchlist ) {
- self.newStatus( true );
+ self.newStatus( false );
}
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/201604
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I368f2f4e127a67b1898bae890ec002022a79fa85
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Jhernandez jhernan...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix error handling for edit workflow - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix error handling for edit workflow
..
Fix error handling for edit workflow
Using this in wrong context
Bug: T94106
Change-Id: I01873f279b3d06d2069d7445ccdd375b2299e2b7
---
M resources/ext.gather.collection.editor/CollectionEditOverlay.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
index 482f6da..7e18565 100644
--- a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
+++ b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
@@ -58,6 +58,7 @@
*/
onSaveClick: function () {
var title = this.$( '.title' ).val(),
+ self = this,
description = this.$( '.description' ).val();
if ( this.isTitleValid( title )
this.isDescriptionValid( description ) ) {
@@ -74,7 +75,7 @@
window.location.reload();
} );
} ).fail( function ( errMsg ) {
- toast.show(
this.options.editFailedError, 'toast error' );
+ toast.show(
self.options.editFailedError, 'toast error' );
// Make it possible to try again.
this.$( '.mw-ui-input, .save' ).prop(
'disabled', false );
schema.log( {
--
To view, visit https://gerrit.wikimedia.org/r/201594
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I01873f279b3d06d2069d7445ccdd375b2299e2b7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Jhernandez jhernan...@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] Hygiene: Remove empty anchor tag - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Remove empty anchor tag
..
Hygiene: Remove empty anchor tag
Change-Id: Id2b8016c83101f7f3d05b423ecbf39a16268b9c4
---
M includes/views/CollectionItemCard.php
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/views/CollectionItemCard.php
b/includes/views/CollectionItemCard.php
index 303f7cd..9966389 100644
--- a/includes/views/CollectionItemCard.php
+++ b/includes/views/CollectionItemCard.php
@@ -47,10 +47,14 @@
protected function getHtml() {
$item = $this-item;
$title = $item-getTitle();
+ $img = $this-image-getHtml();
+ if ( $img ) {
+ $img = Html::openElement( 'a', array( 'href' =
$title-getLocalUrl() ) ) .
+ $img .
+ Html::closeElement( 'a' );
+ }
$html = Html::openElement( 'div', array( 'class' =
'collection-item' ) ) .
- Html::openElement( 'a', array( 'href' =
$title-getLocalUrl() ) ) .
- $this-image-getHtml() .
- Html::closeElement( 'a' ) .
+ $img .
Html::openElement( 'h2', array( 'class' =
'collection-item-title' ) ) .
Linker::link( $title ) .
Html::closeElement( 'h2' );
--
To view, visit https://gerrit.wikimedia.org/r/201589
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2b8016c83101f7f3d05b423ecbf39a16268b9c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Jhernandez jhernan...@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] Account for User::newFromName returning false - change (mediawiki/core)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201698
Change subject: Account for User::newFromName returning false
..
Account for User::newFromName returning false
Bug: T92357
Change-Id: I00edfaed92af7d16894453f28999bfce2de2e37a
---
M includes/skins/Skin.php
1 file changed, 7 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/98/201698/1
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 600a942..dc25c6c 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -339,9 +339,13 @@
$this-mRelevantUser = User::newFromName(
$rootUser, false );
} else {
$user = User::newFromName( $rootUser, false );
- $user-load( User::READ_NORMAL );
- if ( $user $user-isLoggedIn() ) {
- $this-mRelevantUser = $user;
+
+ if ( $user ) {
+ $user-load( User::READ_NORMAL );
+
+ if ( $user-isLoggedIn() ) {
+ $this-mRelevantUser = $user;
+ }
}
}
return $this-mRelevantUser;
--
To view, visit https://gerrit.wikimedia.org/r/201698
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I00edfaed92af7d16894453f28999bfce2de2e37a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Browser proxy support for Firefox/Chrome/Phantomjs - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged.
Change subject: Browser proxy support for Firefox/Chrome/Phantomjs
..
Browser proxy support for Firefox/Chrome/Phantomjs
Implemented configuration bindings for `:browser_http_proxy` in the
browser factories for Firefox, Chrome, and Phantomjs.
Bug: T71725
Change-Id: If1053d1e49715519287687839a0879e13f6e4785
---
M lib/mediawiki_selenium/browser_factory/chrome.rb
M lib/mediawiki_selenium/browser_factory/firefox.rb
M lib/mediawiki_selenium/browser_factory/phantomjs.rb
M spec/browser_factory/chrome_spec.rb
M spec/browser_factory/firefox_spec.rb
M spec/browser_factory/phantomjs_spec.rb
6 files changed, 55 insertions(+), 0 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki_selenium/browser_factory/chrome.rb
b/lib/mediawiki_selenium/browser_factory/chrome.rb
index c92a0e3..7b0113d 100644
--- a/lib/mediawiki_selenium/browser_factory/chrome.rb
+++ b/lib/mediawiki_selenium/browser_factory/chrome.rb
@@ -3,12 +3,17 @@
# Constructs new Chrome browser instances. The following configuration is
# supported.
#
+# - browser_http_proxy
# - browser_language
# - browser_user_agent
#
# @see Base
#
class Chrome Base
+ bind(:browser_http_proxy) do |http_proxy, options|
+options[:args] --proxy-server=#{http_proxy}
+ end
+
bind(:browser_language) do |language, options|
options[:prefs]['intl.accept_languages'] = language
end
diff --git a/lib/mediawiki_selenium/browser_factory/firefox.rb
b/lib/mediawiki_selenium/browser_factory/firefox.rb
index e84f56b..c9e827b 100644
--- a/lib/mediawiki_selenium/browser_factory/firefox.rb
+++ b/lib/mediawiki_selenium/browser_factory/firefox.rb
@@ -3,6 +3,7 @@
# Constructs new Firefox browser instances. The following configuration is
# supported.
#
+# - browser_http_proxy
# - browser_language
# - browser_timeout
# - browser_user_agent
@@ -10,6 +11,10 @@
# @see Base
#
class Firefox Base
+ bind(:browser_http_proxy) do |http_proxy, options|
+options[:profile].proxy = Selenium::WebDriver::Proxy.new(http:
http_proxy, ssl: http_proxy)
+ end
+
bind(:browser_timeout) do |timeout, options|
timeout = timeout.to_i
options[:profile]['dom.max_script_run_time'] = timeout
diff --git a/lib/mediawiki_selenium/browser_factory/phantomjs.rb
b/lib/mediawiki_selenium/browser_factory/phantomjs.rb
index c3119c6..87b63be 100644
--- a/lib/mediawiki_selenium/browser_factory/phantomjs.rb
+++ b/lib/mediawiki_selenium/browser_factory/phantomjs.rb
@@ -3,12 +3,17 @@
# Constructs new Phantomjs browser instances. The following configuration
is
# supported.
#
+# - browser_http_proxy
# - browser_language
# - browser_user_agent
#
# @see Base
#
class Phantomjs Base
+ bind(:browser_http_proxy) do |http_proxy, options|
+options[:desired_capabilities]['phantomjs.cli.args']
--proxy=#{http_proxy}
+ end
+
bind(:browser_language) do |language, options|
options[:desired_capabilities]['phantomjs.page.customHeaders.Accept-Language']
= language
end
@@ -16,6 +21,14 @@
bind(:browser_user_agent) do |user_agent, options|
options[:desired_capabilities]['phantomjs.page.settings.userAgent'] =
user_agent
end
+
+ protected
+
+ def default_browser_options
+super.tap do |options|
+ options[:desired_capabilities]['phantomjs.cli.args'] = []
+end
+ end
end
end
end
diff --git a/spec/browser_factory/chrome_spec.rb
b/spec/browser_factory/chrome_spec.rb
index f00d869..232b1c4 100644
--- a/spec/browser_factory/chrome_spec.rb
+++ b/spec/browser_factory/chrome_spec.rb
@@ -16,6 +16,14 @@
describe '#browser_options' do
subject { factory.browser_options(config) }
+ context 'given a browser proxy' do
+let(:config) { { browser_http_proxy: 'proxy.example:8080' } }
+
+it 'includes it as --proxy-server in the chrome arguments' do
+ expect(subject[:args]).to
include('--proxy-server=proxy.example:8080')
+end
+ end
+
context 'given a custom browser_language' do
let(:config) { { browser_language: 'eo' } }
diff --git a/spec/browser_factory/firefox_spec.rb
b/spec/browser_factory/firefox_spec.rb
index bc14521..6cc21f8 100644
--- a/spec/browser_factory/firefox_spec.rb
+++ b/spec/browser_factory/firefox_spec.rb
@@ -22,6 +22,21 @@
expect(Selenium::WebDriver::Firefox::Profile).to
receive(:new).and_return(profile)
end
+ context 'given a browser proxy' do
+let(:config) { { browser_http_proxy: 'proxy.example:8080' } }
+
+it 'sets up the profile to use a proxy for both http and https' do
+ selenium_proxy =
[MediaWiki-commits] [Gerrit] zuul: Include jquery-visibility.js - change (integration/docroot)
jenkins-bot has submitted this change and it was merged.
Change subject: zuul: Include jquery-visibility.js
..
zuul: Include jquery-visibility.js
It was in the local copy, but suppressed by gitignore.
Was causing a HTTP 404 when using integration.wikimedia.org/zuul/
Follows-up 71a5a4f.
Change-Id: I6b7e8c0b5ac10209df59da685aacff91249fe514
---
M zuul-status/.gitignore
A zuul-status/public_html/jquery-visibility.js
2 files changed, 65 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/zuul-status/.gitignore b/zuul-status/.gitignore
index 1ecdbed..39e5d74 100644
--- a/zuul-status/.gitignore
+++ b/zuul-status/.gitignore
@@ -1,4 +1,3 @@
public_html/jquery.min.js
-public_html/jquery-visibility.js
public_html/bootstrap
public_html/jquery.graphite.js
diff --git a/zuul-status/public_html/jquery-visibility.js
b/zuul-status/public_html/jquery-visibility.js
new file mode 100644
index 000..b1f6c29
--- /dev/null
+++ b/zuul-status/public_html/jquery-visibility.js
@@ -0,0 +1,65 @@
+/*! http://mths.be/visibility v1.0.8 by @mathias | MIT license */
+;(function(window, document, $, undefined) {
+ use strict;
+
+ var prefix;
+ var property;
+ // In Opera, `'onfocusin' in document == true`, hence the extra
`hasFocus` check to detect IE-like behavior
+ var eventName = 'onfocusin' in document 'hasFocus' in document ?
+ 'focusin focusout' :
+ 'focus blur';
+ var prefixes = ['webkit', 'o', 'ms', 'moz', ''];
+ var $support = $.support;
+ var $event = $.event;
+
+ while ((prefix = prefixes.pop()) !== undefined) {
+ property = (prefix ? prefix + 'H': 'h') + 'idden';
+ $support.pageVisibility = document[property] !== undefined;
+ if ($support.pageVisibility) {
+ eventName = prefix + 'visibilitychange';
+ break;
+ }
+ }
+
+ // normalize to and update document hidden property
+ function updateState() {
+ if (property !== 'hidden') {
+ document.hidden = $support.pageVisibility ?
document[property] : undefined;
+ }
+ }
+ updateState();
+
+ $(/blur$/.test(eventName) ? window : document).on(eventName,
function(event) {
+ var type = event.type;
+ var originalEvent = event.originalEvent;
+
+ // Avoid errors from triggered native events for which
`originalEvent` is
+ // not available.
+ if (!originalEvent) {
+ return;
+ }
+
+ var toElement = originalEvent.toElement;
+
+ // If it’s a `{focusin,focusout}` event (IE), `fromElement` and
`toElement`
+ // should both be `null` or `undefined`; else, the page
visibility hasn’t
+ // changed, but the user just clicked somewhere in the doc. In
IE9, we need
+ // to check the `relatedTarget` property instead.
+ if (
+ !/^focus./.test(type) || (
+ toElement === undefined
+ originalEvent.fromElement === undefined
+ originalEvent.relatedTarget === undefined
+ )
+ ) {
+ $event.trigger(
+ property document[property] ||
/^(?:blur|focusout)$/.test(type) ?
+ 'hide' :
+ 'show'
+ );
+ }
+ // and update the current state
+ updateState();
+ });
+
+}(this, document, jQuery));
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/201699
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b7e8c0b5ac10209df59da685aacff91249fe514
Gerrit-PatchSet: 2
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
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] Skin: Account for User::newFromName returning false - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Skin: Account for User::newFromName returning false
..
Skin: Account for User::newFromName returning false
Follows-up e41f5a07f893cf.
Bug: T92357
Change-Id: I00edfaed92af7d16894453f28999bfce2de2e37a
---
M includes/skins/Skin.php
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 600a942..dc25c6c 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -339,9 +339,13 @@
$this-mRelevantUser = User::newFromName(
$rootUser, false );
} else {
$user = User::newFromName( $rootUser, false );
- $user-load( User::READ_NORMAL );
- if ( $user $user-isLoggedIn() ) {
- $this-mRelevantUser = $user;
+
+ if ( $user ) {
+ $user-load( User::READ_NORMAL );
+
+ if ( $user-isLoggedIn() ) {
+ $this-mRelevantUser = $user;
+ }
}
}
return $this-mRelevantUser;
--
To view, visit https://gerrit.wikimedia.org/r/201698
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I00edfaed92af7d16894453f28999bfce2de2e37a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
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] Made Skin::getRelevantUser use READ_NORMAL - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Made Skin::getRelevantUser use READ_NORMAL
..
Made Skin::getRelevantUser use READ_NORMAL
Bug: T92357
Change-Id: I5089c99ae3a21bb8d41d488d18dd63fe1eaefea9
---
M includes/skins/Skin.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 48bce67..600a942 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -339,6 +339,7 @@
$this-mRelevantUser = User::newFromName(
$rootUser, false );
} else {
$user = User::newFromName( $rootUser, false );
+ $user-load( User::READ_NORMAL );
if ( $user $user-isLoggedIn() ) {
$this-mRelevantUser = $user;
}
--
To view, visit https://gerrit.wikimedia.org/r/201688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5089c99ae3a21bb8d41d488d18dd63fe1eaefea9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Alpha: Improved search form for non-js users - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Alpha: Improved search form for non-js users
..
Alpha: Improved search form for non-js users
* Wider search input with a border
* A more beautiful search button
* Make sure default styling (for JS users) stays the same
Bug: T94459
Change-Id: I0929361fec5a737e17687b29e39862cc9c04ba06
---
M includes/skins/MinervaTemplateAlpha.php
M less/icons.less
A less/images/magnifying-glass-white.png
A less/images/magnifying-glass-white.svg
M less/specials/mobilemenu.less
5 files changed, 140 insertions(+), 1 deletion(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/MinervaTemplateAlpha.php
b/includes/skins/MinervaTemplateAlpha.php
index 41ae807..5dff3e5 100644
--- a/includes/skins/MinervaTemplateAlpha.php
+++ b/includes/skins/MinervaTemplateAlpha.php
@@ -110,12 +110,34 @@
protected function getSearchAttributes() {
$searchAttributes = parent::getSearchAttributes();
- $searchAttributes['class'] = MobileUI::iconClass( 'search',
'before', 'search' );
+ $searchAttributes['class'] = MobileUI::semanticClass(
'mw-ui-input', '', 'search' );
return $searchAttributes;
}
/**
+* @inheritdoc
+*/
+ protected function makeSearchForm( $data ) {
+ return Html::openElement( 'form',
+ array(
+ 'action' = $data['wgScript'],
+ 'class' = 'search-box',
+ )
+ ) .
+ $this-makeSearchButton(
+ 'fulltext',
+ array(
+ 'class' = 'fulltext-search no-js-only
icon icon-search-white',
+ )
+ ) .
+ Html::openElement( 'span' ) .
+ $this-makeSearchInput( $this-getSearchAttributes() ) .
+ Html::closeElement( 'span' ) .
+ Html::closeElement( 'form' );
+ }
+
+ /**
* Render Header elements
* @param array $data Data used to build the header
*/
diff --git a/less/icons.less b/less/icons.less
index 20d158f..3c36821 100644
--- a/less/icons.less
+++ b/less/icons.less
@@ -188,6 +188,12 @@
background-color: #FFF;
.background-image-svg-quick('images/magnifying-glass');
}
+.icon-search-white {
+ width: 24px;
+ height: 24px;
+ background-color: #347BFF;
+ .background-image-svg-quick('images/magnifying-glass-white');
+}
// Icon (cancel)
//
diff --git a/less/images/magnifying-glass-white.png
b/less/images/magnifying-glass-white.png
new file mode 100644
index 000..e85b5a5
--- /dev/null
+++ b/less/images/magnifying-glass-white.png
Binary files differ
diff --git a/less/images/magnifying-glass-white.svg
b/less/images/magnifying-glass-white.svg
new file mode 100644
index 000..b88c068
--- /dev/null
+++ b/less/images/magnifying-glass-white.svg
@@ -0,0 +1,59 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+svg
+ xmlns:dc=http://purl.org/dc/elements/1.1/;
+ xmlns:cc=http://creativecommons.org/ns#;
+ xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#;
+ xmlns:svg=http://www.w3.org/2000/svg;
+ xmlns=http://www.w3.org/2000/svg;
+ xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd;
+ xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape;
+ viewBox=0 0 611.975 580
+ enable-background=new 0 0 612 792
+ id=svg2
+ version=1.1
+ inkscape:version=0.91 r13725
+ sodipodi:docname=magnifying-glass.svg
+ metadata
+ id=metadata10
+rdf:RDF
+ cc:Work
+ rdf:about=
+dc:formatimage/svg+xml/dc:format
+dc:type
+ rdf:resource=http://purl.org/dc/dcmitype/StillImage; /
+dc:title/dc:title
+ /cc:Work
+/rdf:RDF
+ /metadata
+ defs
+ id=defs8 /
+ sodipodi:namedview
+ pagecolor=#ff
+ bordercolor=#66
+ borderopacity=1
+ objecttolerance=10
+ gridtolerance=10
+ guidetolerance=10
+ inkscape:pageopacity=0
+ inkscape:pageshadow=2
+ inkscape:window-width=1280
+ inkscape:window-height=751
+ id=namedview6
+ showgrid=false
+ inkscape:zoom=0.40689655
+ inkscape:cx=305.98749
+ inkscape:cy=290
+ inkscape:window-x=0
+ inkscape:window-y=0
+ inkscape:window-maximized=1
+ inkscape:current-layer=svg2 /
+ path
+ d=M69.475 407.3c45.3 45.3 104.5 70.1 168.9 70.1 56.1 0 109-19.1
151.7-54.2l173.4 156.8s38.9-10.2 48.5-53.5l-174-157.4c61.2-93.1
50.4-218-30.6-299-45.3-45.3-104.5-70.1-168.3-70.1-63.8 0-123.7 24.9-168.9
69.5-93.8 93.6-93.1 244.7-.7 337.8zm39.5-285c1.9-2.6 4.5-5.1 7-7
[MediaWiki-commits] [Gerrit] Add check in snakview._selectProperty if _variation is alrea... - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201700
Change subject: Add check in snakview._selectProperty if _variation is already
set
..
Add check in snakview._selectProperty if _variation is already set
sometimes _selectProperty might be triggered more than once,
depending on keyboard or select events and how quickly one is typing.
if this happens, the value field might get stuck with a spinner.
this change avoids that happening and the selection works better.
Change-Id: If192c130a53cb2a9e7a9add103e356c60d2459c2
---
M view/resources/jquery/wikibase/snakview/snakview.js
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/00/201700/1
diff --git a/view/resources/jquery/wikibase/snakview/snakview.js
b/view/resources/jquery/wikibase/snakview/snakview.js
index c870021..34fdceb 100644
--- a/view/resources/jquery/wikibase/snakview/snakview.js
+++ b/view/resources/jquery/wikibase/snakview/snakview.js
@@ -270,6 +270,11 @@
_selectProperty: function() {
var self = this;
+ if ( this._variation !== null ) {
+ // already selected
+ return;
+ }
+
// Display spinner as long as the ValueView is loading:
this.$snakValue.empty().append(
$( 'div/' ).append( $( 'span/' ).addClass(
'mw-small-spinner' ) )
--
To view, visit https://gerrit.wikimedia.org/r/201700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If192c130a53cb2a9e7a9add103e356c60d2459c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
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] [WIP] Client-side face detection in lead images - change (mediawiki...MobileFrontend)
Phuedx has uploaded a new change for review. https://gerrit.wikimedia.org/r/201716 Change subject: [WIP] Client-side face detection in lead images .. [WIP] Client-side face detection in lead images ... made possible with 190.8 KB of tracking.js. Change-Id: I153f7d64c3a511d0bfc9dc03bed3ffd54c6d15b2 --- M includes/Resources.php A javascripts/externals/tracking.js A javascripts/externals/tracking.js-master/eye-min.js A javascripts/externals/tracking.js-master/face-min.js A javascripts/externals/tracking.js-master/mouth-min.js A javascripts/externals/tracking.js-master/tracking-min.js M javascripts/modules/bannerImage/BannerImage.js 7 files changed, 65 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/16/201716/1 -- To view, visit https://gerrit.wikimedia.org/r/201716 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I153f7d64c3a511d0bfc9dc03bed3ffd54c6d15b2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Phuedx g...@samsmith.io ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update ContentTranslation to cherry pick 225d011 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update ContentTranslation to cherry pick 225d011 .. Update ContentTranslation to cherry pick 225d011 Change-Id: I3ee45cfd362d405bcf859f56d83f2007023cfd70 --- M extensions/ContentTranslation 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/ContentTranslation b/extensions/ContentTranslation index efd7bfb..d6b8a52 16 --- a/extensions/ContentTranslation +++ b/extensions/ContentTranslation -Subproject commit efd7bfbc1d6487566a3e0c7a5a81501cfed68185 +Subproject commit d6b8a52bc428f35f1797ae4382c5ac72fec9a908 -- To view, visit https://gerrit.wikimedia.org/r/201715 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3ee45cfd362d405bcf859f56d83f2007023cfd70 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf24 Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: KartikMistry kartik.mis...@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] Fix $streams emptiness check - change (mediawiki...TimedMediaHandler)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix $streams emptiness check
..
Fix $streams emptiness check
Because count( false ) === 1. Tricky!
Bug: T94902
Change-Id: I5eab216f3f30fd1f79da344247a871aac5e2e2be
---
M handlers/WebMHandler/WebMHandler.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlers/WebMHandler/WebMHandler.php
b/handlers/WebMHandler/WebMHandler.php
index 3e89cef..9cee009 100644
--- a/handlers/WebMHandler/WebMHandler.php
+++ b/handlers/WebMHandler/WebMHandler.php
@@ -92,7 +92,7 @@
$baseType = ( $file-getWidth() == 0 $file-getHeight() ==
0 )? 'audio' : 'video';
$streams = $this-getStreamTypes( $file );
- if ( count( $streams ) === 0 ) {
+ if ( !$streams ) {
return $baseType . '/webm';
}
--
To view, visit https://gerrit.wikimedia.org/r/201676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5eab216f3f30fd1f79da344247a871aac5e2e2be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Brian Wolff bawolff...@gmail.com
Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix JS error happening when navigating away while on file step - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix JS error happening when navigating away while on file step
..
Fix JS error happening when navigating away while on file step
Bug: T94550
Change-Id: Ib7ab048d6e93c8cfac95bb68830a6438021d193e
---
M resources/controller/uw.controller.Step.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/controller/uw.controller.Step.js
b/resources/controller/uw.controller.Step.js
index 7b76c5d..7c24c03 100644
--- a/resources/controller/uw.controller.Step.js
+++ b/resources/controller/uw.controller.Step.js
@@ -287,7 +287,7 @@
* @return {boolean}
*/
SP.isComplete = function () {
- return this.uploads.length === 0 || this.movedFrom;
+ return this.uploads === undefined || this.uploads.length === 0
|| this.movedFrom;
};
uw.controller.Step = Step;
--
To view, visit https://gerrit.wikimedia.org/r/201179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7ab048d6e93c8cfac95bb68830a6438021d193e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update ContentTranslation to cherry pick 225d011 - change (mediawiki/core)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/201713 Change subject: Update ContentTranslation to cherry pick 225d011 .. Update ContentTranslation to cherry pick 225d011 Change-Id: Iac4d454cae6f782f3e8e253f5fd65a879b68dcda --- M extensions/ContentTranslation 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/13/201713/1 diff --git a/extensions/ContentTranslation b/extensions/ContentTranslation index efd7bfb..225d011 16 --- a/extensions/ContentTranslation +++ b/extensions/ContentTranslation -Subproject commit efd7bfbc1d6487566a3e0c7a5a81501cfed68185 +Subproject commit 225d01180c85fcb21a51e43c4a6e97c7bb4c968e -- To view, visit https://gerrit.wikimedia.org/r/201713 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac4d454cae6f782f3e8e253f5fd65a879b68dcda Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf23 Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] scale varnish-varnish backend weight for prod 2layer clusters - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201714
Change subject: scale varnish-varnish backend weight for prod 2layer clusters
..
scale varnish-varnish backend weight for prod 2layer clusters
This scales weights proportional to node storage size, with the
default value of 100 corresponding to the most common/current case
of 360G storage size on Intel S3700's. It does so in a generic
fashion based on node hardware classification, irrespective of
which cluster a node belongs in (the weight scale is global to all
nodes). All of this only applies to the text, mobile, and upload
clusters in practice (production 2layer).
WIP: need to evaluate interaction with $backend_weight multiplier
used in 'retries' for chash for some reason (search m/r/c.pp for
'weight \*')
Change-Id: I3a44d4e50f37750068fc4cf5721850e6c430fe67
---
M manifests/role/cache.pp
1 file changed, 23 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/14/201714/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index cbab235..e2b1b36 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -854,13 +854,18 @@
if $::realm == 'production' {
$storage_size_main = $::hostname ? {
-'cp1008'= 117, # Intel X-25M 160G
-/^amssq/= 117, # Intel X-25M 160G
-/^cp104[34]/= 117, # Intel X-25M 160G
-/^cp30(0[3-9]|1[0-4])$/ = 460, # Intel M320 600G via H710
-/^cp301[5-8]$/ = 225, # Intel M320 300G via H710
-default = 360, # Intel S3700 400G
+/^(amssq[0-9][0-9]|cp10(08|4[34]))$/ = 117, # Intel X-25M 160G
+/^cp30(0[3-9]|1[0-4])$/ = 460, # Intel M320 600G
via H710
+/^cp301[5-8]$/ = 225, # Intel M320 300G
via H710
+default = 360, # Intel S3700 400G
}
+
+$backend_scaled_weights = [
+{ backend_match = '^(amssq[0-9][0-9]|cp10(08|4[34]))$',
weight = 32 },
+{ backend_match = '^cp30(0[3-9]|1[0-4])$',
weight = 128 },
+{ backend_match = '^cp301[5-8]$',
weight = 63 },
+{ backend_match = '.',
weight = 100 },
+]
}
else {
# for upload on jessie, bigobj is main/6, so 6 is functional
minimum here.
@@ -965,7 +970,7 @@
'layer'= 'backend',
'ssl_proxies' = $wikimedia_networks,
},
-backend_options= [
+backend_options= array_concat($backend_scaled_weights, [
{
'backend_match' = '^cp[0-9]+\.eqiad\.wmnet$',
'port' = 3128,
@@ -981,8 +986,7 @@
'first_byte_timeout'= '180s',
'between_bytes_timeout' = '4s',
'max_connections' = 1000,
-'weight'= $backend_weight,
-}],
+}]),
wikimedia_networks = $wikimedia_networks,
}
@@ -1006,7 +1010,7 @@
'layer'= 'frontend',
'ssl_proxies' = $wikimedia_networks,
},
-backend_options = [
+backend_options= array_concat($backend_scaled_weights, [
{
'port' = 3128,
'connect_timeout' = '5s',
@@ -1014,8 +1018,7 @@
'between_bytes_timeout' = '2s',
'max_connections' = 10,
'probe' = 'varnish',
-'weight'= $backend_weight,
-}],
+}]),
cluster_options = {
'enable_geoiplookup' = true,
},
@@ -1156,7 +1159,7 @@
'layer'= 'backend',
'ssl_proxies' = $wikimedia_networks,
},
-backend_options= [
+backend_options= array_concat($backend_scaled_weights, [
{
'backend_match' = '^cp[0-9]+\.eqiad.wmnet$',
'port' = 3128,
@@ -1168,8 +1171,7 @@
'first_byte_timeout'= '35s',
'between_bytes_timeout' = '4s',
'max_connections' = 1000,
-'weight'= $backend_weight,
-}],
+}]),
cluster_options= $cluster_options,
wikimedia_networks = $wikimedia_networks,
}
@@ -1192,7 +1194,7 @@
[MediaWiki-commits] [Gerrit] Update ContentTranslation to cherry pick 225d011 - change (mediawiki/core)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/201715 Change subject: Update ContentTranslation to cherry pick 225d011 .. Update ContentTranslation to cherry pick 225d011 Change-Id: I3ee45cfd362d405bcf859f56d83f2007023cfd70 --- M extensions/ContentTranslation 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/15/201715/1 diff --git a/extensions/ContentTranslation b/extensions/ContentTranslation index efd7bfb..d6b8a52 16 --- a/extensions/ContentTranslation +++ b/extensions/ContentTranslation -Subproject commit efd7bfbc1d6487566a3e0c7a5a81501cfed68185 +Subproject commit d6b8a52bc428f35f1797ae4382c5ac72fec9a908 -- To view, visit https://gerrit.wikimedia.org/r/201715 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3ee45cfd362d405bcf859f56d83f2007023cfd70 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf24 Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dox: Fix yaml to make line break real - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: dox: Fix yaml to make line break real
..
dox: Fix yaml to make line break real
Follows-up c9bd3ed.
Change-Id: Ibabed626b696a5810c361eee78849dff9812cba3
---
M jjb/doc.yaml
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/doc.yaml b/jjb/doc.yaml
index f1ccf1d..518fc31 100644
--- a/jjb/doc.yaml
+++ b/jjb/doc.yaml
@@ -27,8 +27,8 @@
- project: publish-on-gallium
block: true
current-parameters: true # Pass Zuul parameters
- predefined-parameters:
- WMF_CI_PUB_DOCROOT=org/wikimedia/doc
+ predefined-parameters: |
+ WMF_CI_PUB_DOCROOT=org/wikimedia/doc
WMF_CI_PUB_DEST={docdest}
# rsync a directory from integration-publisher.eqiad.wmflabs to a website on
gallium.
--
To view, visit https://gerrit.wikimedia.org/r/201679
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibabed626b696a5810c361eee78849dff9812cba3
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
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] Warn users when leaving while a save is in progress - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201689
Change subject: Warn users when leaving while a save is in progress
..
Warn users when leaving while a save is in progress
Bug: T94567
Change-Id: I774c944bda0e61e7e74bf694e80a573ff6cb5942
---
M modules/translation/ext.cx.translation.progress.js
1 file changed, 5 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/89/201689/1
diff --git a/modules/translation/ext.cx.translation.progress.js
b/modules/translation/ext.cx.translation.progress.js
index 88701da..7fe2c07 100644
--- a/modules/translation/ext.cx.translation.progress.js
+++ b/modules/translation/ext.cx.translation.progress.js
@@ -157,9 +157,12 @@
if ( mw.config.get( 'wgContentTranslationDatabase' )
!== null ) {
if ( mw.cx.dirty ) {
mw.hook( 'mw.cx.translation.save'
).fire();
+ // If we leave the page immediately the
above save may not happen.
+ // So, stay or leave?
+ return mw.msg(
'cx-warning-unsaved-translation' );
+ } else {
+ return;
}
-
- return;
}
weights = getTranslationWeights(
getSectionsWithContent() );
--
To view, visit https://gerrit.wikimedia.org/r/201689
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I774c944bda0e61e7e74bf694e80a573ff6cb5942
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Publish oojs code coverage to integration.wikimedia.org - change (integration/config)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201694
Change subject: Publish oojs code coverage to integration.wikimedia.org
..
Publish oojs code coverage to integration.wikimedia.org
Requires I5dbd155ac9 in oojs/core.
Bug: T93558
Bug: T87490
Change-Id: I9b20a368d3941e4fddf26391e51f47d567c457f3
---
M jjb/misc.yaml
R jjb/publish.yaml
2 files changed, 43 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/94/201694/1
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 7b3e836..e2d1144 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -11,6 +11,7 @@
docsrc: 'docs'
docdest: 'unicodejs/$ZUUL_BRANCH'
+# TODO: Rename to oojs-core-publish
- job:
name: 'oojs-core-jsduck-publish'
node: contintLabsSlave UbuntuTrusty
@@ -19,10 +20,19 @@
triggers:
- zuul
builders:
- - jsduck
+ - npm-install
+ - shell: npm run-script doc
- doc-publish:
docsrc: 'docs'
docdest: 'oojs/$ZUUL_BRANCH'
+ - shell: |
+ . /srv/deployment/integration/slave-scripts/bin/npm-set-env.sh
+ npm test
+ - cover-publish:
+src: 'coverage'
+dest: 'oojs'
+publishers:
+ - global-teardown
- job:
name: 'oojs-ui-jsduck-publish'
diff --git a/jjb/doc.yaml b/jjb/publish.yaml
similarity index 79%
rename from jjb/doc.yaml
rename to jjb/publish.yaml
index 518fc31..7ec0aff 100644
--- a/jjb/doc.yaml
+++ b/jjb/publish.yaml
@@ -2,8 +2,6 @@
# another job (executing on gallium) can pull in the files and publish them
# on https://doc.wikimedia.org/.
#
-# Uses $ZUUL_UUID as a unique identifier.
-#
# Parameters:
#
# docsrc: Directory holding documentation files relative to workspace (without
trailing slash)
@@ -14,7 +12,7 @@
docsrc: '{docsrc}'
docdest: '{docdest}'
builders:
- # rsync {docsrc} folder to integration-publisher.eqiad.wmflabs
+ # rsync folder to integration-publisher.eqiad.wmflabs
- shell: |
if [ -z $ZUUL_UUID ]; then
echo Error: ZUUL_UUID must be set, aborting.
@@ -31,6 +29,37 @@
WMF_CI_PUB_DOCROOT=org/wikimedia/doc
WMF_CI_PUB_DEST={docdest}
+# Sync files from a Jenkins slave in labs to a central rsync server from which
+# another job (executing on gallium) can pull in the files and publish them
+# on https://integration.wikimedia.org/cover/.
+#
+# Parameters:
+#
+# src: Directory holding documentation files relative to workspace (without
trailing slash)
+# dest: Directory under integration.wikimedia.org/cover/
+#
+- builder:
+name: cover-publish
+docsrc: '{docsrc}'
+docdest: '{docdest}'
+builders:
+ # rsync folder to integration-publisher.eqiad.wmflabs
+ - shell: |
+ if [ -z $ZUUL_UUID ]; then
+echo Error: ZUUL_UUID must be set, aborting.
+exit 1
+ fi
+ rsync --recursive {src}/ rsync://10.68.16.255/doc/$ZUUL_UUID
+ echo
+ echo Publishing to https://integration.wikimedia.org/cover/{dest}/;
+ - trigger-builds:
+ - project: publish-on-gallium
+ block: true
+ current-parameters: true # Pass Zuul parameters
+ predefined-parameters: |
+ WMF_CI_PUB_DOCROOT=org/wikimedia/doc
+ WMF_CI_PUB_DEST=cover/{dest}
+
# rsync a directory from integration-publisher.eqiad.wmflabs to a website on
gallium.
#
# Serves:
--
To view, visit https://gerrit.wikimedia.org/r/201694
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b20a368d3941e4fddf26391e51f47d567c457f3
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] Return exception instead of raising it - change (pywikibot/core)
XZise has uploaded a new change for review. https://gerrit.wikimedia.org/r/201696 Change subject: [FIX] Return exception instead of raising it .. [FIX] Return exception instead of raising it Instead of raising exceptions it should be returned so the data is set to that exception. Bug: T94993 Change-Id: I955f1c91ae2dc31e404f05ee776d4184882c76f2 --- M pywikibot/comms/threadedhttp.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/96/201696/1 diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py index e3c0e64..7844894 100644 --- a/pywikibot/comms/threadedhttp.py +++ b/pywikibot/comms/threadedhttp.py @@ -306,7 +306,7 @@ headers=headers, max_redirects=max_redirects - 1) else: -raise httplib2.RedirectLimit( +return httplib2.RedirectLimit( Redirected more times than redirection_limit allows., response, content) -- To view, visit https://gerrit.wikimedia.org/r/201696 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I955f1c91ae2dc31e404f05ee776d4184882c76f2 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Qunit core tests borked b/c missing resource dependency - change (mediawiki...Gather)
Jhernandez has uploaded a new change for review. https://gerrit.wikimedia.org/r/201697 Change subject: Qunit core tests borked b/c missing resource dependency .. Qunit core tests borked b/c missing resource dependency Change-Id: If1175ad5fef44687480e118773a795b22e4b502e --- M resources/Resources.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/97/201697/1 diff --git a/resources/Resources.php b/resources/Resources.php index 42a9dbe..abe60c4 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -118,6 +118,7 @@ 'dependencies' = array( 'mediawiki.util', 'mobile.watchstar', + 'mobile.settings', 'ext.gather.api', 'ext.gather.collection.base', 'ext.gather.watchstar.icons', -- To view, visit https://gerrit.wikimedia.org/r/201697 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1175ad5fef44687480e118773a795b22e4b502e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Jhernandez jhernan...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update ContentTranslation to cherry pick 225d011 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update ContentTranslation to cherry pick 225d011 .. Update ContentTranslation to cherry pick 225d011 Change-Id: Iac4d454cae6f782f3e8e253f5fd65a879b68dcda --- M extensions/ContentTranslation 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/ContentTranslation b/extensions/ContentTranslation index efd7bfb..225d011 16 --- a/extensions/ContentTranslation +++ b/extensions/ContentTranslation -Subproject commit efd7bfbc1d6487566a3e0c7a5a81501cfed68185 +Subproject commit 225d01180c85fcb21a51e43c4a6e97c7bb4c968e -- To view, visit https://gerrit.wikimedia.org/r/201713 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac4d454cae6f782f3e8e253f5fd65a879b68dcda Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf23 Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: KartikMistry kartik.mis...@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 namespaces for Western Balochi (bgn) from translatewiki - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add namespaces for Western Balochi (bgn) from translatewiki .. Add namespaces for Western Balochi (bgn) from translatewiki Change-Id: I87e2842b3d204098768fb265b5e2f7bf715d918b --- M languages/messages/MessagesBgn.php 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/languages/messages/MessagesBgn.php b/languages/messages/MessagesBgn.php index 5c01273..3d0aafc 100644 --- a/languages/messages/MessagesBgn.php +++ b/languages/messages/MessagesBgn.php @@ -10,3 +10,22 @@ $fallback = 'fa'; $rtl = true; + +$namespaceNames = array( + NS_MEDIA= 'رسانگ', + NS_SPECIAL = 'ۆێک', + NS_TALK = 'گپ', + NS_USER = 'کارمرزۆک', + NS_USER_TALK= 'کارمرزۆک_ئی_گپ', + NS_PROJECT_TALK = '$1_ئی_گپ', + NS_FILE = 'ورق', + NS_FILE_TALK= 'ورق_ئی_گپ', + NS_MEDIAWIKI= 'ویکی_رسانگ', + NS_MEDIAWIKI_TALK = 'ویکی_رسانگ_ئی_گپ', + NS_TEMPLATE = 'تراشوان', + NS_TEMPLATE_TALK= 'تراشوان_ئی_گپ', + NS_HELP = 'کومک', + NS_HELP_TALK= 'کومک_ئی_گپ', + NS_CATEGORY = 'تهر', + NS_CATEGORY_TALK= 'تهر_ئی_گپ', +); -- To view, visit https://gerrit.wikimedia.org/r/201611 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I87e2842b3d204098768fb265b5e2f7bf715d918b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Mjbmr mjb...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't normalize away comments for parsoid only tests - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't normalize away comments for parsoid only tests
..
Don't normalize away comments for parsoid only tests
Change-Id: I50ac6f9d4db21f33fae000a1a0c5ff267401692a
---
M lib/mediawiki.DOMUtils.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 15 insertions(+), 10 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki.DOMUtils.js b/lib/mediawiki.DOMUtils.js
index 6e66f41..822d271 100644
--- a/lib/mediawiki.DOMUtils.js
+++ b/lib/mediawiki.DOMUtils.js
@@ -2149,7 +2149,7 @@
* @param source {document}
* @return {document}
*/
-DOMUtils.normalizeIEW = function( body, stripSpanTypeof ) {
+DOMUtils.normalizeIEW = function( body, stripSpanTypeof, parsoidOnly ) {
var newlineAround = function(node) {
return node
/^(BODY|CAPTION|DIV|DD|DT|LI|P|TABLE|TR|TD|TH|TBODY|DL|OL|UL|H[1-6])$/.test(node.nodeName);
};
@@ -2196,10 +2196,12 @@
// unwrap certain SPAN nodes
cleanSpans(node);
// now remove comment nodes
- for (child = node.firstChild; child; child = next) {
- next = child.nextSibling;
- if (DOMUtils.isComment(child)) {
- node.removeChild(child);
+ if ( !parsoidOnly ) {
+ for (child = node.firstChild; child; child = next) {
+ next = child.nextSibling;
+ if (DOMUtils.isComment(child)) {
+ node.removeChild(child);
+ }
}
}
// reassemble text nodes split by a comment or span, if
necessary
@@ -2325,7 +2327,7 @@
var stripTypeof = parsoidOnly ?
/^mw:Placeholder$/ :
/^mw:(?:Placeholder|Nowiki|Transclusion|Entity)$/;
- out = this.serializeChildren( this.normalizeIEW( out, stripTypeof ) );
+ out = this.serializeChildren( this.normalizeIEW( out, stripTypeof,
parsoidOnly ) );
// NOTE that we use a slightly restricted regexp for attribute
// which works for the output of DOM serialization. For example,
// we know that attribute values will be surrounded with double quotes,
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 286823b..b1c49b2 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -1033,7 +1033,7 @@
add(html2wt, URL-encoding in URL functions (single parameter),
/index.php?title=Some_pageamp=\n);
add(html2wt, URL-encoding in URL functions (multiple parameters),
/index.php?title=Some_pageq=?amp=\n);
add(html2wt, Non-extlinks in brackets, [foo]\n[foo bar]\n[foo
''bar'']\n[fool's] errand\n[fool's errand]\n[foo]\n[foo bar]\n[foo
''bar'']\n[fool's] errand\n[fool's
errand]\n[url=foo]\n[url=http://example.com]\n;);
-add(html2wt, Unclosed and unmatched quotes, 'Bold italic text '''with
bold deactivated''' in between.'\n\n'Bold italic text ''with italic
deactivated'' in between.'\n\n'''Bold text..'''\n\n..spanning two
paragraphs (should not work).'''nowiki/'''\n\n'''Bold tag left
open'''\n\n''Italic tag left open''\n\nNormal text.\n\n'''This
year'nowiki/'''s election ''should'' beat '''last years.\n\n''Tom'''s car
is bigger than 'nowiki/'''Susan'''s.\n\nPlain ''italic'''s plain\n);
+add(html2wt, Unclosed and unmatched quotes, 'Bold italic text '''with
bold deactivated''' in between.'\n\n'Bold italic text ''with italic
deactivated'' in between.'\n\n'''Bold text..'''\n\n..spanning two
paragraphs (should not work).'''nowiki/'''\n\n'''Bold tag left
open'''\n\n''Italic tag left open''\n\nNormal text.\n\n!-- Unmatching number
of opening, closing tags: --\n'''This year'nowiki/'''s election ''should''
beat '''last years.\n\n''Tom'''s car is bigger than
'nowiki/'''Susan'''s.\n\nPlain ''italic'''s plain\n);
add(html2wt, A table with caption with default-spaced attributes and a
table row, {|\n|+ style=\color: red;\ | caption1\n\n| foo\n|}\n);
add(html2wt, A table with captions with non-default spaced attributes and a
table row, {|\n|+ style=\color: red;\ |caption2\n\n|+ style=\color: red;\
| caption3\n\n| foo\n|}\n);
add(html2wt, Table td-cell syntax variations, {|\n\n| baz\n\n| foo bar
foo \n| baz\n\n| style=\color:red;\ | baz\n\n| style='color:red;' \n|
baz\n|}\n);
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index f936161..90ce57f 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -1683,9 +1683,10 @@
!--c1--*a
!--c2--!--c3--!--c4--*b
!! html
-ul
+!--c1--ul
lia
/li
+!--c2--!--c3--!--c4--
lib
/li
/ul
@@ -5280,7 +5281,9 @@
/ppbBold tag left open/b
/ppiItalic
[MediaWiki-commits] [Gerrit] service_unit @name is already the full name - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/201736 Change subject: service_unit @name is already the full name .. service_unit @name is already the full name Change-Id: I1ed0e77c3bcc714221b0769ea844f9f7b25babec --- M modules/varnish/templates/initscripts/varnishncsa.sysvinit.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/36/201736/1 diff --git a/modules/varnish/templates/initscripts/varnishncsa.sysvinit.erb b/modules/varnish/templates/initscripts/varnishncsa.sysvinit.erb index 6d00283..c537222 100755 --- a/modules/varnish/templates/initscripts/varnishncsa.sysvinit.erb +++ b/modules/varnish/templates/initscripts/varnishncsa.sysvinit.erb @@ -13,7 +13,7 @@ # Source function library . /lib/lsb/init-functions -NAME=varnishncsa-%= @name % +NAME=%= @name % DESC=HTTP accelerator log deamon PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/bin/varnishncsa -- To view, visit https://gerrit.wikimedia.org/r/201736 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ed0e77c3bcc714221b0769ea844f9f7b25babec 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] service_unit @name is already the full name - change (operations/puppet)
BBlack has submitted this change and it was merged. Change subject: service_unit @name is already the full name .. service_unit @name is already the full name Change-Id: I1ed0e77c3bcc714221b0769ea844f9f7b25babec --- M modules/varnish/templates/initscripts/varnishncsa.sysvinit.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/modules/varnish/templates/initscripts/varnishncsa.sysvinit.erb b/modules/varnish/templates/initscripts/varnishncsa.sysvinit.erb index 6d00283..c537222 100755 --- a/modules/varnish/templates/initscripts/varnishncsa.sysvinit.erb +++ b/modules/varnish/templates/initscripts/varnishncsa.sysvinit.erb @@ -13,7 +13,7 @@ # Source function library . /lib/lsb/init-functions -NAME=varnishncsa-%= @name % +NAME=%= @name % DESC=HTTP accelerator log deamon PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/bin/varnishncsa -- To view, visit https://gerrit.wikimedia.org/r/201736 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1ed0e77c3bcc714221b0769ea844f9f7b25babec 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] Send server side eventlogging logs to eventlog1001 instead o... - change (operations/mediawiki-config)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201737
Change subject: Send server side eventlogging logs to eventlog1001 instead of
vanadium
..
Send server side eventlogging logs to eventlog1001 instead of vanadium
vanadium is being deprecated in favor of eventlog1001. vanadium is dying!
Bug: T90363
Change-Id: I9c4de264e6705307b49372e287cbfbc775d36e62
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/37/201737/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 6b4f4cb..57c3838 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2674,7 +2674,7 @@
// All other wikis reference metawiki.
$wgEventLoggingBaseUri = //{$wmfHostnames['bits']}/event.gif;
$wgEventLoggingDBname = 'metawiki';
- $wgEventLoggingFile = 'udp://10.64.21.123:8421/EventLogging';
// vanadium
+ $wgEventLoggingFile = 'udp://10.64.32.167:8421/EventLogging';
// eventlog1001.eqiad.wmnet
$wgEventLoggingSchemaApiUri =
'http://meta.wikimedia.org/w/api.php';
}
if ( $wgEventLoggingDBname === $wgDBname ) {
--
To view, visit https://gerrit.wikimedia.org/r/201737
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c4de264e6705307b49372e287cbfbc775d36e62
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use String.prototype.repeat() where possible - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Use String.prototype.repeat() where possible
..
Use String.prototype.repeat() where possible
* Drop homegrown solutions.
Change-Id: I8b08f3add4d5f498c285c72a9002df68b5848c47
---
M lib/mediawiki.Util.js
M lib/wts.TagHandlers.js
2 files changed, 1 insertion(+), 17 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki.Util.js b/lib/mediawiki.Util.js
index 41141cb..1169e23 100644
--- a/lib/mediawiki.Util.js
+++ b/lib/mediawiki.Util.js
@@ -1061,22 +1061,6 @@
}
},
-// SSS FIXME: This code is copied from the WTS.
-// Given the ongoing refactoring, I figured it is good to have a copy here
-// and de-duplicate code once the refactoring is complete and see if this
-// code survives there.
-charSequence: function(prefix, c, numChars) {
-if (numChars numChars 0) {
-var buf = prefix;
-for (var i = 0; i numChars; i++) {
-buf += c;
-}
-return buf;
-} else {
-return prefix;
-}
-},
-
/**
* Processes content (wikitext, array of tokens, whatever) in its own
pipeline
* based on options.
diff --git a/lib/wts.TagHandlers.js b/lib/wts.TagHandlers.js
index e93d879..f616ca2 100644
--- a/lib/wts.TagHandlers.js
+++ b/lib/wts.TagHandlers.js
@@ -1115,7 +1115,7 @@
},
hr: {
handle: function (node, state, cb) {
- cb(Util.charSequence(, -, DU.getDataParsoid(
node ).extra_dashes), node);
+ cb( -.repeat( 4 + (DU.getDataParsoid( node
).extra_dashes || 0) ), node );
},
sepnls: {
before: id({min: 1, max: 2}),
--
To view, visit https://gerrit.wikimedia.org/r/201730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b08f3add4d5f498c285c72a9002df68b5848c47
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: 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] Remove undefined $user variable - change (mediawiki...ConfirmEdit)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove undefined $user variable
..
Remove undefined $user variable
findLinks() doesn't have a third parameter and an undefined one
wouldn't be all that useful even if it did.
Change-Id: I250b558d7b97a6355b3d86b71b3a37399b3c6eb0
---
M Captcha.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Captcha.php b/Captcha.php
index 046bf08..21ba842 100644
--- a/Captcha.php
+++ b/Captcha.php
@@ -383,8 +383,8 @@
} else {
// Get link changes in the slowest way known to
man
$oldtext = isset( $oldtext ) ? $oldtext :
$this-loadText( $title, $section, $loadOldtextFlags );
- $oldLinks = $this-findLinks( $title, $oldtext,
$user );
- $newLinks = $this-findLinks( $title, $newtext,
$user );
+ $oldLinks = $this-findLinks( $title, $oldtext
);
+ $newLinks = $this-findLinks( $title, $newtext
);
}
$unknownLinks = array_filter( $newLinks, array( $this,
'filterLink' ) );
--
To view, visit https://gerrit.wikimedia.org/r/201742
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I250b558d7b97a6355b3d86b71b3a37399b3c6eb0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@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] Install jq in eventlogging role - change (operations/puppet)
Ottomata has submitted this change and it was merged. Change subject: Install jq in eventlogging role .. Install jq in eventlogging role Change-Id: I5ded940111c16abeeede4b6987cb7c7b3b4d1ae5 --- M manifests/role/eventlogging.pp 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Ottomata: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp index 807eb6d..12349ed 100644 --- a/manifests/role/eventlogging.pp +++ b/manifests/role/eventlogging.pp @@ -156,6 +156,9 @@ hosts_allow = $backup_destinations, } } + +# jq is very useful, install it on eventlogging servers +ensure_packages(['jq']) } -- To view, visit https://gerrit.wikimedia.org/r/201746 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5ded940111c16abeeede4b6987cb7c7b3b4d1ae5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata o...@wikimedia.org Gerrit-Reviewer: Ottomata 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] Avoid undefined index warning for oldid if it's not set in s... - change (mediawiki...VisualEditor)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201772
Change subject: Avoid undefined index warning for oldid if it's not set in
serializeforcache
..
Avoid undefined index warning for oldid if it's not set in serializeforcache
Official VE client always sets this.
Bug: T95015
Change-Id: Ibcef5e4360e2f9d882e9441ff8d3bdbf7179f2f6
---
M ApiVisualEditor.php
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/72/201772/1
diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 04c306c..d4d67b5 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -586,6 +586,9 @@
break;
case 'serializeforcache':
+ if ( !isset( $parserParams['oldid'] ) ) {
+ $parserParams['oldid'] =
Revision::newFromTitle( $title )-getId();
+ }
$key = $this-storeInSerializationCache(
$title, $parserParams['oldid'], $html );
$result = array( 'result' = 'success',
'cachekey' = $key );
break;
--
To view, visit https://gerrit.wikimedia.org/r/201772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcef5e4360e2f9d882e9441ff8d3bdbf7179f2f6
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] composer.json: Set classmap-authoritative: true - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: composer.json: Set classmap-authoritative: true
..
composer.json: Set classmap-authoritative: true
This is a necessary first step before we can switch all the other
autoloaders to use classmap-authoritative: true, since this autoloader
is loaded first and will prevent the other bundled composer autloaders
from running.
Bug: T85182
Change-Id: I42ca6aa82a253cd724c221d71a48ff3fe002a0ef
---
M composer.json
M composer.lock
M multiversion/vendor/autoload.php
M multiversion/vendor/composer/ClassLoader.php
M multiversion/vendor/composer/autoload_real.php
5 files changed, 35 insertions(+), 6 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 9ed4272..768203d 100644
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,7 @@
wikimedia/cdb: 1.0.1
},
config: {
+ classmap-authoritative: true,
optimize-autoloader: true,
prepend-autoloader: false,
vendor-dir: multiversion/vendor
diff --git a/composer.lock b/composer.lock
index e08fc17..da9d3ac 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
This file is @generated automatically
],
-hash: 99c774fb23849c1620a28bb41a6e0a37,
+hash: ea4b0a7928520aecc5c876443dcf6731,
packages: [
{
name: wikimedia/cdb,
@@ -56,6 +56,7 @@
minimum-stability: stable,
stability-flags: [],
prefer-stable: false,
+prefer-lowest: false,
platform: [],
platform-dev: []
}
diff --git a/multiversion/vendor/autoload.php b/multiversion/vendor/autoload.php
index e06f23c..e154c84 100644
--- a/multiversion/vendor/autoload.php
+++ b/multiversion/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInitea7a8b034df32856d6c1587c046d5521::getLoader();
+return ComposerAutoloaderInit77d65f2e0d4ada4815bb93d290a27837::getLoader();
diff --git a/multiversion/vendor/composer/ClassLoader.php
b/multiversion/vendor/composer/ClassLoader.php
index 70d78bc..5e1469e 100644
--- a/multiversion/vendor/composer/ClassLoader.php
+++ b/multiversion/vendor/composer/ClassLoader.php
@@ -54,6 +54,8 @@
private $useIncludePath = false;
private $classMap = array();
+private $classMapAuthoritative = false;
+
public function getPrefixes()
{
if (!empty($this-prefixesPsr0)) {
@@ -249,6 +251,27 @@
}
/**
+ * Turns off searching the prefix and fallback directories for classes
+ * that have not been registered with the class map.
+ *
+ * @param bool $classMapAuthoritative
+ */
+public function setClassMapAuthoritative($classMapAuthoritative)
+{
+$this-classMapAuthoritative = $classMapAuthoritative;
+}
+
+/**
+ * Should class lookup fail if not found in the current class map?
+ *
+ * @return bool
+ */
+public function isClassMapAuthoritative()
+{
+return $this-classMapAuthoritative;
+}
+
+/**
* Registers this instance as an autoloader.
*
* @param bool $prepend Whether to prepend the autoloader or not
@@ -299,6 +322,9 @@
if (isset($this-classMap[$class])) {
return $this-classMap[$class];
}
+if ($this-classMapAuthoritative) {
+return false;
+}
$file = $this-findFileWithExtension($class, '.php');
diff --git a/multiversion/vendor/composer/autoload_real.php
b/multiversion/vendor/composer/autoload_real.php
index 688ba0f..1d53ffe 100644
--- a/multiversion/vendor/composer/autoload_real.php
+++ b/multiversion/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitea7a8b034df32856d6c1587c046d5521
+class ComposerAutoloaderInit77d65f2e0d4ada4815bb93d290a27837
{
private static $loader;
@@ -19,9 +19,9 @@
return self::$loader;
}
-
spl_autoload_register(array('ComposerAutoloaderInitea7a8b034df32856d6c1587c046d5521',
'loadClassLoader'), true, false);
+
spl_autoload_register(array('ComposerAutoloaderInit77d65f2e0d4ada4815bb93d290a27837',
'loadClassLoader'), true, false);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInitea7a8b034df32856d6c1587c046d5521',
'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInit77d65f2e0d4ada4815bb93d290a27837',
'loadClassLoader'));
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace = $path) {
@@ -38,13 +38,14 @@
[MediaWiki-commits] [Gerrit] build: Generate correct paths to fallback images - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Generate correct paths to fallback images
..
build: Generate correct paths to fallback images
Follow-up to d11d5c429754005cccddf6f06cf4b99279676691.
Change-Id: Ia1ab66232ba9e0e04cb8d181eeba62cee1f8af52
---
M src/styles/common.less
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/styles/common.less b/src/styles/common.less
index dc52c7c..9663580 100644
--- a/src/styles/common.less
+++ b/src/styles/common.less
@@ -27,7 +27,7 @@
.oo-ui-background-image-svg( @url-without-extension ) {
@svg: '@{url-without-extension}.svg';
- @fallback: '@{url-without-extension}.@{@oo-ui-default-image-ext}';
+ @fallback: '@{url-without-extension}.@{oo-ui-default-image-ext}';
.oo-ui-background-image-svg2(@svg, @fallback);
}
--
To view, visit https://gerrit.wikimedia.org/r/201707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1ab66232ba9e0e04cb8d181eeba62cee1f8af52
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove undefined $user variable - change (mediawiki...ConfirmEdit)
Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201742
Change subject: Remove undefined $user variable
..
Remove undefined $user variable
findLinks() doesn't have a third parameter and an undefined one
wouldn't be all that useful even if it did.
Change-Id: I250b558d7b97a6355b3d86b71b3a37399b3c6eb0
---
M Captcha.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit
refs/changes/42/201742/1
diff --git a/Captcha.php b/Captcha.php
index 046bf08..21ba842 100644
--- a/Captcha.php
+++ b/Captcha.php
@@ -383,8 +383,8 @@
} else {
// Get link changes in the slowest way known to
man
$oldtext = isset( $oldtext ) ? $oldtext :
$this-loadText( $title, $section, $loadOldtextFlags );
- $oldLinks = $this-findLinks( $title, $oldtext,
$user );
- $newLinks = $this-findLinks( $title, $newtext,
$user );
+ $oldLinks = $this-findLinks( $title, $oldtext
);
+ $newLinks = $this-findLinks( $title, $newtext
);
}
$unknownLinks = array_filter( $newLinks, array( $this,
'filterLink' ) );
--
To view, visit https://gerrit.wikimedia.org/r/201742
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I250b558d7b97a6355b3d86b71b3a37399b3c6eb0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
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] Check whether html parameter is valid rather than allow warn... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Check whether html parameter is valid rather than allow
warnings to be raised if it is not
..
Check whether html parameter is valid rather than allow warnings to be raised
if it is not
Bug: T95015
Change-Id: Iece859db0b67c906ac1f6f3e2e948815b455626c
---
M ApiVisualEditor.php
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index a79272c..04c306c 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -288,7 +288,13 @@
$html = $params['html'];
if ( substr( $html, 0, 11 ) === 'rawdeflate,' ) {
- $html = gzinflate( base64_decode( substr( $html, 11 ) )
);
+ $deflated = base64_decode( substr( $html, 11 ) );
+ wfSuppressWarnings();
+ $html = gzinflate( $deflated );
+ wfRestoreWarnings();
+ if ( $deflated === $html || $html === false ) {
+ $this-dieUsage( HTML provided is not properly
deflated, 'invaliddeflate' );
+ }
}
wfDebugLog( 'visualeditor', called on '$title' with paction:
'{$params['paction']}' );
--
To view, visit https://gerrit.wikimedia.org/r/201743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iece859db0b67c906ac1f6f3e2e948815b455626c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: dd56085..54071c2 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/201747 Change subject: Syncronize VisualEditor: dd56085..54071c2 .. Syncronize VisualEditor: dd56085..54071c2 Change-Id: I8170ffee8ba313de57ddfa6e4e44e864a1086ea4 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/47/201747/1 diff --git a/VisualEditor b/VisualEditor index dd56085..54071c2 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit dd5608598fe7ecbaf7f5d374843013680d9974bb +Subproject commit 54071c21878faff9ccf63a6b53dfd38e57acebd7 -- To view, visit https://gerrit.wikimedia.org/r/201747 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8170ffee8ba313de57ddfa6e4e44e864a1086ea4 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: dd56085..54071c2 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: dd56085..54071c2 .. Syncronize VisualEditor: dd56085..54071c2 Change-Id: I8170ffee8ba313de57ddfa6e4e44e864a1086ea4 --- 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 dd56085..54071c2 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit dd5608598fe7ecbaf7f5d374843013680d9974bb +Subproject commit 54071c21878faff9ccf63a6b53dfd38e57acebd7 -- To view, visit https://gerrit.wikimedia.org/r/201747 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8170ffee8ba313de57ddfa6e4e44e864a1086ea4 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] Fix build - change (apps...wikipedia)
Fjalapeno has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201749
Change subject: Fix build
..
Fix build
Workaround for fastlane bug : https://github.com/KrauseFx/fastlane/issues/176
Change-Id: I2151277940920e5a79bb64a4ab73a15f56af94df
---
M fastlane/Fastfile
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/49/201749/1
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 2a40fce..1b3e0fe 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -57,6 +57,7 @@
# Create and sign the IPA (and DSYM)
ipa({
scheme: 'Wikipedia Alpha',
+configuration: 'Alpha', #Prevents fastlane from passing --configuration
Release - bug?
clean: nil, # this means 'Do Clean'. Clean project before building.
archive: nil, # this means 'Do Archive'. Archive project to the Xcode
organizer after building.
# verbose: nil, # this means 'Do Verbose'.
@@ -102,6 +103,7 @@
# Create and sign the IPA (and DSYM)
ipa({
scheme: 'Wikipedia Beta',
+configuration: 'Beta', #Prevents fastlane from passing --configuration
Release - bug?
clean: true,
archive: nil
})
--
To view, visit https://gerrit.wikimedia.org/r/201749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2151277940920e5a79bb64a4ab73a15f56af94df
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Fjalapeno cfl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] admins: update ssh key for tomasz - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/201722 Change subject: admins: update ssh key for tomasz .. admins: update ssh key for tomasz requested by Tfinc on Bug:T94934 Change-Id: I783b8cd7c342a1880a70132bb2755922e304e9de --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/22/201722/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 8d23fc5..9bf56af 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -791,8 +791,7 @@ gid: 500 name: tomasz realname: Tomasz Finc -ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQDOXgblcBarO8An5LNYfIBOjl+//EK6XhJu3agV8nQvmuaT2qnPtIiLl3W/X34bKHcRJbWsJRe7C3MqJqFWF6BWWtU9MZWj/s1TRtyA8Olgx4y7cXGXSUY/0woJnM6yIh6WitQEPX35iZyKaVapX5FCYlkkSbTEAbJwm/bFV5j2hOTyews7Cff1E0Zp0+E4hli39MvflkMOtllcZvFoLjve5AjETeabZEppvvSR8VPAK5bNMl7zo7fWcoExaNNlglLLRxP8y8Ne2PQlks5gTMrsh5e55BGVr/Nd6kD5OIB7s63InMbudYViWX66MjPgKMXXg8m7RKqkLB33nBifQrY5 -tfinc@kumo] +ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQDYg99M+6cGbfoDwzd7KRFL2zGg8CPZHLqejuCwCijpHjqnMtOBOAjMDpfA8glqpqUL4xW22kgwcUI9H8bkd4X/DazJ0QvTxjJkGPocobfyCkd/yeZ/n5HjaEL/WWeNQZ/OfFW6yiTbWrQttl6+/7QELG2pHXgDqAxaCLEnghRXG+zGbVNkPgJGAZnUoSSPjZj1eZhG10U9I0foUp09qyMTXhWB9c2dbeZyaWJ7LA5I6slKPiVyYQWq+0Kc0zoCpaPGrwkR/sDrzqHBfiwKWR3IJEFn0WhDCE1fHiM31+tQ2YmbVrDCWxoUzdiUWkzbgydlIH88603LoegBLo9xTwrZ tfinc@kumo.local] uid: 1155 yurik: ensure: present -- To view, visit https://gerrit.wikimedia.org/r/201722 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I783b8cd7c342a1880a70132bb2755922e304e9de Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use eventlog1001 as main eventlogging host instead of vanadium - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201724
Change subject: Use eventlog1001 as main eventlogging host instead of vanadium
..
Use eventlog1001 as main eventlogging host instead of vanadium
For this most part, this patch just does s/vanadium/eventlog1001/g.
It also configures a new varnishncsa instance on bits caches called
'eventlogging', rather than 'vanadium'. I have ensured that the
vanadium instnaces will be stopped, and the new eventlogging instances
will send to eventlog1001. Once this is applied, I will
manually remove the vanadium named instances and puppet configs.
Change-Id: I2d0fc3d0a629f2bc75ef209ff2a51324893a9677
---
M manifests/role/cache.pp
M manifests/role/logging.pp
M manifests/role/tcpircbot.pp
M manifests/role/webperf.pp
M manifests/site.pp
M modules/abacist/manifests/init.pp
M modules/admin/files/enforce-users-groups.sh
M modules/eventlogging/manifests/service/consumer.pp
M templates/udp2log/filters.mw.erb
9 files changed, 36 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/24/201724/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index cbab235..3ff0626 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -617,11 +617,24 @@
class varnish::logging::eventlistener {
$event_listener = $::realm ? {
-'production' = '10.64.21.123', # vanadium
+'production' = '10.64.32.167', # eventlog1001
'labs' = '10.68.16.52', # deployment-eventlogging02
}
+# I am renaming this varnishncsa instance to
+# 'eventlogging'. First ensuring that this is stopped,
+# then I will remove configs.
varnish::logging { 'vanadium' :
+listener_address = '10.64.21.123' # vanadium
+port = '8422',
+instance_name= '',
+cli_args = '-m RxURL:^/event\.gif\?. -D',
+log_fmt = '%q\t%l\t%n\t%t\t%h\t%{User-agent}i',
+monitor = false,
+ensure = 'stopped',
+}
+
+varnish::logging { 'eventlogging' :
listener_address = $event_listener,
port = '8422',
instance_name= '',
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 54d468b..a809cee 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -47,7 +47,7 @@
include misc::udp2log::firewall
$error_processor_host = $::realm ? {
-production = 'vanadium.eqiad.wmnet',
+production = 'eventlog1001.eqiad.wmnet',
labs = deployment-fluoride.${::site}.wmflabs,
}
@@ -139,7 +139,7 @@
# == Class role::logging::mediawiki::errors
# fluorine's udp2log instance forwards MediaWiki exceptions and fatals
-# to vanadium, as configured in templates/udp2log/filters.mw.erb. This
+# to eventlog*, as configured in templates/udp2log/filters.mw.erb. This
# role provisions a metric module that reports error counts to StatsD.
#
class role::logging::mediawiki::errors {
@@ -170,16 +170,16 @@
}
# == Class role::logging::relay::eventlogging
-# Relays EventLogging traffic over to Vandadium.
+# Relays EventLogging traffic over to eventlog*.
#
class role::logging::relay::eventlogging {
system::role { 'misc::logging::relay::eventlogging':
-description = 'esams bits event logging to vanadium relay',
+description = 'esams bits event logging to eventlog* relay',
}
misc::logging::relay { 'eventlogging':
listen_port = '8422',
-destination_ip = '10.64.21.123',
+destination_ip = '10.64.32.167', # eventlog1001
destination_port = '8422',
}
}
diff --git a/manifests/role/tcpircbot.pp b/manifests/role/tcpircbot.pp
index 611fe8d..9658ced 100644
--- a/manifests/role/tcpircbot.pp
+++ b/manifests/role/tcpircbot.pp
@@ -15,7 +15,7 @@
channels = '#wikimedia-operations',
password = $passwords::logmsgbot::logmsgbot_password,
cidr = [
-':::10.64.21.123/128',# vanadium
+':::10.64.32.167/128',# eventlog1001
':::10.64.0.196/128', # tin
':::127.0.0.1/128', # loopback
'2620:0:861:101:10:64:0:196/128', # tin
@@ -23,7 +23,7 @@
}
ferm::rule { 'tcpircbot_allowed':
-# Vanadium, tin(v4), localhost, tin (v6)
-rule = 'proto tcp dport 9200 { saddr (10.64.21.123/32 10.64.0.196/32
127.0.0.1 2620:0:861:101:10:64:0:196/128) ACCEPT; }',
+# Vanadium, eventlog1001, tin(v4), localhost, tin (v6)
+rule = 'proto tcp dport 9200 { saddr (10.64.21.123/32 10.64.32.167/32
10.64.0.196/32 127.0.0.1 2620:0:861:101:10:64:0:196/128) ACCEPT; }',
}
}
diff --git a/manifests/role/webperf.pp
[MediaWiki-commits] [Gerrit] Fix the build - scheme were pointing to the wrong config - change (apps...wikipedia)
Dr0ptp4kt has submitted this change and it was merged. Change subject: Fix the build - scheme were pointing to the wrong config .. Fix the build - scheme were pointing to the wrong config Change-Id: I69cf78666e90111d331e4ca9ab012d0977fee4dd --- M Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Alpha.xcscheme M Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Beta.xcscheme 2 files changed, 10 insertions(+), 10 deletions(-) Approvals: Dr0ptp4kt: Looks good to me, approved jenkins-bot: Verified diff --git a/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Alpha.xcscheme b/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Alpha.xcscheme index f361d0d..a5f6364 100644 --- a/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Alpha.xcscheme +++ b/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Alpha.xcscheme @@ -26,7 +26,7 @@ selectedDebuggerIdentifier = Xcode.DebuggerFoundation.Debugger.LLDB selectedLauncherIdentifier = Xcode.DebuggerFoundation.Launcher.LLDB shouldUseLaunchSchemeArgsEnv = YES - buildConfiguration = Debug + buildConfiguration = Alpha Testables /Testables MacroExpansion @@ -44,7 +44,7 @@ selectedLauncherIdentifier = Xcode.DebuggerFoundation.Launcher.LLDB launchStyle = 0 useCustomWorkingDirectory = NO - buildConfiguration = Debug + buildConfiguration = Alpha ignoresPersistentStateOnLaunch = NO debugDocumentVersioning = YES allowLocationSimulation = YES @@ -65,7 +65,7 @@ shouldUseLaunchSchemeArgsEnv = YES savedToolIdentifier = useCustomWorkingDirectory = NO - buildConfiguration = Release + buildConfiguration = Alpha debugDocumentVersioning = YES BuildableProductRunnable runnableDebuggingMode = 0 @@ -79,10 +79,10 @@ /BuildableProductRunnable /ProfileAction AnalyzeAction - buildConfiguration = Debug + buildConfiguration = Alpha /AnalyzeAction ArchiveAction - buildConfiguration = Release + buildConfiguration = Alpha revealArchiveInOrganizer = YES /ArchiveAction /Scheme diff --git a/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Beta.xcscheme b/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Beta.xcscheme index f361d0d..12112bd 100644 --- a/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Beta.xcscheme +++ b/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia Beta.xcscheme @@ -26,7 +26,7 @@ selectedDebuggerIdentifier = Xcode.DebuggerFoundation.Debugger.LLDB selectedLauncherIdentifier = Xcode.DebuggerFoundation.Launcher.LLDB shouldUseLaunchSchemeArgsEnv = YES - buildConfiguration = Debug + buildConfiguration = Beta Testables /Testables MacroExpansion @@ -44,7 +44,7 @@ selectedLauncherIdentifier = Xcode.DebuggerFoundation.Launcher.LLDB launchStyle = 0 useCustomWorkingDirectory = NO - buildConfiguration = Debug + buildConfiguration = Beta ignoresPersistentStateOnLaunch = NO debugDocumentVersioning = YES allowLocationSimulation = YES @@ -65,7 +65,7 @@ shouldUseLaunchSchemeArgsEnv = YES savedToolIdentifier = useCustomWorkingDirectory = NO - buildConfiguration = Release + buildConfiguration = Beta debugDocumentVersioning = YES BuildableProductRunnable runnableDebuggingMode = 0 @@ -79,10 +79,10 @@ /BuildableProductRunnable /ProfileAction AnalyzeAction - buildConfiguration = Debug + buildConfiguration = Beta /AnalyzeAction ArchiveAction - buildConfiguration = Release + buildConfiguration = Beta revealArchiveInOrganizer = YES /ArchiveAction /Scheme -- To view, visit https://gerrit.wikimedia.org/r/201726 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I69cf78666e90111d331e4ca9ab012d0977fee4dd Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Fjalapeno cfl...@wikimedia.org Gerrit-Reviewer: Dr0ptp4kt ab...@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] Don't trigger Wikitext highlighting for intitle: - change (mediawiki...CirrusSearch)
Jdouglas has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201727
Change subject: Don't trigger Wikitext highlighting for intitle:
..
Don't trigger Wikitext highlighting for intitle:
This addresses https://phabricator.wikimedia.org/T94870
In f587e00919ad1cbb5be43b2f54adac02b739, we lost a conditional
that checked whether an {insource|intitle} term was insource, and if
so use Wikitext for highlighting. This restores the lost contional,
and prevents triggering this condition for intitle terms.
Change-Id: I722e25d6c5c07da5f23080fe278d95cb59c2e018
---
M includes/Search/Filters.php
1 file changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/27/201727/1
diff --git a/includes/Search/Filters.php b/includes/Search/Filters.php
index 45f5c96..e9dce1f 100644
--- a/includes/Search/Filters.php
+++ b/includes/Search/Filters.php
@@ -113,7 +113,7 @@
* @return a side-effecting function to update several references
*/
public static function insource( $escaper, $searcher, $value ) {
- return self::insourceOrIntitle( $escaper, $searcher, $value,
function () {
+ return self::insourceOrIntitle( $escaper, $searcher, $value,
true, function () {
return 'source_text.plain';
});
}
@@ -128,7 +128,7 @@
* @return a side-effecting function to update several references
*/
public static function intitle( $escaper, $searcher, $value ) {
- return self::insourceOrIntitle( $escaper, $searcher, $value,
function ( $queryString ) {
+ return self::insourceOrIntitle( $escaper, $searcher, $value,
false, function ( $queryString ) {
if ( preg_match( '/[?*]/u', $queryString ) ) {
return 'title.plain';
} else {
@@ -137,7 +137,7 @@
});
}
- private static function insourceOrIntitle( $escaper, $searcher, $value,
$fieldF ) {
+ private static function insourceOrIntitle( $escaper, $searcher, $value,
$updateHighlightSourceRef, $fieldF ) {
list( $queryString, $fuzzyQuery ) =
$escaper-fixupWholeQueryString(
$escaper-fixupQueryStringPart( $value ) );
$field = $fieldF( $queryString );
@@ -153,7 +153,9 @@
function ( $fuzzyQueryRef, $filterDestinationRef,
$highlightSourceRef, $searchContainedSyntaxRef ) use ( $fuzzyQuery,
$wrappedQuery ) {
$fuzzyQueryRef = $fuzzyQuery;
$filterDestinationRef[]= new
\Elastica\Filter\Query( $wrappedQuery );
- $highlightSourceRef[] = array( 'query' =
$wrappedQuery );
+ if ($updateHighlightSourceRef) {
+ $highlightSourceRef[] = array(
'query' = $wrappedQuery );
+ }
$searchContainedSyntaxRef = true;
};
--
To view, visit https://gerrit.wikimedia.org/r/201727
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I722e25d6c5c07da5f23080fe278d95cb59c2e018
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Jdouglas jdoug...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ShareAFact: correctly align WP wordmark for RTL - change (apps...wikipedia)
BearND has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201732
Change subject: ShareAFact: correctly align WP wordmark for RTL
..
ShareAFact: correctly align WP wordmark for RTL
On RTL languages the location of the wordmark appeared at the wrong location or
was even invisible.
Turns out just setting the alignment to ALIGN_OPPOSITE for the wordmark does
the trick.
Change-Id: I4e539d571992cb44e9afe4aca77ace730adda17a
---
M wikipedia/src/main/java/org/wikipedia/page/snippet/SnippetImage.java
1 file changed, 15 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/32/201732/1
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/snippet/SnippetImage.java
b/wikipedia/src/main/java/org/wikipedia/page/snippet/SnippetImage.java
index 60a1354..2441a16 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/snippet/SnippetImage.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/snippet/SnippetImage.java
@@ -22,6 +22,9 @@
import org.wikipedia.WikipediaApp;
import org.wikipedia.util.L10nUtils;
+import static android.text.Layout.Alignment.ALIGN_NORMAL;
+import static android.text.Layout.Alignment.ALIGN_OPPOSITE;
+
/**
* Creator and holder of a Bitmap which is comprised of an optional lead
image, a title,
* optional description, text, the Wikipedia wordmark, and some license icons.
@@ -261,7 +264,7 @@
Spanned wikipedia =
Html.fromHtml(context.getString(R.string.wp_stylized));
StaticLayout wordmarkLayout = buildLayout(
-new TextLayoutParams(wikipedia, textPaint, maxWidth, 1.0f));
+new TextLayoutParams(wikipedia, textPaint, maxWidth, 1.0f,
ALIGN_OPPOSITE));
final int width = (int) wordmarkLayout.getLineWidth(0);
final int height = wordmarkLayout.getHeight();
@@ -344,7 +347,7 @@
params.text,
params.textPaint,
params.lineWidth,
-Layout.Alignment.ALIGN_NORMAL,
+params.align,
params.spacingMultiplier,
0.0f,
false);
@@ -403,20 +406,29 @@
private final TextPaint textPaint;
private final int lineWidth;
private final float spacingMultiplier;
+private final Layout.Alignment align;
private TextLayoutParams(CharSequence text, TextPaint textPaint, int
lineWidth,
- float spacingMultiplier) {
+ float spacingMultiplier, Layout.Alignment
align) {
this.text = text;
this.textPaint = textPaint;
this.lineWidth = lineWidth;
this.spacingMultiplier = spacingMultiplier;
+this.align = align;
}
+private TextLayoutParams(CharSequence text, TextPaint textPaint, int
lineWidth,
+ float spacingMultiplier) {
+this(text, textPaint, lineWidth, spacingMultiplier, ALIGN_NORMAL);
+}
+
+/** Copy constructor with updated text */
public TextLayoutParams(TextLayoutParams other, CharSequence text) {
this.text = text;
this.textPaint = other.textPaint;
this.lineWidth = other.lineWidth;
this.spacingMultiplier = other.spacingMultiplier;
+this.align = other.align;
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/201732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e539d571992cb44e9afe4aca77ace730adda17a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix duplicate Package[gdb] declaration - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: Fix duplicate Package[gdb] declaration
..
Fix duplicate Package[gdb] declaration
Not using ensure_packages since standard-packages prefers latest. So
that on nodes not using java::tools, it will still keep that behaviour.
Bug: T94917
Change-Id: Ifd1e6b90683ad3aee73f7757a533e96815fa4925
---
M modules/base/manifests/standard-packages.pp
M modules/java/manifests/tools.pp
2 files changed, 9 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Hashar: Verified; Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/base/manifests/standard-packages.pp
b/modules/base/manifests/standard-packages.pp
index b10f605..9a38ff8 100644
--- a/modules/base/manifests/standard-packages.pp
+++ b/modules/base/manifests/standard-packages.pp
@@ -14,7 +14,6 @@
'zsh-beta',
'xfsprogs',
'screen',
-'gdb',
'iperf',
'atop',
'htop',
@@ -37,6 +36,13 @@
ensure = latest,
}
+# Can clash with java::tools class
+if ! defined ( Package['gdb'] ) {
+package { 'gdb':
+ensure = latest
+}
+}
+
# This should be in $packages, but moved here temporarily because it's
# currently broken on jessie hosts...
if ! os_version('debian = jessie') {
diff --git a/modules/java/manifests/tools.pp b/modules/java/manifests/tools.pp
index 61c6273..d40e26c 100644
--- a/modules/java/manifests/tools.pp
+++ b/modules/java/manifests/tools.pp
@@ -4,6 +4,8 @@
# java (JRE or JDK) is installed.
class java::tools {
+
+# Can clash with base::standard-packages class
if ! defined ( Package['gdb'] ) {
package { 'gdb':
ensure = present
--
To view, visit https://gerrit.wikimedia.org/r/201598
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd1e6b90683ad3aee73f7757a533e96815fa4925
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
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] varnish::logging: use service_unit - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201733
Change subject: varnish::logging: use service_unit
..
varnish::logging: use service_unit
Change-Id: I1b6b13ee73959e25633a2c73e5b1485d3c908c31
---
M modules/varnish/manifests/logging.pp
R modules/varnish/templates/initscripts/varnishncsa.sysvinit.erb
2 files changed, 6 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/33/201733/1
diff --git a/modules/varnish/manifests/logging.pp
b/modules/varnish/manifests/logging.pp
index df61925..d412361 100644
--- a/modules/varnish/manifests/logging.pp
+++ b/modules/varnish/manifests/logging.pp
@@ -24,22 +24,12 @@
default = $instance_name
}
-file { /etc/init.d/varnishncsa-${name}:
-content = template(${module_name}/varnishncsa.init.erb),
-owner = 'root',
-group = 'root',
-mode= '0555',
-notify = Service[varnishncsa-${name}],
+base::service_unit { varnishncsa-${name}:
+ensure= $ensure,
+template_name = 'varnishncsa',
+sysvinit = true,
}
-service { varnishncsa-${name}:
-ensure= $ensure,
-require = [
-File[/etc/init.d/varnishncsa-${name}],
-Service[$varnishservice]
-],
-subscribe = File['/etc/default/varnishncsa'],
-pattern = /var/run/varnishncsa/varnishncsa-${name}.pid,
-hasstatus = false,
-}
+Service[$varnishservice] - Service[varnishncsa-${name}];
+File['/etc/default/varnishncsa'] ~ Service[varnishncsa-${name}];
}
diff --git a/modules/varnish/templates/varnishncsa.init.erb
b/modules/varnish/templates/initscripts/varnishncsa.sysvinit.erb
similarity index 100%
rename from modules/varnish/templates/varnishncsa.init.erb
rename to modules/varnish/templates/initscripts/varnishncsa.sysvinit.erb
--
To view, visit https://gerrit.wikimedia.org/r/201733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b6b13ee73959e25633a2c73e5b1485d3c908c31
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] Check whether html parameter is valid rather than allow warn... - change (mediawiki...VisualEditor)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201743
Change subject: Check whether html parameter is valid rather than allow
warnings to be raised if it is not
..
Check whether html parameter is valid rather than allow warnings to be raised
if it is not
Bug: T95015
Change-Id: Iece859db0b67c906ac1f6f3e2e948815b455626c
---
M ApiVisualEditor.php
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/43/201743/1
diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index a79272c..bea9278 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -288,7 +288,11 @@
$html = $params['html'];
if ( substr( $html, 0, 11 ) === 'rawdeflate,' ) {
- $html = gzinflate( base64_decode( substr( $html, 11 ) )
);
+ $gz = base64_decode( substr( $html, 11 ) );
+ $html = @gzinflate( $gz );
+ if ( $gz === $html ) {
+ $this-dieUsage( HTML provided is not properly
deflated, 'invaliddeflate' );
+ }
}
wfDebugLog( 'visualeditor', called on '$title' with paction:
'{$params['paction']}' );
--
To view, visit https://gerrit.wikimedia.org/r/201743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iece859db0b67c906ac1f6f3e2e948815b455626c
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] Move MWLogger classes to MediaWiki\Logger namespace - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Move MWLogger classes to MediaWiki\Logger namespace
..
Move MWLogger classes to MediaWiki\Logger namespace
Move the MWLogger PSR-3 logging related classes into the
MediaWiki\Logger namespace. Create shim classes to ease migration of
existing MWLoggerFactory usage to the namespaced classes.
Bug: T93406
Change-Id: I359cc81fbd2dcf8937742311dcc7d3dee08747b0
---
M RELEASE-NOTES-1.25
M api.php
M autoload.php
A docs/logger.txt
D docs/mwlogger.txt
M includes/DefaultSettings.php
M includes/GlobalFunctions.php
M includes/MediaWiki.php
R includes/debug/logger/LegacyLogger.php
R includes/debug/logger/LegacySpi.php
D includes/debug/logger/Logger.php
R includes/debug/logger/LoggerFactory.php
R includes/debug/logger/MonologSpi.php
M includes/debug/logger/NullSpi.php
A includes/debug/logger/Shims.php
M includes/debug/logger/Spi.php
M includes/debug/logger/monolog/LegacyFormatter.php
R includes/debug/logger/monolog/LegacyHandler.php
M includes/debug/logger/monolog/SyslogHandler.php
R includes/debug/logger/monolog/WikiProcessor.php
M includes/exception/HttpError.php
M includes/jobqueue/JobRunner.php
M includes/objectcache/ObjectCache.php
M includes/specials/SpecialRunJobs.php
M maintenance/runJobs.php
M maintenance/storage/recompressTracked.php
R tests/phpunit/includes/debug/logging/LegacyLoggerTest.php
27 files changed, 403 insertions(+), 236 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index 7b035ac..1ec8b93 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -132,7 +132,8 @@
* The following libraries are now required:
** psr/log
This library provides the interfaces set by the PSR-3 standard
(http://www.php-fig.org/psr/psr-3/)
- which are used by MediaWiki internally via the MWLoggerFactory class.
+ which are used by MediaWiki internally via the
+ MediaWiki\Logger\LoggerFactory class.
See the structured logging RfC
(https://www.mediawiki.org/wiki/Requests_for_comment/Structured_logging)
for more background information.
** cssjanus/cssjanus
diff --git a/api.php b/api.php
index 7788a36..9212747 100644
--- a/api.php
+++ b/api.php
@@ -30,6 +30,8 @@
* @file
*/
+use MediaWiki\Logger\LegacyLogger;
+
// So extensions (and other code) can check whether they're running in API mode
define( 'MW_API', true );
@@ -124,7 +126,7 @@
} else {
$items[] = failed in ApiBeforeMain;
}
- MWLoggerLegacyLogger::emit( implode( ',', $items ) . \n,
$wgAPIRequestLog );
+ LegacyLogger::emit( implode( ',', $items ) . \n, $wgAPIRequestLog );
wfDebug( Logged API request to $wgAPIRequestLog\n );
}
diff --git a/autoload.php b/autoload.php
index 3396738..d646a0e 100644
--- a/autoload.php
+++ b/autoload.php
@@ -694,17 +694,17 @@
'MWFunction' = __DIR__ . '/includes/utils/MWFunction.php',
'MWHookException' = __DIR__ . '/includes/Hooks.php',
'MWHttpRequest' = __DIR__ . '/includes/HttpFunctions.php',
- 'MWLogger' = __DIR__ . '/includes/debug/logger/Logger.php',
- 'MWLoggerFactory' = __DIR__ . '/includes/debug/logger/Factory.php',
- 'MWLoggerLegacyLogger' = __DIR__ .
'/includes/debug/logger/legacy/Logger.php',
- 'MWLoggerLegacySpi' = __DIR__ .
'/includes/debug/logger/legacy/Spi.php',
- 'MWLoggerMonologHandler' = __DIR__ .
'/includes/debug/logger/monolog/Handler.php',
- 'MWLoggerMonologLegacyFormatter' = __DIR__ .
'/includes/debug/logger/monolog/LegacyFormatter.php',
- 'MWLoggerMonologProcessor' = __DIR__ .
'/includes/debug/logger/monolog/Processor.php',
- 'MWLoggerMonologSpi' = __DIR__ .
'/includes/debug/logger/monolog/Spi.php',
- 'MWLoggerMonologSyslogHandler' = __DIR__ .
'/includes/debug/logger/monolog/SyslogHandler.php',
- 'MWLoggerNullSpi' = __DIR__ . '/includes/debug/logger/NullSpi.php',
- 'MWLoggerSpi' = __DIR__ . '/includes/debug/logger/Spi.php',
+ 'MWLogger' = __DIR__ . '/includes/debug/logger/Shims.php',
+ 'MWLoggerFactory' = __DIR__ . '/includes/debug/logger/Shims.php',
+ 'MWLoggerLegacyLogger' = __DIR__ . '/includes/debug/logger/Shims.php',
+ 'MWLoggerLegacySpi' = __DIR__ . '/includes/debug/logger/Shims.php',
+ 'MWLoggerMonologHandler' = __DIR__ .
'/includes/debug/logger/Shims.php',
+ 'MWLoggerMonologLegacyFormatter' = __DIR__ .
'/includes/debug/logger/Shims.php',
+ 'MWLoggerMonologProcessor' = __DIR__ .
'/includes/debug/logger/Shims.php',
+ 'MWLoggerMonologSpi' = __DIR__ . '/includes/debug/logger/Shims.php',
+ 'MWLoggerMonologSyslogHandler' = __DIR__ .
'/includes/debug/logger/Shims.php',
+ 'MWLoggerNullSpi' = __DIR__ . '/includes/debug/logger/Shims.php',
+ 'MWLoggerSpi' = __DIR__ . '/includes/debug/logger/Shims.php',
'MWMemcached' = __DIR__ .
[MediaWiki-commits] [Gerrit] Fix build - change (apps...wikipedia)
Mhurd has submitted this change and it was merged.
Change subject: Fix build
..
Fix build
Workaround for fastlane bug : https://github.com/KrauseFx/fastlane/issues/176
Change-Id: I2151277940920e5a79bb64a4ab73a15f56af94df
---
M fastlane/Fastfile
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Mhurd: Looks good to me, approved
Bgerstle: Looks good to me, approved
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 2a40fce..1b3e0fe 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -57,6 +57,7 @@
# Create and sign the IPA (and DSYM)
ipa({
scheme: 'Wikipedia Alpha',
+configuration: 'Alpha', #Prevents fastlane from passing --configuration
Release - bug?
clean: nil, # this means 'Do Clean'. Clean project before building.
archive: nil, # this means 'Do Archive'. Archive project to the Xcode
organizer after building.
# verbose: nil, # this means 'Do Verbose'.
@@ -102,6 +103,7 @@
# Create and sign the IPA (and DSYM)
ipa({
scheme: 'Wikipedia Beta',
+configuration: 'Beta', #Prevents fastlane from passing --configuration
Release - bug?
clean: true,
archive: nil
})
--
To view, visit https://gerrit.wikimedia.org/r/201749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2151277940920e5a79bb64a4ab73a15f56af94df
Gerrit-PatchSet: 2
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Fjalapeno cfl...@wikimedia.org
Gerrit-Reviewer: Bgerstle bgers...@wikimedia.org
Gerrit-Reviewer: Dr0ptp4kt ab...@wikimedia.org
Gerrit-Reviewer: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix a typo in AppDelegate.m - change (apps...wikipedia)
Mhurd has submitted this change and it was merged. Change subject: Fix a typo in AppDelegate.m .. Fix a typo in AppDelegate.m How many toods could a to do do if a to do could do two? Change-Id: Ib5ef341c5f8726b5c6b599c4dbb80d9751fd4972 --- M wikipedia/AppDelegate.m 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mhurd: Looks good to me, approved Bgerstle: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia/AppDelegate.m b/wikipedia/AppDelegate.m index 97790a9..d004a58 100644 --- a/wikipedia/AppDelegate.m +++ b/wikipedia/AppDelegate.m @@ -19,7 +19,7 @@ @interface AppDelegate () -#warning TOOD: refactor into separate crash-reporting class +#warning TODO: refactor into separate crash-reporting class @property NSString* crashSendText; @property NSString* crashAlwaysSendText; @property NSString* crashDoNotSendText; -- To view, visit https://gerrit.wikimedia.org/r/201239 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib5ef341c5f8726b5c6b599c4dbb80d9751fd4972 Gerrit-PatchSet: 2 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Deskana dga...@wikimedia.org Gerrit-Reviewer: Bgerstle bgers...@wikimedia.org Gerrit-Reviewer: Mhurd mh...@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 multicolumn layouts on small devices - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Ignore multicolumn layouts on small devices
..
Ignore multicolumn layouts on small devices
Bug: T93786
Change-Id: I5932548b8ba5be504686466c56c07ef2c69ef4dc
---
M less/content/hacks.less
1 file changed, 14 insertions(+), 1 deletion(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/less/content/hacks.less b/less/content/hacks.less
index c4dbec8..4f9714c 100644
--- a/less/content/hacks.less
+++ b/less/content/hacks.less
@@ -118,7 +118,7 @@
width: auto !important;
}
-// Hacks to render galleries better on mobile
+// Hacks to render galleries and multicol tables better on mobile
@media all and (max-width: @wgMFDeviceWidthTablet) {
// Center images that might be less than the screen width.
@@ -131,4 +131,17 @@
}
}
}
+
+ .content {
+ table {
+ // Make {{col-beg}}, {{col-break}}, and {{col-end}}
templates display single column tables
+ .multicol {
+tbody tr td,
+tr td {
+ display: block !important;
+ width: auto !important;
+ }
+ }
+ }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/200030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5932548b8ba5be504686466c56c07ef2c69ef4dc
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov bmansu...@wikimedia.org
Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@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] Swap ordering of columns in GatherList - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Swap ordering of columns in GatherList
..
Swap ordering of columns in GatherList
Collection name is the most interesting thing to a user who's looking for a
collection to read, so it should come as the first column in the table. This
patch swaps the ordering of the columns to make a bit more sense for quick
browsing.
Bug: T94973
Change-Id: Ic17f218758378ead4070816eb7e13fc38710567c
---
M includes/specials/SpecialGatherLists.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialGatherLists.php
b/includes/specials/SpecialGatherLists.php
index 00bc1a8..7082b8a 100644
--- a/includes/specials/SpecialGatherLists.php
+++ b/includes/specials/SpecialGatherLists.php
@@ -118,10 +118,10 @@
$html .= Html::openElement( 'div', array( 'class' = 'content
gather-lists' ) );
$html .= Html::openElement( 'ul', array() );
$html .= Html::openElement( 'li', array( 'class' = 'heading' )
)
- . Html::element( 'span', array(), wfMessage(
'gather-lists-collection-owner' ) )
. Html::element( 'span', array(), wfMessage(
'gather-lists-collection-title' ) )
. Html::element( 'span', array(), wfMessage(
'gather-lists-collection-description' ) )
. Html::element( 'span', array(), wfMessage(
'gather-lists-collection-count' ) )
+ . Html::element( 'span', array(), wfMessage(
'gather-lists-collection-owner' ) )
. Html::element( 'span', array(), wfMessage(
'gather-lists-collection-last-updated' ) );
if ( $this-canHideLists() ) {
$html .= Html::element( 'span', array(), '' );
@@ -160,10 +160,10 @@
$ts = $lang-userTimeAndDate( new MWTimestamp( $data['updated']
), $user );
$html = Html::openElement( 'li' )
- . $this-userLink( $data['owner'] )
. $this-collectionLink( $data['label'],
$data['owner'], $data['id'] )
. Html::element( 'span', array(), $data['description'] )
. Html::element( 'span', array(), $data['count'] )
+ . $this-userLink( $data['owner'] )
. Html::element( 'span', array(), $ts );
if ( $this-canHideLists() ) {
--
To view, visit https://gerrit.wikimedia.org/r/201665
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic17f218758378ead4070816eb7e13fc38710567c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Deskana dga...@wikimedia.org
Gerrit-Reviewer: Deskana dga...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@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] Use eventlog1001 as main eventlogging host instead of vanadium - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Use eventlog1001 as main eventlogging host instead of vanadium
..
Use eventlog1001 as main eventlogging host instead of vanadium
For this most part, this patch just does s/vanadium/eventlog1001/g.
It also configures a new varnishncsa instance on bits caches called
'eventlogging', rather than 'vanadium'. I have ensured that the
vanadium instnaces will be stopped, and the new eventlogging instances
will send to eventlog1001. Once this is applied, I will
manually remove the vanadium named instances and puppet configs.
Bug: T90363
Change-Id: I2d0fc3d0a629f2bc75ef209ff2a51324893a9677
---
M manifests/role/abacist.pp
M manifests/role/cache.pp
M manifests/role/eventlogging.pp
M manifests/role/logging.pp
M manifests/role/tcpircbot.pp
M manifests/role/webperf.pp
M manifests/site.pp
M modules/abacist/manifests/init.pp
M modules/admin/files/enforce-users-groups.sh
M modules/eventlogging/manifests/service/consumer.pp
M modules/eventlogging/manifests/service/processor.pp
M modules/statistics/manifests/rsync/eventlogging.pp
M templates/udp2log/filters.mw.erb
13 files changed, 46 insertions(+), 31 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/abacist.pp b/manifests/role/abacist.pp
index 25c74da..cee7fb5 100644
--- a/manifests/role/abacist.pp
+++ b/manifests/role/abacist.pp
@@ -9,7 +9,7 @@
}
class { '::abacist':
-eventlogging_publisher = 'tcp://vanadium.eqiad.wmnet:8600',
+eventlogging_publisher = 'tcp://eventlog1001.eqiad.wmnet:8600',
}
Service['redis-server'] ~ Service['abacist']
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index cbab235..965c475 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -617,11 +617,24 @@
class varnish::logging::eventlistener {
$event_listener = $::realm ? {
-'production' = '10.64.21.123', # vanadium
+'production' = '10.64.32.167', # eventlog1001
'labs' = '10.68.16.52', # deployment-eventlogging02
}
+# I am renaming this varnishncsa instance to
+# 'eventlogging'. First ensuring that this is stopped,
+# then I will remove configs.
varnish::logging { 'vanadium' :
+listener_address = '10.64.21.123', # vanadium
+port = '8422',
+instance_name= '',
+cli_args = '-m RxURL:^/event\.gif\?. -D',
+log_fmt = '%q\t%l\t%n\t%t\t%h\t%{User-agent}i',
+monitor = false,
+ensure = 'stopped',
+}
+
+varnish::logging { 'eventlogging' :
listener_address = $event_listener,
port = '8422',
instance_name= '',
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index 6c8ad70..807eb6d 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -8,10 +8,10 @@
#
# There exist two APIs for generating events: efLogServerSideEvent() in
# PHP and mw.eventLog.logEvent() in JavaScript. Events generated in PHP
-# are sent by the app servers directly to vanadium on UDP port 8421.
+# are sent by the app servers directly to eventlog* servers on UDP port 8421.
# JavaScript-generated events are URL-encoded and sent to our servers by
# means of an HTTP/S request to bits, which a varnishncsa instance
-# forwards to vanadium on port 8422. These event streams are parsed,
+# forwards to eventlog* on port 8422. These event streams are parsed,
# validated, and multiplexed into an output stream that is published via
# ZeroMQ on TCP port 8600. Data sinks are implemented as subscribers
# that connect to this endpoint and read data into some storage medium.
@@ -37,8 +37,8 @@
## Data flow
-# Server-side events are generated by MediaWiki and sent to vanadium
-# on UDP port 8421, using wfErrorLog('...', 'udp://...'). vanadium
+# Server-side events are generated by MediaWiki and sent to eventlog*
+# on UDP port 8421, using wfErrorLog('...', 'udp://...'). eventlog*
# is specified as the destination in $wgEventLoggingFile, declared
# in wmf-config/CommonSettings.php.
@@ -56,7 +56,7 @@
# Client-side events are generated by JavaScript-triggered HTTP/S
# requests to //bits.wikimedia.org/event.gif?event payload.
# A varnishncsa instance on the bits caches greps for these requests
-# and forwards them to vanadium on UDP port 8422. The varnishncsa
+# and forwards them to eventlog* on UDP port 8422. The varnishncsa
# configuration is specified in manifests/role/cache.pp.
eventlogging::service::forwarder { '8422':
@@ -195,7 +195,7 @@
include ::eventlogging::monitoring
eventlogging::service::consumer { 'graphite':
-
[MediaWiki-commits] [Gerrit] Add more tests to variables and remove undefined index issue - change (mediawiki...BounceHandler)
01tonythomas has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201731
Change subject: Add more tests to variables and remove undefined index issue
..
Add more tests to variables and remove undefined index issue
Bug: T93112
Change-Id: I815c25ad7023239efea7e2e41de0c0bee3e47821
---
M includes/ProcessBounceEmails.php
1 file changed, 7 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BounceHandler
refs/changes/31/201731/1
diff --git a/includes/ProcessBounceEmails.php b/includes/ProcessBounceEmails.php
index 9a53b91..4b05628 100644
--- a/includes/ProcessBounceEmails.php
+++ b/includes/ProcessBounceEmails.php
@@ -59,7 +59,7 @@
$subject = $emailHeaders['subject'];
// Get original failed user email and wiki details
- $failedUser = $this-getUserDetails( $to );
+ $failedUser = $to ? $this-getUserDetails( $to ) : false;
if ( is_array( $failedUser ) isset( $failedUser['wikiId'] )
isset( $failedUser['rawEmail'] )
isset( $failedUser[ 'bounceTime' ] )
) {
@@ -101,13 +101,16 @@
global $wgVERPalgorithm, $wgVERPsecret, $wgVERPAcceptTime;
$failedUser = array();
+ $hashedData = null;
$currentTime = wfTimestamp();
preg_match( '~(.*?)@~', $hashedEmail, $hashedPart );
- $hashedVERPPart = explode( '-', $hashedPart[1] );
- $hashedData = $hashedVERPPart[0]. '-'. $hashedVERPPart[1]. '-'.
$hashedVERPPart[2]. '-'. $hashedVERPPart[3];
+ $hashedVERPPart = $hashedPart[1] ? explode( '-', $hashedPart[1]
) : false;
+ if ( $hashedVERPPart[0] $hashedVERPPart[1]
$hashedVERPPart[2] $hashedVERPPart[3] ) {
+ $hashedData = $hashedVERPPart[0]. '-'.
$hashedVERPPart[1]. '-'. $hashedVERPPart[2]. '-'. $hashedVERPPart[3];
+ }
$bounceTime = base_convert( $hashedVERPPart[3], 36, 10 );
-
+ // Check if the VERP hash is valid
if ( base64_encode( substr( hash_hmac( $wgVERPalgorithm,
$hashedData, $wgVERPsecret, true ), 0, 12 ) ) === $hashedVERPPart[4]
$currentTime - $bounceTime $wgVERPAcceptTime
) {
--
To view, visit https://gerrit.wikimedia.org/r/201731
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I815c25ad7023239efea7e2e41de0c0bee3e47821
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BounceHandler
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas 01tonytho...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use ensure = absent for varnish::logging vanadium - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201734
Change subject: Use ensure = absent for varnish::logging vanadium
..
Use ensure = absent for varnish::logging vanadium
Bug: T90363
Change-Id: I5b8d87c4a333c137d2710a18da0778523e85
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/34/201734/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 965c475..109e470 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -631,7 +631,7 @@
cli_args = '-m RxURL:^/event\.gif\?. -D',
log_fmt = '%q\t%l\t%n\t%t\t%h\t%{User-agent}i',
monitor = false,
-ensure = 'stopped',
+ensure = 'absent',
}
varnish::logging { 'eventlogging' :
--
To view, visit https://gerrit.wikimedia.org/r/201734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b8d87c4a333c137d2710a18da0778523e85
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] PHPCS lint fixes - change (mediawiki/core)
Ori.livneh has submitted this change and it was merged.
Change subject: PHPCS lint fixes
..
PHPCS lint fixes
Change-Id: I16288db03f34439bdb16940a86720d2511f46467
---
M includes/GlobalFunctions.php
M includes/MediaWiki.php
2 files changed, 10 insertions(+), 3 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 24a3c33..b2a2e3d 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3063,7 +3063,8 @@
fclose( $yourtextFile );
# Check for a conflict
- $cmd = wfEscapeShellArg( $wgDiff3, '-a', '--overlap-only', $mytextName,
$oldtextName, $yourtextName );
+ $cmd = wfEscapeShellArg( $wgDiff3, '-a', '--overlap-only', $mytextName,
+ $oldtextName, $yourtextName );
$handle = popen( $cmd, 'r' );
if ( fgets( $handle, 1024 ) ) {
@@ -3074,7 +3075,8 @@
pclose( $handle );
# Merge differences
- $cmd = wfEscapeShellArg( $wgDiff3, '-a', '-e', '--merge', $mytextName,
$oldtextName, $yourtextName );
+ $cmd = wfEscapeShellArg( $wgDiff3, '-a', '-e', '--merge', $mytextName,
+ $oldtextName, $yourtextName );
$handle = popen( $cmd, 'r' );
$result = '';
do {
diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index c4af16d..3f2cb62 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -663,7 +663,12 @@
}
$url = wfAppendQuery( wfScript( 'index' ), $query );
- $req = POST $url HTTP/1.1\r\nHost:
{$info['host']}\r\nConnection: Close\r\nContent-Length: 0\r\n\r\n;
+ $req = (
+ POST $url HTTP/1.1\r\n .
+ Host: {$info['host']}\r\n .
+ Connection: Close\r\n .
+ Content-Length: 0\r\n\r\n
+ );
$runJobsLogger-info( Running $n job(s) via '$url' );
// Send a cron API request to be performed in the background.
--
To view, visit https://gerrit.wikimedia.org/r/201741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16288db03f34439bdb16940a86720d2511f46467
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@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
