[MediaWiki-commits] [Gerrit] Remove unused variables from SpecialAllpages::showToplevel() - change (mediawiki/core)
IAlex has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133209
Change subject: Remove unused variables from SpecialAllpages::showToplevel()
..
Remove unused variables from SpecialAllpages::showToplevel()
Follow-up If750cad676 (71fe7c5)
Change-Id: I95bf953b0eb742e94ddff1b6adf6d784fb5dc87c
---
M includes/specials/SpecialAllpages.php
1 file changed, 0 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/09/133209/1
diff --git a/includes/specials/SpecialAllpages.php
b/includes/specials/SpecialAllpages.php
index e4fc54b..ad92298 100644
--- a/includes/specials/SpecialAllpages.php
+++ b/includes/specials/SpecialAllpages.php
@@ -156,31 +156,10 @@
* @param bool $hideredirects Dont show redirects (default false)
*/
function showToplevel( $namespace = NS_MAIN, $from = '', $to = '',
$hideredirects = false ) {
- $output = $this-getOutput();
-
- # TODO: Either make this *much* faster or cache the title index
points
- # in the querycache table.
-
- $dbr = wfGetDB( DB_SLAVE );
- $out = ;
- $where = array( 'page_namespace' = $namespace );
-
- if ( $hideredirects ) {
- $where['page_is_redirect'] = 0;
- }
-
$from = Title::makeTitleSafe( $namespace, $from );
$to = Title::makeTitleSafe( $namespace, $to );
$from = ( $from $from-isLocal() ) ? $from-getDBkey() :
null;
$to = ( $to $to-isLocal() ) ? $to-getDBkey() : null;
-
- if ( isset( $from ) ) {
- $where[] = 'page_title = ' . $dbr-addQuotes( $from );
- }
-
- if ( isset( $to ) ) {
- $where[] = 'page_title = ' . $dbr-addQuotes( $to );
- }
$this-showChunk( $namespace, $from, $to, $hideredirects );
}
--
To view, visit https://gerrit.wikimedia.org/r/133209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I95bf953b0eb742e94ddff1b6adf6d784fb5dc87c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex coderev...@emsenhuber.ch
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update jquery.uls from upstream - change (mediawiki...UniversalLanguageSelector)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133211
Change subject: Update jquery.uls from upstream
..
Update jquery.uls from upstream
* Localization added for Belarusian
* Code cleanup in jquery.uls.core.js
* Call proper cancel function on pressing the cancel button
Change-Id: I4482c6c63d93bdbc520bf3d505288b4b88c66eab
---
A lib/jquery.uls/i18n/be.json
M lib/jquery.uls/src/jquery.uls.core.js
2 files changed, 40 insertions(+), 20 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/11/133211/1
diff --git a/lib/jquery.uls/i18n/be.json b/lib/jquery.uls/i18n/be.json
new file mode 100644
index 000..a1b3d1f
--- /dev/null
+++ b/lib/jquery.uls/i18n/be.json
@@ -0,0 +1,21 @@
+{
+ @metadata: {
+ authors: [
+ Unomano
+ ]
+ },
+ uls-select-language: Выберыце мову,
+ uls-region-WW: Па ўсім свеце,
+ uls-region-SP: Спецыяльныя,
+ uls-region-AM: Амерыка,
+ uls-region-AF: Афрыка,
+ uls-region-EU: Еўропа,
+ uls-region-AS: Азія,
+ uls-region-ME: Блізкі Ўсход,
+ uls-region-PA: Ціхі акіян,
+ uls-no-results-found: Нічога не знойдзена,
+ uls-common-languages: Распаўсюджаныя мовы,
+ uls-no-results-suggestion-title: Вы можаце быць зацікаўлены ў:,
+ uls-search-help: Вы можаце шукаць па мове, назве сцэнара, ISO-коду
мовы, або вы можаце праглядаць па рэгіенах:,
+ uls-search-placeholder: Ппошук мовы
+}
diff --git a/lib/jquery.uls/src/jquery.uls.core.js
b/lib/jquery.uls/src/jquery.uls.core.js
index 6a9536e..5f9d837 100644
--- a/lib/jquery.uls/src/jquery.uls.core.js
+++ b/lib/jquery.uls/src/jquery.uls.core.js
@@ -242,46 +242,46 @@
uls = this;
// Register all event listeners to the ULS here.
- uls.$element.on( 'click', $.proxy( uls.click, uls ) );
+ this.$element.on( 'click', $.proxy( this.click, this )
);
- uls.$languageFilter.on( 'searchclear.uls', $.proxy(
uls.defaultSearch, uls ) );
- uls.$languageFilter.on( 'noresults.uls', $.proxy(
uls.noresults, uls ) );
- uls.$languageFilter.on( 'resultsfound.uls', $.proxy(
uls.success, uls ) );
+ this.$languageFilter.on( 'searchclear.uls', $.proxy(
this.defaultSearch, this ) );
+ this.$languageFilter.on( 'noresults.uls', $.proxy(
this.noresults, this ) );
+ this.$languageFilter.on( 'resultsfound.uls', $.proxy(
this.success, this ) );
// Close when clicking on the close button
- uls.$menu.find( '#uls-close' ).on( 'click', $.proxy(
uls.cancel, uls ) );
+ this.$menu.find( '#uls-close' ).on( 'click', $.proxy(
this.cancel, this ) );
// Don't do anything if pressing on empty space in the
ULS
- uls.$menu.on( 'click', function ( e ) {
+ this.$menu.on( 'click', function ( e ) {
e.stopPropagation();
} );
// Handle key press events on the menu
- uls.$menu.on( 'keypress', $.proxy( this.keypress, this
) )
+ this.$menu.on( 'keypress', $.proxy( this.keypress, this
) )
.on( 'keyup', $.proxy( this.keyup, this ) );
if ( this.eventSupported( 'keydown' ) ) {
this.$menu.on( 'keydown', $.proxy(
this.keypress, this ) );
}
- lcd = uls.$resultsView.lcd( {
- languages: uls.languages,
- quickList: uls.options.quickList,
- clickhandler: $.proxy( uls.select, uls ),
- source: uls.$languageFilter,
- showRegions: uls.options.showRegions
+ lcd = this.$resultsView.lcd( {
+ languages: this.languages,
+ quickList: this.options.quickList,
+ clickhandler: $.proxy( this.select, this ),
+ source: this.$languageFilter,
+ showRegions: this.options.showRegions
} ).data( 'lcd' );
- uls.$languageFilter.languagefilter( {
+ this.$languageFilter.languagefilter( {
$target: lcd,
- languages: uls.languages,
- searchAPI: uls.options.searchAPI,
- onSelect: $.proxy( uls.select, uls )
[MediaWiki-commits] [Gerrit] Extract metadata panel scroll/log/animate logic into separat... - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Extract metadata panel scroll/log/animate logic into separate
component
..
Extract metadata panel scroll/log/animate logic into separate component
Change-Id: I2441d64c094a9bfbae7a4712ff4c78efa13a62a7
---
M MultimediaViewer.php
M MultimediaViewerHooks.php
M resources/mmv/mmv.js
M resources/mmv/ui/mmv.ui.metadataPanel.js
M resources/mmv/ui/mmv.ui.metadataPanel.less
A resources/mmv/ui/mmv.ui.metadataPanelScroller.js
A resources/mmv/ui/mmv.ui.metadataPanelScroller.less
M tests/qunit/mmv/mmv.lightboxinterface.test.js
M tests/qunit/mmv/mmv.test.js
M tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js
A tests/qunit/mmv/ui/mmv.ui.metadataPanelScroller.test.js
11 files changed, 406 insertions(+), 320 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index 5a3cc4a..6952143 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -452,10 +452,12 @@
'mmv.ui.metadataPanel' = $wgMediaViewerResourceTemplate + array(
'scripts' = array(
'mmv/ui/mmv.ui.metadataPanel.js',
+ 'mmv/ui/mmv.ui.metadataPanelScroller.js',
),
'styles' = array(
'mmv/ui/mmv.ui.metadataPanel.less',
+ 'mmv/ui/mmv.ui.metadataPanelScroller.less',
),
'dependencies' = array(
diff --git a/MultimediaViewerHooks.php b/MultimediaViewerHooks.php
index 754e9a6..466cf80 100644
--- a/MultimediaViewerHooks.php
+++ b/MultimediaViewerHooks.php
@@ -215,6 +215,7 @@
'tests/qunit/mmv/ui/mmv.ui.description.test.js',
'tests/qunit/mmv/ui/mmv.ui.fileUsage.test.js',
'tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js',
+
'tests/qunit/mmv/ui/mmv.ui.metadataPanelScroller.test.js',
'tests/qunit/mmv/ui/mmv.ui.progressBar.test.js',
'tests/qunit/mmv/ui/mmv.ui.permission.test.js',
'tests/qunit/mmv/ui/mmv.ui.stripeButtons.test.js',
diff --git a/resources/mmv/mmv.js b/resources/mmv/mmv.js
index b561267..ef1acc8 100755
--- a/resources/mmv/mmv.js
+++ b/resources/mmv/mmv.js
@@ -327,7 +327,7 @@
return;
}
- viewer.ui.panel.animateMetadataOnce();
+ viewer.ui.panel.scroller.animateMetadataOnce();
viewer.preloadDependencies();
} );
diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.js
b/resources/mmv/ui/mmv.ui.metadataPanel.js
index 7ee9710..b865987 100644
--- a/resources/mmv/ui/mmv.ui.metadataPanel.js
+++ b/resources/mmv/ui/mmv.ui.metadataPanel.js
@@ -32,56 +32,33 @@
mw.mmv.ui.Element.call( this, $container );
this.$controlBar = $controlBar;
-
- /** @property {Object} localStorage the window.localStorage
object */
- this.localStorage = localStorage;
-
- /**
-* Whether we've already fired an animation for the metadata
div in this lightbox session.
-* @property {boolean}
-* @private
-*/
- this.hasAnimatedMetadata = undefined;
-
/** @property {mw.mmv.HtmlUtils} htmlUtils - */
this.htmlUtils = new mw.mmv.HtmlUtils();
- this.initializeHeader();
+ this.initializeHeader( localStorage );
this.initializeImageMetadata();
this.initializeAboutLinks();
}
-
oo.inheritClass( MetadataPanel, mw.mmv.ui.Element );
-
MPP = MetadataPanel.prototype;
MPP.attach = function() {
- var panel = this;
- this.handleEvent( 'keydown', function ( e ) {
- panel.keydown( e );
- } );
-
- $.scrollTo().on( 'scroll.mmvp', $.throttle( 250, function() {
- panel.scroll();
- } ) );
-
+ this.scroller.attach();
this.buttons.attach();
this.fileReuse.attach();
-
- // reset animation flag when the viewer is reopened
- this.hasAnimatedMetadata = !this.localStorage ||
this.localStorage.getItem( 'mmv.hasOpenedMetadata' );
};
MPP.unattach = function() {
+ this.scroller.unattach();
this.buttons.unattach();
this.fileReuse.unattach();
this.fileReuse.closeDialog();
this.clearEvents();
-
- $.scrollTo().off( 'scroll.mmvp' );
};
MPP.empty = function () {
+
[MediaWiki-commits] [Gerrit] Generate jobs for MolHandler - change (integration/jenkins-job-builder-config)
Rillke has uploaded a new change for review. https://gerrit.wikimedia.org/r/133212 Change subject: Generate jobs for MolHandler .. Generate jobs for MolHandler Change-Id: Icc16798ad40e1db64072d9a156d60210ba67e139 --- M mediawiki-extensions.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/12/133212/1 diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index 89bd004..554b42c 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -422,6 +422,7 @@ - Math - MathSearch - MobileFrontend + - MolHandler - MoodBar - MultiMaps - MultimediaViewer -- To view, visit https://gerrit.wikimedia.org/r/133212 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icc16798ad40e1db64072d9a156d60210ba67e139 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Rillke ril...@wikipedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix dynamic scope lookup in templates. - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133213
Change subject: Fix dynamic scope lookup in templates.
..
Fix dynamic scope lookup in templates.
Change-Id: Ic42e1f2da7dc5ba6439084398dfa93b4dd559228
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M templates/udp2log/filters.nginx.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/133213/1
diff --git a/templates/udp2log/filters.nginx.erb
b/templates/udp2log/filters.nginx.erb
index b4bbd66..2d3f7bc 100644
--- a/templates/udp2log/filters.nginx.erb
+++ b/templates/udp2log/filters.nginx.erb
@@ -1,4 +1,4 @@
# Note: This file is managed by Puppet.
# Save logs from nginx.
-file 100 %= nginx_log_directory %/nginx-sampled-100.tsv.log
+file 100 %=
scope.lookupvar('role::logging::udp2log::nginx::nginx_log_directory')
%/nginx-sampled-100.tsv.log
--
To view, visit https://gerrit.wikimedia.org/r/133213
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic42e1f2da7dc5ba6439084398dfa93b4dd559228
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] Adding a missing entry - change (labs/private)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133214
Change subject: Adding a missing entry
..
Adding a missing entry
Change-Id: Iffdf61db7375de40fef62fcc6fc8b83346c2bc94
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/passwords/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/private
refs/changes/14/133214/1
diff --git a/modules/passwords/manifests/init.pp
b/modules/passwords/manifests/init.pp
index ceff0bd..bff46fb 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -294,6 +294,7 @@
$osm_password = 'ciao'
$kolossos_password = 'salut'
$aude_password = 'hallo'
+$planemad_password = 'ola'
}
class passwords::rancid {
--
To view, visit https://gerrit.wikimedia.org/r/133214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffdf61db7375de40fef62fcc6fc8b83346c2bc94
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix escapign of wikitext in monolingual values. - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133215
Change subject: Fix escapign of wikitext in monolingual values.
..
Fix escapign of wikitext in monolingual values.
Change-Id: I24dbfdd3df64669e1362e5495b204853937934b9
---
M lib/includes/formatters/MonolingualHtmlFormatter.php
M lib/includes/formatters/WikibaseValueFormatterBuilders.php
M lib/tests/phpunit/formatters/MonolingualHtmlFormatterTest.php
3 files changed, 28 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/15/133215/1
diff --git a/lib/includes/formatters/MonolingualHtmlFormatter.php
b/lib/includes/formatters/MonolingualHtmlFormatter.php
index 457d393..b599a80 100644
--- a/lib/includes/formatters/MonolingualHtmlFormatter.php
+++ b/lib/includes/formatters/MonolingualHtmlFormatter.php
@@ -3,7 +3,6 @@
namespace Wikibase\Formatters;
use DataValues\MonolingualTextValue;
-use ValueFormatters\FormatterOptions;
use ValueFormatters\ValueFormatter;
use ValueFormatters\ValueFormatterBase;
use Wikibase\Utils;
@@ -30,7 +29,10 @@
$textLang = $value-getLanguageCode();
$textLangName = Utils::fetchLanguageName( $textLang, $userLang
);
- $msg = wfMessage( 'wikibase-monolingual-text', $text,
$textLang, $textLangName );
+ $msg = wfMessage( 'wikibase-monolingual-text' )-params(
+ wfEscapeWikiText( $text ),
+ wfEscapeWikiText( $textLang ),
+ wfEscapeWikiText( $textLangName ) );
return $msg-parse();
}
diff --git a/lib/includes/formatters/WikibaseValueFormatterBuilders.php
b/lib/includes/formatters/WikibaseValueFormatterBuilders.php
index 41eadc5..91facdc 100644
--- a/lib/includes/formatters/WikibaseValueFormatterBuilders.php
+++ b/lib/includes/formatters/WikibaseValueFormatterBuilders.php
@@ -81,7 +81,7 @@
SnakFormatter::FORMAT_WIKI = array(
'PT:url' = 'ValueFormatters\StringFormatter', // no
escaping!
//'PT:wikibase-item' =
'Wikibase\Lib\LocalItemLinkFormatter', // TODO
- 'VT:monolingualtext' =
'Wikibase\Formatters\MonolingualHtmlFormatter',
+ //'VT:monolingualtext' =
'Wikibase\Formatters\MonolingualWikitextFormatter', // TODO
),
// Formatters to use for HTML display.
diff --git a/lib/tests/phpunit/formatters/MonolingualHtmlFormatterTest.php
b/lib/tests/phpunit/formatters/MonolingualHtmlFormatterTest.php
index 68d8411..e89c5a3 100644
--- a/lib/tests/phpunit/formatters/MonolingualHtmlFormatterTest.php
+++ b/lib/tests/phpunit/formatters/MonolingualHtmlFormatterTest.php
@@ -25,11 +25,16 @@
*
* @covers HtmlUrlFormatter::format()
*/
- public function testFormat( $value, $options, $pattern ) {
+ public function testFormat( $value, $options, $pattern, $not = '' ) {
$formatter = new MonolingualHtmlFormatter( $options );
$text = $formatter-format( $value );
- $this-assertRegExp( $pattern, $text );
+
+ if ( $not === 'not' ) {
+ $this-assertNotRegExp( $pattern, $text );
+ } else {
+ $this-assertRegExp( $pattern, $text );
+ }
}
public function urlFormatProvider() {
@@ -37,11 +42,26 @@
$options-setOption( ValueFormatter::OPT_LANG, 'en' );
return array(
- array(
+ 'formatting' = array(
new MonolingualTextValue( 'de', 'Hallo Welt' ),
$options,
'@^span lang=de.*?Hallo
Welt\/span.*\((German|Deutsch)\).*$@'
),
+ 'html/wikitext escaping' = array(
+ new MonolingualTextValue( 'de',
'[[HalloWelt]]' ),
+ $options,
+ '@^span
.*?(\[\[|#91;#91;)Hallo(amp;|#38;)Welt(\]\]|#93;#93;)\/span.*$@'
+ ),
+ 'evil html' = array(
+ new MonolingualTextValue(
+ ' onclick=alert(\'gotcha!\')',
+
'Halloscriptalert(\'gotcha!\')/scriptWelt'
+ .'a
href=javascript:alert(\'gotcha!\')evil/a'
+ ),
+ $options,
+ '@^script |(span |lang= )onclick=alert|a
$@',
+ 'not'
+ ),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/133215
To unsubscribe, visit
[MediaWiki-commits] [Gerrit] Remove externalLink, since it's now a simple onclick button. - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove externalLink, since it's now a simple onclick button.
..
Remove externalLink, since it's now a simple onclick button.
Change-Id: Ia82bbe077c1bb06acffb0ccdcef5e469eb62f6a2
---
M resources/tours/anonymouseditoracquisitionpostedit.js
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/tours/anonymouseditoracquisitionpostedit.js
b/resources/tours/anonymouseditoracquisitionpostedit.js
index b6e4ca3..be26946 100644
--- a/resources/tours/anonymouseditoracquisitionpostedit.js
+++ b/resources/tours/anonymouseditoracquisitionpostedit.js
@@ -29,7 +29,6 @@
},
buttons: [ {
namemsg:
'guidedtour-tour-anonymouseditoracquisitionpostedit-continue',
- action: 'externalLink',
onclick: function () {
mw.gettingStarted.anonymousEditorAcquisition.handleSignup() ;
}
--
To view, visit https://gerrit.wikimedia.org/r/133204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia82bbe077c1bb06acffb0ccdcef5e469eb62f6a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: Robmoen rm...@wikimedia.org
Gerrit-Reviewer: Swalling swall...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding a missing entry - change (labs/private)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Adding a missing entry
..
Adding a missing entry
Change-Id: Iffdf61db7375de40fef62fcc6fc8b83346c2bc94
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/passwords/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/modules/passwords/manifests/init.pp
b/modules/passwords/manifests/init.pp
index ceff0bd..bff46fb 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -294,6 +294,7 @@
$osm_password = 'ciao'
$kolossos_password = 'salut'
$aude_password = 'hallo'
+$planemad_password = 'ola'
}
class passwords::rancid {
--
To view, visit https://gerrit.wikimedia.org/r/133214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iffdf61db7375de40fef62fcc6fc8b83346c2bc94
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Factor common string validators into common methiod - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133216
Change subject: Factor common string validators into common methiod
..
Factor common string validators into common methiod
Change-Id: I53883a7921dea368ed8b38aa7513cbbd0f488964
---
M lib/includes/WikibaseDataTypeBuilders.php
1 file changed, 16 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/16/133216/1
diff --git a/lib/includes/WikibaseDataTypeBuilders.php
b/lib/includes/WikibaseDataTypeBuilders.php
index f170b23..8df0a49 100644
--- a/lib/includes/WikibaseDataTypeBuilders.php
+++ b/lib/includes/WikibaseDataTypeBuilders.php
@@ -102,12 +102,20 @@
return new DataType( $id, 'wikibase-entityid', $validators );
}
- public function buildMediaType( $id ) {
+ protected function getCommonStringValidators( $maxLength = 400 ) {
$validators = array();
$validators[] = new TypeValidator( 'string' );
- $validators[] = new StringLengthValidator( 1, 240 ); // Note:
240 is hardcoded in UploadBase
+ //TODO: validate UTF8 (here and elsewhere)
+ $validators[] = new StringLengthValidator( 1, $maxLength,
'mb_strlen' );
$validators[] = new RegexValidator( '/^\s|[\r\n\t]|\s$/', true
); // no leading/trailing whitespace, no line breaks.
+
+ return $validators;
+ }
+
+ public function buildMediaType( $id ) {
+ $validators = $this-getCommonStringValidators( 240 );
+
$validators[] = new RegexValidator( '@[#/:]@u', true ); //
no nasty chars
$validators[] = new RegexValidator( '@\..+@u', false ); // must
contain a file extension
//TODO: add a validator that checks the rules that MediaWiki
imposes on filenames for uploads.
@@ -122,12 +130,7 @@
}
public function buildStringType( $id ) {
- $validators = array();
-
- $validators[] = new TypeValidator( 'string' );
- //TODO: validate UTF8 (here and elsewhere)
- $validators[] = new StringLengthValidator( 1, 400, 'mb_strlen'
);
- $validators[] = new RegexValidator( '/^\s|[\r\n\t]|\s$/', true
); // no leading/trailing whitespace, no line breaks.
+ $validators = $this-getCommonStringValidators();
$topValidator = new DataValueValidator( //Note: validate the
DataValue's native value.
new CompositeValidator( $validators, true ) //Note:
each validator is fatal
@@ -137,24 +140,17 @@
}
public function buildMonolingualTextType( $id ) {
- $validators = array();
-
- $validators[] = new TypeValidator( 'string' );
- //TODO: validate UTF8 (here and elsewhere)
- $validators[] = new StringLengthValidator( 1, 400, 'mb_strlen'
);
- $validators[] = new RegexValidator( '/^\s|[\r\n\t]|\s$/', true
); // no leading/trailing whitespace, no line breaks.
-
$textValidator = new DataFieldValidator(
'text',
- new CompositeValidator( $validators, true ) //Note:
each validator is fatal
+ new CompositeValidator(
+ $this-getCommonStringValidators(),
+ true //Note: each validator is fatal
+ )
);
-
- $validators = array();
- $validators[] = new MembershipValidator(
Utils::getLanguageCodes() );
$languageValidator = new DataFieldValidator(
'language',
- new CompositeValidator( $validators, true )
+ new MembershipValidator( Utils::getLanguageCodes() )
);
$topValidator = new CompositeValidator(
--
To view, visit https://gerrit.wikimedia.org/r/133216
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I53883a7921dea368ed8b38aa7513cbbd0f488964
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] Fix dynamic scope lookup in templates - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Fix dynamic scope lookup in templates
..
Fix dynamic scope lookup in templates
Use of outside-scoped variables in templates does not work in puppet
3. So you need to explicitly look them up the scope with scope.lookupvar
and their absolute namespace specified.
Change-Id: Ic42e1f2da7dc5ba6439084398dfa93b4dd559228
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M templates/udp2log/filters.nginx.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/udp2log/filters.nginx.erb
b/templates/udp2log/filters.nginx.erb
index b4bbd66..2d3f7bc 100644
--- a/templates/udp2log/filters.nginx.erb
+++ b/templates/udp2log/filters.nginx.erb
@@ -1,4 +1,4 @@
# Note: This file is managed by Puppet.
# Save logs from nginx.
-file 100 %= nginx_log_directory %/nginx-sampled-100.tsv.log
+file 100 %=
scope.lookupvar('role::logging::udp2log::nginx::nginx_log_directory')
%/nginx-sampled-100.tsv.log
--
To view, visit https://gerrit.wikimedia.org/r/133213
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic42e1f2da7dc5ba6439084398dfa93b4dd559228
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] Catch EntityIdParsingExceptions in wbgetclaims - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Catch EntityIdParsingExceptions in wbgetclaims
..
Catch EntityIdParsingExceptions in wbgetclaims
Bug: 65095
Change-Id: I7cc5e7e122f0b9504f77ce9a05a23b033c5cf542
---
M repo/includes/api/GetClaims.php
M repo/tests/phpunit/includes/api/GetClaimsTest.php
2 files changed, 49 insertions(+), 6 deletions(-)
Approvals:
WikidataJenkins: Verified
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/GetClaims.php b/repo/includes/api/GetClaims.php
index c2b6d2a..f350761 100644
--- a/repo/includes/api/GetClaims.php
+++ b/repo/includes/api/GetClaims.php
@@ -4,6 +4,7 @@
use ApiBase;
use ApiMain;
+use Wikibase\DataModel\Entity\EntityIdParsingException;
use Wikibase\DataModel\Claim\Claim;
use Wikibase\DataModel\Claim\ClaimGuidParser;
use Wikibase\DataModel\Claim\Claims;
@@ -63,7 +64,12 @@
list( $id, $claimGuid ) = $this-getIdentifiers( $params );
- $entityId = $this-idParser-parse( $id );
+ try {
+ $entityId = $this-idParser-parse( $id );
+ } catch ( EntityIdParsingException $e ) {
+ $this-dieException( $e, 'param-invalid' );
+ }
+
$entityRevision = $entityId ? $this-loadEntityRevision(
$entityId ) : null;
$entity = $entityRevision-getEntity();
@@ -151,7 +157,12 @@
$params = $this-extractRequestParams();
if ( isset( $params['property'] ) ){
- $parsedProperty = $this-idParser-parse(
$params['property'] );
+ try {
+ $parsedProperty = $this-idParser-parse(
$params['property'] );
+ } catch ( EntityIdParsingException $e ) {
+ $this-dieException( $e, 'param-invalid' );
+ }
+
$matchFilter = $propertyId-equals( $parsedProperty );
return $matchFilter;
}
diff --git a/repo/tests/phpunit/includes/api/GetClaimsTest.php
b/repo/tests/phpunit/includes/api/GetClaimsTest.php
index 3ed6e6d..accb60b 100644
--- a/repo/tests/phpunit/includes/api/GetClaimsTest.php
+++ b/repo/tests/phpunit/includes/api/GetClaimsTest.php
@@ -13,6 +13,7 @@
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\Serializers\SerializerFactory;
use Wikibase\DataModel\Entity\Property;
+use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Snak\PropertySomeValueSnak;
use Wikibase\DataModel\Snak\PropertyValueSnak;
@@ -49,10 +50,10 @@
$store-saveEntity( $entity, '', $GLOBALS['wgUser'], EDIT_NEW );
/** @var $claims Claim[] */
- $claims[0] = $entity-newClaim( new PropertyNoValueSnak( 42 ) );
- $claims[1] = $entity-newClaim( new PropertyNoValueSnak( 1 ) );
- $claims[2] = $entity-newClaim( new PropertySomeValueSnak( 42 )
);
- $claims[3] = $entity-newClaim( new PropertyValueSnak( 9001,
new StringValue( 'o_O' ) ) );
+ $claims[0] = $entity-newClaim( new PropertyNoValueSnak( new
PropertyId( 'P42' ) ) );
+ $claims[1] = $entity-newClaim( new PropertyNoValueSnak( new
PropertyId( 'P404' ) ) );
+ $claims[2] = $entity-newClaim( new PropertySomeValueSnak( new
PropertyId( 'P42' ) ) );
+ $claims[3] = $entity-newClaim( new PropertyValueSnak( new
PropertyId( 'P9001' ), new StringValue( 'o_O' ) ) );
foreach( $claims as $key = $claim ){
$claim-setGuid( $entity-getId()-getPrefixedId() .
'$D8404CDA-56A1-4334-AF13-A3290BCD9CL' . $key );
@@ -185,4 +186,35 @@
array( 'x$y$z' )
);
}
+
+ /**
+* @dataProvider getInvalidIdsProvider
+*/
+ public function testGetInvalidIds( $entity, $property ) {
+ if ( !$entity ) {
+ $item = Item::newEmpty();
+ $this-addClaimsAndSave( $item );
+ $entity = $item-getId()-getSerialization();
+ }
+
+ $params = array(
+ 'action' = 'wbgetclaims',
+ 'entity' = $entity,
+ 'property' = $property,
+ );
+
+ try {
+ $this-doApiRequest( $params );
+ $this-fail( 'Invalid entity id did not throw an error'
);
+ } catch ( UsageException $e ) {
+ $this-assertEquals( 'param-invalid',
$e-getCodeString(), 'Invalid entity id raised correct error' );
+ }
+ }
+
+ public function getInvalidIdsProvider() {
+ return array(
+
[MediaWiki-commits] [Gerrit] Prefix with wgCookiePrefix and gettingStarted - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Prefix with wgCookiePrefix and gettingStarted
..
Prefix with wgCookiePrefix and gettingStarted
Change-Id: I6511a0bac54d31f75538af2db789e0377cb39960
---
M resources/ext.gettingstarted.anonymousEditorAcquisition.js
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.gettingstarted.anonymousEditorAcquisition.js
b/resources/ext.gettingstarted.anonymousEditorAcquisition.js
index d2b5878..81406b8 100644
--- a/resources/ext.gettingstarted.anonymousEditorAcquisition.js
+++ b/resources/ext.gettingstarted.anonymousEditorAcquisition.js
@@ -7,7 +7,7 @@
token = user.getToken(),
bucket = user.getBucket(),
LOG_EVENT_TIMEOUT = 500, // (ms)
- CTA_FLAG_KEY = 'hasShownAnonymousEditorAcquisitionCTA',
+ ctaFlagKey = mw.config.get( 'wgCookiePrefix' ) +
'-gettingStartedHasShownAnonymousEditorAcquisitionCTA',
tourToSelectorMapping = {
'anonymouseditoracquisitionpreedit': [ '#ca-edit',
'.mw-editsection a:not( .mw-editsection-visualeditor )' ],
'anonymouseditoracquisitionpreeditve': [ '#ca-ve-edit',
'.mw-editsection-visualeditor ' ]
@@ -155,10 +155,10 @@
// Wrapper for launching the experiment tour
function launchTour( tourName ) {
// Abort if flag is set
- if ( $.jStorage.get( CTA_FLAG_KEY ) ) {
+ if ( $.jStorage.get( ctaFlagKey ) ) {
return;
}
- $.jStorage.set( CTA_FLAG_KEY, true );
+ $.jStorage.set( ctaFlagKey, true );
gt.launchTour( tourName );
}
@@ -293,7 +293,7 @@
logLinkClick( '#pt-createaccount', 'create account' );
// Init if flag is not set
- if ( $.jStorage.get( CTA_FLAG_KEY ) === null ) {
+ if ( $.jStorage.get( ctaFlagKey ) === null ) {
if ( isPreEdit ) {
initPreEditVariant();
} else if ( bucket === 'post-edit' ) {
--
To view, visit https://gerrit.wikimedia.org/r/133199
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6511a0bac54d31f75538af2db789e0377cb39960
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: Robmoen rm...@wikimedia.org
Gerrit-Reviewer: Swalling swall...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix IE9 support - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133218
Change subject: Fix IE9 support
..
Fix IE9 support
- Fix JS error on pushState
- Fix blur issue where blur(0px) filter would blur anyway
- Fix wrapper sizing issue where its size would be 0 when measured
Bug: 65225
Change-Id: If9279cd56f55f71f261ec54dda8228194988b9ae
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/597
---
M resources/mmv/mmv.bootstrap.js
M resources/mmv/mmv.js
M resources/mmv/ui/mmv.ui.canvas.js
M tests/qunit/mmv/ui/mmv.ui.canvas.test.js
4 files changed, 16 insertions(+), 6 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/18/133218/1
diff --git a/resources/mmv/mmv.bootstrap.js b/resources/mmv/mmv.bootstrap.js
index 46c6049..02dbb1c 100755
--- a/resources/mmv/mmv.bootstrap.js
+++ b/resources/mmv/mmv.bootstrap.js
@@ -321,11 +321,12 @@
// The advantage of using pushState when it's available is that
it has to ability to truly
// clear the hash, not leaving # in the history
// An entry with # in the history has the side-effect of
resetting the scroll position when navigating the history
- if ( this.browserHistory ) {
+ if ( this.browserHistory this.browserHistory.pushState ) {
// In order to truly clear the hash, we need to
reconstruct the hash-free URL
if ( hash === '#' ) {
hash = window.location.href.replace( /#.*$/, ''
);
}
+
this.browserHistory.pushState( null, null, hash );
} else {
// Since we voluntarily changed the hash, we don't want
MMVB.hash (which will trigger on hashchange event) to treat it
diff --git a/resources/mmv/mmv.js b/resources/mmv/mmv.js
index b561267..7d57289 100755
--- a/resources/mmv/mmv.js
+++ b/resources/mmv/mmv.js
@@ -198,7 +198,7 @@
*/
MMVP.resize = function ( ui ) {
var viewer = this,
- image = this.thumbs[ this.currentIndex].image,
+ image = this.thumbs[ this.currentIndex ].image,
imageWidths;
this.preloadThumbnails();
diff --git a/resources/mmv/ui/mmv.ui.canvas.js
b/resources/mmv/ui/mmv.ui.canvas.js
index 2d04c27..261029b 100644
--- a/resources/mmv/ui/mmv.ui.canvas.js
+++ b/resources/mmv/ui/mmv.ui.canvas.js
@@ -260,7 +260,7 @@
C.unblur = function() {
// We apply empty CSS values to remove the inline styles
applied by jQuery
// so that they don't get in the way of styles defined in CSS
- this.$image.css( { '-webkit-filter' : '', 'opacity' : '' } )
+ this.$image.css( { '-webkit-filter' : '', 'opacity' : '',
'filter' : '' } )
.removeClass( 'blurred' );
};
@@ -284,10 +284,17 @@
* @returns {mw.mmv.model.ThumbnailWidth}
*/
C.getLightboxImageWidths = function ( image ) {
- var thumb = image.thumbnail;
+ var thumb = image.thumbnail,
+ $window = $( window ),
+ available_width = $window.width(),
+ available_height = $window.height() - $(
'.mw-mmv-controls' ).height();
+
+ // For the above don't rely on this.$imageWrapper's sizing
anymore because it's fragile
+ // Depending on what the wrapper contains, its size can be 0 on
some browsers.
+ // Therefore, we calculate the available space manually
return this.thumbnailWidthCalculator.calculateWidths(
- this.$imageWrapper.width(),
this.$imageWrapper.height(), thumb.width, thumb.height );
+ available_width, available_height, thumb.width,
thumb.height );
};
/**
diff --git a/tests/qunit/mmv/ui/mmv.ui.canvas.test.js
b/tests/qunit/mmv/ui/mmv.ui.canvas.test.js
index a6875e3..f04e26c 100644
--- a/tests/qunit/mmv/ui/mmv.ui.canvas.test.js
+++ b/tests/qunit/mmv/ui/mmv.ui.canvas.test.js
@@ -261,7 +261,7 @@
assert.ok( ! blurredThumbnailShown, 'Placeholder state is
correct' );
} );
- QUnit.test( 'Unblur', 3, function ( assert ) {
+ QUnit.test( 'Unblur', 4, function ( assert ) {
var $qf = $( '#qunit-fixture' ),
canvas = new mw.mmv.ui.Canvas( $qf ),
oldAnimate = $.fn.animate;
@@ -290,6 +290,8 @@
canvas.unblurWithAnimation();
assert.ok( ! canvas.$image.css( '-webkit-filter' ) ||
!canvas.$image.css( '-webkit-filter' ).length,
+ 'Image has no -webkit-filter left' );
+ assert.ok( ! canvas.$image.css( 'filter' ) ||
[MediaWiki-commits] [Gerrit] format the TODO document for readability - change (mediawiki/core)
Waldir has uploaded a new change for review. https://gerrit.wikimedia.org/r/133219 Change subject: format the TODO document for readability .. format the TODO document for readability Change-Id: I54877680158b0b49ed13db9fd2d0441b82cab8b6 --- M tests/phpunit/TODO 1 file changed, 19 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/19/133219/1 diff --git a/tests/phpunit/TODO b/tests/phpunit/TODO index b2fa7fb..4845de7 100644 --- a/tests/phpunit/TODO +++ b/tests/phpunit/TODO @@ -1,10 +1,20 @@ == Things To Do == -* Most of the tests are named poorly; naming should describe a use case in story-like language, not simply identify the -unit under test. An example would be the difference between testCalculate and testAddingIntegersTogetherWorks. -* Many of the tests make multiple assertions, and are thus not unitary tests. By using data-providers and more use-case -oriented test selection nearly all of these cases can be easily resolved. -* Some of the test files are either incorrectly named or in the wrong folder. Tests should be organized in a mirrored -structure to the source they are testing, and named the same, with the exception of the word Test at the end. -* Shared set-up code or base classes are present, but usually named improperly or appear to be poorly factored. Support -code should share as much of the same naming as the code it's supporting, and test and test-case depenencies should be -considered to resolve other shared needs. + +* Most of the tests are named poorly; + naming should describe a use case in story-like language, + not simply identify the unit under test. + An example would be the difference between testCalculate + and testAddingIntegersTogetherWorks. + +* Many of the tests make multiple assertions, and are thus not unitary tests. + By using data-providers and more use-case oriented test selection + nearly all of these cases can be easily resolved. + +* Some of the test files are either incorrectly named or in the wrong folder. + Tests should be organized in a mirrored structure to the source they are testing, + and named the same, with the exception of the word Test at the end. + +* Shared set-up code or base classes are present, + but usually named improperly or appear to be poorly factored. + Support code should share as much of the same naming as the code it's supporting, + and test and test-case depenencies should be considered to resolve other shared needs. \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/133219 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54877680158b0b49ed13db9fd2d0441b82cab8b6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Waldir wal...@email.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] modified badge links for compatibility with Doxygen Markdown - change (mediawiki...Wikibase)
Christopher Johnson (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/133220 Change subject: modified badge links for compatibility with Doxygen Markdown .. modified badge links for compatibility with Doxygen Markdown Change-Id: I0e81bfb086375e9e19c9adeb59a542d23192c91a --- M README.md 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/20/133220/1 diff --git a/README.md b/README.md index c9d72f6..1d06885 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,12 @@ -# Wikibase.git +- - - +Introduction to Wikibase + -[](http://travis-ci.org/wikimedia/mediawiki-extensions-Wikibase) -[](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-Wikibase/) +[Travis Build Status](https://travis-ci.org/wikimedia/mediawiki-extensions-Wikibase.svg?branch=master): + +[Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-Wikibase/badges/quality-score.png?b=master): + + The Wikibase.git package is part of the [Wikibase software](http://wikiba.se/) and consists of three interconnected extensions: -- To view, visit https://gerrit.wikimedia.org/r/133220 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e81bfb086375e9e19c9adeb59a542d23192c91a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] semantic version support + special casing old versions, offl... - change (mediawiki...release)
MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133221
Change subject: semantic version support + special casing old versions, offline
builds, not svn
..
semantic version support + special casing old versions, offline builds, not svn
* Added support in the newer releases (1.23.0-rc.1 and forward) for
Semantic Versioning.
This also involved special casing so that diffs with older versions
(1.23.0rc0 and before) that didn't use semantic versioning.
* Added support for offline creation of tarballs with --offline
option. Used this while flying back from Zűrich.
* Switched trunk which was left over from svn to master for the
new git awesomeness.
Change-Id: I6fbe8b07572a64204673e2491d56e2199b2df40a
---
M make-release/make-release.py
1 file changed, 36 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/21/133221/1
diff --git a/make-release/make-release.py b/make-release/make-release.py
index f9051f0..01dfb38 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -165,6 +165,11 @@
default='tar',
help='path to tar, we are expecting a GNU tar. (defaults to tar)'
)
+parser.add_argument(
+'--offline', dest='offline',
+default=False, action='store_true',
+help='Do not perform actions (e.g. git pull) that require the network'
+)
return parser.parse_args()
@@ -227,8 +232,8 @@
(?Pmajor(?Pmajor1\d+)\.(?Pmajor2\d+))
\.
(?Pminor\d+)
-(?:
-(?Pphase[A-Za-z]+)
+(?:-
+(?Pphase[A-Za-z]+)\.?
(?Pcycle\d+)
)?
, re.X).match(version)
@@ -247,12 +252,23 @@
del ret['major1']
del ret['major2']
-ret['tag'] = 'tags/%s.%s%s%s' % (
-ret['major'],
-ret['minor'],
-ret.get('phase', ''),
-ret.get('cycle', '')
-)
+# Special case for when we switched to semantic versioning
+if(ret['major'] == 1 and
+ (ret['minor'] 23 or
+(ret['minor'] == 23 and ret['phase'] == 'rc' and ret['cycle'] ==
'0'))):
+ret['tag'] = 'tags/%s.%s%s%s' % (
+ret['major'],
+ret['minor'],
+ret.get('phase', ''),
+ret.get('cycle', '')
+)
+else:
+ret['tag'] = 'tags/%s.%s-%s.%s' % (
+ret['major'],
+ret['minor'],
+ret.get('phase', ''),
+ret.get('cycle', '')
+)
last = m.group(m.lastindex)
if int(last) == 0:
@@ -371,21 +387,22 @@
print Could not update local repository %s % repo
sys.exit(1)
-if (os.path.exists(dir)):
-print Updating + label + in + dir + ...
-proc = subprocess.Popen(
-['sh', '-c', 'cd ' + dir + '; git fetch -q --all'])
-else:
-print Cloning + label + into + dir + ...
-proc = subprocess.Popen(['git', 'clone', '-q', repo, dir])
+if (self.options.offline == False):
+if (os.path.exists(dir)):
+print Updating + label + in + dir + ...
+proc = subprocess.Popen(
+['sh', '-c', 'cd ' + dir + '; git fetch -q --all'])
+else:
+print Cloning + label + into + dir + ...
+proc = subprocess.Popen(['git', 'clone', '-q', repo, dir])
-if proc.wait() != 0:
-print git clone failed, exiting
-sys.exit(1)
+if proc.wait() != 0:
+print git clone failed, exiting
+sys.exit(1)
os.chdir(dir)
-if branch != 'trunk':
+if branch != 'master' and branch != None:
print Checking out %s in %s... % (branch, dir)
proc = subprocess.Popen(['git', 'checkout', branch])
--
To view, visit https://gerrit.wikimedia.org/r/133221
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fbe8b07572a64204673e2491d56e2199b2df40a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger m...@nichework.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] better scriptpath default for installer.php - change (mediawiki/core)
Waldir has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133222
Change subject: better scriptpath default for installer.php
..
better scriptpath default for installer.php
If the parameters to installer.php aren't specified,
it uses the default values as defined in DefaultSettings.php.
In the case of scriptpath, this doesn't work out of the box,
unless the server has previously been configured
to route /wiki (the default $wgScriptPath).
This change makes installer.php use mediawiki's core directory
as scriptpath, which at least would work without any special
configurations on the server.
This is similar to what the web installer does already
(see envCheckPath() at includes/installer/WebInstaller.php#L1143),
so this change also improves consistency between the installers.
Change-Id: Ie50be570a29eca9a734beee0337d667a8b29f65a
---
M maintenance/install.php
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/22/133222/1
diff --git a/maintenance/install.php b/maintenance/install.php
index 5a3e00c..0d70923 100644
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -34,7 +34,8 @@
/**
* Maintenance script to install and configure MediaWiki
*
- * Default values for the options are defined in DefaultSettings.php (see the
mapping in CliInstaller.php)
+ * Default values for the options are defined in DefaultSettings.php
+ * (see the mapping in includes/installer/CliInstaller.php)
* Default for --dbpath (SQLite-specific) is defined in
SqliteInstaller::getGlobalDefaults
*
* @ingroup Maintenance
@@ -60,7 +61,7 @@
/* $this-addOption( 'email', 'The email for the wiki
administrator', false, true ); */
$this-addOption(
'scriptpath',
- 'The relative path of the wiki in the web server
(/wiki)',
+ 'The relative path of the wiki in the web server (/' .
basename( dirname( __DIR__ ) ) . ')',
false,
true
);
@@ -98,6 +99,11 @@
$siteName = $this-getArg( 0, 'MediaWiki' ); // Will not be set
if used with --env-checks
$adminName = $this-getArg( 1 );
+ $scriptpath = $this-getOption( 'scriptpath', false );
+ if ( $scriptpath == false ) {
+ $this-mOptions['scriptpath'] = '/' . basename(
dirname( __DIR__ ) );
+ }
+
$dbpassfile = $this-getOption( 'dbpassfile' );
if ( $dbpassfile !== null ) {
if ( $this-getOption( 'dbpass' ) !== null ) {
--
To view, visit https://gerrit.wikimedia.org/r/133222
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie50be570a29eca9a734beee0337d667a8b29f65a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Waldir wal...@email.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused variables from SpecialAllpages::showToplevel() - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove unused variables from SpecialAllpages::showToplevel()
..
Remove unused variables from SpecialAllpages::showToplevel()
Follow-up If750cad676 (71fe7c5)
Change-Id: I95bf953b0eb742e94ddff1b6adf6d784fb5dc87c
---
M includes/specials/SpecialAllpages.php
1 file changed, 0 insertions(+), 21 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialAllpages.php
b/includes/specials/SpecialAllpages.php
index e4fc54b..ad92298 100644
--- a/includes/specials/SpecialAllpages.php
+++ b/includes/specials/SpecialAllpages.php
@@ -156,31 +156,10 @@
* @param bool $hideredirects Dont show redirects (default false)
*/
function showToplevel( $namespace = NS_MAIN, $from = '', $to = '',
$hideredirects = false ) {
- $output = $this-getOutput();
-
- # TODO: Either make this *much* faster or cache the title index
points
- # in the querycache table.
-
- $dbr = wfGetDB( DB_SLAVE );
- $out = ;
- $where = array( 'page_namespace' = $namespace );
-
- if ( $hideredirects ) {
- $where['page_is_redirect'] = 0;
- }
-
$from = Title::makeTitleSafe( $namespace, $from );
$to = Title::makeTitleSafe( $namespace, $to );
$from = ( $from $from-isLocal() ) ? $from-getDBkey() :
null;
$to = ( $to $to-isLocal() ) ? $to-getDBkey() : null;
-
- if ( isset( $from ) ) {
- $where[] = 'page_title = ' . $dbr-addQuotes( $from );
- }
-
- if ( isset( $to ) ) {
- $where[] = 'page_title = ' . $dbr-addQuotes( $to );
- }
$this-showChunk( $namespace, $from, $to, $hideredirects );
}
--
To view, visit https://gerrit.wikimedia.org/r/133209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I95bf953b0eb742e94ddff1b6adf6d784fb5dc87c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex coderev...@emsenhuber.ch
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Generate SQL to a separate folder - change (analytics/multimedia)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/133223 Change subject: Generate SQL to a separate folder .. Generate SQL to a separate folder This lets us avoid keeping generated files in version control Change-Id: I74743ebcf2a01d29641b567bcdbb8e74e808bdcc Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/604 --- D actions/cawiki.sql D actions/commonswiki.sql D actions/czwiki.sql D actions/dewiki.sql D actions/enwiki.sql D actions/enwikivoyage.sql D actions/eswiki.sql D actions/etwiki.sql D actions/fiwiki.sql D actions/frwiki.sql D actions/global.sql D actions/hewiki.sql D actions/huwiki.sql D actions/itwiki.sql D actions/jawiki.sql D actions/kowiki.sql D actions/mediawikiwiki.sql D actions/nlwiki.sql D actions/plwiki.sql D actions/ptwiki.sql D actions/rowiki.sql D actions/ruwiki.sql D actions/skwiki.sql D actions/svwiki.sql D actions/tewiki.sql D actions/thwiki.sql D actions/viwiki.sql M build-action-tsvs M build-geoperf-tsvs M build-perf-tsvs D generate.php A generate.py D geoperf/cawiki-api.sql D geoperf/cawiki-image.sql D geoperf/commonswiki-api.sql D geoperf/commonswiki-image.sql D geoperf/czwiki-api.sql D geoperf/czwiki-image.sql D geoperf/dewiki-api.sql D geoperf/dewiki-image.sql D geoperf/enwiki-api.sql D geoperf/enwiki-image.sql D geoperf/enwikivoyage-api.sql D geoperf/enwikivoyage-image.sql D geoperf/eswiki-api.sql D geoperf/eswiki-image.sql D geoperf/etwiki-api.sql D geoperf/etwiki-image.sql D geoperf/fiwiki-api.sql D geoperf/fiwiki-image.sql D geoperf/frwiki-api.sql D geoperf/frwiki-image.sql D geoperf/global-api.sql D geoperf/global-image.sql D geoperf/hewiki-api.sql D geoperf/hewiki-image.sql D geoperf/huwiki-api.sql D geoperf/huwiki-image.sql D geoperf/itwiki-api.sql D geoperf/itwiki-image.sql D geoperf/jawiki-api.sql D geoperf/jawiki-image.sql D geoperf/kowiki-api.sql D geoperf/kowiki-image.sql D geoperf/mediawikiwiki-api.sql D geoperf/mediawikiwiki-image.sql D geoperf/nlwiki-api.sql D geoperf/nlwiki-image.sql D geoperf/plwiki-api.sql D geoperf/plwiki-image.sql D geoperf/ptwiki-api.sql D geoperf/ptwiki-image.sql D geoperf/rowiki-api.sql D geoperf/rowiki-image.sql D geoperf/ruwiki-api.sql D geoperf/ruwiki-image.sql D geoperf/skwiki-api.sql D geoperf/skwiki-image.sql D geoperf/svwiki-api.sql D geoperf/svwiki-image.sql D geoperf/tewiki-api.sql D geoperf/tewiki-image.sql D geoperf/thwiki-api.sql D geoperf/thwiki-image.sql D geoperf/viwiki-api.sql D geoperf/viwiki-image.sql D perf/cawiki-filerepoinfo.sql D perf/cawiki-globalusage.sql D perf/cawiki-image.sql D perf/cawiki-imagehit.sql D perf/cawiki-imageinfo.sql D perf/cawiki-imagemiss.sql D perf/cawiki-imageusage.sql D perf/cawiki-thumbnailinfo.sql D perf/cawiki-userinfo.sql D perf/commonswiki-filerepoinfo.sql D perf/commonswiki-globalusage.sql D perf/commonswiki-image.sql D perf/commonswiki-imagehit.sql D perf/commonswiki-imageinfo.sql D perf/commonswiki-imagemiss.sql D perf/commonswiki-imageusage.sql D perf/commonswiki-thumbnailinfo.sql D perf/commonswiki-userinfo.sql D perf/commonswiki.sql D perf/czwiki-filerepoinfo.sql D perf/czwiki-globalusage.sql D perf/czwiki-image.sql D perf/czwiki-imagehit.sql D perf/czwiki-imageinfo.sql D perf/czwiki-imagemiss.sql D perf/czwiki-imageusage.sql D perf/czwiki-thumbnailinfo.sql D perf/czwiki-userinfo.sql D perf/dewiki-filerepoinfo.sql D perf/dewiki-globalusage.sql D perf/dewiki-image.sql D perf/dewiki-imagehit.sql D perf/dewiki-imageinfo.sql D perf/dewiki-imagemiss.sql D perf/dewiki-imageusage.sql D perf/dewiki-thumbnailinfo.sql D perf/dewiki-userinfo.sql D perf/enwiki-filerepoinfo.sql D perf/enwiki-globalusage.sql D perf/enwiki-image.sql D perf/enwiki-imagehit.sql D perf/enwiki-imageinfo.sql D perf/enwiki-imagemiss.sql D perf/enwiki-imageusage.sql D perf/enwiki-thumbnailinfo.sql D perf/enwiki-userinfo.sql D perf/enwiki.sql D perf/enwikivoyage-filerepoinfo.sql D perf/enwikivoyage-globalusage.sql D perf/enwikivoyage-image.sql D perf/enwikivoyage-imagehit.sql D perf/enwikivoyage-imageinfo.sql D perf/enwikivoyage-imagemiss.sql D perf/enwikivoyage-imageusage.sql D perf/enwikivoyage-thumbnailinfo.sql D perf/enwikivoyage-userinfo.sql D perf/eswiki-filerepoinfo.sql D perf/eswiki-globalusage.sql D perf/eswiki-image.sql D perf/eswiki-imagehit.sql D perf/eswiki-imageinfo.sql D perf/eswiki-imagemiss.sql D perf/eswiki-imageusage.sql D perf/eswiki-thumbnailinfo.sql D perf/eswiki-userinfo.sql D perf/etwiki-filerepoinfo.sql D perf/etwiki-globalusage.sql D perf/etwiki-image.sql D perf/etwiki-imagehit.sql D perf/etwiki-imageinfo.sql D perf/etwiki-imagemiss.sql D perf/etwiki-imageusage.sql D perf/etwiki-thumbnailinfo.sql D perf/etwiki-userinfo.sql D perf/fiwiki-filerepoinfo.sql D perf/fiwiki-globalusage.sql D perf/fiwiki-image.sql D perf/fiwiki-imagehit.sql D perf/fiwiki-imageinfo.sql D perf/fiwiki-imagemiss.sql D perf/fiwiki-imageusage.sql D perf/fiwiki-thumbnailinfo.sql D
[MediaWiki-commits] [Gerrit] Adding Leila Zia's new ssh key - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133224
Change subject: Adding Leila Zia's new ssh key
..
Adding Leila Zia's new ssh key
RT 7472
Change-Id: I76e604c097214945b2cf52f454c995842f82c13a
---
M manifests/admins.pp
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/24/133224/1
diff --git a/manifests/admins.pp b/manifests/admins.pp
index 09b3d6d..b35eab0 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -3506,6 +3506,12 @@
type = 'ssh-rsa',
key=
'B3NzaC1yc2EDAQABAAABAQCyDhTiTa+lUt+lM++HXAYchRyKX4GVMwb4zAAovcHbG9R7NHAP1vT7px+vwFG69TZay/MsuZ7oo5NyRUWNF00CXSSx0KMZz5FirW/dncrRG9/N+fxat8jyjVVrFiY1sngSUhmILQrLGV0Wa7EC8ZHv0qywO4UqbfgGxZMY5n2nu3hFvLn6LoKKoNDjaFTfEwio8QNjdMC0NZLYqUk1HMj5Zm4mrTFD+UcOXSbbOe4MytQKDYzZdEYd4XOE1ki/dRvAmPhAj0gAkezPCRseCCamaDmokd+PS8db3EHJ390+48FTkXLIO1uUhJJmF9MsWL2dj2gDk1RZjkOlfcAapypl',
}
+ssh_authorized_key { 'leila@starfruit-2':
+ensure = 'present',
+user = $username,
+type = 'ssh-rsa',
+key=
'B3NzaC1yc2EDAQABAAABAQDDrQIRAiH2afKoaaIW2K6loEk1CoOD1IKCLMWcfAky+CwqsCQWepiQxlQOZKez+Y3D0hE/jVA8Rv4jktx5SIqOZbkYQXF1s54jp2ULqVujofqjRH8qnUa+b3s7ywCQILGR8gV1X5cHcXztonwKhrEGqjlw3kk1NeOkI0/akRbTdxGjL5QbhJKg9T3bkkBkfwBupVvH8nxzS1twa/1lGLv0GUF220gEo4c8yUhT9EFWwzJlpcmKBo7m6cXrhXeCVoipKlfq3NMupTT1AiYh4Dcdnk+VxWNkmkbOU7CN9dvwXT0gK0OjznntqNC2nadikJXe8tAOPL953S/9br2Q/OGN',
+}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/133224
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76e604c097214945b2cf52f454c995842f82c13a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding Leila Zia's new ssh key - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Adding Leila Zia's new ssh key
..
Adding Leila Zia's new ssh key
RT 7472
Change-Id: I76e604c097214945b2cf52f454c995842f82c13a
---
M manifests/admins.pp
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/admins.pp b/manifests/admins.pp
index 09b3d6d..b35eab0 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -3506,6 +3506,12 @@
type = 'ssh-rsa',
key=
'B3NzaC1yc2EDAQABAAABAQCyDhTiTa+lUt+lM++HXAYchRyKX4GVMwb4zAAovcHbG9R7NHAP1vT7px+vwFG69TZay/MsuZ7oo5NyRUWNF00CXSSx0KMZz5FirW/dncrRG9/N+fxat8jyjVVrFiY1sngSUhmILQrLGV0Wa7EC8ZHv0qywO4UqbfgGxZMY5n2nu3hFvLn6LoKKoNDjaFTfEwio8QNjdMC0NZLYqUk1HMj5Zm4mrTFD+UcOXSbbOe4MytQKDYzZdEYd4XOE1ki/dRvAmPhAj0gAkezPCRseCCamaDmokd+PS8db3EHJ390+48FTkXLIO1uUhJJmF9MsWL2dj2gDk1RZjkOlfcAapypl',
}
+ssh_authorized_key { 'leila@starfruit-2':
+ensure = 'present',
+user = $username,
+type = 'ssh-rsa',
+key=
'B3NzaC1yc2EDAQABAAABAQDDrQIRAiH2afKoaaIW2K6loEk1CoOD1IKCLMWcfAky+CwqsCQWepiQxlQOZKez+Y3D0hE/jVA8Rv4jktx5SIqOZbkYQXF1s54jp2ULqVujofqjRH8qnUa+b3s7ywCQILGR8gV1X5cHcXztonwKhrEGqjlw3kk1NeOkI0/akRbTdxGjL5QbhJKg9T3bkkBkfwBupVvH8nxzS1twa/1lGLv0GUF220gEo4c8yUhT9EFWwzJlpcmKBo7m6cXrhXeCVoipKlfq3NMupTT1AiYh4Dcdnk+VxWNkmkbOU7CN9dvwXT0gK0OjznntqNC2nadikJXe8tAOPL953S/9br2Q/OGN',
+}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/133224
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I76e604c097214945b2cf52f454c995842f82c13a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update jquery.uls from upstream - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Update jquery.uls from upstream
..
Update jquery.uls from upstream
* Localization added for Belarusian
* Code cleanup in jquery.uls.core.js
* Call proper cancel function on pressing the cancel button
* Remove the unused option menu
Change-Id: I4482c6c63d93bdbc520bf3d505288b4b88c66eab
---
A lib/jquery.uls/i18n/be.json
M lib/jquery.uls/src/jquery.uls.core.js
2 files changed, 40 insertions(+), 20 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/jquery.uls/i18n/be.json b/lib/jquery.uls/i18n/be.json
new file mode 100644
index 000..a1b3d1f
--- /dev/null
+++ b/lib/jquery.uls/i18n/be.json
@@ -0,0 +1,21 @@
+{
+ @metadata: {
+ authors: [
+ Unomano
+ ]
+ },
+ uls-select-language: Выберыце мову,
+ uls-region-WW: Па ўсім свеце,
+ uls-region-SP: Спецыяльныя,
+ uls-region-AM: Амерыка,
+ uls-region-AF: Афрыка,
+ uls-region-EU: Еўропа,
+ uls-region-AS: Азія,
+ uls-region-ME: Блізкі Ўсход,
+ uls-region-PA: Ціхі акіян,
+ uls-no-results-found: Нічога не знойдзена,
+ uls-common-languages: Распаўсюджаныя мовы,
+ uls-no-results-suggestion-title: Вы можаце быць зацікаўлены ў:,
+ uls-search-help: Вы можаце шукаць па мове, назве сцэнара, ISO-коду
мовы, або вы можаце праглядаць па рэгіенах:,
+ uls-search-placeholder: Ппошук мовы
+}
diff --git a/lib/jquery.uls/src/jquery.uls.core.js
b/lib/jquery.uls/src/jquery.uls.core.js
index 6a9536e..5f9d837 100644
--- a/lib/jquery.uls/src/jquery.uls.core.js
+++ b/lib/jquery.uls/src/jquery.uls.core.js
@@ -242,46 +242,46 @@
uls = this;
// Register all event listeners to the ULS here.
- uls.$element.on( 'click', $.proxy( uls.click, uls ) );
+ this.$element.on( 'click', $.proxy( this.click, this )
);
- uls.$languageFilter.on( 'searchclear.uls', $.proxy(
uls.defaultSearch, uls ) );
- uls.$languageFilter.on( 'noresults.uls', $.proxy(
uls.noresults, uls ) );
- uls.$languageFilter.on( 'resultsfound.uls', $.proxy(
uls.success, uls ) );
+ this.$languageFilter.on( 'searchclear.uls', $.proxy(
this.defaultSearch, this ) );
+ this.$languageFilter.on( 'noresults.uls', $.proxy(
this.noresults, this ) );
+ this.$languageFilter.on( 'resultsfound.uls', $.proxy(
this.success, this ) );
// Close when clicking on the close button
- uls.$menu.find( '#uls-close' ).on( 'click', $.proxy(
uls.cancel, uls ) );
+ this.$menu.find( '#uls-close' ).on( 'click', $.proxy(
this.cancel, this ) );
// Don't do anything if pressing on empty space in the
ULS
- uls.$menu.on( 'click', function ( e ) {
+ this.$menu.on( 'click', function ( e ) {
e.stopPropagation();
} );
// Handle key press events on the menu
- uls.$menu.on( 'keypress', $.proxy( this.keypress, this
) )
+ this.$menu.on( 'keypress', $.proxy( this.keypress, this
) )
.on( 'keyup', $.proxy( this.keyup, this ) );
if ( this.eventSupported( 'keydown' ) ) {
this.$menu.on( 'keydown', $.proxy(
this.keypress, this ) );
}
- lcd = uls.$resultsView.lcd( {
- languages: uls.languages,
- quickList: uls.options.quickList,
- clickhandler: $.proxy( uls.select, uls ),
- source: uls.$languageFilter,
- showRegions: uls.options.showRegions
+ lcd = this.$resultsView.lcd( {
+ languages: this.languages,
+ quickList: this.options.quickList,
+ clickhandler: $.proxy( this.select, this ),
+ source: this.$languageFilter,
+ showRegions: this.options.showRegions
} ).data( 'lcd' );
- uls.$languageFilter.languagefilter( {
+ this.$languageFilter.languagefilter( {
$target: lcd,
- languages: uls.languages,
- searchAPI: uls.options.searchAPI,
- onSelect: $.proxy( uls.select, uls )
+
[MediaWiki-commits] [Gerrit] Removing class role::analytics::kraken::jobs::hive::partitio... - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133225
Change subject: Removing class
role::analytics::kraken::jobs::hive::partitions::external
..
Removing class role::analytics::kraken::jobs::hive::partitions::external
We will soon be using Oozie instead of this custom python script
to automatically create hive partitions on top of webrequest data.
Change-Id: I6acac58c0892431e7abacad3cb1d8f33066ede32
See: https://gerrit.wikimedia.org/r/#/c/131208/
---
M manifests/role/analytics/kraken.pp
M manifests/site.pp
2 files changed, 2 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/25/133225/1
diff --git a/manifests/role/analytics/kraken.pp
b/manifests/role/analytics/kraken.pp
index 54abd83..79b6da1 100644
--- a/manifests/role/analytics/kraken.pp
+++ b/manifests/role/analytics/kraken.pp
@@ -1,4 +1,6 @@
# kraken.pp - role classes dealing with Kraken data analysis.
+#
+# NOTE! 'kraken' will be renamed soon.
# == Class role::analytics::kraken
# Kraken refers to the Analytics codebase used to generate
@@ -99,42 +101,6 @@
command = ${script} --start ${start_date} ${datadir} ${log_file}
21,
user= 'hdfs',
minute = 5,
-require = Exec[${script}-exists],
-}
-}
-
-# == Class role::analytics::kraken::hive::partitions::external
-# Installs cron job that creates external Hive partitions for imported
-# datasets in $external_data_hdfs_dir.
-class role::analytics::kraken::jobs::hive::partitions::external {
-include role::analytics::kraken
-
-$script =
${role::analytics::kraken::path}/kraken-etl/hive-partitioner
-$datadir = $role::analytics::kraken::external_data_hdfs_dir
-$database= 'wmf'
-
-# Note: I'm not worried about logrotate yet.
-# This generates just a few lines per hour.
-$log_file= ${role::analytics::kraken::log_dir}/hive-partitioner.log
-
-# make sure the script has been deployed.
-exec { ${script}-exists:
-command = /usr/bin/test -x ${script},
-# This exec doesn't actually create $script, but
-# we don't need to run test it puppet can already
-# tell that the file exists.
-creates = $script,
-}
-
-
-# Use hcatalog jar for JsonSerDe
-$hive_options = '--auxpath
/usr/lib/hcatalog/share/hcatalog/hcatalog-core-0.5.0-cdh4.3.1.jar'
-# cron job to automatically create hive partitions for any
-# newly imported data.
-cron { 'kraken-create-external-hive-partitions':
-command = ${script} --database ${database}
--hive-options='${hive_options}' ${datadir} ${log_file} 21,
-user= 'hdfs',
-minute = 21,
require = Exec[${script}-exists],
}
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 1f22f86..3bdc9a6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -230,8 +230,6 @@
include role::analytics::kraken::jobs::import::pagecounts
# Imports logs from Kafka into Hadoop (via Camus)
include role::analytics::kraken::jobs::import::kafka
-# Creates hive partitions on all data in HDFS /wmf/data/external
-include role::analytics::kraken::jobs::hive::partitions::external
}
# analytics1027 hosts the frontend
--
To view, visit https://gerrit.wikimedia.org/r/133225
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6acac58c0892431e7abacad3cb1d8f33066ede32
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix carbon destinations with additional workers - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/133226 Change subject: fix carbon destinations with additional workers .. fix carbon destinations with additional workers Change-Id: I252cfbe131b27d3c4059baba56037f696fd89aba --- M manifests/role/graphite.pp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/26/133226/1 diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp index bdb6dd5..990f422 100644 --- a/manifests/role/graphite.pp +++ b/manifests/role/graphite.pp @@ -122,8 +122,8 @@ '127.0.0.1:2404:d', '127.0.0.1:2504:e', '127.0.0.1:2604:f', -'127.0.0.1:2604:g', -'127.0.0.1:2604:h', +'127.0.0.1:2704:g', +'127.0.0.1:2804:h', ], }, }, -- To view, visit https://gerrit.wikimedia.org/r/133226 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I252cfbe131b27d3c4059baba56037f696fd89aba Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only using hive-partitioner to create partitions on pagecoun... - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Only using hive-partitioner to create partitions on pagecounts
table
..
Only using hive-partitioner to create partitions on pagecounts table
We will soon be using Oozie instead of this custom python script
to automatically create hive partitions on top of webrequest data
Change-Id: I6acac58c0892431e7abacad3cb1d8f33066ede32
See: https://gerrit.wikimedia.org/r/#/c/131208/
---
M manifests/role/analytics/kraken.pp
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/analytics/kraken.pp
b/manifests/role/analytics/kraken.pp
index 54abd83..fea1abc 100644
--- a/manifests/role/analytics/kraken.pp
+++ b/manifests/role/analytics/kraken.pp
@@ -1,4 +1,6 @@
# kraken.pp - role classes dealing with Kraken data analysis.
+#
+# NOTE! 'kraken' will be renamed soon.
# == Class role::analytics::kraken
# Kraken refers to the Analytics codebase used to generate
@@ -113,6 +115,10 @@
$datadir = $role::analytics::kraken::external_data_hdfs_dir
$database= 'wmf'
+# We are only using hive-partition to add partitions to the pagecounts
table.
+# The webrequest table is using Oozie.
+$tables = 'pagecounts'
+
# Note: I'm not worried about logrotate yet.
# This generates just a few lines per hour.
$log_file= ${role::analytics::kraken::log_dir}/hive-partitioner.log
@@ -132,7 +138,7 @@
# cron job to automatically create hive partitions for any
# newly imported data.
cron { 'kraken-create-external-hive-partitions':
-command = ${script} --database ${database}
--hive-options='${hive_options}' ${datadir} ${log_file} 21,
+command = ${script} --database ${database} --tables ${tables}
--hive-options='${hive_options}' ${datadir} ${log_file} 21,
user= 'hdfs',
minute = 21,
require = Exec[${script}-exists],
--
To view, visit https://gerrit.wikimedia.org/r/133225
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6acac58c0892431e7abacad3cb1d8f33066ede32
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prevent import of entities to avoid ID conflicts - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133227
Change subject: Prevent import of entities to avoid ID conflicts
..
Prevent import of entities to avoid ID conflicts
Bug: 63228
Change-Id: Ie03b10dcb37feb5d038de1730e58daf00d2b49ea
---
M repo/Wikibase.hooks.php
M repo/Wikibase.php
2 files changed, 22 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/27/133227/1
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index 6082c32..e5e5afa 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -1328,4 +1328,25 @@
return true;
}
+ /**
+* Called by Import.php. Implemented to prevent the import of entities.
+*
+* @param object $reader unclear, see Bug 64657
+* @param array $pageInfo
+* @param array $revisionInfo
+*
+* @throws MWException
+* @return bool
+*/
+ public static function onImportHandleRevisionXMLTag( $reader,
$pageInfo, $revisionInfo ) {
+ $entityContentFactory =
WikibaseRepo::getDefaultInstance()-getEntityContentFactory();
+y
+ if ( isset( $revisionInfo['model'] )
$entityContentFactory-isEntityContentModel( $revisionInfo['model'] ) ) {
+ // Skip entities.
+ // XXX: This is rather rough.
+ throw new MWException( 'To avoid ID conflicts, import
of Wikibase entities is not allowed.' );
+ }
+
+ return true;
+ }
}
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index ff02489..a91cdb4 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -182,6 +182,7 @@
$wgHooks['MakeGlobalVariablesScript'][] =
'Wikibase\RepoHooks::onMakeGlobalVariablesScript';
$wgHooks['ContentHandlerForModelID'][] =
'Wikibase\RepoHooks::onContentHandlerForModelID';
$wgHooks['APIQuerySiteInfoStatisticsInfo'][]=
'Wikibase\RepoHooks::onAPIQuerySiteInfoStatisticsInfo';
+ $wgHooks['ImportHandleRevisionXMLTag'][]=
'Wikibase\RepoHooks::onImportHandleRevisionXMLTag';
// Resource Loader Modules:
$wgResourceModules = array_merge( $wgResourceModules, include( __DIR__
. /resources/Resources.php ) );
--
To view, visit https://gerrit.wikimedia.org/r/133227
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie03b10dcb37feb5d038de1730e58daf00d2b49ea
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] Now importing all webrequest data into a webrequest/ subdire... - change (analytics/kraken)
Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/133229 Change subject: Now importing all webrequest data into a webrequest/ subdirectory .. Now importing all webrequest data into a webrequest/ subdirectory This is so we can map a single hive table onto all webrequests Change-Id: I830a582aeac2c497be0a492cc3a3ae2c37c04d91 --- M kraken-etl/conf/camus.webrequest.properties 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/kraken refs/changes/29/133229/1 diff --git a/kraken-etl/conf/camus.webrequest.properties b/kraken-etl/conf/camus.webrequest.properties index 9472cb7..ee512bb 100644 --- a/kraken-etl/conf/camus.webrequest.properties +++ b/kraken-etl/conf/camus.webrequest.properties @@ -1,7 +1,7 @@ # Needed Camus properties, more cleanup to come # final top-level data output directory, sub-directory will be dynamically created for each topic pulled -etl.destination.path=hdfs://kraken/wmf/data/external +etl.destination.path=hdfs://kraken/wmf/data/external/webrequest # HDFS location where you want to keep execution files, i.e. offsets, error logs, and count files etl.execution.base.path=hdfs://kraken/wmf/camus/webrequest # where completed Camus job output directories are kept, usually a sub-dir in the base.path @@ -48,7 +48,7 @@ kafka.max.historical.days=7 # Max minutes for each mapper to pull messages (-1 means no limit) # Let each mapper run for no more than 55 minutes. -# Camus is scheduled to run hourly, and we don't want a single +# Camus creates hourly directories, and we don't want a single # long running mapper keep other Camus jobs from being launched. kafka.max.pull.minutes.per.task=55 -- To view, visit https://gerrit.wikimedia.org/r/133229 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I830a582aeac2c497be0a492cc3a3ae2c37c04d91 Gerrit-PatchSet: 1 Gerrit-Project: analytics/kraken Gerrit-Branch: master Gerrit-Owner: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set unifont-5.1.20080907.ttf for timeline on ZH projects - change (operations/mediawiki-config)
Liangent has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133228
Change subject: Set unifont-5.1.20080907.ttf for timeline on ZH projects
..
Set unifont-5.1.20080907.ttf for timeline on ZH projects
The original one, wqy-zenhei.ttc, doesn't actually exist in GDFONTPATH,
and EasyTimeline is not smart enough to make use of other system fonts.
Bug: 20825
Change-Id: I9dd358872265ff753226b9c8f3b7cd374e3bf609
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/28/133228/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 8b1a4ea..659c0db 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -533,7 +533,7 @@
// Generate(FreeSansWMF.ttf, , 4 );
$wgTimelineSettings-fontFile = 'FreeSansWMF.ttf';
} elseif ( $lang == 'zh' ) {
- $wgTimelineSettings-fontFile = 'wqy-zenhei.ttc';
+ $wgTimelineSettings-fontFile = 'unifont-5.1.20080907.ttf';
}
$wgTimelineSettings-fileBackend = 'local-multiwrite';
--
To view, visit https://gerrit.wikimedia.org/r/133228
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dd358872265ff753226b9c8f3b7cd374e3bf609
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] Now importing all webrequest data into a webrequest/ subdire... - change (analytics/kraken)
Ottomata has submitted this change and it was merged. Change subject: Now importing all webrequest data into a webrequest/ subdirectory .. Now importing all webrequest data into a webrequest/ subdirectory This is so we can map a single hive table onto all webrequests Change-Id: I830a582aeac2c497be0a492cc3a3ae2c37c04d91 --- M kraken-etl/conf/camus.webrequest.properties 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/kraken-etl/conf/camus.webrequest.properties b/kraken-etl/conf/camus.webrequest.properties index 9472cb7..ee512bb 100644 --- a/kraken-etl/conf/camus.webrequest.properties +++ b/kraken-etl/conf/camus.webrequest.properties @@ -1,7 +1,7 @@ # Needed Camus properties, more cleanup to come # final top-level data output directory, sub-directory will be dynamically created for each topic pulled -etl.destination.path=hdfs://kraken/wmf/data/external +etl.destination.path=hdfs://kraken/wmf/data/external/webrequest # HDFS location where you want to keep execution files, i.e. offsets, error logs, and count files etl.execution.base.path=hdfs://kraken/wmf/camus/webrequest # where completed Camus job output directories are kept, usually a sub-dir in the base.path @@ -48,7 +48,7 @@ kafka.max.historical.days=7 # Max minutes for each mapper to pull messages (-1 means no limit) # Let each mapper run for no more than 55 minutes. -# Camus is scheduled to run hourly, and we don't want a single +# Camus creates hourly directories, and we don't want a single # long running mapper keep other Camus jobs from being launched. kafka.max.pull.minutes.per.task=55 -- To view, visit https://gerrit.wikimedia.org/r/133229 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I830a582aeac2c497be0a492cc3a3ae2c37c04d91 Gerrit-PatchSet: 2 Gerrit-Project: analytics/kraken Gerrit-Branch: master Gerrit-Owner: Ottomata o...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] semantic version support + special casing old versions, offl... - change (mediawiki...release)
jenkins-bot has submitted this change and it was merged.
Change subject: semantic version support + special casing old versions, offline
builds, not svn
..
semantic version support + special casing old versions, offline builds, not svn
* Added support in the newer releases (1.23.0-rc.1 and forward) for
Semantic Versioning.
This also involved special casing so that diffs with older versions
(1.23.0rc0 and before) that didn't use semantic versioning.
* Added support for offline creation of tarballs with --offline
option. Used this while flying back from Zűrich.
* Switched trunk which was left over from svn to master for the
new git awesomeness.
Change-Id: I6fbe8b07572a64204673e2491d56e2199b2df40a
---
M make-release/make-release.py
M make-release/tests/test_mwversion.py
2 files changed, 91 insertions(+), 21 deletions(-)
Approvals:
MarkAHershberger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make-release/make-release.py b/make-release/make-release.py
index f9051f0..2298f4a 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -165,6 +165,11 @@
default='tar',
help='path to tar, we are expecting a GNU tar. (defaults to tar)'
)
+parser.add_argument(
+'--offline', dest='offline',
+default=False, action='store_true',
+help='Do not perform actions (e.g. git pull) that require the network'
+)
return parser.parse_args()
@@ -227,8 +232,8 @@
(?Pmajor(?Pmajor1\d+)\.(?Pmajor2\d+))
\.
(?Pminor\d+)
-(?:
-(?Pphase[A-Za-z]+)
+(?:-?
+(?Pphase[A-Za-z]+)\.?
(?Pcycle\d+)
)?
, re.X).match(version)
@@ -247,24 +252,48 @@
del ret['major1']
del ret['major2']
-ret['tag'] = 'tags/%s.%s%s%s' % (
-ret['major'],
-ret['minor'],
-ret.get('phase', ''),
-ret.get('cycle', '')
-)
+# Special case for when we switched to semantic versioning
+if(ret['major'] = '1.22' or
+ (ret['major'] == '1.23' and
+ret['minor'] == '0' and
+(ret['phase'] == 'rc' and
+ ret['cycle'] == '0'))):
+ret['tag'] = 'tags/%s.%s%s%s' % (
+ret['major'],
+ret['minor'],
+ret.get('phase', ''),
+ret.get('cycle', '')
+)
+else:
+ret['tag'] = 'tags/%s.%s-%s.%s' % (
+ret['major'],
+ret['minor'],
+ret.get('phase', ''),
+ret.get('cycle', '')
+)
last = m.group(m.lastindex)
if int(last) == 0:
ret['prevVersion'] = None
+ret['prevTag'] = None
return ret
bits = [d for d in m.groups('')]
-bits[m.lastindex - 1] = str(int(bits[m.lastindex - 1]) - 1)
+last = m.lastindex - 3
del bits[1]
del bits[1]
-ret['prevVersion'] = '%s.%s%s%s' % tuple(bits)
+bits[last] = str(int(bits[last]) - 1)
+
+if(bits[0] = '1.22' or
+ (bits[0] == '1.23' and
+bits[1] == '0' and
+(bits[2] == 'rc' and
+ bits[3] == '0'))):
+ret['prevVersion'] = '%s.%s%s%s' % tuple(bits)
+else:
+ret['prevVersion'] = '%s.%s-%s.%s' % tuple(bits)
+
ret['prevTag'] = 'tags/' + ret['prevVersion']
return ret
@@ -371,21 +400,22 @@
print Could not update local repository %s % repo
sys.exit(1)
-if (os.path.exists(dir)):
-print Updating + label + in + dir + ...
-proc = subprocess.Popen(
-['sh', '-c', 'cd ' + dir + '; git fetch -q --all'])
-else:
-print Cloning + label + into + dir + ...
-proc = subprocess.Popen(['git', 'clone', '-q', repo, dir])
+if not self.options.offline:
+if (os.path.exists(dir)):
+print Updating + label + in + dir + ...
+proc = subprocess.Popen(
+['sh', '-c', 'cd ' + dir + '; git fetch -q --all'])
+else:
+print Cloning + label + into + dir + ...
+proc = subprocess.Popen(['git', 'clone', '-q', repo, dir])
-if proc.wait() != 0:
-print git clone failed, exiting
-sys.exit(1)
+if proc.wait() != 0:
+print git clone failed, exiting
+sys.exit(1)
os.chdir(dir)
-if branch != 'trunk':
+if branch != 'master' and branch is not None:
print Checking out %s in %s... % (branch, dir)
proc = subprocess.Popen(['git', 'checkout', branch])
diff --git a/make-release/tests/test_mwversion.py
[MediaWiki-commits] [Gerrit] Updating kraken - change (analytics...deploy)
Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/133230 Change subject: Updating kraken .. Updating kraken Change-Id: I13c5f55d9636ed898218ec55a092b3f382066f12 --- M kraken 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/kraken/deploy refs/changes/30/133230/1 diff --git a/kraken b/kraken index b687b19..605c6c8 16 --- a/kraken +++ b/kraken -Subproject commit b687b19dd5ee6ef49bf9d6dc4a83039e453932d9 +Subproject commit 605c6c8afca472f2c4626c0242fb4916d8cba587 -- To view, visit https://gerrit.wikimedia.org/r/133230 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I13c5f55d9636ed898218ec55a092b3f382066f12 Gerrit-PatchSet: 1 Gerrit-Project: analytics/kraken/deploy Gerrit-Branch: master Gerrit-Owner: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding oozie files to control addition and deletion of webre... - change (analytics/kraken)
Ottomata has submitted this change and it was merged.
Change subject: Adding oozie files to control addition and deletion of
webrequest table partitions
..
Adding oozie files to control addition and deletion of webrequest table
partitions
util/hive/partition files are generic enough to be used with any external hive
table.
webrequest/partition coordinators actually schedule the hive partition workflows
that add and drop partitions.
Note that this is intended to be used with a different table setup than we
currently have in Hive. I intend to merge the 4 webrequest_* tables
into a single webrequest table, each with a partition for the particular
webrequest_source. Data after camus imports will look like:
webrequest/webrequest_source/hourly/year/month/day/hour
The webrequest table will then contain 5 partitions, 4 for the
date and one for the webrequest_source (e.g. text, bits, mobile, etc.).
Change-Id: I7d658b431c103eb8f73afac136369d401a3958ba
---
A oozie/util/hive/README.md
A oozie/util/hive/hive-site.xml
A oozie/util/hive/partition/add/add_partition.sql
A oozie/util/hive/partition/add/workflow.properties
A oozie/util/hive/partition/add/workflow.xml
A oozie/util/hive/partition/drop/drop_partition.sql
A oozie/util/hive/partition/drop/workflow.properties
A oozie/util/hive/partition/drop/workflow.xml
A oozie/webrequest/README.md
A oozie/webrequest/datasets.xml
A oozie/webrequest/partition/add/coordinator.properties
A oozie/webrequest/partition/add/coordinator.xml
A oozie/webrequest/partition/drop/coordinator.properties
A oozie/webrequest/partition/drop/coordinator.xml
14 files changed, 585 insertions(+), 0 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/oozie/util/hive/README.md b/oozie/util/hive/README.md
new file mode 100644
index 000..93d922c
--- /dev/null
+++ b/oozie/util/hive/README.md
@@ -0,0 +1,10 @@
+Oozie workflows in this directory run Hive actions. The workflows
+here should be generic enough to run on their own via good
+parameterization. I.e. they should not refer to specific tables
+or data in HDFS.
+
+hive-site.xml is a symlink to /etc/hive/conf/hive-site.xml. If you
+run ```hdfs dfs -put``` for the whole oozie/ directory, hive-site.xml
+will be put as the full text of the original file in HDFS.
+This file is referenced from various files relative to an
```${oozieDirectory}```
+property.
diff --git a/oozie/util/hive/hive-site.xml b/oozie/util/hive/hive-site.xml
new file mode 12
index 000..651e45a
--- /dev/null
+++ b/oozie/util/hive/hive-site.xml
@@ -0,0 +1 @@
+/etc/hive/conf/hive-site.xml
\ No newline at end of file
diff --git a/oozie/util/hive/partition/add/add_partition.sql
b/oozie/util/hive/partition/add/add_partition.sql
new file mode 100644
index 000..a5d1758
--- /dev/null
+++ b/oozie/util/hive/partition/add/add_partition.sql
@@ -0,0 +1,7 @@
+ADD JAR ${serde_jar};
+USE ${database};
+ALTER TABLE ${table}
+ ADD IF NOT EXISTS
+ PARTITION (${partition_spec})
+ LOCATION '${location}'
+;
diff --git a/oozie/util/hive/partition/add/workflow.properties
b/oozie/util/hive/partition/add/workflow.properties
new file mode 100644
index 000..5decd40
--- /dev/null
+++ b/oozie/util/hive/partition/add/workflow.properties
@@ -0,0 +1,35 @@
+# Configures a workflow app to add a single Hive partition to a Hive table.
+# Any of the following properties are overidable with -D. Some properties
+# are required to be set via the CLI: 'location' and 'partition_spec'.
+#
+#
-Dlocation=hdfs://namenode.example.org:8020/path/to/data/directory/webrequest/webrequest_mobile/2014/04/02/01
+#
-Dpartition_spec=webrequest_source='mobile',year=2014,month=04,day=02,hour=01
+
+
+# hadoopMaster will be used for name-node and job-tracker elements.
+hadoopMaster = analytics1010.eqiad.wmnet
+nameNode = hdfs://${hadoopMaster}:8020
+jobTracker= ${hadoopMaster}:8032
+queueName = standard
+
+# Base path in HDFS to oozie files.
+# Other files will be used relative to this path.
+oozieDirectory= ${nameNode}/wmf/kraken/current/oozie
+
+# HDFS path to hive-site.xml file. This is needed to run hive actions.
+hive_site_xml = ${oozieDirectory}/util/hive/hive-site.xml
+
+# HDFS path to SerDe jar that a table uses.
+serde_jar =
${nameNode}/wmf/kraken/artifacts/hcatalog-core-0.5.0-cdh4.3.1.jar
+
+# Hive database name.
+database = wmf
+
+# Hive table name.
+table = webrequest
+
+# Workflow app to run.
+oozie.wf.application.path =
${oozieDirectory}/util/hive/partition/add/workflow.xml
+oozie.libpath = ${nameNode}/user/oozie/share/lib
+oozie.use.system.libpath = true
+oozie.action.external.stats.write = true
diff --git
[MediaWiki-commits] [Gerrit] Updating kraken with new oozie files and camus webrequest co... - change (analytics...deploy)
Ottomata has submitted this change and it was merged. Change subject: Updating kraken with new oozie files and camus webrequest config for single table .. Updating kraken with new oozie files and camus webrequest config for single table Change-Id: I13c5f55d9636ed898218ec55a092b3f382066f12 --- M kraken 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/kraken b/kraken index b687b19..de4346e 16 --- a/kraken +++ b/kraken -Subproject commit b687b19dd5ee6ef49bf9d6dc4a83039e453932d9 +Subproject commit de4346e72863b95a80ace59af5f200a10759549c -- To view, visit https://gerrit.wikimedia.org/r/133230 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I13c5f55d9636ed898218ec55a092b3f382066f12 Gerrit-PatchSet: 2 Gerrit-Project: analytics/kraken/deploy Gerrit-Branch: master Gerrit-Owner: Ottomata o...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] updated links in README - change (mediawiki...Wikibase)
Christopher Johnson (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/133231 Change subject: updated links in README .. updated links in README Change-Id: I332246f928242470e6951b8778126fde8a69c561 --- M README.md 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/31/133231/1 diff --git a/README.md b/README.md index c9d72f6..5745f1d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,11 @@ -# Wikibase.git +- - - +Introduction to Wikibase + -[](http://travis-ci.org/wikimedia/mediawiki-extensions-Wikibase) -[](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-Wikibase/) +[Travis Build Status](http://travis-ci.org/wikimedia/mediawiki-extensions-Wikibase/): + +[Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-Wikibase/): + The Wikibase.git package is part of the [Wikibase software](http://wikiba.se/) and consists of three interconnected extensions: -- To view, visit https://gerrit.wikimedia.org/r/133231 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I332246f928242470e6951b8778126fde8a69c561 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use message function and correct message key - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133232
Change subject: Use message function and correct message key
..
Use message function and correct message key
Fixes I48ff51af.
Change-Id: Id6febe80a8a09f6b311a10a9e7a42573832388b4
---
M modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/32/133232/1
diff --git a/modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
b/modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
index 818cd26..93b730e 100644
--- a/modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
+++ b/modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
@@ -36,7 +36,7 @@
'classes': [ 've-ui-languageInputWidget-directionSelect' ],
} ).addItems( [
new OO.ui.ButtonOptionWidget( 'rtl', { '$': this.$, 'icon':
'text-dir-rtl' } ),
- new OO.ui.ButtonOptionWidget( null, { '$': this.$, 'label':
'text-dir-auto' } ),
+ new OO.ui.ButtonOptionWidget( null, { '$': this.$, 'label':
ve.msg( 'visualeditor-dialog-language-auto-direction' ) } ),
new OO.ui.ButtonOptionWidget( 'ltr', { '$': this.$, 'icon':
'text-dir-ltr' } )
] );
--
To view, visit https://gerrit.wikimedia.org/r/133232
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6febe80a8a09f6b311a10a9e7a42573832388b4
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use message function and correct message key - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Use message function and correct message key
..
Use message function and correct message key
Fixes I48ff51af9.
Change-Id: Id6febe80a8a09f6b311a10a9e7a42573832388b4
---
M modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
b/modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
index 818cd26..93b730e 100644
--- a/modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
+++ b/modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
@@ -36,7 +36,7 @@
'classes': [ 've-ui-languageInputWidget-directionSelect' ],
} ).addItems( [
new OO.ui.ButtonOptionWidget( 'rtl', { '$': this.$, 'icon':
'text-dir-rtl' } ),
- new OO.ui.ButtonOptionWidget( null, { '$': this.$, 'label':
'text-dir-auto' } ),
+ new OO.ui.ButtonOptionWidget( null, { '$': this.$, 'label':
ve.msg( 'visualeditor-dialog-language-auto-direction' ) } ),
new OO.ui.ButtonOptionWidget( 'ltr', { '$': this.$, 'icon':
'text-dir-ltr' } )
] );
--
To view, visit https://gerrit.wikimedia.org/r/133232
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id6febe80a8a09f6b311a10a9e7a42573832388b4
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Trevor Parscal tpars...@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 ApiFlowViewTopicList - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133233
Change subject: Add ApiFlowViewTopicList
..
Add ApiFlowViewTopicList
Adds a new API module, similar to the existing ones, to request a
a list of topics.
Note that I'm including 'render' as submodule-parameter.
The better way would be to make use of the 'render' param in ApiFlow.php,
but this server-side rendering will go away anyway.
Figure it's better to keep it as-is for now, and just get rid of it
altogether once client-side rendering is in place.
Change-Id: I659687cbd1563ced0a5e9d7ae9514a62b0b43474
---
M Flow.php
M includes/Block/TopicList.php
M includes/api/ApiFlow.php
A includes/api/ApiFlowViewTopicList.php
4 files changed, 71 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/33/133233/1
diff --git a/Flow.php b/Flow.php
index a8d2208..a65c44a 100755
--- a/Flow.php
+++ b/Flow.php
@@ -229,6 +229,7 @@
$wgAutoloadClasses['ApiFlowModerateTopic'] =
$dir/includes/api/ApiFlowModerateTopic.php;
$wgAutoloadClasses['ApiFlowNewTopic'] =
$dir/includes/api/ApiFlowNewTopic.php;
$wgAutoloadClasses['ApiFlowReply'] = $dir/includes/api/ApiFlowReply.php;
+$wgAutoloadClasses['ApiFlowViewTopicList'] =
$dir/includes/api/ApiFlowViewTopicList.php;
$wgAutoloadClasses['ApiFlowViewPost'] =
$dir/includes/api/ApiFlowViewPost.php;
$wgAutoloadClasses['ApiFlowViewTopic'] =
$dir/includes/api/ApiFlowViewTopic.php;
$wgAutoloadClasses['ApiFlowViewHeader'] =
$dir/includes/api/ApiFlowViewHeader.php;
diff --git a/includes/Block/TopicList.php b/includes/Block/TopicList.php
index bebdb7a..8d73106 100644
--- a/includes/Block/TopicList.php
+++ b/includes/Block/TopicList.php
@@ -27,7 +27,7 @@
/**
* @var array
*/
- protected $supportedGetActions = array( 'view' );
+ protected $supportedGetActions = array( 'view', 'topiclist-view' );
/**
* @var Workflow|null
@@ -255,17 +255,17 @@
// Compute offset/limit
$limit = $this-getLimit( $requestOptions );
- if ( isset( $requestOptions['offset-id'] ) ) {
+ if ( isset( $requestOptions['offset-id'] )
$requestOptions['offset-id'] ) {
$findOptions['pager-offset'] = UUID::create(
$requestOptions['offset-id'] );
- } elseif ( isset( $requestOptions['offset'] ) ) {
+ } elseif ( isset( $requestOptions['offset'] )
$requestOptions['offset'] ) {
$findOptions['pager-offset'] = intval(
$requestOptions['offset'] );
}
- if ( isset( $requestOptions['offset-dir'] ) ) {
+ if ( isset( $requestOptions['offset-dir'] )
$requestOptions['offset-dir'] ) {
$findOptions['pager-dir'] =
$requestOptions['offset-dir'];
}
- if ( isset( $requestOptions['api'] ) ) {
+ if ( isset( $requestOptions['api'] ) $requestOptions['api']
) {
$findOptions['offset-elastic'] = false;
}
diff --git a/includes/api/ApiFlow.php b/includes/api/ApiFlow.php
index e8bf2ea..8a116f2 100644
--- a/includes/api/ApiFlow.php
+++ b/includes/api/ApiFlow.php
@@ -23,6 +23,7 @@
// GET
// action 'view' exists in Topic.php TopicList.php, for
topic, post
// topiclist - we'll want to know topic-/post- or
topiclist-view ;)
+ 'topiclist-view' = 'ApiFlowViewTopicList',
'post-view' = 'ApiFlowViewPost',
'topic-view' = 'ApiFlowViewTopic',
'header-view' = 'ApiFlowViewHeader',
diff --git a/includes/api/ApiFlowViewTopicList.php
b/includes/api/ApiFlowViewTopicList.php
new file mode 100644
index 000..6542d45
--- /dev/null
+++ b/includes/api/ApiFlowViewTopicList.php
@@ -0,0 +1,64 @@
+?php
+
+class ApiFlowViewTopicList extends ApiFlowBaseGet {
+ public function __construct( $api, $modName ) {
+ parent::__construct( $api, $modName, 'vtl' );
+ }
+
+ /**
+* Taken from ext.flow.base.js
+*
+* @return array
+*/
+ protected function getBlockNames() {
+ return array( 'topiclist' );
+ }
+
+ protected function getAction() {
+ return 'topiclist-view';
+ }
+
+ public function getAllowedParams() {
+ global $wgFlowDefaultLimit;
+
+ return array(
+ 'offset-dir' = array(
+ ApiBase::PARAM_TYPE = array( 'fwd', 'rev' ),
+ ApiBase::PARAM_DFLT = 'fwd',
+ ),
+ 'offset-id' = array(
+ ApiBase::PARAM_TYPE = 'string',
+ ApiBase::PARAM_REQUIRED = false,
+
[MediaWiki-commits] [Gerrit] Avoid SiteSQLStore::newInstance and the deprecated Sites class - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid SiteSQLStore::newInstance and the deprecated Sites class
..
Avoid SiteSQLStore::newInstance and the deprecated Sites class
Due to the fact that the SiteStore which is used by most of the
production code is being cached now, just using TestSites::insertIntoDb
wont work anymore as that doesn't affect the cache of the other
SiteStore instances.
Bug: 64743
Change-Id: Ifed24937ee5af3cc723451621ddfc6a272b737df
---
M client/WikibaseClient.hooks.php
M client/includes/ChangeHandler.php
M client/includes/WikibaseClient.php
M client/includes/modules/SiteModule.php
M client/includes/parserhooks/NoLangLinkHandler.php
M client/includes/store/sql/DirectSqlStore.php
M client/tests/phpunit/includes/ChangeHandlerTest.php
M lib/includes/Utils.php
M lib/includes/modules/SitesModule.php
M lib/includes/serializers/ItemSerializer.php
M lib/includes/serializers/SerializerFactory.php
M lib/tests/phpunit/serializers/ItemSerializerTest.php
M repo/includes/EntityContentDiffView.php
M repo/includes/ItemView.php
M repo/includes/UpdateRepoOnMoveJob.php
M repo/includes/WikibaseRepo.php
M repo/includes/actions/EditEntityAction.php
M repo/includes/api/GetEntities.php
M repo/includes/api/LinkTitles.php
M repo/includes/api/ModifyEntity.php
M repo/includes/specials/SpecialEntityData.php
M repo/includes/specials/SpecialNewItem.php
M repo/includes/specials/SpecialSetSiteLink.php
M repo/includes/specials/SpecialWikibaseRepoPage.php
M repo/tests/phpunit/includes/ItemMoveTest.php
M repo/tests/phpunit/includes/actions/ActionTestCase.php
M repo/tests/phpunit/includes/actions/EditEntityActionTest.php
M repo/tests/phpunit/includes/api/IndependentWikibaseApiTestCase.php
M repo/tests/phpunit/includes/api/IntegrationApiTest.php
M repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
M repo/tests/phpunit/includes/content/EntityContentTest.php
M repo/tests/phpunit/includes/content/ItemContentTest.php
M repo/tests/phpunit/includes/specials/SpecialSetSitelinkTest.php
M repo/tests/phpunit/includes/updates/ItemDeletionUpdateTest.php
M repo/tests/phpunit/includes/updates/ItemModificationUpdateTest.php
35 files changed, 126 insertions(+), 125 deletions(-)
Approvals:
WikidataJenkins: Verified
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index e8cdde8..b17de43 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -21,8 +21,6 @@
use RuntimeException;
use SpecialWatchlist;
use SplFileInfo;
-use Sites;
-use SiteSQLStore;
use Skin;
use SpecialRecentChanges;
use StripState;
@@ -368,7 +366,7 @@
$settings-getSetting( 'siteGlobalID' ),
$wikibaseClient-getNamespaceChecker(),
$wikibaseClient-getStore()-getSiteLinkTable(),
- Sites::singleton(),
+ $wikibaseClient-getSiteStore(),
$wikibaseClient-getLangLinkSiteGroup()
);
@@ -587,7 +585,7 @@
$generator = new OtherProjectsSidebarGenerator(
$settings-getSetting( 'siteGlobalID' ),
WikibaseClient::getDefaultInstance()-getStore()-getSiteLinkTable(),
- SiteSQLStore::newInstance(),
+ WikibaseClient::getDefaultInstance()-getSiteStore(),
$siteIdsToOutput
);
diff --git a/client/includes/ChangeHandler.php
b/client/includes/ChangeHandler.php
index f12c541..7bb0220 100644
--- a/client/includes/ChangeHandler.php
+++ b/client/includes/ChangeHandler.php
@@ -5,7 +5,6 @@
use MWException;
use Site;
use SiteList;
-use Sites;
use Title;
use Wikibase\Client\WikibaseClient;
@@ -109,7 +108,7 @@
$settings = $wikibaseClient-getSettings();
if ( $sites === null ) {
- $sites = Sites::singleton()-getSites();
+ $sites = $wikibaseClient-getSiteStore()-getSites();
}
$this-sites = $sites;
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index db4db48..b293e8a 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -8,7 +8,6 @@
use MediaWikiSite;
use MWException;
use Site;
-use Sites;
use SiteSQLStore;
use SiteStore;
use ValueFormatters\FormatterOptions;
@@ -19,7 +18,6 @@
use Wikibase\EntityLookup;
use Wikibase\LangLinkHandler;
use Wikibase\LanguageFallbackChainFactory;
-use Wikibase\Lib\EntityIdFormatter;
use Wikibase\Lib\EntityIdLabelFormatter;
use Wikibase\Lib\EntityRetrievingDataTypeLookup;
use Wikibase\Lib\OutputFormatSnakFormatterFactory;
@@ -371,7 +369,7 @@
* This is taken from the siteGlobalID setting, which defaults
* to the wiki's
[MediaWiki-commits] [Gerrit] Deprecate existing read API - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133234
Change subject: Deprecate existing read API
..
Deprecate existing read API
Change-Id: Iaf2b108596be3065a6bc9cea5d9608df6a82c8e2
---
M includes/api/ApiQueryFlow.php
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/34/133234/1
diff --git a/includes/api/ApiQueryFlow.php b/includes/api/ApiQueryFlow.php
index 35490c3..37d0a69 100644
--- a/includes/api/ApiQueryFlow.php
+++ b/includes/api/ApiQueryFlow.php
@@ -2,6 +2,12 @@
use Flow\Model\UUID;
+/**
+ * This API is deprecated and should not be used. Instead use
+ * ApiFlowView(Header|Post|Topic|TopicList|TopicSummary)
+ *
+ * @deprecated
+ */
class ApiQueryFlow extends ApiQueryBase {
protected $loader, $workflow, $definition, $container;
@@ -50,6 +56,7 @@
$this-getResult()-setIndexedTagName( $result, 'block' );
$this-getResult()-addValue( 'query', $this-getModuleName(),
$result );
+ $this-setWarning( 'This API is deprecated and should not be
used. Instead use ApiFlowView(Header|Post|Topic|TopicList|TopicSummary).' );
}
public function getAllowedParams() {
--
To view, visit https://gerrit.wikimedia.org/r/133234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf2b108596be3065a6bc9cea5d9608df6a82c8e2
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] [WIP] Add mw.track calls for jquery.migrate - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133235
Change subject: [WIP] Add mw.track calls for jquery.migrate
..
[WIP] Add mw.track calls for jquery.migrate
Can't use mw.log.deprecate because many of these are fired
for specific behaviour within a method, not the method access
entirely.
And mustn't fire the events with topic mw.deprecate we can't
give it a search string to find in offending code. I've added
some generic keys that will make it easier to group these in
the event logging infrastructure, but unless we start passing
complex regexes, there is no way we can pass it something that
mw.inspect.grep in the WikimediaEvents extension can find. These
tracking hits would be for hit counts only, not for finding where
it comes from.
Change-Id: I6c868f2ce831d74889ed58b6ab4a69b233b3923f
---
M resources/Resources.php
R resources/src/jquery/jquery.migrate.js
2 files changed, 54 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/35/133235/1
diff --git a/resources/Resources.php b/resources/Resources.php
index abc1661..465972e 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -191,7 +191,7 @@
'jquery' = array(
'scripts' = 'resources/lib/jquery/jquery.js',
- 'debugScripts' = 'resources/lib/jquery/jquery.migrate.js',
+ 'debugScripts' = 'resources/src/jquery/jquery.migrate.js',
'debugRaw' = false,
'targets' = array( 'desktop', 'mobile' ),
),
diff --git a/resources/lib/jquery/jquery.migrate.js
b/resources/src/jquery/jquery.migrate.js
similarity index 90%
rename from resources/lib/jquery/jquery.migrate.js
rename to resources/src/jquery/jquery.migrate.js
index 25b6c81..b48bd45 100644
--- a/resources/lib/jquery/jquery.migrate.js
+++ b/resources/src/jquery/jquery.migrate.js
@@ -32,8 +32,36 @@
jQuery.migrateWarnings.length = 0;
};
-function migrateWarn( msg) {
+function migrateWarn( msg, key ) {
var console = window.console;
+ /*
+ MediaWiki patch for tracking usage.
+
+ Custom keys:
+ - andSelf
+ - attr-pass
+ - attr-prop
+ - bind-error
+ - clean
+ - create-html
+ - data-events
+ - die
+ - event-ajax
+ - event-global
+ - event-hover
+ - event-handle
+ - input-type
+ - json-invalid
+ - live
+ - sub
+ - toggle-handle
+
+ Prop keys:
+ - attrFn
+ - browser
+ */
+ mw.track( jquery.migrate, key || unknown );
+
if ( !warnedAbout[ msg ] ) {
warnedAbout[ msg ] = true;
jQuery.migrateWarnings.push( msg );
@@ -46,7 +74,7 @@
}
}
-function migrateWarnProp( obj, prop, value, msg ) {
+function migrateWarnProp( obj, prop, value, msg, key ) {
if ( Object.defineProperty ) {
// On ES5 browsers (non-oldIE), warn if the code tries to get
prop;
// allow property to be overwritten in case some other plugin
wants it
@@ -55,11 +83,11 @@
configurable: true,
enumerable: true,
get: function() {
- migrateWarn( msg );
+ migrateWarn( msg, key || prop );
return value;
},
set: function( newValue ) {
- migrateWarn( msg );
+ migrateWarn( msg, key || prop );
value = newValue;
}
});
@@ -102,7 +130,7 @@
// Since pass is used internally, we only warn for new jQuery
// versions where there isn't a pass arg in the formal params
if ( oldAttr.length 4 ) {
- migrateWarn(jQuery.fn.attr( props, pass ) is
deprecated);
+ migrateWarn(jQuery.fn.attr( props, pass ) is
deprecated, attr-pass );
}
if ( elem !rnoAttrNodeType.test( nType )
(attrFn ? name in attrFn :
jQuery.isFunction(jQuery.fn[name])) ) {
@@ -113,7 +141,7 @@
// Warn if user tries to set `type`, since it breaks on IE 6/7/8; by
checking
// for disconnected elements we don't warn on $( button, { type:
button } ).
if ( name === type value !== undefined rnoType.test(
elem.nodeName ) elem.parentNode ) {
- migrateWarn(Can't change the 'type' of an input or button in
IE 6/7/8);
[MediaWiki-commits] [Gerrit] updated links in README - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: updated links in README .. updated links in README Change-Id: I332246f928242470e6951b8778126fde8a69c561 --- M README.md 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: Tobias Gritschacher: Looks good to me, approved WikidataJenkins: Verified jenkins-bot: Verified diff --git a/README.md b/README.md index c9d72f6..5745f1d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,11 @@ -# Wikibase.git +- - - +Introduction to Wikibase + -[](http://travis-ci.org/wikimedia/mediawiki-extensions-Wikibase) -[](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-Wikibase/) +[Travis Build Status](http://travis-ci.org/wikimedia/mediawiki-extensions-Wikibase/): + +[Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wikimedia/mediawiki-extensions-Wikibase/): + The Wikibase.git package is part of the [Wikibase software](http://wikiba.se/) and consists of three interconnected extensions: -- To view, visit https://gerrit.wikimedia.org/r/133231 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I332246f928242470e6951b8778126fde8a69c561 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix carbon destinations with additional workers - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: fix carbon destinations with additional workers .. fix carbon destinations with additional workers Change-Id: I252cfbe131b27d3c4059baba56037f696fd89aba --- M manifests/role/graphite.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved Giuseppe Lavagetto: Looks good to me, but someone else must approve diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp index bdb6dd5..990f422 100644 --- a/manifests/role/graphite.pp +++ b/manifests/role/graphite.pp @@ -122,8 +122,8 @@ '127.0.0.1:2404:d', '127.0.0.1:2504:e', '127.0.0.1:2604:f', -'127.0.0.1:2604:g', -'127.0.0.1:2604:h', +'127.0.0.1:2704:g', +'127.0.0.1:2804:h', ], }, }, -- To view, visit https://gerrit.wikimedia.org/r/133226 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I252cfbe131b27d3c4059baba56037f696fd89aba Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Load dependencies in correct order - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133237
Change subject: Load dependencies in correct order
..
Load dependencies in correct order
Pre-concating the dependencies loads them in reverse order.
Change-Id: I676137204c20e6833008ec028cc9773f5a33edf2
---
M build/tasks/buildloader.js
1 file changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/37/133237/1
diff --git a/build/tasks/buildloader.js b/build/tasks/buildloader.js
index 33736d3..0a3196f 100644
--- a/build/tasks/buildloader.js
+++ b/build/tasks/buildloader.js
@@ -41,8 +41,10 @@
return true;
}
- function buildDependencyList( modules, load ) {
- var i, j, k, module, list = [];
+ function buildDependencyList( modules, load, list ) {
+ var i, j, k, module;
+
+ list = list || [];
for ( i = 0; i load.length; i++ ) {
module = load[i];
@@ -53,8 +55,7 @@
// Add in any dependencies
if ( modules[module].hasOwnProperty(
'dependencies' ) ) {
- list = buildDependencyList( modules,
modules[module].dependencies )
- .concat( list );
+ buildDependencyList( modules,
modules[module].dependencies, list );
}
// Append target load module to the end of the
current list
--
To view, visit https://gerrit.wikimedia.org/r/133237
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I676137204c20e6833008ec028cc9773f5a33edf2
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add test files to dependency tree - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133239
Change subject: Add test files to dependency tree
..
Add test files to dependency tree
Change-Id: I03d70b76f48c09f5e41593b403809f8b5c041f9c
---
M Gruntfile.js
M build/modules.json
M build/tasks/buildloader.js
M modules/ve/test/index.html
M modules/ve/test/index.html.template
5 files changed, 213 insertions(+), 189 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/39/133239/1
diff --git a/Gruntfile.js b/Gruntfile.js
index f950c58..f8faa99 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -69,7 +69,10 @@
targetFile: 'modules/ve/test/index.html',
template: 'modules/ve/test/index.html.template',
modules: modules,
- load: [ 'visualEditor.desktop.standalone' ],
+ env: {
+ test: true
+ },
+ load: [ 'visualEditor.test' ],
pathPrefix: '../../../',
indent: '\t\t'
}
diff --git a/build/modules.json b/build/modules.json
index adcd50c..22f5e62 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -4,6 +4,23 @@
lib/jquery/jquery.js
]
},
+ qunit: {
+ scripts: [
+ lib/qunit/qunit.js
+ ],
+ styles: [
+ { file: lib/qunit/qunit.css, test: true }
+ ]
+ },
+ jsdifflib: {
+ scripts: [
+ lib/jsdifflib/diffview.js,
+ lib/jsdifflib/difflib.js
+ ],
+ styles: [
+ { file: lib/jsdifflib/diffview.css, test: true }
+ ]
+ },
oojs: {
scripts: [
lib/oojs/oojs.js
@@ -301,6 +318,87 @@
visualEditor.base
]
},
+ visualEditor.test: {
+ scripts: [
+ modules/ve/test/ve.qunit.js,
+ modules/ve/test/ve.test.utils.js,
+ modules/ve/test/ve.test.js,
+ modules/ve/test/ve.Range.test.js,
+ modules/ve/test/ve.Document.test.js,
+ modules/ve/test/ve.Node.test.js,
+ modules/ve/test/ve.BranchNode.test.js,
+ modules/ve/test/ve.LeafNode.test.js,
+ modules/ve/test/dm/ve.dm.example.js,
+ modules/ve/test/dm/ve.dm.AnnotationSet.test.js,
+ modules/ve/test/dm/ve.dm.NodeFactory.test.js,
+ modules/ve/test/dm/ve.dm.Node.test.js,
+ modules/ve/test/dm/ve.dm.Converter.test.js,
+ modules/ve/test/dm/ve.dm.BranchNode.test.js,
+ modules/ve/test/dm/ve.dm.LeafNode.test.js,
+ modules/ve/test/dm/nodes/ve.dm.TextNode.test.js,
+ modules/ve/test/dm/ve.dm.Document.test.js,
+ modules/ve/test/dm/ve.dm.DocumentSynchronizer.test.js,
+ modules/ve/test/dm/ve.dm.IndexValueStore.test.js,
+ modules/ve/test/dm/ve.dm.InternalList.test.js,
+ modules/ve/test/dm/ve.dm.LinearData.test.js,
+ modules/ve/test/dm/ve.dm.Transaction.test.js,
+ modules/ve/test/dm/ve.dm.TransactionProcessor.test.js,
+ modules/ve/test/dm/ve.dm.Surface.test.js,
+ modules/ve/test/dm/ve.dm.SurfaceFragment.test.js,
+ modules/ve/test/dm/ve.dm.ModelRegistry.test.js,
+ modules/ve/test/dm/ve.dm.MetaList.test.js,
+ modules/ve/test/dm/ve.dm.Model.test.js,
+
modules/ve/test/dm/lineardata/ve.dm.FlatLinearData.test.js,
+
modules/ve/test/dm/lineardata/ve.dm.ElementLinearData.test.js,
+
modules/ve/test/dm/lineardata/ve.dm.MetaLinearData.test.js,
+ modules/ve/test/ce/ve.ce.test.js,
+ modules/ve/test/ce/ve.ce.Document.test.js,
+ modules/ve/test/ce/ve.ce.Surface.test.js,
+ modules/ve/test/ce/ve.ce.NodeFactory.test.js,
+ modules/ve/test/ce/ve.ce.Node.test.js,
+ modules/ve/test/ce/ve.ce.BranchNode.test.js,
+ modules/ve/test/ce/ve.ce.ContentBranchNode.test.js,
+ modules/ve/test/ce/ve.ce.LeafNode.test.js,
+
[MediaWiki-commits] [Gerrit] exim: fix scoping - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: exim: fix scoping
..
exim: fix scoping
Change-Id: I30cb22bbe1629de38a34b119455a43662bcc2d2c
---
M templates/exim/exim4.donate.erb
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/exim/exim4.donate.erb b/templates/exim/exim4.donate.erb
index 84a2b92..c8626be 100644
--- a/templates/exim/exim4.donate.erb
+++ b/templates/exim/exim4.donate.erb
@@ -132,7 +132,7 @@
allow_defer
forbid_file
-% if exim_bounce_collector == true then -%
+% if scope.lookupvar('role::fundraising::civicrm::exim_bounce_collector') ==
true then -%
# Deliver bounce-*@donate.wikimedia.org to mbox
bounce_mail:
@@ -161,7 +161,7 @@
driver = smtp
hosts_avoid_tls = ; 0.0.0.0/0 ; 0::0/0
connection_max_messages = 300
-% if exim_signs_dkim == true then -%
+% if scope.lookupvar('role::fundraising::civicrm::exim_signs_dkim') == true
then -%
dkim_domain = wikimedia.org
dkim_selector = fundraising
dkim_private_key = /etc/exim4/wikimedia.org-fundraising-private.key
@@ -178,7 +178,7 @@
command_timeout = 30s
data_timeout = 30s
final_timeout = 1m
-% if exim_signs_dkim == true then -%
+% if scope.lookupvar('role::fundraising::civicrm::exim_signs_dkim') == true
then -%
dkim_domain = wikimedia.org
dkim_selector = fundraising
dkim_private_key = /etc/exim4/wikimedia.org-fundraising-private.key
@@ -204,7 +204,7 @@
user = civimail
group = civimail
-% if exim_bounce_collector == true then -%
+% if scope.lookupvar('role::fundraising::civicrm::exim_bounce_collector') ==
true then -%
bounce_mail_delivery:
driver = appendfile
file = /var/mail/bounce
--
To view, visit https://gerrit.wikimedia.org/r/119496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I30cb22bbe1629de38a34b119455a43662bcc2d2c
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Jgreen jgr...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Also remove NToC and TemplateEditor images - change (mediawiki...WikiEditor)
TheDJ has uploaded a new change for review. https://gerrit.wikimedia.org/r/133240 Change subject: Also remove NToC and TemplateEditor images .. Also remove NToC and TemplateEditor images In I0f53a68e50fc950d7f407ee81b2bf0d81ef4948d and I47119d6cfdde4b40ff5b07be0c7d327b80598142 I forgot to remove the images of the corresponding modules. Change-Id: I8de59f6ce54d0cc7f67f56853386d4338c693b98 --- D modules/images/templateEditor/collapse.png D modules/images/templateEditor/dialog-collapsed.png D modules/images/templateEditor/dialog-expanded.png D modules/images/templateEditor/expand.png D modules/images/templateEditor/name-base.png D modules/images/templateEditor/text-base.png D modules/images/templateEditor/wiki-text.png D modules/images/toc/close.png D modules/images/toc/grab.png D modules/images/toc/grip.png D modules/images/toc/open.png 11 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor refs/changes/40/133240/1 diff --git a/modules/images/templateEditor/collapse.png b/modules/images/templateEditor/collapse.png deleted file mode 100644 index b155a18..000 --- a/modules/images/templateEditor/collapse.png +++ /dev/null Binary files differ diff --git a/modules/images/templateEditor/dialog-collapsed.png b/modules/images/templateEditor/dialog-collapsed.png deleted file mode 100644 index 0cb8382..000 --- a/modules/images/templateEditor/dialog-collapsed.png +++ /dev/null Binary files differ diff --git a/modules/images/templateEditor/dialog-expanded.png b/modules/images/templateEditor/dialog-expanded.png deleted file mode 100644 index 8cd3a8b..000 --- a/modules/images/templateEditor/dialog-expanded.png +++ /dev/null Binary files differ diff --git a/modules/images/templateEditor/expand.png b/modules/images/templateEditor/expand.png deleted file mode 100644 index 1db8041..000 --- a/modules/images/templateEditor/expand.png +++ /dev/null Binary files differ diff --git a/modules/images/templateEditor/name-base.png b/modules/images/templateEditor/name-base.png deleted file mode 100644 index 0d1cce7..000 --- a/modules/images/templateEditor/name-base.png +++ /dev/null Binary files differ diff --git a/modules/images/templateEditor/text-base.png b/modules/images/templateEditor/text-base.png deleted file mode 100644 index 8fda004..000 --- a/modules/images/templateEditor/text-base.png +++ /dev/null Binary files differ diff --git a/modules/images/templateEditor/wiki-text.png b/modules/images/templateEditor/wiki-text.png deleted file mode 100644 index 44afb4d..000 --- a/modules/images/templateEditor/wiki-text.png +++ /dev/null Binary files differ diff --git a/modules/images/toc/close.png b/modules/images/toc/close.png deleted file mode 100644 index a540856..000 --- a/modules/images/toc/close.png +++ /dev/null Binary files differ diff --git a/modules/images/toc/grab.png b/modules/images/toc/grab.png deleted file mode 100644 index 6291ec8..000 --- a/modules/images/toc/grab.png +++ /dev/null Binary files differ diff --git a/modules/images/toc/grip.png b/modules/images/toc/grip.png deleted file mode 100644 index 0789851..000 --- a/modules/images/toc/grip.png +++ /dev/null Binary files differ diff --git a/modules/images/toc/open.png b/modules/images/toc/open.png deleted file mode 100644 index c782beb..000 --- a/modules/images/toc/open.png +++ /dev/null Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/133240 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8de59f6ce54d0cc7f67f56853386d4338c693b98 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiEditor Gerrit-Branch: master Gerrit-Owner: TheDJ hartman.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Create phantom/shield nodes with methods not templates - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133236
Change subject: Create phantom/shield nodes with methods not templates
..
Create phantom/shield nodes with methods not templates
Templates have the following problems:
* Static, so don't have access to this.*, hence the
importNode hack.
* Run on file node, so potential load order issues
with things like ve.msg.
Change-Id: Ia7f6a2b7ac10b111bcd7245aa96c8ec9bfb183fb
---
M modules/ve/ce/nodes/ve.ce.AlienNode.js
M modules/ve/ce/ve.ce.ProtectedNode.js
2 files changed, 33 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/36/133236/1
diff --git a/modules/ve/ce/nodes/ve.ce.AlienNode.js
b/modules/ve/ce/nodes/ve.ce.AlienNode.js
index 6af1e09..fb2515e 100644
--- a/modules/ve/ce/nodes/ve.ce.AlienNode.js
+++ b/modules/ve/ce/nodes/ve.ce.AlienNode.js
@@ -42,12 +42,21 @@
ve.ce.AlienNode.static.name = 'alien';
-ve.ce.AlienNode.static.$phantomTemplate =
ve.ce.AlienNode.static.$phantomTemplate.clone()
- .addClass( 've-ce-alienNode-phantom' )
- .attr( 'title', ve.msg( 'visualeditor-aliennode-tooltip' ) );
-
/* Methods */
+/**
+ * @inheritDoc
+ */
+ve.ce.AlienNode.prototype.createPhantom = function () {
+ // Mixin method
+ return ve.ce.ProtectedNode.prototype.createPhantom.call( this )
+ .addClass( 've-ce-alienNode-phantom' )
+ .attr( 'title', ve.msg( 'visualeditor-aliennode-tooltip' ) );
+};
+
+/**
+ * @inheritDoc
+ */
ve.ce.AlienNode.prototype.generateContents = function ( config ) {
var deferred = $.Deferred();
deferred.resolve( ( config config.domElements ) ||
this.model.getAttribute( 'domElements' ) || [] );
diff --git a/modules/ve/ce/ve.ce.ProtectedNode.js
b/modules/ve/ce/ve.ce.ProtectedNode.js
index 3411e7e..f3342ca 100644
--- a/modules/ve/ce/ve.ce.ProtectedNode.js
+++ b/modules/ve/ce/ve.ce.ProtectedNode.js
@@ -34,31 +34,31 @@
ve.ce.ProtectedNode.static = {};
+/* Methods */
+
/**
- * Template for shield elements.
+ * Create a shield element.
*
* Uses data URI to inject a 1x1 transparent GIF image into the DOM.
*
- * @property {jQuery}
- * @static
- * @inheritable
+ * @returns {jQuery} A shield element
*/
-ve.ce.ProtectedNode.static.$shieldTemplate = $( 'img' )
- .addClass( 've-ce-protectedNode-shield' )
- .attr( 'src',
'data:image/gif;base64,R0lGODlhAQABAIAAAP///yH5BAEALAABAAEAAAIBRAA7'
);
+ve.ce.ProtectedNode.prototype.createShield = function () {
+ return this.$( 'img' )
+ .addClass( 've-ce-protectedNode-shield' )
+ .attr( 'src',
'data:image/gif;base64,R0lGODlhAQABAIAAAP///yH5BAEALAABAAEAAAIBRAA7'
);
+};
/**
- * Phantom element template.
+ * Create a phantom element.
*
- * @property {jQuery}
- * @static
- * @inheritable
+ * @returns {jQuery} A phantom element
*/
-ve.ce.ProtectedNode.static.$phantomTemplate = $( 'div' )
- .addClass( 've-ce-protectedNode-phantom' )
- .attr( 'draggable', false );
-
-/* Methods */
+ve.ce.ProtectedNode.prototype.createPhantom = function () {
+ return this.$( 'div' )
+ .addClass( 've-ce-protectedNode-phantom' )
+ .attr( 'draggable', false );
+};
/**
* Handle setup events.
@@ -67,8 +67,7 @@
*/
ve.ce.ProtectedNode.prototype.onProtectedSetup = function () {
var $shield,
- node = this,
- $shieldTemplate = this.constructor.static.$shieldTemplate;
+ node = this;
// Exit if already setup or not unattached
if ( this.isSetup || !this.root ) {
@@ -97,7 +96,7 @@
) {
return;
}
- $shield = node.$( node.$.context.importNode(
$shieldTemplate[0], true ) )
+ $shield = node.createShield()
.appendTo( $this )
.on( 'dblclick', function () {
node.emit( 'dblclick' );
@@ -219,14 +218,13 @@
* @method
*/
ve.ce.ProtectedNode.prototype.createPhantoms = function () {
- var $phantomTemplate = this.constructor.static.$phantomTemplate,
- surface = this.root.getSurface(),
+ var surface = this.root.getSurface(),
node = this;
this.$phantomable.find( '.ve-ce-protectedNode-shield:visible' ).each(
ve.bind( function () {
this.$phantoms = this.$phantoms.add(
- this.$( this.$.context.importNode(
$phantomTemplate[0], true ) )
+ this.createPhantom()
.on( 'mousedown', ve.bind(
this.onPhantomMouseDown, this ) )
.on( 'dblclick', function () {
[MediaWiki-commits] [Gerrit] Clarify messages about identical files and titles - change (mediawiki...GWToolset)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/133241 Change subject: Clarify messages about identical files and titles .. Clarify messages about identical files and titles Rephrased them to be less repetitive and more easily readable and translatable. Change-Id: I0f733a0a6d395c5869bae8d03b4b288539e4aa4e --- M i18n/en.json 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GWToolset refs/changes/41/133241/1 diff --git a/i18n/en.json b/i18n/en.json index baa032d..ee71b1c 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -24,9 +24,9 @@ gwtoolset-ignorewarnings: codeignorewarnings/code not set., gwtoolset-incorrect-form-handler: The module \$1\ has not registered a form handler extending GWToolset\\Handlers\\Forms\\FormHandler., gwtoolset-job-throttle-exceeded: The batch job throttle was exceeded., - gwtoolset-mediafile-duplicate-another-title: A version of this mediafile already exists under another title; other title: $1., - gwtoolset-mediafile-duplicate-same-title: This title already exists and has this mediafile already associated with it; existing title, $1., - gwtoolset-mediafile-other-contributors: This title already exists in the wiki and was edited or created by someone other than you; existing title, $1., + gwtoolset-mediafile-duplicate-another-title: An identical media file already exists under the title \$1\., + gwtoolset-mediafile-duplicate-same-title: This media file already exists and has the same title \$1\., + gwtoolset-mediafile-other-contributors: A media file with the identical title \$1\ already exists in the wiki. It was edited or created by someone other than you., gwtoolset-no-accepted-types: No accepted types provided., gwtoolset-no-callback: No callback passed to this method., gwtoolset-no-comment: codeuser_options['comment']/code not set., -- To view, visit https://gerrit.wikimedia.org/r/133241 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f733a0a6d395c5869bae8d03b4b288539e4aa4e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GWToolset Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added more credits to the English i18n file - change (mediawiki...GWToolset)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133242
Change subject: Added more credits to the English i18n file
..
Added more credits to the English i18n file
Change-Id: Ibf9a7a31457de282570902adc7b8af5f94758e3a
---
M i18n/en.json
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GWToolset
refs/changes/42/133242/1
diff --git a/i18n/en.json b/i18n/en.json
index ee71b1c..3a6258b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,7 +1,11 @@
{
@metadata: {
authors: [
- dan-nl
+ dan-nl,
+ Brian Wolff,
+ Siebrand Mazeland,
+ Shirayuki,
+ Amir E. Aharoni
]
},
gwtoolset: GWToolset,
--
To view, visit https://gerrit.wikimedia.org/r/133242
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf9a7a31457de282570902adc7b8af5f94758e3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GWToolset
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added missing i18n values for special properties, to avoid S... - change (mediawiki...SemanticDrilldown)
Yaron Koren has uploaded a new change for review. https://gerrit.wikimedia.org/r/133243 Change subject: Added missing i18n values for special properties, to avoid SMW errors .. Added missing i18n values for special properties, to avoid SMW errors Change-Id: Ieae6e6ce5c5cb41461e3cbdc62e5bd311ea9a106 --- M languages/SD_LanguageAr.php M languages/SD_LanguageArz.php M languages/SD_LanguageNl.php M languages/SD_LanguageZh_cn.php M languages/SD_LanguageZh_tw.php 5 files changed, 18 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticDrilldown refs/changes/43/133243/1 diff --git a/languages/SD_LanguageAr.php b/languages/SD_LanguageAr.php index 50dbda5..a405a5c 100644 --- a/languages/SD_LanguageAr.php +++ b/languages/SD_LanguageAr.php @@ -16,7 +16,10 @@ SD_SP_COVERS_PROPERTY = 'يغطي الخاصية', SD_SP_GETS_VALUES_FROM_CATEGORY = 'يحصل على القيم من التصنيف', //SD_SP_USES_TIME_PERIOD = 'يستخدم فترة زمنية', - SD_SP_HAS_LABEL = 'لديه العلامة' + SD_SP_HAS_LABEL = 'لديه العلامة', + // English stuff, to avoid crashes + SD_SP_REQUIRES_FILTER = 'Requires filter', + SD_SP_HAS_DISPLAY_PARAMETERS = 'Has display parameters', ); var $m_Namespaces = array( diff --git a/languages/SD_LanguageArz.php b/languages/SD_LanguageArz.php index c074393..8823224 100644 --- a/languages/SD_LanguageArz.php +++ b/languages/SD_LanguageArz.php @@ -16,7 +16,9 @@ SD_SP_COVERS_PROPERTY = 'يغطى الخاصية', SD_SP_GETS_VALUES_FROM_CATEGORY = 'يحصل على القيم من التصنيف', SD_SP_REQUIRES_FILTER = 'يتطلب الفلتر', - SD_SP_HAS_LABEL = 'لديه العلامة' + SD_SP_HAS_LABEL = 'لديه العلامة', + // English stuff, to avoid crashes + SD_SP_HAS_DISPLAY_PARAMETERS = 'Has display parameters', ); var $m_Namespaces = array( diff --git a/languages/SD_LanguageNl.php b/languages/SD_LanguageNl.php index 3fad2d9..e8d1b98 100644 --- a/languages/SD_LanguageNl.php +++ b/languages/SD_LanguageNl.php @@ -16,7 +16,9 @@ SD_SP_COVERS_PROPERTY = 'Omvat eigenschap', SD_SP_GETS_VALUES_FROM_CATEGORY = 'Haalt waarden uit categorie', SD_SP_REQUIRES_FILTER = 'Benodigt filter', - SD_SP_HAS_LABEL = 'Heeft label' + SD_SP_HAS_LABEL = 'Heeft label', + // display properties + SD_SP_HAS_DISPLAY_PARAMETERS= 'Heeft weergave parameters', ); var $m_Namespaces = array( diff --git a/languages/SD_LanguageZh_cn.php b/languages/SD_LanguageZh_cn.php index 49739d1..f9bf942 100644 --- a/languages/SD_LanguageZh_cn.php +++ b/languages/SD_LanguageZh_cn.php @@ -15,7 +15,10 @@ SD_SP_COVERS_PROPERTY = '涵盖性质', //'Covers property', SD_SP_GETS_VALUES_FROM_CATEGORY = '设分类为筛选值', //'Gets values from category', SD_SP_REQUIRES_FILTER = '基础筛选器', //'Requires filter', -SD_SP_HAS_LABEL = '设置标签' //'Has label' +SD_SP_HAS_LABEL = '设置标签', //'Has label' + // English stuff, to avoid crashes + SD_SP_HAS_DRILLDOWN_TITLE = 'Has drilldown title', + SD_SP_HAS_DISPLAY_PARAMETERS = 'Has display parameters', ); var $m_Namespaces = array( diff --git a/languages/SD_LanguageZh_tw.php b/languages/SD_LanguageZh_tw.php index f1c9cf0..2823a2e 100644 --- a/languages/SD_LanguageZh_tw.php +++ b/languages/SD_LanguageZh_tw.php @@ -15,7 +15,10 @@ SD_SP_COVERS_PROPERTY = '涵蓋性質', //'Covers property', SD_SP_GETS_VALUES_FROM_CATEGORY = '設分類為篩選值', //'Gets values from category', SD_SP_REQUIRES_FILTER = '基礎篩選器', //'Requires filter', -SD_SP_HAS_LABEL = '設置標籤' //'Has label' +SD_SP_HAS_LABEL = '設置標籤', //'Has label' + // English stuff, to avoid crashes + SD_SP_HAS_DRILLDOWN_TITLE = 'Has drilldown title', + SD_SP_HAS_DISPLAY_PARAMETERS = 'Has display parameters', ); var $m_Namespaces = array( -- To view, visit https://gerrit.wikimedia.org/r/133243 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieae6e6ce5c5cb41461e3cbdc62e5bd311ea9a106 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticDrilldown Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Release candidate 1.23.0-rc.1 - change (mediawiki/core)
MarkAHershberger has uploaded a new change for review. https://gerrit.wikimedia.org/r/133244 Change subject: Release candidate 1.23.0-rc.1 .. Release candidate 1.23.0-rc.1 Change-Id: Ibd20c01c5941e499e2d179f7610cdeca2713287f --- M includes/DefaultSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/44/133244/1 diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 7d5c63f..96fc113 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -70,7 +70,7 @@ * MediaWiki version number * @since 1.2 */ -$wgVersion = '1.23.0rc0'; +$wgVersion = '1.23.0-rc.1'; /** * Name of the site. It must be changed in LocalSettings.php -- To view, visit https://gerrit.wikimedia.org/r/133244 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd20c01c5941e499e2d179f7610cdeca2713287f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_23 Gerrit-Owner: MarkAHershberger m...@nichework.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added missing i18n values for special properties, to avoid S... - change (mediawiki...SemanticDrilldown)
jenkins-bot has submitted this change and it was merged. Change subject: Added missing i18n values for special properties, to avoid SMW errors .. Added missing i18n values for special properties, to avoid SMW errors Change-Id: Ieae6e6ce5c5cb41461e3cbdc62e5bd311ea9a106 --- M languages/SD_LanguageAr.php M languages/SD_LanguageArz.php M languages/SD_LanguageNl.php M languages/SD_LanguageZh_cn.php M languages/SD_LanguageZh_tw.php 5 files changed, 18 insertions(+), 5 deletions(-) Approvals: Yaron Koren: Checked; Looks good to me, approved jenkins-bot: Verified diff --git a/languages/SD_LanguageAr.php b/languages/SD_LanguageAr.php index 50dbda5..a405a5c 100644 --- a/languages/SD_LanguageAr.php +++ b/languages/SD_LanguageAr.php @@ -16,7 +16,10 @@ SD_SP_COVERS_PROPERTY = 'يغطي الخاصية', SD_SP_GETS_VALUES_FROM_CATEGORY = 'يحصل على القيم من التصنيف', //SD_SP_USES_TIME_PERIOD = 'يستخدم فترة زمنية', - SD_SP_HAS_LABEL = 'لديه العلامة' + SD_SP_HAS_LABEL = 'لديه العلامة', + // English stuff, to avoid crashes + SD_SP_REQUIRES_FILTER = 'Requires filter', + SD_SP_HAS_DISPLAY_PARAMETERS = 'Has display parameters', ); var $m_Namespaces = array( diff --git a/languages/SD_LanguageArz.php b/languages/SD_LanguageArz.php index c074393..8823224 100644 --- a/languages/SD_LanguageArz.php +++ b/languages/SD_LanguageArz.php @@ -16,7 +16,9 @@ SD_SP_COVERS_PROPERTY = 'يغطى الخاصية', SD_SP_GETS_VALUES_FROM_CATEGORY = 'يحصل على القيم من التصنيف', SD_SP_REQUIRES_FILTER = 'يتطلب الفلتر', - SD_SP_HAS_LABEL = 'لديه العلامة' + SD_SP_HAS_LABEL = 'لديه العلامة', + // English stuff, to avoid crashes + SD_SP_HAS_DISPLAY_PARAMETERS = 'Has display parameters', ); var $m_Namespaces = array( diff --git a/languages/SD_LanguageNl.php b/languages/SD_LanguageNl.php index 3fad2d9..e8d1b98 100644 --- a/languages/SD_LanguageNl.php +++ b/languages/SD_LanguageNl.php @@ -16,7 +16,9 @@ SD_SP_COVERS_PROPERTY = 'Omvat eigenschap', SD_SP_GETS_VALUES_FROM_CATEGORY = 'Haalt waarden uit categorie', SD_SP_REQUIRES_FILTER = 'Benodigt filter', - SD_SP_HAS_LABEL = 'Heeft label' + SD_SP_HAS_LABEL = 'Heeft label', + // display properties + SD_SP_HAS_DISPLAY_PARAMETERS= 'Heeft weergave parameters', ); var $m_Namespaces = array( diff --git a/languages/SD_LanguageZh_cn.php b/languages/SD_LanguageZh_cn.php index 49739d1..f9bf942 100644 --- a/languages/SD_LanguageZh_cn.php +++ b/languages/SD_LanguageZh_cn.php @@ -15,7 +15,10 @@ SD_SP_COVERS_PROPERTY = '涵盖性质', //'Covers property', SD_SP_GETS_VALUES_FROM_CATEGORY = '设分类为筛选值', //'Gets values from category', SD_SP_REQUIRES_FILTER = '基础筛选器', //'Requires filter', -SD_SP_HAS_LABEL = '设置标签' //'Has label' +SD_SP_HAS_LABEL = '设置标签', //'Has label' + // English stuff, to avoid crashes + SD_SP_HAS_DRILLDOWN_TITLE = 'Has drilldown title', + SD_SP_HAS_DISPLAY_PARAMETERS = 'Has display parameters', ); var $m_Namespaces = array( diff --git a/languages/SD_LanguageZh_tw.php b/languages/SD_LanguageZh_tw.php index f1c9cf0..2823a2e 100644 --- a/languages/SD_LanguageZh_tw.php +++ b/languages/SD_LanguageZh_tw.php @@ -15,7 +15,10 @@ SD_SP_COVERS_PROPERTY = '涵蓋性質', //'Covers property', SD_SP_GETS_VALUES_FROM_CATEGORY = '設分類為篩選值', //'Gets values from category', SD_SP_REQUIRES_FILTER = '基礎篩選器', //'Requires filter', -SD_SP_HAS_LABEL = '設置標籤' //'Has label' +SD_SP_HAS_LABEL = '設置標籤', //'Has label' + // English stuff, to avoid crashes + SD_SP_HAS_DRILLDOWN_TITLE = 'Has drilldown title', + SD_SP_HAS_DISPLAY_PARAMETERS = 'Has display parameters', ); var $m_Namespaces = array( -- To view, visit https://gerrit.wikimedia.org/r/133243 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieae6e6ce5c5cb41461e3cbdc62e5bd311ea9a106 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticDrilldown Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New version: 1.4 - change (mediawiki...SemanticDrilldown)
Yaron Koren has uploaded a new change for review. https://gerrit.wikimedia.org/r/133245 Change subject: New version: 1.4 .. New version: 1.4 Change-Id: I07f5634d7ac8d460ec51f3518a19d59aa547ff12 --- M INSTALL M SemanticDrilldown.php 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticDrilldown refs/changes/45/133245/1 diff --git a/INSTALL b/INSTALL index 68d603e..4a3dee5 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -[[Semantic Drilldown 1.3.1]] +[[Semantic Drilldown 1.4]] Contents: * Disclaimer diff --git a/SemanticDrilldown.php b/SemanticDrilldown.php index 1dcfea5..5768b58 100644 --- a/SemanticDrilldown.php +++ b/SemanticDrilldown.php @@ -13,7 +13,7 @@ if ( !defined( 'MEDIAWIKI' ) ) die(); -define( 'SD_VERSION', '1.4.0' ); +define( 'SD_VERSION', '1.4' ); $wgExtensionCredits[defined( 'SEMANTIC_EXTENSION_TYPE' ) ? 'semantic' : 'specialpage'][] = array( 'path'= __FILE__, -- To view, visit https://gerrit.wikimedia.org/r/133245 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I07f5634d7ac8d460ec51f3518a19d59aa547ff12 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticDrilldown Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New version: 1.4 - change (mediawiki...SemanticDrilldown)
jenkins-bot has submitted this change and it was merged. Change subject: New version: 1.4 .. New version: 1.4 Change-Id: I07f5634d7ac8d460ec51f3518a19d59aa547ff12 --- M INSTALL M SemanticDrilldown.php 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Yaron Koren: Checked; Looks good to me, approved jenkins-bot: Verified diff --git a/INSTALL b/INSTALL index 68d603e..4a3dee5 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -[[Semantic Drilldown 1.3.1]] +[[Semantic Drilldown 1.4]] Contents: * Disclaimer diff --git a/SemanticDrilldown.php b/SemanticDrilldown.php index 1dcfea5..5768b58 100644 --- a/SemanticDrilldown.php +++ b/SemanticDrilldown.php @@ -13,7 +13,7 @@ if ( !defined( 'MEDIAWIKI' ) ) die(); -define( 'SD_VERSION', '1.4.0' ); +define( 'SD_VERSION', '1.4' ); $wgExtensionCredits[defined( 'SEMANTIC_EXTENSION_TYPE' ) ? 'semantic' : 'specialpage'][] = array( 'path'= __FILE__, -- To view, visit https://gerrit.wikimedia.org/r/133245 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I07f5634d7ac8d460ec51f3518a19d59aa547ff12 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticDrilldown Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated authorship - change (mediawiki...SemanticDrilldown)
Yaron Koren has uploaded a new change for review. https://gerrit.wikimedia.org/r/133246 Change subject: Updated authorship .. Updated authorship Change-Id: I07c0b4c23825b036ae4aa1b21c54f620f9821302 --- M SemanticDrilldown.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticDrilldown refs/changes/46/133246/1 diff --git a/SemanticDrilldown.php b/SemanticDrilldown.php index 5768b58..439e3d7 100644 --- a/SemanticDrilldown.php +++ b/SemanticDrilldown.php @@ -19,7 +19,7 @@ 'path'= __FILE__, 'name'= 'Semantic Drilldown', 'version' = SD_VERSION, - 'author' = array( 'Yaron Koren', 'David Loomer' ), + 'author' = array( 'Yaron Koren', '...' ), 'url' = 'https://www.mediawiki.org/wiki/Extension:Semantic_Drilldown', 'descriptionmsg' = 'semanticdrilldown-desc', ); -- To view, visit https://gerrit.wikimedia.org/r/133246 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I07c0b4c23825b036ae4aa1b21c54f620f9821302 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticDrilldown Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated authorship - change (mediawiki...SemanticDrilldown)
jenkins-bot has submitted this change and it was merged. Change subject: Updated authorship .. Updated authorship Change-Id: I07c0b4c23825b036ae4aa1b21c54f620f9821302 --- M SemanticDrilldown.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Yaron Koren: Checked; Looks good to me, approved jenkins-bot: Verified diff --git a/SemanticDrilldown.php b/SemanticDrilldown.php index 5768b58..439e3d7 100644 --- a/SemanticDrilldown.php +++ b/SemanticDrilldown.php @@ -19,7 +19,7 @@ 'path'= __FILE__, 'name'= 'Semantic Drilldown', 'version' = SD_VERSION, - 'author' = array( 'Yaron Koren', 'David Loomer' ), + 'author' = array( 'Yaron Koren', '...' ), 'url' = 'https://www.mediawiki.org/wiki/Extension:Semantic_Drilldown', 'descriptionmsg' = 'semanticdrilldown-desc', ); -- To view, visit https://gerrit.wikimedia.org/r/133246 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I07c0b4c23825b036ae4aa1b21c54f620f9821302 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticDrilldown Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QA Progress bar does not appear for Firefox, only Chrome - change (mediawiki...MobileFrontend)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/133247 Change subject: QA Progress bar does not appear for Firefox, only Chrome .. QA Progress bar does not appear for Firefox, only Chrome Change-Id: If2873452a4fa072e72810915fd782afc33e909ea --- M tests/browser/features/special_uploads.feature 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/47/133247/1 diff --git a/tests/browser/features/special_uploads.feature b/tests/browser/features/special_uploads.feature index 2354514..f4863d4 100644 --- a/tests/browser/features/special_uploads.feature +++ b/tests/browser/features/special_uploads.feature @@ -1,4 +1,4 @@ -@chrome @en.m.wikipedia.beta.wmflabs.org @firefox @login @test2.m.wikipedia.org +@chrome @en.m.wikipedia.beta.wmflabs.org @login @test2.m.wikipedia.org Feature: Special:Uploads uploads Scenario: Upload image file of invalid format -- To view, visit https://gerrit.wikimedia.org/r/133247 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If2873452a4fa072e72810915fd782afc33e909ea Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Parse versions in semver format - change (mediawiki/core)
MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133248
Change subject: Parse versions in semver format
..
Parse versions in semver format
Change-Id: Icb3981736918154898cff0c98c472bc8bb36f1c6
---
M includes/MediaWikiVersionFetcher.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/48/133248/1
diff --git a/includes/MediaWikiVersionFetcher.php
b/includes/MediaWikiVersionFetcher.php
index 17cb8aa..439e53f 100644
--- a/includes/MediaWikiVersionFetcher.php
+++ b/includes/MediaWikiVersionFetcher.php
@@ -19,7 +19,7 @@
$defaultSettings = file_get_contents( __DIR__ .
'/DefaultSettings.php' );
$matches = array();
- preg_match( /wgVersion = '([0-9a-zA-Z\.]+)';/,
$defaultSettings, $matches );
+ preg_match( /wgVersion = '([-0-9a-zA-Z\.]+)';/,
$defaultSettings, $matches );
if ( count( $matches ) !== 2 ) {
throw new RuntimeException( 'Could not extract the
MediaWiki version from DefaultSettings.php' );
--
To view, visit https://gerrit.wikimedia.org/r/133248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb3981736918154898cff0c98c472bc8bb36f1c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
Gerrit-Owner: MarkAHershberger m...@nichework.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Parse versions in semver format - change (mediawiki/core)
MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133249
Change subject: Parse versions in semver format
..
Parse versions in semver format
Change-Id: Icb3981736918154898cff0c98c472bc8bb36f1c6
---
M includes/MediaWikiVersionFetcher.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/49/133249/1
diff --git a/includes/MediaWikiVersionFetcher.php
b/includes/MediaWikiVersionFetcher.php
index 17cb8aa..439e53f 100644
--- a/includes/MediaWikiVersionFetcher.php
+++ b/includes/MediaWikiVersionFetcher.php
@@ -19,7 +19,7 @@
$defaultSettings = file_get_contents( __DIR__ .
'/DefaultSettings.php' );
$matches = array();
- preg_match( /wgVersion = '([0-9a-zA-Z\.]+)';/,
$defaultSettings, $matches );
+ preg_match( /wgVersion = '([-0-9a-zA-Z\.]+)';/,
$defaultSettings, $matches );
if ( count( $matches ) !== 2 ) {
throw new RuntimeException( 'Could not extract the
MediaWiki version from DefaultSettings.php' );
--
To view, visit https://gerrit.wikimedia.org/r/133249
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb3981736918154898cff0c98c472bc8bb36f1c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger m...@nichework.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move data-mw-arginfo to dataAttribs - change (mediawiki...parsoid)
Marcoil has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133250
Change subject: Move data-mw-arginfo to dataAttribs
..
Move data-mw-arginfo to dataAttribs
Change-Id: I1f26222a933341b2746008a8f1f23282c478cb7d
---
M lib/dom.wrapTemplates.js
M lib/ext.core.TemplateHandler.js
2 files changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/50/133250/1
diff --git a/lib/dom.wrapTemplates.js b/lib/dom.wrapTemplates.js
index 52bd25e..d92a255 100644
--- a/lib/dom.wrapTemplates.js
+++ b/lib/dom.wrapTemplates.js
@@ -455,10 +455,9 @@
r = tplRanges[i];
// Extract argInfo and clear it
- var argInfo = r.startElem.getAttribute(data-mw-arginfo);
+ var argInfo = DU.getDataParsoid(r.startElem)['data-mw-arginfo'];
if (argInfo) {
argInfo = JSON.parse(argInfo);
- r.startElem.removeAttribute(data-mw-arginfo);
}
env.log(trace/tplwrap/merge, function() {
diff --git a/lib/ext.core.TemplateHandler.js b/lib/ext.core.TemplateHandler.js
index e98481e..07fddbb 100644
--- a/lib/ext.core.TemplateHandler.js
+++ b/lib/ext.core.TemplateHandler.js
@@ -797,7 +797,7 @@
async.each(params, getParamHTML.bind(this),
function (err) {
// Use a data-attribute to prevent the
sanitizer from stripping this
// attribute before it reaches the DOM
pass where it is needed.
- chunk[0].attribs.push(new
KV(data-mw-arginfo, JSON.stringify(argInfo)));
+ chunk[0].dataAttribs['data-mw-arginfo']
= JSON.stringify(argInfo);
env.dp(
'TemplateHandler._encapsulateTemplate', chunk );
cb({tokens: chunk});
}.bind(this));
@@ -805,11 +805,11 @@
cb({tokens: [], async: true});
return;
} else {
- chunk[0].attribs.push(new KV(data-mw-arginfo,
JSON.stringify(argInfo)));
+ chunk[0].dataAttribs['data-mw-arginfo'] =
JSON.stringify(argInfo);
}
} else {
// Don't add the HTML template parameters, just use
their wikitext
- chunk[0].attribs.push(new KV(data-mw-arginfo,
JSON.stringify(argInfo)));
+ chunk[0].dataAttribs['data-mw-arginfo'] =
JSON.stringify(argInfo);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/133250
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f26222a933341b2746008a8f1f23282c478cb7d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: dom_tpl_params_4
Gerrit-Owner: Marcoil marc...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Parse versions in semver format - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Parse versions in semver format
..
Parse versions in semver format
Change-Id: Icb3981736918154898cff0c98c472bc8bb36f1c6
---
M includes/MediaWikiVersionFetcher.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
MarkAHershberger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MediaWikiVersionFetcher.php
b/includes/MediaWikiVersionFetcher.php
index 17cb8aa..439e53f 100644
--- a/includes/MediaWikiVersionFetcher.php
+++ b/includes/MediaWikiVersionFetcher.php
@@ -19,7 +19,7 @@
$defaultSettings = file_get_contents( __DIR__ .
'/DefaultSettings.php' );
$matches = array();
- preg_match( /wgVersion = '([0-9a-zA-Z\.]+)';/,
$defaultSettings, $matches );
+ preg_match( /wgVersion = '([-0-9a-zA-Z\.]+)';/,
$defaultSettings, $matches );
if ( count( $matches ) !== 2 ) {
throw new RuntimeException( 'Could not extract the
MediaWiki version from DefaultSettings.php' );
--
To view, visit https://gerrit.wikimedia.org/r/133248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb3981736918154898cff0c98c472bc8bb36f1c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
Gerrit-Owner: MarkAHershberger m...@nichework.com
Gerrit-Reviewer: MarkAHershberger m...@nichework.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] Added more classes, thanks to Cavila - change (mediawiki...SemanticBundle)
Yaron Koren has uploaded a new change for review. https://gerrit.wikimedia.org/r/133251 Change subject: Added more classes, thanks to Cavila .. Added more classes, thanks to Cavila Change-Id: I1ef74bcadadec4cafd0ff2ccb1deba7fb8825fe4 --- M SB_AutoloadClassmap.php 1 file changed, 49 insertions(+), 37 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticBundle refs/changes/51/133251/1 diff --git a/SB_AutoloadClassmap.php b/SB_AutoloadClassmap.php index 1d799d3..2dea5e1 100644 --- a/SB_AutoloadClassmap.php +++ b/SB_AutoloadClassmap.php @@ -11,7 +11,7 @@ * * This file is copied from the file autoload_classmap.php, which is * generated automatically by Composer, with slight changes at the top and - * some additions at the bottom. + * various additions at the bottom. */ $vendorDir = dirname(__FILE__); @@ -513,42 +513,54 @@ 'SMW\RefreshJob' = $baseDir . '/extensions/SemanticMediaWiki/includes/jobs/RefreshJob.php', 'SMWParamSource' = $baseDir . '/extensions/SemanticMediaWiki/includes/params/SMW_ParamSource.php', -// Validators -'ValueValidators\\ValueValidator' = $vendorDir . '/data-values/interfaces/src/ValueValidators/ValueValidator.php', -'ValueValidators\\ValueValidatorObject' = $vendorDir . '/data-values/interfaces/src/ValueValidators/ValueValidatorObject.php', -'ValueValidators\\Result' = $vendorDir . '/data-values/interfaces/src/ValueValidators/Result.php', -'ValueValidators\\NullValidator' = $vendorDir . '/data-values/validators/src/NullValidator.php', -'ValueValidators\\StringValidator' = $vendorDir . '/data-values/validators/src/StringValidator.php', -'ValueValidators\\RangeValidator' = $vendorDir . '/data-values/validators/src/RangeValidator.php', -'ValueValidators\\Error' = $vendorDir . '/data-values/interfaces/src/ValueValidators/Error.php', -'ValueValidators\\TitleValidator' = $vendorDir . '/data-values/validators/src/TitleValidator.php', -'ValueValidators\\RangeValidator' = $vendorDir . '/data-values/validators/src/RangeValidator.php', -'ValueValidators\\ListValidator' = $vendorDir . '/data-values/validators/src/ListValidator.php', -'ValueValidators\\DimensionValidator' = $vendorDir . '/data-values/validators/src/DimensionValidator.php', + // ValueValidators + 'ValueValidators\\ValueValidator' = $vendorDir . '/data-values/interfaces/src/ValueValidators/ValueValidator.php', + 'ValueValidators\\ValueValidatorObject' = $vendorDir . '/data-values/interfaces/src/ValueValidators/ValueValidatorObject.php', + 'ValueValidators\\Result' = $vendorDir . '/data-values/interfaces/src/ValueValidators/Result.php', + 'ValueValidators\\NullValidator' = $vendorDir . '/data-values/validators/src/NullValidator.php', + 'ValueValidators\\StringValidator' = $vendorDir . '/data-values/validators/src/StringValidator.php', + 'ValueValidators\\RangeValidator' = $vendorDir . '/data-values/validators/src/RangeValidator.php', + 'ValueValidators\\Error' = $vendorDir . '/data-values/interfaces/src/ValueValidators/Error.php', + 'ValueValidators\\TitleValidator' = $vendorDir . '/data-values/validators/src/TitleValidator.php', + 'ValueValidators\\RangeValidator' = $vendorDir . '/data-values/validators/src/RangeValidator.php', + 'ValueValidators\\ListValidator' = $vendorDir . '/data-values/validators/src/ListValidator.php', + 'ValueValidators\\DimensionValidator' = $vendorDir . '/data-values/validators/src/DimensionValidator.php', -// ValueParsers -'ValueParsers\\ValueParser' = $vendorDir . '/data-values/interfaces/src/ValueParsers/ValueParser.php', -'ValueParsers\\NullParser' = $vendorDir . '/data-values/common/src/ValueParsers/NullParser.php', -'ValueParsers\\IntParser' = $vendorDir . '/data-values/common/src/ValueParsers/IntParser.php', -'ValueParsers\\StringValueParser' = $vendorDir . '/data-values/common/src/ValueParsers/StringValueParser.php', -'ValueParsers\\ParserOptions' = $vendorDir . '/data-values/interfaces/src/ValueParsers/ParserOptions.php', -'ValueParsers\\ParseException' = $vendorDir . '/data-values/interfaces/src/ValueParsers/ParseException.php', -'ValueParsers\\FloatParser' = $vendorDir . '/data-values/common/src/ValueParsers/FloatParser.php', -'ValueParsers\\BoolParser' = $vendorDir . '/data-values/common/src/ValueParsers/BoolParser.php', -'ValueParsers\\TimeParser' = $vendorDir . '/data-values/time/src/ValueParsers/TimeParser.php', -'ValueParsers\\CalendarModelParser' = $vendorDir . '/data-values/time/src/ValueParsers/CalendarModelParser.php', + // ValueParsers + 'ValueParsers\\ValueParser' = $vendorDir . '/data-values/interfaces/src/ValueParsers/ValueParser.php', + 'ValueParsers\\NullParser' = $vendorDir . '/data-values/common/src/ValueParsers/NullParser.php',
[MediaWiki-commits] [Gerrit] mediawiki.util: Decode parentheses and bang in wikiUrlencode - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133252
Change subject: mediawiki.util: Decode parentheses and bang in wikiUrlencode
..
mediawiki.util: Decode parentheses and bang in wikiUrlencode
Matches behaviour of wfUrlencode() and creates prettier urls.
Change-Id: I9b3ecda19f743cd87e790d99d50dd6b730e5ee21
---
M resources/src/mediawiki/mediawiki.util.js
M tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
2 files changed, 33 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/52/133252/1
diff --git a/resources/src/mediawiki/mediawiki.util.js
b/resources/src/mediawiki/mediawiki.util.js
index 298415c..e2fa123 100644
--- a/resources/src/mediawiki/mediawiki.util.js
+++ b/resources/src/mediawiki/mediawiki.util.js
@@ -60,14 +60,29 @@
/**
* Encode page titles for use in a URL
+*
* We want / and : to be included as literal characters in our
title URLs
-* as they otherwise fatally break the title
+* as they otherwise fatally break the title.
+*
+* The others are decoded because we can, it's prettier and
matches behaviour
+* of `wfUrlencode` in PHP.
*
* @param {string} str String to be encoded.
*/
wikiUrlencode: function ( str ) {
return util.rawurlencode( str )
- .replace( /%20/g, '_' ).replace( /%3A/g, ':'
).replace( /%2F/g, '/' );
+ .replace( /%20/g, '_' )
+ // wfUrlencode replacements
+ .replace( /%3B/g, ';' )
+ .replace( /%40/g, '@' )
+ .replace( /%24/g, '$' )
+ .replace( /%21/g, '!' )
+ .replace( /%2A/g, '*' )
+ .replace( /%28/g, '(' )
+ .replace( /%29/g, ')' )
+ .replace( /%2C/g, ',' )
+ .replace( /%2F/g, '/' )
+ .replace( /%3A/g, ':' );
},
/**
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
index b2587be..1526679 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
@@ -17,8 +17,22 @@
assert.equal( mw.util.rawurlencode( 'Test:A B/Here' ),
'Test%3AA%20%26%20B%2FHere' );
} );
- QUnit.test( 'wikiUrlencode', 1, function ( assert ) {
+ QUnit.test( 'wikiUrlencode', 10, function ( assert ) {
assert.equal( mw.util.wikiUrlencode( 'Test:A B/Here' ),
'Test:A_%26_B/Here' );
+ // See also wfUrlencodeTest.php#provideURLS
+ $.each( {
+ '+': '%2B',
+ '': '%26',
+ '=': '%3D',
+ ':': ':',
+ ';@$-_.!*': ';@$-_.!*',
+ '/': '/',
+ '[]': '%5B%5D',
+ '': '%3C%3E',
+ '\'': '%27'
+ }, function ( input, output ) {
+ assert.equal( mw.util.wikiUrlencode( input ), output );
+ } );
} );
QUnit.test( 'getUrl', 4, function ( assert ) {
@@ -30,7 +44,7 @@
assert.equal( href, '/wiki/Sandbox', 'Simple title; Get link
for Sandbox' );
href = mw.util.getUrl( 'Foo:Sandbox ? 5+5=10 ! (test)/subpage'
);
- assert.equal( href,
'/wiki/Foo:Sandbox_%3F_5%2B5%3D10_%21_%28test%29/subpage',
+ assert.equal( href,
'/wiki/Foo:Sandbox_%3F_5%2B5%3D10_!_(test)/subpage',
'Advanced title; Get link for Foo:Sandbox ? 5+5=10 !
(test)/subpage' );
href = mw.util.getUrl();
--
To view, visit https://gerrit.wikimedia.org/r/133252
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b3ecda19f743cd87e790d99d50dd6b730e5ee21
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added more classes, thanks to Cavila - change (mediawiki...SemanticBundle)
jenkins-bot has submitted this change and it was merged. Change subject: Added more classes, thanks to Cavila .. Added more classes, thanks to Cavila Change-Id: I1ef74bcadadec4cafd0ff2ccb1deba7fb8825fe4 --- M SB_AutoloadClassmap.php 1 file changed, 49 insertions(+), 37 deletions(-) Approvals: Yaron Koren: Checked; Looks good to me, approved jenkins-bot: Verified diff --git a/SB_AutoloadClassmap.php b/SB_AutoloadClassmap.php index 1d799d3..2dea5e1 100644 --- a/SB_AutoloadClassmap.php +++ b/SB_AutoloadClassmap.php @@ -11,7 +11,7 @@ * * This file is copied from the file autoload_classmap.php, which is * generated automatically by Composer, with slight changes at the top and - * some additions at the bottom. + * various additions at the bottom. */ $vendorDir = dirname(__FILE__); @@ -513,42 +513,54 @@ 'SMW\RefreshJob' = $baseDir . '/extensions/SemanticMediaWiki/includes/jobs/RefreshJob.php', 'SMWParamSource' = $baseDir . '/extensions/SemanticMediaWiki/includes/params/SMW_ParamSource.php', -// Validators -'ValueValidators\\ValueValidator' = $vendorDir . '/data-values/interfaces/src/ValueValidators/ValueValidator.php', -'ValueValidators\\ValueValidatorObject' = $vendorDir . '/data-values/interfaces/src/ValueValidators/ValueValidatorObject.php', -'ValueValidators\\Result' = $vendorDir . '/data-values/interfaces/src/ValueValidators/Result.php', -'ValueValidators\\NullValidator' = $vendorDir . '/data-values/validators/src/NullValidator.php', -'ValueValidators\\StringValidator' = $vendorDir . '/data-values/validators/src/StringValidator.php', -'ValueValidators\\RangeValidator' = $vendorDir . '/data-values/validators/src/RangeValidator.php', -'ValueValidators\\Error' = $vendorDir . '/data-values/interfaces/src/ValueValidators/Error.php', -'ValueValidators\\TitleValidator' = $vendorDir . '/data-values/validators/src/TitleValidator.php', -'ValueValidators\\RangeValidator' = $vendorDir . '/data-values/validators/src/RangeValidator.php', -'ValueValidators\\ListValidator' = $vendorDir . '/data-values/validators/src/ListValidator.php', -'ValueValidators\\DimensionValidator' = $vendorDir . '/data-values/validators/src/DimensionValidator.php', + // ValueValidators + 'ValueValidators\\ValueValidator' = $vendorDir . '/data-values/interfaces/src/ValueValidators/ValueValidator.php', + 'ValueValidators\\ValueValidatorObject' = $vendorDir . '/data-values/interfaces/src/ValueValidators/ValueValidatorObject.php', + 'ValueValidators\\Result' = $vendorDir . '/data-values/interfaces/src/ValueValidators/Result.php', + 'ValueValidators\\NullValidator' = $vendorDir . '/data-values/validators/src/NullValidator.php', + 'ValueValidators\\StringValidator' = $vendorDir . '/data-values/validators/src/StringValidator.php', + 'ValueValidators\\RangeValidator' = $vendorDir . '/data-values/validators/src/RangeValidator.php', + 'ValueValidators\\Error' = $vendorDir . '/data-values/interfaces/src/ValueValidators/Error.php', + 'ValueValidators\\TitleValidator' = $vendorDir . '/data-values/validators/src/TitleValidator.php', + 'ValueValidators\\RangeValidator' = $vendorDir . '/data-values/validators/src/RangeValidator.php', + 'ValueValidators\\ListValidator' = $vendorDir . '/data-values/validators/src/ListValidator.php', + 'ValueValidators\\DimensionValidator' = $vendorDir . '/data-values/validators/src/DimensionValidator.php', -// ValueParsers -'ValueParsers\\ValueParser' = $vendorDir . '/data-values/interfaces/src/ValueParsers/ValueParser.php', -'ValueParsers\\NullParser' = $vendorDir . '/data-values/common/src/ValueParsers/NullParser.php', -'ValueParsers\\IntParser' = $vendorDir . '/data-values/common/src/ValueParsers/IntParser.php', -'ValueParsers\\StringValueParser' = $vendorDir . '/data-values/common/src/ValueParsers/StringValueParser.php', -'ValueParsers\\ParserOptions' = $vendorDir . '/data-values/interfaces/src/ValueParsers/ParserOptions.php', -'ValueParsers\\ParseException' = $vendorDir . '/data-values/interfaces/src/ValueParsers/ParseException.php', -'ValueParsers\\FloatParser' = $vendorDir . '/data-values/common/src/ValueParsers/FloatParser.php', -'ValueParsers\\BoolParser' = $vendorDir . '/data-values/common/src/ValueParsers/BoolParser.php', -'ValueParsers\\TimeParser' = $vendorDir . '/data-values/time/src/ValueParsers/TimeParser.php', -'ValueParsers\\CalendarModelParser' = $vendorDir . '/data-values/time/src/ValueParsers/CalendarModelParser.php', + // ValueParsers + 'ValueParsers\\ValueParser' = $vendorDir . '/data-values/interfaces/src/ValueParsers/ValueParser.php', + 'ValueParsers\\NullParser' = $vendorDir . '/data-values/common/src/ValueParsers/NullParser.php', + 'ValueParsers\\IntParser' = $vendorDir .
[MediaWiki-commits] [Gerrit] Updated some versions - change (mediawiki...SemanticBundle)
Yaron Koren has uploaded a new change for review. https://gerrit.wikimedia.org/r/133253 Change subject: Updated some versions .. Updated some versions Change-Id: Id0aec4594e5c6a52a7b70da8e1bca3e566fbdf93 --- M externals 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticBundle refs/changes/53/133253/1 diff --git a/externals b/externals index 1599649..c618a5a 100644 --- a/externals +++ b/externals @@ -13,18 +13,18 @@ SemanticForms git.wikimedia.org/git/mediawiki/extensions 2.7 SemanticFormsInputs git.wikimedia.org/git/mediawiki/extensions REL_0_7 SemanticCompoundQueries git.wikimedia.org/git/mediawiki/extensions 0.3.4 -SemanticDrilldown git.wikimedia.org/git/mediawiki/extensions 1.3.1 +SemanticDrilldown git.wikimedia.org/git/mediawiki/extensions 1.4 SemanticMapsgithub.com/SemanticMediaWiki3.0.4 SemanticImageInput git.wikimedia.org/git/mediawiki/extensions master SemanticInternalObjects git.wikimedia.org/git/mediawiki/extensions 0.7.6 SemanticWatchlist github.com/SemanticMediaWiki0.2.2 AdminLinks git.wikimedia.org/git/mediawiki/extensions 0.1.8 -ApprovedRevsgit.wikimedia.org/git/mediawiki/extensions 0.6.6 +ApprovedRevsgit.wikimedia.org/git/mediawiki/extensions 0.7 Arrays git.wikimedia.org/git/mediawiki/extensions master DataTransfergit.wikimedia.org/git/mediawiki/extensions 0.4.1 ExternalDatagit.wikimedia.org/git/mediawiki/extensions 1.6.4 HeaderTabs git.wikimedia.org/git/mediawiki/extensions 0.9.3 Mapsgithub.com/JeroenDeDauw 3.0.1 -PageSchemas git.wikimedia.org/git/mediawiki/extensions 0.4.2 +PageSchemas git.wikimedia.org/git/mediawiki/extensions 0.4.3 ReplaceText git.wikimedia.org/git/mediawiki/extensions 0.9.7 Widgets git.wikimedia.org/git/mediawiki/extensions 1.0 -- To view, visit https://gerrit.wikimedia.org/r/133253 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id0aec4594e5c6a52a7b70da8e1bca3e566fbdf93 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticBundle Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated some versions - change (mediawiki...SemanticBundle)
jenkins-bot has submitted this change and it was merged. Change subject: Updated some versions .. Updated some versions Change-Id: Id0aec4594e5c6a52a7b70da8e1bca3e566fbdf93 --- M externals 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Yaron Koren: Checked; Looks good to me, approved jenkins-bot: Verified diff --git a/externals b/externals index 1599649..c618a5a 100644 --- a/externals +++ b/externals @@ -13,18 +13,18 @@ SemanticForms git.wikimedia.org/git/mediawiki/extensions 2.7 SemanticFormsInputs git.wikimedia.org/git/mediawiki/extensions REL_0_7 SemanticCompoundQueries git.wikimedia.org/git/mediawiki/extensions 0.3.4 -SemanticDrilldown git.wikimedia.org/git/mediawiki/extensions 1.3.1 +SemanticDrilldown git.wikimedia.org/git/mediawiki/extensions 1.4 SemanticMapsgithub.com/SemanticMediaWiki3.0.4 SemanticImageInput git.wikimedia.org/git/mediawiki/extensions master SemanticInternalObjects git.wikimedia.org/git/mediawiki/extensions 0.7.6 SemanticWatchlist github.com/SemanticMediaWiki0.2.2 AdminLinks git.wikimedia.org/git/mediawiki/extensions 0.1.8 -ApprovedRevsgit.wikimedia.org/git/mediawiki/extensions 0.6.6 +ApprovedRevsgit.wikimedia.org/git/mediawiki/extensions 0.7 Arrays git.wikimedia.org/git/mediawiki/extensions master DataTransfergit.wikimedia.org/git/mediawiki/extensions 0.4.1 ExternalDatagit.wikimedia.org/git/mediawiki/extensions 1.6.4 HeaderTabs git.wikimedia.org/git/mediawiki/extensions 0.9.3 Mapsgithub.com/JeroenDeDauw 3.0.1 -PageSchemas git.wikimedia.org/git/mediawiki/extensions 0.4.2 +PageSchemas git.wikimedia.org/git/mediawiki/extensions 0.4.3 ReplaceText git.wikimedia.org/git/mediawiki/extensions 0.9.7 Widgets git.wikimedia.org/git/mediawiki/extensions 1.0 -- To view, visit https://gerrit.wikimedia.org/r/133253 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id0aec4594e5c6a52a7b70da8e1bca3e566fbdf93 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticBundle Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ferm: fully qualify variables - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: ferm: fully qualify variables
..
ferm: fully qualify variables
Change-Id: I8fe3e796f6305afaa91b6373e6b8587db0c48dcd
---
M modules/ferm/templates/rule.erb
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ferm/templates/rule.erb b/modules/ferm/templates/rule.erb
index 89ac02a..3e26898 100644
--- a/modules/ferm/templates/rule.erb
+++ b/modules/ferm/templates/rule.erb
@@ -2,10 +2,10 @@
#
# %= prio %_%= name %: %= desc %
-domain %= domain % {
- table %= table % {
- chain %= chain % {
- %= rule %
+domain %= @domain % {
+ table %= @table % {
+ chain %= @chain % {
+ %= @rule %
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/132922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8fe3e796f6305afaa91b6373e6b8587db0c48dcd
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@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] Factor common string validators into common method - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Factor common string validators into common method
..
Factor common string validators into common method
Change-Id: I53883a7921dea368ed8b38aa7513cbbd0f488964
---
M lib/includes/WikibaseDataTypeBuilders.php
1 file changed, 16 insertions(+), 20 deletions(-)
Approvals:
WikidataJenkins: Verified
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/WikibaseDataTypeBuilders.php
b/lib/includes/WikibaseDataTypeBuilders.php
index f170b23..8df0a49 100644
--- a/lib/includes/WikibaseDataTypeBuilders.php
+++ b/lib/includes/WikibaseDataTypeBuilders.php
@@ -102,12 +102,20 @@
return new DataType( $id, 'wikibase-entityid', $validators );
}
- public function buildMediaType( $id ) {
+ protected function getCommonStringValidators( $maxLength = 400 ) {
$validators = array();
$validators[] = new TypeValidator( 'string' );
- $validators[] = new StringLengthValidator( 1, 240 ); // Note:
240 is hardcoded in UploadBase
+ //TODO: validate UTF8 (here and elsewhere)
+ $validators[] = new StringLengthValidator( 1, $maxLength,
'mb_strlen' );
$validators[] = new RegexValidator( '/^\s|[\r\n\t]|\s$/', true
); // no leading/trailing whitespace, no line breaks.
+
+ return $validators;
+ }
+
+ public function buildMediaType( $id ) {
+ $validators = $this-getCommonStringValidators( 240 );
+
$validators[] = new RegexValidator( '@[#/:]@u', true ); //
no nasty chars
$validators[] = new RegexValidator( '@\..+@u', false ); // must
contain a file extension
//TODO: add a validator that checks the rules that MediaWiki
imposes on filenames for uploads.
@@ -122,12 +130,7 @@
}
public function buildStringType( $id ) {
- $validators = array();
-
- $validators[] = new TypeValidator( 'string' );
- //TODO: validate UTF8 (here and elsewhere)
- $validators[] = new StringLengthValidator( 1, 400, 'mb_strlen'
);
- $validators[] = new RegexValidator( '/^\s|[\r\n\t]|\s$/', true
); // no leading/trailing whitespace, no line breaks.
+ $validators = $this-getCommonStringValidators();
$topValidator = new DataValueValidator( //Note: validate the
DataValue's native value.
new CompositeValidator( $validators, true ) //Note:
each validator is fatal
@@ -137,24 +140,17 @@
}
public function buildMonolingualTextType( $id ) {
- $validators = array();
-
- $validators[] = new TypeValidator( 'string' );
- //TODO: validate UTF8 (here and elsewhere)
- $validators[] = new StringLengthValidator( 1, 400, 'mb_strlen'
);
- $validators[] = new RegexValidator( '/^\s|[\r\n\t]|\s$/', true
); // no leading/trailing whitespace, no line breaks.
-
$textValidator = new DataFieldValidator(
'text',
- new CompositeValidator( $validators, true ) //Note:
each validator is fatal
+ new CompositeValidator(
+ $this-getCommonStringValidators(),
+ true //Note: each validator is fatal
+ )
);
-
- $validators = array();
- $validators[] = new MembershipValidator(
Utils::getLanguageCodes() );
$languageValidator = new DataFieldValidator(
'language',
- new CompositeValidator( $validators, true )
+ new MembershipValidator( Utils::getLanguageCodes() )
);
$topValidator = new CompositeValidator(
--
To view, visit https://gerrit.wikimedia.org/r/133216
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I53883a7921dea368ed8b38aa7513cbbd0f488964
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.htmlform: Refactor and clean up - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133254
Change subject: mediawiki.htmlform: Refactor and clean up
..
mediawiki.htmlform: Refactor and clean up
* Use .filter function instead of concatenating strings.
The end result is the same since [attr$=] is not valid CSS3 and
basically just a convulated way to have jQuery Sizzle strip it
back out and do a manual filter callback as well (it isn't
a CSS3 selector and as such not in native querySelectorAll).
It's faster and more stable and semantically correct this way
because using the string syntax is subject to bugs when using
special characters (you'd have to escape it first, which is
non-trivial to do in CSS selectors, sometimes impossible).
So comparing the .name property against a string value directly
is much easier.
* Use .prop() instead of .attr() where appropiate.
attr() changes attribute nodes only in the DOM, properties
reflect the actual live rendered value. This works because of
a back-compat layer in jQuery, but has been deprecated.
* Use a simple array and create 1 jQuery object, instead of
creating various temporary objects only to have jQuery merge
them via .add(). .add() is relatively expensive in that it
keeps a reference in pushStack and does a lot of logic. Fine
for convenience, but since we have all the data right here,
might as well take a more direct approach.
* Remove ill-informed $() calls. This is already a jQuery object
for the method is a jQuery method. Cloning the object first
leads to unexpected side-effects and is simply not neccecary.
* Remove use of .live()
Change-Id: Icfe63a4111026661c53639b72e67a4d4fa3d6ac2
---
M resources/src/mediawiki/mediawiki.htmlform.js
1 file changed, 50 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/54/133254/1
diff --git a/resources/src/mediawiki/mediawiki.htmlform.js
b/resources/src/mediawiki/mediawiki.htmlform.js
index f7aa7f8..25d05db 100644
--- a/resources/src/mediawiki/mediawiki.htmlform.js
+++ b/resources/src/mediawiki/mediawiki.htmlform.js
@@ -20,14 +20,18 @@
* @return {jQuery|null}
*/
function hideIfGetField( $el, name ) {
- var sel, $found, $p;
+ var $found, $p,
+ suffix = name.replace( /^([^\[]+)/, '[$1]' );
- sel = '[name=' + name + '],' +
- '[name=wp' + name + '],' +
- '[name$=' + name.replace( /^([^\[]+)/, '[$1]' ) + ']';
+ function nameFilter() {
+ return this.name === name ||
+ this.name === ( 'wp' + name ) ||
+ this.name.slice( -suffix.length ) === suffix;
+ }
+
for ( $p = $el.parent(); $p.length 0; $p = $p.parent() ) {
- $found = $p.find( sel );
- if ( $found.length 0 ) {
+ $found = $p.find( '[name]' ).filter( nameFilter );
+ if ( $found.length ) {
return $found;
}
}
@@ -43,7 +47,7 @@
* @return {Array} 2 elements: jQuery of dependent fields, and test
function
*/
function hideIfParse( $el, spec ) {
- var op, i, l, v, $field, $fields, func, funcs, getVal;
+ var op, i, l, v, $field, $fields, fields, func, funcs, getVal;
op = spec[0];
l = spec.length;
@@ -53,15 +57,16 @@
case 'NAND':
case 'NOR':
funcs = [];
- $fields = $();
+ fields = [];
for ( i = 1; i l; i++ ) {
if ( !$.isArray( spec[i] ) ) {
throw new Error( op + '
parameters must be arrays' );
}
v = hideIfParse( $el, spec[i] );
- $fields = $fields.add( v[0] );
+ fields.push( v[0] );
funcs.push( v[1] );
}
+ $fields = $( fields );
l = funcs.length;
switch ( op ) {
@@ -143,12 +148,12 @@
}
v = spec[2];
- if ( $field.first().attr( 'type' ) === 'radio'
||
- $field.first().attr( 'type' ) ===
'checkbox'
+ if ( $field.first().prop( 'type' ) === 'radio'
||
+
[MediaWiki-commits] [Gerrit] [browser test] Don't rely on existing page for anon edit test - change (mediawiki...VisualEditor)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/133255 Change subject: [browser test] Don't rely on existing page for anon edit test .. [browser test] Don't rely on existing page for anon edit test Change-Id: I43a7d78894ec290faa9e74b085aa2ead15958c62 --- M modules/ve-mw/test/browser/features/anon.feature 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/55/133255/1 diff --git a/modules/ve-mw/test/browser/features/anon.feature b/modules/ve-mw/test/browser/features/anon.feature index e401ad3..33a6549 100644 --- a/modules/ve-mw/test/browser/features/anon.feature +++ b/modules/ve-mw/test/browser/features/anon.feature @@ -2,7 +2,7 @@ Feature: VisualEditor Scenario: Basic edit -Given I am at my user page +Given I go to the Anonymous Edit Test page with content Anonymous Edit Test When I edit the page with Editing with And I see the IP warning signs And I click Save page -- To view, visit https://gerrit.wikimedia.org/r/133255 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43a7d78894ec290faa9e74b085aa2ead15958c62 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix file building - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/133256 Change subject: Fix file building .. Fix file building Change-Id: I868f815bb4c75126a243e545be51002982e46f03 --- M includes/Updater.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/56/133256/1 diff --git a/includes/Updater.php b/includes/Updater.php index 70214c6..59ba1db 100644 --- a/includes/Updater.php +++ b/includes/Updater.php @@ -1,6 +1,7 @@ ?php namespace CirrusSearch; +use CirrusSearch\BuildDocument\FileDataBuilder; use CirrusSearch\BuildDocument\PageDataBuilder; use CirrusSearch\BuildDocument\PageTextBuilder; use \MWTimestamp; -- To view, visit https://gerrit.wikimedia.org/r/133256 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I868f815bb4c75126a243e545be51002982e46f03 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initial repository layout - change (analytics...source)
Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/133257 Change subject: Initial repository layout .. Initial repository layout Change-Id: Ieb424fc76a6c56fb801a1e24236532ce49b16c21 --- A README.md A pom.xml A refinery-core/pom.xml A refinery-tools/pom.xml 4 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source refs/changes/57/133257/1 diff --git a/README.md b/README.md new file mode 100644 index 000..17c2a3e --- /dev/null +++ b/README.md @@ -0,0 +1,10 @@ +# refinery/source +This repository should contain only source code that is used for building +artifacts for the Wikimedia Analytics Refinery. + +## refinery-core +Core source code for the Wikimeida Analytics Refinery. + +## refinery-tools +Handy Tools used for dealing with Wikimedia Analytics data. + diff --git a/pom.xml b/pom.xml new file mode 100644 index 000..e69de29 --- /dev/null +++ b/pom.xml diff --git a/refinery-core/pom.xml b/refinery-core/pom.xml new file mode 100644 index 000..e69de29 --- /dev/null +++ b/refinery-core/pom.xml diff --git a/refinery-tools/pom.xml b/refinery-tools/pom.xml new file mode 100644 index 000..e69de29 --- /dev/null +++ b/refinery-tools/pom.xml -- To view, visit https://gerrit.wikimedia.org/r/133257 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb424fc76a6c56fb801a1e24236532ce49b16c21 Gerrit-PatchSet: 1 Gerrit-Project: analytics/refinery/source Gerrit-Branch: master Gerrit-Owner: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] inheritdoc lowercase - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133258
Change subject: inheritdoc lowercase
..
inheritdoc lowercase
Change-Id: I0067638881358e44ecda3b136892285e041cd27a
---
M modules/ve/ui/widgets/ve.ui.LanguageSearchWidget.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/58/133258/1
diff --git a/modules/ve/ui/widgets/ve.ui.LanguageSearchWidget.js
b/modules/ve/ui/widgets/ve.ui.LanguageSearchWidget.js
index 689f0f4..e0e8ced 100644
--- a/modules/ve/ui/widgets/ve.ui.LanguageSearchWidget.js
+++ b/modules/ve/ui/widgets/ve.ui.LanguageSearchWidget.js
@@ -55,7 +55,7 @@
/* Methods */
/**
- * @inheritDoc
+ * @inheritdoc
*/
ve.ui.LanguageSearchWidget.prototype.onQueryChange = function () {
// Parent method
--
To view, visit https://gerrit.wikimedia.org/r/133258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0067638881358e44ecda3b136892285e041cd27a
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] inheritdoc lowercase - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133259
Change subject: inheritdoc lowercase
..
inheritdoc lowercase
Change-Id: Ie7a824a4f145d039b45fe60afbc7fe2a382c5e2d
---
M modules/ve-mw/ui/widgets/ve.ui.MWLanguageSearchWidget.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/59/133259/1
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWLanguageSearchWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWLanguageSearchWidget.js
index 822d6b5..f1e60a0 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWLanguageSearchWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWLanguageSearchWidget.js
@@ -28,7 +28,7 @@
/* Methods */
/**
- * @inheritDoc
+ * @inheritdoc
*/
ve.ui.MWLanguageSearchWidget.prototype.getLanguages = function () {
return mw.language.getData( mw.config.get( 'wgUserLanguage' ),
'languageNames' ) ||
--
To view, visit https://gerrit.wikimedia.org/r/133259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7a824a4f145d039b45fe60afbc7fe2a382c5e2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 5a1e66b..af9cf9b - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/133260 Change subject: Syncronize VisualEditor: 5a1e66b..af9cf9b .. Syncronize VisualEditor: 5a1e66b..af9cf9b Change-Id: Ia3b2768f3fb1a91efc7652f1599b9359013c4b11 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/60/133260/1 diff --git a/VisualEditor b/VisualEditor index 5a1e66b..af9cf9b 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 5a1e66b0a08c484617969fd1110f1f32fbbedc76 +Subproject commit af9cf9b2ff6b55659d09527673d13d78aa392358 -- To view, visit https://gerrit.wikimedia.org/r/133260 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3b2768f3fb1a91efc7652f1599b9359013c4b11 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] inheritdoc lowercase - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: inheritdoc lowercase
..
inheritdoc lowercase
Change-Id: Ie7a824a4f145d039b45fe60afbc7fe2a382c5e2d
---
M modules/ve-mw/ui/widgets/ve.ui.MWLanguageSearchWidget.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWLanguageSearchWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWLanguageSearchWidget.js
index 822d6b5..f1e60a0 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWLanguageSearchWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWLanguageSearchWidget.js
@@ -28,7 +28,7 @@
/* Methods */
/**
- * @inheritDoc
+ * @inheritdoc
*/
ve.ui.MWLanguageSearchWidget.prototype.getLanguages = function () {
return mw.language.getData( mw.config.get( 'wgUserLanguage' ),
'languageNames' ) ||
--
To view, visit https://gerrit.wikimedia.org/r/133259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7a824a4f145d039b45fe60afbc7fe2a382c5e2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 5a1e66b..af9cf9b - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 5a1e66b..af9cf9b .. Syncronize VisualEditor: 5a1e66b..af9cf9b Change-Id: Ia3b2768f3fb1a91efc7652f1599b9359013c4b11 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 5a1e66b..af9cf9b 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 5a1e66b0a08c484617969fd1110f1f32fbbedc76 +Subproject commit af9cf9b2ff6b55659d09527673d13d78aa392358 -- To view, visit https://gerrit.wikimedia.org/r/133260 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia3b2768f3fb1a91efc7652f1599b9359013c4b11 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dynamicproxy: Use redis connection pooling - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: dynamicproxy: Use redis connection pooling
..
dynamicproxy: Use redis connection pooling
Bug: 65179
Change-Id: I8f9dc15c72e135dda00cba776215db0bea274f35
---
M modules/dynamicproxy/files/domainproxy.lua
M modules/dynamicproxy/files/urlproxy.lua
2 files changed, 8 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Tim Landscheidt: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/dynamicproxy/files/domainproxy.lua
b/modules/dynamicproxy/files/domainproxy.lua
index d1afb5d..6d81bdb 100644
--- a/modules/dynamicproxy/files/domainproxy.lua
+++ b/modules/dynamicproxy/files/domainproxy.lua
@@ -25,6 +25,10 @@
local backend = red:srandmember('frontend:' .. frontend)
+-- Use a connection pool of 256 connections with a 32s idle timeout
+-- This also closes the current redis connection.
+red:set_keepalive(1000 * 32, 256)
+
if backend == ngx.null then
-- Handle frontends wihout any configuration in them
ngx.exit(404)
diff --git a/modules/dynamicproxy/files/urlproxy.lua
b/modules/dynamicproxy/files/urlproxy.lua
index e23f8f8..0cb877a 100644
--- a/modules/dynamicproxy/files/urlproxy.lua
+++ b/modules/dynamicproxy/files/urlproxy.lua
@@ -54,6 +54,10 @@
end
end
+-- Use a connection pool of 256 connections with a 32s idle timeout
+-- This also closes the current redis connection.
+red:set_keepalive(1000 * 32, 256)
+
if route then
ngx.var.backend = route
ngx.exit(ngx.OK)
--
To view, visit https://gerrit.wikimedia.org/r/133172
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f9dc15c72e135dda00cba776215db0bea274f35
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: Petrb benap...@gmail.com
Gerrit-Reviewer: Tim Landscheidt t...@tim-landscheidt.de
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] dynamicproxy: Remove some unused code - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged. Change subject: dynamicproxy: Remove some unused code .. dynamicproxy: Remove some unused code Change-Id: Iac15ba90de321c47648f6227e1403d397b8810cb --- M modules/dynamicproxy/files/urlproxy.lua 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved Tim Landscheidt: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/dynamicproxy/files/urlproxy.lua b/modules/dynamicproxy/files/urlproxy.lua index c7247a9..e23f8f8 100644 --- a/modules/dynamicproxy/files/urlproxy.lua +++ b/modules/dynamicproxy/files/urlproxy.lua @@ -22,11 +22,6 @@ local captures = ngx.re.match(ngx.var.uri, ^/([^/]*)(/.*)?$) -if captures == ngx.null then --- This would actually never happen, I'd think. -ngx.exit(500) -end - local prefix = captures[1] local rest = captures[2] or / local routes_arr = nil -- To view, visit https://gerrit.wikimedia.org/r/133171 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac15ba90de321c47648f6227e1403d397b8810cb 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: CoderXpert adnan.i...@gmail.com Gerrit-Reviewer: Petrb benap...@gmail.com Gerrit-Reviewer: Tim Landscheidt t...@tim-landscheidt.de 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] Declare family.versionnumber and site.versionnumber as depre... - change (pywikibot/core)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133261
Change subject: Declare family.versionnumber and site.versionnumber as
deprecated
..
Declare family.versionnumber and site.versionnumber as deprecated
There is a more precise method to compare versions by using
LooseVersion from distutils.version whereas versionnumber() for
2.1wmf3 looks very strange with 1001. With LV we can also compare
the build number.
remove versionnumber() from old site method list
Change-Id: I442523c5b14ccf1a240e74e782c6b3f6f3139a0d
---
M pywikibot/family.py
M pywikibot/site.py
M pywikibot/textlib.py
M scripts/cosmetic_changes.py
M tests/site_tests.py
5 files changed, 19 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/61/133261/1
diff --git a/pywikibot/family.py b/pywikibot/family.py
index c422460..7c3f440 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -959,14 +959,18 @@
# Which version of MediaWiki is used?
def version(self, code):
-Return MediaWiki version number as a string.
-# Don't use this, use versionnumber() instead. This only exists
-# to not break family files.
+ Return MediaWiki version number as a string.
+Use LooseVersion from distutils.version to compate version strings.
+
+
# Here we return the latest mw release for downloading
return '1.20wmf2'
+@pywikibot.deprecated(version())
def versionnumber(self, code):
-Return an int identifying MediaWiki version.
+ DEPRECATED, use version() instead and use
+distutils.version,LooseVersion to compare version strings.
+Return an int identifying MediaWiki version.
Currently this is implemented as returning the minor version
number; i.e., 'X' in version '1.X.Y'
@@ -1066,9 +1070,11 @@
]
def version(self, code):
-Return Wikimedia projects version number as a string.
-# Don't use this, use versionnumber() instead. This only exists
-# to not break family files.
+Return Wikimedia projects version number as a string.
+Use LooseVersion from distutils.version to compate versions.
+
+
+# Here we return the latest mw release for downloading
return '1.24wmf3'
def shared_image_repository(self, code):
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 2db9e82..ce4328c 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -612,7 +612,6 @@
#postData: Post encoded form data to an http address at this site.
#
#version: Return MediaWiki version string from Family file.
-#versionnumber: Return int identifying the MediaWiki version.
#live_version: Return version number read from Special:Version.
#checkCharset(charset): Warn if charset doesn't match family file.
#
diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index c96ecb6..410af7b 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -1020,7 +1020,8 @@
#if self.site().isInterwikiLink(name):
#continue
## {{DEFAULTSORT:...}}
-#defaultKeys = self.site().versionnumber() 13 and \
+#from distutils.version import LooseVersion as LV
+#defaultKeys = LV(self.site.version()) LV(1.13) and \
# self.site().getmagicwords('defaultsort')
## It seems some wikis does not have this magic key
#if defaultKeys:
diff --git a/scripts/cosmetic_changes.py b/scripts/cosmetic_changes.py
index 691460f..2b67cfc 100755
--- a/scripts/cosmetic_changes.py
+++ b/scripts/cosmetic_changes.py
@@ -74,6 +74,7 @@
#
import re
+from distutils.version import LooseVersion as LV
import pywikibot
import isbn
from pywikibot import pagegenerators
@@ -338,7 +339,7 @@
thisNs = namespaces.pop(0)
if nsNumber == 6 and family.name == 'wikipedia':
if self.site.lang in ('en', 'fr') and \
- self.site.versionnumber() = 14:
+ LV(self.site.version()) = LV('1.14'):
# do not change Image on en-wiki and fr-wiki
assert u'Image' in namespaces
namespaces.remove(u'Image')
diff --git a/tests/site_tests.py b/tests/site_tests.py
index 51a9c9e..83ff431 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -10,6 +10,7 @@
__version__ = '$Id$'
+from distutils.version import LooseVersion as LV
import pywikibot
from pywikibot.site import must_be
from tests import patch_request, unpatch_request
@@ -648,7 +649,7 @@
prefix = title[:title.index(:)]
self.assertTrue(mysite.ns_index(prefix) in [6, 7])
self.assertTrue(change[ns] in [6, 7])
-if mysite.versionnumber() = 14:
+if LV(mysite.version()) = LV(1.14):
for change
[MediaWiki-commits] [Gerrit] Create phantom/shield nodes with methods not templates - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Create phantom/shield nodes with methods not templates
..
Create phantom/shield nodes with methods not templates
Templates have the following problems:
* Static, so don't have access to this.*, hence the
importNode hack.
* Run on file node, so potential load order issues
with things like ve.msg.
Change-Id: Ia7f6a2b7ac10b111bcd7245aa96c8ec9bfb183fb
---
M modules/ve/ce/nodes/ve.ce.AlienNode.js
M modules/ve/ce/ve.ce.ProtectedNode.js
2 files changed, 33 insertions(+), 26 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ce/nodes/ve.ce.AlienNode.js
b/modules/ve/ce/nodes/ve.ce.AlienNode.js
index 6af1e09..d3f06d6 100644
--- a/modules/ve/ce/nodes/ve.ce.AlienNode.js
+++ b/modules/ve/ce/nodes/ve.ce.AlienNode.js
@@ -42,12 +42,21 @@
ve.ce.AlienNode.static.name = 'alien';
-ve.ce.AlienNode.static.$phantomTemplate =
ve.ce.AlienNode.static.$phantomTemplate.clone()
- .addClass( 've-ce-alienNode-phantom' )
- .attr( 'title', ve.msg( 'visualeditor-aliennode-tooltip' ) );
-
/* Methods */
+/**
+ * @inheritdoc
+ */
+ve.ce.AlienNode.prototype.createPhantom = function () {
+ // Mixin method
+ return ve.ce.ProtectedNode.prototype.createPhantom.call( this )
+ .addClass( 've-ce-alienNode-phantom' )
+ .attr( 'title', ve.msg( 'visualeditor-aliennode-tooltip' ) );
+};
+
+/**
+ * @inheritdoc
+ */
ve.ce.AlienNode.prototype.generateContents = function ( config ) {
var deferred = $.Deferred();
deferred.resolve( ( config config.domElements ) ||
this.model.getAttribute( 'domElements' ) || [] );
diff --git a/modules/ve/ce/ve.ce.ProtectedNode.js
b/modules/ve/ce/ve.ce.ProtectedNode.js
index 3411e7e..f3342ca 100644
--- a/modules/ve/ce/ve.ce.ProtectedNode.js
+++ b/modules/ve/ce/ve.ce.ProtectedNode.js
@@ -34,31 +34,31 @@
ve.ce.ProtectedNode.static = {};
+/* Methods */
+
/**
- * Template for shield elements.
+ * Create a shield element.
*
* Uses data URI to inject a 1x1 transparent GIF image into the DOM.
*
- * @property {jQuery}
- * @static
- * @inheritable
+ * @returns {jQuery} A shield element
*/
-ve.ce.ProtectedNode.static.$shieldTemplate = $( 'img' )
- .addClass( 've-ce-protectedNode-shield' )
- .attr( 'src',
'data:image/gif;base64,R0lGODlhAQABAIAAAP///yH5BAEALAABAAEAAAIBRAA7'
);
+ve.ce.ProtectedNode.prototype.createShield = function () {
+ return this.$( 'img' )
+ .addClass( 've-ce-protectedNode-shield' )
+ .attr( 'src',
'data:image/gif;base64,R0lGODlhAQABAIAAAP///yH5BAEALAABAAEAAAIBRAA7'
);
+};
/**
- * Phantom element template.
+ * Create a phantom element.
*
- * @property {jQuery}
- * @static
- * @inheritable
+ * @returns {jQuery} A phantom element
*/
-ve.ce.ProtectedNode.static.$phantomTemplate = $( 'div' )
- .addClass( 've-ce-protectedNode-phantom' )
- .attr( 'draggable', false );
-
-/* Methods */
+ve.ce.ProtectedNode.prototype.createPhantom = function () {
+ return this.$( 'div' )
+ .addClass( 've-ce-protectedNode-phantom' )
+ .attr( 'draggable', false );
+};
/**
* Handle setup events.
@@ -67,8 +67,7 @@
*/
ve.ce.ProtectedNode.prototype.onProtectedSetup = function () {
var $shield,
- node = this,
- $shieldTemplate = this.constructor.static.$shieldTemplate;
+ node = this;
// Exit if already setup or not unattached
if ( this.isSetup || !this.root ) {
@@ -97,7 +96,7 @@
) {
return;
}
- $shield = node.$( node.$.context.importNode(
$shieldTemplate[0], true ) )
+ $shield = node.createShield()
.appendTo( $this )
.on( 'dblclick', function () {
node.emit( 'dblclick' );
@@ -219,14 +218,13 @@
* @method
*/
ve.ce.ProtectedNode.prototype.createPhantoms = function () {
- var $phantomTemplate = this.constructor.static.$phantomTemplate,
- surface = this.root.getSurface(),
+ var surface = this.root.getSurface(),
node = this;
this.$phantomable.find( '.ve-ce-protectedNode-shield:visible' ).each(
ve.bind( function () {
this.$phantoms = this.$phantoms.add(
- this.$( this.$.context.importNode(
$phantomTemplate[0], true ) )
+ this.createPhantom()
.on( 'mousedown', ve.bind(
this.onPhantomMouseDown, this ) )
.on( 'dblclick', function () {
node.emit(
[MediaWiki-commits] [Gerrit] Fix handling of short fuzzy queries - change (search/highlighter)
Manybubbles has submitted this change and it was merged.
Change subject: Fix handling of short fuzzy queries
..
Fix handling of short fuzzy queries
Change-Id: Iebdb1277268203309dde74a76506ce8a754636b4
---
M
experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattener.java
M
experimental-highlighter-lucene/src/test/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattenerTest.java
2 files changed, 10 insertions(+), 0 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattener.java
b/experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattener.java
index 57b8761..29aab9f 100644
---
a/experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattener.java
+++
b/experimental-highlighter-lucene/src/main/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattener.java
@@ -354,6 +354,7 @@
String term = query.getTerm().bytes().utf8ToString();
if (query.getPrefixLength() = term.length()) {
callback.flattened(query.getTerm().bytes(), boost, sourceOverride);
+return;
}
FuzzyQueryInfo key = new FuzzyQueryInfo(term, query);
diff --git
a/experimental-highlighter-lucene/src/test/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattenerTest.java
b/experimental-highlighter-lucene/src/test/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattenerTest.java
index 9a75401..4d62e38 100644
---
a/experimental-highlighter-lucene/src/test/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattenerTest.java
+++
b/experimental-highlighter-lucene/src/test/java/org/wikimedia/highlighter/experimental/lucene/QueryFlattenerTest.java
@@ -2,6 +2,7 @@
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertThat;
+import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyFloat;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
@@ -103,6 +104,14 @@
}
@Test
+public void fuzzyQueryShorterThenPrefix() {
+Callback callback = mock(Callback.class);
+new QueryFlattener(1, false).flatten(new FuzzyQuery(bar, 2, 100),
null, callback);
+verify(callback).flattened(bar.bytes(), 1f, null);
+verify(callback, never()).flattened(any(Automaton.class), anyFloat(),
anyInt());
+}
+
+@Test
public void regexpQuery() {
flattenedToAutomatonThatMatches(new RegexpQuery(new Term(test,
ba[zr])),
recognises(bar), recognises(baz), not(recognises(barr)));
--
To view, visit https://gerrit.wikimedia.org/r/133161
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iebdb1277268203309dde74a76506ce8a754636b4
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Add support for skipping some fields - change (search/highlighter)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133262
Change subject: WIP: Add support for skipping some fields
..
WIP: Add support for skipping some fields
This won't work properly right now because we can't control the execution
order of the fields.
Change-Id: I70255c89ed9b18a197066068cda158633abcae5a
---
M
experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
1 file changed, 70 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/search/highlighter
refs/changes/62/133262/1
diff --git
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
index 3fc545c..a568736 100644
---
a/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
+++
b/experimental-highlighter-elasticsearch-plugin/src/main/java/org/elasticsearch/search/highlight/ExperimentalHighlighter.java
@@ -2,7 +2,6 @@
import java.io.IOException;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -10,6 +9,8 @@
import org.apache.lucene.search.Query;
import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.hppc.ObjectObjectMap;
+import org.elasticsearch.common.hppc.ObjectObjectOpenHashMap;
import org.elasticsearch.common.text.StringAndBytesText;
import org.elasticsearch.common.text.StringText;
import org.elasticsearch.common.text.Text;
@@ -50,65 +51,57 @@
@Override
public HighlightField highlight(HighlighterContext context) {
try {
-CacheEntry entry = (CacheEntry)
context.hitContext.cache().get(CACHE_KEY);
-if (entry == null) {
-entry = new CacheEntry();
-context.hitContext.cache().put(CACHE_KEY, entry);
-}
-BasicQueryWeigher weigher =
entry.queryWeighers.get(context.query.originalQuery());
-if (weigher == null) {
-// TODO recycle. But addReleasble doesn't seem to close it
-// properly later. I believe this is fixed in later
-// Elasticsearch versions.
-BytesRefHashTermInfos infos = new
BytesRefHashTermInfos(BigArrays.NON_RECYCLING_INSTANCE);
-//context.context.addReleasable(infos);
-boolean phraseAsTerms = false;
-if (context.field.fieldOptions().options() != null) {
-Boolean phraseAsTermsOption = (Boolean)
context.field.fieldOptions().options()
-.get(phrase_as_terms);
-if (phraseAsTermsOption != null) {
-phraseAsTerms = phraseAsTermsOption;
-}
-}
-weigher = new BasicQueryWeigher(
-new ElasticsearchQueryFlattener(100, phraseAsTerms),
infos,
-context.hitContext.topLevelReader(),
context.query.originalQuery());
-// Build the QueryWeigher with the top level reader to get all
-// the frequency information
-entry.queryWeighers.put(context.query.originalQuery(),
weigher);
-}
-HighlightExecutionContext executionContext = new
HighlightExecutionContext(context,
-weigher);
+HighlightExecutionContext executionContext = new
HighlightExecutionContext(context);
try {
+executionContext.setup();
return executionContext.highlight();
} finally {
executionContext.cleanup();
}
} catch (Exception e) {
+e.printStackTrace();
throw new FetchPhaseExecutionException(context.context, Failed to
highlight field [
+ context.fieldName + ], e);
}
}
-
+
static class CacheEntry {
-private final MapQuery, BasicQueryWeigher queryWeighers = new
HashMapQuery, BasicQueryWeigher();
+// Note that the magic numbers in the constructors for the HashMaps a
+// wild guesses as to efficient initial capacities
+private final ObjectObjectMapQuery, BasicQueryWeigher queryWeighers
= new ObjectObjectOpenHashMapQuery, BasicQueryWeigher(1);
+private final ObjectObjectMapString, Object forwarded = new
ObjectObjectOpenHashMapString, Object(10);
+private int docId;
}
static class HighlightExecutionContext {
private final HighlighterContext context;
-private final BasicQueryWeigher weigher;
+private BasicQueryWeigher weigher;
+private CacheEntry cacheEntry;
[MediaWiki-commits] [Gerrit] build: Simplify building of module dependency list - change (VisualEditor/VisualEditor)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133263
Change subject: build: Simplify building of module dependency list
..
build: Simplify building of module dependency list
Change-Id: I598534c329178a182690a10009ac5c20718807df
---
M build/tasks/buildloader.js
1 file changed, 3 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/63/133263/1
diff --git a/build/tasks/buildloader.js b/build/tasks/buildloader.js
index 0a3196f..074e4b1 100644
--- a/build/tasks/buildloader.js
+++ b/build/tasks/buildloader.js
@@ -42,7 +42,7 @@
}
function buildDependencyList( modules, load, list ) {
- var i, j, k, module;
+ var i, module;
list = list || [];
@@ -59,15 +59,8 @@
}
// Append target load module to the end of the
current list
- list.push( module );
- }
-
- // We always want to retain the first entry of
duplicates
- for ( j = 0; j list.length; j++ ) {
- for ( k = j + 1; k list.length; k++ ) {
- if ( list[j] === list[k] ) {
- list.splice( k--, 1 );
- }
+ if ( list.indexOf( module ) === -1 ) {
+ list.push( module );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/133263
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I598534c329178a182690a10009ac5c20718807df
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Load dependencies in correct order - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Load dependencies in correct order
..
Load dependencies in correct order
Pre-concating the dependencies loads them in reverse order.
Change-Id: I676137204c20e6833008ec028cc9773f5a33edf2
---
M build/tasks/buildloader.js
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/build/tasks/buildloader.js b/build/tasks/buildloader.js
index 33736d3..0a3196f 100644
--- a/build/tasks/buildloader.js
+++ b/build/tasks/buildloader.js
@@ -41,8 +41,10 @@
return true;
}
- function buildDependencyList( modules, load ) {
- var i, j, k, module, list = [];
+ function buildDependencyList( modules, load, list ) {
+ var i, j, k, module;
+
+ list = list || [];
for ( i = 0; i load.length; i++ ) {
module = load[i];
@@ -53,8 +55,7 @@
// Add in any dependencies
if ( modules[module].hasOwnProperty(
'dependencies' ) ) {
- list = buildDependencyList( modules,
modules[module].dependencies )
- .concat( list );
+ buildDependencyList( modules,
modules[module].dependencies, list );
}
// Append target load module to the end of the
current list
--
To view, visit https://gerrit.wikimedia.org/r/133237
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I676137204c20e6833008ec028cc9773f5a33edf2
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix basestring usage in site_tests - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Fix basestring usage in site_tests .. Fix basestring usage in site_tests Change-Id: I621120bb0a099e44077b8112e0ec547e82ee7ecd --- M tests/site_tests.py 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index ae2c92a..c901964 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -15,6 +15,10 @@ from tests import patch_request, unpatch_request from tests.utils import PywikibotTestCase, unittest +import sys +if sys.version_info[0] 2: +basestring = (str, ) + mysite = None mainpage = None imagepage = None -- To view, visit https://gerrit.wikimedia.org/r/130022 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I621120bb0a099e44077b8112e0ec547e82ee7ecd Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: Xqt i...@gno.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 documentation to WikibaseDataTypeBuilders - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133264
Change subject: Add documentation to WikibaseDataTypeBuilders
..
Add documentation to WikibaseDataTypeBuilders
This is a direct follow-up to I53883a7921dea368ed8b38aa7513cbbd0f488964.
Change-Id: If263dfc532da02ceea7c72236477a4a2e4644a94
---
M lib/includes/WikibaseDataTypeBuilders.php
1 file changed, 65 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/64/133264/1
diff --git a/lib/includes/WikibaseDataTypeBuilders.php
b/lib/includes/WikibaseDataTypeBuilders.php
index 8df0a49..64a9b5f 100644
--- a/lib/includes/WikibaseDataTypeBuilders.php
+++ b/lib/includes/WikibaseDataTypeBuilders.php
@@ -4,9 +4,10 @@
use DataTypes\DataType;
use DataValues\TimeValue;
-use Wikibase\Utils;
+use ValueValidators\ValueValidator;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\EntityLookup;
+use Wikibase\Utils;
use Wikibase\Validators\CompositeValidator;
use Wikibase\Validators\DataFieldValidator;
use Wikibase\Validators\DataValueValidator;
@@ -33,17 +34,17 @@
/**
* @var EntityLookup
*/
- protected $entityLookup;
+ private $entityLookup;
/**
* @var EntityIdParser
*/
- protected $entityIdParser;
+ private $entityIdParser;
/**
* @var array
*/
- protected $urlSchemes;
+ private $urlSchemes;
/**
* @param EntityLookup $lookup
@@ -92,6 +93,11 @@
return $types;
}
+ /**
+* @param string $id Data type ID, e.g. 'wikibase-item'
+*
+* @return DataType
+*/
public function buildItemType( $id ) {
$validators = array();
@@ -102,7 +108,13 @@
return new DataType( $id, 'wikibase-entityid', $validators );
}
- protected function getCommonStringValidators( $maxLength = 400 ) {
+ /**
+* @param int $maxLength Defaults to 400 characters. This was an
arbitrary decision when it
+* turned out that 255 was to short for descriptions.
+*
+* @return ValueValidator[]
+*/
+ private function getCommonStringValidators( $maxLength = 400 ) {
$validators = array();
$validators[] = new TypeValidator( 'string' );
@@ -113,7 +125,14 @@
return $validators;
}
+ /**
+* @param string $id Data type ID, e.g. 'commonsMedia'
+*
+* @return DataType
+*/
public function buildMediaType( $id ) {
+ // oi_archive_name is max 255 bytes, which include a timestamp
and an exclamation mark,
+ // so restrict file name to 240 bytes (see
UploadBase::getTitle).
$validators = $this-getCommonStringValidators( 240 );
$validators[] = new RegexValidator( '@[#/:]@u', true ); //
no nasty chars
@@ -129,6 +148,11 @@
return new DataType( $id, 'string', array( new TypeValidator(
'DataValues\DataValue' ), $topValidator ) );
}
+ /**
+* @param string $id Data type ID, e.g. 'string'
+*
+* @return DataType
+*/
public function buildStringType( $id ) {
$validators = $this-getCommonStringValidators();
@@ -139,6 +163,11 @@
return new DataType( $id, 'string', array( new TypeValidator(
'DataValues\DataValue' ), $topValidator ) );
}
+ /**
+* @param string $id Data type ID, e.g. 'monolingual-text'
+*
+* @return DataType
+*/
public function buildMonolingualTextType( $id ) {
$textValidator = new DataFieldValidator(
'text',
@@ -161,12 +190,18 @@
return new DataType( $id, 'monolingual-text', array( new
TypeValidator( 'DataValues\DataValue' ), $topValidator ) );
}
+ /**
+* @param string $id Data type ID, e.g. 'time'
+*
+* @return DataType
+*/
public function buildTimeType( $id ) {
$validators = array();
$validators[] = new TypeValidator( 'array' );
// calendar model field
$calendarIdValidators = array();
+ // Expected to be a short IRI, see TimeFormatter and TimeParser.
$calendarIdValidators[] = $urlValidator =
$this-buildUrlValidator( array( 'http', 'https' ), 255 );
//TODO: enforce well known calendar models from config
@@ -208,12 +243,18 @@
return new DataType( $id, 'time', array( new TypeValidator(
'DataValues\DataValue' ), $topValidator ) );
}
+ /**
+* @param string $id Data type ID, e.g. 'globe-coordinate'
+*
+* @return DataType
+
[MediaWiki-commits] [Gerrit] dynamicproxy: Don't specify text/html for gzip - change (operations/puppet)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/133265 Change subject: dynamicproxy: Don't specify text/html for gzip .. dynamicproxy: Don't specify text/html for gzip This is on even if we do not specify it, and specifying it causes a warning. Change-Id: I33eb229b008fd7d60247c1b2161b264b24e2f757 --- M modules/dynamicproxy/templates/domainproxy.conf M modules/dynamicproxy/templates/urlproxy.conf 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/65/133265/1 diff --git a/modules/dynamicproxy/templates/domainproxy.conf b/modules/dynamicproxy/templates/domainproxy.conf index 2a9d91f..5de6a3f 100644 --- a/modules/dynamicproxy/templates/domainproxy.conf +++ b/modules/dynamicproxy/templates/domainproxy.conf @@ -92,5 +92,5 @@ # GZIP (ALMOST) ALL THE THINGS! gzip on; gzip_proxied any; -gzip_types text/html text/plain text/css text/xml application/json application/javascript application/x-javascript; +gzip_types text/plain text/css text/xml application/json application/javascript application/x-javascript; } diff --git a/modules/dynamicproxy/templates/urlproxy.conf b/modules/dynamicproxy/templates/urlproxy.conf index a470899..020aeec 100644 --- a/modules/dynamicproxy/templates/urlproxy.conf +++ b/modules/dynamicproxy/templates/urlproxy.conf @@ -86,6 +86,6 @@ # GZIP ALL THE THINGS! gzip on; gzip_proxied any; -gzip_types text/html text/plain text/css text/xml application/json application/javascript application/x-javascript; +gzip_types text/plain text/css text/xml application/json application/javascript application/x-javascript; } -- To view, visit https://gerrit.wikimedia.org/r/133265 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I33eb229b008fd7d60247c1b2161b264b24e2f757 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] Enable Flow on another beta features talk page - change (operations/mediawiki-config)
Spage has uploaded a new change for review. https://gerrit.wikimedia.org/r/133267 Change subject: Enable Flow on another beta features talk page .. Enable Flow on another beta features talk page Change-Id: I14efad8e26cae4543a41322dc82963c1c1ca1b8d --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/67/133267/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 4d87481..ef70dcb 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12519,6 +12519,7 @@ 'Talk:Beta Features/Nearby Pages', 'Talk:VisualEditor/Beta Features/Language', 'Talk:Content translation', + 'Talk:Wikibase/Beta Features/Other projects sidebar', ), 'enwiki' = array( // Bug 60178 'Wikipedia talk:WikiProject Breakfast', -- To view, visit https://gerrit.wikimedia.org/r/133267 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14efad8e26cae4543a41322dc82963c1c1ca1b8d 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] toollabs: Install git-svn - change (operations/puppet)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/133266 Change subject: toollabs: Install git-svn .. toollabs: Install git-svn Request from phe on IRC. scfe_de has already installed on -login and -dev. Change-Id: I351b9c6345ac3a50f83616be2d05d0e5aee9d31c --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/66/133266/1 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 46bfd74..18fff35 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -210,6 +210,7 @@ 'gdal-bin', 'git', 'git-review', # Bug 62871. +'git-svn', 'gnuplot-nox', 'graphicsmagick', # Bug 56995 'graphviz', -- To view, visit https://gerrit.wikimedia.org/r/133266 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I351b9c6345ac3a50f83616be2d05d0e5aee9d31c 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 FOR UPDATE in prior LocalFile timestamp check - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133268
Change subject: Use FOR UPDATE in prior LocalFile timestamp check
..
Use FOR UPDATE in prior LocalFile timestamp check
* This covers the case with a snapshotted transaction outside of lock()/unlock()
Change-Id: I8639c2e51cb918f452dc1576681d6224fb4fb2c0
---
M includes/filerepo/file/LocalFile.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/68/133268/1
diff --git a/includes/filerepo/file/LocalFile.php
b/includes/filerepo/file/LocalFile.php
index e8f70fc..a8fa8bd 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1249,8 +1249,9 @@
}
if ( $timestamp === false ) {
+ // Use FOR UPDATE in case lock()/unlock() did not start
the transaction
$ltimestamp = $dbw-selectField( 'image',
'img_timestamp',
- array( 'img_name' = $this-getName() ),
__METHOD__ );
+ array( 'img_name' = $this-getName() ),
__METHOD__, array( 'FOR UPDATE' ) );
$ltime = $ltimestamp ? wfTimestamp( TS_UNIX,
$ltimestamp ) : false;
$ctime = time();
// Avoid a timestamp that is not newer than the last
version
--
To view, visit https://gerrit.wikimedia.org/r/133268
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8639c2e51cb918f452dc1576681d6224fb4fb2c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Work around domino breakage in package.json - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133269
Change subject: Work around domino breakage in package.json
..
Work around domino breakage in package.json
* Jenkins seems to be pulling packages via npm for a couple of
its jobs instead of using packages from the deploy repo.
* Since the latest version of domino is broken, Jenkins jobs on
our patches are failing. We should also fix those Jenkins jobs
to use the deploy repo.
* This patch lets us work around both those dependencies (new domino
release; fix Jenkins jobs) and let us continue with work.
Change-Id: I33b0347a1dd08128689f6dc2b186630528509567
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/69/133269/1
diff --git a/package.json b/package.json
index 8830667..fe55ef6 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
dependencies: {
alea: ~0.0.9,
async: ~0.8.0,
- domino: ~1.0.13,
+ domino:
git+https://github.com/gwicke#b8fd3faae09b6a5b7dc7d0a56d68ef7bf89cf95d;,
entities: ~1.1.1,
es6-shim: ~0.10.0,
express: ~2.5.11,
--
To view, visit https://gerrit.wikimedia.org/r/133269
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33b0347a1dd08128689f6dc2b186630528509567
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed crash when fragment is detached from Activity. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixed crash when fragment is detached from Activity.
..
Fixed crash when fragment is detached from Activity.
Bug: 64493
Change-Id: I214f801f92520ffedad0aafa3c15d2aa5e1524f5
---
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
1 file changed, 11 insertions(+), 1 deletion(-)
Approvals:
BearND: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index fd73dcc..13e0b17 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -3,7 +3,7 @@
import android.content.*;
import android.os.*;
import android.support.v4.app.*;
-import android.support.v4.widget.*;
+import android.util.*;
import android.view.*;
import android.widget.*;
import org.json.*;
@@ -306,6 +306,11 @@
@Override
public void onFinish(ListSection result) {
+// have we been unwittingly detached from our Activity?
+if (!isAdded()) {
+Log.d(PageViewFragment, Detached from activity, so stopping
update.);
+return;
+}
page = new Page(title, (ArrayListSection) result,
pageProperties);
editHandler.setPage(page);
displayLeadSection();
@@ -347,6 +352,11 @@
@Override
public void onFinish(ListSection result) {
+// have we been unwittingly detached from our Activity?
+if (!isAdded()) {
+Log.d(PageViewFragment, Detached from activity, so stopping
update.);
+return;
+}
ArrayListSection newSections = (ArrayListSection)
page.getSections().clone();
newSections.addAll(result);
page = new Page(page.getTitle(), newSections,
page.getPageProperties());
--
To view, visit https://gerrit.wikimedia.org/r/132955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I214f801f92520ffedad0aafa3c15d2aa5e1524f5
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@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] build: Upgrade jscs and jshint - change (VisualEditor/VisualEditor)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133270
Change subject: build: Upgrade jscs and jshint
..
build: Upgrade jscs and jshint
See also If46b94ce18a7084cf in oojs/core.
jshint:
* Update to grunt-contrib-jshint v0.10.0 (jshint v2.5.0).
* Remove coding style option noempty (already covered by jscs).
* Remove option regexp.
* Enable new option freeze (prohibits changing native prototypes).
http://www.jshint.com/blog/new-in-jshint-oct-2013/#option-freeze
* Re-order to match http://www.jshint.com/docs/options/
jscs:
* Update to grunt-contrib-jshint v0.4.2 (jscs v1.4.0).
* Format .jscsrc file in a more spaceious way and order the
properties less arbitrarily (using the jscs's readme order).
* Enforce more details of our coding style:
- requireCurlyBraces: Add more keywords that should have their
code block wrapped in curly braces.
- requireSpaceAfterKeywords: Add more keywords that should have
a space after them.
- requireMultipleVarDecl: Enable the new onevar checker
(like jshint's onevar). Introduced in jscs v1.4.0.
- disallowTrailingComma: Enable.
- disallowKeywordsOnNewLine: Enable for else.
- requireSpaceBeforeBlockStatements: Enable.
- requireBlocksOnNewline: Enable, but only when more than 1
statement (this still will validate shorthand like the
following, which we make use of at the moment):
var noop = function () { return true; };
- requireSpacesInFunctionExpression: Remove, this is already
covered by requireSpaceAfterKeywords and requireSpaceBeforeBlockStatements,
which enforce:
x.noop = function () {};
x.Foo = function Foo() {};
- disallowSpacesInNamedFunctionExpression: Enable for the parenthesis.
Disallows:
x.Foo = function Foo () {};
- disallowSpacesInFunctionDeclaration: Enable for parenthesis.
Disallows:
function noop () {}
- disallowDanglingUnderscores: Enable (like jshint's nomen).
- disallowSpaceAfterPrefixUnaryOperators: Add ! back, now that the
bug where it conflicts with requireRightStickedOperators is fixed.
https://github.com/mdevils/node-jscs/issues/87
- disallowMixedSpacesAndTabs: Enable.
- disallowYodaConditions: Enable.
- disallowRightStickedOperators: Remove, this is obsolete with
requireSpace{Before,After}BinaryOperators and fixes a bug
where the following would be considered invalid when it shouldn't:
+!!constructor.static.matchFunction
// Operator + should not stick to following expression
This is a false positive due to the tricky nature of
disallowRightStickedOperators and for that reason this rule
has been deprecated and scheduled for removal in jscs 2.0.0
Change-Id: Iccf3b461b8d01023dd698771183b0ad5816993b1
---
M .jscsrc
M .jshintrc
M Gruntfile.js
M modules/ve/dm/nodes/ve.dm.ImageNode.js
M modules/ve/dm/ve.dm.Model.js
M modules/ve/init/ve.init.DebugBar.js
M modules/ve/test/ce/ve.ce.Surface.test.js
M modules/ve/test/dm/lineardata/ve.dm.FlatLinearData.test.js
M modules/ve/test/dm/ve.dm.Document.test.js
M modules/ve/test/dm/ve.dm.example.js
M modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
M package.json
12 files changed, 88 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/70/133270/1
diff --git a/.jscsrc b/.jscsrc
index 5ddc1a5..5411724 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,33 +1,94 @@
{
- requireCurlyBraces: [if, else, for, while, do],
- requireSpaceAfterKeywords: [if, else, for, while, do,
switch, return, function],
+ requireCurlyBraces: [
+ if,
+ else,
+ for,
+ while,
+ do,
+ try,
+ catch
+ ],
+ requireSpaceAfterKeywords: [
+ if,
+ else,
+ for,
+ while,
+ do,
+ switch,
+ return,
+ try,
+ catch,
+ function
+ ],
+ requireSpaceBeforeBlockStatements: true,
requireParenthesesAroundIIFE: true,
- requireSpacesInFunctionExpression: {
- beforeOpeningCurlyBrace: true
+ disallowSpacesInNamedFunctionExpression: {
+ beforeOpeningRoundBrace: true
},
- requireMultipleVarDecl: true,
+ disallowSpacesInFunctionDeclaration: {
+ beforeOpeningRoundBrace: true
+ },
+ requireMultipleVarDecl: onevar,
+ requireBlocksOnNewline: 1,
disallowEmptyBlocks: true,
requireSpacesInsideObjectBrackets: all,
disallowDanglingUnderscores: true,
disallowSpaceAfterObjectKeys: true,
requireCommaBeforeLineBreak: true,
- disallowLeftStickedOperators: [?, +, /, *, -, =, ==,
===, !=, !==, , =, , =],
- disallowRightStickedOperators: [?, /, *, :, =, ==, ===,
!=, !==, , =, ,
[MediaWiki-commits] [Gerrit] build: Remove jscs rule for disallowRightStickedOperators - change (oojs/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133271
Change subject: build: Remove jscs rule for disallowRightStickedOperators
..
build: Remove jscs rule for disallowRightStickedOperators
The disallowRightStickedOperators rule is obsolete with
requireSpace{Before,After}BinaryOperators and fixes a bug where
the following would be considered invalid when it shouldn't:
+!!constructor.static.matchFunction
// Operator + should not stick to following expression
This is a false positive due to the tricky nature of
disallowRightStickedOperators and for that reason this rule
has been deprecated and scheduled for removal in jscs 2.0.0
Change-Id: Ib731f11b1184d0e9865104a065421446a78dbfec
---
M .jscsrc
1 file changed, 0 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/71/133271/1
diff --git a/.jscsrc b/.jscsrc
index eb2c768..bc49e03 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -44,22 +44,6 @@
=
],
requireRightStickedOperators: [!],
- disallowRightStickedOperators: [
- ?,
- +,
- /,
- *,
- :,
- =,
- ==,
- ===,
- !=,
- !==,
- ,
- =,
- ,
- =
-],
requireLeftStickedOperators: [,],
disallowSpaceAfterPrefixUnaryOperators: [
++,
--
To view, visit https://gerrit.wikimedia.org/r/133271
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib731f11b1184d0e9865104a065421446a78dbfec
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use FOR UPDATE in prior LocalFile timestamp check - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Use FOR UPDATE in prior LocalFile timestamp check
..
Use FOR UPDATE in prior LocalFile timestamp check
* This covers the case with a snapshotted transaction outside of lock()/unlock()
Change-Id: I8639c2e51cb918f452dc1576681d6224fb4fb2c0
---
M includes/filerepo/file/LocalFile.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filerepo/file/LocalFile.php
b/includes/filerepo/file/LocalFile.php
index e8f70fc..a8fa8bd 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1249,8 +1249,9 @@
}
if ( $timestamp === false ) {
+ // Use FOR UPDATE in case lock()/unlock() did not start
the transaction
$ltimestamp = $dbw-selectField( 'image',
'img_timestamp',
- array( 'img_name' = $this-getName() ),
__METHOD__ );
+ array( 'img_name' = $this-getName() ),
__METHOD__, array( 'FOR UPDATE' ) );
$ltime = $ltimestamp ? wfTimestamp( TS_UNIX,
$ltimestamp ) : false;
$ctime = time();
// Avoid a timestamp that is not newer than the last
version
--
To view, visit https://gerrit.wikimedia.org/r/133268
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8639c2e51cb918f452dc1576681d6224fb4fb2c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@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] Introducing pp_sortkey. - change (mediawiki/core)
MarkAHershberger has uploaded a new change for review. https://gerrit.wikimedia.org/r/133272 Change subject: Introducing pp_sortkey. .. Introducing pp_sortkey. This adds the pp_sortkey column to the page_props table. pp_sortkeys allows for top-k queries for pages, e.g. the 100 pages with the most language links, etc. It is also possible to query for exact values. For now, pp_sortkey will contain pp_value's numeric value if the value was set to a float, int or boolean. Associated tasks: * create a maintenance script for populating pp_sortkey. Tricky, because when reading from the database, all values are strings. * create an API module for querying pages by property value. bug: 58032 hand picked from Change-Id: I217c42656fb877ff35a36eb446a22bdaf119faac Change-Id: I89b6fc719f70a225a0a71290cc6e051f464114b7 --- M RELEASE-NOTES-1.23 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/72/133272/1 diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index bbf2d0a..c2a9c49 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -9,6 +9,9 @@ production. === Configuration changes in 1.23 === +* Introduced $wgPagePropsHaveSortkey as a backwards-compatibility switch, + for using the old schema of the page_props table, in case the respective + schema update was not applied. * (bug 13250) Restored method for clearing a watchlist in web UI so that users with large watchlists don't have to perform contortions to clear them. @@ -272,6 +275,9 @@ * Support was added for Northern Luri (lrc). === Other changes in 1.23 === +* Added pp_sortkey column to page_props table, so pages can be efficiently + queried and sorted by property value (bug 58032). + See $wgPagePropsHaveSortkey if you want to postpone the schema change. * The rc_type field in the recentchanges table has been superseded by a new rc_source field. The rc_source field is a string representation of the change type where rc_type was a numeric constant. This field is not yet -- To view, visit https://gerrit.wikimedia.org/r/133272 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I89b6fc719f70a225a0a71290cc6e051f464114b7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_23 Gerrit-Owner: MarkAHershberger m...@nichework.com Gerrit-Reviewer: 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] Introducing pp_sortkey. - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Introducing pp_sortkey. .. Introducing pp_sortkey. This adds the pp_sortkey column to the page_props table. pp_sortkeys allows for top-k queries for pages, e.g. the 100 pages with the most language links, etc. It is also possible to query for exact values. For now, pp_sortkey will contain pp_value's numeric value if the value was set to a float, int or boolean. Associated tasks: * create a maintenance script for populating pp_sortkey. Tricky, because when reading from the database, all values are strings. * create an API module for querying pages by property value. bug: 58032 hand picked from Change-Id: I217c42656fb877ff35a36eb446a22bdaf119faac Change-Id: I89b6fc719f70a225a0a71290cc6e051f464114b7 --- M RELEASE-NOTES-1.23 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: MarkAHershberger: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index bbf2d0a..c2a9c49 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -9,6 +9,9 @@ production. === Configuration changes in 1.23 === +* Introduced $wgPagePropsHaveSortkey as a backwards-compatibility switch, + for using the old schema of the page_props table, in case the respective + schema update was not applied. * (bug 13250) Restored method for clearing a watchlist in web UI so that users with large watchlists don't have to perform contortions to clear them. @@ -272,6 +275,9 @@ * Support was added for Northern Luri (lrc). === Other changes in 1.23 === +* Added pp_sortkey column to page_props table, so pages can be efficiently + queried and sorted by property value (bug 58032). + See $wgPagePropsHaveSortkey if you want to postpone the schema change. * The rc_type field in the recentchanges table has been superseded by a new rc_source field. The rc_source field is a string representation of the change type where rc_type was a numeric constant. This field is not yet -- To view, visit https://gerrit.wikimedia.org/r/133272 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I89b6fc719f70a225a0a71290cc6e051f464114b7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_23 Gerrit-Owner: MarkAHershberger m...@nichework.com Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de Gerrit-Reviewer: MarkAHershberger m...@nichework.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] Switch back to normal slave for s1 again - change (analytics/geowiki)
QChris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/133273
Change subject: Switch back to normal slave for s1 again
..
Switch back to normal slave for s1 again
s1-analytics-slave.eqiad.wmnet caught up replicating, so we can switch
again back to it.
Change-Id: I064c621d29ac8aa3400d11a5f1ee92fae4c13d3f
---
M geowiki/mysql_config.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/geowiki
refs/changes/73/133273/1
diff --git a/geowiki/mysql_config.py b/geowiki/mysql_config.py
index 0964af2..f018bce 100644
--- a/geowiki/mysql_config.py
+++ b/geowiki/mysql_config.py
@@ -86,7 +86,7 @@
# new CNAME system.
# TODO: abstract mapping to a use just number and then autogenerate CNAMES
aliases
-db_mapping = {'s1':'analytics-store.eqiad.wmnet',
+db_mapping = {'s1':'s1-analytics-slave.eqiad.wmnet',
's2':'s2-analytics-slave.eqiad.wmnet',
's3':'s3-analytics-slave.eqiad.wmnet',
's4':'s4-analytics-slave.eqiad.wmnet',
--
To view, visit https://gerrit.wikimedia.org/r/133273
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I064c621d29ac8aa3400d11a5f1ee92fae4c13d3f
Gerrit-PatchSet: 1
Gerrit-Project: analytics/geowiki
Gerrit-Branch: master
Gerrit-Owner: QChris christ...@quelltextlich.at
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
