[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Remove duplicate $wgAvailableRights additions

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325157

Change subject: Remove duplicate $wgAvailableRights additions
..

Remove duplicate $wgAvailableRights additions

These are already set in extension.json, there's no need to also
duplicate them in the callback.

Change-Id: Id07aae286b0545f8e971551a4cb5352d7e3a6cab
---
M Hooks.php
1 file changed, 0 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/57/325157/1

diff --git a/Hooks.php b/Hooks.php
index 5058e65..0c22690 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -32,14 +32,6 @@
 
require_once __DIR__ . '/defines.php';
 
-   // Make sure all of these are granted via OAuth in Hooks.php
-   $wgAvailableRights[] = 'flow-hide';
-   $wgAvailableRights[] = 'flow-lock';
-   $wgAvailableRights[] = 'flow-delete';
-   $wgAvailableRights[] = 'flow-suppress';
-   $wgAvailableRights[] = 'flow-edit-post';
-   $wgAvailableRights[] = 'flow-create-board';
-
// Action details config file
require __DIR__ . '/FlowActions.php';
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id07aae286b0545f8e971551a4cb5352d7e3a6cab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Get rid of $wgFlowGroupPermissions hack

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325156

Change subject: Get rid of $wgFlowGroupPermissions hack
..

Get rid of $wgFlowGroupPermissions hack

Just read the default permissions out of extension.json for tests.

Change-Id: I59f8ebc8bcac204092bfda6c526fec7b62bcea6d
---
M Hooks.php
M tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
M tests/phpunit/FlowTestCase.php
M tests/phpunit/PermissionsTest.php
4 files changed, 13 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/56/325156/1

diff --git a/Hooks.php b/Hooks.php
index ac977d4..5058e65 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -32,22 +32,6 @@
 
require_once __DIR__ . '/defines.php';
 
-   // User permissions
-   // Added to $wgFlowGroupPermissions instead of 
$wgGroupPermissions immediately,
-   // to easily fetch Flow-specific permissions in 
tests/PermissionsTest.php.
-   // If you wish to make local permission changes, add them to 
$wgGroupPermissions
-   // directly - tests will fail otherwise, since they'll be based 
on a different
-   // permissions config than what's assumed to test.
-   $wgFlowGroupPermissions = array();
-   $wgFlowGroupPermissions['*']['flow-hide'] = true;
-   $wgFlowGroupPermissions['user']['flow-lock'] = true;
-   $wgFlowGroupPermissions['sysop']['flow-lock'] = true;
-   $wgFlowGroupPermissions['sysop']['flow-delete'] = true;
-   $wgFlowGroupPermissions['sysop']['flow-edit-post'] = true;
-   $wgFlowGroupPermissions['oversight']['flow-suppress'] = true;
-   $wgFlowGroupPermissions['flow-bot']['flow-create-board'] = true;
-   $wgGroupPermissions = array_merge_recursive( 
$wgGroupPermissions, $wgFlowGroupPermissions );
-
// Make sure all of these are granted via OAuth in Hooks.php
$wgAvailableRights[] = 'flow-hide';
$wgAvailableRights[] = 'flow-lock';
diff --git a/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php 
b/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
index 0734d35..073a1a0 100644
--- a/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
+++ b/tests/phpunit/Collection/RevisionCollectionPermissionsTest.php
@@ -57,13 +57,7 @@
 
// We don't want local config getting in the way of testing 
whether or
// not our permissions implementation works well.
-   // This will load default $wgGroupPermissions + Flow settings, 
so we can
-   // test if permissions work well, regardless of any custom 
config.
-   global $IP, $wgFlowGroupPermissions;
-   $wgGroupPermissions = array();
-   require "$IP/includes/DefaultSettings.php";
-   $wgGroupPermissions = array_merge_recursive( 
$wgGroupPermissions, $wgFlowGroupPermissions );
-   $this->setMwGlobals( 'wgGroupPermissions', $wgGroupPermissions 
);
+   $this->resetPermissions();
 
// When external store is used, data is written to "blobs" 
table, which
// by default doesn't exist - let's just not use 
externalstorage in test
diff --git a/tests/phpunit/FlowTestCase.php b/tests/phpunit/FlowTestCase.php
index 18ae56f..bd47647 100644
--- a/tests/phpunit/FlowTestCase.php
+++ b/tests/phpunit/FlowTestCase.php
@@ -3,6 +3,7 @@
 namespace Flow\Tests;
 
 use EventRelayerNull;
+use ExtensionRegistry;
 use Flow\Container;
 use Flow\Data\FlowObjectCache;
 use Flow\Model\UUID;
@@ -39,4 +40,14 @@
 
return new FlowObjectCache( $wanCache, Container::get( 
'db.factory' ), $wgFlowCacheTime );
}
+
+   protected function resetPermissions() {
+   $registry = new ExtensionRegistry();
+   $data = $registry->readFromQueue( [ __DIR__ . 
'../../extension.json' => 1 ] );
+   $perms = $data['globals']['wgGroupPermissions'];
+   unset( $perms[$registry::MERGE_STRATEGY] );
+   $this->stashMwGlobals( [ 'wgGroupPermissions'] );
+   global $wgGroupPermissions;
+   $wgGroupPermissions = wfArrayPlus2d( $perms, 
$wgGroupPermissions );
+   }
 }
diff --git a/tests/phpunit/PermissionsTest.php 
b/tests/phpunit/PermissionsTest.php
index 6d1d410..d9e9b7d 100644
--- a/tests/phpunit/PermissionsTest.php
+++ b/tests/phpunit/PermissionsTest.php
@@ -52,13 +52,7 @@
 
// We don't want local config getting in the way of testing 
whether or
// not our permissions implementation works well.
-   // This will load default $wgGroupPermissions + Flow settings, 
so we can
-   // test if permissions work well, regardless of any custom 
config.
-  

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add integration test for MWHttpRequest user/pass options

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add integration test for MWHttpRequest user/pass options
..


Add integration test for MWHttpRequest user/pass options

Change-Id: I5bcb263a725e8042ee51109080d2075744fe7001
---
M tests/integration/includes/http/MWHttpRequestTestCase.php
1 file changed, 36 insertions(+), 0 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/integration/includes/http/MWHttpRequestTestCase.php 
b/tests/integration/includes/http/MWHttpRequestTestCase.php
index fb52de9..4fd1cde 100644
--- a/tests/integration/includes/http/MWHttpRequestTestCase.php
+++ b/tests/integration/includes/http/MWHttpRequestTestCase.php
@@ -175,8 +175,33 @@
$this->assertArrayHasKey( 'origin', $data );
}
 
+   public function testBasicAuthentication() {
+   $request = MWHttpRequest::factory( 
'http://httpbin.org/basic-auth/user/pass', [
+   'username' => 'user',
+   'password' => 'pass',
+   ] );
+   $status = $request->execute();
+   $this->assertTrue( $status->isGood() );
+   $this->assertResponseFieldValue( 'authenticated', true, 
$request );
+
+   $request = MWHttpRequest::factory( 
'http://httpbin.org/basic-auth/user/pass', [
+   'username' => 'user',
+   'password' => 'wrongpass',
+   ] );
+   $status = $request->execute();
+   $this->assertFalse( $status->isOK() );
+   $this->assertSame( 401, $request->getStatus() );
+   }
+
// 
 
+   /**
+* Verifies that the request was successful, returned valid JSON and 
the given field of that
+* JSON data is as expected.
+* @param string|string[] $key Path to the data in the response object
+* @param mixed $expectedValue
+* @param MWHttpRequest $response
+*/
protected function assertResponseFieldValue( $key, $expectedValue, 
MWHttpRequest $response ) {
$this->assertSame( 200, $response->getStatus(), 'response 
status is not 200' );
$data = json_decode( $response->getContent(), true );
@@ -190,6 +215,12 @@
$this->assertSame( $expectedValue, $data );
}
 
+   /**
+* Asserts that the cookie jar has the given cookie with the given 
value.
+* @param string $expectedName Cookie name
+* @param string $expectedValue Cookie value
+* @param CookieJar $cookieJar
+*/
protected function assertHasCookie( $expectedName, $expectedValue, 
CookieJar $cookieJar ) {
$cookieJar = TestingAccessWrapper::newFromObject( $cookieJar );
$cookies = array_change_key_case( $cookieJar->cookie, 
CASE_LOWER );
@@ -199,6 +230,11 @@
$this->assertSame( $expectedValue, $cookie->value );
}
 
+   /**
+* Asserts that the cookie jar does not have the given cookie.
+* @param string $expectedName Cookie name
+* @param CookieJar $cookieJar
+*/
protected function assertNotHasCookie( $name, CookieJar $cookieJar ) {
$cookieJar = TestingAccessWrapper::newFromObject( $cookieJar );
$this->assertArrayNotHasKey( strtolower( $name ),

-- 
To view, visit https://gerrit.wikimedia.org/r/325136
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5bcb263a725e8042ee51109080d2075744fe7001
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Legoktm 
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[master]: Replaced Linker::link() usage with LinkRenderer in some spec...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Replaced Linker::link() usage with LinkRenderer in some special 
pages
..


Replaced Linker::link() usage with LinkRenderer in some special pages

Bug: T149346
Change-Id: I73c2b7402012a49e4419b6214f1d03f2e819220b
---
M includes/specials/SpecialMostlinkedtemplates.php
M includes/specials/SpecialPagesWithProp.php
M includes/specials/SpecialProtectedtitles.php
M includes/specials/SpecialStatistics.php
M includes/specials/SpecialTrackingCategories.php
M includes/specials/SpecialUnblock.php
M includes/specials/SpecialUndelete.php
M includes/specials/SpecialUnusedcategories.php
M includes/specials/SpecialVersion.php
M includes/specials/SpecialWantedcategories.php
10 files changed, 55 insertions(+), 51 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/specials/SpecialMostlinkedtemplates.php 
b/includes/specials/SpecialMostlinkedtemplates.php
index 7fcb9d8..d102791 100644
--- a/includes/specials/SpecialMostlinkedtemplates.php
+++ b/includes/specials/SpecialMostlinkedtemplates.php
@@ -104,7 +104,7 @@
}
 
return $this->getLanguage()->specialList(
-   Linker::link( $title ),
+   $this->getLinkRenderer()->makeLink( $title ),
$this->makeWlhLink( $title, $result )
);
}
@@ -118,9 +118,9 @@
 */
private function makeWlhLink( $title, $result ) {
$wlh = SpecialPage::getTitleFor( 'Whatlinkshere', 
$title->getPrefixedText() );
-   $label = $this->msg( 'ntransclusions' )->numParams( 
$result->value )->escaped();
+   $label = $this->msg( 'ntransclusions' )->numParams( 
$result->value )->text();
 
-   return Linker::link( $wlh, $label );
+   return $this->getLinkRenderer()->makeLink( $wlh, $label );
}
 
protected function getGroupName() {
diff --git a/includes/specials/SpecialPagesWithProp.php 
b/includes/specials/SpecialPagesWithProp.php
index 706a1d7..37006d8 100644
--- a/includes/specials/SpecialPagesWithProp.php
+++ b/includes/specials/SpecialPagesWithProp.php
@@ -133,7 +133,7 @@
 */
function formatResult( $skin, $result ) {
$title = Title::newFromRow( $result );
-   $ret = Linker::link( $title, null, [], [], [ 'known' ] );
+   $ret = $this->getLinkRenderer()->makeKnownLink( $title );
if ( $result->pp_value !== '' ) {
// Do not show very long or binary values on the 
special page
$valueLength = strlen( $result->pp_value );
diff --git a/includes/specials/SpecialProtectedtitles.php 
b/includes/specials/SpecialProtectedtitles.php
index c800d96..fa9033c 100644
--- a/includes/specials/SpecialProtectedtitles.php
+++ b/includes/specials/SpecialProtectedtitles.php
@@ -84,7 +84,7 @@
) . "\n";
}
 
-   $link = Linker::link( $title );
+   $link = $this->getLinkRenderer()->makeLink( $title );
$description_items = [];
// Messages: restriction-level-sysop, 
restriction-level-autoconfirmed
$protType = $this->msg( 'restriction-level-' . 
$row->pt_create_perm )->escaped();
diff --git a/includes/specials/SpecialStatistics.php 
b/includes/specials/SpecialStatistics.php
index 86f1e20..3342c32 100644
--- a/includes/specials/SpecialStatistics.php
+++ b/includes/specials/SpecialStatistics.php
@@ -112,18 +112,20 @@
 * @return string
 */
private function getPageStats() {
+   $linkRenderer = $this->getLinkRenderer();
+
$specialAllPagesTitle = SpecialPage::getTitleFor( 'Allpages' );
$pageStatsHtml = Xml::openElement( 'tr' ) .
Xml::tags( 'th', [ 'colspan' => '2' ], $this->msg( 
'statistics-header-pages' )
->parse() ) .
Xml::closeElement( 'tr' ) .
-   $this->formatRow( Linker::linkKnown( 
$specialAllPagesTitle,
-   $this->msg( 'statistics-articles' 
)->parse(), [], [ 'hideredirects' => 1 ] ),
+   $this->formatRow( $linkRenderer->makeKnownLink( 
$specialAllPagesTitle,
+   $this->msg( 'statistics-articles' 
)->text(), [], [ 'hideredirects' => 1 ] ),
$this->getLanguage()->formatNum( 
$this->good ),
[ 'class' => 'mw-statistics-articles' ],
'statistics-articles-desc' ) .
-   $this->formatRow( Linker::linkKnown( 
$specialAllPagesTitle,
-   $this->msg( 'statistics-pages' 

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Bump wikimedia/slimapp to v0.8.0

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325153

Change subject: Bump wikimedia/slimapp to v0.8.0
..

Bump wikimedia/slimapp to v0.8.0

Change-Id: I3d8ec425d3969d6bb0c353d61000bf6830a5af76
---
M composer.json
M composer.lock
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
M vendor/wikimedia/slimapp/README.md
M vendor/wikimedia/slimapp/composer.lock
M vendor/wikimedia/slimapp/src/AbstractApp.php
M vendor/wikimedia/slimapp/src/Auth/AuthManager.php
M vendor/wikimedia/slimapp/src/Auth/Password.php
M vendor/wikimedia/slimapp/src/Config.php
M vendor/wikimedia/slimapp/src/Controller.php
M vendor/wikimedia/slimapp/src/Dao/AbstractDao.php
M vendor/wikimedia/slimapp/src/HeaderMiddleware.php
M vendor/wikimedia/slimapp/src/Mailer.php
M vendor/wikimedia/slimapp/src/ParsoidClient.php
15 files changed, 498 insertions(+), 305 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships 
refs/changes/53/325153/1

diff --git a/composer.json b/composer.json
index 945510d..0145b06 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
"require": {
"php": ">=5.5.9",
"phpmailer/phpmailer": "v5.2.9",
-   "wikimedia/slimapp": "0.7.1"
+   "wikimedia/slimapp": "0.8.0"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.*",
diff --git a/composer.lock b/composer.lock
index 2976d40..318e7c9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "fa0b80b0efb333ca08d38c9d370e6e74",
-"content-hash": "dbd71bd2282a693ff99033fd68d5c053",
+"hash": "0e9dd8c747da08ca6e00fe115b2150a7",
+"content-hash": "7aa99b7687e646ef7d944a186a565b60",
 "packages": [
 {
 "name": "bd808/monolog-udp2log-handler",
@@ -438,16 +438,16 @@
 },
 {
 "name": "wikimedia/slimapp",
-"version": "v0.7.1",
+"version": "v0.8.0",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/wikimedia-slimapp.git;,
-"reference": "bd24cdfb3cad66e0ad41f973f2bdf60fa6c19c1d"
+"reference": "c66a25d6e06087637da24c27c6beb30c3e736a02"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/wikimedia-slimapp/zipball/bd24cdfb3cad66e0ad41f973f2bdf60fa6c19c1d;,
-"reference": "bd24cdfb3cad66e0ad41f973f2bdf60fa6c19c1d",
+"url": 
"https://api.github.com/repos/wikimedia/wikimedia-slimapp/zipball/c66a25d6e06087637da24c27c6beb30c3e736a02;,
+"reference": "c66a25d6e06087637da24c27c6beb30c3e736a02",
 "shasum": ""
 },
 "require": {
@@ -462,8 +462,8 @@
 },
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "~0.9",
-"mediawiki/mediawiki-codesniffer": "~0.4",
-"phpunit/phpunit": "~4.6"
+"mediawiki/mediawiki-codesniffer": "0.5.1|0.7.2",
+"phpunit/phpunit": "~4.8|~5.0"
 },
 "type": "library",
 "autoload": {
@@ -487,7 +487,7 @@
 ],
 "description": "Common classes to help with creating an 
application using the Slim micro framework and Twig template engine.",
 "homepage": "https://github.com/wikimedia/wikimedia-slimapp;,
-"time": "2015-12-04 00:52:04"
+"time": "2016-11-23 18:29:30"
 }
 ],
 "packages-dev": [
@@ -628,38 +628,87 @@
 "time": "2016-02-17 10:22:13"
 },
 {
-"name": "phpdocumentor/reflection-docblock",
-"version": "2.0.4",
+"name": "phpdocumentor/reflection-common",
+"version": "1.0",
 "source": {
 "type": "git",
-"url": 
"https://github.com/phpDocumentor/ReflectionDocBlock.git;,
-"reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+"url": "https://github.com/phpDocumentor/ReflectionCommon.git;,
+"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8;,
-"reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+"url": 
"https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c;,
+"reference": 

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Update 3rd-party js and css

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325154

Change subject: Update 3rd-party js and css
..

Update 3rd-party js and css

* jQuery 3.1.1
* Bootstrap 3.3.7
* Modernizer 3.3.1

Change-Id: I1be8ec723e6283353cb3c4f71ea3eefcfe74a072
---
M data/templates/base.html
M public/css/vendor/bootstrap.css
M public/fonts/glyphicons-halflings-regular.eot
M public/fonts/glyphicons-halflings-regular.svg
M public/fonts/glyphicons-halflings-regular.ttf
M public/fonts/glyphicons-halflings-regular.woff
A public/fonts/glyphicons-halflings-regular.woff2
M public/js/vendor/bootstrap.js
M public/js/vendor/bootstrap.min.js
D public/js/vendor/jquery-1.10.2.js
D public/js/vendor/jquery-1.10.2.min.js
D public/js/vendor/jquery-1.10.2.min.map
A public/js/vendor/jquery-3.1.1.js
A public/js/vendor/jquery-3.1.1.min.js
A public/js/vendor/jquery-3.1.1.min.map
D public/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js
A public/js/vendor/modernizr-3.3.1-custom.js
17 files changed, 15,489 insertions(+), 13,839 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships 
refs/changes/54/325154/1


-- 
To view, visit https://gerrit.wikimedia.org/r/325154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1be8ec723e6283353cb3c4f71ea3eefcfe74a072
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
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] wikimedia/wikimania-scholarships[master]: Move custom js to file and tighten CSP rules

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325155

Change subject: Move custom js to file and tighten CSP rules
..

Move custom js to file and tighten CSP rules

Move the inline javascript for session keepalive to a static js file.
This is needed to comply with the content security policy of 'self'
which keeps inline javascript from executing.

The prior update of jQuery and Modernizer versions also allows us to
update the content security policy rules to exclude unsafe-inline
styles. The rules used are fundamentally the same rules used by Striker
with the addition of data: as an image source which is needed by the
inline sprites used in main.css.

Change-Id: I3b4862c78953a2e82b74f9f150aa228d51476ed4
---
M data/templates/apply.html
R public/js/apply.js
M src/App.php
3 files changed, 26 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships 
refs/changes/55/325155/1

diff --git a/data/templates/apply.html b/data/templates/apply.html
index 5b477aa..4d880c8 100644
--- a/data/templates/apply.html
+++ b/data/templates/apply.html
@@ -18,9 +18,7 @@
 {% block nav_li_apply %}class="active"{% endblock %}
 
 {% block javascript %}
-
-{% include 'apply.js' %}
-
+
 {% endblock javascript %}
 
 {% block content %}
diff --git a/data/templates/apply.js b/public/js/apply.js
similarity index 92%
rename from data/templates/apply.js
rename to public/js/apply.js
index 14070c0..7d7e132 100644
--- a/data/templates/apply.js
+++ b/public/js/apply.js
@@ -3,10 +3,10 @@
 lastActive = 0,
 refreshCsrf = function() {
 return $.getJSON(
-'{{ urlFor( "revalidatecsrf") }}',
+'/apply/revalidatecsrf',
 function( data ) {
 var $token = $( '#token' );
-$token.val( data[ "{{ csrf_param }}" ] );
+$token.val( data[ "csrf_token" ] );
 console.log( 'csrf token: ' + $token.val() );
 }
 );
diff --git a/src/App.php b/src/App.php
index 272d31b..6f48f68 100644
--- a/src/App.php
+++ b/src/App.php
@@ -494,4 +494,27 @@
} );
}
 
+   /**
+* @inherit
+*/
+   protected function configureHeaderMiddleware() {
+   $headers = parent::configureHeaderMiddleware();
+   $headers['Content-Security-Policy'] =
+   "style-src 'self'; " .
+   "form-action 'self'; " .
+   "font-src 'self'; ".
+   "child-src 'none'; " .
+   "connect-src 'self'; " .
+   "script-src 'self'; " .
+   "sandbox allow-forms allow-same-origin allow-scripts 
allow-top-navigation; " .
+   "object-src 'none'; " .
+   "default-src 'none'; " .
+   "frame-ancestors 'none'; " .
+   "media-src 'none'; " .
+   "base-uri 'none'; " .
+   // Needed for css data:... sprites
+   "img-src 'self' data:;";
+   return $headers;
+   }
+
 } // end App

-- 
To view, visit https://gerrit.wikimedia.org/r/325155
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b4862c78953a2e82b74f9f150aa228d51476ed4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
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...Echo[master]: Add help icon

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add help icon
..


Add help icon

This adds an help icon that extensions can use for help pages. This is
the same icon as the one used in core mediawiki, located at
resources/src/mediawiki/images/help.svg.

Change-Id: I31665932b69c52e2a3eb2f0e1d9b5d88c562bca2
---
M Echo.php
A modules/icons/help.svg
2 files changed, 13 insertions(+), 0 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Echo.php b/Echo.php
index 95d103e..d3ff049 100644
--- a/Echo.php
+++ b/Echo.php
@@ -377,6 +377,9 @@
'emailuser' => array(
'path' => "$echoIconPath/emailuser.svg",
),
+   'help' => array(
+   'path' => "$echoIconPath/help.svg",
+   ),
'global' => array(
'path' => "$echoIconPath/global.svg"
),
diff --git a/modules/icons/help.svg b/modules/icons/help.svg
new file mode 100644
index 000..fcbefd1
--- /dev/null
+++ b/modules/icons/help.svg
@@ -0,0 +1,10 @@
+
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
+
+
+
+
+
+
+
+

-- 
To view, visit https://gerrit.wikimedia.org/r/325104
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I31665932b69c52e2a3eb2f0e1d9b5d88c562bca2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Cenarium 
Gerrit-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] operations/mediawiki-config[master]: Avoid using CONTENT_MODEL_FLOW_BOARD

[Catrope (Code Review)]

Catrope has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325152

Change subject: Avoid using CONTENT_MODEL_FLOW_BOARD
..

Avoid using CONTENT_MODEL_FLOW_BOARD

This constant won't be defined any more once Flow switches to extension.json

Change-Id: I7f2a2bad53023a53415487e9340fcd7b8a81501f
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/52/325152/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 187a03d..2e311e6 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2749,7 +2749,7 @@
}
 
foreach ( $wmgFlowNamespaces as $namespace ) {
-   $wgNamespaceContentModels[$namespace] = 
CONTENT_MODEL_FLOW_BOARD;
+   $wgNamespaceContentModels[$namespace] = 'flow-board'; // 
CONTENT_MODEL_FLOW_BOARD
}
// Requires that Parsoid is available for all wikis using Flow.
$wgFlowContentFormat = 'html';

-- 
To view, visit https://gerrit.wikimedia.org/r/325152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f2a2bad53023a53415487e9340fcd7b8a81501f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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...RegexBlock[master]: [WIP] Version 1.4: Special:RegexBlock is now more of a Speci...

[Jack Phoenix (Code Review)]

Jack Phoenix has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325151

Change subject: [WIP] Version 1.4: Special:RegexBlock is now more of a 
Special:Block copy
..

[WIP] Version 1.4: Special:RegexBlock is now more of a Special:Block copy

Lots and lots of code was copypasted (and modified) from core
/includes/specials/SpecialBlock.php.

Because core Special:Block supports range blocks, there is theoretical
readiness for implementing range blocks in RegexBlock, but:
* right now at least IPv6 ranges will fail the RegexBlockData::isValidRegex() 
test in RegexBlockForm::validateTargetField()
* even if they wouldn't and ranges would be stored in the blockedby table, 
there's no handling of ranges in RegexBlock::check() yet

Other bugfixes included here:
* Fixed stupid bug with RegexBlockData::isValidRegex() -- unlike what the name 
suggests, the function was checking if the supplied regex is *invalid*
* Renamed RegexBlock::clearExpired() to the more accurate name removeBlock()
* Fixed IPv6 bug in RegexBlock::check() where IPv6 addresses weren't being 
blocked correctly

Bug: T152260
Bug: T152262
Bug: T152166
Bug: T152177
Bug: T152179
Change-Id: Ic76123ffb06a3aceab90a79f4c4ede7f1640bfaa
---
M RegexBlockCore.php
M RegexBlockData.php
D RegexBlockUITemplate.php
M SpecialRegexBlock.php
M extension.json
M i18n/en.json
M regexblock.css
7 files changed, 622 insertions(+), 256 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RegexBlock 
refs/changes/51/325151/1

diff --git a/RegexBlockCore.php b/RegexBlockCore.php
index e9ce7cc..fe8efb3 100644
--- a/RegexBlockCore.php
+++ b/RegexBlockCore.php
@@ -32,7 +32,11 @@
return true;
}
 
-   $ip_to_check = $wgRequest->getIP();
+   // sanitizeIP() check is needed for IPv6 -- upon saving a 
RegexBlock,
+   // IPv6 IPs like ::1 (localhost) are expanded to 
0:0:0:0:0:0:0:1, but
+   // $wgRequest->getIP() contains just "::1" so the checks fail 
and
+   // blocked IPv6 IPs would still be able to edit
+   $ip_to_check = IP::sanitizeIP( $wgRequest->getIP() );
 
/* First check cache */
$blocked = self::isBlockedCheck( $current_user, $ip_to_check );
@@ -244,7 +248,7 @@
$names = array( 'ips' => '', 'exact' => '', 
'regex' => '' );
while ( $row = $res->fetchObject() ) {
$key = 'regex';
-   if ( $user->isIP( $row->blckby_name ) 
!= 0 ) {
+   if ( User::isIP( $row->blckby_name ) != 
0 ) {
$key = 'ips';
} elseif ( $row->blckby_exact != 0 ) {
$key = 'exact';
@@ -365,7 +369,7 @@
return $ret;
} else {
/* clean up an obsolete block */
-   self::clearExpired( $single, 
$blocked->blckby_blocker );
+   self::removeBlock( $single, 
$blocked->blckby_blocker );
}
}
}
@@ -404,25 +408,26 @@
}
 
/**
-* Clean up an existing expired block
+* Remove a block from the blockedby DB table.
 *
-* @param string $username Name of the user
-* @param string $blocker Name of the blocker
+* @param string $regex Username or regular expression to unblock
+* @param string $blocker Name of the blocker [unused - remove?]
+* @return bool True if unblocked succeeded, otherwise false
 */
-   function clearExpired( $username, $blocker ) {
+   public static function removeBlock( $regex, $blocker ) {
$result = false;
 
$dbw = self::getDB( DB_MASTER );
 
$dbw->delete(
'blockedby',
-   array( 'blckby_name' => $username ),
+   array( 'blckby_name' => $regex ),
__METHOD__
);
 
if ( $dbw->affectedRows() ) {
/* success, remember to delete cache key */
-   self::unsetKeys( $username );
+   self::unsetKeys( $regex );
$result = true;
}
 
@@ -469,10 +474,10 @@
/**
 * The actual blocking goes here, for each blocker
 *
-* @param string $blocker
+* @param string $blocker User name of the person who placed the block
 * @param array $blocker_block_data
-* @param User $user
-* @param string $user_ip
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: profiler: Support tideways for PHP7 profiling

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325150

Change subject: profiler: Support tideways for PHP7 profiling
..

profiler: Support tideways for PHP7 profiling

xhprof does not support PHP7, and it doesn't seem like upstream will be
working on that any time soon.

Tideways is a profiler that is basically a drop-in replacement for
xhprof with functions renamed. So Xhprof::enable() and Xhprof::disable()
will now try to use tideways if that is installed and xhprof is not.

Bug: T152186
Change-Id: I0d7d2de56ac638ca2851c662f527049bd620c0e9
---
M includes/libs/Xhprof.php
M includes/profiler/ProfilerXhprof.php
2 files changed, 23 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/50/325150/1

diff --git a/includes/libs/Xhprof.php b/includes/libs/Xhprof.php
index 9c1ec8e..016c9b1 100644
--- a/includes/libs/Xhprof.php
+++ b/includes/libs/Xhprof.php
@@ -23,6 +23,10 @@
  * . XHProf can be installed as a PECL
  * package for use with PHP5 (Zend PHP) and is built-in to HHVM 3.3.0.
  *
+ * This also supports using the Tideways profiler
+ * , which additionally
+ * has support for PHP7.
+ *
  * @since 1.28
  */
 class Xhprof {
@@ -43,10 +47,16 @@
 */
public static function enable( $flags = 0, $options = [] ) {
if ( self::isEnabled() ) {
-   throw new Exception( 'Xhprof profiling is already 
enabled.' );
+   throw new Exception( 'Profiling is already enabled.' );
}
self::$enabled = true;
-   xhprof_enable( $flags, $options );
+   if ( function_exists( 'xhprof_enable' ) ) {
+   xhprof_enable( $flags, $options );
+   } elseif ( function_exists( 'tideways_enable' ) ) {
+   tideways_enable( $flags, $options );
+   } else {
+   throw new Exception( "Neither xhprof nor tideways are 
installed" );
+   }
}
 
/**
@@ -57,7 +67,12 @@
public static function disable() {
if ( self::isEnabled() ) {
self::$enabled = false;
-   return xhprof_disable();
+   if ( function_exists( 'xhprof_disable' ) ) {
+   return xhprof_disable();
+   } else {
+   // tideways
+   return tideways_disable();
+   }
}
}
 }
diff --git a/includes/profiler/ProfilerXhprof.php 
b/includes/profiler/ProfilerXhprof.php
index 8fc0b77..1bf4f54 100644
--- a/includes/profiler/ProfilerXhprof.php
+++ b/includes/profiler/ProfilerXhprof.php
@@ -43,12 +43,17 @@
  * ($wgProfiler['exclude']) containing an array of function names.
  * Shell-style patterns are also accepted.
  *
+ * It is also possible to use the Tideways PHP extension, which is mostly
+ * a drop-in replacement for Xhprof. Just change the XHPROF_FLAGS_* constants
+ * to TIDEWAYS_FLAGS_*.
+ *
  * @author Bryan Davis 
  * @copyright © 2014 Bryan Davis and Wikimedia Foundation.
  * @ingroup Profiler
  * @see Xhprof
  * @see https://php.net/xhprof
  * @see https://github.com/facebook/hhvm/blob/master/hphp/doc/profiling.md
+ * @see https://github.com/tideways/php-profiler-extension
  */
 class ProfilerXhprof extends Profiler {
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/325150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d7d2de56ac638ca2851c662f527049bd620c0e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add Webkit hack to `transition` mixin

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325149

Change subject: Add Webkit hack to `transition` mixin
..

Add Webkit hack to `transition` mixin

Adding `-webkit-backface-visibility` hack to 2D `transition` mixins. It's
done in MobileFrontend and this patch targets at unifying mobile and
desktop mixins in one place as preparation.

Change-Id: I3a4725e2f4d84e110371d003ee26afbcc11ab994
---
M resources/src/mediawiki.less/mediawiki.mixins.less
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/49/325149/1

diff --git a/resources/src/mediawiki.less/mediawiki.mixins.less 
b/resources/src/mediawiki.less/mediawiki.mixins.less
index 3535be8..69181cb 100644
--- a/resources/src/mediawiki.less/mediawiki.mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.mixins.less
@@ -53,6 +53,7 @@
 }
 
 .transition( @value ) {
+   -webkit-backface-visibility: hidden; // fixes Chrome 1px movement bug
-webkit-transition: @value; // Safari 3.1-6.0, iOS 3.2-6.1, Android 
2.1-4.3
-moz-transition: @value; // Firefox 4-15
transition: @value; // Chrome 26+, Firefox 16+, IE 10+, Safari 6.1+, 
Opera 12.1+, iOS 7+, Android 4.4+

-- 
To view, visit https://gerrit.wikimedia.org/r/325149
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a4725e2f4d84e110371d003ee26afbcc11ab994
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Use Special::MyLanguage when linking to wikis

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325148

Change subject: Use Special::MyLanguage when linking to wikis
..

Use Special::MyLanguage when linking to wikis

Bug: T85533
Change-Id: I3fd16697c1131362b6a9064d8e6b1e4e4da6b5fb
---
M data/i18n/en.json
1 file changed, 9 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships 
refs/changes/48/325148/1

diff --git a/data/i18n/en.json b/data/i18n/en.json
index 603a8d8..52a0fbc 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -27,16 +27,16 @@
 
"mock": "This is a mock scholarship application site only, use it just 
for testing.",
 
-   "not-open": "The 2017 Wikimania Scholarship process is not yet open. 
For more information, see:\n\nhttps://wikimania2017.wikimedia.org/wiki/Main_Page\;>About 
Wikimania\nhttps://wikimania2017.wikimedia.org/wiki/Scholarships\;>About 
Scholarships\n",
+   "not-open": "The 2017 Wikimania Scholarship process is not yet open. 
For more information, see:\n\nhttps://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Main_Page\;>About
 Wikimania\nhttps://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarships\;>About
 Scholarships\n",
 
-   "deadline-passed": "Scholarship application deadline was February 
16, 23:59 UTC.\nWe will notify applicants in April 2017 about the result 
of their application.\nPlease see the scholarships 
page on the wiki for more details.",
+   "deadline-passed": "Scholarship application deadline was February 
16, 23:59 UTC.\nWe will notify applicants in April 2017 about the result 
of their application.\nPlease see the scholarships
 page on the wiki for more details.",
 
-   "form-intro": "This is the application for sponsorship to attend https://wikimania2017.wikimedia.org\;>Wikimania 2017, the annual 
international conference centered on Wikimedia projects. Awardees will receive 
a scholarship which will cover conference registration fees, hotel, and 
roundtrip travel to Wikimania in Montréal, Quebec, Canada , Aug 9-13, 
2017.\nApplications may be submitted in any language, but every 
applicant must provide evidence of English language abilities that are 
at a level which would enable them to participate in Wikimania, a conference 
which is primarily conducted in English. Sufficient English abilities could be 
demonstrated in the application itself or elsewhere.\nThis is not a 
scholarship for university study. Applications not obviously related to the 
conference will be discarded.\nPlease carefully consider your financial 
needs before applying for a scholarship to attend Wikimania. There are limited 
funds available and many applicants do not have the financial means to attend 
Wikimania without this opportunity. Thank you.\nPlease note that 
if you need more then 10 minutes to complete this application, please 
draft your answers in a text editor, reload this page and then 
copy-paste your answers into corresponding fields before submitting. This 
application may give an error (\"Missing or invalid CSRF token\") if it is open 
for more then 15 minutes before submitting.\nThe deadline to apply is 
February 16, 23:59 UTC. ",
+   "form-intro": "This is the application for sponsorship to attend https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Main_Page\;>Wikimania
 2017, the annual international conference centered on Wikimedia projects. 
Awardees will receive a scholarship which will cover conference registration 
fees, hotel, and roundtrip travel to Wikimania in Montréal, Quebec, Canada , 
Aug 9-13, 2017.\nApplications may be submitted in any language, 
but every applicant must provide evidence of English language abilities 
that are at a level which would enable them to participate in Wikimania, a 
conference which is primarily conducted in English. Sufficient English 
abilities could be demonstrated in the application itself or 
elsewhere.\nThis is not a scholarship for university study. Applications 
not obviously related to the conference will be discarded.\nPlease 
carefully consider your financial needs before applying for a scholarship to 
attend Wikimania. There are limited funds available and many applicants do not 
have the financial means to attend Wikimania without this opportunity. Thank 
you.\nPlease note that if you need more then 10 minutes to 
complete this application, please draft your answers in a text editor, 
reload this page and then copy-paste your answers into corresponding fields 
before submitting. This application may give an error (\"Missing or invalid 
CSRF token\") if it is open for more then 15 minutes before 
submitting.\nThe deadline to apply is February 16, 23:59 
UTC. ",
 
-   "form-intro-faq": "Frequently asked questions",
+   "form-intro-faq": "Frequently asked questions",
 
"form-scholarship-type": "Type of Scholarship",
-   

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Link to 2017 wiki for FAQ

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Link to 2017 wiki for FAQ
..


Link to 2017 wiki for FAQ

Point to wikimania2017.wikimedia.org and use Special:MyLanguage

Change-Id: I9fd3d71b4ba2960d08d566324c2483da3ce0ff16
---
M data/templates/base.html
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/data/templates/base.html b/data/templates/base.html
index 4825585..a738776 100644
--- a/data/templates/base.html
+++ b/data/templates/base.html
@@ -31,7 +31,7 @@
   
 {% block navbar %}
 {{ 'nav-apply'|message }}
-{{ 'nav-faq'|message 
}}
+{{
 'nav-faq'|message }}
 {{ 'nav-credits'|message }}
 {{ 'nav-privacy'|message }}
 {{ 'nav-contact'|message }}

-- 
To view, visit https://gerrit.wikimedia.org/r/325147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9fd3d71b4ba2960d08d566324c2483da3ce0ff16
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Link to 2017 wiki for FAQ

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325147

Change subject: Link to 2017 wiki for FAQ
..

Link to 2017 wiki for FAQ

Point to wikimania2017.wikimedia.org and use Special::MyLanguage

Change-Id: I9fd3d71b4ba2960d08d566324c2483da3ce0ff16
---
M data/templates/base.html
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships 
refs/changes/47/325147/1

diff --git a/data/templates/base.html b/data/templates/base.html
index 4825585..a738776 100644
--- a/data/templates/base.html
+++ b/data/templates/base.html
@@ -31,7 +31,7 @@
   
 {% block navbar %}
 {{ 'nav-apply'|message }}
-{{ 'nav-faq'|message 
}}
+{{
 'nav-faq'|message }}
 {{ 'nav-credits'|message }}
 {{ 'nav-privacy'|message }}
 {{ 'nav-contact'|message }}

-- 
To view, visit https://gerrit.wikimedia.org/r/325147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fd3d71b4ba2960d08d566324c2483da3ce0ff16
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
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] operations/puppet[production]: Quote "owner" and "group" attributes for file and git::clone...

[Tim Landscheidt (Code Review)]

Tim Landscheidt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325146

Change subject: Quote "owner" and "group" attributes for file and git::clone 
resources
..

Quote "owner" and "group" attributes for file and git::clone resources

Change-Id: Ic4ba4ae1ea2103b5172f87be8784d6239a1fd803
---
M modules/bacula/manifests/director.pp
M modules/bacula/manifests/director/catalog.pp
M modules/bacula/manifests/director/fileset.pp
M modules/bacula/manifests/director/pool.pp
M modules/bacula/manifests/director/schedule.pp
M modules/base/manifests/service_unit.pp
M modules/confd/manifests/init.pp
M modules/conftool/manifests/init.pp
M modules/conftool/manifests/master.pp
M modules/drac/manifests/init.pp
M modules/elasticsearch/manifests/ganglia.pp
M modules/etcd/manifests/client/globalconfig.pp
M modules/java/manifests/tools.pp
M modules/labstore/manifests/nfs_mount.pp
M modules/lshell/manifests/init.pp
M modules/lvs/manifests/balancer/runcommand.pp
M modules/miredo/manifests/init.pp
M modules/mongodb/manifests/init.pp
M modules/ntp/manifests/daemon.pp
M modules/openstack/manifests/ceilometer/compute.pp
M modules/openstack/manifests/ceilometer/controller.pp
M modules/openstack/manifests/designate/service.pp
M modules/openstack/manifests/glance/service.pp
M modules/openstack/manifests/keystone/service.pp
M modules/phabricator/manifests/mailrelay.pp
M modules/pivot/manifests/init.pp
M modules/role/manifests/cache/base.pp
M modules/role/manifests/zuul/server.pp
M modules/snapshot/manifests/cron/dumplists.pp
M modules/snapshot/manifests/cron/mediaperprojectlists.pp
M modules/snapshot/manifests/dumps/cron.pp
M modules/systemd/manifests/sidekick.pp
M modules/tlsproxy/manifests/instance.pp
M modules/yubiauth/manifests/yhsm_daemon.pp
M modules/yubiauth/manifests/yhsm_yubikey_ksm.pp
35 files changed, 100 insertions(+), 100 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/325146/1

diff --git a/modules/bacula/manifests/director.pp 
b/modules/bacula/manifests/director.pp
index dfbbe76..b30c3b6 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -65,8 +65,8 @@
 
 file { '/etc/bacula/bacula-dir.conf':
 ensure  => present,
-owner   => root,
-group   => bacula,
+owner   => 'root',
+group   => 'bacula',
 mode=> '0440',
 notify  => Service['bacula-director'],
 content => template('bacula/bacula-dir.conf.erb'),
@@ -80,8 +80,8 @@
 force   => true,
 purge   => true,
 mode=> '0444',
-owner   => root,
-group   => bacula,
+owner   => 'root',
+group   => 'bacula',
 require => Package["bacula-director-${sqlvariant}"],
 }
 
@@ -92,8 +92,8 @@
 force   => true,
 purge   => true,
 mode=> '0444',
-owner   => root,
-group   => bacula,
+owner   => 'root',
+group   => 'bacula',
 require => Package["bacula-director-${sqlvariant}"],
 }
 
@@ -103,8 +103,8 @@
 force   => true,
 purge   => true,
 mode=> '0444',
-owner   => root,
-group   => bacula,
+owner   => 'root',
+group   => 'bacula',
 require => Package["bacula-director-${sqlvariant}"],
 }
 
@@ -112,8 +112,8 @@
 file { '/etc/bacula/jobs.d/restore-migrate-jobs.conf':
 ensure  => file,
 mode=> '0444',
-owner   => root,
-group   => bacula,
+owner   => 'root',
+group   => 'bacula',
 require => File['/etc/bacula/jobs.d'],
 content => template('bacula/restore-migrate-jobs.conf.erb'),
 }
@@ -125,8 +125,8 @@
 force   => true,
 purge   => true,
 mode=> '0444',
-owner   => root,
-group   => bacula,
+owner   => 'root',
+group   => 'bacula',
 require => Package["bacula-director-${sqlvariant}"],
 }
 
@@ -134,8 +134,8 @@
 @@file { '/etc/bacula/bconsole.conf':
 ensure  => present,
 mode=> '0440',
-owner   => root,
-group   => bacula,
+owner   => 'root',
+group   => 'bacula',
 content => template('bacula/bconsole.conf.erb'),
 tag => "bacula-console-${::fqdn}",
 }
diff --git a/modules/bacula/manifests/director/catalog.pp 
b/modules/bacula/manifests/director/catalog.pp
index ce7724b..099ff6d 100644
--- a/modules/bacula/manifests/director/catalog.pp
+++ b/modules/bacula/manifests/director/catalog.pp
@@ -24,8 +24,8 @@
 define bacula::director::catalog($dbname, $dbuser, $dbhost, $dbport, 
$dbpassword) {
 file { "/etc/bacula/conf.d/catalog-${name}.conf":
 ensure  => present,
-owner   => root,
-group   => bacula,
+owner   => 'root',
+group   => 'bacula',
 mode=> '0440',
 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: Add dependencies needed for PoolCounter tests

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325145

Change subject: contint: Add dependencies needed for PoolCounter tests
..

contint: Add dependencies needed for PoolCounter tests

Bug: T152338
Change-Id: I359b3172b002de285b156bf4e50883d622c58767
---
M modules/contint/manifests/packages/ruby.pp
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/45/325145/1

diff --git a/modules/contint/manifests/packages/ruby.pp 
b/modules/contint/manifests/packages/ruby.pp
index e0e0dd0..42fd46a 100644
--- a/modules/contint/manifests/packages/ruby.pp
+++ b/modules/contint/manifests/packages/ruby.pp
@@ -46,6 +46,9 @@
 'ruby2.1',
 'ruby2.1-dev',
 'bundler',
+# Used by PoolCounter tests (T152338)
+'ruby-rspec',
+'cucumber',
 ]: ensure => present,
 }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/325145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I359b3172b002de285b156bf4e50883d622c58767
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add $magicWords translation for Bengali (bn)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add $magicWords translation for Bengali (bn)
..


Add $magicWords translation for Bengali (bn)

Bug: T151134
Change-Id: I81ce473668e3712ea575dc38f5eb76abb45498ac
---
M languages/messages/MessagesBn.php
1 file changed, 136 insertions(+), 0 deletions(-)

Approvals:
  Raimond Spekking: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/languages/messages/MessagesBn.php 
b/languages/messages/MessagesBn.php
index 6a719e5..7dde2b7 100644
--- a/languages/messages/MessagesBn.php
+++ b/languages/messages/MessagesBn.php
@@ -172,4 +172,140 @@
'Withoutinterwiki'  => [ 'আন্তঃউইকিহীন' ],
 ];
 
+$magicWords = [
+   'redirect'=> [ 0, '#পুনর্নির্দেশ', '#পুনঃর্নির্দেশ', 
'#পুনঃনির্দেশ', '#পুননির্দেশ', '#REDIRECT' ],
+   'notoc'   => [ 0, '__কোন_বিষয়বস্তুর_ছক_নয়__', 
'__কোনবিষয়বস্তুরছকনয়__', '__কোন_বিষয়বস্তুর_টেবিল_নয়__', 
'__কোনবিষয়বস্তুরটেবিলনয়__', '__NOTOC__' ],
+   'nogallery'   => [ 0, '__কোনগ্যালারিনয়__', 
'__কোনগ্যালারীনয়__', '__কোন_গ্যালারি_নয়__', '__কোন_গ্যালারী_নয়__', 
'__NOGALLERY__' ],
+   'toc' => [ 0, '__বিষয়বস্তুর_ছক__', 
'__বিষয়বস্তুরছক__', '__বিষয়বস্তুর_টেবিল__', '__বিষয়বস্তুরটেবিল__', '__TOC__' ],
+   'noeditsection'   => [ 0, '__কোনসম্পাদনাঅনুচ্ছেদনয়__', 
'__কোন_সম্পাদনা_অনুচ্ছেদ_নয়__', '__NOEDITSECTION__' ],
+   'currentmonth'=> [ 1, 'চলতি_মাস', 'চলতিমাস', 'বর্তমান_মাস', 
'বর্তমানমাস', 'বর্তমান_মাস_২', 'বর্তমানমাস২', 'CURRENTMONTH', 'CURRENTMONTH2' ],
+   'currentmonth1'   => [ 1, 'চলতি_মাস_১', 'চলতিমাস১', 
'বর্তমান_মাস_১', 'বর্তমানমাস১', 'CURRENTMONTH1' ],
+   'currentmonthname'=> [ 1, 'বর্তমান_মাসের_নাম', 
'বর্তমানমাসেরনাম', 'CURRENTMONTHNAME' ],
+   'currentmonthnamegen' => [ 1, 'বর্তমান_মাসের_নাম_উৎপন্ন', 
'বর্তমানমাসেরনামউৎপন্ন', 'CURRENTMONTHNAMEGEN' ],
+   'currentmonthabbrev'  => [ 1, 'বর্তমান_মাস_সংক্ষেপ', 
'বর্তমানমাসসংক্ষেপ', 'বর্তমান_মাস_সংক্ষিপ্ত', 'বর্তমানমাসসংক্ষিপ্ত', 
'CURRENTMONTHABBREV' ],
+   'currentday'  => [ 1, 'বর্তমান_দিন', 'বর্তমানদিন', 
'আজকের_দিন', 'আজকেরদিন', 'CURRENTDAY' ],
+   'currentday2' => [ 1, 'বর্তমান_দিন_২', 'বর্তমানদিন২', 
'আজকের_দিন_২', 'আজকেরদিন২', 'CURRENTDAY2' ],
+   'currentdayname'  => [ 1, 'বর্তমান_দিনের_নাম', 
'বর্তমানদিনেরনাম', 'আজকের_দিনের_নাম', 'আজকেরদিনেরনাম', 'CURRENTDAYNAME' ],
+   'currentyear' => [ 1, 'চলতি_বছর', 'চলতিবছর', 'বর্তমান_বছর', 
'বর্তমানবছর', 'CURRENTYEAR' ],
+   'currenttime' => [ 1, 'বর্তমান_সময়', 'বর্তমানসময়', 
'এখনকার_সময়', 'এখনকারসময়', 'এখন_সময়', 'CURRENTTIME' ],
+   'currenthour' => [ 1, 'বর্তমান_ঘণ্টা', 'বর্তমানঘণ্টা', 
'বর্তমান_ঘন্টা', 'বর্তমানঘন্টা', 'এখনকার_ঘণ্টা', 'এখনকারঘণ্টা', 'CURRENTHOUR' ],
+   'localmonth'  => [ 1, 'স্থানীয়_মাস', 'স্থানীয়মাস', 
'স্থানীয়_মাস_২', 'স্থানীয়মাস২', 'LOCALMONTH', 'LOCALMONTH2' ],
+   'localmonth1' => [ 1, 'স্থানীয়_মাস_১', 'স্থানীয়মাস১', 
'LOCALMONTH1' ],
+   'localmonthname'  => [ 1, 'স্থানীয়_মাসের_নাম', 
'স্থানীয়মাসেরনাম', 'LOCALMONTHNAME' ],
+   'localmonthnamegen'   => [ 1, 'স্থানীয়_মাসের_নাম_উৎপন্ন', 
'স্থানীয়মাসেরনামউৎপন্ন', 'LOCALMONTHNAMEGEN' ],
+   'localmonthabbrev'=> [ 1, 'স্থানীয়_মাস_সংক্ষেপ', 
'স্থানীয়মাসসংক্ষেপ', 'স্থানীয়_মাস_সংক্ষিপ্ত', 'স্থানীয়মাসসংক্ষিপ্ত', 
'সংক্ষেপিত_স্থানীয়_মাস', 'সংক্ষেপিতস্থানীয়মাস', 'LOCALMONTHABBREV' ],
+   'localday'=> [ 1, 'স্থানীয়_দিন', 'স্থানীয়দিন', 
'স্থানীয়_বার', 'স্থানীয়বার', 'LOCALDAY' ],
+   'localday2'   => [ 1, 'স্থানীয়_দিন_২', 'স্থানীয়দিন২', 
'LOCALDAY2' ],
+   'localdayname'=> [ 1, 'স্থানীয়_দিনের_নাম', 
'স্থানীয়দিনেরনাম', 'LOCALDAYNAME' ],
+   'localyear'   => [ 1, 'স্থানীয়_বছর', 'স্থানীয়বছর', 
'LOCALYEAR' ],
+   'localtime'   => [ 1, 'স্থানীয়_সময়', 'স্থানীয়সময়', 
'LOCALTIME' ],
+   'localhour'   => [ 1, 'স্থানীয়_ঘণ্টা', 'স্থানীয়ঘণ্টা', 
'স্থানীয়_ঘন্টা', 'স্থানীয়ঘন্টা', 'LOCALHOUR' ],
+   'numberofpages'   => [ 1, 'পাতার_সংখ্যা', 'পাতারসংখ্যা', 
'পৃষ্ঠার_সংখ্যা', 'পৃষ্ঠারসংখ্যা', 'পৃষ্ঠা_সংখ্যা', 'পৃষ্ঠাসংখ্যা', 
'NUMBEROFPAGES' ],
+   'numberofarticles'=> [ 1, 'নিবন্ধের_সংখ্যা', 'নিবন্ধেরসংখ্যা', 
'নিবন্ধ_সংখ্যা', 'নিবন্ধসংখ্যা', 'NUMBEROFARTICLES' ],
+   'numberoffiles'   => [ 1, 'ফাইলের_সংখ্যা', 'ফাইলেরসংখ্যা', 
'ফাইল_সংখ্যা', 'ফাইলসংখ্যা', 'NUMBEROFFILES' ],
+   'numberofusers'   => [ 1, 'ব্যবহারকারীর_সংখ্যা', 
'ব্যবহারকারীরসংখ্যা', 'ব্যবহারকারী_সংখ্যা', 'ব্যবহারকারীসংখ্যা', 
'NUMBEROFUSERS' ],
+   'numberofactiveusers' => [ 1, 'সক্রিয়_ব্যবহারকারীর_সংখ্যা', 
'সক্রিয়ব্যবহারকারীরসংখ্যা', 'সক্রিয়_ব্যবহারকারী_সংখ্যা', 
'সক্রিয়ব্যবহারকারীসংখ্যা', 'NUMBEROFACTIVEUSERS' ],
+   'numberofedits'   => [ 1, 

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: template.py: fix failed substitution in tag

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: template.py: fix failed substitution in  tag
..


template.py: fix failed substitution in  tag

Bug: T151931
Change-Id: If8daaecb3ce343a0369c6f0ed60432126ed9abe0
---
M scripts/template.py
1 file changed, 5 insertions(+), 3 deletions(-)

Approvals:
  Dalba: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/scripts/template.py b/scripts/template.py
index c4bbc6c..66f3e95 100755
--- a/scripts/template.py
+++ b/scripts/template.py
@@ -17,7 +17,9 @@
 
 -subst   Resolves the template by putting its text directly into the
  article. This is done by changing {{...}} or {{msg:...}} into
- {{subst:...}}
+ {{subst:...}}.
+ Substitution is not available inside ...,
+ ... and ... tags.
 
 -assubst Replaces the first argument as old template with the second
  argument as new template but substitutes it like -subst does.
@@ -221,11 +223,11 @@
 if self.getOption('subst') and self.getOption('remove'):
 replacements.append((templateRegex,
  r'{{subst:%s\g}}' % new))
-exceptions['inside-tags'] = ['ref', 'gallery']
+exceptions['inside-tags'] = ['ref', 'gallery', 'poem']
 elif self.getOption('subst'):
 replacements.append((templateRegex,
  r'{{subst:%s\g}}' % old))
-exceptions['inside-tags'] = ['ref', 'gallery']
+exceptions['inside-tags'] = ['ref', 'gallery', 'poem']
 elif self.getOption('remove'):
 replacements.append((templateRegex, ''))
 else:

-- 
To view, visit https://gerrit.wikimedia.org/r/324267
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If8daaecb3ce343a0369c6f0ed60432126ed9abe0
Gerrit-PatchSet: 6
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa 
Gerrit-Reviewer: Dalba 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Mpaa 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/config[master]: Make mwext-PoolCounter-build-jessie more like the Debian pac...

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325144

Change subject: Make mwext-PoolCounter-build-jessie more like the Debian package
..

Make mwext-PoolCounter-build-jessie more like the Debian package

Basically syncs up with e2aae3e5cbec and 2c11cfb55.

Change-Id: I6c2504264eea9f09351fc7351f16991200178aec
---
M jjb/mediawiki-extensions.yaml
1 file changed, 1 insertion(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/44/325144/1

diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 2cbeaad..51a4b21 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -395,16 +395,7 @@
  - castor-load
  - shell: |
 cd daemon
-make
- - shell: |
- # Install to BUNDLE_PATH, injected by Zuul
- bundle install --clean
- cd daemon
-
- # AUTOTEST is recognized by cucumber ANSI formatter to force color
- # output on non TTY.
- export AUTOTEST=1
- bundle exec make test
+make test
 publishers:
  - archive:
  artifacts: daemon/poolcounterd

-- 
To view, visit https://gerrit.wikimedia.org/r/325144
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c2504264eea9f09351fc7351f16991200178aec
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Graph[master]: Updated shared graph lib - tabular support

[Yurik (Code Review)]

Yurik has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325143

Change subject: Updated shared graph lib - tabular support
..

Updated shared graph lib - tabular support

Change-Id: I5aaee38092fb277fc2409e07f51c1c3a808d333a
---
M lib/graph2.compiled.js
1 file changed, 9 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Graph 
refs/changes/43/325143/1

diff --git a/lib/graph2.compiled.js b/lib/graph2.compiled.js
index bd95538..d1bb42e 100644
--- a/lib/graph2.compiled.js
+++ b/lib/graph2.compiled.js
@@ -495,7 +495,6 @@
  * Performs post-processing of the data requested by the graph's spec, and 
throw on error
  */
 VegaWrapper.prototype.parseDataOrThrow = function parseDataOrThrow(data, opt) {
-var result;
 switch (opt.graphProtocol) {
 case 'wikiapi:':
 data = this.parseMWApiResponse(data);
@@ -510,30 +509,14 @@
 break;
 case 'tabular:':
 data = this.parseMWApiResponse(data).jsondata;
-result = [];
-data.rows.forEach(function(v) {
-var row = {};
-for (var i = 0; i < data.headers.length; i++) {
-row[data.headers[i]] = v[i];
+var fields = data.schema.fields.map(function(v) { return v.name; 
});
+data.data = data.data.map(function(v) {
+var row = {}, i;
+for (i = 0; i < fields.length; i++) {
+row[fields[i]] = v[i];
 }
-result.push(row);
+return row;
 });
-data = result;
-break;
-case 'tabularinfo:':
-data = this.parseMWApiResponse(data).jsondata;
-result = {
-license: data.license,
-info: data.info,
-types: {},
-titles: {},
-count: data.rows ? data.rows.length : 0
-};
-for (var i = 0; i < data.headers.length; i++) {
-result.types[data.headers[i]] = data.types[i];
-result.titles[data.headers[i]] = data.titles[i];
-}
-data = result;
 break;
 case 'wikidatasparql:':
 data = JSON.parse(data);
@@ -568,10 +551,10 @@
'use strict';
/* global require */
 
-   var wrapper,
-   VegaWrapper = require( 'graph-shared' );
+   var VegaWrapper = require( 'graph-shared' );
 
-   wrapper = new VegaWrapper( {
+   // eslint-disable-next-line no-new
+   new VegaWrapper( {
datalib: vg.util,
useXhr: true,
isTrusted: mw.config.get( 'wgGraphIsTrusted' ),

-- 
To view, visit https://gerrit.wikimedia.org/r/325143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5aaee38092fb277fc2409e07f51c1c3a808d333a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: Yurik 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...PoolCounter[master]: Use Timeout.timeout instead of deprecated Object#timeout

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325142

Change subject: Use Timeout.timeout instead of deprecated Object#timeout
..

Use Timeout.timeout instead of deprecated Object#timeout

This stops the deprecation warnings from appearing when running `make
test` on Debian unstable/stretch.

Tested on Debian unstable and jessie.

Bug: T152231
Change-Id: I9d8def7f6b3972421fe339b4095c100acdb04632
---
M daemon/tests/features/support/client.rb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PoolCounter 
refs/changes/42/325142/1

diff --git a/daemon/tests/features/support/client.rb 
b/daemon/tests/features/support/client.rb
index 23ae144..76a944d 100644
--- a/daemon/tests/features/support/client.rb
+++ b/daemon/tests/features/support/client.rb
@@ -17,7 +17,7 @@
 
   def receive
 raise 'Not connected' unless @socket
-timeout(5) do
+Timeout.timeout(5) do
   @socket.gets.chop
 end
   end

-- 
To view, visit https://gerrit.wikimedia.org/r/325142
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d8def7f6b3972421fe339b4095c100acdb04632
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PoolCounter
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlogPage[master]: Replace ArticleSaveComplete hook usage

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Replace ArticleSaveComplete hook usage
..


Replace ArticleSaveComplete hook usage

Bug: T147390
Change-Id: I8536dd78d03772f40ffb4815354ef59a204db086
---
M BlogPageHooks.php
M extension.json
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Jack Phoenix: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/BlogPageHooks.php b/BlogPageHooks.php
index 73228de..559e0ce 100644
--- a/BlogPageHooks.php
+++ b/BlogPageHooks.php
@@ -80,8 +80,8 @@
 * This function here updates the stats_opinions_created column in the
 * user_stats table every time the user creates a new blog post.
 *
-* This is hooked into two separate hooks (todo: find out why), 
ArticleSave
-* and ArticleSaveComplete. Their arguments are mostly the same and both
+* This is hooked into two separate hooks (todo: find out why), 
PageContentSave
+* and PageContentSaveComplete. Their arguments are mostly the same and 
both
 * have $article as the first argument.
 *
 * @param Article $article Article object representing the page that 
was/is
diff --git a/extension.json b/extension.json
index 9163ca9..48dfcde 100644
--- a/extension.json
+++ b/extension.json
@@ -73,10 +73,10 @@
"ArticleFromTitle": [
"BlogPageHooks::blogFromTitle"
],
-   "ArticleSaveComplete": [
+   "PageContentSaveComplete": [
"BlogPageHooks::updateCreatedOpinionsCount"
],
-   "ArticleSave": [
+   "PageContentSave": [
"BlogPageHooks::updateCreatedOpinionsCount"
],
"AlternateEdit": [

-- 
To view, visit https://gerrit.wikimedia.org/r/315124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8536dd78d03772f40ffb4815354ef59a204db086
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Lewis Cawte 
Gerrit-Reviewer: UltrasonicNXT 
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...SocialProfile[master]: Call echo related hooks

[Lewis Cawte (Code Review)]

Lewis Cawte has submitted this change and it was merged.

Change subject: Call echo related hooks
..


Call echo related hooks

Change-Id: Ib7c49642e164a96fdfd9a502afaded65a5ca1dc5
Follow-up: 278868
---
M SocialProfile.php
1 file changed, 29 insertions(+), 0 deletions(-)

Approvals:
  Lewis Cawte: Verified; Looks good to me, approved



diff --git a/SocialProfile.php b/SocialProfile.php
index f4b722a..605f46c 100644
--- a/SocialProfile.php
+++ b/SocialProfile.php
@@ -37,6 +37,9 @@
 
 // Classes to be autoloaded
 $wgAutoloadClasses['GenerateTopUsersReport'] = __DIR__ . 
'/UserStats/GenerateTopUsersReport.php';
+$wgAutoloadClasses['EchoUserBoardMessagePresentationModel'] = __DIR__ . 
'/UserBoard/EchoUserBoardMessagePresentationModel.php';
+$wgAutoloadClasses['EchoUserRelationshipPresentationModel'] = __DIR__ . 
'/UserRelationship/EchoUserRelationshipPresentationModel.php';
+$wgAutoloadClasses['EchoUserLevelAdvancePresentationModel'] = __DIR__ . 
'/UserStats/EchoUserLevelAdvancePresentationModel.php';
 $wgAutoloadClasses['SpecialAddRelationship'] = __DIR__ . 
'/UserRelationship/SpecialAddRelationship.php';
 $wgAutoloadClasses['SpecialBoardBlast'] = __DIR__ . 
'/UserBoard/SpecialSendBoardBlast.php';
 $wgAutoloadClasses['SpecialEditProfile'] = __DIR__ . 
'/UserProfile/SpecialEditProfile.php';
@@ -52,9 +55,12 @@
 $wgAutoloadClasses['RemoveAvatar'] = __DIR__ . 
'/UserProfile/SpecialRemoveAvatar.php';
 $wgAutoloadClasses['UpdateEditCounts'] = __DIR__ . 
'/UserStats/SpecialUpdateEditCounts.php';
 $wgAutoloadClasses['UserBoard'] = __DIR__ . '/UserBoard/UserBoardClass.php';
+$wgAutoloadClasses['UserBoardHooks'] = __DIR__ . 
'/UserBoard/UserBoardHooks.php';
 $wgAutoloadClasses['UserProfile'] = __DIR__ . 
'/UserProfile/UserProfileClass.php';
 $wgAutoloadClasses['UserProfilePage'] = __DIR__ . 
'/UserProfile/UserProfilePage.php';
 $wgAutoloadClasses['UserRelationship'] = __DIR__ . 
'/UserRelationship/UserRelationshipClass.php';
+$wgAutoloadClasses['UserRelationshipHooks'] = __DIR__ . 
'/UserRelationship/UserRelationshipHooks.php';
+$wgAutoloadClasses['UserStatsHooks'] = __DIR__ . 
'/UserStats/UserStatsHooks.php';
 $wgAutoloadClasses['UserLevel'] = __DIR__ . '/UserStats/UserStatsClass.php';
 $wgAutoloadClasses['UserStats'] = __DIR__ . '/UserStats/UserStatsClass.php';
 $wgAutoloadClasses['UserStatsTrack'] = __DIR__ . 
'/UserStats/UserStatsClass.php';
@@ -80,6 +86,29 @@
 $wgAutoloadClasses['ApiRelationshipResponse'] = __DIR__ . 
'/UserRelationship/ApiRelationshipResponse.php';
 $wgAPIModules['socialprofile-request-response'] = 'ApiRelationshipResponse';
 
+// Echo (Notifications) stuff
+// UserBoard
+$wgHooks['BeforeCreateEchoEvent'][] = 
'UserBoardHooks::onBeforeCreateEchoEvent';
+$wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'UserBoardHooks::onEchoGetDefaultNotifiedUsers';
+$wgHooks['EchoGetBundleRules'][] = 'UserBoardHooks::onEchoGetBundleRules';
+
+$wgDefaultUserOptions['echo-subscriptions-web-social-msg'] = true;
+$wgDefaultUserOptions['echo-subscriptions-email-social-msg'] = false;
+
+// UserRelationship
+$wgHooks['BeforeCreateEchoEvent'][] = 
'UserRelationshipHooks::onBeforeCreateEchoEvent';
+$wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'UserRelationshipHooks::onEchoGetDefaultNotifiedUsers';
+
+$wgDefaultUserOptions['echo-subscriptions-web-social-rel'] = true;
+$wgDefaultUserOptions['echo-subscriptions-email-social-rel'] = false;
+
+// UserStats
+$wgHooks['BeforeCreateEchoEvent'][] = 
'UserStatsHooks::onBeforeCreateEchoEvent';
+$wgHooks['EchoGetBundleRules'][] = 'UserStatsHooks::onEchoGetBundleRules';
+
+$wgDefaultUserOptions['echo-subscriptions-web-social-level-up'] = true;
+$wgDefaultUserOptions['echo-subscriptions-email-social-level-up'] = false;
+
 // New special pages
 $wgSpecialPages['AddRelationship'] = 'SpecialAddRelationship';
 $wgSpecialPages['EditProfile'] = 'SpecialEditProfile';

-- 
To view, visit https://gerrit.wikimedia.org/r/325141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7c49642e164a96fdfd9a502afaded65a5ca1dc5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Lewis Cawte 
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...SocialProfile[master]: Call echo related hooks

[Lewis Cawte (Code Review)]

Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325141

Change subject: Call echo related hooks
..

Call echo related hooks

Change-Id: Ib7c49642e164a96fdfd9a502afaded65a5ca1dc5
Follow-up: 278868
---
M SocialProfile.php
1 file changed, 29 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile 
refs/changes/41/325141/1

diff --git a/SocialProfile.php b/SocialProfile.php
index f4b722a..605f46c 100644
--- a/SocialProfile.php
+++ b/SocialProfile.php
@@ -37,6 +37,9 @@
 
 // Classes to be autoloaded
 $wgAutoloadClasses['GenerateTopUsersReport'] = __DIR__ . 
'/UserStats/GenerateTopUsersReport.php';
+$wgAutoloadClasses['EchoUserBoardMessagePresentationModel'] = __DIR__ . 
'/UserBoard/EchoUserBoardMessagePresentationModel.php';
+$wgAutoloadClasses['EchoUserRelationshipPresentationModel'] = __DIR__ . 
'/UserRelationship/EchoUserRelationshipPresentationModel.php';
+$wgAutoloadClasses['EchoUserLevelAdvancePresentationModel'] = __DIR__ . 
'/UserStats/EchoUserLevelAdvancePresentationModel.php';
 $wgAutoloadClasses['SpecialAddRelationship'] = __DIR__ . 
'/UserRelationship/SpecialAddRelationship.php';
 $wgAutoloadClasses['SpecialBoardBlast'] = __DIR__ . 
'/UserBoard/SpecialSendBoardBlast.php';
 $wgAutoloadClasses['SpecialEditProfile'] = __DIR__ . 
'/UserProfile/SpecialEditProfile.php';
@@ -52,9 +55,12 @@
 $wgAutoloadClasses['RemoveAvatar'] = __DIR__ . 
'/UserProfile/SpecialRemoveAvatar.php';
 $wgAutoloadClasses['UpdateEditCounts'] = __DIR__ . 
'/UserStats/SpecialUpdateEditCounts.php';
 $wgAutoloadClasses['UserBoard'] = __DIR__ . '/UserBoard/UserBoardClass.php';
+$wgAutoloadClasses['UserBoardHooks'] = __DIR__ . 
'/UserBoard/UserBoardHooks.php';
 $wgAutoloadClasses['UserProfile'] = __DIR__ . 
'/UserProfile/UserProfileClass.php';
 $wgAutoloadClasses['UserProfilePage'] = __DIR__ . 
'/UserProfile/UserProfilePage.php';
 $wgAutoloadClasses['UserRelationship'] = __DIR__ . 
'/UserRelationship/UserRelationshipClass.php';
+$wgAutoloadClasses['UserRelationshipHooks'] = __DIR__ . 
'/UserRelationship/UserRelationshipHooks.php';
+$wgAutoloadClasses['UserStatsHooks'] = __DIR__ . 
'/UserStats/UserStatsHooks.php';
 $wgAutoloadClasses['UserLevel'] = __DIR__ . '/UserStats/UserStatsClass.php';
 $wgAutoloadClasses['UserStats'] = __DIR__ . '/UserStats/UserStatsClass.php';
 $wgAutoloadClasses['UserStatsTrack'] = __DIR__ . 
'/UserStats/UserStatsClass.php';
@@ -80,6 +86,29 @@
 $wgAutoloadClasses['ApiRelationshipResponse'] = __DIR__ . 
'/UserRelationship/ApiRelationshipResponse.php';
 $wgAPIModules['socialprofile-request-response'] = 'ApiRelationshipResponse';
 
+// Echo (Notifications) stuff
+// UserBoard
+$wgHooks['BeforeCreateEchoEvent'][] = 
'UserBoardHooks::onBeforeCreateEchoEvent';
+$wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'UserBoardHooks::onEchoGetDefaultNotifiedUsers';
+$wgHooks['EchoGetBundleRules'][] = 'UserBoardHooks::onEchoGetBundleRules';
+
+$wgDefaultUserOptions['echo-subscriptions-web-social-msg'] = true;
+$wgDefaultUserOptions['echo-subscriptions-email-social-msg'] = false;
+
+// UserRelationship
+$wgHooks['BeforeCreateEchoEvent'][] = 
'UserRelationshipHooks::onBeforeCreateEchoEvent';
+$wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'UserRelationshipHooks::onEchoGetDefaultNotifiedUsers';
+
+$wgDefaultUserOptions['echo-subscriptions-web-social-rel'] = true;
+$wgDefaultUserOptions['echo-subscriptions-email-social-rel'] = false;
+
+// UserStats
+$wgHooks['BeforeCreateEchoEvent'][] = 
'UserStatsHooks::onBeforeCreateEchoEvent';
+$wgHooks['EchoGetBundleRules'][] = 'UserStatsHooks::onEchoGetBundleRules';
+
+$wgDefaultUserOptions['echo-subscriptions-web-social-level-up'] = true;
+$wgDefaultUserOptions['echo-subscriptions-email-social-level-up'] = false;
+
 // New special pages
 $wgSpecialPages['AddRelationship'] = 'SpecialAddRelationship';
 $wgSpecialPages['EditProfile'] = 'SpecialEditProfile';

-- 
To view, visit https://gerrit.wikimedia.org/r/325141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7c49642e164a96fdfd9a502afaded65a5ca1dc5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Lewis Cawte 
Gerrit-Reviewer: Jack Phoenix 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Initial Echo integration, based on ikasty's code

[Lewis Cawte (Code Review)]

Lewis Cawte has submitted this change and it was merged.

Change subject: Initial Echo integration, based on ikasty's code
..


Initial Echo integration, based on ikasty's code

Original diff can be found at https://git.io/v1W5n
Some cleanup, (copypasted) "brand new" code, etc. by me.

The new notifications-*.svg images are from WikiFont:
* notifications-award.svg was originally named "uniE023 - ribbonPrize.svg"
* notifications-gift-sent.svg was originally named "uniE022 - upload.svg"
* notifications-gift-received.svg was originally named "uniE023 - download.svg"
* notifications-added.svg was originally named "uniE022 - check.svg"
* notifications-level-up.svg was originally named "uniE027 - betaLaunch.svg"
Some of them have had their color changed to green as per Echo design
guidelines by giving the  element a fill attribute.

Bug: T64520
Change-Id: I0c610c2bd33955c7f36619df9a3ce6b61b3c134f
---
M SocialProfile.php
A SystemGifts/EchoUserSystemGiftPresentationModel.php
M SystemGifts/SystemGifts.php
M SystemGifts/SystemGiftsClass.php
M SystemGifts/UserSystemGiftsClass.php
A SystemGifts/UserSystemGiftsHooks.php
M SystemGifts/i18n/en.json
M SystemGifts/i18n/fi.json
A UserBoard/EchoUserBoardMessagePresentationModel.php
M UserBoard/UserBoardClass.php
A UserBoard/UserBoardHooks.php
M UserBoard/i18n/en.json
M UserBoard/i18n/fi.json
A UserGifts/EchoUserGiftPresentationModel.php
M UserGifts/Gifts.php
M UserGifts/UserGiftsClass.php
A UserGifts/UserGiftsHooks.php
M UserGifts/i18n/en.json
M UserGifts/i18n/fi.json
M UserProfile/SpecialUpdateProfile.php
A UserRelationship/EchoUserRelationshipPresentationModel.php
M UserRelationship/UserRelationshipClass.php
A UserRelationship/UserRelationshipHooks.php
M UserRelationship/i18n/en.json
M UserRelationship/i18n/fi.json
A UserStats/EchoUserLevelAdvancePresentationModel.php
M UserStats/UserStatsClass.php
A UserStats/UserStatsHooks.php
M UserStats/i18n/en.json
M UserStats/i18n/fi.json
M UserSystemMessages/UserSystemMessagesClass.php
A images/notifications-added.svg
A images/notifications-award.svg
A images/notifications-gift-received.svg
A images/notifications-gift-sent.svg
A images/notifications-level-up.svg
36 files changed, 907 insertions(+), 19 deletions(-)

Approvals:
  Lewis Cawte: Verified; Looks good to me, approved



diff --git a/SocialProfile.php b/SocialProfile.php
index f4b722a..c2b4098 100644
--- a/SocialProfile.php
+++ b/SocialProfile.php
@@ -121,7 +121,7 @@
'path' => __FILE__,
'name' => 'SocialProfile',
'author' => array( 'Aaron Wright', 'David Pean', 'Jack Phoenix' ),
-   'version' => '1.9',
+   'version' => '1.10',
'url' => 'https://www.mediawiki.org/wiki/Extension:SocialProfile',
'descriptionmsg' => 'socialprofile-desc',
 );
diff --git a/SystemGifts/EchoUserSystemGiftPresentationModel.php 
b/SystemGifts/EchoUserSystemGiftPresentationModel.php
new file mode 100644
index 000..5e46807
--- /dev/null
+++ b/SystemGifts/EchoUserSystemGiftPresentationModel.php
@@ -0,0 +1,31 @@
+isBundled() ) {
+   return $this->msg( 
'notification-social-award-rec-bundle', $this->getBundleCount() );
+   } else {
+   return $this->msg( 'notification-social-award-rec', 
$this->event->getExtraParam( 'giftname' ) );
+   }
+   }
+
+   public function getBodyMessage() {
+   return false;
+   }
+
+   public function getPrimaryLink() {
+   return array(
+   'url' => SpecialPage::getTitleFor( 'ViewSystemGift' 
)->getLocalURL( array( 'gift_id' => $this->event->getExtraParam( 'giftid' ) ) ),
+   'label' => $this->msg( 'echo-learn-more' )->text()
+   );
+   }
+
+}
\ No newline at end of file
diff --git a/SystemGifts/SystemGifts.php b/SystemGifts/SystemGifts.php
index 06555f0..3d906e1 100644
--- a/SystemGifts/SystemGifts.php
+++ b/SystemGifts/SystemGifts.php
@@ -15,6 +15,7 @@
 
 $wgAutoloadClasses['SystemGifts'] = 
"{$wgSystemGiftsDirectory}/SystemGiftsClass.php";
 $wgAutoloadClasses['UserSystemGifts'] = 
"{$wgSystemGiftsDirectory}/UserSystemGiftsClass.php";
+$wgAutoloadClasses['UserSystemGiftsHooks'] = 
"{$wgSystemGiftsDirectory}/UserSystemGiftsHooks.php";
 
 // Special Pages
 $wgAutoloadClasses['TopAwards'] = "{$wgSystemGiftsDirectory}/TopAwards.php";
@@ -48,3 +49,13 @@
'remoteExtPath' => 'SocialProfile/SystemGifts',
'position' => 'top'
 );
+
+// Echo (Notifications) stuff
+$wgAutoloadClasses['EchoUserSystemGiftPresentationModel'] = 
"{$wgSystemGiftsDirectory}/EchoUserSystemGiftPresentationModel.php";
+
+$wgHooks['BeforeCreateEchoEvent'][] = 
'UserSystemGiftsHooks::onBeforeCreateEchoEvent';
+$wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'UserSystemGiftsHooks::onEchoGetDefaultNotifiedUsers';
+$wgHooks['EchoGetBundleRules'][] = 
'UserSystemGiftsHooks::onEchoGetBundleRules';
+

[MediaWiki-commits] [Gerrit] integration/config[master]: Update email regex part 2

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325140

Change subject: Update email regex part 2
..

Update email regex part 2

Majour refractor so that we doint have to specify the email twice.

Change-Id: I3be7bdc77931b7071bddd604268f0b33d73e7e4f
---
M zuul/layout.yaml
1 file changed, 7 insertions(+), 205 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/40/325140/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 852b46d..61cda5f 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -44,6 +44,7 @@
   email:
 - |
   (?x) ^(?!(
+_whitelist
 .*?@wikimedia\.(org|de)
 | 01tonythomas@gmail\.com
 | aarcos\.wiki@gmail\.com
@@ -274,210 +275,9 @@
   # - Make sure to use non greedy selectors (.*?) and to escape dots: 
\.
   # - Also update the email filter of the 'check' pipeline.
 
-  email: _whitelist
-   - .*?@wikimedia\.(org|de)$
-
-  # WMF staff & contractors:
-   - ^aarcos\.wiki@gmail\.com$
-   - ^amir\.aharoni@mail\.huji\.ac\.il$
-   - ^andrew\.green\.df@gmail\.com$
-   - ^anomie\.wikipedia@gmail\.com$
-   - ^bawolff\+wn@gmail\.com$
-   - ^christian@quelltextlich\.at$
-   - ^david@troi\.org$ # David Chan
-   - ^git@samsmith\.io$ # Sam Smith
-   - ^glaser@hallowelt\.biz$
-   - ^hashar@free\.fr$
-   - ^jeroendedauw@gmail\.com$
-   - ^kartik\.mistry@gmail\.com$
-   - ^krinklemail@gmail\.com$ # Timo Tijhof
-   - ^legoktm@member\.fsf\.org$ # Kunal Mehta
-   - ^maxsem\.wiki@gmail\.com$
-   - ^marielle\.volz@gmail\.com$
-   - ^moriel@gmail\.com # Moriel Schottlender
-   - ^mtraceur@member\.fsf\.org$
-   - ^niharikakohli29@gmail\.com$
-   - ^niklas\.laxstrom@gmail\.com$
-   - ^roan\.kattouw@gmail\.com$
-   - ^sam@samwilson\.id\.au$
-   - ^santhosh\.thottingal@gmail\.com$
-   - ^shahyar@gmail\.com$
-   - ^siebrand@kitano\.nl$
-   - ^stefan@garage-coding\.com$
-   - ^stefan\.petrea@gmail\.com$
-   - ^sucheta\.ghoshal@gmail\.com$
-   - ^trevorparscal@gmail\.com$
-   - ^yuriastrakhan@gmail\.com$
-   - ^yuvipanda@gmail\.com$
-
-  # VisualEditor (Wikia)
-   - ^inez@wikia-inc\.com$
-   - ^orbit@framezero\.com$ # Christian Williams
-
-  # WMDE:
-   - ^addshorewiki@gmail\.com$
-   - ^aude\.wiki@gmail\.com$
-   - ^hoo@online\.de$
-
-  # WMSE:
-   - ^sebastian\.berlin@wikimedia\.se$
-
-  # Hasso-Plattner-Institut students working on Wikidata projects
-   - ^andreas\.burmeister@student\.hpi\.de$
-   - ^dominic\.sauer@yahoo\.de$
-   - ^jonas@keutel\.de$
-   - ^soeren_oldag@freenet\.de$
-   - ^tamaraslosarek@gmail\.com$
-
-  # VistaPrint
-  # They are heavily using MediaWiki internally and open sourced
-  # some of their extensions. Might wildcard them as well, for
-  # now just whitelist Daniel Renfro.
-   - ^drenfro@vistaprint\.com$ # AlephNull
-
-  # Trusted long term users:
-   - ^adamr_carter@btinternet\.com$ # UltrasonicNXT
-   - ^admin@alphacorp\.tk$ # Hydriz
-   - ^admin@glados\.cc$ # Unicodesnowman
-   - ^cblair91@gmail\.com$ # Cblair91 -- mw/ext/ImportArticles
-   - ^anirudh24seven@gmail\.com$ # Anirudh S
-   - ^asthana\.sumit23@gmail\.com$ # Sumit
-   - ^benapetr@gmail\.com$ # petrb
-   - ^benestar\.wikimedia@gmail\.com$
-   - ^bryan\.tongminh@gmail\.com$
-   - ^cenarium\.sysop@gmail\.com$ # Cenarium
-   - ^cicalese@mitre\.org$
-   - ^codereview@emsenhuber\.ch$
-   - ^CommodoreFabianus@gmx\.de # XZise, Pywikibot maintainer
-   - ^d_entous@yahoo\.com$
-   - ^daniel@nadir-seen-fire\.com$
-   - ^daniel\.rey\.lopez@gmail\.com$
-   - ^dereckson@espace-win\.org$
-   - ^devunt@gmail\.com$
-   - ^ebrahim@gnu\.org$
-   - ^eloquence@gmail\.com$
-   - ^eranroz89@gmail\.com$ # Eran Roz
-   - ^federicoleva@tiscali\.it$ # Nemo bis
-   - ^florian\.schmidt\.stargatewissen@gmail\.com$
-   - ^fomafix@googlemail\.com$
-   - ^geofbot@gmail\.com$
-   - ^glaisher\.wiki@gmail\.com$
-   - ^hartman\.wiki@gmail\.com$
-   - ^hgasuser@gmail\.com$ # MGChecker
-   - ^huji\.huji@gmail\.com$
-   - ^info@gno\.de$ # Xqt, Pywikibot maintainer
-   - ^jamesmhare@gmail\.com$ # harej
-   - ^jamesin\.hongkong\.1@gmail\.com$ # Mwjames
-   - ^jack@countervandalism\.net$ # Jack Phoenix
-   - 

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: SaveDialog inherits from plain dialog, not FragmentDialog

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325139

Change subject: SaveDialog inherits from plain dialog, not FragmentDialog
..

SaveDialog inherits from plain dialog, not FragmentDialog

Change-Id: I934ab41567ea68e58cfa27451faf499febd68bd1
---
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/39/325139/1

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 2ee8cdd..a08b0a6 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -12,7 +12,7 @@
  * noted otherwise.
  *
  * @class
- * @extends ve.ui.FragmentDialog
+ * @extends ve.ui.ProcessDialog
  *
  * @constructor
  * @param {Object} [config] Config options
@@ -36,7 +36,7 @@
 
 /* Inheritance */
 
-OO.inheritClass( ve.ui.MWSaveDialog, ve.ui.FragmentDialog );
+OO.inheritClass( ve.ui.MWSaveDialog, OO.ui.ProcessDialog );
 
 /* Static Properties */
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325139
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I934ab41567ea68e58cfa27451faf499febd68bd1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/config[master]: Updating regex for the email so that we do org|de and not or...

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325137

Change subject: Updating regex for the email so that we do org|de and not org 
and de seperatly
..

Updating regex for the email so that we do org|de and not org and de seperatly

This was suggested by Krenair.

I am trying to update the regex so it is shorter.

Change-Id: I76a59293c703275e3f6590daa8ae9a8460db6e20
---
M zuul/layout.yaml
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/37/325137/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5354871..852b46d 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -44,8 +44,7 @@
   email:
 - |
   (?x) ^(?!(
-.*?@wikimedia\.org
-| .*?@wikimedia\.de
+.*?@wikimedia\.(org|de)
 | 01tonythomas@gmail\.com
 | aarcos\.wiki@gmail\.com
 | adamr_carter@btinternet\.com
@@ -276,8 +275,7 @@
   # - Also update the email filter of the 'check' pipeline.
 
   email: _whitelist
-   - .*?@wikimedia\.org$
-   - .*?@wikimedia\.de$
+   - .*?@wikimedia\.(org|de)$
 
   # WMF staff & contractors:
- ^aarcos\.wiki@gmail\.com$

-- 
To view, visit https://gerrit.wikimedia.org/r/325137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76a59293c703275e3f6590daa8ae9a8460db6e20
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add integration test for MWHttpRequest user/pass options

[Code Review]

Gergő Tisza has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325136

Change subject: Add integration test for MWHttpRequest user/pass options
..

Add integration test for MWHttpRequest user/pass options

Change-Id: I5bcb263a725e8042ee51109080d2075744fe7001
---
M tests/integration/includes/http/MWHttpRequestTestCase.php
1 file changed, 36 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/36/325136/1

diff --git a/tests/integration/includes/http/MWHttpRequestTestCase.php 
b/tests/integration/includes/http/MWHttpRequestTestCase.php
index fb52de9..4fd1cde 100644
--- a/tests/integration/includes/http/MWHttpRequestTestCase.php
+++ b/tests/integration/includes/http/MWHttpRequestTestCase.php
@@ -175,8 +175,33 @@
$this->assertArrayHasKey( 'origin', $data );
}
 
+   public function testBasicAuthentication() {
+   $request = MWHttpRequest::factory( 
'http://httpbin.org/basic-auth/user/pass', [
+   'username' => 'user',
+   'password' => 'pass',
+   ] );
+   $status = $request->execute();
+   $this->assertTrue( $status->isGood() );
+   $this->assertResponseFieldValue( 'authenticated', true, 
$request );
+
+   $request = MWHttpRequest::factory( 
'http://httpbin.org/basic-auth/user/pass', [
+   'username' => 'user',
+   'password' => 'wrongpass',
+   ] );
+   $status = $request->execute();
+   $this->assertFalse( $status->isOK() );
+   $this->assertSame( 401, $request->getStatus() );
+   }
+
// 
 
+   /**
+* Verifies that the request was successful, returned valid JSON and 
the given field of that
+* JSON data is as expected.
+* @param string|string[] $key Path to the data in the response object
+* @param mixed $expectedValue
+* @param MWHttpRequest $response
+*/
protected function assertResponseFieldValue( $key, $expectedValue, 
MWHttpRequest $response ) {
$this->assertSame( 200, $response->getStatus(), 'response 
status is not 200' );
$data = json_decode( $response->getContent(), true );
@@ -190,6 +215,12 @@
$this->assertSame( $expectedValue, $data );
}
 
+   /**
+* Asserts that the cookie jar has the given cookie with the given 
value.
+* @param string $expectedName Cookie name
+* @param string $expectedValue Cookie value
+* @param CookieJar $cookieJar
+*/
protected function assertHasCookie( $expectedName, $expectedValue, 
CookieJar $cookieJar ) {
$cookieJar = TestingAccessWrapper::newFromObject( $cookieJar );
$cookies = array_change_key_case( $cookieJar->cookie, 
CASE_LOWER );
@@ -199,6 +230,11 @@
$this->assertSame( $expectedValue, $cookie->value );
}
 
+   /**
+* Asserts that the cookie jar does not have the given cookie.
+* @param string $expectedName Cookie name
+* @param CookieJar $cookieJar
+*/
protected function assertNotHasCookie( $name, CookieJar $cookieJar ) {
$cookieJar = TestingAccessWrapper::newFromObject( $cookieJar );
$this->assertArrayNotHasKey( strtolower( $name ),

-- 
To view, visit https://gerrit.wikimedia.org/r/325136
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bcb263a725e8042ee51109080d2075744fe7001
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Bypass fragment parsing for non-fragment windows

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325135

Change subject: Bypass fragment parsing for non-fragment windows
..

Bypass fragment parsing for non-fragment windows

Change-Id: Ie6deb59fd1992b12dea7cfbd5803d303ce7f3c60
---
M src/ui/actions/ve.ui.WindowAction.js
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/35/325135/1

diff --git a/src/ui/actions/ve.ui.WindowAction.js 
b/src/ui/actions/ve.ui.WindowAction.js
index a08fcee..0d4c2a2 100644
--- a/src/ui/actions/ve.ui.WindowAction.js
+++ b/src/ui/actions/ve.ui.WindowAction.js
@@ -57,14 +57,18 @@
dir = surface.getView().getSelection().getDirection(),
// HACK: Allow $returnFocusTo to take null upstream
$noFocus = [ { focus: function () {} } ],
+   windowClass = ve.ui.windowFactory.lookup( name ),
+   isFragmentWindow = windowClass.prototype instanceof 
ve.ui.FragmentDialog || windowClass.prototype instanceof 
ve.ui.FragmentInspector,
// TODO: Add 'doesHandleSource' method to factory
-   sourceMode = surface.getMode() === 'source' && 
!ve.ui.windowFactory.lookup( name ).static.handlesSource;
+   sourceMode = surface.getMode() === 'source' && 
!windowClass.static.handlesSource;
 
if ( !windowManager ) {
return false;
}
 
-   if ( sourceMode ) {
+   if ( !isFragmentWindow ) {
+   fragmentPromise = $.Deferred().resolve().promise();
+   } else if ( sourceMode ) {
text = fragment.getText( true );
originalFragment = fragment;
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325135
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6deb59fd1992b12dea7cfbd5803d303ce7f3c60
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin: Update my (=legoktm) dotfiles

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325134

Change subject: admin: Update my (=legoktm) dotfiles
..

admin: Update my (=legoktm) dotfiles

Change-Id: Ic7267077cb33687d7a81227f8127c49c56763808
---
M modules/admin/files/home/legoktm/.bash_aliases
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/325134/1

diff --git a/modules/admin/files/home/legoktm/.bash_aliases 
b/modules/admin/files/home/legoktm/.bash_aliases
index 62836f5..bfde7fc 100644
--- a/modules/admin/files/home/legoktm/.bash_aliases
+++ b/modules/admin/files/home/legoktm/.bash_aliases
@@ -1,2 +1,5 @@
 alias ack='ack-grep'
-
+alias sync-file='scap sync-file'
+alias sync-dir='scap sync-dir'
+alias mwversionsinuse='scap wikiversions-inuse'
+alias zuul-logs='tail -f -n100 /var/log/zuul/zuul.log'

-- 
To view, visit https://gerrit.wikimedia.org/r/325134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7267077cb33687d7a81227f8127c49c56763808
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/config[master]: Whitelist GCI16 student Divadsn <divad.nnamtd...@gmail.com>

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Whitelist GCI16 student Divadsn 
..


Whitelist GCI16 student Divadsn 

Change-Id: I80a37c514f300e1dc1a6e1a81122a4d551241890
---
M zuul/layout.yaml
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 8465c11..5354871 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -82,6 +82,7 @@
 | d_entous@yahoo\.com
 | dereckson@espace-win\.org
 | devunt@gmail\.com
+| divad\.nnamtdeis@gmail\.com
 | dominic\.sauer@yahoo\.de
 | drenfro@vistaprint\.com
 | dr\.trigon@surfeu\.ch
@@ -470,6 +471,7 @@
   # GCI students!
- ^bmp2558@gmail\.com$ # Georggi
- ^crazy4sb@gmail\.com$ # unicornisaurous
+   - ^divad\.nnamtdeis@gmail\.com$ # Divadsn
- ^gianiskido@gmail\.com$ # IoannisKydonis
- ^i@ananayarora\.com$
- ^juliusalphonso\.09@gmail\.com$ # JadeMaveric

-- 
To view, visit https://gerrit.wikimedia.org/r/325132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I80a37c514f300e1dc1a6e1a81122a4d551241890
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
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...SocialProfile[master]: [WIP] Replacement of old AJAX stuff with API modules, based ...

[Lewis Cawte (Code Review)]

Lewis Cawte has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325133

Change subject: [WIP] Replacement of old AJAX stuff with API modules, based on 
ikasty's code
..

[WIP] Replacement of old AJAX stuff with API modules, based on ikasty's code

Original diff can be found at
https://github.com/wiki-chan/Social/commit/bb932d15d36bcb4ee076bdcf0e8494496eb0906b
Some cleanup, (copypasted) "brand new" code, etc. by me.

* Renamed API modules to clearly mark them as such
** SendUserBoardMessage --> ApiSendUserBoardMessage
** RelationshipResponse --> ApiRelationshipResponse
* Also prefixed the API actions with socialprofile- instead of social-, for 
consistency
(unlike the Wiki-Chan fork, SocialProfile's canonical name is SocialProfile); 
i.e. socialprofile-send-message
instead of social-send-message for the UserBoard API module used to send out 
board messages
* Added new API module for deleting UserBoard messages 
(ApiDeleteUserBoardMessage)
* Made the API modules use $this->getUser() instead of the global $wgUser
* Translated various hard-coded Korean strings (via Google Translate) in the 
API modules to English

And random, not directly related changes nevertheless bundled here:
* Moved one hard-coded English string from UserProfilePage.js into the i18n file
** This is kinda shitty because technically it should be and actually *is*
already a UserBoard string (userboard_confirmdelete) and now it's
duplicated here as user-board-confirm-delete
* And also in UserProfilePage.js, got rid of an unnecessary variable (replaceID)

Change-Id: I91bb1b68c3a66f7af422435307085daa709a2156
---
M SocialProfile.php
A UserBoard/ApiDeleteUserBoardMessage.php
A UserBoard/ApiSendUserBoardMessage.php
M UserBoard/SpecialUserBoard.php
M UserBoard/UserBoard.js
D UserBoard/UserBoard_AjaxFunctions.php
M UserProfile/UserProfile.php
M UserProfile/UserProfilePage.js
M UserProfile/i18n/en.json
M UserProfile/i18n/fi.json
A UserRelationship/ApiRelationshipResponse.php
D UserRelationship/Relationship_AjaxFunctions.php
M UserRelationship/UserRelationship.js
13 files changed, 256 insertions(+), 124 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile 
refs/changes/33/325133/1

diff --git a/SocialProfile.php b/SocialProfile.php
index 3cb910b..f4b722a 100644
--- a/SocialProfile.php
+++ b/SocialProfile.php
@@ -31,12 +31,12 @@
 $wgMessagesDirs['SocialProfileUserProfile'] = __DIR__ . '/UserProfile/i18n';
 $wgMessagesDirs['SocialProfileUserRelationship'] = __DIR__ . 
'/UserRelationship/i18n';
 $wgMessagesDirs['SocialProfileUserStats'] = __DIR__ . '/UserStats/i18n';
+
 $wgExtensionMessagesFiles['SocialProfileNamespaces'] = __DIR__ . 
'/SocialProfile.namespaces.php';
 $wgExtensionMessagesFiles['AvatarMagic'] = __DIR__ . 
'/UserProfile/Avatar.magic.i18n.php';
 
 // Classes to be autoloaded
 $wgAutoloadClasses['GenerateTopUsersReport'] = __DIR__ . 
'/UserStats/GenerateTopUsersReport.php';
-
 $wgAutoloadClasses['SpecialAddRelationship'] = __DIR__ . 
'/UserRelationship/SpecialAddRelationship.php';
 $wgAutoloadClasses['SpecialBoardBlast'] = __DIR__ . 
'/UserBoard/SpecialSendBoardBlast.php';
 $wgAutoloadClasses['SpecialEditProfile'] = __DIR__ . 
'/UserProfile/SpecialEditProfile.php';
@@ -67,9 +67,18 @@
 $wgAutoloadClasses['AvatarParserFunction'] = __DIR__ . 
'/UserProfile/AvatarParserFunction.php';
 $wgAutoloadClasses['SPUserSecurity'] = __DIR__ . 
'/UserSecurity/UserSecurityClass.php';
 
-// API module
+// API modules
 $wgAutoloadClasses['ApiUserProfilePrivacy'] = __DIR__ . 
'/UserProfile/ApiUserProfilePrivacy.php';
 $wgAPIModules['smpuserprivacy'] = 'ApiUserProfilePrivacy';
+
+$wgAutoloadClasses['ApiDeleteUserBoardMessage'] = __DIR__ . 
'/UserBoard/ApiDeleteUserBoardMessage.php';
+$wgAPIModules['socialprofile-delete-message'] = 'ApiDeleteUserBoardMessage';
+
+$wgAutoloadClasses['ApiSendUserBoardMessage'] = __DIR__ . 
'/UserBoard/ApiSendUserBoardMessage.php';
+$wgAPIModules['socialprofile-send-message'] = 'ApiSendUserBoardMessage';
+
+$wgAutoloadClasses['ApiRelationshipResponse'] = __DIR__ . 
'/UserRelationship/ApiRelationshipResponse.php';
+$wgAPIModules['socialprofile-request-response'] = 'ApiRelationshipResponse';
 
 // New special pages
 $wgSpecialPages['AddRelationship'] = 'SpecialAddRelationship';
@@ -89,10 +98,6 @@
 $wgSpecialPages['UserBoard'] = 'SpecialViewUserBoard';
 $wgSpecialPages['ViewRelationshipRequests'] = 
'SpecialViewRelationshipRequests';
 $wgSpecialPages['ViewRelationships'] = 'SpecialViewRelationships';
-
-// Necessary AJAX functions
-require_once( 
"$IP/extensions/SocialProfile/UserBoard/UserBoard_AjaxFunctions.php" );
-require_once( 
"$IP/extensions/SocialProfile/UserRelationship/Relationship_AjaxFunctions.php" 
);
 
 // What to display on social profile pages by default?
 $wgUserProfileDisplay['board'] = true;
@@ -116,7 +121,7 @@
'path' => __FILE__,
'name' => 'SocialProfile',

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Clarify in emailuserfooter that by responding one reveals th...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Clarify in emailuserfooter that by responding one reveals their 
email address
..


Clarify in emailuserfooter that by responding one reveals their email address

Bug: T152242
Change-Id: I686f7bb8dd1d225620266ac9cbecadcf06bd7705
---
M languages/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index afd13f0..d167904 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2068,7 +2068,7 @@
"emailccsubject": "Copy of your message to $1: $2",
"emailsent": "Email sent",
"emailsenttext": "Your email message has been sent.",
-   "emailuserfooter": "This email was {{GENDER:$1|sent}} by $1 to 
{{GENDER:$2|$2}} by the \"{{int:emailuser}}\" function at {{SITENAME}}.",
+   "emailuserfooter": "This email was {{GENDER:$1|sent}} by $1 to 
{{GENDER:$2|$2}} by the \"{{int:emailuser}}\" function at {{SITENAME}}. 
{{GENDER:$2|Your}} email will be sent directly to the {{GENDER:$1|original 
sender}}, revealing {{GENDER:$2|your}} email address to {{GENDER:$1|them}}.",
"usermessage-summary": "Leaving system message.",
"usermessage-editor": "System messenger",
"usermessage-template": "MediaWiki:UserMessage",

-- 
To view, visit https://gerrit.wikimedia.org/r/325040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I686f7bb8dd1d225620266ac9cbecadcf06bd7705
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Huji 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/config[master]: Whitelist GCI16 student Divadsn <divad.nnamtd...@gmail.com> ...

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325132

Change subject: Whitelist GCI16 student Divadsn  
temporarily
..

Whitelist GCI16 student Divadsn  temporarily

Change-Id: I80a37c514f300e1dc1a6e1a81122a4d551241890
---
M zuul/layout.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/32/325132/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 8465c11..5c0784b 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -82,6 +82,7 @@
 | d_entous@yahoo\.com
 | dereckson@espace-win\.org
 | devunt@gmail\.com
+| divad\.nnamtdeis@gmail\.com
 | dominic\.sauer@yahoo\.de
 | drenfro@vistaprint\.com
 | dr\.trigon@surfeu\.ch
@@ -336,6 +337,9 @@
   # now just whitelist Daniel Renfro.
- ^drenfro@vistaprint\.com$ # AlephNull
 
+  # Temporarily whitelisting  GCI16 students (2 or more changes 
required by GCI16 students)
+   - ^divad\.nnamtdeis@gmail\.com$ # Divadsn
+
   # Trusted long term users:
- ^adamr_carter@btinternet\.com$ # UltrasonicNXT
- ^admin@alphacorp\.tk$ # Hydriz

-- 
To view, visit https://gerrit.wikimedia.org/r/325132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80a37c514f300e1dc1a6e1a81122a4d551241890
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mwyaml: Accept existing, but empty "Hiera:" pages as well

[Tim Landscheidt (Code Review)]

Hello Merlijn van Deen, Giuseppe Lavagetto,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/325131

to review the following change.

Change subject: mwyaml: Accept existing, but empty "Hiera:" pages as well
..

mwyaml: Accept existing, but empty "Hiera:" pages as well

Currently mwyaml chokes on existing, but empty "Hiera:" pages with an
error message:

| Error: Could not retrieve catalog from remote server: Error 400 on
| SERVER: Reading data from Toolsbeta failed: TypeError: Data
| retrieved from Toolsbeta is String not Hash at
| /etc/puppet/manifests/realm.pp:71 on node
| toolsbeta-puppetmaster7.toolsbeta.eqiad.wmflabs

Due to the used caching concept, depending on the rhythm of Puppet
runs, eventually the catalog will be generated (with the correct Hiera
data), but not without regular failures in between.

This change accepts existing, but empty "Hiera:" pages and treats them
as expected.

Change-Id: I567dd6366fd6d56db259c36310b85dfcb4e08669
---
M modules/wmflib/lib/hiera/mwcache.rb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/325131/1

diff --git a/modules/wmflib/lib/hiera/mwcache.rb 
b/modules/wmflib/lib/hiera/mwcache.rb
index 94d4b1b..1208d77 100644
--- a/modules/wmflib/lib/hiera/mwcache.rb
+++ b/modules/wmflib/lib/hiera/mwcache.rb
@@ -40,8 +40,8 @@
 data = resp["*"]
 @cache[path][:data] = block_given? ? yield(data) : data
 
-if !@cache[path][:data].is_a?(expected_type)
-  raise TypeError, "Data retrieved from #{path} is #{data.class} not 
#{expected_type}"
+if !@cache[path][:data].nil? and 
!@cache[path][:data].is_a?(expected_type)
+  raise TypeError, "Data retrieved from #{path} is 
#{@cache[path][:data].class}, not #{expected_type} or nil"
 end
   end
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325131
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I567dd6366fd6d56db259c36310b85dfcb4e08669
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Merlijn van Deen 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Don't pass unsupported parameter

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Don't pass unsupported parameter
..


Don't pass unsupported parameter

Change-Id: I40317c3e64eb3c96862991e49fc4b2041247779c
---
M Views/AbuseFilterViewDiff.php
1 file changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Umherirrender: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Views/AbuseFilterViewDiff.php b/Views/AbuseFilterViewDiff.php
index 5f65cae..cc5c84e 100644
--- a/Views/AbuseFilterViewDiff.php
+++ b/Views/AbuseFilterViewDiff.php
@@ -115,8 +115,7 @@
}
 
$this->mNextHistoryId = $this->getNextHistoryId(
-   $this->mNewVersion['meta']['history_id'],
-   'next'
+   $this->mNewVersion['meta']['history_id']
);
 
return true;

-- 
To view, visit https://gerrit.wikimedia.org/r/324949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I40317c3e64eb3c96862991e49fc4b2041247779c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Glaisher 
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...MediaWikiFarm[master]: Cleaning

[Seb35 (Code Review)]

Seb35 has submitted this change and it was merged.

Change subject: Cleaning
..


Cleaning

Remove unused code, replaced by dedicated code since some time.

Change-Id: Ida232cfde250c7f4bcc98dfea89bd8f5e40756c7
---
M src/MediaWikiFarm.php
M tests/phpunit/ConfigurationTest.php
2 files changed, 0 insertions(+), 165 deletions(-)

Approvals:
  Seb35: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index d7a3315..7d47050 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -308,11 +308,6 @@
# Set other variables of the wiki
$this->setOtherVariables();
 
-   # Set available suffixes and wikis
-   # This is not useful since nobody else use available suffixes 
and wikis
-   # For now, remove loading of one config file to improve a bit 
performance
-   // $this->setWgConf();
-
# Cache the result
if( $this->cacheDir ) {
$variables = $this->variables;
@@ -863,25 +858,6 @@
}
 
/**
-* Set available suffixes and wikis.
-*
-* @todo Still hacky: before setting parameters in store in farms.yml, 
various configurations should be reviewed
-*   to select accordingly the rights management modelisation
-*
-* @return void
-*/
-   /*function setWgConf() {
-
-   global $wgConf;
-
-   $wgConf->suffixes = array( $this->variables['$SUFFIX'] );
-   $wikiIDs = $this->readFile( $this->variables['$SUFFIX'] . 
'/wikis.yml', $this->configDir );
-   foreach( array_keys( $wikiIDs ) as $wiki ) {
-   $wgConf->wikis[] = $wiki . '-' . 
$this->variables['$SUFFIX'];
-   }
-   }*/
-
-   /**
 * Is the cache configuration file LocalSettings.php for the requested 
wiki fresh?
 *
 * @mediawikifarm-const
@@ -943,13 +919,6 @@
 */
function getMediaWikiConfig( $force = false ) {
 
-   // global $wgConf;
-
-   # In MediaWiki 1.16, $wgConf is not created by default
-   // if( is_null( $wgConf ) ) {
-   //  $wgConf = new SiteConfiguration();
-   // }
-
if( !$force && $this->isLocalSettingsFresh() ) {
return;
}
@@ -969,22 +938,6 @@
return;
}
 
-   # Populate wgConf
-   // $this->populatewgConf();
-
-   # Get specific configuration for this wiki
-   # Do not use SiteConfiguration::extractAllGlobals or the 
configuration caching would become
-   # ineffective and there would be inconsistencies in this process
-   // $this->configuration['general'] = $wgConf->getAll( $myWiki, 
$mySuffix, array() );
-
-   # For the permissions array, fix a small strangeness: when an 
existing default permission
-   # is true, it is not possible to make it false in the specific 
configuration
-   // if( array_key_exists( '+wgGroupPermissions', 
$wgConf->settings ) ) {
-   //  $this->configuration['general']['wgGroupPermissions'] = 
self::arrayMerge( $this->configuration['general']['wgGroupPermissions'],
-   //  $wgConf->get( '+wgGroupPermissions', $myWiki, 
$mySuffix )
-   //  );
-   // }
-
# Get specific configuration for this wiki
$this->populateSettings();
 
@@ -998,93 +951,6 @@
rename( $localSettingsFile . '.tmp', 
$localSettingsFile );
}
}
-
-   // $wgConf->siteParamsCallback = array( $this, 
'SiteConfigurationSiteParamsCallback' );
-   }
-
-   /**
-* Popuplate wgConf from config files.
-*
-* @SuppressWarnings(PHPMD.ElseExpression)
-* @SuppressWarnings(PHPMD.CyclomaticComplexity)
-* @codeCoverageIgnore
-*
-* @return bool Success.
-*/
-   function populatewgConf() {
-
-   global $wgConf;
-
-   foreach( $this->farmConfig['config'] as $configFile ) {
-
-   if( !is_array( $configFile ) ) {
-   continue;
-   }
-
-   # Replace variables
-   $configFile = $this->replaceVariables( $configFile );
-
-   # Executable config files
-   if( array_key_exists( 'executable', $configFile ) && 
$configFile['executable'] ) {
-
-   $this->configuration['execFiles'][] = 
$this->configDir . '/' . $configFile['file'];
-   continue;
-   }
-
-  

[MediaWiki-commits] [Gerrit] mediawiki...ConfirmEdit[master]: Update for API error i18n

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update for API error i18n
..


Update for API error i18n

See Iae0e2ce3.

Change-Id: I3cf889811f44a15935e454dd42f081164d4a098c
---
M SimpleCaptcha/Captcha.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/SimpleCaptcha/Captcha.php b/SimpleCaptcha/Captcha.php
index 96f7d16..3076828 100644
--- a/SimpleCaptcha/Captcha.php
+++ b/SimpleCaptcha/Captcha.php
@@ -1044,12 +1044,12 @@
if ( defined( 'MW_API' ) ) {
# API mode
# Asking for captchas in the API is really silly
-   $error = wfMessage( 'captcha-disabledinapi' 
)->text();
+   $error = Status::newFatal( 
'captcha-disabledinapi' );
return false;
}
$this->trigger = "{$wgUser->getName()} sending email";
if ( !$this->passCaptchaLimitedFromRequest( $wgRequest, 
$wgUser ) ) {
-   $error = wfMessage( 'captcha-sendemail-fail' 
)->text();
+   $error = Status::newFatal( 
'captcha-sendemail-fail' );
return false;
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/321419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3cf889811f44a15935e454dd42f081164d4a098c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Gergő Tisza 
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...MediaWikiFarm[master]: Cleaning

[Seb35 (Code Review)]

Seb35 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325130

Change subject: Cleaning
..

Cleaning

Remove unused code, replaced by dedicated code since some time.

Change-Id: Ida232cfde250c7f4bcc98dfea89bd8f5e40756c7
---
M src/MediaWikiFarm.php
1 file changed, 0 insertions(+), 156 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm 
refs/changes/30/325130/1

diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index d7a3315..421362f 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -863,25 +863,6 @@
}
 
/**
-* Set available suffixes and wikis.
-*
-* @todo Still hacky: before setting parameters in store in farms.yml, 
various configurations should be reviewed
-*   to select accordingly the rights management modelisation
-*
-* @return void
-*/
-   /*function setWgConf() {
-
-   global $wgConf;
-
-   $wgConf->suffixes = array( $this->variables['$SUFFIX'] );
-   $wikiIDs = $this->readFile( $this->variables['$SUFFIX'] . 
'/wikis.yml', $this->configDir );
-   foreach( array_keys( $wikiIDs ) as $wiki ) {
-   $wgConf->wikis[] = $wiki . '-' . 
$this->variables['$SUFFIX'];
-   }
-   }*/
-
-   /**
 * Is the cache configuration file LocalSettings.php for the requested 
wiki fresh?
 *
 * @mediawikifarm-const
@@ -943,13 +924,6 @@
 */
function getMediaWikiConfig( $force = false ) {
 
-   // global $wgConf;
-
-   # In MediaWiki 1.16, $wgConf is not created by default
-   // if( is_null( $wgConf ) ) {
-   //  $wgConf = new SiteConfiguration();
-   // }
-
if( !$force && $this->isLocalSettingsFresh() ) {
return;
}
@@ -969,22 +943,6 @@
return;
}
 
-   # Populate wgConf
-   // $this->populatewgConf();
-
-   # Get specific configuration for this wiki
-   # Do not use SiteConfiguration::extractAllGlobals or the 
configuration caching would become
-   # ineffective and there would be inconsistencies in this process
-   // $this->configuration['general'] = $wgConf->getAll( $myWiki, 
$mySuffix, array() );
-
-   # For the permissions array, fix a small strangeness: when an 
existing default permission
-   # is true, it is not possible to make it false in the specific 
configuration
-   // if( array_key_exists( '+wgGroupPermissions', 
$wgConf->settings ) ) {
-   //  $this->configuration['general']['wgGroupPermissions'] = 
self::arrayMerge( $this->configuration['general']['wgGroupPermissions'],
-   //  $wgConf->get( '+wgGroupPermissions', $myWiki, 
$mySuffix )
-   //  );
-   // }
-
# Get specific configuration for this wiki
$this->populateSettings();
 
@@ -998,93 +956,6 @@
rename( $localSettingsFile . '.tmp', 
$localSettingsFile );
}
}
-
-   // $wgConf->siteParamsCallback = array( $this, 
'SiteConfigurationSiteParamsCallback' );
-   }
-
-   /**
-* Popuplate wgConf from config files.
-*
-* @SuppressWarnings(PHPMD.ElseExpression)
-* @SuppressWarnings(PHPMD.CyclomaticComplexity)
-* @codeCoverageIgnore
-*
-* @return bool Success.
-*/
-   function populatewgConf() {
-
-   global $wgConf;
-
-   foreach( $this->farmConfig['config'] as $configFile ) {
-
-   if( !is_array( $configFile ) ) {
-   continue;
-   }
-
-   # Replace variables
-   $configFile = $this->replaceVariables( $configFile );
-
-   # Executable config files
-   if( array_key_exists( 'executable', $configFile ) && 
$configFile['executable'] ) {
-
-   $this->configuration['execFiles'][] = 
$this->configDir . '/' . $configFile['file'];
-   continue;
-   }
-
-   $theseSettings = $this->readFile( $configFile['file'], 
$this->configDir );
-   if( $theseSettings === false ) {
-   # If a file is unavailable, skip it
-   continue;
-   }
-
-   # Key 'default' => no choice of the wiki
-   if( $configFile['key'] == 'default' ) {
-
-   foreach( $theseSettings as $setting => $value ) 
{
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Test: Do not merge

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325129

Change subject: Test: Do not merge
..

Test: Do not merge

Change-Id: I13c4d70291d895a1716e4611bf20f63ac84c80b4
---
M maintenance/postgres/archives/patch-user_former_groups.sql
M maintenance/postgres/archives/patch-user_properties.sql
M maintenance/postgres/tables.sql
3 files changed, 21 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/29/325129/1

diff --git a/maintenance/postgres/archives/patch-user_former_groups.sql 
b/maintenance/postgres/archives/patch-user_former_groups.sql
index 1ba011e..f49910e 100644
--- a/maintenance/postgres/archives/patch-user_former_groups.sql
+++ b/maintenance/postgres/archives/patch-user_former_groups.sql
@@ -1,5 +1,5 @@
 CREATE TABLE user_former_groups (
-  ufg_user   INTEGER  NULL  REFERENCES mwuser(user_id) ON DELETE CASCADE 
DEFERRABLE INITIALLY DEFERRED,
+  ufg_user   INTEGER  NULL  REFERENCES user(user_id) ON DELETE CASCADE 
DEFERRABLE INITIALLY DEFERRED,
   ufg_group  TEXT NOT NULL
 );
 CREATE UNIQUE INDEX ufg_user_group ON user_former_groups (ufg_user, ufg_group);
diff --git a/maintenance/postgres/archives/patch-user_properties.sql 
b/maintenance/postgres/archives/patch-user_properties.sql
index b40fa85..4741c5a 100644
--- a/maintenance/postgres/archives/patch-user_properties.sql
+++ b/maintenance/postgres/archives/patch-user_properties.sql
@@ -1,5 +1,5 @@
 CREATE TABLE user_properties(
-  up_user   INTEGER  NULL  REFERENCES mwuser(user_id) ON DELETE CASCADE,
+  up_user   INTEGER  NULL  REFERENCES user(user_id) ON DELETE CASCADE,
   up_property TEXT NOT NULL,
   up_value TEXT
 );
diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index 2273761..d13ef18 100644
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -34,7 +34,7 @@
 DROP TYPE IF EXISTS media_type CASCADE;
 
 CREATE SEQUENCE user_user_id_seq MINVALUE 0 START WITH 0;
-CREATE TABLE mwuser ( -- replace reserved word 'user'
+CREATE TABLE user ( -- replace reserved word 'user'
   user_id   INTEGER  NOT NULL  PRIMARY KEY DEFAULT 
nextval('user_user_id_seq'),
   user_name TEXT NOT NULL  UNIQUE,
   user_real_nameTEXT,
@@ -51,26 +51,26 @@
   user_editcountINTEGER,
   user_password_expires TIMESTAMPTZ NULL
 );
-CREATE INDEX user_email_token_idx ON mwuser (user_email_token);
+CREATE INDEX user_email_token_idx ON user (user_email_token);
 
 -- Create a dummy user to satisfy fk contraints especially with revisions
-INSERT INTO mwuser
+INSERT INTO user
   VALUES 
(DEFAULT,'Anonymous','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,now(),now());
 
 CREATE TABLE user_groups (
-  ug_user   INTEGER  NULL  REFERENCES mwuser(user_id) ON DELETE CASCADE 
DEFERRABLE INITIALLY DEFERRED,
+  ug_user   INTEGER  NULL  REFERENCES user(user_id) ON DELETE CASCADE 
DEFERRABLE INITIALLY DEFERRED,
   ug_group  TEXT NOT NULL
 );
 CREATE UNIQUE INDEX user_groups_unique ON user_groups (ug_user, ug_group);
 
 CREATE TABLE user_former_groups (
-  ufg_user   INTEGER  NULL  REFERENCES mwuser(user_id) ON DELETE CASCADE 
DEFERRABLE INITIALLY DEFERRED,
+  ufg_user   INTEGER  NULL  REFERENCES user(user_id) ON DELETE CASCADE 
DEFERRABLE INITIALLY DEFERRED,
   ufg_group  TEXT NOT NULL
 );
 CREATE UNIQUE INDEX ufg_user_group ON user_former_groups (ufg_user, ufg_group);
 
 CREATE TABLE user_newtalk (
-  user_id  INTEGER  NOT NULL  REFERENCES mwuser(user_id) ON 
DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+  user_id  INTEGER  NOT NULL  REFERENCES user(user_id) ON 
DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
   user_ip  TEXT NULL,
   user_last_timestamp  TIMESTAMPTZ
 );
@@ -130,7 +130,7 @@
   rev_page   INTEGER  NULL  REFERENCES page (page_id) ON 
DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
   rev_text_idINTEGER  NULL, -- FK
   rev_commentTEXT,
-  rev_user   INTEGER  NOT NULL  REFERENCES mwuser(user_id) ON 
DELETE RESTRICT DEFERRABLE INITIALLY DEFERRED,
+  rev_user   INTEGER  NOT NULL  REFERENCES user(user_id) ON DELETE 
RESTRICT DEFERRABLE INITIALLY DEFERRED,
   rev_user_text  TEXT NOT NULL,
   rev_timestamp  TIMESTAMPTZ  NOT NULL,
   rev_minor_edit SMALLINT NOT NULL  DEFAULT 0,
@@ -189,7 +189,7 @@
   ar_parent_id  INTEGER  NULL,
   ar_sha1   TEXT NOT NULL DEFAULT '',
   ar_commentTEXT,
-  ar_user   INTEGER  NULL  REFERENCES mwuser(user_id) ON 
DELETE SET NULL DEFERRABLE INITIALLY DEFERRED,
+  ar_user   INTEGER  NULL  REFERENCES user(user_id) ON DELETE 
SET NULL DEFERRABLE INITIALLY DEFERRED,
   ar_user_text  TEXT NOT NULL,
   ar_timestamp  TIMESTAMPTZ  NOT NULL,

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Add two questions for 2017 iteration

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add two questions for 2017 iteration
..


Add two questions for 2017 iteration

1. Specify if they are a paid staff or contract worker for any Wikimedia org
2. Specify if they are a board member for any Wikimedia org

Bug: T151371
Change-Id: Ie917ec4e3bba178a6898b323879f82ea81da6261
---
A data/db/migrations/20161202-update-questions-2017.sql
M data/db/schema.mysql
M data/i18n/en.json
M data/i18n/qqq.json
M data/templates/apply.html
M data/templates/review/view.html
M src/Forms/Apply.php
7 files changed, 72 insertions(+), 0 deletions(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/data/db/migrations/20161202-update-questions-2017.sql 
b/data/db/migrations/20161202-update-questions-2017.sql
new file mode 100644
index 000..3804105
--- /dev/null
+++ b/data/db/migrations/20161202-update-questions-2017.sql
@@ -0,0 +1,9 @@
+-- Alter schema for 2017 round
+
+ALTER TABLE scholarships
+  ADD COLUMN staff TINYINT(1) DEFAULT NULL AFTER engage10,
+  ADD COLUMN staffOrg VARCHAR(128) DEFAULT NULL AFTER staff,
+  ADD COLUMN board TINYINT(1) DEFAULT NULL AFTER staffOrg,
+  ADD COLUMN boardOrg VARCHAR(128) DEFAULT NULL AFTER board
+  ;
+
diff --git a/data/db/schema.mysql b/data/db/schema.mysql
index 7ec4004..75aad19 100644
--- a/data/db/schema.mysql
+++ b/data/db/schema.mysql
@@ -44,6 +44,10 @@
   , engage8 TINYINT(1) DEFAULT NULL
   , engage9 TINYINT(1) DEFAULT NULL
   , engage10TINYINT(1) DEFAULT NULL
+  , staff   TINYINT(1) DEFAULT NULL
+  , staffOrgVARCHAR(128) DEFAULT NULL
+  , board   TINYINT(1) DEFAULT NULL
+  , boardOrgVARCHAR(128) DEFAULT NULL
   , involvement TEXT
   , contributionTEXT
   , experience  TEXT
diff --git a/data/i18n/en.json b/data/i18n/en.json
index 4aa6aa4..603a8d8 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -73,6 +73,8 @@
"form-wmfagree-error": "To proceed, please agree to the applicant 
rights condition.",
"form-wmfAgreeName-error": "Please fill in your full name in the given 
field to agree to the terms and conditions.",
"form-engage10-error": "Please select how you have engaged in the 
Wikimedia movement",
+   "form-staffOrg-error": "Please indicate the Wikimedia organization 
you're a paid or contract worker for.",
+   "form-boardOrg-error": "Please indicate the Wikimedia organization 
you're a board member for.",
 
"required-field": "Required field",
 
@@ -118,6 +120,12 @@
"form-engagement-option8": "Participant in Wikimedia organized events 
(e.g. photographer contributing to Wiki Loves Monuments, workshop attendee)",
"form-engagement-option9": "Organizer of Wikimedia events (e.g. WLM, 
edit-a-thons)",
"form-engagement-option10": "None of the above",
+
+   "form-wikimedia-staff": "Are you currently a paid or contract staff of 
any Wikimedia organization?",
+   "form-wikimedia-board": "Are you currently board member of any 
Wikimedia organization?",
+   "form-staff-organization": "If yes, please identify the Wikimedia 
organization here:",
+   "form-board-organization": "If yes, please identify the Wikimedia 
organization here:",
+
"form-community": "Primary language community on wiki:",
"form-active-project": "Most active Wikimedia project:",
"form-active-project2": "Second most active Wikimedia project (if 
applicable):",
@@ -299,6 +307,8 @@
"review-view-study": "Field of study",
"review-view-username": "Username:",
"review-view-alt-users": "Other usernames:",
+   "review-view-staff-member": "Staff member for:",
+   "review-view-board-member": "Board member for:",
"review-view-community": "Primary language community:",
"review-view-active-projects": "Main wiki project:",
"review-view-secondary-project": "Secondary wiki project:",
diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json
index d29d4ce..c076e2c 100644
--- a/data/i18n/qqq.json
+++ b/data/i18n/qqq.json
@@ -70,6 +70,8 @@
"form-wmfagree-error": "Error message shown to user when user does not 
agree to applicant rights and conditions.",
"form-wmfAgreeName-error": "Error message shown to user when user does 
not enter full name agreeing the terms and conditions.",
"form-engage10-error": "Error message shown to user when user does not 
select any types of engagement",
+   "form-staffOrg-error": "Error message shown to user when they did not 
indicate the Wikimedia organization they work for",
+   "form-boardOrg-error": "Error message shown to user when they did not 
indicate the Wikimedia organization they are a board member for",
"required-field": 

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Special config case

[Seb35 (Code Review)]

Seb35 has submitted this change and it was merged.

Change subject: Special config case
..


Special config case

In the special case where the config key is a single wiki, the config file
does not have a 'parameter-wiki-value' structure but only 'parameter-value'

Change-Id: I892d1151a0b4b540fc85802966ff3c2538300671
---
M src/MediaWikiFarm.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Seb35: Verified; Looks good to me, approved



diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index be28e78..d7a3315 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -1149,7 +1149,7 @@
}
 
# Key 'default' => no choice of the wiki
-   if( $configFile['key'] == 'default' ) {
+   if( $configFile['key'] == 'default' || ( strpos( 
$configFile['key'], '*' ) === false && $this->variables['$WIKIID'] == 
$configFile['key'] ) ) {
 
foreach( $theseSettings as $setting => $value ) 
{
 
@@ -1168,7 +1168,7 @@
}
 
# Other key
-   else {
+   elseif( strpos( $configFile['key'], '*' ) !== false ) {
 
// $tags = array(); # @todo data sources not 
implemented, but code to selection parameters from a tag is below
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I892d1151a0b4b540fc85802966ff3c2538300671
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 
Gerrit-Reviewer: Seb35 
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...SocialProfile[master]: Fix fatal when accessing Special:RemoveRelationship directly

[Jack Phoenix (Code Review)]

Jack Phoenix has submitted this change and it was merged.

Change subject: Fix fatal when accessing Special:RemoveRelationship directly
..


Fix fatal when accessing Special:RemoveRelationship directly

Bug: T152327
Change-Id: Ia59b1a0cd2f1bc71d1bc57bcac36f6541d9931f8
---
M UserRelationship/SpecialRemoveRelationship.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/UserRelationship/SpecialRemoveRelationship.php 
b/UserRelationship/SpecialRemoveRelationship.php
index 2940cc2..8c0d073 100644
--- a/UserRelationship/SpecialRemoveRelationship.php
+++ b/UserRelationship/SpecialRemoveRelationship.php
@@ -52,7 +52,7 @@
 
$usertitle = Title::newFromDBkey( $this->getRequest()->getVal( 
'user' ) );
if ( !$usertitle ) {
-   $ot->setPageTitle( $this->msg( 'ur-error-title' 
)->plain() );
+   $out->setPageTitle( $this->msg( 'ur-error-title' 
)->plain() );
$out->addWikiMsg( 'ur-add-no-user' );
return false;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/325128
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia59b1a0cd2f1bc71d1bc57bcac36f6541d9931f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Jack Phoenix 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Fix fatal when accessing Special:RemoveRelationship directly

[Jack Phoenix (Code Review)]

Jack Phoenix has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325128

Change subject: Fix fatal when accessing Special:RemoveRelationship directly
..

Fix fatal when accessing Special:RemoveRelationship directly

Bug: T152327
Change-Id: Ia59b1a0cd2f1bc71d1bc57bcac36f6541d9931f8
---
M UserRelationship/SpecialRemoveRelationship.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile 
refs/changes/28/325128/1

diff --git a/UserRelationship/SpecialRemoveRelationship.php 
b/UserRelationship/SpecialRemoveRelationship.php
index 2940cc2..8c0d073 100644
--- a/UserRelationship/SpecialRemoveRelationship.php
+++ b/UserRelationship/SpecialRemoveRelationship.php
@@ -52,7 +52,7 @@
 
$usertitle = Title::newFromDBkey( $this->getRequest()->getVal( 
'user' ) );
if ( !$usertitle ) {
-   $ot->setPageTitle( $this->msg( 'ur-error-title' 
)->plain() );
+   $out->setPageTitle( $this->msg( 'ur-error-title' 
)->plain() );
$out->addWikiMsg( 'ur-add-no-user' );
return false;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/325128
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia59b1a0cd2f1bc71d1bc57bcac36f6541d9931f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Special config case

[Seb35 (Code Review)]

Seb35 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325127

Change subject: Special config case
..

Special config case

In the special case where the config key is a single wiki, the config file
does not have a 'parameter-wiki-value' structure but only 'parameter-value'

Change-Id: I892d1151a0b4b540fc85802966ff3c2538300671
---
M src/MediaWikiFarm.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm 
refs/changes/27/325127/1

diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index be28e78..d7a3315 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -1149,7 +1149,7 @@
}
 
# Key 'default' => no choice of the wiki
-   if( $configFile['key'] == 'default' ) {
+   if( $configFile['key'] == 'default' || ( strpos( 
$configFile['key'], '*' ) === false && $this->variables['$WIKIID'] == 
$configFile['key'] ) ) {
 
foreach( $theseSettings as $setting => $value ) 
{
 
@@ -1168,7 +1168,7 @@
}
 
# Other key
-   else {
+   elseif( strpos( $configFile['key'], '*' ) !== false ) {
 
// $tags = array(); # @todo data sources not 
implemented, but code to selection parameters from a tag is below
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I892d1151a0b4b540fc85802966ff3c2538300671
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Show a prominent flag on review screen if applicant is a minor

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Show a prominent flag on review screen if applicant is a minor
..


Show a prominent flag on review screen if applicant is a minor

Bug: T151375
Change-Id: I283c379827a5b81ff59a167df72d7d19c110cd03
---
M data/templates/inc/helpers.html
M data/templates/review/view.html
M public/css/main.css
3 files changed, 15 insertions(+), 2 deletions(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/data/templates/inc/helpers.html b/data/templates/inc/helpers.html
index 3691431..86aac52 100644
--- a/data/templates/inc/helpers.html
+++ b/data/templates/inc/helpers.html
@@ -22,7 +22,12 @@
 {% endmacro %}
 
 {% macro yearsOld( dob ) %}
-{{ date( dob ).diff( date( 'now' ) ).format( '%Y' ) }}
+  {% set age = date( dob ).diff( date( 'now' ) ).format( '%Y' ) %}
+  {% if age > 18 %}
+({{ age }})
+  {% else %}
+{{ age }}
+  {% endif %}
 {% endmacro %}
 
 {% macro gender( ctx, g ) %}
diff --git a/data/templates/review/view.html b/data/templates/review/view.html
index 541a69c..038fcbf 100644
--- a/data/templates/review/view.html
+++ b/data/templates/review/view.html
@@ -79,7 +79,7 @@
 {{ 'review-view-dateofbirth'|message }}
 
   {% if schol.dob is not empty %}
-  {{ schol.dob }} ({{ helpers.yearsOld( schol.dob ) }})
+  {{ schol.dob }} {{ helpers.yearsOld( schol.dob ) }}
   {% else %}
   {{ 'review-view-not-specified'|message }}
   {% endif %}
diff --git a/public/css/main.css b/public/css/main.css
index dd1edd3..880a575 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -119,3 +119,11 @@
 a.sortable.sorted-desc {
   background-image: 
url(data:image/gif;base64,R0lGODlhBwAEAIABACMtMP///yH5BAEKAAEALAAHAAQAAAIIhA+BGWoNWSgAOw==);
 }
+
+.minority-badge {
+  background-color: firebrick;
+  color: white;
+  font-size: 14px;
+  border-radius: 10px;
+  padding: 3px;
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/324736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I283c379827a5b81ff59a167df72d7d19c110cd03
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Add a missing error message key

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add a missing error message key
..


Add a missing error message key

Change-Id: Ie27a36899e860f6c2f5584d81f5594f97589d0f1
---
M data/i18n/en.json
M data/i18n/qqq.json
2 files changed, 3 insertions(+), 1 deletion(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/data/i18n/en.json b/data/i18n/en.json
index 5a08ade..4aa6aa4 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -41,7 +41,8 @@
"form-scholarship-either": "I am applying for a full scholarship, but 
would be able to attend if awarded a partial scholarship.",
"form-scholarship-partial": "I am applying for a Partial scholarship.",
 
-   "form-error": "Your form has errors.  Please correct the following 
errors and submit the form again.",
+   "form-type-error": "Please select a scholarship type.",
+   "form-error": "Your form has errors. Please correct the following 
errors and submit the form again.",
"form-save-error": "There was a system error saving your application. 
Please try again.",
"form-gender_other-error": "Please describe your self-defined gender 
identity.",
"form-goals-error": "Please explain your experience of attending 
Wikimania previously and your goals for attending this year.",
diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json
index 3ae95fc..d29d4ce 100644
--- a/data/i18n/qqq.json
+++ b/data/i18n/qqq.json
@@ -39,6 +39,7 @@
"form-scholarship-either": "Scholarship type option",
"form-scholarship-partial": "Scholarship type option",
"form-error": "Error message shown to user when scholarship request 
form submission is incomplete",
+   "form-type-error": "Error message shown to user when they have not 
selected a scholarship type",
"form-save-error": "Error message shown to user when a system error 
occurred saving the application data",
"form-gender_other-error": "Error message shown to user when Gender 
\"other\" is selected and no description of self-defined gender identity is 
provided",
"form-goals-error": "Error message shown to user when user has been a 
previous scholarship recepient and has not filled out his experience and goals 
for attending this year",

-- 
To view, visit https://gerrit.wikimedia.org/r/324721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie27a36899e860f6c2f5584d81f5594f97589d0f1
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Remove Final:Full report from app

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove Final:Full report from app
..


Remove Final:Full report from app

Bug: T151377
Change-Id: I492ff77c21c82092921ee015238b63bbd11c5497
---
M data/templates/base_auth.html
M src/App.php
D src/Controllers/Review/Scores.php
3 files changed, 0 insertions(+), 48 deletions(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/data/templates/base_auth.html b/data/templates/base_auth.html
index 39f3e53..4bc9a65 100644
--- a/data/templates/base_auth.html
+++ b/data/templates/base_auth.html
@@ -31,7 +31,6 @@
 {{ 'phase-2'|message 
}}
 {% if isadmin|default(false) %}
 
-{{ 'final-full'|message 
}}
 {{ 
'nav-reports-export'|message }}
 {% endif %}
   
diff --git a/src/App.php b/src/App.php
index 9a94bb8..272d31b 100644
--- a/src/App.php
+++ b/src/App.php
@@ -432,12 +432,6 @@
$page();
} )->name( 'review_countries' );
 
-   $slim->get( 'scores', function () use ( $slim ) {
-   $page = new Controllers\Review\Scores( $slim );
-   $page->setDao( $slim->applyDao );
-   $page();
-   } )->name( 'review_scores' );
-
$slim->get( 'regions', function () use ( $slim ) {
$page = new Controllers\Review\Regions( $slim );
$page->setDao( $slim->applyDao );
diff --git a/src/Controllers/Review/Scores.php 
b/src/Controllers/Review/Scores.php
deleted file mode 100644
index 471e7a6..000
--- a/src/Controllers/Review/Scores.php
+++ /dev/null
@@ -1,41 +0,0 @@
-http://www.gnu.org/licenses/>.
- *
- * @file
- */
-
-namespace Wikimania\Scholarship\Controllers\Review;
-
-use Wikimedia\Slimapp\Controller;
-
-/**
- * List applications by score.
- *
- * @author Bryan Davis 
- * @copyright © 2013 Bryan Davis and Wikimedia Foundation.
- */
-class Scores extends Controller {
-
-   protected function handleGet() {
-   $rows = $this->dao->getP2List( 'All' );
-   $this->view->set( 'records', $rows );
-   $this->render( 'review/scores.html' );
-   }
-
-}

-- 
To view, visit https://gerrit.wikimedia.org/r/324715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I492ff77c21c82092921ee015238b63bbd11c5497
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: BryanDavis 
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...Contributors[master]: Update Maintenance script to use $this->requireExtension()

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update Maintenance script to use $this->requireExtension()
..


Update Maintenance script to use $this->requireExtension()

Added $this->requireExtension() check in PopulateContributorsTable.php script

Bug: T152139
Change-Id: I05b940506889f795d76f433b3c8ae8db8ec8e1a4
---
M maintenance/PopulateContributorsTable.php
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/maintenance/PopulateContributorsTable.php 
b/maintenance/PopulateContributorsTable.php
index c4ed5ac..f351590 100644
--- a/maintenance/PopulateContributorsTable.php
+++ b/maintenance/PopulateContributorsTable.php
@@ -16,6 +16,7 @@
public function __construct() {
parent::__construct();
$this->addDescription( "Populates the contributor's table with 
contributor's data" );
+   $this->requireExtension( 'Contributors' );
$this->setBatchSize( 100 );
}
 
@@ -87,4 +88,4 @@
 }
 
 $maintClass = "PopulateContributorsTable";
-require_once RUN_MAINTENANCE_IF_MAIN;
\ No newline at end of file
+require_once RUN_MAINTENANCE_IF_MAIN;

-- 
To view, visit https://gerrit.wikimedia.org/r/325124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I05b940506889f795d76f433b3c8ae8db8ec8e1a4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Contributors
Gerrit-Branch: master
Gerrit-Owner: Filip 
Gerrit-Reviewer: Legoktm 
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...CreditsSource[master]: Update Maintenance script to use $this->requireExtension()

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update Maintenance script to use $this->requireExtension()
..


Update Maintenance script to use $this->requireExtension()

Added $this->requireExtension() check in swsite.php script

Bug: T152139
Change-Id: I6a62835b3fc254a674a30698acc7748bb1010c13
---
M maintenance/swsite.php
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/maintenance/swsite.php b/maintenance/swsite.php
index 150d43b..8256aa7 100644
--- a/maintenance/swsite.php
+++ b/maintenance/swsite.php
@@ -30,6 +30,7 @@
public function __construct() {
parent::__construct();
$this->mDescription = 'Fix swauthor & srcwork data after swsite 
introduction';
+   $this->requireExtension( 'CreditsSource' );
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/325125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a62835b3fc254a674a30698acc7748bb1010c13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CreditsSource
Gerrit-Branch: master
Gerrit-Owner: Filip 
Gerrit-Reviewer: Legoktm 
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...GeoData[master]: Update Maintenance script to use $this->requireExtension()

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update Maintenance script to use $this->requireExtension()
..


Update Maintenance script to use $this->requireExtension()

Added $this->requireExtension() check in updateIndexGranularity.php script

Bug: T152139
Change-Id: I4e2dd4c9859f084cdfd00528b3e5b123018f542e
---
M maintenance/updateIndexGranularity.php
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  MaxSem: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/maintenance/updateIndexGranularity.php 
b/maintenance/updateIndexGranularity.php
index 0c83a39..ee25935 100644
--- a/maintenance/updateIndexGranularity.php
+++ b/maintenance/updateIndexGranularity.php
@@ -13,6 +13,7 @@
public function __construct() {
parent::__construct();
$this->mDescription = 'Updates GeoData database after 
$wgGeoDataIndexGranularity has been changed';
+   $this->requireExtension( 'GeoData' );
}
 
public function execute() {

-- 
To view, visit https://gerrit.wikimedia.org/r/325126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4e2dd4c9859f084cdfd00528b3e5b123018f542e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: Filip 
Gerrit-Reviewer: MaxSem 
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...GeoData[master]: Update Maintenance script to use $this->requireExtension()

[Filip (Code Review)]

Filip has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325126

Change subject: Update Maintenance script to use $this->requireExtension()
..

Update Maintenance script to use $this->requireExtension()

Added $this->requireExtension() check in updateIndexGranularity.php script

Bug: T152139
Change-Id: I4e2dd4c9859f084cdfd00528b3e5b123018f542e
---
M maintenance/updateIndexGranularity.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GeoData 
refs/changes/26/325126/1

diff --git a/maintenance/updateIndexGranularity.php 
b/maintenance/updateIndexGranularity.php
index 0c83a39..ee25935 100644
--- a/maintenance/updateIndexGranularity.php
+++ b/maintenance/updateIndexGranularity.php
@@ -13,6 +13,7 @@
public function __construct() {
parent::__construct();
$this->mDescription = 'Updates GeoData database after 
$wgGeoDataIndexGranularity has been changed';
+   $this->requireExtension( 'GeoData' );
}
 
public function execute() {

-- 
To view, visit https://gerrit.wikimedia.org/r/325126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e2dd4c9859f084cdfd00528b3e5b123018f542e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: Filip 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CreditsSource[master]: Update Maintenance script to use $this->requireExtension()

[Filip (Code Review)]

Filip has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325125

Change subject: Update Maintenance script to use $this->requireExtension()
..

Update Maintenance script to use $this->requireExtension()

Added $this->requireExtension() check in swsite.php script

Bug: T152139
Change-Id: I6a62835b3fc254a674a30698acc7748bb1010c13
---
M maintenance/swsite.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CreditsSource 
refs/changes/25/325125/1

diff --git a/maintenance/swsite.php b/maintenance/swsite.php
index 150d43b..8256aa7 100644
--- a/maintenance/swsite.php
+++ b/maintenance/swsite.php
@@ -30,6 +30,7 @@
public function __construct() {
parent::__construct();
$this->mDescription = 'Fix swauthor & srcwork data after swsite 
introduction';
+   $this->requireExtension( 'CreditsSource' );
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/325125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a62835b3fc254a674a30698acc7748bb1010c13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CreditsSource
Gerrit-Branch: master
Gerrit-Owner: Filip 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Contributors[master]: Update Maintenance script to use $this->requireExtension()

[Filip (Code Review)]

Filip has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325124

Change subject: Update Maintenance script to use $this->requireExtension()
..

Update Maintenance script to use $this->requireExtension()

Added $this->requireExtension() check in PopulateContributorsTable.php script

Bug: T152139
Change-Id: I05b940506889f795d76f433b3c8ae8db8ec8e1a4
---
M maintenance/PopulateContributorsTable.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Contributors 
refs/changes/24/325124/1

diff --git a/maintenance/PopulateContributorsTable.php 
b/maintenance/PopulateContributorsTable.php
index c4ed5ac..954c12e 100644
--- a/maintenance/PopulateContributorsTable.php
+++ b/maintenance/PopulateContributorsTable.php
@@ -16,6 +16,7 @@
public function __construct() {
parent::__construct();
$this->addDescription( "Populates the contributor's table with 
contributor's data" );
+   $this->requireExtension( 'Contributors' );  
$this->setBatchSize( 100 );
}
 
@@ -87,4 +88,4 @@
 }
 
 $maintClass = "PopulateContributorsTable";
-require_once RUN_MAINTENANCE_IF_MAIN;
\ No newline at end of file
+require_once RUN_MAINTENANCE_IF_MAIN;

-- 
To view, visit https://gerrit.wikimedia.org/r/325124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I05b940506889f795d76f433b3c8ae8db8ec8e1a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Contributors
Gerrit-Branch: master
Gerrit-Owner: Filip 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Make `box-shadow` Less vars follow naming s...

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325123

Change subject: MediaWiki theme: Make `box-shadow` Less vars follow naming 
scheme
..

MediaWiki theme: Make `box-shadow` Less vars follow naming scheme

Changing `box-shadow` Less variables to follow general naming scheme
with state modifier `-focus` at end of variable. Also removing an
obsolete variabel and introducing a general widget one for
transition purposes.

Change-Id: Icfd621b81453b03a40cdcb89e9568461ea76eb24
---
M src/themes/mediawiki/common.less
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/widgets.less
3 files changed, 24 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/23/325123/1

diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index 3553a94..1314c29 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -98,12 +98,12 @@
 
 @box-shadow-dialog: 0 0.15em 0 0 rgba( 0, 0, 0, 0.15 );
 @box-shadow-menu: @box-shadow-dialog;
-@box-shadow-active: inset 0 0 0 1px @color-progressive-active;
-@box-shadow-focus-default: inset 0 0 0 1px @color-progressive;
-@box-shadow-focus-inset: inset 0 0 0 1px @color-progressive, inset 0 0 0 2px 
@color-default-light;
-@box-shadow-focus-readonly: inset 0 0 0 1px #c8ccd1;
+@box-shadow-widget: inset 0 0 0 1px @background-color-default;
+@box-shadow-widget-focus: inset 0 0 0 1px @color-progressive;
+@box-shadow-progressive-focus: inset 0 0 0 1px @color-progressive, inset 0 0 0 
2px @color-default-light;
+@box-shadow-input-binary-active: inset 0 0 0 1px @color-progressive-active;
+@box-shadow-readonly-focus: inset 0 0 0 1px #c8ccd1;
 @box-shadow-disabled-filled: inset 0 0 0 1px @color-disabled-filled;
-@box-shadow-light-inset: inset 0 0 0 1px @color-default-light;
 
 @line-height-default: 1.4;
 
diff --git a/src/themes/mediawiki/elements.less 
b/src/themes/mediawiki/elements.less
index fccc6e0..4c39e8b 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -102,7 +102,7 @@
color: @color-default-hover;
}
&:focus {
-   box-shadow: @box-shadow-focus-default, 
0 0 0 1px @color-progressive-focus;
+   box-shadow: @box-shadow-widget-focus, 0 
0 0 1px @color-progressive-focus;
}
}
 
@@ -232,8 +232,8 @@
}
 
&:focus {
-   border-color: @color-progressive-focus;
-   box-shadow: @box-shadow-focus-default;
+   border-color: 
@border-color-default-focus;
+   box-shadow: @box-shadow-widget-focus;
}
}
 
@@ -251,7 +251,7 @@
 
&:focus {
border-color: @color-progressive-focus;
-   box-shadow: inset 0 0 0 1px 
@color-progressive-focus, inset 0 0 0 2px @color-default-light;
+   box-shadow: 
@box-shadow-progressive-focus;
}
}
 
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index 3311f90..60ff9e6 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -179,7 +179,7 @@
&:focus {
border-color: @border-color-default-focus;
outline: 0;
-   box-shadow: @box-shadow-focus-default;
+   box-shadow: @box-shadow-widget-focus;
}
 
.oo-ui-iconElement-icon,
@@ -471,12 +471,12 @@
&:active:focus + span {
background-color: @color-progressive-active;
border-color: @border-color-input-binary-active;
-   box-shadow: @box-shadow-active;
+   box-shadow: @box-shadow-input-binary-active;
}
 
&:focus + span {
border-color: @color-progressive;
-   box-shadow: @box-shadow-focus-default;
+   box-shadow: @box-shadow-widget-focus;
}
 
&:checked {
@@ -496,13 +496,13 @@
&:active:focus + span {
background-color: 
@background-color-input-binary-active;
border-color: @border-color-input-binary-active;
-   box-shadow: 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Follow-up I863367b8, Ic9db0829: These two commits conflicted

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325122

Change subject: Follow-up I863367b8, Ic9db0829: These two commits conflicted
..

Follow-up I863367b8, Ic9db0829: These two commits conflicted

Change-Id: I5bb7dc90764bb6178b97c96f646c8040d8651a58
---
M modules/beta/files/shinken.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/325122/1

diff --git a/modules/beta/files/shinken.cfg b/modules/beta/files/shinken.cfg
index c638ef6..6389c7e 100644
--- a/modules/beta/files/shinken.cfg
+++ b/modules/beta/files/shinken.cfg
@@ -88,5 +88,5 @@
 service_description Mediawiki Error Rate
 host_name   graphite-labs
 use generic-service
-check_command   
check_graphite_threshold!https://graphite-labs.wikimedia.org!10!transformNull(sumSeries(logstash.rate.mediawiki.fatal.ERROR.sum,
 logstash.rate.mediawiki.exception.ERROR.sum), 0)!1!10!5min!1!--over
+check_command   
check_graphite_threshold!https://graphite-labs.wikimedia.org!10!transformNull(sumSeries(logstash.rate.mediawiki.fatal.ERROR.sum,
 logstash.rate.mediawiki.exception.ERROR.sum), 0)!1!10!5min!0min!1!--over
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/325122
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bb7dc90764bb6178b97c96f646c8040d8651a58
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Add DataWidget to generate hidden input

[Victorbarbu (Code Review)]

Victorbarbu has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325121

Change subject: Add DataWidget to generate hidden input
..

Add DataWidget to generate hidden input

Bug: T152321
Change-Id: I382d1420ae007683b64da9a3f30b57e78252db8a
---
A php/widgets/DataWidget.php
1 file changed, 44 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/21/325121/1

diff --git a/php/widgets/DataWidget.php b/php/widgets/DataWidget.php
new file mode 100644
index 000..48c2f82
--- /dev/null
+++ b/php/widgets/DataWidget.php
@@ -0,0 +1,44 @@
+setAttributes( [
+   'type' => 'hidden',
+   'value' => $config['value'],
+   'name' => $config['name'],
+   ] );
+   $this->removeAttributes( [ 'aria-disabled' ] );
+   }
+
+   /**
+* This is not intended to be infusable
+* @return bool
+*/
+   public function isInfusable() {
+   return false;
+   }
+
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/325121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I382d1420ae007683b64da9a3f30b57e78252db8a
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Victorbarbu 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: WIP: registration: Add possibility to set CONTENT_MODEL_ and...

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325120

Change subject: WIP: registration: Add possibility to set CONTENT_MODEL_ and 
CONTENT_FORMAT_ constants
..

WIP: registration: Add possibility to set CONTENT_MODEL_ and CONTENT_FORMAT_ 
constants

Bug: T108285
Change-Id: Icee5004a64d50b1cc54ad376b599184111609685
---
M docs/extension.schema.json
M includes/registration/ExtensionProcessor.php
2 files changed, 66 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/20/325120/1

diff --git a/docs/extension.schema.json b/docs/extension.schema.json
index 30feaef..57949db 100644
--- a/docs/extension.schema.json
+++ b/docs/extension.schema.json
@@ -527,7 +527,26 @@
"description": "Mapping of model ID to class name",
"patternProperties": {
"^[A-Za-z]+$": {
-   "type": "string"
+   "type": [ "string", "object" ],
+   "properties": {
+   "handler": {
+   "type": "string",
+   "description": "The 
full qualified class name, which handles the content model."
+   },
+   "model_constant": {
+   "type": "string",
+   "description": "The 
name of the content model constant (without CONTENT_MODEL_).",
+   "default": "Defaults to 
a computation of \"CONTENT_MODEL_\" and the key of this object in uppercase 
letters. E.g. if the key of this object is \"Test\", the constant name would be 
\"CONTENT_MODEL_TEST\"."
+   },
+   "format_constant": {
+   "type": "string",
+   "description": "The 
name of the content format constant (withhout CONTENT_FORMAT_). If not set, the 
constant will not be set!"
+   },
+   "format": {
+   "type": "string",
+   "description": "The 
name of the format of the content handler, will be the value of the 
CONTENT_FORMAT_ constant. If not set, the constant CONTENT_FORMAT_ will not be 
set!"
+   }
+   }
}
}
},
diff --git a/includes/registration/ExtensionProcessor.php 
b/includes/registration/ExtensionProcessor.php
index 207f884..d227a80 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -2,6 +2,8 @@
 
 class ExtensionProcessor implements Processor {
 
+   const CONTENT_MODEL_CONSTANT_PREFIX = 'CONTENT_MODEL_';
+   const CONTENT_FORMAT_CONSTANT_PREFIX = 'CONTENT_FORMAT_';
/**
 * Keys that should be set to $GLOBALS
 *
@@ -21,7 +23,6 @@
'CentralIdLookupProviders',
'ChangeCredentialsBlacklist',
'ConfigRegistry',
-   'ContentHandlers',
'DefaultUserOptions',
'ExtensionEntryPointListFiles',
'ExtensionFunctions',
@@ -177,6 +178,7 @@
$this->extractExtensionMessagesFiles( $dir, $info );
$this->extractMessagesDirs( $dir, $info );
$this->extractNamespaces( $info );
+   $this->extractContentHandlers( $info );
$this->extractResourceLoaderModules( $dir, $info );
$this->extractServiceWiringFiles( $dir, $info );
$this->extractParserTestFiles( $dir, $info );
@@ -274,6 +276,49 @@
}
}
 
+   /**
+* Register ContentHandlers with the appropriate global settings
+* @param array $info
+* @throws MWException If one ContentHandler is already registered or 
the format of the
+*  ContentHandler definition is invalid.
+*/
+   protected function extractContentHandlers( array $info ) {
+   if ( !isset( $info['ContentHandlers'] ) ) {
+   return;
+   }
+
+   foreach ( $info['ContentHandlers'] as $chName => $chData ) {
+   $chConstant = self::CONTENT_MODEL_CONSTANT_PREFIX;
+   if ( isset( 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: deployment-prep: Follow-up Iaff51065: CONTENT_MODEL_FLOW_BOA...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: deployment-prep: Follow-up Iaff51065: CONTENT_MODEL_FLOW_BOARD 
is no longer set by Flow.php
..


deployment-prep: Follow-up Iaff51065: CONTENT_MODEL_FLOW_BOARD is no longer set 
by Flow.php

Production will need to have the same change made before the next train
deployment, but right now I'm dealing with deployment-prep which runs master
and is already broken by this.

Change-Id: Id62d8d77c0aa591b875c83eb57ce033cff877a49
---
M wmf-config/CommonSettings-labs.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Alex Monk: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 5ebafa1..0c39c43 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -72,7 +72,7 @@
191 => true,
];
 
-   $wgNamespaceContentModels[ 191 ] = CONTENT_MODEL_FLOW_BOARD;
+   $wgNamespaceContentModels[ 191 ] = 'flow-board'; // 
CONTENT_MODEL_FLOW_BOARD
 }
 
 if ( $wmgUseContentTranslation ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/325119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id62d8d77c0aa591b875c83eb57ce033cff877a49
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Florianschmidtwelzow 
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]: deployment-prep: Follow-up I3b706396: no more wg = wmg for t...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: deployment-prep: Follow-up I3b706396: no more wg = wmg for this 
variable
..


deployment-prep: Follow-up I3b706396: no more wg = wmg for this variable

Change-Id: I066329d5e1d176d69ca0593cfb3e02e4396c3cba
---
M wmf-config/mobile-labs.php
1 file changed, 0 insertions(+), 2 deletions(-)

Approvals:
  Alex Monk: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/mobile-labs.php b/wmf-config/mobile-labs.php
index 131bf50..a27e368 100644
--- a/wmf-config/mobile-labs.php
+++ b/wmf-config/mobile-labs.php
@@ -18,8 +18,6 @@
 
 $wgMFForceSecureLogin = false;
 
-$wgMFMobileFormatterHeadings = $wmgMFMobileFormatterHeadings;
-
 // T49647
 $wgHooks['EnterMobileMode'][] = function() {
global $wgCentralAuthCookieDomain, $wgHooks;

-- 
To view, visit https://gerrit.wikimedia.org/r/325116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I066329d5e1d176d69ca0593cfb3e02e4396c3cba
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Florianschmidtwelzow 
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]: deployment-prep: Follow-up Iaff51065: CONTENT_MODEL_FLOW_BOA...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325119

Change subject: deployment-prep: Follow-up Iaff51065: CONTENT_MODEL_FLOW_BOARD 
is no longer set by Flow.php
..

deployment-prep: Follow-up Iaff51065: CONTENT_MODEL_FLOW_BOARD is no longer set 
by Flow.php

Production will need to have the same change made before the next train
deployment, but right now I'm dealing with deployment-prep which runs master
and is already broken by this.

Change-Id: Id62d8d77c0aa591b875c83eb57ce033cff877a49
---
M wmf-config/CommonSettings-labs.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/19/325119/1

diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 5ebafa1..0c39c43 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -72,7 +72,7 @@
191 => true,
];
 
-   $wgNamespaceContentModels[ 191 ] = CONTENT_MODEL_FLOW_BOARD;
+   $wgNamespaceContentModels[ 191 ] = 'flow-board'; // 
CONTENT_MODEL_FLOW_BOARD
 }
 
 if ( $wmgUseContentTranslation ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/325119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id62d8d77c0aa591b875c83eb57ce033cff877a49
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Don't let extensions load other extensions lately

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325117

Change subject: Don't let extensions load other extensions lately
..

Don't let extensions load other extensions lately

ExtensionRegistry now offers a way to prevent loading any extension
after the queue was marked as finish. This allows us to have a
defined amount of extensions loaded at a specific time, the set of
extensions isn't allowed to be changed later. This is a requirement
for extensions/skins that depends on other extensions, so that
dependencies can't be loaded after the Setup is already finished.

Change-Id: I09b306bd6f6ccf4210f36be0118e7f17f2c3d264
---
M includes/Setup.php
M includes/registration/ExtensionRegistry.php
2 files changed, 24 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/17/325117/1

diff --git a/includes/Setup.php b/includes/Setup.php
index 9f722af..ff948df 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -38,6 +38,8 @@
 
 // If any extensions are still queued, force load them
 ExtensionRegistry::getInstance()->loadFromQueue();
+// Don't let any other extensions load
+ExtensionRegistry::getInstance()->finish();
 
 // Check to see if we are at the file scope
 if ( !isset( $wgVersion ) ) {
diff --git a/includes/registration/ExtensionRegistry.php 
b/includes/registration/ExtensionRegistry.php
index b5c70e9..0b67b17 100644
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -60,6 +60,13 @@
protected $queued = [];
 
/**
+* Whether we are done loading things
+*
+* @var bool
+*/
+   private $finished = false;
+
+   /**
 * Items in the JSON file that aren't being
 * set as globals
 *
@@ -120,6 +127,12 @@
return;
}
 
+   if ( $this->finished ) {
+   throw new MWException(
+   "The following paths tried to load late: " . 
implode( ', ', $this->queued )
+   );
+   }
+
// A few more things to vary the cache on
$versions = [
'registration' => self::CACHE_VERSION,
@@ -165,6 +178,15 @@
}
 
/**
+* After this is called, no more extensions can be loaded
+*
+* @since 1.29
+*/
+   public function finish() {
+   $this->finished = true;
+   }
+
+   /**
 * Process a queue of extensions and return their extracted data
 *
 * @param array $queue keys are filenames, values are ignored

-- 
To view, visit https://gerrit.wikimedia.org/r/325117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I09b306bd6f6ccf4210f36be0118e7f17f2c3d264
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: registration: Generalize CoreVersionChecker to VersionChecker

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325118

Change subject: registration: Generalize CoreVersionChecker to VersionChecker
..

registration: Generalize CoreVersionChecker to VersionChecker

This allows us to put other requirements more easily into extension
registration, such as skins and/or extensions.

Change-Id: I3ec1b28b6af380621585cd61b38e5ebb8be9f9c7
---
M autoload.php
D includes/registration/CoreVersionChecker.php
M includes/registration/ExtensionProcessor.php
M includes/registration/ExtensionRegistry.php
A includes/registration/VersionChecker.php
R tests/phpunit/includes/registration/VersionCheckerTest.php
6 files changed, 148 insertions(+), 87 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/18/325118/1

diff --git a/autoload.php b/autoload.php
index a154555..49a77ca 100644
--- a/autoload.php
+++ b/autoload.php
@@ -292,7 +292,6 @@
'CopyJobQueue' => __DIR__ . '/maintenance/copyJobQueue.php',
'CoreParserFunctions' => __DIR__ . 
'/includes/parser/CoreParserFunctions.php',
'CoreTagHooks' => __DIR__ . '/includes/parser/CoreTagHooks.php',
-   'CoreVersionChecker' => __DIR__ . 
'/includes/registration/CoreVersionChecker.php',
'CreateAndPromote' => __DIR__ . '/maintenance/createAndPromote.php',
'CreateFileOp' => __DIR__ . 
'/includes/libs/filebackend/fileop/CreateFileOp.php',
'CreditsAction' => __DIR__ . '/includes/actions/CreditsAction.php',
@@ -1521,6 +1520,7 @@
'UzConverter' => __DIR__ . '/languages/classes/LanguageUz.php',
'VFormHTMLForm' => __DIR__ . '/includes/htmlform/VFormHTMLForm.php',
'ValidateRegistrationFile' => __DIR__ . 
'/maintenance/validateRegistrationFile.php',
+   'VersionChecker' => __DIR__ . 
'/includes/registration/VersionChecker.php',
'ViewAction' => __DIR__ . '/includes/actions/ViewAction.php',
'VirtualRESTService' => __DIR__ . 
'/includes/libs/virtualrest/VirtualRESTService.php',
'VirtualRESTServiceClient' => __DIR__ . 
'/includes/libs/virtualrest/VirtualRESTServiceClient.php',
diff --git a/includes/registration/CoreVersionChecker.php 
b/includes/registration/CoreVersionChecker.php
deleted file mode 100644
index f64d826..000
--- a/includes/registration/CoreVersionChecker.php
+++ /dev/null
@@ -1,68 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- */
-
-use Composer\Semver\VersionParser;
-use Composer\Semver\Constraint\Constraint;
-
-/**
- * @since 1.26
- */
-class CoreVersionChecker {
-
-   /**
-* @var Constraint|bool representing $wgVersion
-*/
-   private $coreVersion = false;
-
-   /**
-* @var VersionParser
-*/
-   private $versionParser;
-
-   /**
-* @param string $coreVersion Current version of core
-*/
-   public function __construct( $coreVersion ) {
-   $this->versionParser = new VersionParser();
-   try {
-   $this->coreVersion = new Constraint(
-   '==',
-   $this->versionParser->normalize( $coreVersion )
-   );
-   } catch ( UnexpectedValueException $e ) {
-   // Non-parsable version, don't fatal.
-   }
-   }
-
-   /**
-* Check that the provided constraint is compatible with the current 
version of core
-*
-* @param string $constraint Something like ">= 1.26"
-* @return bool
-*/
-   public function check( $constraint ) {
-   if ( $this->coreVersion === false ) {
-   // Couldn't parse the core version, so we can't check 
anything
-   return true;
-   }
-
-   return $this->versionParser->parseConstraints( $constraint )
-   ->matches( $this->coreVersion );
-   }
-}
diff --git a/includes/registration/ExtensionProcessor.php 
b/includes/registration/ExtensionProcessor.php
index 207f884..7d89366 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -215,13 +215,7 @@
}
 
public function getRequirements( array $info ) {
-   $requirements = [];
-   $key = ExtensionRegistry::MEDIAWIKI_CORE;
-   if ( isset( $info['requires'][$key] ) ) {
-   $requirements[$key] = $info['requires'][$key];
-   }
-
-   return $requirements;
+   return isset( $info['requires'] ) ? $info['requires'] : [];
}
 
protected function extractHooks( array $info ) {
diff --git a/includes/registration/ExtensionRegistry.php 
b/includes/registration/ExtensionRegistry.php
index 0b67b17..20a0bc9 100644
--- a/includes/registration/ExtensionRegistry.php
+++ 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Follow-up I3b706396: no more wg = wmg for this variable

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325116

Change subject: Follow-up I3b706396: no more wg = wmg for this variable
..

Follow-up I3b706396: no more wg = wmg for this variable

Change-Id: I066329d5e1d176d69ca0593cfb3e02e4396c3cba
---
M wmf-config/mobile-labs.php
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/16/325116/1

diff --git a/wmf-config/mobile-labs.php b/wmf-config/mobile-labs.php
index 131bf50..a27e368 100644
--- a/wmf-config/mobile-labs.php
+++ b/wmf-config/mobile-labs.php
@@ -18,8 +18,6 @@
 
 $wgMFForceSecureLogin = false;
 
-$wgMFMobileFormatterHeadings = $wmgMFMobileFormatterHeadings;
-
 // T49647
 $wgHooks['EnterMobileMode'][] = function() {
global $wgCentralAuthCookieDomain, $wgHooks;

-- 
To view, visit https://gerrit.wikimedia.org/r/325116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I066329d5e1d176d69ca0593cfb3e02e4396c3cba
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Bypass API call when wikitext is empty string

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Bypass API call when wikitext is empty string
..


Bypass API call when wikitext is empty string

Change-Id: Ie0cedfaae286f73e73bcde7bfca3cb2ae6197924
---
M modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
1 file changed, 17 insertions(+), 10 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js 
b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
index 79e037f..68c5850 100644
--- a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
+++ b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
@@ -152,16 +152,23 @@
  * @inheritdoc
  */
 ve.dm.MWWikitextSurfaceFragment.prototype.convertFromSource = function ( 
source ) {
-   var parsePromise = new mw.Api().post( {
-   action: 'visualeditor',
-   paction: 'parsefragment',
-   page: mw.config.get( 'wgRelevantPageName' ),
-   wikitext: source
-   } ).then( function ( response ) {
-   return ve.dm.converter.getModelFromDom(
-   ve.createDocumentFromHtml( 
response.visualeditor.content )
-   );
-   } );
+   var parsePromise;
+   if ( !source ) {
+   parsePromise = $.Deferred().resolve(
+   this.getDocument().shallowCloneFromRange( new ve.Range( 
0 ) )
+   ).promise();
+   } else {
+   parsePromise = new mw.Api().post( {
+   action: 'visualeditor',
+   paction: 'parsefragment',
+   page: mw.config.get( 'wgRelevantPageName' ),
+   wikitext: source
+   } ).then( function ( response ) {
+   return ve.dm.converter.getModelFromDom(
+   ve.createDocumentFromHtml( 
response.visualeditor.content )
+   );
+   } );
+   }
 
// TODO: Show progress bar without breaking WindowAction
// ve.init.target.getSurface().createProgress(

-- 
To view, visit https://gerrit.wikimedia.org/r/325111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0cedfaae286f73e73bcde7bfca3cb2ae6197924
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
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...wikihiero[master]: Minor fixes: comments, obsolete stuff

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Minor fixes: comments, obsolete stuff
..


Minor fixes: comments, obsolete stuff

Change-Id: I213f50e860fae113dc7b20a2fc343b69870cceb3
---
M generateTables.php
1 file changed, 6 insertions(+), 57 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/generateTables.php b/generateTables.php
index bf2e166..2919fa8 100644
--- a/generateTables.php
+++ b/generateTables.php
@@ -1,9 +1,8 @@
 mDescription = 'Generate tables with hieroglyph 
information';
+   $this->addDescription( 'Generate tables with hieroglyph 
information' );
$this->requireExtension( 'WikiHiero' );
 
$this->moreTables = str_replace( "\r", '', $this->moreTables );
@@ -50,7 +49,7 @@
if ( $dh ) {
while ( ( $file = readdir( $dh ) ) !== false ) {
if ( stristr( $file, 
WikiHiero::IMAGE_EXT ) ) {
-   list( $width, $height, $type, 
$attr ) = getimagesize( $imgDir . $file );
+   list( $width, $height, , ) = 
getimagesize( $imgDir . $file );
$wh_files .= "  \"" . 
WikiHiero::getCode( $file ) . "\" => array( $width, $height ),\n";
if ( strchr( $file, '&' ) ) {
$wh_prefabs .= "  \"" . 
WikiHiero::getCode( $file ) . "\",\n";
@@ -85,8 +84,8 @@
file_put_contents( 'data/tables.ser', serialize( $result ) );
}
 
-   var $moreTables = '
-$wh_phonemes   =   array(  //  convertion  table   phoneme ->  
Gardinercode
+   private $moreTables = '
+$wh_phonemes   =   array( // phoneme -> Gardiner code conversion table
"mSa"   =>  "A12",
"xr"=>  "A15",
"Xrd"   =>  "A17",
@@ -511,56 +510,6 @@
"\']"   =>  "",
 );
 ';
-
-/* not used yet
-$wh_syntax = array(
-  "-",//block sepatator
-  ":",//supperposition
-  "*",//juxtaposition
-  "(",//open bracket
-  ")",//close bracket
-  "!!",   //end of text
-  "!",//end of line
-  "..",   //blank caracter
-  ".",//half-size blank caracter
-  "$",//color
-  "#",//shade
-  "[&",   //select
-  "&]",
-  "[{",
-  "}]",
-  "[[",
-  "]]",
-  "[\"",
-  "\"]",
-  "['",
-  "']",
-  "<",//cartouche
-  ">",
-  "<1",
-  "2>",
-  "<2",
-  "1>",
-  "<0",
-  "0>",
-  "",
-  "",
-  "",
-  "",
-  "++",   //comment
-  "+s",   //hieroglyph
-  "+t",   //transcription
-  "+l",   //latin-normal
-  "+i",   //latin-italic
-  "+g",   //latin-bold (gras)
-  "+b",   //latin-bold
-  "+c",
-);
-*/
 
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/324814
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I213f50e860fae113dc7b20a2fc343b69870cceb3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/wikihiero
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: EBernhardson 
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...wikihiero[master]: Convert to new array syntax

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Convert to new array syntax
..


Convert to new array syntax

Change-Id: Ief04ee0d01ef4877def3daa5e62da21b494f44d3
---
M HieroTokenizer.php
M SpecialHieroglyphs.php
M data/tables.php
M generateTables.php
M wikihiero.body.php
5 files changed, 1,052 insertions(+), 1,052 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/HieroTokenizer.php b/HieroTokenizer.php
index e1f5cc7..6e97510 100644
--- a/HieroTokenizer.php
+++ b/HieroTokenizer.php
@@ -46,9 +46,9 @@
return;
}
 
-   self::$delimiters = array_flip( array( ' ', '-', "\t", "\n", 
"\r" ) );
-   self::$tokenDelimiters = array_flip( array( '*', ':', '(', ')' 
) );
-   self::$singleChars = array_flip( array( '!' ) );
+   self::$delimiters = array_flip( [ ' ', '-', "\t", "\n", "\r" ] 
);
+   self::$tokenDelimiters = array_flip( [ '*', ':', '(', ')' ] );
+   self::$singleChars = array_flip( [ '!' ] );
}
 
/**
@@ -61,8 +61,8 @@
return $this->blocks;
}
 
-   $this->blocks = array();
-   $this->currentBlock = array();
+   $this->blocks = [];
+   $this->currentBlock = [];
$this->token = '';
 
$text = preg_replace( '/\\', 'message' => 'wikihiero-comment', 
'example' => 'A1' ),
-   );
-   private $helpColumns = array(
+   private $syntaxHelp = [
+   [ 'code' => '-', 'message' => 'wikihiero-separator', 'example' 
=> 'A1 - B1' ],
+   [ 'code' => ':', 'message' => 'wikihiero-superposition', 
'example' => 'p:t' ],
+   [ 'code' => '*', 'message' => 'wikihiero-juxtaposition', 
'example' => 'p*t' ],
+   [ 'code' => '!', 'message' => 'wikihiero-eol', 'example' => 
'A1-B1 ! C1-D1' ],
+   [ 'code' => '\\', 'message' => 'wikihiero-mirror', 'example' => 
'A1\-A1' ],
+   [ 'code' => '..', 'message' => 'wikihiero-void', 'example' => 
'A1 .. B1' ],
+   [ 'code' => '.', 'message' => 'wikihiero-half-void', 'example' 
=> 'A1 . B1' ],
+   [ 'code' => '', 'message' => 'wikihiero-comment', 
'example' => 'A1' ],
+   ];
+   private $helpColumns = [
'code',
'meaning',
'example',
'result',
-   );
+   ];
 
public function __construct() {
parent::__construct( 'Hieroglyphs' );
@@ -70,18 +70,18 @@
 
$out->addHTML(
Html::openElement( 'form',
-   array(
+   [
'method' => 'get',
'action' => 
$this->getPageTitle()->getLinkUrl(),
-   )
+   ]
)
-   . Html::element( 'textarea', array( 'id' => 
'hiero-text', 'name' => 'text' ), $text )
-   . Html::element( 'input', array(
+   . Html::element( 'textarea', [ 'id' => 'hiero-text', 
'name' => 'text' ], $text )
+   . Html::element( 'input', [
'type' => 'submit',
'id' => 'hiero-submit',
'name' => 'submit',
'value' => $this->msg( 'wikihiero-submit' 
)->text(),
-   ) )
+   ] )
. Html::closeElement( 'form' )
);
 
@@ -168,7 +168,7 @@
$syntax = wfMessage( 'wikihiero-syntax' )->text();
$html .= ''
. Html::element( 'a',
-   array( 'href' => "#syntax", 'title' => 
$syntax ),
+   [ 'href' => "#syntax", 'title' => 
$syntax ],
$syntax
)
. '';
@@ -181,7 +181,7 @@
}
$html .= ''
. Html::element( 'a',
-   array( 'href' => "#cat-$cat", 'title' 
=> wfMessage( "wikihiero-category-$cat" )->text() ),
+   [ 'href' => "#cat-$cat", 'title' => 
wfMessage( "wikihiero-category-$cat" )->text() ],
$cat
)
. '';
@@ -192,7 +192,7 @@
}
$html .= ''
. Html::element( 'a',
-   array( 'href' => "#cat-$end", 'title' 
=> wfMessage( 

[MediaWiki-commits] [Gerrit] mediawiki...wikihiero[master]: generateTables cleanup

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: generateTables cleanup
..


generateTables cleanup

* Use absolute paths to make it runnable with mwscript in
  Vagrant from whatever directory.
* Fix use of undefined constant WIKIHIERO_VERSION, use Git hash
  instead.

Change-Id: I592eab04e2ef7493fb5c43684f9c5be7f26fd502
---
M data/tables.php
M data/tables.ser
M generateTables.php
3 files changed, 17 insertions(+), 14 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/data/tables.php b/data/tables.php
index 48bfe35..9980ad0 100644
--- a/data/tables.php
+++ b/data/tables.php
@@ -1,7 +1,7 @@
  array( 34, 32 ),
   "H8" => array( 15, 18 ),
   "H8W" => array( 37, 38 ),
+  "H_HASH" => array( 38, 16 ),
+  "H_SPACE" => array( 5, 15 ),
   "HASH" => array( 30, 38 ),
   "hatching" => array( 75, 46 ),
   "Hmw" => array( 24, 38 ),
-  "H_HASH" => array( 38, 16 ),
-  "H_SPACE" => array( 5, 15 ),
   "I1" => array( 36, 33 ),
   "I10" => array( 35, 38 ),
   "I11" => array( 36, 38 ),
@@ -795,8 +795,8 @@
   "Q5" => array( 38, 15 ),
   "Q6" => array( 38, 24 ),
   "Q7" => array( 20, 37 ),
-  "QUERY" => array( 18, 28 ),
   "Q_HASH" => array( 20, 20 ),
+  "QUERY" => array( 18, 28 ),
   "r" => array( 38, 38 ),
   "r" => array( 38, 38 ),
   "r" => array( 38, 38 ),
@@ -1025,8 +1025,8 @@
   "V7" => array( 9, 26 ),
   "V8" => array( 12, 28 ),
   "V9" => array( 20, 20 ),
-  "VTHREE" => array( 25, 34 ),
   "V_HASH" => array( 15, 38 ),
+  "VTHREE" => array( 25, 34 ),
   "w&" => array( 18, 38 ),
   "w" => array( 36, 38 ),
   "w" => array( 38, 38 ),
@@ -1118,7 +1118,7 @@
 );
 
 
-$wh_phonemes   =   array(  //  convertion  table   phoneme ->  
Gardinercode
+$wh_phonemes   =   array( // phoneme -> Gardiner code conversion table
"mSa"   =>  "A12",
"xr"=>  "A15",
"Xrd"   =>  "A17",
diff --git a/data/tables.ser b/data/tables.ser
index 9e6ad44..4f9d9ba 100644
--- a/data/tables.ser
+++ b/data/tables.ser
@@ -1 +1 @@

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Use faster batchPush in #insertContent

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Use faster batchPush in #insertContent
..


Use faster batchPush in #insertContent

Change-Id: Icfea4347d9ca347b7539594e5634384a610c42c0
---
M src/dm/ve.dm.SurfaceFragment.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  DLynch: Looks good to me, approved
  Jforrester: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/src/dm/ve.dm.SurfaceFragment.js b/src/dm/ve.dm.SurfaceFragment.js
index c063030..1f05815 100644
--- a/src/dm/ve.dm.SurfaceFragment.js
+++ b/src/dm/ve.dm.SurfaceFragment.js
@@ -794,7 +794,7 @@
for ( i = 0, l = lines.length; i < l; i++ ) {
if ( lines[ i ].length ) {
content.push( { type: 'paragraph' } );
-   content = content.concat( lines[ i 
].split( '' ) );
+   ve.batchPush( content, lines[ i 
].split( '' ) );
content.push( { type: '/paragraph' } );
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/325113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icfea4347d9ca347b7539594e5634384a610c42c0
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: DLynch 
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[master]: Update VE core submodule to master (aa8ef3e)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update VE core submodule to master (aa8ef3e)
..


Update VE core submodule to master (aa8ef3e)

New changes:
4321ccd SourceSurfaceFragment: Add #convertNodes
aa8ef3e Follow-up Iaa41c49e2f: Fix `this` context in window action

Change-Id: I82777e4dcd27de744bb3cb934f1c639167127303
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/ve b/lib/ve
index 5be61ce..aa8ef3e 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 5be61ced8835cb1034e2789bbb29d20dfb6ee98d
+Subproject commit aa8ef3e4ed8b6ea5dcef70634ab77e29fb9dffc7

-- 
To view, visit https://gerrit.wikimedia.org/r/325115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I82777e4dcd27de744bb3cb934f1c639167127303
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
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[master]: Don't wait for fragmentPromise before closing open windows

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Don't wait for fragmentPromise before closing open windows
..


Don't wait for fragmentPromise before closing open windows

Change-Id: I88ac2ffa1d9f1f305d78dcabb71eb3c9d590d55b
---
M src/ui/actions/ve.ui.WindowAction.js
1 file changed, 21 insertions(+), 18 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/ui/actions/ve.ui.WindowAction.js 
b/src/ui/actions/ve.ui.WindowAction.js
index cb67757..a08fcee 100644
--- a/src/ui/actions/ve.ui.WindowAction.js
+++ b/src/ui/actions/ve.ui.WindowAction.js
@@ -81,26 +81,29 @@
fragmentPromise = $.Deferred().resolve( fragment ).promise();
}
 
-   fragmentPromise.then( function ( fragment ) {
-   data = ve.extendObject( { dir: dir }, data, { fragment: 
fragment, $returnFocusTo: $noFocus } );
-   if ( windowType === 'toolbar' || windowType === 'inspector' ) {
-   data = ve.extendObject( data, { surface: surface } );
-   // Auto-close the current window if it is different to 
the one we are
-   // trying to open.
-   // TODO: Make auto-close a window manager setting
-   if ( currentWindow && 
currentWindow.constructor.static.name !== name ) {
-   autoClosePromises.push( 
windowManager.closeWindow( currentWindow ) );
-   }
-   }
+   data = ve.extendObject( { dir: dir }, data, { $returnFocusTo: $noFocus 
} );
 
-   // If we're opening a dialog, close all inspectors first
-   if ( windowType === 'dialog' ) {
-   inspectorWindowManager = windowAction.getWindowManager( 
'inspector' );
-   currentInspector = 
inspectorWindowManager.getCurrentWindow();
-   if ( currentInspector ) {
-   autoClosePromises.push( 
inspectorWindowManager.closeWindow( currentInspector ) );
-   }
+   if ( windowType === 'toolbar' || windowType === 'inspector' ) {
+   data = ve.extendObject( data, { surface: surface } );
+   // Auto-close the current window if it is different to the one 
we are
+   // trying to open.
+   // TODO: Make auto-close a window manager setting
+   if ( currentWindow && currentWindow.constructor.static.name !== 
name ) {
+   autoClosePromises.push( windowManager.closeWindow( 
currentWindow ) );
}
+   }
+
+   // If we're opening a dialog, close all inspectors first
+   if ( windowType === 'dialog' ) {
+   inspectorWindowManager = windowAction.getWindowManager( 
'inspector' );
+   currentInspector = inspectorWindowManager.getCurrentWindow();
+   if ( currentInspector ) {
+   autoClosePromises.push( 
inspectorWindowManager.closeWindow( currentInspector ) );
+   }
+   }
+
+   fragmentPromise.then( function ( fragment ) {
+   ve.extendObject( data, { fragment: fragment } );
 
$.when.apply( $, autoClosePromises ).always( function () {
windowManager.getWindow( name ).then( function ( win ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/325114
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I88ac2ffa1d9f1f305d78dcabb71eb3c9d590d55b
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
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[master]: NWE: Disable progress bar when pre-parsing for WindowAction's

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: NWE: Disable progress bar when pre-parsing for WindowAction's
..


NWE: Disable progress bar when pre-parsing for WindowAction's

The progress bar dialogs interfere with the life cycle
of the window you are trying to open. Just disable these
progress bars for now to avoid catastrophic behaviour.

Change-Id: I77c8ae67a2d502bbd189836deb320cd55c3cb11a
---
M modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
1 file changed, 8 insertions(+), 8 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js 
b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
index 1e2afe0..79e037f 100644
--- a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
+++ b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
@@ -163,14 +163,14 @@
);
} );
 
-   // TODO: Emit an event to trigger the progress bar
-   ve.init.target.getSurface().createProgress(
-   parsePromise, ve.msg( 
'visualeditor-generating-wikitext-progress' )
-   ).done( function ( progressBar, cancelPromise ) {
-   cancelPromise.fail( function () {
-   parsePromise.abort();
-   } );
-   } );
+   // TODO: Show progress bar without breaking WindowAction
+   // ve.init.target.getSurface().createProgress(
+   //  parsePromise, ve.msg( 
'visualeditor-generating-wikitext-progress' )
+   // ).done( function ( progressBar, cancelPromise ) {
+   //  cancelPromise.fail( function () {
+   //  parsePromise.abort();
+   //  } );
+   // } );
 
return parsePromise;
 };

-- 
To view, visit https://gerrit.wikimedia.org/r/325110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I77c8ae67a2d502bbd189836deb320cd55c3cb11a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Esanders 
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[master]: Update VE core submodule to master (aa8ef3e)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325115

Change subject: Update VE core submodule to master (aa8ef3e)
..

Update VE core submodule to master (aa8ef3e)

New changes:
4321ccd SourceSurfaceFragment: Add #convertNodes
aa8ef3e Follow-up Iaa41c49e2f: Fix `this` context in window action

Change-Id: I82777e4dcd27de744bb3cb934f1c639167127303
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/15/325115/1

diff --git a/lib/ve b/lib/ve
index 5be61ce..aa8ef3e 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 5be61ced8835cb1034e2789bbb29d20dfb6ee98d
+Subproject commit aa8ef3e4ed8b6ea5dcef70634ab77e29fb9dffc7

-- 
To view, visit https://gerrit.wikimedia.org/r/325115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82777e4dcd27de744bb3cb934f1c639167127303
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Don't wait for fragmentPromise before closing open windows

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325114

Change subject: Don't wait for fragmentPromise before closing open windows
..

Don't wait for fragmentPromise before closing open windows

Change-Id: I88ac2ffa1d9f1f305d78dcabb71eb3c9d590d55b
---
M src/ui/actions/ve.ui.WindowAction.js
1 file changed, 21 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/14/325114/1

diff --git a/src/ui/actions/ve.ui.WindowAction.js 
b/src/ui/actions/ve.ui.WindowAction.js
index cb67757..a08fcee 100644
--- a/src/ui/actions/ve.ui.WindowAction.js
+++ b/src/ui/actions/ve.ui.WindowAction.js
@@ -81,26 +81,29 @@
fragmentPromise = $.Deferred().resolve( fragment ).promise();
}
 
-   fragmentPromise.then( function ( fragment ) {
-   data = ve.extendObject( { dir: dir }, data, { fragment: 
fragment, $returnFocusTo: $noFocus } );
-   if ( windowType === 'toolbar' || windowType === 'inspector' ) {
-   data = ve.extendObject( data, { surface: surface } );
-   // Auto-close the current window if it is different to 
the one we are
-   // trying to open.
-   // TODO: Make auto-close a window manager setting
-   if ( currentWindow && 
currentWindow.constructor.static.name !== name ) {
-   autoClosePromises.push( 
windowManager.closeWindow( currentWindow ) );
-   }
-   }
+   data = ve.extendObject( { dir: dir }, data, { $returnFocusTo: $noFocus 
} );
 
-   // If we're opening a dialog, close all inspectors first
-   if ( windowType === 'dialog' ) {
-   inspectorWindowManager = windowAction.getWindowManager( 
'inspector' );
-   currentInspector = 
inspectorWindowManager.getCurrentWindow();
-   if ( currentInspector ) {
-   autoClosePromises.push( 
inspectorWindowManager.closeWindow( currentInspector ) );
-   }
+   if ( windowType === 'toolbar' || windowType === 'inspector' ) {
+   data = ve.extendObject( data, { surface: surface } );
+   // Auto-close the current window if it is different to the one 
we are
+   // trying to open.
+   // TODO: Make auto-close a window manager setting
+   if ( currentWindow && currentWindow.constructor.static.name !== 
name ) {
+   autoClosePromises.push( windowManager.closeWindow( 
currentWindow ) );
}
+   }
+
+   // If we're opening a dialog, close all inspectors first
+   if ( windowType === 'dialog' ) {
+   inspectorWindowManager = windowAction.getWindowManager( 
'inspector' );
+   currentInspector = inspectorWindowManager.getCurrentWindow();
+   if ( currentInspector ) {
+   autoClosePromises.push( 
inspectorWindowManager.closeWindow( currentInspector ) );
+   }
+   }
+
+   fragmentPromise.then( function ( fragment ) {
+   ve.extendObject( data, { fragment: fragment } );
 
$.when.apply( $, autoClosePromises ).always( function () {
windowManager.getWindow( name ).then( function ( win ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/325114
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I88ac2ffa1d9f1f305d78dcabb71eb3c9d590d55b
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Use faster batchPush in #insertContent

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325113

Change subject: Use faster batchPush in #insertContent
..

Use faster batchPush in #insertContent

Change-Id: Icfea4347d9ca347b7539594e5634384a610c42c0
---
M src/dm/ve.dm.SurfaceFragment.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/13/325113/1

diff --git a/src/dm/ve.dm.SurfaceFragment.js b/src/dm/ve.dm.SurfaceFragment.js
index c063030..1f05815 100644
--- a/src/dm/ve.dm.SurfaceFragment.js
+++ b/src/dm/ve.dm.SurfaceFragment.js
@@ -794,7 +794,7 @@
for ( i = 0, l = lines.length; i < l; i++ ) {
if ( lines[ i ].length ) {
content.push( { type: 'paragraph' } );
-   content = content.concat( lines[ i 
].split( '' ) );
+   ve.batchPush( content, lines[ i 
].split( '' ) );
content.push( { type: '/paragraph' } );
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/325113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfea4347d9ca347b7539594e5634384a610c42c0
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Add two questions for 2017 iteration

[Niharika29 (Code Review)]

Niharika29 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325112

Change subject: Add two questions for 2017 iteration
..

Add two questions for 2017 iteration

1. Specify if they are a paid staff or contract worker for any Wikimedia org
2. Specify if they are a board member for any Wikimedia org

Bug: T151371

Change-Id: Ie917ec4e3bba178a6898b323879f82ea81da6261
---
A data/db/migrations/20161202-update-questions-2017.sql
M data/db/schema.mysql
M data/i18n/en.json
M data/i18n/qqq.json
M data/templates/apply.html
M data/templates/review/view.html
M src/Forms/Apply.php
7 files changed, 72 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships 
refs/changes/12/325112/1

diff --git a/data/db/migrations/20161202-update-questions-2017.sql 
b/data/db/migrations/20161202-update-questions-2017.sql
new file mode 100644
index 000..3804105
--- /dev/null
+++ b/data/db/migrations/20161202-update-questions-2017.sql
@@ -0,0 +1,9 @@
+-- Alter schema for 2017 round
+
+ALTER TABLE scholarships
+  ADD COLUMN staff TINYINT(1) DEFAULT NULL AFTER engage10,
+  ADD COLUMN staffOrg VARCHAR(128) DEFAULT NULL AFTER staff,
+  ADD COLUMN board TINYINT(1) DEFAULT NULL AFTER staffOrg,
+  ADD COLUMN boardOrg VARCHAR(128) DEFAULT NULL AFTER board
+  ;
+
diff --git a/data/db/schema.mysql b/data/db/schema.mysql
index 7ec4004..75aad19 100644
--- a/data/db/schema.mysql
+++ b/data/db/schema.mysql
@@ -44,6 +44,10 @@
   , engage8 TINYINT(1) DEFAULT NULL
   , engage9 TINYINT(1) DEFAULT NULL
   , engage10TINYINT(1) DEFAULT NULL
+  , staff   TINYINT(1) DEFAULT NULL
+  , staffOrgVARCHAR(128) DEFAULT NULL
+  , board   TINYINT(1) DEFAULT NULL
+  , boardOrgVARCHAR(128) DEFAULT NULL
   , involvement TEXT
   , contributionTEXT
   , experience  TEXT
diff --git a/data/i18n/en.json b/data/i18n/en.json
index 4aa6aa4..603a8d8 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -73,6 +73,8 @@
"form-wmfagree-error": "To proceed, please agree to the applicant 
rights condition.",
"form-wmfAgreeName-error": "Please fill in your full name in the given 
field to agree to the terms and conditions.",
"form-engage10-error": "Please select how you have engaged in the 
Wikimedia movement",
+   "form-staffOrg-error": "Please indicate the Wikimedia organization 
you're a paid or contract worker for.",
+   "form-boardOrg-error": "Please indicate the Wikimedia organization 
you're a board member for.",
 
"required-field": "Required field",
 
@@ -118,6 +120,12 @@
"form-engagement-option8": "Participant in Wikimedia organized events 
(e.g. photographer contributing to Wiki Loves Monuments, workshop attendee)",
"form-engagement-option9": "Organizer of Wikimedia events (e.g. WLM, 
edit-a-thons)",
"form-engagement-option10": "None of the above",
+
+   "form-wikimedia-staff": "Are you currently a paid or contract staff of 
any Wikimedia organization?",
+   "form-wikimedia-board": "Are you currently board member of any 
Wikimedia organization?",
+   "form-staff-organization": "If yes, please identify the Wikimedia 
organization here:",
+   "form-board-organization": "If yes, please identify the Wikimedia 
organization here:",
+
"form-community": "Primary language community on wiki:",
"form-active-project": "Most active Wikimedia project:",
"form-active-project2": "Second most active Wikimedia project (if 
applicable):",
@@ -299,6 +307,8 @@
"review-view-study": "Field of study",
"review-view-username": "Username:",
"review-view-alt-users": "Other usernames:",
+   "review-view-staff-member": "Staff member for:",
+   "review-view-board-member": "Board member for:",
"review-view-community": "Primary language community:",
"review-view-active-projects": "Main wiki project:",
"review-view-secondary-project": "Secondary wiki project:",
diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json
index d29d4ce..f7b193d 100644
--- a/data/i18n/qqq.json
+++ b/data/i18n/qqq.json
@@ -70,6 +70,8 @@
"form-wmfagree-error": "Error message shown to user when user does not 
agree to applicant rights and conditions.",
"form-wmfAgreeName-error": "Error message shown to user when user does 
not enter full name agreeing the terms and conditions.",
"form-engage10-error": "Error message shown to user when user does not 
select any types of engagement",
+   "form-staffOrg-error": "Error message shown to user when they did not 
indicate the Wikimedia organization they work for",
+   "form-boardOrg-error": "Error message shown to user when they did not 
indicate the Wikimedia organization 

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Bypass API call when wikitext is empty string

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325111

Change subject: Bypass API call when wikitext is empty string
..

Bypass API call when wikitext is empty string

Change-Id: Ie0cedfaae286f73e73bcde7bfca3cb2ae6197924
---
M modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
1 file changed, 17 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/11/325111/1

diff --git a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js 
b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
index 79e037f..68c5850 100644
--- a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
+++ b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
@@ -152,16 +152,23 @@
  * @inheritdoc
  */
 ve.dm.MWWikitextSurfaceFragment.prototype.convertFromSource = function ( 
source ) {
-   var parsePromise = new mw.Api().post( {
-   action: 'visualeditor',
-   paction: 'parsefragment',
-   page: mw.config.get( 'wgRelevantPageName' ),
-   wikitext: source
-   } ).then( function ( response ) {
-   return ve.dm.converter.getModelFromDom(
-   ve.createDocumentFromHtml( 
response.visualeditor.content )
-   );
-   } );
+   var parsePromise;
+   if ( !source ) {
+   parsePromise = $.Deferred().resolve(
+   this.getDocument().shallowCloneFromRange( new ve.Range( 
0 ) )
+   ).promise();
+   } else {
+   parsePromise = new mw.Api().post( {
+   action: 'visualeditor',
+   paction: 'parsefragment',
+   page: mw.config.get( 'wgRelevantPageName' ),
+   wikitext: source
+   } ).then( function ( response ) {
+   return ve.dm.converter.getModelFromDom(
+   ve.createDocumentFromHtml( 
response.visualeditor.content )
+   );
+   } );
+   }
 
// TODO: Show progress bar without breaking WindowAction
// ve.init.target.getSurface().createProgress(

-- 
To view, visit https://gerrit.wikimedia.org/r/325111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0cedfaae286f73e73bcde7bfca3cb2ae6197924
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: NWE: Disable progress bar when pre-parsing for WindowAction's

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325110

Change subject: NWE: Disable progress bar when pre-parsing for WindowAction's
..

NWE: Disable progress bar when pre-parsing for WindowAction's

The progress bar dialogs interfer with the life cycle
of the window you are trying to open. Just disable these
progress bars for now to avoid catastrophic behaviour.

Change-Id: I77c8ae67a2d502bbd189836deb320cd55c3cb11a
---
M modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
1 file changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/10/325110/1

diff --git a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js 
b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
index 1e2afe0..79e037f 100644
--- a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
+++ b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
@@ -163,14 +163,14 @@
);
} );
 
-   // TODO: Emit an event to trigger the progress bar
-   ve.init.target.getSurface().createProgress(
-   parsePromise, ve.msg( 
'visualeditor-generating-wikitext-progress' )
-   ).done( function ( progressBar, cancelPromise ) {
-   cancelPromise.fail( function () {
-   parsePromise.abort();
-   } );
-   } );
+   // TODO: Show progress bar without breaking WindowAction
+   // ve.init.target.getSurface().createProgress(
+   //  parsePromise, ve.msg( 
'visualeditor-generating-wikitext-progress' )
+   // ).done( function ( progressBar, cancelPromise ) {
+   //  cancelPromise.fail( function () {
+   //  parsePromise.abort();
+   //  } );
+   // } );
 
return parsePromise;
 };

-- 
To view, visit https://gerrit.wikimedia.org/r/325110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77c8ae67a2d502bbd189836deb320cd55c3cb11a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/config[master]: Add a puppet compiler pipeline

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325109

Change subject: Add a puppet compiler pipeline
..

Add a puppet compiler pipeline

In preperation for supporting running puppet compiler from a gerrit
comment

Change-Id: I575d5840e0e09d7828b11d5bdf687d493f4cc59d
---
M zuul/layout.yaml
1 file changed, 23 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/09/325109/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 8465c11..98b965d 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -598,6 +598,29 @@
   gerrit:
 verified: 0
 
+  - name: puppet-compiler
+description: Jobs triggered after a comment on gerrit.
+manager: IndependentPipelineManager
+source: gerrit
+trigger:
+  gerrit:
+- event: comment-added
+  comment: (?im)^Patch Set \d+:\n\n\s*check puppet-compiler 
(php53?|zend)\.?\s*$
+  # Might want to create a new whitelist if we decide we only want 
half of the users to run this.
+  email: *email_whitelist
+  branch: (?!^refs/meta/config)
+start:
+  gerrit:
+verified: 0
+success-message: 'Puppet compiler build succeeded.'
+success:
+  gerrit:
+verified: 2
+failure-message: 'Puppet compiler build failed.'
+failure:
+  gerrit:
+verified: -1
+
   # Pipeline reacting whenever a reference is updated
   - name: post
 description: Whenever a reference is updated.

-- 
To view, visit https://gerrit.wikimedia.org/r/325109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I575d5840e0e09d7828b11d5bdf687d493f4cc59d
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Follow-up Iaa41c49e2f: Fix `this` context in window action

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Follow-up Iaa41c49e2f: Fix `this` context in window action
..


Follow-up Iaa41c49e2f: Fix `this` context in window action

Change-Id: Ifa4b032cfd304a33a110bfaf12019a83b0801443
---
M src/ui/actions/ve.ui.WindowAction.js
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/ui/actions/ve.ui.WindowAction.js 
b/src/ui/actions/ve.ui.WindowAction.js
index 966448d..cb67757 100644
--- a/src/ui/actions/ve.ui.WindowAction.js
+++ b/src/ui/actions/ve.ui.WindowAction.js
@@ -47,6 +47,7 @@
 ve.ui.WindowAction.prototype.open = function ( name, data, action ) {
var currentInspector, inspectorWindowManager, fragmentPromise,
originalFragment, text,
+   windowAction = this,
windowType = this.getWindowType( name ),
windowManager = windowType && this.getWindowManager( windowType 
),
currentWindow = windowManager.getCurrentWindow(),
@@ -94,7 +95,7 @@
 
// If we're opening a dialog, close all inspectors first
if ( windowType === 'dialog' ) {
-   inspectorWindowManager = this.getWindowManager( 
'inspector' );
+   inspectorWindowManager = windowAction.getWindowManager( 
'inspector' );
currentInspector = 
inspectorWindowManager.getCurrentWindow();
if ( currentInspector ) {
autoClosePromises.push( 
inspectorWindowManager.closeWindow( currentInspector ) );

-- 
To view, visit https://gerrit.wikimedia.org/r/325101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa4b032cfd304a33a110bfaf12019a83b0801443
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Tchanders 
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[master]: Decrease height of gallery search results for better fit

[Tchanders (Code Review)]

Tchanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325108

Change subject: Decrease height of gallery search results for better fit
..

Decrease height of gallery search results for better fit

Bug: T151509
Change-Id: I92c812952457df99251fc0b8f1a17d4e55fe52f7
---
M modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/08/325108/1

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
index 63726c3..245cbec 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
@@ -123,7 +123,9 @@
} );
 
// Search panel
-   this.searchWidget = new mw.widgets.MediaSearchWidget();
+   this.searchWidget = new mw.widgets.MediaSearchWidget( {
+   rowHeight: 150
+   } );
 
// Options card
 

-- 
To view, visit https://gerrit.wikimedia.org/r/325108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92c812952457df99251fc0b8f1a17d4e55fe52f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tchanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: echo 2

[Cenarium (Code Review)]

Cenarium has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325107

Change subject: echo 2
..

echo 2

Change-Id: If268b0a07d3e8be9ec5acd14dc89a5c767ef494c
---
M backend/FlaggedRevs.hooks.php
M frontend/FlaggedRevsDeferredPresentationModel.php
2 files changed, 18 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs 
refs/changes/07/325107/1

diff --git a/backend/FlaggedRevs.hooks.php b/backend/FlaggedRevs.hooks.php
index c13db5e..662ed19 100755
--- a/backend/FlaggedRevs.hooks.php
+++ b/backend/FlaggedRevs.hooks.php
@@ -1236,7 +1236,7 @@
'presentation-model' => 
'EchoFlaggedRevsDeferredPresentationModel',
];
$icons['flaggedrevs-deferred'] = [
-   'path' => 'Echo\modules\icons\generic.svg',
+   'path' => 'Echo\modules\icons\generic.svg', // for now
];
return true;
}
diff --git a/frontend/FlaggedRevsDeferredPresentationModel.php 
b/frontend/FlaggedRevsDeferredPresentationModel.php
index 49fae57..9a3dd32 100644
--- a/frontend/FlaggedRevsDeferredPresentationModel.php
+++ b/frontend/FlaggedRevsDeferredPresentationModel.php
@@ -21,22 +21,6 @@
}
 
public function getPrimaryLink() {
-   $helpPage = $this->msg( 'flaggedrevs-defer-help' )->text();
-   $helpTitle = Title::newFromText( $helpPage );
-   if ( !$helpTitle instanceof Title ) {
-   return array();
-   }
-   return array(
-   'url' => $helpTitle->getLocalURL(),
-   'label' => $this->msg( 
'notification-link-text-flaggedrevs-deferred-help' )->text()
-   );
-   }
-
-   public function getSecondaryLinks() {
-   return array( $this->getChangesLink(), $this->getLogLink() );
-   }
-
-   private function getChangesLink() {
$url = $this->event->getTitle()->getLocalURL( array(
'oldid' => $this->event->getExtraParam( 'oldid' ),
'diff' => $this->event->getExtraParam( 'revid' )
@@ -45,10 +29,23 @@
'url' => $url,
'label' => $this->msg( 
'notification-link-text-view-changes',
$this->getViewingUserForGender() )->text(),
-   'description' => '',
-   'icon' => 'changes',
-   'prioritized' => true,
);
+   }
+
+   public function getSecondaryLinks() {
+   $links = array( $this->getLogLink() );
+   $helpPage = $this->msg( 'flaggedrevs-defer-help' )->text();
+   $helpTitle = Title::newFromText( $helpPage );
+   if ( $helpTitle instanceof Title ) {
+   $links[] = array(
+   'url' => $helpTitle->getLocalURL(),
+   'label' => $this->msg( 
'notification-link-text-flaggedrevs-deferred-help' )->text(),
+   'description' => '',
+   'icon' => 'help',
+   'prioritized' => true,
+   );
+   }
+   return $links;
}
 
private function getLogLink() {
@@ -62,7 +59,7 @@
'label' => $this->msg( 
'notification-link-text-flaggedrevs-deferred-log' )->text(),
'url' => SpecialPage::getTitleFor( 'Log' )->getFullURL( 
$query ),
'description' => '',
-   'icon' => false,
+   'icon' => false, // @todo: add a log icon to echo
'prioritized' => true,
);
}

-- 
To view, visit https://gerrit.wikimedia.org/r/325107
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If268b0a07d3e8be9ec5acd14dc89a5c767ef494c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Cenarium 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: echo 1

[Cenarium (Code Review)]

Cenarium has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325106

Change subject: echo 1
..

echo 1

Change-Id: I9e8b24226d4227838723d8c9700d8918e68637e4
---
M backend/FlaggedRevs.hooks.php
M frontend/FlaggedRevsDeferredPresentationModel.php
2 files changed, 5 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs 
refs/changes/06/325106/1

diff --git a/backend/FlaggedRevs.hooks.php b/backend/FlaggedRevs.hooks.php
index aeb6897..c13db5e 100755
--- a/backend/FlaggedRevs.hooks.php
+++ b/backend/FlaggedRevs.hooks.php
@@ -1236,7 +1236,7 @@
'presentation-model' => 
'EchoFlaggedRevsDeferredPresentationModel',
];
$icons['flaggedrevs-deferred'] = [
-   'path' => 
'FlaggedRevs/frontend/modules/img/deferred-icon.png',
+   'path' => 'Echo\modules\icons\generic.svg',
];
return true;
}
diff --git a/frontend/FlaggedRevsDeferredPresentationModel.php 
b/frontend/FlaggedRevsDeferredPresentationModel.php
index fb95507..49fae57 100644
--- a/frontend/FlaggedRevsDeferredPresentationModel.php
+++ b/frontend/FlaggedRevsDeferredPresentationModel.php
@@ -10,14 +10,12 @@
}
 
public function getHeaderMessage() {
-   $isAuto = $this->event->getExtraParam( 'auto' );
-   if ( $isAuto ) {
-   $msg = $this->msg( 
'notification-header-flaggedrevs-deferred-auto',
-   $this->getViewingUserForGender() );
+   if ( $this->event->getExtraParam( 'auto' ) ) {
+   $msg = $this->msg( 
'notification-header-flaggedrevs-deferred-auto' );
} else {
-   $msg = $this->msg( 
'notification-header-flaggedrevs-deferred',
-   $this->getViewingUserForGender() );
+   $msg = $this->msg( 
'notification-header-flaggedrevs-deferred' );
}
+   $msg->params( $this->getViewingUserForGender() );
$msg->params( $this->getTruncatedTitleText( 
$this->event->getTitle(), true ) );
return $msg;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/325106
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e8b24226d4227838723d8c9700d8918e68637e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Cenarium 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[master]: Abstract out $textbox manipulation form UI

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325105

Change subject: Abstract out $textbox manipulation form UI
..

Abstract out $textbox manipulation form UI

Instead provide an API that is given wikitext in, and
returns a promise that resolves with modified wikitext.

It is then up to the caller to read/write the wikitext.

Bug: T152230
Change-Id: I7dcc137d79e029b69467ca282d8c52683e022598
---
M modules/ext.templateDataGenerator.editPage.js
M modules/ext.templateDataGenerator.ui.js
2 files changed, 21 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData 
refs/changes/05/325105/1

diff --git a/modules/ext.templateDataGenerator.editPage.js 
b/modules/ext.templateDataGenerator.editPage.js
index da75303..790ac63 100644
--- a/modules/ext.templateDataGenerator.editPage.js
+++ b/modules/ext.templateDataGenerator.editPage.js
@@ -35,7 +35,9 @@
config.parentPage = pieces.join( '/' );
}
// Prepare the editor
-   mw.libs.tdgUi.init( $( '#mw-content-text' ), $textbox, 
config );
+   mw.libs.tdgUi.init( $( '#mw-content-text' ), 
$textbox.val(), config ).done( function ( newWikitext ) {
+   $textbox.val( newWikitext );
+   } );
}
 
} );
diff --git a/modules/ext.templateDataGenerator.ui.js 
b/modules/ext.templateDataGenerator.ui.js
index 40d92ba..22441e4 100644
--- a/modules/ext.templateDataGenerator.ui.js
+++ b/modules/ext.templateDataGenerator.ui.js
@@ -14,7 +14,8 @@
isDocPage,
pageName,
parentPage,
-   $textbox,
+   deferred,
+   originalWikitext,
// ooui Window Manager
sourceHandler,
tdgDialog,
@@ -83,7 +84,7 @@
editArea.resetNoticeMessage();
 
// Build the model
-   sourceHandler.buildModel( $textbox.val() )
+   sourceHandler.buildModel( originalWikitext )
.then(
// Success
function ( model ) {
@@ -140,20 +141,19 @@
 */
replaceTemplateData = function ( newTemplateData ) {
var finalOutput,
-   fullWikitext = $textbox.val(),
endNoIncludeLength = ''.length,
// NB: This pattern contains no matching 
groups: (). This avoids
// corruption if the template data JSON 
contains $1 etc.
templatedataPattern = 
/[\s\S]*?<\/templatedata>/i;
 
-   if ( fullWikitext.match( templatedataPattern ) ) {
+   if ( originalWikitext.match( templatedataPattern ) ) {
//  exists. Replace it
-   finalOutput = fullWikitext.replace(
+   finalOutput = originalWikitext.replace(
templatedataPattern,
'\n' + JSON.stringify( 
newTemplateData, null, '\t' ) + '\n'
);
} else {
-   finalOutput = fullWikitext;
+   finalOutput = originalWikitext;
if ( finalOutput.substr( -1 ) !== '\n' ) {
finalOutput += '\n';
}
@@ -186,7 +186,7 @@
Object.keys( templateData ).length > 1 ||
Object.keys( templateData.params ).length > 0
) {
-   $textbox.val( replaceTemplateData( templateData 
) );
+   deferred.resolve( replaceTemplateData( 
templateData ) );
} else {
windowManager.closeWindow( 
windowManager.getCurrentWindow() );
windowManager.openWindow( messageDialog, {
@@ -207,7 +207,9 @@
.then( function ( opened ) { return 
opened; } )
.then( function ( data ) {
if ( data && data.action === 
'apply' ) {
-   $textbox.val( 
replaceTemplateData( templateData ) );
+   deferred.resolve( 
replaceTemplateData( templateData ) );
+  

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Restrict financial_txn rows

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Restrict financial_txn rows
..


Restrict financial_txn rows

Bug: T152238
Change-Id: Ie763b24e39b996b6f59083478e927e4599d1f2b3
---
M 
sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
 
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
index 2d0d513..98511e5 100644
--- 
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
+++ 
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
@@ -205,6 +205,11 @@
 
 function from( ) {
 
+$depositFinancialAccountID = civicrm_api3('FinancialAccount', 
'getvalue', array(
+  'return' => 'id',
+  'name' => 'Deposit Bank Account',
+));
+
 $this->_from = <<_aliases['civicrm_contribution']}
 LEFT JOIN wmf_contribution_extra {$this->_aliases['wmf_contribution_extra']}
@@ -216,6 +221,7 @@
 
   LEFT JOIN civicrm_financial_trxn {$this->_aliases['civicrm_financial_trxn']}
 ON {$this->_aliases['civicrm_financial_trxn']}.id = 
entity_financial_trxn_civireport.financial_trxn_id
+AND 
{$this->_aliases['civicrm_financial_trxn']}.to_financial_account_id = 
{$depositFinancialAccountID}
 EOS;
 if ( $this->isTableSelected( 'civicrm_country' ) ) {
 $this->_from .= <
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 
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]: Add help icon

[Cenarium (Code Review)]

Cenarium has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325104

Change subject: Add help icon
..

Add help icon

This adds an help icon that extensions can use for help pages. This is
the same icon as the one used in core mediawiki, located at
resources/src/mediawiki/images/help.svg.

Change-Id: I31665932b69c52e2a3eb2f0e1d9b5d88c562bca2
---
M Echo.php
A modules/icons/help.svg
2 files changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/04/325104/1

diff --git a/Echo.php b/Echo.php
index 95d103e..d3ff049 100644
--- a/Echo.php
+++ b/Echo.php
@@ -377,6 +377,9 @@
'emailuser' => array(
'path' => "$echoIconPath/emailuser.svg",
),
+   'help' => array(
+   'path' => "$echoIconPath/help.svg",
+   ),
'global' => array(
'path' => "$echoIconPath/global.svg"
),
diff --git a/modules/icons/help.svg b/modules/icons/help.svg
new file mode 100644
index 000..3662cb5
--- /dev/null
+++ b/modules/icons/help.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg; 
width="24" height="24" viewBox="0 0 24 24">

-- 
To view, visit https://gerrit.wikimedia.org/r/325104
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I31665932b69c52e2a3eb2f0e1d9b5d88c562bca2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Cenarium 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Scroll highlighted item into view in gallery dialog

[Tchanders (Code Review)]

Tchanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325103

Change subject: Scroll highlighted item into view in gallery dialog
..

Scroll highlighted item into view in gallery dialog

Bug: T152053
Change-Id: I6b77f6c27d5629dc18e421f984cf31badfb2ff04
---
M modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/03/325103/1

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
index 63726c3..1799cda 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
@@ -529,6 +529,9 @@
item.toggleHighlighted( true );
this.highlightedItem = item;
 
+   // Scroll item into view in menu
+   OO.ui.Element.static.scrollIntoView( item.$element[ 0 ] );
+
// Populate edit panel
this.$highlightedImage
.css( 'background-image', 'url(' + item.thumbUrl + ')' );

-- 
To view, visit https://gerrit.wikimedia.org/r/325103
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b77f6c27d5629dc18e421f984cf31badfb2ff04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tchanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Don't pass unsupported parameter

[Code Review]

Matěj Suchánek has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/324949

Change subject: Don't pass unsupported parameter
..

Don't pass unsupported parameter

Change-Id: I40317c3e64eb3c96862991e49fc4b2041247779c
---
M Views/AbuseFilterViewDiff.php
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/49/324949/2

diff --git a/Views/AbuseFilterViewDiff.php b/Views/AbuseFilterViewDiff.php
index 5f65cae..cc5c84e 100644
--- a/Views/AbuseFilterViewDiff.php
+++ b/Views/AbuseFilterViewDiff.php
@@ -115,8 +115,7 @@
}
 
$this->mNextHistoryId = $this->getNextHistoryId(
-   $this->mNewVersion['meta']['history_id'],
-   'next'
+   $this->mNewVersion['meta']['history_id']
);
 
return true;

-- 
To view, visit https://gerrit.wikimedia.org/r/324949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I40317c3e64eb3c96862991e49fc4b2041247779c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Disable heights option in gallery dialog when mode is slideshow

[Tchanders (Code Review)]

Tchanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325102

Change subject: Disable heights option in gallery dialog when mode is slideshow
..

Disable heights option in gallery dialog when mode is slideshow

Bug: T151482
Change-Id: Ic511e1832a9fcaaeaed71c1d495aecc65fdd1d3b
---
M modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/02/325102/1

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
index 63726c3..9cbd3a9 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
@@ -550,6 +550,9 @@
 
this.widthsInput.setDisabled( disabled );
this.perrowInput.setDisabled( disabled );
+
+   // heights is only ignored in slideshow mode
+   this.heightsInput.setDisabled( mode === 'slideshow' );
 };
 
 /**

-- 
To view, visit https://gerrit.wikimedia.org/r/325102
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic511e1832a9fcaaeaed71c1d495aecc65fdd1d3b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tchanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Follow-up Iaa41c49e2f: Fix `this` context in window action

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325101

Change subject: Follow-up Iaa41c49e2f: Fix `this` context in window action
..

Follow-up Iaa41c49e2f: Fix `this` context in window action

Change-Id: Ifa4b032cfd304a33a110bfaf12019a83b0801443
---
M src/ui/actions/ve.ui.WindowAction.js
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/01/325101/1

diff --git a/src/ui/actions/ve.ui.WindowAction.js 
b/src/ui/actions/ve.ui.WindowAction.js
index 966448d..cb67757 100644
--- a/src/ui/actions/ve.ui.WindowAction.js
+++ b/src/ui/actions/ve.ui.WindowAction.js
@@ -47,6 +47,7 @@
 ve.ui.WindowAction.prototype.open = function ( name, data, action ) {
var currentInspector, inspectorWindowManager, fragmentPromise,
originalFragment, text,
+   windowAction = this,
windowType = this.getWindowType( name ),
windowManager = windowType && this.getWindowManager( windowType 
),
currentWindow = windowManager.getCurrentWindow(),
@@ -94,7 +95,7 @@
 
// If we're opening a dialog, close all inspectors first
if ( windowType === 'dialog' ) {
-   inspectorWindowManager = this.getWindowManager( 
'inspector' );
+   inspectorWindowManager = windowAction.getWindowManager( 
'inspector' );
currentInspector = 
inspectorWindowManager.getCurrentWindow();
if ( currentInspector ) {
autoClosePromises.push( 
inspectorWindowManager.closeWindow( currentInspector ) );

-- 
To view, visit https://gerrit.wikimedia.org/r/325101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa4b032cfd304a33a110bfaf12019a83b0801443
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Correct class/classes typo in gallery dialog

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Correct class/classes typo in gallery dialog
..


Correct class/classes typo in gallery dialog

Bug: T152226
Change-Id: I569df87cf82359c13ad61a3ddffacd83f5f03bae
---
M modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Esanders: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
index 63726c3..4c30f53 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
@@ -673,7 +673,7 @@
mwData.attrs.heights = heights || undefined;
mwData.attrs.perrow = perrow || undefined;
mwData.attrs.showfilename = showFilename ? 'yes' : undefined;
-   mwData.attrs.classes = classes || undefined;
+   mwData.attrs.class = classes || undefined;
mwData.attrs.style = styles || undefined;
 
// Unset mode attribute if it is the same as the default

-- 
To view, visit https://gerrit.wikimedia.org/r/325098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I569df87cf82359c13ad61a3ddffacd83f5f03bae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tchanders 
Gerrit-Reviewer: Esanders 
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...PageForms[REL1_28]: Fix merge_strategy since it requires _ in manifest version 1

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix merge_strategy since it requires _ in manifest version 1
..


Fix merge_strategy since it requires _ in manifest version 1

Change-Id: I4211e36598db95c62806a269b90403d4f7b578c9
(cherry picked from commit 82b9690b31d575c5aebe4c3b0f51ead38fadf3b0)
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Paladox: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 65ede80..9696446 100644
--- a/extension.json
+++ b/extension.json
@@ -437,7 +437,7 @@
"HighlightedDaysOfWeek": null,
"DisabledDates": null,
"HighlightedDates": null,
-   "merge_strategy": "array_plus"
+   "_merge_strategy": "array_plus"
}
},
"manifest_version": 1

-- 
To view, visit https://gerrit.wikimedia.org/r/325100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4211e36598db95c62806a269b90403d4f7b578c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Yaron Koren 
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...PageForms[REL1_28]: Fix merge_strategy since it requires _ in manifest version 1

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325100

Change subject: Fix merge_strategy since it requires _ in manifest version 1
..

Fix merge_strategy since it requires _ in manifest version 1

Change-Id: I4211e36598db95c62806a269b90403d4f7b578c9
(cherry picked from commit 82b9690b31d575c5aebe4c3b0f51ead38fadf3b0)
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/00/325100/1

diff --git a/extension.json b/extension.json
index 65ede80..9696446 100644
--- a/extension.json
+++ b/extension.json
@@ -437,7 +437,7 @@
"HighlightedDaysOfWeek": null,
"DisabledDates": null,
"HighlightedDates": null,
-   "merge_strategy": "array_plus"
+   "_merge_strategy": "array_plus"
}
},
"manifest_version": 1

-- 
To view, visit https://gerrit.wikimedia.org/r/325100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4211e36598db95c62806a269b90403d4f7b578c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix merge_strategy since it requires _ in manifest version 1

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix merge_strategy since it requires _ in manifest version 1
..


Fix merge_strategy since it requires _ in manifest version 1

Change-Id: I4211e36598db95c62806a269b90403d4f7b578c9
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Paladox: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index c970181..5d6c33a 100644
--- a/extension.json
+++ b/extension.json
@@ -434,7 +434,7 @@
"HighlightedDaysOfWeek": null,
"DisabledDates": null,
"HighlightedDates": null,
-   "merge_strategy": "array_plus"
+   "_merge_strategy": "array_plus"
}
},
"manifest_version": 1

-- 
To view, visit https://gerrit.wikimedia.org/r/325099
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4211e36598db95c62806a269b90403d4f7b578c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Yaron Koren 
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...PageForms[master]: Fix merge_strategy since it requires _ in manifest version 1

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325099

Change subject: Fix merge_strategy since it requires _ in manifest version 1
..

Fix merge_strategy since it requires _ in manifest version 1

Change-Id: I4211e36598db95c62806a269b90403d4f7b578c9
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/99/325099/1

diff --git a/extension.json b/extension.json
index c970181..5d6c33a 100644
--- a/extension.json
+++ b/extension.json
@@ -434,7 +434,7 @@
"HighlightedDaysOfWeek": null,
"DisabledDates": null,
"HighlightedDates": null,
-   "merge_strategy": "array_plus"
+   "_merge_strategy": "array_plus"
}
},
"manifest_version": 1

-- 
To view, visit https://gerrit.wikimedia.org/r/325099
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4211e36598db95c62806a269b90403d4f7b578c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Correct class/classes typo in gallery dialog

[Tchanders (Code Review)]

Tchanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325098

Change subject: Correct class/classes typo in gallery dialog
..

Correct class/classes typo in gallery dialog

Bug: T152226
Change-Id: I569df87cf82359c13ad61a3ddffacd83f5f03bae
---
M modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/98/325098/1

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
index 63726c3..4c30f53 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
@@ -673,7 +673,7 @@
mwData.attrs.heights = heights || undefined;
mwData.attrs.perrow = perrow || undefined;
mwData.attrs.showfilename = showFilename ? 'yes' : undefined;
-   mwData.attrs.classes = classes || undefined;
+   mwData.attrs.class = classes || undefined;
mwData.attrs.style = styles || undefined;
 
// Unset mode attribute if it is the same as the default

-- 
To view, visit https://gerrit.wikimedia.org/r/325098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I569df87cf82359c13ad61a3ddffacd83f5f03bae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tchanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ArticleViewCustom, EditPageGetDiffText and ShowRawCssJs were...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: ArticleViewCustom, EditPageGetDiffText and ShowRawCssJs were 
removed
..


ArticleViewCustom, EditPageGetDiffText and ShowRawCssJs were removed

Bug: T145728
Change-Id: Iddf29005abbaceaa1e3cc2c79e4becfb46294414
---
M RELEASE-NOTES-1.29
M docs/hooks.txt
M includes/EditPage.php
M includes/diff/DifferenceEngine.php
M includes/page/Article.php
5 files changed, 4 insertions(+), 98 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index ab7cdd4..f135029 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -64,6 +64,8 @@
   were removed.
 * Article::getAutosummary() and WikiPage::getAutosummary (deprecated in 1.21)
   were removed.
+* Hooks ArticleViewCustom, EditPageGetDiffText and ShowRawCssJs (deprecated in 
1.21)
+  were removed.
 
 == Compatibility ==
 
diff --git a/docs/hooks.txt b/docs/hooks.txt
index da12d8c..0254e06 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -774,14 +774,6 @@
 &$sectionanchor: The section anchor link (e.g. "#overview" )
 &$extraq: Extra query parameters which can be added via hooked functions
 
-'ArticleViewCustom': DEPRECATED! Use ArticleContentViewCustom instead.
-Allows to output the text of the article in a different format than wikitext.
-Note that it is preferable to implement proper handing for a custom data type
-using the ContentHandler facility.
-$text: text of the page
-$title: title of the page
-$output: reference to $wgOut
-
 'ArticleViewFooter': After showing the footer section of an ordinary page view
 $article: Article object
 $patrolFooterShown: boolean whether patrol footer is shown
@@ -1414,13 +1406,6 @@
 'EditPageGetDiffContent': Allow modifying the wikitext that will be used in
 "Show changes". Note that it is preferable to implement diff handling for
 different data types using the ContentHandler facility.
-$editPage: EditPage object
-&$newtext: wikitext that will be used as "your version"
-
-'EditPageGetDiffText': DEPRECATED! Use EditPageGetDiffContent instead.
-Allow modifying the wikitext that will be used in "Show changes". Note that it
-is preferable to implement diff handling for different data types using the
-ContentHandler facility.
 $editPage: EditPage object
 &$newtext: wikitext that will be used as "your version"
 
@@ -2840,12 +2825,6 @@
 
 'ShowMissingArticle': Called when generating the output for a non-existent 
page.
 $article: The article object corresponding to the page
-
-'ShowRawCssJs': DEPRECATED! Use the ContentGetParserOutput hook instead.
-Customise the output of raw CSS and JavaScript in page views.
-$text: Text being shown
-$title: Title of the custom script/stylesheet page
-$output: Current OutputPage object
 
 'ShowSearchHit': Customize display of search hit.
 $searchPage: The SpecialSearch instance.
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 745f8de..f37ce34 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3326,7 +3326,6 @@
}
 
if ( $newContent ) {
-   ContentHandler::runLegacyHooks( 'EditPageGetDiffText', 
[ $this, &$newContent ], '1.21' );
Hooks::run( 'EditPageGetDiffContent', [ $this, 
&$newContent ] );
 
$popts = ParserOptions::newFromUserAndLang( $wgUser, 
$wgContLang );
diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index a5a8676..bd65fb4 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -601,28 +601,7 @@
$out->setRevisionTimestamp( 
$this->mNewRev->getTimestamp() );
$out->setArticleFlag( true );
 
-   // NOTE: only needed for B/C: custom rendering of 
JS/CSS via hook
-   if ( $this->mNewPage->isCssJsSubpage() || 
$this->mNewPage->isCssOrJsPage() ) {
-   // This needs to be synchronised with 
Article::showCssOrJsPage(), which sucks
-   // Give hooks a chance to customise the output
-   // @todo standardize this crap into one function
-   if ( ContentHandler::runLegacyHooks( 
'ShowRawCssJs', [ $this->mNewContent, $this->mNewPage, $out ], '1.24' ) ) {
-   // NOTE: deprecated hook, B/C only
-   // use the content object's own 
rendering
-   $cnt = $this->mNewRev->getContent();
-   $po = $cnt ? $cnt->getParserOutput( 
$this->mNewRev->getTitle(), $this->mNewRev->getId() ) : null;
-   if ( $po ) {
-   $out->addParserOutputContent( 
$po );
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Article::getAutosummary() and WikiPage::getAutosummary() wer...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Article::getAutosummary() and WikiPage::getAutosummary() were 
removed
..


Article::getAutosummary() and WikiPage::getAutosummary() were removed

Bug: T145728
Change-Id: I233571658b902c93a148a992ea99eb159551e732
---
M RELEASE-NOTES-1.29
M includes/page/Article.php
M includes/page/WikiPage.php
M tests/phpunit/includes/page/ArticleTest.php
M tests/phpunit/includes/page/WikiPageTest.php
5 files changed, 2 insertions(+), 95 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index caa35ef..ab7cdd4 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -62,6 +62,8 @@
 * Xml::escapeJsString() (deprecated in 1.21) was removed.
 * Article::getText() and Article::prepareTextForEdit() (deprecated in 1.21)
   were removed.
+* Article::getAutosummary() and WikiPage::getAutosummary (deprecated in 1.21)
+  were removed.
 
 == Compatibility ==
 
diff --git a/includes/page/Article.php b/includes/page/Article.php
index ac363b2..d30f034 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -2725,15 +2725,5 @@
WikiPage::onArticleEdit( $title );
}
 
-   /**
-* @param string $oldtext
-* @param string $newtext
-* @param int $flags
-* @return string
-* @deprecated since 1.21, use ContentHandler::getAutosummary() instead
-*/
-   public static function getAutosummary( $oldtext, $newtext, $flags ) {
-   return WikiPage::getAutosummary( $oldtext, $newtext, $flags );
-   }
// **
 }
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index f016494..284a343 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -3520,28 +3520,6 @@
}
 
/**
-* Return an applicable autosummary if one exists for the given edit.
-* @param string|null $oldtext The previous text of the page.
-* @param string|null $newtext The submitted text of the page.
-* @param int $flags Bitmask: a bitmask of flags submitted for the edit.
-* @return string An appropriate autosummary, or an empty string.
-*
-* @deprecated since 1.21, use ContentHandler::getAutosummary() instead
-*/
-   public static function getAutosummary( $oldtext, $newtext, $flags ) {
-   // NOTE: stub for backwards-compatibility. assumes the given 
text is
-   // wikitext. will break horribly if it isn't.
-
-   wfDeprecated( __METHOD__, '1.21' );
-
-   $handler = ContentHandler::getForModelID( 
CONTENT_MODEL_WIKITEXT );
-   $oldContent = is_null( $oldtext ) ? null : 
$handler->unserializeContent( $oldtext );
-   $newContent = is_null( $newtext ) ? null : 
$handler->unserializeContent( $newtext );
-
-   return $handler->getAutosummary( $oldContent, $newContent, 
$flags );
-   }
-
-   /**
 * Auto-generates a deletion reason
 *
 * @param bool &$hasHistory Whether the page has a history
diff --git a/tests/phpunit/includes/page/ArticleTest.php 
b/tests/phpunit/includes/page/ArticleTest.php
index a96a296..7d0813d 100644
--- a/tests/phpunit/includes/page/ArticleTest.php
+++ b/tests/phpunit/includes/page/ArticleTest.php
@@ -63,13 +63,9 @@
 * @covers Article::onArticleCreate
 * @covers Article::onArticleDelete
 * @covers Article::onArticleEdit
-* @covers Article::getAutosummary
 */
public function testStaticFunctions() {
$this->hideDeprecated( 'Article::selectFields' );
-   $this->hideDeprecated( 'Article::getAutosummary' );
-   $this->hideDeprecated( 'WikiPage::getAutosummary' );
-   $this->hideDeprecated( 'CategoryPage::getAutosummary' ); // 
Inherited from Article
 
$this->assertEquals( WikiPage::selectFields(), 
Article::selectFields(),
"Article static functions" );
@@ -78,8 +74,6 @@
$this->assertEquals( true, is_callable( 
"Article::onArticleDelete" ),
"Article static functions" );
$this->assertEquals( true, is_callable( 
"ImagePage::onArticleEdit" ),
-   "Article static functions" );
-   $this->assertTrue( is_string( CategoryPage::getAutosummary( '', 
'', 0 ) ),
"Article static functions" );
}
 }
diff --git a/tests/phpunit/includes/page/WikiPageTest.php 
b/tests/phpunit/includes/page/WikiPageTest.php
index 4b7ebd3..49d9fd2 100644
--- a/tests/phpunit/includes/page/WikiPageTest.php
+++ b/tests/phpunit/includes/page/WikiPageTest.php
@@ -1034,63 +1034,6 @@
$this->assertEquals( "one", 
$page->getContent()->getNativeData() );
}
 
-