[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Replaced private variable and method definitions in new data...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380492 ) Change subject: Replaced private variable and method definitions in new data reader with protected .. Replaced private variable and method definitions in new data reader with protected Change-Id: I191bbc9fff157ff27b386e754356a98a328848f6 --- M src/Data/Reader.php M src/Data/ReaderParams.php 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/src/Data/Reader.php b/src/Data/Reader.php index 05621d2..6afc5f3 100644 --- a/src/Data/Reader.php +++ b/src/Data/Reader.php @@ -10,7 +10,7 @@ * * @var \IContextSource */ - private $context = null; + protected $context = null; /** * diff --git a/src/Data/ReaderParams.php b/src/Data/ReaderParams.php index 5265c78..b7390ab 100644 --- a/src/Data/ReaderParams.php +++ b/src/Data/ReaderParams.php @@ -49,7 +49,7 @@ $this->setFilter( $params ); } - private function setIfAvailable( &$property, $source, $field ) { + protected function setIfAvailable( &$property, $source, $field ) { if( isset( $source[$field] ) ) { $property = $source[$field]; } -- To view, visit https://gerrit.wikimedia.org/r/380492 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I191bbc9fff157ff27b386e754356a98a328848f6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: PwirthGerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Robert Vogel 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...BlueSpiceAuthors[master]: Add grunt-jsonlint and grunt-banana-checker
Robert Vogel has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380833 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I0ecd299909ad7d060cd8bfae63a3ee31ae611bbe --- A Gruntfile.js A package.json 2 files changed, 30 insertions(+), 0 deletions(-) Approvals: Robert Vogel: Verified; Looks good to me, approved diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/380833 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0ecd299909ad7d060cd8bfae63a3ee31ae611bbe Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceAuthors Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Composer.json: cleanum requiremenet for prober dev usage
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380735 ) Change subject: Composer.json: cleanum requiremenet for prober dev usage .. Composer.json: cleanum requiremenet for prober dev usage Change-Id: I223492d1e565b208362e1a237453b2fead361429 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index e5e90c0..acc81de 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ } ], "require": { - "hallowelt/blue-spice-foundation": "2.27.2" + "composer/installers": "~1.0" }, "support": { "issues": "https://sourceforge.net/projects/bluespice/support;, -- To view, visit https://gerrit.wikimedia.org/r/380735 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I223492d1e565b208362e1a237453b2fead361429 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: REL1_27 Gerrit-Owner: LjonkaGerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel 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...BlueSpicePageAssignments[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380808 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I0c4955fafb8408b1d3dce7b1f0b7f5332bfdfe39 --- A Gruntfile.js A package.json 2 files changed, 30 insertions(+), 0 deletions(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/380808 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0c4955fafb8408b1d3dce7b1f0b7f5332bfdfe39 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpicePageAssignments Gerrit-Branch: master Gerrit-Owner: UmherirrenderGerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: paws_internal: Add the analytics client role back to noteboo...
Madhuvishy has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380914 ) Change subject: paws_internal: Add the analytics client role back to notebook1001 .. paws_internal: Add the analytics client role back to notebook1001 Change-Id: I78dfc5847c9ad89044f144a7621c7f6d7cd20364 --- M manifests/site.pp 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Madhuvishy: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index 9085ec4..b44e5b6 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1875,8 +1875,7 @@ # Experimental Jupyter notebook servers node 'notebook1001.eqiad.wmnet' { -role(paws_internal::jupyterhub, paws_internal::mysql_access) - +role(paws_internal::jupyterhub, analytics_cluster::client, paws_internal::mysql_access) include ::standard } node 'notebook1002.eqiad.wmnet' { -- To view, visit https://gerrit.wikimedia.org/r/380914 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I78dfc5847c9ad89044f144a7621c7f6d7cd20364 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: MadhuvishyGerrit-Reviewer: Madhuvishy Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: paws_internal: Add the analytics client role back to noteboo...
Madhuvishy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380914 ) Change subject: paws_internal: Add the analytics client role back to notebook1001 .. paws_internal: Add the analytics client role back to notebook1001 Change-Id: I78dfc5847c9ad89044f144a7621c7f6d7cd20364 --- M manifests/site.pp 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/14/380914/1 diff --git a/manifests/site.pp b/manifests/site.pp index 9085ec4..b44e5b6 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1875,8 +1875,7 @@ # Experimental Jupyter notebook servers node 'notebook1001.eqiad.wmnet' { -role(paws_internal::jupyterhub, paws_internal::mysql_access) - +role(paws_internal::jupyterhub, analytics_cluster::client, paws_internal::mysql_access) include ::standard } node 'notebook1002.eqiad.wmnet' { -- To view, visit https://gerrit.wikimedia.org/r/380914 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I78dfc5847c9ad89044f144a7621c7f6d7cd20364 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Madhuvishy___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Enable https instead of http for phabricator
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/377051 ) Change subject: Enable https instead of http for phabricator .. Enable https instead of http for phabricator cloud supports https and http, lets use https. Change-Id: I193223059e60c76b9596d94ba52cedf2afa4a6dd --- M puppet/modules/phabricator/manifests/init.pp 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified Dzahn: Looks good to me, but someone else must approve diff --git a/puppet/modules/phabricator/manifests/init.pp b/puppet/modules/phabricator/manifests/init.pp index bfd3aa7..b582050 100644 --- a/puppet/modules/phabricator/manifests/init.pp +++ b/puppet/modules/phabricator/manifests/init.pp @@ -29,6 +29,7 @@ $vhost_name, $remote, $branch = undef, +$protocol = 'http', ){ require ::arcanist include ::apache @@ -82,7 +83,7 @@ } phabricator::config { 'phabricator.base-uri': -value => "http://${vhost_name}${::port_fragment}/;, +value => "${protocol}://${vhost_name}${::port_fragment}/", } phabricator::config { 'pygments.enabled': -- To view, visit https://gerrit.wikimedia.org/r/377051 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I193223059e60c76b9596d94ba52cedf2afa4a6dd Gerrit-PatchSet: 7 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: BryanDavis Gerrit-Reviewer: Dduvall Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Paladox Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Add John Michael Kohler Art Center throttle rule" be...
Hello Urbanecm, Catrope, Melos, jenkins-bot, Samtar, Dereckson, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/380913 to review the following change. Change subject: Revert "Add John Michael Kohler Art Center throttle rule" because rule expired. .. Revert "Add John Michael Kohler Art Center throttle rule" because rule expired. This reverts commit 5ec20ca6593a7fcaa63cd426905c0807e8e64e8b. Bug: T176287 Change-Id: Ibdf31a13ea51d8f3f0cd68fd33ef43983f092ffe --- M wmf-config/throttle.php 1 file changed, 22 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/13/380913/1 diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php index 4d3e40f..1d83a31 100644 --- a/wmf-config/throttle.php +++ b/wmf-config/throttle.php @@ -44,13 +44,27 @@ 'value' => 120 // 100 expected ]; -$wmgThrottlingExceptions[] = [ // T176287 - John Michael Kohler Art Center - 'from' => '2017-09-21T13:00-05:00', // Central - 'to' => '2017-09-26T22:00-05:00', - 'IP' => [ - '192.168.50.52', - ], - 'dbname' => [ 'enwiki', 'commonswiki' ], - 'value' => 100, // 100 expected participants (not specified) +$wmgThrottlingExceptions[] = [ // T175534 (1) + 'from' => '2017-09-16T10:00 +8:00', + 'to' => '2017-09-16T17:00 +8:00', + 'IP' => '140.114.51.248', + 'dbname' => [ 'commonswiki', 'zhwiki' ], + 'value' => 80, // 50 expected +]; + +$wmgThrottlingExceptions[] = [ // T175534 (2) + 'from' => '2017-09-17T09:00 +8:00', + 'to' => '2017-09-17T16:00 +8:00', + 'IP' => '140.114.51.248', + 'dbname' => [ 'commonswiki', 'zhwiki' ], + 'value' => 80, // 50 expected +]; + +$wmgThrottlingExceptions[] = [ // T175700 + 'from' => '2017-09-15T10:00 +1:00', + 'to' => '2017-09-15T18:00 +1:00', + 'range' => '130.88.64.0/24', + 'dbname' => [ 'enwiki' ], + 'value' => 30 // 20 expected ]; ## Add throttling definitions above. -- To view, visit https://gerrit.wikimedia.org/r/380913 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibdf31a13ea51d8f3f0cd68fd33ef43983f092ffe Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Zoranzoki21Gerrit-Reviewer: Catrope Gerrit-Reviewer: Dereckson Gerrit-Reviewer: Melos Gerrit-Reviewer: Samtar Gerrit-Reviewer: Urbanecm 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...Flow[master]: BadImageRemover: Update for figure-inline change in Parsoid
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380890 ) Change subject: BadImageRemover: Update for figure-inline change in Parsoid .. BadImageRemover: Update for figure-inline change in Parsoid Bug: T173972 Change-Id: I80506d71d3f035fdf3970d7619219791640669e3 --- M includes/Parsoid/Fixer/BadImageRemover.php M tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php 2 files changed, 25 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Arlolra: Looks good to me, but someone else must approve Jforrester: Looks good to me, approved diff --git a/includes/Parsoid/Fixer/BadImageRemover.php b/includes/Parsoid/Fixer/BadImageRemover.php index 8f97675..3fedf06 100644 --- a/includes/Parsoid/Fixer/BadImageRemover.php +++ b/includes/Parsoid/Fixer/BadImageRemover.php @@ -41,7 +41,7 @@ * @return string */ public function getXPath() { - return '//span[@typeof="mw:Image"]//img[@resource]'; + return '//figure-inline[@typeof="mw:Image"]//img[@resource] | //span[@typeof="mw:Image"]//img[@resource]'; } /** diff --git a/tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php b/tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php index 47c9994..251f36a 100644 --- a/tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php +++ b/tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php @@ -21,6 +21,18 @@ [ 'Passes through allowed good images', // expected html after filtering + ' and other stuff', + // input html + ' and other stuff', + // accept/decline callback + function () { + return false; + } + ], + + [ + 'Passes through allowed good images (with legacy span markup)', + // expected html after filtering ' and other stuff', // input html ' and other stuff', @@ -47,6 +59,18 @@ // expected html after filtering ' and other stuff', // input html + ' and other stuff', + // accept/decline callback + function () { + return true; + } + ], + + [ + 'Strips declined images (with legacy span markup)', + // expected html after filtering + ' and other stuff', + // input html ' and other stuff', // accept/decline callback function () { -- To view, visit https://gerrit.wikimedia.org/r/380890 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I80506d71d3f035fdf3970d7619219791640669e3 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: CatropeGerrit-Reviewer: Arlolra Gerrit-Reviewer: Jforrester 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...VisualEditor[REL1_30]: Update VE core submodule to REL1_30 HEAD (9581fbc0b)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380911 ) Change subject: Update VE core submodule to REL1_30 HEAD (9581fbc0b) .. Update VE core submodule to REL1_30 HEAD (9581fbc0b) New changes: 9581fbc0b Do not setup inline slugs when rendering is locked Bug: T176762 Change-Id: I7d80ad9480f5168231c0f2ea53f75e8f4c776224 --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/lib/ve b/lib/ve index 29c035b..9581fbc 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 29c035b8f20cadc31225644e94d5d2be54af209d +Subproject commit 9581fbc0bd6141879b119ebc9d36af3bd4eb944a -- To view, visit https://gerrit.wikimedia.org/r/380911 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7d80ad9480f5168231c0f2ea53f75e8f4c776224 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: REL1_30 Gerrit-Owner: JforresterGerrit-Reviewer: Jforrester 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/vagrant[master]: scholarships: ensure db created before schema load
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380912 ) Change subject: scholarships: ensure db created before schema load .. scholarships: ensure db created before schema load Change-Id: Id0257886733a3ffa4dcc9186e4ee54564933b8b2 --- M puppet/modules/scholarships/manifests/init.pp 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/scholarships/manifests/init.pp b/puppet/modules/scholarships/manifests/init.pp index fff044a..492a4e5 100644 --- a/puppet/modules/scholarships/manifests/init.pp +++ b/puppet/modules/scholarships/manifests/init.pp @@ -67,7 +67,10 @@ mysql::sql { 'Load scholarships schema': sql => "USE ${db_name}; SOURCE ${deploy_dir}/data/db/schema.mysql;", unless => template('scholarships/load_schema_unless.sql.erb'), -require => Git::Clone['wikimedia/wikimania-scholarships'], +require => [ +Git::Clone['wikimedia/wikimania-scholarships'], +Mysql::Db[$db_name], +], } mysql::sql { 'create_scholarships_admin_user': -- To view, visit https://gerrit.wikimedia.org/r/380912 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id0257886733a3ffa4dcc9186e4ee54564933b8b2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: BryanDavisGerrit-Reviewer: BryanDavis Gerrit-Reviewer: Dduvall 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/vagrant[master]: scholarships: ensure db created before schema load
BryanDavis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380912 ) Change subject: scholarships: ensure db created before schema load .. scholarships: ensure db created before schema load Change-Id: Id0257886733a3ffa4dcc9186e4ee54564933b8b2 --- M puppet/modules/scholarships/manifests/init.pp 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/12/380912/1 diff --git a/puppet/modules/scholarships/manifests/init.pp b/puppet/modules/scholarships/manifests/init.pp index fff044a..492a4e5 100644 --- a/puppet/modules/scholarships/manifests/init.pp +++ b/puppet/modules/scholarships/manifests/init.pp @@ -67,7 +67,10 @@ mysql::sql { 'Load scholarships schema': sql => "USE ${db_name}; SOURCE ${deploy_dir}/data/db/schema.mysql;", unless => template('scholarships/load_schema_unless.sql.erb'), -require => Git::Clone['wikimedia/wikimania-scholarships'], +require => [ +Git::Clone['wikimedia/wikimania-scholarships'], +Mysql::Db[$db_name], +], } mysql::sql { 'create_scholarships_admin_user': -- To view, visit https://gerrit.wikimedia.org/r/380912 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id0257886733a3ffa4dcc9186e4ee54564933b8b2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: BryanDavis___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (8184ce0f9)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380906 ) Change subject: Update VE core submodule to master (8184ce0f9) .. Update VE core submodule to master (8184ce0f9) New changes: 0a45d669c Replace constructive with progressive UI flag 4ff90218d ve.ce.Surface: Fix typo in documentation 605752edb Update OOjs UI to v0.23.2 7bcb9084b Do not setup inline slugs when rendering is locked Bug: T176762 Change-Id: Ic8b8a0209306e4fabfbffd809d3f203cb1472cc9 --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index 723b85d..8184ce0 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 723b85d6c354297e89910dca10f1adca974400bd +Subproject commit 8184ce0f96bbefb0004e54c715583f15c44762ff -- To view, visit https://gerrit.wikimedia.org/r/380906 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic8b8a0209306e4fabfbffd809d3f203cb1472cc9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: Catrope 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...PhabTaskGraph[master]: Fixed jiggling on mouseout when graph is already at rest.
Cicalese has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380909 ) Change subject: Fixed jiggling on mouseout when graph is already at rest. .. Fixed jiggling on mouseout when graph is already at rest. Change-Id: Icfd127625a836977cc977ef5dd900f4e3c7373d1 --- M resources/PhabTaskGraph.js 1 file changed, 16 insertions(+), 12 deletions(-) Approvals: Cicalese: Verified; Looks good to me, approved diff --git a/resources/PhabTaskGraph.js b/resources/PhabTaskGraph.js index c41a78c..3f975fd 100644 --- a/resources/PhabTaskGraph.js +++ b/resources/PhabTaskGraph.js @@ -146,13 +146,15 @@ } }); - var stop_tooltip = false; - var stop_drag = false; + var dragging = false; + var paused = false; node .on('mouseover', function (d) { - stop_tooltip = true; - force.stop(); + if (force.alpha()) { + force.stop(); + paused = true; + } tooltip .transition() .duration(200) @@ -165,9 +167,9 @@ node .on('mouseout', function (d) { - stop_tooltip = false; - if (!stop_drag) { + if (!dragging && paused) { force.resume(); + paused = false; } tooltip .transition() @@ -182,8 +184,11 @@ drag .on('dragstart', function (d) { d3.event.sourceEvent.stopPropagation(); - stop_drag = true; - force.stop(); + dragging = true; + if (force.alpha()) { + force.stop(); + paused = true; + } }); drag @@ -201,10 +206,9 @@ d.fixed = !d.fixed; } tick(); - stop_drag = false; - if (!stop_tooltip) { - force.resume(); - } + dragging = false; + force.resume(); + paused = false; }); node -- To view, visit https://gerrit.wikimedia.org/r/380909 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icfd127625a836977cc977ef5dd900f4e3c7373d1 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/PhabTaskGraph Gerrit-Branch: master Gerrit-Owner: CicaleseGerrit-Reviewer: Cicalese ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[REL1_30]: Update VE core submodule to wmf/1.31.0-wmf.1 HEAD (9581fbc0b)
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380911 ) Change subject: Update VE core submodule to wmf/1.31.0-wmf.1 HEAD (9581fbc0b) .. Update VE core submodule to wmf/1.31.0-wmf.1 HEAD (9581fbc0b) New changes: 9581fbc0b Do not setup inline slugs when rendering is locked Bug: T176762 Change-Id: I7d80ad9480f5168231c0f2ea53f75e8f4c776224 --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/11/380911/1 diff --git a/lib/ve b/lib/ve index 29c035b..9581fbc 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 29c035b8f20cadc31225644e94d5d2be54af209d +Subproject commit 9581fbc0bd6141879b119ebc9d36af3bd4eb944a -- To view, visit https://gerrit.wikimedia.org/r/380911 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d80ad9480f5168231c0f2ea53f75e8f4c776224 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: REL1_30 Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.31.0-wmf.1]: Update VE core submodule to wmf/1.31.0-wmf.1 HEAD (11be03f5b)
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380910 ) Change subject: Update VE core submodule to wmf/1.31.0-wmf.1 HEAD (11be03f5b) .. Update VE core submodule to wmf/1.31.0-wmf.1 HEAD (11be03f5b) New changes: 11be03f5b Do not setup inline slugs when rendering is locked Bug: T176762 Change-Id: I7d80ad9480f5168231c0f2ea53f75e8f4c776224 --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/10/380910/1 diff --git a/lib/ve b/lib/ve index 723b85d..11be03f 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 723b85d6c354297e89910dca10f1adca974400bd +Subproject commit 11be03f5b680e0195caca5eff441186c9c821ef3 -- To view, visit https://gerrit.wikimedia.org/r/380910 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d80ad9480f5168231c0f2ea53f75e8f4c776224 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: wmf/1.31.0-wmf.1 Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PhabTaskGraph[master]: Fixed jiggling on mouseout when graph is already at rest.
Cicalese has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380909 ) Change subject: Fixed jiggling on mouseout when graph is already at rest. .. Fixed jiggling on mouseout when graph is already at rest. Change-Id: Icfd127625a836977cc977ef5dd900f4e3c7373d1 --- M resources/PhabTaskGraph.js 1 file changed, 19 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PhabTaskGraph refs/changes/09/380909/1 diff --git a/resources/PhabTaskGraph.js b/resources/PhabTaskGraph.js index c41a78c..fe991a9 100644 --- a/resources/PhabTaskGraph.js +++ b/resources/PhabTaskGraph.js @@ -146,13 +146,17 @@ } }); - var stop_tooltip = false; - var stop_drag = false; + var displaying_tooltip = false; + var dragging = false; + var paused = false; node .on('mouseover', function (d) { - stop_tooltip = true; - force.stop(); + displaying_tooltip = true; + if (force.alpha()) { + force.stop(); + paused = true; + } tooltip .transition() .duration(200) @@ -165,9 +169,10 @@ node .on('mouseout', function (d) { - stop_tooltip = false; - if (!stop_drag) { + displaying_tooltip = false; + if (!dragging && paused) { force.resume(); + paused = false; } tooltip .transition() @@ -182,8 +187,11 @@ drag .on('dragstart', function (d) { d3.event.sourceEvent.stopPropagation(); - stop_drag = true; - force.stop(); + dragging = true; + if (force.alpha()) { + force.stop(); + paused = true; + } }); drag @@ -201,10 +209,9 @@ d.fixed = !d.fixed; } tick(); - stop_drag = false; - if (!stop_tooltip) { - force.resume(); - } + dragging = false; + force.resume(); + paused = false; }); node -- To view, visit https://gerrit.wikimedia.org/r/380909 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icfd127625a836977cc977ef5dd900f4e3c7373d1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PhabTaskGraph Gerrit-Branch: master Gerrit-Owner: Cicalese___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[REL1_30]: Update VE core submodule to wmf/1.31.0-wmf.1 HEAD (11be03f5b)
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380908 ) Change subject: Update VE core submodule to wmf/1.31.0-wmf.1 HEAD (11be03f5b) .. Update VE core submodule to wmf/1.31.0-wmf.1 HEAD (11be03f5b) New changes: 11be03f5b Do not setup inline slugs when rendering is locked Bug: T176762 Change-Id: I7d80ad9480f5168231c0f2ea53f75e8f4c776244 --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/08/380908/1 diff --git a/lib/ve b/lib/ve index 723b85d..11be03f 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 723b85d6c354297e89910dca10f1adca974400bd +Subproject commit 11be03f5b680e0195caca5eff441186c9c821ef3 -- To view, visit https://gerrit.wikimedia.org/r/380908 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d80ad9480f5168231c0f2ea53f75e8f4c776244 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: REL1_30 Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[wmf/1.31.0-wmf.1]: Do not setup inline slugs when rendering is locked
Jforrester has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380905 ) Change subject: Do not setup inline slugs when rendering is locked .. Do not setup inline slugs when rendering is locked Bug: T176762 Change-Id: I54ab0c936efd27657bf8ad8899c5490291b0e0bb (cherry picked from commit 7bcb9084baefe9fd96713cff1509c6c99439b278) --- M src/ce/ve.ce.ContentBranchNode.js 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/src/ce/ve.ce.ContentBranchNode.js b/src/ce/ve.ce.ContentBranchNode.js index 6e73bf5..cd3a292 100644 --- a/src/ce/ve.ce.ContentBranchNode.js +++ b/src/ce/ve.ce.ContentBranchNode.js @@ -161,6 +161,7 @@ */ ve.ce.ContentBranchNode.prototype.setupBlockSlugs = function () { // Respect render lock + // TODO: Can this check be moved into the parent method? if ( this.root instanceof ve.ce.DocumentNode && this.root.getSurface().isRenderingLocked() @@ -172,6 +173,22 @@ }; /** + * @inheritdoc + */ +ve.ce.ContentBranchNode.prototype.setupInlineSlugs = function () { + // Respect render lock + // TODO: Can this check be moved into the parent method? + if ( + this.root instanceof ve.ce.DocumentNode && + this.root.getSurface().isRenderingLocked() + ) { + return; + } + // Parent method + ve.ce.ContentBranchNode.super.prototype.setupInlineSlugs.apply( this, arguments ); +}; + +/** * Get an HTML rendering of the contents. * * If you are actually going to append the result to a DOM, you need to -- To view, visit https://gerrit.wikimedia.org/r/380905 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I54ab0c936efd27657bf8ad8899c5490291b0e0bb Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: wmf/1.31.0-wmf.1 Gerrit-Owner: JforresterGerrit-Reviewer: Divec Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[REL1_30]: Do not setup inline slugs when rendering is locked
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380907 ) Change subject: Do not setup inline slugs when rendering is locked .. Do not setup inline slugs when rendering is locked Bug: T176762 Change-Id: I54ab0c936efd27657bf8ad8899c5490291b0e0bb (cherry picked from commit 7bcb9084baefe9fd96713cff1509c6c99439b278) --- M src/ce/ve.ce.ContentBranchNode.js 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/src/ce/ve.ce.ContentBranchNode.js b/src/ce/ve.ce.ContentBranchNode.js index 6e73bf5..cd3a292 100644 --- a/src/ce/ve.ce.ContentBranchNode.js +++ b/src/ce/ve.ce.ContentBranchNode.js @@ -161,6 +161,7 @@ */ ve.ce.ContentBranchNode.prototype.setupBlockSlugs = function () { // Respect render lock + // TODO: Can this check be moved into the parent method? if ( this.root instanceof ve.ce.DocumentNode && this.root.getSurface().isRenderingLocked() @@ -172,6 +173,22 @@ }; /** + * @inheritdoc + */ +ve.ce.ContentBranchNode.prototype.setupInlineSlugs = function () { + // Respect render lock + // TODO: Can this check be moved into the parent method? + if ( + this.root instanceof ve.ce.DocumentNode && + this.root.getSurface().isRenderingLocked() + ) { + return; + } + // Parent method + ve.ce.ContentBranchNode.super.prototype.setupInlineSlugs.apply( this, arguments ); +}; + +/** * Get an HTML rendering of the contents. * * If you are actually going to append the result to a DOM, you need to -- To view, visit https://gerrit.wikimedia.org/r/380907 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I54ab0c936efd27657bf8ad8899c5490291b0e0bb Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: REL1_30 Gerrit-Owner: JforresterGerrit-Reviewer: Divec Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[REL1_30]: Do not setup inline slugs when rendering is locked
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380907 ) Change subject: Do not setup inline slugs when rendering is locked .. Do not setup inline slugs when rendering is locked Bug: T176762 Change-Id: I54ab0c936efd27657bf8ad8899c5490291b0e0bb (cherry picked from commit 7bcb9084baefe9fd96713cff1509c6c99439b278) --- M src/ce/ve.ce.ContentBranchNode.js 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/07/380907/1 diff --git a/src/ce/ve.ce.ContentBranchNode.js b/src/ce/ve.ce.ContentBranchNode.js index 6e73bf5..cd3a292 100644 --- a/src/ce/ve.ce.ContentBranchNode.js +++ b/src/ce/ve.ce.ContentBranchNode.js @@ -161,6 +161,7 @@ */ ve.ce.ContentBranchNode.prototype.setupBlockSlugs = function () { // Respect render lock + // TODO: Can this check be moved into the parent method? if ( this.root instanceof ve.ce.DocumentNode && this.root.getSurface().isRenderingLocked() @@ -172,6 +173,22 @@ }; /** + * @inheritdoc + */ +ve.ce.ContentBranchNode.prototype.setupInlineSlugs = function () { + // Respect render lock + // TODO: Can this check be moved into the parent method? + if ( + this.root instanceof ve.ce.DocumentNode && + this.root.getSurface().isRenderingLocked() + ) { + return; + } + // Parent method + ve.ce.ContentBranchNode.super.prototype.setupInlineSlugs.apply( this, arguments ); +}; + +/** * Get an HTML rendering of the contents. * * If you are actually going to append the result to a DOM, you need to -- To view, visit https://gerrit.wikimedia.org/r/380907 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54ab0c936efd27657bf8ad8899c5490291b0e0bb Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: REL1_30 Gerrit-Owner: JforresterGerrit-Reviewer: Divec ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (8184ce0f9)
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380906 ) Change subject: Update VE core submodule to master (8184ce0f9) .. Update VE core submodule to master (8184ce0f9) New changes: 0a45d669c Replace constructive with progressive UI flag 4ff90218d ve.ce.Surface: Fix typo in documentation 605752edb Update OOjs UI to v0.23.2 7bcb9084b Do not setup inline slugs when rendering is locked Bug: T176762 Change-Id: Ic8b8a0209306e4fabfbffd809d3f203cb1472cc9 --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/06/380906/1 diff --git a/lib/ve b/lib/ve index 723b85d..8184ce0 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 723b85d6c354297e89910dca10f1adca974400bd +Subproject commit 8184ce0f96bbefb0004e54c715583f15c44762ff -- To view, visit https://gerrit.wikimedia.org/r/380906 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8b8a0209306e4fabfbffd809d3f203cb1472cc9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[wmf/1.31.0-wmf.1]: Do not setup inline slugs when rendering is locked
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380905 ) Change subject: Do not setup inline slugs when rendering is locked .. Do not setup inline slugs when rendering is locked Bug: T176762 Change-Id: I54ab0c936efd27657bf8ad8899c5490291b0e0bb (cherry picked from commit 7bcb9084baefe9fd96713cff1509c6c99439b278) --- M src/ce/ve.ce.ContentBranchNode.js 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/05/380905/1 diff --git a/src/ce/ve.ce.ContentBranchNode.js b/src/ce/ve.ce.ContentBranchNode.js index 6e73bf5..cd3a292 100644 --- a/src/ce/ve.ce.ContentBranchNode.js +++ b/src/ce/ve.ce.ContentBranchNode.js @@ -161,6 +161,7 @@ */ ve.ce.ContentBranchNode.prototype.setupBlockSlugs = function () { // Respect render lock + // TODO: Can this check be moved into the parent method? if ( this.root instanceof ve.ce.DocumentNode && this.root.getSurface().isRenderingLocked() @@ -172,6 +173,22 @@ }; /** + * @inheritdoc + */ +ve.ce.ContentBranchNode.prototype.setupInlineSlugs = function () { + // Respect render lock + // TODO: Can this check be moved into the parent method? + if ( + this.root instanceof ve.ce.DocumentNode && + this.root.getSurface().isRenderingLocked() + ) { + return; + } + // Parent method + ve.ce.ContentBranchNode.super.prototype.setupInlineSlugs.apply( this, arguments ); +}; + +/** * Get an HTML rendering of the contents. * * If you are actually going to append the result to a DOM, you need to -- To view, visit https://gerrit.wikimedia.org/r/380905 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54ab0c936efd27657bf8ad8899c5490291b0e0bb Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: wmf/1.31.0-wmf.1 Gerrit-Owner: JforresterGerrit-Reviewer: Divec ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Do not setup inline slugs when rendering is locked
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380900 ) Change subject: Do not setup inline slugs when rendering is locked .. Do not setup inline slugs when rendering is locked Bug: T176762 Change-Id: I54ab0c936efd27657bf8ad8899c5490291b0e0bb --- M src/ce/ve.ce.ContentBranchNode.js 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/src/ce/ve.ce.ContentBranchNode.js b/src/ce/ve.ce.ContentBranchNode.js index 6e73bf5..cd3a292 100644 --- a/src/ce/ve.ce.ContentBranchNode.js +++ b/src/ce/ve.ce.ContentBranchNode.js @@ -161,6 +161,7 @@ */ ve.ce.ContentBranchNode.prototype.setupBlockSlugs = function () { // Respect render lock + // TODO: Can this check be moved into the parent method? if ( this.root instanceof ve.ce.DocumentNode && this.root.getSurface().isRenderingLocked() @@ -172,6 +173,22 @@ }; /** + * @inheritdoc + */ +ve.ce.ContentBranchNode.prototype.setupInlineSlugs = function () { + // Respect render lock + // TODO: Can this check be moved into the parent method? + if ( + this.root instanceof ve.ce.DocumentNode && + this.root.getSurface().isRenderingLocked() + ) { + return; + } + // Parent method + ve.ce.ContentBranchNode.super.prototype.setupInlineSlugs.apply( this, arguments ); +}; + +/** * Get an HTML rendering of the contents. * * If you are actually going to append the result to a DOM, you need to -- To view, visit https://gerrit.wikimedia.org/r/380900 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I54ab0c936efd27657bf8ad8899c5490291b0e0bb Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: DivecGerrit-Reviewer: Catrope Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] marvin[master]: Chore: add missing types to page summaries
Niedzielski has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380903 ) Change subject: Chore: add missing types to page summaries .. Chore: add missing types to page summaries - Add missed response ETags, Mobile Content Service Errors, and request redirects to page summaries for completeness. These aren't currently used but Marvin's definition for the service responses should be accurate. Error is currently unreferenced but will soon be wanted. - Add missing references to page summary related types. Most of these are URLs but may be difficult to uncover because they live in multiple services. Bug: T173324 Change-Id: I475f6d78151d4c5d403454b02554a163607f7daa --- M package-lock.json M package.json M src/common/data-clients/page-data-client.ts M src/common/marshallers/page-restbase-mount-everest-expected.test.json M src/common/marshallers/page-unmarshaller.test.ts M src/common/marshallers/page-unmarshaller.ts M src/common/marshallers/restbase.ts M src/common/models/page.ts A src/common/types/isomorphic-unfetch-extras.d.ts 9 files changed, 99 insertions(+), 925 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/03/380903/1 diff --git a/package-lock.json b/package-lock.json index 98b229f..d294cc6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,6 +74,15 @@ "integrity": "sha512-HupkFXEv3O3KSzcr3Ylfajg0kaerBg1DyaZzRBBQfrU3NN1mTBRE7sCveqHwXLS5Yrjvww8qFzkzYQQakG9FuQ==", "dev": true }, +"@types/node-fetch": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-1.6.7.tgz;, + "integrity": "sha1-UhB46PDGmhWOUCIAWsqS0mIPbVc=", + "dev": true, + "requires": { +"@types/node": "8.0.28" + } +}, "@types/serve-static": { "version": "1.7.32", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.7.32.tgz;, @@ -779,7 +788,6 @@ "requires": { "anymatch": "1.3.2", "async-each": "1.0.1", -"fsevents": "1.1.2", "glob-parent": "2.0.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -2320,905 +2328,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz;, "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true -}, -"fsevents": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz;, - "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==", - "dev": true, - "optional": true, - "requires": { -"nan": "2.7.0", -"node-pre-gyp": "0.6.36" - }, - "dependencies": { -"abbrev": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true -}, -"ajv": { - "version": "4.11.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { -"co": "4.6.0", -"json-stable-stringify": "1.0.1" - } -}, -"ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true -}, -"aproba": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true -}, -"are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { -"delegates": "1.0.0", -"readable-stream": "2.2.9" - } -}, -"asn1": { - "version": "0.2.3", - "bundled": true, - "dev": true, - "optional": true -}, -"assert-plus": { - "version": "0.2.0", - "bundled": true, - "dev": true, - "optional": true -}, -"asynckit": { - "version": "0.4.0", - "bundled": true, - "dev": true, - "optional": true -}, -"aws-sign2": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true -}, -"aws4": { - "version": "1.6.0", - "bundled": true, - "dev": true, - "optional": true -}, -"balanced-match": { - "version": "0.4.2", - "bundled": true, - "dev": true -}, -"bcrypt-pbkdf": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { -"tweetnacl": "0.14.5" - } -}, -"block-stream": { - "version": "0.0.9", - "bundled": true, - "dev": true, - "requires": { -
[MediaWiki-commits] [Gerrit] marvin[master]: Chore: move page summaries to distinct endpoint
Niedzielski has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380902 ) Change subject: Chore: move page summaries to distinct endpoint .. Chore: move page summaries to distinct endpoint Move page summaries to a new endpoint, `page/summary/:title`, to allow wiki pages and page summaries to coexist. Bug: T173324 Change-Id: Iecd3887a47ccf861f4f7417810b8080dbd9ee8f4 --- M src/common/pages/home.tsx R src/common/pages/summary.tsx M src/common/routers/api.test.ts M src/common/routers/api.ts 4 files changed, 19 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/02/380902/1 diff --git a/src/common/pages/home.tsx b/src/common/pages/home.tsx index 80dc985..38f119d 100644 --- a/src/common/pages/home.tsx +++ b/src/common/pages/home.tsx @@ -1,6 +1,6 @@ import { h } from "preact"; import App from "../components/app/app"; -import { about, home, wiki, styleGuide } from "../../common/routers/api"; +import { about, home, summary, styleGuide } from "../../common/routers/api"; import Page from "../components/page/page"; import Link from "../components/link"; @@ -22,21 +22,23 @@ Style Guide - Banana + Banana - + Bill & Ted's Excellent Adventure - Cucumber + Cucumber - Ice cream + Ice cream - + Article without image diff --git a/src/common/pages/wiki.tsx b/src/common/pages/summary.tsx similarity index 100% rename from src/common/pages/wiki.tsx rename to src/common/pages/summary.tsx diff --git a/src/common/routers/api.test.ts b/src/common/routers/api.test.ts index 6c1d769..9627afd 100644 --- a/src/common/routers/api.test.ts +++ b/src/common/routers/api.test.ts @@ -1,5 +1,5 @@ import * as assert from "assert"; -import { home, about, wiki, styleGuide, notFound } from "./api"; +import { home, about, summary, styleGuide, notFound } from "./api"; import { Route, RouteParams } from "./route"; const testPathParams = ({ @@ -33,9 +33,9 @@ // eslint-disable-next-line max-len describe("each route's path, URL parameters, and route parameters match:", () => { [ - { name: "wiki", route: wiki, params: { title: "title" } }, { name: "home", route: home, params: undefined }, { name: "about", route: about, params: undefined }, + { name: "summary", route: summary, params: { title: "title" } }, { name: "styleGuide", route: styleGuide, params: undefined }, { name: "notFound", route: notFound, params: { 0: "/404" } } ].forEach(testPathParams); diff --git a/src/common/routers/api.ts b/src/common/routers/api.ts index 5297704..68d6064 100644 --- a/src/common/routers/api.ts +++ b/src/common/routers/api.ts @@ -1,5 +1,8 @@ import { Params as NotFoundParams } from "../pages/not-found"; -import { Props as WikiProps, Params as WikiParams } from "../pages/wiki"; +import { + Props as SummaryProps, + Params as SummaryParams +} from "../pages/summary"; import { AnyRoute, Route, newRoute } from "./route"; export const home: Route = newRoute({ @@ -18,11 +21,11 @@ status: 200 }); -export const wiki: Route= newRoute({ - path: "/wiki/:title", +export const summary: Route = newRoute({ + path: "/page/summary/:title", importModule: () => -import(/* webpackChunkName: "pages/wiki" */ "../pages/wiki"), - chunkName: "pages/wiki", +import(/* webpackChunkName: "pages/summary" */ "../pages/summary"), + chunkName: "pages/summary", status: 200 }); @@ -44,4 +47,4 @@ status: 404 }); -export const routes: AnyRoute[] = [home, about, wiki, styleGuide, notFound]; +export const routes: AnyRoute[] = [home, about, summary, styleGuide, notFound]; -- To view, visit https://gerrit.wikimedia.org/r/380902 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iecd3887a47ccf861f4f7417810b8080dbd9ee8f4 Gerrit-PatchSet: 1 Gerrit-Project: marvin Gerrit-Branch: master Gerrit-Owner: Niedzielski Gerrit-Reviewer: Sniedzielski ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] marvin[master]: Chore: move page summary data client to distinct file
Niedzielski has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380904 ) Change subject: Chore: move page summary data client to distinct file .. Chore: move page summary data client to distinct file Separate out page summary requests from the upcoming page requests since it's large enough to deserve its own module. Bug: T173324 Change-Id: I53ce9202ac15ae1c5913d7cadfbcbd9f4dbaf560 --- A src/common/data-clients/page-summary-data-client.ts M src/common/marshallers/restbase.ts M src/common/pages/summary.tsx 3 files changed, 42 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/04/380904/1 diff --git a/src/common/data-clients/page-summary-data-client.ts b/src/common/data-clients/page-summary-data-client.ts new file mode 100644 index 000..e1a109d --- /dev/null +++ b/src/common/data-clients/page-summary-data-client.ts @@ -0,0 +1,37 @@ +import * as fetch from "isomorphic-unfetch"; +import { PageSummary, PageTitlePath } from "../models/page"; +import { RESTBase } from "../marshallers/restbase"; +import { unmarshalPageSummary } from "../marshallers/page-unmarshaller"; + +// https://en.wikipedia.org/api/rest_v1/#!/Page_content/get_page_summary_title +export interface Params { + titlePath: PageTitlePath; + + /** + * When enabled (the default), requests for [redirect pages] return an HTTP + * 302 with a redirect target in the Location header and content in the body. + * When disabled, an HTTP 200 response is returned instead. + * + * Beware that redirected pre-flighted cross-origin requests (such as those + * sending custom request headers like Api-User-Agent) will fail in most + * current browsers due to a [spec bug]. + * + * [redirect pages]: https://www.mediawiki.org/wiki/Help:Redirects + * [spec bug]: https://github.com/whatwg/fetch/issues/204 + */ + redirect?: boolean; +} + +const url = ({ titlePath, redirect }: Params) => { + const redirectParam = redirect === undefined ? "" : `=${redirect}`; + return `https://en.wikipedia.org/api/rest_v1/page/summary/${titlePath}${redirectParam}`; +}; + +const HEADERS = { + accept: RESTBase.PageSummary.ACCEPT_HEADER +}; + +export const request = (params: Params): Promise => + fetch(url(params), { headers: HEADERS }) +.then(response => Promise.all([response.headers, response.json()])) +.then(([headers, json]) => unmarshalPageSummary({ headers, json })); diff --git a/src/common/marshallers/restbase.ts b/src/common/marshallers/restbase.ts index a8e9086..e5055c3 100644 --- a/src/common/marshallers/restbase.ts +++ b/src/common/marshallers/restbase.ts @@ -23,6 +23,9 @@ // https://en.wikipedia.org/api/rest_v1/#!/Page_content/get_page_summary_title export namespace PageSummary { +export const ACCEPT_HEADER: string = + 'application/json; charset=utf-8; profile="https://www.mediawiki.org/wiki/Specs/Summary/1.2.0;'; + // https://phabricator.wikimedia.org/diffusion/GRES/browse/master/v1/summary.yaml;efa0412225221d49e901fdce0ba2ae88cd6ccc11$138 export interface Thumbnail { source: string; diff --git a/src/common/pages/summary.tsx b/src/common/pages/summary.tsx index 40bc587..23f3919 100644 --- a/src/common/pages/summary.tsx +++ b/src/common/pages/summary.tsx @@ -9,7 +9,7 @@ } from "../models/page"; import Page from "../components/page/page"; import { RouteParams } from "../routers/route"; -import { requestPageSummary } from "../data-clients/page-data-client"; +import { request } from "../data-clients/page-summary-data-client"; export interface Params extends RouteParams { /** @@ -24,7 +24,7 @@ } export const getInitialProps = ({ title }: Params): Promise => - requestPageSummary({ titlePath: title }).then(summary => ({ summary })); + request({ titlePath: title }).then(summary => ({ summary })); export const Component = ({ summary }: Props): JSX.Element => ( -- To view, visit https://gerrit.wikimedia.org/r/380904 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I53ce9202ac15ae1c5913d7cadfbcbd9f4dbaf560 Gerrit-PatchSet: 1 Gerrit-Project: marvin Gerrit-Branch: master Gerrit-Owner: NiedzielskiGerrit-Reviewer: Sniedzielski ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: objectcache: Improve WANObjectCache test coverage
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380657 ) Change subject: objectcache: Improve WANObjectCache test coverage .. objectcache: Improve WANObjectCache test coverage class WANObjectCache (methods: 30% -> 40%, lines: 62% -> 65%) * doGetWithSetCallback: 98% -> 100% - Add case: Throw for invalid callback. * getWithSetCallback: 86% -> 100% - Cover case: Else branch for `$cur[self::VFLD_VERSION] === $version`. * getMulti: 91% -> 98% - Cover case: If branch for `$this->warmupCache`. * set: 93% -> 100% - Cover case: If branch for `lockTSE >= 0`. * reap: 84% -> 100% - Add case: Error when changeTTL() fails. Change-Id: I4844ab0ebdd4d3ec9acc9cd4500721b04cfda317 --- M tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php 1 file changed, 42 insertions(+), 1 deletion(-) Approvals: Aaron Schulz: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php index c762aa7..137ef0c 100644 --- a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php +++ b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php @@ -5,7 +5,7 @@ class WANObjectCacheTest extends PHPUnit_Framework_TestCase { /** @var WANObjectCache */ private $cache; - /**@var BagOStuff */ + /** @var BagOStuff */ private $internalCache; protected function setUp() { @@ -260,9 +260,19 @@ } /** +* @covers WANObjectCache::getWithSetCallback() +* @covers WANObjectCache::doGetWithSetCallback() +*/ + public function testGetWithSetCallback_invalidCallback() { + $this->setExpectedException( InvalidArgumentException::class ); + $this->cache->getWithSetCallback( 'key', 30, 'invalid callback' ); + } + + /** * @dataProvider getMultiWithSetCallback_provider * @covers WANObjectCache::getMultiWithSetCallback() * @covers WANObjectCache::makeMultiKeys() +* @covers WANObjectCache::getMulti() * @param array $extOpts * @param bool $versioned */ @@ -618,6 +628,7 @@ /** * @covers WANObjectCache::getWithSetCallback() * @covers WANObjectCache::doGetWithSetCallback() +* @covers WANObjectCache::set() */ public function testLockTSESlow() { $cache = $this->cache; @@ -911,6 +922,8 @@ /** * @dataProvider getWithSetCallback_versions_provider +* @covers WANObjectCache::getWithSetCallback() +* @covers WANObjectCache::doGetWithSetCallback() * @param array $extOpts * @param bool $versioned */ @@ -1101,6 +1114,34 @@ } /** +* @covers WANObjectCache::reap() +*/ + public function testReap_fail() { + $backend = $this->getMockBuilder( EmptyBagOStuff::class ) + ->setMethods( [ 'get', 'changeTTL' ] )->getMock(); + $backend->expects( $this->once() )->method( 'get' ) + ->willReturn( [ + WANObjectCache::FLD_VERSION => WANObjectCache::VERSION, + WANObjectCache::FLD_VALUE => 'value', + WANObjectCache::FLD_TTL => 3600, + WANObjectCache::FLD_TIME => 300, + ] ); + $backend->expects( $this->once() )->method( 'changeTTL' ) + ->willReturn( false ); + + $wanCache = new WANObjectCache( [ + 'cache' => $backend, + 'pool' => 'testcache-hash', + 'relayer' => new EventRelayerNull( [] ) + ] ); + + $isStale = null; + $ret = $wanCache->reap( 'key', 360, $isStale ); + $this->assertTrue( $isStale, 'value was stale' ); + $this->assertFalse( $ret, 'changeTTL failed' ); + } + + /** * @covers WANObjectCache::set() */ public function testSetWithLag() { -- To view, visit https://gerrit.wikimedia.org/r/380657 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4844ab0ebdd4d3ec9acc9cd4500721b04cfda317 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: KrinkleGerrit-Reviewer: Aaron Schulz Gerrit-Reviewer: Gilles Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga/base: re-enable screen/tmux monitoring
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380901 ) Change subject: icinga/base: re-enable screen/tmux monitoring .. icinga/base: re-enable screen/tmux monitoring Bug: T165348 Change-Id: I0569c449294603c81ff16fa34ab95a2c7fc5906b --- M modules/base/manifests/monitoring/host.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/01/380901/1 diff --git a/modules/base/manifests/monitoring/host.pp b/modules/base/manifests/monitoring/host.pp index 5c50293..c9cf253 100644 --- a/modules/base/manifests/monitoring/host.pp +++ b/modules/base/manifests/monitoring/host.pp @@ -147,7 +147,7 @@ } } -if hiera('monitor_screens', false) { +if hiera('monitor_screens', true) { file { '/usr/local/lib/nagios/plugins/check_long_procs': ensure => present, -- To view, visit https://gerrit.wikimedia.org/r/380901 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0569c449294603c81ff16fa34ab95a2c7fc5906b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Do not setup inline slugs when rendering is locked
Divec has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380900 ) Change subject: Do not setup inline slugs when rendering is locked .. Do not setup inline slugs when rendering is locked Bug: T176762 Change-Id: I54ab0c936efd27657bf8ad8899c5490291b0e0bb --- M src/ce/ve.ce.ContentBranchNode.js 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/00/380900/1 diff --git a/src/ce/ve.ce.ContentBranchNode.js b/src/ce/ve.ce.ContentBranchNode.js index 6e73bf5..cd3a292 100644 --- a/src/ce/ve.ce.ContentBranchNode.js +++ b/src/ce/ve.ce.ContentBranchNode.js @@ -161,6 +161,7 @@ */ ve.ce.ContentBranchNode.prototype.setupBlockSlugs = function () { // Respect render lock + // TODO: Can this check be moved into the parent method? if ( this.root instanceof ve.ce.DocumentNode && this.root.getSurface().isRenderingLocked() @@ -172,6 +173,22 @@ }; /** + * @inheritdoc + */ +ve.ce.ContentBranchNode.prototype.setupInlineSlugs = function () { + // Respect render lock + // TODO: Can this check be moved into the parent method? + if ( + this.root instanceof ve.ce.DocumentNode && + this.root.getSurface().isRenderingLocked() + ) { + return; + } + // Parent method + ve.ce.ContentBranchNode.super.prototype.setupInlineSlugs.apply( this, arguments ); +}; + +/** * Get an HTML rendering of the contents. * * If you are actually going to append the result to a DOM, you need to -- To view, visit https://gerrit.wikimedia.org/r/380900 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54ab0c936efd27657bf8ad8899c5490291b0e0bb Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Divec___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: [WIP] Seperate emitSep
Arlolra has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380899 ) Change subject: [WIP] Seperate emitSep .. [WIP] Seperate emitSep Change-Id: I92953d00580bf8ad7d5e34a0d804931991da1e43 --- M lib/html2wt/SerializerState.js M lib/html2wt/WikitextSerializer.js M tests/parserTests-blacklist.js 3 files changed, 75 insertions(+), 68 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/99/380899/1 diff --git a/lib/html2wt/SerializerState.js b/lib/html2wt/SerializerState.js index eb93757..5efe9e0 100644 --- a/lib/html2wt/SerializerState.js +++ b/lib/html2wt/SerializerState.js @@ -287,6 +287,74 @@ function() { return JSON.stringify(sep.text); }); }; +/* -- + * When block nodes are deleted, the deletion affects whether unmodified + * newline separators between a pair of unmodified P tags can be reused. + * + * Example: + * Original WT : "xfoo\nbar" + * Original HTML: "xfoo\nbar" + * Edited HTML : "foo\nbar" + * Annotated DOM: "foo\nbar" + * Expected WT : "foo\n\nbar" + * + * Note the additional newline between "foo" and "bar" even though originally, + * there was just a single newline. + * + * So, even though the two P tags and the separator between them is + * unmodified, it is insufficient to rely on just that. We have to look at + * what has happened on the two wikitext lines onto which the two P tags + * will get serialized. + * + * Now, if you check the code for 'nextToDeletedBlockNodeInWT', that code is + * not really looking at ALL the nodes before/after the nodes that could + * serialize onto the wikitext lines. It is looking at the immediately + * adjacent nodes, i.e. it is not necessary to look if a block-tag was + * deleted 2 or 5 siblings away. If we had to actually examine all of those, + * nodes, this would get very complex, and it would be much simpler to just + * discard the original separators => potentially lots of dirty diffs. + * + * To understand why it is sufficient (for correctness) to examine just + * the immediately adjacent nodes, let us look at an additional example. + * + * Original WT : "abcde\nf" + * Original HTML: "abcde\nf" + * + * Note how tags and tags interleave in the HTML. This would be + * the case always no matter how much inline content showed up between the + * block tags in wikitext. If the b- was deleted, we don't care + * about it, since we still have the d- before the P tag that preserves + * the correctness of the single "\n" separator. If the d- was deleted, + * we conservatively ignore the original separator and let normal P-P constraints + * take care of it. At worst, we might generate a dirty diff in this scenario. + * -- */ +SSP.emitSep = function(node) { + var origSepUsable = + this.prevNodeUnmodified && !DU.nextToDeletedBlockNodeInWT(this.env, this.sep.lastSourceNode, true) && + this.currNodeUnmodified && !DU.nextToDeletedBlockNodeInWT(this.env, node, false); + + var origSep; + if (origSepUsable) { + if (this.prevNode && DU.isElt(this.prevNode) && DU.isElt(node)) { + origSep = this.getOrigSrc( + DU.getDataParsoid(this.prevNode).dsr[1], + DU.getDataParsoid(node).dsr[0] + ); + } else { + origSep = this.sep.src; + } + } + + if (origSep !== undefined && WTSUtils.isValidSep(origSep)) { + this.pushSep(origSep, node, 'ORIG-SEP:'); + } else { + var sep = this.serializer.buildSep(node); + if (sep !== undefined) { + this.pushSep(sep, node, 'SEP:'); + } + } +} + SSP.emitChunk = function(res, node) { if (!(res instanceof String)) { this.env.log('warning', 'Emitting non-string value: ' + String(res)); @@ -298,75 +366,11 @@ res.text = res.text.replace(/\n/g, ' '); } - /* -- -* When block nodes are deleted, the deletion affects whether unmodified -* newline separators between a pair of unmodified P tags can be reused. -* -* Example: -* Original WT : "xfoo\nbar" -* Original HTML: "xfoo\nbar" -* Edited HTML : "foo\nbar" -* Annotated DOM: "foo\nbar" -* Expected WT : "foo\n\nbar" -* -* Note the additional newline between "foo" and "bar" even though originally, -* there was just a single newline. -* -* So, even though the two P tags and the separator between them is -* unmodified, it is insufficient to rely on
[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Fix gap between notification pop-up header and notifications
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380898 ) Change subject: Fix gap between notification pop-up header and notifications .. Fix gap between notification pop-up header and notifications Change-Id: I12261ad8033af7286d426933df19611b8163d9c9 --- M modules/styles/mw.echo.ui.NotificationBadgeWidget.less 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less index 183edf9..73092a7 100644 --- a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less +++ b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less @@ -24,7 +24,7 @@ > .oo-ui-labelElement-label { font-size: 1.2em; - padding: 0.3em; + padding: 0.25em; margin-left: 0; font-weight: bold; } -- To view, visit https://gerrit.wikimedia.org/r/380898 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I12261ad8033af7286d426933df19611b8163d9c9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: KaldariGerrit-Reviewer: Catrope 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...Echo[master]: Fix gap between notification pop-up header and notifications
Kaldari has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380898 ) Change subject: Fix gap between notification pop-up header and notifications .. Fix gap between notification pop-up header and notifications Change-Id: I12261ad8033af7286d426933df19611b8163d9c9 --- M modules/styles/mw.echo.ui.NotificationBadgeWidget.less 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/98/380898/1 diff --git a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less index 183edf9..73092a7 100644 --- a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less +++ b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less @@ -24,7 +24,7 @@ > .oo-ui-labelElement-label { font-size: 1.2em; - padding: 0.3em; + padding: 0.25em; margin-left: 0; font-weight: bold; } -- To view, visit https://gerrit.wikimedia.org/r/380898 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12261ad8033af7286d426933df19611b8163d9c9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Kaldari___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Redirects return 204 inside MCS
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380856 ) Change subject: Redirects return 204 inside MCS .. Redirects return 204 inside MCS These will be handled upstream in RestBase. To avoid confusion send a 204 when no intro is available and thus no summary is available. Bug: T176517 Change-Id: I42dc94babefdfa4aa0a6d97c3b412868df72e0e6 --- M routes/mobile-sections.js M test/features/mobile-sections-lead/previewHtml.js 2 files changed, 7 insertions(+), 2 deletions(-) Approvals: BearND: Looks good to me, approved jenkins-bot: Verified Zoranzoki21: Looks good to me, but someone else must approve diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js index a7239e3..e37c35e 100644 --- a/routes/mobile-sections.js +++ b/routes/mobile-sections.js @@ -385,6 +385,11 @@ code = 204; } else if (lead.intro) { summary = transforms.summarize(lead.intro); +} else { +// If the lead introduction is empty we should consider it +// a placeholder e.g. redirect page. To avoid sending an empty +// summary 204. (T176517) +code = 204; } return Object.assign({ code, diff --git a/test/features/mobile-sections-lead/previewHtml.js b/test/features/mobile-sections-lead/previewHtml.js index c34a087..023f0ab 100644 --- a/test/features/mobile-sections-lead/previewHtml.js +++ b/test/features/mobile-sections-lead/previewHtml.js @@ -44,11 +44,11 @@ }); }); -it('200/302 for pages that are redirects', () => { +it('204 for pages that are redirects', () => { const uri = `${server.config.uri}en.wikipedia.org/v1/page/summary/Barack`; return preq.get({ uri }) .then((res) => { -assert.ok(res.status === 200, 'Redirect pages are resolved to 200 via a 302'); +assert.ok(res.status === 204, 'Redirect pages are resolved to 204'); }); }); }); -- To view, visit https://gerrit.wikimedia.org/r/380856 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I42dc94babefdfa4aa0a6d97c3b412868df72e0e6 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/services/mobileapps Gerrit-Branch: master Gerrit-Owner: JdlrobsonGerrit-Reviewer: BearND Gerrit-Reviewer: Dbrant Gerrit-Reviewer: Fjalapeno Gerrit-Reviewer: GWicke Gerrit-Reviewer: Mholloway Gerrit-Reviewer: Mhurd Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: Ppchelko Gerrit-Reviewer: Zoranzoki21 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...cxserver[master]: AdaptationTest: Actually test that the output is correct
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380897 ) Change subject: AdaptationTest: Actually test that the output is correct .. AdaptationTest: Actually test that the output is correct These tests only tested that the adaptation process didn't error out and returned a non-empty result. Now they also test that the result is what we expect it to be. Because the result contains data-cx blobs which are quite large (due to embedded titleInfo for links), embed those in the test data separately for readability, and add some code to inject them back in by ID. Also fix the test cases to assert the correct outcome, mostly around link titles (the title attribute of an adapted link is equal to the adapted href, not the unadapted one). Change-Id: I12a723732b87c20d09967755ddb85182ee1ea9c3 --- M test/adaptation/AdaptationTest.js M test/adaptation/AdaptationTests.json 2 files changed, 166 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver refs/changes/97/380897/1 diff --git a/test/adaptation/AdaptationTest.js b/test/adaptation/AdaptationTest.js index 4154cfe..04691c2 100644 --- a/test/adaptation/AdaptationTest.js +++ b/test/adaptation/AdaptationTest.js @@ -1,11 +1,12 @@ 'use strict'; -const assert = require( '../utils/assert.js' ), +const assert = require( 'assert' ), server = require( '../utils/server.js' ), async = require( 'async' ), Apertium = require( '../../lib/mt' ).Apertium, Adapter = require( '../../lib/Adapter' ), - tests = require( './AdaptationTests.json' ); + tests = require( './AdaptationTests.json' ), + jsdom = require( 'jsdom' ); describe( 'Adaptation tests', () => { async.forEach( tests, ( test ) => { @@ -14,9 +15,27 @@ cxserver = server.config.conf.services[ server.config.conf.services.length - 1 ]; cxserver.conf.mtClient = new Apertium( cxserver ); adapter = new Adapter( test.from, test.to, cxserver ); - it( 'should not have any errors when: ' + test.desc, () => { + it( test.desc, () => { + let expectedDom = new jsdom.JSDOM( test.result ); + // Put data-cx in + if ( test[ 'data-cx' ] ) { + for ( let id in test[ 'data-cx' ] ) { + expectedDom.window.document.getElementById( id ) + .setAttribute( 'data-cx', JSON.stringify( test[ 'data-cx' ][ id ] ) ); + } + } + return adapter.adapt( test.source ).then( ( result ) => { - assert.ok( result.getHtml().length > 0 ); + let actualDom = new jsdom.JSDOM( result.getHtml() ); + if ( actualDom.window.document.body.isEqualNode( expectedDom.window.document.body ) ) { + assert.ok( true, test.desc ); + } else { + assert.equal( + actualDom.window.document.body.outerHTML, + expectedDom.window.document.body.outerHTML, + test.desc + ); + } } ); } ); } ); diff --git a/test/adaptation/AdaptationTests.json b/test/adaptation/AdaptationTests.json index 47031c1..3d7d0af 100644 --- a/test/adaptation/AdaptationTests.json +++ b/test/adaptation/AdaptationTests.json @@ -3,36 +3,171 @@ "desc": "Link adaptation basic test", "from": "en", "to": "es", - "source": "Oxygen is a chemical element with symbol O and atomic number 8.", - "result": "Oxygen is a chemical element with symbol O and atomic number 8." + "source": "Oxygen is a chemical element with symbol O and atomic number 8.", + "result": "Oxygen is a chemical element with symbol O and atomic number 8.", + "data-cx": { + "mwAA": { + "adapted": true, + "targetTitle": { + "title": "Oxígeno", + "pagelanguage": "es", + "thumbnail": { + "source": "https://upload.wikimedia.org/wikipedia/commons/thumb/7/77/O%2C8.jpg/80px-O%2C8.jpg;, + "width": 80, + "height": 40 +
[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: MWLink: Be selective in which title info fields we pass on
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380896 ) Change subject: MWLink: Be selective in which title info fields we pass on .. MWLink: Be selective in which title info fields we pass on The data-cx blob was bloated with fields like "touched", "lastrevid", etc, and they make testing harder too. Change-Id: Ibab5af16f1d183313ddcb9c50d15b6451fd4ee2d --- M lib/translationunits/MWLink.js 1 file changed, 21 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver refs/changes/96/380896/1 diff --git a/lib/translationunits/MWLink.js b/lib/translationunits/MWLink.js index 826864c..35ba14c 100644 --- a/lib/translationunits/MWLink.js +++ b/lib/translationunits/MWLink.js @@ -2,13 +2,28 @@ const cxutil = require( '../util.js' ), TranslationUnit = require( './TranslationUnit.js' ), - MWApiRequestManager = require( '../mw/ApiRequestManager.js' ); + MWApiRequestManager = require( '../mw/ApiRequestManager.js' ), + titleInfoFields = [ + 'title', + 'pagelanguage', + 'thumbnail', + 'terms', + 'pageprops' + ]; class MWLink extends TranslationUnit { } MWLink.matchTagNames = [ 'a' ]; MWLink.matchRdfaTypes = [ 'mw:WikiLink' ]; + +function getUsefulFields( titleInfo ) { + var result = {}; + for ( const field of titleInfoFields ) { + result[ field ] = titleInfo[ field ]; + } + return result; +} MWLink.prototype.adapt = cxutil.async( function* () { var linkPairInfo, adaptationInfo, sourceTitleInfoRequest, @@ -31,13 +46,15 @@ // NOTE: This paths we are setting here are not relative paths. this.node.attributes.href = linkPairInfo.targetTitle; this.node.attributes.title = linkPairInfo.targetTitle; - adaptationInfo.targetTitle = yield apiRequestManager.titleInfoRequest( - linkPairInfo.targetTitle, this.targetLanguage + adaptationInfo.targetTitle = getUsefulFields( + yield apiRequestManager.titleInfoRequest( + linkPairInfo.targetTitle, this.targetLanguage + ) ); adaptationInfo.adapted = true; } - adaptationInfo.sourceTitle = yield sourceTitleInfoRequest; + adaptationInfo.sourceTitle = getUsefulFields( yield sourceTitleInfoRequest ); this.node.attributes[ 'data-cx' ] = JSON.stringify( adaptationInfo ); return this.node; -- To view, visit https://gerrit.wikimedia.org/r/380896 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibab5af16f1d183313ddcb9c50d15b6451fd4ee2d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver Gerrit-Branch: master Gerrit-Owner: Catrope___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: demos: Remove unnecessary button demo widgets
VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380894 ) Change subject: demos: Remove unnecessary button demo widgets .. demos: Remove unnecessary button demo widgets Removing unnecessary button demo widgets, that are either duplicated or only slightly different. After we've got rid of 'constructive' button examples If83ab721bd75, it's the perfect moment to reduce overboarding button demo widgets further resulting in more even focus with other widgets. Change-Id: I04ed0b671878697e9e9e5cbe2b7c8463fa5c4150 --- M demos/pages/widgets.js M demos/pages/widgets.php 2 files changed, 10 insertions(+), 52 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/94/380894/1 diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js index 6f9321b..28f0b55 100644 --- a/demos/pages/widgets.js +++ b/demos/pages/widgets.js @@ -146,17 +146,6 @@ new OO.ui.FieldLayout( new OO.ui.ButtonWidget( { label: 'Progressive', - flags: [ 'progressive' ], - disabled: true - } ), - { - label: 'ButtonWidget (progressive, disabled)\u200E', - align: 'top' - } - ), - new OO.ui.FieldLayout( - new OO.ui.ButtonWidget( { - label: 'Progressive', icon: 'tag', flags: [ 'progressive' ], disabled: true @@ -217,17 +206,6 @@ label: 'ButtonWidget (with accesskey)\u200E', align: 'top', help: new OO.ui.HtmlSnippet( 'Notice: Using `accesskey` might http://webaim.org/techniques/keyboard/accesskey; target="_blank">negatively impact screen readers!' ) - } - ), - new OO.ui.FieldLayout( - new OO.ui.ButtonInputWidget( { - title: 'Accesskey is added to the title.', - label: 'Access key: H', - accessKey: 'h' - } ), - { - label: 'ButtonInputWidget (with accesskey and title)\u200E', - align: 'top' } ), new OO.ui.FieldLayout( @@ -401,11 +379,12 @@ ), new OO.ui.FieldLayout( new OO.ui.ButtonInputWidget( { - label: 'Access key: I', - accessKey: 'i' + title: 'Accesskey is added to the title.', + label: 'Access key: H', + accessKey: 'h' } ), { - label: 'ButtonInputWidget (with accesskey)\u200E', + label: 'ButtonInputWidget (with accesskey & title)\u200E', align: 'top', help: new OO.ui.HtmlSnippet( 'Notice: Using `accesskey` might http://webaim.org/techniques/keyboard/accesskey; target="_blank">negatively impact screen readers!' ) } @@ -418,7 +397,7 @@ } ), { align: 'top', - label: 'ButtonInputWidget (frameless)\u200E' + label: 'ButtonInputWidget (frameless, using )\u200E' } ), new OO.ui.FieldLayout( @@ -624,6 +603,11 @@ items: [
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Enable ui for slaves
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/379420 ) Change subject: Gerrit: Enable ui for slaves .. Gerrit: Enable ui for slaves Note that it will still be in read only, just you will be able to see what the slave has data wise. Bug: T176532 Change-Id: I3bd7021ab531b54e5155e98a1f4adc12f9c42275 --- M modules/gerrit/templates/gerrit.config.erb 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/gerrit/templates/gerrit.config.erb b/modules/gerrit/templates/gerrit.config.erb index 53ae6c1..3a2bb41 100644 --- a/modules/gerrit/templates/gerrit.config.erb +++ b/modules/gerrit/templates/gerrit.config.erb @@ -65,6 +65,9 @@ javaOptions = <% @java_options.each do |jvm_opt| %><%= jvm_opt %> <% end %> heapLimit = <%= @heap_limit %> slave = <%= @slave %> +<%- if @slave %> +daemonOpt = --enable-httpd --enable-sshd +<%- end -%> [core] packedGitOpenFiles = 6000 packedGitLimit = 2g -- To view, visit https://gerrit.wikimedia.org/r/379420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3bd7021ab531b54e5155e98a1f4adc12f9c42275 Gerrit-PatchSet: 6 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: PaladoxGerrit-Reviewer: Chad Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::discovery_dashboards: Add daily forecasts dashboard
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380786 ) Change subject: profile::discovery_dashboards: Add daily forecasts dashboard .. profile::discovery_dashboards: Add daily forecasts dashboard Adds a new member to the Discovery Dashboards family: daily forecasts of Search Platform & WDQS metrics. Bug: T112170 Change-Id: I04311cf86aab40a3f50e5924585e989188ef48fb --- M modules/profile/files/discovery_dashboards/index.html M modules/profile/manifests/discovery_dashboards/development.pp M modules/profile/manifests/discovery_dashboards/production.pp 3 files changed, 28 insertions(+), 11 deletions(-) Approvals: jenkins-bot: Verified Chelsyx: Looks good to me, but someone else must approve Dzahn: Looks good to me, approved diff --git a/modules/profile/files/discovery_dashboards/index.html b/modules/profile/files/discovery_dashboards/index.html index 99dc1ab..e583608 100644 --- a/modules/profile/files/discovery_dashboards/index.html +++ b/modules/profile/files/discovery_dashboards/index.html @@ -106,6 +106,11 @@ Dashboard for digging into search-engine-referred traffic. (https://phabricator.wikimedia.org/diffusion/WDWO/;>Code Repository) + Daily Forecasts + +Dashboard for viewing predicted Search Platform and Wikidata Query Service metrics. (https://phabricator.wikimedia.org/diffusion/WDDE/;>Code Repository) + + @@ -125,7 +130,7 @@ We wrote an article to help you do that! :D Head over to https://wikitech.wikimedia.org/wiki/Building_a_Shiny_Dashboard;>Building a Shiny Dashboard on Wikitech. To make the ops side of things easier, we've developed the https://github.com/wikimedia/puppet/tree/production/modules/shiny_server;>Shiny Server module for Puppet. See https://github.com/wikimedia/puppet/tree/production/modules/profile/manifests/discovery_dashboards;>these profiles for further reference. If you have other questions or would like further assistance, please mailto:mpo...@wikimedia.org;>Mikhail or mailto:c...@wikimedia.org;>Chelsy. - + This page is available under the https://creativecommons.org/licenses/by-sa/3.0/;>Creative Commons Attribution-ShareAlike License. All the dashboards' code is available under the https://opensource.org/licenses/MIT;>MIT License. diff --git a/modules/profile/manifests/discovery_dashboards/development.pp b/modules/profile/manifests/discovery_dashboards/development.pp index a9f07c7..be5e5d4 100644 --- a/modules/profile/manifests/discovery_dashboards/development.pp +++ b/modules/profile/manifests/discovery_dashboards/development.pp @@ -14,31 +14,37 @@ ensure=> 'latest', directory => '/srv/shiny-server/metrics', notify=> Service['shiny-server'], -branch=> 'develop' +branch=> 'develop', } git::clone { 'wikimedia/discovery/twilightsparql': ensure=> 'latest', directory => '/srv/shiny-server/wdqs', notify=> Service['shiny-server'], -branch=> 'develop' +branch=> 'develop', } git::clone { 'wikimedia/discovery/prince': ensure=> 'latest', directory => '/srv/shiny-server/portal', notify=> Service['shiny-server'], -branch=> 'develop' +branch=> 'develop', } git::clone { 'wikimedia/discovery/wetzel': ensure=> 'latest', directory => '/srv/shiny-server/maps', notify=> Service['shiny-server'], -branch=> 'develop' +branch=> 'develop', } git::clone { 'wikimedia/discovery/wonderbolt': ensure=> 'latest', directory => '/srv/shiny-server/external', notify=> Service['shiny-server'], -branch=> 'develop' +branch=> 'develop', +} +git::clone { 'wikimedia/discovery/delphi': +ensure=> 'latest', +directory => '/srv/shiny-server/forecasts', +notify=> Service['shiny-server'], +branch=> 'develop', } } diff --git a/modules/profile/manifests/discovery_dashboards/production.pp b/modules/profile/manifests/discovery_dashboards/production.pp index 974b9a0..6c50f4c 100644 --- a/modules/profile/manifests/discovery_dashboards/production.pp +++ b/modules/profile/manifests/discovery_dashboards/production.pp @@ -13,31 +13,37 @@ ensure=> 'latest', directory => '/srv/shiny-server/metrics', notify=> Service['shiny-server'], -branch=> 'master' +branch=> 'master', } git::clone { 'wikimedia/discovery/twilightsparql': ensure=> 'latest', directory => '/srv/shiny-server/wdqs', notify=> Service['shiny-server'], -branch=> 'master' +branch=> 'master', } git::clone { 'wikimedia/discovery/prince':
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: Remove ubuntu / upstart support
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/379794 ) Change subject: Phabricator: Remove ubuntu / upstart support .. Phabricator: Remove ubuntu / upstart support We are on jessie now which supports systemd, lets remove support for upstart but at the same time remove support for ubuntu too. Change-Id: I24f0c142416fa2b848170888ce26c11ba88c3d3a --- M modules/phabricator/manifests/aphlict.pp M modules/phabricator/manifests/init.pp M modules/phabricator/manifests/vcs.pp D modules/phabricator/templates/initscripts/aphlict.upstart.erb D modules/phabricator/templates/initscripts/phd.upstart.erb D modules/phabricator/templates/initscripts/ssh-phab.upstart.erb 6 files changed, 4 insertions(+), 90 deletions(-) Approvals: 20after4: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/phabricator/manifests/aphlict.pp b/modules/phabricator/manifests/aphlict.pp index 960ba8c..0c565f8 100644 --- a/modules/phabricator/manifests/aphlict.pp +++ b/modules/phabricator/manifests/aphlict.pp @@ -84,7 +84,6 @@ base::service_unit { 'aphlict': ensure => $ensure, systemd=> systemd_template('aphlict'), -upstart=> upstart_template('aphlict'), require=> User[$user], service_params => { ensure => $service_ensure, diff --git a/modules/phabricator/manifests/init.pp b/modules/phabricator/manifests/init.pp index 3f950c8..05ad2a2 100644 --- a/modules/phabricator/manifests/init.pp +++ b/modules/phabricator/manifests/init.pp @@ -106,6 +106,7 @@ # https://secure.phabricator.com/rPa2cd3d9a8913d5709e2bc999efb75b63d7c19696 if os_version('debian >= stretch') { package { [ +'php-apcu', 'php-mysql', 'php-gd', 'php-mailparse', @@ -117,10 +118,10 @@ ensure => present; } include ::apache::mod::php7 -} -# jessie or trusty - PHP (5.5/5.6) packages and Apache module -if os_version('ubuntu == trusty || debian == jessie') { +} else { +# jessie - PHP (5.5/5.6) packages and Apache module package { [ +'php5-apcu', 'php5-mysql', 'php5-gd', 'php5-mailparse', @@ -147,17 +148,6 @@ # common Apache modules include ::apache::mod::rewrite include ::apache::mod::headers - -# APC(u) package is different in all 3 releases -if os_version('debian == jessie') { -package { 'php5-apcu': ensure => present; } -} -if os_version('debian >= stretch') { -package { 'php-apcu': ensure => present; } -} -if os_version('ubuntu == trusty') { -package { 'php-apc': ensure => present; } -} $docroot = "${phabdir}/phabricator/webroot" @@ -336,7 +326,6 @@ base::service_unit { 'phd': ensure => 'present', systemd=> systemd_template('phd'), -upstart=> upstart_template('phd'), require=> $base_requirements, service_params => { ensure => $phd_service_ensure, diff --git a/modules/phabricator/manifests/vcs.pp b/modules/phabricator/manifests/vcs.pp index a4b2672..f7a0569 100644 --- a/modules/phabricator/manifests/vcs.pp +++ b/modules/phabricator/manifests/vcs.pp @@ -92,7 +92,6 @@ base::service_unit { 'ssh-phab': ensure => 'present', systemd => systemd_template('ssh-phab'), -upstart => upstart_template('ssh-phab'), require => Package['openssh-server'], } } diff --git a/modules/phabricator/templates/initscripts/aphlict.upstart.erb b/modules/phabricator/templates/initscripts/aphlict.upstart.erb deleted file mode 100644 index 22b7958..000 --- a/modules/phabricator/templates/initscripts/aphlict.upstart.erb +++ /dev/null @@ -1,19 +0,0 @@ -# aphlict - Phabricator notification server -# -# Routes real-time notifications to websocket clients - -description "Phabricator notification websocket server" - -setuid <%= scope.lookupvar('phabricator::aphlict::user') %> -setgid <%= scope.lookupvar('phabricator::aphlict::group') %> - -start on runlevel [2345] -stop on runlevel [!2345] - -respawn -respawn limit 10 5 -umask 022 - -expect stop - -exec <%= scope.lookupvar('phabricator::aphlict::aphlict_start_cmd') %> diff --git a/modules/phabricator/templates/initscripts/phd.upstart.erb b/modules/phabricator/templates/initscripts/phd.upstart.erb deleted file mode 100644 index d97c604..000 --- a/modules/phabricator/templates/initscripts/phd.upstart.erb +++ /dev/null @@ -1,27 +0,0 @@ -# Phabricator daemons init script -description "Phabricator Daemons supervisor" -author "Wikimedia Foundation" - -stop on runlevel [!2345] - -respawn -respawn limit 10 5 -oom never - -kill timeout 86400
[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: [WIP] Support new thresholds API
Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380893 ) Change subject: [WIP] Support new thresholds API .. [WIP] Support new thresholds API TODO: Need to preserve old API compatibility and provide a way to switch between them. This patch is currently a hard cutover. Bug: T175053 Change-Id: I683027d43f7dcee1646cab6df70b208476b62bfe --- M extension.json M includes/Api.php M includes/Stats.php 3 files changed, 7 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES refs/changes/93/380893/1 diff --git a/extension.json b/extension.json index 043724a..f2dfc3e 100644 --- a/extension.json +++ b/extension.json @@ -127,7 +127,7 @@ "config": { "OresExtensionStatus": "on", "OresUiEnabled": true, - "OresBaseUrl": "https://ores.wikimedia.org/;, + "OresBaseUrl": "https://ores.wikimedia.org/v3/;, "OresExcludeBots": true, "OresModels": { "damaging": true, diff --git a/includes/Api.php b/includes/Api.php index daf74aa..605d2df 100644 --- a/includes/Api.php +++ b/includes/Api.php @@ -35,10 +35,9 @@ } /** -* @param string|null $model Name of the model to query * @return string Base URL plus your wiki's `scores` API path. */ - public function getUrl( $model = null ) { + protected function getUrl() { global $wgOresBaseUrl, $wgOresWikiId; if ( $wgOresWikiId ) { @@ -47,9 +46,6 @@ $wikiId = wfWikiID(); } $url = "{$wgOresBaseUrl}scores/{$wikiId}/"; - if ( $model ) { - $url .= "{$model}/"; - } return $url; } @@ -57,14 +53,13 @@ * Make an ORES API request and return the decoded result. * * @param array $params optional GET parameters -* @param string|null $model Name of the model to query * @return array Decoded response * */ - public function request( $params = [], $model = null ) { + public function request( $params = [] ) { $logger = LoggerFactory::getInstance( 'ORES' ); - $url = $this->getUrl( $model ); + $url = $this->getUrl(); $params['format'] = 'json'; $url = wfAppendQuery( $url, $params ); $logger->debug( "Requesting: {$url}" ); diff --git a/includes/Stats.php b/includes/Stats.php index f3f3bae..05ca7c2 100644 --- a/includes/Stats.php +++ b/includes/Stats.php @@ -75,9 +75,9 @@ } private function fetchStatsFromApi( $model ) { - $data = $this->api->request( [ 'model_info' => 'test_stats' ], $model ); - if ( isset( $data[ 'test_stats' ] ) ) { - return $data[ 'test_stats' ]; + $data = $this->api->request( [ 'models' => $model, 'model_info' => 'statistics' ] ); + if ( isset( $data[ 'statistics' ] ) ) { + return $data[ 'statistics' ]; } } -- To view, visit https://gerrit.wikimedia.org/r/380893 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I683027d43f7dcee1646cab6df70b208476b62bfe Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ORES Gerrit-Branch: master Gerrit-Owner: Awight___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update jQuery Migrate to v3.0.1
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380884 ) Change subject: Update jQuery Migrate to v3.0.1 .. Update jQuery Migrate to v3.0.1 * Fixes IE9 issues with console.log. * Add warning for $.fn.hover(). * Add warning for $.holdReady(). * Improve handling of jQuery.easing methods. Change-Id: I38084ac6367b6d2ba47d6ecc6c9934a8bb7d8ae0 --- M resources/lib/jquery/jquery.migrate.js 1 file changed, 21 insertions(+), 20 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/resources/lib/jquery/jquery.migrate.js b/resources/lib/jquery/jquery.migrate.js index 70512e0..c9b37ca 100644 --- a/resources/lib/jquery/jquery.migrate.js +++ b/resources/lib/jquery/jquery.migrate.js @@ -1,5 +1,5 @@ /*! - * jQuery Migrate - v3.0.1-pre - 2017-08-17 + * jQuery Migrate - v3.0.1 - 2017-09-26 * Copyright jQuery Foundation and other contributors * * Patched for MediaWiki: @@ -27,35 +27,31 @@ "use strict"; -jQuery.migrateVersion = "3.0.1-pre"; +jQuery.migrateVersion = "3.0.1"; /* exported migrateWarn, migrateWarnFunc, migrateWarnProp */ ( function() { + var rbadVersions = /^[12]\./; + // Support: IE9 only // IE9 only creates console object when dev tools are first opened - // Also, avoid Function#bind here to simplify PhantomJS usage - var log = window.console && window.console.log && - function() { - window.console.log.apply( window.console, arguments ); - }, - rbadVersions = /^[12]\./; - - if ( !log ) { + // IE9 console is a host object, callable but doesn't have .apply() + if ( !window.console || !window.console.log ) { return; } // Need jQuery 3.0.0+ and no older Migrate loaded if ( !jQuery || rbadVersions.test( jQuery.fn.jquery ) ) { - log( "JQMIGRATE: jQuery 3.0.0+ REQUIRED" ); + window.console.log( "JQMIGRATE: jQuery 3.0.0+ REQUIRED" ); } if ( jQuery.migrateWarnings ) { - log( "JQMIGRATE: Migrate plugin loaded multiple times" ); + window.console.log( "JQMIGRATE: Migrate plugin loaded multiple times" ); } // Show a message on the console so devs know we're active - log( "JQMIGRATE: Migrate is installed" + + window.console.log( "JQMIGRATE: Migrate is installed" + ( jQuery.migrateMute ? "" : " with logging active" ) + ", version " + jQuery.migrateVersion ); @@ -213,6 +209,9 @@ return oldValue; }; + +migrateWarnFunc( jQuery, "holdReady", jQuery.holdReady, + "jQuery.holdReady is deprecated" ); migrateWarnFunc( jQuery, "unique", jQuery.uniqueSort, "jQuery.unique is deprecated; use jQuery.uniqueSort" ); @@ -375,19 +374,17 @@ }; var oldTweenRun = jQuery.Tween.prototype.run; +var linearEasing = function( pct ) { + return pct; + }; jQuery.Tween.prototype.run = function( ) { if ( jQuery.easing[ this.easing ].length > 1 ) { migrateWarn( - "easing function " + - "\"jQuery.easing." + this.easing.toString() + - "\" should use only first argument" + "'jQuery.easing." + this.easing.toString() + "' should use only one argument" ); - var oldEasing = jQuery.easing[ this.easing ]; - jQuery.easing[ this.easing ] = function( percent ) { - return oldEasing.call( jQuery.easing, percent, percent, 0, 1, 1 ); - }.bind( this ); + jQuery.easing[ this.easing ] = linearEasing; } oldTweenRun.apply( this, arguments ); @@ -511,6 +508,10 @@ return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn ); + }, + hover: function( fnOver, fnOut ) { + migrateWarn( "jQuery.fn.hover() is deprecated" ); + return this.on( "mouseenter", fnOver ).on( "mouseleave", fnOut || fnOver ); } } ); -- To view, visit https://gerrit.wikimedia.org/r/380884 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38084ac6367b6d2ba47d6ecc6c9934a8bb7d8ae0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: KrinkleGerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.31.0-wmf.1]: Follow-up Iebd1def1: Revert MWSignatureTool case
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380842 ) Change subject: Follow-up Iebd1def1: Revert MWSignatureTool case .. Follow-up Iebd1def1: Revert MWSignatureTool case The tool checks the page name before the target is initialized. Change-Id: I02ec528a11cc01b026fb95617388d47323ad96ee (cherry picked from commit 38d716f895ab2bbeb83e17909e91e50d8142f31d) --- M modules/ve-mw/ui/tools/ve.ui.MWSignatureTool.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Thcipriani: Looks good to me, approved jenkins-bot: Verified Jforrester: Looks good to me, but someone else must approve diff --git a/modules/ve-mw/ui/tools/ve.ui.MWSignatureTool.js b/modules/ve-mw/ui/tools/ve.ui.MWSignatureTool.js index 443623d..f908711 100644 --- a/modules/ve-mw/ui/tools/ve.ui.MWSignatureTool.js +++ b/modules/ve-mw/ui/tools/ve.ui.MWSignatureTool.js @@ -33,7 +33,7 @@ if ( $.inArray( - new mw.Title( ve.init.target.pageName ).getNamespaceId(), + new mw.Title( mw.config.get( 'wgRelevantPageName' ) ).getNamespaceId(), mw.config.get( 'wgVisualEditorConfig' ).signatureNamespaces ) !== -1 ) { -- To view, visit https://gerrit.wikimedia.org/r/380842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02ec528a11cc01b026fb95617388d47323ad96ee Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: wmf/1.31.0-wmf.1 Gerrit-Owner: CatropeGerrit-Reviewer: Catrope Gerrit-Reviewer: Esanders Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Thcipriani Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...heritage[master]: Remove non-url registrant_url for Tunisia in French (tn_fr)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380769 ) Change subject: Remove non-url registrant_url for Tunisia in French (tn_fr) .. Remove non-url registrant_url for Tunisia in French (tn_fr) Change-Id: Id70c944f0ca4bc2bd2a26cf0e0e0a728cbc312e5 --- M erfgoedbot/monuments_config/tn_fr.json 1 file changed, 1 insertion(+), 9 deletions(-) Approvals: Jean-Frédéric: Looks good to me, approved jenkins-bot: Verified diff --git a/erfgoedbot/monuments_config/tn_fr.json b/erfgoedbot/monuments_config/tn_fr.json index fc77bee..31bedf1 100644 --- a/erfgoedbot/monuments_config/tn_fr.json +++ b/erfgoedbot/monuments_config/tn_fr.json @@ -75,10 +75,6 @@ "dest": "monument_article", "source": "monument", "conv": "extractWikilink" -}, -{ -"dest": "registrant_url", -"source": "id" } ], "sql_lang": "French", @@ -147,10 +143,6 @@ "monument_article": { "value": "monument_article", "type": "Field" -}, -"registrant_url": { -"value": "registrant_url", -"type": "Field" } } -} \ No newline at end of file +} -- To view, visit https://gerrit.wikimedia.org/r/380769 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id70c944f0ca4bc2bd2a26cf0e0e0a728cbc312e5 Gerrit-PatchSet: 3 Gerrit-Project: labs/tools/heritage Gerrit-Branch: master Gerrit-Owner: Lokal ProfilGerrit-Reviewer: Jean-Frédéric Gerrit-Reviewer: Lokal Profil Gerrit-Reviewer: Multichill 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/core[wmf/1.31.0-wmf.1]: RCFilters: Log performance data
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380801 ) Change subject: RCFilters: Log performance data .. RCFilters: Log performance data Just UI ready time and wgBackendResponseTime for now. Sanitizing responseStart and especially firstPaint cross-browser is too messy. NavigationTiming has code for it but that would need to be exposed somewhere. Bug: T176652 Change-Id: I6caf52fe8bc77fac0426d73549553301c5951c32 (cherry picked from commit b3f9593262f1f5fa1909941bbc68d89bae2b0495) --- M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js 1 file changed, 16 insertions(+), 6 deletions(-) Approvals: Thcipriani: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js index 5ab32ea..73259f6 100644 --- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js +++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js @@ -29,9 +29,7 @@ savedLinksListWidget = new mw.rcfilters.ui.SavedLinksListWidget( controller, savedQueriesModel, { $overlay: $overlay } ), - currentPage = mw.config.get( 'wgCanonicalNamespace' ) + - ':' + - mw.config.get( 'wgCanonicalSpecialPageName' ); + specialPage = mw.config.get( 'wgCanonicalSpecialPageName' ); // TODO: The changesListWrapperWidget should be able to initialize // after the model is ready. @@ -66,8 +64,8 @@ controller.replaceUrl(); - if ( currentPage === 'Special:Recentchanges' || - currentPage === 'Special:Recentchangeslinked' ) { + if ( specialPage === 'Recentchanges' || + specialPage === 'Recentchangeslinked' ) { $topLinks = $( '.mw-recentchanges-toplinks' ).detach(); rcTopSection = new mw.rcfilters.ui.RcTopSectionWidget( @@ -76,7 +74,7 @@ filtersWidget.setTopSection( rcTopSection.$element ); } // end Special:RC - if ( currentPage === 'Special:Watchlist' ) { + if ( specialPage === 'Watchlist' ) { $( '#contentSub, form#mw-watchlist-resetbutton' ).detach(); $watchlistDetails = $( '.watchlistDetails' ).detach().contents(); @@ -86,6 +84,18 @@ filtersWidget.setTopSection( wlTopSection.$element ); } // end Special:WL + // Log performance data + if ( window.performance && window.performance.now ) { + mw.track( + 'timing.MediaWiki.timing.structuredChangeFilters.ready.' + specialPage, + window.performance.now() + ); + mw.track( + 'timing.MediaWiki.timing.structuredChangeFilters.backendResponse.' + specialPage, + mw.config.get( 'wgBackendResponseTime' ) + ); + } + /** * Fired when initialization of the filtering interface for changes list is complete. * -- To view, visit https://gerrit.wikimedia.org/r/380801 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6caf52fe8bc77fac0426d73549553301c5951c32 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.31.0-wmf.1 Gerrit-Owner: CatropeGerrit-Reviewer: Thcipriani 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/core[wmf/1.30.0-wmf.19]: RCFilters: Log performance data
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380802 ) Change subject: RCFilters: Log performance data .. RCFilters: Log performance data Just UI ready time and wgBackendResponseTime for now. Sanitizing responseStart and especially firstPaint cross-browser is too messy. NavigationTiming has code for it but that would need to be exposed somewhere. Bug: T176652 Change-Id: I6caf52fe8bc77fac0426d73549553301c5951c32 (cherry picked from commit b3f9593262f1f5fa1909941bbc68d89bae2b0495) --- M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js 1 file changed, 16 insertions(+), 6 deletions(-) Approvals: Thcipriani: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js index 5ab32ea..73259f6 100644 --- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js +++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js @@ -29,9 +29,7 @@ savedLinksListWidget = new mw.rcfilters.ui.SavedLinksListWidget( controller, savedQueriesModel, { $overlay: $overlay } ), - currentPage = mw.config.get( 'wgCanonicalNamespace' ) + - ':' + - mw.config.get( 'wgCanonicalSpecialPageName' ); + specialPage = mw.config.get( 'wgCanonicalSpecialPageName' ); // TODO: The changesListWrapperWidget should be able to initialize // after the model is ready. @@ -66,8 +64,8 @@ controller.replaceUrl(); - if ( currentPage === 'Special:Recentchanges' || - currentPage === 'Special:Recentchangeslinked' ) { + if ( specialPage === 'Recentchanges' || + specialPage === 'Recentchangeslinked' ) { $topLinks = $( '.mw-recentchanges-toplinks' ).detach(); rcTopSection = new mw.rcfilters.ui.RcTopSectionWidget( @@ -76,7 +74,7 @@ filtersWidget.setTopSection( rcTopSection.$element ); } // end Special:RC - if ( currentPage === 'Special:Watchlist' ) { + if ( specialPage === 'Watchlist' ) { $( '#contentSub, form#mw-watchlist-resetbutton' ).detach(); $watchlistDetails = $( '.watchlistDetails' ).detach().contents(); @@ -86,6 +84,18 @@ filtersWidget.setTopSection( wlTopSection.$element ); } // end Special:WL + // Log performance data + if ( window.performance && window.performance.now ) { + mw.track( + 'timing.MediaWiki.timing.structuredChangeFilters.ready.' + specialPage, + window.performance.now() + ); + mw.track( + 'timing.MediaWiki.timing.structuredChangeFilters.backendResponse.' + specialPage, + mw.config.get( 'wgBackendResponseTime' ) + ); + } + /** * Fired when initialization of the filtering interface for changes list is complete. * -- To view, visit https://gerrit.wikimedia.org/r/380802 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6caf52fe8bc77fac0426d73549553301c5951c32 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.30.0-wmf.19 Gerrit-Owner: CatropeGerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: Thcipriani 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...parsoid[master]: Linter: Flag misnested tags with different behavior in HTML5...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/379430 ) Change subject: Linter: Flag misnested tags with different behavior in HTML5 vs Tidy .. Linter: Flag misnested tags with different behavior in HTML5 vs Tidy * This will make a different when Tidy is replaced by Remex and will also make Parsoid rendering more compatible with Tidy. Bug: T176363 Change-Id: I93d779eba9b7738c309b8a8a4a89f337bb4ac168 --- M lib/utils/DOMUtils.js M lib/wt2html/pp/handlers/linter.js M tests/mocha/linter.js 3 files changed, 140 insertions(+), 9 deletions(-) Approvals: jenkins-bot: Verified Arlolra: Looks good to me, approved diff --git a/lib/utils/DOMUtils.js b/lib/utils/DOMUtils.js index e073bde..5de498f 100644 --- a/lib/utils/DOMUtils.js +++ b/lib/utils/DOMUtils.js @@ -1244,6 +1244,12 @@ return next; }, + hasFollowingContent: function(node) { + return !DU.isBody(node) && ( + DU.nextNonSepSibling(node) || DU.hasFollowingContent(node.parentNode) + ); + }, + numNonDeletedChildNodes: function(node) { var n = 0; var child = node.firstChild; diff --git a/lib/wt2html/pp/handlers/linter.js b/lib/wt2html/pp/handlers/linter.js index 305b023..fa50353 100644 --- a/lib/wt2html/pp/handlers/linter.js +++ b/lib/wt2html/pp/handlers/linter.js @@ -17,6 +17,62 @@ var Util = require('../../../utils/Util.js').Util; var Consts = require('../../../config/WikitextConstants.js').WikitextConstants; +/* -- + * We are trying to find HTML5 tags that have different behavior compared to HTML4 + * in some misnesting scenarios around wikitext paragraphs. + * + * Ex: Input: ab + * Tidy output: ab + * HTML5 output: ab + * + * So, all good here. + * But, see how output changes when we use instead + * + * Ex: Input: ab + * Tidy output: ab + * HTML5 output: ab + * + * The source wikitext is "a\n\nb". The difference persists even + * when you have "a\n\nb" or "a\n\n{|\n|x\n|}\nbar". + * + * This is because Tidy seems to be doing the equivalent of HTM5-treebuilder's + * active formatting element reconstruction step on all *inline* elements. + * However, HTML5 parsers only do that on formatting elements. So, we need + * to compute which HTML5 tags are subject to this differential behavior. + * + * We compute that by excluding the following tags from the list of all HTML5 tags + * - If our sanitizer doesn't whitelist them, they will be escaped => ignore them + * - HTML4 block tags are excluded (obviously) + * - Void tags don't matter since they cannot wrap anything (obviously) + * - Active formatting elements have special handling in the HTML5 tree building + * algorithm where they are reconstructed to wrap all originally intended content. + * (ex: above) + * + * Here is the list of 22 HTML5 tags that are affected: + *ABBR, BDI, BDO, CITE, DATA, DEL, DFN, INS, KBD, MARK, + *Q, RB, RP, RT, RTC, RUBY, SAMP, SPAN, SUB, SUP, TIME, VAR + * + * https://phabricator.wikimedia.org/T176363#3628173 verifies that this list of + * tags all demonstrate this behavior. + * -- */ +var tagsWithChangedMisnestingBehavior; +function getTagsWithChangedMisnestingBehavior() { + if (!tagsWithChangedMisnestingBehavior) { + tagsWithChangedMisnestingBehavior = new Set(); + Consts.HTML.HTML5Tags.forEach(function(t) { + if (Consts.Sanitizer.TagWhiteList.has(t) && + !Consts.HTML.BlockTags.has(t) && + !Consts.HTML.FormattingTags.has(t) && + !Consts.HTML.VoidTags.has(t) + ) { + tagsWithChangedMisnestingBehavior.add(t); + } + }); + } + + return tagsWithChangedMisnestingBehavior; +} + /* * Log Transclusion with more than one parts * Ex - {{table-start}} @@ -176,16 +232,31 @@ templateInfo: templateInfo, params: { name: cNodeName }, }; - var adjNode = getNextMatchingNode(c, c); - if (adjNode) { - var adjDp = DU.getDataParsoid(adjNode); - if (!adjDp.tmp) { - adjDp.tmp = {}; + + // FIXME: This literal html marker check is strictly not required + // (a) we've already checked that above and know that isQuoteElt is + // not one of our tags. + // (b) none of the tags in the list have native wikitext
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: "Automatically enable all new beta features" should enable 2...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/379228 ) Change subject: "Automatically enable all new beta features" should enable 2017 editor .. "Automatically enable all new beta features" should enable 2017 editor Bug: T176181 Change-Id: I588dd08b788689fb89de7fd001bded30caa07e64 --- M VisualEditor.hooks.php 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved Objections: Deskana: There's a problem with this change, please improve diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php index c3b1aa6..2bf92cb 100644 --- a/VisualEditor.hooks.php +++ b/VisualEditor.hooks.php @@ -719,8 +719,7 @@ 'requirements' => [ 'javascript' => true, 'blacklist' => $veConfig->get( 'VisualEditorBrowserBlacklist' ), - ], - 'exempt-from-auto-enrollment' => true + ] ]; } } -- To view, visit https://gerrit.wikimedia.org/r/379228 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I588dd08b788689fb89de7fd001bded30caa07e64 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: DeskanaGerrit-Reviewer: Deskana Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...WDCM[master]: Fix Tabs/Crosstabs Init
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380892 ) Change subject: Fix Tabs/Crosstabs Init .. Fix Tabs/Crosstabs Init Change-Id: Ifa7a7b7bf44fd26543d89bab38f8f7fabbd70d34 --- M WDCM_UsageDashboard/server.R M WDCM_UsageDashboard/ui.R 2 files changed, 341 insertions(+), 346 deletions(-) Approvals: GoranSMilovanovic: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/WDCM_UsageDashboard/server.R b/WDCM_UsageDashboard/server.R index 62fe121..74f8a9f 100644 --- a/WDCM_UsageDashboard/server.R +++ b/WDCM_UsageDashboard/server.R @@ -547,26 +547,24 @@ updateSelectizeInput(session, 'selectProject', choices = c(projects, paste("_", projectTypes, sep="")), - selected = projects[round(runif(5, 1, length(projects)))], + selected = c("_Wikipedia", "_Wikinews", "_Wiktionary"), server = TRUE) ### --- SELECT: update select 'selectCategories' updateSelectizeInput(session, 'selectCategories', choices = categories, - selected = categories[round(runif(3, 1, length(categories)))], + selected = categories[round(runif(6, 1, length(categories)))], server = TRUE) - # - OBSERVE: input$applySelection - observeEvent(input$applySelection, { - + tabsDataset <- reactive({ ### --- selected projects: selectedProjects <- character() -wUnzip <- which(names(unzip_projectTypes) %in% isolate(input$selectProject)) +wUnzip <- which(names(unzip_projectTypes) %in% input$selectProject) if (length(wUnzip > 0)) { selectedProjects <- unname(do.call(c, unzip_projectTypes[wUnzip])) } -wSel <- which(projects %in% isolate(input$selectProject)) +wSel <- which(projects %in% input$selectProject) if (length(wSel > 0)) { selectedProjects <- c(selectedProjects, projects[wSel]) } @@ -574,343 +572,340 @@ output$testSelectedProjects <- renderText({ paste(selectedProjects, collapse = ", ", sep = "") }) - ### --- selected categories: -selectedCategories <- isolate(input$selectCategories) - - --- Chart: tabulations_projectsChart -output$tabulations_projectsChart <- renderPlot({ - # - Chart Frame for output$tabulations_projectsChart - plotFrame <- wdcmProjectCategory %>% -filter(Project %in% selectedProjects & Category %in% selectedCategories) %>% -group_by(Project) %>% -summarise(Usage = sum(Usage)) %>% -arrange(desc(Usage)) - # - top 25 projects: - if (dim(plotFrame)[1] > 25) { -plotFrame <- plotFrame[1:25, ] - } - plotFrame$Project <- factor(plotFrame$Project, - levels = plotFrame$Project[order(-plotFrame$Usage)]) - # - express labels as K, M: - plotFrame$Label <- sapply(plotFrame$Usage, function(x) { -if (x >= 1e+03 & x < 1e+06) { - out <- paste(round(x/1e+03, 1), "K", sep = "") -} else if (x > 1e+06) { - out <- paste(round(x/1e+06, 1), "M", sep = "") -} else { - out <- as.character(x) -} -return(out) - }) - # - Plot - ggplot(plotFrame, - aes(x = Project, y = Usage, label = Label)) + -geom_bar(stat = "identity", width = .6, fill = "#4c8cff") + -xlab('Projects') + ylab('Entity Usage') + -ylim(0, max(plotFrame$Usage) + .1*max(plotFrame$Usage)) + -scale_y_continuous(labels = comma) + -geom_label(size = 3, vjust = -.1) + -theme_minimal() + -theme(axis.text.x = element_text(angle = 90, size = 12, hjust = 1)) + -theme(axis.title.x = element_text(size = 12)) + -theme(axis.title.y = element_text(size = 12)) + -theme(plot.title = element_text(size = 15)) %>% -withProgress(message = 'Generating plot', - min = 0, - max = 1, - value = 1, {incProgress(amount = 0)}) -}) -# - Download Frame: tabulations_projectsChart -tabulations_projectsDownload_Frame <- reactive({ - plotFrame <- wdcmProjectCategory %>% -filter(Project %in% selectedProjects & Category %in% selectedCategories) %>% -group_by(Project) %>% -summarise(Usage = sum(Usage)) %>% -arrange(desc(Usage)) - plotFrame -}) -# - Download: tabulations_projectsChart -output$tabulations_projectsDownload_Frame <- downloadHandler( - filename = function() { -'WDCM_Data.csv'}, - content = function(file) { -write.csv(tabulations_projectsDownload_Frame(), - file, - quote = FALSE, - row.names = FALSE) - }, - contentType =
[MediaWiki-commits] [Gerrit] analytics...WDCM[master]: Fix Tabs/Crosstabs Init
GoranSMilovanovic has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380892 ) Change subject: Fix Tabs/Crosstabs Init .. Fix Tabs/Crosstabs Init Change-Id: Ifa7a7b7bf44fd26543d89bab38f8f7fabbd70d34 --- M WDCM_UsageDashboard/server.R M WDCM_UsageDashboard/ui.R 2 files changed, 341 insertions(+), 346 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/WDCM refs/changes/92/380892/1 diff --git a/WDCM_UsageDashboard/server.R b/WDCM_UsageDashboard/server.R index 62fe121..74f8a9f 100644 --- a/WDCM_UsageDashboard/server.R +++ b/WDCM_UsageDashboard/server.R @@ -547,26 +547,24 @@ updateSelectizeInput(session, 'selectProject', choices = c(projects, paste("_", projectTypes, sep="")), - selected = projects[round(runif(5, 1, length(projects)))], + selected = c("_Wikipedia", "_Wikinews", "_Wiktionary"), server = TRUE) ### --- SELECT: update select 'selectCategories' updateSelectizeInput(session, 'selectCategories', choices = categories, - selected = categories[round(runif(3, 1, length(categories)))], + selected = categories[round(runif(6, 1, length(categories)))], server = TRUE) - # - OBSERVE: input$applySelection - observeEvent(input$applySelection, { - + tabsDataset <- reactive({ ### --- selected projects: selectedProjects <- character() -wUnzip <- which(names(unzip_projectTypes) %in% isolate(input$selectProject)) +wUnzip <- which(names(unzip_projectTypes) %in% input$selectProject) if (length(wUnzip > 0)) { selectedProjects <- unname(do.call(c, unzip_projectTypes[wUnzip])) } -wSel <- which(projects %in% isolate(input$selectProject)) +wSel <- which(projects %in% input$selectProject) if (length(wSel > 0)) { selectedProjects <- c(selectedProjects, projects[wSel]) } @@ -574,343 +572,340 @@ output$testSelectedProjects <- renderText({ paste(selectedProjects, collapse = ", ", sep = "") }) - ### --- selected categories: -selectedCategories <- isolate(input$selectCategories) - - --- Chart: tabulations_projectsChart -output$tabulations_projectsChart <- renderPlot({ - # - Chart Frame for output$tabulations_projectsChart - plotFrame <- wdcmProjectCategory %>% -filter(Project %in% selectedProjects & Category %in% selectedCategories) %>% -group_by(Project) %>% -summarise(Usage = sum(Usage)) %>% -arrange(desc(Usage)) - # - top 25 projects: - if (dim(plotFrame)[1] > 25) { -plotFrame <- plotFrame[1:25, ] - } - plotFrame$Project <- factor(plotFrame$Project, - levels = plotFrame$Project[order(-plotFrame$Usage)]) - # - express labels as K, M: - plotFrame$Label <- sapply(plotFrame$Usage, function(x) { -if (x >= 1e+03 & x < 1e+06) { - out <- paste(round(x/1e+03, 1), "K", sep = "") -} else if (x > 1e+06) { - out <- paste(round(x/1e+06, 1), "M", sep = "") -} else { - out <- as.character(x) -} -return(out) - }) - # - Plot - ggplot(plotFrame, - aes(x = Project, y = Usage, label = Label)) + -geom_bar(stat = "identity", width = .6, fill = "#4c8cff") + -xlab('Projects') + ylab('Entity Usage') + -ylim(0, max(plotFrame$Usage) + .1*max(plotFrame$Usage)) + -scale_y_continuous(labels = comma) + -geom_label(size = 3, vjust = -.1) + -theme_minimal() + -theme(axis.text.x = element_text(angle = 90, size = 12, hjust = 1)) + -theme(axis.title.x = element_text(size = 12)) + -theme(axis.title.y = element_text(size = 12)) + -theme(plot.title = element_text(size = 15)) %>% -withProgress(message = 'Generating plot', - min = 0, - max = 1, - value = 1, {incProgress(amount = 0)}) -}) -# - Download Frame: tabulations_projectsChart -tabulations_projectsDownload_Frame <- reactive({ - plotFrame <- wdcmProjectCategory %>% -filter(Project %in% selectedProjects & Category %in% selectedCategories) %>% -group_by(Project) %>% -summarise(Usage = sum(Usage)) %>% -arrange(desc(Usage)) - plotFrame -}) -# - Download: tabulations_projectsChart -output$tabulations_projectsDownload_Frame <- downloadHandler( - filename = function() { -'WDCM_Data.csv'}, - content = function(file) { -write.csv(tabulations_projectsDownload_Frame(), - file, - quote = FALSE, - row.names = FALSE) - }, - contentType =
[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: Don't load CentralNotice on history or diff pages
Pcoombe has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380891 ) Change subject: Don't load CentralNotice on history or diff pages .. Don't load CentralNotice on history or diff pages History and diff pages have one-click rollback links. Delayed loading of CentralNotice banners on these pages can cause users to misclick these links. It is safer, and affects relatively few pageviews, to not load CentralNotice on these pages. We already avoid loading on Special pages. Bug: T176656 Change-Id: Icf31d9f00b7c74c5eca661ce9f759b7fbab74cd3 --- M CentralNotice.hooks.php 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/91/380891/1 diff --git a/CentralNotice.hooks.php b/CentralNotice.hooks.php index b980767..b33516d 100644 --- a/CentralNotice.hooks.php +++ b/CentralNotice.hooks.php @@ -168,9 +168,12 @@ // TODO Separate geoIP from CentralNotice $out->addModules( 'ext.centralNotice.geoIP' ); - // If we're editing or we're on a special page, bow out now + // If we're on a special page, editing, viewing history or a diff, bow out now + // This is to reduce chance of bad misclicks from delayed banner loading if ( $out->getTitle()->inNamespace( NS_SPECIAL ) || - ( $wgRequest->getText( 'action' ) === 'edit' ) + ( $wgRequest->getText( 'action' ) === 'edit' ) || + ( $wgRequest->getText( 'action' ) === 'history' ) || + ( $wgRequest->getText( 'diff' ) !== '' ) ) { return true; } -- To view, visit https://gerrit.wikimedia.org/r/380891 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf31d9f00b7c74c5eca661ce9f759b7fbab74cd3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: master Gerrit-Owner: Pcoombe___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: BadImageRemover: Update for inline-image change in Parsoid
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380890 ) Change subject: BadImageRemover: Update for inline-image change in Parsoid .. BadImageRemover: Update for inline-image change in Parsoid Bug: T118520 Change-Id: I80506d71d3f035fdf3970d7619219791640669e3 --- M includes/Parsoid/Fixer/BadImageRemover.php M tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php 2 files changed, 25 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/90/380890/1 diff --git a/includes/Parsoid/Fixer/BadImageRemover.php b/includes/Parsoid/Fixer/BadImageRemover.php index 8f97675..c2fe067 100644 --- a/includes/Parsoid/Fixer/BadImageRemover.php +++ b/includes/Parsoid/Fixer/BadImageRemover.php @@ -41,7 +41,7 @@ * @return string */ public function getXPath() { - return '//span[@typeof="mw:Image"]//img[@resource]'; + return '//inline-image[@typeof="mw:Image"]//img[@resource] | //span[@typeof="mw:Image"]//img[@resource]'; } /** diff --git a/tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php b/tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php index 47c9994..dd7ecba 100644 --- a/tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php +++ b/tests/phpunit/Parsoid/Fixer/BadImageRemoverTest.php @@ -21,6 +21,18 @@ [ 'Passes through allowed good images', // expected html after filtering + ' and other stuff', + // input html + ' and other stuff', + // accept/decline callback + function () { + return false; + } + ], + + [ + 'Passes through allowed good images (with legacy span markup)', + // expected html after filtering ' and other stuff', // input html ' and other stuff', @@ -47,6 +59,18 @@ // expected html after filtering ' and other stuff', // input html + ' and other stuff', + // accept/decline callback + function () { + return true; + } + ], + + [ + 'Strips declined images (with legacy span markup)', + // expected html after filtering + ' and other stuff', + // input html ' and other stuff', // accept/decline callback function () { -- To view, visit https://gerrit.wikimedia.org/r/380890 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I80506d71d3f035fdf3970d7619219791640669e3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Catrope___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Replace constructive with progressive UI flag
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380821 ) Change subject: Replace constructive with progressive UI flag .. Replace constructive with progressive UI flag Change-Id: Iae36e978978ed6642f44606a934c540cf5f8537f --- M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb M modules/ve-mw/ui/dialogs/ve.ui.MWExtensionDialog.js M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js M modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js M modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js 6 files changed, 7 insertions(+), 7 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb index a1a6912..3dde4ce 100644 --- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb +++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb @@ -105,7 +105,7 @@ div(:media_select, class: 'mw-widget-mediaResultWidget-overlay') div(:medium_dialog, class: 'oo-ui-window oo-ui-dialog oo-ui-dialog-open oo-ui-dialog-medium') span(:use_image_button, css: '.oo-ui-processDialog-actions-primary > div:nth-child(1) > a:nth-child(1) > span:nth-child(2)') - span(:media_insert_button, css: '.oo-ui-flaggedElement-constructive > a:nth-child(1) > span:nth-child(2)') + span(:media_insert_button, css: '.oo-ui-flaggedElement-progressive > a:nth-child(1) > span:nth-child(2)') div(:caption, css: 'div.ve-ui-surface:nth-child(2) > div:nth-child(1) > div.ve-ce-documentNode.ve-ce-branchNode') text_field(:alternative_text, css: '.oo-ui-textInputWidget.ve-ui-mwMediaDialog-altText > input') checkbox(:minor_edit, id: 'wpMinoredit') diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWExtensionDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWExtensionDialog.js index a878393..1f19820 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWExtensionDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWExtensionDialog.js @@ -47,7 +47,7 @@ { action: 'done', label: OO.ui.deferMsg( 'visualeditor-dialog-action-insert' ), - flags: [ 'constructive', 'primary' ], + flags: [ 'progressive', 'primary' ], modes: 'insert' } ] ); diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js index a6d32db..b1c33d9 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js @@ -52,7 +52,7 @@ { action: 'insert', label: OO.ui.deferMsg( 'visualeditor-dialog-action-insert' ), - flags: [ 'primary', 'constructive' ], + flags: [ 'primary', 'progressive' ], modes: 'insert' }, { diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js index f7d6708..b02c9f1 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js @@ -57,7 +57,7 @@ action: 'save', // May be overridden by config.saveButtonLabel label: OO.ui.deferMsg( 'visualeditor-savedialog-label-review' ), - flags: [ 'primary', 'constructive' ], + flags: [ 'primary', 'progressive' ], modes: [ 'save', 'review', 'preview' ], accessKey: 's' }, @@ -84,7 +84,7 @@ { action: 'resolve', label: OO.ui.deferMsg( 'visualeditor-savedialog-label-resolve-conflict' ), - flags: [ 'primary', 'constructive' ], + flags: [ 'primary', 'progressive' ], modes: 'conflict' }, { diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js index 866e296..6a3fd20 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js @@ -50,7 +50,7 @@ { action: 'insert', label: OO.ui.deferMsg( 'visualeditor-dialog-action-insert' ), - flags: [ 'primary', 'constructive' ], + flags: [ 'primary', 'progressive' ], modes: 'insert' }, { diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js index cc833de..fd31dc5 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js @@ -41,7 +41,7 @@ this.addTemplateButton = new OO.ui.ButtonWidget( { label: ve.msg(
[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiChat[master]: Fix rendering of main chat messages
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357518 ) Change subject: Fix rendering of main chat messages .. Fix rendering of main chat messages Thanks to Hawke and Kitsufox for originally finding the issue, as well as to MtMNC and MatmaRex for both helping figuring out what's going on and contributing to the code patch! Bug: T166421 Co-authored by: MtMNCCo-authored-by: Bartosz Dziewoński Change-Id: I90984c81cf04b2c19b5353a8f6d75e853dd89e44 --- M MediaWikiChat.js M extension.json 2 files changed, 33 insertions(+), 21 deletions(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/MediaWikiChat.js b/MediaWikiChat.js old mode 100644 new mode 100755 index 3b4c8ca..8b24e8e --- a/MediaWikiChat.js +++ b/MediaWikiChat.js @@ -278,6 +278,10 @@ }, addSystemMessage: function( text, timestamp ) { + // stop processing the message if it's a duplicate + if ( MediaWikiChat.messageIsDuplicate( timestamp ) ) { + return; + } var html = ''; // mwchat-parent so that sending a system message resets the parent/child system html += ''; html += text; @@ -288,7 +292,23 @@ MediaWikiChat.addGeneralMessage( html, timestamp ); }, + messageIsDuplicate: function( timestamp ) { + // note message is only considered duplicate if it has the same timestamp as another, + //regardless of who posted that other message + $( '.mwchat-item-timestamp.pretty' ).each( function( index, value ) { + if ( $( value ).attr( 'data-timestamp' ) == timestamp ) { + return true; + } + } ); + return false; + }, + addMessage: function( userId, message, timestamp ) { + // stop processing the message if it's a duplicate + if ( MediaWikiChat.messageIsDuplicate( timestamp ) ) { + return; + } + var fromUser = MediaWikiChat.userData[userId]; var currentUser = MediaWikiChat.userData[mw.config.get( 'wgUserId' )] @@ -307,13 +327,14 @@ } var messages = $( '#mwchat-table tr.mwchat-parent' ); var lastParent = $( messages[messages.length - 1] ); + var html = ''; if ( lastParent.attr( 'data-username' ) == fromUser.name ) { lastParent.children( '.mwchat-rowspan' ).attr( 'rowspan', Number( lastParent.children( '.mwchat-rowspan' ).attr( 'rowspan' ) ) + 1 ); // increment the rowspan - var html = ''; + html = ''; } else { - var html = ''; + html = ''; html += ''; if ( mw.config.get( 'wgChatLinkUsernames' ) ) { @@ -340,27 +361,18 @@ }, addGeneralMessage: function( html, timestamp ) { - var post = true; + // assumes the message isn't a duplicate (already checked in addMessage and addSystemMessage) + var elem = $( html ).appendTo( $( '#mwchat-table' ) ); - $( '.mwchat-item-timestamp.pretty' ).each( function( index, value ) { - if ( $( value ).attr( 'data-timestamp' ) == timestamp ) { - post = false; - } + elem.hover( function() { + elem.find( '.pretty' ).css( 'visibility', 'hidden' ); + elem.find( '.real' ).show(); + }, function() { + elem.find( '.real' ).hide(); + elem.find( '.pretty' ).css( 'visibility', 'visible' ); } ); - if ( post ) { - var elem = $( html ).appendTo( $( '#mwchat-table' ) ); - - elem.hover( function() { - elem.find( '.pretty' ).css( 'visibility', 'hidden' ); - elem.find( '.real' ).show(); - }, function() { - elem.find( '.real' ).hide(); - elem.find( '.pretty' ).css( 'visibility', 'visible' ); - } ); - - elem.find( 'a' ).attr( 'target', '_blank' ); - } + elem.find( 'a' ).attr( 'target', '_blank' ); }, getColourFromUsername: function( name ) { diff --git a/extension.json b/extension.json index 81ff59c..b2ea83d 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "MediaWikiChat", -
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOjs UI to v0.23.2
Jforrester has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380849 ) Change subject: Update OOjs UI to v0.23.2 .. Update OOjs UI to v0.23.2 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.23.2 Depends-On: I9d1264ebf456cadc7e350c2558a9997a2a0633c4 Change-Id: I9bbd4b8ff6333816e7ba73b3c033623753bb6df5 --- M composer.json M resources/lib/oojs-ui/i18n/ais.json A resources/lib/oojs-ui/i18n/en-gb.json M resources/lib/oojs-ui/i18n/pt-br.json M resources/lib/oojs-ui/i18n/tay.json M resources/lib/oojs-ui/oojs-ui-apex.js M resources/lib/oojs-ui/oojs-ui-core-apex.css M resources/lib/oojs-ui/oojs-ui-core-wikimediaui.css M resources/lib/oojs-ui/oojs-ui-core.js M resources/lib/oojs-ui/oojs-ui-core.js.map M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css M resources/lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css M resources/lib/oojs-ui/oojs-ui-toolbars.js M resources/lib/oojs-ui/oojs-ui-widgets-apex.css M resources/lib/oojs-ui/oojs-ui-widgets-wikimediaui.css M resources/lib/oojs-ui/oojs-ui-widgets.js M resources/lib/oojs-ui/oojs-ui-widgets.js.map M resources/lib/oojs-ui/oojs-ui-wikimediaui.js M resources/lib/oojs-ui/oojs-ui-windows-apex.css M resources/lib/oojs-ui/oojs-ui-windows-wikimediaui.css M resources/lib/oojs-ui/oojs-ui-windows.js M resources/lib/oojs-ui/oojs-ui-windows.js.map 22 files changed, 194 insertions(+), 160 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/380849 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9bbd4b8ff6333816e7ba73b3c033623753bb6df5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: Catrope Gerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Siebrand Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix/simplify RecyclerView item decorations (dividers).
Dbrant has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380889 ) Change subject: Fix/simplify RecyclerView item decorations (dividers). .. Fix/simplify RecyclerView item decorations (dividers). This fixes (and simplifies) the way we draw the thin dividers between the items in our RecyclerViews. Some recent changes exposed a flaw in the previous implementation, where it actually wasn't providing enough space for the divider to be drawn (and instead drawing it on top of the item itself. Change-Id: Ie589ef5262561d90558a8309db0057f2e1e3ff9b --- M app/src/main/java/org/wikipedia/feed/news/NewsFragment.java M app/src/main/java/org/wikipedia/feed/view/ListCardView.java M app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java M app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java M app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java M app/src/main/java/org/wikipedia/views/DrawableItemDecoration.java 7 files changed, 25 insertions(+), 54 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/89/380889/1 diff --git a/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java b/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java index 30c262d..72a74b8 100644 --- a/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java +++ b/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java @@ -27,7 +27,6 @@ import org.wikipedia.page.PageActivity; import org.wikipedia.readinglist.AddToReadingListDialog; import org.wikipedia.util.GradientUtil; -import org.wikipedia.util.ResourceUtil; import org.wikipedia.util.ShareUtil; import org.wikipedia.views.DefaultRecyclerAdapter; import org.wikipedia.views.DefaultViewHolder; @@ -103,8 +102,7 @@ private void initRecycler() { links.setLayoutManager(new LinearLayoutManager(getContext())); -links.addItemDecoration(new DrawableItemDecoration(getContext(), -ResourceUtil.getThemedAttributeId(getContext(), R.attr.list_separator_drawable), true)); +links.addItemDecoration(new DrawableItemDecoration(getContext(), R.attr.list_separator_drawable)); links.setNestedScrollingEnabled(false); } diff --git a/app/src/main/java/org/wikipedia/feed/view/ListCardView.java b/app/src/main/java/org/wikipedia/feed/view/ListCardView.java index 4fc4eac..9601de2 100644 --- a/app/src/main/java/org/wikipedia/feed/view/ListCardView.java +++ b/app/src/main/java/org/wikipedia/feed/view/ListCardView.java @@ -9,7 +9,6 @@ import org.wikipedia.R; import org.wikipedia.feed.model.Card; -import org.wikipedia.util.ResourceUtil; import org.wikipedia.views.DrawableItemDecoration; import org.wikipedia.views.ViewUtil; @@ -60,8 +59,7 @@ directly. */ protected void initRecycler(@NonNull RecyclerView recyclerView) { recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); -recyclerView.addItemDecoration(new DrawableItemDecoration(getContext(), -ResourceUtil.getThemedAttributeId(getContext(), R.attr.list_separator_drawable), true)); +recyclerView.addItemDecoration(new DrawableItemDecoration(getContext(), R.attr.list_separator_drawable)); recyclerView.setNestedScrollingEnabled(false); } } diff --git a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java index a45d171..14ce604 100644 --- a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java +++ b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java @@ -77,8 +77,7 @@ recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); recyclerView.setAdapter(adapter); -recyclerView.addItemDecoration(new DrawableItemDecoration(getContext(), -ResourceUtil.getThemedAttributeId(getContext(), R.attr.list_separator_drawable), true)); +recyclerView.addItemDecoration(new DrawableItemDecoration(getContext(), R.attr.list_separator_drawable)); ((SimpleItemAnimator) recyclerView.getItemAnimator()).setSupportsChangeAnimations(false); errorView.setBackClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java b/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java index 72bb951..a9c0889 100644 --- a/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java +++ b/app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java @@ -89,8 +89,7 @@ recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); recyclerView.setAdapter(adapter); -recyclerView.addItemDecoration(new DrawableItemDecoration(getContext(), -
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Reopen db connection after doing SpecialPageCacheUpdates
Brian Wolff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380888 ) Change subject: Reopen db connection after doing SpecialPageCacheUpdates .. Reopen db connection after doing SpecialPageCacheUpdates Special page updates on commons have been broken recently due to Mysql "going away" after doing the ActiveUsers special page cache update. Presumably this is because we were only repinging the server after QueryPage updates, and not the callback updates (Combined with a spike in wikidata recentchanges entries making the ActiveUsers callback now take about an hour to complete) Bug: T176055 Change-Id: Ic344940460c353544d7c08bbe2d8c900f6cc73da --- M maintenance/updateSpecialPages.php 1 file changed, 21 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/88/380888/1 diff --git a/maintenance/updateSpecialPages.php b/maintenance/updateSpecialPages.php index 5ea3828..390a5fb 100644 --- a/maintenance/updateSpecialPages.php +++ b/maintenance/updateSpecialPages.php @@ -101,16 +101,7 @@ $this->output( sprintf( "%.2fs\n", $seconds ) ); } # Reopen any connections that have closed - if ( !wfGetLB()->pingAll() ) { - $this->output( "\n" ); - do { - $this->error( "Connection failed, reconnecting in 10 seconds..." ); - sleep( 10 ); - } while ( !wfGetLB()->pingAll() ); - $this->output( "Reconnected\n\n" ); - } - # Wait for the replica DB to catch up - wfWaitForSlaves(); + $this->reopenAndWaitSlaves(); } else { $this->output( "cheap, skipped\n" ); } @@ -119,6 +110,25 @@ } } } + } + + /** +* Re-open any closed db connection, and wait for slaves +* +* Queries that take a really long time, might cause the +* mysql connection to "go away" +*/ + private function reopenAndWaitSlaves() { + if ( !wfGetLB()->pingAll() ) { + $this->output( "\n" ); + do { + $this->error( "Connection failed, reconnecting in 10 seconds..." ); + sleep( 10 ); + } while ( !wfGetLB()->pingAll() ); + $this->output( "Reconnected\n\n" ); + } + # Wait for the replica DB to catch up + wfWaitForSlaves(); } public function doSpecialPageCacheUpdates( $dbw ) { @@ -154,7 +164,7 @@ } $this->output( sprintf( "%.2fs\n", $seconds ) ); # Wait for the replica DB to catch up - wfWaitForSlaves(); + $this->reopenAndWaitSlaves(); } } } -- To view, visit https://gerrit.wikimedia.org/r/380888 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic344940460c353544d7c08bbe2d8c900f6cc73da Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Brian Wolff___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Replace constructive with progressive UI flag
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380818 ) Change subject: Replace constructive with progressive UI flag .. Replace constructive with progressive UI flag Change-Id: If216e7f58edf06835f98aa70823e3cba23b8b6ce --- M src/ui/inspectors/ve.ui.AnnotationInspector.js M src/ui/inspectors/ve.ui.FragmentInspector.js 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/src/ui/inspectors/ve.ui.AnnotationInspector.js b/src/ui/inspectors/ve.ui.AnnotationInspector.js index 1102b90..215e8b0 100644 --- a/src/ui/inspectors/ve.ui.AnnotationInspector.js +++ b/src/ui/inspectors/ve.ui.AnnotationInspector.js @@ -57,7 +57,7 @@ { action: 'done', label: OO.ui.deferMsg( 'visualeditor-dialog-action-insert' ), - flags: [ 'constructive', 'primary' ], + flags: [ 'progressive', 'primary' ], modes: 'insert' } ]; diff --git a/src/ui/inspectors/ve.ui.FragmentInspector.js b/src/ui/inspectors/ve.ui.FragmentInspector.js index b39f9b2..5178c00 100644 --- a/src/ui/inspectors/ve.ui.FragmentInspector.js +++ b/src/ui/inspectors/ve.ui.FragmentInspector.js @@ -43,7 +43,7 @@ { action: 'done', label: OO.ui.deferMsg( 'visualeditor-dialog-action-insert' ), - flags: [ 'constructive', 'primary' ], + flags: [ 'progressive', 'primary' ], modes: 'insert' } ] ); -- To view, visit https://gerrit.wikimedia.org/r/380818 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If216e7f58edf06835f98aa70823e3cba23b8b6ce Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: Catrope 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/vendor[master]: Update OOjs UI to v0.23.2
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380848 ) Change subject: Update OOjs UI to v0.23.2 .. Update OOjs UI to v0.23.2 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0$ Change-Id: I9d1264ebf456cadc7e350c2558a9997a2a0633c4 --- M composer.json M composer.lock M composer/installed.json M oojs/oojs-ui/History.md M oojs/oojs-ui/bin/testsuitegenerator.rb M oojs/oojs-ui/demos/classes/BrokenDialog.js M oojs/oojs-ui/demos/classes/ButtonStyleShowcaseWidget.js M oojs/oojs-ui/demos/classes/ButtonStyleShowcaseWidget.php M oojs/oojs-ui/demos/classes/MenuDialog.js M oojs/oojs-ui/demos/classes/ProcessDialog.js M oojs/oojs-ui/demos/classes/SampleTabPanel.js M oojs/oojs-ui/demos/pages/dialogs.js M oojs/oojs-ui/demos/pages/widgets.js M oojs/oojs-ui/demos/pages/widgets.php M oojs/oojs-ui/demos/styles/demo.css M oojs/oojs-ui/i18n/ais.json A oojs/oojs-ui/i18n/en-gb.json M oojs/oojs-ui/i18n/pt-br.json M oojs/oojs-ui/i18n/tay.json M oojs/oojs-ui/package.json M oojs/oojs-ui/php/mixins/FlaggedElement.php 21 files changed, 198 insertions(+), 137 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index e6dd1a3..3ebc15a 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "monolog/monolog": "1.22.1", "mustangostang/spyc": "0.6.2", "nmred/kafka-php": "0.1.5", - "oojs/oojs-ui": "0.23.1", + "oojs/oojs-ui": "0.23.2", "oyejorge/less.php": "1.7.0.14", "pear/console_getopt": "1.4.1", "pear/mail": "1.4.1", diff --git a/composer.lock b/composer.lock index 7822ac2..96393d5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;, "This file is @generated automatically" ], -"content-hash": "1129c0e8cd3e4bfcdd6c36f6a6fef8f0", +"content-hash": "1abc9f7afbd26388ee9bccadaaef1239", "packages": [ { "name": "composer/semver", @@ -516,16 +516,16 @@ }, { "name": "oojs/oojs-ui", -"version": "v0.23.1", +"version": "v0.23.2", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git;, -"reference": "78a763891cab6e5af620e891f340141e75ceef84" +"reference": "60ea6e39e200f732448ecceb88c9922e69974dd4" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/78a763891cab6e5af620e891f340141e75ceef84;, -"reference": "78a763891cab6e5af620e891f340141e75ceef84", +"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/60ea6e39e200f732448ecceb88c9922e69974dd4;, +"reference": "60ea6e39e200f732448ecceb88c9922e69974dd4", "shasum": "" }, "require": { @@ -591,7 +591,7 @@ ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;, -"time": "2017-09-20T00:13:22+00:00" +"time": "2017-09-26T19:49:41+00:00" }, { "name": "oyejorge/less.php", diff --git a/composer/installed.json b/composer/installed.json index d327ab5..da842bf 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -2326,17 +2326,17 @@ }, { "name": "oojs/oojs-ui", -"version": "v0.23.1", -"version_normalized": "0.23.1.0", +"version": "v0.23.2", +"version_normalized": "0.23.2.0", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git;, -"reference": "78a763891cab6e5af620e891f340141e75ceef84" +"reference": "60ea6e39e200f732448ecceb88c9922e69974dd4" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/78a763891cab6e5af620e891f340141e75ceef84;, -"reference": "78a763891cab6e5af620e891f340141e75ceef84", +"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/60ea6e39e200f732448ecceb88c9922e69974dd4;, +"reference": "60ea6e39e200f732448ecceb88c9922e69974dd4", "shasum": "" }, "require": { @@ -2348,7 +2348,7 @@ "mediawiki/mediawiki-codesniffer": "0.12.0", "phpunit/phpunit": "4.8.21" }, -"time": "2017-09-20T00:13:22+00:00", +"time": "2017-09-26T19:49:41+00:00", "type": "library", "installation-source": "dist",
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Do not include wikidata in number active users on Special:St...
Brian Wolff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380887 ) Change subject: Do not include wikidata in number active users on Special:Statistics .. Do not include wikidata in number active users on Special:Statistics We already exclude wikidata actions from counting on Special:ActiveUsers as of 56524c05. Should be consistent. Change-Id: Ib69a614a65246a0f4f47365751f9bef130f47475 --- M includes/deferred/SiteStatsUpdate.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/87/380887/1 diff --git a/includes/deferred/SiteStatsUpdate.php b/includes/deferred/SiteStatsUpdate.php index 2f074ba..6665d2d 100644 --- a/includes/deferred/SiteStatsUpdate.php +++ b/includes/deferred/SiteStatsUpdate.php @@ -149,6 +149,7 @@ 'recentchanges', 'COUNT( DISTINCT rc_user_text )', [ + 'rc_type != ' . $dbr->addQuotes( RC_EXTERNAL ), // no wikidata 'rc_user != 0', 'rc_bot' => 0, 'rc_log_type != ' . $dbr->addQuotes( 'newusers' ) . ' OR rc_log_type IS NULL', -- To view, visit https://gerrit.wikimedia.org/r/380887 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib69a614a65246a0f4f47365751f9bef130f47475 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Brian Wolff___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.23.2
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380850 ) Change subject: Update OOjs UI to v0.23.2 .. Update OOjs UI to v0.23.2 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.23.2 Change-Id: I9d1264ebf456cadc7e350c2558a9997a2a0633c4 --- M .jsduck/eg-iframe.html M demos/ve/desktop-dist.html M demos/ve/desktop.html M demos/ve/mobile-dist.html M demos/ve/mobile.html M lib/oojs-ui/i18n/ais.json A lib/oojs-ui/i18n/en-gb.json M lib/oojs-ui/i18n/pt-br.json M lib/oojs-ui/i18n/tay.json M lib/oojs-ui/oojs-ui-apex-icons-accessibility.css M lib/oojs-ui/oojs-ui-apex-icons-accessibility.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-alerts.css M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-content.css M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-layout.css M lib/oojs-ui/oojs-ui-apex-icons-layout.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-media.css M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-movement.css M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-user.css M lib/oojs-ui/oojs-ui-apex-icons-user.rtl.css M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui-core-apex.css M lib/oojs-ui/oojs-ui-core-apex.rtl.css M lib/oojs-ui/oojs-ui-core-mediawiki.css M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-core-wikimediaui.css M lib/oojs-ui/oojs-ui-core-wikimediaui.rtl.css M lib/oojs-ui/oojs-ui-core.js M lib/oojs-ui/oojs-ui-core.js.map M lib/oojs-ui/oojs-ui-images-apex.css M lib/oojs-ui/oojs-ui-images-apex.rtl.css M lib/oojs-ui/oojs-ui-images-wikimediaui.css M lib/oojs-ui/oojs-ui-images-wikimediaui.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.css M lib/oojs-ui/oojs-ui-mediawiki.js M lib/oojs-ui/oojs-ui-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars-apex.css M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.rtl.css M lib/oojs-ui/oojs-ui-toolbars.js M lib/oojs-ui/oojs-ui-widgets-apex.css M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-widgets-wikimediaui.css M lib/oojs-ui/oojs-ui-widgets-wikimediaui.rtl.css M lib/oojs-ui/oojs-ui-widgets.js M lib/oojs-ui/oojs-ui-widgets.js.map M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.rtl.css M
[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: [WIP] QuickTime MJPEG/MP3 240p video fallback for iOS
Brion VIBBER has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380886 ) Change subject: [WIP] QuickTime MJPEG/MP3 240p video fallback for iOS .. [WIP] QuickTime MJPEG/MP3 240p video fallback for iOS Still testing this, based on old abandonded patch. As a stopgap until the frontend video rewrite is done, produce video transcodes at low resolution in a format that iOS understands that should be free of patent issues. QuickTime (.mov) container with MJPEG video (no known patents) and MP3 audio (patents expired). iOS and Mac OS understand such files and will play them back in a element in Safari, but video quality is bad and bitrate is high because MJPEG has no interframe compression. Desktop view will get the ogv.js shim along with the rest of the player frontend, so this MJPEG file is only exposed in these situations: * mobile view * JS disabled * HTML-scraping with the JS removed Bug: T101716 Change-Id: I15b971d47bf8862524e3306615cfbc366e6d8116 --- M TimedMediaHandler.php M WebVideoTranscode/WebVideoTranscode.php M WebVideoTranscode/WebVideoTranscodeJob.php M i18n/en.json 4 files changed, 63 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/86/380886/1 diff --git a/TimedMediaHandler.php b/TimedMediaHandler.php index 0cade78..3804eda 100644 --- a/TimedMediaHandler.php +++ b/TimedMediaHandler.php @@ -216,6 +216,9 @@ // A 4K high quality stream; higher end phones, tablets, smart tvs WebVideoTranscode::ENC_H264_2160P, */ + + // Last-ditch fallback for iOS; low visual quality. + WebVideoTranscode::ENC_MJPEG_240P, ]; $wgEnabledAudioTranscodeSet = [ diff --git a/WebVideoTranscode/WebVideoTranscode.php b/WebVideoTranscode/WebVideoTranscode.php index b444c08..768669b 100644 --- a/WebVideoTranscode/WebVideoTranscode.php +++ b/WebVideoTranscode/WebVideoTranscode.php @@ -64,6 +64,9 @@ const ENC_H264_1440P = '1440p.mp4'; const ENC_H264_2160P = '2160p.mp4'; + // mjpeg+mp3 QuickTime profile for iOS + const ENC_MJPEG_240P = '240p.mov'; + const ENC_OGG_VORBIS = 'ogg'; const ENC_OGG_OPUS = 'opus'; const ENC_MP3 = 'mp3'; @@ -478,6 +481,20 @@ 'type' => 'video/mp4; codecs="avc1.42E01E, mp4a.40.2"', ], + // MJPEG/MP3 profile for iOS last-ditch fallback + // Won't look good, but plays. :D + self::ENC_MJPEG_240P => + [ + 'maxSize' => '426x240', + 'videoBitrate' => '1536', + 'framerate' => '15', + 'samplerate' => '44010', + 'bufDelay' => '256', + 'videoCodec' => 'mjpeg', + 'audioCodec' => 'pcm_mulaw', + 'type' => 'video/quicktime; codecs="jpeg, mp3"', + ], + // Audio profiles self::ENC_OGG_VORBIS => [ diff --git a/WebVideoTranscode/WebVideoTranscodeJob.php b/WebVideoTranscode/WebVideoTranscodeJob.php index cec23b2..ebbaa12 100644 --- a/WebVideoTranscode/WebVideoTranscodeJob.php +++ b/WebVideoTranscode/WebVideoTranscodeJob.php @@ -199,7 +199,8 @@ $status = $this->ffmpeg2TheoraEncode( $options ); } elseif ( $options['videoCodec'] == 'vp8' || $options['videoCodec'] == 'vp9' || $options['videoCodec'] == 'h264' || - ( $options['videoCodec'] == 'theora' && $wgFFmpeg2theoraLocation === false ) + ( $options['videoCodec'] == 'theora' && $wgFFmpeg2theoraLocation === false ) || + $options['videoCodec'] == 'mjpeg' ) { // Check for twopass: if ( isset( $options['twopass'] ) ) { @@ -384,6 +385,8 @@ $cmd .= $this->ffmpegAddH264VideoOptions( $options, $pass ); } elseif ( $options['videoCodec'] == 'theora' ) { $cmd .= $this->ffmpegAddTheoraVideoOptions( $options, $pass ); + } elseif ( $options['videoCodec'] == 'mjpeg' ) { + $cmd .= $this->ffmpegAddMJPEGVideoOptions( $options, $pass ); } // Add size options: $cmd .= $this->ffmpegAddVideoSizeOptions( $options ); @@ -631,6 +634,43 @@ } /** +* Adds ffmpeg shell options for MJPEG MOV +* +* @param array $options +* @param string $pass +* @return string +*/ + function ffmpegAddMJPEGVideoOptions( $options, $pass ) { + global $wgFFmpegThreads; + + // Get a local
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Typo fix in docs
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380637 ) Change subject: Typo fix in docs .. Typo fix in docs Change-Id: Ibea12784963164caf0f44b3b860c5bbb2c6c528f --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Umherirrender: Looks good to me, but someone else must approve Hashar: Looks good to me, approved Addshore: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/README.md b/README.md index d630f94..3f4564f 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ . - + -- To view, visit https://gerrit.wikimedia.org/r/380637 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibea12784963164caf0f44b3b860c5bbb2c6c528f Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/tools/codesniffer Gerrit-Branch: master Gerrit-Owner: MarcoAurelioGerrit-Reviewer: Addshore Gerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Umherirrender 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...release[master]: make-wmf-branch: Stop amending commits for branches with sub...
Hello Thcipriani, Catrope, 20after4, Jforrester, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/380885 to review the following change. Change subject: make-wmf-branch: Stop amending commits for branches with submodules .. make-wmf-branch: Stop amending commits for branches with submodules In Ia31a9f1d, we tried to fix submodule support in branching so they get branched properly as well. To do this, we had to make a commit with some submodules being committed. To avoid noise and roll it into the prior commit we'd done for .gitreview, we'd push the resulting single commit to Gerrit. Then I come along in I3ba2bb8f to stop mangling .gitreview on all the extension branches because it was superfluous. However, that meant that the *second* commit from before was now amending the *last* commit prior to branching. Confused yet? Bug: T175324 Change-Id: I8a9c1a7094cb5f7be36c101498ddd7107522c2d6 --- M make-wmf-branch/MakeWmfBranch.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release refs/changes/85/380885/1 diff --git a/make-wmf-branch/MakeWmfBranch.php b/make-wmf-branch/MakeWmfBranch.php index fd7dc5a..827bab7 100644 --- a/make-wmf-branch/MakeWmfBranch.php +++ b/make-wmf-branch/MakeWmfBranch.php @@ -191,7 +191,7 @@ $this->chdir( $repo ); $this->runCmd( 'git', 'add', $submodule ); } - $this->runCmd( 'git', 'commit', '-q', '--amend', '-m', "Creating new {$newVersion} branch" ); + $this->runCmd( 'git', 'commit', '-q', '-m', "Creating new {$newVersion} branch" ); $this->runWriteCmd( 'git', 'push', 'origin', $newVersion ); } else { $this->createBranch( $newVersion, true ); -- To view, visit https://gerrit.wikimedia.org/r/380885 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a9c1a7094cb5f7be36c101498ddd7107522c2d6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: ChadGerrit-Reviewer: 20after4 Gerrit-Reviewer: Catrope Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update jQuery Migrate to v3.0.1
Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380884 ) Change subject: Update jQuery Migrate to v3.0.1 .. Update jQuery Migrate to v3.0.1 * Fixes IE9 issues with console.log. * Add warning for $.fn.hover(). * Add warning for $.holdReady(). * Improve handling of jQuery.easing methods. Change-Id: I38084ac6367b6d2ba47d6ecc6c9934a8bb7d8ae0 --- M resources/lib/jquery/jquery.migrate.js 1 file changed, 21 insertions(+), 20 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/84/380884/1 diff --git a/resources/lib/jquery/jquery.migrate.js b/resources/lib/jquery/jquery.migrate.js index 70512e0..c9b37ca 100644 --- a/resources/lib/jquery/jquery.migrate.js +++ b/resources/lib/jquery/jquery.migrate.js @@ -1,5 +1,5 @@ /*! - * jQuery Migrate - v3.0.1-pre - 2017-08-17 + * jQuery Migrate - v3.0.1 - 2017-09-26 * Copyright jQuery Foundation and other contributors * * Patched for MediaWiki: @@ -27,35 +27,31 @@ "use strict"; -jQuery.migrateVersion = "3.0.1-pre"; +jQuery.migrateVersion = "3.0.1"; /* exported migrateWarn, migrateWarnFunc, migrateWarnProp */ ( function() { + var rbadVersions = /^[12]\./; + // Support: IE9 only // IE9 only creates console object when dev tools are first opened - // Also, avoid Function#bind here to simplify PhantomJS usage - var log = window.console && window.console.log && - function() { - window.console.log.apply( window.console, arguments ); - }, - rbadVersions = /^[12]\./; - - if ( !log ) { + // IE9 console is a host object, callable but doesn't have .apply() + if ( !window.console || !window.console.log ) { return; } // Need jQuery 3.0.0+ and no older Migrate loaded if ( !jQuery || rbadVersions.test( jQuery.fn.jquery ) ) { - log( "JQMIGRATE: jQuery 3.0.0+ REQUIRED" ); + window.console.log( "JQMIGRATE: jQuery 3.0.0+ REQUIRED" ); } if ( jQuery.migrateWarnings ) { - log( "JQMIGRATE: Migrate plugin loaded multiple times" ); + window.console.log( "JQMIGRATE: Migrate plugin loaded multiple times" ); } // Show a message on the console so devs know we're active - log( "JQMIGRATE: Migrate is installed" + + window.console.log( "JQMIGRATE: Migrate is installed" + ( jQuery.migrateMute ? "" : " with logging active" ) + ", version " + jQuery.migrateVersion ); @@ -213,6 +209,9 @@ return oldValue; }; + +migrateWarnFunc( jQuery, "holdReady", jQuery.holdReady, + "jQuery.holdReady is deprecated" ); migrateWarnFunc( jQuery, "unique", jQuery.uniqueSort, "jQuery.unique is deprecated; use jQuery.uniqueSort" ); @@ -375,19 +374,17 @@ }; var oldTweenRun = jQuery.Tween.prototype.run; +var linearEasing = function( pct ) { + return pct; + }; jQuery.Tween.prototype.run = function( ) { if ( jQuery.easing[ this.easing ].length > 1 ) { migrateWarn( - "easing function " + - "\"jQuery.easing." + this.easing.toString() + - "\" should use only first argument" + "'jQuery.easing." + this.easing.toString() + "' should use only one argument" ); - var oldEasing = jQuery.easing[ this.easing ]; - jQuery.easing[ this.easing ] = function( percent ) { - return oldEasing.call( jQuery.easing, percent, percent, 0, 1, 1 ); - }.bind( this ); + jQuery.easing[ this.easing ] = linearEasing; } oldTweenRun.apply( this, arguments ); @@ -511,6 +508,10 @@ return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn ); + }, + hover: function( fnOver, fnOut ) { + migrateWarn( "jQuery.fn.hover() is deprecated" ); + return this.on( "mouseenter", fnOver ).on( "mouseleave", fnOut || fnOver ); } } ); -- To view, visit https://gerrit.wikimedia.org/r/380884 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I38084ac6367b6d2ba47d6ecc6c9934a8bb7d8ae0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Rename mw.cx.ui.TranslationView to ve.init.mw.CXTarget
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380883 ) Change subject: Rename mw.cx.ui.TranslationView to ve.init.mw.CXTarget .. Rename mw.cx.ui.TranslationView to ve.init.mw.CXTarget There is some conflict over VE and CX naming conventions, specifically: * Target in VE being the root UI element for the editor * Target in CX possibly meaning the target (not source) document and * View in VE referring to CE nodes (as opposed to DM model) * TranslationView being the root UI element for the editor As mw.cx.ui.TranslationView inherits from ve.init.mw.Target it is definitely a VE component and therefore should live in ve-cx and use VE naming conventions, hence being renamed to ve.init.mw.CXTarget. To avoid confusion with target documents, local pointers to the instance of this are called '.veTarget'. Change-Id: Idbbd4250a7f2381f2cd82c22d7abd88f823d47d1 --- M doc/ContentTranslation-v2.md M extension.json M modules/mw.cx.TargetArticle.js M modules/mw.cx.TranslationController.js M modules/mw.cx.init.Translation.js M modules/translation/ext.cx.translation.loader.js R modules/ve-cx/init/styles/ve.init.mw.CXTarget.less R modules/ve-cx/init/ve.init.mw.CXTarget.js 8 files changed, 92 insertions(+), 92 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/83/380883/1 diff --git a/doc/ContentTranslation-v2.md b/doc/ContentTranslation-v2.md index c863a7f..2a86109 100644 --- a/doc/ContentTranslation-v2.md +++ b/doc/ContentTranslation-v2.md @@ -26,11 +26,11 @@ mw.cx.Translation - Save, fetch and restore implementation mw.cx.TargetArticle - Prepare translation for publishing. -TODO: Currently instantiated in mw.cx.ui.TranslationView, I think we need to move this to mw.cx.Translation +TODO: Currently instantiated in ve.init.mw.CXTarget, I think we need to move this to mw.cx.Translation User Interface -- -mw.cx.ui.TranslationView constructed using +ve.init.mw.CXTarget constructed using 1. mw.cx.ui.Header 1. mw.cx.ui.Infobar 2. mw.cx.ui.Columns @@ -38,7 +38,7 @@ 2. mw.cx.ui.TranslationColumn 3. mw.cx.ui.ToolsColumn -mw.cx.ui.TranslationView prepares the translation unit UI models based on translation unit Data models in mw.cx.dm.Translation +ve.init.mw.CXTarget prepares the translation unit UI models based on translation unit Data models in mw.cx.dm.Translation Translation data models --- @@ -108,7 +108,7 @@ * If there is a translation corresponding to a source section, mw.cx.Translation.prototype.restore will set the target document to that translation unit. * There is no initialization code for translation unit data models. And nothing happens till The UI is ready and UI data models initialized. -Once the translation UI is ready, and source article and saved translation (if any) is fetched, it is time for rendering each translation unit in interface. mw.cx.ui.TranslationView.prototype.loadTranslation is called by mw.cx.init.Translation, which then calls mw.cx.ui.TranslationView.prototype.prepareTranslationUnitUIs. This is also a non-recursive construction of translation unit UI models. The init method of each translation unit is called explicitly. +Once the translation UI is ready, and source article and saved translation (if any) is fetched, it is time for rendering each translation unit in interface. ve.init.mw.CXTarget.prototype.loadTranslation is called by mw.cx.init.Translation, which then calls ve.init.mw.CXTarget.prototype.prepareTranslationUnitUIs. This is also a non-recursive construction of translation unit UI models. The init method of each translation unit is called explicitly. The init method of SectionTranslationUnit just initialize the source and target section properties and listens for events. @@ -138,8 +138,8 @@ } ``` -It is mw.cx.ui.TranslationView that connects the translation units and tools. The showTool event from translation unit is handled by mw.cx.ui.TranslationView and it fires mw.cx.ui.TranslationView.prototype.showTranslationTool. +It is ve.init.mw.CXTarget that connects the translation units and tools. The showTool event from translation unit is handled by ve.init.mw.CXTarget and it fires ve.init.mw.CXTarget.prototype.showTranslationTool. -When a click is received on a translation unit, the unit is activated and it emits 'activate' event. On every 'activate' event all translation tools are first hidden by the mw.cx.ui.TranslationView. +When a click is received on a translation unit, the unit is activated and it emits 'activate' event. On every 'activate' event all translation tools are first hidden by the ve.init.mw.CXTarget. Nested section translation units are problematic in this case too. Section level translation unit tools will be shown more than once when the event propagates. diff --git a/extension.json b/extension.json
[MediaWiki-commits] [Gerrit] labs...guc[master]: Centralise database hostname handling
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380873 ) Change subject: Centralise database hostname handling .. Centralise database hostname handling * Remove deadcode for $cluster as integer. * Make code for appendin ".labsdb" suffix actually used. Change-Id: I47fe2e622bec94ba2453ca41ce8819eb6094d1fb --- M src/App.php M src/Main.php 2 files changed, 18 insertions(+), 18 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/src/App.php b/src/App.php index db38076..57a69d6 100644 --- a/src/App.php +++ b/src/App.php @@ -35,20 +35,20 @@ * @return PDO */ private function openDB($database = 'wikidatawiki', $cluster = null) { -$this->aTP('Create connection to '.$cluster); -if (is_string($database)) { -$host = $database.'.labsdb'; -$dbname = $database.'_p'; -} -if (is_int($cluster)) { -$host = 's'.$cluster.'.labsdb'; -$dbname = (is_string($database)) ? $database.'_p': 'information_schema'; -} +$dbname = "{$database}_p"; if (is_string($cluster)) { -$host = $cluster; -$dbname = (is_string($database)) ? $database.'_p': 'information_schema'; +if (strpos($cluster, '.') === false) { +// Default suffix +$host = "{$cluster}.labsdb"; +} else { +$host = $cluster; +} +} else { +$host = "{$database}.labsdb"; } + +$this->aTP('Create connection to ' . $cluster); try { // Establish connection @@ -63,18 +63,18 @@ * Gibt die Verbindung zu einem Wiki zurück (cache) * * @param string $database - * @param $clusterNr + * @param string $cluster * @return PDO */ -public function getDB($database = 'meta', $clusterNr = 's1.labsdb') { +public function getDB($database = 'meta', $cluster = 's1') { if (!$clusterNr) { throw new Exception('Invalid DB cluster specification'); } -// Bereits vorhanden? -if (!isset($this->clusters[$clusterNr])) { -$this->clusters[$clusterNr] = $this->openDB($database, $clusterNr); +// Reuse existing connection if possible +if (!isset($this->clusters[$cluster])) { +$this->clusters[$cluster] = $this->openDB($database, $cluster); } -$pdo = $this->clusters[$clusterNr]; +$pdo = $this->clusters[$cluster]; // Select the right database on this cluster server $m = $pdo->prepare('USE `'.$database.'_p`;'); diff --git a/src/Main.php b/src/Main.php index 8d1812e..70fee63 100644 --- a/src/Main.php +++ b/src/Main.php @@ -260,7 +260,7 @@ } if ($centralauthData === null) { $centralauthData = array(); -$pdo = $this->app->getDB('centralauth', 'centralauth.labsdb'); +$pdo = $this->app->getDB('centralauth', 'centralauth'); $statement = $pdo->prepare('SELECT * FROM localuser WHERE lu_name = :user;'); $statement->bindParam(':user', $this->user); $statement->execute(); -- To view, visit https://gerrit.wikimedia.org/r/380873 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I47fe2e622bec94ba2453ca41ce8819eb6094d1fb Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/guc Gerrit-Branch: master Gerrit-Owner: KrinkleGerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...guc[master]: Centralise database hostname handling
Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380873 ) Change subject: Centralise database hostname handling .. Centralise database hostname handling * Remove deadcode for $cluster as integer. * Make code for appendin ".labsdb" suffix actually used. Change-Id: I47fe2e622bec94ba2453ca41ce8819eb6094d1fb --- M src/App.php M src/Main.php 2 files changed, 18 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/guc refs/changes/73/380873/1 diff --git a/src/App.php b/src/App.php index db38076..57a69d6 100644 --- a/src/App.php +++ b/src/App.php @@ -35,20 +35,20 @@ * @return PDO */ private function openDB($database = 'wikidatawiki', $cluster = null) { -$this->aTP('Create connection to '.$cluster); -if (is_string($database)) { -$host = $database.'.labsdb'; -$dbname = $database.'_p'; -} -if (is_int($cluster)) { -$host = 's'.$cluster.'.labsdb'; -$dbname = (is_string($database)) ? $database.'_p': 'information_schema'; -} +$dbname = "{$database}_p"; if (is_string($cluster)) { -$host = $cluster; -$dbname = (is_string($database)) ? $database.'_p': 'information_schema'; +if (strpos($cluster, '.') === false) { +// Default suffix +$host = "{$cluster}.labsdb"; +} else { +$host = $cluster; +} +} else { +$host = "{$database}.labsdb"; } + +$this->aTP('Create connection to ' . $cluster); try { // Establish connection @@ -63,18 +63,18 @@ * Gibt die Verbindung zu einem Wiki zurück (cache) * * @param string $database - * @param $clusterNr + * @param string $cluster * @return PDO */ -public function getDB($database = 'meta', $clusterNr = 's1.labsdb') { +public function getDB($database = 'meta', $cluster = 's1') { if (!$clusterNr) { throw new Exception('Invalid DB cluster specification'); } -// Bereits vorhanden? -if (!isset($this->clusters[$clusterNr])) { -$this->clusters[$clusterNr] = $this->openDB($database, $clusterNr); +// Reuse existing connection if possible +if (!isset($this->clusters[$cluster])) { +$this->clusters[$cluster] = $this->openDB($database, $cluster); } -$pdo = $this->clusters[$clusterNr]; +$pdo = $this->clusters[$cluster]; // Select the right database on this cluster server $m = $pdo->prepare('USE `'.$database.'_p`;'); diff --git a/src/Main.php b/src/Main.php index 8d1812e..70fee63 100644 --- a/src/Main.php +++ b/src/Main.php @@ -260,7 +260,7 @@ } if ($centralauthData === null) { $centralauthData = array(); -$pdo = $this->app->getDB('centralauth', 'centralauth.labsdb'); +$pdo = $this->app->getDB('centralauth', 'centralauth'); $statement = $pdo->prepare('SELECT * FROM localuser WHERE lu_name = :user;'); $statement->bindParam(':user', $this->user); $statement->execute(); -- To view, visit https://gerrit.wikimedia.org/r/380873 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47fe2e622bec94ba2453ca41ce8819eb6094d1fb Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/guc Gerrit-Branch: master Gerrit-Owner: Krinkle___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Design tweak: no longer draw rectangular border around list ...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380845 ) Change subject: Design tweak: no longer draw rectangular border around list item images. .. Design tweak: no longer draw rectangular border around list item images. Per https://phabricator.wikimedia.org/T163590#3561236 Change-Id: I1478afbd11493bb0339b574fad7fda39d91b1ee5 --- D app/src/main/res/drawable/view_list_card_item_image_background.xml M app/src/main/res/layout/dialog_link_preview.xml M app/src/main/res/layout/item_page_list_entry.xml M app/src/main/res/layout/item_search_result.xml M app/src/main/res/layout/view_list_card_item.xml 5 files changed, 4 insertions(+), 10 deletions(-) Approvals: jenkins-bot: Verified Mholloway: Looks good to me, approved diff --git a/app/src/main/res/drawable/view_list_card_item_image_background.xml b/app/src/main/res/drawable/view_list_card_item_image_background.xml deleted file mode 100644 index d6df27a..000 --- a/app/src/main/res/drawable/view_list_card_item_image_background.xml +++ /dev/null @@ -1,6 +0,0 @@ - -http://schemas.android.com/apk/res/android;> - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_link_preview.xml b/app/src/main/res/layout/dialog_link_preview.xml index 5277fc7..01af4c3 100755 --- a/app/src/main/res/layout/dialog_link_preview.xml +++ b/app/src/main/res/layout/dialog_link_preview.xml @@ -33,7 +33,7 @@ android:layout_margin="16dp" android:layout_gravity="center_vertical" android:contentDescription="@null" - app:backgroundImage="@drawable/view_list_card_item_image_background"/> +app:backgroundImage="?attr/paper_color"/> +app:backgroundImage="?attr/paper_color" /> http://schemas.android.com/apk/res-auto; diff --git a/app/src/main/res/layout/item_search_result.xml b/app/src/main/res/layout/item_search_result.xml index f9d7380..fc974c3 100644 --- a/app/src/main/res/layout/item_search_result.xml +++ b/app/src/main/res/layout/item_search_result.xml @@ -22,7 +22,7 @@ android:layout_height="@dimen/view_list_card_item_image" android:layout_marginTop="6dp" app:roundedCornerRadius="2dp" -app:backgroundImage="@drawable/view_list_card_item_image_background" /> +app:backgroundImage="?attr/paper_color" /> +app:backgroundImage="?attr/paper_color" /> https://gerrit.wikimedia.org/r/380845 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1478afbd11493bb0339b574fad7fda39d91b1ee5 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: DbrantGerrit-Reviewer: Brion VIBBER Gerrit-Reviewer: Cooltey Gerrit-Reviewer: Mholloway Gerrit-Reviewer: Sharvaniharan Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Consolidation: normalize usage of background / paper color t...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380826 ) Change subject: Consolidation: normalize usage of background / paper color throughout. .. Consolidation: normalize usage of background / paper color throughout. One of the major design themes that has emerged from the consolidation is the following: - All activities shall have a default background color of base80 (light) / base10 (dark) - All components (controls, cards, list items) that appear in an activity shall have a background of "paper_color", which is base100/base14. This patch sweeps through all activities/framents and normalizes (and corrects where necessary) their usages of these two colors. This also consolidates the unnecessary "base_color" style, being equivalent to windowBackground. Change-Id: Iaed1ad7016944a4c21c96dfe7ac0a5cbca31d6f2 --- M app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java M app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java M app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java M app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java M app/src/main/java/org/wikipedia/offline/RemoteCompilationsFragment.java M app/src/main/res/layout/activity_create_account.xml M app/src/main/res/layout/activity_edit_section.xml M app/src/main/res/layout/activity_langlinks.xml M app/src/main/res/layout/activity_login.xml M app/src/main/res/layout/dialog_preference_languages.xml M app/src/main/res/layout/fragment_compilation_detail.xml M app/src/main/res/layout/fragment_description_edit.xml M app/src/main/res/layout/fragment_description_edit_help.xml M app/src/main/res/layout/fragment_feed.xml M app/src/main/res/layout/fragment_history.xml M app/src/main/res/layout/fragment_local_compilations.xml M app/src/main/res/layout/fragment_page.xml M app/src/main/res/layout/fragment_preview_edit.xml M app/src/main/res/layout/fragment_reading_list.xml M app/src/main/res/layout/fragment_reading_lists.xml M app/src/main/res/layout/fragment_remote_compilations.xml M app/src/main/res/layout/fragment_search.xml M app/src/main/res/layout/fragment_search_recent.xml M app/src/main/res/layout/fragment_search_results.xml M app/src/main/res/layout/inflate_create_account_onboarding.xml M app/src/main/res/layout/item_language_list_entry.xml M app/src/main/res/layout/item_page_list_entry.xml M app/src/main/res/layout/item_reading_list.xml M app/src/main/res/layout/item_search_recent.xml M app/src/main/res/layout/item_search_result.xml M app/src/main/res/layout/view_explore_overflow.xml M app/src/main/res/values/attrs.xml M app/src/main/res/values/styles_dark.xml M app/src/main/res/values/styles_light.xml 34 files changed, 61 insertions(+), 63 deletions(-) Approvals: jenkins-bot: Verified Mholloway: Looks good to me, approved diff --git a/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java b/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java index cbb2eb9..231d6e0 100644 --- a/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java +++ b/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java @@ -53,7 +53,7 @@ } private void resetBackgroundColor() { -setBackgroundColor(ResourceUtil.getThemedColor(getContext(), R.attr.cardBackgroundColor)); +setBackgroundColor(ResourceUtil.getThemedColor(getContext(), R.attr.paper_color)); } private class ImageLoadListener implements FaceAndColorDetectImageView.OnImageLoadListener { @@ -81,7 +81,7 @@ private void animateBackgroundColor(@NonNull View view, @ColorInt int targetColor) { final int animDuration = 500; ObjectAnimator animator = ObjectAnimator.ofInt(view, "backgroundColor", -ResourceUtil.getThemedColor(getContext(), R.attr.cardBackgroundColor), +ResourceUtil.getThemedColor(getContext(), R.attr.paper_color), targetColor); animator.setEvaluator(new ArgbEvaluator()); animator.setDuration(animDuration); diff --git a/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java b/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java index 1b57372..656ddcb 100644 --- a/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java +++ b/app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java @@ -15,7 +15,7 @@ public DefaultFeedCardView(Context context) { super(context); -setCardBackgroundColor(ResourceUtil.getThemedColor(context, R.attr.cardBackgroundColor)); +setCardBackgroundColor(ResourceUtil.getThemedColor(context, R.attr.paper_color)); } @Override public void setCard(@NonNull T card) { diff --git a/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Correcting check icon placement in RTL
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380844 ) Change subject: Correcting check icon placement in RTL .. Correcting check icon placement in RTL Bug: T176796 Change-Id: Ib0c6faa77f393a9f0f78b9d9d492c4c25fb0d3b5 --- M resources/src/mediawiki.action/mediawiki.action.view.postEdit.less 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/resources/src/mediawiki.action/mediawiki.action.view.postEdit.less b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.less index d19f098..46976d4 100644 --- a/resources/src/mediawiki.action/mediawiki.action.view.postEdit.less +++ b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.less @@ -56,4 +56,6 @@ .postedit-icon-checkmark { /* @embed */ background-image: url( images/green-checkmark.png ); + /* T176796 */ + background-position: left; } -- To view, visit https://gerrit.wikimedia.org/r/380844 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib0c6faa77f393a9f0f78b9d9d492c4c25fb0d3b5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: EranrozGerrit-Reviewer: Fomafix Gerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Mooeypoo Gerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...heritage[master]: Add default instructions to top of unused images reports
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380058 ) Change subject: Add default instructions to top of unused images reports .. Add default instructions to top of unused images reports Bug:T176200 Change-Id: I048bbb13761ea41996d252efff68b68036698dfd --- M erfgoedbot/unused_monument_images.py M tests/test_unused_monument_images.py 2 files changed, 16 insertions(+), 9 deletions(-) Approvals: Lokal Profil: Looks good to me, approved jenkins-bot: Verified diff --git a/erfgoedbot/unused_monument_images.py b/erfgoedbot/unused_monument_images.py index 78c7a79..78ab903 100644 --- a/erfgoedbot/unused_monument_images.py +++ b/erfgoedbot/unused_monument_images.py @@ -139,7 +139,12 @@ order to ensure all candidates for a given monument id are presented. """ # People can add a /header template for with more info -text = u'{{#ifexist:{{FULLPAGENAME}}/header | {{/header}} }}\n' +text = ( +u'{{#ifexist:{{FULLPAGENAME}}/header' +u'|{{/header}}' +u'|For information on how to use this report and how to localise ' +u'these instructions visit ' +u'[[:c:Commons:Monuments database/Unused images]]. }}\n') total_pages = 0 total_ids = 0 totalImages = 0 diff --git a/tests/test_unused_monument_images.py b/tests/test_unused_monument_images.py index e1fe1aa..024d915 100644 --- a/tests/test_unused_monument_images.py +++ b/tests/test_unused_monument_images.py @@ -482,6 +482,12 @@ self.mock_report_page = mock.create_autospec( unused_monument_images.pywikibot.Page, ) +self.prefix = ( +u'{{#ifexist:{{FULLPAGENAME}}/header' +u'|{{/header}}' +u'|For information on how to use this report and how to localise ' +u'these instructions visit ' +u'[[:c:Commons:Monuments database/Unused images]]. }}\n') self.unused_images = OrderedDict() self.unused_images['source_link_1'] = OrderedDict() @@ -500,8 +506,7 @@ def test_output_country_report_complete(self): expected_cmt = u'Images to be used in monument lists: 5' -expected_output = ( -u'{{#ifexist:{{FULLPAGENAME}}/header | {{/header}} }}\n' +expected_output = self.prefix + ( u'=== source_link_1 ===\n' u'\n' u'File:filename1_11.jpg|id_11\n' @@ -535,8 +540,7 @@ expected_cmt = ( u'Images to be used in monument lists: 2 (gallery maximum ' u'reached), total of unused images: 5') -expected_output = ( -u'{{#ifexist:{{FULLPAGENAME}}/header | {{/header}} }}\n' +expected_output = self.prefix + ( u'=== source_link_1 ===\n' u'\n' u'File:filename1_11.jpg|id_11\n' @@ -566,8 +570,7 @@ expected_cmt = ( u'Images to be used in monument lists: 3 (gallery maximum ' u'reached), total of unused images: 5') -expected_output = ( -u'{{#ifexist:{{FULLPAGENAME}}/header | {{/header}} }}\n' +expected_output = self.prefix + ( u'=== source_link_1 ===\n' u'\n' u'File:filename1_11.jpg|id_11\n' @@ -598,8 +601,7 @@ self.unused_images = {} expected_cmt = u'Images to be used in monument lists: 0' -expected_output = ( -u'{{#ifexist:{{FULLPAGENAME}}/header | {{/header}} }}\n' +expected_output = self.prefix + ( u'\nThere are no unused images left. Great work!\n') expected_totals = { 'images': 0, -- To view, visit https://gerrit.wikimedia.org/r/380058 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I048bbb13761ea41996d252efff68b68036698dfd Gerrit-PatchSet: 4 Gerrit-Project: labs/tools/heritage Gerrit-Branch: master Gerrit-Owner: Lokal ProfilGerrit-Reviewer: Jean-Frédéric Gerrit-Reviewer: Lokal Profil Gerrit-Reviewer: Multichill Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: DNS: Add mgmt DNS entries for furud Bug:T176506
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380776 ) Change subject: DNS: Add mgmt DNS entries for furud Bug:T176506 .. DNS: Add mgmt DNS entries for furud Bug:T176506 Change-Id: Ib4976a77102f146a422a56e236102973d1c108eb --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index d3a2e19..fdc565f 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -3751,6 +3751,8 @@ 40 1H IN PTR wmf6581.mgmt.codfw.wmnet. 41 1H IN PTR netmon2001.mgmt.codfw.wmnet. 41 1H IN PTR wmf6582.mgmt.codfw.wmnet. +42 1H IN PTR furud.mgmt.codfw.wmnet. +42 1H IN PTR wmf6587.mgmt.codfw.wmnet. 49 1H IN PTR labtestweb2001.mgmt.codfw.wmnet. 49 1H IN PTR wmf5847.mgmt.codfw.wmnet. diff --git a/templates/wmnet b/templates/wmnet index 099bd3a..1ee6b69 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -3539,6 +3539,7 @@ es2018 1H IN A10.193.2.242 es2019 1H IN A10.193.2.243 eventlog20011H IN A10.193.2.119 +furud 1H IN A10.193.1.42 ganeti2001 1H IN A10.193.2.165 ganeti2002 1H IN A10.193.2.166 ganeti2003 1H IN A10.193.2.167 @@ -4385,7 +4386,7 @@ wmf6580 1H IN A10.193.1.39 wmf6581 1H IN A10.193.1.40 wmf6582 1H IN A10.193.1.41 - +wmf6587 1H IN A10.193.1.42 ; ; ESAMS ; -- To view, visit https://gerrit.wikimedia.org/r/380776 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib4976a77102f146a422a56e236102973d1c108eb Gerrit-PatchSet: 2 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: PapaulGerrit-Reviewer: Dzahn 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...mobileapps[master]: Redirects return 204 inside MCS
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380856 ) Change subject: Redirects return 204 inside MCS .. Redirects return 204 inside MCS These will be handled upstream in RestBase. To avoid confusion send a 204 when no intro is available and thus no summary is available. Bug: T176517 Change-Id: I42dc94babefdfa4aa0a6d97c3b412868df72e0e6 --- M routes/mobile-sections.js 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps refs/changes/56/380856/1 diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js index a7239e3..723b6a9 100644 --- a/routes/mobile-sections.js +++ b/routes/mobile-sections.js @@ -385,6 +385,11 @@ code = 204; } else if (lead.intro) { summary = transforms.summarize(lead.intro); +} else { + // If the lead introduction is empty we should consider it + // a placeholder e.g. redirect page. To avoid sending an empty + // summary 204. (T176517) + code = 204; } return Object.assign({ code, -- To view, visit https://gerrit.wikimedia.org/r/380856 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I42dc94babefdfa4aa0a6d97c3b412868df72e0e6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mobileapps Gerrit-Branch: master Gerrit-Owner: Jdlrobson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOjs UI to v0.23.2
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380849 ) Change subject: Update OOjs UI to v0.23.2 .. Update OOjs UI to v0.23.2 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.23.2 Depends-On: I9d1264ebf456cadc7e350c2558a9997a2a0633c4 Change-Id: I9bbd4b8ff6333816e7ba73b3c033623753bb6df5 --- M composer.json M resources/lib/oojs-ui/i18n/ais.json A resources/lib/oojs-ui/i18n/en-gb.json M resources/lib/oojs-ui/i18n/pt-br.json M resources/lib/oojs-ui/i18n/tay.json M resources/lib/oojs-ui/oojs-ui-apex.js M resources/lib/oojs-ui/oojs-ui-core-apex.css M resources/lib/oojs-ui/oojs-ui-core-wikimediaui.css M resources/lib/oojs-ui/oojs-ui-core.js M resources/lib/oojs-ui/oojs-ui-core.js.map M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css M resources/lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css M resources/lib/oojs-ui/oojs-ui-toolbars.js M resources/lib/oojs-ui/oojs-ui-widgets-apex.css M resources/lib/oojs-ui/oojs-ui-widgets-wikimediaui.css M resources/lib/oojs-ui/oojs-ui-widgets.js M resources/lib/oojs-ui/oojs-ui-widgets.js.map M resources/lib/oojs-ui/oojs-ui-wikimediaui.js M resources/lib/oojs-ui/oojs-ui-windows-apex.css M resources/lib/oojs-ui/oojs-ui-windows-wikimediaui.css M resources/lib/oojs-ui/oojs-ui-windows.js M resources/lib/oojs-ui/oojs-ui-windows.js.map 22 files changed, 194 insertions(+), 160 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/49/380849/1 -- To view, visit https://gerrit.wikimedia.org/r/380849 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9bbd4b8ff6333816e7ba73b3c033623753bb6df5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.23.2
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380850 ) Change subject: Update OOjs UI to v0.23.2 .. Update OOjs UI to v0.23.2 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.23.2 Change-Id: I9d1264ebf456cadc7e350c2558a9997a2a0633c4 --- M .jsduck/eg-iframe.html M demos/ve/desktop-dist.html M demos/ve/desktop.html M demos/ve/mobile-dist.html M demos/ve/mobile.html M lib/oojs-ui/i18n/ais.json A lib/oojs-ui/i18n/en-gb.json M lib/oojs-ui/i18n/pt-br.json M lib/oojs-ui/i18n/tay.json M lib/oojs-ui/oojs-ui-apex-icons-accessibility.css M lib/oojs-ui/oojs-ui-apex-icons-accessibility.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-alerts.css M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-content.css M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-layout.css M lib/oojs-ui/oojs-ui-apex-icons-layout.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-media.css M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-movement.css M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-user.css M lib/oojs-ui/oojs-ui-apex-icons-user.rtl.css M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui-core-apex.css M lib/oojs-ui/oojs-ui-core-apex.rtl.css M lib/oojs-ui/oojs-ui-core-mediawiki.css M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-core-wikimediaui.css M lib/oojs-ui/oojs-ui-core-wikimediaui.rtl.css M lib/oojs-ui/oojs-ui-core.js M lib/oojs-ui/oojs-ui-core.js.map M lib/oojs-ui/oojs-ui-images-apex.css M lib/oojs-ui/oojs-ui-images-apex.rtl.css M lib/oojs-ui/oojs-ui-images-wikimediaui.css M lib/oojs-ui/oojs-ui-images-wikimediaui.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.css M lib/oojs-ui/oojs-ui-mediawiki.js M lib/oojs-ui/oojs-ui-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars-apex.css M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.rtl.css M lib/oojs-ui/oojs-ui-toolbars.js M lib/oojs-ui/oojs-ui-widgets-apex.css M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-widgets-wikimediaui.css M lib/oojs-ui/oojs-ui-widgets-wikimediaui.rtl.css M lib/oojs-ui/oojs-ui-widgets.js M lib/oojs-ui/oojs-ui-widgets.js.map M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.css M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.rtl.css M
[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOjs UI to v0.23.2
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380848 ) Change subject: Update OOjs UI to v0.23.2 .. Update OOjs UI to v0.23.2 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0$ Change-Id: I9d1264ebf456cadc7e350c2558a9997a2a0633c4 --- M composer.json M composer.lock M composer/installed.json M oojs/oojs-ui/History.md M oojs/oojs-ui/bin/testsuitegenerator.rb M oojs/oojs-ui/demos/classes/BrokenDialog.js M oojs/oojs-ui/demos/classes/ButtonStyleShowcaseWidget.js M oojs/oojs-ui/demos/classes/ButtonStyleShowcaseWidget.php M oojs/oojs-ui/demos/classes/MenuDialog.js M oojs/oojs-ui/demos/classes/ProcessDialog.js M oojs/oojs-ui/demos/classes/SampleTabPanel.js M oojs/oojs-ui/demos/pages/dialogs.js M oojs/oojs-ui/demos/pages/widgets.js M oojs/oojs-ui/demos/pages/widgets.php M oojs/oojs-ui/demos/styles/demo.css M oojs/oojs-ui/i18n/ais.json A oojs/oojs-ui/i18n/en-gb.json M oojs/oojs-ui/i18n/pt-br.json M oojs/oojs-ui/i18n/tay.json M oojs/oojs-ui/package.json M oojs/oojs-ui/php/mixins/FlaggedElement.php 21 files changed, 198 insertions(+), 137 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor refs/changes/48/380848/1 diff --git a/composer.json b/composer.json index e6dd1a3..3ebc15a 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "monolog/monolog": "1.22.1", "mustangostang/spyc": "0.6.2", "nmred/kafka-php": "0.1.5", - "oojs/oojs-ui": "0.23.1", + "oojs/oojs-ui": "0.23.2", "oyejorge/less.php": "1.7.0.14", "pear/console_getopt": "1.4.1", "pear/mail": "1.4.1", diff --git a/composer.lock b/composer.lock index 7822ac2..96393d5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;, "This file is @generated automatically" ], -"content-hash": "1129c0e8cd3e4bfcdd6c36f6a6fef8f0", +"content-hash": "1abc9f7afbd26388ee9bccadaaef1239", "packages": [ { "name": "composer/semver", @@ -516,16 +516,16 @@ }, { "name": "oojs/oojs-ui", -"version": "v0.23.1", +"version": "v0.23.2", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git;, -"reference": "78a763891cab6e5af620e891f340141e75ceef84" +"reference": "60ea6e39e200f732448ecceb88c9922e69974dd4" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/78a763891cab6e5af620e891f340141e75ceef84;, -"reference": "78a763891cab6e5af620e891f340141e75ceef84", +"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/60ea6e39e200f732448ecceb88c9922e69974dd4;, +"reference": "60ea6e39e200f732448ecceb88c9922e69974dd4", "shasum": "" }, "require": { @@ -591,7 +591,7 @@ ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;, -"time": "2017-09-20T00:13:22+00:00" +"time": "2017-09-26T19:49:41+00:00" }, { "name": "oyejorge/less.php", diff --git a/composer/installed.json b/composer/installed.json index d327ab5..da842bf 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -2326,17 +2326,17 @@ }, { "name": "oojs/oojs-ui", -"version": "v0.23.1", -"version_normalized": "0.23.1.0", +"version": "v0.23.2", +"version_normalized": "0.23.2.0", "source": { "type": "git", "url": "https://github.com/wikimedia/oojs-ui.git;, -"reference": "78a763891cab6e5af620e891f340141e75ceef84" +"reference": "60ea6e39e200f732448ecceb88c9922e69974dd4" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/78a763891cab6e5af620e891f340141e75ceef84;, -"reference": "78a763891cab6e5af620e891f340141e75ceef84", +"url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/60ea6e39e200f732448ecceb88c9922e69974dd4;, +"reference": "60ea6e39e200f732448ecceb88c9922e69974dd4", "shasum": "" }, "require": { @@ -2348,7 +2348,7 @@ "mediawiki/mediawiki-codesniffer": "0.12.0", "phpunit/phpunit": "4.8.21" }, -"time": "2017-09-20T00:13:22+00:00", +"time": "2017-09-26T19:49:41+00:00", "type": "library", "installation-source": "dist",
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Depool db2044
Marostegui has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380846 ) Change subject: db-codfw.php: Depool db2044 .. db-codfw.php: Depool db2044 Storage looks broken Change-Id: If9aaa05b37f1a9ef87f57d3cbd1cb7e6d2ee38c7 --- M wmf-config/db-codfw.php 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Marostegui: Verified; Looks good to me, approved Volans: Looks good to me, but someone else must approve diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 9c6cbc9..9a33d41 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -133,7 +133,7 @@ 'db2051' => 0, # B8 2.9TB 160GB, master # 'db2019' => 0, # B6 2.9TB 96GB, old master 'db2037' => 50, # C6 2.9TB 160GB, rc, log - 'db2044' => 50, # C6 2.9TB 160GB, rc, log + # 'db2044' => 50, # C6 2.9TB 160GB, rc, log 'db2058' => 50, # D6 3.3TB 160GB, dump (inactive), vslow 'db2065' => 200, # D6 3.3TB 160GB, api 'db2073' => 400, # C6 3.3TB 512GB # Compressed InnoDB @@ -328,23 +328,23 @@ 's4' => [ 'watchlist' => [ 'db2037' => 1, - 'db2044' => 1, + # 'db2044' => 1, ], 'recentchanges' => [ 'db2037' => 1, - 'db2044' => 1, + # 'db2044' => 1, ], 'recentchangeslinked' => [ 'db2037' => 1, - 'db2044' => 1, + # 'db2044' => 1, ], 'contributions' => [ 'db2037' => 1, - 'db2044' => 1, + # 'db2044' => 1, ], 'logpager' => [ 'db2037' => 1, - 'db2044' => 1, + # 'db2044' => 1, ], 'dump' => [ 'db2058' => 1, -- To view, visit https://gerrit.wikimedia.org/r/380846 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If9aaa05b37f1a9ef87f57d3cbd1cb7e6d2ee38c7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MarosteguiGerrit-Reviewer: Marostegui Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Volans Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Depool db2044
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380846 ) Change subject: db-codfw.php: Depool db2044 .. db-codfw.php: Depool db2044 Storage looks broken Change-Id: If9aaa05b37f1a9ef87f57d3cbd1cb7e6d2ee38c7 --- M wmf-config/db-codfw.php 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/46/380846/1 diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 9c6cbc9..9a33d41 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -133,7 +133,7 @@ 'db2051' => 0, # B8 2.9TB 160GB, master # 'db2019' => 0, # B6 2.9TB 96GB, old master 'db2037' => 50, # C6 2.9TB 160GB, rc, log - 'db2044' => 50, # C6 2.9TB 160GB, rc, log + # 'db2044' => 50, # C6 2.9TB 160GB, rc, log 'db2058' => 50, # D6 3.3TB 160GB, dump (inactive), vslow 'db2065' => 200, # D6 3.3TB 160GB, api 'db2073' => 400, # C6 3.3TB 512GB # Compressed InnoDB @@ -328,23 +328,23 @@ 's4' => [ 'watchlist' => [ 'db2037' => 1, - 'db2044' => 1, + # 'db2044' => 1, ], 'recentchanges' => [ 'db2037' => 1, - 'db2044' => 1, + # 'db2044' => 1, ], 'recentchangeslinked' => [ 'db2037' => 1, - 'db2044' => 1, + # 'db2044' => 1, ], 'contributions' => [ 'db2037' => 1, - 'db2044' => 1, + # 'db2044' => 1, ], 'logpager' => [ 'db2037' => 1, - 'db2044' => 1, + # 'db2044' => 1, ], 'dump' => [ 'db2058' => 1, -- To view, visit https://gerrit.wikimedia.org/r/380846 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9aaa05b37f1a9ef87f57d3cbd1cb7e6d2ee38c7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Design tweak: no longer draw rectangular border around list ...
Dbrant has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380845 ) Change subject: Design tweak: no longer draw rectangular border around list item images. .. Design tweak: no longer draw rectangular border around list item images. Per https://phabricator.wikimedia.org/T163590#3561236 Change-Id: I1478afbd11493bb0339b574fad7fda39d91b1ee5 --- D app/src/main/res/drawable/view_list_card_item_image_background.xml M app/src/main/res/layout/dialog_link_preview.xml M app/src/main/res/layout/item_page_list_entry.xml M app/src/main/res/layout/item_search_result.xml M app/src/main/res/layout/view_list_card_item.xml 5 files changed, 4 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/45/380845/1 diff --git a/app/src/main/res/drawable/view_list_card_item_image_background.xml b/app/src/main/res/drawable/view_list_card_item_image_background.xml deleted file mode 100644 index d6df27a..000 --- a/app/src/main/res/drawable/view_list_card_item_image_background.xml +++ /dev/null @@ -1,6 +0,0 @@ - -http://schemas.android.com/apk/res/android;> - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_link_preview.xml b/app/src/main/res/layout/dialog_link_preview.xml index 5277fc7..01af4c3 100755 --- a/app/src/main/res/layout/dialog_link_preview.xml +++ b/app/src/main/res/layout/dialog_link_preview.xml @@ -33,7 +33,7 @@ android:layout_margin="16dp" android:layout_gravity="center_vertical" android:contentDescription="@null" - app:backgroundImage="@drawable/view_list_card_item_image_background"/> +app:backgroundImage="?attr/paper_color"/> +app:backgroundImage="?attr/paper_color" /> http://schemas.android.com/apk/res-auto; diff --git a/app/src/main/res/layout/item_search_result.xml b/app/src/main/res/layout/item_search_result.xml index f9d7380..fc974c3 100644 --- a/app/src/main/res/layout/item_search_result.xml +++ b/app/src/main/res/layout/item_search_result.xml @@ -22,7 +22,7 @@ android:layout_height="@dimen/view_list_card_item_image" android:layout_marginTop="6dp" app:roundedCornerRadius="2dp" -app:backgroundImage="@drawable/view_list_card_item_image_background" /> +app:backgroundImage="?attr/paper_color" /> +app:backgroundImage="?attr/paper_color" /> https://gerrit.wikimedia.org/r/380845 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1478afbd11493bb0339b574fad7fda39d91b1ee5 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Correcting check icon placement in RTL
Eranroz has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380844 ) Change subject: Correcting check icon placement in RTL .. Correcting check icon placement in RTL Bug: T176796 Change-Id: Ib0c6faa77f393a9f0f78b9d9d492c4c25fb0d3b5 --- M resources/src/mediawiki.action/mediawiki.action.view.postEdit.less 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/44/380844/1 diff --git a/resources/src/mediawiki.action/mediawiki.action.view.postEdit.less b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.less index d19f098..46976d4 100644 --- a/resources/src/mediawiki.action/mediawiki.action.view.postEdit.less +++ b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.less @@ -56,4 +56,6 @@ .postedit-icon-checkmark { /* @embed */ background-image: url( images/green-checkmark.png ); + /* T176796 */ + background-position: left; } -- To view, visit https://gerrit.wikimedia.org/r/380844 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0c6faa77f393a9f0f78b9d9d492c4c25fb0d3b5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Eranroz___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ImageTweaks[master]: Replace constructive with progressive UI flag
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380830 ) Change subject: Replace constructive with progressive UI flag .. Replace constructive with progressive UI flag Change-Id: I7ed958d4afffd15cec71b39db1a71d6701e62eca --- M resources/src/imageeditor.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/resources/src/imageeditor.js b/resources/src/imageeditor.js index 36cc2b9..beb6cd9 100644 --- a/resources/src/imageeditor.js +++ b/resources/src/imageeditor.js @@ -209,7 +209,7 @@ this.saveButton = new OO.ui.ButtonWidget( { label: mw.message( 'imagetweaks-editor-save' ).text(), - flags: [ 'constructive', 'primary' ] + flags: [ 'progressive', 'primary' ] } ).on( 'click', function () { editor.emit( 'save' ); } ); -- To view, visit https://gerrit.wikimedia.org/r/380830 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ed958d4afffd15cec71b39db1a71d6701e62eca Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ImageTweaks Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: VolkerE 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...Cite[master]: Replace constructive with progressive UI flag
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380829 ) Change subject: Replace constructive with progressive UI flag .. Replace constructive with progressive UI flag Change-Id: I0edfb7ad13b12a0695f6cdc4afc9afcc82265183 --- M modules/ve-cite/ve.ui.MWReferenceDialog.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/modules/ve-cite/ve.ui.MWReferenceDialog.js b/modules/ve-cite/ve.ui.MWReferenceDialog.js index a8fcd0c..1e89360 100644 --- a/modules/ve-cite/ve.ui.MWReferenceDialog.js +++ b/modules/ve-cite/ve.ui.MWReferenceDialog.js @@ -44,7 +44,7 @@ { action: 'insert', label: OO.ui.deferMsg( 'visualeditor-dialog-action-insert' ), - flags: [ 'primary', 'constructive' ], + flags: [ 'progressive', 'primary' ], modes: 'insert' }, { -- To view, visit https://gerrit.wikimedia.org/r/380829 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0edfb7ad13b12a0695f6cdc4afc9afcc82265183 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cite Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: Jackmcbarn Gerrit-Reviewer: VolkerE 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...VisualEditor[wmf/1.31.0-wmf.1]: Follow-up Iebd1def1: Revert MWSignatureTool case
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380842 ) Change subject: Follow-up Iebd1def1: Revert MWSignatureTool case .. Follow-up Iebd1def1: Revert MWSignatureTool case The tool checks the page name before the target is initialized. Change-Id: I02ec528a11cc01b026fb95617388d47323ad96ee (cherry picked from commit 38d716f895ab2bbeb83e17909e91e50d8142f31d) --- M modules/ve-mw/ui/tools/ve.ui.MWSignatureTool.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/42/380842/1 diff --git a/modules/ve-mw/ui/tools/ve.ui.MWSignatureTool.js b/modules/ve-mw/ui/tools/ve.ui.MWSignatureTool.js index 443623d..f908711 100644 --- a/modules/ve-mw/ui/tools/ve.ui.MWSignatureTool.js +++ b/modules/ve-mw/ui/tools/ve.ui.MWSignatureTool.js @@ -33,7 +33,7 @@ if ( $.inArray( - new mw.Title( ve.init.target.pageName ).getNamespaceId(), + new mw.Title( mw.config.get( 'wgRelevantPageName' ) ).getNamespaceId(), mw.config.get( 'wgVisualEditorConfig' ).signatureNamespaces ) !== -1 ) { -- To view, visit https://gerrit.wikimedia.org/r/380842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I02ec528a11cc01b026fb95617388d47323ad96ee Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: wmf/1.31.0-wmf.1 Gerrit-Owner: CatropeGerrit-Reviewer: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: add mgmt.frack.eqiad.wmnet hostnames
Jgreen has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380840 ) Change subject: add mgmt.frack.eqiad.wmnet hostnames .. add mgmt.frack.eqiad.wmnet hostnames Bug: T156397 Change-Id: Ib46c4aa59e0e6445cdf48fe4ba90907b2679f1b0 --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 45 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Jgreen: Looks good to me, approved diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index ee379d8..d3a2e19 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -1043,6 +1043,27 @@ 163 1H IN PTR thulium-fundraising.frack.eqiad.wmnet. ; 10.64.40.192/26 - frack-management1-c-eqiad +193 1H IN PTR pfw3-eqiad.mgmt.frack.eqiad.wmnet. +194 1H IN PTR pay-lvs1001.mgmt.frack.eqiad.wmnet. +195 1H IN PTR pay-lvs1002.mgmt.frack.eqiad.wmnet. +196 1H IN PTR frauth1001.mgmt.frack.eqiad.wmnet. +197 1H IN PTR frdb1001.mgmt.frack.eqiad.wmnet. +198 1H IN PTR frdb1002.mgmt.frack.eqiad.wmnet. +199 1H IN PTR frdb1003.mgmt.frack.eqiad.wmnet. +200 1H IN PTR frdev1001.mgmt.frack.eqiad.wmnet. +201 1H IN PTR civi1001.mgmt.frack.eqiad.wmnet. +202 1H IN PTR frpm1001.mgmt.frack.eqiad.wmnet. +203 1H IN PTR frqueue1001.mgmt.frack.eqiad.wmnet. +204 1H IN PTR frqueue1002.mgmt.frack.eqiad.wmnet. +205 1H IN PTR americium.mgmt.frack.eqiad.wmnet. +206 1H IN PTR bismuth.mgmt.frack.eqiad.wmnet. +207 1H IN PTR tellurium.mgmt.frack.eqiad.wmnet. +208 1H IN PTR payments1001.mgmt.frack.eqiad.wmnet. +209 1H IN PTR payments1002.mgmt.frack.eqiad.wmnet. +210 1H IN PTR payments1003.mgmt.frack.eqiad.wmnet. +211 1H IN PTR payments1004.mgmt.frack.eqiad.wmnet. +212 1H IN PTR samarium.mgmt.frack.eqiad.wmnet. +213 1H IN PTR thulium.mgmt.frack.eqiad.wmnet. ; 10.64.48.0/22 - private1-d-eqiad $ORIGIN 48.64.{{ zonename }}. diff --git a/templates/wmnet b/templates/wmnet index 696081e..099bd3a 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -2525,7 +2525,6 @@ ; EQIAD fundraising/payments - $ORIGIN frack.eqiad.wmnet. americium 1H IN A10.64.40.113 civi10011H IN A10.64.40.109 @@ -2550,10 +2549,33 @@ payments10051H IN A10.64.40.9 samarium1H IN A10.64.40.130 tellurium 1H IN A10.64.40.34 -te 1H IN CNAME tellurium thulium 1H IN A10.64.40.162 thulium-fundraising 1H IN A10.64.40.163 +; EQIAD fundraising/payments management +$ORIGIN mgmt.frack.eqiad.wmnet. +pfw3-eqiad 1H IN A10.64.40.193 +pay-lvs1001 1H IN A10.64.40.194 +pay-lvs1002 1H IN A10.64.40.195 +frauth1001 1H IN A10.64.40.196 +frdb10011H IN A10.64.40.197 +frdb10021H IN A10.64.40.198 +frdb10031H IN A10.64.40.199 +frdev1001 1H IN A10.64.40.200 +civi10011H IN A10.64.40.201 +frpm10011H IN A10.64.40.202 +frqueue1001 1H IN A10.64.40.203 +frqueue1002 1H IN A10.64.40.204 +americium 1H IN A10.64.40.205 +bismuth 1H IN A10.64.40.206 +tellurium 1H IN A10.64.40.207 +payments10011H IN A10.64.40.208 +payments10021H IN A10.64.40.209 +payments10031H IN A10.64.40.210 +payments10041H IN A10.64.40.211 +samarium1H IN A10.64.40.212 +thulium 1H IN A10.64.40.213 + ; EQIAD analytics cluster -- To view, visit https://gerrit.wikimedia.org/r/380840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib46c4aa59e0e6445cdf48fe4ba90907b2679f1b0 Gerrit-PatchSet: 3 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: JgreenGerrit-Reviewer: Ayounsi Gerrit-Reviewer: Cmjohnson Gerrit-Reviewer: Jgreen 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...DataTypes[master]: Add grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380843 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Run eslint over grunt Bug: T94547 Change-Id: Id7386a839b763e35bc0d285adc98f169a22e8030 --- A Gruntfile.js M i18n/ce.json M i18n/ckb.json M i18n/en.json M i18n/ig.json M i18n/lv.json M i18n/mt.json M i18n/nds.json M i18n/or.json M i18n/so.json M i18n/ta.json M i18n/te.json M package.json 13 files changed, 125 insertions(+), 94 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataTypes refs/changes/43/380843/1 diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..fc50f9d --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,28 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-eslint' ); + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + grunt.initConfig( { + eslint: { + all: [ + '**/*.js', + '!node_modules/**', + '!vendor/**' + ] + }, + banana: { + all: 'i18n/' + }, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana', 'eslint' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/i18n/ce.json b/i18n/ce.json index 2d4aca5..a3b0a73 100644 --- a/i18n/ce.json +++ b/i18n/ce.json @@ -1,9 +1,9 @@ { -"@metadata": { -"authors": [ -"Умар" -] -}, -"datatypes-type-globe-coordinate": "Географин координаташ", -"datatypes-type-time": "Хан" + "@metadata": { + "authors": [ + "Умар" + ] + }, + "datatypes-type-globe-coordinate": "Географин координаташ", + "datatypes-type-time": "Хан" } \ No newline at end of file diff --git a/i18n/ckb.json b/i18n/ckb.json index 62c7600..982637d 100644 --- a/i18n/ckb.json +++ b/i18n/ckb.json @@ -1,9 +1,9 @@ { -"@metadata": { -"authors": [ -"Calak" -] -}, -"datatypes-type-string": "زنجیرەنووسە", -"datatypes-type-time": "کات" + "@metadata": { + "authors": [ + "Calak" + ] + }, + "datatypes-type-string": "زنجیرەنووسە", + "datatypes-type-time": "کات" } \ No newline at end of file diff --git a/i18n/en.json b/i18n/en.json index 7070e1e..49f72e1 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1,18 +1,18 @@ { -"@metadata": { -"authors": [ -"Jeroen De Dauw" -] -}, -"datatypes-desc": "Collection of data type definitions", -"datatypes-type-string": "String", -"datatypes-type-quantity": "Quantity", -"datatypes-type-monolingualtext": "Monolingual text", -"datatypes-type-multilingualtext": "Multilingual text", -"datatypes-type-number": "Number", -"datatypes-type-mediawiki-title": "MediaWiki title", -"datatypes-type-unknown": "Unspecified", -"datatypes-type-boolean": "Boolean", -"datatypes-type-globe-coordinate": "Geographic coordinates", -"datatypes-type-time": "Point in time" + "@metadata": { + "authors": [ + "Jeroen De Dauw" + ] + }, + "datatypes-desc": "Collection of data type definitions", + "datatypes-type-string": "String", + "datatypes-type-quantity": "Quantity", + "datatypes-type-monolingualtext": "Monolingual text", + "datatypes-type-multilingualtext": "Multilingual text", + "datatypes-type-number": "Number", + "datatypes-type-mediawiki-title": "MediaWiki title", + "datatypes-type-unknown": "Unspecified", + "datatypes-type-boolean": "Boolean", + "datatypes-type-globe-coordinate": "Geographic coordinates", + "datatypes-type-time": "Point in time" } diff --git a/i18n/ig.json b/i18n/ig.json index d39243a..45fbefc 100644 --- a/i18n/ig.json +++ b/i18n/ig.json @@ -1,8 +1,8 @@ { -"@metadata": { -"authors": [ -"Ukabia" -] -}, -"datatypes-type-number": "Ọ́nụ́ọ̀gụ̀gụ̀" + "@metadata": { + "authors": [ + "Ukabia" + ] + }, + "datatypes-type-number": "Ọ́nụ́ọ̀gụ̀gụ̀" } \ No newline at end of file diff --git a/i18n/lv.json b/i18n/lv.json index 2c3a678..47f23b8 100644 --- a/i18n/lv.json +++ b/i18n/lv.json @@ -1,8 +1,8
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Replace constructive with progressive UI flag
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380828 ) Change subject: Replace constructive with progressive UI flag .. Replace constructive with progressive UI flag Change-Id: Ia2231b53ae7e085ec44d468697fecab17eb2c801 --- M includes/content/NewsletterContent.php M includes/specials/SpecialNewsletter.php 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/includes/content/NewsletterContent.php b/includes/content/NewsletterContent.php index 9119822..5afa578 100644 --- a/includes/content/NewsletterContent.php +++ b/includes/content/NewsletterContent.php @@ -261,7 +261,7 @@ $buttons[] = new OOUI\ButtonWidget( [ 'label' => wfMessage( 'newsletter-subscribe-button' )->text(), - 'flags' => [ 'constructive' ], + 'flags' => [ 'progressive' ], 'href' => SpecialPage::getTitleFor( 'Newsletter', $id. '/' . self::NEWSLETTER_SUBSCRIBE )->getFullURL() diff --git a/includes/specials/SpecialNewsletter.php b/includes/specials/SpecialNewsletter.php index 9442fb6..9bd005a 100644 --- a/includes/specials/SpecialNewsletter.php +++ b/includes/specials/SpecialNewsletter.php @@ -218,7 +218,7 @@ 'name' => 'subscribe', 'default' => $this->msg( 'newsletter-do-subscribe' )->text(), 'id' => 'mw-newsletter-subscribe', - 'flags' => [ 'primary', 'constructive' ], + 'flags' => [ 'primary', 'progressive' ], ] ]; } -- To view, visit https://gerrit.wikimedia.org/r/380828 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia2231b53ae7e085ec44d468697fecab17eb2c801 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: Addshore Gerrit-Reviewer: VolkerE 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...TemplateData[master]: Replace constructive with progressive UI flag
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380831 ) Change subject: Replace constructive with progressive UI flag .. Replace constructive with progressive UI flag Change-Id: Ia406001eb8bd30857f825b34971a7d7d7393bb01 --- M modules/ext.templateDataGenerator.ui.tdDialog.js 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/modules/ext.templateDataGenerator.ui.tdDialog.js b/modules/ext.templateDataGenerator.ui.tdDialog.js index cb03a00..efa6fe3 100644 --- a/modules/ext.templateDataGenerator.ui.tdDialog.js +++ b/modules/ext.templateDataGenerator.ui.tdDialog.js @@ -36,7 +36,7 @@ { action: 'apply', label: mw.msg( 'templatedata-modal-button-apply' ), - flags: [ 'primary', 'constructive' ], + flags: [ 'primary', 'progressive' ], modes: 'list' }, { @@ -48,7 +48,7 @@ { action: 'add', label: mw.msg( 'templatedata-modal-button-addparam' ), - flags: [ 'constructive' ], + flags: [ 'progressive' ], modes: 'list' }, { -- To view, visit https://gerrit.wikimedia.org/r/380831 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia406001eb8bd30857f825b34971a7d7d7393bb01 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TemplateData Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.23.2
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380839 ) Change subject: Tag v0.23.2 .. Tag v0.23.2 Change-Id: I58e2a122fd9eb22c4757f3a138069396c39c865e --- M History.md M package.json 2 files changed, 21 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/History.md b/History.md index 7c4e6b3..cc89b95 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,24 @@ # OOjs UI Release History +## v0.23.2 / 2017-09-26 +### Deprecations +* [DEPRECATING CHANGE]: Apex theme: Begin killing `constructive` flag (James D. Forrester) + +### Features +* LabelElement#highlightQuery: Support locale comparison (Ed Sanders) +* MenuLayout, BookletLayout, IndexLayout: Support `expanded: false` (Bartosz Dziewoński) +* WindowManager: Set `aria-hidden` by default and change toggleAriaIsolation behavior (Prateek Saxena) + +### Code +* MenuLayout: Rewrite support for `expanded: false` (Bartosz Dziewoński) +* TextInputWidget: Reduce CSS output by enhancing unselectable behaviour (Volker E.) +* themes: Align DropdownWidget `&-handle` selectors for code hygiene (Volker E.) +* Apex theme: Simplify Radio- & Checkbox*optionWidget label rules (Volker E.) +* Remove duplicated `outline` property (Volker E.) +* Remove LESS vars covered by WikimediaUI Base (Volker E.) +* demos: Expand long dialog title to actually test things (James D. Forrester) +* demos: Restrict `opacity` to non-flagged icons only (Volker E.) + + ## v0.23.1 / 2017-09-19 ### Deprecations * [DEPRECATING CHANGE] SelectWidget: Rename `getFirstSelectableItem` to `findFirstSelectableItem` (Prateek Saxena) diff --git a/package.json b/package.json index c06d083..02dbb25 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oojs-ui", - "version": "0.23.1", + "version": "0.23.2", "description": "User interface classes built on the OOjs framework.", "keywords": [ "oojs-plugin", -- To view, visit https://gerrit.wikimedia.org/r/380839 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I58e2a122fd9eb22c4757f3a138069396c39c865e Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: VolkerE 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...Citoid[master]: Replace constructive with progressive UI flag
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380822 ) Change subject: Replace constructive with progressive UI flag .. Replace constructive with progressive UI flag Change-Id: Idf4301aa4f9921e11b18e35897430c4df6594174 --- M modules/ve.ui.CiteFromIdReferenceWidget.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/modules/ve.ui.CiteFromIdReferenceWidget.js b/modules/ve.ui.CiteFromIdReferenceWidget.js index 5ea9280..2498027 100644 --- a/modules/ve.ui.CiteFromIdReferenceWidget.js +++ b/modules/ve.ui.CiteFromIdReferenceWidget.js @@ -43,7 +43,7 @@ this.insertButton = new OO.ui.ButtonWidget( { label: mw.msg( 'citoid-citation-widget-insert-button' ), classes: [ 've-ui-citeFromIdReferenceWidget-insert-button' ], - flags: [ 'constructive', 'primary' ] + flags: [ 'progressive', 'primary' ] } ); // Create the citation preview -- To view, visit https://gerrit.wikimedia.org/r/380822 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idf4301aa4f9921e11b18e35897430c4df6594174 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Citoid Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: VolkerE 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...FileAnnotations[master]: Replace constructive with progressive UI flag
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380825 ) Change subject: Replace constructive with progressive UI flag .. Replace constructive with progressive UI flag Change-Id: I5182b09d1dac5177746f24ddb5e6ba3dea23138e --- M resources/src/FileAnnotationEditor.js M resources/src/FileAnnotator.js 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/resources/src/FileAnnotationEditor.js b/resources/src/FileAnnotationEditor.js index 3c5004a..8683bc1 100644 --- a/resources/src/FileAnnotationEditor.js +++ b/resources/src/FileAnnotationEditor.js @@ -103,7 +103,7 @@ this.saveButton = new OO.ui.ButtonWidget( { label: mw.message( 'fileannotations-save' ).text(), icon: 'check', - flags: [ 'constructive', 'primary' ] + flags: [ 'progressive', 'primary' ] } ); this.cancelButton = new OO.ui.ButtonWidget( { diff --git a/resources/src/FileAnnotator.js b/resources/src/FileAnnotator.js index 519cb09..9df6a31 100644 --- a/resources/src/FileAnnotator.js +++ b/resources/src/FileAnnotator.js @@ -73,7 +73,7 @@ createButton = new OO.ui.ButtonWidget( { label: mw.message( 'fileannotations-create' ).text(), icon: 'add', - flags: [ 'constructive' ] + flags: [ 'progressive' ] } ); createButton.on( 'click', function () { -- To view, visit https://gerrit.wikimedia.org/r/380825 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5182b09d1dac5177746f24ddb5e6ba3dea23138e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/FileAnnotations Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: VolkerE 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...UploadWizard[master]: Replace constructive with progressive UI flag
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380823 ) Change subject: Replace constructive with progressive UI flag .. Replace constructive with progressive UI flag Change-Id: If3805d6984d1913e2d5498e43e89ef64d3f6b686 --- M resources/details/uw.DescriptionsDetailsWidget.js M resources/ui/steps/uw.ui.Upload.js M resources/uw.CopyMetadataWidget.js 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/resources/details/uw.DescriptionsDetailsWidget.js b/resources/details/uw.DescriptionsDetailsWidget.js index 35f1df6..a999db9 100644 --- a/resources/details/uw.DescriptionsDetailsWidget.js +++ b/resources/details/uw.DescriptionsDetailsWidget.js @@ -19,7 +19,7 @@ this.addDescriptionButton = new OO.ui.ButtonWidget( { classes: [ 'mwe-upwiz-details-descriptions-add' ], framed: false, - flags: [ 'constructive' ], + flags: [ 'progressive' ], // Messages: mwe-upwiz-desc-add-0, mwe-upwiz-desc-add-n label: mw.msg( 'mwe-upwiz-desc-add-' + ( !this.required ? '0' : 'n' ) ) } ); diff --git a/resources/ui/steps/uw.ui.Upload.js b/resources/ui/steps/uw.ui.Upload.js index 3491a0a..8d94d81 100644 --- a/resources/ui/steps/uw.ui.Upload.js +++ b/resources/ui/steps/uw.ui.Upload.js @@ -46,7 +46,7 @@ this.addFile = new OO.ui.ButtonWidget( { id: 'mwe-upwiz-add-file', label: mw.message( 'mwe-upwiz-add-file-0-free' ).text(), - flags: [ 'constructive', 'primary' ] + flags: [ 'progressive', 'primary' ] } ); this.$addFileContainer.append( this.addFile.$element ); @@ -62,7 +62,7 @@ this.addFlickrFile = new OO.ui.ButtonWidget( { id: 'mwe-upwiz-add-flickr-file', label: mw.message( 'mwe-upwiz-add-file-flickr' ).text(), - flags: 'constructive' + flags: 'progressive' } ).on( 'click', function () { upload.flickrInterfaceInit(); uw.eventFlowLogger.logEvent( 'flickr-upload-button-clicked' ); @@ -95,7 +95,7 @@ this.flickrSelectButton = new OO.ui.ButtonWidget( { id: 'mwe-upwiz-select-flickr', label: mw.message( 'mwe-upwiz-add-file-0-free' ).text(), - flags: [ 'constructive', 'primary' ] + flags: [ 'progressive', 'primary' ] } ); this.$flickrSelectListContainer.append( this.flickrSelectButton.$element ); diff --git a/resources/uw.CopyMetadataWidget.js b/resources/uw.CopyMetadataWidget.js index 6545ab3..4be1051 100644 --- a/resources/uw.CopyMetadataWidget.js +++ b/resources/uw.CopyMetadataWidget.js @@ -42,7 +42,7 @@ } ); this.copyButton = new OO.ui.ButtonWidget( { label: mw.message( 'mwe-upwiz-copy-metadata-button' ).text(), - flags: [ 'constructive' ] + flags: [ 'progressive' ] } ); this.undoButton = new OO.ui.ButtonWidget( { label: mw.message( 'mwe-upwiz-copy-metadata-button-undo' ).text() -- To view, visit https://gerrit.wikimedia.org/r/380823 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If3805d6984d1913e2d5498e43e89ef64d3f6b686 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UploadWizard Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: add mgmt.frack.eqiad.wmnet hostnames
Jgreen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380840 ) Change subject: add mgmt.frack.eqiad.wmnet hostnames .. add mgmt.frack.eqiad.wmnet hostnames Change-Id: Ib46c4aa59e0e6445cdf48fe4ba90907b2679f1b0 --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 43 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/40/380840/1 diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index ee379d8..5e34d86 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -1043,6 +1043,26 @@ 163 1H IN PTR thulium-fundraising.frack.eqiad.wmnet. ; 10.64.40.192/26 - frack-management1-c-eqiad +194 1H IN PTR pay-lvs1001.mgmt.frack.eqiad.wmnet. +195 1H IN PTR pay-lvs1002.mgmt.frack.eqiad.wmnet. +196 1H IN PTR frauth1001.mgmt.frack.eqiad.wmnet. +197 1H IN PTR frdb1001.mgmt.frack.eqiad.wmnet. +198 1H IN PTR frdb1002.mgmt.frack.eqiad.wmnet. +199 1H IN PTR frdb1003.mgmt.frack.eqiad.wmnet. +200 1H IN PTR frdev1001.mgmt.frack.eqiad.wmnet. +201 1H IN PTR civi1001.mgmt.frack.eqiad.wmnet. +202 1H IN PTR frpm1001.mgmt.frack.eqiad.wmnet. +203 1H IN PTR frqueue1001.mgmt.frack.eqiad.wmnet. +204 1H IN PTR frqueue1002.mgmt.frack.eqiad.wmnet. +205 1H IN PTR americium.mgmt.frack.eqiad.wmnet. +206 1H IN PTR bismuth.mgmt.frack.eqiad.wmnet. +207 1H IN PTR tellurium.mgmt.frack.eqiad.wmnet. +208 1H IN PTR payments1001.mgmt.frack.eqiad.wmnet. +209 1H IN PTR payments1002.mgmt.frack.eqiad.wmnet. +210 1H IN PTR payments1003.mgmt.frack.eqiad.wmnet. +211 1H IN PTR payments1004.mgmt.frack.eqiad.wmnet. +212 1H IN PTR samarium.mgmt.frack.eqiad.wmnet. +213 1H IN PTR thulium.mgmt.frack.eqiad.wmnet. ; 10.64.48.0/22 - private1-d-eqiad $ORIGIN 48.64.{{ zonename }}. diff --git a/templates/wmnet b/templates/wmnet index 696081e..2bd6ac4 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -2525,7 +2525,6 @@ ; EQIAD fundraising/payments - $ORIGIN frack.eqiad.wmnet. americium 1H IN A10.64.40.113 civi10011H IN A10.64.40.109 @@ -2550,10 +2549,32 @@ payments10051H IN A10.64.40.9 samarium1H IN A10.64.40.130 tellurium 1H IN A10.64.40.34 -te 1H IN CNAME tellurium thulium 1H IN A10.64.40.162 thulium-fundraising 1H IN A10.64.40.163 +; EQIAD fundraising/payments management +$ORIGIN mgmt.frack.eqiad.wmnet. +pay-lvs1001 1H IN A10.64.40.194 +pay-lvs1002 1H IN A10.64.40.195 +frauth1001 1H IN A10.64.40.196 +frdb10011H IN A10.64.40.197 +frdb10021H IN A10.64.40.198 +frdb10031H IN A10.64.40.199 +frdev1001 1H IN A10.64.40.200 +civi10011H IN A10.64.40.201 +frpm10011H IN A10.64.40.202 +frqueue1001 1H IN A10.64.40.203 +frqueue1002 1H IN A10.64.40.204 +americium 1H IN A10.64.40.205 +bismuth 1H IN A10.64.40.206 +tellurium 1H IN A10.64.40.207 +payments10011H IN A10.64.40.208 +payments10021H IN A10.64.40.209 +payments10031H IN A10.64.40.210 +payments10041H IN A10.64.40.211 +samarium1H IN A10.64.40.212 +thulium 1H IN A10.64.40.213 + ; EQIAD analytics cluster -- To view, visit https://gerrit.wikimedia.org/r/380840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib46c4aa59e0e6445cdf48fe4ba90907b2679f1b0 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Jgreen___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.23.2
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380839 ) Change subject: Tag v0.23.2 .. Tag v0.23.2 Change-Id: I58e2a122fd9eb22c4757f3a138069396c39c865e --- M History.md M package.json 2 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/39/380839/1 diff --git a/History.md b/History.md index 7c4e6b3..cc89b95 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,24 @@ # OOjs UI Release History +## v0.23.2 / 2017-09-26 +### Deprecations +* [DEPRECATING CHANGE]: Apex theme: Begin killing `constructive` flag (James D. Forrester) + +### Features +* LabelElement#highlightQuery: Support locale comparison (Ed Sanders) +* MenuLayout, BookletLayout, IndexLayout: Support `expanded: false` (Bartosz Dziewoński) +* WindowManager: Set `aria-hidden` by default and change toggleAriaIsolation behavior (Prateek Saxena) + +### Code +* MenuLayout: Rewrite support for `expanded: false` (Bartosz Dziewoński) +* TextInputWidget: Reduce CSS output by enhancing unselectable behaviour (Volker E.) +* themes: Align DropdownWidget `&-handle` selectors for code hygiene (Volker E.) +* Apex theme: Simplify Radio- & Checkbox*optionWidget label rules (Volker E.) +* Remove duplicated `outline` property (Volker E.) +* Remove LESS vars covered by WikimediaUI Base (Volker E.) +* demos: Expand long dialog title to actually test things (James D. Forrester) +* demos: Restrict `opacity` to non-flagged icons only (Volker E.) + + ## v0.23.1 / 2017-09-19 ### Deprecations * [DEPRECATING CHANGE] SelectWidget: Rename `getFirstSelectableItem` to `findFirstSelectableItem` (Prateek Saxena) diff --git a/package.json b/package.json index c06d083..02dbb25 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oojs-ui", - "version": "0.23.1", + "version": "0.23.2", "description": "User interface classes built on the OOjs framework.", "keywords": [ "oojs-plugin", -- To view, visit https://gerrit.wikimedia.org/r/380839 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I58e2a122fd9eb22c4757f3a138069396c39c865e Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Graph[master]: Replace constructive with progressive UI flag
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380832 ) Change subject: Replace constructive with progressive UI flag .. Replace constructive with progressive UI flag Change-Id: I3d71f9ff27029a057c4b70e13ab30f61a5969f7a --- M modules/ve-graph/ve.ui.MWGraphDialog.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/modules/ve-graph/ve.ui.MWGraphDialog.js b/modules/ve-graph/ve.ui.MWGraphDialog.js index b3426cc..05537e9 100644 --- a/modules/ve-graph/ve.ui.MWGraphDialog.js +++ b/modules/ve-graph/ve.ui.MWGraphDialog.js @@ -46,7 +46,7 @@ { action: 'done', label: OO.ui.deferMsg( 'visualeditor-dialog-action-insert' ), - flags: [ 'constructive', 'primary' ], + flags: [ 'progressive', 'primary' ], modes: 'insert' }, { -- To view, visit https://gerrit.wikimedia.org/r/380832 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d71f9ff27029a057c4b70e13ab30f61a5969f7a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Graph Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: VolkerE 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...BlueSpiceUserManager[master]: Add grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380838 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: Id40b8a35558a56b7dc41caa62c036d6f4ff6b721 --- A .gitignore A Gruntfile.js A package.json 3 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceUserManager refs/changes/38/380838/1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..db8a779 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/node_modules +/vendor +/composer.lock diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/380838 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id40b8a35558a56b7dc41caa62c036d6f4ff6b721 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceUserManager Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSmartlist[master]: Add grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380836 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I272a6e9429865b49d237913c8ffec2ce95ddaff2 --- A Gruntfile.js A package.json 2 files changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceSmartlist refs/changes/36/380836/1 diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/380836 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I272a6e9429865b49d237913c8ffec2ce95ddaff2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceSmartlist Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePageTemplates[master]: Add grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380835 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I19b0c432babe3e3ac2d868aeb33f2949a51ada35 --- A Gruntfile.js A package.json 2 files changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpicePageTemplates refs/changes/35/380835/1 diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/380835 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I19b0c432babe3e3ac2d868aeb33f2949a51ada35 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpicePageTemplates Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Support locale comparison in LabelElement#highlightQuery
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/379778 ) Change subject: Support locale comparison in LabelElement#highlightQuery .. Support locale comparison in LabelElement#highlightQuery Change-Id: I576f31759a84d221d6be8dedbb7660d7a194cce2 --- M src/mixins/LabelElement.js 1 file changed, 18 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/src/mixins/LabelElement.js b/src/mixins/LabelElement.js index 8d5f98a..0991d3d 100644 --- a/src/mixins/LabelElement.js +++ b/src/mixins/LabelElement.js @@ -61,12 +61,25 @@ * * @param {string} text Text * @param {string} query Query to find + * @param {Function} [compare] Optional string comparator, e.g. Intl.Collator().compare * @return {jQuery} Text with the first match of the query * sub-string wrapped in highlighted span */ -OO.ui.mixin.LabelElement.static.highlightQuery = function ( text, query ) { - var $result = $( '' ), +OO.ui.mixin.LabelElement.static.highlightQuery = function ( text, query, compare ) { + var i, offset, tLen, qLen, + $result = $( '' ); + + if ( compare ) { + tLen = text.length; + qLen = query.length; + for ( i = 0; offset === undefined && i <= tLen - qLen; i++ ) { + if ( compare( query, text.slice( i, i + qLen ) ) === 0 ) { + offset = i; + } + } + } else { offset = text.toLowerCase().indexOf( query.toLowerCase() ); + } if ( !query.length || offset === -1 ) { return $result.text( text ); @@ -131,10 +144,11 @@ * * @param {string} text Text label to set * @param {string} query Substring of text to highlight + * @param {Function} [compare] Optional string comparator, e.g. Intl.Collator().compare * @chainable */ -OO.ui.mixin.LabelElement.prototype.setHighlightedQuery = function ( text, query ) { - return this.setLabel( this.constructor.static.highlightQuery( text, query ) ); +OO.ui.mixin.LabelElement.prototype.setHighlightedQuery = function ( text, query, compare ) { + return this.setLabel( this.constructor.static.highlightQuery( text, query, compare ) ); }; /** -- To view, visit https://gerrit.wikimedia.org/r/379778 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I576f31759a84d221d6be8dedbb7660d7a194cce2 Gerrit-PatchSet: 2 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: EsandersGerrit-Reviewer: Jforrester Gerrit-Reviewer: VolkerE 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...BlueSpiceExtendedStatistics[master]: Add grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/380834 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Bug: T94547 Change-Id: I7829ec346d28605c08351f89c5173ab8b17a6fd8 --- A Gruntfile.js A package.json 2 files changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtendedStatistics refs/changes/34/380834/1 diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/380834 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7829ec346d28605c08351f89c5173ab8b17a6fd8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtendedStatistics Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits