[MediaWiki-commits] [Gerrit] Make the main script load on-demand - change (mediawiki...ImageMetrics)
jenkins-bot has submitted this change and it was merged.
Change subject: Make the main script load on-demand
..
Make the main script load on-demand
Change-Id: I93bb46e6589f0496b5b7cdecddd45fec62201d87
---
M ImageMetrics.php
M resources/ext.imageMetrics.js
A resources/ext.imageMetrics.loader.js
3 files changed, 36 insertions(+), 18 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ImageMetrics.php b/ImageMetrics.php
index cbc5420..b621ca6 100644
--- a/ImageMetrics.php
+++ b/ImageMetrics.php
@@ -49,6 +49,12 @@
'targets' = array( 'desktop', 'mobile' ),
'position' = 'top',
),
+ 'ext.imageMetrics.loader' = array(
+ 'scripts' = 'ext.imageMetrics.loader.js',
+ 'localBasePath' = __DIR__ . '/resources',
+ 'remoteExtPath' = 'ImageMetrics/resources',
+ 'targets' = array( 'desktop', 'mobile' ),
+ ),
);
/**
@@ -58,7 +64,7 @@
*/
$wgHooks['BeforePageDisplay'][] = function ( $out, $skin ) {
if ( $out-getTitle()-inNamespace( NS_FILE ) Action::getActionName(
$out-getContext() ) === 'view' ) {
- $out-addModules( array( 'ext.imageMetrics.head',
'ext.imageMetrics' ) );
+ $out-addModules( array( 'ext.imageMetrics.head',
'ext.imageMetrics.loader' ) );
}
return true;
};
diff --git a/resources/ext.imageMetrics.js b/resources/ext.imageMetrics.js
index 1c968eb..bb9efa5 100644
--- a/resources/ext.imageMetrics.js
+++ b/resources/ext.imageMetrics.js
@@ -75,19 +75,6 @@
};
/**
-* Makes a random decision (based on the sampling factor configuration
setting) whether the current
-* request should be logged.
-* @return {boolean}
-*/
- ImageMetrics.prototype.isInSample = function () {
- var factor = this.mwConfig.get( 'wgImageMetricsSamplingFactor',
false );
- if ( !$.isNumeric( factor ) || factor 1 ) {
- return false;
- }
- return Math.floor( Math.random() * factor ) === 0;
- };
-
- /**
* Adds information provided by MediaWiki.
* @param {Object} data
* @param {jQuery} $file jQuery object containing the img element
@@ -166,9 +153,6 @@
var $file,
data = {};
- if ( !this.isInSample() || !this.eventLog ) {
- return;
- }
data.samplingFactor = this.mwConfig.get(
'wgImageMetricsSamplingFactor' );
data.isHttps = this.location.protocol === 'https:';
@@ -185,5 +169,4 @@
};
mw.ImageMetrics = ImageMetrics;
- ImageMetrics.install();
} ( mediaWiki, jQuery ) );
diff --git a/resources/ext.imageMetrics.loader.js
b/resources/ext.imageMetrics.loader.js
new file mode 100644
index 000..942433e
--- /dev/null
+++ b/resources/ext.imageMetrics.loader.js
@@ -0,0 +1,29 @@
+/**
+ * JavaScript module for image-related metrics.
+ * @see https://mediawiki.org/wiki/Extension:ImageMetrics
+ *
+ * @licence GNU GPL v2 or later
+ * @author Tisza Gergő gti...@wikimedia.org
+ */
+( function ( mw, $ ) {
+ 'use strict';
+
+ /**
+* Makes a random decision (based on the sampling factor configuration
setting) whether the current
+* request should be logged.
+* @return {boolean}
+*/
+ function isInSample() {
+ var factor = mw.config.get( 'wgImageMetricsSamplingFactor',
false );
+ if ( !$.isNumeric( factor ) || factor 1 ) {
+ return false;
+ }
+ return Math.floor( Math.random() * factor ) === 0;
+ }
+
+ if ( isInSample() ) {
+ mw.loader.using( 'ext.imageMetrics', function () {
+ mw.ImageMetrics.install();
+ } );
+ }
+} ( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/157815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I93bb46e6589f0496b5b7cdecddd45fec62201d87
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ImageMetrics
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.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] Kill auto-mention in favor of subscriptions - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Kill auto-mention in favor of subscriptions
..
Kill auto-mention in favor of subscriptions
Change-Id: Id5eb62c0471f5a0c8e0723558c7700e263cfdf5e
---
M modules/new/components/flow-board.js
1 file changed, 1 insertion(+), 13 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/new/components/flow-board.js
b/modules/new/components/flow-board.js
index 563546c..3790604 100644
--- a/modules/new/components/flow-board.js
+++ b/modules/new/components/flow-board.js
@@ -1558,20 +1558,13 @@
topicTitle = $post.closest( '.flow-topic'
).find( '.flow-topic-title' ).text(),
replyToContent = $post.find(
'.flow-post-content' ).text() || topicTitle,
author = $.trim( $post.find(
'.flow-author:first .mw-userlink' ).text() ),
- initialContent, $form;
+ $form;
// Check if reply form has already been opened
if ( $post.data( 'flow-replying' ) ) {
return;
}
$post.data( 'flow-replying', true );
-
- // if we have a real username, turn it into [[User]]
(otherwise, just 127.0.0.1)
- if ( !mw.util.isIPv4Address( author , true )
!mw.util.isIPv6Address( author , true ) ) {
- initialContent = '[[' + mw.Title.newFromText(
author, 2 ).getPrefixedText() + '|' + author + ']]: ';
- } else {
- initialContent = author + ': ';
- }
$form = $(
flowBoard.TemplateEngine.processTemplateGetFragment(
'flow_reply_form',
@@ -1591,11 +1584,6 @@
content: {
content: replyToContent,
format: 'plaintext'
- },
- submitted: {
- postId: postId,
- // prefill content
- content: initialContent
}
}
) ).children();
--
To view, visit https://gerrit.wikimedia.org/r/156467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id5eb62c0471f5a0c8e0723558c7700e263cfdf5e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Bsitu bs...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@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] This class is just Preferences now, not Reset - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged. Change subject: This class is just Preferences now, not Reset .. This class is just Preferences now, not Reset Change-Id: I2ca32f3ab5cdfc82f351e17662893822d7fc4f9b --- M tests/browser/features/step_definitions/upload_wizard_steps.rb R tests/browser/features/support/pages/preferences_page.rb 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Gilles: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/step_definitions/upload_wizard_steps.rb b/tests/browser/features/step_definitions/upload_wizard_steps.rb index 3001f82..16998f3 100644 --- a/tests/browser/features/step_definitions/upload_wizard_steps.rb +++ b/tests/browser/features/step_definitions/upload_wizard_steps.rb @@ -14,7 +14,7 @@ end Given(/^my Preferences Skip tutorial box is unchecked$/) do - visit(PreferencesResetPage) do |page| + visit(PreferencesPage) do |page| page.upload_wizard_pref_tab_element.when_present.click page.uncheck_reset_skip_checkbox page.preferences_save_button_element.click diff --git a/tests/browser/features/support/pages/preferences_reset_page.rb b/tests/browser/features/support/pages/preferences_page.rb similarity index 96% rename from tests/browser/features/support/pages/preferences_reset_page.rb rename to tests/browser/features/support/pages/preferences_page.rb index bf8a442..48c0a12 100644 --- a/tests/browser/features/support/pages/preferences_reset_page.rb +++ b/tests/browser/features/support/pages/preferences_page.rb @@ -9,7 +9,7 @@ # UploadWizard top-level directory and at # https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/CREDITS # -class PreferencesResetPage +class PreferencesPage include PageObject include URL -- To view, visit https://gerrit.wikimedia.org/r/158241 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2ca32f3ab5cdfc82f351e17662893822d7fc4f9b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UploadWizard Gerrit-Branch: master Gerrit-Owner: Neilk ne...@neilk.net 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] Use link title as fallback for caption - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Use link title as fallback for caption
..
Use link title as fallback for caption
This works because the title doesn't exist if there's no caption and we
won't get to this logic branch if the thumbnail is an explicit |thumb|
with a caption already.
Refactored caption-fetching a bit.
Change-Id: If84c890e7b71880db640a0993f8e3d6cd59951b8
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/513
---
M resources/mmv/mmv.bootstrap.js
M tests/qunit/mmv/mmv.bootstrap.test.js
2 files changed, 52 insertions(+), 20 deletions(-)
Approvals:
Gilles: Looks good to me, approved
Gergő Tisza: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/resources/mmv/mmv.bootstrap.js b/resources/mmv/mmv.bootstrap.js
index 4367854..9b9898f 100644
--- a/resources/mmv/mmv.bootstrap.js
+++ b/resources/mmv/mmv.bootstrap.js
@@ -178,9 +178,7 @@
* @param {Object} thumb
*/
MMVB.processThumb = function ( thumb ) {
- var $thumbCaption,
- caption,
- bs = this,
+ var bs = this,
alwaysOpen = false,
$thumb = $( thumb ),
$link = $thumb.closest( 'a.image' ),
@@ -198,20 +196,6 @@
}
if ( $thumbContain.length !== 0 $thumbContain.is( '.thumb' )
) {
- $thumbCaption = $thumbContain.find( '.thumbcaption'
).clone();
- $thumbCaption.find( '.magnify' ).remove();
- if ( !$thumbCaption.length ) { // gallery, maybe
- $thumbCaption = $thumbContain
- .closest( '.gallerybox' )
- .not( function () {
- // do not treat categories as
galleries - the autogenerated caption they have is not helpful
- return $thumbContain.closest(
'#mw-category-media' ).length;
- } )
- .find( '.gallerytext' )
- .clone();
- }
- caption = this.htmlUtils.htmlToTextWithLinks(
$thumbCaption.html() || '' );
-
// If this is a thumb, we preload JS/CSS when the mouse
cursor hovers the thumb container (thumb image + caption + border)
$thumbContain.mouseenter( function() {
// There is no point preloading if clicking the
thumb won't open Media Viewer
@@ -253,7 +237,7 @@
$thumb : $thumb,
title : title,
link : link,
- caption : caption } );
+ caption : this.findCaption( $thumbContain, $link ) } );
$link.add( $enlarge ).click( function ( e ) {
return bs.click( this, e, title, alwaysOpen );
@@ -261,6 +245,34 @@
};
/**
+* Finds the caption for an image.
+* @param {jQuery} $thumbContain The container for the thumbnail.
+* @param {jQuery} $link The link that encompasses the thumbnail.
+* @returns {string|undefined} Unsafe HTML may be present - caution
+*/
+ MMVB.findCaption = function ( $thumbContain, $link ) {
+ var $thumbCaption;
+
+ if ( $thumbContain.length !== 0 $thumbContain.is( '.thumb' )
) {
+ $thumbCaption = $thumbContain.find( '.thumbcaption'
).clone();
+ $thumbCaption.find( '.magnify' ).remove();
+ if ( !$thumbCaption.length ) { // gallery, maybe
+ $thumbCaption = $thumbContain
+ .closest( '.gallerybox' )
+ .not( function () {
+ // do not treat categories as
galleries - the autogenerated caption they have is not helpful
+ return $thumbContain.closest(
'#mw-category-media' ).length;
+ } )
+ .find( '.gallerytext' )
+ .clone();
+ }
+ return this.htmlUtils.htmlToTextWithLinks(
$thumbCaption.html() || '' );
+ } else if ( $link.prop( 'title' ) ) {
+ return $link.prop( 'title' );
+ }
+ };
+
+ /**
* Handles a click event on a link
* @param {HTMLElement} element Clicked element
* @param {jQuery.Event} e jQuery event object
diff --git
[MediaWiki-commits] [Gerrit] Add @covers tags - change (mediawiki...Gadgets)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158331
Change subject: Add @covers tags
..
Add @covers tags
Change-Id: I839c472dfb93f2cdb19bebed6dbe59b61bd198e4
---
M tests/GadgetsTest.php
1 file changed, 22 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets
refs/changes/31/158331/1
diff --git a/tests/GadgetsTest.php b/tests/GadgetsTest.php
index 45d4d4b..86de239 100644
--- a/tests/GadgetsTest.php
+++ b/tests/GadgetsTest.php
@@ -15,6 +15,7 @@
}
/**
+* @covers Gadget::isValidGadgetID
* @dataProvider provideIsValidGadgetID
*/
public function testIsValidGadgetID( $input, $expectedToBeValid, $desc
) {
@@ -36,6 +37,7 @@
}
/**
+* @covers Gadget::validatePropertiesArray
* @dataProvider provideValidatePropertiesArray
*/
public function testValidatePropertiesArray( $input, $expectSuccess,
$expectedErrors, $desc ) {
@@ -136,6 +138,9 @@
$this-assertEquals( $data['module']['dependencies'],
$g-getDependencies(), 'getDependencies' );
}
+ /**
+* @covers Gadget::getJSON
+*/
public function testGetJSON() {
$data = self::getBoilerplateData();
$g = new Gadget( 'GadgetTest', LocalGadgetRepo::singleton() );
@@ -160,6 +165,10 @@
$this-assertEquals( FormatJson::encode( $oldData ),
$g-getJSON(), 'getJSON removes duplicates from arrays' );
}
+ /**
+* @covers Gadget::getTitleMessageKey
+* @covers Gadget::getDescriptionMessageKey
+*/
public function testMessageFunctions() {
global $wgLang;
@@ -203,6 +212,9 @@
}
+ /**
+* @covers Gadget::getModule
+*/
public function testGetModule() {
$data = self::getBoilerplateData();
$g = new Gadget( 'GadgetTest', LocalGadgetRepo::singleton() );
@@ -224,6 +236,10 @@
$this-assertEquals( $pages, $m-getPages(
ResourceLoaderContext::newDummyContext() ), 'getPages' );
}
+ /**
+* @covers Gadget::isEnabledByDefault
+* @covers Gadget::isEnabledForUser
+*/
public function testIsEnabledForUser() {
$defaultOff = self::buildPropertiesArray( array( 'settings' =
array( 'default' = false ) ) );
$defaultOn = self::buildPropertiesArray( array( 'settings' =
array( 'default' = true ) ) );
@@ -253,6 +269,9 @@
$this-assertTrue( $gOn-isEnabledForUser( $user ),
'isEnabledForUser for gOn with pref on' );
}
+ /**
+* @covers Gadget::isAllowed
+*/
public function testIsAllowed() {
$data = self::buildPropertiesArray( array( 'settings' = array(
'rights' = array( 'foo', 'bar' ) ) ) );
$g = new Gadget( 'GadgetTest', LocalGadgetRepo::singleton() );
@@ -272,6 +291,9 @@
$this-assertTrue( $g-isAllowed( $user ), 'user has both foo
and bar rights' );
}
+ /**
+* @covers Gadget::supportsSkin
+*/
public function testSupportsSkin() {
$data = self::buildPropertiesArray( array( 'settings' = array(
'skins' = array( 'monobook', 'modern' ) ) ) );
$g = new Gadget( 'GadgetTest', LocalGadgetRepo::singleton() );
--
To view, visit https://gerrit.wikimedia.org/r/158331
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I839c472dfb93f2cdb19bebed6dbe59b61bd198e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: RL2
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove the old GadgetsTest that is broken - change (mediawiki...Gadgets)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158332
Change subject: Remove the old GadgetsTest that is broken
..
Remove the old GadgetsTest that is broken
Change-Id: Iedf9e5fab9c460ff1234893bd1024bcd2f95f2fe
---
D tests/old/GadgetsTest.php
1 file changed, 0 insertions(+), 89 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets
refs/changes/32/158332/1
diff --git a/tests/old/GadgetsTest.php b/tests/old/GadgetsTest.php
deleted file mode 100644
index b479c6e..000
--- a/tests/old/GadgetsTest.php
+++ /dev/null
@@ -1,89 +0,0 @@
-?php
-/**
- * @group Gadgets
- */
-
-/**
- * @group Broken
- */
-class GadgetsTest extends PHPUnit_Framework_TestCase {
- private function create( $line ) {
- // TODO fails now
- $g = Gadget::newFromDefinition( $line );
- // assertInstanceOf() is available since PHPUnit 3.5
- $this-assertEquals( 'Gadget', get_class( $g ) );
-
- return $g;
- }
-
- function testInvalidLines() {
- $this-assertFalse( Gadget::newFromDefinition( '' ) );
- $this-assertFalse( Gadget::newFromDefinition( 'foo|bar' ) );
- }
-
- function testSimpleCases() {
- $g = $this-create( '* foo bar| foo.css|foo.js|foo.bar' );
//FIXME
- $this-assertEquals( 'foo_bar', $g-getId() );
- $this-assertEquals( 'ext.gadget.foo_bar', $g-getModuleName()
);
- $this-assertEquals( array( 'Gadget-foo.js' ), $g-getScripts()
);
- $this-assertEquals( array( 'Gadget-foo.css' ), $g-getStyles()
);
- $this-assertEquals( array( 'Gadget-foo.js', 'Gadget-foo.css' ),
- $g-getScriptsAndStyles() );
- $this-assertEquals( array( 'Gadget-foo.js' ),
$g-getLegacyScripts() );
- $this-assertFalse( $g-supportsResourceLoader() );
- $this-assertTrue( $g-hasModule() );
- }
-
- function testRLtag() {
- $g = $this-create( '*foo [ResourceLoader]|foo.js|foo.css' );
//FIXME
- $this-assertEquals( 'foo', $g-getId() );
- $this-assertTrue( $g-supportsResourceLoader() );
- $this-assertEquals( 0, count( $g-getLegacyScripts() ) );
- }
-
- function testDependencies() {
- $g = $this-create( '*
foo[ResourceLoader|dependencies=jquery.ui]|bar.js' ); //FIXME
- $this-assertEquals( array( 'Gadget-bar.js' ), $g-getScripts()
);
- $this-assertTrue( $g-supportsResourceLoader() );
- $this-assertEquals( array( 'jquery.ui' ),
$g-getDependencies() );
- }
-
- function testPreferences() {
- // FIXME this test is broken
- $this-markTestIncomplete( 'Broken for now' );
- return;
-
- global $wgUser, $wgOut, $wgTitle;
-
- // This test makes call to the parser which requires valid
OutputPage
- // and Title objects. Set them up here, they will be released
at the
- // end of the test.
- $old_wgOut = $wgOut;
- $old_wgTitle = $wgTitle;
- $wgTitle = Title::newFromText( 'Parser test for Gadgets
extension' );
-
- // Proceed with test setup:
- $prefs = array();
- $context = new RequestContext();
- $wgOut = $context-getOutput();
- $wgOut-setTitle( Title::newFromText( 'test' ) );
-
- Gadget::loadStructuredList( '* foo | foo.js
-==keep-section1==
-* bar| bar.js
-==remove-section==
-* baz [rights=embezzle] |baz.js
-==keep-section2==
-* quux [rights=read] | quux.js' );
- $this-assertTrue( GadgetsHooks::getPreferences( $wgUser,
$prefs ), 'GetPrefences hook should return true' );
-
- $options = $prefs['gadgets']['options'];
- $this-assertFalse( isset(
$options['lt;gadget-section-remove-sectiongt;'] ), 'Must not show empty
sections' );
- $this-assertTrue( isset(
$options['lt;gadget-section-keep-section1gt;'] ) );
- $this-assertTrue( isset(
$options['lt;gadget-section-keep-section2gt;'] ) );
-
- // Restore globals
- $wgOut = $old_wgOut;
- $wgTitle = $old_wgTitle;
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/158332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedf9e5fab9c460ff1234893bd1024bcd2f95f2fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: RL2
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] Avoid removing empty spans that carry template data - change (mediawiki...cxserver)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158333
Change subject: Avoid removing empty spans that carry template data
..
Avoid removing empty spans that carry template data
Inline span['data-mw'] (like img) if it only contains
whitespace characters
Bug: 69885
Change-Id: I430897d1ca0c40afe1591c840c11d449c29b83db
---
M lineardoc/LinearDoc.js
1 file changed, 78 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver
refs/changes/33/158333/1
diff --git a/lineardoc/LinearDoc.js b/lineardoc/LinearDoc.js
index eeba4cb..92e8549 100644
--- a/lineardoc/LinearDoc.js
+++ b/lineardoc/LinearDoc.js
@@ -215,7 +215,7 @@
* @param {number[]} boundaries Boundary offsets
* @param chunks Chunks to which the boundaries apply
* @param {Function} getLength Function returning the length of a chunk
- * @returns {Object} Array of {chunk: ch, boundaries: [...]}
+ * @returns {Object[]} Array of {chunk: ch, boundaries: [...]}
*/
function getChunkBoundaryGroups( boundaries, chunks, getLength ) {
var i, len, groupBoundaries, chunk, chunkLength, boundary,
@@ -265,12 +265,12 @@
* @constructor
* @param {string} text Plaintext in the chunk (can be '')
* @param {Object[]} array of SAX open tag objects, for the applicable tags
- * @param {Doc|object} [inlineElement] tag or sub-doc
+ * @param {Doc|object} [inlineContent] tag or sub-doc
*/
-function TextChunk( text, tags, inlineElement ) {
+function TextChunk( text, tags, inlineContent ) {
this.text = text;
this.tags = tags;
- this.inlineElement = inlineElement;
+ this.inlineContent = inlineContent;
}
/**
@@ -293,14 +293,14 @@
/**
* Get the (last) text chunk at a given char offset
* @method
- * @param {number} charOffset the char offset of the TextChunk
+ * @param {number} charOffset The char offset of the TextChunk
* @return {TextChunk} The text chunk
*/
TextBlock.prototype.getTextChunkAt = function ( charOffset ) {
- // TODO: bisecting instead of quadratic
+ // TODO: bisecting instead of linear search
var i, len;
for ( i = 0, len = this.textChunks.length - 1; i len; i++ ) {
- if ( this.startOffsets[i + 1] charOffset ) {
+ if ( this.startOffsets[ i + 1 ] charOffset ) {
break;
}
}
@@ -318,17 +318,15 @@
TextBlock.prototype.translateAnnotations = function ( targetText,
rangeMappings ) {
var i, len, rangeMapping, oldTextChunk, newText,
newTextChunks = [];
+
for ( i = 0, len = rangeMappings.length; i len; i++ ) {
- rangeMapping = rangeMappings[i];
+ rangeMapping = rangeMappings[ i ];
oldTextChunk = this.getTextChunkAt( rangeMapping.source.start );
- newText = targetText.substr(
- rangeMapping.target.start,
- rangeMapping.target.length
- );
+ newText = targetText.substr( rangeMapping.target.start,
rangeMapping.target.length );
newTextChunks.push( new TextChunk(
newText,
oldTextChunk.tags,
- oldTextChunk.inlineElement
+ oldTextChunk.inlineContent
) );
}
return new TextBlock( newTextChunks );
@@ -378,15 +376,16 @@
}
oldTags = textChunk.tags;
- // Now add text and inline elements
+ // Now add text and inline content
html.push( esc( textChunk.text ) );
- if ( textChunk.inlineElement ) {
- if ( textChunk.inlineElement.getHtml ) {
+ if ( textChunk.inlineContent ) {
+ if ( textChunk.inlineContent.getHtml ) {
// a sub-doc
- html.push( textChunk.inlineElement.getHtml() );
+ html.push( textChunk.inlineContent.getHtml() );
} else {
// an empty inline tag
- html.push( getOpenTagHtml(
textChunk.inlineElement ) );
+ html.push( getOpenTagHtml(
textChunk.inlineContent ) );
+ html.push( getCloseTagHtml(
textChunk.inlineContent ) );
}
}
}
@@ -434,7 +433,7 @@
newTextChunks.push( new TextChunk(
textChunk.text,
newTags,
- textChunk.inlineElement
+ textChunk.inlineContent
) );
}
return newTextChunks;
@@ -528,7 +527,7 @@
rightPart = new TextChunk(
[MediaWiki-commits] [Gerrit] Avoid removing empty spans that carry template data - change (mediawiki...cxserver)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid removing empty spans that carry template data
..
Avoid removing empty spans that carry template data
Inline span['data-mw'] (like img) if it only contains
whitespace characters
Bug: 69885
Change-Id: I430897d1ca0c40afe1591c840c11d449c29b83db
---
M lineardoc/LinearDoc.js
1 file changed, 78 insertions(+), 36 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lineardoc/LinearDoc.js b/lineardoc/LinearDoc.js
index eeba4cb..92e8549 100644
--- a/lineardoc/LinearDoc.js
+++ b/lineardoc/LinearDoc.js
@@ -215,7 +215,7 @@
* @param {number[]} boundaries Boundary offsets
* @param chunks Chunks to which the boundaries apply
* @param {Function} getLength Function returning the length of a chunk
- * @returns {Object} Array of {chunk: ch, boundaries: [...]}
+ * @returns {Object[]} Array of {chunk: ch, boundaries: [...]}
*/
function getChunkBoundaryGroups( boundaries, chunks, getLength ) {
var i, len, groupBoundaries, chunk, chunkLength, boundary,
@@ -265,12 +265,12 @@
* @constructor
* @param {string} text Plaintext in the chunk (can be '')
* @param {Object[]} array of SAX open tag objects, for the applicable tags
- * @param {Doc|object} [inlineElement] tag or sub-doc
+ * @param {Doc|object} [inlineContent] tag or sub-doc
*/
-function TextChunk( text, tags, inlineElement ) {
+function TextChunk( text, tags, inlineContent ) {
this.text = text;
this.tags = tags;
- this.inlineElement = inlineElement;
+ this.inlineContent = inlineContent;
}
/**
@@ -293,14 +293,14 @@
/**
* Get the (last) text chunk at a given char offset
* @method
- * @param {number} charOffset the char offset of the TextChunk
+ * @param {number} charOffset The char offset of the TextChunk
* @return {TextChunk} The text chunk
*/
TextBlock.prototype.getTextChunkAt = function ( charOffset ) {
- // TODO: bisecting instead of quadratic
+ // TODO: bisecting instead of linear search
var i, len;
for ( i = 0, len = this.textChunks.length - 1; i len; i++ ) {
- if ( this.startOffsets[i + 1] charOffset ) {
+ if ( this.startOffsets[ i + 1 ] charOffset ) {
break;
}
}
@@ -318,17 +318,15 @@
TextBlock.prototype.translateAnnotations = function ( targetText,
rangeMappings ) {
var i, len, rangeMapping, oldTextChunk, newText,
newTextChunks = [];
+
for ( i = 0, len = rangeMappings.length; i len; i++ ) {
- rangeMapping = rangeMappings[i];
+ rangeMapping = rangeMappings[ i ];
oldTextChunk = this.getTextChunkAt( rangeMapping.source.start );
- newText = targetText.substr(
- rangeMapping.target.start,
- rangeMapping.target.length
- );
+ newText = targetText.substr( rangeMapping.target.start,
rangeMapping.target.length );
newTextChunks.push( new TextChunk(
newText,
oldTextChunk.tags,
- oldTextChunk.inlineElement
+ oldTextChunk.inlineContent
) );
}
return new TextBlock( newTextChunks );
@@ -378,15 +376,16 @@
}
oldTags = textChunk.tags;
- // Now add text and inline elements
+ // Now add text and inline content
html.push( esc( textChunk.text ) );
- if ( textChunk.inlineElement ) {
- if ( textChunk.inlineElement.getHtml ) {
+ if ( textChunk.inlineContent ) {
+ if ( textChunk.inlineContent.getHtml ) {
// a sub-doc
- html.push( textChunk.inlineElement.getHtml() );
+ html.push( textChunk.inlineContent.getHtml() );
} else {
// an empty inline tag
- html.push( getOpenTagHtml(
textChunk.inlineElement ) );
+ html.push( getOpenTagHtml(
textChunk.inlineContent ) );
+ html.push( getCloseTagHtml(
textChunk.inlineContent ) );
}
}
}
@@ -434,7 +433,7 @@
newTextChunks.push( new TextChunk(
textChunk.text,
newTags,
- textChunk.inlineElement
+ textChunk.inlineContent
) );
}
return newTextChunks;
@@ -528,7 +527,7 @@
rightPart = new TextChunk(
textChunk.text.substring( relOffset ),
[MediaWiki-commits] [Gerrit] Use a mock instead of ResourceLoaderContext::newDummyContext() - change (mediawiki...Gadgets)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158334
Change subject: Use a mock instead of ResourceLoaderContext::newDummyContext()
..
Use a mock instead of ResourceLoaderContext::newDummyContext()
Change-Id: I0f7a631e58b3fd2cca507e8b251ee5dcff714d4c
---
M tests/GadgetsTest.php
1 file changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets
refs/changes/34/158334/1
diff --git a/tests/GadgetsTest.php b/tests/GadgetsTest.php
index 86de239..1cd3394 100644
--- a/tests/GadgetsTest.php
+++ b/tests/GadgetsTest.php
@@ -213,6 +213,15 @@
}
/**
+* @return ResourceLoaderContext
+*/
+ private function getMockContext() {
+ return $this-getMockBuilder( 'ResourceLoaderContext' )
+ -disableOriginalConstructor()
+ -getMock();
+ }
+
+ /**
* @covers Gadget::getModule
*/
public function testGetModule() {
@@ -233,7 +242,7 @@
$this-assertEquals( $data['module']['messages'],
$m-getMessages(), 'getMessages' );
$this-assertEquals( $data['module']['position'],
$m-getPosition(), 'getPosition' );
$this-assertEquals( LocalGadgetRepo::singleton()-getSource(),
$m-getSource(), 'getSource' );
- $this-assertEquals( $pages, $m-getPages(
ResourceLoaderContext::newDummyContext() ), 'getPages' );
+ $this-assertEquals( $pages, $m-getPages(
$this-getMockContext() ), 'getPages' );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/158334
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f7a631e58b3fd2cca507e8b251ee5dcff714d4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: RL2
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] rcstream: remove duplicate package declaration - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158335
Change subject: rcstream: remove duplicate package declaration
..
rcstream: remove duplicate package declaration
Change-Id: I0609d40fcb17f6845e56be3bceb209f6b7904eac
---
M modules/rcstream/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/35/158335/1
diff --git a/modules/rcstream/manifests/init.pp
b/modules/rcstream/manifests/init.pp
index c688426..357ef82 100644
--- a/modules/rcstream/manifests/init.pp
+++ b/modules/rcstream/manifests/init.pp
@@ -46,7 +46,7 @@
system = true,
}
-package { [ 'python-socketio', 'python-redis' ]:
+package { [ 'python-socketio']:
ensure = $ensure,
before = Package['rcstream'],
}
--
To view, visit https://gerrit.wikimedia.org/r/158335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0609d40fcb17f6845e56be3bceb209f6b7904eac
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] MTControlCard: Use data attributes to keep track of current ... - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: MTControlCard: Use data attributes to keep track of current
state
..
MTControlCard: Use data attributes to keep track of current state
To indicate the state of whether the section is pure MT or something
changed or using the source text.
If section has data-cx-mt = true, section is pure MT
If section has data-cx-mt = false, section has manual edits
If section has data-cx-source = true, section uses source text as translation
Previously, the restore translation was not shown if user edited something.
With this patch, we show restore translation button whenever translator edit
something. This helps the translator to easily undo all edits and start from
MT.
Removed the MTControlCard.enableRestory object and
updateSection, showRestore, hideRestore methods
Change-Id: I76d49ed0c6803e61de5da7757e2cde910f8a5ae2
---
M modules/tools/ext.cx.tools.mt.js
1 file changed, 11 insertions(+), 60 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 626143f..299c26a 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -140,12 +140,6 @@
this.$card = null;
this.$translations = null;
this.$providersMenu = null;
-
- // This is static because the card can be reinitialized.
- // Indexed by section id.
- if ( !MTControlCard.enableRestore ) {
- MTControlCard.enableRestore = {};
- }
}
MTControlCard.prototype.getCard = function () {
@@ -205,33 +199,13 @@
};
/**
-* Update the section with text from source, applying tools like
-* adaptation and machine translation.
-* @param {boolean} machineTranslate Whether to apply machine
translation to the section.
-*/
- MTControlCard.prototype.updateSection = function ( machineTranslate ) {
- var sourceId = this.$section.data( 'source' ),
- cxMtCard = this;
-
- // Paste the source without machine translation
- mw.hook( 'mw.cx.translation.add' ).fire( sourceId,
machineTranslate );
-
- // Updating the section replaced the DOM element,
- // so it needs to be reinitialized
- mw.hook( 'mw.cx.translation.updated' ).add( function () {
- cxMtCard.$section = $( '#cx' + sourceId );
- } );
- };
-
- /**
* Update the section with text from source,
* not applying machine translation.
*/
MTControlCard.prototype.useSource = function () {
- this.updateSection( false );
- this.showRestore();
-
- this.$section.focus();
+ var sourceId = this.$section.data( 'source' );
+ // Use the source without machine translation
+ mw.hook( 'mw.cx.translation.add' ).fire( sourceId, false );
};
/**
@@ -240,44 +214,19 @@
* and hide the restore button.
*/
MTControlCard.prototype.restoreTranslation = function () {
- this.updateSection( true );
- this.hideRestore();
-
- this.$section.focus();
+ var sourceId = this.$section.data( 'source' );
+ // Use the source without machine translation
+ mw.hook( 'mw.cx.translation.add' ).fire( sourceId, true );
+ this.stop();
};
/**
* Clear the translation text.
*/
MTControlCard.prototype.clearTranslation = function () {
- this.$section
- .html( '' );
+ this.$section.empty();
mw.hook( 'mw.cx.translation.change' ).fire( this.$section );
- this.showRestore();
-
this.$section.focus();
- };
-
- /**
-* Show the restore button.
-*/
- MTControlCard.prototype.showRestore = function () {
- // TODO Investigate why isn't it initialized sometimes.
- // It should always be initialized by the time this runs.
- if ( !this.$section ) {
- return;
- }
-
- MTControlCard.enableRestore[ this.$section.prop( 'id' ) ] =
true;
- this.$restore.removeClass( 'hidden' );
- };
-
- /**
-* Hide the restore button.
-*/
- MTControlCard.prototype.hideRestore = function () {
- MTControlCard.enableRestore[ this.$section.prop( 'id' ) ] =
false;
- this.$restore.addClass( 'hidden' );
};
MTControlCard.prototype.selectProvider = function ( providerId ) {
@@ -388,8 +337,10
[MediaWiki-commits] [Gerrit] py3 imports and types - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158336
Change subject: py3 imports and types
..
py3 imports and types
- winreg import
- urlencode import
- use bytes() before decoding
- use b'' before doing string operations like startswith
Change-Id: I2f8c2fb06115c735a499d24dd333e3854a4d6cc2
---
M pywikibot/__init__.py
M pywikibot/config2.py
M pywikibot/pagegenerators.py
M pywikibot/site.py
M pywikibot/userinterfaces/win32_unicode.py
M pywikibot/weblib.py
M tests/page_tests.py
M tests/script_tests.py
M tests/site_tests.py
9 files changed, 36 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/36/158336/1
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index add9a33..0228e79 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -21,6 +21,7 @@
from Queue import Queue
else:
from queue import Queue
+long = int
# Use pywikibot. prefix for all in-package imports; this is to prevent
# confusion with similarly-named modules in version 1 framework, for users
diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 0fe5f38..4da09e9 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -303,7 +303,10 @@
# On Windows systems, this script tries to determine the default text editor.
if sys.platform == 'win32':
try:
-import _winreg
+if sys.version_info[0] 2:
+import winreg as _winreg
+else:
+import _winreg
_key1 = _winreg.OpenKey(_winreg.HKEY_CURRENT_USER,
'Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithProgids')
_progID = _winreg.EnumValue(_key1, 1)[0]
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index a46e27c..484eadf 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -19,6 +19,7 @@
__version__ = '$Id$'
#
+import sys
import codecs
import itertools
import re
@@ -28,6 +29,10 @@
from pywikibot.comms import http
import pywikibot.data.wikidataquery as wdquery
+if sys.version_info[0] 2:
+basestring = (str, )
+unicode = str
+
# ported from version 1 for backwards-compatibility
# most of these functions just wrap a Site or Page method that returns
# a generator
diff --git a/pywikibot/site.py b/pywikibot/site.py
index e5da073..cfbd128 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -46,6 +46,7 @@
if sys.version_info[0] 2:
basestring = (str,)
+unicode = str
_logger = wiki.site
diff --git a/pywikibot/userinterfaces/win32_unicode.py
b/pywikibot/userinterfaces/win32_unicode.py
index a7bcfc4..ae9048d 100755
--- a/pywikibot/userinterfaces/win32_unicode.py
+++ b/pywikibot/userinterfaces/win32_unicode.py
@@ -25,6 +25,10 @@
stdout = sys.stdout
stderr = sys.stderr
argv = sys.argv
+
+if sys.version_info[0] 2:
+unicode = str
+
if sys.platform == win32:
import codecs
from ctypes import WINFUNCTYPE, windll, POINTER
@@ -178,7 +182,7 @@
self._stream.write(text)
else:
if not isinstance(text, unicode):
-text = str(text).decode('utf-8')
+text = bytes(text).decode('utf-8')
remaining = len(text)
while remaining 0:
n = DWORD(0)
@@ -246,7 +250,7 @@
# Also skip option arguments to the Python interpreter.
while len(argv) 0:
arg = argv[0]
-if not arg.startswith(u-) or arg == u-:
+if not arg.startswith(b-) or arg == u-:
break
argv = argv[1:]
if arg == u'-m':
diff --git a/pywikibot/weblib.py b/pywikibot/weblib.py
index 017965a..83f6a68 100644
--- a/pywikibot/weblib.py
+++ b/pywikibot/weblib.py
@@ -11,7 +11,12 @@
#
__version__ = '$Id$'
-import urllib
+import sys
+if sys.version_info[0] == 2:
+from urllib import urlencode
+else:
+from urllib.parse import urlencode
+
from pywikibot.comms import http
@@ -34,7 +39,7 @@
if timestamp is not None:
query['timestamp'] = timestamp
-uri = uri + urllib.urlencode(query)
+uri = uri + urlencode(query)
jsontext = http.request(uri=uri, site=None)
if closest in jsontext:
data = json.loads(jsontext)
@@ -63,7 +68,7 @@
if timestamp is not None:
query['date'] = timestamp
-uri = uri + urllib.urlencode(query)
+uri = uri + urlencode(query)
xmltext = http.request(uri=uri, site=None)
if success in xmltext:
data = ET.fromstring(xmltext)
diff --git a/tests/page_tests.py b/tests/page_tests.py
index d8590c9..772ddce 100644
--- a/tests/page_tests.py
+++ b/tests/page_tests.py
@@ -7,12 +7,16 @@
#
__version__ = '$Id$'
-
+import
[MediaWiki-commits] [Gerrit] Fix TitleBlacklist support - change (mediawiki...UploadWizard)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158337
Change subject: Fix TitleBlacklist support
..
Fix TitleBlacklist support
The Commons blacklist seems to expect File: in what's checked,
presumably because that's what Special:Upload is sending it.
Change-Id: I5f502253391bbb8d255e55918bfdcfe32bd5a6cd
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/656
---
M resources/mw.DestinationChecker.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/37/158337/1
diff --git a/resources/mw.DestinationChecker.js
b/resources/mw.DestinationChecker.js
index b078305..7bc61dc 100644
--- a/resources/mw.DestinationChecker.js
+++ b/resources/mw.DestinationChecker.js
@@ -175,7 +175,7 @@
* @param mixed - false if not blacklisted, object if
blacklisted
*/
if ( mw.config.get( 'UploadWizardConfig' ).useTitleBlacklistApi
) {
- this.api.isBlacklisted( title, blacklistResultProcessor
);
+ this.api.isBlacklisted( 'File:' + title,
blacklistResultProcessor );
} else {
// it's not blacklisted, because the API isn't even
available
blacklistResultProcessor( false );
--
To view, visit https://gerrit.wikimedia.org/r/158337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f502253391bbb8d255e55918bfdcfe32bd5a6cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Trigger input event to the section while removing reference - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Trigger input event to the section while removing reference
..
Trigger input event to the section while removing reference
Change-Id: Ia0939b6f42688d16995613df6e89efddd61f568b
---
M modules/tools/ext.cx.tools.reference.js
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tools/ext.cx.tools.reference.js
b/modules/tools/ext.cx.tools.reference.js
index 1b112b9..3e74cf0 100644
--- a/modules/tools/ext.cx.tools.reference.js
+++ b/modules/tools/ext.cx.tools.reference.js
@@ -63,7 +63,11 @@
* Remove the reference
*/
ReferenceCard.prototype.removeReference = function () {
+ var $parentSection;
+
if ( this.$reference ) {
+ $parentSection = this.$reference.parents(
'[contenteditable]' );
+ $parentSection.trigger( 'input' );
this.$reference.remove();
this.stop();
}
--
To view, visit https://gerrit.wikimedia.org/r/158327
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0939b6f42688d16995613df6e89efddd61f568b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Job to run ResourcesTest for WikibaseRepo - change (integration/jenkins-job-builder-config)
Tobias Gritschacher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158338
Change subject: Add Job to run ResourcesTest for WikibaseRepo
..
Add Job to run ResourcesTest for WikibaseRepo
It happened several times that we introduced bad dependencies
to Wikibase JavaScript Resources. Running the test that checks
resources should avoid that in the future.
Change-Id: Ie334342dd899d67ccc9806f41884822a226133c3
---
M wikidata.yaml
1 file changed, 6 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/38/158338/1
diff --git a/wikidata.yaml b/wikidata.yaml
index a1e0af5..536527d 100644
--- a/wikidata.yaml
+++ b/wikidata.yaml
@@ -143,6 +143,12 @@
repoorclient: 'repo'
phpunit-params: '--group GetEntitiesTest'
+- 'mwext-Wikibase-{kind}-tests':
+ext-name: 'Wikibase'
+kind: repo-resources
+repoorclient: 'repo'
+phpunit-params: '--filter ResourcesTest'
+
- 'mwext-Wikibase-{kind}-tests':
ext-name: 'Wikibase'
kind: client
--
To view, visit https://gerrit.wikimedia.org/r/158338
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie334342dd899d67ccc9806f41884822a226133c3
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Link Adaptation: Adds trigger for input on link creation - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Link Adaptation: Adds trigger for input on link creation
..
Link Adaptation: Adds trigger for input on link creation
Change-Id: I99f439edc31151a91887d14d943a20f759b7cc64
---
M modules/tools/ext.cx.tools.link.js
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tools/ext.cx.tools.link.js
b/modules/tools/ext.cx.tools.link.js
index d843b22..c107e5d 100644
--- a/modules/tools/ext.cx.tools.link.js
+++ b/modules/tools/ext.cx.tools.link.js
@@ -361,7 +361,7 @@
* @return {jQuery}
*/
LinkCard.prototype.createInternalLink = function ( linkText, title, id
) {
- var $link;
+ var $link, $parentSection;
$link = $( 'a' )
.addClass( 'cx-target-link' )
@@ -377,6 +377,10 @@
pasteHtmlAtSelection( $link[ 0 ].outerHTML );
+ $parentSection = $( '.cx-target-link[data-linkid=' + id + ']'
)
+ .parents( '[contenteditable]' );
+ $parentSection.trigger( 'input' );
+
return $link;
};
--
To view, visit https://gerrit.wikimedia.org/r/158148
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I99f439edc31151a91887d14d943a20f759b7cc64
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Jsahleen jsahl...@wikimedia.org
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] rcstream: remove duplicate package declaration - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: rcstream: remove duplicate package declaration
..
rcstream: remove duplicate package declaration
Change-Id: I0609d40fcb17f6845e56be3bceb209f6b7904eac
---
M modules/rcstream/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/rcstream/manifests/init.pp
b/modules/rcstream/manifests/init.pp
index c688426..357ef82 100644
--- a/modules/rcstream/manifests/init.pp
+++ b/modules/rcstream/manifests/init.pp
@@ -46,7 +46,7 @@
system = true,
}
-package { [ 'python-socketio', 'python-redis' ]:
+package { [ 'python-socketio']:
ensure = $ensure,
before = Package['rcstream'],
}
--
To view, visit https://gerrit.wikimedia.org/r/158335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0609d40fcb17f6845e56be3bceb209f6b7904eac
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@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 empty files necessary for puppet class icinga::monitor. - change (labs/private)
JanZerebecki has uploaded a new change for review. https://gerrit.wikimedia.org/r/158340 Change subject: Add empty files necessary for puppet class icinga::monitor. .. Add empty files necessary for puppet class icinga::monitor. Change-Id: I2f69f22400026123dbcca9eedf4143320b16ddb5 --- A files/icinga/nsca.cfg A files/icinga/send_nsca.cfg A files/nagios/nsca_frack.cfg 3 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/private refs/changes/40/158340/1 diff --git a/files/icinga/nsca.cfg b/files/icinga/nsca.cfg new file mode 100644 index 000..e69de29 --- /dev/null +++ b/files/icinga/nsca.cfg diff --git a/files/icinga/send_nsca.cfg b/files/icinga/send_nsca.cfg new file mode 100644 index 000..e69de29 --- /dev/null +++ b/files/icinga/send_nsca.cfg diff --git a/files/nagios/nsca_frack.cfg b/files/nagios/nsca_frack.cfg new file mode 100644 index 000..e69de29 --- /dev/null +++ b/files/nagios/nsca_frack.cfg -- To view, visit https://gerrit.wikimedia.org/r/158340 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2f69f22400026123dbcca9eedf4143320b16ddb5 Gerrit-PatchSet: 1 Gerrit-Project: labs/private Gerrit-Branch: master Gerrit-Owner: JanZerebecki jan.wikime...@zerebecki.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use Flow on frwiki and hewiki - change (operations/mediawiki-config)
Spage has uploaded a new change for review. https://gerrit.wikimedia.org/r/158341 Change subject: Use Flow on frwiki and hewiki .. Use Flow on frwiki and hewiki The Mantle extension it requires is already loaded. Enabling Flow on particular pages will be follow-on patches. Change-Id: I41b11f10d8d7d9edbca16f373fb9b48e2aba2f36 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/41/158341/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 0bba76a..cad4e69 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -13161,6 +13161,8 @@ 'mediawikiwiki' = true, 'metawiki' = true, 'enwiki' = true, + 'frwiki' = true, + 'hewiki' = true, ), 'wmgFlowEditorList' = array( // Disable VE inside flow, leaving only the wikitext editor -- To view, visit https://gerrit.wikimedia.org/r/158341 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I41b11f10d8d7d9edbca16f373fb9b48e2aba2f36 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Spage sp...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable Flow on several pages - change (operations/mediawiki-config)
Spage has uploaded a new change for review. https://gerrit.wikimedia.org/r/158342 Change subject: Enable Flow on several pages .. Enable Flow on several pages Change-Id: Ib0aaa60f095c3ad9309f816256cd0ea84b7b7015 --- M wmf-config/InitialiseSettings.php 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/42/158342/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index cad4e69..59d 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -13191,11 +13191,19 @@ 'Talk:Search', 'Talk:Cite-from-id', 'Talk:Sparrow (sandbox for testing at Wikimania)', + 'Wikipedia:Teahouse/Questions/Flow_test', + 'Talk:MediaWiki 1.25', ), 'enwiki' = array( // Bug 60178 'Wikipedia talk:WikiProject Breakfast', 'Wikipedia talk:WikiProject Hampshire', 'Wikipedia talk:Flow/Developer test page', + 'Wikipedia:Co-op/Mentorship match', + 'Wikipedia:Teahouse/Questions/Flow test', + ), + 'frwiki' = array( + 'Wikipédia:Forum des nouveaux/Flow', + 'Discussion Wikipédia:Flow', ), ), // Use separate database on extension1 cluster for all non-private wikis. -- To view, visit https://gerrit.wikimedia.org/r/158342 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0aaa60f095c3ad9309f816256cd0ea84b7b7015 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Spage sp...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove visible whitespace in sitelinkgroupview - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Remove visible whitespace in sitelinkgroupview .. Remove visible whitespace in sitelinkgroupview The newline is rendered and causes a too big padding. Change-Id: Ifcb4d0b23c67a45187bc546f404a29ce818b5eb8 --- M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js M lib/resources/templates.php 2 files changed, 3 insertions(+), 5 deletions(-) Approvals: Henning Snater: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js index 1e4de0d..5b004fa 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js @@ -137,8 +137,8 @@ siteLink ? site.getUrlTo( siteLink.getPageName() ) : '', siteLink ? siteLink.getPageName() : '', '', // badges - siteLink ? site.getLanguageCode() : '', - siteLink ? site.getLanguageDirection() : 'auto' + site ? site.getLanguageCode() : '', + site ? site.getLanguageDirection() : 'auto' ) ); } diff --git a/lib/resources/templates.php b/lib/resources/templates.php index 7a829d1..217ad52 100644 --- a/lib/resources/templates.php +++ b/lib/resources/templates.php @@ -283,9 +283,7 @@ $templates['wikibase-sitelinkgroupview'] = HTML div class=wikibase-sitelinkgroupview data-wb-sitelinks-group=$5 - h2 class=wb-section-heading wikibase-sitelinkgroupview-heading dir=auto id=$1 - $2span class=wikibase-sitelinkgroupview-counter$3/span - /h2 + h2 class=wb-section-heading wikibase-sitelinkgroupview-heading dir=auto id=$1$2span class=wikibase-sitelinkgroupview-counter$3/span/h2 !-- wikibase-sitelinklistview --$4 /div HTML; -- To view, visit https://gerrit.wikimedia.org/r/156117 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifcb4d0b23c67a45187bc546f404a29ce818b5eb8 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Bene benestar.wikime...@googlemail.com Gerrit-Reviewer: Henning Snater henning.sna...@wikimedia.de Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add labs ssl key for puppet icinga::monitor. - change (labs/private)
JanZerebecki has uploaded a new change for review. https://gerrit.wikimedia.org/r/158344 Change subject: Add labs ssl key for puppet icinga::monitor. .. Add labs ssl key for puppet icinga::monitor. Change-Id: Ie1743e0a0272595603fe99dcc05df26bf0151a80 --- A files/ssl/icinga-admin.wikimedia.org.key A files/ssl/icinga.wikimedia.org.key 2 files changed, 58 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/private refs/changes/44/158344/1 diff --git a/files/ssl/icinga-admin.wikimedia.org.key b/files/ssl/icinga-admin.wikimedia.org.key new file mode 100644 index 000..07975c9 --- /dev/null +++ b/files/ssl/icinga-admin.wikimedia.org.key @@ -0,0 +1,29 @@ +# used only as a place holder for labs internal testing of icinga::monitor +-BEGIN PRIVATE KEY- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDZRDwNPfF8JprE +yyoy9qZk/cx0cU/OPLRI+OgmOQQb3YEh2Dhq9twjvgiIsWcq65eRb6Y9Vzenvgt2 ++vkFl7WyNdKG9j7ckbg3069lPh3mJ4XGHoqpLJ0j/Tgwlbp2PFimtRDkY9MImB8n +FCikiKbWr1c8FViZqQpBaLk3lCObB6I2hS+FVMWHzRhkh440bq9xxRnpsjEsPo3h +syQ9a48YVgyiTM+CMj2ZuPDh+E0yPSgMHCAVfSunUUv3S/WjPd3Hawllhm/W +DfrARkyzmxY68bxVsJZFU9l8pai01VLISKpf/7PZmISHf+itzGuRMaGXCU4yxVNi +gnPdKZr3AgMBAAECggEAZOdo0GmVTqiLNpx4k8SzkLHCk83QV6Mfw8g94QqX2u0r +vPEzepH9uWfXhMyHcoqKERR+a3ynL3N21aJHpw5HZ2XRybZxiXTvzpW0ntuTfUGb +wmCK23kJ3h4LS50uRR1PutTa7IdkCljEFx0opwmEGq7CX/g19t9oEOq3IpXdV3D/ +hApoAW/hamcY/aYvXucv9cqHLvU+T/fb9H2D9DGx91lzSV+ixu0pGTKQmlfnGsyn +tb51RsU4Gia1VEYEx6n1YmGTaj+jy8+li6ZsAdSeqyXFfEvRaz1DVxAbXjCi0exW +gqkQlci/PUyA9QyYelF9dFYr68YEqhE4gAkR/sYv4QKBgQD9nfiewzsJQPMp5yxQ +4FBsnWzsoFy+ljU33QHWbG94XT056OVkJy1Datu/NIQKFMejTdrxApLXQn2dUZdd +20vcmGXUz2Jy4ucsd475HWfcKPw1Caxt0+0u/lt53tFtCAKyGxllbfTMHZkIvwuF +WMNe0PZF11FMFLYsQMc/o2jJhwKBgQDbTtQ1WcyIqD6FiqksjFtMq5ktB7Ey7D7y +e1cLNINKo262DwANiDx4yQteuJIFuOFHMBaGoHsjd/pe8s/qYK1I1pItL/TjsUgX +KM0/JposWTqGXzVC386rRqNv/WjV1zQa+ENefYqmAwmzVPG632bmTFEw0hAzTZtD +jLy+MIQ/EQKBgQDn31wFWx1Ikpc/Aloj/1HIXA3QMbVZkl9JmcgqUK2BcE2f+mxv +qtnZP4N1RwBJb0Iu7el0XBQAtou+H3CyoOK05qiDbq/ltcoBf7W50Ma6JMahfxyk +tROu2WKtA6iZdK9yQxBvCZ68V3so4fIYklTdBVOD+x4a3vzHbNo+NpqBVQKBgQCP +LdkH99e8RLOE9jFa/0vAM6wupP4AdBLotrPugdtRyH/IZuSu8QoiBYfh0HitObYC +hxe9z1p1nqgcg0RRDcs0abpHvC6S1TRuwlm16Brx51N5VQFt5raERfsAa56dNgIz +tXAuaaIynnsf1M55Jc+Ffb/oMs0W4Y0Dvgef2AcPMQKBgQDqR4+PquSbGQZ3xvFz +7D+skFkjBTLnB416g0XMkfJiKCtcqZYia+wigtdvHl1hWv9sVpPBvYx/ZiwSBwUK +ZHhAOQj9grtwnOzIboslYkHwqELQ1Kjh5ex1JZp4dn15gnoNn1PWd1YLcHQdJvnt +cfNm0C8cfOaRzJhldETnJa0Fzw== +-END PRIVATE KEY- diff --git a/files/ssl/icinga.wikimedia.org.key b/files/ssl/icinga.wikimedia.org.key new file mode 100644 index 000..db095b6 --- /dev/null +++ b/files/ssl/icinga.wikimedia.org.key @@ -0,0 +1,29 @@ +# used only as a place holder for labs internal testing of icinga::monitor +-BEGIN PRIVATE KEY- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC0vcJnZQ+iLkkZ +n7XKxSc/S0IlCW5+Lghb3gPgVCYR9F1pYu9sUefEFNp4TK5RNh8Iz6Lkqv7zLV47 +a0moFIy40iimePWGN7/5NprR4V53w+vtouFevA5xGGHd4lcpFzHjAYBbs9Kc4fpc +Bz5jiq/36gvUo5UCH5fHmIWHvudfh+Nql65m3eInARs/9UUxKARq1IDI02SYW4ur +sWmm0690KEtdWFHmqYAR7drIcds42KgWg6LrFNOae6k0kePekrQxc34jfGPehGHI +zrL6n6ikjx3IfWgHhroNhz1OUiE5ZBvhbg56hXrXrueSf2DcZRLDYi+7cCqWpB7h +qpWQXZutAgMBAAECggEAL532w6q6ba3oEFolWOCMMH6xVHShqZiTFzDssIM67GwG +2Cb6kP0bJGuiCyOYoUiy8G1Tqw7p0ENZminv49pWILMthn5DoTK63vtl2nmXm9IA +LEFHQuAkpeMYlY52DBtSR04z9PTxPefDP8+gvjThm10L9N+L+F0+bZVfSJ4g8ue2 +pvOAKRzUdqeC6IieZUa+gLTeORH+YMh1IaYSMCI0gihMYuHccUYgKxVYE2LQVODg +D5+fs3ZUSeCNtkN72y8rVa7/Kw7/tb8nHaMP0zSVfh58viy9Ay3UYvTo1o2QMdxM +wBez/LKyVuRP6pA6somxIlknVw3P2QDuscB+EFu1uQKBgQDhxQJXdmlz9ZvwWfy2 ++iLa9C8FLq9ijbpLDw3aer9qiV7wQq8TclN1szYS4wAXrKpvCVM5TYITvizyIGlv +PvRb6s0G9g1JLgewd89+590qjHvpiaBaBpJL3NOOxXc/KM0Q6u+1kxcgcwvN6qHF +DKmbrUJwtRVWGK/WxQVK371pGwKBgQDM8UHZHBcd3my0wetJXFZTyZE+yIugQwxk +bpGmoAx9jNyIonifOiWvBNCzz1bXr92cPFA9rq7VzRzBPOJpbyY1zkf58wOJ/4fr +KLHngOrAemgmJndaztPgjX+khQYTzXJhwNfmb1pwq0rHl1EXRyRLs9j3sJvoDSPh +WhII0Qpi1wKBgAbKOQbOXd+J7HWvDyWlojS5kUxzmfy5zHeDbWQ7utQGa5+IMeHA +13e7uw2YXCFaJQoP2rvnc9kKKCnkBae92fWFu0LRVZb01nBdOhVT/dfQv81HQVZT +ykST0J0DnVF99aTjm+/3C4QDUcCQpOrbNaKj9FKVb53WQjuQU1dsITMvAoGAKpqc +zb2BMLxkbM9DUmTXrWNhxmN6Yz6M/PPfY3wyHIeD8QOVf8RewRuHJ1oa+4ubzjbb +l3cQ8XFKYQF/L9vjXZwcamGSgsWUQ9aZ5T5vjsPjksq8VSxZ73x65ICi2ssC1D96 +onTToEh7qzJRsT0g1nv0xsj4IC1bICXRSfPq7NECgYEAjgTuyXQbiNI8ARsrunOT +zRt0afNLV5vCoyzHMg0l7Dg3JG/tvAQFyvknDh24e1VfiDn1qntOc+M5mpTp6WQL +i1Ov8pYFfEV74DjyCSa8riwFiGgD2WJ9SzC3OEXRg8s6NeTnOpi3KpgkASQV4Pr5 +D9OI3vcuRjKYFxSCjdBKszc= +-END PRIVATE KEY- -- To view, visit https://gerrit.wikimedia.org/r/158344 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1743e0a0272595603fe99dcc05df26bf0151a80 Gerrit-PatchSet: 1 Gerrit-Project: labs/private Gerrit-Branch: master Gerrit-Owner: JanZerebecki jan.wikime...@zerebecki.de ___ MediaWiki-commits mailing
[MediaWiki-commits] [Gerrit] Puppetize icinga log file permission fix. - change (operations/puppet)
JanZerebecki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158345
Change subject: Puppetize icinga log file permission fix.
..
Puppetize icinga log file permission fix.
Change-Id: I3128485d42f68df34d4fee2112e6a4c0af0549ff
---
M manifests/misc/icinga.pp
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/158345/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 06dc6e2..e631831 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -297,6 +297,9 @@
exec { 'fix_icinga_temp_files':
command = '/bin/chown -R icinga /var/lib/icinga';
}
+exec { 'fix_icinga_log_files':
+command = '/bin/chown -R icinga /var/log/icinga';
+}
exec { 'fix_nagios_plugins_files':
command = '/bin/chmod -R a+w /var/lib/nagios';
}
--
To view, visit https://gerrit.wikimedia.org/r/158345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3128485d42f68df34d4fee2112e6a4c0af0549ff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: JanZerebecki jan.wikime...@zerebecki.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix wikibase test test_own_client - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Fix wikibase test test_own_client .. Fix wikibase test test_own_client The test test_own_client was introduced when Wikidata became its own client. The test checked whether pywikibot could support this configuration, but it used an invalid test scenario to do this. It was introduced in dce03581d4a2f0e52aa5b7a2e2b1e68a5a1b48a1 The Main Page should not be a valid ItemPage title; that is being fixed in other changes. The intention was to see whether an item could be loaded for the normal page object for Main Page. Change-Id: I21686a13825f547cf1a4ea34dae697139f3e0bbe --- M tests/wikibase_tests.py 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index d629e7e..9e1bca9 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -134,16 +134,16 @@ # working correctly on Wikidata. # The main Wikidata is its own client. -self.wdp = pywikibot.ItemPage(wikidata, - wikidata.siteinfo['mainpage']) +self.wdp = pywikibot.Page(wikidata, + wikidata.siteinfo['mainpage']) item = pywikibot.ItemPage.fromPage(self.wdp) -del item +self.assertEqual(item.site, self.wdp.site) # test.wikidata is also -self.wdp = pywikibot.ItemPage(wikidatatest, - wikidatatest.siteinfo['mainpage']) +self.wdp = pywikibot.Page(wikidatatest, + wikidatatest.siteinfo['mainpage']) item = pywikibot.ItemPage.fromPage(self.wdp) -del item +self.assertEqual(item.site, self.wdp.site) class TestItemLoad(PywikibotTestCase): -- To view, visit https://gerrit.wikimedia.org/r/158082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I21686a13825f547cf1a4ea34dae697139f3e0bbe Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make table name correspond to country name - change (labs...heritage)
Lokal Profil has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158346
Change subject: Make table name correspond to country name
..
Make table name correspond to country name
Since country in monuments_all is limited to 10 characters the
previous strings were cropped. Changing the source names to
reflect this leads to less confusion.
Affected tables:
* monuments_se-arbetsliv_(sv) - monuments_se-arbetsl_(sv)
* monuments_se-fornminne_(sv) - monuments_se-fornmin_(sv)
Change-Id: I52d43574130db0f12427507a1cc924fca77fe5d7
---
M erfgoedbot/monuments_config.py
M erfgoedbot/sql/fill_table_monuments_all.sql
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage
refs/changes/46/158346/1
diff --git a/erfgoedbot/monuments_config.py b/erfgoedbot/monuments_config.py
index 1183f19..b011ce8 100755
--- a/erfgoedbot/monuments_config.py
+++ b/erfgoedbot/monuments_config.py
@@ -7218,7 +7218,7 @@
},
],
},
-('se-arbetsliv', 'sv') : { # Working Life Museums in Sweden in Swedish
+('se-arbetsl', 'sv') : { # Working Life Museums in Sweden in Swedish
'project' : u'wikipedia',
'lang' : u'sv',
'headerTemplate' : u'Arbetslivsmuseum-huvud',
diff --git a/erfgoedbot/sql/fill_table_monuments_all.sql
b/erfgoedbot/sql/fill_table_monuments_all.sql
index e66962c..067bd59 100644
--- a/erfgoedbot/sql/fill_table_monuments_all.sql
+++ b/erfgoedbot/sql/fill_table_monuments_all.sql
@@ -2018,7 +2018,7 @@
FROM `monuments_se-bbr_(sv)`;
/* Fornminne Monuments in Sweden in Swedish */
REPLACE INTO `monuments_all_tmp` (`country`, `lang`, `id`, `adm0`, `adm1`,
`adm2`, `adm3`, `adm4`, `name`, `address`, `municipality`, `lat`, `lon`,
`lat_int`, `lon_int`, `image`, `commonscat`, `source`, `changed`,
`monument_article`, `registrant_url` )
-SELECT 'se-fornminne' AS `country`,
+SELECT 'se-fornmin' AS `country`,
'sv' AS `lang`,
`id` AS `id`,
'se' AS `adm0`,
@@ -2039,7 +2039,7 @@
`changed` AS `changed`,
`artikel` AS `monument_article`,
`registrant_url` AS `registrant_url`
- FROM `monuments_se-fornminne_(sv)`;
+ FROM `monuments_se-fornmin_(sv)`;
/* Listed historical ships in Sweden in Swedish */
REPLACE INTO `monuments_all_tmp` (`country`, `lang`, `id`, `adm0`, `adm1`,
`adm2`, `adm3`, `adm4`, `name`, `address`, `municipality`, `lat`, `lon`,
`lat_int`, `lon_int`, `image`, `commonscat`, `source`, `changed`,
`monument_article`, `registrant_url` )
SELECT 'se-ship' AS `country`,
@@ -2066,7 +2066,7 @@
FROM `monuments_se-ship_(sv)`;
/* Working Life Museums in Sweden in Swedish */
REPLACE INTO `monuments_all_tmp` (`country`, `lang`, `id`, `adm0`, `adm1`,
`adm2`, `adm3`, `adm4`, `name`, `address`, `municipality`, `lat`, `lon`,
`lat_int`, `lon_int`, `image`, `commonscat`, `source`, `changed`,
`monument_article`, `registrant_url` )
-SELECT 'se-arbetsliv' AS `country`,
+SELECT 'se-arbetsl' AS `country`,
'sv' AS `lang`,
`id` AS `id`,
'se' AS `adm0`,
@@ -2087,7 +2087,7 @@
`changed` AS `changed`,
`monument_article` AS `monument_article`,
'' AS `registrant_url` /* FIXME: Add this field to source table */
- FROM `monuments_se-arbetsliv_(sv)`;
+ FROM `monuments_se-arbetsl_(sv)`;
/* Slovakia in German */
REPLACE INTO `monuments_all_tmp` (`country`, `lang`, `id`, `adm0`, `adm1`,
`adm2`, `adm3`, `adm4`, `name`, `address`, `municipality`, `lat`, `lon`,
`lat_int`, `lon_int`, `image`, `commonscat`, `source`, `changed`,
`monument_article`, `registrant_url` )
SELECT 'sk' AS `country`,
--
To view, visit https://gerrit.wikimedia.org/r/158346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I52d43574130db0f12427507a1cc924fca77fe5d7
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil lokal.pro...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QUnit tests for isAbuse method of MTAbuseCard - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158347
Change subject: QUnit tests for isAbuse method of MTAbuseCard
..
QUnit tests for isAbuse method of MTAbuseCard
Change-Id: I963181ae43c2f6e73c7261d17daf36390de14b87
---
M ContentTranslation.hooks.php
A tests/qunit/ext.cx.tools.mtabuse.test.js
2 files changed, 63 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/47/158347/1
diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index ea21786..1f9395c 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -100,8 +100,15 @@
*/
public static function addTestModules( array $testModules,
ResourceLoader $resourceLoader ) {
$testModules['qunit']['ext.cx.tools.tests'] = array(
- 'scripts' = array(
'tests/qunit/ext.cx.tools.template.test.js' ),
- 'dependencies' = array( 'ext.cx.model',
'ext.cx.tools.template' ),
+ 'scripts' = array(
+ 'tests/qunit/ext.cx.tools.template.test.js',
+ 'tests/qunit/ext.cx.tools.mtabuse.test.js'
+ ),
+ 'dependencies' = array(
+ 'ext.cx.model',
+ 'ext.cx.tools.template',
+ 'ext.cx.tools.mtabuse',
+ ),
'localBasePath' = __DIR__,
'remoteExtPath' = 'ContentTranslation',
);
diff --git a/tests/qunit/ext.cx.tools.mtabuse.test.js
b/tests/qunit/ext.cx.tools.mtabuse.test.js
new file mode 100644
index 000..1f8d5fc
--- /dev/null
+++ b/tests/qunit/ext.cx.tools.mtabuse.test.js
@@ -0,0 +1,54 @@
+/**
+ * QUnit tests for Content Translation.
+ *
+ * @file
+ * @ingroup Extensions
+ * @licence GPL-2.0+
+ */
+
+( function ( $, mw ) {
+ 'use strict';
+
+ QUnit.module( 'ext.cx.tools.mtabuse', QUnit.newMwEnvironment() );
+
+ QUnit.test( 'MT Abuse - isAbuse method tests', 5, function ( assert ) {
+ var progress, mtAbuseCard = new mw.cx.tools.mtabuse();
+ progress = {
+ any: 0,
+ human: 0,
+ mt: 0,
+ mtSectionsCount: 0
+ };
+ assert.assertFalse( mtAbuseCard.isAbuse( progress ), 'Beginning
of translation. Nothing done.' );
+ progress = {
+ any: 1.0,
+ human: 0.9,
+ mt: 0.1,
+ mtSectionsCount: 10
+ };
+ assert.assertFalse( mtAbuseCard.isAbuse( progress ),
'Translation with 90% human edits' );
+ progress = {
+ any: 0,
+ human: 0,
+ mt: 0.8,
+ mtSectionsCount: 2
+ };
+ assert.assertFalse( mtAbuseCard.isAbuse( progress ),
'Translation with 80% MT, but only 2 sections translated' );
+ progress = {
+ any: 0,
+ human: 0,
+ mt: 0.8,
+ mtSectionsCount: 6
+ };
+ assert.assertTrue( mtAbuseCard.isAbuse( progress ),
'Translation with 80% MT, 6 sections translated' );
+ progress = {
+ any: 0.76,
+ human: 0,
+ mt: 0.8,
+ mtSectionsCount: 5
+ };
+ assert.assertTrue( mtAbuseCard.isAbuse( progress ),
+ 'Translation with 80% MT, only 5 sections translated,
but total translation is 76%' );
+ } );
+
+}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/158347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I963181ae43c2f6e73c7261d17daf36390de14b87
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] New Wikidata Build - 04/09/2014 10:00 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review. https://gerrit.wikimedia.org/r/158348 Change subject: New Wikidata Build - 04/09/2014 10:00 .. New Wikidata Build - 04/09/2014 10:00 Change-Id: I82c7292ec448898ccd6cd05a4a8b295d63b9057e --- M composer.lock M extensions/ValueView/README.md M extensions/ValueView/ValueView.php M extensions/ValueView/lib/jquery.ui/jquery.ui.toggler.css M extensions/ValueView/lib/resources.php M extensions/Wikibase/.jshintignore M extensions/Wikibase/client/i18n/da.json M extensions/Wikibase/client/i18n/oc.json M extensions/Wikibase/composer.json M extensions/Wikibase/lib/WikibaseLib.hooks.php M extensions/Wikibase/lib/i18n/da.json M extensions/Wikibase/lib/i18n/nl.json M extensions/Wikibase/lib/includes/serializers/LegacyInternalClaimSerializer.php M extensions/Wikibase/lib/includes/serializers/LegacyInternalEntitySerializer.php M extensions/Wikibase/lib/resources/Resources.php R extensions/Wikibase/lib/resources/jquery.ui/jquery.ui.tagadata.LICENSE R extensions/Wikibase/lib/resources/jquery.ui/jquery.ui.tagadata.css A extensions/Wikibase/lib/resources/jquery.ui/jquery.ui.tagadata.js M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js M extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/movetoolbar.js M extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/toolbar.js M extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/toolbarbase.js M extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/toolbarbutton.js M extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/toolbareditgroup.js M extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/toolbarlabel.js A extensions/Wikibase/lib/resources/jquery/jquery.removeClassByRegex.js M extensions/Wikibase/lib/resources/templates.php D extensions/Wikibase/lib/resources/wikibase.utilities/wikibase.utilities.jQuery.js D extensions/Wikibase/lib/resources/wikibase.utilities/wikibase.utilities.jQuery.ui.tagadata/wikibase.utilities.jQuery.ui.tagadata.js M extensions/Wikibase/lib/resources/wikibase.utilities/wikibase.utilities.js D extensions/Wikibase/lib/resources/wikibase.utilities/wikibase.utilities.ui.StatableObject.js M extensions/Wikibase/lib/tests/phpunit/NoBadDependencyUsageTest.php D extensions/Wikibase/lib/tests/phpunit/serializers/LegacyInternalEntitySerializerTest.php A extensions/Wikibase/lib/tests/qunit/jquery.ui/jquery.ui.tagadata.tests.js M extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js M extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.listview.tests.js M extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.referenceview.tests.js M extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js M extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.snaklistview.tests.js M extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.statementview.RankSelector.tests.js M extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.wbtooltip.tests.js A extensions/Wikibase/lib/tests/qunit/jquery.wikibase/resources.php M extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbar.tests.js M extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbarbutton.tests.js M extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbareditgroup.tests.js M extensions/Wikibase/lib/tests/qunit/jquery.wikibase/toolbar/toolbarlabel.tests.js A extensions/Wikibase/lib/tests/qunit/jquery/jquery.removeClassByRegex.tests.js A extensions/Wikibase/lib/tests/qunit/resources.php M extensions/Wikibase/lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js M extensions/Wikibase/lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApiError.tests.js M extensions/Wikibase/lib/tests/qunit/wikibase.Site.tests.js M extensions/Wikibase/lib/tests/qunit/wikibase.compileEntityStoreFromMwConfig.tests.js M extensions/Wikibase/lib/tests/qunit/wikibase.store/store.EntityStore.tests.js M extensions/Wikibase/lib/tests/qunit/wikibase.tests.js M extensions/Wikibase/lib/tests/qunit/wikibase.utilities/wikibase.utilities.ClaimGuidGenerator.tests.js M extensions/Wikibase/lib/tests/qunit/wikibase.utilities/wikibase.utilities.GuidGenerator.tests.js D extensions/Wikibase/lib/tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.PersistentPromisor.tests.js D extensions/Wikibase/lib/tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.tests.js D extensions/Wikibase/lib/tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.ui.tagadata.tests.js D
[MediaWiki-commits] [Gerrit] Add QUnit tests for ext.cx.editor - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158349
Change subject: Add QUnit tests for ext.cx.editor
..
Add QUnit tests for ext.cx.editor
Change-Id: I8dc1f550959cfa3d4f81288434cf51cf76650e93
---
M ContentTranslation.hooks.php
A tests/qunit/editor/ext.cx.editor.test.js
2 files changed, 75 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/49/158349/1
diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index ea21786..a612baf 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -106,6 +106,13 @@
'remoteExtPath' = 'ContentTranslation',
);
+ $testModules['qunit']['ext.cx.editor.tests'] = array(
+ 'scripts' = array(
'tests/qunit/editor/ext.cx.editor.test.js' ),
+ 'dependencies' = array( 'ext.cx.editor' ),
+ 'localBasePath' = __DIR__,
+ 'remoteExtPath' = 'ContentTranslation',
+ );
+
return true;
}
}
diff --git a/tests/qunit/editor/ext.cx.editor.test.js
b/tests/qunit/editor/ext.cx.editor.test.js
new file mode 100644
index 000..4fffcca
--- /dev/null
+++ b/tests/qunit/editor/ext.cx.editor.test.js
@@ -0,0 +1,68 @@
+/**
+ * @file
+ * @author Niklas Laxström
+ * @license GPL-2.0+
+ */
+
+( function ( $, mw ) {
+ 'use strict';
+
+ /**
+* Testing persistent hooks is tricky. This should take care of the
messy details.
+*
+* @param {string} hook Name of the hook.
+* @param {function} trigger Function to call to trigger an event.
+* @param {function} callback Function to bind to the hook.
+*/
+ function triggerSafely( hook, callback, trigger ) {
+ // Fire wake even so we know we are not getting cached data,
+ // use timeout as there is no way to know when trigger has
+ // been processed - especially since the other end uses
+ // $.debounce. There seems to be no way to clear the hooks
+ // either.
+ mw.hook( hook ).fire();
+
+ trigger.call();
+
+ setTimeout( function () {
+ mw.hook( hook ).add( callback );
+ }, 300 );
+ }
+
+ QUnit.module( 'ext.cx.editor', QUnit.newMwEnvironment( {
+ setup: function () {
+ this.hook = null;
+ this.asserter = null;
+ this.$section = $( 'div' ).appendTo( $(
'#qunit-fixture' ) );
+ this.$section.cxEditor();
+ },
+ teardown: function () {
+ mw.hook( this.hook ).remove( this.asserter );
+ }
+ } ) );
+
+ QUnit.test( 'Initialization', function ( assert ) {
+ QUnit.expect( 1 );
+ assert.strictEqual(
+ this.$section.attr( 'contenteditable' ),
+ 'true',
+ 'Section is content editable'
+ );
+ } );
+
+ QUnit.test( 'Event (change)', function ( assert ) {
+ var $section = this.$section;
+
+ this.hook = 'mw.cx.translation.change';
+ this.asserter = function ( value ) {
+ QUnit.start();
+ assert.ok( value instanceof jQuery, 'Event was fired' );
+ };
+
+ QUnit.expect( 1 );
+ QUnit.stop();
+ triggerSafely( this.hook, this.asserter, function () {
+ $section.text( 'bar' ).trigger( 'input' );
+ } );
+ } );
+}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/158349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8dc1f550959cfa3d4f81288434cf51cf76650e93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
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] Remove usage of removed hooks - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158350
Change subject: Remove usage of removed hooks
..
Remove usage of removed hooks
Change-Id: I37d79b61578a273c4c798f5d3663acb6ecb42e31
---
M hooks.md
M modules/tools/ext.cx.tools.mt.js
M modules/translation/ext.cx.translation.js
3 files changed, 1 insertion(+), 21 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/50/158350/1
diff --git a/hooks.md b/hooks.md
index ba53bde..1d7ac55 100644
--- a/hooks.md
+++ b/hooks.md
@@ -98,14 +98,6 @@
Fired when the translation section changed because of any reason.
-## mw.cx.translation.clear
-
-Fired when the translation section is cleared.
-
-## mw.cx.translation.edit
-
-Fired when translator edits the translation section, for example by typing.
-
## mw.cx.translation.focus
Fired when translation section receives focus.
diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 299c26a..c29a25b 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -261,7 +261,7 @@
this.$restore
.on( 'click', $.proxy( this.restoreTranslation, this )
);
- mw.hook( 'mw.cx.translation.edit' ).add( $.proxy(
this.showRestore, this ) );
+ mw.hook( 'mw.cx.translation.change' ).add( $.proxy(
this.showRestore, this ) );
};
MTControlCard.prototype.buildProvidersMenu = function () {
diff --git a/modules/translation/ext.cx.translation.js
b/modules/translation/ext.cx.translation.js
index f445e5e..3925663 100644
--- a/modules/translation/ext.cx.translation.js
+++ b/modules/translation/ext.cx.translation.js
@@ -106,18 +106,6 @@
}, 2000 );
} );
- // The translation for a section was cleared.
- // The translator either deleted the content
- // or used the clear translation tool.
- // Present the placeholder for the section to user.
- mw.hook( 'mw.cx.translation.clear' ).add( function ( sourceId )
{
- var targetSectionId = '#cx' + sourceId,
- $placeholder = getPlaceholder( sourceId );
-
- mw.hook( 'mw.cx.translation.change' ).fire( $(
targetSectionId ) );
- $( targetSectionId ).replaceWith( $placeholder );
- } );
-
mw.hook( 'mw.cx.translation.change' ).add( function ( $section
) {
if ( $section ) {
$section.keepAlignment();
--
To view, visit https://gerrit.wikimedia.org/r/158350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37d79b61578a273c4c798f5d3663acb6ecb42e31
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
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] pep257 in pywikibot/families - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158351
Change subject: pep257 in pywikibot/families
..
pep257 in pywikibot/families
Change-Id: Iaeb7761baf6f8440f2113d3e688b5c83fc50c6f2
---
M pywikibot/families/__init__.py
M pywikibot/families/anarchopedia_family.py
M pywikibot/families/battlestarwiki_family.py
M pywikibot/families/commons_family.py
M pywikibot/families/i18n_family.py
M pywikibot/families/incubator_family.py
M pywikibot/families/lockwiki_family.py
M pywikibot/families/lyricwiki_family.py
M pywikibot/families/mediawiki_family.py
M pywikibot/families/meta_family.py
M pywikibot/families/omegawiki_family.py
M pywikibot/families/osm_family.py
M pywikibot/families/outreach_family.py
M pywikibot/families/species_family.py
M pywikibot/families/strategy_family.py
M pywikibot/families/vikidia_family.py
M pywikibot/families/wikia_family.py
M pywikibot/families/wikibooks_family.py
M pywikibot/families/wikidata_family.py
M pywikibot/families/wikimedia_family.py
M pywikibot/families/wikinews_family.py
M pywikibot/families/wikipedia_family.py
M pywikibot/families/wikiquote_family.py
M pywikibot/families/wikisource_family.py
M pywikibot/families/wikitech_family.py
M pywikibot/families/wikiversity_family.py
M pywikibot/families/wikivoyage_family.py
M pywikibot/families/wiktionary_family.py
M pywikibot/families/wowwiki_family.py
29 files changed, 188 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/51/158351/1
diff --git a/pywikibot/families/__init__.py b/pywikibot/families/__init__.py
index 5041b19..e1d916b 100644
--- a/pywikibot/families/__init__.py
+++ b/pywikibot/families/__init__.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+Families package.
#
# (C) Pywikibot team, 2007
#
diff --git a/pywikibot/families/anarchopedia_family.py
b/pywikibot/families/anarchopedia_family.py
index 5929098..42f4a96 100644
--- a/pywikibot/families/anarchopedia_family.py
+++ b/pywikibot/families/anarchopedia_family.py
@@ -1,4 +1,6 @@
# -*- coding: utf-8 -*-
+Family module for Anarchopedia wiki.
+
__version__ = '$Id$'
from pywikibot import family
@@ -6,7 +8,11 @@
# The Anarchopedia family
class Family(family.Family):
+
+Family class for Anarchopedia wiki.
+
def __init__(self):
+Constructor.
family.Family.__init__(self)
self.name = 'anarchopedia'
@@ -62,13 +68,17 @@
}
def version(self, code):
+Return the version for this family.
return 1.14alpha
def scriptpath(self, code):
+Return the script path for this family.
return ''
def path(self, code):
+Return the path to index.php for this family.
return '/index.php'
def apipath(self, code):
+Return the path to api.php for this family.
return '/api.php'
diff --git a/pywikibot/families/battlestarwiki_family.py
b/pywikibot/families/battlestarwiki_family.py
index 8be7a43..44a9182 100644
--- a/pywikibot/families/battlestarwiki_family.py
+++ b/pywikibot/families/battlestarwiki_family.py
@@ -1,4 +1,6 @@
# -*- coding: utf-8 -*-
+Family module for Battlestar Wiki.
+
__version__ = '$Id$'
from pywikibot import family
@@ -7,7 +9,11 @@
# The Battlestar Wiki family, a set of Battlestar wikis.
# http://battlestarwiki.org/
class Family(family.Family):
+
+Family class for Battlestar Wiki.
+
def __init__(self):
+Constructor.
family.Family.__init__(self)
self.name = 'battlestarwiki'
@@ -17,7 +23,9 @@
self.langs[lang] = '%s.battlestarwiki.org' % lang
def hostname(self, code):
+Return the hostname for a site in this family.
return '%s.battlestarwiki.org' % code
def version(self, code):
+Return the version for this family.
return 1.16.4
diff --git a/pywikibot/families/commons_family.py
b/pywikibot/families/commons_family.py
index 39375c9..17e9d9b 100644
--- a/pywikibot/families/commons_family.py
+++ b/pywikibot/families/commons_family.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+Family module for Wikimedia Commons.
__version__ = '$Id$'
@@ -7,7 +8,11 @@
# The Wikimedia Commons family
class Family(family.WikimediaFamily):
+
+Family class for Wikimedia Commons.
+
def __init__(self):
+Constructor.
super(Family, self).__init__()
self.name = 'commons'
self.langs = {
@@ -41,4 +46,5 @@
}
def shared_data_repository(self, code, transcluded=False):
+Return the shared data repository for this site.
return ('wikidata', 'wikidata')
diff --git a/pywikibot/families/i18n_family.py
b/pywikibot/families/i18n_family.py
index f1dea70..9a1047f 100644
--- a/pywikibot/families/i18n_family.py
+++ b/pywikibot/families/i18n_family.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+Family module for Translate Wiki.
[MediaWiki-commits] [Gerrit] Untangled $.wikibase.snakview ResourceLoader modules - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Untangled $.wikibase.snakview ResourceLoader modules .. Untangled $.wikibase.snakview ResourceLoader modules Change-Id: I083ae8899965d9dde68d8219c766557f3355be86 --- M lib/resources/Resources.php M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.SnakTypeSelector.js M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.ViewState.js M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.js 6 files changed, 107 insertions(+), 27 deletions(-) Approvals: Tobias Gritschacher: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php index ef615e6..4323663 100644 --- a/lib/resources/Resources.php +++ b/lib/resources/Resources.php @@ -585,12 +585,6 @@ 'scripts' = array( 'jquery.wikibase/jquery.wikibase.snakview/snakview.js', 'jquery.wikibase/jquery.wikibase.snakview/snakview.SnakTypeSelector.js', - 'jquery.wikibase/jquery.wikibase.snakview/snakview.ViewState.js', - 'jquery.wikibase/jquery.wikibase.snakview/snakview.variations.js', - 'jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js', - 'jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js', - 'jquery.wikibase/jquery.wikibase.snakview/snakview.variations.SomeValue.js', - 'jquery.wikibase/jquery.wikibase.snakview/snakview.variations.NoValue.js', ), 'styles' = array( 'jquery.wikibase/jquery.wikibase.snakview/themes/default/snakview.SnakTypeSelector.css', @@ -601,27 +595,93 @@ 'jquery.ui.position', 'jquery.ui.TemplatedWidget', 'jquery.wikibase.entityselector', + 'jquery.wikibase.snakview.variations', + 'jquery.wikibase.snakview.variations.NoValue', + 'jquery.wikibase.snakview.variations.SomeValue', + 'jquery.wikibase.snakview.variations.Value', + 'jquery.wikibase.snakview.ViewState', 'mediawiki.legacy.shared', 'mw.config.values.wbRepo', - 'util.inherit', 'wikibase.datamodel', - 'wikibase.dataTypes', - 'wikibase.utilities' + 'wikibase.utilities', ), 'messages' = array( 'wikibase-snakview-property-input-placeholder', - 'wikibase-snakview-unsupportedsnaktype', 'wikibase-snakview-choosesnaktype', - 'wikibase-snakview-variation-datavaluetypemismatch', - 'wikibase-snakview-variation-datavaluetypemismatch-details', - 'wikibase-snakview-variation-nonewvaluefordeletedproperty', - 'datatypes-type-wikibase-item', - 'wikibase-snakview-variations-somevalue-label', - 'wikibase-snakview-variations-novalue-label', 'wikibase-snakview-snaktypeselector-value', 'wikibase-snakview-snaktypeselector-somevalue', 'wikibase-snakview-snaktypeselector-novalue' - ) + ), + ), + + 'jquery.wikibase.snakview.variations' = $moduleTemplate + array( + 'scripts' = array( + 'jquery.wikibase/jquery.wikibase.snakview/snakview.variations.js', + ), + 'dependencies' = array( + 'jquery.wikibase.snakview.variations.Variation', + 'util.inherit', + ), + ), + + 'jquery.wikibase.snakview.variations.Variation' = $moduleTemplate + array( + 'scripts' = array( + 'jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js', + ), + 'dependencies' = array( +
[MediaWiki-commits] [Gerrit] Use 'div' instead of 'section' and 'article' - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Use 'div' instead of 'section' and 'article'
..
Use 'div' instead of 'section' and 'article'
The user-agent stylesheet was making the size
of both the h1's and h2's 1.5em as it was inside
article and section
:-webkit-any(article,aside,nav,section)
h1 - 1.5em user agent stylesheet
~h1 - 2em~ user agent stylesheet
Change-Id: Ied1d03f63c132dc3904d05cd4e55f70aa3f80c3d
---
M docs/kss/styleguide-template/index.html
M docs/kss/styleguide-template/public/kss.less
2 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/kss/styleguide-template/index.html
b/docs/kss/styleguide-template/index.html
index b6036b2..38f0dd1 100644
--- a/docs/kss/styleguide-template/index.html
+++ b/docs/kss/styleguide-template/index.html
@@ -19,7 +19,7 @@
/header
div class=container
- nav class=content
+ nav
ul
lia href=index.htmlspan0.0/span
Overview/a/li
{{#eachRoot}}
@@ -28,12 +28,12 @@
/ul
/nav
- article
+ div class=content
{{#if overview}}
{{html overview}}
{{else}}
{{#eachSection rootNumber}}
- section
+ div
{{#whenDepth 1}}
h1{{ reference }}.0 {{ header
}}/h1
{{else}}
@@ -60,10 +60,10 @@
{{html
description}}
{{/if}}
{{/ifAny}}
- /section
+ /div
{{/eachSection}}
{{/if}}
- /article
+ /div
/div
/div/body
/html
diff --git a/docs/kss/styleguide-template/public/kss.less
b/docs/kss/styleguide-template/public/kss.less
index f5ddff1..a1d62a3 100644
--- a/docs/kss/styleguide-template/public/kss.less
+++ b/docs/kss/styleguide-template/public/kss.less
@@ -1,4 +1,3 @@
-
.container {
width: 100%;
}
@@ -7,7 +6,7 @@
display: none;
}
-article {
+.content {
.example {
blockquote {
margin-top: 20px;
@@ -25,7 +24,8 @@
font-family: Nimbus Sans L, Liberation Sans, Helvetica Neue,
Helvetica, Arial, sans-serif;
}
-.content.kss-no-margin {
+.kss-no-margin {
+ // FIXME: Is this being used anywhere? Remove if not.
margin: 0;
}
@@ -89,7 +89,7 @@
}
}
-article {
+.content {
-webkit-flex: 1;
flex: 1;
@@ -154,7 +154,7 @@
width: auto;
}
- article {
+ .content {
margin-left: 30px;
}
--
To view, visit https://gerrit.wikimedia.org/r/150812
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied1d03f63c132dc3904d05cd4e55f70aa3f80c3d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Prtksxna psax...@wikimedia.org
Gerrit-Reviewer: Waldir wal...@email.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 group parameter from modules - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/158352 Change subject: Remove group parameter from modules .. Remove group parameter from modules I'm unable to find any documentation for this parameter. For what I understand it only prevents combining these modules with other modules during bundling. Change-Id: I54dba1d72dbb54bf35d30f4518cedaa18b273846 --- M Resources.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/52/158352/1 diff --git a/Resources.php b/Resources.php index 9a0ac02..073f9e1 100644 --- a/Resources.php +++ b/Resources.php @@ -11,7 +11,6 @@ $resourcePaths = array( 'localBasePath' = $dir . '/modules', 'remoteExtPath' = 'ContentTranslation/modules', - 'group' = 'ext.cx', ); $wgResourceModules['ext.cx.model'] = array( -- To view, visit https://gerrit.wikimedia.org/r/158352 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54dba1d72dbb54bf35d30f4518cedaa18b273846 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation 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] pep257 in pywikibot/families - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: pep257 in pywikibot/families
..
pep257 in pywikibot/families
Change-Id: Iaeb7761baf6f8440f2113d3e688b5c83fc50c6f2
---
M pywikibot/families/__init__.py
M pywikibot/families/anarchopedia_family.py
M pywikibot/families/battlestarwiki_family.py
M pywikibot/families/commons_family.py
M pywikibot/families/i18n_family.py
M pywikibot/families/incubator_family.py
M pywikibot/families/lockwiki_family.py
M pywikibot/families/lyricwiki_family.py
M pywikibot/families/mediawiki_family.py
M pywikibot/families/meta_family.py
M pywikibot/families/omegawiki_family.py
M pywikibot/families/osm_family.py
M pywikibot/families/outreach_family.py
M pywikibot/families/species_family.py
M pywikibot/families/strategy_family.py
M pywikibot/families/vikidia_family.py
M pywikibot/families/wikia_family.py
M pywikibot/families/wikibooks_family.py
M pywikibot/families/wikidata_family.py
M pywikibot/families/wikimedia_family.py
M pywikibot/families/wikinews_family.py
M pywikibot/families/wikipedia_family.py
M pywikibot/families/wikiquote_family.py
M pywikibot/families/wikisource_family.py
M pywikibot/families/wikitech_family.py
M pywikibot/families/wikiversity_family.py
M pywikibot/families/wikivoyage_family.py
M pywikibot/families/wiktionary_family.py
M pywikibot/families/wowwiki_family.py
29 files changed, 188 insertions(+), 11 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/families/__init__.py b/pywikibot/families/__init__.py
index 5041b19..e1d916b 100644
--- a/pywikibot/families/__init__.py
+++ b/pywikibot/families/__init__.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+Families package.
#
# (C) Pywikibot team, 2007
#
diff --git a/pywikibot/families/anarchopedia_family.py
b/pywikibot/families/anarchopedia_family.py
index 5929098..42f4a96 100644
--- a/pywikibot/families/anarchopedia_family.py
+++ b/pywikibot/families/anarchopedia_family.py
@@ -1,4 +1,6 @@
# -*- coding: utf-8 -*-
+Family module for Anarchopedia wiki.
+
__version__ = '$Id$'
from pywikibot import family
@@ -6,7 +8,11 @@
# The Anarchopedia family
class Family(family.Family):
+
+Family class for Anarchopedia wiki.
+
def __init__(self):
+Constructor.
family.Family.__init__(self)
self.name = 'anarchopedia'
@@ -62,13 +68,17 @@
}
def version(self, code):
+Return the version for this family.
return 1.14alpha
def scriptpath(self, code):
+Return the script path for this family.
return ''
def path(self, code):
+Return the path to index.php for this family.
return '/index.php'
def apipath(self, code):
+Return the path to api.php for this family.
return '/api.php'
diff --git a/pywikibot/families/battlestarwiki_family.py
b/pywikibot/families/battlestarwiki_family.py
index 8be7a43..44a9182 100644
--- a/pywikibot/families/battlestarwiki_family.py
+++ b/pywikibot/families/battlestarwiki_family.py
@@ -1,4 +1,6 @@
# -*- coding: utf-8 -*-
+Family module for Battlestar Wiki.
+
__version__ = '$Id$'
from pywikibot import family
@@ -7,7 +9,11 @@
# The Battlestar Wiki family, a set of Battlestar wikis.
# http://battlestarwiki.org/
class Family(family.Family):
+
+Family class for Battlestar Wiki.
+
def __init__(self):
+Constructor.
family.Family.__init__(self)
self.name = 'battlestarwiki'
@@ -17,7 +23,9 @@
self.langs[lang] = '%s.battlestarwiki.org' % lang
def hostname(self, code):
+Return the hostname for a site in this family.
return '%s.battlestarwiki.org' % code
def version(self, code):
+Return the version for this family.
return 1.16.4
diff --git a/pywikibot/families/commons_family.py
b/pywikibot/families/commons_family.py
index 39375c9..17e9d9b 100644
--- a/pywikibot/families/commons_family.py
+++ b/pywikibot/families/commons_family.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+Family module for Wikimedia Commons.
__version__ = '$Id$'
@@ -7,7 +8,11 @@
# The Wikimedia Commons family
class Family(family.WikimediaFamily):
+
+Family class for Wikimedia Commons.
+
def __init__(self):
+Constructor.
super(Family, self).__init__()
self.name = 'commons'
self.langs = {
@@ -41,4 +46,5 @@
}
def shared_data_repository(self, code, transcluded=False):
+Return the shared data repository for this site.
return ('wikidata', 'wikidata')
diff --git a/pywikibot/families/i18n_family.py
b/pywikibot/families/i18n_family.py
index f1dea70..9a1047f 100644
--- a/pywikibot/families/i18n_family.py
+++ b/pywikibot/families/i18n_family.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+Family module for Translate Wiki.
__version__ = '$Id$'
@@ -8,7 +9,10 @@
# The
[MediaWiki-commits] [Gerrit] Ignore missing docstring in PEP257 - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Ignore missing docstring in PEP257
..
Ignore missing docstring in PEP257
For a while in order to reduce number of errors.
We'll get to them later
Change-Id: I2344b40eda4b437762c4ab48654b246c4db16ebe
---
M tox.ini
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tox.ini b/tox.ini
index 00fcf0d..3022ca6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@
deps = flake8
[testenv:flake8-docstrings]
-commands = flake8 --select=D {posargs} --jobs=1
+commands = flake8 {posargs} --jobs=1 --ignore=D102,D103
deps = flake8-docstrings
# Note: flake8 is run here with --jobs=1 to disable multiprocessing which stall
# the run with flake8-docstrings / pep257.
--
To view, visit https://gerrit.wikimedia.org/r/157289
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2344b40eda4b437762c4ab48654b246c4db16ebe
Gerrit-PatchSet: 7
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Nullzero nullzero.f...@gmail.com
Gerrit-Reviewer: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Position flyout on window resize - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Position flyout on window resize
..
Position flyout on window resize
Change-Id: I53248ffaac405e794b99ab7f720143847a78410c
---
M resources/lightbulb/lightbulb.flyout.js
1 file changed, 24 insertions(+), 26 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/lightbulb/lightbulb.flyout.js
b/resources/lightbulb/lightbulb.flyout.js
index ffd531e..fa6340e 100644
--- a/resources/lightbulb/lightbulb.flyout.js
+++ b/resources/lightbulb/lightbulb.flyout.js
@@ -25,6 +25,7 @@
currentFlyoutPageIndex, // 0-based
mwConfig = mw.config.get( [ 'wgArticleId', 'wgUserId' ] ),
$lightbulb = $(
'.mw-gettingstarted-personal-tool-recommendations' ),
+ $flyout = null,
requestingSuggestions = false;
function renderFlyout() {
@@ -61,10 +62,9 @@
* Adds the suggestions to the flyout. This sets up pagination and
shows the
* first page of suggestions.
*
-* @param {jQuery} $flyout Flyout jQuery set
* @param {Array} suggestions Array of suggestions from the parser
*/
- function addSuggestionsToFlyout( $flyout, suggestions ) {
+ function addSuggestionsToFlyout( suggestions ) {
var $nextButton,
$pagination = $flyout.find(
'.mw-gettingstarted-lightbulb-flyout-pagination' ),
pageCount = Math.ceil( suggestions.length /
MAX_SUGGESTION_PER_PAGE_COUNT ),
@@ -75,7 +75,7 @@
.attr( 'title', mw.msg(
'gettingstarted-lightbulb-flyout-back' ) )
.click( function () {
currentFlyoutPageIndex--;
- renderFlyoutPage( $flyout, suggestions,
currentFlyoutPageIndex, pageCount );
+ renderFlyoutPage( suggestions,
currentFlyoutPageIndex, pageCount );
} );
@@ -84,7 +84,7 @@
.attr( 'title', mw.msg(
'gettingstarted-lightbulb-flyout-next' ) )
.click( function () {
currentFlyoutPageIndex++;
- renderFlyoutPage( $flyout, suggestions,
currentFlyoutPageIndex, pageCount );
+ renderFlyoutPage( suggestions,
currentFlyoutPageIndex, pageCount );
} );
if ( pageCount 1 ) {
for ( i = 0; i pageCount; i++ ) {
@@ -101,18 +101,17 @@
}
currentFlyoutPageIndex = 0;
- renderFlyoutPage( $flyout, suggestions, currentFlyoutPageIndex,
pageCount );
+ renderFlyoutPage( suggestions, currentFlyoutPageIndex,
pageCount );
}
/**
* Updates the flyout to render a particular page
*
-* @param {jQuery} $flyout jQuery set for flyout
* @param {Array} suggestions Full list of suggestions
* @param {Number} pageIndex Page index to show, 0-based
* @param {Number} pageCount Number of pages
*/
- function renderFlyoutPage( $flyout, suggestions, pageIndex, pageCount )
{
+ function renderFlyoutPage( suggestions, pageIndex, pageCount ) {
var $suggestions = $flyout.find(
'.mw-gettingstarted-lightbulb-suggestions' ),
$newSuggestions = $( 'ol' ).attr( 'class',
'mw-gettingstarted-lightbulb-suggestions' ),
suggestion,
@@ -155,18 +154,18 @@
} );
}
- function positionFlyout( $flyout, $target ) {
- var targetOffset,
+ function positionFlyout() {
+ var lightbulbOffset,
top,
left;
- targetOffset = $target.offset();
- top = targetOffset.top + $target.innerHeight() + ( POKEY_HEIGHT
/ 2 ) - 5;
+ lightbulbOffset = $lightbulb.offset();
+ top = lightbulbOffset.top + $lightbulb.innerHeight() + (
POKEY_HEIGHT / 2 ) - 5;
// XXX (phuedx, 2014/07/30): $flyout.width and
// innerWidth( {false,true} ) don't work here, even with
// visibility: hidden in place of display: none. Why?
- left = targetOffset.left + ( $target.innerWidth() / 2 ) - (
FLYOUT_WIDTH / 2 );
+ left = lightbulbOffset.left + ( $lightbulb.innerWidth() / 2 ) -
( FLYOUT_WIDTH / 2 );
$flyout.css( {
top: parseInt( top, 10 ) + 'px',
@@ -181,7 +180,7 @@
* @param {jQuery.Event} evt Click event
*/
function checkForClickOutside( evt ) {
- var $flyout, $target;
+ var $target;
$target = $( evt.target );
[MediaWiki-commits] [Gerrit] trebuchet::packages: use ensure_packages from stdlib - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158353
Change subject: trebuchet::packages: use ensure_packages from stdlib
..
trebuchet::packages: use ensure_packages from stdlib
Change-Id: I2e3b74aaa2ef8c97055392e40b5244493705a57c
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/trebuchet/manifests/packages.pp
1 file changed, 2 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/158353/1
diff --git a/modules/trebuchet/manifests/packages.pp
b/modules/trebuchet/manifests/packages.pp
index cc2629f..8957c57 100644
--- a/modules/trebuchet/manifests/packages.pp
+++ b/modules/trebuchet/manifests/packages.pp
@@ -3,19 +3,6 @@
# Provision packages required for trebuchet to operate
#
class trebuchet::packages {
-if ! defined(Package['git-core']){
- package { 'git-core':
-ensure = present,
- }
-}
-if ! defined(Package['python-redis']){
- package { 'python-redis':
-ensure = present,
- }
-}
-if ! defined(Package['git-fat']){
- package { 'git-fat':
-ensure = present,
- }
-}
+include stdlib
+ensure_packages(['python-redis', 'git-core', 'git-fat'])
}
--
To view, visit https://gerrit.wikimedia.org/r/158353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e3b74aaa2ef8c97055392e40b5244493705a57c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Progress calculation: If section has source content copied, ... - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Progress calculation: If section has source content copied,
count it as MT
..
Progress calculation: If section has source content copied, count it as MT
Change-Id: Icf1fef2c71e16d19f37cf91d8195d410e0e74a83
---
M modules/translation/ext.cx.translation.progress.js
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/translation/ext.cx.translation.progress.js
b/modules/translation/ext.cx.translation.progress.js
index 6e6055b..ad7c222 100644
--- a/modules/translation/ext.cx.translation.progress.js
+++ b/modules/translation/ext.cx.translation.progress.js
@@ -78,7 +78,11 @@
weight = $section.data( 'cx-weight' );
weights.any += weight;
- if ( $section.data( 'cx-mt' ) === true ) {
+ if ( $section.data( 'cx-mt' ) === true ||
+ $section.data( 'cx-source' ) === true
+ ) {
+ // If the section has unmodified MT or source
content copied,
+ // count it as MT.
weights.mt += weight;
weights.mtSectionsCount += 1;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/158329
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf1fef2c71e16d19f37cf91d8195d410e0e74a83
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move mediawiki.skinning.* modules from skins/common/ to reso... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Move mediawiki.skinning.* modules from skins/common/ to resources/ .. Move mediawiki.skinning.* modules from skins/common/ to resources/ This is a BREAKING CHANGE, as we have used the names of these three files in skins/common/ as a public API for skins for a long time. Doing so has been deprecated (but still supported) in 1.23. We must clear them out at some point, and now is as good a time as ever, with the 1.23 LTS release still supporting the old way. Skins may no longer rely on the presence of commonElements.css, commonContent.css and commonInterface.css in skins/common/ and include them in their style modules. The corresponding ResourceLoader modules must be used instead: - skins/common/commonElements.css → 'mediawiki.skinning.elements' module - skins/common/commonContent.css → 'mediawiki.skinning.content' module - skins/common/commonInterface.css → 'mediawiki.skinning.interface' module Follow-up to I3947eaac (where I said I intend to do this) and I56758908. Bug: 69277 Change-Id: Id8456c570ff406822a8befad8f42f528ef5bd3a6 --- M RELEASE-NOTES-1.24 M resources/Resources.php R resources/src/mediawiki.skinning/content.css R resources/src/mediawiki.skinning/elements.css R resources/src/mediawiki.skinning/images/magnify-clip-ltr.png A resources/src/mediawiki.skinning/images/magnify-clip-rtl.png R resources/src/mediawiki.skinning/interface.css 7 files changed, 14 insertions(+), 13 deletions(-) Approvals: Isarra: Looks good to me, but someone else must approve Jdlrobson: Looks good to me, approved Jack Phoenix: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index c13ea9d..2ac3710 100644 --- a/RELEASE-NOTES-1.24 +++ b/RELEASE-NOTES-1.24 @@ -355,6 +355,13 @@ the headelement template key are no longer supported. Setting $useHeadElement = false; is no longer supported and will not cause old keys like headlinks, skinnameclass, etc. to be defined. +* BREAKING CHANGE: The files commonElements.css, commonContent.css and + commonInterface.css (in skins/common/) have been removed. Skins may no longer + rely on their presence and include them in their style modules. ResourceLoader + modules introduced in MediaWiki 1.23 should be loaded instead: + - skins/common/commonElements.css → 'mediawiki.skinning.elements' module + - skins/common/commonContent.css → 'mediawiki.skinning.content' module + - skins/common/commonInterface.css → 'mediawiki.skinning.interface' module * The deprecated 'SpecialVersionExtensionTypes' hook was removed. * (bug 63891) Add 'X-Robots-Tag: noindex' header in action=render pages. * SpecialPage no longer supports the syntax for invoking wfSpecial*() functions. diff --git a/resources/Resources.php b/resources/Resources.php index eb36ee5..946f3c9 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -83,33 +83,27 @@ */ 'mediawiki.skinning.elements' = array( 'styles' = array( - 'commonElements.css' = array( 'media' = 'screen' ), + 'resources/src/mediawiki.skinning/elements.css' = array( 'media' = 'screen' ), ), - 'remoteSkinPath' = 'common', - 'localBasePath' = $GLOBALS['wgStyleDirectory'] . '/common', ), 'mediawiki.skinning.content' = array( 'styles' = array( - 'commonElements.css' = array( 'media' = 'screen' ), - 'commonContent.css' = array( 'media' = 'screen' ), + 'resources/src/mediawiki.skinning/elements.css' = array( 'media' = 'screen' ), + 'resources/src/mediawiki.skinning/content.css' = array( 'media' = 'screen' ), ), - 'remoteSkinPath' = 'common', - 'localBasePath' = $GLOBALS['wgStyleDirectory'] . '/common', ), 'mediawiki.skinning.interface' = array( // Used in the web installer. Test it after modifying this definition! 'styles' = array( - 'commonElements.css' = array( 'media' = 'screen' ), - 'commonContent.css' = array( 'media' = 'screen' ), - 'commonInterface.css' = array( 'media' = 'screen' ), + 'resources/src/mediawiki.skinning/elements.css' = array( 'media' = 'screen' ), + 'resources/src/mediawiki.skinning/content.css' = array( 'media' = 'screen' ), + 'resources/src/mediawiki.skinning/interface.css' = array( 'media' = 'screen' ), ), - 'remoteSkinPath' = 'common', - 'localBasePath' = $GLOBALS['wgStyleDirectory'] . '/common', ), 'mediawiki.skinning.content.parsoid' = array(
[MediaWiki-commits] [Gerrit] Apply keydown instead of keyup in sitelinkview toolbar defin... - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158354
Change subject: Apply keydown instead of keyup in sitelinkview toolbar
definition
..
Apply keydown instead of keyup in sitelinkview toolbar definition
keydown event propagation is stopped in the suggester widget when native
suggester handling is
triggered. On any native suggester handling (closing the menu, selecting a
suggestion), no
additional action (e.g. saving, canceling) is supposed to be triggered.
requires: https://github.com/wmde/ValueView/pull/115
Change-Id: Id701776188b4e4d9fb4373b7b77f2abd6c62c320
---
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/54/158354/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
index 91ef0f7..ee73c2c 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
@@ -494,7 +494,7 @@
enableRemove: !!sitelinkview.value()
} );
- $sitelinkview.on( 'keyup', function( event ) {
+ $sitelinkview.on( 'keydown.editoolbar', function( event
) {
if( sitelinkview.option( 'disabled' ) ) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/158354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id701776188b4e4d9fb4373b7b77f2abd6c62c320
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labmon: Add http:// prefix for graphite URL - change (operations/puppet)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/158356 Change subject: labmon: Add http:// prefix for graphite URL .. labmon: Add http:// prefix for graphite URL Change-Id: I2cbfae01eee5c07830266bf72404843262619280 --- M manifests/role/beta.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/56/158356/1 diff --git a/manifests/role/beta.pp b/manifests/role/beta.pp index 91481cc..32824d4 100644 --- a/manifests/role/beta.pp +++ b/manifests/role/beta.pp @@ -154,7 +154,7 @@ metric = 'deployment-prep.*.puppetagent.failed_events.value', critical= 1, warning = 1, -graphite_url= 'labmon1001.eqiad.wmnet', +graphite_url= 'http://labmon1001.eqiad.wmnet', contact_group = 'betalabs' } } -- To view, visit https://gerrit.wikimedia.org/r/158356 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2cbfae01eee5c07830266bf72404843262619280 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production 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] Update or remove outdated urls - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Update or remove outdated urls
..
Update or remove outdated urls
Change-Id: I4d138e55fdc34d8357b3fed9343c2442ce50ba69
---
M README
M Translate.php
M messagegroups/MessageGroupBase.php
3 files changed, 3 insertions(+), 5 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
Nemo bis: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/README b/README
index fecfa69..a2cfe11 100644
--- a/README
+++ b/README
@@ -20,7 +20,7 @@
== Contributing ==
* Translations? Go to https://translatewiki.net and sign up.
* Code? File format handlers? New message groups? Graphics? Suggestions?
- Bug reports? Please start a thread at http://translatewiki.net/wiki/Support,
+ Bug reports? Please start a thread at https://translatewiki.net/wiki/Support,
report a bug in https://bugzilla.wikimedia.org or join us at #mediawiki-i18n
and let us know what you have in mind.
@@ -30,5 +30,3 @@
Documentation for the extension is at:
https://www.mediawiki.org/wiki/Help:Extension:Translate
-And for the code at:
- https://translatewiki.net/docs/Translate/html/
diff --git a/Translate.php b/Translate.php
index a1957ce..599fb89 100644
--- a/Translate.php
+++ b/Translate.php
@@ -381,7 +381,7 @@
* with simple markup and automatic tracking of changes.
*
* @defgroup PageTranslation Page Translation
- * @see http://translatewiki.net/wiki/Translating:Page_translation_feature
+ * @see
https://www.mediawiki.org/wiki/Help:Extension:Translate/Page_translation_administration
*/
$GLOBALS['wgEnablePageTranslation'] = true;
diff --git a/messagegroups/MessageGroupBase.php
b/messagegroups/MessageGroupBase.php
index 4a07d5b..2a6cffc 100644
--- a/messagegroups/MessageGroupBase.php
+++ b/messagegroups/MessageGroupBase.php
@@ -14,7 +14,7 @@
* and are managed with Special:ManageMessageGroups and
* processMessageChanges.php.
*
- * @see http://translatewiki.net/wiki/Translating:Group_configuration
+ * @see
https://www.mediawiki.org/wiki/Help:Extension:Translate/Group_configuration
* @ingroup MessageGroup
*/
abstract class MessageGroupBase implements MessageGroup {
--
To view, visit https://gerrit.wikimedia.org/r/157791
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4d138e55fdc34d8357b3fed9343c2442ce50ba69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] HTTP: Decode Python 3 stream - change (pywikibot/core)
XZise has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158358
Change subject: [FIX] HTTP: Decode Python 3 stream
..
[FIX] HTTP: Decode Python 3 stream
httplib2 returns a bytes object in Python 3 which must be decoded
first. It reads the encoding from the header and applies it. If the
encoding wasn't transmitted, it defaults to ASCII.
Change-Id: I2191170f3793d00f6cb32e818d0387ff5208565d
---
M pywikibot/comms/http.py
M tests/http_tests.py
2 files changed, 13 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/58/158358/1
diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py
index e9703ff..3fd9cbc 100644
--- a/pywikibot/comms/http.py
+++ b/pywikibot/comms/http.py
@@ -256,4 +256,13 @@
pywikibot.warning(uHttp response status %(status)s
% {'status': request.data[0].status})
-return request.data[1]
+pos = request.data[0]['content-type'].find('charset=')
+if pos = 0:
+pos += len('charset=')
+encoding = request.data[0]['content-type'][pos:]
+else:
+encoding = 'ascii'
+# Don't warn, many pages don't contain one
+pywikibot.log(uHttp response doesn't contain a charset.)
+
+return request.data[1].decode(encoding)
diff --git a/tests/http_tests.py b/tests/http_tests.py
index 9229cdd..2c90b65 100644
--- a/tests/http_tests.py
+++ b/tests/http_tests.py
@@ -20,7 +20,7 @@
def test_get(self):
r = http.request(site=None, uri='http://www.wikipedia.org/')
-self.assertIsInstance(r, str)
+self.assertIsInstance(r, str if sys.version_info[0] = 3 else unicode)
self.assertIn('html lang=mul', r)
def test_request(self):
@@ -32,8 +32,8 @@
self.assertIsInstance(r[0]['status'], str)
self.assertEqual(r[0]['status'], '200')
-self.assertIsInstance(r[1], str)
-self.assertIn('html lang=mul', r[1])
+self.assertIsInstance(r[1], bytes if sys.version_info[0] = 3 else str)
+self.assertIn(b'html lang=mul', r[1])
self.assertEqual(int(r[0]['content-length']), len(r[1]))
def test_gzip(self):
--
To view, visit https://gerrit.wikimedia.org/r/158358
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2191170f3793d00f6cb32e818d0387ff5208565d
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise commodorefabia...@gmx.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] HTTP: Decode Python 3 stream - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: [FIX] HTTP: Decode Python 3 stream
..
[FIX] HTTP: Decode Python 3 stream
httplib2 returns a bytes object in Python 3 which must be decoded
first. It reads the encoding from the header and applies it. If the
encoding wasn't transmitted, it defaults to ASCII.
Change-Id: I2191170f3793d00f6cb32e818d0387ff5208565d
---
M pywikibot/comms/http.py
M tests/http_tests.py
2 files changed, 13 insertions(+), 4 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py
index e9703ff..3fd9cbc 100644
--- a/pywikibot/comms/http.py
+++ b/pywikibot/comms/http.py
@@ -256,4 +256,13 @@
pywikibot.warning(uHttp response status %(status)s
% {'status': request.data[0].status})
-return request.data[1]
+pos = request.data[0]['content-type'].find('charset=')
+if pos = 0:
+pos += len('charset=')
+encoding = request.data[0]['content-type'][pos:]
+else:
+encoding = 'ascii'
+# Don't warn, many pages don't contain one
+pywikibot.log(uHttp response doesn't contain a charset.)
+
+return request.data[1].decode(encoding)
diff --git a/tests/http_tests.py b/tests/http_tests.py
index 9229cdd..2c90b65 100644
--- a/tests/http_tests.py
+++ b/tests/http_tests.py
@@ -20,7 +20,7 @@
def test_get(self):
r = http.request(site=None, uri='http://www.wikipedia.org/')
-self.assertIsInstance(r, str)
+self.assertIsInstance(r, str if sys.version_info[0] = 3 else unicode)
self.assertIn('html lang=mul', r)
def test_request(self):
@@ -32,8 +32,8 @@
self.assertIsInstance(r[0]['status'], str)
self.assertEqual(r[0]['status'], '200')
-self.assertIsInstance(r[1], str)
-self.assertIn('html lang=mul', r[1])
+self.assertIsInstance(r[1], bytes if sys.version_info[0] = 3 else str)
+self.assertIn(b'html lang=mul', r[1])
self.assertEqual(int(r[0]['content-length']), len(r[1]))
def test_gzip(self):
--
To view, visit https://gerrit.wikimedia.org/r/158358
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2191170f3793d00f6cb32e818d0387ff5208565d
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable CORS for everything under /run - change (analytics...web)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158359
Change subject: Enable CORS for everything under /run
..
Enable CORS for everything under /run
Change-Id: Ia32d04019e6a87830daf158f4ee87c9f6b573f75
---
M quarry/web/app.py
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web
refs/changes/59/158359/1
diff --git a/quarry/web/app.py b/quarry/web/app.py
index 3e3ee05..59e7def 100644
--- a/quarry/web/app.py
+++ b/quarry/web/app.py
@@ -300,7 +300,7 @@
return Response(json.dumps({
'status': qrun.status_message,
'extra': json.loads(qrun.extra_info or {})
-}), mimetype='application/json')
+}), mimetype='application/json', headers={'Access-Control-Allow-Origin':
'*'})
@app.route(/run/int:qrun_id/output/int:resultset_id/string:format)
@@ -321,6 +321,7 @@
format
)
response.headers['Content-Disposition'] = 'attachment; filename=%s'
% filename
+response.headers['Access-Control-Allow-Origin'] = '*'
return response
--
To view, visit https://gerrit.wikimedia.org/r/158359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia32d04019e6a87830daf158f4ee87c9f6b573f75
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
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] quarry: Remove unused directive from nginx conf - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158360
Change subject: quarry: Remove unused directive from nginx conf
..
quarry: Remove unused directive from nginx conf
CORS header is now set in python code
Change-Id: Ib63cc0fd381f571acc12ca1941f2fa7df0fb36dc
---
M modules/quarry/templates/quarry-web.nginx.erb
1 file changed, 0 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/158360/1
diff --git a/modules/quarry/templates/quarry-web.nginx.erb
b/modules/quarry/templates/quarry-web.nginx.erb
index 4f3a795..218323f 100644
--- a/modules/quarry/templates/quarry-web.nginx.erb
+++ b/modules/quarry/templates/quarry-web.nginx.erb
@@ -13,11 +13,4 @@
location /static {
alias %= @clone_path %/quarry/web/static;
}
-
-location /api/query/output {
-alias %= @result_path %;
-
-add_header 'Access-Control-Allow-Origin' '*';
-default_type application/json;
-}
}
--
To view, visit https://gerrit.wikimedia.org/r/158360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib63cc0fd381f571acc12ca1941f2fa7df0fb36dc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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] Use scores from ElasticSearch using function scoring - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158361
Change subject: Use scores from ElasticSearch using function scoring
..
Use scores from ElasticSearch using function scoring
Change-Id: If59c33edf668436ef4eb7aea6193082cb7565b57
---
M ttmserver/ElasticSearchTTMServer.php
1 file changed, 17 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/61/158361/1
diff --git a/ttmserver/ElasticSearchTTMServer.php
b/ttmserver/ElasticSearchTTMServer.php
index 3e0852d..64311a5 100644
--- a/ttmserver/ElasticSearchTTMServer.php
+++ b/ttmserver/ElasticSearchTTMServer.php
@@ -53,12 +53,25 @@
$oldTimeout = $connection-getTimeout();
$connection-setTimeout( 10 );
- $query = new \Elastica\Query();
-
$fuzzyQuery = new \Elastica\Query\FuzzyLikeThis();
$fuzzyQuery-setLikeText( $text );
$fuzzyQuery-addFields( array( 'content' ) );
- $query-setQuery( $fuzzyQuery );
+
+ $escapedForGroovy = addcslashes( $text, '\\ );
+ $groovyScript =
+GROOVY
+import org.apache.lucene.search.spell.*
+new LevensteinDistance().getDistance('$escapedForGroovy', _source['content'])
+GROOVY;
+ $script = new \Elastica\Script( $groovyScript, null,
\Elastica\Script::LANG_GROOVY );
+ $boostQuery = new \Elastica\Query\FunctionScore();
+ $boostQuery-addScriptScoreFunction( $script );
+ $boostQuery-setBoostMode(
\Elastica\Query\FunctionScore::BOOST_MODE_REPLACE );
+ $boostQuery-setQuery( $fuzzyQuery );
+
+ // The whole query
+ $query = new \Elastica\Query();
+ $query-setQuery( $boostQuery );
$languageFilter = new \Elastica\Filter\Term();
$languageFilter-setTerm( 'language', $sourceLanguage );
@@ -85,17 +98,7 @@
$contents = $scores = $terms = array();
foreach ( $resultset-getResults() as $result ) {
$data = $result-getData();
-
- // FIXME: hacked in client side scoring as the search
query
- // returns wildly irrelevant results. This is slow.
- $len1 = mb_strlen( $text );
- $len2 = mb_strlen( $data['content'] );
- $dist = self::levenshtein( $text, $data['content'],
$len1, $len2 );
- $score = 1 - ( $dist * 0.9 / min( $len1, $len2 ) );
- if ( $score $this-config['cutoff'] ) {
- continue;
- }
-
+ $score = $result-getScore();
$sourceId = preg_replace( '~/[^/]+$~', '',
$result-getId() );
$contents[$sourceId] = $data['content'];
$scores[$sourceId] = $score;
--
To view, visit https://gerrit.wikimedia.org/r/158361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If59c33edf668436ef4eb7aea6193082cb7565b57
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] labmon: Add http:// prefix for graphite URL - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: labmon: Add http:// prefix for graphite URL .. labmon: Add http:// prefix for graphite URL Change-Id: I2cbfae01eee5c07830266bf72404843262619280 --- M manifests/role/beta.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/beta.pp b/manifests/role/beta.pp index 91481cc..32824d4 100644 --- a/manifests/role/beta.pp +++ b/manifests/role/beta.pp @@ -154,7 +154,7 @@ metric = 'deployment-prep.*.puppetagent.failed_events.value', critical= 1, warning = 1, -graphite_url= 'labmon1001.eqiad.wmnet', +graphite_url= 'http://labmon1001.eqiad.wmnet', contact_group = 'betalabs' } } -- To view, visit https://gerrit.wikimedia.org/r/158356 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2cbfae01eee5c07830266bf72404843262619280 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org Gerrit-Reviewer: Chasemp chas...@gmail.com Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: coren mpellet...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] quarry: Remove unused directive from nginx conf - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: quarry: Remove unused directive from nginx conf
..
quarry: Remove unused directive from nginx conf
CORS header is now set in python code
Change-Id: Ib63cc0fd381f571acc12ca1941f2fa7df0fb36dc
---
M modules/quarry/templates/quarry-web.nginx.erb
1 file changed, 0 insertions(+), 7 deletions(-)
Approvals:
Yuvipanda: Looks good to me, but someone else must approve
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/modules/quarry/templates/quarry-web.nginx.erb
b/modules/quarry/templates/quarry-web.nginx.erb
index 4f3a795..218323f 100644
--- a/modules/quarry/templates/quarry-web.nginx.erb
+++ b/modules/quarry/templates/quarry-web.nginx.erb
@@ -13,11 +13,4 @@
location /static {
alias %= @clone_path %/quarry/web/static;
}
-
-location /api/query/output {
-alias %= @result_path %;
-
-add_header 'Access-Control-Allow-Origin' '*';
-default_type application/json;
-}
}
--
To view, visit https://gerrit.wikimedia.org/r/158360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib63cc0fd381f571acc12ca1941f2fa7df0fb36dc
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix: problems in i18n files - change (mediawiki...MathSearch)
Physikerwelt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158363
Change subject: Fix: problems in i18n files
..
Fix: problems in i18n files
Change-Id: I1f50792a322e52d2c9ae10cc64ff5fa5b3d55f50
---
M SpecialUploadResult.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 52 insertions(+), 52 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch
refs/changes/63/158363/1
diff --git a/SpecialUploadResult.php b/SpecialUploadResult.php
index a3bbed3..8d0d041 100644
--- a/SpecialUploadResult.php
+++ b/SpecialUploadResult.php
@@ -17,7 +17,7 @@
}
private static function formatErrors( $errors ) {
- return wfMessage( 'wmcWarnings' )-text() . ' ' . implode( br
/, $errors );
+ return wfMessage( 'math-wmc-Warnings' )-text() . ' ' .
implode( br /, $errors );
}
function execute( $query ) {
@@ -26,10 +26,10 @@
throw new PermissionsError( 'mathwmcsubmit' );
}
- $this-getOutput()-addWikiText( wfMessage( 'wmcIntroduction'
)-text() );
+ $this-getOutput()-addWikiText( wfMessage(
'math-wmc-Introduction' )-text() );
$formDescriptor = $this-printRunSelector();
- $formDescriptor['File'] = array( 'label-message' =
'wmcFileLabel',
- 'help-message' = 'wmcFileHelp',
+ $formDescriptor['File'] = array( 'label-message' =
'math-wmc-FileLabel',
+ 'help-message' = 'math-wmc-FileHelp',
'class' = 'HTMLTextField',
'type' = 'file',
'required' = true,
@@ -54,10 +54,10 @@
}
//Probably we want to add more field in the future
$formFields['run'] = array( 'type' = 'selectorother',
- 'label-message' = 'wmcSelectRun',
+ 'label-message' = 'math-wmc-SelectRun',
'options' = $options,
'required' = true,
- 'help-message' = 'wmcSelectRunHelp',
+ 'help-message' = 'math-wmc-SelectRunHelp',
'filter-callback' = array( $this, 'runSelectorFilter'
),
'validation-callback' = array( $this,
'runValidatorFilter' ),
//'section' = 'wmcSectionRun'
@@ -81,13 +81,13 @@
array( 'isDraft' = true, 'userID' =
$uID, 'runName' = $run ) );
if ( $success ) {
$this-runID = $dbw-insertId();
- $this-getOutput()-addWikiMsg(
'wmcRunAdded', $run, $this-runID );
+ $this-getOutput()-addWikiMsg(
'math-wmc-RunAdded', $run, $this-runID );
} else {
$this-runID = false;
- $this-getOutput()-addWikiMsg(
'wmcRunAddError', $run );
+ $this-getOutput()-addWikiMsg(
'math-wmc-RunAddError', $run );
}
} else {
- $this-getOutput()-addWikiMsg(
'wmcRunAddExist', $run, $exists );
+ $this-getOutput()-addWikiMsg(
'math-wmc-RunAddExist', $run, $exists );
$this-runID = false;
}
} else {
@@ -102,7 +102,7 @@
$res = $dbr-selectField( 'math_wmc_runs', 'runName',
array( 'isDraft' = true, 'userID' = $uID, 'runId' =
$this-runID ) );
if ( ! $res ) {
- return wfMessage( 'wmcSelectRunHelp' )-text();
+ return wfMessage( 'math-wmc-SelectRunHelp' )-text();
} else {
return true;
}
@@ -140,7 +140,7 @@
}
function processInput( ) {
- $this-getOutput()-addWikiMsg( wmcSubmissionSuccess );
+ $this-getOutput()-addWikiMsg( math-wmc-SubmissionSuccess );
self::deleteRun( $this-runID );
$dbw = wfGetDB( DB_MASTER );
//TODO: Find adequate API call
@@ -224,7 +224,7 @@
// check header line
$uploadedHeaders = $table[0];
if ( $uploadedHeaders != $this-columnHeaders ) {
- $error_msg = wfMessage( 'importcsv_badheader' )-text();
+ $error_msg = wfMessage( 'math-wmc-bad-header' )-text();
return $error_msg;
}
$rank = 0;
@@ -239,17 +239,17 @@
$fId = trim( $line[1] );
$qValid = $this-isValidQId( $qId );
[MediaWiki-commits] [Gerrit] [FIX] Category: Print info that dump was loaded to stdout - change (pywikibot/core)
XZise has uploaded a new change for review. https://gerrit.wikimedia.org/r/158364 Change subject: [FIX] Category: Print info that dump was loaded to stdout .. [FIX] Category: Print info that dump was loaded to stdout When category.py script loads the category dump, it informs the user about that, but because it's printed to stderr the script test fails. Change-Id: I73b6b8d9672529c16b5a25c218cc2157e1bf1992 --- M scripts/category.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/64/158364/1 diff --git a/scripts/category.py b/scripts/category.py index 95817ae..60a53ce 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -146,7 +146,7 @@ filename = config.datafilepath(filename) f = bz2.BZ2File(filename, 'r') pywikibot.output(u'Reading dump from %s' - % config.shortpath(filename)) + % config.shortpath(filename), toStdout=True) databases = pickle.load(f) f.close() # keys are categories, values are 2-tuples with lists as -- To view, visit https://gerrit.wikimedia.org/r/158364 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73b6b8d9672529c16b5a25c218cc2157e1bf1992 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Refactored ResourceLoader module definitions - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Refactored ResourceLoader module definitions
..
Refactored ResourceLoader module definitions
Split up module definitions into separate files per directory.
Change-Id: Ia712356c1904056ec8835128c907f11d2fd6cbd9
---
M lib/resources/Resources.php
A lib/resources/jquery.wikibase/resources.php
A lib/resources/jquery.wikibase/snakview/resources.php
R lib/resources/jquery.wikibase/snakview/snakview.SnakTypeSelector.js
R lib/resources/jquery.wikibase/snakview/snakview.ViewState.js
R lib/resources/jquery.wikibase/snakview/snakview.js
R lib/resources/jquery.wikibase/snakview/snakview.variations.NoValue.js
R lib/resources/jquery.wikibase/snakview/snakview.variations.SomeValue.js
R lib/resources/jquery.wikibase/snakview/snakview.variations.Value.js
R lib/resources/jquery.wikibase/snakview/snakview.variations.Variation.js
R lib/resources/jquery.wikibase/snakview/snakview.variations.js
R
lib/resources/jquery.wikibase/snakview/themes/default/images/ui-icon_snaktypeselector_2694e8.png
R
lib/resources/jquery.wikibase/snakview/themes/default/images/ui-icon_snaktypeselector_3d80b3.png
R
lib/resources/jquery.wikibase/snakview/themes/default/images/ui-icon_snaktypeselector_66.png
R
lib/resources/jquery.wikibase/snakview/themes/default/snakview.SnakTypeSelector.css
A lib/resources/jquery.wikibase/toolbar/resources.php
A lib/resources/wikibase.RepoApi/resources.php
A lib/resources/wikibase.store/resources.php
A lib/resources/wikibase.utilities/resources.php
D lib/resources/wikibase.utilities/wikibase.utilities.jQuery.ui.js
M lib/tests/qunit/jquery.wikibase/resources.php
21 files changed, 935 insertions(+), 814 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 4323663..5a9708e 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -4,11 +4,6 @@
use Wikibase\Repo\WikibaseRepo;
/**
- * File for Wikibase resourceloader modules.
- * When included this returns an array with all the modules introduced by
Wikibase.
- *
- * @since 0.2
- *
* @licence GNU GPL v2+
* @author Daniel Werner
* @author H. Snater mediaw...@snater.com
@@ -16,81 +11,15 @@
* @codeCoverageIgnoreStart
*/
return call_user_func( function() {
- $remoteExtPathParts = explode( DIRECTORY_SEPARATOR . 'extensions' .
DIRECTORY_SEPARATOR , __DIR__, 2 );
+ $remoteExtPathParts = explode(
+ DIRECTORY_SEPARATOR . 'extensions' . DIRECTORY_SEPARATOR,
__DIR__, 2
+ );
$moduleTemplate = array(
'localBasePath' = __DIR__,
'remoteExtPath' = $remoteExtPathParts[1],
);
$modules = array(
- // common styles independent from JavaScript being enabled or
disabled
- 'wikibase.common' = $moduleTemplate + array(
- 'styles' = array(
- // Order must be hierarchical, do not order
alphabetically
- 'wikibase.css',
-
'jquery.wikibase/themes/default/jquery.wikibase.labelview.css',
-
'jquery.wikibase/themes/default/jquery.wikibase.descriptionview.css',
-
'jquery.wikibase/themes/default/jquery.wikibase.aliasesview.css',
-
'jquery.wikibase/themes/default/jquery.wikibase.sitelinklistview.css',
-
'jquery.wikibase/themes/default/jquery.wikibase.sitelinkview.css',
- )
- ),
-
- 'wikibase.sites' = $moduleTemplate + array(
- 'scripts' = array(
- 'wikibase.sites.js',
- ),
- 'dependencies' = array(
- 'mw.config.values.wbSiteDetails',
- 'wikibase',
- 'wikibase.Site',
- )
- ),
-
- 'wikibase.Site' = $moduleTemplate + array(
- 'scripts' = array(
- 'wikibase.Site.js',
- ),
- 'dependencies' = array(
- 'mediawiki.util',
- 'util.inherit',
- 'wikibase',
- ),
- ),
-
- 'mw.config.values.wbSiteDetails' = $moduleTemplate + array(
- 'class' = 'Wikibase\SitesModule'
- ),
-
- 'mw.config.values.wbRepo' = $moduleTemplate + array(
- 'class' = 'Wikibase\RepoAccessModule',
- ),
-
- 'wikibase' = $moduleTemplate + array(
- 'scripts' =
[MediaWiki-commits] [Gerrit] Remove all vumi related code - change (operations/puppet)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/158365 Change subject: Remove all vumi related code .. Remove all vumi related code This is all hosted externally now and unused internally. We might want to figure out if we should add ::decomission code to kill the things that were running, or do that manually on silver. This also removes most unmodularized code under 'mobile/', so yay Change-Id: I56746045a53a6f8c2f9e7e41c0fceecf17943373 --- D files/mobile/vumi/rabbitmq.setup.sh D files/mobile/vumi/supervisord.wikipedia.conf D files/mobile/vumi/tata_ussd_dispatcher.yaml D files/mobile/vumi/wikipedia.yaml D manifests/mobile.pp M manifests/site.pp D templates/mobile/vumi/tata_sms_incoming.yaml.erb D templates/mobile/vumi/tata_sms_outgoing.yaml.erb D templates/mobile/vumi/tata_ussd_delhi.yaml.erb D templates/mobile/vumi/tata_ussd_hyd.yaml.erb D templates/mobile/vumi/wikipedia_xmpp.yaml.erb D templates/mobile/vumi/wikipedia_xmpp_sms.yaml.erb D templates/udp2log/filters.vumi.erb 13 files changed, 0 insertions(+), 548 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/65/158365/1 diff --git a/files/mobile/vumi/rabbitmq.setup.sh b/files/mobile/vumi/rabbitmq.setup.sh deleted file mode 100755 index ea22cbd..000 --- a/files/mobile/vumi/rabbitmq.setup.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -rabbitmqctl add_user vumi vumi -rabbitmqctl add_vhost /develop -rabbitmqctl set_permissions -p /develop vumi '.*' '.*' '.*' diff --git a/files/mobile/vumi/supervisord.wikipedia.conf b/files/mobile/vumi/supervisord.wikipedia.conf deleted file mode 100644 index 55b46e3..000 --- a/files/mobile/vumi/supervisord.wikipedia.conf +++ /dev/null @@ -1,172 +0,0 @@ -[program:tata_ussd_dispatcher] -numprocs=1 -numprocs_start=1 -process_name=%(program_name)s_%(process_num)s -command=twistd -n ---pidfile=/tmp/%(program_name)s_%(process_num)s.pid -start_worker ---worker-class=vumi.dispatchers.BaseDispatchWorker ---config=/etc/vumi/tata_ussd_dispatcher.yaml -stdout_logfile=/var/log/vumi/%(program_name)s_%(process_num)s.log -stdout_logfile_maxbytes=10MB -stdout_logfile_backups=10 -stderr_logfile=/var/log/vumi/%(program_name)s_%(process_num)s.err -stderr_logfile_maxbytes=10MB -stderr_logfile_backups=10 -autorestart=true - -[program:tata_ussd_hyd_transport] -numprocs=1 -numprocs_start=1 -process_name=%(program_name)s_%(process_num)s -command=twistd -n ---pidfile=/tmp/%(program_name)s_%(process_num)s.pid -start_worker ---worker-class=vumi.transports.smpp.SmppTransport ---config=/etc/vumi/tata_ussd_hyd.yaml ---set-option=smpp_offset:%(process_num)s ---set-option=smpp_increment:10 -stdout_logfile=/var/log/vumi/%(program_name)s_%(process_num)s.log -stdout_logfile_maxbytes=10MB -stdout_logfile_backups=10 -stderr_logfile=/var/log/vumi/%(program_name)s_%(process_num)s.err -stderr_logfile_maxbytes=10MB -stderr_logfile_backups=10 -autorestart=true - -[program:tata_ussd_delhi_transport] -numprocs=1 -numprocs_start=1 -process_name=%(program_name)s_%(process_num)s -command=twistd -n ---pidfile=/tmp/%(program_name)s_%(process_num)s.pid -start_worker ---worker-class=vumi.transports.smpp.SmppTransport ---config=/etc/vumi/tata_ussd_delhi.yaml ---set-option=smpp_offset:%(process_num)s ---set-option=smpp_increment:10 -stdout_logfile=/var/log/vumi/%(program_name)s_%(process_num)s.log -stdout_logfile_maxbytes=10MB -stdout_logfile_backups=10 -stderr_logfile=/var/log/vumi/%(program_name)s_%(process_num)s.err -stderr_logfile_maxbytes=10MB -stderr_logfile_backups=10 -autorestart=true - -[program:tata_sms_outgoing_transport] -numprocs=1 -numprocs_start=1 -process_name=%(program_name)s_%(process_num)s -command=twistd -n ---pidfile=/tmp/%(program_name)s_%(process_num)s.pid -start_worker ---worker-class=vumi.transports.smpp.SmppTransport ---config=/etc/vumi/tata_sms_outgoing.yaml ---set-option=smpp_offset:%(process_num)s ---set-option=smpp_increment:10 -stdout_logfile=/var/log/vumi/%(program_name)s_%(process_num)s.log -stdout_logfile_maxbytes=10MB -stdout_logfile_backups=10 -stderr_logfile=/var/log/vumi/%(program_name)s_%(process_num)s.err -stderr_logfile_maxbytes=10MB -stderr_logfile_backups=10 -autorestart=true - -[program:tata_sms_incoming_transport] -numprocs=1 -numprocs_start=1 -process_name=%(program_name)s_%(process_num)s -command=twistd -n ---pidfile=/tmp/%(program_name)s_%(process_num)s.pid -start_worker ---worker-class=vumi.transports.smpp.SmppTransport ---config=/etc/vumi/tata_sms_incoming.yaml ---set-option=smpp_offset:%(process_num)s ---set-option=smpp_increment:10 -stdout_logfile=/var/log/vumi/%(program_name)s_%(process_num)s.log -stdout_logfile_maxbytes=10MB -stdout_logfile_backups=10 -stderr_logfile=/var/log/vumi/%(program_name)s_%(process_num)s.err -stderr_logfile_maxbytes=10MB
[MediaWiki-commits] [Gerrit] Change loading order of Chinese conversion tables - change (mediawiki/core)
Liangent has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158366
Change subject: Change loading order of Chinese conversion tables
..
Change loading order of Chinese conversion tables
Previously, the zh-cn table was composed by:
(1) Load zh2Hans as zh-hans table
(2) Load zh2CN + zh2Hans as zh-cn table
(3) Load Conversiontable/zh-hans + zh-hans as zh-hans table
(4) Load Conversiontable/zh-cn + zh-cn as zh-cn table
(5) Load zh-hans + zh-cn as the final zh-cn table
The new loading order is:
(1) Load zh2Hans as zh-hans table
(2) Load zh2CN as zh-cn table
(3) Load Conversiontable/zh-hans + zh-hans as zh-hans table
(4) Load Conversiontable/zh-cn + zh-cn as zh-cn table
(5) Load zh-cn + zh-hans as the final zh-cn table
Change-Id: Ie9d08b85d4911618946fa7efd23eb898412449e5
---
M languages/classes/LanguageZh.php
1 file changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/66/158366/1
diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index dfdc6b1..90d538d 100644
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -67,23 +67,23 @@
$this-mTables = array(
'zh-hans' = new ReplacementArray( $zh2Hans ),
'zh-hant' = new ReplacementArray( $zh2Hant ),
- 'zh-cn' = new ReplacementArray( array_merge( $zh2Hans,
$zh2CN ) ),
- 'zh-hk' = new ReplacementArray( array_merge( $zh2Hant,
$zh2HK ) ),
- 'zh-mo' = new ReplacementArray( array_merge( $zh2Hant,
$zh2HK ) ),
- 'zh-my' = new ReplacementArray( array_merge( $zh2Hans,
$zh2SG ) ),
- 'zh-sg' = new ReplacementArray( array_merge( $zh2Hans,
$zh2SG ) ),
- 'zh-tw' = new ReplacementArray( array_merge( $zh2Hant,
$zh2TW ) ),
+ 'zh-cn' = new ReplacementArray( $zh2CN ),
+ 'zh-hk' = new ReplacementArray( $zh2HK ),
+ 'zh-mo' = new ReplacementArray( $zh2HK ),
+ 'zh-my' = new ReplacementArray( $zh2SG ),
+ 'zh-sg' = new ReplacementArray( $zh2SG ),
+ 'zh-tw' = new ReplacementArray( $zh2TW ),
'zh' = new ReplacementArray
);
}
function postLoadTables() {
- $this-mTables['zh-cn']-merge( $this-mTables['zh-hans'] );
- $this-mTables['zh-hk']-merge( $this-mTables['zh-hant'] );
- $this-mTables['zh-mo']-merge( $this-mTables['zh-hant'] );
- $this-mTables['zh-my']-merge( $this-mTables['zh-hans'] );
- $this-mTables['zh-sg']-merge( $this-mTables['zh-hans'] );
- $this-mTables['zh-tw']-merge( $this-mTables['zh-hant'] );
+ $this-mTables['zh-cn']-setArray(
$this-mTables['zh-cn']-getArray() + $this-mTables['zh-hans']-getArray() );
+ $this-mTables['zh-hk']-setArray(
$this-mTables['zh-hk']-getArray() + $this-mTables['zh-hant']-getArray() );
+ $this-mTables['zh-mo']-setArray(
$this-mTables['zh-mo']-getArray() + $this-mTables['zh-hant']-getArray() );
+ $this-mTables['zh-my']-setArray(
$this-mTables['zh-my']-getArray() + $this-mTables['zh-hans']-getArray() );
+ $this-mTables['zh-sg']-setArray(
$this-mTables['zh-sg']-getArray() + $this-mTables['zh-hans']-getArray() );
+ $this-mTables['zh-tw']-setArray(
$this-mTables['zh-tw']-getArray() + $this-mTables['zh-hant']-getArray() );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/158366
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9d08b85d4911618946fa7efd23eb898412449e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Liangent liang...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add geoip resources for direct address resolution - change (operations/dns)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158367
Change subject: Add geoip resources for direct address resolution
..
Add geoip resources for direct address resolution
Change-Id: I48f1ebac2e35f5f401c97b9d1829ba7f1509a0a0
---
M config-geo
1 file changed, 57 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/67/158367/1
diff --git a/config-geo b/config-geo
index a672e34..762197d 100644
--- a/config-geo
+++ b/config-geo
@@ -214,6 +214,7 @@
},
},
resources = {
+# Current CNAME-based resources
bits = {
map = generic-map
dcmap = {
@@ -262,5 +263,61 @@
ulsfo = mobile-lb.ulsfo.wikimedia.org.
}
}
+
+# New address-based resources
+text-addrs = {
+map = generic-map
+service_types = up
+dcmap = {
+eqiad = { addrs_v4 = 208.80.154.224, addrs_v6 =
2620:0:861:ed1a::1 }
+esams = { addrs_v4 = 91.198.174.192, addrs_v6 =
2620:0:862:ed1a::1 }
+ulsfo = { addrs_v4 = 198.35.26.96, addrs_v6 =
2620:0:863:ed1a::1 }
+}
+}
+text-addrs-v4 = { # v4 from above, for e.g. donate
+map = generic-map
+service_types = up
+dcmap = {
+eqiad = 208.80.154.224
+esams = 91.198.174.192
+ulsfo = 198.35.26.96
+}
+}
+bits-addrs = {
+map = generic-map
+service_types = up
+dcmap = {
+eqiad = { addrs_v4 = 208.80.154.234, addrs_v6 =
2620:0:861:ed1a::1:a }
+esams = { addrs_v4 = 91.198.174.202, addrs_v6 =
2620:0:862:ed1a::1:a }
+ulsfo = { addrs_v4 = 198.35.26.106, addrs_v6 =
2620:0:863:ed1a::1:a }
+}
+}
+bits-addrs-v4 = { # v4 from above, for e.g. geoiplookup
+map = generic-map
+service_types = up
+dcmap = {
+eqiad = 208.80.154.234
+esams = 91.198.174.202
+ulsfo = 198.35.26.106
+}
+}
+upload-addrs = {
+map = generic-map
+service_types = up
+dcmap = {
+eqiad = { addrs_v4 = 208.80.154.240, addrs_v6 =
2620:0:861:ed1a::2:b }
+esams = { addrs_v4 = 91.198.174.208, addrs_v6 =
2620:0:862:ed1a::2:b }
+ulsfo = { addrs_v4 = 198.35.26.112, addrs_v6 =
2620:0:863:ed1a::2:b }
+}
+}
+mobile-addrs = {
+map = generic-map
+service_types = up
+dcmap = {
+eqiad = { addrs_v4 = 208.80.154.236, addrs_v6 =
2620:0:861:ed1a::1:c }
+esams = { addrs_v4 = 91.198.174.204, addrs_v6 =
2620:0:862:ed1a::1:c }
+ulsfo = { addrs_v4 = 198.35.26.108, addrs_v6 =
2620:0:863:ed1a::1:c }
+}
+}
}
}}
--
To view, visit https://gerrit.wikimedia.org/r/158367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48f1ebac2e35f5f401c97b9d1829ba7f1509a0a0
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add langs templates using DYNA - change (operations/dns)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158368
Change subject: add langs templates using DYNA
..
add langs templates using DYNA
Change-Id: I6e1c817a6856a6cfddfd2b0327faf9bc08704174
---
M templates/helpers/langlist.tmpl
1 file changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/68/158368/1
diff --git a/templates/helpers/langlist.tmpl b/templates/helpers/langlist.tmpl
index 6ed0fc8..e9154dc 100644
--- a/templates/helpers/langlist.tmpl
+++ b/templates/helpers/langlist.tmpl
@@ -12,3 +12,16 @@
{{ langcname(lang, domain) }}
{% endfor %}
{%- endmacro %}
+
+{% macro langdyna(lang, dyna) -%}
+{{ lang }} 1H IN DYNA{{ dyna }}
+www.{{ lang }} 1H IN DYNA{{ dyna }}
+{{ lang }}.m1H IN DYNAgeoip!mobile-addrs
+{{ lang }}.zero 1H IN DYNAgeoip!mobile-addrs
+{%- endmacro %}
+
+{% macro langdynalist(dyna) -%}
+{% for lang in langs -%}
+{{ langdyna(lang, dyna) }}
+{% endfor %}
+{%- endmacro %}
--
To view, visit https://gerrit.wikimedia.org/r/158368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e1c817a6856a6cfddfd2b0327faf9bc08704174
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Format Tool card - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158369
Change subject: WIP: Format Tool card
..
WIP: Format Tool card
Don't merge. A quick and minimal functionality is added, just to
find out how it goes
* Remove experimental medium editor
Change-Id: I794d7e6bfcd3792acea6cae6ec00492251018ba7
---
M Resources.php
M modules/editor/ext.cx.editor.js
D modules/editor/medium/medium-editor.css
D modules/editor/medium/medium-editor.js
D modules/editor/medium/theme/agora.css
A modules/tools/ext.cx.tools.formatter.js
A modules/tools/images/bold-b.svg
A modules/tools/images/bullet-list-ltr.svg
A modules/tools/images/bullet-list-rtl.svg
A modules/tools/images/italic-i.svg
A modules/tools/images/number-list-ltr.svg
A modules/tools/images/number-list-rtl.svg
A modules/tools/styles/ext.cx.tools.formatter.less
M specials/SpecialContentTranslation.php
14 files changed, 281 insertions(+), 1,716 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/69/158369/1
diff --git a/Resources.php b/Resources.php
index 9a0ac02..68d0f9f 100644
--- a/Resources.php
+++ b/Resources.php
@@ -122,6 +122,7 @@
),
'dependencies' = array(
'ext.cx.translation.progress',
+ 'ext.cx.editor',
'jquery.uls.data',
'mediawiki.Uri',
'jquery.throttle-debounce',
@@ -164,6 +165,7 @@
'mediawiki.jqueryMsg',
'ext.cx.tools.manager',
'ext.cx.tools.dictionary',
+ 'ext.cx.tools.formatter',
'ext.cx.tools.instructions',
'ext.cx.tools.link',
'ext.cx.tools.images',
@@ -217,6 +219,19 @@
'cx-mt-abuse-warning-text',
'cx-tools-view-guidelines',
'cx-tools-view-guidelines-link',
+ ),
+ 'dependencies' = array(
+ 'ext.cx.tools.manager',
+ 'ext.cx.tools.card',
+ ),
+) + $resourcePaths;
+
+$wgResourceModules['ext.cx.tools.formatter'] = array(
+ 'scripts' = array(
+ 'tools/ext.cx.tools.formatter.js',
+ ),
+ 'styles' = array(
+ 'tools/styles/ext.cx.tools.formatter.less',
),
'dependencies' = array(
'ext.cx.tools.manager',
@@ -422,15 +437,3 @@
'jquery.throttle-debounce',
),
) + $resourcePaths;
-
-$wgResourceModules['ext.cx.editor.medium'] = array(
- 'scripts' = array(
- 'editor/ext.cx.editor.js',
- 'editor/medium/medium-editor.js',
- ),
- 'styles' = array(
- 'editor/medium/medium-editor.css',
- 'editor/medium/theme/agora.css',
- ),
-) + $resourcePaths;
-
diff --git a/modules/editor/ext.cx.editor.js b/modules/editor/ext.cx.editor.js
index 455216a..091f521 100644
--- a/modules/editor/ext.cx.editor.js
+++ b/modules/editor/ext.cx.editor.js
@@ -34,7 +34,6 @@
}
// Make the element editable
this.$editableElement.attr( 'contenteditable', true );
- this.wysiwygEditor();
};
/**
@@ -69,38 +68,6 @@
return e.which !== 13; // Enter key code
} );
}
- };
-
- /**
-* Enhance the basic content editable with a WYSIWYG editor
-* MediumEditor is used here. But any such simple editor
-* can work here.
-*/
- CXSectionEditor.prototype.wysiwygEditor = function () {
- var editorOptions;
-
- if ( !window.MediumEditor ) {
- return;
- }
- editorOptions = {
- cleanPastedHTML: true,
- buttons: [ 'bold', 'italic', 'header1', 'header2',
- 'unorderedlist', 'orderedlist', 'indent',
'outdent' ],
- firstHeader: 'h2',
- secondHeader: 'h3',
- disableDoubleReturn: true
- };
- // Avoid previews on mouse over of links
- MediumEditor.prototype.editorAnchorObserver = function () {};
-
- if ( this.$editableElement.get( 0 ).tagName === 'FIGURECAPTION'
) {
- // Prevent pressing return on caption to avoid
- // creation of p nodes
- editorOptions.disableReturn = true;
- }
-
- /*jshint -W031 */
- new MediumEditor( this.$editableElement, editorOptions );
};
$.fn.cxEditor = function () {
diff --git a/modules/editor/medium/medium-editor.css
b/modules/editor/medium/medium-editor.css
deleted file mode 100644
index 244f74c..000
--- a/modules/editor/medium/medium-editor.css
+++ /dev/null
@@ -1,168 +0,0 @@
[MediaWiki-commits] [Gerrit] Enable CORS for everything under /run - change (analytics...web)
jenkins-bot has submitted this change and it was merged.
Change subject: Enable CORS for everything under /run
..
Enable CORS for everything under /run
Change-Id: Ia32d04019e6a87830daf158f4ee87c9f6b573f75
---
M quarry/web/app.py
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/quarry/web/app.py b/quarry/web/app.py
index 3e3ee05..59e7def 100644
--- a/quarry/web/app.py
+++ b/quarry/web/app.py
@@ -300,7 +300,7 @@
return Response(json.dumps({
'status': qrun.status_message,
'extra': json.loads(qrun.extra_info or {})
-}), mimetype='application/json')
+}), mimetype='application/json', headers={'Access-Control-Allow-Origin':
'*'})
@app.route(/run/int:qrun_id/output/int:resultset_id/string:format)
@@ -321,6 +321,7 @@
format
)
response.headers['Content-Disposition'] = 'attachment; filename=%s'
% filename
+response.headers['Access-Control-Allow-Origin'] = '*'
return response
--
To view, visit https://gerrit.wikimedia.org/r/158359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia32d04019e6a87830daf158f4ee87c9f6b573f75
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add geoip resources for direct address resolution - change (operations/dns)
BBlack has submitted this change and it was merged.
Change subject: Add geoip resources for direct address resolution
..
Add geoip resources for direct address resolution
Change-Id: I48f1ebac2e35f5f401c97b9d1829ba7f1509a0a0
---
M config-geo
1 file changed, 57 insertions(+), 0 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/config-geo b/config-geo
index a672e34..762197d 100644
--- a/config-geo
+++ b/config-geo
@@ -214,6 +214,7 @@
},
},
resources = {
+# Current CNAME-based resources
bits = {
map = generic-map
dcmap = {
@@ -262,5 +263,61 @@
ulsfo = mobile-lb.ulsfo.wikimedia.org.
}
}
+
+# New address-based resources
+text-addrs = {
+map = generic-map
+service_types = up
+dcmap = {
+eqiad = { addrs_v4 = 208.80.154.224, addrs_v6 =
2620:0:861:ed1a::1 }
+esams = { addrs_v4 = 91.198.174.192, addrs_v6 =
2620:0:862:ed1a::1 }
+ulsfo = { addrs_v4 = 198.35.26.96, addrs_v6 =
2620:0:863:ed1a::1 }
+}
+}
+text-addrs-v4 = { # v4 from above, for e.g. donate
+map = generic-map
+service_types = up
+dcmap = {
+eqiad = 208.80.154.224
+esams = 91.198.174.192
+ulsfo = 198.35.26.96
+}
+}
+bits-addrs = {
+map = generic-map
+service_types = up
+dcmap = {
+eqiad = { addrs_v4 = 208.80.154.234, addrs_v6 =
2620:0:861:ed1a::1:a }
+esams = { addrs_v4 = 91.198.174.202, addrs_v6 =
2620:0:862:ed1a::1:a }
+ulsfo = { addrs_v4 = 198.35.26.106, addrs_v6 =
2620:0:863:ed1a::1:a }
+}
+}
+bits-addrs-v4 = { # v4 from above, for e.g. geoiplookup
+map = generic-map
+service_types = up
+dcmap = {
+eqiad = 208.80.154.234
+esams = 91.198.174.202
+ulsfo = 198.35.26.106
+}
+}
+upload-addrs = {
+map = generic-map
+service_types = up
+dcmap = {
+eqiad = { addrs_v4 = 208.80.154.240, addrs_v6 =
2620:0:861:ed1a::2:b }
+esams = { addrs_v4 = 91.198.174.208, addrs_v6 =
2620:0:862:ed1a::2:b }
+ulsfo = { addrs_v4 = 198.35.26.112, addrs_v6 =
2620:0:863:ed1a::2:b }
+}
+}
+mobile-addrs = {
+map = generic-map
+service_types = up
+dcmap = {
+eqiad = { addrs_v4 = 208.80.154.236, addrs_v6 =
2620:0:861:ed1a::1:c }
+esams = { addrs_v4 = 91.198.174.204, addrs_v6 =
2620:0:862:ed1a::1:c }
+ulsfo = { addrs_v4 = 198.35.26.108, addrs_v6 =
2620:0:863:ed1a::1:c }
+}
+}
}
}}
--
To view, visit https://gerrit.wikimedia.org/r/158367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48f1ebac2e35f5f401c97b9d1829ba7f1509a0a0
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add langs templates using DYNA - change (operations/dns)
BBlack has submitted this change and it was merged.
Change subject: add langs templates using DYNA
..
add langs templates using DYNA
Change-Id: I6e1c817a6856a6cfddfd2b0327faf9bc08704174
---
M templates/helpers/langlist.tmpl
1 file changed, 13 insertions(+), 0 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/helpers/langlist.tmpl b/templates/helpers/langlist.tmpl
index 6ed0fc8..494f613 100644
--- a/templates/helpers/langlist.tmpl
+++ b/templates/helpers/langlist.tmpl
@@ -12,3 +12,16 @@
{{ langcname(lang, domain) }}
{% endfor %}
{%- endmacro %}
+
+{% macro geolang(lang, dyna) -%}
+{{ lang }} 1H IN DYNAgeoip!{{ dyna }}
+www.{{ lang }} 1H IN DYNAgeoip!{{ dyna }}
+{{ lang }}.m1H IN DYNAgeoip!mobile-addrs
+{{ lang }}.zero 1H IN DYNAgeoip!mobile-addrs
+{%- endmacro %}
+
+{% macro geolanglist(dyna) -%}
+{% for lang in langs -%}
+{{ langdyna(lang, dyna) }}
+{% endfor %}
+{%- endmacro %}
--
To view, visit https://gerrit.wikimedia.org/r/158368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e1c817a6856a6cfddfd2b0327faf9bc08704174
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bounce out the ToC when scrolling like a madman. - change (apps...wikipedia)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158370
Change subject: Bounce out the ToC when scrolling like a madman.
..
Bounce out the ToC when scrolling like a madman.
- Nudge out the ToC when scrolled beyond a defined vertical threshold.
- Also expand the active drag edge of the drawers for easier pulling (see
bug)
Bug: 65004
Change-Id: I4cf0f4693c7c38e743b46a69aa84c2c61a0d1d00
---
M wikipedia/res/layout/activity_main.xml
M wikipedia/src/main/java/org/wikipedia/ViewAnimations.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
M wikipedia/src/main/java/org/wikipedia/views/DisableableDrawerLayout.java
M wikipedia/src/main/java/org/wikipedia/views/ObservableWebView.java
6 files changed, 146 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/70/158370/1
diff --git a/wikipedia/res/layout/activity_main.xml
b/wikipedia/res/layout/activity_main.xml
index fca585f..cccdc98 100644
--- a/wikipedia/res/layout/activity_main.xml
+++ b/wikipedia/res/layout/activity_main.xml
@@ -1,7 +1,7 @@
FrameLayout
xmlns:android=http://schemas.android.com/apk/res/android;
xmlns:tools=http://schemas.android.com/tools;
android:layout_width=match_parent android:layout_height=match_parent
-android.support.v4.widget.DrawerLayout
+org.wikipedia.views.DisableableDrawerLayout
android:id=@+id/drawer_layout
android:layout_width=match_parent
android:saveEnabled=false
@@ -19,7 +19,7 @@
android:layout_gravity=start
tools:layout=@layout/fragment_navdrawer/
-/android.support.v4.widget.DrawerLayout
+/org.wikipedia.views.DisableableDrawerLayout
LinearLayout android:layout_width=match_parent
android:layout_height=match_parent android:id=@+id/zero_crouton_container
fragment
android:id=@+id/search_fragment
diff --git a/wikipedia/src/main/java/org/wikipedia/ViewAnimations.java
b/wikipedia/src/main/java/org/wikipedia/ViewAnimations.java
index e2dd558..65d9522 100644
--- a/wikipedia/src/main/java/org/wikipedia/ViewAnimations.java
+++ b/wikipedia/src/main/java/org/wikipedia/ViewAnimations.java
@@ -197,4 +197,18 @@
animate(view).translationY(translation).setDuration(SHORT_ANIMATION_DURATION).start();
}
}
+
+/**
+ * Ensures that the translationX of a particular view is the given value.
+ *
+ * If it isn't the current value, then it performs a short animation to
make it so.
+ *
+ * @param view The view to translate
+ * @param translation The value to ensure it is translated by
+ */
+public static void ensureTranslationX(View view, int translation) {
+if (ViewHelper.getTranslationX(view) != translation) {
+
animate(view).translationX(translation).setDuration(SHORT_ANIMATION_DURATION).start();
+}
+}
}
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index 9cdbd9b..8c4ea38 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -435,6 +435,17 @@
new QuickReturnHandler(webView, quickReturnBar);
+webView.setOnFrustratedScrollListener(new
ObservableWebView.OnFrustratedScrollListener() {
+private boolean shown = false;
+@Override
+public void onFrustratedScroll() {
+if (!shown) {
+tocDrawer.nudgeOut();
+//shown = true;
+}
+}
+});
+
setState(state);
performActionForState(state);
}
diff --git a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
index c3f4385..954da77 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -4,6 +4,7 @@
import android.support.v4.widget.DrawerLayout;
import android.text.Html;
import android.util.Log;
+import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -81,6 +82,15 @@
public void onDrawerSlide(View drawerView, float slideOffset) {
super.onDrawerSlide(drawerView, slideOffset);
}
+
+@Override
+public void onDrawerStateChanged(int state) {
+super.onDrawerStateChanged(state);
+//if we're in the process of pulling the ToC, make sure to
un-nudge it, in case it's nudged out.
+if (state != DrawerLayout.STATE_IDLE) {
+slidingPane.unNudge();
[MediaWiki-commits] [Gerrit] Comment on future removal of $project-lb.wm.o - change (operations/dns)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/158371 Change subject: Comment on future removal of $project-lb.wm.o .. Comment on future removal of $project-lb.wm.o Change-Id: I428c671a992b5f3bf43a9a9e4c7483b13d8a9532 --- M templates/wikimedia.org 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/71/158371/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index b53b49e..794ca04 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -85,18 +85,25 @@ m 600 DYNC geoip!mobile-lb geoiplookup 600 DYNC geoip!geoiplookup donate 600 DYNC geoip!donate + +; Legacy geo-lb hostnames - no longer referenced +; To be removed sometime after Sep 8, 2014 +; Probably should be announced as well in case +; 3rd parties are referencing them. +; Do not CNAME to these going forward! foundation-lb 600 DYNC geoip!text-lb mediawiki-lb600 DYNC geoip!text-lb wikibooks-lb600 DYNC geoip!text-lb wikimedia-lb600 DYNC geoip!text-lb -wikinews-lb 600 DYNC geoip!text-lb +wikinews-lb 600 DYNC geoip!text-lb wikipedia-lb600 DYNC geoip!text-lb wikiquote-lb600 DYNC geoip!text-lb wikisource-lb 600 DYNC geoip!text-lb wikiversity-lb 600 DYNC geoip!text-lb wiktionary-lb 600 DYNC geoip!text-lb -wikidata-lb 600 DYNC geoip!text-lb +wikidata-lb 600 DYNC geoip!text-lb wikivoyage-lb 600 DYNC geoip!text-lb +; End legacy lb hostnames ; Servers (alphabetic order) WHAT PART ABOUT THIS IS SO HARD TO UNDERSTAND? -- To view, visit https://gerrit.wikimedia.org/r/158371 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I428c671a992b5f3bf43a9a9e4c7483b13d8a9532 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Comment on future removal of $project-lb.wm.o - change (operations/dns)
BBlack has submitted this change and it was merged. Change subject: Comment on future removal of $project-lb.wm.o .. Comment on future removal of $project-lb.wm.o Change-Id: I428c671a992b5f3bf43a9a9e4c7483b13d8a9532 --- M templates/wikimedia.org 1 file changed, 9 insertions(+), 2 deletions(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wikimedia.org b/templates/wikimedia.org index b53b49e..794ca04 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -85,18 +85,25 @@ m 600 DYNC geoip!mobile-lb geoiplookup 600 DYNC geoip!geoiplookup donate 600 DYNC geoip!donate + +; Legacy geo-lb hostnames - no longer referenced +; To be removed sometime after Sep 8, 2014 +; Probably should be announced as well in case +; 3rd parties are referencing them. +; Do not CNAME to these going forward! foundation-lb 600 DYNC geoip!text-lb mediawiki-lb600 DYNC geoip!text-lb wikibooks-lb600 DYNC geoip!text-lb wikimedia-lb600 DYNC geoip!text-lb -wikinews-lb 600 DYNC geoip!text-lb +wikinews-lb 600 DYNC geoip!text-lb wikipedia-lb600 DYNC geoip!text-lb wikiquote-lb600 DYNC geoip!text-lb wikisource-lb 600 DYNC geoip!text-lb wikiversity-lb 600 DYNC geoip!text-lb wiktionary-lb 600 DYNC geoip!text-lb -wikidata-lb 600 DYNC geoip!text-lb +wikidata-lb 600 DYNC geoip!text-lb wikivoyage-lb 600 DYNC geoip!text-lb +; End legacy lb hostnames ; Servers (alphabetic order) WHAT PART ABOUT THIS IS SO HARD TO UNDERSTAND? -- To view, visit https://gerrit.wikimedia.org/r/158371 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I428c671a992b5f3bf43a9a9e4c7483b13d8a9532 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix: problems in i18n files - change (mediawiki...MathSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix: problems in i18n files
..
Fix: problems in i18n files
Change-Id: I1f50792a322e52d2c9ae10cc64ff5fa5b3d55f50
---
M SpecialUploadResult.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 52 insertions(+), 52 deletions(-)
Approvals:
Physikerwelt: Looks good to me, approved
Raimond Spekking: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/SpecialUploadResult.php b/SpecialUploadResult.php
index a3bbed3..8d0d041 100644
--- a/SpecialUploadResult.php
+++ b/SpecialUploadResult.php
@@ -17,7 +17,7 @@
}
private static function formatErrors( $errors ) {
- return wfMessage( 'wmcWarnings' )-text() . ' ' . implode( br
/, $errors );
+ return wfMessage( 'math-wmc-Warnings' )-text() . ' ' .
implode( br /, $errors );
}
function execute( $query ) {
@@ -26,10 +26,10 @@
throw new PermissionsError( 'mathwmcsubmit' );
}
- $this-getOutput()-addWikiText( wfMessage( 'wmcIntroduction'
)-text() );
+ $this-getOutput()-addWikiText( wfMessage(
'math-wmc-Introduction' )-text() );
$formDescriptor = $this-printRunSelector();
- $formDescriptor['File'] = array( 'label-message' =
'wmcFileLabel',
- 'help-message' = 'wmcFileHelp',
+ $formDescriptor['File'] = array( 'label-message' =
'math-wmc-FileLabel',
+ 'help-message' = 'math-wmc-FileHelp',
'class' = 'HTMLTextField',
'type' = 'file',
'required' = true,
@@ -54,10 +54,10 @@
}
//Probably we want to add more field in the future
$formFields['run'] = array( 'type' = 'selectorother',
- 'label-message' = 'wmcSelectRun',
+ 'label-message' = 'math-wmc-SelectRun',
'options' = $options,
'required' = true,
- 'help-message' = 'wmcSelectRunHelp',
+ 'help-message' = 'math-wmc-SelectRunHelp',
'filter-callback' = array( $this, 'runSelectorFilter'
),
'validation-callback' = array( $this,
'runValidatorFilter' ),
//'section' = 'wmcSectionRun'
@@ -81,13 +81,13 @@
array( 'isDraft' = true, 'userID' =
$uID, 'runName' = $run ) );
if ( $success ) {
$this-runID = $dbw-insertId();
- $this-getOutput()-addWikiMsg(
'wmcRunAdded', $run, $this-runID );
+ $this-getOutput()-addWikiMsg(
'math-wmc-RunAdded', $run, $this-runID );
} else {
$this-runID = false;
- $this-getOutput()-addWikiMsg(
'wmcRunAddError', $run );
+ $this-getOutput()-addWikiMsg(
'math-wmc-RunAddError', $run );
}
} else {
- $this-getOutput()-addWikiMsg(
'wmcRunAddExist', $run, $exists );
+ $this-getOutput()-addWikiMsg(
'math-wmc-RunAddExist', $run, $exists );
$this-runID = false;
}
} else {
@@ -102,7 +102,7 @@
$res = $dbr-selectField( 'math_wmc_runs', 'runName',
array( 'isDraft' = true, 'userID' = $uID, 'runId' =
$this-runID ) );
if ( ! $res ) {
- return wfMessage( 'wmcSelectRunHelp' )-text();
+ return wfMessage( 'math-wmc-SelectRunHelp' )-text();
} else {
return true;
}
@@ -140,7 +140,7 @@
}
function processInput( ) {
- $this-getOutput()-addWikiMsg( wmcSubmissionSuccess );
+ $this-getOutput()-addWikiMsg( math-wmc-SubmissionSuccess );
self::deleteRun( $this-runID );
$dbw = wfGetDB( DB_MASTER );
//TODO: Find adequate API call
@@ -224,7 +224,7 @@
// check header line
$uploadedHeaders = $table[0];
if ( $uploadedHeaders != $this-columnHeaders ) {
- $error_msg = wfMessage( 'importcsv_badheader' )-text();
+ $error_msg = wfMessage( 'math-wmc-bad-header' )-text();
return $error_msg;
}
$rank = 0;
@@ -239,17 +239,17 @@
$fId = trim( $line[1] );
$qValid = $this-isValidQId(
[MediaWiki-commits] [Gerrit] trebuchet::packages: use ensure_packages from stdlib - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: trebuchet::packages: use ensure_packages from stdlib
..
trebuchet::packages: use ensure_packages from stdlib
Also fix a conflict with mobile::vumi class
Change-Id: I2e3b74aaa2ef8c97055392e40b5244493705a57c
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M manifests/mobile.pp
M modules/trebuchet/manifests/packages.pp
2 files changed, 15 insertions(+), 16 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/mobile.pp b/manifests/mobile.pp
index 1dfb9dd..6b08936 100644
--- a/manifests/mobile.pp
+++ b/manifests/mobile.pp
@@ -74,8 +74,10 @@
ensure = '0.1.4-1ubuntu1',
}
-package { 'python-redis':
-ensure = '2.4.9-1',
+if !defined(Package['python-redis']) {
+package { 'python-redis':
+ensure ='present',
+}
}
package { 'python-smpp':
diff --git a/modules/trebuchet/manifests/packages.pp
b/modules/trebuchet/manifests/packages.pp
index cc2629f..fa15a57 100644
--- a/modules/trebuchet/manifests/packages.pp
+++ b/modules/trebuchet/manifests/packages.pp
@@ -3,19 +3,16 @@
# Provision packages required for trebuchet to operate
#
class trebuchet::packages {
-if ! defined(Package['git-core']){
- package { 'git-core':
-ensure = present,
- }
+include stdlib
+
+# Installs git-core
+require base::standard-packages
+
+#git-fat was not in hardy
+if ubuntu_version('= 10.04') {
+ensure_packages(['git-fat'])
}
-if ! defined(Package['python-redis']){
- package { 'python-redis':
-ensure = present,
- }
-}
-if ! defined(Package['git-fat']){
- package { 'git-fat':
-ensure = present,
- }
-}
+
+
+ensure_packages(['python-redis'])
}
--
To view, visit https://gerrit.wikimedia.org/r/158353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2e3b74aaa2ef8c97055392e40b5244493705a57c
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@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 config parameter for event logging sampling rate. - change (mediawiki...MobileApp)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158372
Change subject: Add config parameter for event logging sampling rate.
..
Add config parameter for event logging sampling rate.
Change-Id: I3b9a7c9cb60d93516af4710cb98314c5b96fecc9
---
M config/config.json
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileApp
refs/changes/72/158372/1
diff --git a/config/config.json b/config/config.json
index 75b5c8d..fe486b3 100644
--- a/config/config.json
+++ b/config/config.json
@@ -1,3 +1,4 @@
{
-disableAnonEditing: false
+disableAnonEditing: false,
+eventLogSampleRate: 10
}
--
To view, visit https://gerrit.wikimedia.org/r/158372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b9a7c9cb60d93516af4710cb98314c5b96fecc9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileApp
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bug 61214 is resolved, removed pending block - change (mediawiki...UniversalLanguageSelector)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/158373 Change subject: Bug 61214 is resolved, removed pending block .. Bug 61214 is resolved, removed pending block Paired with: Amir E. Aharoni Bug: 61214 Change-Id: I3345ee2130d09bd230a55e0c9c33da7a36247a09 --- M tests/browser/features/step_definitions/ime_steps.rb 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/73/158373/1 diff --git a/tests/browser/features/step_definitions/ime_steps.rb b/tests/browser/features/step_definitions/ime_steps.rb index bd016bf..1dc3b2c 100644 --- a/tests/browser/features/step_definitions/ime_steps.rb +++ b/tests/browser/features/step_definitions/ime_steps.rb @@ -32,9 +32,7 @@ end Then(/^I should see a list of suggested languages$/) do - pending(Bug 61214) do -on(IMEPage).input_method_language_list_element.should be_visible - end + on(IMEPage).input_method_language_list_element.should be_visible end When(/^I choose (.+?) as the input language$/) do |language| -- To view, visit https://gerrit.wikimedia.org/r/158373 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3345ee2130d09bd230a55e0c9c33da7a36247a09 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector 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] Bug 61214 is resolved, removed pending block - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged. Change subject: Bug 61214 is resolved, removed pending block .. Bug 61214 is resolved, removed pending block Paired with: Amir E. Aharoni Bug: 61214 Change-Id: I3345ee2130d09bd230a55e0c9c33da7a36247a09 --- M tests/browser/features/step_definitions/ime_steps.rb 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/step_definitions/ime_steps.rb b/tests/browser/features/step_definitions/ime_steps.rb index bd016bf..1dc3b2c 100644 --- a/tests/browser/features/step_definitions/ime_steps.rb +++ b/tests/browser/features/step_definitions/ime_steps.rb @@ -32,9 +32,7 @@ end Then(/^I should see a list of suggested languages$/) do - pending(Bug 61214) do -on(IMEPage).input_method_language_list_element.should be_visible - end + on(IMEPage).input_method_language_list_element.should be_visible end When(/^I choose (.+?) as the input language$/) do |language| -- To view, visit https://gerrit.wikimedia.org/r/158373 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3345ee2130d09bd230a55e0c9c33da7a36247a09 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] trebuchet::packages: fix conditional install - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158374
Change subject: trebuchet::packages: fix conditional install
..
trebuchet::packages: fix conditional install
Change-Id: I5c48edb6a4ea9f4fb28f5e6aa4c3bb895cfe335c
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/trebuchet/manifests/packages.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/74/158374/1
diff --git a/modules/trebuchet/manifests/packages.pp
b/modules/trebuchet/manifests/packages.pp
index fa15a57..68d464e 100644
--- a/modules/trebuchet/manifests/packages.pp
+++ b/modules/trebuchet/manifests/packages.pp
@@ -9,7 +9,7 @@
require base::standard-packages
#git-fat was not in hardy
-if ubuntu_version('= 10.04') {
+if ubuntu_version(' hardy') {
ensure_packages(['git-fat'])
}
--
To view, visit https://gerrit.wikimedia.org/r/158374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c48edb6a4ea9f4fb28f5e6aa4c3bb895cfe335c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] trebuchet::packages: fix conditional install - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: trebuchet::packages: fix conditional install
..
trebuchet::packages: fix conditional install
Change-Id: I5c48edb6a4ea9f4fb28f5e6aa4c3bb895cfe335c
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/trebuchet/manifests/packages.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/modules/trebuchet/manifests/packages.pp
b/modules/trebuchet/manifests/packages.pp
index fa15a57..68d464e 100644
--- a/modules/trebuchet/manifests/packages.pp
+++ b/modules/trebuchet/manifests/packages.pp
@@ -9,7 +9,7 @@
require base::standard-packages
#git-fat was not in hardy
-if ubuntu_version('= 10.04') {
+if ubuntu_version(' hardy') {
ensure_packages(['git-fat'])
}
--
To view, visit https://gerrit.wikimedia.org/r/158374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c48edb6a4ea9f4fb28f5e6aa4c3bb895cfe335c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@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] trebuchet::packages: s/hardy/lucid/ - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158375
Change subject: trebuchet::packages: s/hardy/lucid/
..
trebuchet::packages: s/hardy/lucid/
Change-Id: I7092f0b520270fcd2585f9e25bc51488ef7895d7
---
M modules/trebuchet/manifests/packages.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/158375/1
diff --git a/modules/trebuchet/manifests/packages.pp
b/modules/trebuchet/manifests/packages.pp
index 68d464e..33d8de6 100644
--- a/modules/trebuchet/manifests/packages.pp
+++ b/modules/trebuchet/manifests/packages.pp
@@ -9,7 +9,7 @@
require base::standard-packages
#git-fat was not in hardy
-if ubuntu_version(' hardy') {
+if ubuntu_version(' lucid') {
ensure_packages(['git-fat'])
}
--
To view, visit https://gerrit.wikimedia.org/r/158375
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7092f0b520270fcd2585f9e25bc51488ef7895d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] trebuchet::packages: s/hardy/lucid/ - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: trebuchet::packages: s/hardy/lucid/
..
trebuchet::packages: s/hardy/lucid/
Change-Id: I7092f0b520270fcd2585f9e25bc51488ef7895d7
---
M modules/trebuchet/manifests/packages.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/trebuchet/manifests/packages.pp
b/modules/trebuchet/manifests/packages.pp
index 68d464e..33d8de6 100644
--- a/modules/trebuchet/manifests/packages.pp
+++ b/modules/trebuchet/manifests/packages.pp
@@ -9,7 +9,7 @@
require base::standard-packages
#git-fat was not in hardy
-if ubuntu_version(' hardy') {
+if ubuntu_version(' lucid') {
ensure_packages(['git-fat'])
}
--
To view, visit https://gerrit.wikimedia.org/r/158375
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7092f0b520270fcd2585f9e25bc51488ef7895d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@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] README updates - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/158376 Change subject: README updates .. README updates Also includes instructions to expand groovy sandbox to run cirrus properly. Change-Id: I674160b8c423baee12a1626d1ffdd372f45ab018 --- M README A elasticsearch.yml 2 files changed, 102 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/76/158376/1 diff --git a/README b/README index 3cfcc49..7f4fa3b 100644 --- a/README +++ b/README @@ -3,17 +3,15 @@ Installation -Get Elasticsearch up and running somewhere. 1.2.1 and above are all fine with 1.3.x required soon. +Get Elasticsearch up and running somewhere. 1.3.2 and above are all fine. -CirrusSearch makes use of the dynamic scripting feature in Elasticsearch for improved performance. -With Elasticsearch 1.2.0 and higher, dynamic scripting is disabled per default but can and -needs to be enabled for Cirrus. +Optional: CirrusSearch makes use of sandboxed dynamic scripts in Elasticsearch. For most +functions the sandbox is fine but some advanced features (source regular expression search) +require relaxing the sandbox some. To do this add the contents of elasticsearch.yml located +in this directory to the elasticsearch.yml that came with Elasticsearch and restart +Elasticsearch. -In the elasticsearch.yml config, add: - - script.disable_dynamic: false - -Then place the CirrusSearch extension in your extensions directory. +Place the CirrusSearch extension in your extensions directory. Make sure you have the curl php library installed (sudo apt-get install php5-curl in Debian.) You also need to install the Elastica MediaWiki extension. Add this to LocalSettings.php: @@ -238,6 +236,18 @@ sure fire way to get it to work is also the slowest. Add this to your LocalSettings.php: $wgRunJobsAsync = false; + +Development +--- +The fastest way to get started with CirrusSearch development is to use MediaWiki-Vagrant. +1. Follow steps here: https://www.mediawiki.org/wiki/MediaWiki-Vagrant#Quick_start +2. Now execute the following: +vagrant enable-role cirrussearch +vagrant provision + +This can take some time but it produces a clean development environment in a virtual machine +that has everything required to run Cirrus. + Hooks - CirrusSearch provides hooks that other extensions can make use of to extend the core schema and diff --git a/elasticsearch.yml b/elasticsearch.yml new file mode 100644 index 000..98bd6bc --- /dev/null +++ b/elasticsearch.yml @@ -0,0 +1,83 @@ +# The default sandbox for Groovy is too restrictive for Cirrus. This adds a +# few more allowed invocations. +script.groovy.sandbox.class_whitelist: + #Defaults + - java.util.Date + - java.util.Map + - java.util.List + - java.util.Set + - java.util.ArrayList + - java.util.Arrays + - java.util.HashMap + - java.util.HashSet + - java.util.UUID + - java.math.BigDecimal + - org.joda.time.DateTime + - org.joda.time.DateTimeZone + - org.elasticsearch.common.joda.time.DateTime + - org.elasticsearch.common.joda.time.DateTimeZone + # Added for Cirrus + - java.util.Locale + - org.apache.lucene.util.automaton.RegExp + - org.apache.lucene.util.automaton.CharacterRunAutomaton +script.groovy.sandbox.package_whitelist: + # Defaults + - java.util + - java.lang + - org.joda.time + - org.elasticsearch.common.joda.time + # Added for Cirrus + - org.apache.lucene.util.automaton +script.groovy.sandbox.receiver_whitelist: + # Defaults + - java.lang.Math + - java.lang.Integer + - [I + - [[I + - [[[I + - java.lang.Float + - [F + - [[F + - [[[F + - java.lang.Double + - [D + - [[D + - [[[D + - java.lang.Long + - [J + - [[J + - [[[J + - java.lang.Short + - [S + - [[S + - [[[S + - java.lang.Character + - [C + - [[C + - [[[C + - java.lang.Byte + - [B + - [[B + - [[[B + - java.lang.Boolean + - [Z + - [[Z + - [[[Z + - java.math.BigDecimal + - java.util.Arrays + - java.util.Date + - java.util.List + - java.util.Map + - java.util.Set + - java.lang.Object + - org.joda.time.DateTime + - org.joda.time.DateTimeUtils + - org.joda.time.DateTimeZone + - org.joda.time.Instant + - org.elasticsearch.common.joda.time.DateTime + - org.elasticsearch.common.joda.time.DateTimeUtils + - org.elasticsearch.common.joda.time.DateTimeZone + - org.elasticsearch.common.joda.time.Instant + # Added for Cirrus + - org.apache.lucene.util.automaton.RegExp + - org.apache.lucene.util.automaton.CharacterRunAutomaton -- To view, visit https://gerrit.wikimedia.org/r/158376 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I674160b8c423baee12a1626d1ffdd372f45ab018 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits
[MediaWiki-commits] [Gerrit] pep257-D205 fixes in pywikibot/ - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158377
Change subject: pep257-D205 fixes in pywikibot/
..
pep257-D205 fixes in pywikibot/
Change-Id: I1bd1375ffe01025b43c307cd1828471fbb5e05d9
---
M pywikibot/__init__.py
M pywikibot/comms/threadedhttp.py
M pywikibot/data/api.py
M pywikibot/data/wikidataquery.py
M pywikibot/date.py
M pywikibot/editor.py
M pywikibot/exceptions.py
M pywikibot/i18n.py
M pywikibot/interwiki_graph.py
M pywikibot/logentries.py
M pywikibot/login.py
M pywikibot/page.py
M pywikibot/pagegenerators.py
M pywikibot/site.py
M pywikibot/textlib.py
M pywikibot/tools.py
M pywikibot/userinterfaces/gui.py
M pywikibot/userinterfaces/terminal_interface_base.py
M pywikibot/version.py
M pywikibot/weblib.py
M pywikibot/xmlreader.py
M scripts/imagetransfer.py
22 files changed, 274 insertions(+), 162 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/77/158377/1
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index add9a33..9c62715 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -117,15 +117,15 @@
@classmethod
def fromtimestampformat(cls, ts):
-Convert the internal MediaWiki timestamp format to a Timestamp
object.
+Convert a MediaWiki internal timestamp to a Timestamp object.
return cls.strptime(ts, cls.mediawikiTSFormat)
def toISOformat(self):
-Convert the Timestamp object to an ISO 8601 timestamp.
+Convert object to an ISO 8601 timestamp.
return self.strftime(self.ISO8601Format)
def totimestampformat(self):
-Convert the Timestamp object to the internal MediaWiki timestamp
format.
+Convert object to the internal MediaWiki timestamp format.
return self.strftime(self.mediawikiTSFormat)
def __str__(self):
@@ -248,6 +248,8 @@
@property
def precision(self):
+Return the precision of the geo coordinate.
+
The biggest error (in degrees) will be given by the longitudinal error
- the same error in meters becomes larger
(in degrees) further up north. We can thus ignore the latitudinal
error.
@@ -425,6 +427,8 @@
@staticmethod
def fromWikibase(wb):
+Create a WbQuanity from the JSON format given by the Wikibase API.
+
amount = eval(wb['amount'])
upperBound = eval(wb['upperBound'])
lowerBound = eval(wb['lowerBound'])
diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py
index 9c85179..790190b 100644
--- a/pywikibot/comms/threadedhttp.py
+++ b/pywikibot/comms/threadedhttp.py
@@ -46,6 +46,8 @@
def __init__(self, maxnum=5):
+Constructor.
+
@param maxnum: Maximum number of connections per identifier.
The pool drops excessive connections added.
@@ -132,6 +134,8 @@
def __init__(self, *args, **kwargs):
+Constructor.
+
@param cookiejar: (optional) CookieJar to use. A new one will be
used when not supplied.
@param connection_pool: (optional) Connection pool to use. A new one
@@ -244,7 +248,7 @@
def _follow_redirect(self, uri, method, body, headers, response,
content, max_redirects):
-Internal function to follow a redirect recieved by L{request}
+Internal function to follow a redirect recieved by L{request}.
(scheme, authority, absolute_uri,
defrag_uri) = httplib2.urlnorm(httplib2.iri2uri(uri))
if self.cache:
@@ -308,7 +312,11 @@
def __init__(self, *args, **kwargs):
-See C{Http.request} for parameters.
+
+Constructor.
+
+See C{Http.request} for parameters.
+
self.args = args
self.kwargs = kwargs
self.data = None
@@ -319,6 +327,8 @@
Thread object to spawn multiple HTTP connection threads.
def __init__(self, queue, cookiejar, connection_pool):
+Constructor.
+
@param queue: The C{Queue.Queue} object that contains L{HttpRequest}
objects.
@param cookiejar: The C{LockableCookieJar} cookie object to share among
@@ -380,8 +390,9 @@
#
class DummyRequest(object):
-Simulated urllib2.Request object for httplib2
- implements only what's necessary for cookielib.CookieJar to work
+Simulated urllib2.Request object for httplib2.
+
+ Implements only what's necessary for cookielib.CookieJar to work.
def __init__(self, url, headers=None):
self.url = url
@@ -424,8 +435,9 @@
class DummyResponse(object):
-Simulated urllib2.Request object for httplib2
- implements only what's necessary for cookielib.CookieJar to work
+Simulated urllib2.Request object for httplib2.
+
+
[MediaWiki-commits] [Gerrit] Use same arguments for globalApiPreHandlers as for apiPreHan... - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158378
Change subject: Use same arguments for globalApiPreHandlers as for
apiPreHandlers
..
Use same arguments for globalApiPreHandlers as for apiPreHandlers
Change-Id: Ia657c9f118fae78662921d92558ebbfde0565c9e
---
M modules/new/components/flow-board.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/78/158378/1
diff --git a/modules/new/components/flow-board.js
b/modules/new/components/flow-board.js
index 088dc23..6aef252 100644
--- a/modules/new/components/flow-board.js
+++ b/modules/new/components/flow-board.js
@@ -1468,7 +1468,7 @@
// Let generic pre-handler take care of edit conflicts
// @todo use oojs or mf events system?
$.each(
FlowBoardComponent.UI.events.globalApiPreHandlers, function( key ) {
- preHandlerReturns.push(
FlowBoardComponent.UI.events.globalApiPreHandlers[key].apply( _this, arguments
) );
+ preHandlerReturns.push(
FlowBoardComponent.UI.events.globalApiPreHandlers[key].apply( _this, args ) );
} );
// Use the pre-callback to find out if we should
process this
--
To view, visit https://gerrit.wikimedia.org/r/158378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia657c9f118fae78662921d92558ebbfde0565c9e
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] Fixed some facet issues - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158379
Change subject: Fixed some facet issues
..
Fixed some facet issues
- In some rare cases facetting could faild because of an defective check
- Removed onchange attr because it is not needed
- Code improvements
- Added documentation
Change-Id: Ib71b3650aed8ed5d76fd01ecf49ca4a63315f230
---
M ExtendedSearch/ExtendedSearch.class.php
M ExtendedSearch/includes/ExtendedSearchBase.class.php
M ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
M ExtendedSearch/includes/SearchIndex/SearchRequest.class.php
M ExtendedSearch/includes/SearchIndex/SearchResult.class.php
M ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
M ExtendedSearch/views/view.ExtendedSearchFacetBox.php
7 files changed, 78 insertions(+), 67 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/79/158379/1
diff --git a/ExtendedSearch/ExtendedSearch.class.php
b/ExtendedSearch/ExtendedSearch.class.php
index 182bbbc..887fe9e 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -52,16 +52,6 @@
class ExtendedSearch extends BsExtensionMW {
/**
-* Instance of BsExtendedSearchBase
-* @var Object
-*/
- protected $oExtendedSearchBase = null;
- /**
-* Instance of BuildIndexMainControl
-* @var Object
-*/
- protected $oBuildIndexMainControl = null;
- /**
* Unique wiki id
*/
private $sWikiID = '';
@@ -148,9 +138,6 @@
$this-setHook( 'BSDashboardsAdminDashboardPortalPortlets' );
$this-setHook( 'SkinTemplateOutputPageBeforeExec' );
- $this-oExtendedSearchBase = ExtendedSearchBase::getInstance(
$this );
- $this-oBuildIndexMainControl =
BuildIndexMainControl::getInstance();
-
$this-mCore-registerPermission( 'searchfiles', array( 'user'
) );
wfProfileOut( 'BS::'.__METHOD__ );
@@ -205,7 +192,7 @@
$oWidgetView
-setId( 'bs-extendedsearch-mlt' )
-setTitle( wfMessage( 'bs-extendedsearch-morelikethis'
)-plain() )
- -setBody(
$this-oExtendedSearchBase-getViewMoreLikeThis( $oTitle )-execute() )
+ -setBody( ExtendedSearchBase::getInstance( $this
)-getViewMoreLikeThis( $oTitle )-execute() )
-setTooltip( wfMessage(
'bs-extendedsearch-morelikethis' )-plain() )
-setAdditionalBodyClasses( array( 'bs-nav-links',
'bs-extendedsearch-portlet' ) ); //For correct margin and fontsize
@@ -235,7 +222,7 @@
$oMltListView = new ViewStateBarBodyElement();
$oMltListView-setKey( 'MoreLikeThis' );
$oMltListView-setHeading( wfMessage(
'bs-extendedsearch-morelikethis' )-plain() );
- $oMltListView-setBodyText(
$this-oExtendedSearchBase-getViewMoreLikeThis( $oTitle )-execute() );
+ $oMltListView-setBodyText( ExtendedSearchBase::getInstance(
$this )-getViewMoreLikeThis( $oTitle )-execute() );
$aBodyViews['statebarbodymorelikethis'] = $oMltListView;
return true;
@@ -366,7 +353,7 @@
*/
public function onArticleDeleteComplete( $oArticle, $oUser, $sReason,
$iID ) {
try {
- $this-oBuildIndexMainControl-deleteFromIndexWiki(
$iID );
+
BuildIndexMainControl::getInstance()-deleteFromIndexWiki( $iID );
} catch ( BsException $e ) {
wfDebugLog( 'ExtendedSearch', 'onArticleDeleteComplete:
'.$e-getMessage() );
}
@@ -382,7 +369,7 @@
*/
public function onArticleSaveComplete( $oArticle, $oUser ) {
try {
- $this-oBuildIndexMainControl-updateIndexWiki(
$oArticle );
+ BuildIndexMainControl::getInstance()-updateIndexWiki(
$oArticle );
} catch ( BsException $e ) {
wfDebugLog( 'ExtendedSearch', 'onArticleSaveComplete:
'.$e-getMessage() );
}
@@ -397,7 +384,7 @@
*/
public function onArticleUndelete( $oTitle, $bCreate ) {
try {
-
$this-oBuildIndexMainControl-updateIndexWikiByTitleObject( $oTitle );
+
BuildIndexMainControl::getInstance()-updateIndexWikiByTitleObject( $oTitle );
} catch ( BsException $e ) {
wfDebugLog( 'ExtendedSearch', 'onArticleUndelete:
'.$e-getMessage() );
}
@@ -416,18 +403,18 @@
public function onTitleMoveComplete( $oTitle, $oNewtitle, $oUser,
$iOldID, $iNewID ) {
try {
// Moving article
-
[MediaWiki-commits] [Gerrit] Remove usage of removed hooks - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove usage of removed hooks
..
Remove usage of removed hooks
Change-Id: I37d79b61578a273c4c798f5d3663acb6ecb42e31
---
M hooks.md
M modules/tools/ext.cx.tools.mt.js
M modules/translation/ext.cx.translation.js
3 files changed, 1 insertion(+), 21 deletions(-)
Approvals:
KartikMistry: Looks good to me, but someone else must approve
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hooks.md b/hooks.md
index ba53bde..1d7ac55 100644
--- a/hooks.md
+++ b/hooks.md
@@ -98,14 +98,6 @@
Fired when the translation section changed because of any reason.
-## mw.cx.translation.clear
-
-Fired when the translation section is cleared.
-
-## mw.cx.translation.edit
-
-Fired when translator edits the translation section, for example by typing.
-
## mw.cx.translation.focus
Fired when translation section receives focus.
diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 299c26a..c29a25b 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -261,7 +261,7 @@
this.$restore
.on( 'click', $.proxy( this.restoreTranslation, this )
);
- mw.hook( 'mw.cx.translation.edit' ).add( $.proxy(
this.showRestore, this ) );
+ mw.hook( 'mw.cx.translation.change' ).add( $.proxy(
this.showRestore, this ) );
};
MTControlCard.prototype.buildProvidersMenu = function () {
diff --git a/modules/translation/ext.cx.translation.js
b/modules/translation/ext.cx.translation.js
index f445e5e..3925663 100644
--- a/modules/translation/ext.cx.translation.js
+++ b/modules/translation/ext.cx.translation.js
@@ -106,18 +106,6 @@
}, 2000 );
} );
- // The translation for a section was cleared.
- // The translator either deleted the content
- // or used the clear translation tool.
- // Present the placeholder for the section to user.
- mw.hook( 'mw.cx.translation.clear' ).add( function ( sourceId )
{
- var targetSectionId = '#cx' + sourceId,
- $placeholder = getPlaceholder( sourceId );
-
- mw.hook( 'mw.cx.translation.change' ).fire( $(
targetSectionId ) );
- $( targetSectionId ).replaceWith( $placeholder );
- } );
-
mw.hook( 'mw.cx.translation.change' ).add( function ( $section
) {
if ( $section ) {
$section.keepAlignment();
--
To view, visit https://gerrit.wikimedia.org/r/158350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37d79b61578a273c4c798f5d3663acb6ecb42e31
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: KartikMistry kartik.mis...@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] Some basic QUnit tests for cx.util - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Some basic QUnit tests for cx.util
..
Some basic QUnit tests for cx.util
Change-Id: I94b17dae57d7f1ed5fb858718ad0c14225ff9242
---
M Resources.php
A tests/qunit/base/ext.cx.util.test.js
2 files changed, 62 insertions(+), 0 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index 9a0ac02..87b4189 100644
--- a/Resources.php
+++ b/Resources.php
@@ -8,6 +8,7 @@
$dir = __DIR__;
+// TODO: use the standard form
$resourcePaths = array(
'localBasePath' = $dir . '/modules',
'remoteExtPath' = 'ContentTranslation/modules',
@@ -434,3 +435,17 @@
),
) + $resourcePaths;
+$wgHooks['ResourceLoaderTestModules'][] = function ( array $modules ) {
+ $resourcePaths = array(
+ 'localBasePath' = __DIR__,
+ 'remoteExtPath' = 'ContentTranslation',
+ );
+
+ $modules['qunit']['ext.cx.util.test'] = array(
+ 'scripts' = array( 'tests/qunit/base/ext.cx.util.test.js' ),
+ 'dependencies' = array(
+ 'ext.cx.util',
+ 'mediawiki.Uri',
+ ),
+ ) + $resourcePaths;
+};
diff --git a/tests/qunit/base/ext.cx.util.test.js
b/tests/qunit/base/ext.cx.util.test.js
new file mode 100644
index 000..ab4e3e4
--- /dev/null
+++ b/tests/qunit/base/ext.cx.util.test.js
@@ -0,0 +1,47 @@
+/**
+ * @file
+ * @author Niklas Laxström
+ * @license GPL-2.0+
+ */
+
+( function ( $, mw ) {
+ 'use strict';
+
+ QUnit.module( 'ext.cx.util', QUnit.newMwEnvironment( {
+ config: {
+ wgContentTranslationDomainTemplate: '$1.example.com',
+ wgArticlePath: '/bunny/says/$1',
+ wgScriptPath: '/w'
+ }
+ } ) );
+
+ QUnit.test( 'getPageUrl', function ( assert ) {
+ var proto = new mw.Uri().protocol + '://';
+
+ QUnit.expect( 2 );
+
+ assert.strictEqual(
+ mw.cx.getPageUrl( 'es', 'Title' ),
+ proto + 'es.example.com/bunny/says/Title',
+ 'Simple title'
+ );
+
+ assert.strictEqual(
+ mw.cx.getPageUrl( 'fi', 'Longer title' ),
+ proto + 'fi.example.com/bunny/says/Longer title',
+ 'Title with space'
+ );
+ } );
+
+ QUnit.test( 'getApiUrl', function ( assert ) {
+ var proto = new mw.Uri().protocol + '://';
+
+ QUnit.expect( 1 );
+
+ assert.strictEqual(
+ mw.cx.getApiUrl( 'he' ),
+ proto + 'he.example.com/w/api.php',
+ 'Basic test'
+ );
+ } );
+}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/150555
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94b17dae57d7f1ed5fb858718ad0c14225ff9242
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move all test modules to Resources.php - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158380
Change subject: Move all test modules to Resources.php
..
Move all test modules to Resources.php
Change-Id: Ia43038ad17ac3f8bc3ddafb71e7e3bd9698c343b
---
M ContentTranslation.hooks.php
M ContentTranslation.php
M Resources.php
3 files changed, 10 insertions(+), 20 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/80/158380/1
diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index ea21786..953ed97 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -90,22 +90,4 @@
$vars['wgContentTranslationExperimentalFeatures'] =
$wgContentTranslationExperimentalFeatures;
return true;
}
-
- /**
-* @param $testModules array of javascript testing modules. 'qunit' is
fed
-* using tests/qunit/QUnitTestResources.php.
-* @param ResourceLoader $resourceLoader
-* @return bool
-* Hook: ResourceLoaderTestModules
-*/
- public static function addTestModules( array $testModules,
ResourceLoader $resourceLoader ) {
- $testModules['qunit']['ext.cx.tools.tests'] = array(
- 'scripts' = array(
'tests/qunit/ext.cx.tools.template.test.js' ),
- 'dependencies' = array( 'ext.cx.model',
'ext.cx.tools.template' ),
- 'localBasePath' = __DIR__,
- 'remoteExtPath' = 'ContentTranslation',
- );
-
- return true;
- }
}
diff --git a/ContentTranslation.php b/ContentTranslation.php
index 98dcdf9..007067c 100644
--- a/ContentTranslation.php
+++ b/ContentTranslation.php
@@ -67,8 +67,6 @@
$GLOBALS['wgHooks']['BeforePageDisplay'][] =
'ContentTranslationHooks::addModules';
$GLOBALS['wgHooks']['GetBetaFeaturePreferences'][] =
'ContentTranslationHooks::getPreferences';
$GLOBALS['wgHooks']['ResourceLoaderGetConfigVars'][] =
'ContentTranslationHooks::addConfig';
-$GLOBALS['wgHooks']['ResourceLoaderTestModules'][] =
- 'ContentTranslationHooks::addTestModules';
$GLOBALS['wgExtensionFunctions'][] = function () {
global $wgResourceModules, $wgContentTranslationEventLogging;
diff --git a/Resources.php b/Resources.php
index 87b4189..20365c4 100644
--- a/Resources.php
+++ b/Resources.php
@@ -448,4 +448,14 @@
'mediawiki.Uri',
),
) + $resourcePaths;
+
+ $modules['qunit']['ext.cx.tools.tests'] = array(
+ 'scripts' = array(
+ 'tests/qunit/ext.cx.tools.template.test.js'
+ ),
+ 'dependencies' = array(
+ 'ext.cx.model',
+ 'ext.cx.tools.template'
+ ),
+ ) + $resourcePaths;
};
--
To view, visit https://gerrit.wikimedia.org/r/158380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia43038ad17ac3f8bc3ddafb71e7e3bd9698c343b
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] Move AbstractSwiftBlobContainer to SwiftBlobContainer - change (search/repository-swift)
Chad has submitted this change and it was merged.
Change subject: Move AbstractSwiftBlobContainer to SwiftBlobContainer
..
Move AbstractSwiftBlobContainer to SwiftBlobContainer
It should have been abstract, but it wasn't. Coming rewrite changes
will land nicer if the file doesn't have to move as well.
Change-Id: Ibebd53effa3a1f1f1ff29d8516a77361e1abf7cc
---
R
src/main/java/org/wikimedia/elasticsearch/swift/repositories/blobstore/SwiftBlobContainer.java
M
src/main/java/org/wikimedia/elasticsearch/swift/repositories/blobstore/SwiftImmutableBlobContainer.java
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Chad: Verified
Manybubbles: Looks good to me, approved
diff --git
a/src/main/java/org/wikimedia/elasticsearch/swift/repositories/blobstore/AbstractSwiftBlobContainer.java
b/src/main/java/org/wikimedia/elasticsearch/swift/repositories/blobstore/SwiftBlobContainer.java
similarity index 96%
rename from
src/main/java/org/wikimedia/elasticsearch/swift/repositories/blobstore/AbstractSwiftBlobContainer.java
rename to
src/main/java/org/wikimedia/elasticsearch/swift/repositories/blobstore/SwiftBlobContainer.java
index 5db6376..b20e8c0 100644
---
a/src/main/java/org/wikimedia/elasticsearch/swift/repositories/blobstore/AbstractSwiftBlobContainer.java
+++
b/src/main/java/org/wikimedia/elasticsearch/swift/repositories/blobstore/SwiftBlobContainer.java
@@ -17,7 +17,7 @@
/**
* Swift's implementation of the AbstractBlobContainer
*/
-public class AbstractSwiftBlobContainer extends AbstractBlobContainer {
+public class SwiftBlobContainer extends AbstractBlobContainer {
// Our local swift blob store instance
protected final SwiftBlobStore blobStore;
@@ -29,7 +29,7 @@
* @param path The BlobPath to find blobs in
* @param blobStore The blob store to use for operations
*/
-protected AbstractSwiftBlobContainer(BlobPath path, SwiftBlobStore
blobStore) {
+protected SwiftBlobContainer(BlobPath path, SwiftBlobStore blobStore) {
super(path);
this.blobStore = blobStore;
String keyPath = path.buildAsString(/);
diff --git
a/src/main/java/org/wikimedia/elasticsearch/swift/repositories/blobstore/SwiftImmutableBlobContainer.java
b/src/main/java/org/wikimedia/elasticsearch/swift/repositories/blobstore/SwiftImmutableBlobContainer.java
index 6f69f6b..8ea65a4 100644
---
a/src/main/java/org/wikimedia/elasticsearch/swift/repositories/blobstore/SwiftImmutableBlobContainer.java
+++
b/src/main/java/org/wikimedia/elasticsearch/swift/repositories/blobstore/SwiftImmutableBlobContainer.java
@@ -11,7 +11,7 @@
/**
* The final implementation of Swift blob storage. Implements the write
functionality
*/
-public class SwiftImmutableBlobContainer extends AbstractSwiftBlobContainer
implements ImmutableBlobContainer {
+public class SwiftImmutableBlobContainer extends SwiftBlobContainer implements
ImmutableBlobContainer {
/**
* Constructor. Just call the parent.
* @param path The BlobPath to find blobs in
--
To view, visit https://gerrit.wikimedia.org/r/158282
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibebd53effa3a1f1f1ff29d8516a77361e1abf7cc
Gerrit-PatchSet: 1
Gerrit-Project: search/repository-swift
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Apply mw-ui-anchor where necessary - change (mediawiki...Flow)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158383
Change subject: Apply mw-ui-anchor where necessary
..
Apply mw-ui-anchor where necessary
Soon this will be mandatory
Change-Id: Ia6607c74530665ba8a1dd1e32943273125aaabe4
---
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_board.handlebars.php
M handlebars/compiled/flow_board_watch_link.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_board_watch_link.handlebars
M handlebars/flow_post_meta_actions.handlebars
7 files changed, 31 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/83/158383/1
diff --git a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
index 581ffaf..86bbdec 100644
--- a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
@@ -199,7 +199,7 @@
'.((LCRun3::ifvar($cx, ((is_array($in['actions'])
isset($in['actions']['reply'])) ? $in['actions']['reply'] : null))) ? '
a
href='.htmlentities(((is_array($in['actions']['reply'])
isset($in['actions']['reply']['url'])) ? $in['actions']['reply']['url'] :
null), ENT_QUOTES, 'UTF-8').'
title='.htmlentities(((is_array($in['actions']['reply'])
isset($in['actions']['reply']['title'])) ? $in['actions']['reply']['title'] :
null), ENT_QUOTES, 'UTF-8').'
- class=mw-ui-progressive mw-ui-quiet
+ class=mw-ui-anchor mw-ui-progressive mw-ui-quiet
data-flow-interactive-handler=activateReplyPost'.htmlentities(((is_array($in['actions']['reply'])
isset($in['actions']['reply']['title'])) ? $in['actions']['reply']['title']
: null), ENT_QUOTES, 'UTF-8').'/a
' : '').'
'.((LCRun3::ifvar($cx, ((is_array($in['actions'])
isset($in['actions']['edit'])) ? $in['actions']['edit'] : null))) ? '
@@ -209,14 +209,14 @@
data-flow-api-handler=activateEditPost
data-flow-api-target= .flow-post-main
data-flow-interactive-handler=apiRequest
- class=mw-ui-progressive mw-ui-quiet
+ class=mw-ui-anchor mw-ui-progressive mw-ui-quiet
'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-post-action-edit-post'),Array()), 'encq').'
/a
' : '').'
'.((LCRun3::ifvar($cx, ((is_array($in['actions'])
isset($in['actions']['thank'])) ? $in['actions']['thank'] : null))) ? '
#8226;
'.'
- a class=mw-ui-constructive mw-ui-quiet
mw-thanks-flow-thank-link
+ a class=mw-ui-anchor mw-ui-constructive mw-ui-quiet
mw-thanks-flow-thank-link
href='.htmlentities(((is_array($in['actions']['thank'])
isset($in['actions']['thank']['url'])) ? $in['actions']['thank']['url'] :
null), ENT_QUOTES, 'UTF-8').'
title='.htmlentities(((is_array($in['actions']['thank'])
isset($in['actions']['thank']['title'])) ? $in['actions']['thank']['title'] :
null), ENT_QUOTES,
'UTF-8').''.htmlentities(((is_array($in['actions']['thank'])
isset($in['actions']['thank']['title'])) ? $in['actions']['thank']['title'] :
null), ENT_QUOTES, 'UTF-8').'/a
' : '').'
@@ -224,7 +224,7 @@
'.((LCRun3::ifvar($cx, ((is_array($in)
isset($in['previousRevisionId'])) ? $in['previousRevisionId'] : null))) ? '
'.((LCRun3::ifvar($cx, ((is_array($in['links'])
isset($in['links']['diff-prev'])) ? $in['links']['diff-prev'] : null))) ? '
a
href='.htmlentities(((is_array($in['links']['diff-prev'])
isset($in['links']['diff-prev']['url'])) ? $in['links']['diff-prev']['url'] :
null), ENT_QUOTES, 'UTF-8').'
- class=mw-ui-progressive mw-ui-quiet
+ class=mw-ui-anchor mw-ui-progressive mw-ui-quiet
title='.htmlentities(((is_array($in['links']['diff-prev'])
isset($in['links']['diff-prev']['title'])) ? $in['links']['diff-prev']['title']
: null), ENT_QUOTES, 'UTF-8').'
' : '').'
'.LCRun3::ch($cx, 'uuidTimestamp',
Array(Array(((is_array($in) isset($in['revisionId'])) ? $in['revisionId'] :
null),'flow-edited-ago'),Array()), 'encq').'
@@ -410,7 +410,7 @@
'.((LCRun3::ifvar($cx, ((is_array($in['actions'])
isset($in['actions']['reply'])) ? $in['actions']['reply'] : null))) ? '
[MediaWiki-commits] [Gerrit] Move all geoip-based resolution to DYNA - change (operations/dns)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158382
Change subject: Move all geoip-based resolution to DYNA
..
Move all geoip-based resolution to DYNA
This eliminates (cross-zone) CNAME chains from our
most common public names. This should significantly
reduce our servers' DNS request rate, reduce the
size of DNS response packets, and reduce client/cache
DNS lookup latency.
The simplification of the lookup structure also
makes future changes safer as there aren't
CNAME-based races between the update times of
the individual authservers.
It also removes the redundant copies of various
addresses from the zonefiles, which is DRY-er
and thus avoids faulty partial updates when
addresses change.
Also, root-level lookups (e.g. queries for just
wikipedia.org) are now geo-distributed, whereas
before they were specified as the direct address
for eqiad (due to lack of CNAME capability at
the zone root).
The net publicly-visible change for all geoip-resolved
hostnames should look like this example:
OLD behavior (2x CNAMEs - 2x queries, cross-zone):
-
$ dig +short @ns0.wikimedia.org en.wikipedia.org
text-lb.wikimedia.org.
$ dig +short @ns0.wikimedia.org text-lb.wikimedia.org
text-lb.eqiad.wikimedia.org.
208.80.154.224
NEW behavior (direct address result):
-
$ dig +short @ns0.wikimedia.org en.wikipedia.org
208.80.154.224
Change-Id: Iefae74d8d268b72cc24377877b26016bcf995512
---
M templates/helpers/langlist.tmpl
M templates/mediawiki.org
M templates/wikibooks.org
M templates/wikidata.org
M templates/wikimedia.com
M templates/wikimedia.community
M templates/wikimedia.ee
M templates/wikimedia.org
M templates/wikimediafoundation.org
M templates/wikinews.org
M templates/wikipedia.org
M templates/wikiquote.org
M templates/wikisource.org
M templates/wikiversity.org
M templates/wikivoyage.org
M templates/wiktionary.org
M templates/wmftest.org
17 files changed, 305 insertions(+), 362 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/82/158382/1
diff --git a/templates/helpers/langlist.tmpl b/templates/helpers/langlist.tmpl
index 494f613..065302d 100644
--- a/templates/helpers/langlist.tmpl
+++ b/templates/helpers/langlist.tmpl
@@ -1,18 +1,5 @@
{% from helpers/langs.tmpl import langs %}
-{% macro langcname(lang, domain) -%}
-{{ lang }} 1H IN CNAME{{ domain }}
-www.{{ lang }} 1H IN CNAME{{ domain }}
-{{ lang }}.m1H IN CNAMEm.wikimedia.org.
-{{ lang }}.zero 1H IN CNAMEm.wikimedia.org.
-{%- endmacro %}
-
-{% macro langlist(domain) -%}
-{% for lang in langs -%}
-{{ langcname(lang, domain) }}
-{% endfor %}
-{%- endmacro %}
-
{% macro geolang(lang, dyna) -%}
{{ lang }} 1H IN DYNAgeoip!{{ dyna }}
www.{{ lang }} 1H IN DYNAgeoip!{{ dyna }}
@@ -22,6 +9,6 @@
{% macro geolanglist(dyna) -%}
{% for lang in langs -%}
-{{ langdyna(lang, dyna) }}
+{{ geolang(lang, dyna) }}
{% endfor %}
{%- endmacro %}
diff --git a/templates/mediawiki.org b/templates/mediawiki.org
index 12fc67b..882c1f9 100644
--- a/templates/mediawiki.org
+++ b/templates/mediawiki.org
@@ -21,8 +21,7 @@
; Canonical names
-1H IN A208.80.154.224
-1H IN 2620:0:861:ed1a::1
+1H IN DYNA geoip!text-addrs
; Google Webmaster Tools verification record for search management
600 IN TXT
google-site-verification=SB70h2VwbTUOmrd3YTPxnT4gjjX5u_g8MAxkIaCW03c
@@ -33,20 +32,20 @@
; Wikis (alphabetic order)
-www 1H IN CNAMEtext-lb.wikimedia.org.
-wiki1H IN CNAMEtext-lb.wikimedia.org.
-bugzilla1H IN CNAMEtext-lb.wikimedia.org.
-bugs1H IN CNAMEtext-lb.wikimedia.org.
+www 1H IN DYNA geoip!text-addrs
+wiki1H IN DYNA geoip!text-addrs
+bugzilla1H IN DYNA geoip!text-addrs
+bugs1H IN DYNA geoip!text-addrs
; Other websites
-doc 1H IN CNAMEtext-lb.wikimedia.org.
-donate 1H IN CNAMEtext-lb.wikimedia.org.
-download1H IN CNAMEtext-lb.wikimedia.org.
-integration 1H IN CNAMEtext-lb.wikimedia.org.
-www.donate 1H IN CNAMEtext-lb.wikimedia.org.
+doc 1H IN DYNA geoip!text-addrs
+donate 1H IN DYNA geoip!text-addrs
+download1H IN DYNA geoip!text-addrs
+integration 1H IN DYNA geoip!text-addrs
+www.donate 1H IN DYNA geoip!text-addrs
svn 1H IN CNAMEsvn.wikimedia.org.
-shop1H IN CNAMEtext-lb.wikimedia.org.
-store 1H IN CNAMEtext-lb.wikimedia.org.
+shop1H IN DYNA geoip!text-addrs
+store 1H IN DYNA geoip!text-addrs
; Mobile
-m 1H IN
[MediaWiki-commits] [Gerrit] Put other project links in parser cache - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158381
Change subject: Put other project links in parser cache
..
Put other project links in parser cache
Bug: 70393
Change-Id: I25cc3ea4af94c77eb67ddc02a84df0d95e1348cc
---
M client/WikibaseClient.hooks.php
D client/includes/EntityIdPropertyUpdater.php
M client/includes/LangLinkHandler.php
M client/includes/WikibaseClient.php
M client/tests/phpunit/includes/LangLinkHandlerTest.php
5 files changed, 154 insertions(+), 95 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/81/158381/3
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index 83ae926..61aa95a 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -346,7 +346,9 @@
return true;
}
- if ( !self::isWikibaseEnabled(
$parser-getTitle()-getNamespace() ) ) {
+ $title = $parser-getTitle();
+
+ if ( !self::isWikibaseEnabled( $title-getNamespace() ) ) {
// shorten out
return true;
}
@@ -355,8 +357,6 @@
// @todo split up the multiple responsibilities here and in
lang link handler
- $parserOutput = $parser-getOutput();
-
// only run this once, for the article content and not
interface stuff
//FIXME: this also runs for messages in
EditPage::showEditTools! Ugh!
if ( $parser-getOptions()-getInterfaceMessage() ) {
@@ -364,32 +364,26 @@
return true;
}
- $wikibaseClient = WikibaseClient::getDefaultInstance();
- $settings = $wikibaseClient-getSettings();
+ $langLinkHandler =
WikibaseClient::getDefaultInstance()-getLangLinkHandler();
- $langLinkHandler = new LangLinkHandler(
- $settings-getSetting( 'siteGlobalID' ),
- $wikibaseClient-getNamespaceChecker(),
- $wikibaseClient-getStore()-getSiteLinkTable(),
- $wikibaseClient-getSiteStore(),
- $wikibaseClient-getLangLinkSiteGroup()
- );
-
- $useRepoLinks = $langLinkHandler-useRepoLinks(
$parser-getTitle(), $parser-getOutput() );
+ $parserOutput = $parser-getOutput();
+ $useRepoLinks = $langLinkHandler-useRepoLinks( $title,
$parserOutput );
try {
if ( $useRepoLinks ) {
// add links
- $langLinkHandler-addLinksFromRepository(
$parser-getTitle(), $parser-getOutput() );
+ $langLinkHandler-addLinksFromRepository(
$title, $parserOutput );
}
- $langLinkHandler-updateItemIdProperty(
$parser-getTitle(), $parser-getOutput() );
+ $langLinkHandler-updateItemIdProperty( $title,
$parserOutput );
+ $langLinkHandler-updateOtherProjectsLinksData( $title,
$parserOutput );
} catch ( \Exception $e ) {
wfWarn( 'Failed to add repo links: ' . $e-getMessage()
);
}
if ( $useRepoLinks || $settings-getSetting( 'alwaysSort' ) ) {
- // sort links
+ $settings =
WikibaseClient::getDefaultInstance()-getSettings();
+
$interwikiSorter = new InterwikiSorter(
$settings-getSetting( 'sort' ),
$settings-getSetting( 'interwikiSortOrders' ),
@@ -551,6 +545,12 @@
$out-setProperty( 'wikibase_item', $itemId );
}
+ $otherProjects = $pout-getExtensionData(
'wikibase-otherprojects-sidebar' );
+
+ if ( $otherProjects !== null ) {
+ $out-setProperty( 'wikibase-otherprojects-sidebar',
$otherProjects );
+ }
+
return true;
}
@@ -630,9 +630,20 @@
BetaFeatures::isFeatureEnabled(
$skin-getUser(), 'wikibase-otherprojects' );
if ( $settings-getSetting( 'otherProjectsLinksByDefault' ) ||
$betaFeatureEnabled ) {
- $otherProjectsSidebarGenerator =
$wikibaseClient-getOtherProjectsSidebarGenerator();
- $title = $skin-getContext()-getTitle();
- $otherProjectsSidebar =
$otherProjectsSidebarGenerator-buildProjectLinkSidebar( $title );
+ $outputPage = $skin-getContext()-getOutput();
+ $otherProjectsSidebar = $outputPage-getProperty(
'wikibase-otherprojects-sidebar' );
+
+
+ // backwards
[MediaWiki-commits] [Gerrit] Fixed some facet issues - change (mediawiki...BlueSpiceExtensions)
Smuggli has submitted this change and it was merged.
Change subject: Fixed some facet issues
..
Fixed some facet issues
- In some rare cases facetting could faild because of an defective check
- Removed onchange attr because it is not needed
- Code improvements
- Added documentation
- Fixed typo
Change-Id: Ib71b3650aed8ed5d76fd01ecf49ca4a63315f230
---
M ExtendedSearch/ExtendedSearch.class.php
M ExtendedSearch/includes/ExtendedSearchBase.class.php
M ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
M ExtendedSearch/includes/SearchIndex/SearchRequest.class.php
M ExtendedSearch/includes/SearchIndex/SearchResult.class.php
M ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
M ExtendedSearch/views/view.ExtendedSearchFacetBox.php
7 files changed, 78 insertions(+), 67 deletions(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
diff --git a/ExtendedSearch/ExtendedSearch.class.php
b/ExtendedSearch/ExtendedSearch.class.php
index 182bbbc..887fe9e 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -52,16 +52,6 @@
class ExtendedSearch extends BsExtensionMW {
/**
-* Instance of BsExtendedSearchBase
-* @var Object
-*/
- protected $oExtendedSearchBase = null;
- /**
-* Instance of BuildIndexMainControl
-* @var Object
-*/
- protected $oBuildIndexMainControl = null;
- /**
* Unique wiki id
*/
private $sWikiID = '';
@@ -148,9 +138,6 @@
$this-setHook( 'BSDashboardsAdminDashboardPortalPortlets' );
$this-setHook( 'SkinTemplateOutputPageBeforeExec' );
- $this-oExtendedSearchBase = ExtendedSearchBase::getInstance(
$this );
- $this-oBuildIndexMainControl =
BuildIndexMainControl::getInstance();
-
$this-mCore-registerPermission( 'searchfiles', array( 'user'
) );
wfProfileOut( 'BS::'.__METHOD__ );
@@ -205,7 +192,7 @@
$oWidgetView
-setId( 'bs-extendedsearch-mlt' )
-setTitle( wfMessage( 'bs-extendedsearch-morelikethis'
)-plain() )
- -setBody(
$this-oExtendedSearchBase-getViewMoreLikeThis( $oTitle )-execute() )
+ -setBody( ExtendedSearchBase::getInstance( $this
)-getViewMoreLikeThis( $oTitle )-execute() )
-setTooltip( wfMessage(
'bs-extendedsearch-morelikethis' )-plain() )
-setAdditionalBodyClasses( array( 'bs-nav-links',
'bs-extendedsearch-portlet' ) ); //For correct margin and fontsize
@@ -235,7 +222,7 @@
$oMltListView = new ViewStateBarBodyElement();
$oMltListView-setKey( 'MoreLikeThis' );
$oMltListView-setHeading( wfMessage(
'bs-extendedsearch-morelikethis' )-plain() );
- $oMltListView-setBodyText(
$this-oExtendedSearchBase-getViewMoreLikeThis( $oTitle )-execute() );
+ $oMltListView-setBodyText( ExtendedSearchBase::getInstance(
$this )-getViewMoreLikeThis( $oTitle )-execute() );
$aBodyViews['statebarbodymorelikethis'] = $oMltListView;
return true;
@@ -366,7 +353,7 @@
*/
public function onArticleDeleteComplete( $oArticle, $oUser, $sReason,
$iID ) {
try {
- $this-oBuildIndexMainControl-deleteFromIndexWiki(
$iID );
+
BuildIndexMainControl::getInstance()-deleteFromIndexWiki( $iID );
} catch ( BsException $e ) {
wfDebugLog( 'ExtendedSearch', 'onArticleDeleteComplete:
'.$e-getMessage() );
}
@@ -382,7 +369,7 @@
*/
public function onArticleSaveComplete( $oArticle, $oUser ) {
try {
- $this-oBuildIndexMainControl-updateIndexWiki(
$oArticle );
+ BuildIndexMainControl::getInstance()-updateIndexWiki(
$oArticle );
} catch ( BsException $e ) {
wfDebugLog( 'ExtendedSearch', 'onArticleSaveComplete:
'.$e-getMessage() );
}
@@ -397,7 +384,7 @@
*/
public function onArticleUndelete( $oTitle, $bCreate ) {
try {
-
$this-oBuildIndexMainControl-updateIndexWikiByTitleObject( $oTitle );
+
BuildIndexMainControl::getInstance()-updateIndexWikiByTitleObject( $oTitle );
} catch ( BsException $e ) {
wfDebugLog( 'ExtendedSearch', 'onArticleUndelete:
'.$e-getMessage() );
}
@@ -416,18 +403,18 @@
public function onTitleMoveComplete( $oTitle, $oNewtitle, $oUser,
$iOldID, $iNewID ) {
try {
// Moving article
-
[MediaWiki-commits] [Gerrit] (bug 61691) Delay loading editor javascript until after init... - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158384
Change subject: (bug 61691) Delay loading editor javascript until after initial
page load
..
(bug 61691) Delay loading editor javascript until after initial page load
This delays the loading of ext.flow.editor dependency, which is not immediately
needed, this speeding up pageload.
The editor module will be loaded after 20 seconds (so that when we need it, we
don't have to wait for it to be loaded), or immediately (should it be needed
earlier anyway)
Bug: 61691
Change-Id: I9ae88921b678419a1e18fe5e421638e823151fb7
---
M Resources.php
M modules/new/components/flow-board.js
2 files changed, 33 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/84/158384/1
diff --git a/Resources.php b/Resources.php
index faec23d..4ef124f 100644
--- a/Resources.php
+++ b/Resources.php
@@ -306,7 +306,6 @@
'ext.flow.templating', // ResourceLoader templating
'ext.flow.new.handlebars', // prototype-based for
progressiveEnhancement
'ext.flow.new.history',
- 'ext.flow.editor',
'ext.flow.vendor.storer',
'ext.flow.vendor.jquery.ba-throttle-debounce',
'mediawiki.jqueryMsg',
diff --git a/modules/new/components/flow-board.js
b/modules/new/components/flow-board.js
index 6aef252..af9b00f 100644
--- a/modules/new/components/flow-board.js
+++ b/modules/new/components/flow-board.js
@@ -89,7 +89,8 @@
$boardNavigation = $container.filter(
'.flow-board-navigation' ),
$topicNavigation = $container.filter(
'.flow-topic-navigation' ),
$board = $container.filter( '.flow-board' ),
- $retObj = $();
+ $retObj = $(),
+ editorTimer;
// ...then check at the second level...
$header = $header.length ? $header : $container.find(
'.flow-board-header' );
$boardNavigation = $boardNavigation.length ? $boardNavigation :
$container.find( '.flow-board-navigation' );
@@ -149,7 +150,21 @@
FlowBoardComponent.UI.bindGlobalHandlers();
// Initialize editors, turning them from textareas into editor
objects
- FlowBoardComponent.UI.initializeEditors( $container );
+ if ( typeof this.editorTimer === 'undefined' ) {
+ /*
+* When this method is first run, all page elements are
initialized.
+* We probably don't need editor immediately, so defer
loading it
+* to speed up the rest of the work that needs to be
done.
+*/
+ this.editorTimer = setTimeout(
FlowBoardComponent.UI.initializeEditors.bind( this, $container ), 2 );
+ } else {
+ /*
+* Subsequent calls here (e.g. when rendering the edit
header form)
+* should immediately initialize the editors!
+*/
+ clearTimeout( this.editorTimer );
+ FlowBoardComponent.UI.initializeEditors( $container );
+ }
// Restore the last state
this.HistoryEngine.restoreLastState();
@@ -227,7 +242,7 @@
// Doublecheck that this textarea is actually
an editor instance
// (the editor may have added a textarea
itself...)
- if ( mw.flow.editor.exists( $editor ) ) {
+ if ( mw.flow.editor mw.flow.editor.exists(
$editor ) ) {
override[$editor.attr( 'name' )] =
mw.flow.editor.getContent( $editor );
}
@@ -1834,7 +1849,7 @@
var $editor = $( this );
// Kill editor instances
- if ( mw.flow.editor.exists( $editor ) ) {
+ if ( mw.flow.editor mw.flow.editor.exists(
$editor ) ) {
mw.flow.editor.destroy( $editor );
}
@@ -2055,21 +2070,23 @@
* @param jQuery $container
*/
FlowBoardComponent.UI.initializeEditors = function ( $container
) {
- var $editors = $container.find( 'textarea' );
+ mw.loader.using( 'ext.flow.editor', function() {
+ var $editors = $container.find( 'textarea' );
- $editors.each( function() {
-
[MediaWiki-commits] [Gerrit] Set wgUploadPath for labswiki - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/158385 Change subject: Set wgUploadPath for labswiki .. Set wgUploadPath for labswiki Change-Id: I61e649e371f49a2b1584b5e2ef7e00532fdadcf2 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/85/158385/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 0bba76a..8dd3e6a 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -1826,6 +1826,7 @@ 'default' = '//upload.wikimedia.org/$site/$lang', 'private' = '/w/img_auth.php', 'commonswiki' = '//upload.wikimedia.org/wikipedia/commons', + 'labswiki' = '//wikitech.wikimedia.org/w/images', 'metawiki' = '//upload.wikimedia.org/wikipedia/meta', 'testwiki' = '//upload.wikimedia.org/wikipedia/test', ), -- To view, visit https://gerrit.wikimedia.org/r/158385 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I61e649e371f49a2b1584b5e2ef7e00532fdadcf2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use scores from ElasticSearch using function scoring - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Use scores from ElasticSearch using function scoring
..
Use scores from ElasticSearch using function scoring
Change-Id: If59c33edf668436ef4eb7aea6193082cb7565b57
---
M ttmserver/ElasticSearchTTMServer.php
1 file changed, 25 insertions(+), 10 deletions(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ttmserver/ElasticSearchTTMServer.php
b/ttmserver/ElasticSearchTTMServer.php
index 3e0852d..aa546d8 100644
--- a/ttmserver/ElasticSearchTTMServer.php
+++ b/ttmserver/ElasticSearchTTMServer.php
@@ -53,12 +53,33 @@
$oldTimeout = $connection-getTimeout();
$connection-setTimeout( 10 );
- $query = new \Elastica\Query();
-
$fuzzyQuery = new \Elastica\Query\FuzzyLikeThis();
$fuzzyQuery-setLikeText( $text );
$fuzzyQuery-addFields( array( 'content' ) );
- $query-setQuery( $fuzzyQuery );
+
+ $groovyScript =
+GROOVY
+import org.apache.lucene.search.spell.*
+new LevensteinDistance().getDistance(srctxt, _source['content'])
+GROOVY;
+ $script = new \Elastica\Script(
+ $groovyScript,
+ array( 'srctxt' = $text ),
+ \Elastica\Script::LANG_GROOVY
+ );
+ $boostQuery = new \Elastica\Query\FunctionScore();
+ $boostQuery-addScriptScoreFunction( $script );
+ $boostQuery-setBoostMode(
\Elastica\Query\FunctionScore::BOOST_MODE_REPLACE );
+
+ // Wrap the fuzzy query so it can be used as a filter.
+ // This is slightly faster, as ES can throw away the scores by
this query.
+ $fuzzyFilter = new \Elastica\Filter\Query();
+ $fuzzyFilter-setQuery( $fuzzyQuery );
+ $boostQuery-setFilter( $fuzzyFilter );
+
+ // The whole query
+ $query = new \Elastica\Query();
+ $query-setQuery( $boostQuery );
$languageFilter = new \Elastica\Filter\Term();
$languageFilter-setTerm( 'language', $sourceLanguage );
@@ -85,13 +106,7 @@
$contents = $scores = $terms = array();
foreach ( $resultset-getResults() as $result ) {
$data = $result-getData();
-
- // FIXME: hacked in client side scoring as the search
query
- // returns wildly irrelevant results. This is slow.
- $len1 = mb_strlen( $text );
- $len2 = mb_strlen( $data['content'] );
- $dist = self::levenshtein( $text, $data['content'],
$len1, $len2 );
- $score = 1 - ( $dist * 0.9 / min( $len1, $len2 ) );
+ $score = $result-getScore();
if ( $score $this-config['cutoff'] ) {
continue;
}
--
To view, visit https://gerrit.wikimedia.org/r/158361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If59c33edf668436ef4eb7aea6193082cb7565b57
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bug: 70370 Explicitly specify content model in PHPParseRequest - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged. Change subject: Bug: 70370 Explicitly specify content model in PHPParseRequest .. Bug: 70370 Explicitly specify content model in PHPParseRequest This prevents mediawiki from choosing an alternate content model when we know we are passing wikitext. This is causing math rendering to fail in Flow due to the content model being detect as 'flow-board' but the content sent is wikitext. Change-Id: I703737a652284e751e5328f0aa2955fe51ae953a --- M lib/mediawiki.ApiRequest.js 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js index d55c513..9ccd964 100644 --- a/lib/mediawiki.ApiRequest.js +++ b/lib/mediawiki.ApiRequest.js @@ -456,7 +456,8 @@ format: 'json', action: 'parse', text: text, - disablepp: 'true' + disablepp: 'true', + contentmodel: 'wikitext' }; var uri = env.conf.wiki.apiURI; -- To view, visit https://gerrit.wikimedia.org/r/158294 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I703737a652284e751e5328f0aa2955fe51ae953a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org Gerrit-Reviewer: Arlolra abrea...@wikimedia.org Gerrit-Reviewer: GWicke gwi...@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] Use new LocalisationCacheRecacheFallback hook - change (mediawiki...LocalisationUpdate)
jenkins-bot has submitted this change and it was merged.
Change subject: Use new LocalisationCacheRecacheFallback hook
..
Use new LocalisationCacheRecacheFallback hook
This allows us to not use the wrong message when a language itself
doesn't have a change but one of its fallbacks does.
Bug: 68781
Change-Id: I5433aeba95823c5e939efc5e304d955faf1e9551
---
M LocalisationUpdate.class.php
M LocalisationUpdate.php
2 files changed, 30 insertions(+), 3 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/LocalisationUpdate.class.php b/LocalisationUpdate.class.php
index 79253c9..349c35f 100644
--- a/LocalisationUpdate.class.php
+++ b/LocalisationUpdate.class.php
@@ -4,6 +4,29 @@
* Class for localization update hooks and static methods.
*/
class LocalisationUpdate {
+ /** @todo Remove this once pre-1.24 versions of MW are no longer
supported. */
+ private static $onRecacheFallbackCalled = false;
+
+ /**
+* Hook: LocalisationCacheRecacheFallback
+*/
+ public static function onRecacheFallback( LocalisationCache $lc, $code,
array $cache ) {
+ self::$onRecacheFallbackCalled = true;
+
+ $dir = LocalisationUpdate::getDirectory();
+ if ( !$dir ) {
+ return true;
+ }
+
+ $fileName = $dir/ . self::getFilename( $code );
+ if ( is_readable( $fileName ) ) {
+ $data = FormatJson::decode( file_get_contents(
$fileName ), true );
+ $cache['messages'] = array_merge( $cache['messages'],
$data );
+ }
+
+ return true;
+ }
+
/**
* Hook: LocalisationCacheRecache
*/
@@ -16,11 +39,14 @@
$codeSequence = array_merge( array( $code ),
$cache['fallbackSequence'] );
foreach ( $codeSequence as $csCode ) {
$fileName = $dir/ . self::getFilename( $csCode );
- if ( is_readable( $fileName ) ) {
+ if ( !self::$onRecacheFallbackCalled is_readable(
$fileName ) ) {
+ // We're on an old version of MW that doesn't
have the hook
+ // needed to do things correctly. L10n will be
broken here in
+ // certain reasonably-common situations (see
bug 68781), but
+ // there's nothing we can do about it.
$data = FormatJson::decode( file_get_contents(
$fileName ), true );
$cache['messages'] = array_merge(
$cache['messages'], $data );
}
-
$cache['deps'][] = new FileDependency( $fileName );
}
diff --git a/LocalisationUpdate.php b/LocalisationUpdate.php
index 25b6e86..c90bf1b 100644
--- a/LocalisationUpdate.php
+++ b/LocalisationUpdate.php
@@ -40,12 +40,13 @@
'path' = __FILE__,
'name' = 'LocalisationUpdate',
'author' = array( 'Tom Maaswinkel', 'Niklas Laxström', 'Roan Kattouw'
),
- 'version' = '1.2.0',
+ 'version' = '1.3.0',
'url' = 'https://www.mediawiki.org/wiki/Extension:LocalisationUpdate',
'descriptionmsg' = 'localisationupdate-desc',
);
$wgHooks['LocalisationCacheRecache'][] = 'LocalisationUpdate::onRecache';
+$wgHooks['LocalisationCacheRecacheFallback'][] =
'LocalisationUpdate::onRecacheFallback';
$dir = __DIR__;
$wgMessagesDirs['LocalisationUpdate'] = __DIR__ . '/i18n';
--
To view, visit https://gerrit.wikimedia.org/r/158147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5433aeba95823c5e939efc5e304d955faf1e9551
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/LocalisationUpdate
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set wgUploadPath for labswiki. Update wgUploadDirectory - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Set wgUploadPath for labswiki. Update wgUploadDirectory .. Set wgUploadPath for labswiki. Update wgUploadDirectory Change-Id: I61e649e371f49a2b1584b5e2ef7e00532fdadcf2 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Andrew Bogott: Looks good to me, but someone else must approve Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 0bba76a..48b57f6 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -1826,6 +1826,7 @@ 'default' = '//upload.wikimedia.org/$site/$lang', 'private' = '/w/img_auth.php', 'commonswiki' = '//upload.wikimedia.org/wikipedia/commons', + 'labswiki' = '//wikitech.wikimedia.org/w/images', 'metawiki' = '//upload.wikimedia.org/wikipedia/meta', 'testwiki' = '//upload.wikimedia.org/wikipedia/test', ), @@ -1840,7 +1841,7 @@ 'execwiki' = '/mnt/upload7/private/execwiki', 'transitionteamwiki' = '/mnt/upload7/private/transitionteamwiki', 'iegcomwiki' = '/mnt/upload7/private/iegcomwiki', -'labswiki' = '/srv/org/wikimedia/controller/wikis/images', +'labswiki' = '/usr/local/apache/images', ), 'wgImgAuthUrlPathMap' = array( -- To view, visit https://gerrit.wikimedia.org/r/158385 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I61e649e371f49a2b1584b5e2ef7e00532fdadcf2 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org Gerrit-Reviewer: Reedy re...@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 all test modules to Resources.php - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Move all test modules to Resources.php
..
Move all test modules to Resources.php
Change-Id: Ia43038ad17ac3f8bc3ddafb71e7e3bd9698c343b
---
M ContentTranslation.hooks.php
M ContentTranslation.php
M Resources.php
3 files changed, 10 insertions(+), 20 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index ea21786..953ed97 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -90,22 +90,4 @@
$vars['wgContentTranslationExperimentalFeatures'] =
$wgContentTranslationExperimentalFeatures;
return true;
}
-
- /**
-* @param $testModules array of javascript testing modules. 'qunit' is
fed
-* using tests/qunit/QUnitTestResources.php.
-* @param ResourceLoader $resourceLoader
-* @return bool
-* Hook: ResourceLoaderTestModules
-*/
- public static function addTestModules( array $testModules,
ResourceLoader $resourceLoader ) {
- $testModules['qunit']['ext.cx.tools.tests'] = array(
- 'scripts' = array(
'tests/qunit/ext.cx.tools.template.test.js' ),
- 'dependencies' = array( 'ext.cx.model',
'ext.cx.tools.template' ),
- 'localBasePath' = __DIR__,
- 'remoteExtPath' = 'ContentTranslation',
- );
-
- return true;
- }
}
diff --git a/ContentTranslation.php b/ContentTranslation.php
index 98dcdf9..007067c 100644
--- a/ContentTranslation.php
+++ b/ContentTranslation.php
@@ -67,8 +67,6 @@
$GLOBALS['wgHooks']['BeforePageDisplay'][] =
'ContentTranslationHooks::addModules';
$GLOBALS['wgHooks']['GetBetaFeaturePreferences'][] =
'ContentTranslationHooks::getPreferences';
$GLOBALS['wgHooks']['ResourceLoaderGetConfigVars'][] =
'ContentTranslationHooks::addConfig';
-$GLOBALS['wgHooks']['ResourceLoaderTestModules'][] =
- 'ContentTranslationHooks::addTestModules';
$GLOBALS['wgExtensionFunctions'][] = function () {
global $wgResourceModules, $wgContentTranslationEventLogging;
diff --git a/Resources.php b/Resources.php
index 87b4189..bbc1902 100644
--- a/Resources.php
+++ b/Resources.php
@@ -448,4 +448,14 @@
'mediawiki.Uri',
),
) + $resourcePaths;
+
+ $modules['qunit']['ext.cx.tools.tests'] = array(
+ 'scripts' = array(
+ 'tests/qunit/ext.cx.tools.template.test.js'
+ ),
+ 'dependencies' = array(
+ 'ext.cx.model',
+ 'ext.cx.tools.template',
+ ),
+ ) + $resourcePaths;
};
--
To view, visit https://gerrit.wikimedia.org/r/158380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia43038ad17ac3f8bc3ddafb71e7e3bd9698c343b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use grunt-grunticon to convert SVG icons to PNG for distribu... - change (oojs/ui)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158386
Change subject: Use grunt-grunticon to convert SVG icons to PNG for distribution
..
Use grunt-grunticon to convert SVG icons to PNG for distribution
Good things about grunticon:
* It will also let us colorize the icons (both SVG and PNG versions),
which we need for feature parity with icon fonts, and which is the
whole point of using it in the first place.
Bad things about grunticon:
* It does a bunch more things in addition to SVG to PNG conversion and
colorizing, that we don't really want and that can't be turned off.
Nothing a quick `rm -rf` can't fix.
* It has very limited globbing support, requiring a separate task
definition for each directory that needs to be processed. You might
think that this would work:
files: [ {
expand: true,
src: [ '**/*.svg' ],
cwd: 'src/styles/images',
dest: 'dist/images'
} ]
…but it results in all generated PNGs landing directly in
dist/images rather than appropriate subdirectories.
* To make the previous worse, the 'files' entry in task configuration
contains an array, but everything other than the first element of it
is ignored.
Change-Id: Ida886f1348f3e8d9537b6f1dc2f1ea14bf5c2c06
---
M Gruntfile.js
M package.json
D src/styles/images/icons/accept.png
D src/styles/images/icons/add-item.png
D src/styles/images/icons/advanced.png
D src/styles/images/icons/alert.png
D src/styles/images/icons/arched-arrow-ltr.png
D src/styles/images/icons/arched-arrow-rtl.png
D src/styles/images/icons/check.png
D src/styles/images/icons/clear.png
D src/styles/images/icons/close.png
D src/styles/images/icons/code.png
D src/styles/images/icons/collapse.png
D src/styles/images/icons/comment.png
D src/styles/images/icons/expand.png
D src/styles/images/icons/help.png
D src/styles/images/icons/history.png
D src/styles/images/icons/info.png
D src/styles/images/icons/link.png
D src/styles/images/icons/menu.png
D src/styles/images/icons/move-ltr.png
D src/styles/images/icons/move-rtl.png
D src/styles/images/icons/picture.png
D src/styles/images/icons/remove-item.png
D src/styles/images/icons/remove.png
D src/styles/images/icons/search.png
D src/styles/images/icons/settings.png
D src/styles/images/icons/tag.png
D src/styles/images/icons/window.png
D src/styles/images/indicators/alert.png
D src/styles/images/indicators/arrow-down.png
D src/styles/images/indicators/arrow-ltr.png
D src/styles/images/indicators/arrow-rtl.png
D src/styles/images/indicators/arrow-up.png
D src/styles/images/indicators/required.png
D src/styles/images/textures/transparency.png
36 files changed, 42 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/86/158386/1
diff --git a/Gruntfile.js b/Gruntfile.js
index b39fae7..2a580e5 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,6 +13,7 @@
grunt.loadNpmTasks( 'grunt-contrib-qunit' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
grunt.loadNpmTasks( 'grunt-file-exists' );
+ grunt.loadNpmTasks( 'grunt-grunticon' );
grunt.loadNpmTasks( 'grunt-cssjanus' );
grunt.loadNpmTasks( 'grunt-jscs' );
grunt.loadTasks( 'build/tasks' );
@@ -50,7 +51,8 @@
grunt.initConfig( {
pkg: grunt.file.readJSON( 'package.json' ),
clean: {
- dist: 'dist/*'
+ dist: 'dist/*',
+ 'grunticon-junk': 'dist/**/grunticon-junk'
},
fileExists: {
code: modules['oojs-ui'].scripts,
@@ -82,6 +84,40 @@
js: {
dest: 'dist/oojs-ui.js',
src: modules['oojs-ui'].scripts
+ }
+ },
+ grunticon: {
+ options: {
+ datasvgcss: 'grunticon-junk/datasvgcss.dat',
+ datapngcss: 'grunticon-junk/datapngcss.dat',
+ urlpngcss: 'grunticon-junk/urlpngcss.dat',
+ previewhtml: 'grunticon-junk/previewhtml.dat',
+ loadersnippet:
'grunticon-junk/loadersnippet.dat',
+ pngfolder: ''
+ },
+ imagesIcons: {
+ files: [ {
+ expand: true,
+ src: [ '*.svg' ],
+ cwd: 'src/styles/images/icons',
+ dest: 'dist/images/icons'
+ } ]
+ },
+ imagesIndicators: {
+ files: [ {
+ expand:
[MediaWiki-commits] [Gerrit] Fix strict issue - change (mediawiki...MWSearch)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158387
Change subject: Fix strict issue
..
Fix strict issue
Strict Standards: Declaration of LuceneResult::getTitleSnippet()
should be compatible with that of SearchResult::getTitleSnippet()
in
/usr/local/apache/common-local/php-1.24wmf15/extensions/MWSearch/MWSearch_body.php
on line 153
Change-Id: I2b724dd6abfd512b3212eb40c309ca8bd33cf11f
---
M MWSearch_body.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MWSearch
refs/changes/87/158387/1
diff --git a/MWSearch_body.php b/MWSearch_body.php
index 7be389e..542c40a 100644
--- a/MWSearch_body.php
+++ b/MWSearch_body.php
@@ -364,7 +364,7 @@
return $this-mHighlightText;
}
- function getRedirectSnippet($terms) {
+ function getRedirectSnippet() {
if( is_null($this-mHighlightRedirect) )
return '';
return $this-mHighlightRedirect;
--
To view, visit https://gerrit.wikimedia.org/r/158387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b724dd6abfd512b3212eb40c309ca8bd33cf11f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MWSearch
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix strict issue - change (mediawiki...MWSearch)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158388
Change subject: Fix strict issue
..
Fix strict issue
Strict Standards: Declaration of LuceneResult::getTitleSnippet()
should be compatible with that of SearchResult::getTitleSnippet()
in
/usr/local/apache/common-local/php-1.24wmf15/extensions/MWSearch/MWSearch_body.php
on line 153
Change-Id: I2b724dd6abfd512b3212eb40c309ca8bd33cf11f
---
M MWSearch_body.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MWSearch
refs/changes/88/158388/1
diff --git a/MWSearch_body.php b/MWSearch_body.php
index 7be389e..542c40a 100644
--- a/MWSearch_body.php
+++ b/MWSearch_body.php
@@ -364,7 +364,7 @@
return $this-mHighlightText;
}
- function getRedirectSnippet($terms) {
+ function getRedirectSnippet() {
if( is_null($this-mHighlightRedirect) )
return '';
return $this-mHighlightRedirect;
--
To view, visit https://gerrit.wikimedia.org/r/158388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b724dd6abfd512b3212eb40c309ca8bd33cf11f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MWSearch
Gerrit-Branch: wmf/1.24wmf15
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix strict issue - change (mediawiki...MWSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix strict issue
..
Fix strict issue
Strict Standards: Declaration of LuceneResult::getTitleSnippet()
should be compatible with that of SearchResult::getTitleSnippet()
in
/usr/local/apache/common-local/php-1.24wmf15/extensions/MWSearch/MWSearch_body.php
on line 153
Change-Id: I2b724dd6abfd512b3212eb40c309ca8bd33cf11f
---
M MWSearch_body.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Hoo man: Looks good to me, approved
Andrew Bogott: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/MWSearch_body.php b/MWSearch_body.php
index 7be389e..542c40a 100644
--- a/MWSearch_body.php
+++ b/MWSearch_body.php
@@ -364,7 +364,7 @@
return $this-mHighlightText;
}
- function getRedirectSnippet($terms) {
+ function getRedirectSnippet() {
if( is_null($this-mHighlightRedirect) )
return '';
return $this-mHighlightRedirect;
--
To view, visit https://gerrit.wikimedia.org/r/158387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b724dd6abfd512b3212eb40c309ca8bd33cf11f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MWSearch
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.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] Graceful handling of failures to load latest rev - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158389
Change subject: Graceful handling of failures to load latest rev
..
Graceful handling of failures to load latest rev
When trying to resolve an edit conflict, we sometimes fail to load the
latest revision (e.g. if the entity is missing from wb_entity_per_page).
This used to trigger a fatal error. This change turns that into
a logged warning, and continues without resolving the redirect.
Caveat: no unit test, since this only happens with a corrupt database.
Bug: 70347
Change-Id: Ice24df04a915a4f7d25a6f8da8fa2ce94e034401
---
M repo/includes/EditEntity.php
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/89/158389/1
diff --git a/repo/includes/EditEntity.php b/repo/includes/EditEntity.php
index e67b9cb..fcea69a 100644
--- a/repo/includes/EditEntity.php
+++ b/repo/includes/EditEntity.php
@@ -473,6 +473,12 @@
$latestRev = $this-getLatestRevision();
$newEntity = $this-getNewEntity();
+ if ( !$latestRev ) {
+ wfLogWarning( 'Failed to load latest revision of entity
' . $this-getEntityId() . '! '
+ . 'This may indicate entries missing from thw
wb_entities_per_page table.' );
+ return false;
+ }
+
// calculate patch against base revision
// NOTE: will fail if $baseRev or $base are null, which they
may be if
// this gets called at an inappropriate time. The data flow in
this class
--
To view, visit https://gerrit.wikimedia.org/r/158389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice24df04a915a4f7d25a6f8da8fa2ce94e034401
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove debugging stuff from wikitech - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/158390 Change subject: Remove debugging stuff from wikitech .. Remove debugging stuff from wikitech Change-Id: Ic1615ec077632bc7cdfaf7cc8dd35dd3824f13a2 --- M wmf-config/wikitech.php 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/90/158390/1 diff --git a/wmf-config/wikitech.php b/wmf-config/wikitech.php index 597989d..252fce7 100644 --- a/wmf-config/wikitech.php +++ b/wmf-config/wikitech.php @@ -2,11 +2,6 @@ # WARNING: This file is publically viewable on the web. # Do not put private data here. - -error_reporting( -1 ); -ini_set( 'display_errors', 1 ); -$wgShowExceptionDetails = true; - /* From Settings.php on old wikitech */ $wgEmailConfirmToEdit = true; -- To view, visit https://gerrit.wikimedia.org/r/158390 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1615ec077632bc7cdfaf7cc8dd35dd3824f13a2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix strict issue - change (mediawiki...MWSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix strict issue
..
Fix strict issue
Strict Standards: Declaration of LuceneResult::getTitleSnippet()
should be compatible with that of SearchResult::getTitleSnippet()
in
/usr/local/apache/common-local/php-1.24wmf15/extensions/MWSearch/MWSearch_body.php
on line 153
Change-Id: I2b724dd6abfd512b3212eb40c309ca8bd33cf11f
---
M MWSearch_body.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MWSearch_body.php b/MWSearch_body.php
index 7be389e..542c40a 100644
--- a/MWSearch_body.php
+++ b/MWSearch_body.php
@@ -364,7 +364,7 @@
return $this-mHighlightText;
}
- function getRedirectSnippet($terms) {
+ function getRedirectSnippet() {
if( is_null($this-mHighlightRedirect) )
return '';
return $this-mHighlightRedirect;
--
To view, visit https://gerrit.wikimedia.org/r/158388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b724dd6abfd512b3212eb40c309ca8bd33cf11f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MWSearch
Gerrit-Branch: wmf/1.24wmf15
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Reedy re...@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] Retry inserting into wb_entity_per_page table on deadlock. - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158391
Change subject: Retry inserting into wb_entity_per_page table on deadlock.
..
Retry inserting into wb_entity_per_page table on deadlock.
Inserts into the wb_entity_per_page table often fail with a deadlock error.
This change puts the insert into a retry loop to mitigate that problem.
Caveat: no unit test, since this only happens with an overloaded database.
Bug: 70400
Change-Id: If8f6a742ab8bb91825f99aff1086cc1ad440e138
---
M repo/includes/store/sql/EntityPerPageTable.php
1 file changed, 40 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/91/158391/1
diff --git a/repo/includes/store/sql/EntityPerPageTable.php
b/repo/includes/store/sql/EntityPerPageTable.php
index 7697d37..522fb2a 100644
--- a/repo/includes/store/sql/EntityPerPageTable.php
+++ b/repo/includes/store/sql/EntityPerPageTable.php
@@ -2,10 +2,13 @@
namespace Wikibase;
+use DatabaseBase;
+use DBError;
use InvalidArgumentException;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\LegacyIdInterpreter;
+use Wikibase\Lib\Store\StorageException;
/**
* Represents a lookup database table that make the link between entities and
pages.
@@ -100,26 +103,49 @@
$values['epp_redirect_target'] = $redirectTarget;
}
- $this-deleteConflictingRows( $values );
+ $conflictConds = $this-getConflictingRowConditions( $values );
+
+ // NOTE: deadlockLoop can't directly call a private function,
so wrap the call in a closure.
+ $thisTable = $this;
+ $ok = $dbw-deadlockLoop(
+ function ( DatabaseBase $dbw, array $values, array
$deletionConds ) use ( $thisTable ) {
+ $thisTable-addRow_internal( $dbw, $values,
$deletionConds );
+ return true;
+ },
+ $dbw, $values, $conflictConds
+ );
+
+ if ( !$ok ) {
+ throw new DBError( $dbw, 'Failed to insert a row into
wb_entity_per_page, the deadlock retry limit was exceeded.' );
+ }
+ }
+
+ /**
+* Inserts a row with the given values. Rows matching $conflictConds
will be deleted first.
+*
+* @param DatabaseBase $dbw
+* @param array $values
+* @param array $conflictConds
+*
+* @return bool true
+*/
+ private function addRow_internal( DatabaseBase $dbw, array $values,
array $conflictConds = null ) {
+ if ( $conflictConds ) {
+ $where = $dbw-makeList( $conflictConds, LIST_OR );
+ $dbw-delete(
+ 'wb_entity_per_page',
+ $where,
+ __METHOD__
+ );
+ }
$dbw-insert(
'wb_entity_per_page',
$values,
__METHOD__
);
- }
- private function deleteConflictingRows( array $values ) {
- $dbw = wfGetDB( DB_MASTER );
- $conds = $this-getConflictingRowConditions( $values );
-
- $count = $dbw-delete(
- 'wb_entity_per_page',
- $conds,
- __METHOD__
- );
-
- return $count;
+ return true;
}
private function getConflictingRowConditions( array $values ) {
@@ -133,7 +159,7 @@
$conditions[] = $dbw-makeList( $indexValues, LIST_AND
);
}
- return $dbw-makeList( $conditions, LIST_OR );
+ return $conditions;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/158391
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8f6a742ab8bb91825f99aff1086cc1ad440e138
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update MWSearch to 1.24wmf15 HEAD - change (mediawiki/core)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/158392 Change subject: Update MWSearch to 1.24wmf15 HEAD .. Update MWSearch to 1.24wmf15 HEAD Change-Id: Id27b8cbfd77721fd522f2372629a1232e1a9494e --- M extensions/MWSearch 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/92/158392/1 diff --git a/extensions/MWSearch b/extensions/MWSearch index f5663f7..ae8c241 16 --- a/extensions/MWSearch +++ b/extensions/MWSearch -Subproject commit f5663f7c44f28eaca061cadca84a9d656a22830c +Subproject commit ae8c241e1664fbf11c255d798a092725d87f1690 -- To view, visit https://gerrit.wikimedia.org/r/158392 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id27b8cbfd77721fd522f2372629a1232e1a9494e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf15 Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
