[MediaWiki-commits] [Gerrit] Big credits patch - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Big credits patch
..
Big credits patch
Add all authors, and put the extension in the new Beta features credit
section in Special:Version.
Change-Id: I22b0ab0ded87191832b469bec21665ef3fd6f2e1
---
A AUTHORS
M MultimediaViewer.php
2 files changed, 45 insertions(+), 1 deletion(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 000..f6bb5b1
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,24 @@
+* Mark Holmquist mtrac...@member.fsf.org
+* Gilles Dubuc gdu...@wikimedia.org
+* Gergő Tisza tgr.huw...@gmail.com
+* Aaron Arcos aarcos.w...@gmail.com
+* Zeljko Filipin zeljko.fili...@gmail.com
+* Pau Giner pau.gi...@gmail.com
+* theopolisme theopolismew...@gmail.com
+* MatmaRex matma@gmail.com
+* apsdehal amanpreet.iitr2...@gmail.com
+* vldandrew vldand...@gmail.com
+* Ebrahim Byagowi ebra...@gnu.org
+* Dereckson dereck...@espace-win.org
+* Brion VIBBER br...@wikimedia.org
+* Yuki Shira shirayuk...@gmail.com
+* Yaroslav Melnychuk yaroslavmelnuc...@gmail.com
+* tonythomas01 01tonytho...@gmail.com
+* raymond raimond.spekk...@gmail.com
+* Kunal Mehta lego...@gmail.com
+* Jeff Hall jh...@wikimedia.org
+* Christian Aistleitner christ...@quelltextlich.at
+* Amir E. Aharoni amir.ahar...@mail.huji.ac.il
+
+Generated with git log --format='%aN %aE' | awk '{arr[$0]++} END{for (i in
arr){print arr[i], i;}}' | sort -rn | cut -d\ -f2-
+Manually pruned for bots and duplicates
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index 700aeb0..012ff52 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -564,13 +564,33 @@
$wgHooks['ResourceLoaderGetConfigVars'][] =
'MultimediaViewerHooks::resourceLoaderGetConfigVars';
$wgHooks['ResourceLoaderTestModules'][] =
'MultimediaViewerHooks::getTestModules';
- $wgExtensionCredits['other'][] = array(
+ $wgExtensionCredits['betafeatures'][] = array(
'path' = __FILE__,
'name' = 'MultimediaViewer',
'descriptionmsg' = 'multimediaviewer-desc',
'version' = '0.2.0',
'author' = array(
'MarkTraceur (Mark Holmquist)',
+ 'Gilles Dubuc',
+ 'Gergő Tisza',
+ 'Aaron Arcos',
+ 'Zeljko Filipin',
+ 'Pau Giner',
+ 'theopolisme',
+ 'MatmaRex',
+ 'apsdehal',
+ 'vldandrew',
+ 'Ebrahim Byagowi',
+ 'Dereckson',
+ 'Brion VIBBER',
+ 'Yuki Shira',
+ 'Yaroslav Melnychuk',
+ 'tonythomas01',
+ 'Raimond Spekking',
+ 'Kunal Mehta',
+ 'Jeff Hall',
+ 'Christian Aistleitner',
+ 'Amir E. Aharoni',
),
'url' =
'https://mediawiki.org/wiki/Extension:MultimediaViewer',
);
--
To view, visit https://gerrit.wikimedia.org/r/113259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I22b0ab0ded87191832b469bec21665ef3fd6f2e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Gilles gdu...@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] Introduce mw.cx base object as the common data object - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Introduce mw.cx base object as the common data object
..
Introduce mw.cx base object as the common data object
Change-Id: Ic3e3f4ae9b18b66c979a5aaab283d4373642c821
---
M Resources.php
M modules/base/ext.cx.base.js
A modules/base/ext.cx.model.js
M modules/eventlogging/ext.cx.eventlogging.js
M modules/translation/ext.cx.publish.js
5 files changed, 50 insertions(+), 11 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index 2e3e9ac..82e4382 100644
--- a/Resources.php
+++ b/Resources.php
@@ -14,16 +14,20 @@
'group' = 'ext.cx',
);
+$wgResourceModules['ext.cx.model'] = array(
+ 'scripts' = 'base/ext.cx.model.js',
+) + $resourcePaths;
+
$wgResourceModules['ext.cx.base'] = array(
- 'scripts' = 'base/ext.cx.base.js',
+ 'scripts' = array(
+ 'base/ext.cx.base.js',
+ ),
'styles' = array(
'base/styles/ext.cx.base.less',
),
'dependencies' = array(
- 'mediawiki.api',
- 'mediawiki.jqueryMsg',
- 'mediawiki.language',
'mediawiki.ui',
+ 'ext.cx.model',
'ext.cx.header',
'ext.cx.source',
'ext.cx.translation',
@@ -40,6 +44,7 @@
'header/styles/ext.cx.header.less',
),
'dependencies' = array(
+ 'mediawiki.jqueryMsg',
'ext.cx.progressbar',
'ext.cx.publish',
),
@@ -55,6 +60,8 @@
'source/styles/ext.cx.source.less',
),
'dependencies' = array(
+ 'mediawiki.jqueryMsg',
+ 'mediawiki.api',
'jquery.uls.data',
'mediawiki.Uri',
),
@@ -88,6 +95,9 @@
'cx-tools-instructions-text4',
'cx-tools-instructions-text5'
),
+ 'dependencies' = array(
+ 'mediawiki.jqueryMsg',
+ ),
) + $resourcePaths;
$wgResourceModules['ext.cx.progressbar'] = array(
@@ -97,6 +107,9 @@
),
'messages' = array(
'cx-header-progressbar-text'
+ ),
+ 'dependencies' = array(
+ 'mediawiki.jqueryMsg',
),
) + $resourcePaths;
@@ -113,6 +126,9 @@
$wgResourceModules['ext.cx.eventlogging'] = array(
'scripts' = 'eventlogging/ext.cx.eventlogging.js',
- 'dependencies' = 'schema.ContentTranslation',
+ 'dependencies' = array(
+ 'schema.ContentTranslation',
+ 'ext.cx.model',
+ ),
) + $resourcePaths;
diff --git a/modules/base/ext.cx.base.js b/modules/base/ext.cx.base.js
index ee10ef0..2951ceb 100644
--- a/modules/base/ext.cx.base.js
+++ b/modules/base/ext.cx.base.js
@@ -8,10 +8,9 @@
* @copyright See AUTHORS.txt
* @license GPL-2.0+
*/
-( function ( $, mw ) {
+( function ( $ ) {
'use strict';
- mw.cx = mw.cx || {};
/**
* ContentTranslation
*
@@ -82,4 +81,4 @@
$( document ).ready( function () {
$( 'body' ).cx();
} );
-}( jQuery, mediaWiki ) );
+}( jQuery ) );
diff --git a/modules/base/ext.cx.model.js b/modules/base/ext.cx.model.js
new file mode 100644
index 000..058bea7
--- /dev/null
+++ b/modules/base/ext.cx.model.js
@@ -0,0 +1,27 @@
+/**
+ * ContentTranslation extension
+ * A tool that allows editors to translate pages from one language
+ * to another with the help of machine translation and other translation aids
+ *
+ * @file
+ * @ingroup Extensions
+ * @copyright See AUTHORS.txt
+ * @license GPL-2.0+
+ */
+( function ( $, mw ) {
+ 'use strict';
+
+ // mw.cx base model
+ mw.cx = {};
+ // Source language
+ mw.cx.sourceLanguage = null;
+ // Target language
+ mw.cx.targetLanguage = null;
+ // Source title
+ mw.cx.sourceTitle = null;
+ // Translated title
+ mw.cx.targetTitle = null;
+ // Current progress of translation.
+ mw.cx.progress = 0;
+
+}( jQuery, mediaWiki ) );
diff --git a/modules/eventlogging/ext.cx.eventlogging.js
b/modules/eventlogging/ext.cx.eventlogging.js
index 5895765..5989c67 100644
--- a/modules/eventlogging/ext.cx.eventlogging.js
+++ b/modules/eventlogging/ext.cx.eventlogging.js
@@ -80,6 +80,5 @@
}
};
- mw.cx = mw.cx || {};
mw.cx.eventlogging = new ContentTranslationEventLogging();
}( jQuery, mediaWiki ) );
diff --git a/modules/translation/ext.cx.publish.js
b/modules/translation/ext.cx.publish.js
index edb39bb..909bd78 100644
--- a/modules/translation/ext.cx.publish.js
+++ b/modules/translation/ext.cx.publish.js
@@ -11,8 +11,6 @@
( function ( $, mw ) {
'use strict';
- mw.cx = mw.cx || {};
-
mw.cx.publish = function () {
var
[MediaWiki-commits] [Gerrit] Add autopatrol and related settings for Japanese Wiktionary - change (operations/mediawiki-config)
Whym has uploaded a new change for review. https://gerrit.wikimedia.org/r/113338 Change subject: Add autopatrol and related settings for Japanese Wiktionary .. Add autopatrol and related settings for Japanese Wiktionary Bug: TO_BE_SUPPLIED Change-Id: I0b2c31a894e35306f32a94a43477a7adeae8bc01 --- M wmf-config/InitialiseSettings.php 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/38/113338/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index c7f642d..867079b 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -6095,6 +6095,7 @@ 'itwikibooks' = true, // bug 9159 'itwikiquote' = true, // bug 12826 'itwiktionary' = true, // bug 11424 +'jawiktionary' = true, // bug TO_BE_SUPPLIED 'kshwiki' = true, // bug 8798 'mediawikiwiki' = true, // bug 56104 'metawiki' = true, // bug 4747 @@ -7070,6 +7071,10 @@ 'autoconfirmed' = array( 'upload' = false ), 'sysop' = array( 'upload' = true ), ), + 'jawiktionary' = array( + 'autoconfirmed' = array( 'patrol' = true ), // bug TO_BE_SUPPLIED + 'autopatrolled' = array( 'autopatrol' = true ), // bug TO_BE_SUPPLIED + ), 'kawiki' = array( 'editor' = array( 'rollback' = true ), ), @@ -7913,6 +7918,9 @@ 'sysop' = array( 'abusefilter' ), 'bureaucrat' = array( 'rollbacker', 'eliminator', 'interface_editor' ), ), + '+jawiktionary' = array( + 'sysop' = array( 'autopatrolled' ), // bug TO_BE_SUPPLIED + ), '+kawiki' = array( 'sysop' = array( 'trusted' ), ), -- To view, visit https://gerrit.wikimedia.org/r/113338 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b2c31a894e35306f32a94a43477a7adeae8bc01 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Whym w...@whym.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Way for JS to know whether page is using page translation - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113339
Change subject: Way for JS to know whether page is using page translation
..
Way for JS to know whether page is using page translation
Bug: 61331
Change-Id: I7731cd2bf39d3f5d1ef2eada326d2ace6c0b5f28
---
M tag/PageTranslationHooks.php
1 file changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/39/113339/1
diff --git a/tag/PageTranslationHooks.php b/tag/PageTranslationHooks.php
index 425dba1..3fc0aa4 100644
--- a/tag/PageTranslationHooks.php
+++ b/tag/PageTranslationHooks.php
@@ -77,13 +77,18 @@
global $wgTranslatePageTranslationULS;
$title = $out-getTitle();
- if ( TranslatablePage::isSourcePage( $title ) ||
- TranslatablePage::isTranslationPage( $title )
- ) {
+ $isSource = TranslatablePage::isSourcePage( $title );
+ $isTranslation = TranslatablePage::isTranslationPage( $title );
+
+ if ( $isSource || $isTranslation ) {
$out-addModules( 'ext.translate' );
if ( $wgTranslatePageTranslationULS ) {
$out-addModules(
'ext.translate.pagetranslation.uls' );
}
+
+ // Per bug 61331
+ $type = $isSource ? 'source' : 'translation';
+ $out-addJsConfigVars( 'wgTranslatePageTranslation',
$type );
}
return true;
--
To view, visit https://gerrit.wikimedia.org/r/113339
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7731cd2bf39d3f5d1ef2eada326d2ace6c0b5f28
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Actually hide the size label when not in use - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Actually hide the size label when not in use
..
Actually hide the size label when not in use
It was previously just made transparent, and when it's positioning got out
of sync it would act as an invisible click block.
Change-Id: I47f623b79323d85e90e88204bcb1b2d8f12b60f8
---
M modules/ve/ce/ve.ce.ResizableNode.js
1 file changed, 8 insertions(+), 1 deletion(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ce/ve.ce.ResizableNode.js
b/modules/ve/ce/ve.ce.ResizableNode.js
index 6f803dc..a06d3bc 100644
--- a/modules/ve/ce/ve.ce.ResizableNode.js
+++ b/modules/ve/ce/ve.ce.ResizableNode.js
@@ -109,7 +109,9 @@
// Parent method
ve.Scalable.prototype.setOriginalDimensions.call( this, dimensions );
// If dimensions are valid and the scale label is desired, enable it
- this.canShowScaleLabel = this.showScaleLabel
this.getOriginalDimensions().width this.getOriginalDimensions().height;
+ this.canShowScaleLabel = this.showScaleLabel
+ this.getOriginalDimensions().width
+ this.getOriginalDimensions().height;
};
/**
@@ -122,6 +124,10 @@
setTimeout( function () {
node.$sizeLabel.removeClass(
've-ce-resizableNode-sizeLabel-resizing' );
} );
+ // Actually hide the size label after it's done animating
+ setTimeout( function () {
+ node.$sizeLabel.hide();
+ }, 200 );
};
/**
@@ -146,6 +152,7 @@
height = dimensions.height;
}
this.$sizeLabel
+ .show()
.addClass( 've-ce-resizableNode-sizeLabel-resizing' )
.css( {
'top': top,
--
To view, visit https://gerrit.wikimedia.org/r/113280
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47f623b79323d85e90e88204bcb1b2d8f12b60f8
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: Esanders esand...@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] New Wikidata Build - 14/02/2014 10:00 - change (mediawiki...Wikidata)
wikidata-servi...@wikimedia.de has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113340
Change subject: New Wikidata Build - 14/02/2014 10:00
..
New Wikidata Build - 14/02/2014 10:00
Change-Id: Ic68ceb4548455658a07edb3c93dc8fdb01b84042
---
M composer.lock
M extensions/Wikibase/INSTALL
D extensions/Wikibase/lib/tests/phpunit/claim/ClaimDifferenceTest.php
M extensions/Wikibase/repo/Wikibase.i18n.php
R extensions/Wikibase/repo/includes/ClaimDiffer.php
R extensions/Wikibase/repo/includes/ClaimDifference.php
R extensions/Wikibase/repo/includes/ClaimDifferenceVisualizer.php
R extensions/Wikibase/repo/includes/DiffOpValueFormatter.php
R extensions/Wikibase/repo/includes/DiffView.php
R extensions/Wikibase/repo/includes/EntityDiffVisualizer.php
R extensions/Wikibase/repo/tests/phpunit/includes/ClaimDifferTest.php
R extensions/Wikibase/repo/tests/phpunit/includes/ClaimDifferenceTest.php
R
extensions/Wikibase/repo/tests/phpunit/includes/ClaimDifferenceVisualizerTest.php
R extensions/Wikibase/repo/tests/phpunit/includes/DiffOpValueFormatterTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/FormatSnakValueTest.php
M vendor/autoload.php
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
19 files changed, 109 insertions(+), 116 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/40/113340/1
diff --git a/composer.lock b/composer.lock
index cf8319b..9127d2a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -850,12 +850,12 @@
source: {
type: git,
url:
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: 23e7c709e922123ec1c6c4f6807ec1121f44590b
+reference: 6e1dcdedd2aeed20d506536d2bdf9fb3aa3650b8
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/23e7c709e922123ec1c6c4f6807ec1121f44590b;,
-reference: 23e7c709e922123ec1c6c4f6807ec1121f44590b,
+url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6e1dcdedd2aeed20d506536d2bdf9fb3aa3650b8;,
+reference: 6e1dcdedd2aeed20d506536d2bdf9fb3aa3650b8,
shasum:
},
require: {
@@ -914,7 +914,7 @@
wikibaserepo,
wikidata
],
-time: 2014-02-12 21:37:03
+time: 2014-02-13 22:34:49
}
],
packages-dev: [
diff --git a/extensions/Wikibase/INSTALL b/extensions/Wikibase/INSTALL
index ecf75c6..2361737 100644
--- a/extensions/Wikibase/INSTALL
+++ b/extensions/Wikibase/INSTALL
@@ -4,8 +4,6 @@
* WikibaseLib (in the subdirectory lib)
* Wikibase Client (in the subdirectory client)
-Installation instructions for each can be found in the INSTALL file in the
given subdirectory.
-
In order to enable experimental features for the extensions, put the below
line before
the inclusion of the extensions in your LocalSettings.php file:
diff --git
a/extensions/Wikibase/lib/tests/phpunit/claim/ClaimDifferenceTest.php
b/extensions/Wikibase/lib/tests/phpunit/claim/ClaimDifferenceTest.php
deleted file mode 100644
index 42d0066..000
--- a/extensions/Wikibase/lib/tests/phpunit/claim/ClaimDifferenceTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-?php
-
-namespace Wikibase\Test;
-
-use Diff\Diff;
-use Diff\DiffOpAdd;
-use Diff\DiffOpChange;
-use Wikibase\ClaimDifference;
-use Wikibase\PropertyNoValueSnak;
-use Wikibase\Reference;
-use Wikibase\Statement;
-
-/**
- * @covers Wikibase\ClaimDifference
- *
- * @since 0.4
- *
- * @group Wikibase
- * @group WikibaseLib
- * @group WikibaseClaim
- *
- * @licence GNU GPL v2+
- * @author Jeroen De Dauw jeroended...@gmail.com
- */
-class ClaimDifferenceTest extends \MediaWikiTestCase {
-
- public function testGetReferenceChanges() {
- $expected = new Diff( array(
- new DiffOpAdd( new Reference() )
- ), false );
-
- $difference = new ClaimDifference( null, null, $expected );
-
- $actual = $difference-getReferenceChanges();
-
- $this-assertInstanceOf( 'Diff\Diff', $actual );
- $this-assertEquals( $expected, $actual );
- }
-
- public function testGetQualifierChanges() {
- $expected = new Diff( array(
- new DiffOpAdd( new PropertyNoValueSnak( 42 ) )
- ), false );
-
- $difference = new ClaimDifference( null, $expected );
-
- $actual = $difference-getQualifierChanges();
-
- $this-assertInstanceOf( 'Diff\Diff', $actual );
- $this-assertEquals( $expected, $actual );
- }
-
- public function testGetMainSnakChange() {
[MediaWiki-commits] [Gerrit] Deprecate wgSkipSkin in favor of wgSkipSkins - change (mediawiki/core)
TTO has uploaded a new change for review. https://gerrit.wikimedia.org/r/113341 Change subject: Deprecate wgSkipSkin in favor of wgSkipSkins .. Deprecate wgSkipSkin in favor of wgSkipSkins Per comments at https://gerrit.wikimedia.org/r/#/c/110162/5/includes/DefaultSettings.php Change-Id: I47e891464c9955e2ea8c655c8e2e19cb09f55baa --- M includes/DefaultSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/41/113341/1 diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index dd76a04..34bb191 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -2908,6 +2908,8 @@ * Specify the name of a skin that should not be presented in the list of * available skins. Use for blacklisting a skin which you do not want to * remove from the .../skins/ directory + * + * @deprecated since 1.23; use $wgSkipSkins instead */ $wgSkipSkin = ''; -- To view, visit https://gerrit.wikimedia.org/r/113341 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47e891464c9955e2ea8c655c8e2e19cb09f55baa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: TTO at.li...@live.com.au ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 14/02/2014 10:00 - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged.
Change subject: New Wikidata Build - 14/02/2014 10:00
..
New Wikidata Build - 14/02/2014 10:00
Change-Id: Ic68ceb4548455658a07edb3c93dc8fdb01b84042
---
M composer.lock
M extensions/Wikibase/INSTALL
D extensions/Wikibase/lib/tests/phpunit/claim/ClaimDifferenceTest.php
M extensions/Wikibase/repo/Wikibase.i18n.php
R extensions/Wikibase/repo/includes/ClaimDiffer.php
R extensions/Wikibase/repo/includes/ClaimDifference.php
R extensions/Wikibase/repo/includes/ClaimDifferenceVisualizer.php
R extensions/Wikibase/repo/includes/DiffOpValueFormatter.php
R extensions/Wikibase/repo/includes/DiffView.php
R extensions/Wikibase/repo/includes/EntityDiffVisualizer.php
R extensions/Wikibase/repo/tests/phpunit/includes/ClaimDifferTest.php
R extensions/Wikibase/repo/tests/phpunit/includes/ClaimDifferenceTest.php
R
extensions/Wikibase/repo/tests/phpunit/includes/ClaimDifferenceVisualizerTest.php
R extensions/Wikibase/repo/tests/phpunit/includes/DiffOpValueFormatterTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/FormatSnakValueTest.php
M vendor/autoload.php
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
19 files changed, 109 insertions(+), 116 deletions(-)
Approvals:
WikidataJenkins: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index cf8319b..9127d2a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -850,12 +850,12 @@
source: {
type: git,
url:
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: 23e7c709e922123ec1c6c4f6807ec1121f44590b
+reference: 6e1dcdedd2aeed20d506536d2bdf9fb3aa3650b8
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/23e7c709e922123ec1c6c4f6807ec1121f44590b;,
-reference: 23e7c709e922123ec1c6c4f6807ec1121f44590b,
+url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6e1dcdedd2aeed20d506536d2bdf9fb3aa3650b8;,
+reference: 6e1dcdedd2aeed20d506536d2bdf9fb3aa3650b8,
shasum:
},
require: {
@@ -914,7 +914,7 @@
wikibaserepo,
wikidata
],
-time: 2014-02-12 21:37:03
+time: 2014-02-13 22:34:49
}
],
packages-dev: [
diff --git a/extensions/Wikibase/INSTALL b/extensions/Wikibase/INSTALL
index ecf75c6..2361737 100644
--- a/extensions/Wikibase/INSTALL
+++ b/extensions/Wikibase/INSTALL
@@ -4,8 +4,6 @@
* WikibaseLib (in the subdirectory lib)
* Wikibase Client (in the subdirectory client)
-Installation instructions for each can be found in the INSTALL file in the
given subdirectory.
-
In order to enable experimental features for the extensions, put the below
line before
the inclusion of the extensions in your LocalSettings.php file:
diff --git
a/extensions/Wikibase/lib/tests/phpunit/claim/ClaimDifferenceTest.php
b/extensions/Wikibase/lib/tests/phpunit/claim/ClaimDifferenceTest.php
deleted file mode 100644
index 42d0066..000
--- a/extensions/Wikibase/lib/tests/phpunit/claim/ClaimDifferenceTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-?php
-
-namespace Wikibase\Test;
-
-use Diff\Diff;
-use Diff\DiffOpAdd;
-use Diff\DiffOpChange;
-use Wikibase\ClaimDifference;
-use Wikibase\PropertyNoValueSnak;
-use Wikibase\Reference;
-use Wikibase\Statement;
-
-/**
- * @covers Wikibase\ClaimDifference
- *
- * @since 0.4
- *
- * @group Wikibase
- * @group WikibaseLib
- * @group WikibaseClaim
- *
- * @licence GNU GPL v2+
- * @author Jeroen De Dauw jeroended...@gmail.com
- */
-class ClaimDifferenceTest extends \MediaWikiTestCase {
-
- public function testGetReferenceChanges() {
- $expected = new Diff( array(
- new DiffOpAdd( new Reference() )
- ), false );
-
- $difference = new ClaimDifference( null, null, $expected );
-
- $actual = $difference-getReferenceChanges();
-
- $this-assertInstanceOf( 'Diff\Diff', $actual );
- $this-assertEquals( $expected, $actual );
- }
-
- public function testGetQualifierChanges() {
- $expected = new Diff( array(
- new DiffOpAdd( new PropertyNoValueSnak( 42 ) )
- ), false );
-
- $difference = new ClaimDifference( null, $expected );
-
- $actual = $difference-getQualifierChanges();
-
- $this-assertInstanceOf( 'Diff\Diff', $actual );
- $this-assertEquals( $expected, $actual );
- }
-
- public function testGetMainSnakChange() {
- $expected = new DiffOpChange(
-
[MediaWiki-commits] [Gerrit] Avoid deep copy of global mediaWiki object - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113342
Change subject: Avoid deep copy of global mediaWiki object
..
Avoid deep copy of global mediaWiki object
When _createWidget is called (line 290) it calls $.extend( true,
... ) and therefor does a deep copy of the options object including
the global mediaWiki object. This obviously wastes time and
triggers deprecated warnings.
The other options (expecially dataValueType and dataTypeId) are
needed when creating the widget and can not be moved down.
Other changes: Code cleanup. Replaced fixed delay time with one of
the three that are configurable by the user.
Change-Id: Ic845d4ce0ea789399fdaf06132c7b40aabb4fdbc
---
M
lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js
1 file changed, 13 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/42/113342/1
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js
index b2c7851..f63eb05 100644
---
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js
+++
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js
@@ -187,7 +187,7 @@
self._viewState.notify( 'invalid' );
} )
.on( 'valueviewafterparse.' + this.variationBaseClass,
function( event ) {
- self._viewState.notify( (
self._valueView.value() ) ? 'valid' : 'invalid' );
+ self._viewState.notify( self._valueView.value()
? 'valid' : 'invalid' );
} )
.on( 'inputextenderanimation.' +
this.variationBaseClass, function( animationEvent ) {
animationEvent.animationCallbacks.add( 'done',
function() {
@@ -210,7 +210,7 @@
{ height: newHeight },
{
queue:
heightAnimationQueue,
- duration: 250,
+ duration: 'fast', //
200 by default
progress: function(
animation, progress, remainingMs ) {
$.ui.inputextender.redrawVisibleExtensions();
}
@@ -276,26 +276,23 @@
return false; // no valueview created!
}
- var valueViewOptions = {
- value: dataValue,
- mediaWiki: mw
- };
+ var valueViewOptions = { value: dataValue };
if( dataType ) {
- $.extend( valueViewOptions, {
- dataTypeId: dataType.getId(),
- dataValueType:
dataType.getDataValueType()
- } );
+ valueViewOptions.dataTypeId=
dataType.getId();
+ valueViewOptions.dataValueType =
dataType.getDataValueType();
} else if( dataValue ) {
- $.extend( valueViewOptions, {
- dataValueType: dataValue.getType()
- } );
+ valueViewOptions.dataValueType =
dataValue.getType();
}
// TODO: Use something like an 'editview' and just
change its data type rather than
- // initializing this over and over again and doing the
checks.
+ // initializing this over and over again and doing the
checks.
$valueViewDom.valueview( valueViewOptions );
this._valueView = $valueViewDom.data( 'valueview' );
+
+ // Setting this option must be delayed, otherwise the
deep copy call
+ // $.extend( true, ... ) in _createWidget() will clone
the full mw object.
+ this._valueView.option( { mediaWiki: mw } );
return true;
},
@@ -304,18 +301,14 @@
* @see jQuery.wikibase.snakview.variations.Variation.focus
*/
focus: function() {
- if( this._valueView ) {
- this._valueView.focus();
- }
+
[MediaWiki-commits] [Gerrit] [GlobalUserrights] Register extension - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [GlobalUserrights] Register extension .. [GlobalUserrights] Register extension Was migrated from SVN some days ago Change-Id: I478084298bce3b7f88af9adc25f89d0f349e375e --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index dc5a286..f5825c6 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -673,6 +673,10 @@ Global User Groups # GlobalUserGroups.i18n.groups.php not added. Has a lot of user groups which conflicts with WikimediaMessages.i18n.php +Global Userrights +aliasfile = GlobalUserrights/GlobalUserrights.alias.php +descmsg = gur-desc + Google AdSense ignored = googleadsense -- To view, visit https://gerrit.wikimedia.org/r/113343 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I478084298bce3b7f88af9adc25f89d0f349e375e Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@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] [GlobalUserrights] Register extension - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/113343 Change subject: [GlobalUserrights] Register extension .. [GlobalUserrights] Register extension Was migrated from SVN some days ago Change-Id: I478084298bce3b7f88af9adc25f89d0f349e375e --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/43/113343/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index dc5a286..f5825c6 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -673,6 +673,10 @@ Global User Groups # GlobalUserGroups.i18n.groups.php not added. Has a lot of user groups which conflicts with WikimediaMessages.i18n.php +Global Userrights +aliasfile = GlobalUserrights/GlobalUserrights.alias.php +descmsg = gur-desc + Google AdSense ignored = googleadsense -- To view, visit https://gerrit.wikimedia.org/r/113343 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I478084298bce3b7f88af9adc25f89d0f349e375e Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add gitreview file - change (mediawiki...mathoid)
Hashar has submitted this change and it was merged. Change subject: add gitreview file .. add gitreview file gerrit is great Change-Id: I0ddbc70a333acf8163afb7fbbf1c630de51ac48d --- A .gitreview 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Hashar: Verified GWicke: Looks good to me, approved diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..ac60245 --- /dev/null +++ b/.gitreview @@ -0,0 +1,6 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=mediawiki/services/mathoid +defaultbranch=master +defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/112875 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0ddbc70a333acf8163afb7fbbf1c630de51ac48d Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/services/mathoid Gerrit-Branch: master Gerrit-Owner: Physikerwelt w...@physikerwelt.de Gerrit-Reviewer: GWicke gwi...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Record detailed network performance of API calls - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113344
Change subject: Record detailed network performance of API calls
..
Record detailed network performance of API calls
Also fixes some issues with incorrect values passed to event logging
Change-Id: I2cc730727d30fb4f87a4fbe81725d6859690589b
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/211
---
M MultimediaViewer.php
M resources/mmv/mmv.performance.js
M resources/mmv/provider/mmv.provider.Api.js
M resources/mmv/provider/mmv.provider.FileRepoInfo.js
M resources/mmv/provider/mmv.provider.GlobalUsage.js
M resources/mmv/provider/mmv.provider.ImageInfo.js
M resources/mmv/provider/mmv.provider.ImageUsage.js
M resources/mmv/provider/mmv.provider.ThumbnailInfo.js
M resources/mmv/provider/mmv.provider.UserInfo.js
M tests/qunit/provider/mmv.provider.Api.test.js
10 files changed, 196 insertions(+), 64 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/44/113344/1
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index ca9d0af..6e777bd 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -518,7 +518,7 @@
$wgResourceModules['schema.MultimediaViewerNetworkPerformance'] = array(
'class' = 'ResourceLoaderSchemaModule',
'schema' =
'MultimediaViewerNetworkPerformance',
- 'revision' = 7393226,
+ 'revision' = 7488625,
);
$wgResourceModules['mmv']['dependencies'][] =
'ext.eventLogging';
diff --git a/resources/mmv/mmv.performance.js b/resources/mmv/mmv.performance.js
index 9fec186..45b420b 100755
--- a/resources/mmv/mmv.performance.js
+++ b/resources/mmv/mmv.performance.js
@@ -48,12 +48,7 @@
if ( request.readyState === 4 ) {
deferred.resolve( request.response );
-
- // The timeout is necessary because if there's
an entry in window.performance,
- // it hasn't been added yet at this point
- setTimeout( function() {
- perf.recordEntry( type, total, url,
request );
- }, 1000 );
+ perf.recordEntryDelayed( type, total, url,
request );
}
};
@@ -75,6 +70,9 @@
P.recordEntry = function ( type, total, url, request ) {
var timingList, timingEntry, i,
matches,
+ age,
+ xcache,
+ xvarnish,
stats = { type: type,
contentHost: window.location.host,
userAgent: navigator.userAgent,
@@ -117,10 +115,19 @@
}
if ( request ) {
- stats.XCache = request.getResponseHeader( 'X-Cache' );
- stats.XVarnish = request.getResponseHeader( 'X-Varnish'
);
+ xcache = request.getResponseHeader( 'X-Cache' );
- if ( stats.XCache stats.XCache.length ) {
+ if ( xcache ) {
+ stats.XCache = xcache;
+ }
+
+ xvarnish = request.getResponseHeader( 'X-Varnish' );
+
+ if ( xvarnish ) {
+ stats.XVarnish = xvarnish;
+ }
+
+ if ( stats.XCache stats.XCache.length
stats.XCache ) {
varnishXCache = this.parseVarnishXCacheHeader(
stats.XCache );
$.each( varnishXCache, function( key, value ) {
@@ -129,7 +136,13 @@
}
stats.contentLength = parseInt(
request.getResponseHeader( 'Content-Length' ), 10 );
- stats.age = parseInt( request.getResponseHeader( 'Age'
), 10 );
+
+ age = parseInt( request.getResponseHeader( 'Age' ), 10
);
+
+ if ( !isNaN( age ) ) {
+ stats.age = age;
+ }
+
stats.timestamp = new Date( request.getResponseHeader(
'Date' ) ).getTime() / 1000;
stats.status = request.status;
}
@@ -141,7 +154,7 @@
for ( i = 0; i timingList.length; i++ ) {
timingEntry = timingList[ i ];
if ( timingEntry.initiatorType ===
'xmlhttprequest'
-timingEntry.name === url ) {
+
[MediaWiki-commits] [Gerrit] Allow different JS files to be referenced in different rt se... - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow different JS files to be referenced in different rt
server views
..
Allow different JS files to be referenced in different rt server views
Change-Id: If3ab219885bafb42f4c9e959de6169b6057721ed
---
M tests/server/server.js
M tests/server/views/commits.html
M tests/server/views/layout.html
3 files changed, 20 insertions(+), 6 deletions(-)
Approvals:
Marcoil: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/server/server.js b/tests/server/server.js
index b31d893..a51af5f 100755
--- a/tests/server/server.js
+++ b/tests/server/server.js
@@ -706,6 +706,19 @@
}
};
+// block helper to reference js files in page head.
+// options.fn is a function taking the present context and returning a string
+// (whatever is between {{#jsFiles}} and {{/jsFiles}} in a template).
+// This string becomes the value of a 'javascripts' key added to the context,
to be
+// rendered as html where {{{javascripts}}} appears in layout.html.
+hbs.registerHelper('jsFiles', function(options){
+ if (!this.javascripts) {
+ this.javascripts = {};
+ }
+ this.javascripts = options.fn(this);
+ return null;
+});
+
var pageListData = [
{ url: '/topfails', title: 'Results by title' },
{ url: '/failedFetches', title: 'Non-existing test pages' },
@@ -1395,8 +1408,6 @@
// List of all commits
app.use( '/commits', GET_commits );
-
-app.use( '/static', express.static( __dirname + '/static' ) );
// Clients will GET this path if they want to run a test
coordApp.get( /^\/title$/, getTitle );
diff --git a/tests/server/views/commits.html b/tests/server/views/commits.html
index de2e0e8..aa50f3e 100644
--- a/tests/server/views/commits.html
+++ b/tests/server/views/commits.html
@@ -1,3 +1,9 @@
+{{#jsFiles}}
+ script src='/static/js/jquery-min.js'/script
+ script src='/static/js/commitList.js'/script
+ script src='/static/js/app.js'/script
+{{/jsFiles}}
+
h1 class='heading'Revisions since {{latest}}/h1
div id='content'
diff --git a/tests/server/views/layout.html b/tests/server/views/layout.html
index 8799610..270c3ab 100644
--- a/tests/server/views/layout.html
+++ b/tests/server/views/layout.html
@@ -2,10 +2,7 @@
html
head
meta charset=UTF-8
- script src='/static/js/jquery-min.js'/script
- script src='/static/js/commitList.js'/script
- script src='/static/js/app.js'/script
-
+ {{{javascripts}}}
link type='text/css' href=/static/style.css rel=stylesheet
/head
body
--
To view, visit https://gerrit.wikimedia.org/r/113121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If3ab219885bafb42f4c9e959de6169b6057721ed
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Bebirchall bebirch...@gmail.com
Gerrit-Reviewer: Marcoil marc...@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] Fix shadow position in standalone toolbar - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113345
Change subject: Fix shadow position in standalone toolbar
..
Fix shadow position in standalone toolbar
Was causing horizontal scrollbar to appears when not floated.
Change-Id: Ie1b7993abbd084facd39b93d2a7f664fe93e07fb
---
M modules/ve/ui/styles/ve.ui.Toolbar.css
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/45/113345/1
diff --git a/modules/ve/ui/styles/ve.ui.Toolbar.css
b/modules/ve/ui/styles/ve.ui.Toolbar.css
index 3444af3..ac0f020 100644
--- a/modules/ve/ui/styles/ve.ui.Toolbar.css
+++ b/modules/ve/ui/styles/ve.ui.Toolbar.css
@@ -5,11 +5,15 @@
* @license The MIT License (MIT); see LICENSE.txt
*/
+.oo-ui-toolbar-bar {
+ position: relative;
+}
+
.ve-ui-toolbar-floating .oo-ui-toolbar-bar {
position: fixed;
top: 0;
z-index: 100;
- border-top: none; /* TODO: Do we need this? What does it reset? */
+ border-top: none;
}
.ve-ui-toolbar-floating .oo-ui-toolbar-shadow {
--
To view, visit https://gerrit.wikimedia.org/r/113345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1b7993abbd084facd39b93d2a7f664fe93e07fb
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add makefile - change (mediawiki...mathoid)
Hashar has submitted this change and it was merged. Change subject: Add makefile .. Add makefile Change-Id: Id92aab295d19f5ee0026d03f5e0d4c1d44da1e8e --- A Makefile 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/Makefile b/Makefile new file mode 100644 index 000..a571329 --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +.PHONY: all clean install + +all: install + +install: + npm install + +clean: + rm -rf node_modules -- To view, visit https://gerrit.wikimedia.org/r/113024 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id92aab295d19f5ee0026d03f5e0d4c1d44da1e8e Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/services/mathoid Gerrit-Branch: master Gerrit-Owner: Physikerwelt w...@physikerwelt.de Gerrit-Reviewer: GWicke gwi...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Create a Jenkins job to run UniversalLanguageSelector tests ... - change (mediawiki/selenium)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/113346 Change subject: Create a Jenkins job to run UniversalLanguageSelector tests in Internet Explorer .. Create a Jenkins job to run UniversalLanguageSelector tests in Internet Explorer Paired with Kartik Mistry. Change-Id: I0f708c17adc730da2e31b6aeaab56182d5238930 --- M docs/jobs.md 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium refs/changes/46/113346/1 diff --git a/docs/jobs.md b/docs/jobs.md index 189a622..785c494 100644 --- a/docs/jobs.md +++ b/docs/jobs.md @@ -194,7 +194,7 @@ # UniversalLanguageSelector - Browser Label: firefox -- Recipients: aahar...@wikimedia.org cmcma...@wikimedia.org nlaxst...@wikimedia.org sthottin...@wikimedia.org zfili...@wikimedia.org +- Recipients: aahar...@wikimedia.org cmcma...@wikimedia.org kmis...@wikimedia.org nlaxst...@wikimedia.org sthottin...@wikimedia.org zfili...@wikimedia.org - Repository URL: UniversalLanguageSelector @@ -204,6 +204,13 @@ - MediaWiki user: Uls - MediaWiki password variable: MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG +## UniversalLanguageSelector-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_10 +- Browser Label: internet_explorer_10 +- bundle exec cucumber: --tags @commons.wikimedia.beta.wmflabs.org +- MediaWiki URL: commons.wikimedia.beta.wmflabs.org +- MediaWiki user: Uls +- MediaWiki password variable: MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG + ## UniversalLanguageSelector-en.wikipedia.beta.wmflabs.org-linux-firefox - bundle exec cucumber: --tags @en.wikipedia.beta.wmflabs.org - MediaWiki URL: en.wikipedia.beta.wmflabs.org -- To view, visit https://gerrit.wikimedia.org/r/113346 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f708c17adc730da2e31b6aeaab56182d5238930 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mathoidsvc-debian-glue - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113347
Change subject: mathoidsvc-debian-glue
..
mathoidsvc-debian-glue
For mediawiki/services/mathoid is being Debianized!
Change-Id: I170134b855dc86e861161d742cd8cb032df34724
---
M mediawiki-misc.yaml
1 file changed, 6 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/47/113347/1
diff --git a/mediawiki-misc.yaml b/mediawiki-misc.yaml
index 92baa02..a6dfe9f 100644
--- a/mediawiki-misc.yaml
+++ b/mediawiki-misc.yaml
@@ -16,6 +16,12 @@
- 'mediawiki-selenium-gembuild'
- project:
+# mediawiki/services/mathoid.git
+name: 'mathoidsvc'
+jobs:
+ - '{name}-debian-glue'
+
+- project:
name: 'mediawiki-vagrant'
jobs:
- '{name}-puppet-validate'
--
To view, visit https://gerrit.wikimedia.org/r/113347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I170134b855dc86e861161d742cd8cb032df34724
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mathoidsvc-debian-glue - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: mathoidsvc-debian-glue
..
mathoidsvc-debian-glue
For mediawiki/services/mathoid is being Debianized!
Change-Id: I170134b855dc86e861161d742cd8cb032df34724
---
M mediawiki-misc.yaml
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki-misc.yaml b/mediawiki-misc.yaml
index 92baa02..a6dfe9f 100644
--- a/mediawiki-misc.yaml
+++ b/mediawiki-misc.yaml
@@ -16,6 +16,12 @@
- 'mediawiki-selenium-gembuild'
- project:
+# mediawiki/services/mathoid.git
+name: 'mathoidsvc'
+jobs:
+ - '{name}-debian-glue'
+
+- project:
name: 'mediawiki-vagrant'
jobs:
- '{name}-puppet-validate'
--
To view, visit https://gerrit.wikimedia.org/r/113347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I170134b855dc86e861161d742cd8cb032df34724
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Trigger mathoidsvc-debian-glue - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/113348 Change subject: Trigger mathoidsvc-debian-glue .. Trigger mathoidsvc-debian-glue Change-Id: Ie4aa182940eca362c8cd94f17799b6936b0f65bc --- M layout.yaml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/48/113348/1 diff --git a/layout.yaml b/layout.yaml index 4209df5..9caab44 100644 --- a/layout.yaml +++ b/layout.yaml @@ -2152,6 +2152,10 @@ - name: extension-checks extname: ParserHooks + - name: mediawiki/services/mathoid +test: + - mathoidsvc-debian-glue + - name: mediawiki/services/parsoid check: - parsoidsvc-jslint -- To view, visit https://gerrit.wikimedia.org/r/113348 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4aa182940eca362c8cd94f17799b6936b0f65bc Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Trigger mathoidsvc-debian-glue - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Trigger mathoidsvc-debian-glue .. Trigger mathoidsvc-debian-glue Change-Id: Ie4aa182940eca362c8cd94f17799b6936b0f65bc --- M layout.yaml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 4209df5..9caab44 100644 --- a/layout.yaml +++ b/layout.yaml @@ -2152,6 +2152,10 @@ - name: extension-checks extname: ParserHooks + - name: mediawiki/services/mathoid +test: + - mathoidsvc-debian-glue + - name: mediawiki/services/parsoid check: - parsoidsvc-jslint -- To view, visit https://gerrit.wikimedia.org/r/113348 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie4aa182940eca362c8cd94f17799b6936b0f65bc Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...mathoid)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/113349 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: Iebdcf620d2b0fce37ee7aef113c68b718718dd2c --- A JENKINS A jenkins-testfile.py A jenkins.js A jenkins.php A jenkins.rb 5 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid refs/changes/49/113349/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php diff --git a/jenkins.rb b/jenkins.rb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.rb -- To view, visit https://gerrit.wikimedia.org/r/113349 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iebdcf620d2b0fce37ee7aef113c68b718718dd2c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mathoid Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move JsonDumpGenerator from lib to repo - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113350
Change subject: Move JsonDumpGenerator from lib to repo
..
Move JsonDumpGenerator from lib to repo
Change-Id: I428cde001a0934beeaa231b0315443dfd3f947de
---
R repo/includes/Dumpers/JsonDumpGenerator.php
R repo/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
2 files changed, 13 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/50/113350/1
diff --git a/lib/includes/Dumpers/JsonDumpGenerator.php
b/repo/includes/Dumpers/JsonDumpGenerator.php
similarity index 90%
rename from lib/includes/Dumpers/JsonDumpGenerator.php
rename to repo/includes/Dumpers/JsonDumpGenerator.php
index 8fc6539..8c50232 100644
--- a/lib/includes/Dumpers/JsonDumpGenerator.php
+++ b/repo/includes/Dumpers/JsonDumpGenerator.php
@@ -3,6 +3,7 @@
namespace Wikibase\Dumpers;
use ExceptionHandler;
+use InvalidArgumentException;
use MessageReporter;
use MWException;
use NullMessageReporter;
@@ -75,14 +76,14 @@
/**
* @param resource $out
-* @param \Wikibase\EntityLookup $lookup
+* @param EntityLookup $lookup
* @param Serializer $entitySerializer
*
-* @throws \InvalidArgumentException
+* @throws InvalidArgumentException
*/
public function __construct( $out, EntityLookup $lookup, Serializer
$entitySerializer ) {
if ( !is_resource( $out ) ) {
- throw new \InvalidArgumentException( '$out must be a
file handle!' );
+ throw new InvalidArgumentException( '$out must be a
file handle!' );
}
$this-out = $out;
@@ -126,14 +127,14 @@
}
/**
-* @param \ExceptionHandler $exceptionHandler
+* @param ExceptionHandler $exceptionHandler
*/
public function setExceptionHandler( ExceptionHandler $exceptionHandler
) {
$this-exceptionHandler = $exceptionHandler;
}
/**
-* @return \ExceptionHandler
+* @return ExceptionHandler
*/
public function getExceptionHandler() {
return $this-exceptionHandler;
@@ -148,19 +149,19 @@
* @param int $shardingFactor
* @param int $shard
*
-* @throws \InvalidArgumentException
+* @throws InvalidArgumentException
*/
public function setShardingFilter( $shardingFactor, $shard ) {
if ( !is_int( $shardingFactor ) || $shardingFactor 1 ) {
- throw new \InvalidArgumentException( '$shardingFactor
must be an integer 0' );
+ throw new InvalidArgumentException( '$shardingFactor
must be an integer 0' );
}
if ( !is_int( $shard ) || $shard 0 ) {
- throw new \InvalidArgumentException( '$shard must be an
integer = 0' );
+ throw new InvalidArgumentException( '$shard must be an
integer = 0' );
}
if ( $shard = $shardingFactor ) {
- throw new \InvalidArgumentException( '$shard must be
smaller than $shardingFactor' );
+ throw new InvalidArgumentException( '$shard must be
smaller than $shardingFactor' );
}
$this-shardingFactor = $shardingFactor;
@@ -172,7 +173,7 @@
*
* @param string|null $type The desired type (use null for any type).
*
-* @throws \InvalidArgumentException
+* @throws InvalidArgumentException
*/
public function setEntityTypeFilter( $type ) {
$this-entityType = $type;
@@ -256,7 +257,7 @@
* @param $data
*
* @return string
-* @throws \MWException
+* @throws MWException
*/
public function encode( $data ) {
$json = json_encode( $data, $this-jsonFlags );
diff --git a/lib/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
b/repo/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
similarity index 99%
rename from lib/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
rename to repo/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
index 6ab4d86..c09d84a 100644
--- a/lib/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
+++ b/repo/tests/phpunit/Dumpers/JsonDumpGeneratorTest.php
@@ -20,7 +20,7 @@
* @covers Wikibase\Dumpers\JsonDumpGenerator
*
* @group Wikibase
- * @group WikibaseLib
+ * @group WikibaseRepo
* @group JsonDump
*
* @license GPL 2+
--
To view, visit https://gerrit.wikimedia.org/r/113350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I428cde001a0934beeaa231b0315443dfd3f947de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner:
[MediaWiki-commits] [Gerrit] Remove white-space: normal override. - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove white-space: normal override.
..
Remove white-space: normal override.
Fixed in core in 955f31af361b06da89c758803f87c83447801f56
Change-Id: I70f1dfe9966646147cc2a2d3843a3ed9a231c655
---
M resources/ext.gettingstarted.return.css
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.gettingstarted.return.css
b/resources/ext.gettingstarted.return.css
index 8dd909b..dbe135c 100644
--- a/resources/ext.gettingstarted.return.css
+++ b/resources/ext.gettingstarted.return.css
@@ -96,7 +96,6 @@
margin-right: 20px;
margin-bottom: 0px;
margin-top: 15px;
- white-space: normal;
}
.mw-ui-button.mw-gettingstarted-cta-secondary:hover {
--
To view, visit https://gerrit.wikimedia.org/r/111262
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I70f1dfe9966646147cc2a2d3843a3ed9a231c655
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: Swalling swall...@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] Wait 60 seconds before killing the parsoid master - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Wait 60 seconds before killing the parsoid master .. Wait 60 seconds before killing the parsoid master Change-Id: I81444e5db5651be96c9bdfad4c554af19d54bf34 --- M files/misc/parsoid.upstart 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/files/misc/parsoid.upstart b/files/misc/parsoid.upstart index 0bf1ab3..ea4db42 100644 --- a/files/misc/parsoid.upstart +++ b/files/misc/parsoid.upstart @@ -28,6 +28,9 @@ respawn +# wait 60 seconds for a graceful restart before killing the master +kill timeout 60 + script if [ -f $DEFAULTFILE ] ; then . $DEFAULTFILE -- To view, visit https://gerrit.wikimedia.org/r/113316 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I81444e5db5651be96c9bdfad4c554af19d54bf34 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: GWicke gwi...@wikimedia.org Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: GWicke gwi...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwgrep: use a filtered boolean query - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113351
Change subject: mwgrep: use a filtered boolean query
..
mwgrep: use a filtered boolean query
Rather than use a query string query, use a filtered boolean query, per Nik's
recommendation.
Change-Id: I49406f7462cadce4b2c6ee9db04fa4c5b2c12c92
---
M files/misc/scripts/mwgrep
1 file changed, 14 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/51/113351/1
diff --git a/files/misc/scripts/mwgrep b/files/misc/scripts/mwgrep
index 6c5df13..e256cf0 100755
--- a/files/misc/scripts/mwgrep
+++ b/files/misc/scripts/mwgrep
@@ -9,30 +9,34 @@
import argparse
import json
-import urllib
import urllib2
BASE_URI = 'http://search.svc.eqiad.wmnet:9200/_all/page/_search'
-BASE_QUERY = text:{0} AND namespace:8 AND title:(js css)
ap = argparse.ArgumentParser(description='Grep for CSS/JS in MediaWiki: NS')
-ap.add_argument('term', type=BASE_QUERY.format, help='text to search for')
+ap.add_argument('term', help='text to search for')
ap.add_argument('--max-results', type=int, default=100)
args = ap.parse_args()
+filters = [
+{'term': {'namespace': '8'}},
+{'regexp': {'title.keyword': '.*\\.(js|css)'}},
+{'script': {'script': _source['text'].contains('%s') % args.term}},
+]
+
query = {
'size': args.max_results,
-'analyzer': 'keyword',
-'q': args.term,
+'fields': ['namespace', 'title'],
+'query': {'filtered': {'filter': {'bool': {'must': filters,
}
-req = urllib2.urlopen(BASE_URI + '?' + urllib.urlencode(query))
+req = urllib2.urlopen(BASE_URI, json.dumps(query))
result = json.load(req)['hits']
for hit in result['hits']:
-db_name = hit['_index'].split('_', 1)[0]
-title = hit['_source']['title']
-print db_name, title
+db = hit['_index'].split('_', 1)[0]
+title = hit['fields']['title']
+print('{:20}{}'.format(db, title))
-print '(total: %s, shown: %s)' % (result['total'], len(result['hits']))
+print('(total: %s, shown: %s)' % (result['total'], len(result['hits'])))
--
To view, visit https://gerrit.wikimedia.org/r/113351
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I49406f7462cadce4b2c6ee9db04fa4c5b2c12c92
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove openTask cookie on logout - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove openTask cookie on logout
..
Remove openTask cookie on logout
Also, remove setPageTask method, since we no longer need a server-side
method to assign tasks.
Bug: 54992
Change-Id: I00f25c191d7eafe0c7c78d35c42bbb62f250f33f
---
M GettingStarted.php
M Hooks.php
2 files changed, 25 insertions(+), 19 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GettingStarted.php b/GettingStarted.php
index 7295cfa..4cc9157 100644
--- a/GettingStarted.php
+++ b/GettingStarted.php
@@ -257,5 +257,6 @@
$wgHooks[ 'MakeGlobalVariablesScript' ][] =
'GettingStarted\Hooks::onMakeGlobalVariablesScript';
$wgHooks[ 'ResourceLoaderGetConfigVars' ][] =
'GettingStarted\Hooks::onResourceLoaderGetConfigVars';
$wgHooks[ 'GetPreferences' ][] = 'GettingStarted\Hooks::onGetPreferences';
+$wgHooks[ 'UserLogoutComplete'][] =
'GettingStarted\Hooks::onUserLogoutComplete';
// Extension:CentralAuth's hook
$wgHooks[ 'CentralAuthPostLoginRedirect' ][] =
'GettingStarted\Hooks::onCentralAuthPostLoginRedirect';
diff --git a/Hooks.php b/Hooks.php
index 2585d89..b8d4375 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -26,8 +26,13 @@
*/
protected static $openTask = null;
- // There is used unprefixed for legacy reasons.
+ // There is used unprefixed and with a custom path for legacy reasons.
const COOKIE_NAME = 'openTask';
+
+ protected static $COOKIE_OPTIONS = array(
+ 'prefix' = '',
+ 'path' = '/',
+ );
const INTRO_OPTION = 'gettingstarted-task-toolbar-show-intro';
@@ -113,24 +118,6 @@
}
return null;
- }
-
- /**
-* Sets a task for the title in the openTask structure, then sets the
cookie.
-* If applicable, this should already be prefixed (e.g.
'gettingstarted-addlinks', not 'addlinks').
-*
-* @param WebRequest $request current request
-* @param Title $title title to set
-* @param string $task task to set
-*/
- public static function setPageTask( WebRequest $request, Title $title,
$task ) {
- self::initializeOpenTask( $request );
-
- self::$openTask[$title-getPrefixedText()] = $task;
-
- // WebResponse-setcookie cannot set session cookies
- // This encoding will be decoded properly by jQuery.cookie (it
uses decodeURIComponent).
- setrawcookie( self::COOKIE_NAME, rawurlencode(
FormatJson::encode( self::$openTask ) ), 0, '/' );
}
/**
@@ -398,6 +385,24 @@
}
/**
+* Delete the user's openTask cookie.
+*
+* Called when user is on the 'You are now logged out.' page
+*
+* @param User $user user object of the now-anonymous user
+* @param string $inject_html reference that can be used to inject HTML
into logout page.
+* @param string $old_name name of user that just logged out
+*/
+ public static function onUserLogoutComplete( $user, $inject_html,
$old_name ) {
+ global $wgRequest;
+
+ // Set expiration time in the past to expire. Uses -1 day like
User.php.
+ $wgRequest-response()-setcookie( self::COOKIE_NAME, '',
time() - 86400, self::$COOKIE_OPTIONS );
+
+ return true;
+ }
+
+ /**
* When the CentralAuth extension has redirected away from the create
* account form, preventing the BeforeWelcomeCreation hook, it runs this
* hook. If user is not mobile, tweak the page returned to or its
--
To view, visit https://gerrit.wikimedia.org/r/113337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I00f25c191d7eafe0c7c78d35c42bbb62f250f33f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: Swalling swall...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add MediaWiki extension MathSearch - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add MediaWiki extension MathSearch .. Add MediaWiki extension MathSearch Change-Id: I4c420b70876e6bb672075de244baaa571d32b1d5 --- M mediawiki-extensions.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index 2acd764..ac9b7b0 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -383,6 +383,7 @@ - MarkAsHelpful - MassMessage - Math + - MathSearch - MobileFrontend - MoodBar - MultiMaps -- To view, visit https://gerrit.wikimedia.org/r/112935 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c420b70876e6bb672075de244baaa571d32b1d5 Gerrit-PatchSet: 2 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Physikerwelt w...@physikerwelt.de Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Triggers mw/ext/MathSearch - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/113352 Change subject: Triggers mw/ext/MathSearch .. Triggers mw/ext/MathSearch Change-Id: I4c420b70876e6bb672075de244baaa571d32b1d5 --- M layout.yaml 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/52/113352/1 diff --git a/layout.yaml b/layout.yaml index 9caab44..66a3e40 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1956,6 +1956,11 @@ postmerge: - beta-recompile-math-texvc + - name: mediawiki/extensions/MathSearch +template: + - name: extension-unittests +extname: MathSearch + - name: mediawiki/extensions/Maps template: - name: extension-checks -- To view, visit https://gerrit.wikimedia.org/r/113352 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c420b70876e6bb672075de244baaa571d32b1d5 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Triggers mw/ext/MathSearch - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Triggers mw/ext/MathSearch .. Triggers mw/ext/MathSearch Change-Id: I4c420b70876e6bb672075de244baaa571d32b1d5 --- M layout.yaml 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 9caab44..66a3e40 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1956,6 +1956,11 @@ postmerge: - beta-recompile-math-texvc + - name: mediawiki/extensions/MathSearch +template: + - name: extension-unittests +extname: MathSearch + - name: mediawiki/extensions/Maps template: - name: extension-checks -- To view, visit https://gerrit.wikimedia.org/r/113352 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c420b70876e6bb672075de244baaa571d32b1d5 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add shell account for santhosh, admins restricted + stats1002 - change (operations/puppet)
ArielGlenn has submitted this change and it was merged.
Change subject: Add shell account for santhosh, admins restricted + stats1002
..
Add shell account for santhosh, admins restricted + stats1002
RT #6760
labs user: santhosh
UID: 2024
real name: Santhosh Thottingal
requested/approved: Alolita, Greg
requested: accessing the events logging DB for ULS data
Change-Id: I906218e1a2d63d046d8219b0178681572eb1c1ec
---
M manifests/admins.pp
1 file changed, 23 insertions(+), 1 deletion(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/admins.pp b/manifests/admins.pp
index 35d52e4..1cf143a 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -3422,6 +3422,26 @@
}
}
+# RT 6760
+class santhosh inherits baseaccount {
+$username = 'santhosh'
+$realname = 'Santhosh Thottingal'
+$uid = 2024
+
+unixaccount { $realname: username = $username, uid = $uid, gid =
$gid }
+
+if $manage_home {
+Ssh_authorized_key { require = Unixaccount[$realname] }
+
+ssh_authorized_key { 'santhosh@thottingal':
+ensure = present,
+user = $username,
+type = 'ssh-rsa',
+key=
'B3NzaC1yc2EBIwAAAQEArK3LPgIbkKgXNG0l5g6vRND236f3Bm6h9kiweycy4l+J14B1hY0o1baG8FNxgSpRxhZ1xeqdZceSii5fDfNEx4SnUEImCruH3PedumYb5pn5FIlZHEHvMOmjVobkSqES+ZZ5JrYLk8Xc4+elDULF80ERAx/8k6hwMHPJiYJwv26652GyE1nqmBj5KRMxmrpnGenirjLl8fnfRgFX3EqTliGTKqZ0B7vBVLNC3kM++EwFhLpwfQaB6/Jt6fdgksyIx6vB2f3mPQOWKetHw8Iu4VeAYNgt/KzXzvWNnS9Z9Uw8Ushn21BX2Oe7h4iICly8RDsQbVoT2PKmqLpNVAcOZQ==',
+}
+}
+}
+
# FIXME: not an admin. This is more like a system account.
class l10nupdate inherits baseaccount {
$username = l10nupdate
@@ -3575,6 +3595,7 @@
include accounts::csalvia # RT 6664
include accounts::leila # RT 6765
include accounts::sahar # RT 6767
+ include accounts::santhosh # RT 6760
}
class admins::labs {
@@ -3635,7 +3656,8 @@
accounts::nuria,# RT 6617
accounts::csalvia, # RT 6664
accounts::leila,# RT 6765
- accounts::sahar # RT 6767
+ accounts::sahar,# RT 6767
+ accounts::santhosh # RT 6760
}
class admins::fr-tech {
--
To view, visit https://gerrit.wikimedia.org/r/112912
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I906218e1a2d63d046d8219b0178681572eb1c1ec
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@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] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...MathSearch)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/113353 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I4c420b70876e6bb672075de244baaa571d32b1d5 --- A JENKINS A jenkins-testfile.py A jenkins.js A jenkins.php A jenkins.rb 5 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch refs/changes/53/113353/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php diff --git a/jenkins.rb b/jenkins.rb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.rb -- To view, visit https://gerrit.wikimedia.org/r/113353 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c420b70876e6bb672075de244baaa571d32b1d5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MathSearch Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP Removed configuration of Sauce Labs browsers from the gem - change (mediawiki/selenium)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113354
Change subject: WIP Removed configuration of Sauce Labs browsers from the gem
..
WIP Removed configuration of Sauce Labs browsers from the gem
Also bumped patch version to 0.2.4 and releasing the new version of the
gem.
Bug: 61067
Change-Id: Id12c6dfc748abeef99120bcf2e7c8e679cd9a34c
---
M lib/mediawiki_selenium/support/env.rb
M lib/mediawiki_selenium/version.rb
2 files changed, 7 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium
refs/changes/54/113354/1
diff --git a/lib/mediawiki_selenium/support/env.rb
b/lib/mediawiki_selenium/support/env.rb
index 2bd50d8..a020026 100644
--- a/lib/mediawiki_selenium/support/env.rb
+++ b/lib/mediawiki_selenium/support/env.rb
@@ -75,59 +75,22 @@
)
end
def sauce_browser(test_name, language)
- browsers = {
-
-chrome =
- {name = chrome,
- platform = Linux,
- version = nil},
-
-firefox =
- {name = firefox,
- platform = Linux,
- version = 26},
-
-internet_explorer_6 =
- {name = internet_explorer,
- platform = Windows XP,
- version= 6},
-
-internet_explorer_7 =
- {name = internet_explorer,
- platform = Windows XP,
- version= 7},
-
-internet_explorer_8 =
- {name = internet_explorer,
- platform = Windows XP,
- version= 8},
-
-internet_explorer_9 =
- {name = internet_explorer,
- platform = Windows 7,
- version= 9},
-
-internet_explorer_10 =
- {name = internet_explorer,
- platform = Windows 8,
- version= 10}}
-
- browser_label = browsers[ENV[BROWSER_LABEL]]
+ abort Environment variables BROWSER, PLATFORM and VERSION have to be set
if (ENV[BROWSER] == nil) or (ENV[PLATFORM] == nil) or (ENV[VERSION] ==
nil)
if language == default
-caps =
Selenium::WebDriver::Remote::Capabilities.send(browser_label[name])
- elsif browser_label[name] == firefox
+caps = Selenium::WebDriver::Remote::Capabilities.send(ENV[BROWSER])
+ elsif ENV[BROWSER] == firefox
profile = Selenium::WebDriver::Firefox::Profile.new
profile[intl.accept_languages] = language
caps = Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_profile
= profile)
- elsif browser_label[name] == chrome
+ elsif ENV[BROWSER] == chrome
profile = Selenium::WebDriver::Chrome::Profile.new
profile[intl.accept_languages] = language
caps = Selenium::WebDriver::Remote::Capabilities.chrome(chrome.profile
= profile.as_json[zip])
end
- caps.platform = browser_label[platform]
- caps.version = browser_label[version]
+ caps.platform = ENV[PLATFORM]
+ caps.version = ENV[VERSION]
caps[:name] = #{test_name} #{ENV['JOB_NAME']}##{ENV['BUILD_NUMBER']}
require selenium/webdriver/remote/http/persistent # http_client
diff --git a/lib/mediawiki_selenium/version.rb
b/lib/mediawiki_selenium/version.rb
index 379453c..f0e7bab 100644
--- a/lib/mediawiki_selenium/version.rb
+++ b/lib/mediawiki_selenium/version.rb
@@ -10,5 +10,5 @@
=end
module MediawikiSelenium
- VERSION = 0.2.3
+ VERSION = 0.2.4
end
--
To view, visit https://gerrit.wikimedia.org/r/113354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id12c6dfc748abeef99120bcf2e7c8e679cd9a34c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: 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] move SqlEntityInfoBuilder to repo - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/113355 Change subject: move SqlEntityInfoBuilder to repo .. move SqlEntityInfoBuilder to repo not needed nor used by client Change-Id: I20f3752591cfd2d6729cf92c388a27a989d0130f --- R repo/includes/store/sql/SqlEntityInfoBuilder.php R repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php 2 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/55/113355/1 diff --git a/lib/includes/store/sql/SqlEntityInfoBuilder.php b/repo/includes/store/sql/SqlEntityInfoBuilder.php similarity index 100% rename from lib/includes/store/sql/SqlEntityInfoBuilder.php rename to repo/includes/store/sql/SqlEntityInfoBuilder.php diff --git a/lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php b/repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php similarity index 100% rename from lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php rename to repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php -- To view, visit https://gerrit.wikimedia.org/r/113355 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I20f3752591cfd2d6729cf92c388a27a989d0130f 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] move SqlEntityInfoBuilder to repo - change (mediawiki...Wikibase)
Addshore has submitted this change and it was merged. Change subject: move SqlEntityInfoBuilder to repo .. move SqlEntityInfoBuilder to repo not needed nor used by client Change-Id: I20f3752591cfd2d6729cf92c388a27a989d0130f --- R repo/includes/store/sql/SqlEntityInfoBuilder.php R repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php 2 files changed, 0 insertions(+), 0 deletions(-) Approvals: WikidataJenkins: Verified Addshore: Looks good to me, approved diff --git a/lib/includes/store/sql/SqlEntityInfoBuilder.php b/repo/includes/store/sql/SqlEntityInfoBuilder.php similarity index 100% rename from lib/includes/store/sql/SqlEntityInfoBuilder.php rename to repo/includes/store/sql/SqlEntityInfoBuilder.php diff --git a/lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php b/repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php similarity index 100% rename from lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php rename to repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php -- To view, visit https://gerrit.wikimedia.org/r/113355 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I20f3752591cfd2d6729cf92c388a27a989d0130f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: Addshore addshorew...@gmail.com Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Stop trying to return a void value... - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113356
Change subject: Stop trying to return a void value...
..
Stop trying to return a void value...
Change-Id: Ie8776914b9e740de3d6b61c7cd933791f522a626
---
M repo/includes/specials/SpecialMyLanguageFallbackChain.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/56/113356/1
diff --git a/repo/includes/specials/SpecialMyLanguageFallbackChain.php
b/repo/includes/specials/SpecialMyLanguageFallbackChain.php
index bba1d2d..701dcb0 100644
--- a/repo/includes/specials/SpecialMyLanguageFallbackChain.php
+++ b/repo/includes/specials/SpecialMyLanguageFallbackChain.php
@@ -58,7 +58,7 @@
*/
public function setContext( $context ) {
$this-chain = null;
- return parent::setContext( $context );
+ parent::setContext( $context );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/113356
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8776914b9e740de3d6b61c7cd933791f522a626
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adds inprop=preload support - change (mediawiki...ProofreadPage)
jenkins-bot has submitted this change and it was merged.
Change subject: Adds inprop=preload support
..
Adds inprop=preload support
Bug 58963
Change-Id: Ic68d9be120d23386cb0e95849a850ae6eada0e64
---
M ProofreadPage.body.php
M ProofreadPage.php
2 files changed, 21 insertions(+), 0 deletions(-)
Approvals:
Phe: Looks good to me, but someone else must approve
Tpt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 7d2fe80..46fca8e 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -20,6 +20,7 @@
*/
use ProofreadPage\Context;
+use ProofreadPage\Page\PageContentBuilder;
/*
@todo :
@@ -721,6 +722,25 @@
}
/**
+* Provides text for preload API
+*
+* @param string $text
+* @param Title $title
+* @return bool
+*/
+ public static function onEditFormPreloadText( $text, Title $title ) {
+ if ( !$title-inNamespace( self::getPageNamespaceId() ) ) {
+ return true;
+ }
+
+ $pageContentBuilder = new PageContentBuilder(
RequestContext::getMain(), Context::getDefaultContext() );
+ $content = $pageContentBuilder-buildDefaultContentForPage( new
ProofreadPagePage( $title ) );
+ $text = $content-serialize();
+
+ return true;
+ }
+
+ /**
* Add ProofreadPage preferences to the preferences menu
* @param $user
* @param $preferences array
diff --git a/ProofreadPage.php b/ProofreadPage.php
index 6d599c9..9434478 100644
--- a/ProofreadPage.php
+++ b/ProofreadPage.php
@@ -192,6 +192,7 @@
$wgHooks['SkinTemplateNavigation'][] =
'ProofreadPage::onSkinTemplateNavigation';
$wgHooks['ContentHandlerDefaultModelFor'][] =
'ProofreadPage::onContentHandlerDefaultModelFor';
$wgHooks['APIEditBeforeSave'][] = 'ProofreadPage::onAPIEditBeforeSave';
+$wgHooks['EditFormPreloadText'][] = 'ProofreadPage::onEditFormPreloadText';
/**
--
To view, visit https://gerrit.wikimedia.org/r/113166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic68d9be120d23386cb0e95849a850ae6eada0e64
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt thoma...@hotmail.fr
Gerrit-Reviewer: Phe phil...@free.fr
Gerrit-Reviewer: Rtdwivedi ellydwivedi2...@gmail.com
Gerrit-Reviewer: Tpt thoma...@hotmail.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Performance of mediawiki.searchSuggest.js - change (mediawiki/core)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113357
Change subject: Performance of mediawiki.searchSuggest.js
..
Performance of mediawiki.searchSuggest.js
Two tiny performance improvements.
The complexity of a regular expression is not needed to check if a
string contains a character. string.match() returns an array of
matches which is not used anyway in this case. Either
string.indexOf() or RegExp.test() should be used.
Duplicate jQuery call merged.
Change-Id: Ifec79eada70181df0d56c583ef832ee82594620e
---
M resources/mediawiki/mediawiki.searchSuggest.js
1 file changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/57/113357/1
diff --git a/resources/mediawiki/mediawiki.searchSuggest.js
b/resources/mediawiki/mediawiki.searchSuggest.js
index 3b360af..8d950a0 100644
--- a/resources/mediawiki/mediawiki.searchSuggest.js
+++ b/resources/mediawiki/mediawiki.searchSuggest.js
@@ -32,13 +32,13 @@
// Compute form data for search suggestions functionality.
function computeResultRenderCache( context ) {
- var $form, formAction, baseHref, linkParams;
+ var $form, baseHref, linkParams;
// Compute common parameters for links' hrefs
$form = context.config.$region.closest( 'form' );
- formAction = $form.attr( 'action' );
- baseHref = formAction + ( formAction.match( /\?/ ) ?
'' : '?' );
+ baseHref = $form.attr( 'action' );
+ baseHref += baseHref.indexOf( '?' ) -1 ? '' : '?';
linkParams = {};
$.each( $form.serializeArray(), function ( idx, obj ) {
@@ -185,10 +185,9 @@
special: {
render: specialRenderFunction,
select: function ( $input ) {
- $input.closest( 'form' ).append(
- $( 'input type=hidden
name=fulltext value=1/' )
- );
- $input.closest( 'form' ).submit();
+ $input.closest( 'form' )
+ .append( $( 'input
type=hidden name=fulltext value=1/' ) )
+ .submit();
}
},
$region: $searchRegion
--
To view, visit https://gerrit.wikimedia.org/r/113357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifec79eada70181df0d56c583ef832ee82594620e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] MathSearch requires MySQL - change (mediawiki...MathSearch)
Physikerwelt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113358
Change subject: MathSearch requires MySQL
..
MathSearch requires MySQL
The MathSearch extension is designed to with mysql only.
Change-Id: I399541fab500b3429d45a9d9761e98e424d4c1e7
---
M MathSearch.hooks.php
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch
refs/changes/58/113358/1
diff --git a/MathSearch.hooks.php b/MathSearch.hooks.php
index 5f37745..f25b7a0 100644
--- a/MathSearch.hooks.php
+++ b/MathSearch.hooks.php
@@ -26,16 +26,16 @@
// // 'mssql' = 'math.mssql.sql',
// // 'db2' = 'math.db2.sql',
// );
-// $type = $updater-getDB()-getType();
-// if ( isset( $map[$type] ) ) {
+ $type = $updater-getDB()-getType();
+ if ( $type == mysql ) {
$dir = dirname( __FILE__ ) . '/db/' ;// . $map[$type];
$updater-addExtensionTable( 'mathindex', $dir .
'mathsearch.sql' );
$updater-addExtensionTable( 'mathobservation', $dir .
'mathobservation.sql' );
$updater-addExtensionTable( 'mathvarstat', $dir .
'mathvarstat.sql' );
$updater-addExtensionTable( 'mathpagestat', $dir .
'mathpagestat.sql' );
-// } else {
-// throw new MWException( Math extension does not
currently support $type database. );
-// }
+ } else {
+ throw new MWException( Math extension does not
currently support $type database. );
+ }
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/113358
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I399541fab500b3429d45a9d9761e98e424d4c1e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Performance of mediawiki.searchSuggest.js - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Performance of mediawiki.searchSuggest.js
..
Performance of mediawiki.searchSuggest.js
Two tiny performance improvements.
The complexity of a regular expression is not needed to check if a
string contains a character. string.match() returns an array of
matches which is not used anyway in this case. Either
string.indexOf() or RegExp.test() should be used.
Duplicate jQuery call merged.
Change-Id: Ifec79eada70181df0d56c583ef832ee82594620e
---
M resources/mediawiki/mediawiki.searchSuggest.js
1 file changed, 6 insertions(+), 7 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mediawiki/mediawiki.searchSuggest.js
b/resources/mediawiki/mediawiki.searchSuggest.js
index 3b360af..8d950a0 100644
--- a/resources/mediawiki/mediawiki.searchSuggest.js
+++ b/resources/mediawiki/mediawiki.searchSuggest.js
@@ -32,13 +32,13 @@
// Compute form data for search suggestions functionality.
function computeResultRenderCache( context ) {
- var $form, formAction, baseHref, linkParams;
+ var $form, baseHref, linkParams;
// Compute common parameters for links' hrefs
$form = context.config.$region.closest( 'form' );
- formAction = $form.attr( 'action' );
- baseHref = formAction + ( formAction.match( /\?/ ) ?
'' : '?' );
+ baseHref = $form.attr( 'action' );
+ baseHref += baseHref.indexOf( '?' ) -1 ? '' : '?';
linkParams = {};
$.each( $form.serializeArray(), function ( idx, obj ) {
@@ -185,10 +185,9 @@
special: {
render: specialRenderFunction,
select: function ( $input ) {
- $input.closest( 'form' ).append(
- $( 'input type=hidden
name=fulltext value=1/' )
- );
- $input.closest( 'form' ).submit();
+ $input.closest( 'form' )
+ .append( $( 'input
type=hidden name=fulltext value=1/' ) )
+ .submit();
}
},
$region: $searchRegion
--
To view, visit https://gerrit.wikimedia.org/r/113357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifec79eada70181df0d56c583ef832ee82594620e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
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] MathSearch requires MySQL - change (mediawiki...MathSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: MathSearch requires MySQL
..
MathSearch requires MySQL
The MathSearch extension is designed to with mysql only.
Change-Id: I399541fab500b3429d45a9d9761e98e424d4c1e7
---
M MathSearch.hooks.php
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Physikerwelt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MathSearch.hooks.php b/MathSearch.hooks.php
index 5f37745..fb3b6c2 100644
--- a/MathSearch.hooks.php
+++ b/MathSearch.hooks.php
@@ -26,16 +26,16 @@
// // 'mssql' = 'math.mssql.sql',
// // 'db2' = 'math.db2.sql',
// );
-// $type = $updater-getDB()-getType();
-// if ( isset( $map[$type] ) ) {
+ $type = $updater-getDB()-getType();
+ if ( $type == mysql ) {
$dir = dirname( __FILE__ ) . '/db/' ;// . $map[$type];
$updater-addExtensionTable( 'mathindex', $dir .
'mathsearch.sql' );
$updater-addExtensionTable( 'mathobservation', $dir .
'mathobservation.sql' );
$updater-addExtensionTable( 'mathvarstat', $dir .
'mathvarstat.sql' );
$updater-addExtensionTable( 'mathpagestat', $dir .
'mathpagestat.sql' );
-// } else {
-// throw new MWException( Math extension does not
currently support $type database. );
-// }
+ } else {
+ //throw new MWException( Math extension does not
currently support $type database. );
+ }
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/113358
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I399541fab500b3429d45a9d9761e98e424d4c1e7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Delete MWS submodule - change (mediawiki...MathSearch)
Physikerwelt has uploaded a new change for review. https://gerrit.wikimedia.org/r/113359 Change subject: Delete MWS submodule .. Delete MWS submodule The MathWeb Search server is a service that should be installed on its own including is as submodule is a bad system design. A debian package would be much more appropriate. Change-Id: Iad9860c0d061461fee48dea8af1b878e75e42e68 --- D .gitmodules D mws 2 files changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch refs/changes/59/113359/1 diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 58eab46..000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule mws] - path = mws - url = https://github.com/physikerwelt/mws diff --git a/mws b/mws deleted file mode 16 index b1d6d1d..000 --- a/mws +++ /dev/null -Subproject commit b1d6d1d5297ec6c99c1de6074cdb9722c14a2713 -- To view, visit https://gerrit.wikimedia.org/r/113359 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad9860c0d061461fee48dea8af1b878e75e42e68 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MathSearch Gerrit-Branch: master Gerrit-Owner: Physikerwelt w...@physikerwelt.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] s6 pool db1030 depool db1010 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/113360 Change subject: s6 pool db1030 depool db1010 .. s6 pool db1030 depool db1010 Change-Id: I326f4c2a41a6375c2fbbfc0ca2540b24641a6769 --- M wmf-config/db-eqiad.php 1 file changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/60/113360/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 205c5d1..82de5a0 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -128,7 +128,8 @@ 's6' = array( 'db1023' = 0, 'db1022' = 0, # snapshot, vslow, dump - 'db1010' = 0, # watchlist, recentchangeslinked, contributions, logpager + # rebuild 'db1010' = 0, # watchlist, recentchangeslinked, contributions, logpager + 'db1030' = 0, # watchlist, recentchangeslinked, contributions, logpager 'db1015' = 400, 'db1006' = 400, ), @@ -242,16 +243,16 @@ 'db1022' = 1, ), 'watchlist' = array( - 'db1010' = 1, + 'db1030' = 1, ), 'recentchangeslinked' = array( - 'db1010' = 1, + 'db1030' = 1, ), 'contributions' = array( - 'db1010' = 1, + 'db1030' = 1, ), 'logpager' = array( - 'db1010' = 1, + 'db1030' = 1, ), ), 's7' = array( @@ -360,6 +361,7 @@ 'db1026' = '10.64.16.15', #do not remove or comment out 'db1027' = '10.64.16.16', #do not remove or comment out 'db1028' = '10.64.16.17', #do not remove or comment out + 'db1030' = '10.64.16.19', #do not remove or comment out 'db1033' = '10.64.16.22', #do not remove or comment out 'db1034' = '10.64.16.23', #do not remove or comment out 'db1035' = '10.64.16.24', #do not remove or comment out -- To view, visit https://gerrit.wikimedia.org/r/113360 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I326f4c2a41a6375c2fbbfc0ca2540b24641a6769 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Delete MWS submodule - change (mediawiki...MathSearch)
Physikerwelt has submitted this change and it was merged. Change subject: Delete MWS submodule .. Delete MWS submodule The MathWeb Search server is a service that should be installed on its own including is as submodule is a bad system design. A debian package would be much more appropriate. Change-Id: Iad9860c0d061461fee48dea8af1b878e75e42e68 --- D .gitmodules D mws 2 files changed, 0 insertions(+), 3 deletions(-) Approvals: Physikerwelt: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 58eab46..000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule mws] - path = mws - url = https://github.com/physikerwelt/mws diff --git a/mws b/mws deleted file mode 16 index b1d6d1d..000 --- a/mws +++ /dev/null -Subproject commit b1d6d1d5297ec6c99c1de6074cdb9722c14a2713 -- To view, visit https://gerrit.wikimedia.org/r/113359 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad9860c0d061461fee48dea8af1b878e75e42e68 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MathSearch Gerrit-Branch: master Gerrit-Owner: Physikerwelt w...@physikerwelt.de Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] s6 pool db1030 depool db1010 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: s6 pool db1030 depool db1010 .. s6 pool db1030 depool db1010 Change-Id: I326f4c2a41a6375c2fbbfc0ca2540b24641a6769 --- M wmf-config/db-eqiad.php 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 205c5d1..82de5a0 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -128,7 +128,8 @@ 's6' = array( 'db1023' = 0, 'db1022' = 0, # snapshot, vslow, dump - 'db1010' = 0, # watchlist, recentchangeslinked, contributions, logpager + # rebuild 'db1010' = 0, # watchlist, recentchangeslinked, contributions, logpager + 'db1030' = 0, # watchlist, recentchangeslinked, contributions, logpager 'db1015' = 400, 'db1006' = 400, ), @@ -242,16 +243,16 @@ 'db1022' = 1, ), 'watchlist' = array( - 'db1010' = 1, + 'db1030' = 1, ), 'recentchangeslinked' = array( - 'db1010' = 1, + 'db1030' = 1, ), 'contributions' = array( - 'db1010' = 1, + 'db1030' = 1, ), 'logpager' = array( - 'db1010' = 1, + 'db1030' = 1, ), ), 's7' = array( @@ -360,6 +361,7 @@ 'db1026' = '10.64.16.15', #do not remove or comment out 'db1027' = '10.64.16.16', #do not remove or comment out 'db1028' = '10.64.16.17', #do not remove or comment out + 'db1030' = '10.64.16.19', #do not remove or comment out 'db1033' = '10.64.16.22', #do not remove or comment out 'db1034' = '10.64.16.23', #do not remove or comment out 'db1035' = '10.64.16.24', #do not remove or comment out -- To view, visit https://gerrit.wikimedia.org/r/113360 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I326f4c2a41a6375c2fbbfc0ca2540b24641a6769 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@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] s1 repool db1056 warm up - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/113361 Change subject: s1 repool db1056 warm up .. s1 repool db1056 warm up Change-Id: Ibaff9d4edc1c61cb7f11b42b4691d6d4cbf2ecfe --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/61/113361/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 82de5a0..967b1d6 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -93,7 +93,7 @@ 'db1037' = 300, # 1.4TB sas 64GB 'db1049' = 300, # 2.8TB sas 64GB 'db1051' = 400, # 2.8TB sas 96GB - # bug 61319 'db1056' = 400, # 2.8TB sas 96GB + 'db1056' = 50, # 2.8TB sas 96GB, warm up ), 's2' = array( 'db1024' = 0, -- To view, visit https://gerrit.wikimedia.org/r/113361 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibaff9d4edc1c61cb7f11b42b4691d6d4cbf2ecfe Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] s1 repool db1056 warm up - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: s1 repool db1056 warm up .. s1 repool db1056 warm up Change-Id: Ibaff9d4edc1c61cb7f11b42b4691d6d4cbf2ecfe --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 82de5a0..967b1d6 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -93,7 +93,7 @@ 'db1037' = 300, # 1.4TB sas 64GB 'db1049' = 300, # 2.8TB sas 64GB 'db1051' = 400, # 2.8TB sas 96GB - # bug 61319 'db1056' = 400, # 2.8TB sas 96GB + 'db1056' = 50, # 2.8TB sas 96GB, warm up ), 's2' = array( 'db1024' = 0, -- To view, visit https://gerrit.wikimedia.org/r/113361 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibaff9d4edc1c61cb7f11b42b4691d6d4cbf2ecfe Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@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] Moved Release notes for Ia0dc5895 - change (mediawiki/core)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/113362 Change subject: Moved Release notes for Ia0dc5895 .. Moved Release notes for Ia0dc5895 Was filled under configuration, but new features is better. Change-Id: I63f13700f9e7a7082ff3586aa03ecdb47937eaee --- M RELEASE-NOTES-1.23 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/62/113362/1 diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index ccde5cc..b16276b 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -34,8 +34,6 @@ * The 'max threads' setting was removed from $wgDBservers. * Support for AdminSettings.php has been completely removed. All configuration belongs in LocalSettings.php. -* Special:ProtectedPages shows now a table. The timestamp, the reason and - the protecting user is also shown. === New features in 1.23 === * ResourceLoader can utilize the Web Storage API to cache modules client-side. @@ -92,6 +90,8 @@ multiple sites. * Added jquery.throttle-debounce ResourceLoader module to limit the number of callbacks for frequently occurring events. +* Special:ProtectedPages shows now a table. The timestamp, the reason and + the protecting user is also shown. === Bug fixes in 1.23 === * (bug 41759) The updated since last visit markers (on history pages, recent -- To view, visit https://gerrit.wikimedia.org/r/113362 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I63f13700f9e7a7082ff3586aa03ecdb47937eaee Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] s1 db1056 full steam - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/113363 Change subject: s1 db1056 full steam .. s1 db1056 full steam Change-Id: I80a85895fedb0baaca960d3cf6c7e810a44ea865 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/63/113363/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 967b1d6..e5faf5b 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -93,7 +93,7 @@ 'db1037' = 300, # 1.4TB sas 64GB 'db1049' = 300, # 2.8TB sas 64GB 'db1051' = 400, # 2.8TB sas 96GB - 'db1056' = 50, # 2.8TB sas 96GB, warm up + 'db1056' = 400, # 2.8TB sas 96GB ), 's2' = array( 'db1024' = 0, -- To view, visit https://gerrit.wikimedia.org/r/113363 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I80a85895fedb0baaca960d3cf6c7e810a44ea865 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] s1 db1056 full steam - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: s1 db1056 full steam .. s1 db1056 full steam Change-Id: I80a85895fedb0baaca960d3cf6c7e810a44ea865 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 967b1d6..e5faf5b 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -93,7 +93,7 @@ 'db1037' = 300, # 1.4TB sas 64GB 'db1049' = 300, # 2.8TB sas 64GB 'db1051' = 400, # 2.8TB sas 96GB - 'db1056' = 50, # 2.8TB sas 96GB, warm up + 'db1056' = 400, # 2.8TB sas 96GB ), 's2' = array( 'db1024' = 0, -- To view, visit https://gerrit.wikimedia.org/r/113363 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I80a85895fedb0baaca960d3cf6c7e810a44ea865 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@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] [4.4] Upgrade InlineHistory extension - change (wikimedia...modifications)
Dzahn has submitted this change and it was merged.
Change subject: [4.4] Upgrade InlineHistory extension
..
[4.4] Upgrade InlineHistory extension
DO NOT COMMIT until Bugzilla has been upgraded to 4.4.
Upgrade InlineHistory extension to make it work with 4.4.
It's slightly messy upstream, for the records:
https://bugzilla.mozilla.org/show_bug.cgi?id=935513
Change-Id: If0a1c4f13f59eb34c23587c85d4e5eda9fd7dc09
---
M extensions/InlineHistory/Extension.pm
M
extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl
2 files changed, 15 insertions(+), 10 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/extensions/InlineHistory/Extension.pm
b/extensions/InlineHistory/Extension.pm
index 60050e0..9089790 100644
--- a/extensions/InlineHistory/Extension.pm
+++ b/extensions/InlineHistory/Extension.pm
@@ -34,7 +34,9 @@
my $bug_id = $bug-id;
# build bug activity
-my ($activity) = Bugzilla::Bug::GetBugActivity($bug_id);
+ my ($activity) = $bug-can('get_activity')
+? $bug-get_activity()
+: Bugzilla::Bug::GetBugActivity($bug_id);
$activity = _add_duplicates($bug_id, $activity);
if (scalar @$activity MAXIMUM_ACTIVITY_COUNT) {
diff --git
a/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl
b/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl
index 1c47fd2..ceb0929 100644
---
a/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl
+++
b/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl
@@ -25,14 +25,17 @@
[% FOREACH change = operation.changes %]
[%# track flag changes %]
[% IF change.fieldname == 'flagtypes.name' change.added != '' %]
-var item = new Array(5);
-item[0] = '[% changer_login FILTER js %]';
-item[1] = '[% change_date FILTER js %]';
-item[2] = '[% change.attachid FILTER js %]';
-item[3] = '[% change.added FILTER js %]';
-item[4] = '[% changer_identity FILTER js %]';
-ih_activity_flags.push(item);
-[% has_flag = 1 %]
+[% new_flags = change.added.split('[ ,]+') %]
+[% FOREACH new_flag IN new_flags %]
+ var item = new Array(5);
+ item[0] = '[% changer_login FILTER js %]';
+ item[1] = '[% change_date FILTER js %]';
+ item[2] = '[% change.attachid FILTER js %]';
+ item[3] = '[% change.added FILTER js %]';
+ item[4] = '[% changer_identity FILTER js %]';
+ ih_activity_flags.push(item);
+ [% has_flag = 1 %]
+[% END %]
[% END %]
[%# wrap CC changes in a span for toggling visibility %]
@@ -138,7 +141,7 @@
[%~%]a href=[% see_also FILTER html FILTER js %] target=_blank
[%~%][% see_also FILTER html FILTER js %]/a
[%- , IF NOT loop.last %]
-[% END %]
+[% END -%]
[% ELSIF change.fieldname == 'assigned_to' ||
change.fieldname == 'reporter' ||
change.fieldname == 'qa_contact' ||
--
To view, visit https://gerrit.wikimedia.org/r/97994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If0a1c4f13f59eb34c23587c85d4e5eda9fd7dc09
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Show 'Indexing by robots' status correct on action=info - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113364
Change subject: Show 'Indexing by robots' status correct on action=info
..
Show 'Indexing by robots' status correct on action=info
When $wgNamespaceRobotPolicies contains a noindex for a namespace and
the page contains __INDEX__, the index status on action=info was
Disallowed, but that is wrong, because the page is indexed.
Fixed this by parsing the 'index' to robot policy logic.
Change-Id: Ib77c3e73968cdc72f657e50371a2372564a1c618
---
M includes/actions/InfoAction.php
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/64/113364/1
diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index 918fc9e..63f3151 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -289,6 +289,9 @@
if ( isset( $pageProperties['noindex'] ) ) {
$pOutput-setIndexPolicy( 'noindex' );
}
+ if ( isset( $pageProperties['index'] ) ) {
+ $pOutput-setIndexPolicy( 'index' );
+ }
// Use robot policy logic
$policy = $this-page-getRobotPolicy( 'view', $pOutput );
--
To view, visit https://gerrit.wikimedia.org/r/113364
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib77c3e73968cdc72f657e50371a2372564a1c618
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [4.4] Upgrade two template files and reapply our custom changes - change (wikimedia...modifications)
Dzahn has submitted this change and it was merged.
Change subject: [4.4] Upgrade two template files and reapply our custom changes
..
[4.4] Upgrade two template files and reapply our custom changes
DO NOT COMMIT until Bugzilla has been upgraded to 4.4.
Also kill loading Dusk. It was loaded as alternative CSS in
4.2 but was enabled by default in 4.4 due to custom code and
http://bzr.mozilla.org/bugzilla/trunk/revision/8553 .
It has always looked ugly when explicitly enabling it.
Change-Id: If24dee5f6c69c6fc374370db2ec2a49162335ab2
---
M template/en/custom/global/header.html.tmpl
M template/en/custom/global/variables.none.tmpl
2 files changed, 8 insertions(+), 31 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/template/en/custom/global/header.html.tmpl
b/template/en/custom/global/header.html.tmpl
index cd2ea8f..6bc0448 100644
--- a/template/en/custom/global/header.html.tmpl
+++ b/template/en/custom/global/header.html.tmpl
@@ -111,12 +111,8 @@
[% SET yui = yui_resolve_deps(yui, yui_deps) %]
[% SET css_sets = css_files(style_urls, yui, yui_css) %]
-[%# CSS cascade, part 1: Standard Bugzilla stylesheet set (persistent).
- # Always present.
- #%]
-[%# This allows people to switch back to the Classic skin if they
- # are in another skin.
- #%]
+[%# CSS cascade, parts 1 2: YUI Standard Bugzilla stylesheet set
(persistent).
+ # Always present. %]
link href=[% 'skins/standard/global.css' FILTER mtime FILTER html %]
rel=alternate stylesheet
title=[% setting_descs.standard FILTER html %]
@@ -124,26 +120,17 @@
[% PROCESS format_css_link css_set_name = 'standard' %]
[% END %]
-[%# CSS cascade, part 2 3: Third-party stylesheet set (selected and
- # selectable). All third-party skins are present as alternate
- # stylesheets, even if they are not currently in use.
- #%]
+[%# CSS cascade, part 3: Third-party stylesheet set, per user prefs. %]
[% FOREACH style_url = css_sets.skin %]
[% PROCESS format_css_link css_set_name = user.settings.skin.value %]
[% END %]
-[% FOREACH alternate_skin = css_sets.alternate.keys %]
- [% FOREACH style_url = css_sets.alternate.$alternate_skin %]
-[% PROCESS format_css_link css_set_name = alternate_skin %]
- [% END %]
-[% END %]
[% IF user.settings.skin.value=='Wikimedia' %]
link rel=stylesheet href=skins/contrib/Wikimedia/vector.css
media=screen /
[% END %]
-[%# CSS cascade, part 4: page-specific styles.
- #%]
+[%# CSS cascade, part 4: page-specific styles. %]
[% IF style %]
style type=text/css
[% style %]
@@ -334,7 +321,7 @@
[% END %]
[% IF message %]
-div id=message[% message %]/div
+ div id=message[% message %]/div
[% END %]
[% BLOCK format_css_link %]
@@ -346,26 +333,15 @@
#%]
[% END %]
- [% IF css_set_name == 'standard'
- OR css_set_name == user.settings.skin.value
- %]
-[% SET css_rel = 'stylesheet' %]
-[% SET css_set_display_name = setting_descs.${user.settings.skin.value}
- || user.settings.skin.value %]
- [% ELSE %]
-[% SET css_rel = 'alternate stylesheet' %]
-[% SET css_set_display_name = setting_descs.$css_set_name || css_set_name
%]
- [% END %]
-
[% IF css_set_name == 'standard' %]
[% SET css_title_link = '' %]
[% ELSE %]
[% css_title_link = BLOCK ~%]
- title=[% css_set_display_name FILTER html %]
+ title=[% setting_descs.${user.settings.skin.value} ||
user.settings.skin.value FILTER html %]
[% END %]
[% END %]
- link href=[% style_url FILTER html %] rel=[% css_rel FILTER none %]
+ link href=[% style_url FILTER html %] rel=stylesheet
type=text/css [% css_title_link FILTER none %]
[% '![endif]--' IF style_url.match('/IE-fixes\.css') %]
diff --git a/template/en/custom/global/variables.none.tmpl
b/template/en/custom/global/variables.none.tmpl
index c61fb59..8b25bac 100644
--- a/template/en/custom/global/variables.none.tmpl
+++ b/template/en/custom/global/variables.none.tmpl
@@ -41,4 +41,5 @@
}
%]
+[% USE Hook %]
[% Hook.process(end) %]
--
To view, visit https://gerrit.wikimedia.org/r/98005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If24dee5f6c69c6fc374370db2ec2a49162335ab2
Gerrit-PatchSet: 6
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [4.4] Upgrade Login/Email address string to use upstream... - change (wikimedia...modifications)
Dzahn has submitted this change and it was merged.
Change subject: [4.4] Upgrade Login/Email address string to use upstream
code
..
[4.4] Upgrade Login/Email address string to use upstream code
DO NOT COMMIT until Bugzilla has been upgraded to 4.4.
Kill our custom hack to display Email address instead of
the confusing login. This is a backport of 4.5 code in
http://bzr.mozilla.org/bugzilla/trunk/revision/8686
Change-Id: Ida6429cc3d7c38265a200573a5aaebf093464417
---
M template/en/custom/account/auth/login.html.tmpl
1 file changed, 18 insertions(+), 2 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/template/en/custom/account/auth/login.html.tmpl
b/template/en/custom/account/auth/login.html.tmpl
index 1bc815f..bd100cc 100644
--- a/template/en/custom/account/auth/login.html.tmpl
+++ b/template/en/custom/account/auth/login.html.tmpl
@@ -37,14 +37,22 @@
[% USE Bugzilla %]
p
- I need a legitimate login and password to continue.
+ [% terms.Bugzilla %] needs a legitimate login and password to continue.
/p
form name=login action=[% target FILTER html %] method=POST
[%- IF Bugzilla.cgi.param(data) %] enctype=multipart/form-data[% END %]
table
tr
- th align=rightlabel for=Bugzilla_loginEmail address:/label/th
+ th
+label for=Bugzilla_login
+ [% IF Param('emailsuffix') %]
+Login:
+ [% ELSE %]
+Your Email Address:
+ [% END %]
+/label
+ /th
td
input size=35 id=Bugzilla_login name=Bugzilla_login
[% Param('emailsuffix') FILTER html %]
@@ -103,6 +111,14 @@
p
If you don't have a [% terms.Bugzilla %] account, you can
a href=createaccount.cgicreate a new account/a.
+ [% IF Param(requirelogin) %]
+A user account is required because this [% terms.Bugzilla %]
+installation is only accessible to authenticated users.
+ [% ELSIF target.match(_bug\.cgi$) %]
+A user account is required to file a new [% terms.bug %] or to comment
+into existing ones so that you can be contacted if more information is
+needed.
+ [% END %]
/p
[% END %]
--
To view, visit https://gerrit.wikimedia.org/r/98008
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida6429cc3d7c38265a200573a5aaebf093464417
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved Ruby code that multiple repositories use to mediawiki_... - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Moved Ruby code that multiple repositories use to
mediawiki_selenium Ruby gem
..
Moved Ruby code that multiple repositories use to mediawiki_selenium Ruby gem
Bug: 56088
Change-Id: I5b3700173a5d2eda415a2187ee81f1f3cbe5aa3a
---
M tests/browser/Gemfile.lock
M tests/browser/features/step_definitions/general_steps.rb
D tests/browser/features/support/modules/url_module.rb
D tests/browser/features/support/pages/login_page.rb
4 files changed, 2 insertions(+), 31 deletions(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index 1a6578f..4539e75 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -22,7 +22,7 @@
headless (1.0.1)
i18n (0.6.9)
json (1.8.1)
-mediawiki_selenium (0.2.1)
+mediawiki_selenium (0.2.2)
cucumber (~ 1.3, = 1.3.10)
headless (~ 1.0, = 1.0.1)
json (~ 1.8, = 1.8.1)
@@ -34,7 +34,7 @@
mime-types (2.1)
multi_json (1.8.4)
multi_test (0.0.3)
-net-http-persistent (2.9.3)
+net-http-persistent (2.9.4)
page-object (0.9.6)
page_navigation (= 0.9)
selenium-webdriver (= 2.39.0)
diff --git a/tests/browser/features/step_definitions/general_steps.rb
b/tests/browser/features/step_definitions/general_steps.rb
index 86910d5..5058da0 100644
--- a/tests/browser/features/step_definitions/general_steps.rb
+++ b/tests/browser/features/step_definitions/general_steps.rb
@@ -1,7 +1,3 @@
-Given(/^I am logged in$/) do
- visit(LoginPage).login_with(ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD])
-end
-
Given(/^I am at a random page.*$/) do
visit RandomPage
end
diff --git a/tests/browser/features/support/modules/url_module.rb
b/tests/browser/features/support/modules/url_module.rb
deleted file mode 100644
index 1dd1856..000
--- a/tests/browser/features/support/modules/url_module.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module URL
- def self.url(name)
-if ENV[MEDIAWIKI_URL]
- mediawiki_url = ENV[MEDIAWIKI_URL]
-else
- mediawiki_url = http://en.wikipedia.beta.wmflabs.org/wiki/;
-end
-#{mediawiki_url}#{name}
- end
-end
diff --git a/tests/browser/features/support/pages/login_page.rb
b/tests/browser/features/support/pages/login_page.rb
deleted file mode 100644
index 54fc13e..000
--- a/tests/browser/features/support/pages/login_page.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class LoginPage
- include PageObject
-
- page_url URL.url(Special:UserLogin)
-
- button(:login, id: wpLoginAttempt)
- text_field(:password, id: wpPassword1)
- text_field(:username, id: wpName1)
-
- def login_with(username, password)
-self.username = username
-self.password = password
-login
- end
-end
--
To view, visit https://gerrit.wikimedia.org/r/112672
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5b3700173a5d2eda415a2187ee81f1f3cbe5aa3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Jhall jh...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
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] [4.4] Sync with upstream 4.4 - change (wikimedia...modifications)
Dzahn has submitted this change and it was merged.
Change subject: [4.4] Sync with upstream 4.4
..
[4.4] Sync with upstream 4.4
DO NOT COMMIT until Bugzilla has been upgraded to 4.4!
Sync with upstream 4.4 and reapply our custom patches for
bug 46413 and bug 58415.
Change-Id: I6c9a234c7c1bf8ff25f9fecb556550b9e5622645
---
M template/en/custom/bug/edit.html.tmpl
1 file changed, 192 insertions(+), 194 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/template/en/custom/bug/edit.html.tmpl
b/template/en/custom/bug/edit.html.tmpl
index 2ce6c35..5396b12 100644
--- a/template/en/custom/bug/edit.html.tmpl
+++ b/template/en/custom/bug/edit.html.tmpl
@@ -24,79 +24,12 @@
# Elliotte Martin emar...@everythingsolved.com
#%]
-[% PROCESS global/variables.none.tmpl %]
-
[% PROCESS global/field-descs.none.tmpl %]
[% PROCESS bug/time.html.tmpl %]
script type=text/javascript
!--
- /* Outputs a link to call replyToComment(); used to reduce HTML output */
- function addReplyLink(id, real_id) {
- /* XXX this should really be updated to use the DOM Core's
- * createElement, but finding a container isn't trivial.
- */
- [% IF user.settings.quote_replies.value != 'off' %]
-document.write('[a href=#add_comment onclick=replyToComment(' +
- id + ',' + real_id + '); return false;reply' +
'/a]');
- [% END %]
- }
-
- /* Adds the reply text to the `comment' textarea */
- function replyToComment(id, real_id) {
- var prefix = (In reply to comment # + id + )\n;
- var replytext = ;
- [% IF user.settings.quote_replies.value == 'quoted_reply' %]
-/* pre id=comment_name_N */
-var text_elem = document.getElementById('comment_text_'+id);
-var text = getText(text_elem);
-replytext = prefix + wrapReplyText(text);
- [% ELSIF user.settings.quote_replies.value == 'simple_reply' %]
-replytext = prefix;
- [% END %]
-
-[% IF user.is_insider %]
- if (document.getElementById('isprivate_' + real_id).checked) {
- document.getElementById('newcommentprivacy').checked = 'checked';
-
updateCommentTagControl(document.getElementById('newcommentprivacy'),
'comment');
- }
-[% END %]
-
- /* textarea id=comment */
- var textarea = document.getElementById('comment');
- textarea.value += replytext;
-
- textarea.focus();
- }
-
- if (typeof Node == 'undefined') {
- /* MSIE doesn't define Node, so provide a compatibility object */
- window.Node = {
- TEXT_NODE: 3,
- ENTITY_REFERENCE_NODE: 5
- };
- }
-
- /* Concatenates all text from element's childNodes. This is used
- * instead of innerHTML because we want the actual text (and
- * innerText is non-standard).
- */
- function getText(element) {
- var child, text = ;
- for (var i=0; i element.childNodes.length; i++) {
- child = element.childNodes[i];
- var type = child.nodeType;
- if (type == Node.TEXT_NODE || type == Node.ENTITY_REFERENCE_NODE) {
- text += child.nodeValue;
- } else {
- /* recurse into nodes of other types */
- text += getText(child);
- }
- }
- return text;
- }
-
[% IF user.is_timetracker %]
var fRemainingTime = [% bug.remaining_time %]; // holds the original value
function adjustRemainingTime() {
@@ -115,7 +48,6 @@
// if the remaining time is changed manually, update fRemainingTime
fRemainingTime = document.changeform.remaining_time.value;
}
-
[% END %]
[% IF user.id %]
@@ -164,8 +96,10 @@
[% PROCESS section_url_keyword_whiteboard %]
[% PROCESS section_spacer %]
-
- [%# *** Dependencies *** %]
+
+ [%# *** Dependencies and duplicates *** %]
+ [% PROCESS section_duplicates %]
+
[% PROCESS section_dependson_blocks %]
/table
@@ -253,10 +187,8 @@
a href=show_bug.cgi?id=[% bug.bug_id %]
[%-# %]b[% terms.Bug %]nbsp;[% bug.bug_id FILTER html %]/b
[%-# %]/a -span id=summary_alias_container
class=bz_default_hidden
- [% IF Param(usebugaliases) %]
-[% IF bug.alias != %]
- (span id=alias_nonedit_display[% bug.alias FILTER html
%]/span)
-[% END %]
+ [% IF bug.alias != %]
+(span id=alias_nonedit_display[% bug.alias FILTER html %]/span)
[% END %]
span id=short_desc_nonedit_display[% bug.short_desc FILTER
quoteUrls(bug) %]/span
[% IF bug.check_can_change_field('short_desc', 0, 1) ||
@@ -268,16 +200,13 @@
div id=summary_alias_input
table id=summary
-[% IF Param(usebugaliases) %]
- tr
+tr
[% IF bug.check_can_change_field('alias', 0, 1) %]
+[% INCLUDE
[MediaWiki-commits] [Gerrit] [4.4] Sync MoreBugUrl extension with upstream - change (wikimedia...modifications)
Dzahn has submitted this change and it was merged.
Change subject: [4.4] Sync MoreBugUrl extension with upstream
..
[4.4] Sync MoreBugUrl extension with upstream
DO NOT COMMIT until Bugzilla has been upgraded to 4.4.
Change-Id: I7ea496ca167f91faf7424ec852f13a7ba99d0f26
---
M extensions/MoreBugUrl/lib/GetSatisfaction.pm
M extensions/MoreBugUrl/lib/PHP.pm
M extensions/MoreBugUrl/lib/RT.pm
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/extensions/MoreBugUrl/lib/GetSatisfaction.pm
b/extensions/MoreBugUrl/lib/GetSatisfaction.pm
index 4c077b1..75d5ece 100644
--- a/extensions/MoreBugUrl/lib/GetSatisfaction.pm
+++ b/extensions/MoreBugUrl/lib/GetSatisfaction.pm
@@ -20,7 +20,7 @@
# GetSatisfaction URLs only have one form:
# http(s)://getsatisfaction.com/PROJECT_NAME/topics/TOPIC_NAME
-return ($uri-authority =~ /^getsatisfaction.com$/i
+return (lc($uri-authority) eq 'getsatisfaction.com'
and $uri-path =~ m|^/[^/]+/topics/[^/]+$|) ? 1 : 0;
}
diff --git a/extensions/MoreBugUrl/lib/PHP.pm b/extensions/MoreBugUrl/lib/PHP.pm
index 1521cae..ea090e8 100644
--- a/extensions/MoreBugUrl/lib/PHP.pm
+++ b/extensions/MoreBugUrl/lib/PHP.pm
@@ -20,8 +20,8 @@
# PHP Bug URLs have only one form:
# https://bugs.php.net/bug.php?id=1234
-return ($uri-authority =~ /^bugs.php.net$/i
-and $uri-path =~ m|/bug.php$|
+return (lc($uri-authority) eq 'bugs.php.net'
+and $uri-path =~ m|/bug\.php$|
and $uri-query_param('id') =~ /^\d+$/) ? 1 : 0;
}
diff --git a/extensions/MoreBugUrl/lib/RT.pm b/extensions/MoreBugUrl/lib/RT.pm
index 7244568..a1ca6fd 100644
--- a/extensions/MoreBugUrl/lib/RT.pm
+++ b/extensions/MoreBugUrl/lib/RT.pm
@@ -21,7 +21,7 @@
# RT URLs can look like various things:
# http://example.com/rt/Ticket/Display.html?id=1234
# https://example.com/Public/Bug/Display.html?id=1234
-return ($uri-path =~ m|/Display.html$|
+return ($uri-path =~ m|/Display\.html$|
and $uri-query_param('id') =~ /^\d+$/) ? 1 : 0;
}
--
To view, visit https://gerrit.wikimedia.org/r/98031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ea496ca167f91faf7424ec852f13a7ba99d0f26
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [4.4] Sync custom file with upstream 4.4 and reapply custom ... - change (wikimedia...modifications)
Dzahn has submitted this change and it was merged.
Change subject: [4.4] Sync custom file with upstream 4.4 and reapply custom
patch
..
[4.4] Sync custom file with upstream 4.4 and reapply custom patch
DO NOT COMMIT until Bugzilla has been upgraded to 4.4.
Sync custom file with upstream 4.4 and reapply custom patch for
https://bugzilla.wikimedia.org/show_bug.cgi?id=43130
Change-Id: If96219d81b5b05e6513d6c95f524d11c4d1e9aaf
---
M Bugzilla/BugMail.pm
1 file changed, 39 insertions(+), 3 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 66330d0..65d3c7c 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -355,6 +355,14 @@
push(@watchingrel, 'None') unless @watchingrel;
push @watchingrel, map { user_id_to_login($_) } @$watchingRef;
+my @changedfields = uniq map { $_-{field_name} } @display_diffs;
+
+# Add attachments.created to changedfields if one or more
+# comments contain information about a new attachment
+if (grep($_-type == CMT_ATTACHMENT_CREATED, @send_comments)) {
+push(@changedfields, 'attachments.created');
+}
+
my $vars = {
date = $date,
to_user = $user,
@@ -365,7 +373,7 @@
reasonswatchheader = join( , @watchingrel),
changer = $changer,
diffs = \@display_diffs,
-changedfields = [uniq map { $_-{field_name} } @display_diffs],
+changedfields = \@changedfields,
new_comments = \@send_comments,
threadingmarker = build_thread_marker($bug-id, $user-id,
!$bug-lastdiffed),
};
@@ -410,6 +418,8 @@
$email-content_type_set($parts[0]-content_type);
} else {
$email-content_type_set('multipart/alternative');
+# Some mail clients need same encoding for each part, even empty ones.
+$email-charset_set('UTF-8') if Bugzilla-params-{'utf8'};
}
$email-parts_set(\@parts);
return $email;
@@ -437,7 +447,8 @@
ON fielddefs.id = bugs_activity.fieldid
WHERE bugs_activity.bug_id = ?
$when_restriction
- ORDER BY bugs_activity.bug_when, {Slice={}}, @args);
+ ORDER BY bugs_activity.bug_when, bugs_activity.id,
+{Slice={}}, @args);
foreach my $diff (@$diffs) {
$user_cache-{$diff-{who}} ||= new Bugzilla::User($diff-{who});
@@ -454,18 +465,43 @@
}
}
-return @$diffs;
+my @changes = ();
+foreach my $diff (@$diffs) {
+# If this is the same field as the previous item, then concatenate
+# the data into the same change.
+if (scalar(@changes)
+ $diff-{field_name}eq $changes[-1]-{field_name}
+ $diff-{bug_when} eq $changes[-1]-{bug_when}
+ $diff-{who} eq $changes[-1]-{who}
+ ($diff-{attach_id} || 0) == ($changes[-1]-{attach_id} || 0)
+ ($diff-{comment_id} || 0) == ($changes[-1]-{comment_id} || 0)
+) {
+my $old_change = pop @changes;
+$diff-{old} = join_activity_entries($diff-{field_name},
$old_change-{old}, $diff-{old});
+$diff-{new} = join_activity_entries($diff-{field_name},
$old_change-{new}, $diff-{new});
+}
+push @changes, $diff;
+}
+
+return @changes;
}
sub _get_new_bugmail_fields {
my $bug = shift;
my @fields = @{ Bugzilla-fields({obsolete = 0, in_new_bugmail = 1}) };
my @diffs;
+my $params = Bugzilla-params;
foreach my $field (@fields) {
my $name = $field-name;
my $value = $bug-$name;
+next if !$field-is_visible_on_bug($bug)
+|| ($name eq 'classification' !$params-{'useclassification'})
+|| ($name eq 'status_whiteboard'
!$params-{'usestatuswhiteboard'})
+|| ($name eq 'qa_contact' !$params-{'useqacontact'})
+|| ($name eq 'target_milestone'
!$params-{'usetargetmilestone'});
+
if (ref $value eq 'ARRAY') {
$value = join(', ', @$value);
}
--
To view, visit https://gerrit.wikimedia.org/r/98032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If96219d81b5b05e6513d6c95f524d11c4d1e9aaf
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [4.4] Upgrade files to 4.4 and reapply one-liner custom patches - change (wikimedia...modifications)
Dzahn has submitted this change and it was merged.
Change subject: [4.4] Upgrade files to 4.4 and reapply one-liner custom patches
..
[4.4] Upgrade files to 4.4 and reapply one-liner custom patches
DO NOT COMMIT until Bugzilla has been upgraded to 4.4.
Change-Id: Ib49a5cfa14f2a80a21154869968a9a869c2b3108
---
M template/en/custom/account/auth/login-small.html.tmpl
M template/en/custom/list/table.html.tmpl
2 files changed, 2 insertions(+), 5 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/template/en/custom/account/auth/login-small.html.tmpl
b/template/en/custom/account/auth/login-small.html.tmpl
index c02a8e6..a4cb14e 100644
--- a/template/en/custom/account/auth/login-small.html.tmpl
+++ b/template/en/custom/account/auth/login-small.html.tmpl
@@ -28,8 +28,6 @@
[% login_target = index.cgi %]
[% END %]
-[% login_target = urlbase _ login_target %]
-
li id=mini_login_container[% qs_suffix %]
span class=separator| /span
[% connector = ? %]
diff --git a/template/en/custom/list/table.html.tmpl
b/template/en/custom/list/table.html.tmpl
index 330a1f3..6e40791 100644
--- a/template/en/custom/list/table.html.tmpl
+++ b/template/en/custom/list/table.html.tmpl
@@ -46,7 +46,7 @@
{
bug_severity = { maxlength = 3 , title = Sev } ,
priority = { maxlength = 7 , title = Pri } ,
-rep_platform = { maxlength = 3 , title = Plt } ,
+rep_platform = { maxlength = 3 , title = HW } ,
bug_status = { maxlength = 4 } ,
assigned_to = { maxlength = 30 , ellipsis = ... } ,
assigned_to_realname = { maxlength = 20 , ellipsis = ... } ,
@@ -213,8 +213,7 @@
[%- bug.$column.truncate(abbrev.$column.maxlength,
abbrev.$column.ellipsis) FILTER html -%]
/a
[% ELSE %]
-[%- display_value(column,
bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis)
- FILTER html -%]
+[%- display_value(column,
bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER
html -%]
[% END %]
[% IF abbrev.$column.maxlength %]
/span
--
To view, visit https://gerrit.wikimedia.org/r/98025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib49a5cfa14f2a80a21154869968a9a869c2b3108
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved tests from browsertests repository - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged. Change subject: Moved tests from browsertests repository .. Moved tests from browsertests repository See also the commit[1] that deletes the tests from browsertests repository and the commit[2] in mediawiki/selenium repository that documents changes in Jenkins jobs. The tests run just fine on my machine. Added CREDITS file following advice from Luis Villa[3]. 1: https://gerrit.wikimedia.org/r/#/c/113115/ 2: https://gerrit.wikimedia.org/r/#/c/113138/ 3: https://bugzilla.wikimedia.org/show_bug.cgi?id=49313#c2 Bug: 61311 Change-Id: Id293a6bb06430bd49334c2964a4c2a28e175182a --- A CREDITS A tests/browser/features/simple_search.feature A tests/browser/features/step_definitions/simple_search_steps.rb 3 files changed, 68 insertions(+), 0 deletions(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/CREDITS b/CREDITS new file mode 100644 index 000..57d386c --- /dev/null +++ b/CREDITS @@ -0,0 +1,9 @@ +MediaWiki CirrusSearch is a collaborative project released under the +GNU General Public License v2. We would like to recognize the +following names for their contribution to the product. + +For further details on licensing, see the COPYING file. + +== Developers == +* Nik Everett +* Chad Horohoe diff --git a/tests/browser/features/simple_search.feature b/tests/browser/features/simple_search.feature new file mode 100644 index 000..53fb5da --- /dev/null +++ b/tests/browser/features/simple_search.feature @@ -0,0 +1,30 @@ +# +# This file is subject to the license terms in the COPYING file found in the +# CirrusSearch top-level directory and at +# https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FCirrusSearch/HEAD/COPYING. No part of +# CirrusSearch, including this file, may be copied, modified, propagated, or +# distributed except according to the terms contained in the COPYING file. +# +# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the +# CirrusSearch top-level directory and at +# https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FCirrusSearch/HEAD/CREDITS +# +@clean @en.wikipedia.beta.wmflabs.org @test2.wikipedia.org +Feature: Search + + Scenario: Search suggestions +Given I am at a random page +When I search for: main +Then a list of suggested pages should appear + And Main Page should be the first result + + Scenario: Fill in search term and click search +Given I am at a random page +When I search for: ma + And I click the search button +Then I should land on Search Results page + + Scenario: Search with accent yields result page with accent +Given I am at a random page +When I search for África +Then the page I arrive on has title África diff --git a/tests/browser/features/step_definitions/simple_search_steps.rb b/tests/browser/features/step_definitions/simple_search_steps.rb new file mode 100644 index 000..d0e055a --- /dev/null +++ b/tests/browser/features/step_definitions/simple_search_steps.rb @@ -0,0 +1,29 @@ +# +# This file is subject to the license terms in the COPYING file found in the +# CirrusSearch top-level directory and at +# https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FCirrusSearch/HEAD/COPYING. No part of +# CirrusSearch, including this file, may be copied, modified, propagated, or +# distributed except according to the terms contained in the COPYING file. +# +# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the +# CirrusSearch top-level directory and at +# https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FCirrusSearch/HEAD/CREDITS +# +When(/^I search for: (.+)$/) do |search_term| + on(SearchPage).search_input_element.when_present.send_keys(search_term) +end + +Then(/^a list of suggested pages should appear$/) do + on(SearchPage).search_results_element.when_present.should exist +end +Then(/^I should land on Search Results page$/) do + on(SearchResultsPage).search_element.when_present + @browser.url.should match Regexp.escape(title=Special%3ASearch) +end +Then(/^(.+) should be the first result$/) do |page_name| + on(SearchPage).one_result.should == page_name +end + +Then(/^the page I arrive on has title (.+)$/) do |title| + @browser.title.should match Regexp.escape(title) +end -- To view, visit https://gerrit.wikimedia.org/r/113131 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id293a6bb06430bd49334c2964a4c2a28e175182a Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Jhall jh...@wikimedia.org Gerrit-Reviewer: LuisVilla lvi...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: jenkins-bot
[MediaWiki-commits] [Gerrit] Moved tests to CirrusSearch repository - change (qa/browsertests)
jenkins-bot has submitted this change and it was merged. Change subject: Moved tests to CirrusSearch repository .. Moved tests to CirrusSearch repository See also the commit[1] in CirrusSearch repository that moves the tests there and the commit[2] in mediawiki/selenium repository that documents changes in Jenkins jobs. 1: https://gerrit.wikimedia.org/r/#/c/113131/ 2: https://gerrit.wikimedia.org/r/#/c/113138/ Bug: 61311 Change-Id: I5378b1d60fa26a9d15565970464ed1f4f56b7055 --- D tests/browser/features/search.feature D tests/browser/features/step_definitions/search_steps.rb D tests/browser/features/support/pages/search_page.rb D tests/browser/features/support/pages/search_results_page.rb 4 files changed, 0 insertions(+), 109 deletions(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/search.feature b/tests/browser/features/search.feature deleted file mode 100644 index d609ac7..000 --- a/tests/browser/features/search.feature +++ /dev/null @@ -1,30 +0,0 @@ -# -# This file is subject to the license terms in the LICENSE file found in the -# qa-browsertests top-level directory and at -# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of -# qa-browsertests, including this file, may be copied, modified, propagated, or -# distributed except according to the terms contained in the LICENSE file. -# -# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the -# qa-browsertests top-level directory and at -# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS -# -@en.wikipedia.beta.wmflabs.org @test2.wikipedia.org -Feature: Search - - Scenario: Search suggestions -Given I am at random page -When I search for: main -Then a list of suggested pages should appear - And Main Page should be the first result - - Scenario: Fill in search term and click search -Given I am at random page -When I search for: ma - And I click the Search button -Then I should land on Search Results page - - Scenario: Search with accent yields result page with accent -Given I am at random page -When I search for África -Then the page I arrive on has title África diff --git a/tests/browser/features/step_definitions/search_steps.rb b/tests/browser/features/step_definitions/search_steps.rb deleted file mode 100644 index 6b50337..000 --- a/tests/browser/features/step_definitions/search_steps.rb +++ /dev/null @@ -1,43 +0,0 @@ -# -# This file is subject to the license terms in the LICENSE file found in the -# qa-browsertests top-level directory and at -# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of -# qa-browsertests, including this file, may be copied, modified, propagated, or -# distributed except according to the terms contained in the LICENSE file. -# -# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the -# qa-browsertests top-level directory and at -# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS -# -Given(/^I am at random page$/) do - visit RandomPage -end - -When(/^I click the Search button$/) do - on(SearchPage).search_button -end -When(/^I search for: (.+)$/) do |search_term| - on(SearchPage).search_input_element.when_present.send_keys(search_term) -end - -Then(/^a list of suggested pages should appear$/) do - on(SearchPage).search_results_element.when_present.should exist -end -Then(/^I should land on Search Results page$/) do - on(SearchResultsPage).search_element.when_present - @browser.url.should match Regexp.escape(title=Special%3ASearch) -end -Then(/^(.+) should be the first result$/) do |page_name| - on(SearchPage).one_result.should == page_name -end - -When(/^I search for (.+)$/) do |text| - on(RandomPage) do |page| -page.search_input_element.when_present.send_keys(text) -page.search_button - end -end - -Then(/^the page I arrive on has title (.+)$/) do |title| - @browser.title.should match Regexp.escape(title) -end diff --git a/tests/browser/features/support/pages/search_page.rb b/tests/browser/features/support/pages/search_page.rb deleted file mode 100644 index 22ac463..000 --- a/tests/browser/features/support/pages/search_page.rb +++ /dev/null @@ -1,19 +0,0 @@ -# -# This file is subject to the license terms in the LICENSE file found in the -# qa-browsertests top-level directory and at -# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of -# qa-browsertests, including this file, may be copied, modified, propagated, or -# distributed except according to the terms contained in the LICENSE file. -# -# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the -# qa-browsertests top-level directory and at -# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS -# -class SearchPage - include PageObject - - div(:one_result, class:
[MediaWiki-commits] [Gerrit] Make the server runnable without cluster setup - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review. https://gerrit.wikimedia.org/r/113365 Change subject: Make the server runnable without cluster setup .. Make the server runnable without cluster setup This patch make it possible to run a single process instance Change-Id: I587ba30a08dd2970283d737eb4928c08926c7ac6 --- M server/ContentTranslationService.js M server/server.js 2 files changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/65/113365/1 diff --git a/server/ContentTranslationService.js b/server/ContentTranslationService.js index b0256ca..d72799a 100644 --- a/server/ContentTranslationService.js +++ b/server/ContentTranslationService.js @@ -53,8 +53,8 @@ sourceText = req.body.sourcetext; res.setHeader( 'Content-Type', 'text/plain; charset=UTF-8' ); -// TODO: create configurable access control list for production -res.setHeader( 'Access-Control-Allow-Origin', '*' ); + // TODO: create configurable access control list for production + res.setHeader( 'Access-Control-Allow-Origin', '*' ); res.end( app.translator.translate( sourceLang, targetLang, @@ -67,5 +67,6 @@ console.log( ' - ' + instanceName + ' ready' ); -module.exports = app; +app.listen( config.port ); +module.exports = app; diff --git a/server/server.js b/server/server.js index aec306a..48b767b 100644 --- a/server/server.js +++ b/server/server.js @@ -58,7 +58,4 @@ } ); var app = require( './ContentTranslationService.js' ); - // when running on appfog.com the listen port for the app - // is passed in an environment variable. Most users can ignore this! - app.listen( process.env.VCAP_APP_PORT || config.port ); } -- To view, visit https://gerrit.wikimedia.org/r/113365 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I587ba30a08dd2970283d737eb4928c08926c7ac6 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] Make the server runnable without cluster setup - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Make the server runnable without cluster setup
..
Make the server runnable without cluster setup
This patch make it possible to run a single process instance
Change-Id: I587ba30a08dd2970283d737eb4928c08926c7ac6
---
M server/ContentTranslationService.js
M server/server.js
2 files changed, 5 insertions(+), 9 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/server/ContentTranslationService.js
b/server/ContentTranslationService.js
index b0256ca..d72799a 100644
--- a/server/ContentTranslationService.js
+++ b/server/ContentTranslationService.js
@@ -53,8 +53,8 @@
sourceText = req.body.sourcetext;
res.setHeader( 'Content-Type', 'text/plain; charset=UTF-8' );
-// TODO: create configurable access control list for production
-res.setHeader( 'Access-Control-Allow-Origin', '*' );
+ // TODO: create configurable access control list for production
+ res.setHeader( 'Access-Control-Allow-Origin', '*' );
res.end( app.translator.translate(
sourceLang,
targetLang,
@@ -67,5 +67,6 @@
console.log( ' - ' + instanceName + ' ready' );
-module.exports = app;
+app.listen( config.port );
+module.exports = app;
diff --git a/server/server.js b/server/server.js
index aec306a..2aa45c8 100644
--- a/server/server.js
+++ b/server/server.js
@@ -8,8 +8,6 @@
var cluster = require( 'cluster' );
-var config = require( __dirname + '/config.js' );
-
if ( cluster.isMaster ) {
// Start a few more workers than there are cpus visible to the OS, so
that we
// get some degree of parallelism even on single-core systems. A single
@@ -57,8 +55,5 @@
heapdump.writeSnapshot();
} );
- var app = require( './ContentTranslationService.js' );
- // when running on appfog.com the listen port for the app
- // is passed in an environment variable. Most users can ignore this!
- app.listen( process.env.VCAP_APP_PORT || config.port );
+ require( './ContentTranslationService.js' );
}
--
To view, visit https://gerrit.wikimedia.org/r/113365
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I587ba30a08dd2970283d737eb4928c08926c7ac6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@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] [4.4] Sync custom file with upstream 4.4 and reapply custom ... - change (wikimedia...modifications)
Dzahn has submitted this change and it was merged.
Change subject: [4.4] Sync custom file with upstream 4.4 and reapply custom
patch
..
[4.4] Sync custom file with upstream 4.4 and reapply custom patch
DO NOT COMMIT until Bugzilla has been upgraded to 4.4.
Sync custom file with upstream 4.4 and reapply custom patch for
https://bugzilla.wikimedia.org/show_bug.cgi?id=42606
Change-Id: I3915e58e9b88a47845e8c0b1aaf2b37877dd55d5
---
M template/en/custom/attachment/createformcontents.html.tmpl
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/template/en/custom/attachment/createformcontents.html.tmpl
b/template/en/custom/attachment/createformcontents.html.tmpl
index 0b8fb43..863565c 100644
--- a/template/en/custom/attachment/createformcontents.html.tmpl
+++ b/template/en/custom/attachment/createformcontents.html.tmpl
@@ -21,6 +21,8 @@
# Marc Schumann wurbl...@gmail.com
#%]
+[% max_local = Param('maxlocalattachment') * 1024 %]
+[% max_limit = Param('maxattachmentsize') max_local ?
Param('maxattachmentsize') : max_local %]
tr class=attachment_data
thlabel for=dataFile/label:/th
td
@@ -29,6 +31,7 @@
javascript:TUI_toggle_class('attachment_data')
paste text as attachment/a).br
input type=file id=data name=data size=50
onchange=DataFieldHandler()
+brem(File size limit: [% max_limit FILTER html %] KB)/em
/td
/tr
tr class=attachment_text_field
@@ -100,6 +103,7 @@
{type = image/gif, desc = GIF image},
{type = image/jpeg, desc = JPEG image},
{type = image/png, desc = PNG image},
+ {type = application/pdf, desc = PDF document},
{type = application/octet-stream, desc = binary file}]
%]
[% Hook.process(mimetypes, attachment/createformcontents.html.tmpl) %]
--
To view, visit https://gerrit.wikimedia.org/r/101643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3915e58e9b88a47845e8c0b1aaf2b37877dd55d5
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update custom Component label to match 4.4 styling - change (wikimedia...modifications)
Dzahn has submitted this change and it was merged. Change subject: Update custom Component label to match 4.4 styling .. Update custom Component label to match 4.4 styling Bug: 59749 Change-Id: I32d8c81318fe3a3df85dcb6bcad3aceab88925e0 --- M template/en/custom/bug/edit.html.tmpl 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Dzahn: Verified; Looks good to me, approved diff --git a/template/en/custom/bug/edit.html.tmpl b/template/en/custom/bug/edit.html.tmpl index 5396b12..576b936 100644 --- a/template/en/custom/bug/edit.html.tmpl +++ b/template/en/custom/bug/edit.html.tmpl @@ -275,10 +275,10 @@ tr [%# WIKIMEDIA START 46413 %] td class=field_label - label for=componentb + label for=component a href=describecomponents.cgi?product=[% bug.product FILTER uri %] -Component/a - /b/label +Component:/a + /label /td [%# WIKIMEDIA END 46413, plus additional no_tds=1 %] td -- To view, visit https://gerrit.wikimedia.org/r/113095 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32d8c81318fe3a3df85dcb6bcad3aceab88925e0 Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/bugzilla/modifications Gerrit-Branch: master Gerrit-Owner: TTO at.li...@live.com.au Gerrit-Reviewer: Aklapper aklap...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Renamed the feature to Smoke test - change (mediawiki...CirrusSearch)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/113366 Change subject: Renamed the feature to Smoke test .. Renamed the feature to Smoke test Paired with Nikolas Everett. Change-Id: I8f5f1d54a02626fcec9b58eaf5be221b7331c202 --- R tests/browser/features/smoke.feature 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/66/113366/1 diff --git a/tests/browser/features/simple_search.feature b/tests/browser/features/smoke.feature similarity index 92% rename from tests/browser/features/simple_search.feature rename to tests/browser/features/smoke.feature index 53fb5da..f6d48fd 100644 --- a/tests/browser/features/simple_search.feature +++ b/tests/browser/features/smoke.feature @@ -10,7 +10,7 @@ # https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FCirrusSearch/HEAD/CREDITS # @clean @en.wikipedia.beta.wmflabs.org @test2.wikipedia.org -Feature: Search +Feature: Smoke test Scenario: Search suggestions Given I am at a random page @@ -24,7 +24,7 @@ And I click the search button Then I should land on Search Results page - Scenario: Search with accent yields result page with accent + Scenario: Search with accent yields result page with accent Given I am at a random page When I search for África Then the page I arrive on has title África -- To view, visit https://gerrit.wikimedia.org/r/113366 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f5f1d54a02626fcec9b58eaf5be221b7331c202 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Renamed the feature to Smoke test - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged. Change subject: Renamed the feature to Smoke test .. Renamed the feature to Smoke test Paired with Nikolas Everett. Change-Id: I8f5f1d54a02626fcec9b58eaf5be221b7331c202 --- R tests/browser/features/smoke.feature 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/simple_search.feature b/tests/browser/features/smoke.feature similarity index 92% rename from tests/browser/features/simple_search.feature rename to tests/browser/features/smoke.feature index 53fb5da..f6d48fd 100644 --- a/tests/browser/features/simple_search.feature +++ b/tests/browser/features/smoke.feature @@ -10,7 +10,7 @@ # https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FCirrusSearch/HEAD/CREDITS # @clean @en.wikipedia.beta.wmflabs.org @test2.wikipedia.org -Feature: Search +Feature: Smoke test Scenario: Search suggestions Given I am at a random page @@ -24,7 +24,7 @@ And I click the search button Then I should land on Search Results page - Scenario: Search with accent yields result page with accent + Scenario: Search with accent yields result page with accent Given I am at a random page When I search for África Then the page I arrive on has title África -- To view, visit https://gerrit.wikimedia.org/r/113366 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8f5f1d54a02626fcec9b58eaf5be221b7331c202 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Jhall jh...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@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] duplicates.cgi: Add Resolution and Priority columns - change (wikimedia...modifications)
Dzahn has submitted this change and it was merged.
Change subject: duplicates.cgi: Add Resolution and Priority columns
..
duplicates.cgi: Add Resolution and Priority columns
...and remove less used OS column. File is a copy of upstream
4.4 file (do not apply on 4.2) at
http://bzr.mozilla.org/bugzilla/4.4/view/head:/template/en/default/reports/duplicates-table.html.tmpl
Our custom changes are marked with Wikimedia in the source code.
Bug: 56253
Bug: 58749
Change-Id: I7c13f73c07357a0d0d37f2650937355ffaad4be6
---
A template/en/custom/reports/duplicates-table.html.tmpl
1 file changed, 118 insertions(+), 0 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/template/en/custom/reports/duplicates-table.html.tmpl
b/template/en/custom/reports/duplicates-table.html.tmpl
new file mode 100644
index 000..4ee4644
--- /dev/null
+++ b/template/en/custom/reports/duplicates-table.html.tmpl
@@ -0,0 +1,118 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ #
+ # This Source Code Form is Incompatible With Secondary Licenses, as
+ # defined by the Mozilla Public License, v. 2.0.
+ #%]
+
+[%# INTERFACE:
+ # bugs: list of hashes. May be empty. Each hash has three members:
+ # bug: A Bugzilla::Bug object
+ # count: integer. The number of dupes
+ # delta: integer. The change in count in the last $changedsince days
+ #
+ # bug_ids: list of integers. May be empty. The IDs of the bugs in $bugs.
+ #
+ # sortby: string. the column on which we are sorting the buglist.
+ # reverse: boolean. True if we are reversing the current sort.
+ # maxrows: integer. Max number of rows to display.
+ # changedsince: integer. The number of days ago for the changedsince column.
+ # openonly: boolean. True if we are only showing open bugs.
+ # product: array of strings. Restrict to these products only.
+ #%]
+
+[%# *** Column Headers *** %]
+
+[%# WIKIMEDIA 58749 and 56253: resolution and priority columns %]
+[% SET columns = [
+{ name = id, description = $terms.Bug # },
+{ name = count, description = DupebrCount },
+{ name = delta,
+ description = Change in lastbr$changedsince day(s) },
+{ name = component, description = field_descs.component },
+{ name = resolution, description = field_descs.resolution },
+{ name = bug_severity, description = field_descs.bug_severity },
+{ name = priority, description = field_descs.priority },
+{ name = target_milestone, description = field_descs.target_milestone
},
+{ name = short_desc, description = field_descs.short_desc },
+] %]
+
+[% SET base_args = [] %]
+[% FOREACH param = ['maxrows', 'openonly', 'format', 'sortvisible',
+'changedsince', 'product']
+%]
+ [% NEXT IF NOT ${param}.defined %]
+ [% FOREACH value = ${param} %]
+[% filtered_value = value FILTER uri %]
+[% base_args.push($param=$filtered_value) %]
+ [% END %]
+[% END %]
+[% IF sortvisible %]
+ [% bug_ids_string = bug_ids.nsort.join(',') FILTER uri %]
+ [% base_args.push(bug_id=$bug_ids_string) %]
+[% END %]
+[% base_args_string = base_args.join('amp;') %]
+
+[% IF bugs.size %]
+ table id=duplicates_table cellpadding=0 cellspacing=0
+thead
+ tr
+[% FOREACH column = columns %]
+ [% IF column.name == sortby %]
+[%# We add this to the column object so it doesn't affect future
+ # iterations of the loop.
+ #%]
+[% column.reverse_sort = reverse ? 0 : 1 %]
+ [% END %]
+ th class=[% column.name FILTER html %]
+a href=duplicates.cgi?sortby=[% column.name FILTER uri %]
+ [% IF column.reverse_sort.defined %]
+ [%- %]amp;reverse=[% column.reverse_sort FILTER uri %]
+ [% END %]
+ [% IF base_args_string %]
+ [% amp;$base_args_string FILTER none %]
+ [% END %]
+[% column.description FILTER none %]/a
+ /th
+[% END %]
+ /tr
+/thead
+
+[%# *** Buglist *** %]
+
+tbody
+ [% FOREACH item = bugs %]
+[% SET bug = item.bug %]
+tr [% class='resolved' IF NOT bug.isopened %]
+ td class=id
+[% bug.id FILTER bug_link(bug) FILTER none %]
+ /td
+ td class=count[% item.count FILTER html %]/td
+ td class=delta[% item.delta FILTER html %]/td
+ td class=component[% bug.component FILTER html %]/td
+[%# WIKIMEDIA START 58749 %]
+ td class=resolution
+[%- display_value('resolution', bug.resolution) FILTER html %]
+ /td
+[%# WIKIMEDIA END 58749 %]
+ td class=bug_severity
+[%- display_value('bug_severity', bug.bug_severity)
[MediaWiki-commits] [Gerrit] Re-login if session cookies have expired - change (apps...wikipedia)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113368
Change subject: Re-login if session cookies have expired
..
Re-login if session cookies have expired
Change-Id: I45649e5a0af172d4aa9f7187044d92b3f706a9cb
---
M wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
1 file changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/68/113368/1
diff --git
a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
index aaa42c3..a1779fb 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
@@ -23,6 +23,9 @@
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.RequestBuilder;
import org.wikipedia.*;
+import org.wikipedia.login.LoginTask;
+import org.wikipedia.login.LogoutTask;
+import org.wikipedia.login.User;
import org.wikipedia.page.Section;
public class EditSectionActivity extends ActionBarActivity {
@@ -172,6 +175,23 @@
@Override
public void onCatch(Throwable caught) {
+if (caught instanceof EditingException) {
+EditingException ee = (EditingException) caught;
+if (app.getUserInfoStorage().isLoggedIn()
ee.getCode() == badtoken) {
+// looks like our session expired.
+app.getEditTokenStorage().clearAllTokens();
+app.getCookieManager().clearAllCookies();
+
+User user = app.getUserInfoStorage().getUser();
+new LoginTask(app, app.getPrimarySite(),
user.getUsername(), user.getPassword()) {
+@Override
+public void onFinish(String result) {
+doSave();
+}
+}.execute();
+return;
+}
+}
if (!(caught instanceof
HttpRequest.HttpRequestException)) {
throw new RuntimeException(caught);
}
--
To view, visit https://gerrit.wikimedia.org/r/113368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I45649e5a0af172d4aa9f7187044d92b3f706a9cb
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix crashes with NavDrawer when running in Strict Mode - change (apps...wikipedia)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113367
Change subject: Fix crashes with NavDrawer when running in Strict Mode
..
Fix crashes with NavDrawer when running in Strict Mode
Change-Id: I8ecdbcf81c1db284e40e07bdd9fe20bc11fe947a
---
M wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
1 file changed, 18 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/67/113367/1
diff --git a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
index 4039581..2cb3ce8 100644
--- a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
@@ -34,8 +34,13 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
-View parentView = inflater.inflate(R.layout.fragment_navdrawer,
container, false);
-navList = (ListView) parentView.findViewById(R.id.nav_list);
+return inflater.inflate(R.layout.fragment_navdrawer, container, false);
+}
+
+@Override
+public void onActivityCreated(Bundle savedInstanceState) {
+super.onActivityCreated(savedInstanceState);
+navList = (ListView) getView().findViewById(R.id.nav_list);
adapter = new NavListAdapter();
app = (WikipediaApp)getActivity().getApplicationContext();
@@ -43,8 +48,6 @@
navList.setAdapter(adapter);
navList.setOnItemClickListener(this);
-
-return parentView;
}
@Override
@@ -77,9 +80,17 @@
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data)
{
-if (resultCode == LoginActivity.LOG_IN_SUCCESSFUL) {
-setupDynamicItems();
-((NavListAdapter)navList.getAdapter()).notifyDataSetChanged();
+// Okay, so this is really, really stupid, but
+// sometimes if the previous activity was destroyed before the
callback is done
+// onActivityResult may be called *before* the onCreate,
onActivityAttach, etc are called
+// This, of course, is fucking stupid. However, in this particular
case (updating the login status)
+// we can just ignore it if that is the case and keep going.
+// BUGS! GRR!
+if (getView() != null) {
+if (resultCode == LoginActivity.LOG_IN_SUCCESSFUL) {
+setupDynamicItems();
+((NavListAdapter)navList.getAdapter()).notifyDataSetChanged();
+}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/113367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ecdbcf81c1db284e40e07bdd9fe20bc11fe947a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not crash when user has changed password - change (apps...wikipedia)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113370
Change subject: Do not crash when user has changed password
..
Do not crash when user has changed password
Change-Id: Ieeb10f0e6d053d8e0187c90a61e4de9023c4c36c
---
M wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/70/113370/1
diff --git
a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
index a1779fb..c0822f5 100644
--- a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java
@@ -186,7 +186,13 @@
new LoginTask(app, app.getPrimarySite(),
user.getUsername(), user.getPassword()) {
@Override
public void onFinish(String result) {
-doSave();
+if (result.equals(Success)) {
+doSave();
+} else {
+// Throw up login screen here
later on. For now, just make it an anon edit?
+
app.getUserInfoStorage().clearUser();
+doSave();
+}
}
}.execute();
return;
--
To view, visit https://gerrit.wikimedia.org/r/113370
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieeb10f0e6d053d8e0187c90a61e4de9023c4c36c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add Art Photo template to GWToolset - change (mediawiki...GWToolset)
Dan-nl has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113369
Change subject: add Art Photo template to GWToolset
..
add Art Photo template to GWToolset
Bug: 61376
Change-Id: I6ee1514f56f1a793a4119f1bef9d6ae963b83dd3
---
M includes/Config.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GWToolset
refs/changes/69/113369/1
diff --git a/includes/Config.php b/includes/Config.php
index bb94a55..cdaaec4 100644
--- a/includes/Config.php
+++ b/includes/Config.php
@@ -103,6 +103,7 @@
* - fallbacks in case there’s no template data for these MediaWiki
templates
*/
public static $mediawiki_templates = array(
+ 'Art_Photo' =
'{artist:,title:,description:,date:,medium:,dimensions:,institution:,location:,references:,object
history:,exhibition history:,credit
line:,inscriptions:,notes:,accession number:,artwork
license:,artwork:,photo description:,photo
date:,photographer:,source:,permission:,photo
license:,other_versions:}',
'Artwork' =
'{artist:,title:,description:,date:,medium:,dimensions:,institution:,location:,references:,object
history:,exhibition history:,credit
line:,inscriptions:,notes:,accession
number:,source:,permission:,other_versions:}',
'Book' =
'{Author:,Translator:,Editor:,Illustrator:,Title:,Subtitle:,Series
title:,Volume:,Edition:,Publisher:,Printer:,Date:,City:,Language:,Description:,Source:,Permission:,Image:,Image
page:,Pageoverview:,Wikisource:,Homecat:,Other_versions:,ISBN:,LCCN:,OCLC:}',
'Musical_work' =
'{composer:,lyrics_writer:,performer:,title:,description:,composition_date:,performance_date:,notes:,record_ID:,image:,references:,source:,permission:,other_versions:}',
--
To view, visit https://gerrit.wikimedia.org/r/113369
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ee1514f56f1a793a4119f1bef9d6ae963b83dd3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GWToolset
Gerrit-Branch: master
Gerrit-Owner: Dan-nl d_ent...@yahoo.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] Make reindex process less brittle - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113371
Change subject: Make reindex process less brittle
..
Make reindex process less brittle
1. Catch bulk index failures and retry them as single indexes. This should
help with really really large pages.
2. Catch failures in those single indexes and backoff for some time and
retry.
3. Make the batch size and the number of errors to try to backoff from
configurable.
Change-Id: I77c82dc8dcaf180f4d701d4ea277c1c45262592d
---
M maintenance/updateOneSearchIndexConfig.php
1 file changed, 59 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/71/113371/1
diff --git a/maintenance/updateOneSearchIndexConfig.php
b/maintenance/updateOneSearchIndexConfig.php
index 962a07f..0d34258 100644
--- a/maintenance/updateOneSearchIndexConfig.php
+++ b/maintenance/updateOneSearchIndexConfig.php
@@ -3,6 +3,7 @@
namespace CirrusSearch;
use Elastica;
use \Maintenance;
+use \ProfileSection;
/**
* Update the search configuration on the search backend.
@@ -43,7 +44,8 @@
// Is the index currently closed?
private $closed = false;
- private $reindexChunkSize = 1000;
+ private $reindexChunkSize;
+ private $reindexRetryAttempts;
private $indexBaseName;
private $indexIdentifier;
@@ -129,6 +131,14 @@
$maintenance-addOption( 'reindexAcceptableCountDeviation',
'How much can the reindexed ' .
'copy of an index is allowed to deviate from the
current copy without triggering a ' .
'reindex failure. Defaults to 5%.', false, true );
+ $maintenance-addOption( 'reindexChunkSize', 'Documents per
shard to reindex in a batch. ' .
+ 'Note when changing the number of shards that the old shard
size is used, not the new ' .
+ 'one. If you see many errors submitting documents in bulk
but the automatic retry as ' .
+ 'singles works then lower this number. Defaults to 100.',
false, true );
+ $maintenance-addOption( 'reindexRetryAttempts', 'Number of
times to back off and retry ' .
+ 'per failure. Note that failures are not common but if
Elasticsearch is in the process ' .
+ 'of moving a shard this can time out. This will retry
the attempt after some backoff ' .
+ 'rather than failing the whole reindex process.
Defaults to 5.', false, true );
$maintenance-addOption( 'baseName', 'What basename to use for
all indexes, ' .
'defaults to wiki id', false, true );
}
@@ -152,6 +162,8 @@
$this-reindexProcesses = $this-getOption( 'reindexProcesses',
wfIsWindows() ? 1 : 10 );
$this-reindexAcceptableCountDeviation =
$this-parsePotentialPercent(
$this-getOption( 'reindexAcceptableCountDeviation',
'5%' ) );
+ $this-reindexChunkSize = $this-getOption( 'reindexChunkSize',
100 );
+ $this-reindexRetryAttempts = $this-getOption(
'reindexRetryAttempts', 5 );
$this-langCode = $wgLanguageCode;
$this-aggressiveSplitting =
$wgCirrusSearchUseAggressiveSplitting;
$this-prefixSearchStartsWithAny =
$wgCirrusSearchPrefixSearchStartsWithAnyWord;
@@ -630,10 +642,7 @@
$result-next();
}
wfProfileOut( __METHOD__ . '::packageDocs' );
- wfProfileIn( __METHOD__ . '::sendDocs' );
- $updateResult =
$this-getPageType()-addDocuments( $documents );
- wfDebugLog( 'CirrusSearch', 'Update completed
in ' . $updateResult-getEngineTime() . ' (engine) millis' );
- wfProfileOut( __METHOD__ . '::sendDocs' );
+ $this-sendDocumentsWithRetry( $messagePrefix,
$documents );
$completed += $result-count();
$rate = round( $completed / ( microtime( true )
- $operationStartTime ) );
$this-output( $this-indent . $messagePrefix .
@@ -646,6 +655,51 @@
}
}
+ private function sendDocumentsWithRetry( $messagePrefix, $documents ) {
+ $profiler = new ProfileSection( __METHOD__ );
+
+ $errors = 0;
+ while ( true ) {
+ if ( $errors $this-reindexRetryAttempts ) {
+ try {
+ $this-sendDocuments( $messagePrefix,
$documents );
+ return;
+ } catch (
[MediaWiki-commits] [Gerrit] Add exemption to the CVE linker for Ubuntu security links - change (wikimedia...modifications)
Dzahn has submitted this change and it was merged.
Change subject: Add exemption to the CVE linker for Ubuntu security links
..
Add exemption to the CVE linker for Ubuntu security links
In an ideal world, there would be a more general solution to this
problem. Rather than imagining all possible good and bad patterns,
let's just fix the error at hand for now.
Bug: 61328
Change-Id: I2429484d2523048194e27ba95100bcac1c6edf4a
---
M extensions/Wikimedia/Extension.pm
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Aklapper: Looks good to me, but someone else must approve
Dzahn: Verified; Looks good to me, approved
diff --git a/extensions/Wikimedia/Extension.pm
b/extensions/Wikimedia/Extension.pm
index c75722d..2f1c306 100644
--- a/extensions/Wikimedia/Extension.pm
+++ b/extensions/Wikimedia/Extension.pm
@@ -68,8 +68,9 @@
replace = \_createGitCommitLink
};
+ # Test case: https://bugzilla.wikimedia.org/60112#c8
my $replacerCVE = {
- match = qr{\b(CVE-\d{4}-\d+)},
+ match =
qr{(?!http://people\.canonical\.com/~ubuntu-security/cve/2013/)\b(CVE-\d{4}-\d+)},
replace = \_createCVELink
};
--
To view, visit https://gerrit.wikimedia.org/r/113170
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2429484d2523048194e27ba95100bcac1c6edf4a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt t...@tim-landscheidt.de
Gerrit-Reviewer: Aklapper aklap...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clean up SkinMinerva to pass mwcodesniffer - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Clean up SkinMinerva to pass mwcodesniffer
..
Clean up SkinMinerva to pass mwcodesniffer
Change-Id: I73c91d9e1d7e0711048d48f09de3b148558dd4ec
---
M includes/skins/SkinMinerva.php
1 file changed, 48 insertions(+), 18 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 9899470..e6f694c 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -11,7 +11,7 @@
public $skinname = 'minerva';
public $template = 'MinervaTemplate';
public $useHeadElement = true;
- /* @var string describing the current stability of the skin, can be
overriden by derivative experimental skins */
+ /* @var string describes 'stability' of the skin - alpha, beta, stable
*/
protected $mode = 'stable';
protected function prepareQuickTemplate() {
@@ -25,14 +25,24 @@
);
}
$out-addHeadItem( 'viewport',
- Html::element( 'meta', array( 'name' = 'viewport',
'content' = 'initial-scale=1.0, user-scalable=yes, minimum-scale=0.25,
maximum-scale=1.6' ) )
+ Html::element(
+ 'meta', array(
+ 'name' = 'viewport',
+ 'content' = 'initial-scale=1.0,
user-scalable=yes, minimum-scale=0.25, maximum-scale=1.6',
+ )
+ )
);
// hide chrome on bookmarked sites
$out-addHeadItem( 'apple-mobile-web-app-capable',
Html::element( 'meta', array( 'name' =
'apple-mobile-web-app-capable', 'content' = 'yes' ) )
);
$out-addHeadItem( 'apple-mobile-web-app-status-bar-style',
- Html::element( 'meta', array( 'name' =
'apple-mobile-web-app-status-bar-style', 'content' = 'black' ) )
+ Html::element(
+ 'meta', array(
+ 'name' =
'apple-mobile-web-app-status-bar-style',
+ 'content' = 'black',
+ )
+ )
);
$out-addHeadItem( 'loadingscript', Html::inlineScript(
document.documentElement.className += ' page-loading';
@@ -42,7 +52,8 @@
}
if ( $this-isMobileMode ) {
- // FIXME: This needs to occur before
prepareQuickTemplate which wraps the body text in an element with id
mw-content-text
+ // @FIXME: This needs to occur before
prepareQuickTemplate which wraps the body text in an
+ // element with id mw-content-text
// Otherwise we end up with an unnecessary div.
$html = ExtMobileFrontend::DOMParse( $out );
}
@@ -64,7 +75,8 @@
$this-prepareLanguages( $tpl );
// FIXME: Remove need for a page-loading class
$bottomScripts = Html::inlineScript(
- document.documentElement.className =
document.documentElement.className.replace( 'page-loading', '' );
+ document.documentElement.className = .
+ document.documentElement.className.replace(
'page-loading', '' );
);
$bottomScripts .= $out-getBottomScripts();
$tpl-set( 'bottomscripts', $bottomScripts );
@@ -116,7 +128,7 @@
$className = $this-getMode();
if ( $title-isMainPage() ) {
$className .= ' page-Main_Page ';
- } else if ( $title-isSpecialPage() ) {
+ } elseif ( $title-isSpecialPage() ) {
$className .= ' mw-mf-special ';
}
if ( !$this-getUser()-isAnon() ) {
@@ -171,11 +183,15 @@
$tpl-set( 'secondaryButton',
Html::openElement( 'a', array(
'title' = wfMessage(
'mobile-frontend-user-button-tooltip' ),
- 'href' =
$notificationsTitle-getLocalURL( array( 'returnto' =
$currentTitle-getPrefixedText() ) ),
+ 'href' =
$notificationsTitle-getLocalURL(
+ array( 'returnto' =
$currentTitle-getPrefixedText() ) ),
'class' = 'user-button',
'id'= 'secondary-button',
) ) .
-
[MediaWiki-commits] [Gerrit] Prevent the sending of purely-whitespace messages - change (mediawiki...MediaWikiChat)
UltrasonicNXT has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113372
Change subject: Prevent the sending of purely-whitespace messages
..
Prevent the sending of purely-whitespace messages
Brickimedia/brickimedia#214
Change-Id: Ib3992b26a1341e5c6fc19c4a08b80d7652bb1964
---
M MediaWikiChat.php
M Send.api.php
2 files changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat
refs/changes/72/113372/1
diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index 6b1adb0..d575ceb 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -17,7 +17,7 @@
$wgExtensionCredits['specialpage'][] = array(
'path' = __FILE__,
'name' = 'MediaWikiChat',
- 'version' = '2.5.3',
+ 'version' = '2.5.4',
'author' = 'Adam Carter/UltrasonicNXT',
'url' = 'https://www.mediawiki.org/wiki/Extension:MediaWikiChat',
'descriptionmsg' = 'chat-desc',
diff --git a/Send.api.php b/Send.api.php
index 56b5c13..e415aad 100644
--- a/Send.api.php
+++ b/Send.api.php
@@ -9,6 +9,8 @@
$message = $this-getMain()-getVal( 'message' );
if ( $wgUser-isAllowed( 'chat' ) ) {
+ $message = trim( $message );
+
if ( $message != '' ) {
$dbw = wfGetDB( DB_MASTER );
--
To view, visit https://gerrit.wikimedia.org/r/113372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3992b26a1341e5c6fc19c4a08b80d7652bb1964
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT adamr_car...@btinternet.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add selenium-based performance test trying to load Italy - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged. Change subject: Add selenium-based performance test trying to load Italy .. Add selenium-based performance test trying to load Italy Change-Id: I472435ccaa983b8c455c9d39cfe2f03c24eb8def --- A tests/browser/data/italy.json A tests/browser/features/performance_test.feature A tests/browser/features/step_definitions/performance_test_steps.rb M tests/browser/features/support/env.rb M tests/browser/features/support/modules/wikibase_api_module.rb 5 files changed, 178 insertions(+), 4 deletions(-) Approvals: Tobias Gritschacher: Looks good to me, approved WikidataJenkins: Verified -- To view, visit https://gerrit.wikimedia.org/r/112861 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I472435ccaa983b8c455c9d39cfe2f03c24eb8def Gerrit-PatchSet: 14 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de 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] Prevent the sending of purely-whitespace messages - change (mediawiki...MediaWikiChat)
UltrasonicNXT has submitted this change and it was merged.
Change subject: Prevent the sending of purely-whitespace messages
..
Prevent the sending of purely-whitespace messages
Brickimedia/brickimedia#214
Change-Id: Ib3992b26a1341e5c6fc19c4a08b80d7652bb1964
---
M MediaWikiChat.php
M Send.api.php
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
UltrasonicNXT: Verified; Looks good to me, approved
diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index 6b1adb0..d575ceb 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -17,7 +17,7 @@
$wgExtensionCredits['specialpage'][] = array(
'path' = __FILE__,
'name' = 'MediaWikiChat',
- 'version' = '2.5.3',
+ 'version' = '2.5.4',
'author' = 'Adam Carter/UltrasonicNXT',
'url' = 'https://www.mediawiki.org/wiki/Extension:MediaWikiChat',
'descriptionmsg' = 'chat-desc',
diff --git a/Send.api.php b/Send.api.php
index 56b5c13..e415aad 100644
--- a/Send.api.php
+++ b/Send.api.php
@@ -9,6 +9,8 @@
$message = $this-getMain()-getVal( 'message' );
if ( $wgUser-isAllowed( 'chat' ) ) {
+ $message = trim( $message );
+
if ( $message != '' ) {
$dbw = wfGetDB( DB_MASTER );
--
To view, visit https://gerrit.wikimedia.org/r/113372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3992b26a1341e5c6fc19c4a08b80d7652bb1964
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT adamr_car...@btinternet.com
Gerrit-Reviewer: UltrasonicNXT adamr_car...@btinternet.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved Ruby code that multiple repositories use to mediawiki_... - change (mediawiki...MultimediaViewer)
Cmcmahon has submitted this change and it was merged.
Change subject: Moved Ruby code that multiple repositories use to
mediawiki_selenium Ruby gem
..
Moved Ruby code that multiple repositories use to mediawiki_selenium Ruby gem
Bug: 56088
Change-Id: I126fe93ac511570594cfc1ba684b33bd2b356b34
---
M tests/browser/Gemfile.lock
M tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
D tests/browser/features/support/modules/url_module.rb
D tests/browser/features/support/pages/login_page.rb
4 files changed, 10 insertions(+), 46 deletions(-)
Approvals:
Jhall: Looks good to me, but someone else must approve
Cmcmahon: Looks good to me, approved
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index c23a2f6..48eface 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -22,19 +22,19 @@
headless (1.0.1)
i18n (0.6.9)
json (1.8.1)
-mediawiki_selenium (0.2.0)
- cucumber (~ 1.3.10)
- headless (~ 1.0.1)
- json (~ 1.8.1)
- net-http-persistent (~ 2.9.1)
- page-object (~ 0.9.5)
- rest-client (~ 1.6.7)
- rspec-expectations (~ 2.14.4)
- syntax (~ 1.2.0)
+mediawiki_selenium (0.2.2)
+ cucumber (~ 1.3, = 1.3.10)
+ headless (~ 1.0, = 1.0.1)
+ json (~ 1.8, = 1.8.1)
+ net-http-persistent (~ 2.9, = 2.9.1)
+ page-object (~ 0.9, = 0.9.5)
+ rest-client (~ 1.6, = 1.6.7)
+ rspec-expectations (~ 2.14, = 2.14.4)
+ syntax (~ 1.2, = 1.2.0)
mime-types (2.1)
multi_json (1.8.4)
multi_test (0.0.3)
-net-http-persistent (2.9.3)
+net-http-persistent (2.9.4)
page-object (0.9.6)
page_navigation (= 0.9)
selenium-webdriver (= 2.39.0)
diff --git
a/tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
b/tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
index dc467bf..4333101 100644
--- a/tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
+++ b/tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
@@ -3,10 +3,6 @@
on(LightboxDemoPage).image1_in_article_element.should be_visible
end
-Given(/^I am logged in$/) do
- visit(LoginPage).login_with(ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD])
-end
-
When(/^I click on the first image in the article$/) do
on(LightboxDemoPage) do |page|
page.image1_in_article
diff --git a/tests/browser/features/support/modules/url_module.rb
b/tests/browser/features/support/modules/url_module.rb
deleted file mode 100644
index 1dd1856..000
--- a/tests/browser/features/support/modules/url_module.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module URL
- def self.url(name)
-if ENV[MEDIAWIKI_URL]
- mediawiki_url = ENV[MEDIAWIKI_URL]
-else
- mediawiki_url = http://en.wikipedia.beta.wmflabs.org/wiki/;
-end
-#{mediawiki_url}#{name}
- end
-end
diff --git a/tests/browser/features/support/pages/login_page.rb
b/tests/browser/features/support/pages/login_page.rb
deleted file mode 100644
index 6a22f2a..000
--- a/tests/browser/features/support/pages/login_page.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-class LoginPage
- include PageObject
-
- include URL
- page_url URL.url(Special:UserLogin)
-
- button(:login, id: wpLoginAttempt)
- text_field(:password, id: wpPassword1)
- text_field(:username, id: wpName1)
-
- def logged_in_as_element
-@browser.div(id: mw-content-text).p.b
- end
- def login_with(username, password)
-self.username_element.when_present.send_keys(username)
-self.password_element.when_present.send_keys(password)
-login_element.fire_event(onfocus)
-login_element.when_present.click
- end
-end
-
-
--
To view, visit https://gerrit.wikimedia.org/r/112676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I126fe93ac511570594cfc1ba684b33bd2b356b34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Jhall jh...@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] Truncate search suggestions similar to mediawiki.searchSuggest - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113373
Change subject: Truncate search suggestions similar to mediawiki.searchSuggest
..
Truncate search suggestions similar to mediawiki.searchSuggest
The containing... entry at the bottom of the search suggestions
popup was not truncated like it is in the original MediaWiki
module, which is not used in Wikibase.
Additionally I moved the code a little bit to make it look like the
original code in mediawiki.searchSuggest.js.
Change-Id: If4a2893176067d723372b01fc0d35c3e7f760999
---
M
lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
M repo/resources/themes/default/wikibase.ui.entitysearch.css
M repo/resources/wikibase.ui.entitysearch.js
3 files changed, 20 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/73/113373/1
diff --git
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
index 23d04d8..0beed8c 100644
---
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
+++
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
@@ -25,8 +25,9 @@
.ui-entityselector-list .ui-entityselector-aliases {
display: block;
overflow: hidden;
- white-space: nowrap;
+ -o-text-overflow: ellipsis; /* Opera 9 to 10 */
text-overflow: ellipsis;
+ white-space: nowrap;
}
.ui-entityselector-list .ui-entityselector-section-container {
diff --git a/repo/resources/themes/default/wikibase.ui.entitysearch.css
b/repo/resources/themes/default/wikibase.ui.entitysearch.css
index ec5b881..0494ec0 100644
--- a/repo/resources/themes/default/wikibase.ui.entitysearch.css
+++ b/repo/resources/themes/default/wikibase.ui.entitysearch.css
@@ -12,13 +12,20 @@
}
.ui-entityselector-list .wb-entitysearch-suggestions .suggestions-special {
- display: block;
- border: none;
background-color: transparent;
+ border: 0;
+ display: block;
margin: 0;
padding: 0;
}
+.ui-entityselector-list .wb-entitysearch-suggestions .special-query {
+ overflow: hidden;
+ -o-text-overflow: ellipsis; /* Opera 9 to 10 */
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
.ui-entityselector-list .wb-entitysearch-suggestions .ui-state-hover div {
- color: #FF;
+ color: #FFF;
}
diff --git a/repo/resources/wikibase.ui.entitysearch.js
b/repo/resources/wikibase.ui.entitysearch.js
index 7164afb..8225389 100644
--- a/repo/resources/wikibase.ui.entitysearch.js
+++ b/repo/resources/wikibase.ui.entitysearch.js
@@ -51,11 +51,14 @@
url: mw.config.get( 'wgServer' ) + mw.config.get(
'wgScriptPath' ) + '/api.php',
emulateSearchBox: true,
customListItem: {
- content: $( 'div/' ).addClass(
'suggestions-special' )
- .append( $( 'div/' ).addClass(
'special-label ' ).text(
- mw.msg(
'searchsuggest-containing' ) )
- )
- .append( $( 'div/' ).addClass(
'special-query' )
+ content: $( 'div' )
+ .addClass( 'suggestions-special' )
+ .append(
+ $( 'div' )
+ .addClass(
'special-label' )
+ .text( mw.msg(
'searchsuggest-containing' ) ),
+ $( 'div' )
+ .addClass(
'special-query' )
),
action: function( event, entityselector ) {
$form.submit();
--
To view, visit https://gerrit.wikimedia.org/r/113373
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4a2893176067d723372b01fc0d35c3e7f760999
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved tests to UploadWizard repository - change (qa/browsertests)
jenkins-bot has submitted this change and it was merged.
Change subject: Moved tests to UploadWizard repository
..
Moved tests to UploadWizard repository
See also the commit[1] in UploadWizard repository that moves the tests there
and the commit[2] in mediawiki/selenium repository that documents changes in
Jenkins jobs.
1: https://gerrit.wikimedia.org/r/#/c/112895/
2: https://gerrit.wikimedia.org/r/#/c/112899/
Bug: 56419
Change-Id: I3f53483791a5e6427a5e8348ccc5a346c0cb60b7
---
M tests/browser/Gemfile
M tests/browser/Gemfile.lock
D tests/browser/features/step_definitions/upload_wizard_steps.rb
D tests/browser/features/support/pages/describe_page.rb
D tests/browser/features/support/pages/learn_page.rb
D tests/browser/features/support/pages/release_rights_page.rb
D tests/browser/features/support/pages/upload_page.rb
D tests/browser/features/support/pages/upload_wizard_page.rb
D tests/browser/features/support/pages/use_page.rb
D tests/browser/features/upload_wizard.feature
10 files changed, 0 insertions(+), 347 deletions(-)
Approvals:
Cmcmahon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index 8f379eb..f7ea33d 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -3,5 +3,4 @@
source https://rubygems.org;
-gem chunky_png
gem mediawiki_selenium
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index 2f48062..f1a6d86 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -4,7 +4,6 @@
builder (3.2.2)
childprocess (0.4.0)
ffi (~ 1.0, = 1.0.11)
-chunky_png (1.3.0)
cucumber (1.3.10)
builder (= 2.1.2)
diff-lcs (= 1.1.3)
@@ -66,5 +65,4 @@
x86-mingw32
DEPENDENCIES
- chunky_png
mediawiki_selenium
diff --git a/tests/browser/features/step_definitions/upload_wizard_steps.rb
b/tests/browser/features/step_definitions/upload_wizard_steps.rb
deleted file mode 100644
index 9b38d1e..000
--- a/tests/browser/features/step_definitions/upload_wizard_steps.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# This file is subject to the license terms in the LICENSE file found in the
-# qa-browsertests top-level directory and at
-# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of
-# qa-browsertests, including this file, may be copied, modified, propagated, or
-# distributed except according to the terms contained in the LICENSE file.
-#
-# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the
-# qa-browsertests top-level directory and at
-# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS
-#
-When(/^click button Continue$/) do
- on(UploadPage).continue_element.when_present(15).click
-end
-When(/^I click Next button$/) do
- on(UploadWizardPage).next_element.when_present(15).click
-end
-When(/^I click Next button at Describe page$/) do
- sleep 1 # todo # I can not figure out at the moment how to make this work
without using sleep
- on(DescribePage).next_element.when_present(15).click
-end
-When(/^I click Next button at Learn page$/) do
- on(LearnPage).next_element.when_present(15).click
-end
-When(/^I click Next button at Release rights page$/) do
- on(ReleaseRightsPage).next_element.when_present(15).click
-end
-When(/^I click This file is my own work$/) do
- on(ReleaseRightsPage).select_my_own_work
-end
-When(/^I enter category$/) do
- on(DescribePage).category = Test
-end
-When(/^I enter description$/) do
- on(DescribePage).description = description
-end
-When(/^I enter title$/) do
- on(DescribePage).title = Title #{Random.new.rand}
-end
-When(/^I navigate to Upload Wizard$/) do
- visit UploadWizardPage
-end
-When(/^thumbnail should be visible$/) do
- on(ReleaseRightsPage).thumbnail_element.when_present.should be_visible
-end
-When(/^upload file (.+)$/) do |file_name|
- require tempfile
- path = #{Dir.tmpdir}/#{file_name}
-
- require chunky_png
- ChunkyPNG::Image.new(Random.new.rand(255), Random.new.rand(255),
Random.new.rand(255)).save path
-
- if @browser.driver.browser == :chrome
-@browser.execute_script
document.getElementsByName('file')[0].removeAttribute('class');
-@browser.execute_script
document.getElementsByName('file')[0].removeAttribute('style');
- end
-
- on(UploadPage).select_file = path
-end
-Then(/^(.+) checkbox should be there$/) do |_|
- on(LearnPage).skip_element.when_present.should be_visible
-end
-Then(/^Describe page should open$/) do
- @browser.url.should match /Special:UploadWizard/
-end
-Then(/^Learn page should appear$/) do
- @browser.url.should match /Special:UploadWizard/
-end
-Then(/^Release rights page should open$/) do
- @browser.url.should match /Special:UploadWizard/
-end
-Then(/^Select a media file to donate button should be there$/) do
- sleep 1
- on(UploadPage).select_file_element.when_present.should be_visible
-end
-Then(/^title text field should be there$/) do
[MediaWiki-commits] [Gerrit] Moved tests from browsertests repository - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged. Change subject: Moved tests from browsertests repository .. Moved tests from browsertests repository See also the commit[1] that deletes the tests from browsertests repository and the commit[2] in mediawiki/selenium repository that documents changes in Jenkins jobs. 1: https://gerrit.wikimedia.org/r/#/c/112894/ 2: https://gerrit.wikimedia.org/r/#/c/112899/ 3: https://bugzilla.wikimedia.org/show_bug.cgi?id=49313#c2 Bug: 56419 Change-Id: Ifd6005bd1fd1a2ead6bd8c2d5194adafeed4b156 --- A CREDITS A tests/browser/Gemfile A tests/browser/Gemfile.lock A tests/browser/README.md A tests/browser/features/step_definitions/upload_wizard_steps.rb A tests/browser/features/support/env.rb A tests/browser/features/support/pages/describe_page.rb A tests/browser/features/support/pages/learn_page.rb A tests/browser/features/support/pages/release_rights_page.rb A tests/browser/features/support/pages/upload_page.rb A tests/browser/features/support/pages/upload_wizard_page.rb A tests/browser/features/support/pages/use_page.rb A tests/browser/features/upload_wizard.feature 13 files changed, 445 insertions(+), 0 deletions(-) Approvals: Cmcmahon: Looks good to me, approved jenkins-bot: Verified diff --git a/CREDITS b/CREDITS new file mode 100644 index 000..b42d366 --- /dev/null +++ b/CREDITS @@ -0,0 +1,15 @@ +MediaWiki UploadWizard is a collaborative project released under the +GNU General Public License v2. We would like to recognize the +following names for their contribution to the product. + +For further details on licensing, see the COPYING file. + +== Developers == +* Neil Kandalgaonkar +* Jeroen De Dauw +* Mark Holmquist +* Ryan Kaldari +* Michael Dale +* Ankur Anand +* Nischay Nahata +* Yuvi Panda diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile new file mode 100755 index 000..8c620ac --- /dev/null +++ b/tests/browser/Gemfile @@ -0,0 +1,7 @@ +#ruby=ruby-2.1.0 +#ruby-gemset=UploadWizard + +source https://rubygems.org; + +gem chunky_png +gem mediawiki_selenium diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock new file mode 100644 index 000..1ddc40b --- /dev/null +++ b/tests/browser/Gemfile.lock @@ -0,0 +1,66 @@ +GEM + remote: https://rubygems.org/ + specs: +builder (3.2.2) +childprocess (0.4.0) + ffi (~ 1.0, = 1.0.11) +chunky_png (1.3.0) +cucumber (1.3.10) + builder (= 2.1.2) + diff-lcs (= 1.1.3) + gherkin (~ 2.12) + multi_json (= 1.7.5, 2.0) + multi_test (= 0.0.2) +data_magic (0.17) + faker (= 1.1.2) + yml_reader (= 0.2) +diff-lcs (1.2.5) +faker (1.2.0) + i18n (~ 0.5) +ffi (1.9.3) +gherkin (2.12.2) + multi_json (~ 1.3) +headless (1.0.1) +i18n (0.6.9) +json (1.8.1) +mediawiki_selenium (0.2.2) + cucumber (~ 1.3, = 1.3.10) + headless (~ 1.0, = 1.0.1) + json (~ 1.8, = 1.8.1) + net-http-persistent (~ 2.9, = 2.9.1) + page-object (~ 0.9, = 0.9.5) + rest-client (~ 1.6, = 1.6.7) + rspec-expectations (~ 2.14, = 2.14.4) + syntax (~ 1.2, = 1.2.0) +mime-types (2.1) +multi_json (1.8.4) +multi_test (0.0.3) +net-http-persistent (2.9.4) +page-object (0.9.6) + page_navigation (= 0.9) + selenium-webdriver (= 2.39.0) + watir-webdriver (= 0.6.7) +page_navigation (0.9) + data_magic (= 0.14) +rest-client (1.6.7) + mime-types (= 1.16) +rspec-expectations (2.14.5) + diff-lcs (= 1.1.3, 2.0) +rubyzip (1.1.0) +selenium-webdriver (2.39.0) + childprocess (= 0.2.5) + multi_json (~ 1.0) + rubyzip (~ 1.0) + websocket (~ 1.0.4) +syntax (1.2.0) +watir-webdriver (0.6.7) + selenium-webdriver (= 2.18.0) +websocket (1.0.7) +yml_reader (0.2) + +PLATFORMS + ruby + +DEPENDENCIES + chunky_png + mediawiki_selenium diff --git a/tests/browser/README.md b/tests/browser/README.md new file mode 100644 index 000..3631949 --- /dev/null +++ b/tests/browser/README.md @@ -0,0 +1 @@ +Please see https://github.com/wikimedia/mediawiki-selenium for instructions on how to run tests. diff --git a/tests/browser/features/step_definitions/upload_wizard_steps.rb b/tests/browser/features/step_definitions/upload_wizard_steps.rb new file mode 100644 index 000..5898ea2 --- /dev/null +++ b/tests/browser/features/step_definitions/upload_wizard_steps.rb @@ -0,0 +1,87 @@ +# +# This file is subject to the license terms in the COPYING file found in the +# UploadWizard top-level directory and at +# https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/COPYING. No part of +# UploadWizard, including this file, may be copied, modified, propagated, or +# distributed except according to the terms contained in the COPYING file. +# +# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the +# UploadWizard top-level
[MediaWiki-commits] [Gerrit] Moved tests from browsertests repository to UploadWizard rep... - change (mediawiki/selenium)
Cmcmahon has submitted this change and it was merged. Change subject: Moved tests from browsertests repository to UploadWizard repository .. Moved tests from browsertests repository to UploadWizard repository See also commits in browsertests[1] and UploadWizard[2] repositories. Also added WikiLove and ZeroRatedMobileAccess repositories to the template. 1: https://gerrit.wikimedia.org/r/#/c/112894/ 2: https://gerrit.wikimedia.org/r/#/c/112895/ Bug: 56419 Change-Id: I130fd0154a3c87edfcbe5572e56d343f398b0eac --- M README.md M docs/jobs.md M docs/template.md 3 files changed, 37 insertions(+), 28 deletions(-) Approvals: Cmcmahon: Looks good to me, approved diff --git a/README.md b/README.md index 69bae72..f0fc5d1 100644 --- a/README.md +++ b/README.md @@ -77,9 +77,10 @@ 6. Translate: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Translate), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Translate), [Jenkins](https://wmf.ci.cloudbees.com/view/r-tr/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Translate) 7. TwnMainPage: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/TwnMainPage), [GitHub](https://github.com/wikimedia/mediawiki-extensions-TwnMainPage), [Jenkins](https://wmf.ci.cloudbees.com/view/r-tw/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-TwnMainPage) 8. UniversalLanguageSelector: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/UniversalLanguageSelector), [GitHub](https://github.com/wikimedia/mediawiki-extensions-UniversalLanguageSelector), [Jenkins](https://wmf.ci.cloudbees.com/view/r-uls/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-UniversalLanguageSelector) -9. VisualEditor: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/VisualEditor), [GitHub](https://github.com/wikimedia/mediawiki-extensions-VisualEditor), [Jenkins](https://wmf.ci.cloudbees.com/view/r-ve/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-VisualEditor), `/modules/ve-mw/test/browser` folder -10. Wikibase: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Wikibase), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Wikibase), [Jenkins](https://wikidata-cloudbees.ci.cloudbees.com/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Wikibase) -11. browsertests: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/qa/browsertests), [GitHub](https://github.com/wikimedia/qa-browsertests), [Jenkins](https://wmf.ci.cloudbees.com/view/r-bt/), [Code Climate](https://codeclimate.com/github/wikimedia/qa-browsertests) +9. UploadWizard: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/UploadWizard), [GitHub](https://github.com/wikimedia/mediawiki-extensions-UploadWizard), [Jenkins](https://wmf.ci.cloudbees.com/view/r-uw/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-UploadWizard) +10. VisualEditor: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/VisualEditor), [GitHub](https://github.com/wikimedia/mediawiki-extensions-VisualEditor), [Jenkins](https://wmf.ci.cloudbees.com/view/r-ve/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-VisualEditor), `/modules/ve-mw/test/browser` folder +11. Wikibase: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Wikibase), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Wikibase), [Jenkins](https://wikidata-cloudbees.ci.cloudbees.com/), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Wikibase) +12. browsertests: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/qa/browsertests), [GitHub](https://github.com/wikimedia/qa-browsertests), [Jenkins](https://wmf.ci.cloudbees.com/view/r-bt/), [Code Climate](https://codeclimate.com/github/wikimedia/qa-browsertests) ## Contributing diff --git a/docs/jobs.md b/docs/jobs.md index 189a622..334a5b6 100644 --- a/docs/jobs.md +++ b/docs/jobs.md @@ -17,25 +17,6 @@ - MediaWiki user: Selenium_user -# browsertests-commons.wikimedia.beta.wmflabs.org -- MediaWiki URL: commons.wikimedia.beta.wmflabs.org -- bundle exec cucumber: --tags @commons.wikimedia.beta.wmflabs.org -- MediaWiki password variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG - -## browsertests-commons.wikimedia.beta.wmflabs.org-linux-chrome -- Browser Label: chrome - -## browsertests-commons.wikimedia.beta.wmflabs.org-linux-firefox -- Browser Label: firefox - -## browsertests-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_9 -- Browser Label: internet_explorer_9 - -## browsertests-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_10 --
[MediaWiki-commits] [Gerrit] Convert scap-1 to python - change (mediawiki...scap)
jenkins-bot has submitted this change and it was merged.
Change subject: Convert scap-1 to python
..
Convert scap-1 to python
Convert the scap-1 bash script to a pair of python functions.
sync_common contains the core business logic and sync_common_main
provides a wrapper with command line arguments and error logging.
This patch also introduces a utility function for constructing sudo
calls and a small number of doc tests.
Change-Id: Ida1cc1e149383cf26388494fb642e738da30be12
---
M bin/scap-1
M scap/__init__.py
A scap/main.py
M scap/scap.py
A scap/tasks.py
M scap/utils.py
6 files changed, 176 insertions(+), 32 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/scap-1 b/bin/scap-1
index 913cc2f..26835e5 100755
--- a/bin/scap-1
+++ b/bin/scap-1
@@ -1,31 +1,17 @@
-#!/bin/bash
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Sync MW_COMMON
+#
+# Copyright © 2014 Wikimedia Foundation and contributors
-. /usr/local/lib/mw-deployment-vars.sh
+import os
+import sys
-if [ ! -d ${MW_COMMON} ];then
- if ! install -d -o mwdeploy -g mwdeploy ${MW_COMMON}; then
- echo Unable to create ${MW_COMMON}, please re-run this script
as root.
- exit 1
- fi
-fi
+# Add scap package to search path
+script = os.path.realpath(sys.argv[0])
+scap_src = os.path.dirname(os.path.dirname(script))
+sys.path.append(scap_src)
-if [ ! -d /usr/local/apache/uncommon ];then
- if ! install -d -o mwdeploy -g mwdeploy /usr/local/apache/uncommon; then
- echo Unable to create /usr/local/apache/uncommon, please
re-run this script as root.
- exit 1
- fi
-fi
-
-RSYNC_SERVERS=$1
-SERVER=
-if [ -n $RSYNC_SERVERS ]; then
- SERVER=$(sudo /usr/local/bin/find-nearest-rsync $RSYNC_SERVERS)
-fi
-if [ -z $SERVER ]; then
- SERVER=${MW_RSYNC_HOST}
-fi
-
-sudo -u mwdeploy MW_VERSIONS_SYNC=$MW_VERSIONS_SYNC
MW_SCAP_BETA=$MW_SCAP_BETA /usr/local/bin/scap-2 $SERVER
-
-echo Done
-exit 0
+import scap
+sys.exit(scap.sync_common())
diff --git a/scap/__init__.py b/scap/__init__.py
index c2ccf8d..a0a9752 100644
--- a/scap/__init__.py
+++ b/scap/__init__.py
@@ -7,8 +7,12 @@
from .scap import scap
+from .main import sync_common
from . import log
-__all__ = ('scap',)
+__all__ = (
+'scap',
+'sync_common',
+)
log.setup_loggers()
diff --git a/scap/main.py b/scap/main.py
new file mode 100644
index 000..796b5ea
--- /dev/null
+++ b/scap/main.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+scap.main
+~~
+Command wrappers for scap tasks
+
+
+import argparse
+import logging
+import sys
+
+from . import tasks
+from . import utils
+
+
+def sync_common():
+Command wrapper for :func:`tasks.sync_common`
+
+:returns: Integer exit status suitable for use with ``sys.exit``
+
+logger = logging.getLogger('sync_common')
+try:
+
+parser = argparse.ArgumentParser(description='Sync MW_COMMON')
+parser.add_argument('-c', '--conf',
+dest='conf_file', default='/usr/local/lib/mw-deployment-vars.sh',
+help='Path to configuration file')
+parser.add_argument('servers', nargs=argparse.REMAINDER,
+help='Rsync server(s) to copy from')
+args = parser.parse_args()
+args.cfg = utils.get_config(args.conf_file)
+
+tasks.sync_common(args.cfg, args.servers)
+return 0
+
+except SystemExit:
+# Triggered by sys.exit() calls
+raise
+
+except KeyboardInterrupt:
+# Handle ctrl-c from interactive user
+logger.warning('sync_common aborted')
+return 1
+
+except:
+# Handle all unhandled exceptions and errors
+exctype, value = sys.exc_info()[:2]
+logger.error('sync_common failed: %s %s', exctype.__name__, value)
+return 1
diff --git a/scap/scap.py b/scap/scap.py
index 520e8f5..a564d69 100644
--- a/scap/scap.py
+++ b/scap/scap.py
@@ -15,6 +15,7 @@
import time
from . import log
+from . import tasks
from . import utils
@@ -59,7 +60,7 @@
# Update the current machine so that serialization works. Push
# wikiversions.dat changes so mwversionsinuse, set-group-write,
# and mwscript work with the right version of the files.
-subprocess.check_call('/usr/local/bin/sync-common')
+tasks.sync_common(dict(args.cfg.items() + env.items()))
# Update list of extension message files and regenerate the
# localisation cache.
diff --git a/scap/tasks.py b/scap/tasks.py
new file mode 100644
index 000..fed4081
--- /dev/null
+++ b/scap/tasks.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+
+scap.tasks
+~~
+Contains functions implementing scap tasks
+
+
+import logging
+import os
+import socket
+import subprocess
+
+from . import utils
+
+
+def sync_common(cfg, sync_from=None):
+Sync
[MediaWiki-commits] [Gerrit] Add category title as a link inside the message to be more f... - change (pywikibot/i18n)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113374
Change subject: Add category title as a link inside the message to be more
flexible
..
Add category title as a link inside the message to be more flexible
- en translation on top
- add doc message
- add de translation
Change-Id: Ia2e3397bc169653c2e0c97387dd49b6e36855631
---
M makecat.py
1 file changed, 21 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/i18n
refs/changes/74/113374/1
diff --git a/makecat.py b/makecat.py
index e4aa37b..59904ff 100644
--- a/makecat.py
+++ b/makecat.py
@@ -1,42 +1,48 @@
# -*- coding: utf-8 -*-
msg = {
- 'ar': {
- 'makecat-create': u'بوت: إنشاء أو تحديث التصنيف:',
- },
'en': {
- 'makecat-create': u'Robot: Creation or update of category:',
+ 'makecat-create': u'Robot: Creation or update of category
[[:Category:%(cat)s|]]',
+ },
+ 'qqq': {
+ 'makecat-create': u'{{doc-important|Do not change
:Category:%(cat)s so this message will work in any language.}}\nEdit summary
when the bot creates or updates a category.\n* %(cat)s - category name',
+ },
+ 'ar': {
+ 'makecat-create': u'بوت: إنشاء أو تحديث التصنيف
[[:Category:%(cat)s|]]',
+ },
+ 'de': {
+ 'makecat-create': u'Bot: Kategorie [[:Category:%(cat)s|]] wurde
neu angelegt oder aktualisiert',
},
'es': {
- 'makecat-create': u'Bot: Creación o actualiza de la categoría:',
+ 'makecat-create': u'Bot: Creación o actualiza de la categoría
[[:Category:%(cat)s|]]',
},
'fa': {
- 'makecat-create': u'ربات: ایجاد یا تصحیح رده:',
+ 'makecat-create': u'ربات: ایجاد یا تصحیح رده
[[:Category:%(cat)s|]]',
},
'fr': {
- 'makecat-create': u'Robot : Création ou mise à jour de
categorie:',
+ 'makecat-create': u'Robot: Création ou mise à jour de categorie
[[:Category:%(cat)s|]]',
},
'he': {
- 'makecat-create': u'בוט: יצירה או עדכון של קטגוריה:',
+ 'makecat-create': u'בוט: יצירה או עדכון של קטגוריה
[[:Category:%(cat)s|]]',
},
'ia': {
- 'makecat-create': u'Bot: Creation o actualisation de
categoria:',
+ 'makecat-create': u'Bot: Creation o actualisation de categoria
[[:Category:%(cat)s|]]',
},
'it': {
- 'makecat-create': u'Bot: La creazione o laggiornamento di
categoria:',
+ 'makecat-create': u'Bot: La creazione o laggiornamento di
categoria [[:Category:%(cat)s|]]',
},
'nl': {
- 'makecat-create': u'Robot: Aanmaak of uitbreiding van
categorie:',
+ 'makecat-create': u'Robot: Aanmaak of uitbreiding van categorie
[[:Category:%(cat)s|]]',
},
'nn': {
- 'makecat-create': u'robot: oppretting eller oppdatering av
kategori:',
+ 'makecat-create': u'robot: oppretting eller oppdatering av
kategori [[:Category:%(cat)s|]]',
},
'no': {
- 'makecat-create': u'Robot: opprettelse eller oppdatering av
kategori:',
+ 'makecat-create': u'Robot: opprettelse eller oppdatering av
kategori [[:Category:%(cat)s|]]',
},
'pl': {
- 'makecat-create': u'Robot: Stworzenie lub aktualizacja
kategorii:',
+ 'makecat-create': u'Robot: Stworzenie lub aktualizacja
kategorii [[:Category:%(cat)s|]]',
},
'pt': {
- 'makecat-create': u'Robô: Criando ou atualizando categoria:',
+ 'makecat-create': u'Robô: Criando ou atualizando categoria
[[:Category:%(cat)s|]]',
},
};
--
To view, visit https://gerrit.wikimedia.org/r/113374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2e3397bc169653c2e0c97387dd49b6e36855631
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/i18n
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwgrep: use a filtered boolean query - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: mwgrep: use a filtered boolean query
..
mwgrep: use a filtered boolean query
Rather than use a query string query, use a filtered boolean query, per Nik's
recommendation.
Change-Id: I49406f7462cadce4b2c6ee9db04fa4c5b2c12c92
---
M files/misc/scripts/mwgrep
1 file changed, 14 insertions(+), 10 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/misc/scripts/mwgrep b/files/misc/scripts/mwgrep
index 6c5df13..e256cf0 100755
--- a/files/misc/scripts/mwgrep
+++ b/files/misc/scripts/mwgrep
@@ -9,30 +9,34 @@
import argparse
import json
-import urllib
import urllib2
BASE_URI = 'http://search.svc.eqiad.wmnet:9200/_all/page/_search'
-BASE_QUERY = text:{0} AND namespace:8 AND title:(js css)
ap = argparse.ArgumentParser(description='Grep for CSS/JS in MediaWiki: NS')
-ap.add_argument('term', type=BASE_QUERY.format, help='text to search for')
+ap.add_argument('term', help='text to search for')
ap.add_argument('--max-results', type=int, default=100)
args = ap.parse_args()
+filters = [
+{'term': {'namespace': '8'}},
+{'regexp': {'title.keyword': '.*\\.(js|css)'}},
+{'script': {'script': _source['text'].contains('%s') % args.term}},
+]
+
query = {
'size': args.max_results,
-'analyzer': 'keyword',
-'q': args.term,
+'fields': ['namespace', 'title'],
+'query': {'filtered': {'filter': {'bool': {'must': filters,
}
-req = urllib2.urlopen(BASE_URI + '?' + urllib.urlencode(query))
+req = urllib2.urlopen(BASE_URI, json.dumps(query))
result = json.load(req)['hits']
for hit in result['hits']:
-db_name = hit['_index'].split('_', 1)[0]
-title = hit['_source']['title']
-print db_name, title
+db = hit['_index'].split('_', 1)[0]
+title = hit['fields']['title']
+print('{:20}{}'.format(db, title))
-print '(total: %s, shown: %s)' % (result['total'], len(result['hits']))
+print('(total: %s, shown: %s)' % (result['total'], len(result['hits'])))
--
To view, visit https://gerrit.wikimedia.org/r/113351
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I49406f7462cadce4b2c6ee9db04fa4c5b2c12c92
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add WikimediaEvents role - change (mediawiki/vagrant)
Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113375
Change subject: Add WikimediaEvents role
..
Add WikimediaEvents role
Change-Id: Ifac155a7674e02a6cea7a15388f3a96dd80052b1
---
A puppet/manifests/roles/wikimediaevents.pp
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/75/113375/1
diff --git a/puppet/manifests/roles/wikimediaevents.pp
b/puppet/manifests/roles/wikimediaevents.pp
new file mode 100644
index 000..fdc6185
--- /dev/null
+++ b/puppet/manifests/roles/wikimediaevents.pp
@@ -0,0 +1,9 @@
+# == Class: role::wikimediaevents
+# Configures WikimediaEvents, a MediaWiki extension that uses
+# EventLogging to log certain events.
+class role::wikimediaevents {
+include role::mediawiki
+include role::eventlogging
+
+mediawiki::extension { 'WikimediaEvents': }
+}
--
To view, visit https://gerrit.wikimedia.org/r/113375
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifac155a7674e02a6cea7a15388f3a96dd80052b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] use i18n parameter for replacement of category title - change (pywikibot/core)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113376
Change subject: use i18n parameter for replacement of category title
..
use i18n parameter for replacement of category title
uses new i18n file comitted with
https://gerrit.wikimedia.org/r/#/c/113374/
Change-Id: I298a7a3ae8037348f3888a7f06df893278bcfc71
---
M scripts/makecat.py
1 file changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/76/113376/1
diff --git a/scripts/makecat.py b/scripts/makecat.py
index 509f8b9..4f34b6f 100644
--- a/scripts/makecat.py
+++ b/scripts/makecat.py
@@ -32,7 +32,7 @@
# (C) Andre Engels, 2004
-# (C) Pywikipedia bot team 2005-2010
+# (C) Pywikibot team 2005-2014
#
# Distributed under the terms of the MIT license.
#
@@ -51,8 +51,7 @@
def isdate(s):
-returns true iff s is a date or year
-
+returns true if s is a date or year
dict, val = date.getAutoFormat(pywikibot.getSite().language(), s)
return dict is not None
@@ -126,7 +125,7 @@
ctoshow = 500
pywikibot.output(u'')
pywikibot.output(u==%s== % pl.title())
-while 1:
+while True:
answer = raw_input(y(es)/n(o)/i(gnore)/(o)ther options? )
if answer == 'y':
include(pl)
@@ -222,7 +221,7 @@
workingcatname = ' '.join(workingcatname)
mysite = pywikibot.getSite()
workingcatname = unicode(workingcatname, 'utf-8')
-pywikibot.setAction(i18n.twtranslate(mysite, 'makecat-create') + u' ' +
workingcatname)
+pywikibot.setAction(i18n.twtranslate(mysite, 'makecat-create', {'cat':
workingcatname)})
workingcat = pywikibot.Category(mysite,
u'%s:%s'
% (mysite.category_namespace(),
--
To view, visit https://gerrit.wikimedia.org/r/113376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I298a7a3ae8037348f3888a7f06df893278bcfc71
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make reindex process less brittle - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Make reindex process less brittle
..
Make reindex process less brittle
1. Catch bulk index failures and retry them as single indexes. This should
help with really really large pages.
2. Catch failures in those single indexes and backoff for some time and
retry.
3. Make the batch size and the number of errors to try to backoff from
configurable.
Change-Id: I77c82dc8dcaf180f4d701d4ea277c1c45262592d
---
M maintenance/updateOneSearchIndexConfig.php
1 file changed, 59 insertions(+), 5 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/updateOneSearchIndexConfig.php
b/maintenance/updateOneSearchIndexConfig.php
index 962a07f..0d34258 100644
--- a/maintenance/updateOneSearchIndexConfig.php
+++ b/maintenance/updateOneSearchIndexConfig.php
@@ -3,6 +3,7 @@
namespace CirrusSearch;
use Elastica;
use \Maintenance;
+use \ProfileSection;
/**
* Update the search configuration on the search backend.
@@ -43,7 +44,8 @@
// Is the index currently closed?
private $closed = false;
- private $reindexChunkSize = 1000;
+ private $reindexChunkSize;
+ private $reindexRetryAttempts;
private $indexBaseName;
private $indexIdentifier;
@@ -129,6 +131,14 @@
$maintenance-addOption( 'reindexAcceptableCountDeviation',
'How much can the reindexed ' .
'copy of an index is allowed to deviate from the
current copy without triggering a ' .
'reindex failure. Defaults to 5%.', false, true );
+ $maintenance-addOption( 'reindexChunkSize', 'Documents per
shard to reindex in a batch. ' .
+ 'Note when changing the number of shards that the old shard
size is used, not the new ' .
+ 'one. If you see many errors submitting documents in bulk
but the automatic retry as ' .
+ 'singles works then lower this number. Defaults to 100.',
false, true );
+ $maintenance-addOption( 'reindexRetryAttempts', 'Number of
times to back off and retry ' .
+ 'per failure. Note that failures are not common but if
Elasticsearch is in the process ' .
+ 'of moving a shard this can time out. This will retry
the attempt after some backoff ' .
+ 'rather than failing the whole reindex process.
Defaults to 5.', false, true );
$maintenance-addOption( 'baseName', 'What basename to use for
all indexes, ' .
'defaults to wiki id', false, true );
}
@@ -152,6 +162,8 @@
$this-reindexProcesses = $this-getOption( 'reindexProcesses',
wfIsWindows() ? 1 : 10 );
$this-reindexAcceptableCountDeviation =
$this-parsePotentialPercent(
$this-getOption( 'reindexAcceptableCountDeviation',
'5%' ) );
+ $this-reindexChunkSize = $this-getOption( 'reindexChunkSize',
100 );
+ $this-reindexRetryAttempts = $this-getOption(
'reindexRetryAttempts', 5 );
$this-langCode = $wgLanguageCode;
$this-aggressiveSplitting =
$wgCirrusSearchUseAggressiveSplitting;
$this-prefixSearchStartsWithAny =
$wgCirrusSearchPrefixSearchStartsWithAnyWord;
@@ -630,10 +642,7 @@
$result-next();
}
wfProfileOut( __METHOD__ . '::packageDocs' );
- wfProfileIn( __METHOD__ . '::sendDocs' );
- $updateResult =
$this-getPageType()-addDocuments( $documents );
- wfDebugLog( 'CirrusSearch', 'Update completed
in ' . $updateResult-getEngineTime() . ' (engine) millis' );
- wfProfileOut( __METHOD__ . '::sendDocs' );
+ $this-sendDocumentsWithRetry( $messagePrefix,
$documents );
$completed += $result-count();
$rate = round( $completed / ( microtime( true )
- $operationStartTime ) );
$this-output( $this-indent . $messagePrefix .
@@ -646,6 +655,51 @@
}
}
+ private function sendDocumentsWithRetry( $messagePrefix, $documents ) {
+ $profiler = new ProfileSection( __METHOD__ );
+
+ $errors = 0;
+ while ( true ) {
+ if ( $errors $this-reindexRetryAttempts ) {
+ try {
+ $this-sendDocuments( $messagePrefix,
$documents );
+ return;
+ } catch (
\Elastica\Exception\ExceptionInterface $e ) {
+
[MediaWiki-commits] [Gerrit] default entry point for extension + sqlite db update - change (mediawiki...TwoFactorAuthentication)
jenkins-bot has submitted this change and it was merged.
Change subject: default entry point for extension + sqlite db update
..
default entry point for extension + sqlite db update
Wikimedia CI system expect extension to have a default entry point named
a like the extension. A symlink is good enough for it.
The ExtensionSchemaUpdate hook was only acting for MySQL backend, added
in the sqlite database backend as well.
Change-Id: I53ec2c3d78c4110f5f6530c7c52120e70a01e667
---
M TwoFactorAuth.hooks.php
A TwoFactorAuthentication.php
M TwoFactorUser.php
M tests/TwoFactorUserTest.php
4 files changed, 38 insertions(+), 33 deletions(-)
Approvals:
Parent5446: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/TwoFactorAuth.hooks.php b/TwoFactorAuth.hooks.php
index f37c9d3..99f8e15 100644
--- a/TwoFactorAuth.hooks.php
+++ b/TwoFactorAuth.hooks.php
@@ -137,6 +137,7 @@
$base = dirname( __FILE__ );
switch ( $updater-getDB()-getType() ) {
case 'mysql':
+ case 'sqlite':
$updater-addExtensionTable( 'twofactorauth',
$base/twofactorauth.sql );
break;
}
diff --git a/TwoFactorAuthentication.php b/TwoFactorAuthentication.php
new file mode 12
index 000..61c9a06
--- /dev/null
+++ b/TwoFactorAuthentication.php
@@ -0,0 +1 @@
+TwoFactorAuth.php
\ No newline at end of file
diff --git a/TwoFactorUser.php b/TwoFactorUser.php
index f5461d1..10bdd09 100644
--- a/TwoFactorUser.php
+++ b/TwoFactorUser.php
@@ -142,9 +142,11 @@
$memcKey = wfMemcKey( 'twofactorauth', 'lasttoken',
$this-user-getId() );
$lastTokens = $wgMemc-get( $memcKey );
- if ( in_array( $token, $lastTokens ) ) {
+ if ( is_array( $lastTokens ) in_array( $token, $lastTokens )
) {
// Token was already used recently.
return false;
+ } elseif ( !is_array( $lastTokens ) ) {
+ $lastTokens = array();
}
$results = HOTP::generateByTimeWindow(
@@ -161,18 +163,22 @@
array_unshift( $lastTokens, $token );
// Keep the lastTokens array trimmed to the
number of tokens accepted (due to leniency)
array_splice( $lastTokens,
$wgTwoFactorWindowLeniency * 2 );
- $wgMemc-set( $memcKey, $lastTokens, 2 *
$wgTwoFactorLeniency * $wgTwoFactorWindowSize );
+ $wgMemc-set( $memcKey, $lastTokens, 2 *
$wgTwoFactorWindowLeniency * $wgTwoFactorWindowSize );
+
return true;
}
}
// See if the user is using a scratch token
- for ( $i = 0; $i count( $this-scratchTokens ); $i++ ) {
+ $numTokens = count( $this-scratchTokens );
+ for ( $i = 0; $i $numTokens; $i++ ) {
if ( $token === $this-scratchTokens[$i] ) {
// If there is a scratch token, remove it from
the scratch token list
unset( $this-scratchTokens[$i] );
- // Only return true if we removed it from the
database
- return $this-updateScratchTokens();
+ $this-scratchTokens = array_values(
$this-scratchTokens );
+ $this-updateScratchTokens();
+
+ return true;
}
}
@@ -199,7 +205,7 @@
if( $success ) {
$this-enabled = true;
}
- return $success;
+ return (bool)$success;
}
/**
@@ -218,18 +224,18 @@
if( $success ) {
$this-enabled = false;
}
- return $success;
+ return (bool)$success;
}
/**
* Update the list of scratch token to the database. This function is
* used when a scratch token is spent and needs to be invalidated.
*
-* @return bool
+* @return void
*/
public function updateScratchTokens() {
$dbw = wfGetDB( DB_MASTER );
- return $dbw-update(
+ $dbw-update(
'twofactorauth',
array( 'scratch_tokens' = serialize(
$this-scratchTokens ) ),
array( 'id' = $this-user-getId() ),
diff --git a/tests/TwoFactorUserTest.php b/tests/TwoFactorUserTest.php
index 52051d8..5e98682 100644
--- a/tests/TwoFactorUserTest.php
+++ b/tests/TwoFactorUserTest.php
@@ -5,8 +5,11 @@
* @group
[MediaWiki-commits] [Gerrit] WIP: Autonym font browser test refactoring - change (mediawiki...UniversalLanguageSelector)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/113378 Change subject: WIP: Autonym font browser test refactoring .. WIP: Autonym font browser test refactoring * Renamed Autonym font test to Web fonts test. * phantomjs bug is fixed. * Interlanguage autonym font is blacklisted. Commented. Change-Id: I5c7433b917b8d7f79f706a4a7a97a6c6a9a6afa2 --- M tests/browser/features/autonym.feature 1 file changed, 8 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/78/113378/1 diff --git a/tests/browser/features/autonym.feature b/tests/browser/features/autonym.feature index d5283da..b9f7f84 100644 --- a/tests/browser/features/autonym.feature +++ b/tests/browser/features/autonym.feature @@ -1,14 +1,7 @@ -# The tests do not normalize the font-family passed back by the browser -# Firefox/Chrome/Phantomjs handle the normalization differently. -# -# https://bugzilla.wikimedia.org/show_bug.cgi?id=57101 -@phantomjs-bug -Feature: Autonym font +Feature: Web fonts - * Web font should always be applied to the ULS language selector's language -selection screen for display and input languages. - * Web font should always be applied to the interlanguage section of MediaWiki -when MediaWiki extension ULS is installed. + * WIP: Autonym -- Web fonts + * See: https://upload.wikimedia.org/wikipedia/commons/7/7d/ULS-WebFonts-Workflow-Diagram.png @login @commons.wikimedia.beta.wmflabs.org Scenario: Autonym font is used in the ULS language search dialog for display language selection by logged-in users @@ -26,11 +19,11 @@ When I click the button with the ellipsis Then the language list of ULS should use Autonym font - @en.wikipedia.beta.wmflabs.org - Scenario: Autonym font should be used in the Interlanguage area of a page only with Interlanguage links -When I am on the main page -Then the Interlanguage links should use Autonym font - And elements that are not Interlanguage links should not use Autonym font + #@en.wikipedia.beta.wmflabs.org + #Scenario: Autonym font should be used in the Interlanguage area of a page only with Interlanguage links + # When I am on the main page + # Then the Interlanguage links should use Autonym font + #And elements that are not Interlanguage links should not use Autonym font @commons.wikimedia.beta.wmflabs.org Scenario: Autonym font is used in the ULS language search dialog for input language selection by anonymous users -- To view, visit https://gerrit.wikimedia.org/r/113378 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5c7433b917b8d7f79f706a4a7a97a6c6a9a6afa2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master 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] Revert Add local interwiki for metawiki - change (operations/mediawiki-config)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113377
Change subject: Revert Add local interwiki for metawiki
..
Revert Add local interwiki for metawiki
Breaks things, see some test cases at
https://meta.wikimedia.org/?oldid=7493717
This reverts commit f7bdb7a48cc91c81e61cd9985de216d7bf90c047.
Change-Id: I73b93d34779612384d74a22292647ad89d29d46d
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/77/113377/1
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index c7f642d..dd2e4f4 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -154,7 +154,6 @@
'wgLocalInterwiki' = array(
'default' = '$lang',
'mediawikiwiki' = 'mw',
- 'metawiki' = 'm',
),
# wgLocaltimezone @{
--
To view, visit https://gerrit.wikimedia.org/r/113377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I73b93d34779612384d74a22292647ad89d29d46d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-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] Fix CU formatter test - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113379
Change subject: Fix CU formatter test
..
Fix CU formatter test
Change-Id: I4086dcfa8789f786657bc3dee67b9367417f2b3a
---
M tests/FormatterTest.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/79/113379/1
diff --git a/tests/FormatterTest.php b/tests/FormatterTest.php
index 6f2c45b..36f3306 100644
--- a/tests/FormatterTest.php
+++ b/tests/FormatterTest.php
@@ -56,9 +56,9 @@
}
// @fixme code smell, duplicating code from elsewhere in test
- $comment = $action . ',' . $workflowId-getHex();
+ $comment = $action . ',' . $workflowId-getAlphadecimal();
if ( $postId ) {
- $comment .= ',' . $postId-getHex();
+ $comment .= ',' . $postId-getAlphadecimal();
}
$row = (object) array(
@@ -78,7 +78,7 @@
// Code uses wfWarn as a louder wfDebugLog in error conditions.
// but phpunit considers a warning a fail.
wfSuppressWarnings();
- $links = $this-createFormatter( 'Flow\CheckUser\Formatter'
)-format( $checkUser, $row );
+ $links = $this-createFormatter( 'Flow\Formatter\CheckUser'
)-format( $checkUser, $row );
wfRestoreWarnings();
$test( $this, $message, $links );
}
--
To view, visit https://gerrit.wikimedia.org/r/113379
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4086dcfa8789f786657bc3dee67b9367417f2b3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only allow pointer events on shields inside generated conten... - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Only allow pointer events on shields inside generated content
nodes
..
Only allow pointer events on shields inside generated content nodes
Often the wrapper and contents have different size and positioning
characteristics than the shields, and shouldn't be interacted with
directly. For example, a centered image has a 100% width wrapper with a
figure inside with a fixed width and horizontal margins set to auto. The
wrapper ends up being a click block to the left and right, when all we
really want to do is make the shields clickable.
Change-Id: I2c2c592d78025cfd983c20d263a0e600616c9ae1
---
M modules/ve/ce/styles/ve.ce.Node.css
1 file changed, 10 insertions(+), 0 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ce/styles/ve.ce.Node.css
b/modules/ve/ce/styles/ve.ce.Node.css
index 5eddb5c..c4737a3 100644
--- a/modules/ve/ce/styles/ve.ce.Node.css
+++ b/modules/ve/ce/styles/ve.ce.Node.css
@@ -168,6 +168,16 @@
/* ve.ce.GeneratedContentNode */
+/* Prevent GeneratedContentNode wrappers from being interacted with */
+.ve-ce-generatedContentNode {
+ pointer-events: none;
+}
+
+/* Allow GeneratedContentNode content to be interacted with */
+.ve-ce-generatedContentNode .ve-ce-protectedNode-shield {
+ pointer-events: all;
+}
+
.ve-ce-generatedContentNode-generating {
opacity: 0.5;
}
--
To view, visit https://gerrit.wikimedia.org/r/113256
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2c2c592d78025cfd983c20d263a0e600616c9ae1
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: 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] Remove old CU formatter - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113381
Change subject: Remove old CU formatter
..
Remove old CU formatter
https://gerrit.wikimedia.org/r/#/c/113154/ moves all formatters.
For some reason, this one was not properly renamed, but added
a second time, instead.
Change-Id: I8d429a460f75e60df04d0a0802d6e9e134677ab4
---
D includes/CheckUser/Formatter.php
1 file changed, 0 insertions(+), 64 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/81/113381/1
diff --git a/includes/CheckUser/Formatter.php b/includes/CheckUser/Formatter.php
deleted file mode 100644
index 1b40666..000
--- a/includes/CheckUser/Formatter.php
+++ /dev/null
@@ -1,64 +0,0 @@
-?php
-
-namespace Flow\CheckUser;
-
-use CheckUser;
-use Html;
-use Linker;
-use Title;
-use Flow\AbstractFormatter;
-use Flow\Model\UUID;
-
-class Formatter extends AbstractFormatter {
-
- /**
-* @param CheckUser $checkUser
-* @param object $row
-* @return array|null
-*/
- public function format( CheckUser $checkUser, $row ) {
- if ( $row-cuc_type != RC_FLOW || !$row-cuc_comment ) {
- return null;
- }
-
- $data = explode( ',', $row-cuc_comment );
- $post = null;
- switch( count( $data ) ) {
- case 3:
- $post = UUID::create( $data[2] );
- // fall-through to 2 parameter case
- case 2:
- $workflow = UUID::create( $data[1] );
- $action = $data[0];
- break;
- default:
- wfDebugLog( __CLASS__, __FUNCTION__ . ':
Invalid number of parameters received from cuc_comment. Expected 2 or 3 but
received ' . count( $data ) );
- return null;
- }
-
- $title = Title::makeTitle( $row-cuc_namespace, $row-cuc_title
);
- $links = $this-buildActionLinks( $title, $action, $workflow,
$post );
- if ( $links === false ) {
- return null;
- }
-
- $result = array();
- $ctx = $checkUser-getContext();
- foreach ( $links as $key = $link ) {
- list( $url, $message ) = $link;
- $text = $message-setContext( $ctx )-text();
- $result[$key] = $checkUser-msg( 'parentheses' )
- -rawParams( Html::element(
- 'a',
- array(
- 'href' = $url,
- 'title' = $text,
- ),
- $text
- ) );
- }
- $result['title'] = '. . ' . Linker::link( $title );
-
- return $result;
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/113381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d429a460f75e60df04d0a0802d6e9e134677ab4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove old CU formatter - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove old CU formatter
..
Remove old CU formatter
https://gerrit.wikimedia.org/r/#/c/113154/ moves all formatters.
For some reason, this one was not properly renamed, but added
a second time, instead.
Change-Id: I8d429a460f75e60df04d0a0802d6e9e134677ab4
---
D includes/CheckUser/Formatter.php
1 file changed, 0 insertions(+), 64 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/CheckUser/Formatter.php b/includes/CheckUser/Formatter.php
deleted file mode 100644
index 1b40666..000
--- a/includes/CheckUser/Formatter.php
+++ /dev/null
@@ -1,64 +0,0 @@
-?php
-
-namespace Flow\CheckUser;
-
-use CheckUser;
-use Html;
-use Linker;
-use Title;
-use Flow\AbstractFormatter;
-use Flow\Model\UUID;
-
-class Formatter extends AbstractFormatter {
-
- /**
-* @param CheckUser $checkUser
-* @param object $row
-* @return array|null
-*/
- public function format( CheckUser $checkUser, $row ) {
- if ( $row-cuc_type != RC_FLOW || !$row-cuc_comment ) {
- return null;
- }
-
- $data = explode( ',', $row-cuc_comment );
- $post = null;
- switch( count( $data ) ) {
- case 3:
- $post = UUID::create( $data[2] );
- // fall-through to 2 parameter case
- case 2:
- $workflow = UUID::create( $data[1] );
- $action = $data[0];
- break;
- default:
- wfDebugLog( __CLASS__, __FUNCTION__ . ':
Invalid number of parameters received from cuc_comment. Expected 2 or 3 but
received ' . count( $data ) );
- return null;
- }
-
- $title = Title::makeTitle( $row-cuc_namespace, $row-cuc_title
);
- $links = $this-buildActionLinks( $title, $action, $workflow,
$post );
- if ( $links === false ) {
- return null;
- }
-
- $result = array();
- $ctx = $checkUser-getContext();
- foreach ( $links as $key = $link ) {
- list( $url, $message ) = $link;
- $text = $message-setContext( $ctx )-text();
- $result[$key] = $checkUser-msg( 'parentheses' )
- -rawParams( Html::element(
- 'a',
- array(
- 'href' = $url,
- 'title' = $text,
- ),
- $text
- ) );
- }
- $result['title'] = '. . ' . Linker::link( $title );
-
- return $result;
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/113381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8d429a460f75e60df04d0a0802d6e9e134677ab4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@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 CU formatter test - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix CU formatter test
..
Fix CU formatter test
Change-Id: I4086dcfa8789f786657bc3dee67b9367417f2b3a
---
M tests/FormatterTest.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/FormatterTest.php b/tests/FormatterTest.php
index 6f2c45b..36f3306 100644
--- a/tests/FormatterTest.php
+++ b/tests/FormatterTest.php
@@ -56,9 +56,9 @@
}
// @fixme code smell, duplicating code from elsewhere in test
- $comment = $action . ',' . $workflowId-getHex();
+ $comment = $action . ',' . $workflowId-getAlphadecimal();
if ( $postId ) {
- $comment .= ',' . $postId-getHex();
+ $comment .= ',' . $postId-getAlphadecimal();
}
$row = (object) array(
@@ -78,7 +78,7 @@
// Code uses wfWarn as a louder wfDebugLog in error conditions.
// but phpunit considers a warning a fail.
wfSuppressWarnings();
- $links = $this-createFormatter( 'Flow\CheckUser\Formatter'
)-format( $checkUser, $row );
+ $links = $this-createFormatter( 'Flow\Formatter\CheckUser'
)-format( $checkUser, $row );
wfRestoreWarnings();
$test( $this, $message, $links );
}
--
To view, visit https://gerrit.wikimedia.org/r/113379
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4086dcfa8789f786657bc3dee67b9367417f2b3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@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 propagate permissions to older revisions - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't propagate permissions to older revisions
..
Don't propagate permissions to older revisions
Revisions are meant to be a standalone snapshot in time.
Instead of propagating changes in permissions, we should look at the
most recent revision to fetch the current revision state.
Otherwise, we lose track of history. E.g. we can't know if a certain
revision is/was suppressed and should be hidden from sight, if at a
later point, a later revision got restored.
Change-Id: I14f3ecc30cd003e40df110116a44474b6f424ecd
---
M Hooks.php
M includes/Block/Topic.php
M includes/Log/PostModerationLogger.php
M includes/Model/AbstractRevision.php
M includes/Model/Header.php
5 files changed, 25 insertions(+), 79 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Hooks.php b/Hooks.php
index 896de24..f1599a1 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -287,7 +287,7 @@
* @return bool
*/
public static function onUserGetReservedNames( $names ) {
- $permissions = array_keys( Flow\Model\AbstractRevision::$perms
);
+ $permissions = Flow\Model\AbstractRevision::$perms;
foreach ( $permissions as $permission ) {
$names[] = msg:flow-$permission-usertext;
}
diff --git a/includes/Block/Topic.php b/includes/Block/Topic.php
index 095c011..f649010 100644
--- a/includes/Block/Topic.php
+++ b/includes/Block/Topic.php
@@ -30,7 +30,6 @@
protected $topicTitle;
protected $rootLoader;
protected $newRevision;
- protected $relatedRevisions = array();
protected $notification;
protected $requestedPost = array();
@@ -273,11 +272,7 @@
$reason = $this-submitted['reason'];
- if ( $post-needsModerateHistorical( $newState ) ) {
- $this-relatedRevisions = $this-loadHistorical( $post
);
- }
-
- $this-newRevision = $post-moderate( $this-user, $newState,
$action, $reason, $this-relatedRevisions );
+ $this-newRevision = $post-moderate( $this-user, $newState,
$action, $reason );
if ( !$this-newRevision ) {
$this-addError( 'moderate', wfMessage(
'flow-error-not-allowed' ) );
return;
@@ -358,10 +353,6 @@
$this-storage-put( $this-newRevision );
$this-storage-put( $this-workflow );
- // These are moderated historical revisions of
$this-newRevision
- foreach ( $this-relatedRevisions as $revision ) {
- $this-storage-put( $revision );
- }
$self = $this;
$newRevision = $this-newRevision;
$rootPost = $this-loadRootPost();
diff --git a/includes/Log/PostModerationLogger.php
b/includes/Log/PostModerationLogger.php
index 4a56234..1b4cb34 100644
--- a/includes/Log/PostModerationLogger.php
+++ b/includes/Log/PostModerationLogger.php
@@ -60,7 +60,7 @@
if ( ! $changeTypes ) {
$changeTypes = array();
- foreach( AbstractRevision::$perms as $perm = $info ) {
+ foreach( AbstractRevision::$perms as $perm ) {
if ( $perm != '' ) {
$changeTypes[] = {$perm}-topic;
$changeTypes[] = {$perm}-post;
diff --git a/includes/Model/AbstractRevision.php
b/includes/Model/AbstractRevision.php
index b49c53d..f471296 100644
--- a/includes/Model/AbstractRevision.php
+++ b/includes/Model/AbstractRevision.php
@@ -18,26 +18,15 @@
const MODERATED_SUPPRESSED = 'suppress';
/**
-* Metadata relatied to moderation states from least restrictive
-* to most restrictive.
+* List of available permission levels.
+*
+* @var array
**/
static public $perms = array(
- self::MODERATED_NONE = array(
- // Whether or not to apply transition to this
moderation state to historical revisions
- 'historical' = true,
- ),
- self::MODERATED_HIDDEN = array(
- // Whether or not to apply transition to this
moderation state to historical revisions
- 'historical' = false,
- ),
- self::MODERATED_DELETED = array(
- // Whether or not to apply transition to this
moderation state to historical revisions
- 'historical' = true,
- ),
- self::MODERATED_SUPPRESSED = array(
- // Whether or not to
[MediaWiki-commits] [Gerrit] Split permission-logic into separate method - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Split permission-logic into separate method
..
Split permission-logic into separate method
Change-Id: I81618dd2aa9a1cbbefb0ce494b86db3ccd18051a
---
M includes/RevisionActionPermissions.php
1 file changed, 27 insertions(+), 13 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/RevisionActionPermissions.php
b/includes/RevisionActionPermissions.php
index 2121fda..7cab0b0 100644
--- a/includes/RevisionActionPermissions.php
+++ b/includes/RevisionActionPermissions.php
@@ -59,24 +59,12 @@
return false;
}
- // $revision may be null if the revision has yet to be created
- $moderationState = AbstractRevision::MODERATED_NONE;
- if ( $revision instanceof AbstractRevision ) {
- $moderationState = $revision-getModerationState();
- }
- $permission = $this-actions-getValue( $action, 'permissions',
$moderationState );
+ $permission = $this-getPermission( $revision, $action );
// If no permission is defined for this state, then the action
is not allowed
// check if permission is set for this action
if ( $permission === null ) {
return false;
- }
-
- // Some permissions may be more complex to be defined as simple
array
- // values, in which case they're a Closure (which will accept
- // AbstractRevision FlowActionPermissions as arguments)
- if ( $permission instanceof Closure ) {
- $permission = $permission( $revision, $this );
}
// check if user is allowed to perform action
@@ -113,6 +101,32 @@
}
/**
+* Returns the permission specified in FlowActions for the given action
+* against the given revision's moderation state.
+*
+* @param AbstractRevision[optional] $revision
+* @param string $action
+* @return Closure|string
+*/
+ public function getPermission( AbstractRevision $revision = null,
$action ) {
+ // $revision may be null if the revision has yet to be created
+ $moderationState = AbstractRevision::MODERATED_NONE;
+ if ( $revision instanceof AbstractRevision ) {
+ $moderationState = $revision-getModerationState();
+ }
+ $permission = $this-actions-getValue( $action, 'permissions',
$moderationState );
+
+ // Some permissions may be more complex to be defined as simple
array
+ // values, in which case they're a Closure (which will accept
+ // AbstractRevision FlowActionPermissions as arguments)
+ if ( $permission instanceof Closure ) {
+ $permission = $permission( $revision, $this );
+ }
+
+ return $permission;
+ }
+
+ /**
* @return User
*/
public function getUser() {
--
To view, visit https://gerrit.wikimedia.org/r/112158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I81618dd2aa9a1cbbefb0ce494b86db3ccd18051a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Jakobj jakob-jungm...@hotmail.de
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Gracefully handle empty pagination result - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Gracefully handle empty pagination result
..
Gracefully handle empty pagination result
Pagination was mistakenly interpreting an empty result
set as result set containing a single null value.
Bug: 61349
Change-Id: Ia8afd0457baec1527ad8a7de3a656aa3b9b3d312
---
M includes/Data/Pager.php
1 file changed, 5 insertions(+), 2 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Data/Pager.php b/includes/Data/Pager.php
index fd229c8..2616af5 100644
--- a/includes/Data/Pager.php
+++ b/includes/Data/Pager.php
@@ -36,8 +36,11 @@
// Retrieve results
$results = $this-storage-find( $this-query, $options );
-
- return $this-processPage( $direction, $offset, $pageLimit,
$results );
+ if ( $results === null ) {
+ return new PagerPage( array(), array(), $this );
+ } else {
+ return $this-processPage( $direction, $offset,
$pageLimit, $results );
+ }
}
public function getDefaultLimit() {
--
To view, visit https://gerrit.wikimedia.org/r/113380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8afd0457baec1527ad8a7de3a656aa3b9b3d312
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
