[MediaWiki-commits] [Gerrit] integration/monitoring: Remove and redirect to Nagf instead - change (integration/docroot)
jenkins-bot has submitted this change and it was merged. Change subject: integration/monitoring: Remove and redirect to Nagf instead .. integration/monitoring: Remove and redirect to Nagf instead Change-Id: I81a3b55d60fab161c148d50d586b0dfdaca33dec --- A org/wikimedia/integration/.htaccess M org/wikimedia/integration/default.html D org/wikimedia/integration/monitoring/index.php D org/wikimedia/integration/monitoring/monitoring.js M shared/IntegrationPage.php 5 files changed, 4 insertions(+), 149 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/org/wikimedia/integration/.htaccess b/org/wikimedia/integration/.htaccess new file mode 100644 index 000..0b7f04f --- /dev/null +++ b/org/wikimedia/integration/.htaccess @@ -0,0 +1 @@ +Redirect 301 /monitoring/ https://tools.wmflabs.org/nagf/?project=integration diff --git a/org/wikimedia/integration/default.html b/org/wikimedia/integration/default.html index f2e7066..36f9bba 100644 --- a/org/wikimedia/integration/default.html +++ b/org/wikimedia/integration/default.html @@ -30,7 +30,7 @@ /table /div div class=span5 - h4Monitoring/h4 + h4Monitor/h4 !-- Tweak Ganglia graphs using parameters documentation at http://sourceforge.net/apps/trac/ganglia/wiki/ganglia_modular_graph_documentation @@ -39,7 +39,7 @@ img alt=Jenkins queues last hour src=https://ganglia.wikimedia.org/latest/graph.php?r=houramp;width=170amp;height=50amp;title=Jenkins+queuesamp;hreg%5B%5D=galliumamp;mreg%5B%5D=jenkins_overallload.%2Aamp;gtype=lineamp;glegend=hideamp;aggregate=1amp;_=1372432670708; img alt=Jenkins queues last day src=https://ganglia.wikimedia.org/latest/graph.php?r=dayamp;width=170amp;height=50amp;title=Jenkins+queuesamp;hreg%5B%5D=galliumamp;mreg%5B%5D=jenkins_overallload.%2Aamp;gtype=lineamp;glegend=hideamp;aggregate=1amp;_=1372432670708; /a - bra href=monitoring/(more…)/a + bra href=https://tools.wmflabs.org/nagf/?project=integration;(more…)/a h4Beta cluster/h4 a href=https://integration.wikimedia.org/ci/view/Beta/;Jenkins view of Beta/a diff --git a/org/wikimedia/integration/monitoring/index.php b/org/wikimedia/integration/monitoring/index.php deleted file mode 100644 index 9ed38cb..000 --- a/org/wikimedia/integration/monitoring/index.php +++ /dev/null @@ -1,132 +0,0 @@ -?php -require_once __DIR__ . '/../../../../shared/IntegrationPage.php'; - -$p = IntegrationPage::newFromPageName( 'Monitoring' ); -$p-setDir( __DIR__ ); -$p-setRootDir( dirname( __DIR__ ) ); -$p-enableFooter(); - -$hosts = array( - // Graphite supports wildcard target, but we want separate graphs in this case - 'overview', - 'integration-slave1001', - 'integration-slave1002', - 'integration-slave1003', - 'integration-slave1006', - 'integration-slave1007', - 'integration-slave1008', - 'integration-slave1009', - 'integration-puppetmaster', -); -$graphConfigs = array( - 'cpu' = array( - 'title' = 'CPU', - 'targets' = array( - 'alias(color(stacked(HOST.cpu.total.user.value),#bb),User)', - 'alias(color(stacked(HOST.cpu.total.nice.value),#ffea00),Nice)', - 'alias(color(stacked(HOST.cpu.total.system.value),#dd),System)', - 'alias(color(stacked(HOST.cpu.total.iowait.value),#ff8a60),Wait I/O)', - 'alias(alpha(color(stacked(HOST.cpu.total.idle.value),#e2e2f2),0.4),Idle)', - ), - ), - 'memory' = array( - 'title' = 'Memory', - 'targets' = array( - 'alias(color(stacked(HOST.memory.Inactive.value),#cc),Inactive)', - 'alias(color(stacked(HOST.memory.Cached.value),#33cc33),Cached)', - 'alias(color(stacked(HOST.memory.Buffers.value),#99ff33),Buffers)', - 'alias(alpha(color(stacked(HOST.memory.MemFree.value),#f0ffc0),0.4),Free)', - 'alias(color(stacked(HOST.memory.SwapCached.value),#9900CC),Swap)', - 'alias(color(HOST.memory.MemTotal.value,red),Total)', - ), - 'overview' = array( - 'alias(color(stacked(sum(HOST.memory.Inactive.value)),#cc),Inactive)', - 'alias(color(stacked(sum(HOST.memory.Cached.value)),#33cc33),Cached)', - 'alias(color(stacked(sum(HOST.memory.Buffers.value)),#99ff33),Buffers)', - 'alias(alpha(color(stacked(sum(HOST.memory.MemFree.value)),#f0ffc0),0.4),Free)', -
[MediaWiki-commits] [Gerrit] integration/monitoring: Remove and redirect to Nagf instead - change (integration/docroot)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/165434 Change subject: integration/monitoring: Remove and redirect to Nagf instead .. integration/monitoring: Remove and redirect to Nagf instead Change-Id: I81a3b55d60fab161c148d50d586b0dfdaca33dec --- A org/wikimedia/integration/.htaccess M org/wikimedia/integration/default.html D org/wikimedia/integration/monitoring/index.php D org/wikimedia/integration/monitoring/monitoring.js M shared/IntegrationPage.php 5 files changed, 4 insertions(+), 149 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/docroot refs/changes/34/165434/1 diff --git a/org/wikimedia/integration/.htaccess b/org/wikimedia/integration/.htaccess new file mode 100644 index 000..0b7f04f --- /dev/null +++ b/org/wikimedia/integration/.htaccess @@ -0,0 +1 @@ +Redirect 301 /monitoring/ https://tools.wmflabs.org/nagf/?project=integration diff --git a/org/wikimedia/integration/default.html b/org/wikimedia/integration/default.html index f2e7066..36f9bba 100644 --- a/org/wikimedia/integration/default.html +++ b/org/wikimedia/integration/default.html @@ -30,7 +30,7 @@ /table /div div class=span5 - h4Monitoring/h4 + h4Monitor/h4 !-- Tweak Ganglia graphs using parameters documentation at http://sourceforge.net/apps/trac/ganglia/wiki/ganglia_modular_graph_documentation @@ -39,7 +39,7 @@ img alt=Jenkins queues last hour src=https://ganglia.wikimedia.org/latest/graph.php?r=houramp;width=170amp;height=50amp;title=Jenkins+queuesamp;hreg%5B%5D=galliumamp;mreg%5B%5D=jenkins_overallload.%2Aamp;gtype=lineamp;glegend=hideamp;aggregate=1amp;_=1372432670708; img alt=Jenkins queues last day src=https://ganglia.wikimedia.org/latest/graph.php?r=dayamp;width=170amp;height=50amp;title=Jenkins+queuesamp;hreg%5B%5D=galliumamp;mreg%5B%5D=jenkins_overallload.%2Aamp;gtype=lineamp;glegend=hideamp;aggregate=1amp;_=1372432670708; /a - bra href=monitoring/(more…)/a + bra href=https://tools.wmflabs.org/nagf/?project=integration;(more…)/a h4Beta cluster/h4 a href=https://integration.wikimedia.org/ci/view/Beta/;Jenkins view of Beta/a diff --git a/org/wikimedia/integration/monitoring/index.php b/org/wikimedia/integration/monitoring/index.php deleted file mode 100644 index 9ed38cb..000 --- a/org/wikimedia/integration/monitoring/index.php +++ /dev/null @@ -1,132 +0,0 @@ -?php -require_once __DIR__ . '/../../../../shared/IntegrationPage.php'; - -$p = IntegrationPage::newFromPageName( 'Monitoring' ); -$p-setDir( __DIR__ ); -$p-setRootDir( dirname( __DIR__ ) ); -$p-enableFooter(); - -$hosts = array( - // Graphite supports wildcard target, but we want separate graphs in this case - 'overview', - 'integration-slave1001', - 'integration-slave1002', - 'integration-slave1003', - 'integration-slave1006', - 'integration-slave1007', - 'integration-slave1008', - 'integration-slave1009', - 'integration-puppetmaster', -); -$graphConfigs = array( - 'cpu' = array( - 'title' = 'CPU', - 'targets' = array( - 'alias(color(stacked(HOST.cpu.total.user.value),#bb),User)', - 'alias(color(stacked(HOST.cpu.total.nice.value),#ffea00),Nice)', - 'alias(color(stacked(HOST.cpu.total.system.value),#dd),System)', - 'alias(color(stacked(HOST.cpu.total.iowait.value),#ff8a60),Wait I/O)', - 'alias(alpha(color(stacked(HOST.cpu.total.idle.value),#e2e2f2),0.4),Idle)', - ), - ), - 'memory' = array( - 'title' = 'Memory', - 'targets' = array( - 'alias(color(stacked(HOST.memory.Inactive.value),#cc),Inactive)', - 'alias(color(stacked(HOST.memory.Cached.value),#33cc33),Cached)', - 'alias(color(stacked(HOST.memory.Buffers.value),#99ff33),Buffers)', - 'alias(alpha(color(stacked(HOST.memory.MemFree.value),#f0ffc0),0.4),Free)', - 'alias(color(stacked(HOST.memory.SwapCached.value),#9900CC),Swap)', - 'alias(color(HOST.memory.MemTotal.value,red),Total)', - ), - 'overview' = array( - 'alias(color(stacked(sum(HOST.memory.Inactive.value)),#cc),Inactive)', - 'alias(color(stacked(sum(HOST.memory.Cached.value)),#33cc33),Cached)', - 'alias(color(stacked(sum(HOST.memory.Buffers.value)),#99ff33),Buffers)', - 'alias(alpha(color(stacked(sum(HOST.memory.MemFree.value)),#f0ffc0),0.4),Free)', -
[MediaWiki-commits] [Gerrit] Enable XDebug with HHVM - change (mediawiki/vagrant)
Mattflaschen has uploaded a new change for review. https://gerrit.wikimedia.org/r/165435 Change subject: Enable XDebug with HHVM .. Enable XDebug with HHVM This works for me, but not reliably. For example, I get https://github.com/facebook/hhvm/issues/3926 and not all debugging commands seem to respond correctly. However, it should not interfere with the experience if you are not using XDebug (i.e. if the browser cookie is not set). Thus, I think it's mergable so people can continue to attempt to use it and troubleshoot the debugger itself. Bug: 71777 Change-Id: I2e5818012e7bd0d52be8a1eb2a02b96bdb341c6d --- M puppet/hieradata/common.yaml 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/35/165435/1 diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index 7917d81..4ba578b 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -75,6 +75,11 @@ slow_query_threshold: 30 hhvm::fcgi_settings: max_execution_time: 180 + hhvm: +xdebug-not-done: + enable: 1 + remote_connect_back: 1 + remote_enable: 1 hhvm::logroot: /vagrant/logs mathoid::base_path: /vagrant/mathoid -- To view, visit https://gerrit.wikimedia.org/r/165435 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2e5818012e7bd0d52be8a1eb2a02b96bdb341c6d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Open the published article in new tab when clicked on succes... - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review. https://gerrit.wikimedia.org/r/165436 Change subject: Open the published article in new tab when clicked on success message .. Open the published article in new tab when clicked on success message Make all the links in infobar open links if any, in new tab. Change-Id: I0666ccb648183fbd26c6c28d5270e2d5a3daebdb --- M modules/header/ext.cx.header.js 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/36/165436/1 diff --git a/modules/header/ext.cx.header.js b/modules/header/ext.cx.header.js index bb884d8..06f1a1c 100644 --- a/modules/header/ext.cx.header.js +++ b/modules/header/ext.cx.header.js @@ -97,7 +97,8 @@ this.$infoBar .removeClass( 'cx-success cx-error' ) .addClass( type ) - .show(); + .show() + .find( 'a' ).attr( 'target', '_blank' ); }; /** -- To view, visit https://gerrit.wikimedia.org/r/165436 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0666ccb648183fbd26c6c28d5270e2d5a3daebdb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] MT health check for the language pairs - change (mediawiki...cxserver)
jenkins-bot has submitted this change and it was merged.
Change subject: MT health check for the language pairs
..
MT health check for the language pairs
Simple test to see if the MT backend can respond to
each language pair for which cxserver is configured.
This might also prepare the processing pipelines.
This dos not test whether the machine translation is correct or not.
Change-Id: I0bb7251af8b509aae9a76946a50901337b3fea6e
---
D public/js/mt.js
A public/mt/css/main.css
M public/mt/index.html
A public/mt/js/main.js
4 files changed, 148 insertions(+), 47 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/public/js/mt.js b/public/js/mt.js
deleted file mode 100644
index 9eca076..000
--- a/public/js/mt.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*jshint browser:true, jquery:true */
-( function ( $ ) {
- 'use strict';
-
- $( document ).ready( function () {
- $( 'progress' ).hide();
- $( 'button' ).click( function () {
- $( '.targetHtmlRaw' ).text( '' );
- $( '.targetHtmlRendered' ).html( '' );
- $( 'progress' ).show();
- $( '.status' ).text( 'Connecting to server...' );
- var sourceHtml = $( 'textarea[name=sourceHtml]' ).val(),
- sourceLanguage = $(
'input[name=sourceLanguage]' ).val(),
- targetLanguage = $(
'input[name=targetLanguage]' ).val(),
-url = '/mt/' + sourceLanguage + '/' + targetLanguage;
- $.post( url, sourceHtml, function ( response ) {
- $( '.targetHtmlRaw' ).text( response );
- $( '.targetHtmlRendered' ).html( response );
- } ).fail( function () {
- $( '.targetHtmlRendered' ).html(
'h1Error/h1' );
- } ).always( function () {
- $( 'progress' ).hide();
- } );
- } );
- } );
-}( jQuery ) );
diff --git a/public/mt/css/main.css b/public/mt/css/main.css
new file mode 100644
index 000..3608481
--- /dev/null
+++ b/public/mt/css/main.css
@@ -0,0 +1,46 @@
+body {
+ width: 80%;
+ margin-left: 10%;
+ color: #555;
+}
+
+label {
+ width: 20%;
+}
+
+input {
+ width: 40%;
+ padding: 5px;
+}
+
+textarea {
+ width: 100%;
+}
+.lang {
+ width: 5%;
+}
+button {
+ width: 10%;
+ padding: 5px;
+}
+.status {
+ color: grey;
+}
+
+.status.ok {
+ color: green;
+}
+
+.status.fail {
+ color: red;
+}
+
+table {
+ border-collapse: collapse;
+}
+
+table, th, td {
+ border: 1px solid #aaa;
+ width: 20%;
+ padding: 5px;
+}
\ No newline at end of file
diff --git a/public/mt/index.html b/public/mt/index.html
index 523f415..ea09d86 100644
--- a/public/mt/index.html
+++ b/public/mt/index.html
@@ -1,23 +1,38 @@
html
- head
- script src=//code.jquery.com/jquery-1.10.2.min.js/script
- titleApertium Wrapper/title
- link rel=stylesheet href=../css/main.css type=text/css /
- /head
- body
- h1Apertium Wrapper/h1
- div class=form
- label for=sourceHtmlEnter some HTML/labelbr
- textarea name=sourceHtml style=width: 100%; height:
10empsAdemás/s de Valencia. Un dos ba href=3tres/a quatre ia
href=5cinc/a sis set/i vuit nou/b deu/p/textareabr
- label for=sourceLanguagefrom/label
- input class=lang name=sourceLanguage value=es /
- label for=targetLanguageto/label
- input class=lang name=targetLanguage value=ca /
- buttonGo/button
- progress/progress
- /div
- div class=targetHtmlRendered/div
- div class=targetHtmlRaw/div
- script src=../js/mt.js/script
- /body
+
+head
+script src=//code.jquery.com/jquery-1.10.2.min.js/script
+titleCX Machine Translation/title
+link rel=stylesheet href=css/main.css type=text/css /
+script src=js/main.js/script
+/head
+
+body
+h1CX Machine Translation/h1
+div class=form
+label for=sourceHtmlEnter some HTML/label
+br
+textarea name=sourceHtml style=width: 100%; height: 10em
+psAdemás/s de Valencia. Un dos ba href=3tres/a
quatre ia href=5cinc/a sis set/i vuit nou/b deu/p
+/textarea
+br
+label for=sourceLanguagefrom/label
+input class=lang name=sourceLanguage value=es /
+label for=targetLanguageto/label
+input class=lang name=targetLanguage value=ca /
+button class=translateGo/button
+progress/progress
+/div
+div class=targetHtmlRendered/div
+div class=targetHtmlRaw/div
+h2MT
[MediaWiki-commits] [Gerrit] Open the published article in new tab when clicked on succes... - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged. Change subject: Open the published article in new tab when clicked on success message .. Open the published article in new tab when clicked on success message Make all the links in infobar open links if any, in new tab. Change-Id: I0666ccb648183fbd26c6c28d5270e2d5a3daebdb --- M modules/header/ext.cx.header.js 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/header/ext.cx.header.js b/modules/header/ext.cx.header.js index bb884d8..06f1a1c 100644 --- a/modules/header/ext.cx.header.js +++ b/modules/header/ext.cx.header.js @@ -97,7 +97,8 @@ this.$infoBar .removeClass( 'cx-success cx-error' ) .addClass( type ) - .show(); + .show() + .find( 'a' ).attr( 'target', '_blank' ); }; /** -- To view, visit https://gerrit.wikimedia.org/r/165436 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0666ccb648183fbd26c6c28d5270e2d5a3daebdb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix vagrant-browertests Makefile rule - change (mediawiki...Flow)
Mattflaschen has uploaded a new change for review. https://gerrit.wikimedia.org/r/165437 Change subject: Fix vagrant-browertests Makefile rule .. Fix vagrant-browertests Makefile rule Change-Id: I6366ee83f1e289109ebe33b7ea8aa97b8752f035 --- M Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/37/165437/1 diff --git a/Makefile b/Makefile index f63d4ad..7a0d446 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ @scripts/qunit.sh vagrant-browsertests: - @vagrant ssh -- -X cd /srv/browsertests/tests/browser '' MEDIAWIKI_URL=http://localhost/wiki/ MEDIAWIKI_USER=Admin MEDIAWIKI_PASSWORD=vagrant bundle exec cucumber /vagrant/mediawiki/extensions/Flow/tests/browser/features/ -f pretty + @vagrant ssh -- -X cd /vagrant/mediawiki/extensions/Flow/tests/browser '' MEDIAWIKI_URL=http://127.0.0.1:8080/wiki/ MEDIAWIKI_USER=Admin MEDIAWIKI_PASSWORD=vagrant bundle exec cucumber /vagrant/mediawiki/extensions/Flow/tests/browser/features/ -f pretty ### # Static analysis -- To view, visit https://gerrit.wikimedia.org/r/165437 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6366ee83f1e289109ebe33b7ea8aa97b8752f035 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add ImageMetrics to the -multimedia channel - change (labs...pywikibugs)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/165438 Change subject: Add ImageMetrics to the -multimedia channel .. Add ImageMetrics to the -multimedia channel Change-Id: Ibf56febfa7ab3150124d434323cfc1a32f4b --- M channels.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/pywikibugs refs/changes/38/165438/1 diff --git a/channels.py b/channels.py index ce1ccab..ce449ca 100644 --- a/channels.py +++ b/channels.py @@ -43,7 +43,8 @@ x.get(X-Bugzilla-Product, None) in [MediaWiki extensions] and x.get(X-Bugzilla-Component, None) in [UploadWizard, TimedMediaHandler, VipsScaler, GlobalUsage, MultimediaViewer, GWToolset, - Score, PagedTiffHandler, PdfHandler, ImageMap, CommonsMetadata, OggHandler] + Score, PagedTiffHandler, PdfHandler, ImageMap, CommonsMetadata, OggHandler, + ImageMetrics] ) or \ ( x.get(X-Bugzilla-Product, None) in [MediaWiki] and -- To view, visit https://gerrit.wikimedia.org/r/165438 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf56febfa7ab3150124d434323cfc1a32f4b Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/pywikibugs Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove 'new' level in directory tree. - change (mediawiki...Flow)
Mattflaschen has uploaded a new change for review. https://gerrit.wikimedia.org/r/165439 Change subject: Remove 'new' level in directory tree. .. Remove 'new' level in directory tree. The front-end rewrite is no longer new, and this qualifier is unneeded. Change-Id: I9f6eaf00bb90c3bc7c7fd5d3dae475418126055b --- M .jshintignore M Flow.php M Resources.php M includes/Notifications/Controller.php R modules/components/flow-board.js R modules/flow-api.js R modules/flow-components.js R modules/flow-handlebars.js R modules/flow-history.js R modules/flow.js R modules/mw-ui.enhance.js R modules/mw-ui.modal.js R modules/notification/icon/Talk-ltr.png R modules/notification/icon/Talk-rtl.png R modules/styles/board/collapser.less R modules/styles/board/content-preview.less R modules/styles/board/form-actions.less R modules/styles/board/header.less R modules/styles/board/menu.less R modules/styles/board/moderated.less R modules/styles/board/navigation.less R modules/styles/board/replycount.less R modules/styles/board/terms-of-use.less R modules/styles/board/timestamps.less R modules/styles/board/topic/meta.less R modules/styles/board/topic/navigation.less R modules/styles/board/topic/navigator.less R modules/styles/board/topic/post.less R modules/styles/board/topic/summary.less R modules/styles/board/topic/titlebar.less R modules/styles/board/topic/watchlist.less R modules/styles/common.less R modules/styles/errors.less R modules/styles/flow.less/flow.colors.less R modules/styles/flow.less/flow.helpers.less R modules/styles/flow.less/flow.variables.less R modules/styles/js.less R modules/styles/mediawiki.ui/forms.less R modules/styles/mediawiki.ui/modal.less R modules/styles/mediawiki.ui/text.less R modules/styles/mediawiki.ui/tooltips.less R modules/styles/minerva/common.less R modules/vendor/Storer.js R modules/vendor/jquery.ba-throttle-debounce.js R tests/qunit/components/test_flow-board.js R tests/qunit/test_flow-handlebars.js R tests/qunit/test_mw-ui.enhance.js 47 files changed, 40 insertions(+), 40 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/39/165439/1 diff --git a/.jshintignore b/.jshintignore index 9c3c475..6e5c6c0 100644 --- a/.jshintignore +++ b/.jshintignore @@ -1,4 +1,4 @@ modules/jquery.scroll.js -modules/new/vendor/handlebars-v2.0.0-alpha.2.js -modules/new/vendor/Storer.js -modules/new/vendor/jquery.ba-throttle-debounce.js +modules/vendor/handlebars-v2.0.0-alpha.2.js +modules/vendor/Storer.js +modules/vendor/jquery.ba-throttle-debounce.js diff --git a/Flow.php b/Flow.php index 2b34dbb..c350811 100755 --- a/Flow.php +++ b/Flow.php @@ -126,7 +126,7 @@ // Register Flow import paths $wgResourceLoaderLESSImportPaths = array_merge( $wgResourceLoaderLESSImportPaths, array( - $dir . modules/new/styles/flow.less/, + $dir . modules/styles/flow.less/, ) ); // Configuration diff --git a/Resources.php b/Resources.php index 36e0131..22d2e6a 100644 --- a/Resources.php +++ b/Resources.php @@ -214,25 +214,25 @@ // @todo: upstream to mediawiki ui 'ext.flow.mediawiki.ui.modal' = $flowResourceTemplate + array( 'styles' = array( - 'new/styles/mediawiki.ui/modal.less', + 'styles/mediawiki.ui/modal.less', ), ) + $mobile, // @todo: upstream to mediawiki ui 'ext.flow.mediawiki.ui.text' = $flowResourceTemplate + array( 'styles' = array( - 'new/styles/mediawiki.ui/text.less', + 'styles/mediawiki.ui/text.less', ), ) + $mobile, // @todo: upstream to mediawiki ui 'ext.flow.mediawiki.ui.form' = $flowResourceTemplate + array( 'styles' = array( - 'new/styles/mediawiki.ui/forms.less', + 'styles/mediawiki.ui/forms.less', ), ) + $mobile, // @todo: upstream to mediawiki ui 'ext.flow.mediawiki.ui.tooltips' = $flowResourceTemplate + array( 'styles' = array( - 'new/styles/mediawiki.ui/tooltips.less', + 'styles/mediawiki.ui/tooltips.less', ), ) + $mobile, 'ext.flow.icons.styles' = $flowResourceTemplate + array( @@ -243,39 +243,39 @@ ) + $mobile, 'ext.flow.styles' = $flowResourceTemplate + array( 'styles' = array( - 'new/styles/common.less', - 'new/styles/errors.less', + 'styles/common.less', + 'styles/errors.less', ), ) + $mobile, 'ext.flow.board.styles' = $flowResourceTemplate + array( 'styles' = array( - 'new/styles/board/collapser.less', - 'new/styles/board/header.less', -
[MediaWiki-commits] [Gerrit] Workaround for invalid ParserAfterParse hook call - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165440
Change subject: Workaround for invalid ParserAfterParse hook call
..
Workaround for invalid ParserAfterParse hook call
Bug: 71772
Change-Id: I70a9542a0f2c25139e4d7d464c93228f27157974
---
M client/includes/hooks/SidebarHookHandlers.php
M client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
2 files changed, 20 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/40/165440/1
diff --git a/client/includes/hooks/SidebarHookHandlers.php
b/client/includes/hooks/SidebarHookHandlers.php
index 95e2b74..94127d0 100644
--- a/client/includes/hooks/SidebarHookHandlers.php
+++ b/client/includes/hooks/SidebarHookHandlers.php
@@ -114,13 +114,13 @@
/**
* Static handler for the ParserAfterParse hook.
*
-* @param Parser $parser
-* @param string $text
-* @param StripState $stripState
+* @param Parser|null $parser
+* @param string|null $text Unused.
+* @param StripState|null $stripState Unused.
*
* @return bool
*/
- public static function onParserAfterParse( Parser $parser, $text,
StripState $stripState ) {
+ public static function onParserAfterParse( Parser $parser = null,
$text = null, StripState $stripState = null ) {
// this hook tries to access repo SiteLinkTable
// it interferes with any test that parses something, like a
page or a message
if ( defined( 'MW_PHPUNIT_TEST' ) ) {
@@ -197,13 +197,17 @@
* Hook runs after internal parsing
* @see https://www.mediawiki.org/wiki/Manual:Hooks/ParserAfterParse
*
-* @param Parser $parser
-* @param string $text
-* @param StripState $stripState
+* @param Parser|null $parser
+* @param string|null $text Unused.
+* @param StripState|null $stripState Unused.
*
* @return bool
*/
- public function doParserAfterParse( Parser $parser, $text, StripState
$stripState ) {
+ public function doParserAfterParse( Parser $parser = null, $text =
null, StripState $stripState = null ) {
+ if ( $parser === null ) {
+ return true;
+ }
+
$title = $parser-getTitle();
if ( !$this-namespaceChecker-isWikibaseEnabled(
$title-getNamespace() ) ) {
diff --git a/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
b/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
index 71f38b9..43fd22a 100644
--- a/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
+++ b/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
@@ -15,10 +15,10 @@
use SiteStore;
use StripState;
use Title;
-use Wikibase\Client\WikibaseClient;
use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
use Wikibase\Client\Hooks\OtherProjectsSidebarGenerator;
use Wikibase\Client\Hooks\SidebarHookHandlers;
+use Wikibase\Client\WikibaseClient;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
@@ -362,6 +362,13 @@
}
}
+ /**
+* @see https://bugzilla.wikimedia.org/show_bug.cgi?id=71772
+*/
+ public function testOnParserAfterParse_withoutParameters() {
+ $this-assertTrue( SidebarHookHandlers::onParserAfterParse() );
+ }
+
public function testDoOutputPageParserOutput() {
$title = Title::makeTitle( NS_MAIN, 'Oxygen' );
--
To view, visit https://gerrit.wikimedia.org/r/165440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I70a9542a0f2c25139e4d7d464c93228f27157974
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't try to log metrics if it's not an image - change (mediawiki...ImageMetrics)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165441
Change subject: Don't try to log metrics if it's not an image
..
Don't try to log metrics if it's not an image
Bug: 71780
Change-Id: Id47f9cdc35ce03350353d27f40af8e059d4abd9e
---
M resources/ext.imageMetrics.js
M tests/qunit/ext.imageMetrics.test.js
2 files changed, 18 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ImageMetrics
refs/changes/41/165441/1
diff --git a/resources/ext.imageMetrics.js b/resources/ext.imageMetrics.js
index ffebc8f..b68e718 100644
--- a/resources/ext.imageMetrics.js
+++ b/resources/ext.imageMetrics.js
@@ -162,6 +162,10 @@
data.imageType = 'filepage-main'; // the only supported
measurement type ATM
$file = $( '#file' ).find( 'img' ); // more efficient than
'#file img'
+ if ( !$file.length ) {
+ return;
+ }
+
this.addMediaWikiData( data, $file );
this.addOnloadData( data );
this.addNavigationTimingData( data );
diff --git a/tests/qunit/ext.imageMetrics.test.js
b/tests/qunit/ext.imageMetrics.test.js
index e992ecb..ae5c982 100644
--- a/tests/qunit/ext.imageMetrics.test.js
+++ b/tests/qunit/ext.imageMetrics.test.js
@@ -103,4 +103,18 @@
assert.strictEqual( data.fullLoadingTime, 10222,
'fullLoadingTime is logged correctly' );
assert.strictEqual( data.fetchDelay, 89, 'fetchDelay is logged
correctly' );
} );
+
+ QUnit.test( 'No image, no logging', 1, function ( assert ) {
+ var data,
+ options = {
+ performance: { navigation: { type: 0 } },
+ config: { wgImageMetricsSamplingFactor: 1 }
+ },
+ imageMetrics = createImageMetrics( this.sandbox,
options );
+ $( '#qunit-fixture' ).append( 'div id=file/div' );
+
+ imageMetrics.log();
+
+ assert.strictEqual( options.logEvent.called, false, 'logEvent
was not called' );
+ } );
} ( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/165441
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id47f9cdc35ce03350353d27f40af8e059d4abd9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageMetrics
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Getting rid of ve.splitClusters in ve-mw - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Getting rid of ve.splitClusters in ve-mw .. Getting rid of ve.splitClusters in ve-mw Bug: 57628 Change-Id: I28cb52bd2af564f208b9414154977c351f5c3fcb --- M modules/ve-mw/ui/inspectors/ve.ui.MWLinkNodeInspector.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWLinkNodeInspector.js b/modules/ve-mw/ui/inspectors/ve.ui.MWLinkNodeInspector.js index 8e2136a..5f49df5 100644 --- a/modules/ve-mw/ui/inspectors/ve.ui.MWLinkNodeInspector.js +++ b/modules/ve-mw/ui/inspectors/ve.ui.MWLinkNodeInspector.js @@ -128,7 +128,7 @@ } ); annotations = doc.data.getAnnotationsFromOffset( nodeRange.start ).clone(); annotations.push( annotation ); - content = ve.splitClusters( value ); + content = value.split( '' ); ve.dm.Document.static.addAnnotationsToData( content, annotations ); surfaceModel.change( ve.dm.Transaction.newFromReplacement( doc, nodeRange, content ) -- To view, visit https://gerrit.wikimedia.org/r/165430 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I28cb52bd2af564f208b9414154977c351f5c3fcb Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: SuchetaG sucheta.ghos...@gmail.com Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Getting rid of ve.splitClusters in VE core - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Getting rid of ve.splitClusters in VE core
..
Getting rid of ve.splitClusters in VE core
Bug: 57628
Change-Id: I65d4c58466c486c3eae8399a26a362c2a79586a5
---
M src/ce/ve.ce.Surface.js
M src/dm/ve.dm.Converter.js
M src/dm/ve.dm.SurfaceFragment.js
M src/ui/inspectors/ve.ui.AnnotationInspector.js
M src/ve.js
5 files changed, 6 insertions(+), 15 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 541a9c8..8e53b5a 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1705,8 +1705,8 @@
fromLeft = 0,
fromRight = 0,
nodeOffset = node.getModel().getOffset(),
- previousData = ve.splitClusters( previous.text ),
- nextData = ve.splitClusters( next.text ),
+ previousData = previous.text.split( '' ),
+ nextData = next.text.split( '' ),
lengthDiff = next.text.length - previous.text.length,
nextDataString = new ve.dm.DataString( nextData ),
surface = this;
@@ -1787,7 +1787,7 @@
// Simple insertion
if ( lengthDiff 0 offsetDiff === lengthDiff /*
sameLeadingAndTrailing */) {
- data = ve.splitClusters( next.text ).slice(
previousStart, nextStart );
+ data = nextData.slice( previousStart, nextStart );
// Apply insertion annotations
annotations = this.model.getInsertionAnnotations();
if ( annotations.getLength() ) {
diff --git a/src/dm/ve.dm.Converter.js b/src/dm/ve.dm.Converter.js
index 4a173ba..1f05211 100644
--- a/src/dm/ve.dm.Converter.js
+++ b/src/dm/ve.dm.Converter.js
@@ -49,7 +49,7 @@
*/
ve.dm.Converter.getDataContentFromText = function ( text, annotations ) {
var i, len,
- characters = ve.splitClusters( text );
+ characters = text.split( '' );
if ( !annotations || annotations.isEmpty() ) {
return characters;
diff --git a/src/dm/ve.dm.SurfaceFragment.js b/src/dm/ve.dm.SurfaceFragment.js
index ef757d5..385a6b0 100644
--- a/src/dm/ve.dm.SurfaceFragment.js
+++ b/src/dm/ve.dm.SurfaceFragment.js
@@ -709,7 +709,7 @@
offset = this.getSelection( true ).getRange().start;
// Auto-convert content to array of plain text characters
if ( typeof content === 'string' ) {
- content = ve.splitClusters( content );
+ content = content.split( '' );
}
if ( content.length ) {
if ( annotate ) {
diff --git a/src/ui/inspectors/ve.ui.AnnotationInspector.js
b/src/ui/inspectors/ve.ui.AnnotationInspector.js
index 860cc10..c6a38a2 100644
--- a/src/ui/inspectors/ve.ui.AnnotationInspector.js
+++ b/src/ui/inspectors/ve.ui.AnnotationInspector.js
@@ -68,7 +68,7 @@
* @returns {Array} Linear model content to insert
*/
ve.ui.AnnotationInspector.prototype.getInsertionData = function () {
- return ve.splitClusters( this.getInsertionText() );
+ return this.getInsertionText().split( '' );
};
/**
diff --git a/src/ve.js b/src/ve.js
index 5d00abf..2a45179 100644
--- a/src/ve.js
+++ b/src/ve.js
@@ -400,15 +400,6 @@
};
/**
-* Compatibility method. We no longer split into clusters at this level.
-*
-* TODO: strip out calls to splitClusters then delete this method.
-*/
- ve.splitClusters = function ( text ) {
- return text.split( '' );
- };
-
- /**
* Determine if the text consists of only unattached combining marks.
*
* @param {string} text Text to test
--
To view, visit https://gerrit.wikimedia.org/r/165433
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I65d4c58466c486c3eae8399a26a362c2a79586a5
Gerrit-PatchSet: 3
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: SuchetaG sucheta.ghos...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 1af18c3..0bb6d3b - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 1af18c3..0bb6d3b .. Syncronize VisualEditor: 1af18c3..0bb6d3b Change-Id: I63f827f972e41ba9ca9db77e4b31edf6cf40d1d3 --- 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 1af18c3..0bb6d3b 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 1af18c3c128151dcb4257fe1cfdcb23d43aab982 +Subproject commit 0bb6d3b3337b4d5b49be72ead9e65c2379f07776 -- To view, visit https://gerrit.wikimedia.org/r/165442 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I63f827f972e41ba9ca9db77e4b31edf6cf40d1d3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 1af18c3..0bb6d3b - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/165442 Change subject: Syncronize VisualEditor: 1af18c3..0bb6d3b .. Syncronize VisualEditor: 1af18c3..0bb6d3b Change-Id: I63f827f972e41ba9ca9db77e4b31edf6cf40d1d3 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/42/165442/1 diff --git a/VisualEditor b/VisualEditor index 1af18c3..0bb6d3b 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 1af18c3c128151dcb4257fe1cfdcb23d43aab982 +Subproject commit 0bb6d3b3337b4d5b49be72ead9e65c2379f07776 -- To view, visit https://gerrit.wikimedia.org/r/165442 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I63f827f972e41ba9ca9db77e4b31edf6cf40d1d3 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] Add Sucheta Ghoshal to the trusted users whitelist - change (integration/zuul-config)
Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/165443 Change subject: Add Sucheta Ghoshal to the trusted users whitelist .. Add Sucheta Ghoshal to the trusted users whitelist Change-Id: I82eea96a14e98f2b28789df3eb7bee0fd54d31db --- M layout.yaml 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/43/165443/1 diff --git a/layout.yaml b/layout.yaml index 2660e48..d07a352 100644 --- a/layout.yaml +++ b/layout.yaml @@ -37,7 +37,7 @@ # TODO: Figure out a way to not have to repeat this from pipeline 'test'. # This email_filter and the one for 'test' can be removed once we have fixed bug 45499. email_filter: -- ^(?!(.*?@wikimedia\.org|.*?@wikimedia\.de|l10n-bot@translatewiki\.net|anomie\.wikipedia@gmail\.com|amir\.aharoni@mail\.huji\.ac\.il|hashar@free\.fr|jeroendedauw@gmail\.com|maxsem\.wiki@gmail\.com|mtraceur@member\.fsf\.org|niklas\.laxstrom@gmail\.com|santhosh\.thottingal@gmail\.com|s\.mazeland@xs4all\.nl|stefan\.petrea@gmail\.com|stefan@garage-coding\.com|roan\.kattouw@gmail\.com|krinklemail@gmail\.com|trevorparscal@gmail\.com|inez@wikia-inc\.com|orbit@framezero\.com|david@sheetmusic\.org\.uk|git@samsmith\.io|glaser@hallowelt\.biz|aude\.wiki@gmail\.com|bawolff\+wn@gmail\.com|bryan\.tongminh@gmail\.com|dereckson@espace-win\.org|hartman\.wiki@gmail\.com|hoo@online\.de|codereview@emsenhuber\.ch|daniel@nadir-seen-fire\.com|jamesin\.hongkong\.1@gmail\.com|krenair@gmail\.com|liangent@gmail\.com|mah@everybody\.org|matma\.rex@gmail\.com|raimond\.spekking@gmail\.com|robinp\.1273@gmail\.com|tim@tim-landscheidt\.de|tylerromeo@gmail\.com|umherirrender_de\.wp@web\.de|yuriastrakhan@gmail\.com|yaron57@gmail\.com|markus@semantic-mediawiki\.org|s7eph4n@gmail\.org|wiki@physikerwelt\.de|addshorewiki@gmail\.com|pragun06@gmail\.com|nilesh@nileshc\.com|benestar\.wikimedia@gmail\.com|mlazowik@gmail\.com|pleasestand@live\.com|legoktm\.wikipedia@gmail\.com|moriel@gmail\.com|d_entous@yahoo\.com|kartik\.mistry@gmail\.com|drenfro@vistaprint\.com|matanya\.moses@gmail\.com|matanya@foss\.co\.il|andrew\.green\.df@gmail\.com|thomaspt@hotmail\.fr|twkozlowski@gmail\.com|yuvipanda@gmail\.com|aarcos\.wiki@gmail\.com|saper@saper\.info|christian@quelltextlich\.at|maria\.pacana@gmail\.com|bebirchall@gmail\.com|shahyar@gmail\.com|federicoleva@tiscali\.it|jack@countervandalism\.net|at\.light@live\.com\.au|jackmcbarn@gmail\.com|platonides@gmail\.com|jarry1250@gmail\.com|admin@alphacorp\.tk|01tonythomas@gmail\.com|benapetr@gmail\.com|pastakhov@yandex\.ru|hardikjuneja\.hj@gmail\.com|siebrand@kitano\.nl|wctaiwan@gmail\.com|ladsgroup@gmail\.com|info@gno\.de|valhallasw@arctus\.nl|zhorishna@gmail\.com|jayvdb@gmail\.com|skizzerz@gmail\.com|jan\.wikimedia@zerebecki\.de|rillke@wikipedia\.de|mwalker@khaosdev\.com|se4598@gmx\.de|oliver\.buchtala@gmail\.com|florian\.schmidt\.welzow@t-online\.de)).*$ +-
[MediaWiki-commits] [Gerrit] Add Sucheta to authors list - change (mediawiki...VisualEditor)
Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/165444 Change subject: Add Sucheta to authors list .. Add Sucheta to authors list Change-Id: I1938546cf61b517564117cd6be1e830ef00b90fb --- M AUTHORS.txt M VisualEditor.php 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/44/165444/1 diff --git a/AUTHORS.txt b/AUTHORS.txt index 494447b..7baad85 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -9,6 +9,7 @@ Moriel Schottlender mschottlen...@wikimedia.org Roan Kattouw r...@wikimedia.org Rob Moen rm...@wikimedia.org +Sucheta Ghoshal sghos...@wikimedia.org Timo Tijhof t...@wikimedia.org Trevor Parscal tre...@wikimedia.org diff --git a/VisualEditor.php b/VisualEditor.php index f5585bf..0017ad3 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -23,6 +23,7 @@ 'Moriel Schottlender', 'Roan Kattouw', 'Rob Moen', + 'Sucheta Ghoshal', 'Timo Tijhof', 'Trevor Parscal', ), -- To view, visit https://gerrit.wikimedia.org/r/165444 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1938546cf61b517564117cd6be1e830ef00b90fb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope roan.katt...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move Bartosz to principal authors section - change (mediawiki...VisualEditor)
Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/165445 Change subject: Move Bartosz to principal authors section .. Move Bartosz to principal authors section Change-Id: Ib0fb1c074ee6cca0953d54dfa64f05af9104537f --- M AUTHORS.txt M VisualEditor.php 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/45/165445/1 diff --git a/AUTHORS.txt b/AUTHORS.txt index 494447b..04d65c1 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,6 +1,7 @@ Principal Authors (major contributors, alphabetically) Alex Monk kren...@wikimedia.org +Bartosz Dziewoński matma...@wikimedia.org Christian Williams christ...@wikia-inc.com David Chan dc...@wikimedia.org Ed Sanders esand...@wikimedia.org @@ -20,7 +21,6 @@ Amir E. Aharoni amir.ahar...@mail.huji.ac.il Antoine Musso has...@free.fr Audrey Tang audr...@audreyt.org -Bartosz Dziewoński matma@gmail.com Brion Vibber br...@wikimedia.org C. Scott Ananian canan...@wikimedia.org Chris McMahon cmcma...@wikimedia.org diff --git a/VisualEditor.php b/VisualEditor.php index f5585bf..f7a5adb 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -15,6 +15,7 @@ 'name' = 'VisualEditor', 'author' = array( 'Alex Monk', + 'Bartosz Dziewoński' 'Christian Williams', 'David Chan', 'Ed Sanders', -- To view, visit https://gerrit.wikimedia.org/r/165445 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0fb1c074ee6cca0953d54dfa64f05af9104537f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope roan.katt...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Sucheta Ghoshal to the trusted users whitelist - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add Sucheta Ghoshal to the trusted users whitelist .. Add Sucheta Ghoshal to the trusted users whitelist Change-Id: I82eea96a14e98f2b28789df3eb7bee0fd54d31db --- M layout.yaml 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 2660e48..d07a352 100644 --- a/layout.yaml +++ b/layout.yaml @@ -37,7 +37,7 @@ # TODO: Figure out a way to not have to repeat this from pipeline 'test'. # This email_filter and the one for 'test' can be removed once we have fixed bug 45499. email_filter: -- ^(?!(.*?@wikimedia\.org|.*?@wikimedia\.de|l10n-bot@translatewiki\.net|anomie\.wikipedia@gmail\.com|amir\.aharoni@mail\.huji\.ac\.il|hashar@free\.fr|jeroendedauw@gmail\.com|maxsem\.wiki@gmail\.com|mtraceur@member\.fsf\.org|niklas\.laxstrom@gmail\.com|santhosh\.thottingal@gmail\.com|s\.mazeland@xs4all\.nl|stefan\.petrea@gmail\.com|stefan@garage-coding\.com|roan\.kattouw@gmail\.com|krinklemail@gmail\.com|trevorparscal@gmail\.com|inez@wikia-inc\.com|orbit@framezero\.com|david@sheetmusic\.org\.uk|git@samsmith\.io|glaser@hallowelt\.biz|aude\.wiki@gmail\.com|bawolff\+wn@gmail\.com|bryan\.tongminh@gmail\.com|dereckson@espace-win\.org|hartman\.wiki@gmail\.com|hoo@online\.de|codereview@emsenhuber\.ch|daniel@nadir-seen-fire\.com|jamesin\.hongkong\.1@gmail\.com|krenair@gmail\.com|liangent@gmail\.com|mah@everybody\.org|matma\.rex@gmail\.com|raimond\.spekking@gmail\.com|robinp\.1273@gmail\.com|tim@tim-landscheidt\.de|tylerromeo@gmail\.com|umherirrender_de\.wp@web\.de|yuriastrakhan@gmail\.com|yaron57@gmail\.com|markus@semantic-mediawiki\.org|s7eph4n@gmail\.org|wiki@physikerwelt\.de|addshorewiki@gmail\.com|pragun06@gmail\.com|nilesh@nileshc\.com|benestar\.wikimedia@gmail\.com|mlazowik@gmail\.com|pleasestand@live\.com|legoktm\.wikipedia@gmail\.com|moriel@gmail\.com|d_entous@yahoo\.com|kartik\.mistry@gmail\.com|drenfro@vistaprint\.com|matanya\.moses@gmail\.com|matanya@foss\.co\.il|andrew\.green\.df@gmail\.com|thomaspt@hotmail\.fr|twkozlowski@gmail\.com|yuvipanda@gmail\.com|aarcos\.wiki@gmail\.com|saper@saper\.info|christian@quelltextlich\.at|maria\.pacana@gmail\.com|bebirchall@gmail\.com|shahyar@gmail\.com|federicoleva@tiscali\.it|jack@countervandalism\.net|at\.light@live\.com\.au|jackmcbarn@gmail\.com|platonides@gmail\.com|jarry1250@gmail\.com|admin@alphacorp\.tk|01tonythomas@gmail\.com|benapetr@gmail\.com|pastakhov@yandex\.ru|hardikjuneja\.hj@gmail\.com|siebrand@kitano\.nl|wctaiwan@gmail\.com|ladsgroup@gmail\.com|info@gno\.de|valhallasw@arctus\.nl|zhorishna@gmail\.com|jayvdb@gmail\.com|skizzerz@gmail\.com|jan\.wikimedia@zerebecki\.de|rillke@wikipedia\.de|mwalker@khaosdev\.com|se4598@gmx\.de|oliver\.buchtala@gmail\.com|florian\.schmidt\.welzow@t-online\.de)).*$ +-
[MediaWiki-commits] [Gerrit] Add Sucheta to AUTHORS.txt - change (VisualEditor/VisualEditor)
Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/165446 Change subject: Add Sucheta to AUTHORS.txt .. Add Sucheta to AUTHORS.txt Change-Id: Id2f7647e7cdb770b7ba5615a63a0c868331f697b --- M AUTHORS.txt 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/46/165446/1 diff --git a/AUTHORS.txt b/AUTHORS.txt index db035ac..cda76c8 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -7,6 +7,7 @@ Moriel Schottlender mschottlen...@wikimedia.org Roan Kattouw r...@wikimedia.org Rob Moen rm...@wikimedia.org +Sucheta Ghoshal sghos...@wikimedia.org Timo Tijhof t...@wikimedia.org Trevor Parscal tre...@wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/165446 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id2f7647e7cdb770b7ba5615a63a0c868331f697b Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope roan.katt...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move Bartosz to principal authors section - change (VisualEditor/VisualEditor)
Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/165447 Change subject: Move Bartosz to principal authors section .. Move Bartosz to principal authors section Change-Id: I4c0c3bad45e32c87ce3798b163e333a30e40ff3c --- M AUTHORS.txt 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/47/165447/1 diff --git a/AUTHORS.txt b/AUTHORS.txt index db035ac..1e74aa6 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,5 +1,6 @@ Principal Authors (major contributors, alphabetically) +Bartosz Dziewoński matma...@wikimedia.org Christian Williams christ...@wikia-inc.com David Chan dc...@wikimedia.org Ed Sanders esand...@wikimedia.org @@ -16,7 +17,6 @@ Adam Wight s...@ludd.net Antoine Musso has...@free.fr Audrey Tang audr...@audreyt.org -Bartosz Dziewoński matma@gmail.com Brion Vibber br...@wikimedia.org Erik Moeller e...@wikimedia.org Gabriel Wicke gwi...@wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/165447 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c0c3bad45e32c87ce3798b163e333a30e40ff3c Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope roan.katt...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Empty commit to check Jenkins' sanity - change (mediawiki...ImageMetrics)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165448
Change subject: Empty commit to check Jenkins' sanity
..
Empty commit to check Jenkins' sanity
Change-Id: Ia1eef7a8fffc74eafec742c3622bc2c943254477
---
M tests/qunit/ext.imageMetrics.test.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ImageMetrics
refs/changes/48/165448/1
diff --git a/tests/qunit/ext.imageMetrics.test.js
b/tests/qunit/ext.imageMetrics.test.js
index e992ecb..a866a78 100644
--- a/tests/qunit/ext.imageMetrics.test.js
+++ b/tests/qunit/ext.imageMetrics.test.js
@@ -1,5 +1,5 @@
( function ( mw, $ ) {
- 'use strict';
+ 'use strict'; // foo
QUnit.module( 'ImageMetrics', QUnit.newMwEnvironment() );
--
To view, visit https://gerrit.wikimedia.org/r/165448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1eef7a8fffc74eafec742c3622bc2c943254477
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageMetrics
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrade db1042 mariadb 10 - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165449
Change subject: upgrade db1042 mariadb 10
..
upgrade db1042 mariadb 10
Change-Id: I6b62c8755493d340257958709732a1da95444171
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/165449/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 413f74c..c07f036 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -735,7 +735,7 @@
}
}
-node /^db10(40|42|53|56|59|64)\.eqiad\.wmnet/ {
+node /^db10(40|53|56|59|64)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
@@ -830,7 +830,7 @@
}
}
-node /^db10(68|70)\.eqiad\.wmnet/ {
+node /^db10(42|68|70)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
--
To view, visit https://gerrit.wikimedia.org/r/165449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b62c8755493d340257958709732a1da95444171
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle sprin...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gitblit: fix monitoring check - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165450
Change subject: gitblit: fix monitoring check
..
gitblit: fix monitoring check
gitblit (git.wm.org) is behind the misc-lb Varnish cluster nowadays
which handles SSL termination for the service as well. The machine
itself doesn't respond to HTTPS (in fact, it just happens for some other
service, svn.wm.org, to be responding on 443).
Fix the check to check HTTP instead of HTTPS and hence making the check
work again, rather than hitting svn and 404ing.
Change-Id: I0a9689973a89284e71add8c6bd421bd9f600c28d
---
M manifests/role/gitblit.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/165450/1
diff --git a/manifests/role/gitblit.pp b/manifests/role/gitblit.pp
index be0873f..ba50006 100644
--- a/manifests/role/gitblit.pp
+++ b/manifests/role/gitblit.pp
@@ -17,8 +17,8 @@
}
monitor_service { 'gitblit_web':
-description = 'gitblit.wikimedia.org',
-check_command =
'check_https_url!git.wikimedia.org!/tree/mediawiki%2Fcore.git',
+description = 'git.wikimedia.org',
+check_command =
'check_http_url!git.wikimedia.org!/tree/mediawiki%2Fcore.git',
}
nrpe::monitor_service { 'gitblit_process':
--
To view, visit https://gerrit.wikimedia.org/r/165450
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a9689973a89284e71add8c6bd421bd9f600c28d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrade db1042 mariadb 10 - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: upgrade db1042 mariadb 10
..
upgrade db1042 mariadb 10
Change-Id: I6b62c8755493d340257958709732a1da95444171
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 413f74c..c07f036 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -735,7 +735,7 @@
}
}
-node /^db10(40|42|53|56|59|64)\.eqiad\.wmnet/ {
+node /^db10(40|53|56|59|64)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
@@ -830,7 +830,7 @@
}
}
-node /^db10(68|70)\.eqiad\.wmnet/ {
+node /^db10(42|68|70)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
--
To view, visit https://gerrit.wikimedia.org/r/165449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b62c8755493d340257958709732a1da95444171
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle sprin...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gitblit: fix monitoring check - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: gitblit: fix monitoring check
..
gitblit: fix monitoring check
gitblit (git.wm.org) is behind the misc-lb Varnish cluster nowadays
which handles SSL termination for the service as well. The machine
itself doesn't respond to HTTPS (in fact, it just happens for some other
service, svn.wm.org, to be responding on 443).
Fix the check to check HTTP instead of HTTPS and hence making the check
work again, rather than hitting svn and 404ing.
Change-Id: I0a9689973a89284e71add8c6bd421bd9f600c28d
---
M manifests/role/gitblit.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/gitblit.pp b/manifests/role/gitblit.pp
index be0873f..ba50006 100644
--- a/manifests/role/gitblit.pp
+++ b/manifests/role/gitblit.pp
@@ -17,8 +17,8 @@
}
monitor_service { 'gitblit_web':
-description = 'gitblit.wikimedia.org',
-check_command =
'check_https_url!git.wikimedia.org!/tree/mediawiki%2Fcore.git',
+description = 'git.wikimedia.org',
+check_command =
'check_http_url!git.wikimedia.org!/tree/mediawiki%2Fcore.git',
}
nrpe::monitor_service { 'gitblit_process':
--
To view, visit https://gerrit.wikimedia.org/r/165450
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0a9689973a89284e71add8c6bd421bd9f600c28d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 08/10/2014 - change (mediawiki...Wikidata)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165451
Change subject: New Wikidata Build - 08/10/2014
..
New Wikidata Build - 08/10/2014
Change-Id: I23f910d0eea469b1686da80222c92eaa475f06d1
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M extensions/Wikibase/client/resources/Resources.php
M extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
M extensions/Wikibase/lib/includes/ChangesTable.php
M extensions/Wikibase/lib/includes/ValuesFinder.php
M extensions/Wikibase/lib/includes/serializers/ByPropertyListSerializer.php
M extensions/Wikibase/lib/includes/serializers/ReferenceSerializer.php
M extensions/Wikibase/lib/resources/experts/EntityIdInput.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
M extensions/Wikibase/lib/resources/jquery.wikibase/snakview/snakview.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/snakview/snakview.variations.Variation.js
D extensions/Wikibase/lib/resources/parsers/EntityIdParser.js
M extensions/Wikibase/lib/resources/parsers/getStore.js
M extensions/Wikibase/lib/resources/parsers/resources.php
M extensions/Wikibase/lib/resources/wikibase.store/store.ApiEntityStore.js
M extensions/Wikibase/lib/resources/wikibase.store/store.CombiningEntityStore.js
M extensions/Wikibase/lib/resources/wikibase.store/store.EntityStore.js
M extensions/Wikibase/lib/resources/wikibase.store/store.MwConfigEntityStore.js
M
extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.badgeselector.tests.js
M
extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js
M
extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinklistview.tests.js
D extensions/Wikibase/lib/tests/qunit/parsers/EntityIdParser.tests.js
M extensions/Wikibase/lib/tests/qunit/resources.php
M
extensions/Wikibase/lib/tests/qunit/wikibase.store/store.CombiningEntityStore.tests.js
M extensions/Wikibase/repo/i18n/ja.json
M extensions/Wikibase/repo/i18n/qqq.json
M extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
M extensions/Wikibase/repo/includes/UserLanguageLookup.php
M extensions/Wikibase/repo/includes/api/ModifyEntity.php
M extensions/Wikibase/repo/includes/api/ParseValue.php
M extensions/Wikibase/repo/includes/api/SetReference.php
M extensions/Wikibase/repo/includes/api/SetSiteLink.php
M extensions/Wikibase/repo/tests/phpunit/includes/UserLanguageLookupTest.php
A extensions/Wikibase/repo/tests/phpunit/includes/api/ApiConventionsTest.php
M extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
M vendor/autoload.php
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
41 files changed, 489 insertions(+), 378 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/51/165451/1
diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php
index b740552..fc754d7 100644
--- a/WikibaseClient.settings.php
+++ b/WikibaseClient.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412589408;
\ No newline at end of file
+$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412757975;
\ No newline at end of file
diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php
index 4b14127..971a3e9 100644
--- a/WikibaseRepo.settings.php
+++ b/WikibaseRepo.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412589408;
\ No newline at end of file
+$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412757975;
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index ffe061c..c0140d5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -835,12 +835,12 @@
source: {
type: git,
url: https://github.com/wmde/Wikidata.org.git;,
-reference: 381190e89865e9d0fadcc490ca6f7c7dfdaefb04
+reference: 217ed7ece8c02fb1474b6ba0cabb936e3ef6c9f1
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wmde/Wikidata.org/zipball/381190e89865e9d0fadcc490ca6f7c7dfdaefb04;,
-reference: 381190e89865e9d0fadcc490ca6f7c7dfdaefb04,
+url:
https://api.github.com/repos/wmde/Wikidata.org/zipball/217ed7ece8c02fb1474b6ba0cabb936e3ef6c9f1;,
+reference: 217ed7ece8c02fb1474b6ba0cabb936e3ef6c9f1,
shasum:
},
require: {
@@ -874,7 +874,7 @@
source: https://github.com/wmde/Wikidata.org/tree/master;,
issues: https://github.com/wmde/Wikidata.org/issues;
},
-time: 2014-09-26 07:02:41
+time: 2014-10-06 14:34:12
},
{
name: wikibase/data-model,
@@ -1191,12
[MediaWiki-commits] [Gerrit] syslog-ng: update to trusty - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: syslog-ng: update to trusty
..
syslog-ng: update to trusty
change syslog-ng config syntax to 3.5 (trusty's version) and install
syslog-ng-core too, otherwise syslog-ng installation fails
Change-Id: Ib140ef22413959afc3f0c926f840fbc84babac6e
---
M manifests/misc/logging.pp
M templates/syslog-ng/syslog-ng.conf.nfs.erb
2 files changed, 8 insertions(+), 7 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/manifests/misc/logging.pp b/manifests/misc/logging.pp
index 09f6502..aeb6fc7 100644
--- a/manifests/misc/logging.pp
+++ b/manifests/misc/logging.pp
@@ -17,7 +17,7 @@
$archivepath = $basepath/archive
-package { 'syslog-ng':
+package { ['syslog-ng', 'syslog-ng-core']:
ensure = latest,
}
diff --git a/templates/syslog-ng/syslog-ng.conf.nfs.erb
b/templates/syslog-ng/syslog-ng.conf.nfs.erb
index 6ff736b..ea98fd9 100644
--- a/templates/syslog-ng/syslog-ng.conf.nfs.erb
+++ b/templates/syslog-ng/syslog-ng.conf.nfs.erb
@@ -14,6 +14,7 @@
# the none priority found in the original syslogd configuration is
# only used in internal messages created by syslogd
+@version: 3.5
##
# options
@@ -21,7 +22,7 @@
options {
# disable the chained hostname format in logs
# (default is enabled)
-chain_hostnames(0);
+chain_hostnames(no);
# the time to wait before a died connection is re-established
# (default is 60)
@@ -39,7 +40,7 @@
#sync(0);
# the number of lines fitting in the output queue
-log_fifo_size(2048);
+log_fifo_size(1);
# enable or disable directory creation for destination files
create_dirs(no);
@@ -92,7 +93,7 @@
# function to send logs to)
unix-stream(/dev/log);
# messages from the kernel
-file(/proc/kmsg log_prefix(kernel: ));
+file(/proc/kmsg program_override(kernel: ));
# use the following line if you want to receive remote UDP logging
messages
# (this is equivalent to the -r syslogd flag)
#udp();
@@ -376,9 +377,9 @@
filter f_nojunk {
not (
program(apache2) and
- match(File does not exist:) or
- match(File name too long:) or
- match(Directory index forbidden)
+ match(File does not exist: value(MESSAGE)) or
+ match(File name too long: value(MESSAGE)) or
+ match(Directory index forbidden value(MESSAGE))
);
};
--
To view, visit https://gerrit.wikimedia.org/r/164523
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib140ef22413959afc3f0c926f840fbc84babac6e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@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] syslog-ng: filter out swift noise - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: syslog-ng: filter out swift noise
..
syslog-ng: filter out swift noise
namely the spammy handoff requested (fixed in newer upstream) and GET/HEAD
requests which don't change state
Change-Id: Ida16acf1de0e2c182bec9e9d5fb37f60464667d8
---
M templates/syslog-ng/syslog-ng.conf.nfs.erb
1 file changed, 10 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Giuseppe Lavagetto: Looks good to me, but someone else must approve
diff --git a/templates/syslog-ng/syslog-ng.conf.nfs.erb
b/templates/syslog-ng/syslog-ng.conf.nfs.erb
index ea98fd9..fada207 100644
--- a/templates/syslog-ng/syslog-ng.conf.nfs.erb
+++ b/templates/syslog-ng/syslog-ng.conf.nfs.erb
@@ -394,6 +394,14 @@
;
};
+filter f_nojunk_swift {
+ not (
+ match(Handoff requested value(MESSAGE)) or
+ match(GET / value(MESSAGE)) or
+ match(HEAD / value(MESSAGE))
+ );
+};
+
# Remote syslog
log {
source(s_remote);
@@ -406,6 +414,7 @@
# OpenSwift related
log {
source(s_remote);
+ filter(f_nojunk_swift);
filter(f_swift);
destination(df_swift);
};
@@ -413,6 +422,7 @@
log {
source(s_remote);
filter(f_nojunk);
+ filter(f_nojunk_swift);
destination(df_remote);
flags(fallback, final);
};
--
To view, visit https://gerrit.wikimedia.org/r/164524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida16acf1de0e2c182bec9e9d5fb37f60464667d8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@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] Standardise script main() - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165452
Change subject: Standardise script main()
..
Standardise script main()
Allow scripts to be invoked with command line options from within
Python, such as module.main('-simulate')
Always process global arguments before local arguments, fixing bugs
regarding order of arguments.
Also several docstring fixes.
Change-Id: I828ba3cf155fb6d3e052564d20768fdf9c3acc95
---
M scripts/add_text.py
M scripts/archivebot.py
M scripts/basic.py
M scripts/blockpageschecker.py
M scripts/blockreview.py
M scripts/capitalize_redirects.py
M scripts/catall.py
M scripts/category.py
M scripts/category_redirect.py
M scripts/cfd.py
M scripts/checkimages.py
M scripts/claimit.py
M scripts/clean_sandbox.py
M scripts/commons_link.py
M scripts/commonscat.py
M scripts/coordinate_import.py
M scripts/cosmetic_changes.py
M scripts/create_categories.py
M scripts/delete.py
M scripts/disambredir.py
M scripts/editarticle.py
M scripts/featured.py
M scripts/fixing_redirects.py
M scripts/flickrripper.py
M scripts/freebasemappingupload.py
M scripts/harvest_template.py
M scripts/illustrate_wikidata.py
M scripts/image.py
M scripts/imagerecat.py
M scripts/imagetransfer.py
M scripts/imageuncat.py
M scripts/interwiki.py
M scripts/isbn.py
M scripts/listpages.py
M scripts/login.py
M scripts/lonelypages.py
M scripts/misspelling.py
M scripts/movepages.py
M scripts/newitem.py
M scripts/noreferences.py
M scripts/nowcommons.py
M scripts/pagefromfile.py
M scripts/protect.py
M scripts/redirect.py
M scripts/reflinks.py
M scripts/replace.py
M scripts/revertbot.py
M scripts/script_wui.py
M scripts/selflink.py
M scripts/solve_disambiguation.py
M scripts/spamremove.py
M scripts/template.py
M scripts/templatecount.py
M scripts/touch.py
M scripts/transferbot.py
M scripts/unlink.py
M scripts/unusedfiles.py
M scripts/upload.py
M scripts/watchlist.py
M scripts/weblinkchecker.py
M scripts/welcome.py
M tox.ini
62 files changed, 613 insertions(+), 128 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/52/165452/1
diff --git a/scripts/add_text.py b/scripts/add_text.py
index 1d104e1..252e6ab 100644
--- a/scripts/add_text.py
+++ b/scripts/add_text.py
@@ -275,7 +275,15 @@
return (text, newtext, always)
-def main():
+def main(*args):
+
+Process command line arguments and invoke bot.
+
+If args is an empty list, sys.argv is used.
+
+@param args: command line arguments
+@type args: list of unicode
+
# If none, the var is setted only for check purpose.
summary = None
addText = None
@@ -292,7 +300,7 @@
up = False
# Process global args and prepare generator args parser
-local_args = pywikibot.handleArgs()
+local_args = pywikibot.handleArgs(*args)
genFactory = pagegenerators.GeneratorFactory()
# Loading the arguments
diff --git a/scripts/archivebot.py b/scripts/archivebot.py
index 015f924..90c617e 100644
--- a/scripts/archivebot.py
+++ b/scripts/archivebot.py
@@ -524,7 +524,15 @@
self.page.update(comment)
-def main():
+def main(*args):
+
+Process command line arguments and invoke bot.
+
+If args is an empty list, sys.argv is used.
+
+@param args: command line arguments
+@type args: list of unicode
+
filename = None
pagename = None
namespace = None
@@ -537,7 +545,8 @@
if arg.startswith(name):
yield arg[len(name) + 1:]
-for arg in pywikibot.handleArgs():
+local_args = pywikibot.handleArgs(*args)
+for arg in local_args:
for v in if_arg_value(arg, '-file'):
filename = v
for v in if_arg_value(arg, '-locale'):
diff --git a/scripts/basic.py b/scripts/basic.py
index 99f83f1..245000d 100755
--- a/scripts/basic.py
+++ b/scripts/basic.py
@@ -136,10 +136,17 @@
return False
-def main():
- Process command line arguments and invoke BasicBot.
+def main(*args):
+
+Process command line arguments and invoke bot.
+
+If args is an empty list, sys.argv is used.
+
+@param args: command line arguments
+@type args: list of unicode
+
# Process global arguments to determine desired site
-local_args = pywikibot.handleArgs()
+local_args = pywikibot.handleArgs(*args)
# This factory is responsible for processing command line arguments
# that are also used by other scripts and that determine on which pages
diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py
index 70c5fdf..aa6f6b8 100755
--- a/scripts/blockpageschecker.py
+++ b/scripts/blockpageschecker.py
@@ -205,8 +205,15 @@
editor.edit(page.text)
-def main():
-Main Function.
+def main(*args):
+
+Process command line arguments and perform task.
+
+If args is an empty list, sys.argv is used.
+
+@param args: command line arguments
+@type
[MediaWiki-commits] [Gerrit] Docstring fixes in scripts - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165453
Change subject: Docstring fixes in scripts
..
Docstring fixes in scripts
Change-Id: Ic5a25fac9592fead9a6d8b0748bf13947ef7f2c7
---
M scripts/__init__.py
M scripts/category_redirect.py
M scripts/clean_sandbox.py
M scripts/commons_link.py
M scripts/commonscat.py
M scripts/cosmetic_changes.py
M scripts/create_categories.py
M scripts/data_ingestion.py
M scripts/delete.py
M scripts/disambredir.py
M scripts/editarticle.py
M scripts/featured.py
M scripts/fixing_redirects.py
M scripts/flickrripper.py
M scripts/freebasemappingupload.py
M scripts/image.py
M scripts/imagerecat.py
M scripts/imagetransfer.py
M scripts/imageuncat.py
M scripts/isbn.py
M scripts/lonelypages.py
M scripts/misspelling.py
M scripts/movepages.py
M scripts/noreferences.py
M scripts/nowcommons.py
M scripts/pagefromfile.py
M scripts/redirect.py
M scripts/reflinks.py
M scripts/replace.py
M scripts/replicate_wiki.py
M scripts/revertbot.py
M scripts/script_wui.py
M scripts/selflink.py
M scripts/solve_disambiguation.py
M scripts/spamremove.py
M scripts/template.py
M scripts/templatecount.py
M scripts/touch.py
M scripts/transferbot.py
M scripts/unlink.py
M scripts/unusedfiles.py
M scripts/upload.py
M scripts/version.py
M scripts/weblinkchecker.py
M scripts/welcome.py
M tox.ini
46 files changed, 421 insertions(+), 200 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/53/165453/1
diff --git a/scripts/__init__.py b/scripts/__init__.py
index c47da75..6eb2664 100644
--- a/scripts/__init__.py
+++ b/scripts/__init__.py
@@ -1 +1 @@
-# THIS DIRECTORY IS TO HOLD BOT SCRIPTS FOR THE NEW FRAMEWORK
+ THIS DIRECTORY IS TO HOLD BOT SCRIPTS FOR THE NEW FRAMEWORK.
diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py
index 1cb5acb..382bab7 100755
--- a/scripts/category_redirect.py
+++ b/scripts/category_redirect.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-This bot will move pages out of redirected categories
+This bot will move pages out of redirected categories.
Usage: category_redirect.py [options]
@@ -37,7 +37,10 @@
class CategoryRedirectBot(object):
+Page category update bot.
+
def __init__(self):
+Constructor.
self.cooldown = 7 # days
self.site = pywikibot.Site()
self.catprefix = self.site.namespace(14) + :
diff --git a/scripts/clean_sandbox.py b/scripts/clean_sandbox.py
index 47a5edb..8c6ca27 100755
--- a/scripts/clean_sandbox.py
+++ b/scripts/clean_sandbox.py
@@ -1,8 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-This bot cleans a (user) sandbox by replacing the current contents with
-predefined text.
+This bot resets a (user) sandbox with predefined text.
This script understands the following command-line arguments:
@@ -137,6 +136,9 @@
class SandboxBot(Bot):
+
+Sandbox reset bot.
+
availableOptions = {
'hours': 1,
'no_repeat': True,
@@ -149,6 +151,7 @@
}
def __init__(self, **kwargs):
+Constructor.
super(SandboxBot, self).__init__(**kwargs)
if self.getOption('delay') is None:
d = min(15, max(5, int(self.getOption('hours') * 60)))
@@ -177,6 +180,7 @@
sys.exit(0)
def run(self):
+Run bot.
self.site.login()
while True:
wait = False
diff --git a/scripts/commons_link.py b/scripts/commons_link.py
index 8ba3204..7436ffb 100644
--- a/scripts/commons_link.py
+++ b/scripts/commons_link.py
@@ -43,6 +43,9 @@
class CommonsLinkBot(Bot):
+
+Commons linking bot.
+
def __init__(self, generator, **kwargs):
self.availableOptions.update({
'action': None,
diff --git a/scripts/commonscat.py b/scripts/commonscat.py
index 96dedfb..0c9ec78 100755
--- a/scripts/commonscat.py
+++ b/scripts/commonscat.py
@@ -2,6 +2,7 @@
# -*- coding: utf-8 -*-
With this tool you can add the template {{commonscat}} to categories.
+
The tool works by following the interwiki links. If the template is present on
another langauge page, the bot will use it.
@@ -236,6 +237,8 @@
class CommonscatBot(Bot):
+Commons categorisation bot.
+
def __init__(self, generator, always, summary=None):
super(CommonscatBot, self).__init__(always=always)
self.generator = generator
@@ -262,6 +265,7 @@
@classmethod
def getCommonscatTemplate(self, code=None):
Get the template name of a site. Expects the site code.
+
Return as tuple containing the primary template and it's alternatives
@@ -271,7 +275,7 @@
return commonscatTemplates[u'_default']
def skipPage(self, page):
-Do we want to skip this page?
+Determine if the page should be skipped.
if page.site.code in ignoreTemplates:
templatesInThePage = page.templates()
[MediaWiki-commits] [Gerrit] log SerializationException in EntityContentDataCodec - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: log SerializationException in EntityContentDataCodec
..
log SerializationException in EntityContentDataCodec
Change-Id: I39ca304ad73d747d7d427fb15f74c4dfaee5b638
---
M lib/includes/store/EntityContentDataCodec.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/store/EntityContentDataCodec.php
b/lib/includes/store/EntityContentDataCodec.php
index fad8d48..27e4c0d 100644
--- a/lib/includes/store/EntityContentDataCodec.php
+++ b/lib/includes/store/EntityContentDataCodec.php
@@ -142,6 +142,7 @@
return $this-encodeEntityContentData( $data, $format );
}
catch ( SerializationException $ex ) {
+ \MWExceptionHandler::logException( $ex );
throw new MWContentSerializationException(
$ex-getMessage(), 0, $ex );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/165140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I39ca304ad73d747d7d427fb15f74c4dfaee5b638
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@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] Drop ORMTable::getFieldPrefix - change (mediawiki...EducationProgram)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165454
Change subject: Drop ORMTable::getFieldPrefix
..
Drop ORMTable::getFieldPrefix
This patch is a no-op. It doesn't change anything but is a
prerequisit for I46a0d7e.
Change-Id: Ib7be38f5c830ba7c9e46d325a28cb16711fc3fbb
---
M includes/Extension.php
M includes/tables/CAs.php
M includes/tables/Courses.php
M includes/tables/Events.php
M includes/tables/Instructors.php
M includes/tables/OAs.php
M includes/tables/Orgs.php
M includes/tables/PageTable.php
M includes/tables/Revisions.php
M includes/tables/Students.php
10 files changed, 38 insertions(+), 75 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EducationProgram
refs/changes/54/165454/1
diff --git a/includes/Extension.php b/includes/Extension.php
index 8c07b39..fd3bbc6 100644
--- a/includes/Extension.php
+++ b/includes/Extension.php
@@ -4,7 +4,6 @@
use EducationProgram\Events\EventStore;
use EducationProgram\Store\CourseStore;
-use ORMTable;
/**
* Main extension class, acts as dependency injection container look-alike.
diff --git a/includes/tables/CAs.php b/includes/tables/CAs.php
index c7ff1a5..9ea3292 100644
--- a/includes/tables/CAs.php
+++ b/includes/tables/CAs.php
@@ -14,6 +14,10 @@
*/
class CAs extends \ORMTable {
+ public function __construct() {
+ $this-fieldPrefix = 'ca_';
+ }
+
/**
* @see ORMTable::getName()
* @since 0.1
@@ -21,15 +25,6 @@
*/
public function getName() {
return 'ep_cas';
- }
-
- /**
-* @see ORMTable::getFieldPrefix()
-* @since 0.1
-* @return string
-*/
- public function getFieldPrefix() {
- return 'ca_';
}
/**
diff --git a/includes/tables/Courses.php b/includes/tables/Courses.php
index 1e2897c..3a3cdcd 100644
--- a/includes/tables/Courses.php
+++ b/includes/tables/Courses.php
@@ -1,7 +1,9 @@
?php
namespace EducationProgram;
-use ORMResult, Title;
+
+use ORMResult;
+use Title;
/**
* Class representing the ep_courses table.
@@ -20,6 +22,10 @@
// a new course.
const DEFAULT_COURSE_DURATION = '+6 months';
+ public function __construct() {
+ $this-fieldPrefix = 'course_';
+ }
+
/**
* @see ORMTable::getName()
* @since 0.1
@@ -27,15 +33,6 @@
*/
public function getName() {
return 'ep_courses';
- }
-
- /**
-* @see ORMTable::getFieldPrefix()
-* @since 0.1
-* @return string
-*/
- public function getFieldPrefix() {
- return 'course_';
}
/**
diff --git a/includes/tables/Events.php b/includes/tables/Events.php
index 6753399..e770cef 100644
--- a/includes/tables/Events.php
+++ b/includes/tables/Events.php
@@ -14,6 +14,10 @@
*/
class Events extends \ORMTable {
+ public function __construct() {
+ $this-fieldPrefix = 'event_';
+ }
+
/**
* @see ORMTable::getName()
* @since 0.1
@@ -21,15 +25,6 @@
*/
public function getName() {
return 'ep_events';
- }
-
- /**
-* @see ORMTable::getFieldPrefix()
-* @since 0.1
-* @return string
-*/
- public function getFieldPrefix() {
- return 'event_';
}
/**
diff --git a/includes/tables/Instructors.php b/includes/tables/Instructors.php
index e86a0a7..2d5e18e 100644
--- a/includes/tables/Instructors.php
+++ b/includes/tables/Instructors.php
@@ -14,6 +14,10 @@
*/
class Instructors extends \ORMTable {
+ public function __construct() {
+ $this-fieldPrefix = 'instructor_';
+ }
+
/**
* @see ORMTable::getName()
* @since 0.1
@@ -21,15 +25,6 @@
*/
public function getName() {
return 'ep_instructors';
- }
-
- /**
-* @see ORMTable::getFieldPrefix()
-* @since 0.1
-* @return string
-*/
- public function getFieldPrefix() {
- return 'instructor_';
}
/**
diff --git a/includes/tables/OAs.php b/includes/tables/OAs.php
index e5de189..88796f6 100644
--- a/includes/tables/OAs.php
+++ b/includes/tables/OAs.php
@@ -14,6 +14,10 @@
*/
class OAs extends \ORMTable {
+ public function __construct() {
+ $this-fieldPrefix = 'oa_';
+ }
+
/**
* @see ORMTable::getName()
* @since 0.1
@@ -21,15 +25,6 @@
*/
public function getName() {
return 'ep_oas';
- }
-
- /**
-* @see ORMTable::getFieldPrefix()
-* @since 0.1
-* @return string
-*/
- public function getFieldPrefix() {
- return 'oa_';
}
[MediaWiki-commits] [Gerrit] Disable voting for mwext-ImageMetrics-qunit - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/165455 Change subject: Disable voting for mwext-ImageMetrics-qunit .. Disable voting for mwext-ImageMetrics-qunit The job never worked and prevent patches from landing in. Dies with a cryptic error: JQMIGRATE: Logging is active Exception thrown by test.module1 Error: expected Error: expected Bug: 71782 Change-Id: I6d25211f81086f6e1dfadca92ecc239e99b2f521 --- M layout.yaml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/55/165455/1 diff --git a/layout.yaml b/layout.yaml index d07a352..1acb01c 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1556,6 +1556,10 @@ branch: (?!REL1_19) queue-name: mediawiki + # Job never worked, broken somehow. Bug 71782 + - name: ^mwext-ImageMetrics-qunit$ +voting: false + - name: ^mwext-Wikibase-qunit$ voting: false - name: ^mwext-Wikidata-qunit$ -- To view, visit https://gerrit.wikimedia.org/r/165455 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d25211f81086f6e1dfadca92ecc239e99b2f521 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable voting for mwext-ImageMetrics-qunit - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Disable voting for mwext-ImageMetrics-qunit .. Disable voting for mwext-ImageMetrics-qunit The job never worked and prevent patches from landing in. Dies with a cryptic error: JQMIGRATE: Logging is active Exception thrown by test.module1 Error: expected Error: expected Bug: 71782 Change-Id: I6d25211f81086f6e1dfadca92ecc239e99b2f521 --- M layout.yaml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index d07a352..1acb01c 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1556,6 +1556,10 @@ branch: (?!REL1_19) queue-name: mediawiki + # Job never worked, broken somehow. Bug 71782 + - name: ^mwext-ImageMetrics-qunit$ +voting: false + - name: ^mwext-Wikibase-qunit$ voting: false - name: ^mwext-Wikidata-qunit$ -- To view, visit https://gerrit.wikimedia.org/r/165455 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6d25211f81086f6e1dfadca92ecc239e99b2f521 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org Gerrit-Reviewer: Gilles gdu...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 08/10/2014 - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged.
Change subject: New Wikidata Build - 08/10/2014
..
New Wikidata Build - 08/10/2014
Change-Id: I23f910d0eea469b1686da80222c92eaa475f06d1
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M extensions/Wikibase/client/resources/Resources.php
M extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
M extensions/Wikibase/lib/includes/ChangesTable.php
M extensions/Wikibase/lib/includes/ValuesFinder.php
M extensions/Wikibase/lib/includes/serializers/ByPropertyListSerializer.php
M extensions/Wikibase/lib/includes/serializers/ReferenceSerializer.php
M extensions/Wikibase/lib/resources/experts/EntityIdInput.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
M extensions/Wikibase/lib/resources/jquery.wikibase/snakview/snakview.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/snakview/snakview.variations.Variation.js
D extensions/Wikibase/lib/resources/parsers/EntityIdParser.js
M extensions/Wikibase/lib/resources/parsers/getStore.js
M extensions/Wikibase/lib/resources/parsers/resources.php
M extensions/Wikibase/lib/resources/wikibase.store/store.ApiEntityStore.js
M extensions/Wikibase/lib/resources/wikibase.store/store.CombiningEntityStore.js
M extensions/Wikibase/lib/resources/wikibase.store/store.EntityStore.js
M extensions/Wikibase/lib/resources/wikibase.store/store.MwConfigEntityStore.js
M
extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.badgeselector.tests.js
M
extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js
M
extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinklistview.tests.js
D extensions/Wikibase/lib/tests/qunit/parsers/EntityIdParser.tests.js
M extensions/Wikibase/lib/tests/qunit/resources.php
M
extensions/Wikibase/lib/tests/qunit/wikibase.store/store.CombiningEntityStore.tests.js
M extensions/Wikibase/repo/i18n/ja.json
M extensions/Wikibase/repo/i18n/qqq.json
M extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
M extensions/Wikibase/repo/includes/UserLanguageLookup.php
M extensions/Wikibase/repo/includes/api/ModifyEntity.php
M extensions/Wikibase/repo/includes/api/ParseValue.php
M extensions/Wikibase/repo/includes/api/SetReference.php
M extensions/Wikibase/repo/includes/api/SetSiteLink.php
M extensions/Wikibase/repo/tests/phpunit/includes/UserLanguageLookupTest.php
A extensions/Wikibase/repo/tests/phpunit/includes/api/ApiConventionsTest.php
M extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
M vendor/autoload.php
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
41 files changed, 489 insertions(+), 378 deletions(-)
Approvals:
Aude: Looks good to me, approved
WikidataJenkins: Verified
jenkins-bot: Verified
diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php
index b740552..fc754d7 100644
--- a/WikibaseClient.settings.php
+++ b/WikibaseClient.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412589408;
\ No newline at end of file
+$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412757975;
\ No newline at end of file
diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php
index 4b14127..971a3e9 100644
--- a/WikibaseRepo.settings.php
+++ b/WikibaseRepo.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412589408;
\ No newline at end of file
+$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412757975;
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index ffe061c..c0140d5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -835,12 +835,12 @@
source: {
type: git,
url: https://github.com/wmde/Wikidata.org.git;,
-reference: 381190e89865e9d0fadcc490ca6f7c7dfdaefb04
+reference: 217ed7ece8c02fb1474b6ba0cabb936e3ef6c9f1
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wmde/Wikidata.org/zipball/381190e89865e9d0fadcc490ca6f7c7dfdaefb04;,
-reference: 381190e89865e9d0fadcc490ca6f7c7dfdaefb04,
+url:
https://api.github.com/repos/wmde/Wikidata.org/zipball/217ed7ece8c02fb1474b6ba0cabb936e3ef6c9f1;,
+reference: 217ed7ece8c02fb1474b6ba0cabb936e3ef6c9f1,
shasum:
},
require: {
@@ -874,7 +874,7 @@
source: https://github.com/wmde/Wikidata.org/tree/master;,
issues: https://github.com/wmde/Wikidata.org/issues;
},
-time: 2014-09-26 07:02:41
+time: 2014-10-06 14:34:12
},
{
name: wikibase/data-model,
@@ -1191,12 +1191,12 @@
[MediaWiki-commits] [Gerrit] ImageMetrics depends on EventLogging - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165456
Change subject: ImageMetrics depends on EventLogging
..
ImageMetrics depends on EventLogging
The qunit job for ImageMetrics was not working at all, turns out it
depends on EventLogging extension to be added.
Note: this also add EventLogging as a dependency when running PHPUnit
tests.
Bug: 71782
Change-Id: I5e823d902a4656239b7f41ff02f57c3f9846dab7
---
M mediawiki-extensions.yaml
1 file changed, 3 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/56/165456/1
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index a861d0b..f04b033 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -576,7 +576,8 @@
- IfTemplates
- ImageLink
- ImageMap
- - ImageMetrics
+ - ImageMetrics:
+dependencies: 'EventLogging'
- IndexFunction
- InlineCategorizer
- InputBox
@@ -1046,6 +1047,7 @@
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: ImageMetrics
+dependencies: 'EventLogging'
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: Mantle
--
To view, visit https://gerrit.wikimedia.org/r/165456
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e823d902a4656239b7f41ff02f57c3f9846dab7
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Disable voting for mwext-ImageMetrics-qunit - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/165457 Change subject: Revert Disable voting for mwext-ImageMetrics-qunit .. Revert Disable voting for mwext-ImageMetrics-qunit ImageMetrics depends on EventLogging which has been added to the Jenkins jobs with https://gerrit.wikimedia.org/r/#/c/165456/ A manual test confirmed the qunit job now pass. This reverts commit fe5ce90314bb65246470aea95410ce5d5694246d. Bug: 71782 Change-Id: I5e823d902a4656239b7f41ff02f57c3f9846dab7 --- M layout.yaml 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/57/165457/1 diff --git a/layout.yaml b/layout.yaml index 1acb01c..d07a352 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1556,10 +1556,6 @@ branch: (?!REL1_19) queue-name: mediawiki - # Job never worked, broken somehow. Bug 71782 - - name: ^mwext-ImageMetrics-qunit$ -voting: false - - name: ^mwext-Wikibase-qunit$ voting: false - name: ^mwext-Wikidata-qunit$ -- To view, visit https://gerrit.wikimedia.org/r/165457 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5e823d902a4656239b7f41ff02f57c3f9846dab7 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ImageMetrics depends on EventLogging - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: ImageMetrics depends on EventLogging
..
ImageMetrics depends on EventLogging
The qunit job for ImageMetrics was not working at all, turns out it
depends on EventLogging extension to be added.
Note: this also add EventLogging as a dependency when running PHPUnit
tests.
Bug: 71782
Change-Id: I5e823d902a4656239b7f41ff02f57c3f9846dab7
---
M mediawiki-extensions.yaml
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index a861d0b..f04b033 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -576,7 +576,8 @@
- IfTemplates
- ImageLink
- ImageMap
- - ImageMetrics
+ - ImageMetrics:
+dependencies: 'EventLogging'
- IndexFunction
- InlineCategorizer
- InputBox
@@ -1046,6 +1047,7 @@
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: ImageMetrics
+dependencies: 'EventLogging'
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: Mantle
--
To view, visit https://gerrit.wikimedia.org/r/165456
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e823d902a4656239b7f41ff02f57c3f9846dab7
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Disable voting for mwext-ImageMetrics-qunit - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Revert Disable voting for mwext-ImageMetrics-qunit .. Revert Disable voting for mwext-ImageMetrics-qunit ImageMetrics depends on EventLogging which has been added to the Jenkins jobs with https://gerrit.wikimedia.org/r/#/c/165456/ A manual test confirmed the qunit job now pass. This reverts commit fe5ce90314bb65246470aea95410ce5d5694246d. Bug: 71782 Change-Id: I5e823d902a4656239b7f41ff02f57c3f9846dab7 --- M layout.yaml 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 1acb01c..d07a352 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1556,10 +1556,6 @@ branch: (?!REL1_19) queue-name: mediawiki - # Job never worked, broken somehow. Bug 71782 - - name: ^mwext-ImageMetrics-qunit$ -voting: false - - name: ^mwext-Wikibase-qunit$ voting: false - name: ^mwext-Wikidata-qunit$ -- To view, visit https://gerrit.wikimedia.org/r/165457 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5e823d902a4656239b7f41ff02f57c3f9846dab7 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] torrus - remove pmpta subtrees and renderers - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: torrus - remove pmpta subtrees and renderers
..
torrus - remove pmpta subtrees and renderers
Change-Id: I0f1b9e5c31939ae17d6e448573a6cd8a3e69965c
---
M files/torrus/conf/schema-override.pl
M files/torrus/xmlconfig/facilities_aggregates.xml
M files/torrus/xmlconfig/power.xml
3 files changed, 3 insertions(+), 540 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/torrus/conf/schema-override.pl
b/files/torrus/conf/schema-override.pl
index 4b197d0..0bc9b30 100644
--- a/files/torrus/conf/schema-override.pl
+++ b/files/torrus/conf/schema-override.pl
@@ -13,9 +13,4 @@
$Torrus::Renderer::graphStyles{'mobile-eqiad'}{'color'} = '#e6004d';
$Torrus::Renderer::graphStyles{'api-eqiad'}{'color'} = '##yellow';
-$Torrus::Renderer::graphStyles{'text-pmtpa'}{'color'} = '#cc';
-$Torrus::Renderer::graphStyles{'upload-pmtpa'}{'color'} = '#7a';
-$Torrus::Renderer::graphStyles{'bits-pmtpa'}{'color'} = '#4545a6';
-$Torrus::Renderer::graphStyles{'mobile-pmtpa'}{'color'} = '#4545A6';
-$Torrus::Renderer::graphStyles{'api-pmtpa'}{'color'} = '##orange';
diff --git a/files/torrus/xmlconfig/facilities_aggregates.xml
b/files/torrus/xmlconfig/facilities_aggregates.xml
index b5f766c..e8c8ea8 100644
--- a/files/torrus/xmlconfig/facilities_aggregates.xml
+++ b/files/torrus/xmlconfig/facilities_aggregates.xml
@@ -5,17 +5,15 @@
datasources
subtree name=Power_usage
subtree name=Total_power_usage
- param name=expr-Power_Measured_pmtpa
value={/Power_strips/pmtpa/ps1-c1-pmtpa/System/Total_power},{/Power_strips/pmtpa/ps1-c2-pmtpa/System/Total_power},{/Power_strips/pmtpa/ps1-c3-pmtpa/System/Total_power},{/Power_strips/pmtpa/ps1-d1-pmtpa/System/Total_power},{/Power_strips/pmtpa/ps1-d2-pmtpa/System/Total_power},{/Power_strips/pmtpa/ps1-d3-pmtpa/System/Total_power},ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN/
param name=expr-Power_Measured_eqiad
value={/Power_strips/eqiad/ps1-a1-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-a2-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-a3-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-a4-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-a5-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-a6-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-a7-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-a8-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-b1-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-b2-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-b3-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-b4-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-b5-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-b6-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-b7-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-b8-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-c1-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-c2-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-c3-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-c4-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-c5-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-c6-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-c7-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-c8-eqiad/System/Total_power},ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN/
- param name=expr-Power_Measured
value=%expr-Power_Measured_pmtpa%,%expr-Power_Measured_eqiad%,ADDNAN,ADDNAN/
+ param name=expr-Power_Measured
value=%expr-Power_Measured_eqiad%,ADDNAN,ADDNAN/
- param name=expr-Power_Estimated_pmtpa
value=%expr-Power_Measured_pmtpa%,16000,ADDNAN/
param name=expr-Power_Estimated_eqiad
value=%expr-Power_Measured_eqiad%,0,ADDNAN/
param name=expr-Power_Estimated_esams
value=32200/
param name=expr-Power_Estimated_knams
value=3680/
- param name=expr-Power_Estimated
value=%expr-Power_Estimated_pmtpa%,%expr-Power_Estimated_eqiad%,%expr-Power_Estimated_esams%,%expr-Power_Estimated_knams%,ADDNAN,ADDNAN,ADDNAN,ADDNAN/
+ param name=expr-Power_Estimated
value=%expr-Power_Estimated_eqiad%,%expr-Power_Estimated_esams%,%expr-Power_Estimated_knams%,ADDNAN,ADDNAN,ADDNAN,ADDNAN/
leaf name=Total_measured_power
param name=ds-type value=rrd-file/
diff --git a/files/torrus/xmlconfig/power.xml b/files/torrus/xmlconfig/power.xml
index 8eb3ca1..28b6246 100644
--- a/files/torrus/xmlconfig/power.xml
+++
[MediaWiki-commits] [Gerrit] Add points to Tasks Table Change base URLs Add SprintReportC... - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: Add points to Tasks Table Change base URLs Add
SprintReportController Class Add Nav Menu to BurndownListController Change-Id:
I9148971fb50a407cb843efd046817855a2365e9e
..
Add points to Tasks Table
Change base URLs
Add SprintReportController Class
Add Nav Menu to BurndownListController
Change-Id: I9148971fb50a407cb843efd046817855a2365e9e
---
M __phutil_library_map__.php
M src/BurndownActionMenuEventListener.php
M src/BurndownApplication.php
M src/BurndownData.php
M src/BurndownListController.php
A src/SprintReportController.php
6 files changed, 1,031 insertions(+), 195 deletions(-)
Approvals:
Christopher Johnson (WMDE): Verified; Looks good to me, approved
diff --git a/__phutil_library_map__.php b/__phutil_library_map__.php
index b49e603..d3477bd 100644
--- a/__phutil_library_map__.php
+++ b/__phutil_library_map__.php
@@ -20,6 +20,7 @@
'SprintStartDateField' = 'src/SprintStartDateField.php',
'SprintEndDateField' = 'src/SprintEndDateField.php',
'SprintProjectCustomField' = 'src/SprintProjectCustomField.php',
+'SprintReportController' = 'src/SprintReportController.php',
'SprintTaskStoryPointsField' = 'src/SprintTaskStoryPointsField.php',
),
'function' = array(),
@@ -36,6 +37,7 @@
'PhabricatorProjectCustomField',
'PhabricatorStandardCustomFieldInterface',
),
+'SprintReportController' = 'ManiphestController',
'SprintTaskStoryPointsField' = array(
'ManiphestCustomField',
'PhabricatorStandardCustomFieldInterface',
diff --git a/src/BurndownActionMenuEventListener.php
b/src/BurndownActionMenuEventListener.php
index f528e15..1422171 100644
--- a/src/BurndownActionMenuEventListener.php
+++ b/src/BurndownActionMenuEventListener.php
@@ -37,7 +37,7 @@
$project = $event-getValue('object');
-$view_uri = '/burndown/view/'.$project-getId();
+$view_uri = '/sprint/view/'.$project-getId();
return id(new PhabricatorActionView())
-setIcon('fa-bar-chart-o')
diff --git a/src/BurndownApplication.php b/src/BurndownApplication.php
index f81fae6..67455da 100644
--- a/src/BurndownApplication.php
+++ b/src/BurndownApplication.php
@@ -7,11 +7,11 @@
final class BurndownApplication extends PhabricatorApplication {
public function getName() {
-return pht('Burndown Extensions');
+return pht('Sprint');
}
public function getBaseURI() {
-return '/burndown/list/';
+return '/sprint/list/';
}
public function getIconName() {
@@ -30,8 +30,9 @@
public function getRoutes() {
return array(
- '/burndown/' = array(
+ '/sprint/' = array(
'list/' = 'BurndownListController',
+'report/(?:(?Pview\w+)/)?' = 'SprintReportController',
'view/(?Pid\d+)/' = 'BurndownController',
),
);
diff --git a/src/BurndownData.php b/src/BurndownData.php
index 10b8ae2..f9dd8ef 100644
--- a/src/BurndownData.php
+++ b/src/BurndownData.php
@@ -6,60 +6,62 @@
class BurndownData {
- // Array of BurndownDataDates
- // There are two special keys, 'before' and 'after'
- //
- // Looks like: array(
- // 'before' = BurndownDataDate
- // 'Tue Jun 3' = BurndownDataDate
- // 'Wed Jun 4' = BurndownDataDate
- // ...
- // 'after' = BurndownDataDate
- // )
+ // Array of BurndownDataDates
+ // There are two special keys, 'before' and 'after'
+ //
+ // Looks like: array(
+ // 'before' = BurndownDataDate
+ // 'Tue Jun 3' = BurndownDataDate
+ // 'Wed Jun 4' = BurndownDataDate
+ // ...
+ // 'after' = BurndownDataDate
+ // )
+ private $type_status = 'core:customfield';
+ private $storypoints;
private $dates;
private $data;
- // These hold an array of each task, and how many points are assigned, and
- // whether it's open or closed. These values change as we progress through
- // time, so that changes to points or status reflect on the graph.
+ // These hold an array of each task, and how many points are assigned, and
+ // whether it's open or closed. These values change as we progress through
+ // time, so that changes to points or status reflect on the graph.
private $task_points = array();
private $task_statuses = array();
- private $task_in_sprint= array();
-// Project associated with this burndown.
+ private $task_in_sprint = array();
+ // Project associated with this burndown.
private $project;
private $viewer;
private $tasks;
private $events;
private $xactions;
- public function __construct($project, $viewer)
- {
+ public function __construct($project, $viewer) {
$this-project = $project;
$this-viewer = $viewer;
// We need the custom fields so we can pull out the start and end date
-$aux_fields = $this-getAuxFields($project,$viewer);
-$start= $this-getStartDate($aux_fields);
+$aux_fields =
[MediaWiki-commits] [Gerrit] Isolate api traffic on s2 to db1054 and db1060. - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/165458 Change subject: Isolate api traffic on s2 to db1054 and db1060. .. Isolate api traffic on s2 to db1054 and db1060. Done live on tin during outage. Make it stick. Change-Id: I5b0a89bb1dc9f56fdd2833bbeecfef974f9d7069 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/58/165458/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 458b94e..a979f84 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -103,8 +103,8 @@ 'db1018' = 0, # 1.4TB 64GB, snapshot, dump, vslow 'db1036' = 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager 'db1009' = 100, # 1.4TB 64GB, traffic sampling - 'db1054' = 400, # 2.8TB 96GB - 'db1060' = 400, # 2.8TB 96GB + 'db1054' = 200, # 2.8TB 96GB, api + 'db1060' = 200, # 2.8TB 96GB, api 'db1063' = 500, # 2.8TB 128GB 'db1067' = 500, # 2.8TB 160GB ), @@ -176,6 +176,10 @@ 'dump' = array( 'db1018' = 1, ), + 'api' = array( + 'db1054' = 1, + 'db1060' = 1, + ), 'watchlist' = array( 'db1036' = 1, ), -- To view, visit https://gerrit.wikimedia.org/r/165458 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b0a89bb1dc9f56fdd2833bbeecfef974f9d7069 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Isolate api traffic on s2 to db1054 and db1060. - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Isolate api traffic on s2 to db1054 and db1060. .. Isolate api traffic on s2 to db1054 and db1060. Done live on tin during outage. Make it stick. Change-Id: I5b0a89bb1dc9f56fdd2833bbeecfef974f9d7069 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 458b94e..a979f84 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -103,8 +103,8 @@ 'db1018' = 0, # 1.4TB 64GB, snapshot, dump, vslow 'db1036' = 0, # 1.4TB 64GB, watchlist, recentchangeslinked, contributions, logpager 'db1009' = 100, # 1.4TB 64GB, traffic sampling - 'db1054' = 400, # 2.8TB 96GB - 'db1060' = 400, # 2.8TB 96GB + 'db1054' = 200, # 2.8TB 96GB, api + 'db1060' = 200, # 2.8TB 96GB, api 'db1063' = 500, # 2.8TB 128GB 'db1067' = 500, # 2.8TB 160GB ), @@ -176,6 +176,10 @@ 'dump' = array( 'db1018' = 1, ), + 'api' = array( + 'db1054' = 1, + 'db1060' = 1, + ), 'watchlist' = array( 'db1036' = 1, ), -- To view, visit https://gerrit.wikimedia.org/r/165458 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5b0a89bb1dc9f56fdd2833bbeecfef974f9d7069 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix KeyError in package_versions - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/165459 Change subject: Fix KeyError in package_versions .. Fix KeyError in package_versions Replace algorithm with simpler approach that removes only pywikibot sub-modules like 'wikipedia_family' from the package list. Change-Id: Ic93b75b7b9e74a66ce3907fa4526e58d694492a5 --- M pywikibot/version.py 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/59/165459/1 diff --git a/pywikibot/version.py b/pywikibot/version.py index 1002ffb..4c02f57 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -370,12 +370,11 @@ else: data[name] = info -# Remove any sub-packages which were loaded with a different name. +# Remove any sub-modules which were loaded with a different name. # e.g. 'wikipedia_family.py' is loaded as 'wikipedia' +_program_dir = _get_program_dir() for path, name in paths.items(): -for other_path in set(paths) - set([path]): -if path.startswith(other_path) and not other_path.startswith(path): -del paths[path] -del data[name] +if _program_dir in path: +del data[name] return data -- To view, visit https://gerrit.wikimedia.org/r/165459 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic93b75b7b9e74a66ce3907fa4526e58d694492a5 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use single quotes for __version__ $Id$ strings - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/165460 Change subject: Use single quotes for __version__ $Id$ strings .. Use single quotes for __version__ $Id$ strings All but three of the __version__ $Id$ strings use single quotes. This changes those three for consistency. Change-Id: I96a697f8a438207108785fae217c8f66a39d4426 --- M generate_family_file.py M pywikibot/editor.py M scripts/editarticle.py 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/60/165460/1 diff --git a/generate_family_file.py b/generate_family_file.py index 5a8f6e5..78e663f 100644 --- a/generate_family_file.py +++ b/generate_family_file.py @@ -12,7 +12,7 @@ # # Distributed under the terms of the MIT license # -__version__ = $Id$ +__version__ = '$Id$' # # system imports diff --git a/pywikibot/editor.py b/pywikibot/editor.py index e795928..0ab7de1 100644 --- a/pywikibot/editor.py +++ b/pywikibot/editor.py @@ -8,7 +8,7 @@ # # Distributed under the terms of the MIT license. # -__version__ = $Id$ +__version__ = '$Id$' # import sys diff --git a/scripts/editarticle.py b/scripts/editarticle.py index 74af631..9e4e16a 100755 --- a/scripts/editarticle.py +++ b/scripts/editarticle.py @@ -15,7 +15,7 @@ # # Distributed under the terms of the MIT license. # -__version__ = $Id$ +__version__ = '$Id$' # import os -- To view, visit https://gerrit.wikimedia.org/r/165460 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96a697f8a438207108785fae217c8f66a39d4426 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use templates for all Wikidata jobs - change (integration/jenkins-job-builder-config)
Tobias Gritschacher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165461
Change subject: Use templates for all Wikidata jobs
..
Use templates for all Wikidata jobs
Some jobs require tests with specific tags to be executed.
For this to work I needed to introduce another parameter to
specify custom tags. Called it cucumber_tags. If it is not set
everything behaves as before. If it is set, only tests with the
specified tags will be executed.
Change-Id: I7d7e528024c849b939cb5b00a2d522ec39d50ff1
---
M browsertests.yaml
M job-templates-browsertests.yaml
M macro.yaml
3 files changed, 15 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/61/165461/1
diff --git a/browsertests.yaml b/browsertests.yaml
index 1f7ac2e..9b3f4ab 100644
--- a/browsertests.yaml
+++ b/browsertests.yaml
@@ -528,7 +528,15 @@
repository_host: github.com/wmde
jobs:
- -
'browsertests-Wikidata-{name}-{mediawiki_url}-{platform}-{browser}-sauce'
+ - 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce'
+
+ - 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce':
+ name: PerformanceTests
+ cucumber_tags: '@performance_testing'
+
+ - 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce':
+ name: SmokeTests
+ cucumber_tags: '@smoke'
# WikiLove
- project:
diff --git a/job-templates-browsertests.yaml b/job-templates-browsertests.yaml
index 2da78b1..39ffd04 100644
--- a/job-templates-browsertests.yaml
+++ b/job-templates-browsertests.yaml
@@ -68,7 +68,7 @@
- lang_list
- job-template:
-name:
'browsertests-Wikidata-{name}-{mediawiki_url}-{platform}-{browser}-sauce'
+name: 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce'
defaults: browsertests
triggers:
@@ -78,6 +78,7 @@
name: browsertests
node: contintLabsSlave UbuntuPrecise
repository_host: 'gerrit.wikimedia.org/r'
+cucumber_tags: ''
properties:
- throttle:
@@ -104,6 +105,7 @@
- shell: mkdir -p $WORKSPACE/log/junit
- browsertest-website:
browser: '{browser}'
+ cucumber_tags: '{cucumber_tags}'
headless: '{headless}'
folder: '{folder}'
mediawiki_password_variable: '{mediawiki_password_variable}'
diff --git a/macro.yaml b/macro.yaml
index dbbd7eb..6598b91 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -627,6 +627,7 @@
- shell: |
# set up environment variables
export BROWSER={browser}
+ export CUCUMBER_TAGS={cucumber_tags}
export HEADLESS={headless}
export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php
export MEDIAWIKI_PASSWORD_VARIABLE={mediawiki_password_variable}
@@ -706,6 +707,8 @@
export LANGUAGE_SCREENSHOT_PATH=$WORKSPACE/log
elif [[ $JOB_NAME == browsertests-Core-* ]]; then
CUCUMBER_PARAMETER=@clean
+ elif [[ ! -z $CUCUMBER_TAGS ]]; then
+CUCUMBER_PARAMETER=$CUCUMBER_TAGS
else
CUCUMBER_PARAMETER=@{mediawiki_url}
fi
--
To view, visit https://gerrit.wikimedia.org/r/165461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d7e528024c849b939cb5b00a2d522ec39d50ff1
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BurndownListController Navigation Change - change (phabricator...Sprint)
Christopher Johnson (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165462
Change subject: BurndownListController Navigation Change
..
BurndownListController Navigation Change
Change-Id: Ide4c26c85626f7fb706e4f7aefee7f387dfa17d8
---
M src/BurndownListController.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint
refs/changes/62/165462/1
diff --git a/src/BurndownListController.php b/src/BurndownListController.php
index 0e7e287..e673e9e 100644
--- a/src/BurndownListController.php
+++ b/src/BurndownListController.php
@@ -17,8 +17,8 @@
$nav = new AphrontSideNavFilterView();
$nav-setBaseURI(new PhutilURI('/sprint/report/'));
$nav-addLabel(pht('Open Tasks'));
-$nav-addFilter('user', pht('By User'));
$nav-addFilter('project', pht('By Project'));
+$nav-addFilter('user', pht('By User'));
$nav-addLabel(pht('Burndown'));
$nav-addFilter('burn', pht('Burndown Rate'));
--
To view, visit https://gerrit.wikimedia.org/r/165462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide4c26c85626f7fb706e4f7aefee7f387dfa17d8
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
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] BurndownListController Navigation Change - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: BurndownListController Navigation Change
..
BurndownListController Navigation Change
Change-Id: Ide4c26c85626f7fb706e4f7aefee7f387dfa17d8
---
M src/BurndownListController.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Christopher Johnson (WMDE): Verified; Looks good to me, approved
diff --git a/src/BurndownListController.php b/src/BurndownListController.php
index 0e7e287..e673e9e 100644
--- a/src/BurndownListController.php
+++ b/src/BurndownListController.php
@@ -17,8 +17,8 @@
$nav = new AphrontSideNavFilterView();
$nav-setBaseURI(new PhutilURI('/sprint/report/'));
$nav-addLabel(pht('Open Tasks'));
-$nav-addFilter('user', pht('By User'));
$nav-addFilter('project', pht('By Project'));
+$nav-addFilter('user', pht('By User'));
$nav-addLabel(pht('Burndown'));
$nav-addFilter('burn', pht('Burndown Rate'));
--
To view, visit https://gerrit.wikimedia.org/r/165462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ide4c26c85626f7fb706e4f7aefee7f387dfa17d8
Gerrit-PatchSet: 2
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de
Gerrit-Reviewer: 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] Reduce number of parsoid runners even further - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: Reduce number of parsoid runners even further .. Reduce number of parsoid runners even further The API cluster is still overloaded, so manually scale back Parsoid job processing further. This might result in Parsoid falling behind on low-priority dependent updates, but that's still better than overloading the API cluster. Change-Id: Iba3fd20c5028276a885681e7f24826f50d68150d --- M manifests/role/mediawiki.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Subramanya Sastry: Looks good to me, but someone else must approve Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp index b97ea11..b20b25b 100644 --- a/manifests/role/mediawiki.pp +++ b/manifests/role/mediawiki.pp @@ -114,7 +114,7 @@ queue_servers = ['rdb1001.eqiad.wmnet', 'rdb1003.eqiad.wmnet'], statsd_server = 'statsd.eqiad.wmnet:8125', runners_basic = 14, -runners_parsoid = 14, +runners_parsoid = 10, runners_upload = 7, runners_gwt = 1, } -- To view, visit https://gerrit.wikimedia.org/r/165317 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba3fd20c5028276a885681e7f24826f50d68150d Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: GWicke gwi...@wikimedia.org Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] table_type - default_storage_engine - change (mediawiki...WikimediaMaintenance)
jenkins-bot has submitted this change and it was merged. Change subject: table_type - default_storage_engine .. table_type - default_storage_engine Bug: 71566 Change-Id: Ia0a75cdbc0be438ec7a507b26e698be03d4e4c42 --- M addWiki.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/addWiki.php b/addWiki.php index 8304f9d..6da1748 100644 --- a/addWiki.php +++ b/addWiki.php @@ -159,7 +159,7 @@ $store = new ExternalStoreDB; $extdb = $store-getMaster( $cluster ); - $extdb-query( SET table_type=InnoDB ); + $extdb-query( SET default_storage_engine=InnoDB ); $extdb-query( CREATE DATABASE $dbName ); $extdb-selectDB( $dbName ); -- To view, visit https://gerrit.wikimedia.org/r/164405 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia0a75cdbc0be438ec7a507b26e698be03d4e4c42 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/WikimediaMaintenance Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove all superfluous docroot folders - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Remove all superfluous docroot folders .. Remove all superfluous docroot folders Depends on https://gerrit.wikimedia.org/r/#/c/90703 Change-Id: I6ef3d47472db9145d8356f6ee7b3257eeae89b1c --- D docroot/advisory/503.html D docroot/advisory/images D docroot/advisory/w D docroot/auditcom/503.html D docroot/auditcom/images D docroot/auditcom/w D docroot/board/503.html D docroot/board/images D docroot/board/w D docroot/boardgovcom/503.html D docroot/boardgovcom/images D docroot/boardgovcom/w D docroot/chair/503.html D docroot/chair/images D docroot/chair/w D docroot/chapcom/503.html D docroot/chapcom/images D docroot/chapcom/w D docroot/checkuser/503.html D docroot/checkuser/images D docroot/checkuser/w D docroot/collab/503.html D docroot/collab/images D docroot/collab/w D docroot/donate/503.html D docroot/donate/images D docroot/donate/w D docroot/exec/503.html D docroot/exec/images D docroot/exec/w D docroot/fdc/503.html D docroot/fdc/images D docroot/fdc/w D docroot/grants/503.html D docroot/grants/images D docroot/grants/w D docroot/iegcom/503.html D docroot/iegcom/images D docroot/iegcom/w D docroot/incubator/503.html D docroot/incubator/images D docroot/incubator/w D docroot/internal/503.html D docroot/internal/images D docroot/internal/w D docroot/login/503.html D docroot/login/images D docroot/login/w D docroot/meta/503.html D docroot/meta/images D docroot/meta/w D docroot/movementroles/503.html D docroot/movementroles/images D docroot/movementroles/w D docroot/nomcom/503.html D docroot/nomcom/images D docroot/nomcom/w D docroot/office/503.html D docroot/office/images D docroot/office/w D docroot/ombudsmen/503.html D docroot/ombudsmen/images D docroot/ombudsmen/w D docroot/otrs-wiki/503.html D docroot/otrs-wiki/images D docroot/otrs-wiki/w D docroot/outreach/503.html D docroot/outreach/images D docroot/outreach/w D docroot/quality/503.html D docroot/quality/images D docroot/quality/w D docroot/searchcom/503.html D docroot/searchcom/images D docroot/searchcom/w D docroot/sources/503.html D docroot/sources/images D docroot/sources/w D docroot/spcom/503.html D docroot/spcom/images D docroot/spcom/w D docroot/species/503.html D docroot/species/images D docroot/species/w D docroot/steward/503.html D docroot/steward/images D docroot/steward/w D docroot/strategy/503.html D docroot/strategy/images D docroot/strategy/w D docroot/test/503.html D docroot/test/images D docroot/test/w D docroot/testwikidata/503.html D docroot/testwikidata/images D docroot/testwikidata/w D docroot/transitionteam/503.html D docroot/transitionteam/images D docroot/transitionteam/w D docroot/ukwikimedia/503.html D docroot/ukwikimedia/images D docroot/ukwikimedia/w D docroot/vote/503.html D docroot/vote/images D docroot/vote/w 105 files changed, 0 insertions(+), 105 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/docroot/advisory/503.html b/docroot/advisory/503.html deleted file mode 12 index 0562d3e..000 --- a/docroot/advisory/503.html +++ /dev/null @@ -1 +0,0 @@ -../../503.html \ No newline at end of file diff --git a/docroot/advisory/images b/docroot/advisory/images deleted file mode 12 index 2a1f364..000 --- a/docroot/advisory/images +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/images \ No newline at end of file diff --git a/docroot/advisory/w b/docroot/advisory/w deleted file mode 12 index 945d99f..000 --- a/docroot/advisory/w +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/live-1.5 \ No newline at end of file diff --git a/docroot/auditcom/503.html b/docroot/auditcom/503.html deleted file mode 12 index 0562d3e..000 --- a/docroot/auditcom/503.html +++ /dev/null @@ -1 +0,0 @@ -../../503.html \ No newline at end of file diff --git a/docroot/auditcom/images b/docroot/auditcom/images deleted file mode 12 index 2a1f364..000 --- a/docroot/auditcom/images +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/images \ No newline at end of file diff --git a/docroot/auditcom/w b/docroot/auditcom/w deleted file mode 12 index 945d99f..000 --- a/docroot/auditcom/w +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/live-1.5 \ No newline at end of file diff --git a/docroot/board/503.html b/docroot/board/503.html deleted file mode 12 index 0562d3e..000 --- a/docroot/board/503.html +++ /dev/null @@ -1 +0,0 @@ -../../503.html \ No newline at end of file diff --git a/docroot/board/images b/docroot/board/images deleted file mode 12 index 2a1f364..000 --- a/docroot/board/images +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/images \ No newline at end of file diff --git a/docroot/board/w b/docroot/board/w deleted file mode 12 index 945d99f..000 --- a/docroot/board/w +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/live-1.5 \ No newline at end of file diff --git a/docroot/boardgovcom/503.html
[MediaWiki-commits] [Gerrit] [FIX] Detect source module and apply it to four functions/me... - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: [FIX] Detect source module and apply it to four
functions/methods
..
[FIX] Detect source module and apply it to four functions/methods
This adds usecases and doesn't rely on __self__ anymore. With Python 3
an unbound method (which is usually used) doesn't has a __self__
attribute because it's handled like a function. So the class now must be
supplied manually and using __self__ is removed, because it's value is
already supplied.
This makes redirect_func also compatible with classmethods by getting
rid of the wrapper class, which replaced the 'self' parameter and the
new method was called like a function.
Change-Id: I9155163bb0d89707dbfa7c393ab63be56e2f616a
---
M pywikibot/__init__.py
M pywikibot/site.py
M pywikibot/tools.py
3 files changed, 34 insertions(+), 29 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index dd3d4f1..63b3294 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
The initialization file for the Pywikibot framework.
#
-# (C) Pywikibot team, 2008-2013
+# (C) Pywikibot team, 2008-2014
#
# Distributed under the terms of the MIT license.
#
@@ -536,7 +536,8 @@
return _sites[key]
-getSite = Site # alias for backwards-compability
+# alias for backwards-compability
+getSite = pywikibot.tools.redirect_func(Site, old_name='getSite')
from .page import (
diff --git a/pywikibot/site.py b/pywikibot/site.py
index de30eda..5611585 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -28,6 +28,7 @@
import pywikibot.family
from pywikibot.tools import (
itergroup, deprecated, deprecate_arg, UnicodeMixin, ComparableMixin,
+redirect_func,
)
from pywikibot.tools import MediaWikiVersion as LV
from pywikibot.throttle import Throttle
@@ -105,10 +106,9 @@
return 'LoginStatus(%s)' % (LoginStatus.name(self.state))
-Family = pywikibot.tools.redirect_func(pywikibot.family.Family.load,
- 'pywikibot.site',
- 'pywikibot.family.Family',
- 'Family')
+Family = redirect_func(pywikibot.family.Family.load,
+ target_module='pywikibot.family.Family',
+ old_name='Family')
class Namespace(Iterable, ComparableMixin, UnicodeMixin):
@@ -549,7 +549,9 @@
for name in self.namespaces()[ns]]:
return ns
-getNamespaceIndex = ns_index # for backwards-compatibility
+# for backwards-compatibility
+getNamespaceIndex = redirect_func(ns_index, old_name='getNamespaceIndex',
+ class_name='BaseSite')
def namespaces(self):
Return dict of valid namespaces on this wiki.
@@ -568,7 +570,10 @@
index = self.ns_index(value)
return self.namespace(index)
-normalizeNamespace = ns_normalize # for backwards-compatibility
+# for backwards-compatibility
+normalizeNamespace = redirect_func(ns_normalize,
+ old_name='normalizeNamespace',
+ class_name='BaseSite')
def redirect(self, default=True):
Return list of localized redirect tags for the site.
@@ -1435,7 +1440,9 @@
else:
self._loginstatus = LoginStatus.NOT_LOGGED_IN # failure
-forceLogin = login # alias for backward-compatibility
+# alias for backward-compatibility
+forceLogin = redirect_func(login, old_name='forceLogin',
+ class_name='APISite')
def logout(self):
Logout of the site and load details for the logged out user.
diff --git a/pywikibot/tools.py b/pywikibot/tools.py
index c11d0d7..22e2203 100644
--- a/pywikibot/tools.py
+++ b/pywikibot/tools.py
@@ -372,7 +372,7 @@
def redirect_func(target, source_module=None, target_module=None,
- old_name=None):
+ old_name=None, class_name=None):
Return a function which can be used to redirect to 'target'.
@@ -392,27 +392,17 @@
@param old_name: The old function name. If None it uses the name of the
new function.
@type old_name: basestring
+@param class_name: The name of the class. It's added to the target and
+source module (separated by a '.').
+@type class_name: basestring
@return: A new function which adds a warning prior to each execution.
@rtype: callable
-class Wrapper(object):
-def __init__(self):
-self._function = target
-self.parameters = {'new': target.__name__,
- 'old': old_name or target.__name__,
- 'target':
[MediaWiki-commits] [Gerrit] mediawiki: add HHVM proxy rules in main.conf - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki: add HHVM proxy rules in main.conf
..
mediawiki: add HHVM proxy rules in main.conf
Change-Id: I169a954ba9ca6767ed0fa50f641d016eff4f8f4e
---
M modules/mediawiki/files/apache/sites/main.conf
1 file changed, 76 insertions(+), 9 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/files/apache/sites/main.conf
b/modules/mediawiki/files/apache/sites/main.conf
index ef3fef3..6dfa51b 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -25,6 +25,13 @@
# Our FAQ
RewriteRule ^/FAQ$ %{ENV:RW_PROTO}://www.mediawiki.org/wiki/Help:FAQ
[R=301,L]
+IfDefine HHVM
+ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/mediawiki/w/index.php
+ProxyPass /w/extensions!
+ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/mediawiki/w/$1
+/IfDefine
+
+
# Primary wiki redirector:
Alias /wiki /srv/mediawiki/docroot/mediawiki/w/index.php
RewriteRule ^/$ /w/index.php
@@ -69,9 +76,6 @@
ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/index.php
ProxyPass /w/extensions!
ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/$1
-RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/index.php[P]
-RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/robots.php [P]
-RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/favicon.php [P]
/IfDefine
# Make robots.txt editable via Mediawiki:robots.txt
@@ -111,6 +115,12 @@
# Make robots.txt editable via Mediawiki:robots.txt
RewriteRule ^/robots.txt$ /w/robots.php [L]
+IfDefine HHVM
+ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/index.php
+ProxyPass /w/extensions!
+ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/$1
+/IfDefine
+
# Primary wiki redirector:
Alias /wiki /srv/mediawiki/docroot/wikidata/w/index.php
Alias /ontology
/srv/mediawiki/docroot/wikidata/w/extensions/Wikibase/docs/ontology.owl
@@ -149,6 +159,13 @@
RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}]
RewriteCond %{ENV:RW_PROTO} !=https
RewriteRule . - [E=RW_PROTO:http]
+
+IfDefine HHVM
+ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary/w/index.php
+ProxyPass /w/extensions!
+ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary/w/$1
+/IfDefine
+
# Make robots.txt editable via Mediawiki:robots.txt
RewriteRule ^/robots.txt$ /w/robots.php [L]
@@ -217,6 +234,14 @@
RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}]
RewriteCond %{ENV:RW_PROTO} !=https
RewriteRule . - [E=RW_PROTO:http]
+
+IfDefine HHVM
+ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote/w/index.php
+ProxyPass /s/
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote/w/index.php
+ProxyPass /w/extensions!
+ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote/w/$1
+/IfDefine
+
# Make robots.txt editable via Mediawiki:robots.txt
RewriteRule ^/robots.txt$ /w/robots.php [L]
@@ -292,6 +317,13 @@
RewriteCond %{ENV:RW_PROTO} !=https
RewriteRule . - [E=RW_PROTO:http]
+IfDefine HHVM
+ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/donate/w/index.php
+ProxyPass /w/extensions!
+ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/donate/w/$1
+/IfDefine
+
+
# Primary wiki redirector:
Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
@@ -327,6 +359,13 @@
DocumentRoot /srv/mediawiki/docroot/wikimedia.org
AllowEncodedSlashes On
RewriteEngine On
+
+IfDefine HHVM
+ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/vote/w/index.php
+ProxyPass /w/extensions!
+ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/vote/w/$1
+/IfDefine
+
# Primary wiki redirector:
Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
@@ -366,9 +405,6 @@
ProxyPassMatch ^/w/(.*\.(php|hh))$
[MediaWiki-commits] [Gerrit] Use single quotes for __version__ $Id$ strings - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Use single quotes for __version__ $Id$ strings .. Use single quotes for __version__ $Id$ strings All but three of the __version__ $Id$ strings use single quotes. This changes those three for consistency. Change-Id: I96a697f8a438207108785fae217c8f66a39d4426 --- M generate_family_file.py M pywikibot/editor.py M scripts/editarticle.py 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/generate_family_file.py b/generate_family_file.py index 5a8f6e5..78e663f 100644 --- a/generate_family_file.py +++ b/generate_family_file.py @@ -12,7 +12,7 @@ # # Distributed under the terms of the MIT license # -__version__ = $Id$ +__version__ = '$Id$' # # system imports diff --git a/pywikibot/editor.py b/pywikibot/editor.py index e795928..0ab7de1 100644 --- a/pywikibot/editor.py +++ b/pywikibot/editor.py @@ -8,7 +8,7 @@ # # Distributed under the terms of the MIT license. # -__version__ = $Id$ +__version__ = '$Id$' # import sys diff --git a/scripts/editarticle.py b/scripts/editarticle.py index 74af631..9e4e16a 100755 --- a/scripts/editarticle.py +++ b/scripts/editarticle.py @@ -15,7 +15,7 @@ # # Distributed under the terms of the MIT license. # -__version__ = $Id$ +__version__ = '$Id$' # import os -- To view, visit https://gerrit.wikimedia.org/r/165460 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I96a697f8a438207108785fae217c8f66a39d4426 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: XZise commodorefabia...@gmx.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [IMPROV] Tokens: Only load all tokens if it can be done in o... - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: [IMPROV] Tokens: Only load all tokens if it can be done in one
request
..
[IMPROV] Tokens: Only load all tokens if it can be done in one request
Change-Id: I48f3424399c82083c7f13481f0d103780113fcb1
---
M pywikibot/site.py
1 file changed, 15 insertions(+), 6 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 82a7299..70356d9 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -1191,7 +1191,15 @@
self.failed_cache = set() # cache unavailable tokens.
def load_tokens(self, types, all=False):
-Preload one or multiple tokens.
+
+Preload one or multiple tokens.
+
+@param types: the types of token.
+@type types: iterable
+@param all: load all available tokens, if None only if it can be done
+in one request.
+@type all: bool
+
assert(self.site.logged_in())
self._tokens.setdefault(self.site.user(), {}).update(
@@ -1201,7 +1209,7 @@
# When all=True types is extended in site.get_tokens().
# Keys not recognised as tokens, are cached so they are not requested
# any longer.
-if all:
+if all is not False:
for key in types:
if key not in self._tokens[self.site.user()]:
self.failed_cache.add((self.site.user(), key))
@@ -1222,7 +1230,7 @@
if (key not in user_tokens and
failed_cache_key not in self.failed_cache):
-self.load_tokens([key], all=not user_tokens)
+self.load_tokens([key], all=False if user_tokens else None)
if key in user_tokens:
return user_tokens[key]
@@ -2403,7 +2411,8 @@
@param types: the types of token (e.g., edit, move, delete);
see API documentation for full list of types
@type types: iterable
-@param all: load all available tokens
+@param all: load all available tokens, if None only if it can be done
+in one request.
@type all: bool
return: a dict with retrieved valid tokens.
@@ -2434,12 +2443,12 @@
else:
if _version LV('1.24wmf19'):
-if all:
+if all is not False:
types.extend(self.TOKENS_1)
req = api.Request(site=self, action='tokens',
type='|'.join(self.validate_tokens(types)))
else:
-if all:
+if all is not False:
types.extend(self.TOKENS_2)
req = api.Request(site=self, action='query', meta='tokens',
--
To view, visit https://gerrit.wikimedia.org/r/161673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48f3424399c82083c7f13481f0d103780113fcb1
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Mpaa mpaa.w...@gmail.com
Gerrit-Reviewer: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki: fixup for proxy changes - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: mediawiki: fixup for proxy changes .. mediawiki: fixup for proxy changes Change-Id: I1179c9d7b28a83fe0f71f840cd7d34c8f7e0 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M modules/mediawiki/files/apache/sites/main.conf 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/modules/mediawiki/files/apache/sites/main.conf b/modules/mediawiki/files/apache/sites/main.conf index 6dfa51b..f0c46ce 100644 --- a/modules/mediawiki/files/apache/sites/main.conf +++ b/modules/mediawiki/files/apache/sites/main.conf @@ -161,9 +161,9 @@ RewriteRule . - [E=RW_PROTO:http] IfDefine HHVM -ProxyPass /wiki fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary/w/index.php +ProxyPass /wiki fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/index.php ProxyPass /w/extensions! -ProxyPassMatch ^/w/(.*\.(php|hh))$ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary/w/$1 +ProxyPassMatch ^/w/(.*\.(php|hh))$ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/$1 /IfDefine @@ -236,10 +236,10 @@ RewriteRule . - [E=RW_PROTO:http] IfDefine HHVM -ProxyPass /wiki fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote/w/index.php -ProxyPass /s/ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote/w/index.php +ProxyPass /wiki fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/index.php +ProxyPass /s/ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/index.php ProxyPass /w/extensions! -ProxyPassMatch ^/w/(.*\.(php|hh))$ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote/w/$1 +ProxyPassMatch ^/w/(.*\.(php|hh))$ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/$1 /IfDefine -- To view, visit https://gerrit.wikimedia.org/r/165463 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1179c9d7b28a83fe0f71f840cd7d34c8f7e0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production 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] mediawiki: fixup for proxy changes - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/165463 Change subject: mediawiki: fixup for proxy changes .. mediawiki: fixup for proxy changes Change-Id: I1179c9d7b28a83fe0f71f840cd7d34c8f7e0 Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org --- M modules/mediawiki/files/apache/sites/main.conf 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/63/165463/1 diff --git a/modules/mediawiki/files/apache/sites/main.conf b/modules/mediawiki/files/apache/sites/main.conf index 6dfa51b..f0c46ce 100644 --- a/modules/mediawiki/files/apache/sites/main.conf +++ b/modules/mediawiki/files/apache/sites/main.conf @@ -161,9 +161,9 @@ RewriteRule . - [E=RW_PROTO:http] IfDefine HHVM -ProxyPass /wiki fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary/w/index.php +ProxyPass /wiki fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/index.php ProxyPass /w/extensions! -ProxyPassMatch ^/w/(.*\.(php|hh))$ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary/w/$1 +ProxyPassMatch ^/w/(.*\.(php|hh))$ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/$1 /IfDefine @@ -236,10 +236,10 @@ RewriteRule . - [E=RW_PROTO:http] IfDefine HHVM -ProxyPass /wiki fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote/w/index.php -ProxyPass /s/ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote/w/index.php +ProxyPass /wiki fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/index.php +ProxyPass /s/ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/index.php ProxyPass /w/extensions! -ProxyPassMatch ^/w/(.*\.(php|hh))$ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote/w/$1 +ProxyPassMatch ^/w/(.*\.(php|hh))$ fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/$1 /IfDefine -- To view, visit https://gerrit.wikimedia.org/r/165463 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1179c9d7b28a83fe0f71f840cd7d34c8f7e0 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] [FIX] Exceptions: Use page attribute in getPage() - change (pywikibot/core)
XZise has uploaded a new change for review. https://gerrit.wikimedia.org/r/165464 Change subject: [FIX] Exceptions: Use page attribute in getPage() .. [FIX] Exceptions: Use page attribute in getPage() Change-Id: Ia3651cf268f8907ed462b41969ac20d5759e5945 --- M pywikibot/exceptions.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/64/165464/1 diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index 7022935..fec58df 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -104,7 +104,7 @@ super(PageRelatedError, self).__init__(self.message % page) def getPage(self): -return self._page +return self.page class PageSaveRelatedError(PageRelatedError): -- To view, visit https://gerrit.wikimedia.org/r/165464 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3651cf268f8907ed462b41969ac20d5759e5945 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Override parent DifferenceEngine#getDiffLang for addHeader use - change (mediawiki...Wikibase)
Ebrahim has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165465
Change subject: Override parent DifferenceEngine#getDiffLang for addHeader use
..
Override parent DifferenceEngine#getDiffLang for addHeader use
UI language is much better than title language for Wikibase so using that
for wikibase diff
Change-Id: I0567dde13fc0c9cbe31a2cc38f1dc76216aca00f
---
M repo/includes/Diff/EntityContentDiffView.php
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/65/165465/1
diff --git a/repo/includes/Diff/EntityContentDiffView.php
b/repo/includes/Diff/EntityContentDiffView.php
index b437bc1..3693811 100644
--- a/repo/includes/Diff/EntityContentDiffView.php
+++ b/repo/includes/Diff/EntityContentDiffView.php
@@ -108,6 +108,15 @@
}
/**
+* Override parent DifferenceEngine
+*
+* @return Language
+*/
+ public function getDiffLang() {
+ return $this-getLanguage()
+ }
+
+ /**
* Get a header for a specified revision.
*
* @param $rev Revision
--
To view, visit https://gerrit.wikimedia.org/r/165465
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0567dde13fc0c9cbe31a2cc38f1dc76216aca00f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ebrahim ebra...@gnu.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Output content/format pair for moderateReason - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Output content/format pair for moderateReason
..
Hygiene: Output content/format pair for moderateReason
When outputting api keys that contain fully user generated content we have
been outputting a content/format pair so api consumers know how to escape
the content. Additionally this is required for a follow patch which uses
moderateReason within a preview context, previews always use the
content/format pair when injecting the new content into the templates.
Change-Id: Ia5fda59f29415e954380f1282ebfcf4cb71a6be0
---
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topic_history.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/compiled/flow_block_topiclist_newtopic.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_topic_titlebar_content.handlebars
M includes/Formatter/RevisionFormatter.php
9 files changed, 22 insertions(+), 17 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlebars/compiled/flow_block_topic.handlebars.php
b/handlebars/compiled/flow_block_topic.handlebars.php
index da98d64..1de070e 100644
--- a/handlebars/compiled/flow_block_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic.handlebars.php
@@ -72,7 +72,7 @@
'.LCRun3::ch($cx, 'l10n',
Array(Array('post_moderation_state',((is_array($in)
isset($in['moderateState'])) ? $in['moderateState'] : null),((is_array($in)
isset($in['replyToId'])) ? $in['replyToId'] :
null),((is_array($in['moderator']) isset($in['moderator']['name'])) ?
$in['moderator']['name'] : null)),Array()), 'encq').'/div
div class=flow-moderated-topic-reason
'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-topic-moderated-reason-prefix'),Array()), 'encq').'
- '.htmlentities(((is_array($in) isset($in['moderateReason']))
? $in['moderateReason'] : null), ENT_QUOTES, 'UTF-8').'
+ '.LCRun3::ch($cx, 'escapeContent',
Array(Array(((is_array($in['moderateReason'])
isset($in['moderateReason']['format'])) ? $in['moderateReason']['format'] :
null),((is_array($in['moderateReason'])
isset($in['moderateReason']['content'])) ? $in['moderateReason']['content'] :
null)),Array()), 'encq').'
/div
' : '').'
span class=flow-reply-countspan class=wikiglyph
wikiglyph-speech-bubble/spanspan
class=flow-reply-count-number'.htmlentities(((is_array($in)
isset($in['reply_count'])) ? $in['reply_count'] : null), ENT_QUOTES,
'UTF-8').'/span/span
diff --git a/handlebars/compiled/flow_block_topic_history.handlebars.php
b/handlebars/compiled/flow_block_topic_history.handlebars.php
index a5df98a..c7c390b 100644
--- a/handlebars/compiled/flow_block_topic_history.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_history.handlebars.php
@@ -25,14 +25,14 @@
ul
'.LCRun3::sec($cx, ((is_array($in)
isset($in['revisions'])) ? $in['revisions'] : null), $in, true, function($cx,
$in) {return '
li
- ('.((LCRun3::ifvar($cx,
((is_array($in['links']) isset($in['links']['diff-cur'])) ?
$in['links']['diff-cur'] : null))) ? 'a
href='.htmlentities(((is_array($in['links']['diff-cur'])
isset($in['links']['diff-cur']['url'])) ? $in['links']['diff-cur']['url'] :
null), ENT_QUOTES, 'UTF-8').'
title='.htmlentities(((is_array($in['links']['diff-cur'])
isset($in['links']['diff-cur']['title'])) ? $in['links']['diff-cur']['title'] :
null), ENT_QUOTES,
'UTF-8').''.htmlentities(((is_array($in['links']['diff-cur'])
isset($in['links']['diff-cur']['title'])) ? $in['links']['diff-cur']['title'] :
null), ENT_QUOTES, 'UTF-8').'/a' : ''.LCRun3::ch($cx, 'l10n',
Array(Array('cur'),Array()), 'encq').'
- ').'
- '.LCRun3::ch($cx, 'l10n',
Array(Array('pipe-separator'),Array()), 'encq').'
- '.((LCRun3::ifvar($cx,
((is_array($in['links']) isset($in['links']['diff-prev'])) ?
$in['links']['diff-prev'] : null))) ? '
- a
href='.htmlentities(((is_array($in['links']['diff-prev'])
isset($in['links']['diff-prev']['url'])) ? $in['links']['diff-prev']['url'] :
null), ENT_QUOTES, 'UTF-8').'
title='.htmlentities(((is_array($in['links']['diff-prev'])
isset($in['links']['diff-prev']['title'])) ? $in['links']['diff-prev']['title']
: null), ENT_QUOTES,
'UTF-8').''.htmlentities(((is_array($in['links']['diff-prev'])
isset($in['links']['diff-prev']['title'])) ?
[MediaWiki-commits] [Gerrit] mediawiki: repool mw1163 for scap, convert to hhvm. - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165466
Change subject: mediawiki: repool mw1163 for scap, convert to hhvm.
..
mediawiki: repool mw1163 for scap, convert to hhvm.
Change-Id: Id0013e4c08e366a16625c192be2cfaca8b750de7
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M hieradata/hosts/mw1163.yaml
M manifests/site.pp
M modules/dsh/files/group/mw-eqiad
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/66/165466/1
diff --git a/hieradata/hosts/mw1163.yaml b/hieradata/hosts/mw1163.yaml
index 2c726b4..e30aca3 100644
--- a/hieradata/hosts/mw1163.yaml
+++ b/hieradata/hosts/mw1163.yaml
@@ -1 +1 @@
-mainrole: appserver
+mainrole: appserver_hhvm
diff --git a/manifests/site.pp b/manifests/site.pp
index c07f036..baa237a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1985,7 +1985,6 @@
node /^mw1(05[4-9]|0[6-9][0-9]|10[0-9]|11[0-3])\.eqiad\.wmnet$/ {
class {'::admin': groups = ['deployment']}
-$cluster = 'appserver'
if $::hostname =~ /^mw105[45]$/ {
$ganglia_aggregator = true
@@ -2036,7 +2035,7 @@
node /^mw11(6[1-9]|7[0-9]|8[0-8])\.eqiad\.wmnet$/ {
class {'::admin': groups = ['deployment']}
-$cluster = 'appserver'
+
if $::hostname == 'mw1161' {
include misc::deployment::scap_proxy
}
diff --git a/modules/dsh/files/group/mw-eqiad b/modules/dsh/files/group/mw-eqiad
index 19b0ed0..be6497c 100644
--- a/modules/dsh/files/group/mw-eqiad
+++ b/modules/dsh/files/group/mw-eqiad
@@ -160,6 +160,7 @@
mw1160
mw1161
mw1162
+mw1163
mw1164
mw1165
mw1166
--
To view, visit https://gerrit.wikimedia.org/r/165466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0013e4c08e366a16625c192be2cfaca8b750de7
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] Extract wmf-beta-scap to sudo-withagent wrapper script - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: Extract wmf-beta-scap to sudo-withagent wrapper script
..
Extract wmf-beta-scap to sudo-withagent wrapper script
Change-Id: Id8541b7b28b33e31aaf60f49d1b76553909cae39
---
A files/misc/scripts/sudo-withagent
M manifests/misc/deployment.pp
M modules/beta/files/wmf-beta-scap
M modules/beta/manifests/scap/master.pp
4 files changed, 43 insertions(+), 26 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/misc/scripts/sudo-withagent
b/files/misc/scripts/sudo-withagent
new file mode 100755
index 000..9e029f8
--- /dev/null
+++ b/files/misc/scripts/sudo-withagent
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+# sudo-withagent USER /path/to/script param1 param2
+#
+# This file is managed by puppet.
+#
+set -e
+
+# User that the script should be run as
+RUN_AS=$1
+
+# Ensure that script is run as the correct user
+[[ $(whoami) = $RUN_AS ]] || exec sudo -H -u $RUN_AS -- $0 $@
+
+# Pop user
+shift
+
+# Ensure that an ssh-agent is running
+if [[ -z $SSH_AUTH_SOCK ]]; then
+echo Starting ssh-agent
+eval $(ssh-agent)
+
+# Add default keys
+ssh-add
+
+# Kill the agent when this script exits
+trap 'trap - EXIT; [[ $SSH_AGENT_PID ]] kill $SSH_AGENT_PID' \
+EXIT SIGHUP SIGINT SIGQUIT SIGPIPE SIGTERM
+fi
+
+# Set a sane terminal type
+export TERM=dumb
+
+# Run script
+$@
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 0e3ac3d..f5a7389 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -124,6 +124,11 @@
group = 'root',
mode= '0444',
source = 'puppet:///files/misc/scripts/man';
+'/usr/local/bin/sudo-withagent':
+owner = 'root',
+group = 'root',
+mode= '0555',
+source = 'puppet:///files/misc/scripts/sudo-withagent';
}
}
diff --git a/modules/beta/files/wmf-beta-scap b/modules/beta/files/wmf-beta-scap
index a0c64bc..a0ed58a 100755
--- a/modules/beta/files/wmf-beta-scap
+++ b/modules/beta/files/wmf-beta-scap
@@ -3,29 +3,4 @@
#
# Run scap on the beta cluster.
#
-set -e
-
-# User that scap should be run as
-RUN_AS=mwdeploy
-
-# Ensure that script is run as the correct user
-[[ $(whoami) = $RUN_AS ]] || exec sudo -H -u $RUN_AS -- $0 $@
-
-# Ensure that an ssh-agent is running
-if [[ -z $SSH_AUTH_SOCK ]]; then
-echo Starting ssh-agent
-eval $(ssh-agent)
-
-# Add default keys
-ssh-add
-
-# Kill the agent when this script exits
-trap 'trap - EXIT; [[ $SSH_AGENT_PID ]] kill $SSH_AGENT_PID' \
-EXIT SIGHUP SIGINT SIGQUIT SIGPIPE SIGTERM
-fi
-
-# Set a sane terminal type
-export TERM=dumb
-
-# Run scap
-/usr/local/bin/scap $@
+/usr/local/bin/sudo-withagent mwdeploy /usr/local/bin/scap $@
diff --git a/modules/beta/manifests/scap/master.pp
b/modules/beta/manifests/scap/master.pp
index fdaa472..32d003d 100644
--- a/modules/beta/manifests/scap/master.pp
+++ b/modules/beta/manifests/scap/master.pp
@@ -45,10 +45,13 @@
}
# Install a scap runner script for commmand line or jenkins use
+# Depends on sudo-withagent from misc::deployment::scap_scripts
file { '/usr/local/bin/wmf-beta-scap':
owner = 'root',
group = 'root',
mode= '0555',
+require = File['/usr/local/bin/sudo-withagent'],
source = 'puppet:///modules/beta/wmf-beta-scap',
}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/160960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8541b7b28b33e31aaf60f49d1b76553909cae39
Gerrit-PatchSet: 10
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] Exceptions: Use page attribute in getPage() - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: [FIX] Exceptions: Use page attribute in getPage() .. [FIX] Exceptions: Use page attribute in getPage() Change-Id: Ia3651cf268f8907ed462b41969ac20d5759e5945 --- M pywikibot/exceptions.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index 7022935..fec58df 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -104,7 +104,7 @@ super(PageRelatedError, self).__init__(self.message % page) def getPage(self): -return self._page +return self.page class PageSaveRelatedError(PageRelatedError): -- To view, visit https://gerrit.wikimedia.org/r/165464 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia3651cf268f8907ed462b41969ac20d5759e5945 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Drop ORMTable::getFieldPrefix - change (mediawiki...SSLClientAuthentication)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165467
Change subject: Drop ORMTable::getFieldPrefix
..
Drop ORMTable::getFieldPrefix
See I46a0d7e.
Change-Id: Ib8d57021fe612e3f23db8e74e39266fbaa295d4f
---
M SSLClientCertificate.php
1 file changed, 4 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SSLClientAuthentication
refs/changes/67/165467/1
diff --git a/SSLClientCertificate.php b/SSLClientCertificate.php
index 0f315fa..3b62e1c 100644
--- a/SSLClientCertificate.php
+++ b/SSLClientCertificate.php
@@ -24,16 +24,16 @@
* @author Tyler Romeo tylerro...@gmail.com
*/
class SSLCertificateTable extends ORMTable {
+ public function __construct() {
+ $this-fieldPrefix = 'ssl_';
+ }
+
function getName() {
return 'sslcerts';
}
function getRowClass() {
return 'SSLCertificate';
- }
-
- function getFieldPrefix() {
- return 'ssl_';
}
function getFields() {
--
To view, visit https://gerrit.wikimedia.org/r/165467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8d57021fe612e3f23db8e74e39266fbaa295d4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SSLClientAuthentication
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cache.py: forgotten cache_dirs renamed to cache_path - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: cache.py: forgotten cache_dirs renamed to cache_path
..
cache.py: forgotten cache_dirs renamed to cache_path
Not all variables were renamed.
Change-Id: I007a74904e07fccd35ae85d6585bde051a5acb5a
---
M scripts/maintenance/cache.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/maintenance/cache.py b/scripts/maintenance/cache.py
index 27c1671..603d50f 100644
--- a/scripts/maintenance/cache.py
+++ b/scripts/maintenance/cache.py
@@ -319,12 +319,12 @@
# Also process the base directory, if it isnt the current directory
if os.path.abspath(os.getcwd()) != pywikibot.config2.base_dir:
-cache_dirs += [
+cache_paths += [
os.path.join(pywikibot.config2.base_dir, 'apicache')]
# Also process the user home cache, if it isnt the config directory
if os.path.expanduser('~/.pywikibot') != pywikibot.config2.base_dir:
-cache_dirs += [
+cache_paths += [
os.path.join(os.path.expanduser('~/.pywikibot'), 'apicache')]
if delete:
--
To view, visit https://gerrit.wikimedia.org/r/165357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I007a74904e07fccd35ae85d6585bde051a5acb5a
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa mpaa.w...@gmail.com
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Mpaa mpaa.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Install new plugin and upgrade another - change (operations...plugins)
Manybubbles has submitted this change and it was merged. Change subject: Install new plugin and upgrade another .. Install new plugin and upgrade another Upgrades the experimental highlighter plugin to get a fix for regex highlighting and adds the wikimedia-extra plugin for trigram accelerate regular expressions. Change-Id: I8c32a2bc8875409428aac7f0de0b0fb711dd59fe --- D experimental-highlighter-elasticsearch-plugin/experimental-highlighter-core-0.0.11.jar A experimental-highlighter-elasticsearch-plugin/experimental-highlighter-core-0.0.12.jar D experimental-highlighter-elasticsearch-plugin/experimental-highlighter-elasticsearch-plugin-0.0.11.jar A experimental-highlighter-elasticsearch-plugin/experimental-highlighter-elasticsearch-plugin-0.0.12.jar D experimental-highlighter-elasticsearch-plugin/experimental-highlighter-lucene-0.0.11.jar A experimental-highlighter-elasticsearch-plugin/experimental-highlighter-lucene-0.0.12.jar A extra/extra-0.0.1.jar 7 files changed, 4 insertions(+), 3 deletions(-) Approvals: Manybubbles: Verified; Looks good to me, approved diff --git a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-core-0.0.11.jar b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-core-0.0.11.jar deleted file mode 100644 index baf70ec..000 --- a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-core-0.0.11.jar +++ /dev/null @@ -1 +0,0 @@ -#$# git-fat fe0b689242a160da3031590e834178d6a0e9366b 127442 diff --git a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-core-0.0.12.jar b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-core-0.0.12.jar new file mode 100644 index 000..17f5241 --- /dev/null +++ b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-core-0.0.12.jar @@ -0,0 +1 @@ +#$# git-fat df1ed2e982e74b366d0828fb9ee4dc5220bb71bb 127442 diff --git a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-elasticsearch-plugin-0.0.11.jar b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-elasticsearch-plugin-0.0.11.jar deleted file mode 100644 index b88013b..000 --- a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-elasticsearch-plugin-0.0.11.jar +++ /dev/null @@ -1 +0,0 @@ -#$# git-fat 56dc1635d748388df32619905862964cb89e200b38844 diff --git a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-elasticsearch-plugin-0.0.12.jar b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-elasticsearch-plugin-0.0.12.jar new file mode 100644 index 000..f9b8c76 --- /dev/null +++ b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-elasticsearch-plugin-0.0.12.jar @@ -0,0 +1 @@ +#$# git-fat f82e8a3b0f3f92636929c0dd3e1ba81220f0c4b439009 diff --git a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-lucene-0.0.11.jar b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-lucene-0.0.11.jar deleted file mode 100644 index 3a4fc16..000 --- a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-lucene-0.0.11.jar +++ /dev/null @@ -1 +0,0 @@ -#$# git-fat c513360faa187a200a7f372ab2c8d597c0e995ab44337 diff --git a/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-lucene-0.0.12.jar b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-lucene-0.0.12.jar new file mode 100644 index 000..f7bd54c --- /dev/null +++ b/experimental-highlighter-elasticsearch-plugin/experimental-highlighter-lucene-0.0.12.jar @@ -0,0 +1 @@ +#$# git-fat 6532f6a837616a2703069819238881135d4d24ec44206 diff --git a/extra/extra-0.0.1.jar b/extra/extra-0.0.1.jar new file mode 100644 index 000..8bf810c --- /dev/null +++ b/extra/extra-0.0.1.jar @@ -0,0 +1 @@ +#$# git-fat f00df056a051a273507c0e000bc6f26ddad19f0841718 -- To view, visit https://gerrit.wikimedia.org/r/164633 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8c32a2bc8875409428aac7f0de0b0fb711dd59fe Gerrit-PatchSet: 3 Gerrit-Project: operations/software/elasticsearch/plugins Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make Wikidata jobs use the templates - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Make Wikidata jobs use the templates
..
Make Wikidata jobs use the templates
Change-Id: Id553b987d0adac41fa6be57bea5e14feafe6c651
---
M browsertests.yaml
M job-templates-browsertests.yaml
M macro.yaml
3 files changed, 30 insertions(+), 49 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/browsertests.yaml b/browsertests.yaml
index 1248e45..e3139ed 100644
--- a/browsertests.yaml
+++ b/browsertests.yaml
@@ -29,6 +29,9 @@
- VisualEditor: emails-VisualEditor
cmcma...@wikimedia.org jforres...@wikimedia.org
qa-ale...@lists.wikimedia.org
+ - Wikidata: emails-Wikidata-qa
+adrian.l...@wikimedia.de qa-ale...@lists.wikimedia.org
tobias.gritschac...@wikimedia.de
+
# CirrusSearch
- project:
name: CirrusSearch
@@ -510,56 +513,22 @@
mediawiki_user: LanguageScreenshotBot
# Wikidata
-- job:
-name: browsertests-Wikidata-wikidata.beta.wmflabs.org-linux-firefox-sauce
-node: contintLabsSlave UbuntuPrecise
+- project:
+name: WikidataTests
+defaults: browsertests
+browser: firefox
+folder: tests
+headless: 'false'
+mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
+mediawiki_url: wikidata.beta.wmflabs.org
+mediawiki_user: WikidataTester
+platform: linux
+recipients: *emails-Wikidata-qa
+repository: WikidataBrowserTests.git
+repository_host: github.com/wmde
-scm:
-- git:
-url: 'https://github.com/wmde/WikidataBrowserTests.git'
-branches:
- - 'master'
-skip-tag: true
-
-wrappers:
- - ansicolor
- - timestamps
-
-triggers:
- - timed: 'H 14 * * *'
-
-builders:
- - shell: |
- # Shared cache of gems to avoid hitting rubygems all the time
- # See https://github.com/bundler/bundler/issues/2856
- export GEM_HOME=$WORKSPACE/../gems
-
- # install ruby dependencies
- mkdir -p vendor
- gem1.9.3 install --env-shebang -i vendor bundler --no-ri --no-rdoc
- # Prepare some paths lookup
- export GEM_PATH=`pwd`/vendor
-
- cd tests/browser
- $WORKSPACE/vendor/bin/bundle install --verbose
-
- cp config/config_ci.yml config/config.yml
-
- export WB_REPO_USERNAME=WikidataTester
-
- export BROWSER=firefox
- export VERSION=25
- export PLATFORM=Linux
- export BROWSER_TIMEOUT=30
- $WORKSPACE/vendor/bin/bundle exec cucumber \
---backtrace \
---color \
---verbose \
---format pretty \
---format Cucumber::Formatter::Sauce \
---out $WORKSPACE/log/junit \
---tags @wikidata.beta.wmflabs.org \
---tags ~@skip
+jobs:
+ -
'browsertests-Wikidata-{name}-{mediawiki_url}-{platform}-{browser}-sauce'
# WikiLove
- project:
diff --git a/job-templates-browsertests.yaml b/job-templates-browsertests.yaml
index 5c7d54b..2da78b1 100644
--- a/job-templates-browsertests.yaml
+++ b/job-templates-browsertests.yaml
@@ -67,6 +67,13 @@
values:
- lang_list
+- job-template:
+name:
'browsertests-Wikidata-{name}-{mediawiki_url}-{platform}-{browser}-sauce'
+defaults: browsertests
+
+triggers:
+ - timed: H 14 * * *
+
- defaults:
name: browsertests
node: contintLabsSlave UbuntuPrecise
diff --git a/macro.yaml b/macro.yaml
index 86c7ce6..dbbd7eb 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -716,6 +716,11 @@
phantomjs --version
fi
+ # provide config.yml
+ if [ -e $WORKSPACE/tests/browser/config/config_ci.yml ] [ ! -e
$WORKSPACE/tests/browser/config/config.yml ]; then
+ cp $WORKSPACE/tests/browser/config/config_ci.yml
$WORKSPACE/tests/browser/config/config.yml
+ fi
+
# run tests
$WORKSPACE/vendor/bin/bundle exec cucumber \
--backtrace \
--
To view, visit https://gerrit.wikimedia.org/r/165177
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id553b987d0adac41fa6be57bea5e14feafe6c651
Gerrit-PatchSet: 9
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Sucheta to AUTHORS.txt - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Add Sucheta to AUTHORS.txt .. Add Sucheta to AUTHORS.txt Change-Id: Id2f7647e7cdb770b7ba5615a63a0c868331f697b --- M AUTHORS.txt 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: SuchetaG: Looks good to me, approved jenkins-bot: Verified diff --git a/AUTHORS.txt b/AUTHORS.txt index db035ac..cda76c8 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -7,6 +7,7 @@ Moriel Schottlender mschottlen...@wikimedia.org Roan Kattouw r...@wikimedia.org Rob Moen rm...@wikimedia.org +Sucheta Ghoshal sghos...@wikimedia.org Timo Tijhof t...@wikimedia.org Trevor Parscal tre...@wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/165446 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id2f7647e7cdb770b7ba5615a63a0c868331f697b Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope roan.katt...@gmail.com Gerrit-Reviewer: SuchetaG sucheta.ghos...@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] Credits: Move Bartosz up from patch contributors to developers - change (mediawiki/core)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/165468 Change subject: Credits: Move Bartosz up from patch contributors to developers .. Credits: Move Bartosz up from patch contributors to developers Change-Id: I159325fa03a2c31d56ac14f06c09861aa488df84 --- M CREDITS 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/68/165468/1 diff --git a/CREDITS b/CREDITS index dbd5a61..e70a035 100644 --- a/CREDITS +++ b/CREDITS @@ -15,6 +15,7 @@ * Antoine Musso * Arthur Richards * Aryeh Gregor +* Bartosz Dziewoński * Bertrand Grondin * Brad Jorsch * Brian Wolff @@ -104,7 +105,6 @@ * Asier Lostalé * Azliq7 * Bagariavivek -* Bartosz Dziewoński * Beau * Benny Situ * Bergi -- To view, visit https://gerrit.wikimedia.org/r/165468 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I159325fa03a2c31d56ac14f06c09861aa488df84 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Alex Monk kren...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] changed default from user to project focus in BurndownList view - change (phabricator...Sprint)
Christopher Johnson (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165469
Change subject: changed default from user to project focus in BurndownList view
..
changed default from user to project focus in BurndownList view
Change-Id: I6ba54f991aef63ea567c5a4b5f1210d1143a6b6a
---
M src/BurndownListController.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint
refs/changes/69/165469/1
diff --git a/src/BurndownListController.php b/src/BurndownListController.php
index e673e9e..e5cfb43 100644
--- a/src/BurndownListController.php
+++ b/src/BurndownListController.php
@@ -22,7 +22,7 @@
$nav-addLabel(pht('Burndown'));
$nav-addFilter('burn', pht('Burndown Rate'));
-$this-view = $nav-selectFilter($this-view, 'user');
+$this-view = $nav-selectFilter($this-view, 'project');
// Load all projects with Sprint in the name.
--
To view, visit https://gerrit.wikimedia.org/r/165469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ba54f991aef63ea567c5a4b5f1210d1143a6b6a
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
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] Fix varname type in test - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165470
Change subject: Fix varname type in test
..
Fix varname type in test
Change-Id: I3cf623a8348a328479d9956408ea64e059262f8d
---
M tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/70/165470/1
diff --git a/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
b/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
index 35f67c4..e95fa58 100644
--- a/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
+++ b/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
@@ -149,7 +149,7 @@
/**
* @dataProvider permissionsProvider
*/
- public function testPermissions( User $user, $permisisonAction,
$actions ) {
+ public function testPermissions( User $user, $permissionAction,
$actions ) {
$permissions = new RevisionActionPermissions( $this-actions,
$user );
// we'll have to process this in 2 steps: first do all of the
actions,
@@ -174,8 +174,8 @@
$revision = array_shift( $revisions );
$this-assertEquals(
$expected,
- $permissions-isAllowed( $revision,
$permisisonAction ),
- 'User ' . $user-getName() . ' should ' . (
$expected ? '' : 'not ' ) . 'be allowed action ' . $permisisonAction . ' on
revision ' . key( $action ) . ' : ' . $debug . ' : ' . json_encode(
$revision::toStorageRow( $revision ) )
+ $permissions-isAllowed( $revision,
$permissionAction ),
+ 'User ' . $user-getName() . ' should ' . (
$expected ? '' : 'not ' ) . 'be allowed action ' . $permissionAction . ' on
revision ' . key( $action ) . ' : ' . $debug . ' : ' . json_encode(
$revision::toStorageRow( $revision ) )
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/165470
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3cf623a8348a328479d9956408ea64e059262f8d
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] Fix varname type in test - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix varname type in test
..
Fix varname type in test
Change-Id: I3cf623a8348a328479d9956408ea64e059262f8d
---
M tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
b/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
index 35f67c4..e95fa58 100644
--- a/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
+++ b/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
@@ -149,7 +149,7 @@
/**
* @dataProvider permissionsProvider
*/
- public function testPermissions( User $user, $permisisonAction,
$actions ) {
+ public function testPermissions( User $user, $permissionAction,
$actions ) {
$permissions = new RevisionActionPermissions( $this-actions,
$user );
// we'll have to process this in 2 steps: first do all of the
actions,
@@ -174,8 +174,8 @@
$revision = array_shift( $revisions );
$this-assertEquals(
$expected,
- $permissions-isAllowed( $revision,
$permisisonAction ),
- 'User ' . $user-getName() . ' should ' . (
$expected ? '' : 'not ' ) . 'be allowed action ' . $permisisonAction . ' on
revision ' . key( $action ) . ' : ' . $debug . ' : ' . json_encode(
$revision::toStorageRow( $revision ) )
+ $permissions-isAllowed( $revision,
$permissionAction ),
+ 'User ' . $user-getName() . ' should ' . (
$expected ? '' : 'not ' ) . 'be allowed action ' . $permissionAction . ' on
revision ' . key( $action ) . ' : ' . $debug . ' : ' . json_encode(
$revision::toStorageRow( $revision ) )
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/165470
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3cf623a8348a328479d9956408ea64e059262f8d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New-topic recentchanges must use the board title - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: New-topic recentchanges must use the board title .. New-topic recentchanges must use the board title Currently watchlisting a board does not give you entries for new topics on that board, they are being inserted against the topic. The patch adds a new option, 'rc_title', that allows the action configuration to toggle between using the owner or article title as the recent change source. Change-Id: Id60c6d7b05650ac12567626083814bf6526575c1 --- M FlowActions.php M autoload.php M container.php M includes/Data/RecentChanges/HeaderRecentChanges.php M includes/Data/RecentChanges/PostRevisionRecentChanges.php M includes/Data/RecentChanges/PostSummaryRecentChanges.php A includes/Data/RecentChanges/RecentChangeFactory.php M includes/Data/RecentChanges/RecentChanges.php A tests/phpunit/Data/RecentChanges/RecentChangesTest.php 9 files changed, 158 insertions(+), 10 deletions(-) Approvals: Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/FlowActions.php b/FlowActions.php index 012009d..8b7a45a 100644 --- a/FlowActions.php +++ b/FlowActions.php @@ -29,6 +29,11 @@ * * bundle: array with, again, all of the above information if multiple types * should be bundled (then the bundle i18n class will be used to generate * the list-item; clicking on it will reveal the individual history entries) + * * watch: Used by the WatchTopicListener to auto-subscribe users to topics. Only + * value value currently is immediate. + * * immediate: watchlist the title in the current process + * * rc_title: Either 'article' or 'owner' to select between Workflow::getArticleTitle + * or Workflow::getOwnerTitle being used as the related recentchanges entry on insert */ $wgFlowActions = array( 'create-header' = array( @@ -150,6 +155,7 @@ 'performs-writes' = true, 'log_type' = false, 'rc_insert' = true, + 'rc_title' = 'owner', 'permissions' = array( PostRevision::MODERATED_NONE = '', ), diff --git a/autoload.php b/autoload.php index 35a6e09..836b397 100644 --- a/autoload.php +++ b/autoload.php @@ -97,6 +97,7 @@ $wgAutoloadClasses['Flow\\Data\\RecentChanges\\HeaderRecentChanges'] = __DIR__ . '/includes/Data/RecentChanges/HeaderRecentChanges.php'; $wgAutoloadClasses['Flow\\Data\\RecentChanges\\PostRevisionRecentChanges'] = __DIR__ . '/includes/Data/RecentChanges/PostRevisionRecentChanges.php'; $wgAutoloadClasses['Flow\\Data\\RecentChanges\\PostSummaryRecentChanges'] = __DIR__ . '/includes/Data/RecentChanges/PostSummaryRecentChanges.php'; +$wgAutoloadClasses['Flow\\Data\\RecentChanges\\RecentChangeFactory'] = __DIR__ . '/includes/Data/RecentChanges/RecentChangeFactory.php'; $wgAutoloadClasses['Flow\\Data\\RecentChanges\\RecentChanges'] = __DIR__ . '/includes/Data/RecentChanges/RecentChanges.php'; $wgAutoloadClasses['Flow\\Data\\Storage\\BasicDbStorage'] = __DIR__ . '/includes/Data/Storage/BasicDbStorage.php'; $wgAutoloadClasses['Flow\\Data\\Storage\\BoardHistoryStorage'] = __DIR__ . '/includes/Data/Storage/BoardHistoryStorage.php'; @@ -227,9 +228,13 @@ $wgAutoloadClasses['Flow\\Tests\\Data\\FlowNothingTest'] = __DIR__ . '/tests/phpunit/Data/NothingTest.php'; $wgAutoloadClasses['Flow\\Tests\\Data\\IndexTest'] = __DIR__ . '/tests/phpunit/Data/IndexTest.php'; $wgAutoloadClasses['Flow\\Tests\\Data\\ObjectLocatorTest'] = __DIR__ . '/tests/phpunit/Data/ObjectLocatorTest.php'; +$wgAutoloadClasses['Flow\\Tests\\Data\\Pager\\PagerTest'] = __DIR__ . '/tests/phpunit/Data/Pager/PagerTest.php'; +$wgAutoloadClasses['Flow\\Tests\\Data\\RecentChanges\\RecentChangesMock'] = __DIR__ . '/tests/phpunit/Data/RecentChanges/RecentChangesTest.php'; +$wgAutoloadClasses['Flow\\Tests\\Data\\RecentChanges\\RecentChangesTest'] = __DIR__ . '/tests/phpunit/Data/RecentChanges/RecentChangesTest.php'; $wgAutoloadClasses['Flow\\Tests\\Data\\RevisionStorageTest'] = __DIR__ . '/tests/phpunit/Data/RevisionStorageTest.php'; $wgAutoloadClasses['Flow\\Tests\\Data\\UserNameBatchTest'] = __DIR__ . '/tests/phpunit/Data/UserNameBatchTest.php'; $wgAutoloadClasses['Flow\\Tests\\Data\\UserNameListenerTest'] = __DIR__ . '/tests/phpunit/Data/UserNameListenerTest.php'; +$wgAutoloadClasses['Flow\\Tests\\FlowActionsTest'] = __DIR__ . '/tests/phpunit/FlowActionsTest.php'; $wgAutoloadClasses['Flow\\Tests\\FlowTestCase'] = __DIR__ . '/tests/phpunit/FlowTestCase.php'; $wgAutoloadClasses['Flow\\Tests\\Formatter\\FormatterTest'] = __DIR__ . '/tests/phpunit/Formatter/FormatterTest.php'; $wgAutoloadClasses['Flow\\Tests\\HookTest'] = __DIR__ . '/tests/phpunit/HookTest.php'; diff --git a/container.php b/container.php index 861ae2c..23050fa 100644 --- a/container.php +++ b/container.php @@ -237,6 +237,7 @@ new
[MediaWiki-commits] [Gerrit] Added initial Debian packaging - change (operations...apertium-en-es)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165471
Change subject: Added initial Debian packaging
..
Added initial Debian packaging
Change-Id: Ifc99fa9050701e21c72541bac4a0a1a5c2d8509b
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 115 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-en-es
refs/changes/71/165471/1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..eef9393
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,30 @@
+apertium-en-es (0.8.0+svn~57502-1) trusty; urgency=low
+
+ [ Tino Didriksen ]
+ * New upstream release based on SVN snapshot.
+
+ [ Kartik Mistry ]
+ * debian/control:
++ Added myself as uploaders.
++ Updated Standards-Version to 3.9.6
+ * Added debian/watch file.
+
+ -- Kartik Mistry kar...@debian.org Wed, 08 Oct 2014 10:00:15 +0530
+
+apertium-en-es (0.6.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Rebuild against apertium 3.1 fix build-depends and configure.ac
+accordingly. Rebuild ./configure to avoid relying on autoconf at
+build-time. Fix FTBFS. Thanks to Thomas Viehmann for the patch.
+(Closes: #527792)
+ * debian/rules: clean up more properly upon clean
+
+ -- Stefano Zacchiroli z...@debian.org Tue, 08 Sep 2009 21:44:37 +0200
+
+apertium-en-es (0.6.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #471720)
+
+ -- Francis Tyers fty...@prompsit.com Wed, 19 Mar 2008 19:53:51 +
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..6a37b83
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,27 @@
+Source: apertium-en-es
+Section: science
+Priority: optional
+Maintainer: Debian Science Team
debian-science-maintain...@lists.alioth.debian.org
+Uploaders: Tino Didriksen m...@tinodidriksen.com,
+ Kartik Mistry kar...@debian.org
+Build-Depends: apertium (= 3.3),
+ autotools-dev,
+ debhelper (= 8.0),
+ dh-autoreconf,
+ gawk,
+ libapertium3-3.3-dev,
+ locales,
+ pkg-config (= 0.21)
+Standards-Version: 3.9.6
+Homepage: http://apertium.org/
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-en-es.git
+Vcs-Browser:
https://anonscm.debian.org/cgit/debian-science/packages/apertium-en-es.git
+
+Package: apertium-en-es
+Architecture: all
+Depends: apertium (= 3.3), ${misc:Depends}, ${shlibs:Depends}
+Provides: apertium-es-en
+Conflicts: apertium-es-en
+Description: Apertium translation data for the English-Spanish pair
+ Data package providing Apertium language resources for translating
+ between the English and Spanish languages.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..8f6f23c
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,22 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://apertium.org/
+
+Files: *
+Copyright: 2014, Apertium Project Management Committee
apertium-...@dlsi.ua.es
+ See AUTHORS for more copyrights.
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see http://www.gnu.org/licenses/.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in /usr/share/common-licenses/GPL-3.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 000..6f83607
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..11004df
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and
[MediaWiki-commits] [Gerrit] remove Tampa network gear from netmon - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: remove Tampa network gear from netmon .. remove Tampa network gear from netmon Change-Id: Ie4151561811e6cdb3f8f316102a7f8429721efb8 --- M manifests/site.pp 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index c07f036..d94cc93 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2136,10 +2136,8 @@ 'cr1-ulsfo.wikimedia.org', 'cr2-eqiad.wikimedia.org', 'cr2-knams.wikimedia.org', -'cr2-pmtpa.wikimedia.org', 'cr2-ulsfo.wikimedia.org', 'cr2-codfw.wikimedia.org', -'mr1-pmtpa.mgmt.pmtpa.wmnet', 'pfw1-eqiad.wikimedia.org', ] @@ -2149,20 +2147,16 @@ 'asw-b-eqiad.mgmt.eqiad.wmnet', 'asw-c-eqiad.mgmt.eqiad.wmnet', 'asw-d-eqiad.mgmt.eqiad.wmnet', -'asw-d-pmtpa.mgmt.pmtpa.wmnet', 'asw-a-codfw.mgmt.codfw.wmnet', 'asw-b-codfw.mgmt.codfw.wmnet', 'asw-c-codfw.mgmt.codfw.wmnet', 'asw-d-codfw.mgmt.codfw.wmnet', 'csw2-esams.wikimedia.org', 'msw1-eqiad.mgmt.eqiad.wmnet', -'msw2-pmtpa.mgmt.pmtpa.wmnet', 'psw1-eqiad.mgmt.eqiad.wmnet', ] $storagehosts = [ -'nas1-a.pmtpa.wmnet', -'nas1-b.pmtpa.wmnet', 'nas1001-a.eqiad.wmnet', 'nas1001-b.eqiad.wmnet', ] -- To view, visit https://gerrit.wikimedia.org/r/165418 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie4151561811e6cdb3f8f316102a7f8429721efb8 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Alexandros Kosiaris akosia...@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] I103: Duplicated topics are returned - change (mediawiki...Flow)
Matthias Mullie has submitted this change and it was merged.
Change subject: I103: Duplicated topics are returned
..
I103: Duplicated topics are returned
Duplicated topics were being returned when a second query was run but the
index did not properly slice the results due to looking for the offset-key
options instead of offset-id. I don't think it was ever intended for this
to be two options so all offset-key usages were replaced with offset-id
and a test was written to verify it slices in the appropriate place.
Change-Id: I2f8d69730b8a88e6270b7408922d4775accf7039
---
M autoload.php
M includes/Data/Index/FeatureIndex.php
M includes/Data/Pager/Pager.php
A tests/phpunit/Data/Index/FeatureIndexTest.php
4 files changed, 81 insertions(+), 9 deletions(-)
Approvals:
Matthias Mullie: Verified; Looks good to me, approved
diff --git a/autoload.php b/autoload.php
index 836b397..c57e24c 100644
--- a/autoload.php
+++ b/autoload.php
@@ -227,6 +227,8 @@
$wgAutoloadClasses['Flow\\Tests\\Data\\CachingObjectManagerTest'] = __DIR__ .
'/tests/phpunit/Data/CachingObjectMapperTest.php';
$wgAutoloadClasses['Flow\\Tests\\Data\\FlowNothingTest'] = __DIR__ .
'/tests/phpunit/Data/NothingTest.php';
$wgAutoloadClasses['Flow\\Tests\\Data\\IndexTest'] = __DIR__ .
'/tests/phpunit/Data/IndexTest.php';
+$wgAutoloadClasses['Flow\\Tests\\Data\\Index\\MockFeatureIndex'] = __DIR__ .
'/tests/phpunit/Data/Index/FeatureIndexTest.php';
+$wgAutoloadClasses['Flow\\Tests\\Data\\Index\\UniqueFeatureIndexTests'] =
__DIR__ . '/tests/phpunit/Data/Index/FeatureIndexTest.php';
$wgAutoloadClasses['Flow\\Tests\\Data\\ObjectLocatorTest'] = __DIR__ .
'/tests/phpunit/Data/ObjectLocatorTest.php';
$wgAutoloadClasses['Flow\\Tests\\Data\\Pager\\PagerTest'] = __DIR__ .
'/tests/phpunit/Data/Pager/PagerTest.php';
$wgAutoloadClasses['Flow\\Tests\\Data\\RecentChanges\\RecentChangesMock'] =
__DIR__ . '/tests/phpunit/Data/RecentChanges/RecentChangesTest.php';
@@ -234,7 +236,6 @@
$wgAutoloadClasses['Flow\\Tests\\Data\\RevisionStorageTest'] = __DIR__ .
'/tests/phpunit/Data/RevisionStorageTest.php';
$wgAutoloadClasses['Flow\\Tests\\Data\\UserNameBatchTest'] = __DIR__ .
'/tests/phpunit/Data/UserNameBatchTest.php';
$wgAutoloadClasses['Flow\\Tests\\Data\\UserNameListenerTest'] = __DIR__ .
'/tests/phpunit/Data/UserNameListenerTest.php';
-$wgAutoloadClasses['Flow\\Tests\\FlowActionsTest'] = __DIR__ .
'/tests/phpunit/FlowActionsTest.php';
$wgAutoloadClasses['Flow\\Tests\\FlowTestCase'] = __DIR__ .
'/tests/phpunit/FlowTestCase.php';
$wgAutoloadClasses['Flow\\Tests\\Formatter\\FormatterTest'] = __DIR__ .
'/tests/phpunit/Formatter/FormatterTest.php';
$wgAutoloadClasses['Flow\\Tests\\HookTest'] = __DIR__ .
'/tests/phpunit/HookTest.php';
diff --git a/includes/Data/Index/FeatureIndex.php
b/includes/Data/Index/FeatureIndex.php
index 15b1d53..14ab5f0 100644
--- a/includes/Data/Index/FeatureIndex.php
+++ b/includes/Data/Index/FeatureIndex.php
@@ -85,6 +85,14 @@
}
/**
+* @return string
+*/
+ public function getOrder() {
+ $order = isset( $this-options['order'] ) ?
$this-options['order'] : 'DESC';
+ return strtoupper( $order );
+ }
+
+ /**
* @param array $rows
* @param array $options
* @return array [offset, limit]
@@ -92,14 +100,14 @@
protected function getOffsetLimit( $rows, $options ) {
$limit = isset( $options['limit'] ) ? $options['limit'] :
$this-getLimit();
- if ( !isset( $options['offset-key'] ) ) {
+ if ( !isset( $options['offset-id'] ) ) {
$offset = isset( $options['offset'] ) ?
$options['offset'] : 0;
return array( $offset, $limit );
}
- $offsetKey = $options['offset-key'];
- if ( $offsetKey instanceof UUID ) {
- $offsetKey = $offsetKey-getAlphadecimal();
+ $offsetId = $options['offset-id'];
+ if ( $offsetId instanceof UUID ) {
+ $offsetId = $offsetId-getAlphadecimal();
}
$dir = 'fwd';
@@ -110,7 +118,7 @@
$dir = 'rev';
}
- $offset = $this-getOffsetFromKey( $rows, $offsetKey );
+ $offset = $this-getOffsetFromKey( $rows, $offsetId );
if ( $dir === 'fwd' ) {
$startPos = $offset + 1;
@@ -143,8 +151,10 @@
protected function getOffsetFromKey( $rows, $offsetKey ) {
$rowIndex = 0;
foreach ( $rows as $row ) {
+ $nextInOrder = $this-getOrder() === 'DESC' ? -1 : 1;
+
$comparisonValue = $this-compareRowToOffset( $row,
$offsetKey );
- if ( $comparisonValue = 0 ) {
+ if ( $comparisonValue ===
[MediaWiki-commits] [Gerrit] Added initial Debian packaging - change (operations...apertium-es-pt)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165473
Change subject: Added initial Debian packaging
..
Added initial Debian packaging
Change-Id: I46b11d60e493765060b31533666c8ce85ea4ba4c
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 121 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-es-pt
refs/changes/73/165473/1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..e44db28
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,36 @@
+apertium-es-pt (1.1.5+svn~57507-1) trusty; urgency=low
+
+ [ Tino Didriksen ]
+ * New upstream release based on SVN snapshot.
+
+ [ Kartik Mistry ]
+ * Added debian/watch file.
+
+ -- Kartik Mistry kar...@debian.org Wed, 08 Oct 2014 18:14:06 +0530
+
+apertium-es-pt (1.0.3-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Rebuild against apertium 3.1: fix build dependency and configure.ac
+accordingly; re-run autoconf. (Closes: #527789)
+
+ -- Stefano Zacchiroli z...@debian.org Tue, 15 Sep 2009 16:22:51 +0200
+
+apertium-es-pt (1.0.3-2) unstable; urgency=low
+
+ * Fixed Build-Depends (Closes: #446594)
+
+ -- Francis Tyers fty...@prompsit.com Mon, 22 Oct 2007 16:27:44 +0100
+
+apertium-es-pt (1.0.3-1) unstable; urgency=low
+
+ * Depends on apertium 3.0, build system now autoconf
+
+ -- Francis Tyers fty...@prompsit.com Mon, 08 Oct 2007 08:30:42 +0100
+
+apertium-es-pt (0.9-1) unstable; urgency=low
+
+ * Initial release (Closes: #388151)
+
+ -- Francis Tyers f.ty...@uea.ac.uk Mon, 18 Sep 2006 21:42:00 +0100
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..ba8dbdd
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,27 @@
+Source: apertium-es-pt
+Section: science
+Priority: optional
+Maintainer: Debian Science Team
debian-science-maintain...@lists.alioth.debian.org
+Uploaders: Tino Didriksen m...@tinodidriksen.com,
+ Kartik Mistry kar...@debian.org
+Build-Depends: apertium (= 3.3),
+ autotools-dev,
+ debhelper (= 8.0),
+ dh-autoreconf,
+ gawk,
+ libapertium3-3.3-dev,
+ locales,
+ pkg-config (= 0.21)
+Standards-Version: 3.9.6
+Homepage: http://apertium.org/
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-es-pt.git
+Vcs-Browser:
https://anonscm.debian.org/cgit/debian-science/packages/apertium-es-pt.git
+
+Package: apertium-es-pt
+Architecture: all
+Depends: apertium (= 3.3), ${misc:Depends}, ${shlibs:Depends}
+Provides: apertium-pt-es
+Conflicts: apertium-pt-es
+Description: Apertium translation data for the Spanish-Portuguese pair
+ Data package providing Apertium language resources for translating
+ between the Spanish and Portuguese languages.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..8f6f23c
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,22 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://apertium.org/
+
+Files: *
+Copyright: 2014, Apertium Project Management Committee
apertium-...@dlsi.ua.es
+ See AUTHORS for more copyrights.
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see http://www.gnu.org/licenses/.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in /usr/share/common-licenses/GPL-3.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 000..6f83607
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..11004df
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
[MediaWiki-commits] [Gerrit] [FIX] Only log the rawdata once - change (pywikibot/core)
XZise has uploaded a new change for review. https://gerrit.wikimedia.org/r/165474 Change subject: [FIX] Only log the rawdata once .. [FIX] Only log the rawdata once Change-Id: I913e24078a0cdd42f6a1648c23060ea7d807bfe1 --- M pywikibot/data/api.py 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/74/165474/1 diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 2cac9a3..d3625ee 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -547,7 +547,6 @@ pywikibot.warning( Non-JSON response received from server %s; the server may be down. % self.site) -pywikibot.debug(rawdata, _logger) # there might also be an overflow, so try a smaller limit for param in self._params: if param.endswith(limit): -- To view, visit https://gerrit.wikimedia.org/r/165474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I913e24078a0cdd42f6a1648c23060ea7d807bfe1 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] changed default from user to project focus in BurndownList view - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: changed default from user to project focus in BurndownList view
..
changed default from user to project focus in BurndownList view
Change-Id: I6ba54f991aef63ea567c5a4b5f1210d1143a6b6a
---
M src/BurndownListController.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Christopher Johnson (WMDE): Verified; Looks good to me, approved
diff --git a/src/BurndownListController.php b/src/BurndownListController.php
index e673e9e..e5cfb43 100644
--- a/src/BurndownListController.php
+++ b/src/BurndownListController.php
@@ -22,7 +22,7 @@
$nav-addLabel(pht('Burndown'));
$nav-addFilter('burn', pht('Burndown Rate'));
-$this-view = $nav-selectFilter($this-view, 'user');
+$this-view = $nav-selectFilter($this-view, 'project');
// Load all projects with Sprint in the name.
--
To view, visit https://gerrit.wikimedia.org/r/165469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ba54f991aef63ea567c5a4b5f1210d1143a6b6a
Gerrit-PatchSet: 2
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de
Gerrit-Reviewer: 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] Fix PHP notices complaining about missing array indices - change (mediawiki...CommonsMetadata)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165476
Change subject: Fix PHP notices complaining about missing array indices
..
Fix PHP notices complaining about missing array indices
Bug: 71793
Change-Id: Iaa1b01d9a1d4adde637676226c42f1471112db79
---
M DataCollector.php
1 file changed, 12 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CommonsMetadata
refs/changes/76/165476/1
diff --git a/DataCollector.php b/DataCollector.php
index b8d7e0d..018954b 100755
--- a/DataCollector.php
+++ b/DataCollector.php
@@ -157,9 +157,18 @@
protected function getTemplateMetadata( $templateData ) {
// GetExtendedMetadata does not handle multivalued fields, we
need to select one of everything
$templateFields = array();
- $templateFields = array_merge( $templateFields,
$this-selectCoordinate( $templateData[TemplateParser::COORDINATES_KEY] ) );
- $templateFields = array_merge( $templateFields,
$this-selectInformationTemplate(
$templateData[TemplateParser::INFORMATION_FIELDS_KEY] ) );
- $templateFields = array_merge( $templateFields,
$this-selectLicense( $templateData[TemplateParser::LICENSES_KEY] ) );
+
+ if ( isset( $templateData[TemplateParser::COORDINATES_KEY] ) ) {
+ $templateFields = array_merge( $templateFields,
$this-selectCoordinate( $templateData[TemplateParser::COORDINATES_KEY] ) );
+ }
+
+ if ( isset(
$templateData[TemplateParser::INFORMATION_FIELDS_KEY] ) ) {
+ $templateFields = array_merge( $templateFields,
$this-selectInformationTemplate(
$templateData[TemplateParser::INFORMATION_FIELDS_KEY] ) );
+ }
+
+ if ( isset( $templateData[TemplateParser::LICENSES_KEY] ) ) {
+ $templateFields = array_merge( $templateFields,
$this-selectLicense( $templateData[TemplateParser::LICENSES_KEY] ) );
+ }
$metadata = array();
foreach( $templateFields as $name = $value ) {
--
To view, visit https://gerrit.wikimedia.org/r/165476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa1b01d9a1d4adde637676226c42f1471112db79
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CommonsMetadata
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added initial Debian packaging - change (operations...apertium-pt-ca)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165475
Change subject: Added initial Debian packaging
..
Added initial Debian packaging
Change-Id: If09d0521e64b3f6bdf450303fe7cfe4100877c01
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 108 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium-pt-ca
refs/changes/75/165475/1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..f64aeaa
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,23 @@
+apertium-pt-ca (0.8.2+svn~57507-1) experimental; urgency=low
+
+ [ Tino Didriksen ]
+ * New upstream release based on SVN snapshot.
+
+ [ Kartik Mistry ]
+ * Added debian/watch file.
+
+ -- Kartik Mistry kar...@debian.org Wed, 08 Oct 2014 17:31:11 +0530
+
+apertium-pt-ca (0.8.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Added dependency on apertium-pcre2
+
+ -- Francis Tyers fty...@prompsit.com Wed, 04 Mar 2009 21:53:12 +
+
+apertium-pt-ca (0.8.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #486796)
+
+ -- Francis Tyers fty...@prompsit.com Wed, 18 Jun 2008 10:24:41 +0100
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..95319b2
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,27 @@
+Source: apertium-pt-ca
+Section: science
+Priority: optional
+Maintainer: Debian Science Team
debian-science-maintain...@lists.alioth.debian.org
+Uploaders: Tino Didriksen m...@tinodidriksen.com,
+ Kartik Mistry kar...@debian.org
+Build-Depends: apertium (= 3.3),
+ autotools-dev,
+ debhelper (= 8.0),
+ dh-autoreconf,
+ gawk,
+ libapertium3-3.3-dev,
+ locales,
+ pkg-config (= 0.21)
+Standards-Version: 3.9.6
+Homepage: http://apertium.org/
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-pt-ca.git
+Vcs-Browser:
https://anonscm.debian.org/cgit/debian-science/packages/apertium-pt-ca.git
+
+Package: apertium-pt-ca
+Architecture: all
+Depends: apertium (= 3.3), ${misc:Depends}, ${shlibs:Depends}
+Provides: apertium-ca-pt
+Conflicts: apertium-ca-pt
+Description: Apertium translation data for the Portuguese-Catalan pair
+ Data package providing Apertium language resources for translating
+ between the Portuguese and Catalan languages.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..8f6f23c
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,22 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://apertium.org/
+
+Files: *
+Copyright: 2014, Apertium Project Management Committee
apertium-...@dlsi.ua.es
+ See AUTHORS for more copyrights.
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see http://www.gnu.org/licenses/.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in /usr/share/common-licenses/GPL-3.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 000..6f83607
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..11004df
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+%:
+ dh $@ --with autoreconf
+
+override_dh_auto_build:
+ mkdir -p debian/tmp/locale/
+ localedef -f UTF-8 -i en_US
[MediaWiki-commits] [Gerrit] Fix ImageMetrics schema - change (mediawiki...ImageMetrics)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix ImageMetrics schema
..
Fix ImageMetrics schema
https://meta.wikimedia.org/w/index.php?diff=10078363
Fixes two issues:
* some fields which were previously marked integer can have higher precision
* non-required numeric EventLogging fields are not happy with null
Change-Id: I7acba21690d6feb3af9e3f635d581cf242295d04
---
M ImageMetrics.php
M resources/ext.imageMetrics.js
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ImageMetrics.php b/ImageMetrics.php
index 63e96a4..e507fc0 100644
--- a/ImageMetrics.php
+++ b/ImageMetrics.php
@@ -30,7 +30,7 @@
$wgExtensionFunctions[] = function () {
global $wgEventLoggingSchemas;
- $wgEventLoggingSchemas['ImageMetricsLoadingTime'] = 9673571;
+ $wgEventLoggingSchemas['ImageMetricsLoadingTime'] = 10078363;
};
diff --git a/resources/ext.imageMetrics.js b/resources/ext.imageMetrics.js
index ffebc8f..d390e33 100644
--- a/resources/ext.imageMetrics.js
+++ b/resources/ext.imageMetrics.js
@@ -144,7 +144,7 @@
if ( timing ) {
data.ownLoadingTime = timing.duration;
data.fullLoadingTime = timing.responseEnd;
- data.fetchDelay = timing.responseStart ? (
timing.responseStart - timing.startTime ) : null;
+ data.fetchDelay = timing.responseStart ? (
timing.responseStart - timing.startTime ) : undefined;
}
};
--
To view, visit https://gerrit.wikimedia.org/r/164427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7acba21690d6feb3af9e3f635d581cf242295d04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageMetrics
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Work in progress: ogv.js media player for Safari/IE (3 of 3) - change (mediawiki...TimedMediaHandler)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165479
Change subject: Work in progress: ogv.js media player for Safari/IE (3 of 3)
..
Work in progress: ogv.js media player for Safari/IE (3 of 3)
Mobile video/audio-player overlay, supporting both native and
ogv.js JavaScript-based playback (used for Safari).
* currently appears to be broken due to changes in MobileFrontend *
Note this doesn't work in IE for Windows Phone, which currently
lacks both Web Audio and Flash support.
Bug: 61823
Change-Id: Ib0083dc6b50eb91adb9e9624a5e90448860441e2
---
M TimedMediaHandler.hooks.php
M TimedMediaHandler_body.php
M i18n/en.json
M i18n/qqq.json
A resources/ext.tmh.mobile.MediaOverlay.js
A resources/ext.tmh.mobile.MediaOverlay.less
A resources/ext.tmh.mobile.css
A resources/ext.tmh.mobile.js
8 files changed, 480 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/79/165479/1
diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index 7ab2230..8771157 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -89,6 +89,44 @@
'loaderScripts' =
'resources/mw.MediaWikiPlayer.loader.js',
),
);
+
+ // Add OgvJs-related modules common to desktop Safari/IE and
mobile Safari
+ $wgResourceModules += array(
+ 'ext.tmh.OgvJsSupport' = $baseExtensionResource +
array(
+ 'scripts' =
'resources/ext.tmh.OgvJsSupport.js',
+ 'targets' = array( 'mobile', 'desktop' ),
+ ),
+ );
+
+ // Add the MobileFrontend-specific lightweight player
+ $wgResourceModules += array(
+ 'ext.tmh.mobile' = $baseExtensionResource + array(
+ 'scripts' = 'resources/ext.tmh.mobile.js',
+ 'styles' = array(
+ 'resources/ext.tmh.mobile.css',
+ 'resources/PopUpThumbVideo.css',
+ ),
+ 'dependencies' = array(
+ 'mobile.startup',
+ 'ext.tmh.OgvJsSupport',
+ ),
+ 'targets' = array( 'mobile' ),
+ ),
+ );
+ $wgResourceModules += array(
+ 'ext.tmh.mobile.MediaOverlay' = $baseExtensionResource
+ array(
+ 'scripts' =
'resources/ext.tmh.mobile.MediaOverlay.js',
+ 'styles' =
'resources/ext.tmh.mobile.MediaOverlay.less',
+ 'dependencies' = array(
+ 'ext.tmh.mobile',
+ 'mobile.overlays',
+ 'mediawiki.Title',
+ ),
+ 'messages' =
'timedmedia-mobile-overlay-details',
+ 'targets' = array( 'mobile' ),
+ ),
+ );
+
// Setup a hook for iframe embed handling:
$wgHooks['ArticleFromTitle'][] =
'TimedMediaIframeOutput::iframeHook';
@@ -396,6 +434,7 @@
if ( $addModules ) {
$out-addModuleScripts( 'mw.PopUpMediaTransform' );
$out-addModuleStyles( 'mw.PopUpMediaTransform' );
+ $out-addModules( 'ext.tmh.mobile' );
}
return true;
diff --git a/TimedMediaHandler_body.php b/TimedMediaHandler_body.php
index 9bd172a..4283041 100644
--- a/TimedMediaHandler_body.php
+++ b/TimedMediaHandler_body.php
@@ -217,6 +217,7 @@
$outputPage-addModuleScripts( 'mw.PopUpMediaTransform' );
$outputPage-addModuleStyles( 'mw.PopUpMediaTransform' );
$outputPage-addModules( 'mw.TMHGalleryHook.js' );
+ $outputPage-addModules( 'ext.tmh.mobile' );
}
/**
diff --git a/i18n/en.json b/i18n/en.json
index 63bebfc..0459ab9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -115,5 +115,6 @@
orphanedtimedtext: Orphaned TimedText pages,
orphanedtimedtext-summary: List of
[[{{#special:AllPages/TimedText:}}|{{ns:TimedText}}]] pages which do not have a
corresponding file.,
orphanedtimedtext-unsupported: This special page is only supported on
MySQL databases.,
-orphanedtimedtext-notimedtext: TimedText is not enabled on this wiki.
+orphanedtimedtext-notimedtext: TimedText is not enabled on this wiki.,
+timedmedia-mobile-overlay-details: Details
}
diff --git a/i18n/qqq.json
[MediaWiki-commits] [Gerrit] Work in progress: ogv.js media player for Safari/IE (1 of 3) - change (mediawiki...TimedMediaHandler)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/165477 Change subject: Work in progress: ogv.js media player for Safari/IE (1 of 3) .. Work in progress: ogv.js media player for Safari/IE (1 of 3) JavaScript and Flash media players for Ogg Vorbis/Theora audio/video, built from https://github.com/brion/ogv.js by Brion Vibber Includes libogg, libtheora, libvorbis, and libopus cross-compiled with Mozilla's emscripten compiler and Adobe's crossbridge compiler and wrapped in a simple media player. This is a separate commit to make the actual plugin for the player framework more readable. Bug: 61823 Change-Id: I0fb32af11fe7c95e91023dc6eacb113206adeef9 --- A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/COPYING-ogg.txt A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/COPYING-ogv.js.txt A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/COPYING-opus.txt A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/COPYING-theora.txt A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/COPYING-vorbis.txt A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/README A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/dynamicaudio.swf A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv.swf A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogvjs.js A MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogvswf.js 10 files changed, 2,911 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/77/165477/1 -- To view, visit https://gerrit.wikimedia.org/r/165477 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0fb32af11fe7c95e91023dc6eacb113206adeef9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TimedMediaHandler Gerrit-Branch: master Gerrit-Owner: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Work in progress: ogv.js media player for Safari/IE (2 of 3) - change (mediawiki...TimedMediaHandler)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165478
Change subject: Work in progress: ogv.js media player for Safari/IE (2 of 3)
..
Work in progress: ogv.js media player for Safari/IE (2 of 3)
Plugin to MwEmbedPlayer for using ogv.js JavaScript or Flash playback
of Ogg Theora/Vorbis media in Safari and IE.
The actual JS and Flash libraries are in the previous commit in order
to make this commit easier to review.
This commit adds only the plugin for the desktop player and support
code that's common with the mobile player coming in the next commit.
Bug: 61823
Change-Id: Ia6b2e66864a596dbb4ba5841b9da135021f38276
---
M MwEmbedModules/EmbedPlayer/EmbedPlayer.php
M MwEmbedModules/EmbedPlayer/i18n/en.json
M MwEmbedModules/EmbedPlayer/i18n/qqq.json
A MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
A MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvSwf.js
M MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
M MwEmbedModules/EmbedPlayer/resources/mw.MediaElement.js
M MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
M MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
A resources/ext.tmh.OgvJsSupport.js
10 files changed, 524 insertions(+), 6 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/78/165478/1
diff --git a/MwEmbedModules/EmbedPlayer/EmbedPlayer.php
b/MwEmbedModules/EmbedPlayer/EmbedPlayer.php
index c60d41c..95efa94 100644
--- a/MwEmbedModules/EmbedPlayer/EmbedPlayer.php
+++ b/MwEmbedModules/EmbedPlayer/EmbedPlayer.php
@@ -68,6 +68,11 @@
'scripts'= resources/mw.EmbedPlayerVLCApp.js,
'dependencies' = array( 'mediawiki.Uri' )
),
+ mw.EmbedPlayerOgvJs = array(
+ 'scripts' = 'resources/mw.EmbedPlayerOgvJs.js',
+ 'dependencies' = 'ext.tmh.OgvJsSupport',
+ ),
+ mw.EmbedPlayerOgvSwf = array( 'scripts'=
resources/mw.EmbedPlayerOgvSwf.js ),
mw.EmbedPlayerImageOverlay = array( 'scripts'=
resources/mw.EmbedPlayerImageOverlay.js ),
mw.EmbedPlayerVlc = array( 'scripts'=
resources/mw.EmbedPlayerVlc.js ),
diff --git a/MwEmbedModules/EmbedPlayer/i18n/en.json
b/MwEmbedModules/EmbedPlayer/i18n/en.json
index d3221a2..7539465 100644
--- a/MwEmbedModules/EmbedPlayer/i18n/en.json
+++ b/MwEmbedModules/EmbedPlayer/i18n/en.json
@@ -50,6 +50,8 @@
mwe-embedplayer-ogg-player-webmNative: HTML5 WebM player,
mwe-embedplayer-ogg-player-oggPlugin: Generic Ogg plugin,
mwe-embedplayer-ogg-player-vlcAppPlayer: VLC for iOS app,
+mwe-embedplayer-ogg-player-ogvJsPlayer: JavaScript Ogg player,
+mwe-embedplayer-ogg-player-ogvSwfPlayer: Flash Ogg player,
mwe-embedplayer-ogg-player-quicktime-mozilla: QuickTime plugin,
mwe-embedplayer-ogg-player-quicktime-activex: QuickTime ActiveX,
mwe-embedplayer-ogg-player-cortado: Java Cortado,
diff --git a/MwEmbedModules/EmbedPlayer/i18n/qqq.json
b/MwEmbedModules/EmbedPlayer/i18n/qqq.json
index 0b17710..3e3de78 100644
--- a/MwEmbedModules/EmbedPlayer/i18n/qqq.json
+++ b/MwEmbedModules/EmbedPlayer/i18n/qqq.json
@@ -24,6 +24,8 @@
mwe-embedplayer-ogg-player-aacNative: name of AAC player in
configuration screen,
mwe-embedplayer-ogg-player-cortado: {{optional}},
mwe-embedplayer-ogg-player-selected: {{Identical|Selected}},
+ mwe-embedplayer-ogg-player-ogvJsPlayer: name of ogv.js Ogg
JavaScript player in configuration screen,
+ mwe-embedplayer-ogg-player-ogvSwfPlayer: name of ogv.swf Ogg Flash
player in configuration screen,
mwe-embedplayer-for_best_experience: Shown when user's browser
doesn't support playing videos. Parameters:\n* $1 - An empty lt;agt; tag.
Don't use this parameter.,
mwe-embedplayer-download-warn: Parameters:\n* $1 - URL,
mwe-embedplayer-do_not_warn_again: Standard message for
disabling\nfuture identical warnings messages,
diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
new file mode 100644
index 000..d2ef1b6
--- /dev/null
+++ b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
@@ -0,0 +1,171 @@
+( function( mw, $ ) { use strict;
+
+mw.EmbedPlayerOgvJs = {
+
+ // Instance name:
+ instanceOf: 'OgvJs',
+
+ // Supported feature set of the cortado applet:
+ supports: {
+ 'playHead' : false, // seeking not supported yet
+ 'pause' : true,
+ 'stop' : true,
+ 'fullscreen' : false,
+ 'sourceSwitch': true, // todo
+ 'timeDisplay' : true,
+ 'volumeControl' : false,
+ 'overlays': true
+
[MediaWiki-commits] [Gerrit] mediawiki: repool mw1163 for scap, convert to hhvm. - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki: repool mw1163 for scap, convert to hhvm.
..
mediawiki: repool mw1163 for scap, convert to hhvm.
Change-Id: Id0013e4c08e366a16625c192be2cfaca8b750de7
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M hieradata/hosts/mw1163.yaml
M manifests/site.pp
M modules/dsh/files/group/mw-eqiad
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/hieradata/hosts/mw1163.yaml b/hieradata/hosts/mw1163.yaml
index 2c726b4..e30aca3 100644
--- a/hieradata/hosts/mw1163.yaml
+++ b/hieradata/hosts/mw1163.yaml
@@ -1 +1 @@
-mainrole: appserver
+mainrole: appserver_hhvm
diff --git a/manifests/site.pp b/manifests/site.pp
index d94cc93..50e28ab 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1985,7 +1985,6 @@
node /^mw1(05[4-9]|0[6-9][0-9]|10[0-9]|11[0-3])\.eqiad\.wmnet$/ {
class {'::admin': groups = ['deployment']}
-$cluster = 'appserver'
if $::hostname =~ /^mw105[45]$/ {
$ganglia_aggregator = true
@@ -2036,7 +2035,7 @@
node /^mw11(6[1-9]|7[0-9]|8[0-8])\.eqiad\.wmnet$/ {
class {'::admin': groups = ['deployment']}
-$cluster = 'appserver'
+
if $::hostname == 'mw1161' {
include misc::deployment::scap_proxy
}
diff --git a/modules/dsh/files/group/mw-eqiad b/modules/dsh/files/group/mw-eqiad
index 19b0ed0..be6497c 100644
--- a/modules/dsh/files/group/mw-eqiad
+++ b/modules/dsh/files/group/mw-eqiad
@@ -160,6 +160,7 @@
mw1160
mw1161
mw1162
+mw1163
mw1164
mw1165
mw1166
--
To view, visit https://gerrit.wikimedia.org/r/165466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id0013e4c08e366a16625c192be2cfaca8b750de7
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] Fix PHP notices complaining about missing array indices - change (mediawiki...CommonsMetadata)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix PHP notices complaining about missing array indices
..
Fix PHP notices complaining about missing array indices
Bug: 71793
Change-Id: Iaa1b01d9a1d4adde637676226c42f1471112db79
---
M DataCollector.php
1 file changed, 12 insertions(+), 3 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/DataCollector.php b/DataCollector.php
index b8d7e0d..018954b 100755
--- a/DataCollector.php
+++ b/DataCollector.php
@@ -157,9 +157,18 @@
protected function getTemplateMetadata( $templateData ) {
// GetExtendedMetadata does not handle multivalued fields, we
need to select one of everything
$templateFields = array();
- $templateFields = array_merge( $templateFields,
$this-selectCoordinate( $templateData[TemplateParser::COORDINATES_KEY] ) );
- $templateFields = array_merge( $templateFields,
$this-selectInformationTemplate(
$templateData[TemplateParser::INFORMATION_FIELDS_KEY] ) );
- $templateFields = array_merge( $templateFields,
$this-selectLicense( $templateData[TemplateParser::LICENSES_KEY] ) );
+
+ if ( isset( $templateData[TemplateParser::COORDINATES_KEY] ) ) {
+ $templateFields = array_merge( $templateFields,
$this-selectCoordinate( $templateData[TemplateParser::COORDINATES_KEY] ) );
+ }
+
+ if ( isset(
$templateData[TemplateParser::INFORMATION_FIELDS_KEY] ) ) {
+ $templateFields = array_merge( $templateFields,
$this-selectInformationTemplate(
$templateData[TemplateParser::INFORMATION_FIELDS_KEY] ) );
+ }
+
+ if ( isset( $templateData[TemplateParser::LICENSES_KEY] ) ) {
+ $templateFields = array_merge( $templateFields,
$this-selectLicense( $templateData[TemplateParser::LICENSES_KEY] ) );
+ }
$metadata = array();
foreach( $templateFields as $name = $value ) {
--
To view, visit https://gerrit.wikimedia.org/r/165476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa1b01d9a1d4adde637676226c42f1471112db79
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CommonsMetadata
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Gergő Tisza gti...@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: stuff - change (search/extra)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165480
Change subject: WIP: stuff
..
WIP: stuff
1. Javadoc
2. reject_unaccelerated to reject regexes that cannot be accelerated
3. test for changing gram size
NOCOMMIT: The tests for changing the gram size are a bit flaky right now-
they fail 1/3 of the time or so.
Change-Id: I5fa944ab285b410103cce0cb30ec53fbc0d5705e
---
M src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
A src/main/java/org/wikimedia/search/extra/package-info.java
M src/main/java/org/wikimedia/search/extra/regex/SourceRegexFilter.java
M src/main/java/org/wikimedia/search/extra/regex/SourceRegexFilterBuilder.java
M src/main/java/org/wikimedia/search/extra/regex/SourceRegexFilterParser.java
A
src/main/java/org/wikimedia/search/extra/regex/UnableToAccelerateRegexException.java
M
src/main/java/org/wikimedia/search/extra/regex/expression/AbstractCompositeExpression.java
M src/main/java/org/wikimedia/search/extra/regex/expression/Expression.java
M
src/main/java/org/wikimedia/search/extra/regex/expression/ExpressionSource.java
M src/main/java/org/wikimedia/search/extra/regex/expression/False.java
M src/main/java/org/wikimedia/search/extra/regex/expression/True.java
M
src/main/java/org/wikimedia/search/extra/regex/ngram/AutomatonTooComplexException.java
M src/main/java/org/wikimedia/search/extra/regex/ngram/NGramAutomaton.java
M src/main/java/org/wikimedia/search/extra/regex/ngram/NGramExtractor.java
M src/main/java/org/wikimedia/search/extra/util/FieldValues.java
M src/main/java/org/wikimedia/search/extra/util/Functions.java
A src/main/java/org/wikimedia/search/extra/util/package-info.java
M src/test/java/org/wikimedia/search/extra/regex/SourceRegexFilterTest.java
18 files changed, 312 insertions(+), 81 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/search/extra
refs/changes/80/165480/1
diff --git a/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
b/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
index 70f0c95..f0a5b92 100644
--- a/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
+++ b/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
@@ -4,6 +4,9 @@
import org.elasticsearch.plugins.AbstractPlugin;
import org.wikimedia.search.extra.regex.SourceRegexFilterParser;
+/**
+ * Setup the Elasticsearch plugin.
+ */
public class ExtraPlugin extends AbstractPlugin {
@Override
public String description() {
@@ -15,6 +18,9 @@
return wikimedia-extra;
}
+/**
+ * Register our parsers.
+ */
public void onModule(IndicesQueriesModule module) {
module.addFilter(new SourceRegexFilterParser());
}
diff --git a/src/main/java/org/wikimedia/search/extra/package-info.java
b/src/main/java/org/wikimedia/search/extra/package-info.java
new file mode 100644
index 000..910721c
--- /dev/null
+++ b/src/main/java/org/wikimedia/search/extra/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Utilities.
+ */
+package org.wikimedia.search.extra;
\ No newline at end of file
diff --git
a/src/main/java/org/wikimedia/search/extra/regex/SourceRegexFilter.java
b/src/main/java/org/wikimedia/search/extra/regex/SourceRegexFilter.java
index 6461ca0..6f36195 100644
--- a/src/main/java/org/wikimedia/search/extra/regex/SourceRegexFilter.java
+++ b/src/main/java/org/wikimedia/search/extra/regex/SourceRegexFilter.java
@@ -33,13 +33,14 @@
private final int maxInspect;
private final boolean caseSensitive;
private final Locale locale;
+private final boolean rejectUnaccelerated;
private int inspected = 0;
private Filter prefilter;
private CharacterRunAutomaton charRun;
public SourceRegexFilter(String fieldPath, FieldValues.Loader loader,
String regex, String ngramFieldPath, int gramSize, int maxExpand,
-int maxStatesTraced, int maxInspect, boolean caseSensitive, Locale
locale) {
+int maxStatesTraced, int maxInspect, boolean caseSensitive, Locale
locale, boolean rejectUnaccelerated) {
this.fieldPath = fieldPath;
this.loader = loader;
this.regex = regex;
@@ -50,6 +51,7 @@
this.maxInspect = maxInspect;
this.caseSensitive = caseSensitive;
this.locale = locale;
+this.rejectUnaccelerated = rejectUnaccelerated;
}
@Override
@@ -73,6 +75,9 @@
Automaton automaton = new RegExp(regex.toLowerCase(locale),
RegExp.ALL ^ RegExp.AUTOMATON).toAutomaton();
ExpressionString expression = new NGramExtractor(gramSize,
maxExpand, maxStatesTraced).extract(automaton).simplify();
if (expression.alwaysTrue()) {
+if (rejectUnaccelerated) {
+throw new UnableToAccelerateRegexException(regex,
gramSize, ngramFieldPath);
+}
prefilter = Queries.MATCH_ALL_FILTER;
}
[MediaWiki-commits] [Gerrit] zuul: debug gear.Server - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165481
Change subject: zuul: debug gear.Server
..
zuul: debug gear.Server
The internal class gear.Server logs interesting message at debug level,
log them down to /var/log/zuul/gearman-server-debug.log with a few days
of archives.
While at it add vim modeline and some comments to let me better read the
file.
Applied in production manually.
Change-Id: Idda66be684a568050cae2f4fb9739d09564b48a2
---
M modules/zuul/files/gearman-logging.conf
1 file changed, 25 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/81/165481/1
diff --git a/modules/zuul/files/gearman-logging.conf
b/modules/zuul/files/gearman-logging.conf
index 9b89f3f..7750fe9 100644
--- a/modules/zuul/files/gearman-logging.conf
+++ b/modules/zuul/files/gearman-logging.conf
@@ -1,11 +1,19 @@
+#
+### THIS FILE IS MANAGED BY PUPPET
+### puppet:///files/zuul/gearman-logging.conf
+#
+# vim: set filetype=dosini:
+
[loggers]
-keys=root,gear
+keys=root,gear,gearsrv
[handlers]
-keys=console,normal
+keys=console,normal,srvdebug
[formatters]
keys=simple
+
+#
[logger_root]
level=WARNING
@@ -16,18 +24,33 @@
handlers=normal
qualname=gear
+[logger_gearsrv]
+level=DEBUG
+handlers=srvdebug
+qualname=gear.Server
+
+#
+
[handler_console]
level=WARNING
class=StreamHandler
formatter=simple
args=(sys.stdout,)
+[handler_srvdebug]
+level=DEBUG
+class=logging.handlers.TimedRotatingFileHandler
+formatter=simple
+args=('/var/log/zuul/gearman-server-debug.log', 'midnight', 1, 4,)
+
[handler_normal]
level=WARNING
class=logging.handlers.TimedRotatingFileHandler
formatter=simple
args=('/var/log/zuul/gearman-server.log', 'midnight', 1, 30,)
+#
+
[formatter_simple]
format=%(asctime)s %(levelname)s %(name)s: %(message)s
datefmt=
--
To view, visit https://gerrit.wikimedia.org/r/165481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idda66be684a568050cae2f4fb9739d09564b48a2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Quick add of full-HD (1080p) transcode configs for TMH - change (mediawiki...TimedMediaHandler)
jenkins-bot has submitted this change and it was merged. Change subject: Quick add of full-HD (1080p) transcode configs for TMH .. Quick add of full-HD (1080p) transcode configs for TMH Bug: 71705 Change-Id: I805ddbddda143db43ab7644de81a28014a13022c --- M TimedMediaHandler.php M WebVideoTranscode/WebVideoTranscode.php M i18n/en.json M i18n/qqq.json 4 files changed, 50 insertions(+), 0 deletions(-) Approvals: Gilles: Looks good to me, approved jenkins-bot: Verified diff --git a/TimedMediaHandler.php b/TimedMediaHandler.php index a9762d2..b1e0025 100644 --- a/TimedMediaHandler.php +++ b/TimedMediaHandler.php @@ -144,6 +144,9 @@ // A high quality WebM stream WebVideoTranscode::ENC_WEBM_720P, + + // A full-HD high quality WebM stream + WebVideoTranscode::ENC_WEBM_1080P, /* // A least common denominator h.264 stream; first gen iPhone, iPods, early android etc. WebVideoTranscode::ENC_H264_320P, @@ -153,6 +156,9 @@ // An high quality HD stream; higher end phones, tablets, smart tvs WebVideoTranscode::ENC_H264_720P, + + // A full-HD high quality stream; higher end phones, tablets, smart tvs + WebVideoTranscode::ENC_H264_1080P, */ ); diff --git a/WebVideoTranscode/WebVideoTranscode.php b/WebVideoTranscode/WebVideoTranscode.php index 704fd8d..e6b7a7f 100644 --- a/WebVideoTranscode/WebVideoTranscode.php +++ b/WebVideoTranscode/WebVideoTranscode.php @@ -30,17 +30,20 @@ const ENC_OGV_360P = '360p.ogv'; const ENC_OGV_480P = '480p.ogv'; const ENC_OGV_720P = '720p.ogv'; + const ENC_OGV_1080P = '1080p.ogv'; // WebM profiles: const ENC_WEBM_160P = '160p.webm'; const ENC_WEBM_360P = '360p.webm'; const ENC_WEBM_480P = '480p.webm'; const ENC_WEBM_720P = '720p.webm'; + const ENC_WEBM_1080P = '1080p.webm'; // mp4 profiles: const ENC_H264_320P = '320p.mp4'; const ENC_H264_480P = '480p.mp4'; const ENC_H264_720P = '720p.mp4'; + const ENC_H264_1080P = '1080p.mp4'; const ENC_OGG_VORBIS = 'ogg'; const ENC_OGG_OPUS = 'opus'; @@ -114,6 +117,17 @@ 'type' = 'video/ogg; codecs=theora, vorbis', ), + WebVideoTranscode::ENC_OGV_1080P = + array( + 'maxSize'= '1920x1080', + 'videoQuality' = 6, + 'audioQuality' = 3, + 'noUpscaling'= 'true', + 'keyframeInterval' = '128', + 'videoCodec' = 'theora', + 'type' = 'video/ogg; codecs=theora, vorbis', + ), + // WebM transcode: WebVideoTranscode::ENC_WEBM_160P = array( @@ -164,6 +178,15 @@ 'videoCodec' = 'vp8', 'type' = 'video/webm; codecs=vp8, vorbis', ), + WebVideoTranscode::ENC_WEBM_1080P = +array( + 'maxSize'= '1920x1080', + 'videoQuality' = 7, + 'audioQuality' = 3, + 'noUpscaling'= 'true', + 'videoCodec' = 'vp8', + 'type' = 'video/webm; codecs=vp8, vorbis', + ), // Losly defined per PCF guide to mp4 profiles: // https://develop.participatoryculture.org/index.php/ConversionMatrix @@ -206,6 +229,18 @@ 'type' = 'video/mp4; codecs=avc1.42E01E, mp4a.40.2', ), + WebVideoTranscode::ENC_H264_1080P = + array( + 'maxSize' = '1920x1080', + 'videoCodec' = 'h264', + 'preset' = '1080p', + 'videoBitrate' = '5000k', + 'audioCodec' = 'aac', + 'channels' = '2', + 'audioBitrate' = '128k', + 'type' = 'video/mp4; codecs=avc1.42E01E, mp4a.40.2', + ), + //Audio profiles WebVideoTranscode::ENC_OGG_VORBIS = array( diff --git a/i18n/en.json b/i18n/en.json index 63bebfc..191b6cb 100644 --- a/i18n/en.json +++ b/i18n/en.json
[MediaWiki-commits] [Gerrit] Apply link styling logic to transclusion nodes - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Apply link styling logic to transclusion nodes
..
Apply link styling logic to transclusion nodes
Only template nodes for now. Not sure what we can do about generated content
nodes in general...
Bug: 65353
Change-Id: I848f36764b446ed30c74c0e641d0973008f6880b
---
M modules/ve-mw/ce/annotations/ve.ce.MWInternalLinkAnnotation.js
M modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
M modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
M modules/ve-mw/init/ve.init.mw.LinkCache.js
4 files changed, 74 insertions(+), 36 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ce/annotations/ve.ce.MWInternalLinkAnnotation.js
b/modules/ve-mw/ce/annotations/ve.ce.MWInternalLinkAnnotation.js
index fb09e24..85ed5e9 100644
--- a/modules/ve-mw/ce/annotations/ve.ce.MWInternalLinkAnnotation.js
+++ b/modules/ve-mw/ce/annotations/ve.ce.MWInternalLinkAnnotation.js
@@ -24,22 +24,7 @@
this.$element.addClass( 've-ce-mwInternalLinkAnnotation' );
// Style based on link cache information
- ve.init.platform.linkCache.get( model.getAttribute( 'lookupTitle' ) )
- .done( function ( data ) {
- if ( data.missing ) {
- annotation.$element.addClass( 'new' );
- } else {
- // Provided by core MediaWiki, no styles by
default.
- if ( data.redirect ) {
- annotation.$element.addClass(
'mw-redirect' );
- }
- // Should be provided by the Disambiguator
extension, but no one has yet written a suitably
- // performant patch to do it. It is instead
implemented in JavaScript in on-wiki gadgets.
- if ( data.disambiguation ) {
- annotation.$element.addClass(
'mw-disambig' );
- }
- }
- } );
+ ve.init.platform.linkCache.styleElement( model.getAttribute(
'lookupTitle' ), annotation.$element );
// HACK: Override href in case hrefPrefix isn't set
// This is a workaround for bug 58314 until such time as Parsoid gets
rid of
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
index 3ad732d..4150181 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
@@ -125,6 +125,26 @@
};
/**
+ * @inheritdoc
+ */
+ve.ce.MWTransclusionNode.prototype.getRenderedDomElements = function (
domElements ) {
+ var $elements = this.$(
ve.ce.GeneratedContentNode.prototype.getRenderedDomElements.call( this,
domElements ) );
+ $elements
+ .find( 'a[href]' ).addBack( 'a[href]' )
+ .each( function () {
+ var targetData =
ve.dm.MWInternalLinkAnnotation.static.getTargetDataFromHref(
+ this.href, this.ownerDocument
+ ),
+ normalisedHref = targetData.title;
+ if ( mw.Title.newFromText( targetData.title ) ) {
+ normalisedHref = mw.Title.newFromText(
targetData.title ).getPrefixedText();
+ }
+ ve.init.platform.linkCache.styleElement(
normalisedHref, $( this ) );
+ } );
+ return $elements.toArray();
+};
+
+/**
* Handle an unsuccessful response from the parser for the wikitext fragment.
*
* @param {jQuery.Deferred} deferred The promise object created by
#generateContents
diff --git a/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
b/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
index 0ffdcfe..93d6835 100644
--- a/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
+++ b/modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js
@@ -33,22 +33,42 @@
ve.dm.MWInternalLinkAnnotation.static.matchRdfaTypes = ['mw:WikiLink'];
ve.dm.MWInternalLinkAnnotation.static.toDataElement = function ( domElements,
converter ) {
+ var targetData = this.getTargetDataFromHref(
+ domElements[0].getAttribute( 'href' ),
+ converter.getTargetHtmlDocument()
+ );
+ return {
+ type: this.name,
+ attributes: {
+ hrefPrefix: targetData.hrefPrefix,
+ title: decodeURIComponent( targetData.title ).replace(
/_/g, ' ' ),
+ normalizedTitle: this.normalizeTitle( targetData.title
),
+ lookupTitle: this.getLookupTitle( targetData.title
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0bb6d3b..1d3f875 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/165482 Change subject: Syncronize VisualEditor: 0bb6d3b..1d3f875 .. Syncronize VisualEditor: 0bb6d3b..1d3f875 Change-Id: Ifda2fcfee1daae585dee4573c1015855f3ee99f1 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/82/165482/1 diff --git a/VisualEditor b/VisualEditor index 0bb6d3b..1d3f875 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 0bb6d3b3337b4d5b49be72ead9e65c2379f07776 +Subproject commit 1d3f875dc4698a761d04c7c47f44ed947ae5dfa2 -- To view, visit https://gerrit.wikimedia.org/r/165482 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifda2fcfee1daae585dee4573c1015855f3ee99f1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0bb6d3b..1d3f875 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 0bb6d3b..1d3f875 .. Syncronize VisualEditor: 0bb6d3b..1d3f875 Change-Id: Ifda2fcfee1daae585dee4573c1015855f3ee99f1 --- 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 0bb6d3b..1d3f875 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 0bb6d3b3337b4d5b49be72ead9e65c2379f07776 +Subproject commit 1d3f875dc4698a761d04c7c47f44ed947ae5dfa2 -- To view, visit https://gerrit.wikimedia.org/r/165482 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifda2fcfee1daae585dee4573c1015855f3ee99f1 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] Bump versionCode - change (apps...wikipedia)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165483
Change subject: Bump versionCode
..
Bump versionCode
Change-Id: Ifebcc17f7ae9613ce50107f317d1ffb19d67cc68
---
M wikipedia/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/83/165483/1
diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index bd5d3d4..e2a1e0d 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -9,7 +9,7 @@
applicationId 'org.wikipedia'
minSdkVersion 10
targetSdkVersion 17
-versionCode 81
+versionCode 82
testApplicationId org.wikipedia.test
}
signingConfigs {
--
To view, visit https://gerrit.wikimedia.org/r/165483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifebcc17f7ae9613ce50107f317d1ffb19d67cc68
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump versionCode - change (apps...wikipedia)
Dbrant has submitted this change and it was merged.
Change subject: Bump versionCode
..
Bump versionCode
Change-Id: Ifebcc17f7ae9613ce50107f317d1ffb19d67cc68
---
M wikipedia/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Dbrant: Looks good to me, approved
diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index bd5d3d4..e2a1e0d 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -9,7 +9,7 @@
applicationId 'org.wikipedia'
minSdkVersion 10
targetSdkVersion 17
-versionCode 81
+versionCode 82
testApplicationId org.wikipedia.test
}
signingConfigs {
--
To view, visit https://gerrit.wikimedia.org/r/165483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifebcc17f7ae9613ce50107f317d1ffb19d67cc68
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't try to log metrics if it's not an image - change (mediawiki...ImageMetrics)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't try to log metrics if it's not an image
..
Don't try to log metrics if it's not an image
Bug: 71780
Change-Id: Id47f9cdc35ce03350353d27f40af8e059d4abd9e
---
M resources/ext.imageMetrics.js
M tests/qunit/ext.imageMetrics.test.js
2 files changed, 17 insertions(+), 0 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.imageMetrics.js b/resources/ext.imageMetrics.js
index ffebc8f..b68e718 100644
--- a/resources/ext.imageMetrics.js
+++ b/resources/ext.imageMetrics.js
@@ -162,6 +162,10 @@
data.imageType = 'filepage-main'; // the only supported
measurement type ATM
$file = $( '#file' ).find( 'img' ); // more efficient than
'#file img'
+ if ( !$file.length ) {
+ return;
+ }
+
this.addMediaWikiData( data, $file );
this.addOnloadData( data );
this.addNavigationTimingData( data );
diff --git a/tests/qunit/ext.imageMetrics.test.js
b/tests/qunit/ext.imageMetrics.test.js
index e992ecb..cfe3538 100644
--- a/tests/qunit/ext.imageMetrics.test.js
+++ b/tests/qunit/ext.imageMetrics.test.js
@@ -103,4 +103,17 @@
assert.strictEqual( data.fullLoadingTime, 10222,
'fullLoadingTime is logged correctly' );
assert.strictEqual( data.fetchDelay, 89, 'fetchDelay is logged
correctly' );
} );
+
+ QUnit.test( 'No image, no logging', 1, function ( assert ) {
+ var options = {
+ performance: { navigation: { type: 0 } },
+ config: { wgImageMetricsSamplingFactor: 1 }
+ },
+ imageMetrics = createImageMetrics( this.sandbox,
options );
+ $( '#qunit-fixture' ).append( 'div id=file/div' );
+
+ imageMetrics.log();
+
+ assert.strictEqual( options.logEvent.called, false, 'logEvent
was not called' );
+ } );
} ( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/165441
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id47f9cdc35ce03350353d27f40af8e059d4abd9e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ImageMetrics
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move Bartosz to principal authors section - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Move Bartosz to principal authors section .. Move Bartosz to principal authors section Change-Id: I4c0c3bad45e32c87ce3798b163e333a30e40ff3c --- M AUTHORS.txt 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/AUTHORS.txt b/AUTHORS.txt index db035ac..1e74aa6 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,5 +1,6 @@ Principal Authors (major contributors, alphabetically) +Bartosz Dziewoński matma...@wikimedia.org Christian Williams christ...@wikia-inc.com David Chan dc...@wikimedia.org Ed Sanders esand...@wikimedia.org @@ -16,7 +17,6 @@ Adam Wight s...@ludd.net Antoine Musso has...@free.fr Audrey Tang audr...@audreyt.org -Bartosz Dziewoński matma@gmail.com Brion Vibber br...@wikimedia.org Erik Moeller e...@wikimedia.org Gabriel Wicke gwi...@wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/165447 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c0c3bad45e32c87ce3798b163e333a30e40ff3c Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 1d3f875..85b509f - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 1d3f875..85b509f .. Syncronize VisualEditor: 1d3f875..85b509f Change-Id: Ia164e85f6ba825318f501e7d3477d235d6fefa13 --- 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 1d3f875..85b509f 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 1d3f875dc4698a761d04c7c47f44ed947ae5dfa2 +Subproject commit 85b509fdfad3ceb42ed42f4bb1becce782953a89 -- To view, visit https://gerrit.wikimedia.org/r/165484 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia164e85f6ba825318f501e7d3477d235d6fefa13 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 1d3f875..85b509f - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/165484 Change subject: Syncronize VisualEditor: 1d3f875..85b509f .. Syncronize VisualEditor: 1d3f875..85b509f Change-Id: Ia164e85f6ba825318f501e7d3477d235d6fefa13 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/84/165484/1 diff --git a/VisualEditor b/VisualEditor index 1d3f875..85b509f 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 1d3f875dc4698a761d04c7c47f44ed947ae5dfa2 +Subproject commit 85b509fdfad3ceb42ed42f4bb1becce782953a89 -- To view, visit https://gerrit.wikimedia.org/r/165484 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia164e85f6ba825318f501e7d3477d235d6fefa13 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
