[MediaWiki-commits] [Gerrit] Proxydashboard: Explanatory changes to the 'Create a Proxy' ... - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Proxydashboard: Explanatory changes to the 'Create a Proxy' 
panel
..

Proxydashboard: Explanatory changes to the 'Create a Proxy' panel

Change-Id: I069ce36bbef1a420efede740d1729ef0246c96bd
---
M modules/openstack/files/liberty/horizon/proxy/templates/proxy/_create.html
M modules/openstack/files/liberty/horizon/proxy/views.py
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/279581/1

diff --git 
a/modules/openstack/files/liberty/horizon/proxy/templates/proxy/_create.html 
b/modules/openstack/files/liberty/horizon/proxy/templates/proxy/_create.html
index cfecda6..cb8b11a 100644
--- a/modules/openstack/files/liberty/horizon/proxy/templates/proxy/_create.html
+++ b/modules/openstack/files/liberty/horizon/proxy/templates/proxy/_create.html
@@ -7,6 +7,6 @@
 {% block modal-body-right %}
   {% trans "Description:" %}
   
- {% trans "We can 
put some useful text explaining the form here." %}
+ {% trans "A web 
proxy will relay web traffic from the specified hostname to the backend 
instance.  The proxy will also provide ssl termination." %}
   
 {% endblock %}
diff --git a/modules/openstack/files/liberty/horizon/proxy/views.py 
b/modules/openstack/files/liberty/horizon/proxy/views.py
index 849cf65..f39375d 100644
--- a/modules/openstack/files/liberty/horizon/proxy/views.py
+++ b/modules/openstack/files/liberty/horizon/proxy/views.py
@@ -163,7 +163,7 @@
 
 
 class CreateProxyForm(forms.SelfHandlingForm):
-record = forms.CharField(max_length=255, label=_("Record"))
+record = forms.CharField(max_length=255, label=_("Hostname"))
 domain = forms.ChoiceField(widget=forms.Select(), label=_("Domain"))
 backendInstance = forms.ChoiceField(widget=forms.Select(), 
label=_("Backend instance"))
 backendPort = forms.CharField(widget=TextInput(attrs={'type': 'number'}), 
label=_("Backend port"))

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I069ce36bbef1a420efede740d1729ef0246c96bd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] Proxydashboard: Validate the proxy name with a standard dns ... - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Proxydashboard: Validate the proxy name with a standard dns 
hostname regex
..

Proxydashboard: Validate the proxy name with a standard dns hostname regex

Change-Id: I2bae8bec14315665d1bbf91483e8ea3e5f569960
---
M modules/openstack/files/liberty/horizon/proxy/views.py
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/279582/1

diff --git a/modules/openstack/files/liberty/horizon/proxy/views.py 
b/modules/openstack/files/liberty/horizon/proxy/views.py
index f39375d..9c27efa 100644
--- a/modules/openstack/files/liberty/horizon/proxy/views.py
+++ b/modules/openstack/files/liberty/horizon/proxy/views.py
@@ -163,7 +163,10 @@
 
 
 class CreateProxyForm(forms.SelfHandlingForm):
-record = forms.CharField(max_length=255, label=_("Hostname"))
+record = forms.RegexField(max_length=255, label=_("Hostname"),
+  
regex="^([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])$",
+  error_messages={"invalid":
+  "This must be a simple hostname 
without dots or special characters."})
 domain = forms.ChoiceField(widget=forms.Select(), label=_("Domain"))
 backendInstance = forms.ChoiceField(widget=forms.Select(), 
label=_("Backend instance"))
 backendPort = forms.CharField(widget=TextInput(attrs={'type': 'number'}), 
label=_("Backend port"))

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bae8bec14315665d1bbf91483e8ea3e5f569960
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] Proxydashboard: Move proxy panel into the 'dns' group - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Proxydashboard: Move proxy panel into the 'dns' group
..

Proxydashboard: Move proxy panel into the 'dns' group

It's not a perfect fit but it looked so lonely out on its own...

Change-Id: Id8d9483535f1f3ddc2b4b8e0c1b06ce5da6bc190
---
M modules/openstack/files/liberty/horizon/proxy_enable.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/279580/1

diff --git a/modules/openstack/files/liberty/horizon/proxy_enable.py 
b/modules/openstack/files/liberty/horizon/proxy_enable.py
index c9919f8..4bed1d3 100644
--- a/modules/openstack/files/liberty/horizon/proxy_enable.py
+++ b/modules/openstack/files/liberty/horizon/proxy_enable.py
@@ -1,4 +1,4 @@
 PANEL = 'proxy'
-PANEL_GROUP = 'default'
+PANEL_GROUP = 'dns'
 PANEL_DASHBOARD = 'project'
 ADD_PANEL = ('wikimediaproxydashboard.panel.Proxy')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8d9483535f1f3ddc2b4b8e0c1b06ce5da6bc190
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] Proxydashboard: Check for ownership of a proxy before delet... - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Proxydashboard:  Check for ownership of a proxy before deleting.
..

Proxydashboard:  Check for ownership of a proxy before deleting.

Change-Id: I07b346131c532e0b07e2f10b47160a37a4261ca9
---
M modules/openstack/files/liberty/horizon/proxy/views.py
1 file changed, 22 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/279583/1

diff --git a/modules/openstack/files/liberty/horizon/proxy/views.py 
b/modules/openstack/files/liberty/horizon/proxy/views.py
index 9c27efa..a6ae2f9 100644
--- a/modules/openstack/files/liberty/horizon/proxy/views.py
+++ b/modules/openstack/files/liberty/horizon/proxy/views.py
@@ -66,6 +66,12 @@
 record = obj_id[:obj_id.find('.')]
 domain = obj_id[obj_id.find('.') + 1:]
 
+# First let's make sure that this proxy is really ours to delete.
+fqdn = "%s.%s" % (record, domain)
+existing_domains = [proxy.domain for proxy in get_proxy_list(request)]
+if fqdn not in existing_domains:
+raise Exception("Proxy \'%s\' is to be deleted but is not owned by 
this view." % domain)
+
 if domain == 'wmflabs.org.':
 auth = identity_generic.Password(
 auth_url=base.url_for(request, 'identity'),
@@ -141,6 +147,21 @@
 self.backends = backends
 
 
+def get_proxy_list(request):
+try:
+resp = requests.get(base.url_for(request, 'proxy') + '/mapping')
+if resp.status_code == 400 and resp.text == 'No such project':
+proxies = []
+elif not resp:
+raise Exception("Got status " + str(resp.status_code))
+else:
+proxies = [Proxy(route['domain'], route['backends']) for route in 
resp.json()['routes']]
+except Exception:
+proxies = []
+exceptions.handle(request, _("Unable to retrieve proxies: " + 
resp.text))
+return proxies
+
+
 class IndexView(tables.DataTableView):
 table_class = ProxyTable
 template_name = 'project/proxy/index.html'
@@ -148,18 +169,7 @@
 
 def get_data(self):
 resp = None
-try:
-resp = requests.get(base.url_for(self.request, 'proxy') + 
'/mapping')
-if resp.status_code == 400 and resp.text == 'No such project':
-proxies = []
-elif not resp:
-raise Exception("Got status " + str(resp.status_code))
-else:
-proxies = [Proxy(route['domain'], route['backends']) for route 
in resp.json()['routes']]
-except Exception:
-proxies = []
-exceptions.handle(self.request, _("Unable to retrieve proxies: " + 
resp.text))
-return proxies
+return get_proxy_list(self.request)
 
 
 class CreateProxyForm(forms.SelfHandlingForm):

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07b346131c532e0b07e2f10b47160a37a4261ca9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] media: Misc code clean up in DjVu.php - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: media: Misc code clean up in DjVu.php
..


media: Misc code clean up in DjVu.php

* Use $cache->makeKey() instead of global.
* Access constants via $cache.
* Remove obsolete 'that = this' PHP 5.3 workaround.

Change-Id: I75505d3e3017fde185e43815d4e7acaba3fee69c
---
M includes/media/DjVu.php
1 file changed, 9 insertions(+), 10 deletions(-)

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



diff --git a/includes/media/DjVu.php b/includes/media/DjVu.php
index cd249a8..9add138 100644
--- a/includes/media/DjVu.php
+++ b/includes/media/DjVu.php
@@ -393,25 +393,24 @@
}
 
protected function getDimensionInfo( File $file ) {
-   $that = $this;
-
-   return ObjectCache::getMainWANInstance()->getWithSetCallback(
-   wfMemcKey( 'file-djvu', 'dimensions', $file->getSha1() 
),
-   WANObjectCache::TTL_INDEFINITE,
-   function () use ( $that, $file ) {
-   $tree = $that->getMetaTree( $file );
+   $cache = ObjectCache::getMainWANInstance();
+   return $cache->getWithSetCallback(
+   $cache->makeKey( 'file-djvu', 'dimensions', 
$file->getSha1() ),
+   $cache::TTL_INDEFINITE,
+   function () use ( $file ) {
+   $tree = $this->getMetaTree( $file );
if ( !$tree ) {
return false;
}
 
$dimsByPage = [];
$count = count( $tree->xpath( '//OBJECT' ) );
-   for ( $i = 0; $i < $count; ++$i ) {
+   for ( $i = 0; $i < $count; $i++ ) {
$o = $tree->BODY[0]->OBJECT[$i];
if ( $o ) {
$dimsByPage[$i] = [
'width' => 
(int)$o['width'],
-   'height' => 
(int)$o['height']
+   'height' => 
(int)$o['height'],
];
} else {
$dimsByPage[$i] = false;
@@ -420,7 +419,7 @@
 
return [ 'pageCount' => $count, 
'dimensionsByPage' => $dimsByPage ];
},
-   [ 'pcTTL' => WANObjectCache::TTL_INDEFINITE ]
+   [ 'pcTTL' => $cache::TTL_INDEFINITE ]
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I75505d3e3017fde185e43815d4e7acaba3fee69c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Send Community-Wishlist-Survey stuff to #wikimedia-commtech - change (labs...wikibugs2)

[Niharika29 (Code Review)]

Niharika29 has uploaded a new change for review.

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

Change subject: Send Community-Wishlist-Survey stuff to #wikimedia-commtech
..

Send Community-Wishlist-Survey stuff to #wikimedia-commtech

Change-Id: Ia5c7dfb072d1a9840e4c6bdc2db971fadcfd0732
---
M channels.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 
refs/changes/79/279579/1

diff --git a/channels.yaml b/channels.yaml
index dfee5e3..f907c37 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -48,6 +48,7 @@
 
 "#wikimedia-commtech":
 - Community-Tech(-.*)?
+- Community-Wishlist-Survey
 
 "#wikimedia-ed":
 - Education-.*

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5c7dfb072d1a9840e4c6bdc2db971fadcfd0732
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Niharika29 

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

[MediaWiki-commits] [Gerrit] Don't strip namespace from text that we replace firstHeading... - change (mediawiki...VisualEditor)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Don't strip namespace from text that we replace firstHeading 
with
..

Don't strip namespace from text that we replace firstHeading with

wgTitle is basically just $title->getText()
wgPageName is $title->getPrefixedDBkey()

So we need to take wgPageName and run getPrefixedText (difference is underscores
get replaced by spaces)

Change-Id: Ib99f0d20f1ba99338f80bbbf39cffd544887c3fa
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index d3c04ea..7508482 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -297,7 +297,9 @@
this.checkboxesByName = {};
this.$otherFields = $( [] );
if ( [ 'edit', 'submit' ].indexOf( mw.util.getParamValue( 'action' ) ) 
!== -1 ) {
-   $( '#content #firstHeading' ).text( mw.config.get( 'wgTitle' ) 
);
+   $( '#content #firstHeading' ).text(
+   mw.Title.newFromText( mw.config.get( 'wgPageName' ) 
).getPrefixedText()
+   );
}
 
if ( data.checkboxes ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib99f0d20f1ba99338f80bbbf39cffd544887c3fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
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] Send Community-Wishlist-Survey notifications to commtech - change (labs...wikibugs2)

[Niharika29 (Code Review)]

Niharika29 has uploaded a new change for review.

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

Change subject: Send Community-Wishlist-Survey notifications to commtech
..

Send Community-Wishlist-Survey notifications to commtech

Change-Id: Ifcc80bba19856f8dff4dc68907ab5dc282d8e0b4
---
M channels.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 
refs/changes/77/279577/1

diff --git a/channels.yaml b/channels.yaml
index dfee5e3..a9054f1 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -48,6 +48,7 @@
 
 "#wikimedia-commtech":
 - Community-Tech(-.*)?
+   - Community-Wishlist-Survey
 
 "#wikimedia-ed":
 - Education-.*

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifcc80bba19856f8dff4dc68907ab5dc282d8e0b4
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Niharika29 

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

[MediaWiki-commits] [Gerrit] Add user right for enabling two-factor auth - change (mediawiki...OATHAuth)

[CSteipp (Code Review)]

CSteipp has uploaded a new change for review.

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

Change subject: Add user right for enabling two-factor auth
..

Add user right for enabling two-factor auth

Make new right oathauth-enable that the user must have to enable two
factor authentication (disabling and logging in, of course, are still
allowed).

Bug: T100376
Change-Id: I18d43f8b2cf2c2ce9c2309a43961686498b5c999
---
M OATHAuth.hooks.php
M extension.json
M i18n/en.json
M i18n/qqq.json
M special/SpecialOATHEnable.php
5 files changed, 25 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OATHAuth 
refs/changes/75/279575/1

diff --git a/OATHAuth.hooks.php b/OATHAuth.hooks.php
index 4c3f68d..c65fdf6 100644
--- a/OATHAuth.hooks.php
+++ b/OATHAuth.hooks.php
@@ -142,6 +142,10 @@
 * @return bool
 */
public static function manageOATH( User $user, array &$preferences ) {
+   if ( !$user->isAllowed( 'oathauth-enable' ) ) {
+   return true;
+   }
+
$oathUser = self::getOATHUserRepository()->findByUser( $user );
 
$title = SpecialPage::getTitleFor( 'OATH' );
diff --git a/extension.json b/extension.json
index 09ef513..e367775 100644
--- a/extension.json
+++ b/extension.json
@@ -69,5 +69,13 @@
"SpecialPages": {
"OATH": "SpecialOATH"
},
+   "AvailableRights": [
+   "oathauth-enable"
+   ],
+   "GroupPermissions": {
+   "*": {
+   "oathauth-enable": true
+   }
+   },
"manifest_version": 1
 }
diff --git a/i18n/en.json b/i18n/en.json
index 66568c1..5413063 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -42,5 +42,7 @@
"oathauth-step2alt": "Or enter the secret manually:",
"oathauth-step3": "Step 3: Write down the scratch codes",
"oathauth-step4": "Step 4: Verification",
-   "oathauth-entertoken": "Enter a code from your mobile app to verify:"
+   "oathauth-entertoken": "Enter a code from your mobile app to verify:",
+   "right-oathauth-enable": "Enable two-factor authentication",
+   "action-oathauth-enable": "enable two-factor authentication"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 369a1e3..439c8c5 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -40,11 +40,13 @@
"oathauth-mustbeloggedin": "Plain text seen on Special:OATH when a user 
is not logged in.",
"oathauth-prefs-label": "Plain text label seen on 
Special:Preferences\n\nSee 
[https://en.wikipedia.org/wiki/Two_factor_authentication two factor 
authentication]",
"oathauth-abortlogin": "Error message shown on login and password 
change pages when authentication is aborted.\n\nSee 
[https://en.wikipedia.org/wiki/Two_factor_authentication two factor 
authentication]",
-"oathauth-step1": "Label for step 1 on Special:OATH form",
-"oathauth-step1-test": "Text for step 1 on Special:OATH form",
-"oathauth-step2": "Label for step 2, the QR code, on Special:OATH",
-"oathauth-step2alt": "Label for information on how to manually do step 2 
on Special:OATH",
-"oathauth-step3": "Label for step 3 information on Special:OATH",
-"oathauth-step4": "Label for step 4 information on Special:OATH",
-"oathauth-entertoken": "Label on input field on Special:OATH asking user 
to enter token"
+   "oathauth-step1": "Label for step 1 on Special:OATH form",
+   "oathauth-step1-test": "Text for step 1 on Special:OATH form",
+   "oathauth-step2": "Label for step 2, the QR code, on Special:OATH",
+   "oathauth-step2alt": "Label for information on how to manually do step 
2 on Special:OATH",
+   "oathauth-step3": "Label for step 3 information on Special:OATH",
+   "oathauth-step4": "Label for step 4 information on Special:OATH",
+   "oathauth-entertoken": "Label on input field on Special:OATH asking 
user to enter token",
+   "right-oathauth-enable": "{{doc-right|oathauth-enable}}",
+   "action-oathauth-enable": "{{doc-action|oathauth-enable}}"
 }
diff --git a/special/SpecialOATHEnable.php b/special/SpecialOATHEnable.php
index 1fb4bc4..4e331fd 100644
--- a/special/SpecialOATHEnable.php
+++ b/special/SpecialOATHEnable.php
@@ -20,7 +20,7 @@
 * @param OATHUser $user
 */
public function __construct( OATHUserRepository $repository, OATHUser 
$user ) {
-   parent::__construct( 'OATH', '', false );
+   parent::__construct( 'OATH', 'oathauth-enable', false );
 
$this->OATHRepository = $repository;
$this->OATHUser = $user;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I18d43f8b2cf2c2ce9c2309a43961686498b5c999
Gerrit-PatchSet: 1
Gerrit-Project: 

[MediaWiki-commits] [Gerrit] Don't assume an explicit oldid is old - check it against the... - change (mediawiki...VisualEditor)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Don't assume an explicit oldid is old - check it against the 
current ID
..

Don't assume an explicit oldid is old - check it against the current ID

Bug: T130810
Change-Id: I3d5b748da37a0a059f282f97dd0d68d1846e2553
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 14f9dce..f018c7e 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -42,10 +42,11 @@
 
// Sometimes we actually don't want to send a useful oldid
// if we do, PostEdit will give us a 'page restored' message
+   revisionId = Number.parseInt( revisionId );
this.requestedRevId = revisionId;
this.revid = revisionId || mw.config.get( 'wgCurRevisionId' );
 
-   this.restoring = !!revisionId;
+   this.restoring = !!revisionId && revisionId !== mw.config.get( 
'wgCurRevisionId' );
this.pageDeletedWarning = false;
this.editToken = mw.user.tokens.get( 'editToken' );
this.submitUrl = ( new mw.Uri( mw.util.getUrl( this.pageName ) ) )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d5b748da37a0a059f282f97dd0d68d1846e2553
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
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] RightsLogFormatter: Use DB key to generate foreign user link - change (mediawiki/core)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: RightsLogFormatter: Use DB key to generate foreign user link
..

RightsLogFormatter: Use DB key to generate foreign user link

getText returns a version of the title with spaces instead of underscores,
which confuses WikiMap

Also show underscore in text displayed to user

Bug: T130835
Change-Id: I192e28062590e4602127f895b88328b52018b468
---
M includes/logging/RightsLogFormatter.php
1 file changed, 10 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/74/279574/1

diff --git a/includes/logging/RightsLogFormatter.php 
b/includes/logging/RightsLogFormatter.php
index b9dfb6c..55262df 100644
--- a/includes/logging/RightsLogFormatter.php
+++ b/includes/logging/RightsLogFormatter.php
@@ -33,12 +33,19 @@
global $wgContLang, $wgUserrightsInterwikiDelimiter;
 
if ( !$this->plaintext ) {
-   $text = $wgContLang->ucfirst( $title->getText() );
+   $text = $wgContLang->ucfirst( $title->getDbKey() );
$parts = explode( $wgUserrightsInterwikiDelimiter, 
$text, 2 );
 
if ( count( $parts ) === 2 ) {
-   $titleLink = WikiMap::foreignUserLink( 
$parts[1], $parts[0],
-   htmlspecialchars( $title->getText() ) );
+   $titleLink = WikiMap::foreignUserLink(
+   $parts[1],
+   $parts[0],
+   htmlspecialchars(
+   strtr( $parts[0], '_', ' ' ) .
+   $wgUserrightsInterwikiDelimiter 
.
+   $parts[1]
+   )
+   );
 
if ( $titleLink !== false ) {
return $titleLink;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I192e28062590e4602127f895b88328b52018b468
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Block form handling: Check for 'Tags' index in $data from UI... - change (mediawiki/core)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Block form handling: Check for 'Tags' index in $data from UI 
before trying to access it
..

Block form handling: Check for 'Tags' index in $data from UI before trying to 
access it

Was showing this notice:
Undefined index: Tags in /path/to/mw/includes/specials/SpecialUnblock.php on 
line 241

The API sets this but the UI does not

Change-Id: Ibf31c2b9be4d4b621d1745fd87550a383c389f12
---
M includes/specials/SpecialUnblock.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/73/279573/1

diff --git a/includes/specials/SpecialUnblock.php 
b/includes/specials/SpecialUnblock.php
index cc7a091..cff8bf4 100644
--- a/includes/specials/SpecialUnblock.php
+++ b/includes/specials/SpecialUnblock.php
@@ -238,7 +238,9 @@
$logEntry->setTarget( $page );
$logEntry->setComment( $data['Reason'] );
$logEntry->setPerformer( $performer );
-   $logEntry->setTags( $data['Tags'] );
+   if ( isset( $data['Tags'] ) ) {
+   $logEntry->setTags( $data['Tags'] );
+   }
$logId = $logEntry->insert();
$logEntry->publish( $logId );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf31c2b9be4d4b621d1745fd87550a383c389f12
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] errorpage: Minor code clean up and simplify replacement url - change (operations/mediawiki-config)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: errorpage: Minor code clean up and simplify replacement url
..

errorpage: Minor code clean up and simplify replacement url

* Move header together.
* Merge duplicate code paths.
* Consistently use  instead of font-weight in both places.
* Consistently use  instead of font-style in both places.
* Remove redundant 'type' attribute on 

[MediaWiki-commits] [Gerrit] errorpages: Remove X-Wikimedia-Debug header from 404.php res... - change (operations/mediawiki-config)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: errorpages: Remove X-Wikimedia-Debug header from 404.php 
response
..

errorpages: Remove X-Wikimedia-Debug header from 404.php response

This doesn't seem very useful and is confusing with the unrelated request header
of the same name .

Change-Id: Ic0b85ebdca2e4a33cc9e3011e11a5c5a77f30f76
---
M errorpages/404.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/errorpages/404.php b/errorpages/404.php
index 5f31e59..bf387cf 100644
--- a/errorpages/404.php
+++ b/errorpages/404.php
@@ -11,7 +11,6 @@
 
 $encUrl = htmlspecialchars( $prot . $serv . $loc );
 header( "Cache-Control: s-maxage=2678400, max-age=2678400");
-header( "X-Wikimedia-Debug: prot=$prot serv=$serv loc=$loc");
 if( preg_match( "/(%2f)/i", $loc, $matches )
|| preg_match( "/^\/(?:upload|style|wiki|w|extensions)\/(.*)/i", $loc, 
$matches )
 ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0b85ebdca2e4a33cc9e3011e11a5c5a77f30f76
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] Add npm entry point - change (mediawiki...DataTransfer)

[Yaron Koren (Code Review)]

Yaron Koren has submitted this change and it was merged.

Change subject: Add npm entry point
..


Add npm entry point

Change-Id: If7f6850560b84923a1a043af2217e005edb3ea5e
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 32 insertions(+), 1 deletion(-)

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



diff --git a/.gitignore b/.gitignore
index 98b092a..1689d7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-.svn
 *~
 *.kate-swp
 .*.swp
+node_modules/**
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..7756e75
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..41cecca
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.4.0",
+"grunt-jsonlint": "1.0.7"
+  }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If7f6850560b84923a1a043af2217e005edb3ea5e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataTransfer
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
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] Provide a unique request identifier - change (mediawiki/core)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Provide a unique request identifier
..

Provide a unique request identifier

When MediaWiki encounters an unhandled exception, the error message it produces
includes a randomly-generated token, which allows the exception details to be
looked up in the error logs. This is useful but narrow: would it not be useful
to have the ability to retrieve all log records associated with a particular
request, rather than just exception details? (Hint: yes.)

So: introduce the notion of a request-global unique ID, retrievable via
WebRequest::getRequestId(). When MediaWiki is behind Apache + mod_unique_id
(which provides the same facility) or some other software which sets a
UNIQUE_ID envvar, the value of that envvar is used as the request ID.
Otherwise, it is a randomly-generated 24-character string.

The request ID supplants exception-specific IDs; MWExceptionHandler::getLogId()
is deprecated, accordingly. The request ID is also added as an annotation to
all Monolog-processed log records, and is exposed client-side as 'wgRequestId'.
This allows developers to associate a page view with log records even when the
page view does not result in an unhandled exception. (For the WMF, I also
intend to add it as an annotation to profiling data).

The request ID is not a tracking token; it does not persist, and it is
associated with a backend request, not with a particular user or a particular
session. Like the data in the NewPP report, the request ID is designed to be
cacheable, so that if, for example, a developer notices something weird in the
HTML, s/he can associate the output with a backend request regardless of
whether the response was served from the cache or directly from the backend.

Some prior art:
* https://httpd.apache.org/docs/2.4/mod/mod_unique_id.html
* http://api.rubyonrails.org/classes/ActionDispatch/RequestId.html
* https://github.com/dabapps/django-log-request-id
* https://packagist.org/packages/php-middleware/request-id
* https://github.com/rhyselsmore/flask-request-id

Change-Id: Iaf90c20c330e0470b9b98627a0228cadefd301d1
---
M RELEASE-NOTES-1.27
M includes/OutputPage.php
M includes/WebRequest.php
M includes/api/ApiMain.php
M includes/debug/logger/monolog/WikiProcessor.php
M includes/exception/MWException.php
M includes/exception/MWExceptionHandler.php
7 files changed, 39 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/70/279570/1

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index ac19d39..915b93b 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -175,6 +175,12 @@
   be a good idea, but will log out all current sessions.
 * $wgEventRelayerConfig was added, for managing PubSub event relay 
configuration,
   specifically for reliable CDN url purges.
+* Requests have unique IDs, equal to the UNIQUE_ID environment variable (when
+  MediaWiki is behind Apache+mod_unique_id or something similar) or a randomly-
+  generated 24-character string. This request ID is used to annotate log 
records
+  and error messages. It is available client-side via mw.config.get( 
'wgRequestId' ).
+  The request ID supplants exception IDs. Accordingly, 
MWExceptionHandler::getLogId()
+  is deprecated.
 
 === External library changes in 1.27 ===
 
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 0c3d609..3c0dc18 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3210,6 +3210,7 @@
'wgMonthNamesShort' => 
$lang->getMonthAbbreviationsArray(),
'wgRelevantPageName' => 
$relevantTitle->getPrefixedDBkey(),
'wgRelevantArticleId' => $relevantTitle->getArticleID(),
+   'wgRequestId' => WebRequest::getRequestId(),
];
 
if ( $user->isLoggedIn() ) {
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 812a320..f4b4871 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -247,6 +247,25 @@
}
 
/**
+* Get the unique request ID.
+* This is either the value of the UNIQUE_ID envvar (if present) or a
+* randomly-generated 24-character string.
+*
+* @return string
+* @since 1.27
+*/
+   public static function getRequestId() {
+   static $reqId;
+
+   if ( !$reqId ) {
+   $reqId = isset( $_SERVER['UNIQUE_ID'] )
+   ? $_SERVER['UNIQUE_ID'] : wfRandomString( 24 );
+   }
+
+   return $reqId;
+   }
+
+   /**
 * Get the current URL protocol (http or https)
 * @return string
 */
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 63b79ac..5566d31 100644
--- a/includes/api/ApiMain.php
+++ 

[MediaWiki-commits] [Gerrit] Wikitech: Remove address, domain, proxy special pages. - change (mediawiki...OpenStackManager)

[jenkins-bot (Code Review)]

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

Change subject: Wikitech:  Remove address, domain, proxy special pages.
..


Wikitech:  Remove address, domain, proxy special pages.

Bug: T124184
Change-Id: I02e309dd119265468da52ebd7bbd8afdec161a65
---
M OpenStackManager.php
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/OpenStackManager.php b/OpenStackManager.php
index 28f009f..bedab09 100644
--- a/OpenStackManager.php
+++ b/OpenStackManager.php
@@ -234,14 +234,11 @@
 $wgSpecialPages['NovaInstance'] = 'SpecialNovaInstance';
 $wgSpecialPages['NovaKey'] = 'SpecialNovaKey';
 $wgSpecialPages['NovaProject'] = 'SpecialNovaProject';
-$wgSpecialPages['NovaDomain'] = 'SpecialNovaDomain';
-$wgSpecialPages['NovaAddress'] = 'SpecialNovaAddress';
 $wgSpecialPages['NovaSecurityGroup'] = 'SpecialNovaSecurityGroup';
 $wgSpecialPages['NovaServiceGroup'] = 'SpecialNovaServiceGroup';
 $wgSpecialPages['NovaRole'] = 'SpecialNovaRole';
 $wgSpecialPages['NovaVolume'] = 'SpecialNovaVolume';
 $wgSpecialPages['NovaSudoer'] = 'SpecialNovaSudoer';
-$wgSpecialPages['NovaProxy'] = 'SpecialNovaProxy';
 $wgSpecialPages['NovaPuppetGroup'] = 'SpecialNovaPuppetGroup';
 $wgSpecialPages['NovaResources'] = 'SpecialNovaResources';
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I02e309dd119265468da52ebd7bbd8afdec161a65
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Wikitech: Remove address, domain, proxy special pages. - change (mediawiki...OpenStackManager)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Wikitech:  Remove address, domain, proxy special pages.
..

Wikitech:  Remove address, domain, proxy special pages.

Bug: T124184
Change-Id: I02e309dd119265468da52ebd7bbd8afdec161a65
---
M OpenStackManager.php
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager 
refs/changes/69/279569/1

diff --git a/OpenStackManager.php b/OpenStackManager.php
index 28f009f..bedab09 100644
--- a/OpenStackManager.php
+++ b/OpenStackManager.php
@@ -234,14 +234,11 @@
 $wgSpecialPages['NovaInstance'] = 'SpecialNovaInstance';
 $wgSpecialPages['NovaKey'] = 'SpecialNovaKey';
 $wgSpecialPages['NovaProject'] = 'SpecialNovaProject';
-$wgSpecialPages['NovaDomain'] = 'SpecialNovaDomain';
-$wgSpecialPages['NovaAddress'] = 'SpecialNovaAddress';
 $wgSpecialPages['NovaSecurityGroup'] = 'SpecialNovaSecurityGroup';
 $wgSpecialPages['NovaServiceGroup'] = 'SpecialNovaServiceGroup';
 $wgSpecialPages['NovaRole'] = 'SpecialNovaRole';
 $wgSpecialPages['NovaVolume'] = 'SpecialNovaVolume';
 $wgSpecialPages['NovaSudoer'] = 'SpecialNovaSudoer';
-$wgSpecialPages['NovaProxy'] = 'SpecialNovaProxy';
 $wgSpecialPages['NovaPuppetGroup'] = 'SpecialNovaPuppetGroup';
 $wgSpecialPages['NovaResources'] = 'SpecialNovaResources';
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02e309dd119265468da52ebd7bbd8afdec161a65
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: wmf/1.27.0-wmf.18
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] Disable submit buttons if we know the user can't edit - change (mediawiki...Flow)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: Disable submit buttons if we know the user can't edit
..

Disable submit buttons if we know the user can't edit

For performance reasons, we can not compute this with 100% accuracy
at page load (we could maybe do it when they open the editor, but this
doesn't).

However, there is a core variable (wgIsProbablyEditable) that tells you
when they definitely can *not* edit.

This uses that variable to disable save buttons and show the user an
indication of why.

We should polish the text and use a better icon.

Bug: T108762
Bug: T127774
Change-Id: I7507a67e9ca9dfc778f795c96604951e85f9b3f6
---
M Resources.php
M i18n/en.json
M i18n/qqq.json
M modules/flow/ui/widgets/editor/mw.flow.ui.AnonWarningWidget.js
A modules/flow/ui/widgets/editor/mw.flow.ui.CanNotEditWidget.js
M modules/flow/ui/widgets/editor/mw.flow.ui.EditorControlsWidget.js
M modules/flow/ui/widgets/editor/mw.flow.ui.EditorWidget.js
M modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
M modules/flow/ui/widgets/mw.flow.ui.EditPostWidget.js
M modules/flow/ui/widgets/mw.flow.ui.EditTopicSummaryWidget.js
M modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
M modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
M modules/flow/ui/widgets/mw.flow.ui.TopicTitleWidget.js
M modules/mw.flow.Initializer.js
A modules/styles/flow/widgets/editor/mw.flow.ui.CanNotEditWidget.less
15 files changed, 142 insertions(+), 10 deletions(-)


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

diff --git a/Resources.php b/Resources.php
index 86c715a..c5e5f33 100644
--- a/Resources.php
+++ b/Resources.php
@@ -390,6 +390,7 @@

'flow/ui/widgets/editor/editors/mw.flow.ui.WikitextEditorWidget.js',

'flow/ui/widgets/editor/editors/mw.flow.ui.VisualEditorWidget.js',

'flow/ui/widgets/editor/mw.flow.ui.AnonWarningWidget.js',
+   'flow/ui/widgets/editor/mw.flow.ui.CanNotEditWidget.js',

'flow/ui/widgets/editor/mw.flow.ui.EditorSwitcherWidget.js',

'flow/ui/widgets/editor/mw.flow.ui.EditorControlsWidget.js',
'flow/ui/widgets/editor/mw.flow.ui.EditorWidget.js',
@@ -406,8 +407,8 @@
'styles/flow/widgets/mw.flow.ui.ReplyWidget.less',

'styles/flow/widgets/mw.flow.ui.SidebarExpandWidget.less',
'styles/flow/widgets/mw.flow.ui.NewTopicWidget.less',
-

'styles/flow/widgets/editor/mw.flow.ui.AnonWarningWidget.less',
+   
'styles/flow/widgets/editor/mw.flow.ui.CanNotEditWidget.less',

'styles/flow/widgets/editor/mw.flow.ui.EditorControlsWidget.less',

'styles/flow/widgets/editor/mw.flow.ui.EditorSwitcherWidget.less',

'styles/flow/widgets/editor/mw.flow.ui.EditorWidget.less',
@@ -417,6 +418,7 @@
'styles/flow/widgets/mw.flow.ui.TopicTitleWidget.less',
),
'messages' => array(
+   'flow-error-can-not-edit',
'flow-error-parsoid-failure',
'flow-error-default',
'flow-dialog-cancelconfirm-title',
diff --git a/i18n/en.json b/i18n/en.json
index 8e9c69c..3652374 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -130,6 +130,7 @@
"flow-error-allowcreation-no-usedb": "Enabling Flow on a specific page 
requires $wgContentHandlerUseDB to be true.",
"flow-error-allowcreation-already-exists": "Page already exists at 
destination, so a Flow board can not be moved there.",
"flow-error-allowcreation-flow-create-board": "User does not have the 
\"{{int:right-flow-create-board}}\" permission",
+   "flow-error-can-not-edit": "{{GENDER:|You}} are not currently able to 
add content to this Flow board, or edit it, because the board is protected, or 
you do not have the required rights.",
"flow-error-http": "An error occurred while contacting the server.",
"flow-error-external": "An error occurred. The error message received 
was: $1",
"flow-error-topic-is-locked": "This topic is resolved, so further 
activity is not possible.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 9d30f86..bad7156 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -140,6 +140,7 @@
"flow-error-allowcreation-no-usedb": "Internal error when attempting to 
enable Flow on a specific page, and $wgContentHandlerUseDB is not 
set to true. Do not translate true as it a boolean 
value.",
"flow-error-allowcreation-already-exists": "Internal error when 
attempting to enable Flow on a specific page, and $mustNotExist was set true, 
but the page does already exist",

[MediaWiki-commits] [Gerrit] Remove unused error messages, switch API errors to HTML, and... - change (mediawiki...Flow)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: Remove unused error messages, switch API errors to HTML, and 
handle that on the client.
..

Remove unused error messages, switch API errors to HTML, and handle that on the 
client.

I tried to find ways to make the errors short text messages (which is why the 
Flow messages
were converted to be such), rather than (sometimes-long) HTML.  However, the 
errors in core
and other extensions use wikitext rather than plaintext, and the mechanism to 
handle this (messageMap)
completely lacks i18n (English-only).

So until the i18n error system is improved, I think we have to use HTML.

I also removed unused Flow errors.

Bug: T121137
Change-Id: I0ca448380491400400f9bf35f812b4f73f67d26f
---
M i18n/en.json
M i18n/qqq.json
M includes/Api/ApiFlowBase.php
M includes/Api/ApiFlowBaseGet.php
M includes/Api/ApiFlowBasePost.php
M includes/Block/Topic.php
M includes/Exception/ExceptionHandling.php
M includes/Model/Workflow.php
M includes/SubmissionHandler.php
M modules/flow/ui/widgets/mw.flow.ui.BoardDescriptionWidget.js
M modules/flow/ui/widgets/mw.flow.ui.EditPostWidget.js
M modules/flow/ui/widgets/mw.flow.ui.EditTopicSummaryWidget.js
M modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
M modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
M modules/flow/ui/widgets/mw.flow.ui.TopicTitleWidget.js
M modules/mw.flow.Initializer.js
16 files changed, 56 insertions(+), 42 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index db04362..8e9c69c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -131,22 +131,16 @@
"flow-error-allowcreation-already-exists": "Page already exists at 
destination, so a Flow board can not be moved there.",
"flow-error-allowcreation-flow-create-board": "User does not have the 
\"{{int:right-flow-create-board}}\" permission",
"flow-error-http": "An error occurred while contacting the server.",
-   "flow-error-other": "An unexpected error occurred.",
-   "flow-error-external": "An error occurred.The error message 
received was: $1",
+   "flow-error-external": "An error occurred. The error message received 
was: $1",
"flow-error-topic-is-locked": "This topic is resolved, so further 
activity is not possible.",
"flow-error-lock-moderated-post": "You cannot mark a moderated post as 
resolved.",
-   "flow-error-external-multi": "Errors were encountered.$1",
"flow-error-missing-content": "Post has no content. Content is required 
to save a post.",
"flow-error-missing-summary": "You must submit a summary.",
"flow-error-missing-title": "Topic has no title. Title is required to 
save a topic.",
"flow-error-parsoid-failure": "Unable to transfer content: Error 
contacting the server for conversion between wikitext and HTML. Please check 
your Internet connection or try again later if the problem persists. If you 
still get this error please file a bug",
"flow-error-missing-replyto": "No \"replyTo\" parameter was supplied. 
This parameter is required for the \"reply\" action.",
-   "flow-error-invalid-replyto": "\"replyTo\" parameter was invalid. The 
specified post could not be found.",
-   "flow-error-delete-failure": "Deletion of this item failed.",
-   "flow-error-hide-failure": "Hiding this item failed.",
"flow-error-missing-postId": "No \"postId\" parameter was supplied. 
This parameter is required to manipulate a post.",
"flow-error-invalid-postId": "\"postId\" parameter was invalid. The 
specified post ($1) could not be found.",
-   "flow-error-restore-failure": "Restoration of this item failed.",
"flow-error-invalid-moderation-state": "An invalid value for a 
parameter ('moderationState') was submitted to the Flow API.",
"flow-error-invalid-moderation-reason": "Please provide a reason for 
the moderation.",
"flow-error-not-allowed": "Insufficient permissions to execute this 
action.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 720ac4c..9d30f86 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -141,22 +141,16 @@
"flow-error-allowcreation-already-exists": "Internal error when 
attempting to enable Flow on a specific page, and $mustNotExist was set true, 
but the page does already exist",
"flow-error-allowcreation-flow-create-board": "Internal error when 
attempting to enable Flow on a specific page, and user does not have 
flow-create-board",
"flow-error-http": "Used as error message on HTTP error.",
-   "flow-error-other": "Used as generic error message.",
-   "flow-error-external": "Uses as error message. Parameters:\n* $1 - 
error message\nSee also:\n* {{msg-mw|Flow-error-external-multi}}",
+   "flow-error-external": "Used as error message. 

[MediaWiki-commits] [Gerrit] Enable extension registration for InputBox - change (operations/mediawiki-config)

[Dereckson (Code Review)]

Dereckson has uploaded a new change for review.

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

Change subject: Enable extension registration for InputBox
..

Enable extension registration for InputBox

Bug: T119117
Change-Id: I65027fb19e205c37f2cb52a48e3ce9a411858621
---
M wmf-config/CommonSettings.php
M wmf-config/extension-list
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 80d6023..a213d70 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -696,7 +696,7 @@
 }
 
 if ( $wmgUseInputBox ) {
-   include( $IP . '/extensions/InputBox/InputBox.php' );
+   wfLoadExtension( 'InputBox' );
 }
 
 if ( $wmgUseImageMap ) {
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 1a0f67d..504b715 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -61,7 +61,7 @@
 $IP/extensions/GWToolset/GWToolset.php
 $IP/extensions/ImageMap/ImageMap.php
 $IP/extensions/ImageMetrics/ImageMetrics.php
-$IP/extensions/InputBox/InputBox.php
+$IP/extensions/InputBox/extension.json
 $IP/extensions/Insider/Insider.php
 $IP/extensions/intersection/DynamicPageList.php
 $IP/extensions/Interwiki/Interwiki.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65027fb19e205c37f2cb52a48e3ce9a411858621
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 

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

[MediaWiki-commits] [Gerrit] admin: create shell account for dereckson - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: admin: create shell account for dereckson
..

admin: create shell account for dereckson

Bug:T129365
Change-Id: I74084091b373540112e83d980702d27c875ad862
---
M modules/admin/data/data.yaml
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/279565/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index b23e448..f178052 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1855,3 +1855,11 @@
 ssh_keys:
   - ssh-rsa 
B3NzaC1yc2EDAQABAAACAQDIaXtdgL5Xj5c9XLGxkVQYLAZfbgqQWuRaX2VajopwH4mqFvNuZWiPFMF53t+H4eUdF+/1LfA0DSebuYrzP83LgZH69UVXxwl4xNeyZtjNRf577eojl9nb+TIZhPCQpwLLKRyDu50uRUXfKJ4rXlVFE3r103+6OmVgIc8+SLF3X1umJsv9wDnclBLIrdd0wieUasyaosUjp211BALftpf6CZ6KlqCOwBjcyJ5bxyDJ0SBBEzksROEYJm6QshYgJs9aywcWsfpQPskP4tavHkL2ppQ7VfNm2zxyVRyrbXqXH+55pWwusQW5vVChnkhpVKO7p/7BYJNF+YZlwip5JpyRTOgC5OmXFmL3GP6ib62RWi7YaMxg4jS1JkbvzL6js2+P8k6UcE7Cu/KfIAkwqYMymw217oNx8hXfrOVOr3PcMhhKd9BsTrQd0xonlSyZQxbOdxnUm7oYApkCBoYt+tYdwU+RX/kvdrz2QULgrGJaxjBf8ZrT8G15Efm89fkGRWZ8sQfT4m6C91lFvOrX53G2igY2BfWBd9dIvw3v1/ZG2gHsEs4G2I/9wZDFrR5itedjzW3lMU47sVTNC/dl5wcR/Xc70AjT6AA3fispIJZWIYjAAnBgKyRXawJf5wc2II+AjZvAvHBgKSsRlk/DTzLghvM9XwFX843DgaO/CZgfbQ==
 nsch...@wikimedia.org
 uid: 13973
+  dereckson:
+ensure: present
+gid: 500
+name: dereckson
+realname: Sebastien Santoro
+ssh_keys:
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAACAQC72LsfzAEKAXX1184vQojgMfAE2bz3deNtM2vAyxNnpkAzvaqM2Oe1JjJ08E1qS9l5Gtc7zqLrbvSpf2uNkqAYAm/0O3098ykQdv7MOXwcDJNraJx0l5rdSkNxEryQZ9xlwPQ+eKp2avNCaL+YW5YPN7vjvu5bibJN8KtIsIsmBNhhQdTiLcaAX2ZlyOfVybVzLiPz5f0if38AgZlWJdKaNcXn1Yndw5cBzPrNl2Y9ODREFxrEEEz/OjwSHESbGHrkablfg8YiZV5V6p/0IYIfrkHMmKea4+l8f7f57XKCochFhqJP5oZ4/k4OWt63wSwu9hKqsBMjVMbxddBOit79t/dXdvlv3O05V399bW+I9C04rww9xuLJ8ujfmhQtk/sO08caJOBjgXx+EH8/+114n+PdL74AYLDnjE4nSUuJLL7aAmOu70d7C5R7kyBkK+P2AL67tq13VvORwYjbRP8EwRredQ/HHP2jqFXaF6+2/uVQ3Bv0uVvfVCcgprPl0d0OA+C0dBiSVaFfyVPtgj8qbRsntQMcHN+GN4rxZe6A4VEXOUZj+/XVWdKb0m36KlnDwPUHVkZvoc7czeJGX/d1s7RwW5BMn2PxUPcuBLi/100CVaHHC3HCShZpLm9vh2eaHsV927oZg9TuS9ptB9LYEpn46yIHY47b0jYDwY0StQ==
 dereckson-wikimedia-prod-20160324
+uid: 2362

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I74084091b373540112e83d980702d27c875ad862
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>

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

[MediaWiki-commits] [Gerrit] admin: add dereckson to deployers - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: admin: add dereckson to deployers
..

admin: add dereckson to deployers

Bug:T129365
Change-Id: I12d7a74342cd83749e04eff9479f67b996a17961
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/279566/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index f178052..8638b11 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -48,7 +48,7 @@
   nikerabbit, reedy, robla, spage, ssastry, tomasz, yurik,
   tgr, phuedx, bsimmers, ejegg, twentyafterfour, legoktm, catrope, 
krenair,
   mobrovac, nuria, thcipriani, joal, eevans, mforns, dpatrick, 
dcausse,
-  bsitzmann, mholloway-shell, jzerebecki, dduvall, gehel, 
madhuvishy]
+  bsitzmann, mholloway-shell, jzerebecki, dduvall, gehel, 
madhuvishy, dereckson]
 privileges: ['ALL = (www-data,apache,mwdeploy,l10nupdate) NOPASSWD: ALL',
  'ALL = NOPASSWD: /sbin/restart hhvm',
  'ALL = NOPASSWD: /sbin/start hhvm',

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

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

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

[MediaWiki-commits] [Gerrit] Revert "varnish: route upload cache backends to codfw" - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Revert "varnish: route upload cache backends to codfw"
..


Revert "varnish: route upload cache backends to codfw"

This reverts commit cd7f7ae26946cde6600e6b37050b7bab5056c4b5.

Bug: T129089
Change-Id: I9d4e0a9ee85c58f2e107a84f4e1fae6b19b4ee16
---
M hieradata/common/cache/upload.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/hieradata/common/cache/upload.yaml 
b/hieradata/common/cache/upload.yaml
index 7ef5210..25ead0f 100644
--- a/hieradata/common/cache/upload.yaml
+++ b/hieradata/common/cache/upload.yaml
@@ -44,7 +44,7 @@
 - 'cp4015.ulsfo.wmnet'
 apps:
   swift:
-route: 'codfw'
+route: 'eqiad'
 backends:
   eqiad: 'ms-fe.svc.eqiad.wmnet'
   codfw: 'ms-fe.svc.codfw.wmnet'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d4e0a9ee85c58f2e107a84f4e1fae6b19b4ee16
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] WIP: Rewrite /static/ also for PURGE requests - change (operations/puppet)

[GWicke (Code Review)]

GWicke has uploaded a new change for review.

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

Change subject: WIP: Rewrite /static/ also for PURGE requests
..

WIP: Rewrite /static/ also for PURGE requests

Bug: T130904
Change-Id: I6ac59be92ad171332c81987e9153be8266ba629e
---
M templates/varnish/text-backend.inc.vcl.erb
M templates/varnish/text-frontend.inc.vcl.erb
2 files changed, 18 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/279564/1

diff --git a/templates/varnish/text-backend.inc.vcl.erb 
b/templates/varnish/text-backend.inc.vcl.erb
index d07c220..ed987d4 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -5,6 +5,15 @@
 sub cluster_be_recv_pre_purge {
if (req.request == "PURGE") {
call text_normalize_path;
+
+   # normalize all /static to the same hostname for caching
+   if (req.url ~ "^/static/") { set req.http.host = "<%= 
@vcl_config.fetch("static_host") %>"; }
+
+   # normalize all /w/static.php to the same wiki host for caching
+   # ignore urls without hash query as those are affected by 
multiversion
+   if (req.url ~ 
"^/w/(skins|resources|extensions)/.+\?[a-fA-F0-9]+$" ) {
+   set req.http.host = "<%= 
@vcl_config.fetch("static_host") %>";
+   }
}
 }
 
diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 098fa53..c601533 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -113,6 +113,15 @@
 
// Normalize paths before purging
call text_normalize_path;
+
+   # normalize all /static to the same hostname for caching
+   if (req.url ~ "^/static/") { set req.http.host = "<%= 
@vcl_config.fetch("static_host") %>"; }
+
+   # normalize all /w/static.php to the same wiki host for caching
+   # ignore urls without hash query as those are affected by multiversion
+   if (req.url ~ "^/w/(skins|resources|extensions)/.+\?[a-fA-F0-9]+$" ) {
+   set req.http.host = "<%= @vcl_config.fetch("static_host") %>";
+   }
 }
 
 sub cluster_fe_recv {
@@ -125,15 +134,6 @@
}
 
call mobile_redirect;
-
-   # normalize all /static to the same hostname for caching
-   if (req.url ~ "^/static/") { set req.http.host = "<%= 
@vcl_config.fetch("static_host") %>"; }
-
-   # normalize all /w/static.php to the same wiki host for caching
-   # ignore urls without hash query as those are affected by multiversion
-   if (req.url ~ "^/w/(skins|resources|extensions)/.+\?[a-fA-F0-9]+$" ) {
-   set req.http.host = "<%= @vcl_config.fetch("static_host") %>";
-   }
 
// Users that just logged out, should not get a 304 for their
// (locally cached) logged in pages.

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

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

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

[MediaWiki-commits] [Gerrit] Also update exim config for labtest realm - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Also update exim config for labtest realm
..


Also update exim config for labtest realm

Change-Id: I3e2eeaa830f8e8fd33716ce8d73cc68c7b4e0146
---
M templates/mail/exim4.minimal.labtest.erb
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/templates/mail/exim4.minimal.labtest.erb 
b/templates/mail/exim4.minimal.labtest.erb
index 547d82c..74abe58 100644
--- a/templates/mail/exim4.minimal.labtest.erb
+++ b/templates/mail/exim4.minimal.labtest.erb
@@ -13,6 +13,9 @@
 # No frozen messages please
 ignore_bounce_errors_after = 0h
 
+add_environment = <; PATH=/bin:/usr/bin
+keep_environment =
+
 # Logging
 log_selector = +address_rewrite +all_parents +delivery_size +deliver_time 
+incoming_interface +incoming_port +smtp_confirmation +smtp_protocol_error 
+smtp_syntax_error
 message_logs = false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e2eeaa830f8e8fd33716ce8d73cc68c7b4e0146
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
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.widgets: Remove use of bind() for lexical 'this' b... - change (mediawiki/core)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: mediawiki.widgets: Remove use of bind() for lexical 'this' 
binding
..

mediawiki.widgets: Remove use of bind() for lexical 'this' binding

Follows-up 4636ac79dd.

Bind can be useful when needing to pass an instance method elewhere.

However when nesting closures, use the scope directly instead of binding 'this'
several layers deep. This is fragile at best and doesn't make it less confusing.

Leave the natural 'this' unchanged. Change this can go wrong both ways and
results in unpredictable behaviour and confusing code that is hard to review.
Sometimes one means the outer 'this' but gets the inner one, and sometimes you
need the inner one (e.g. inside callbacks for jQuery). Consistently asign a
variable and use scope to access objects. Besides, one can't escape it when you
need both.

This avoids an entire class of potential errors. It also performs marginally
better without a binding but that's besides the point as there are other valid
uses of bind().

Change-Id: I1fcfdbd8fa7c52e150cadd8a520591e700c5bfa9
---
M resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js
1 file changed, 16 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/63/279563/1

diff --git 
a/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js
index 5369d35..58115c3 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js
@@ -25,23 +25,24 @@
 * @private
 */
PageExistenceCache.prototype.processExistenceCheckQueue = function () {
-   var queue, titles;
+   var queue, titles,
+   cache = this;
if ( this.currentRequest ) {
// Don't fire off a million requests at the same time
this.currentRequest.always( function () {
-   this.currentRequest = null;
-   this.processExistenceCheckQueueDebounced();
-   }.bind( this ) );
+   cache.currentRequest = null;
+   cache.processExistenceCheckQueueDebounced();
+   } );
return;
}
queue = this.existenceCheckQueue;
this.existenceCheckQueue = {};
titles = Object.keys( queue ).filter( function ( title ) {
-   if ( this.existenceCache.hasOwnProperty( title ) ) {
-   queue[ title ].resolve( this.existenceCache[ 
title ] );
+   if ( cache.existenceCache.hasOwnProperty( title ) ) {
+   queue[ title ].resolve( cache.existenceCache[ 
title ] );
}
-   return !this.existenceCache.hasOwnProperty( title );
-   }.bind( this ) );
+   return !cache.existenceCache.hasOwnProperty( title );
+   } );
if ( !titles.length ) {
return;
}
@@ -53,10 +54,10 @@
} ).done( function ( response ) {
$.each( response.query.pages, function ( index, page ) {
var title = new ForeignTitle( page.title 
).getPrefixedText();
-   this.existenceCache[ title ] = !page.missing;
-   queue[ title ].resolve( this.existenceCache[ 
title ] );
-   }.bind( this ) );
-   }.bind( this ) );
+   cache.existenceCache[ title ] = !page.missing;
+   queue[ title ].resolve( cache.existenceCache[ 
title ] );
+   } );
+   } );
};
 
/**
@@ -107,6 +108,7 @@
 * @cfg {string} [apiUrl] API URL, if not the current wiki's API
 */
mw.widgets.CategoryCapsuleItemWidget = function 
MWWCategoryCapsuleItemWidget( config ) {
+   var widget = this;
// Parent constructor
mw.widgets.CategoryCapsuleItemWidget.parent.call( this, 
$.extend( {
data: config.title.getMainText(),
@@ -137,8 +139,8 @@
this.constructor.static.pageExistenceCaches[ this.apiUrl ]
.checkPageExistence( new ForeignTitle( 
this.title.getPrefixedText() ) )
.done( function ( exists ) {
-   this.setMissing( !exists );
-   }.bind( this ) );
+   widget.setMissing( !exists );
+   

[MediaWiki-commits] [Gerrit] [Alternative] Fix the map stopping the scroll and zooming wi... - change (mediawiki...Kartographer)

[jenkins-bot (Code Review)]

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

Change subject: [Alternative] Fix the map stopping the scroll and zooming with 
the open source script leaflet.sleep.js.
..


[Alternative] Fix the map stopping the scroll and zooming with
the open source script leaflet.sleep.js.

Alternative to:
https://gerrit.wikimedia.org/r/#/c/279088/
- Increases the wakeTime to 1s

Bug: T126659
Change-Id: I66e5a22a8f282b16eebdfb8140affb562955563f
---
M extension.json
A lib/leaflet.sleep.js
M modules/kartographer.js
M package.json
4 files changed, 129 insertions(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 35898af..1412ab6 100644
--- a/extension.json
+++ b/extension.json
@@ -110,6 +110,7 @@
"mediawiki.jqueryMsg"
],
"scripts": [
+   "lib/leaflet.sleep.js",
"modules/kartographer.js"
],
"messages": [
diff --git a/lib/leaflet.sleep.js b/lib/leaflet.sleep.js
new file mode 100644
index 000..f91f5ca
--- /dev/null
+++ b/lib/leaflet.sleep.js
@@ -0,0 +1,119 @@
+L.Map.mergeOptions({
+  sleep: true,
+  sleepTime: 750,
+  wakeTime: 750,
+  sleepNote: true,
+  hoverToWake: true,
+  sleepOpacity:.7
+});
+
+L.Map.Sleep = L.Handler.extend({
+  addHooks: function () {
+this.sleepNote = L.DomUtil.create('p', 'sleep-note', this._map._container);
+this._sleepMap();
+this._enterTimeout = null;
+this._exitTimeout = null;
+
+
+var mapStyle = this._map.getContainer().style;
+mapStyle.WebkitTransition += 'opacity .5s';
+mapStyle.MozTransition += 'opacity .5s';
+
+var noteString = this._map.options.wakeMessage ||
+ ('Click ' + (this._map.options.hoverToWake?'or Hover 
':'') + 'to Wake');
+var style = this.sleepNote.style;
+if( this._map.options.sleepNote ){
+  this.sleepNote.appendChild(document.createTextNode( noteString ));
+  style.pointerEvents = 'none';
+  style.maxWidth = '150px';
+  style.transitionDuration = '.2s';
+  style.zIndex = 5000;
+  style.opacity = '.6';
+  style.margin = 'auto';
+  style.textAlign = 'center';
+  style.borderRadius = '4px';
+  style.top = '50%';
+  style.position = 'relative';
+  style.padding = '5px';
+  style.border = 'solid 2px black';
+  style.background = 'white';
+}
+  },
+
+  removeHooks: function () {
+if (!this._map.scrollWheelZoom.enabled()){
+  this._map.scrollWheelZoom.enable();
+}
+L.DomUtil.setOpacity( this._map._container, 1);
+L.DomUtil.setOpacity( this.sleepNote, 0);
+this._removeSleepingListeners();
+this._removeAwakeListeners();
+  },
+
+  _wakeMap: function () {
+this._stopWaiting();
+this._map.scrollWheelZoom.enable();
+L.DomUtil.setOpacity( this._map._container, 1);
+this.sleepNote.style.opacity = 0;
+this._addAwakeListeners();
+  },
+
+  _sleepMap: function () {
+this._stopWaiting();
+this._map.scrollWheelZoom.disable();
+L.DomUtil.setOpacity( this._map._container, 
this._map.options.sleepOpacity);
+this.sleepNote.style.opacity = .4;
+this._addSleepingListeners();
+  },
+
+  _wakePending: function () {
+this._map.once('mousedown', this._wakeMap, this);
+if (this._map.options.hoverToWake){
+  var self = this;
+  this._map.once('mouseout', this._sleepMap, this);
+  self._enterTimeout = setTimeout(function(){
+  self._map.off('mouseout', self._sleepMap, self);
+  self._wakeMap();
+  } , self._map.options.wakeTime);
+}
+  },
+
+  _sleepPending: function () {
+var self = this;
+self._map.once('mouseover', self._wakeMap, self);
+self._exitTimeout = setTimeout(function(){
+self._map.off('mouseover', self._wakeMap, self);
+self._sleepMap();
+} , self._map.options.sleepTime);
+  },
+
+  _addSleepingListeners: function(){
+this._map.once('mouseover', this._wakePending, this);
+  },
+
+  _addAwakeListeners: function(){
+this._map.once('mouseout', this._sleepPending, this);
+  },
+
+  _removeSleepingListeners: function(){
+this._map.options.hoverToWake &&
+  this._map.off('mouseover', this._wakePending, this);
+this._map.off('mousedown', this._wakeMap, this);
+  },
+
+  _removeAwakeListeners: function(){
+this._map.off('mouseout', this._sleepPending, this);
+  },
+
+  _stopWaiting: function () {
+this._removeSleepingListeners();
+this._removeAwakeListeners();
+var self = this;
+if(this._enterTimeout) clearTimeout(self._enterTimeout);
+if(this._exitTimeout) clearTimeout(self._exitTimeout);
+this._enterTimeout = null;
+this._exitTimeout = null;
+  }
+});
+
+L.Map.addInitHook('addHandler', 'sleep', L.Map.Sleep);
diff --git 

[MediaWiki-commits] [Gerrit] Remove flashes of unstyled content on page load - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Remove flashes of unstyled content on page load
..

Remove flashes of unstyled content on page load

* section-heading class added to headings in MobileFormatter
* Box model changing css rules for headings (border and margin moved
into non-js stylesheet)
* Space left for toggle icon when JS enabled

Bug: T128982
Change-Id: I0b4a0267a383efc9b41749cd55c57a44be84578a
---
M includes/MobileFormatter.php
M minerva.less/minerva.variables.less
M resources/mobile.toggle/toggle.less
M resources/skins.minerva.base.styles/ui.less
4 files changed, 24 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/61/279561/1

diff --git a/includes/MobileFormatter.php b/includes/MobileFormatter.php
index 1fe66c3..913822b 100644
--- a/includes/MobileFormatter.php
+++ b/includes/MobileFormatter.php
@@ -368,6 +368,12 @@
$sectionBody = $doc->createElement( 'div' );
$sectionBody->setAttribute( 'class', 'mf-section-' . 
$sectionNumber );
 
+   // Mark the top level headings which will become collapsible 
soon.
+   foreach ( $headings as $heading ) {
+   $className = $heading->hasAttribute( 'class' ) ? 
$heading->getAttribute( 'class' ) . ' ' : '';
+   $heading->setAttribute( 'class', $className . ' 
section-heading' );
+   }
+
while ( $sibling ) {
$node = $sibling;
$sibling = $sibling->nextSibling;
diff --git a/minerva.less/minerva.variables.less 
b/minerva.less/minerva.variables.less
index 12a8de9..d04f4ca 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -110,3 +110,6 @@
 @z-indexMain: 3;
 @z-indexOverlay: 4;
 @z-indexOverOverlay: 5;
+
+// indicators
+@indicatorFontSize: .4em;
diff --git a/resources/mobile.toggle/toggle.less 
b/resources/mobile.toggle/toggle.less
index 06756d6..72e1501 100644
--- a/resources/mobile.toggle/toggle.less
+++ b/resources/mobile.toggle/toggle.less
@@ -15,17 +15,11 @@
cursor: pointer;
position: relative;
 
-   border-bottom: solid 1px @sectionBorderColor;
-
.indicator {
float: left;
margin-top: .7em;
-   font-size: .4em;
+   font-size: @indicatorFontSize;
}
-   }
-
-   .section-heading {
-   margin-bottom: @headingMargin;
}
 
.collapsible-block {
diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index a8ced72..0052517 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -177,6 +177,20 @@
}
}
 
+   .section-heading {
+   border-bottom: solid 1px @sectionBorderColor;
+   margin-bottom: @headingMargin;
+   // Avoid flash of unstyled content by leaving space for the 
icon.
+   padding-left: (@iconSize + @iconGutterWidth + @iconGutterWidth) 
* @indicatorFontSize;
+
+   .client-nojs &,
+   &.collapsible-heading {
+   padding-left: 0;
+   // Account for -1px glitch when collapse chevron appears
+   margin-left: -1px;
+   }
+   }
+
.section-heading,
.in-block {
// Safari needs this. @see T106347

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b4a0267a383efc9b41749cd55c57a44be84578a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] WIP: Avoid repaints for table of contents. - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: WIP: Avoid repaints for table of contents.
..

WIP: Avoid repaints for table of contents.

Using MobileFormatter always add a table of contents placeholder
Hide table of contents in mobile mode
In tablet mode use visibility to leave space for an uncollapsed
table of contents to load.

Bug: T126836
Change-Id: I86e054eadc5f5f7bcc87b7de977785e629245b29
---
M includes/MobileFormatter.php
M minerva.less/minerva.variables.less
M resources/mobile.toc/TableOfContents.js
M resources/mobile.toc/toc.less
M resources/mobile.toggle/toggle.js
M resources/skins.minerva.base.styles/common.less
M resources/skins.minerva.tablet.scripts/toc.js
M resources/skins.minerva.tablet.styles/common.less
M resources/skins.minerva.tablet.styles/hacks.less
9 files changed, 51 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/62/279562/1

diff --git a/includes/MobileFormatter.php b/includes/MobileFormatter.php
index 913822b..7124ef8 100644
--- a/includes/MobileFormatter.php
+++ b/includes/MobileFormatter.php
@@ -390,6 +390,16 @@
}
// Insert the previous section body and reset 
it for the new section
$body->insertBefore( $sectionBody, $node );
+
+   if ( $sectionNumber === 0 ) {
+   // Insert table of content placeholder 
which will be progressively enhanced via JS
+   $toc = $doc->createElement( 'div' );
+   $toc->setAttribute( 'id', 'toc' );
+   $toc->setAttribute( 'class', 
'toc-mobile' );
+   $tocHeading = $doc->createElement( 
'h2', wfMessage( 'toc' )->text() );
+   $toc->appendChild( $tocHeading );
+   $sectionBody->appendChild( $toc );
+   }
$sectionNumber += 1;
$sectionBody = $doc->createElement( 'div' );
$sectionBody->setAttribute( 'class', 
'mf-section-' . $sectionNumber );
diff --git a/minerva.less/minerva.variables.less 
b/minerva.less/minerva.variables.less
index d04f4ca..d21a4cf 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -111,5 +111,7 @@
 @z-indexOverlay: 4;
 @z-indexOverOverlay: 5;
 
+// table of contents
+@tocFontSize: .8em;
 // indicators
 @indicatorFontSize: .4em;
diff --git a/resources/mobile.toc/TableOfContents.js 
b/resources/mobile.toc/TableOfContents.js
index 2cdd17e..7830449 100644
--- a/resources/mobile.toc/TableOfContents.js
+++ b/resources/mobile.toc/TableOfContents.js
@@ -33,6 +33,7 @@
contentsMsg: mw.msg( 'toc' )
},
tagName: 'div',
+   isBorderBox: false,
className: 'toc-mobile',
template: mw.template.get( 'mobile.toc', 'toc.hogan' ),
events: {
diff --git a/resources/mobile.toc/toc.less b/resources/mobile.toc/toc.less
index 209f0dc..3e1d7cb 100644
--- a/resources/mobile.toc/toc.less
+++ b/resources/mobile.toc/toc.less
@@ -4,19 +4,10 @@
 @paddingHorizontal: 24px;
 @iconSize: 16px;
 @iconHeadingGap: 12px;
-@paddingVertical: 1.4em;
-@fontSize: .8em;
+@fontSize: @tocFontSize;
 
 
 .client-js .toc-mobile {
-   position: relative;
-   // FIXME: Use predefined colors?
-   background-color: @colorGray15;
-   border: solid 1px @grayLightest;
-   font-size: 1.3em;
-   float: left;
-   clear: left;
-   margin: 1em 0;
 
.toc-button {
float: left;
@@ -25,12 +16,11 @@
}
 
.collapsible-heading {
-   font-family: @fontFamily;
-   font-size: @fontSize;
+   visibility: visible;
+   // FIXME: Use predefined colors?
+   background-color: @colorGray15;
+   border: solid 1px @grayLightest;
background-position: right center;
-   font-weight: bold;
-   padding: @paddingVertical / 2 0;
-   border-bottom: none;
 
// Override rules for section toggler
// In table of contents the collapsing caret is on the right
diff --git a/resources/mobile.toggle/toggle.js 
b/resources/mobile.toggle/toggle.js
index 32aecf7..52035f4 100644
--- a/resources/mobile.toggle/toggle.js
+++ b/resources/mobile.toggle/toggle.js
@@ -16,11 +16,12 @@
 * @param {jQuery.Object} $container to apply toggling to
 * @param {String} prefix a prefix to use for the id.
 * @param {Page} [page] to allow storage of session for 

[MediaWiki-commits] [Gerrit] Fix for defining constants when using extension.json - change (mediawiki...Cargo)

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review.

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

Change subject: Fix for defining constants when using extension.json
..

Fix for defining constants when using extension.json

Change-Id: Ib779b283e8cbfe89bbef827a1fb07436005a9d31
---
M Cargo.hooks.php
M Cargo.php
2 files changed, 22 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/78/279378/1

diff --git a/Cargo.hooks.php b/Cargo.hooks.php
index 87766b7..0533787 100644
--- a/Cargo.hooks.php
+++ b/Cargo.hooks.php
@@ -11,6 +11,8 @@
public static function registerExtension() {
global $cgScriptPath, $wgScriptPath, $wgCargoFieldTypes, 
$wgCargoAllowedSQLFunctions, $wgGroupPermissions;
 
+   define( 'CARGO_VERSION', '1.0-alpha' );
+
// Script path.
$cgScriptPath = $wgScriptPath . '/extensions/Cargo';
 
@@ -31,8 +33,14 @@
 
$wgGroupPermissions['sysop']['recreatecargodata'] = true;
$wgGroupPermissions['sysop']['deletecargodata'] = true;
-   }
 
+   define( 'CARGO_STORE_CREATION_DATE', 1 );
+   define( 'CARGO_STORE_MODIFICATION_DATE', 2 );
+   define( 'CARGO_STORE_CREATOR', 3 );
+   define( 'CARGO_STORE_FULL_TEXT', 4 );
+   define( 'CARGO_STORE_CATEGORIES', 5 );
+   define( 'CARGO_STORE_NUM_REVISIONS', 6 );
+   }
 
public static function registerParserFunctions( &$parser ) {
$parser->setFunctionHook( 'cargo_declare', array( 
'CargoDeclare', 'run' ) );
@@ -65,8 +73,9 @@
// the language of the user.
$vars['wgCargoMonthNames'] = 
$out->getLanguage()->getMonthNamesArray();
/**
-* @todo all these arrays should perhaps be switched to start 
keys from 1, in order to
-* match built-in arrys, such as wgMonthNames.
+* @TODO - all these arrays should perhaps be switched to start
+* keys from 1, in order to match built-in arrys, such as
+* $wgMonthNames.
 */
array_shift( $vars['wgCargoMonthNames'] ); //start keys from 0
 
diff --git a/Cargo.php b/Cargo.php
index 90aa8a0..699a8f1 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -6,18 +6,6 @@
  * @author Yaron Koren
  */
 
-// We need to set this at the top, so that it is also defined if
-// wfLoadExtension() is called, because its presence is used by other
-// extensions to determine whether Cargo is installed.
-define( 'CARGO_VERSION', '1.0-alpha' );
-
-define( 'CARGO_STORE_CREATION_DATE', 1 );
-define( 'CARGO_STORE_MODIFICATION_DATE', 2 );
-define( 'CARGO_STORE_CREATOR', 3 );
-define( 'CARGO_STORE_FULL_TEXT', 4 );
-define( 'CARGO_STORE_CATEGORIES', 5 );
-define( 'CARGO_STORE_NUM_REVISIONS', 6 );
-
 // There are bugs in MW 1.25 and 1.26 that make extension.json
 // unusable for Cargo - for simplicity's sake, don't load extensions
 // unless we're at version 1.27 or higher.
@@ -35,7 +23,16 @@
return;
 }
 
-// All the rest is for backward compatibility, for MW 1.25 and lower.
+// All the rest is for backward compatibility, for MW 1.26 and lower.
+
+define( 'CARGO_VERSION', '1.0-alpha' );
+
+define( 'CARGO_STORE_CREATION_DATE', 1 );
+define( 'CARGO_STORE_MODIFICATION_DATE', 2 );
+define( 'CARGO_STORE_CREATOR', 3 );
+define( 'CARGO_STORE_FULL_TEXT', 4 );
+define( 'CARGO_STORE_CATEGORIES', 5 );
+define( 'CARGO_STORE_NUM_REVISIONS', 6 );
 
 $wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib779b283e8cbfe89bbef827a1fb07436005a9d31
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 

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

[MediaWiki-commits] [Gerrit] build: Add browserNoActivityTimeout to karma - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: build: Add browserNoActivityTimeout to karma
..


build: Add browserNoActivityTimeout to karma

This reduces likeliness of tests failing. This exact change was used
for MediaWiki's karma run in March 2015; see T89075 for details.

Change-Id: I18205baf61495b503ec4cfad2accf1924a0d01c8
---
M Gruntfile.js
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
index 0632f79..e9cc1b4 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -411,7 +411,8 @@
singleRun: true,
browserDisconnectTimeout: 5000,
browserDisconnectTolerance: 2,
-   autoWatch: false
+   autoWatch: false,
+   browserNoActivityTimeout: 60 * 1000
},
main: {
browsers: [ 'Chrome' ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18205baf61495b503ec4cfad2accf1924a0d01c8
Gerrit-PatchSet: 4
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove nonexistent message from Resources.php - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Remove nonexistent message from Resources.php
..


Remove nonexistent message from Resources.php

Bug: T129979
Change-Id: I36ed70aec559c5b90d165fd68dc64d1e0ff24d3d
---
M Resources.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/Resources.php b/Resources.php
index 86c715a..1a86367 100644
--- a/Resources.php
+++ b/Resources.php
@@ -171,7 +171,6 @@
'talkpagelinktext',
'flow-cancel-warning',
// Moderation state
-   'flow-lock-post-content',
'flow-hide-title-content',
'flow-hide-post-content',
'flow-delete-title-content',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I36ed70aec559c5b90d165fd68dc64d1e0ff24d3d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope 
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] logstash: Remove obsolete role::logstash::stashbot class - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: logstash: Remove obsolete role::logstash::stashbot class
..


logstash: Remove obsolete role::logstash::stashbot class

role::logstash::stashbot was introduced in 0df444e for the stashbot labs
project. That project has been replaced by resources in Tool Labs and is
no longer based on Logstash technology.

Change-Id: I95c8561fab5e0c61d6483e2ad3d9a7444965be7a
---
D files/logstash/filter-stashbot-bash.conf
D files/logstash/filter-stashbot-sal.conf
D files/logstash/filter-stashbot.conf
D hieradata/labs/stashbot/common.yaml
D hieradata/labs/stashbot/host/stashbot-logstash.yaml
M manifests/role/logstash.pp
6 files changed, 0 insertions(+), 237 deletions(-)

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



diff --git a/files/logstash/filter-stashbot-bash.conf 
b/files/logstash/filter-stashbot-bash.conf
deleted file mode 100644
index 0c02ecc..000
--- a/files/logstash/filter-stashbot-bash.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-filter {
-  if [type] == "bash" {
-# Strip !bash from start of message
-grok {
-  match => [ "message", "^!bash %{GREEDYDATA:message}$" ]
-  overwrite => [ "message" ]
-  named_captures_only => true
-}
-
-mutate {
-# Replace tabs with newlines
-# NOTE: a literal newline is used as Logstash doesn't properly expand
-# escape codes in the replacement string.
-gsub => [ "message", "\t", "
-" ]
-
-# Trim leading/trailing whitespace
-strip => [ "message" ]
-}
-  } # end [type] == "bash"
-}
diff --git a/files/logstash/filter-stashbot-sal.conf 
b/files/logstash/filter-stashbot-sal.conf
deleted file mode 100644
index 16f31ad..000
--- a/files/logstash/filter-stashbot-sal.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-filter {
-  if [type] == "sal" {
-if [channel] == "#wikimedia-labs" {
-  grok {
-match => [ "message", "^!log %{NOTSPACE:project} 
%{GREEDYDATA:message}$" ]
-overwrite => [ "message" ]
-named_captures_only => true
-  }
-}
-
-if [channel] == "#wikimedia-releng" {
-  grok {
-match => [ "message", "^!log %{GREEDYDATA:message}$" ]
-overwrite => [ "message" ]
-named_captures_only => true
-add_field => [ "project", "releng" ]
-  }
-}
-
-if [channel] == "#wikimedia-analytics" {
-  grok {
-match => [ "message", "^!log %{GREEDYDATA:message}$" ]
-overwrite => [ "message" ]
-named_captures_only => true
-add_field => [ "project", "analytics" ]
-  }
-}
-
-if [channel] == "#wikimedia-operations" {
-  grok {
-match => [ "message", "^!log %{GREEDYDATA:message}$" ]
-overwrite => [ "message" ]
-named_captures_only => true
-add_field => [ "project", "production" ]
-  }
-
-  if [nick] == "logmsgbot" {
-# Scrape shell sender out of logmsgbot relayed messages
-grok {
-  match => [ "message", "^%{NOTSPACE:nick} %{GREEDYDATA:message}$" ]
-  overwrite => [ "nick", "message" ]
-  named_captures_only => true
-}
-  }
-}
-  } # end [type] == "sal"
-}
diff --git a/files/logstash/filter-stashbot.conf 
b/files/logstash/filter-stashbot.conf
deleted file mode 100644
index 3ef1c26..000
--- a/files/logstash/filter-stashbot.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-filter {
-  if [type] == "irc" {
-# Remove IRC formatting codes and tag for indexing
-mutate {
-  gsub => [ "message", "[\x02\x0F\x16\x1D\x1F]|\x03(\d{,2}(,\d{,2})?)?", 
"" ]
-  add_tag => [ "es" ]
-}
-
-if [message] =~ /^!bash / {
-  # Clone for custom bash message processing
-  clone {
-clones => [ "bash" ]
-remove_tag => [ "es" ]
-  }
-} # end [message] =~ /^!bash /
-
-if [message] =~ /^!log / {
-  # Clone for custom SAL message processing
-  clone {
-clones => [ "sal" ]
-remove_tag => [ "es" ]
-  }
-} # end [message] =~ /^!log /
-  } # end [type] == "irc"
-}
diff --git a/hieradata/labs/stashbot/common.yaml 
b/hieradata/labs/stashbot/common.yaml
deleted file mode 100644
index 95b4835..000
--- a/hieradata/labs/stashbot/common.yaml
+++ /dev/null
@@ -1,26 +0,0 @@

-# Elasticsearch
-elasticsearch::auto_create_index: true
-elasticsearch::cluster_name: stashbot
-elasticsearch::expected_nodes: 2
-elasticsearch::heap_memory: '8G'
-elasticsearch::minimum_master_nodes: 1
-elasticsearch::recover_after_nodes: 1
-elasticsearch::recover_after_time: 1m
-elasticsearch::unicast_hosts:
-  - stashbot-elastic01.stashbot.eqiad.wmflabs
-  - stashbot-elastic02.stashbot.eqiad.wmflabs
-
-# Logstash
-logstash::filter_workers: 2
-logstash::heap_memory_mb: 256
-
-logstash::cluster_hosts:
-  - stashbot-logstash.stashbot.eqiad.wmflabs
-  - stashbot-elastic01.stashbot.eqiad.wmflabs
-  - 

[MediaWiki-commits] [Gerrit] TriggerRegistry: Alter trigger for paste special on Mac to O... - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: TriggerRegistry: Alter trigger for paste special on Mac to OS 
standard
..


TriggerRegistry: Alter trigger for paste special on Mac to OS standard

Bug: T130735
Change-Id: I13e6cbcce229e7507318b8d8fc05c7f223900ec7
---
M src/ui/ve.ui.TriggerRegistry.js
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/src/ui/ve.ui.TriggerRegistry.js b/src/ui/ve.ui.TriggerRegistry.js
index 05d68cb..c2921c4 100644
--- a/src/ui/ve.ui.TriggerRegistry.js
+++ b/src/ui/ve.ui.TriggerRegistry.js
@@ -198,7 +198,10 @@
'selectAll', { mac: new ve.ui.Trigger( 'cmd+a' ), pc: new 
ve.ui.Trigger( 'ctrl+a' ) }
 );
 ve.ui.triggerRegistry.register(
-   'pasteSpecial', { mac: new ve.ui.Trigger( 'cmd+shift+v' ), pc: new 
ve.ui.Trigger( 'ctrl+shift+v' ) }
+   'pasteSpecial', {
+   mac: new ve.ui.Trigger( 'cmd+option+shift+v' ),
+   pc: new ve.ui.Trigger( 'ctrl+shift+v' )
+   }
 );
 ve.ui.triggerRegistry.register(
'findAndReplace', { mac: new ve.ui.Trigger( 'cmd+f' ), pc: new 
ve.ui.Trigger( 'ctrl+f' ) }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I13e6cbcce229e7507318b8d8fc05c7f223900ec7
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/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] media: Misc code clean up in DjVu.php - change (mediawiki/core)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: media: Misc code clean up in DjVu.php
..

media: Misc code clean up in DjVu.php

* Use $cache->makeKey() instead of global.
* Access constants via $cache.
* Remove obsolete 'that = this' PHP 5.3 workaround.

Change-Id: I75505d3e3017fde185e43815d4e7acaba3fee69c
---
M includes/media/DjVu.php
1 file changed, 9 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/60/279560/1

diff --git a/includes/media/DjVu.php b/includes/media/DjVu.php
index cd249a8..9add138 100644
--- a/includes/media/DjVu.php
+++ b/includes/media/DjVu.php
@@ -393,25 +393,24 @@
}
 
protected function getDimensionInfo( File $file ) {
-   $that = $this;
-
-   return ObjectCache::getMainWANInstance()->getWithSetCallback(
-   wfMemcKey( 'file-djvu', 'dimensions', $file->getSha1() 
),
-   WANObjectCache::TTL_INDEFINITE,
-   function () use ( $that, $file ) {
-   $tree = $that->getMetaTree( $file );
+   $cache = ObjectCache::getMainWANInstance();
+   return $cache->getWithSetCallback(
+   $cache->makeKey( 'file-djvu', 'dimensions', 
$file->getSha1() ),
+   $cache::TTL_INDEFINITE,
+   function () use ( $file ) {
+   $tree = $this->getMetaTree( $file );
if ( !$tree ) {
return false;
}
 
$dimsByPage = [];
$count = count( $tree->xpath( '//OBJECT' ) );
-   for ( $i = 0; $i < $count; ++$i ) {
+   for ( $i = 0; $i < $count; $i++ ) {
$o = $tree->BODY[0]->OBJECT[$i];
if ( $o ) {
$dimsByPage[$i] = [
'width' => 
(int)$o['width'],
-   'height' => 
(int)$o['height']
+   'height' => 
(int)$o['height'],
];
} else {
$dimsByPage[$i] = false;
@@ -420,7 +419,7 @@
 
return [ 'pageCount' => $count, 
'dimensionsByPage' => $dimsByPage ];
},
-   [ 'pcTTL' => WANObjectCache::TTL_INDEFINITE ]
+   [ 'pcTTL' => $cache::TTL_INDEFINITE ]
);
}
 

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

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

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

[MediaWiki-commits] [Gerrit] build: For grunt-svg2png use a tag instead of git hash - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: build: For grunt-svg2png use a tag instead of git hash 
..


build: For grunt-svg2png use a tag instead of git hash 

This reduces the amount of memory needed to download, and
updates the link from which the binary is downloaded.

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

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



diff --git a/package.json b/package.json
index bc601d3..a6963c5 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
 "grunt-jsonlint": "1.0.7",
 "grunt-karma": "0.12.2",
 "grunt-promise-q": "0.1.1",
-"grunt-svg2png": 
"git://github.com/jdforrester/grunt-svg2png.git#375ca1924784aecef8097718a84bd3c3315ca569",
+"grunt-svg2png": 
"git://github.com/jdforrester/grunt-svg2png.git#v0.2.7-wmf",
 "grunt-tyops": "0.1.0",
 "grunt": "0.4.5",
 "karma-chrome-launcher": "0.2.2",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b9bb9abe20ac1a525b1b6a03335dffca192fba4
Gerrit-PatchSet: 4
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] LinearArrowKeyDownHandler: test more - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: LinearArrowKeyDownHandler: test more
..


LinearArrowKeyDownHandler: test more

Bug: T130389
Change-Id: If58ea415dae0435c93674f67473fc506985aee59
---
M tests/ce/ve.ce.Surface.test.js
1 file changed, 119 insertions(+), 5 deletions(-)

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



diff --git a/tests/ce/ve.ce.Surface.test.js b/tests/ce/ve.ce.Surface.test.js
index 53cea7c..56bb203 100644
--- a/tests/ce/ve.ce.Surface.test.js
+++ b/tests/ce/ve.ce.Surface.test.js
@@ -8,7 +8,7 @@
 
 /* Tests */
 
-ve.test.utils.runSurfaceHandleSpecialKeyTest = function ( assert, htmlOrDoc, 
rangeOrSelection, keys, expectedData, expectedRangeOrSelection, msg ) {
+ve.test.utils.runSurfaceHandleSpecialKeyTest = function ( assert, htmlOrDoc, 
rangeOrSelection, keys, expectedData, expectedRangeOrSelection, msg, 
forceSelection, fullEvents ) {
var i, e, selection, expectedSelection, key,
view = typeof htmlOrDoc === 'string' ?
ve.test.utils.createSurfaceViewFromHtml( htmlOrDoc ) :
@@ -35,9 +35,28 @@
preventDefault: function () {},
stopPropagation: function () {}
};
-   ve.ce.keyDownHandlerFactory.executeHandlersForKey(
-   e.keyCode, selection.getName(), view, e
-   );
+   if ( fullEvents ) {
+   // Some key handlers do things like schedule 
after-event handlers,
+   // and so we want to fake the full sequence.
+   // TODO: Could probably switch to using this for every 
test, but it
+   // would need the faked testing surface to be improved.
+   view.eventSequencer.onEvent( 'keydown', $.Event( 
'keydown', e ) );
+   if ( forceSelection ) {
+   view.showSelectionState( 
view.getSelectionState( forceSelection ) );
+   }
+   view.eventSequencer.runPendingCalls( 'keydown' );
+   view.eventSequencer.onEvent( 'keypress', $.Event( 
'keypress', e ) );
+   view.eventSequencer.runPendingCalls( 'keypress' );
+   view.eventSequencer.onEvent( 'keyup', $.Event( 'keyup', 
e ) );
+   view.eventSequencer.runPendingCalls( 'keyup' );
+   } else {
+   if ( forceSelection ) {
+   view.showSelectionState( 
view.getSelectionState( forceSelection ) );
+   }
+   ve.ce.keyDownHandlerFactory.executeHandlersForKey(
+   e.keyCode, selection.getName(), view, e
+   );
+   }
}
expectedData( data );
 
@@ -520,6 +539,84 @@
)
),
cases = [
+   // Within normal text. NOTE: these tests manually force 
the cursor to
+   // move, because we rely on native browser actions for 
that.
+   // As such, these are mostly testing to make sure that 
other
+   // behavior doesn't trigger when it shouldn't.
+   {
+   htmlOrDoc: blockImageDoc,
+   rangeOrSelection: new ve.Range( 2 ),
+   keys: [ 'LEFT' ],
+   forceSelection: new ve.Range( 1 ),
+   expectedData: function () {},
+   expectedRangeOrSelection: new ve.Range( 1 ),
+   msg: 'Cursor left in text'
+   },
+   {
+   htmlOrDoc: blockImageDoc,
+   rangeOrSelection: new ve.Range( 2 ),
+   keys: [ 'RIGHT' ],
+   forceSelection: new ve.Range( 3 ),
+   expectedData: function () {},
+   expectedRangeOrSelection: new ve.Range( 3 ),
+   msg: 'Cursor right in text'
+   },
+   {
+   htmlOrDoc: blockImageDoc,
+   rangeOrSelection: new ve.Range( 4 ),
+   keys: [ 'UP' ],
+   forceSelection: new ve.Range( 1 ),
+   expectedData: function () {},
+   expectedRangeOrSelection: new ve.Range( 1 ),
+   msg: 'Cursor up in text'
+   },
+   {
+   htmlOrDoc: blockImageDoc,
+   

[MediaWiki-commits] [Gerrit] Enable extension registration for ParserFunctions - change (operations/mediawiki-config)

[Dereckson (Code Review)]

Dereckson has uploaded a new change for review.

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

Change subject: Enable extension registration for ParserFunctions
..

Enable extension registration for ParserFunctions

Bug: T119117
Change-Id: I81939085844a72478e50a8919f46d60eb3d1f05c
---
M wmf-config/CommonSettings.php
M wmf-config/extension-list
2 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 80d6023..af7c377 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -683,9 +683,9 @@
 }
 
 if ( $wmgUseParserFunctions ) {
-   include( $IP . '/extensions/ParserFunctions/ParserFunctions.php' );
+   wfLoadExtension( 'ParserFunctions' );
+   $wgExpensiveParserFunctionLimit = 500;
 }
-$wgExpensiveParserFunctionLimit = 500;
 
 if ( $wmgUseCite ) {
wfLoadExtension( 'Cite' );
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 1a0f67d..8e66138 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -88,7 +88,7 @@
 $IP/extensions/PagedTiffHandler/PagedTiffHandler.php
 $IP/extensions/PageImages/PageImages.php
 $IP/extensions/PageTriage/PageTriage.php
-$IP/extensions/ParserFunctions/ParserFunctions.php
+$IP/extensions/ParserFunctions/extension.json
 $IP/extensions/ParsoidBatchAPI/extension.json
 $IP/extensions/PdfHandler/PdfHandler.php
 $IP/extensions/Petition/Petition.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81939085844a72478e50a8919f46d60eb3d1f05c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 

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

[MediaWiki-commits] [Gerrit] grafana: Increase homepage 'starred' and 'featured' limit to... - change (operations/puppet)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: grafana: Increase homepage 'starred' and 'featured' limit to 100
..

grafana: Increase homepage 'starred' and 'featured' limit to 100

Follows-up ea0733b. Especially 'starred' should not be limited
since that is controlled per-user and a user can have as many as
they like.

Same for featured. If we get more than 20 (currently: 15) featured
dashboards and want to change that we can always untag a few to
not be featured (as they wouldn't be) instead of letting a-z sorting
remove them implicitly.

Change-Id: Ifffd88abaa0738f27ecf0ad2ebaa65e1fa0a307f
---
M files/grafana/home.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/59/279559/1

diff --git a/files/grafana/home.json b/files/grafana/home.json
index 2f75029..9eec839 100644
--- a/files/grafana/home.json
+++ b/files/grafana/home.json
@@ -38,7 +38,7 @@
 "featured"
   ],
   "title": "Featured dashboards",
-  "limit": 14
+  "limit": 100
 },
 {
   "id": 3,
@@ -46,7 +46,7 @@
   "type": "dashlist",
   "mode": "starred",
   "title": "Starred dashboards",
-  "limit": 14
+  "limit": 100
 }
   ]
 }

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

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

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

[MediaWiki-commits] [Gerrit] Added 'Searchtext' to $wgCargoFieldTypes - change (mediawiki...Cargo)

[Yaron Koren (Code Review)]

Yaron Koren has submitted this change and it was merged.

Change subject: Added 'Searchtext' to $wgCargoFieldTypes
..


Added 'Searchtext' to $wgCargoFieldTypes

Change-Id: I0ce3a24ea83bfeb5423f270c3c5b2a2330bfa940
---
M Cargo.hooks.php
M Cargo.php
2 files changed, 10 insertions(+), 2 deletions(-)

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



diff --git a/Cargo.hooks.php b/Cargo.hooks.php
index ca28bc9..87766b7 100644
--- a/Cargo.hooks.php
+++ b/Cargo.hooks.php
@@ -14,7 +14,11 @@
// Script path.
$cgScriptPath = $wgScriptPath . '/extensions/Cargo';
 
-   $wgCargoFieldTypes = array( 'Page', 'String', 'Text', 
'Integer', 'Float', 'Date', 'Datetime', 'Boolean', 'Coordinates', 'Wikitext', 
'File', 'URL', 'Email' );
+   $wgCargoFieldTypes = array(
+   'Page', 'String', 'Text', 'Integer', 'Float', 'Date',
+   'Datetime', 'Boolean', 'Coordinates', 'Wikitext',
+   'Searchtext', 'File', 'URL', 'Email'
+   );
$wgCargoAllowedSQLFunctions = array(
// Math functions
'COUNT', 'FLOOR', 'CEIL', 'ROUND',
diff --git a/Cargo.php b/Cargo.php
index adc491c..90aa8a0 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -293,7 +293,11 @@
),
 );
 
-$wgCargoFieldTypes = array( 'Page', 'String', 'Text', 'Integer', 'Float', 
'Date', 'Datetime', 'Boolean', 'Coordinates', 'Wikitext', 'File', 'URL', 
'Email' );
+$wgCargoFieldTypes = array(
+   'Page', 'String', 'Text', 'Integer', 'Float', 'Date', 'Datetime',
+   'Boolean', 'Coordinates', 'Wikitext', 'Searchtext', 'File', 'URL',
+   'Email'
+);
 $wgCargoAllowedSQLFunctions = array(
// Math functions
'COUNT', 'FLOOR', 'CEIL', 'ROUND',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ce3a24ea83bfeb5423f270c3c5b2a2330bfa940
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
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] [DisqusTag] Add npm test and composer-test - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [DisqusTag] Add npm test and composer-test
..

[DisqusTag] Add npm test and composer-test

Also move jsonlint to check: for non-whitelsited users.

Requires Ib3a91d9f5827def8f8fef58f2db18dde824c2697

Change-Id: Id6a5a6830c69599d45dde80bb85164d376326360
---
M zuul/layout.yaml
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/58/279558/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 31fa968..1ed85d9 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4431,8 +4431,11 @@
 
   - name: mediawiki/extensions/DisqusTag
 template:
-  - name: jsonlint
+  - name: composer-test
   - name: extension-unittests-generic
+  - name: npm
+check:
+  - jsonlint
 
   - name: mediawiki/extensions/DjangoAnalytics
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6a5a6830c69599d45dde80bb85164d376326360
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] Add tools to calculate whitelist for Amazon - change (wikimedia...tools)

[jenkins-bot (Code Review)]

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

Change subject: Add tools to calculate whitelist for Amazon
..


Add tools to calculate whitelist for Amazon

Downloads us-east-1 IP address ranges from Amazon and removes
anything indicated as non-Amazon services, such as CLOUDFRONT,
EC2, and ROUTE53.

Bug: T119002
Change-Id: I81e4f6a946aed995cc9968e78ed32e9c4c4ff4c3
---
A whitelist/amazon-ranges.sh
A whitelist/netdiff.py
2 files changed, 34 insertions(+), 0 deletions(-)

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



diff --git a/whitelist/amazon-ranges.sh b/whitelist/amazon-ranges.sh
new file mode 100755
index 000..21bb1b2
--- /dev/null
+++ b/whitelist/amazon-ranges.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+IPFILE=`mktemp`
+INCLUDEFILE=`mktemp`
+EXCLUDEFILE=`mktemp`
+MYPATH=`dirname $0`
+wget --quiet https://ip-ranges.amazonaws.com/ip-ranges.json -O $IPFILE
+jq '.prefixes[] | select(.region|startswith("us-east-1")) | 
select(.service=="AMAZON") | .ip_prefix' $IPFILE \
+| sed -e 's/"//g' > $INCLUDEFILE
+jq '.prefixes[] | select(.service!="AMAZON") | .ip_prefix' $IPFILE \
+| sed -e 's/"//g' > $EXCLUDEFILE
+$MYPATH/netdiff.py $INCLUDEFILE $EXCLUDEFILE
+rm $IPFILE $INCLUDEFILE $EXCLUDEFILE
diff --git a/whitelist/netdiff.py b/whitelist/netdiff.py
new file mode 100755
index 000..da6d548
--- /dev/null
+++ b/whitelist/netdiff.py
@@ -0,0 +1,22 @@
+#! /usr/bin/env python
+# Calculates the disjunction of two sets of IP ranges
+from sys import argv
+from netaddr import IPSet
+
+if len(argv) != 3:
+print('Usage: {0} include.txt exclude.txt'.format(argv[0]))
+exit()
+
+net = IPSet()
+
+with open(argv[1], 'r') as incfile:
+for line in incfile:
+net = net | IPSet([line])
+
+with open(argv[2], 'r') as exfile:
+for line in exfile:
+net.remove(line)
+
+for cidr in net.iter_cidrs():
+print(cidr)
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81e4f6a946aed995cc9968e78ed32e9c4c4ff4c3
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] This is a test commit - do not merge - change (analytics...source)

[Madhuvishy (Code Review)]

Madhuvishy has uploaded a new change for review.

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

Change subject: This is a test commit - do not merge
..

This is a test commit - do not merge

Change-Id: I4fd6a594d0894f86ae21e8df75f37677e1b66e76
---
M README.md
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source 
refs/changes/57/279557/1

diff --git a/README.md b/README.md
index 715d919..74e75e8 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+Adding this dummy line
 # refinery/source
 This repository should contain only source code that is used for building
 artifacts for the Wikimedia Analytics Refinery.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4fd6a594d0894f86ae21e8df75f37677e1b66e76
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: Madhuvishy 

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

[MediaWiki-commits] [Gerrit] Follow-up ffdbfe34: Drop references to i18n keys that no lon... - change (mediawiki...Graph)

[jenkins-bot (Code Review)]

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

Change subject: Follow-up ffdbfe34: Drop references to i18n keys that no longer 
exist
..


Follow-up ffdbfe34: Drop references to i18n keys that no longer exist

Bug: T130868
Change-Id: I4ce2700a4598a6b336e003dd33b2e41e2c3e6e64
---
M extension.json
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/extension.json b/extension.json
index 711947e..c9f7035 100644
--- a/extension.json
+++ b/extension.json
@@ -42,10 +42,6 @@
"scripts": [
"modules/graph-loader.js"
],
-   "messages": [
-   "graph-loading",
-   "graph-loading-done"
-   ],
"dependencies": [
"mediawiki.api"
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ce2700a4598a6b336e003dd33b2e41e2c3e6e64
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: wmf/1.27.0-wmf.18
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Catrope 
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] Add npm entry point - change (mediawiki...DisqusTag)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Add npm entry point
..

Add npm entry point

Change-Id: Ib3a91d9f5827def8f8fef58f2db18dde824c2697
---
M .gitignore
A .jshintignore
A .jshintrc
M DisqusTag.js
A Gruntfile.js
A package.json
6 files changed, 73 insertions(+), 6 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index e43b0f9..85dd063 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .DS_Store
+node_modules/**
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000..3c3629e
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1 @@
+node_modules
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..04c3a97
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,23 @@
+{
+   // Enforcing
+   "bitwise": true,
+   "eqeqeq": true,
+   "freeze": true,
+   "latedef": "nofunc",
+   "noarg": true,
+   "nonew": true,
+   "undef": true,
+   "unused": true,
+   "strict": false,
+
+   // Relaxing
+   "es5": false,
+
+   // Environment
+   "browser": true,
+   "jquery": true,
+
+   "globals": {
+   "mediaWiki": false
+   }
+}
diff --git a/DisqusTag.js b/DisqusTag.js
index e6b0ade..5f5747a 100644
--- a/DisqusTag.js
+++ b/DisqusTag.js
@@ -1,23 +1,23 @@
 window.showDisqusDialog = function( id ) {
 
-   $( '#disqus_dialog' ).dialog({ 'width': 800, 'position': 'top' });
+   jQuery( '#disqus_dialog' ).dialog( { 'width': 800, 'position': 'top' } 
);
 
var identifier = url = location.protocol + '//' + location.hostname + 
location.pathname + '#!' + id
 
//Reset Disqus to show the thread corresponding to the clicked button
-   DISQUS.reset({
+   DISQUS.reset( {
reload: true,
config: function () {
this.page.identifier = identifier;
this.page.url = url;
}
-   });
+   } );
 }
 
-$(function() {
+jQuery( function() {
var disqus = document.createElement( 'script' );
disqus.type = 'text/javascript';
disqus.async = true;
disqus.src = '//' + egDisqusShortname + '.disqus.com/embed.js';
-   document.getElementsByTagName( 'body' )[0].appendChild( disqus );
-});
\ No newline at end of file
+   document.getElementsByTagName( 'body' )[ 0 ].appendChild( disqus );
+} );
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..36b6671
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,30 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   jshint: {
+   options: {
+   jshintrc: true
+   },
+   all: [
+   '**/*.js',
+   '!node_modules/**'
+   ]
+   },
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..ec97d7b
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.4.0",
+"grunt-contrib-jshint": "1.0.0",
+"grunt-jsonlint": "1.0.7"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3a91d9f5827def8f8fef58f2db18dde824c2697
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DisqusTag
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] Remove nonexistent message from Resources.php - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Remove nonexistent message from Resources.php
..


Remove nonexistent message from Resources.php

Bug: T129979
Change-Id: I36ed70aec559c5b90d165fd68dc64d1e0ff24d3d
(cherry picked from commit 0f747bbbfd4378ff2348649387abbb401d1c87e2)
---
M Resources.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/Resources.php b/Resources.php
index 86c715a..1a86367 100644
--- a/Resources.php
+++ b/Resources.php
@@ -171,7 +171,6 @@
'talkpagelinktext',
'flow-cancel-warning',
// Moderation state
-   'flow-lock-post-content',
'flow-hide-title-content',
'flow-hide-post-content',
'flow-delete-title-content',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I36ed70aec559c5b90d165fd68dc64d1e0ff24d3d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.27.0-wmf.18
Gerrit-Owner: Krinkle 
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] Allow titles with falsy title text in suggestions - change (mediawiki/core)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Allow titles with falsy title text in suggestions
..

Allow titles with falsy title text in suggestions

A valid title, such as 0, would end up being ignored in this clause and
not providing a title. Make the empty string check stricter to allow
these titles through.

Change-Id: I938a7dfe294e979c19f720eadb6f96282b1c4588
---
M includes/search/SearchSuggestion.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/279555/1

diff --git a/includes/search/SearchSuggestion.php 
b/includes/search/SearchSuggestion.php
index cd9062b..80a437b 100644
--- a/includes/search/SearchSuggestion.php
+++ b/includes/search/SearchSuggestion.php
@@ -84,7 +84,7 @@
 */
public function setText( $text, $setTitle = true ) {
$this->text = $text;
-   if ( $setTitle && $text ) {
+   if ( $setTitle && $text !== '' && $text !== null ) {
$this->setSuggestedTitle( Title::makeTitle( 0, $text ) 
);
}
}

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

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

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

[MediaWiki-commits] [Gerrit] Follow-up I1575901: Don't register a non-existant i18n key - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

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

Change subject: Follow-up I1575901: Don't register a non-existant i18n key
..


Follow-up I1575901: Don't register a non-existant i18n key

The i18n message cx-publish-gt-no-permission-to-move-title doesn't actually
exist; cx-publish-gt-no-permission-to-move-description does, and this was
seemingly added in error.

Bug: T129980
Change-Id: I4f8fbd453416ecabeb3f3f03edfd40ab836ad5fe
---
M extension.json
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 0959b2b..53827fa 100644
--- a/extension.json
+++ b/extension.json
@@ -861,7 +861,6 @@
"messages": [
"vector-action-move",
"vector-view-edit",
-   "cx-publish-gt-no-permission-to-move-title",

"cx-publish-gt-no-permission-to-move-description",
"cx-publish-gt-first-step-title",
"cx-publish-gt-first-step-description",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f8fbd453416ecabeb3f3f03edfd40ab836ad5fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: wmf/1.27.0-wmf.18
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Catrope 
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] Fix for defining constants when using extension.json - change (mediawiki...Cargo)

[Yaron Koren (Code Review)]

Yaron Koren has submitted this change and it was merged.

Change subject: Fix for defining constants when using extension.json
..


Fix for defining constants when using extension.json

Change-Id: Ib779b283e8cbfe89bbef827a1fb07436005a9d31
---
M Cargo.hooks.php
M Cargo.php
2 files changed, 22 insertions(+), 16 deletions(-)

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



diff --git a/Cargo.hooks.php b/Cargo.hooks.php
index 87766b7..0533787 100644
--- a/Cargo.hooks.php
+++ b/Cargo.hooks.php
@@ -11,6 +11,8 @@
public static function registerExtension() {
global $cgScriptPath, $wgScriptPath, $wgCargoFieldTypes, 
$wgCargoAllowedSQLFunctions, $wgGroupPermissions;
 
+   define( 'CARGO_VERSION', '1.0-alpha' );
+
// Script path.
$cgScriptPath = $wgScriptPath . '/extensions/Cargo';
 
@@ -31,8 +33,14 @@
 
$wgGroupPermissions['sysop']['recreatecargodata'] = true;
$wgGroupPermissions['sysop']['deletecargodata'] = true;
-   }
 
+   define( 'CARGO_STORE_CREATION_DATE', 1 );
+   define( 'CARGO_STORE_MODIFICATION_DATE', 2 );
+   define( 'CARGO_STORE_CREATOR', 3 );
+   define( 'CARGO_STORE_FULL_TEXT', 4 );
+   define( 'CARGO_STORE_CATEGORIES', 5 );
+   define( 'CARGO_STORE_NUM_REVISIONS', 6 );
+   }
 
public static function registerParserFunctions( &$parser ) {
$parser->setFunctionHook( 'cargo_declare', array( 
'CargoDeclare', 'run' ) );
@@ -65,8 +73,9 @@
// the language of the user.
$vars['wgCargoMonthNames'] = 
$out->getLanguage()->getMonthNamesArray();
/**
-* @todo all these arrays should perhaps be switched to start 
keys from 1, in order to
-* match built-in arrys, such as wgMonthNames.
+* @TODO - all these arrays should perhaps be switched to start
+* keys from 1, in order to match built-in arrys, such as
+* $wgMonthNames.
 */
array_shift( $vars['wgCargoMonthNames'] ); //start keys from 0
 
diff --git a/Cargo.php b/Cargo.php
index 90aa8a0..699a8f1 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -6,18 +6,6 @@
  * @author Yaron Koren
  */
 
-// We need to set this at the top, so that it is also defined if
-// wfLoadExtension() is called, because its presence is used by other
-// extensions to determine whether Cargo is installed.
-define( 'CARGO_VERSION', '1.0-alpha' );
-
-define( 'CARGO_STORE_CREATION_DATE', 1 );
-define( 'CARGO_STORE_MODIFICATION_DATE', 2 );
-define( 'CARGO_STORE_CREATOR', 3 );
-define( 'CARGO_STORE_FULL_TEXT', 4 );
-define( 'CARGO_STORE_CATEGORIES', 5 );
-define( 'CARGO_STORE_NUM_REVISIONS', 6 );
-
 // There are bugs in MW 1.25 and 1.26 that make extension.json
 // unusable for Cargo - for simplicity's sake, don't load extensions
 // unless we're at version 1.27 or higher.
@@ -35,7 +23,16 @@
return;
 }
 
-// All the rest is for backward compatibility, for MW 1.25 and lower.
+// All the rest is for backward compatibility, for MW 1.26 and lower.
+
+define( 'CARGO_VERSION', '1.0-alpha' );
+
+define( 'CARGO_STORE_CREATION_DATE', 1 );
+define( 'CARGO_STORE_MODIFICATION_DATE', 2 );
+define( 'CARGO_STORE_CREATOR', 3 );
+define( 'CARGO_STORE_FULL_TEXT', 4 );
+define( 'CARGO_STORE_CATEGORIES', 5 );
+define( 'CARGO_STORE_NUM_REVISIONS', 6 );
 
 $wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib779b283e8cbfe89bbef827a1fb07436005a9d31
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
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] [DidYouMean] Add npm test and composer-test - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [DidYouMean] Add npm test and composer-test
..

[DidYouMean] Add npm test and composer-test

Also move jsonlint to check: for non-whitelisted users and remove jshint
since there are no js files.

Requires Iada6b02fcdb5697b87f9891ad977e1cb046cfba2

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/54/279554/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 31fa968..1139cce 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4425,9 +4425,11 @@
 
   - name: mediawiki/extensions/DidYouMean
 template:
-  - name: jshint
-  - name: jsonlint
+  - name: composer-test
   - name: extension-unittests-generic
+  - name: npm
+check:
+  - jsonlint
 
   - name: mediawiki/extensions/DisqusTag
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34e07a63be0f96d5fb5cecc3295dc7b4a37ff245
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] Add npm entry point - change (mediawiki...DidYouMean)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Add npm entry point
..

Add npm entry point

Change-Id: Iada6b02fcdb5697b87f9891ad977e1cb046cfba2
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 32 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DidYouMean 
refs/changes/53/279553/1

diff --git a/.gitignore b/.gitignore
index 98b092a..1689d7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-.svn
 *~
 *.kate-swp
 .*.swp
+node_modules/**
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..7756e75
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..41cecca
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.4.0",
+"grunt-jsonlint": "1.0.7"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iada6b02fcdb5697b87f9891ad977e1cb046cfba2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DidYouMean
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] Roll out RESTBase usage to Android production app: 2% - change (mediawiki...MobileApp)

[jenkins-bot (Code Review)]

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

Change subject: Roll out RESTBase usage to Android production app: 2%
..


Roll out RESTBase usage to Android production app: 2%

Bug: T126934
See-also: Ie49d02141402ede6c292244d223531ee2ef76575
Change-Id: I9001ada6c1762d8a3856fb6c76e9290ea7a4b144
---
M config/config.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/config/config.json b/config/config.json
index 32b7631..57651bd 100644
--- a/config/config.json
+++ b/config/config.json
@@ -4,5 +4,6 @@
 "disableFullTextSearch": false,
 "searchLogSampleRate": 100,
 "tocLogSampleRate": 100,
-"restbaseBetaPercent": 100
+"restbaseBetaPercent": 100,
+"restbaseProdPercent": 2
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9001ada6c1762d8a3856fb6c76e9290ea7a4b144
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileApp
Gerrit-Branch: wmf/1.27.0-wmf.18
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Bgerstle 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [DidYouKnow] Add npm test and composer-test - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [DidYouKnow] Add npm test and composer-test
..

[DidYouKnow] Add npm test and composer-test

Also move jsonlint to check: for non-whitelisted users and remove jshint
since there are no js files.

Requires I5d6d762a3b4102d7a7d9bb12eeeb70ba45aaa406

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/52/279552/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 31fa968..c221269 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4419,9 +4419,11 @@
 
   - name: mediawiki/extensions/DidYouKnow
 template:
-  - name: jshint
-  - name: jsonlint
+  - name: composer-test
   - name: extension-unittests-generic
+  - name: npm
+check:
+  - jsonlint
 
   - name: mediawiki/extensions/DidYouMean
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7865afed754e925963257d7e2b51173689b855d0
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] Add npm entry point - change (mediawiki...DidYouKnow)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Add npm entry point
..

Add npm entry point

Change-Id: I5d6d762a3b4102d7a7d9bb12eeeb70ba45aaa406
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 32 insertions(+), 1 deletion(-)


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

diff --git a/.gitignore b/.gitignore
index 98b092a..1689d7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-.svn
 *~
 *.kate-swp
 .*.swp
+node_modules/**
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..7756e75
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..41cecca
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.4.0",
+"grunt-jsonlint": "1.0.7"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d6d762a3b4102d7a7d9bb12eeeb70ba45aaa406
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DidYouKnow
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] Revert "Promote structured language overlay to stable" - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Revert "Promote structured language overlay to stable"
..


Revert "Promote structured language overlay to stable"

This reverts commit 472aff1a8a88112015326006428e97f97a372a27.
The new language overlay is not showing language variants

Bug: T130798
Change-Id: If3517e051ad91a7cfe0bc5bb8c7df94a0473d8cb
---
M extension.json
M i18n/en.json
M i18n/qqq.json
A resources/mobile.languages/LanguageOverlay.hogan
A resources/mobile.languages/LanguageOverlay.js
M resources/skins.minerva.scripts/init.js
M tests/browser/features/language.feature
M tests/browser/features/step_definitions/language_steps.rb
M tests/browser/features/support/pages/article_page.rb
A tests/qunit/mobile.languages/test_LanguageOverlay.js
10 files changed, 403 insertions(+), 32 deletions(-)

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



diff --git a/extension.json b/extension.json
index c8ec3d5..84bf1bd 100644
--- a/extension.json
+++ b/extension.json
@@ -1177,6 +1177,28 @@

"resources/mobile.buttonWithSpinner/ButtonWithSpinner.js"
]
},
+   "mobile.languages": {
+   "class": "MFResourceLoaderParsedMessageModule",
+   "dependencies": [
+   "mobile.overlays",
+   "mobile.settings",
+   "mobile.browser"
+   ],
+   "scripts": [
+   "resources/mobile.languages/LanguageOverlay.js"
+   ],
+   "templates": {
+   "LanguageOverlay.hogan": 
"resources/mobile.languages/LanguageOverlay.hogan"
+   },
+   "messages": {
+   "0": "mobile-frontend-language-heading",
+   "1": "mobile-frontend-language-header",
+   "mobile-frontend-language-variant-header": [
+   "parse"
+   ],
+   "2": "mobile-frontend-language-site-choose"
+   }
+   },
"mobile.languages.structured": {
"class": "MFResourceLoaderParsedMessageModule",
"dependencies": [
@@ -1949,6 +1971,28 @@
"A": 0.03
}
},
+   "@languageOverlay": "controls which language overlay 
shows in stable",
+   "languageOverlay": {
+   "name": "languageOverlay",
+   "enabled": false,
+   "buckets": {
+   "@control": "the ratio of users that 
see the simpler overlay",
+   "control": 1,
+   "@A": "the ratio of users that see the 
structured overlay",
+   "A": 0
+   }
+   },
+   "@languageOverlayBeta": "controls which language 
overlay shows in beta",
+   "languageOverlayBeta": {
+   "name": "languageOverlayBeta",
+   "enabled": false,
+   "buckets": {
+   "@control": "the ratio of users that 
see the simpler overlay",
+   "control": 1,
+   "@A": "the ratio of users that see the 
structured overlay",
+   "A": 0
+   }
+   },
"_merge_strategy": "array_plus_2d"
},
"MFEnableMinervaBetaFeature": false,
diff --git a/i18n/en.json b/i18n/en.json
index f47bf92..20c22c8 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -177,7 +177,10 @@
"mobile-frontend-image-uploading": "'''Uploading''' image...",
"mobile-frontend-images-status": "Images",
"mobile-frontend-language-article-heading": "Read in another language",
+   "mobile-frontend-language-header": "This page is available in $1 
{{PLURAL:$1|language|languages}}",
"mobile-frontend-language-heading": "Languages",
+   "mobile-frontend-language-site-choose": "Search language",
+   "mobile-frontend-language-variant-header": "Choose 
{{#language:{{CONTENTLANG variant",
"mobile-frontend-languages-404-desc": "A valid title must be 
specified.",
"mobile-frontend-languages-404-title": "Languages error",
"mobile-frontend-languages-header": 

[MediaWiki-commits] [Gerrit] [Dice] Archive extension - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [Dice] Archive extension
..

[Dice] Archive extension

This is do to know extension files at
https://github.com/wikimedia/mediawiki-extensions-Dice

Its just an empty repo.

Change-Id: I6fd2d63a0811c1d3d41e0b51d1523b14642d0179
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/50/279550/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 31fa968..29d93f0 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4414,8 +4414,7 @@
 
   - name: mediawiki/extensions/Dice
 template:
-  - name: jsonlint
-  - name: extension-unittests-non-voting
+  - name: archived
 
   - name: mediawiki/extensions/DidYouKnow
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fd2d63a0811c1d3d41e0b51d1523b14642d0179
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] [Dice] Archive extension - change (mediawiki...Dice)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [Dice] Archive extension
..

[Dice] Archive extension

This is do to know extension files at
https://github.com/wikimedia/mediawiki-extensions-Dice

Its just an empty repo.

Change-Id: I5ffa8babc10cabdcd99b56483799113eab4548e9
---
A Dice.php
1 file changed, 24 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Dice 
refs/changes/49/279549/1

diff --git a/Dice.php b/Dice.php
new file mode 100644
index 000..702a06f
--- /dev/null
+++ b/Dice.php
@@ -0,0 +1,24 @@
+https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   ); */
+   return;
+} else {
+   die( 'This version of the DeletePagesForGood extension requires 
MediaWiki 1.25+' );
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ffa8babc10cabdcd99b56483799113eab4548e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Dice
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] [Diagnosis] Add npm test and composer-test - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [Diagnosis] Add npm test and composer-test
..

[Diagnosis] Add npm test and composer-test

Also move jsonlint to check: for non-whitelisted users and remove jshint
since there are no js files.

Requires Iba130c71a6e6088778262f4cf8c3188e82977015

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/48/279548/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 31fa968..debedc9 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4408,9 +4408,11 @@
 
   - name: mediawiki/extensions/Diagnosis
 template:
-  - name: jshint
-  - name: jsonlint
+  - name: composer-test
   - name: extension-unittests-generic
+  - name: npm
+check:
+  - jsonlint
 
   - name: mediawiki/extensions/Dice
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9066a173cb21e3ae628c0d8b69af03eb2df2c06
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] Enable $wgEchoFooterNotice on enwiki - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Enable $wgEchoFooterNotice on enwiki
..


Enable $wgEchoFooterNotice on enwiki

Bug: T128937
Change-Id: I2e7540d7ace0327f7bc62152fb9ffb5c02ac2550
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1bd7467..d6edd8d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15342,6 +15342,7 @@
 ),
 'wmgEchoShowFooterNotice' => array(
'default' => false,
+   'enwiki' => true,
'testwiki' => true,
 ),
 'wmgEchoFooterNoticeURL' => array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e7540d7ace0327f7bc62152fb9ffb5c02ac2550
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
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] Improved regexp for "MATCHES" - change (mediawiki...Cargo)

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review.

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

Change subject: Improved regexp for "MATCHES"
..

Improved regexp for "MATCHES"

Change-Id: I74b2281c0194afe62b95c0d8057464804c6108fe
---
M CargoSQLQuery.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/70/279370/1

diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php
index 6d21655..51ebfc5 100644
--- a/CargoSQLQuery.php
+++ b/CargoSQLQuery.php
@@ -1025,7 +1025,7 @@
foreach ( $searchTextFields as $searchTextField ) {
$fieldName = $searchTextField['fieldName'];
$tableName = $searchTextField['tableName'];
-   $patternSuffix = '(\s+MATCHES\s*)([^)\s]*)/i';
+   $patternSuffix = '(\s+MATCHES\s*)([\'"][^\'"]*[\'"])/i';
 
$pattern1 = CargoUtils::getSQLTableAndFieldPattern( 
$tableName, $fieldName, false ) . $patternSuffix;
$foundMatch1 = preg_match( $pattern1, $this->mWhereStr, 
$matches );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I74b2281c0194afe62b95c0d8057464804c6108fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 

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

[MediaWiki-commits] [Gerrit] Add npm entry point - change (mediawiki...Diagnosis)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Add npm entry point
..

Add npm entry point

Change-Id: Iba130c71a6e6088778262f4cf8c3188e82977015
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 32 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Diagnosis 
refs/changes/47/279547/1

diff --git a/.gitignore b/.gitignore
index 98b092a..1689d7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-.svn
 *~
 *.kate-swp
 .*.swp
+node_modules/**
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..7756e75
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..41cecca
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.4.0",
+"grunt-jsonlint": "1.0.7"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba130c71a6e6088778262f4cf8c3188e82977015
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Diagnosis
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] cp3019-22: decom from cache_misc - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: cp3019-22: decom from cache_misc
..


cp3019-22: decom from cache_misc

Bug: T125485
Change-Id: I25598c480059cc5ea8ff8800b63f2df68943c0f0
---
M conftool-data/nodes/esams.yaml
M hieradata/common/cache/misc.yaml
M manifests/site.pp
3 files changed, 1 insertion(+), 9 deletions(-)

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



diff --git a/conftool-data/nodes/esams.yaml b/conftool-data/nodes/esams.yaml
index cbb6c70..9e44d32 100644
--- a/conftool-data/nodes/esams.yaml
+++ b/conftool-data/nodes/esams.yaml
@@ -33,10 +33,6 @@
   cp3008.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp3009.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp3010.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp3019.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp3020.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp3021.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp3022.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
 dns:
   maerlant.wikimedia.org: [pdns_recursor]
   nescio.wikimedia.org: [pdns_recursor]
diff --git a/hieradata/common/cache/misc.yaml b/hieradata/common/cache/misc.yaml
index a66e43c..15a8a47 100644
--- a/hieradata/common/cache/misc.yaml
+++ b/hieradata/common/cache/misc.yaml
@@ -14,10 +14,6 @@
 - 'cp3008.esams.wmnet'
 - 'cp3009.esams.wmnet'
 - 'cp3010.esams.wmnet'
-- 'cp3019.esams.wmnet'
-- 'cp3020.esams.wmnet'
-- 'cp3021.esams.wmnet'
-- 'cp3022.esams.wmnet'
   ulsfo:
 - 'cp4001.ulsfo.wmnet'
 - 'cp4002.ulsfo.wmnet'
diff --git a/manifests/site.pp b/manifests/site.pp
index 3a5acbf..f9e6228 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -370,7 +370,7 @@
 
 node /^cp30(19|2[0-2])\.esams\.wmnet$/ {
 interface::add_ip6_mapped { 'main': }
-role cache::misc, ipsec
+include standard # to be decommed
 }
 
 node /^cp30[34][0123]\.esams\.wmnet$/ {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25598c480059cc5ea8ff8800b63f2df68943c0f0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [Description2] Add npm test - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [Description2] Add npm test
..

[Description2] Add npm test

Also move jsonlint to check: for non-whitelisted users and remove jshint
since there are no js files.

Requires Ibf52aaad3924f741a2ed44bd03193705f7b85233

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/46/279546/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 31fa968..649b17e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4396,9 +4396,10 @@
 
   - name: mediawiki/extensions/Description2
 template:
-  - name: jshint
-  - name: jsonlint
   - name: extension-unittests-generic
+  - name: npm
+check:
+  - jsonlint
 
   - name: mediawiki/extensions/DeviceMapLogCapture
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I66ec23c114c31b9cc1bacdc68386a1503e1a341c
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] Use the legacy language overlay for now - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Use the legacy language overlay for now
..


Use the legacy language overlay for now

... until we fix all issues related to the new structured
language overlay.

Change-Id: I0a1be0b08cdf63c790c89fd468c89471a8f5df71
---
M wmf-config/InitialiseSettings.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1bd7467..dee837b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14076,15 +14076,15 @@
'languageOverlay' => array(
'enabled' => true,
'buckets' => array(
-   'control' => 0.5,  // simpler overlay
-   'A' => 0.5  // structured overlay
+   'control' => 1,  // simpler overlay
+   'A' => 0  // structured overlay
),
),
'languageOverlayBeta' => array(
'enabled' => true,
'buckets' => array(
-   'control' => 0,  // simpler overlay
-   'A' => 1  // structured overlay
+   'control' => 1,  // simpler overlay
+   'A' => 0  // structured overlay
),
),
),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a1be0b08cdf63c790c89fd468c89471a8f5df71
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 
Gerrit-Reviewer: Catrope 
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] Update restbase to 32992df - change (mediawiki...deploy)

[Ppchelko (Code Review)]

Ppchelko has submitted this change and it was merged.

Change subject: Update restbase to 32992df
..


Update restbase to 32992df

List of changes:
141ea15 Use 302 redirect for commons pages
a144cea Release v0.12.1
38cee28 Temporarily limit commons page redirects to app clients
xxx Update node module dependencies

Change-Id: I074e3b96a0cb0ec3c24a336db72f9e13466603a1
---
M node_modules/content-type/package.json
M node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
M node_modules/hyperswitch/node_modules/swagger-ui/package.json
M node_modules/json-stable-stringify/package.json
M 
node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json
M 
node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json
A node_modules/service-runner/node_modules/hot-shots/CHANGES.md~
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/core-util-is/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/string_decoder/package.json
M restbase
11 files changed, 52 insertions(+), 9 deletions(-)

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



diff --git a/node_modules/content-type/package.json 
b/node_modules/content-type/package.json
index b3721fb..aa60fab 100644
--- a/node_modules/content-type/package.json
+++ b/node_modules/content-type/package.json
@@ -44,7 +44,7 @@
   },
   "homepage": "https://github.com/jshttp/content-type#readme;,
   "_id": "content-type@1.0.1",
-  "_shasum": "7788d4ab8ab1d6cda48bf90a7cf998600e40",
+  "_shasum": "dfded2af51501b7d462c883c5deed4149a36f434",
   "_from": "git+https://github.com/wikimedia/content-type.git#master;,
   "_resolved": 
"git+https://github.com/wikimedia/content-type.git#47b2632d0a2ee79a7d67268e2f6621becd95d05b;
 }
diff --git 
a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json 
b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
index 473a823..b83ecc7 100644
--- a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
+++ b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
@@ -50,7 +50,7 @@
 "url": "https://github.com/substack/json-stable-stringify/issues;
   },
   "_id": "json-stable-stringify@1.0.0",
-  "_shasum": "6bb0b29682f1855ebfe0c93961878781591fb529",
+  "_shasum": "070fe1d4cda4ad43ea1c1e3c67c1130310b561a9",
   "_from": "git+https://github.com/wikimedia/json-stable-stringify.git#master;,
   "_resolved": 
"git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f;
 }
diff --git a/node_modules/hyperswitch/node_modules/swagger-ui/package.json 
b/node_modules/hyperswitch/node_modules/swagger-ui/package.json
index 78b251e..2e9e212 100644
--- a/node_modules/hyperswitch/node_modules/swagger-ui/package.json
+++ b/node_modules/hyperswitch/node_modules/swagger-ui/package.json
@@ -60,7 +60,7 @@
 "url": "https://github.com/swagger-api/swagger-ui/issues;
   },
   "_id": "swagger-ui@2.1.4",
-  "_shasum": "ad4518d9633ac05b4cd1a7408f109e96ab3793fc",
+  "_shasum": "5268b6a6f265317cf9fba32b372edf6878338ead",
   "_from": "git+https://github.com/wikimedia/swagger-ui.git#master;,
   "_resolved": 
"git+https://github.com/wikimedia/swagger-ui.git#7bef30a93a3b81c55cb95d3ce9e0f9f53d5d8262;
 }
diff --git a/node_modules/json-stable-stringify/package.json 
b/node_modules/json-stable-stringify/package.json
index 4d4ada1..5786558 100644
--- a/node_modules/json-stable-stringify/package.json
+++ b/node_modules/json-stable-stringify/package.json
@@ -50,7 +50,7 @@
 "url": "https://github.com/substack/json-stable-stringify/issues;
   },
   "_id": "json-stable-stringify@1.0.0",
-  "_shasum": "af407a68be9ef24134fa1c9496eaddefa5c718e7",
+  "_shasum": "78885b948c06693fbcf404f707b08a8e28bf267f",
   "_from": "git+https://github.com/wikimedia/json-stable-stringify.git#master;,
   "_resolved": 
"git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f;
 }
diff --git 
a/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json
 
b/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json
index 473a823..b83ecc7 100644
--- 
a/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json
+++ 
b/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json
@@ -50,7 +50,7 @@
 "url": "https://github.com/substack/json-stable-stringify/issues;
   },
   "_id": "json-stable-stringify@1.0.0",
-  "_shasum": "6bb0b29682f1855ebfe0c93961878781591fb529",
+  "_shasum": "070fe1d4cda4ad43ea1c1e3c67c1130310b561a9",
   "_from": 

[MediaWiki-commits] [Gerrit] Add npm entry point - change (mediawiki...Description2)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Add npm entry point
..

Add npm entry point

Change-Id: Ibf52aaad3924f741a2ed44bd03193705f7b85233
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 32 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Description2 
refs/changes/45/279545/1

diff --git a/.gitignore b/.gitignore
index 98b092a..1689d7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-.svn
 *~
 *.kate-swp
 .*.swp
+node_modules/**
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..7756e75
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..41cecca
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.4.0",
+"grunt-jsonlint": "1.0.7"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf52aaad3924f741a2ed44bd03193705f7b85233
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Description2
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] cache_upload: remove support for If-Cached - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: cache_upload: remove support for If-Cached
..

cache_upload: remove support for If-Cached

I *think* this was all in support of our earlier upload/thumbs
architecture, back when the rendering servers actually did
If-Cached queries back into the front of varnish, or something
like that.  I don't see any If-Cached queries flowing in short log
samples today.  Could use more confirmation before killing this
needless complexity.

Change-Id: I1c0bc1885b88e64b8036b0e4db0654fa8e9f5ae3
---
M templates/varnish/upload-backend.inc.vcl.erb
M templates/varnish/upload-common.inc.vcl.erb
M templates/varnish/upload-frontend.inc.vcl.erb
3 files changed, 2 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/279544/1

diff --git a/templates/varnish/upload-backend.inc.vcl.erb 
b/templates/varnish/upload-backend.inc.vcl.erb
index 092244d..f0b541a 100644
--- a/templates/varnish/upload-backend.inc.vcl.erb
+++ b/templates/varnish/upload-backend.inc.vcl.erb
@@ -40,9 +40,7 @@
 
 sub cluster_be_hash { }
 
-sub cluster_be_hit {
-   call upload_common_hit;
-}
+sub cluster_be_hit { }
 
 sub cluster_be_miss {
// Convert range requests into pass when over a certain threshold
@@ -52,10 +50,6 @@
set bereq.http.Range = req.http.Range;
std.log("Passing high range request: " + req.http.Range);
return (pass);
-   }
-
-   if (req.http.If-Cached) {
-   error 412 "Entity not in cache";
}
 }
 
diff --git a/templates/varnish/upload-common.inc.vcl.erb 
b/templates/varnish/upload-common.inc.vcl.erb
index 98dfeb7..068fda2 100644
--- a/templates/varnish/upload-common.inc.vcl.erb
+++ b/templates/varnish/upload-common.inc.vcl.erb
@@ -6,12 +6,6 @@
}
 }
 
-sub upload_common_hit {
-   if (req.http.If-Cached && req.http.If-Cached != obj.http.Etag) {
-   error 412 "Etag mismatch";
-   }
-}
-
 sub upload_common_deliver {
if (resp.http.X-Content-Range) {
set resp.http.Content-Range = resp.http.X-Content-Range;
diff --git a/templates/varnish/upload-frontend.inc.vcl.erb 
b/templates/varnish/upload-frontend.inc.vcl.erb
index c060afe..cebb964 100644
--- a/templates/varnish/upload-frontend.inc.vcl.erb
+++ b/templates/varnish/upload-frontend.inc.vcl.erb
@@ -30,19 +30,12 @@
 
 sub cluster_fe_hash { }
 
-sub cluster_fe_hit {
-   call upload_common_hit;
-}
+sub cluster_fe_hit { }
 
 sub cluster_fe_miss {
// Convert range requests into pass
if (req.http.Range) {
set bereq.http.Range = req.http.Range;
-   return (pass);
-   }
-
-   // Make sure If-Cached requests won't pollute the cache
-   if (req.http.If-Cached) {
return (pass);
}
 }

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

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

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

[MediaWiki-commits] [Gerrit] Update VE-MW submodule to wmf/1.27.0-wmf.18 HEAD (9669db0) - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Update VE-MW submodule to wmf/1.27.0-wmf.18 HEAD (9669db0)
..


Update VE-MW submodule to wmf/1.27.0-wmf.18 HEAD (9669db0)

New changes:
9669db0 Update VE core submodule to wmf/1.27.0-wmf.18 HEAD (5834cfc)

Change-Id: I2efcb1fca94b5f4fcb7dd3b57fa6279c917f1d71
---
M extensions/VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index f3765a7..9669db0 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit f3765a713084f6e317a300eef84fc9415f66465f
+Subproject commit 9669db0f823626da1f7b4a59ca24059c9dcc594b

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2efcb1fca94b5f4fcb7dd3b57fa6279c917f1d71
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.27.0-wmf.18
Gerrit-Owner: Jforrester 
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] Enable extension registration for ParserFunctions - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Enable extension registration for ParserFunctions
..


Enable extension registration for ParserFunctions

Bug: T119117
Change-Id: I81939085844a72478e50a8919f46d60eb3d1f05c
---
M wmf-config/CommonSettings.php
M wmf-config/extension-list
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 80d6023..dc10241 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -683,7 +683,7 @@
 }
 
 if ( $wmgUseParserFunctions ) {
-   include( $IP . '/extensions/ParserFunctions/ParserFunctions.php' );
+   wfLoadExtension( 'ParserFunctions' );
 }
 $wgExpensiveParserFunctionLimit = 500;
 
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 1a0f67d..8e66138 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -88,7 +88,7 @@
 $IP/extensions/PagedTiffHandler/PagedTiffHandler.php
 $IP/extensions/PageImages/PageImages.php
 $IP/extensions/PageTriage/PageTriage.php
-$IP/extensions/ParserFunctions/ParserFunctions.php
+$IP/extensions/ParserFunctions/extension.json
 $IP/extensions/ParsoidBatchAPI/extension.json
 $IP/extensions/PdfHandler/PdfHandler.php
 $IP/extensions/Petition/Petition.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81939085844a72478e50a8919f46d60eb3d1f05c
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Catrope 
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] Styling changes to the footer message - change (mediawiki...Echo)

[jenkins-bot (Code Review)]

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

Change subject: Styling changes to the footer message
..


Styling changes to the footer message

Change-Id: Ie57c0f981671392b751a9774de7be6bb187de3b8
(cherry picked from commit 2df435c1fbe89a42fa97660334cf82c84e5e3334)
---
M i18n/en.json
M modules/ooui/mw.echo.ui.FooterNoticeWidget.js
M modules/ooui/styles/mw.echo.ui.FooterNoticeWidget.less
3 files changed, 13 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 577cd8f..258e31e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -85,7 +85,7 @@
"echo-none": "You have no notifications.",
"echo-more-info": "More info",
"echo-feedback": "Feedback",
-   "echo-popup-footer-feedback": "Provide feedback. [$2 $1]",
+   "echo-popup-footer-feedback": "Provide feedback. [$2 
$1]",
"echo-popup-footer-feedback-survey": "Take this quick survey about 
notifications.",
"echo-popup-footer-feedback-info": "This feedback link is designed to 
help the developers learn more about how people use Notifications so we 
continue to improve the tool. Clicking the survey link will send you to a 
third-party website.",
"echo-quotation-marks": "\"$1\"",
diff --git a/modules/ooui/mw.echo.ui.FooterNoticeWidget.js 
b/modules/ooui/mw.echo.ui.FooterNoticeWidget.js
index 2df05fb..dbffd5c 100644
--- a/modules/ooui/mw.echo.ui.FooterNoticeWidget.js
+++ b/modules/ooui/mw.echo.ui.FooterNoticeWidget.js
@@ -47,7 +47,7 @@
} );
 
infoIcon = new OO.ui.ButtonWidget( {
-   icon: 'info',
+   icon: 'help',
framed: false,
title: mw.msg( 'echo-popup-footer-feedback-info' ),
classes: [ 'mw-echo-ui-footerNoticeWidget-info' ]
diff --git a/modules/ooui/styles/mw.echo.ui.FooterNoticeWidget.less 
b/modules/ooui/styles/mw.echo.ui.FooterNoticeWidget.less
index 913426c..4ce0fec 100644
--- a/modules/ooui/styles/mw.echo.ui.FooterNoticeWidget.less
+++ b/modules/ooui/styles/mw.echo.ui.FooterNoticeWidget.less
@@ -1,4 +1,5 @@
 @import '../../echo.variables';
+@import '../../echo.mixins';
 
 .mw-echo-ui-footerNoticeWidget {
padding: 0.5em;
@@ -21,4 +22,14 @@
&-icon {
padding-right: 0.5em;
}
+
+   &-dismiss,
+   &-info {
+   .mw-echo-ui-mixin-hover-opacity();
+
+   .oo-ui-iconElement-icon {
+   width: 1.3em !important;
+   height: 1.3em !important;
+   }
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie57c0f981671392b751a9774de7be6bb187de3b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: wmf/1.27.0-wmf.18
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Mooeypoo 
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] Add massmessage-sender group to zh.wiki - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Add massmessage-sender group to zh.wiki
..


Add massmessage-sender group to zh.wiki

The Chinese Wikipedia community would like to enable mass message
feature. The right is grantable and revokable by sysops, while any
member of this users group can remove themself.

Bug: T130814
Change-Id: I13804e6593d314945f7cd92adf5a52b37b2c40ee
---
M wmf-config/InitialiseSettings.php
1 file changed, 9 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1bd7467..5ebbe45 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -8771,6 +8771,9 @@
'patroller' => array( 'patrol' => true, 'autopatrol' => true ),
'autoreviewer' => array( 'autopatrol' => true ),
'flood' => array( 'bot' => true ),
+   'massmessage-sender' => array( // T130814
+   'massmessage' => true,
+   ),
),
 
'zhwikinews' => array(
@@ -9512,7 +9515,7 @@
),
'+zhwiki' => array(
'bureaucrat' => array( 'flood' ),
-   'sysop' => array( 'patroller', 'rollbacker', 'autoreviewer', 
'confirmed' ),
+   'sysop' => array( 'patroller', 'rollbacker', 'autoreviewer', 
'confirmed', 'massmessage-sender' ), // T130814
),
'+zhwikinews' => array(
'sysop' => array(
@@ -10209,7 +10212,7 @@
),
'+zhwiki' => array(
'bureaucrat' => array( 'flood' ),
-   'sysop' => array( 'patroller', 'rollbacker', 'autoreviewer', 
'confirmed', 'flood' ),
+   'sysop' => array( 'patroller', 'rollbacker', 'autoreviewer', 
'confirmed', 'flood', 'massmessage-sender' ), // T130814
),
'+zhwikinews' => array(
'sysop' => array(
@@ -11829,7 +11832,10 @@
'sysop' => array( 'flood', 'translationadmin' ), // T50013, 
T48856
'flood' => array( 'flood' ), // T50013
),
-   'zhwiki' => array( 'sysop' => array( 'flood' ) ),
+   'zhwiki' => array(
+   'sysop' => array( 'flood' ),
+   'massmessage-sender' => array( 'massmessage-sender' ), // 
T130814
+   ),
'zhwikinews' => array( 'flood' => array( 'flood' ) ), // T54546
 ),
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I13804e6593d314945f7cd92adf5a52b37b2c40ee
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Catrope 
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] Wikitech: Remove address, domain, proxy special pages. - change (mediawiki...OpenStackManager)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Wikitech:  Remove address, domain, proxy special pages.
..

Wikitech:  Remove address, domain, proxy special pages.

Bug:  T124184
Change-Id: I02e309dd119265468da52ebd7bbd8afdec161a65
---
M OpenStackManager.php
1 file changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/OpenStackManager.php b/OpenStackManager.php
index 28f009f..bedab09 100644
--- a/OpenStackManager.php
+++ b/OpenStackManager.php
@@ -234,14 +234,11 @@
 $wgSpecialPages['NovaInstance'] = 'SpecialNovaInstance';
 $wgSpecialPages['NovaKey'] = 'SpecialNovaKey';
 $wgSpecialPages['NovaProject'] = 'SpecialNovaProject';
-$wgSpecialPages['NovaDomain'] = 'SpecialNovaDomain';
-$wgSpecialPages['NovaAddress'] = 'SpecialNovaAddress';
 $wgSpecialPages['NovaSecurityGroup'] = 'SpecialNovaSecurityGroup';
 $wgSpecialPages['NovaServiceGroup'] = 'SpecialNovaServiceGroup';
 $wgSpecialPages['NovaRole'] = 'SpecialNovaRole';
 $wgSpecialPages['NovaVolume'] = 'SpecialNovaVolume';
 $wgSpecialPages['NovaSudoer'] = 'SpecialNovaSudoer';
-$wgSpecialPages['NovaProxy'] = 'SpecialNovaProxy';
 $wgSpecialPages['NovaPuppetGroup'] = 'SpecialNovaPuppetGroup';
 $wgSpecialPages['NovaResources'] = 'SpecialNovaResources';
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02e309dd119265468da52ebd7bbd8afdec161a65
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] Revert "varnish: route codfw as 'direct' for upload caches" - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Revert "varnish: route codfw as 'direct' for upload caches"
..


Revert "varnish: route codfw as 'direct' for upload caches"

This reverts commit 1209688df44e777b31548e9d68940338c3f89f7e.

Bug: T129089
Change-Id: I663d6b62c9e58f6dfda5d038bacabe32b01c85e4
---
M hieradata/role/common/cache/upload.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/hieradata/role/common/cache/upload.yaml 
b/hieradata/role/common/cache/upload.yaml
index ce54492..bfde655 100644
--- a/hieradata/role/common/cache/upload.yaml
+++ b/hieradata/role/common/cache/upload.yaml
@@ -22,6 +22,6 @@
 #
 cache::route_table:
   eqiad: 'direct'
-  codfw: 'direct'
+  codfw: 'eqiad'
   ulsfo: 'codfw'
   esams: 'eqiad'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I663d6b62c9e58f6dfda5d038bacabe32b01c85e4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Enable extension registration for InputBox - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Enable extension registration for InputBox
..


Enable extension registration for InputBox

Bug: T119117
Change-Id: I65027fb19e205c37f2cb52a48e3ce9a411858621
---
M wmf-config/CommonSettings.php
M wmf-config/extension-list
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 80d6023..a213d70 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -696,7 +696,7 @@
 }
 
 if ( $wmgUseInputBox ) {
-   include( $IP . '/extensions/InputBox/InputBox.php' );
+   wfLoadExtension( 'InputBox' );
 }
 
 if ( $wmgUseImageMap ) {
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 1a0f67d..504b715 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -61,7 +61,7 @@
 $IP/extensions/GWToolset/GWToolset.php
 $IP/extensions/ImageMap/ImageMap.php
 $IP/extensions/ImageMetrics/ImageMetrics.php
-$IP/extensions/InputBox/InputBox.php
+$IP/extensions/InputBox/extension.json
 $IP/extensions/Insider/Insider.php
 $IP/extensions/intersection/DynamicPageList.php
 $IP/extensions/Interwiki/Interwiki.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65027fb19e205c37f2cb52a48e3ce9a411858621
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Catrope 
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] Update extension-list for extension registration - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Update extension-list for extension registration
..


Update extension-list for extension registration

Extensions loaded with wfLoadExtension should have extension.json
as entry point.

Bug: T119117
Change-Id: I9a2226ea90c7c3d776a787acb917a39b124443c1
---
M wmf-config/extension-list
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 1a0f67d..35126db 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -14,7 +14,7 @@
 $IP/extensions/CharInsert/extension.json
 $IP/extensions/CheckUser/CheckUser.php
 $IP/extensions/CirrusSearch/CirrusSearch.php
-$IP/extensions/Cite/Cite.php
+$IP/extensions/Cite/extension.json
 $IP/extensions/CiteThisPage/extension.json
 $IP/extensions/Citoid/Citoid.php
 $IP/extensions/cldr/cldr.php
@@ -75,7 +75,7 @@
 $IP/extensions/LocalisationUpdate/LocalisationUpdate.php
 $IP/extensions/MapSources/MapSources.php
 $IP/extensions/MassMessage/MassMessage.php
-$IP/extensions/Math/Math.php
+$IP/extensions/Math/extension.json
 $IP/extensions/MobileApp/MobileApp.php
 $IP/extensions/MobileFrontend/MobileFrontend.php
 $IP/extensions/MoodBar/MoodBar.php
@@ -98,7 +98,7 @@
 $IP/extensions/ProofreadPage/ProofreadPage.php
 $IP/extensions/QuickSurveys/extension.json
 $IP/extensions/Quiz/Quiz.php
-$IP/extensions/RelatedArticles/RelatedArticles.php
+$IP/extensions/RelatedArticles/extension.json
 $IP/extensions/RelatedSites/RelatedSites.php
 $IP/extensions/Renameuser/Renameuser.php
 $IP/extensions/RestBaseUpdateJobs/RestbaseUpdate.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a2226ea90c7c3d776a787acb917a39b124443c1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Catrope 
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] Set $wgNamespacesWithSubpages to true for NS_TEMPLATE for ru... - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Set $wgNamespacesWithSubpages to true for NS_TEMPLATE for 
ru.wikisource
..


Set $wgNamespacesWithSubpages to true for NS_TEMPLATE for ru.wikisource

Removed the entry for ru.wikisource in $wgNamespacesWithSubpages for
templates, so that it uses the default value (true).

Bug: T124615
Change-Id: If5a77d6c1942ca266384f1cd2323b9bbf6e83c11
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 6981b7e..de10c00 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4008,7 +4008,6 @@
'+enwikisource' => array( 114 => 1, 115 => 1 ), // T52007
'+huwikisource' => array( 10 => 0 ),
'+nowikisource' => array( 10 => 0 ),
-   '+ruwikisource' => array( 10 => 0 ),
'+trwikisource' => array( 10 => 0 ),
'+ukwikisource' => array( 114 => 1, 115 => 1 ), // T52561
'+viwikisource' => array( 10 => 0 ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If5a77d6c1942ca266384f1cd2323b9bbf6e83c11
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Pmlineditor 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Luke081515 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update restbase to 32992df - change (mediawiki...deploy)

[Ppchelko (Code Review)]

Ppchelko has uploaded a new change for review.

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

Change subject: Update restbase to 32992df
..

Update restbase to 32992df

List of changes:
141ea15 Use 302 redirect for commons pages
a144cea Release v0.12.1
38cee28 Temporarily limit commons page redirects to app clients
xxx Update node module dependencies

Change-Id: I074e3b96a0cb0ec3c24a336db72f9e13466603a1
---
M node_modules/content-type/package.json
M node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
M node_modules/hyperswitch/node_modules/swagger-ui/package.json
M node_modules/json-stable-stringify/package.json
M 
node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json
M 
node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json
A node_modules/service-runner/node_modules/hot-shots/CHANGES.md~
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/core-util-is/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/string_decoder/package.json
M restbase
11 files changed, 52 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/42/279542/1

diff --git a/node_modules/content-type/package.json 
b/node_modules/content-type/package.json
index b3721fb..aa60fab 100644
--- a/node_modules/content-type/package.json
+++ b/node_modules/content-type/package.json
@@ -44,7 +44,7 @@
   },
   "homepage": "https://github.com/jshttp/content-type#readme;,
   "_id": "content-type@1.0.1",
-  "_shasum": "7788d4ab8ab1d6cda48bf90a7cf998600e40",
+  "_shasum": "dfded2af51501b7d462c883c5deed4149a36f434",
   "_from": "git+https://github.com/wikimedia/content-type.git#master;,
   "_resolved": 
"git+https://github.com/wikimedia/content-type.git#47b2632d0a2ee79a7d67268e2f6621becd95d05b;
 }
diff --git 
a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json 
b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
index 473a823..b83ecc7 100644
--- a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
+++ b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
@@ -50,7 +50,7 @@
 "url": "https://github.com/substack/json-stable-stringify/issues;
   },
   "_id": "json-stable-stringify@1.0.0",
-  "_shasum": "6bb0b29682f1855ebfe0c93961878781591fb529",
+  "_shasum": "070fe1d4cda4ad43ea1c1e3c67c1130310b561a9",
   "_from": "git+https://github.com/wikimedia/json-stable-stringify.git#master;,
   "_resolved": 
"git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f;
 }
diff --git a/node_modules/hyperswitch/node_modules/swagger-ui/package.json 
b/node_modules/hyperswitch/node_modules/swagger-ui/package.json
index 78b251e..2e9e212 100644
--- a/node_modules/hyperswitch/node_modules/swagger-ui/package.json
+++ b/node_modules/hyperswitch/node_modules/swagger-ui/package.json
@@ -60,7 +60,7 @@
 "url": "https://github.com/swagger-api/swagger-ui/issues;
   },
   "_id": "swagger-ui@2.1.4",
-  "_shasum": "ad4518d9633ac05b4cd1a7408f109e96ab3793fc",
+  "_shasum": "5268b6a6f265317cf9fba32b372edf6878338ead",
   "_from": "git+https://github.com/wikimedia/swagger-ui.git#master;,
   "_resolved": 
"git+https://github.com/wikimedia/swagger-ui.git#7bef30a93a3b81c55cb95d3ce9e0f9f53d5d8262;
 }
diff --git a/node_modules/json-stable-stringify/package.json 
b/node_modules/json-stable-stringify/package.json
index 4d4ada1..5786558 100644
--- a/node_modules/json-stable-stringify/package.json
+++ b/node_modules/json-stable-stringify/package.json
@@ -50,7 +50,7 @@
 "url": "https://github.com/substack/json-stable-stringify/issues;
   },
   "_id": "json-stable-stringify@1.0.0",
-  "_shasum": "af407a68be9ef24134fa1c9496eaddefa5c718e7",
+  "_shasum": "78885b948c06693fbcf404f707b08a8e28bf267f",
   "_from": "git+https://github.com/wikimedia/json-stable-stringify.git#master;,
   "_resolved": 
"git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f;
 }
diff --git 
a/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json
 
b/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json
index 473a823..b83ecc7 100644
--- 
a/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json
+++ 
b/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json
@@ -50,7 +50,7 @@
 "url": "https://github.com/substack/json-stable-stringify/issues;
   },
   "_id": "json-stable-stringify@1.0.0",
-  "_shasum": "6bb0b29682f1855ebfe0c93961878781591fb529",
+  

[MediaWiki-commits] [Gerrit] Allow for using separate database for OATH creds - change (mediawiki...OATHAuth)

[jenkins-bot (Code Review)]

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

Change subject: Allow for using separate database for OATH creds
..


Allow for using separate database for OATH creds

Add configuration variable for specifying what database the OATH
credentials are stored in, that way wikis that use CentralAuth can
centralize their two-factor authentication data as well.

Bug: T100374
Change-Id: I285e2fe29fee43ddc6c5a6e51823911d43c596f6
(cherry picked from commit 67c7dd10e7dff43a3e2ae78995575775a21732af)
---
M OATHAuth.hooks.php
M OATHAuthKey.php
M extension.json
M special/SpecialOATH.php
4 files changed, 25 insertions(+), 9 deletions(-)

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



diff --git a/OATHAuth.hooks.php b/OATHAuth.hooks.php
index 2df0313..4c3f68d 100644
--- a/OATHAuth.hooks.php
+++ b/OATHAuth.hooks.php
@@ -24,6 +24,23 @@
}
 
/**
+* Get the singleton OATH user repository
+*
+* @return OATHUserRepository
+*/
+   public static function getOATHUserRepository() {
+   global $wgOATHAuthDatabase;
+
+   static $service = null;
+
+   if ( $service == null ) {
+   $service = new OATHUserRepository( wfGetLB( 
$wgOATHAuthDatabase ) );
+   }
+
+   return $service;
+   }
+
+   /**
 * @param $extraFields array
 * @return bool
 */
@@ -43,6 +60,7 @@
 */
static function AbortChangePassword( $user, $password, $newpassword, 
&$errorMsg ) {
$result = self::authenticate( $user );
+
if ( $result ) {
return true;
} else {
@@ -78,8 +96,7 @@
global $wgRequest;
 
$token = $wgRequest->getText( 'wpOATHToken' );
-   $oathrepo = new OATHUserRepository( wfGetLB() );
-   $oathuser = $oathrepo->findByUser( $user );
+   $oathuser = self::getOATHUserRepository()->findByUser( $user );
# Though it's weird to default to true, we only want to deny
# users who have two-factor enabled and have validated their
# token.
@@ -102,8 +119,7 @@
static function TwoFactorIsEnabled( &$isEnabled ) {
global $wgUser;
 
-   $oathrepo = new OATHUserRepository( wfGetLB() );
-   $user = $oathrepo->findByUser( $wgUser );
+   $user = self::getOATHUserRepository()->findByUser( $wgUser );
if ( $user && $user->getKey() !== null ) {
$isEnabled = true;
# This two-factor extension is enabled by the user,
@@ -126,8 +142,7 @@
 * @return bool
 */
public static function manageOATH( User $user, array &$preferences ) {
-   $oathrepo = new OATHUserRepository( wfGetLB() );
-   $oathUser = $oathrepo->findByUser( $user );
+   $oathUser = self::getOATHUserRepository()->findByUser( $user );
 
$title = SpecialPage::getTitleFor( 'OATH' );
$msg = $oathUser->getKey() !== null ? 'oathauth-disable' : 
'oathauth-enable';
diff --git a/OATHAuthKey.php b/OATHAuthKey.php
index ac4a26b..c5ce239 100644
--- a/OATHAuthKey.php
+++ b/OATHAuthKey.php
@@ -117,7 +117,7 @@
if ( $token === 
$this->scratchTokens[$i] ) {
// If there is a scratch token, 
remove it from the scratch token list
unset( $this->scratchTokens[$i] 
);
-   $oathrepo = new 
OATHUserRepository( wfGetLB() );
+   $oathrepo = 
OATHAuthHooks::getOATHUserRepository();
$user->setKey( $this );
$oathrepo->persist( $user );
// Only return true if we 
removed it from the database
diff --git a/extension.json b/extension.json
index 9a47fa4..09ef513 100644
--- a/extension.json
+++ b/extension.json
@@ -50,7 +50,8 @@
]
},
"config": {
-   "OATHAuthWindowRadius": 4
+   "OATHAuthWindowRadius": 4,
+   "OATHAuthDatabase": false
},
"ResourceModules": {
"ext.oathauth": {
diff --git a/special/SpecialOATH.php b/special/SpecialOATH.php
index 5ab08dd..96214cf 100644
--- a/special/SpecialOATH.php
+++ b/special/SpecialOATH.php
@@ -11,7 +11,7 @@
 * @return SpecialOATHDisable|SpecialOATHEnable|SpecialPage
 */
protected function getTargetPage() {
-   $repo = new OATHUserRepository( wfGetLB() );
+   $repo = OATHAuthHooks::getOATHUserRepository();
$user = 

[MediaWiki-commits] [Gerrit] Introduce basic SpecialEditWatchlistTest - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Introduce basic SpecialEditWatchlistTest
..


Introduce basic SpecialEditWatchlistTest

Change-Id: I9f765c4183314850169f685abd242e979a79bd68
---
A tests/phpunit/includes/specials/SpecialEditWatchlistTest.php
1 file changed, 50 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/specials/SpecialEditWatchlistTest.php 
b/tests/phpunit/includes/specials/SpecialEditWatchlistTest.php
new file mode 100644
index 000..cd84d79
--- /dev/null
+++ b/tests/phpunit/includes/specials/SpecialEditWatchlistTest.php
@@ -0,0 +1,50 @@
+setExpectedException( 'UserNotLoggedIn' );
+   $this->executeSpecialPage();
+   }
+
+   public function testRootPage_displaysExplanationMessage() {
+   $user = new TestUser( __METHOD__ );
+   list( $html, ) = $this->executeSpecialPage( '', null, 'qqx', 
$user->getUser() );
+   $this->assertContains( '(watchlistedit-normal-explain)', $html 
);
+   }
+
+   public function testClearPage_hasClearButtonForm() {
+   $user = new TestUser( __METHOD__ );
+   list( $html, ) = $this->executeSpecialPage( 'clear', null, 
'qqx', $user->getUser() );
+   $this->assertRegExp(
+   '//',
+   $html
+   );
+   }
+
+   public function testEditRawPage_hasTitlesBox() {
+   $user = new TestUser( __METHOD__ );
+   list( $html, ) = $this->executeSpecialPage( 'raw', null, 'qqx', 
$user->getUser() );
+   $this->assertContains(
+   'https://gerrit.wikimedia.org/r/279360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f765c4183314850169f685abd242e979a79bd68
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Integrate 3.19.8-ckt16 and 3.19.8-ckt17 - change (operations...linux)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Integrate 3.19.8-ckt16 and 3.19.8-ckt17
..


Integrate 3.19.8-ckt16 and 3.19.8-ckt17

Change-Id: Ife0df20797de10cff723223973bbfc93496d6bac
---
M debian/changelog
A debian/patches/bugfix/all/stable-3.19.8-ckt16.patch
A debian/patches/bugfix/all/stable-3.19.8-ckt17.patch
M debian/patches/series
4 files changed, 10,904 insertions(+), 0 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife0df20797de10cff723223973bbfc93496d6bac
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/linux
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 

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

[MediaWiki-commits] [Gerrit] Add handling for PCRE errors in ustringGsub - change (mediawiki...Scribunto)

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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

Change subject: Add handling for PCRE errors in ustringGsub
..

Add handling for PCRE errors in ustringGsub

Bug: T130823
Change-Id: I6fab71c82ddab92daf6b369cb9857d9892f2d246
---
M engines/LuaCommon/UstringLibrary.php
M tests/engines/LuaCommon/UstringLibraryPureLuaTest.php
M tests/engines/LuaCommon/UstringLibraryTest.php
3 files changed, 97 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto 
refs/changes/77/279377/1

diff --git a/engines/LuaCommon/UstringLibrary.php 
b/engines/LuaCommon/UstringLibrary.php
index bef0761..ec845d8 100644
--- a/engines/LuaCommon/UstringLibrary.php
+++ b/engines/LuaCommon/UstringLibrary.php
@@ -672,6 +672,52 @@
 
$count = 0;
$s2 = preg_replace_callback( $re, $cb, $s, $n, $count );
+   if ( $s2 === null ) {
+   self::handlePCREError( preg_last_error(), $pattern );
+   }
return array( $s2, $count );
}
+
+   /**
+* Handle a PCRE error
+* @param int $error From preg_last_error()
+* @param string $pattern Pattern being matched
+* @throws Scribunto_LuaError
+*/
+   private function handlePCREError( $error, $pattern ) {
+   $PREG_JIT_STACKLIMIT_ERROR = defined( 
'PREG_JIT_STACKLIMIT_ERROR' )
+   ? PREG_JIT_STACKLIMIT_ERROR
+   : 'PREG_JIT_STACKLIMIT_ERROR';
+
+   $error = preg_last_error();
+   switch ( $error ) {
+   case PREG_NO_ERROR:
+   // Huh?
+   break;
+   case PREG_INTERNAL_ERROR:
+   throw new Scribunto_LuaError( "PCRE internal 
error" );
+   case PREG_BACKTRACK_LIMIT_ERROR:
+   throw new Scribunto_LuaError(
+   "PCRE backtrack limit reached while 
matching pattern '$pattern'"
+   );
+   case PREG_RECURSION_LIMIT_ERROR:
+   throw new Scribunto_LuaError(
+   "PCRE recursion limit reached while 
matching pattern '$pattern'"
+   );
+   case PREG_BAD_UTF8_ERROR:
+   // Should have alreay been caught, but just in 
case
+   throw new Scribunto_LuaError( "PCRE bad UTF-8 
error" );
+   case PREG_BAD_UTF8_OFFSET_ERROR:
+   // Shouldn't happen, but just in case
+   throw new Scribunto_LuaError( "PCRE bad UTF-8 
offset error" );
+   case $PREG_JIT_STACKLIMIT_ERROR:
+   throw new Scribunto_LuaError(
+   "PCRE JIT stack limit reached while 
matching pattern '$pattern'"
+   );
+   default:
+   throw new Scribunto_LuaError(
+   "PCRE error code $error while matching 
pattern '$pattern'"
+   );
+   }
+   }
 }
diff --git a/tests/engines/LuaCommon/UstringLibraryPureLuaTest.php 
b/tests/engines/LuaCommon/UstringLibraryPureLuaTest.php
index 141996d..f1109f8 100644
--- a/tests/engines/LuaCommon/UstringLibraryPureLuaTest.php
+++ b/tests/engines/LuaCommon/UstringLibraryPureLuaTest.php
@@ -17,4 +17,18 @@
', 'fortest' )
);
}
+
+   /**
+* @dataProvider providePCREErrors
+*/
+   public function testPCREErrors($ini, $args, $error) {
+   // Not applicable
+   $this->assertTrue( true );
+   }
+
+   public static function providePCREErrors() {
+   return array(
+   array( array(), array(), null ),
+   );
+   }
 }
diff --git a/tests/engines/LuaCommon/UstringLibraryTest.php 
b/tests/engines/LuaCommon/UstringLibraryTest.php
index 3e24a5d..99576a0 100644
--- a/tests/engines/LuaCommon/UstringLibraryTest.php
+++ b/tests/engines/LuaCommon/UstringLibraryTest.php
@@ -53,6 +53,43 @@
$this->assertSame( $expected, $actual );
$this->luaTestName = null;
}
+
+   /**
+* @dataProvider providePCREErrors
+*/
+   public function testPCREErrors( $ini, $args, $error ) {
+   $reset = array();
+   foreach ( $ini as $key => $value ) {
+   $old = ini_set( $key, $value );
+   if ( $old === false ) {
+   $this->markTestSkipped( "Failed to set ini 
setting $key = $value" );
+

[MediaWiki-commits] [Gerrit] Update VE-MW submodule to wmf/1.27.0-wmf.18 HEAD (9669db0) - change (mediawiki/core)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Update VE-MW submodule to wmf/1.27.0-wmf.18 HEAD (9669db0)
..

Update VE-MW submodule to wmf/1.27.0-wmf.18 HEAD (9669db0)

New changes:
9669db0 Update VE core submodule to wmf/1.27.0-wmf.18 HEAD (5834cfc)

Change-Id: I2efcb1fca94b5f4fcb7dd3b57fa6279c917f1d71
---
M extensions/VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/41/279541/1

diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index f3765a7..9669db0 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit f3765a713084f6e317a300eef84fc9415f66465f
+Subproject commit 9669db0f823626da1f7b4a59ca24059c9dcc594b

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2efcb1fca94b5f4fcb7dd3b57fa6279c917f1d71
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.27.0-wmf.18
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] Improved regexp for "MATCHES" - change (mediawiki...Cargo)

[Yaron Koren (Code Review)]

Yaron Koren has submitted this change and it was merged.

Change subject: Improved regexp for "MATCHES"
..


Improved regexp for "MATCHES"

Change-Id: I74b2281c0194afe62b95c0d8057464804c6108fe
---
M CargoSQLQuery.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php
index 6d21655..51ebfc5 100644
--- a/CargoSQLQuery.php
+++ b/CargoSQLQuery.php
@@ -1025,7 +1025,7 @@
foreach ( $searchTextFields as $searchTextField ) {
$fieldName = $searchTextField['fieldName'];
$tableName = $searchTextField['tableName'];
-   $patternSuffix = '(\s+MATCHES\s*)([^)\s]*)/i';
+   $patternSuffix = '(\s+MATCHES\s*)([\'"][^\'"]*[\'"])/i';
 
$pattern1 = CargoUtils::getSQLTableAndFieldPattern( 
$tableName, $fieldName, false ) . $patternSuffix;
$foundMatch1 = preg_match( $pattern1, $this->mWhereStr, 
$matches );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I74b2281c0194afe62b95c0d8057464804c6108fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
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] Update VE core submodule to wmf/1.27.0-wmf.18 HEAD (5834cfc) - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Update VE core submodule to wmf/1.27.0-wmf.18 HEAD (5834cfc)
..


Update VE core submodule to wmf/1.27.0-wmf.18 HEAD (5834cfc)

New changes:
5834cfc SurfaceFramgent: Guard against tx.getModifiedRange returning null

Change-Id: I468c9bfd25374f1741202509c4a420797439b628
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/lib/ve b/lib/ve
index 80c41b7..5834cfc 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 80c41b73c8a7078033e8fe72add0f202550af0a2
+Subproject commit 5834cfc3a012f17ed28113a2c88197389cc94842

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I468c9bfd25374f1741202509c4a420797439b628
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.18
Gerrit-Owner: Jforrester 
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] Styling changes to the footer message - change (mediawiki...Echo)

[Catrope (Code Review)]

Catrope has uploaded a new change for review.

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

Change subject: Styling changes to the footer message
..

Styling changes to the footer message

Change-Id: Ie57c0f981671392b751a9774de7be6bb187de3b8
(cherry picked from commit 2df435c1fbe89a42fa97660334cf82c84e5e3334)
---
M i18n/en.json
M modules/ooui/mw.echo.ui.FooterNoticeWidget.js
M modules/ooui/styles/mw.echo.ui.FooterNoticeWidget.less
3 files changed, 13 insertions(+), 2 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 577cd8f..258e31e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -85,7 +85,7 @@
"echo-none": "You have no notifications.",
"echo-more-info": "More info",
"echo-feedback": "Feedback",
-   "echo-popup-footer-feedback": "Provide feedback. [$2 $1]",
+   "echo-popup-footer-feedback": "Provide feedback. [$2 
$1]",
"echo-popup-footer-feedback-survey": "Take this quick survey about 
notifications.",
"echo-popup-footer-feedback-info": "This feedback link is designed to 
help the developers learn more about how people use Notifications so we 
continue to improve the tool. Clicking the survey link will send you to a 
third-party website.",
"echo-quotation-marks": "\"$1\"",
diff --git a/modules/ooui/mw.echo.ui.FooterNoticeWidget.js 
b/modules/ooui/mw.echo.ui.FooterNoticeWidget.js
index 2df05fb..dbffd5c 100644
--- a/modules/ooui/mw.echo.ui.FooterNoticeWidget.js
+++ b/modules/ooui/mw.echo.ui.FooterNoticeWidget.js
@@ -47,7 +47,7 @@
} );
 
infoIcon = new OO.ui.ButtonWidget( {
-   icon: 'info',
+   icon: 'help',
framed: false,
title: mw.msg( 'echo-popup-footer-feedback-info' ),
classes: [ 'mw-echo-ui-footerNoticeWidget-info' ]
diff --git a/modules/ooui/styles/mw.echo.ui.FooterNoticeWidget.less 
b/modules/ooui/styles/mw.echo.ui.FooterNoticeWidget.less
index 913426c..4ce0fec 100644
--- a/modules/ooui/styles/mw.echo.ui.FooterNoticeWidget.less
+++ b/modules/ooui/styles/mw.echo.ui.FooterNoticeWidget.less
@@ -1,4 +1,5 @@
 @import '../../echo.variables';
+@import '../../echo.mixins';
 
 .mw-echo-ui-footerNoticeWidget {
padding: 0.5em;
@@ -21,4 +22,14 @@
&-icon {
padding-right: 0.5em;
}
+
+   &-dismiss,
+   &-info {
+   .mw-echo-ui-mixin-hover-opacity();
+
+   .oo-ui-iconElement-icon {
+   width: 1.3em !important;
+   height: 1.3em !important;
+   }
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie57c0f981671392b751a9774de7be6bb187de3b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: wmf/1.27.0-wmf.18
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Mooeypoo 

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

[MediaWiki-commits] [Gerrit] [DeleteOwn] Add npm test - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [DeleteOwn] Add npm test
..

[DeleteOwn] Add npm test

Also move jsonlint to check: for non-whitelisted users and remove jshint
since there are no js files.

Requires Ia22b18b8fd8b43d1888627ef7785210c07a0b3f5

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/39/279539/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 31fa968..ffb0abf 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4390,9 +4390,10 @@
 
   - name: mediawiki/extensions/DeleteOwn
 template:
-  - name: jshint
-  - name: jsonlint
   - name: extension-unittests-generic
+  - name: npm
+check:
+  - jsonlint
 
   - name: mediawiki/extensions/Description2
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04051a8a75bebc4fbc516f3bdafaaa79bea86f55
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] Request-local caching of image_redirect - change (mediawiki/core)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Request-local caching of image_redirect
..

Request-local caching of image_redirect

LocalRepo::checkRedirect() cache image redirect checks in memory to avoid
unnecessary trips to memcached. Same idea as Idbd11637.

Change-Id: Idaa12376382aaa0bd8cb988240ec1da0b688359d
---
M includes/filerepo/LocalRepo.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/38/279538/1

diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php
index d24aa24..d038d93 100644
--- a/includes/filerepo/LocalRepo.php
+++ b/includes/filerepo/LocalRepo.php
@@ -226,7 +226,8 @@
return ( $row && $row->rd_namespace == NS_FILE )
? Title::makeTitle( $row->rd_namespace, 
$row->rd_title )->getDBkey()
: ''; // negative cache
-   }
+   },
+   [ 'pcTTL' => $expiry ]
);
 
// @note: also checks " " for b/c

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idaa12376382aaa0bd8cb988240ec1da0b688359d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Styling changes to the footer message - change (mediawiki...Echo)

[jenkins-bot (Code Review)]

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

Change subject: Styling changes to the footer message
..


Styling changes to the footer message

Change-Id: Ie57c0f981671392b751a9774de7be6bb187de3b8
---
M i18n/en.json
M modules/ooui/mw.echo.ui.FooterNoticeWidget.js
M modules/ooui/styles/mw.echo.ui.FooterNoticeWidget.less
3 files changed, 13 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 577cd8f..258e31e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -85,7 +85,7 @@
"echo-none": "You have no notifications.",
"echo-more-info": "More info",
"echo-feedback": "Feedback",
-   "echo-popup-footer-feedback": "Provide feedback. [$2 $1]",
+   "echo-popup-footer-feedback": "Provide feedback. [$2 
$1]",
"echo-popup-footer-feedback-survey": "Take this quick survey about 
notifications.",
"echo-popup-footer-feedback-info": "This feedback link is designed to 
help the developers learn more about how people use Notifications so we 
continue to improve the tool. Clicking the survey link will send you to a 
third-party website.",
"echo-quotation-marks": "\"$1\"",
diff --git a/modules/ooui/mw.echo.ui.FooterNoticeWidget.js 
b/modules/ooui/mw.echo.ui.FooterNoticeWidget.js
index 2df05fb..dbffd5c 100644
--- a/modules/ooui/mw.echo.ui.FooterNoticeWidget.js
+++ b/modules/ooui/mw.echo.ui.FooterNoticeWidget.js
@@ -47,7 +47,7 @@
} );
 
infoIcon = new OO.ui.ButtonWidget( {
-   icon: 'info',
+   icon: 'help',
framed: false,
title: mw.msg( 'echo-popup-footer-feedback-info' ),
classes: [ 'mw-echo-ui-footerNoticeWidget-info' ]
diff --git a/modules/ooui/styles/mw.echo.ui.FooterNoticeWidget.less 
b/modules/ooui/styles/mw.echo.ui.FooterNoticeWidget.less
index 913426c..4ce0fec 100644
--- a/modules/ooui/styles/mw.echo.ui.FooterNoticeWidget.less
+++ b/modules/ooui/styles/mw.echo.ui.FooterNoticeWidget.less
@@ -1,4 +1,5 @@
 @import '../../echo.variables';
+@import '../../echo.mixins';
 
 .mw-echo-ui-footerNoticeWidget {
padding: 0.5em;
@@ -21,4 +22,14 @@
&-icon {
padding-right: 0.5em;
}
+
+   &-dismiss,
+   &-info {
+   .mw-echo-ui-mixin-hover-opacity();
+
+   .oo-ui-iconElement-icon {
+   width: 1.3em !important;
+   height: 1.3em !important;
+   }
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie57c0f981671392b751a9774de7be6bb187de3b8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
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] Add npm entry point - change (mediawiki...DeleteOwn)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Add npm entry point
..

Add npm entry point

Change-Id: Ia22b18b8fd8b43d1888627ef7785210c07a0b3f5
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 32 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DeleteOwn 
refs/changes/37/279537/1

diff --git a/.gitignore b/.gitignore
index 98b092a..1689d7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-.svn
 *~
 *.kate-swp
 .*.swp
+node_modules/**
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..7756e75
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..41cecca
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.4.0",
+"grunt-jsonlint": "1.0.7"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia22b18b8fd8b43d1888627ef7785210c07a0b3f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DeleteOwn
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] [DataTransfer] Add npm test - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [DataTransfer] Add npm test
..

[DataTransfer] Add npm test

Also move jsonlint to check: for non-whitelisted users and remove jshint
since there are no js files.

Requires If7f6850560b84923a1a043af2217e005edb3ea5e

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/36/279536/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 31fa968..e96be09 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4384,9 +4384,10 @@
 
   - name: mediawiki/extensions/DataTransfer
 template:
-  - name: jshint
-  - name: jsonlint
   - name: extension-unittests-generic
+  - name: npm
+check:
+  - jsonlint
 
   - name: mediawiki/extensions/DeleteOwn
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id674d9e613aa6f71dc90dd3c2ef492e4cbc89066
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] Update VE core submodule to master (0f0d980) - change (mediawiki...VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

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

Update VE core submodule to master (0f0d980)

New changes:
1f298ce Update OOjs UI to v0.16.4
650776a Improve drop target preview for block node dragging
0f669bf Fix behaviour of SurfaceFragment#annotateContent
fa08fca ve.ui.ContentActions: Add tests
3f4185f Tests: Add speed warnings to UI surface constructors
4bee4eb Localisation updates from https://translatewiki.net.
254a802 Localisation updates from https://translatewiki.net.
0f0d980 SurfaceFramgent: Guard against tx.getModifiedRange returning null

Change-Id: I512c9b3a99673a876040e0fce789483e7221a78c
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/lib/ve b/lib/ve
index d1ce123..0f0d980 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit d1ce123f9ff1f46d86476c86b8ccb23d04ee35a7
+Subproject commit 0f0d9803e7f387775a1342df8f0c8e1e35d7ca92

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

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

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

[MediaWiki-commits] [Gerrit] Update VE core submodule to wmf/1.27.0-wmf.18 HEAD (5834cfc) - change (mediawiki...VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Update VE core submodule to wmf/1.27.0-wmf.18 HEAD (5834cfc)
..

Update VE core submodule to wmf/1.27.0-wmf.18 HEAD (5834cfc)

New changes:
5834cfc SurfaceFramgent: Guard against tx.getModifiedRange returning null

Change-Id: I468c9bfd25374f1741202509c4a420797439b628
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/lib/ve b/lib/ve
index 80c41b7..5834cfc 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 80c41b73c8a7078033e8fe72add0f202550af0a2
+Subproject commit 5834cfc3a012f17ed28113a2c88197389cc94842

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I468c9bfd25374f1741202509c4a420797439b628
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.18
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] SurfaceFramgent: Guard against tx.getModifiedRange returning... - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: SurfaceFramgent: Guard against tx.getModifiedRange returning 
null
..


SurfaceFramgent: Guard against tx.getModifiedRange returning null

Bug: T130847
Change-Id: If3785843b0ae15a52a65fb4def60fddb338cc05f
---
M src/dm/ve.dm.SurfaceFragment.js
1 file changed, 12 insertions(+), 14 deletions(-)

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



diff --git a/src/dm/ve.dm.SurfaceFragment.js b/src/dm/ve.dm.SurfaceFragment.js
index 041a2d3..04ab04d 100644
--- a/src/dm/ve.dm.SurfaceFragment.js
+++ b/src/dm/ve.dm.SurfaceFragment.js
@@ -720,7 +720,8 @@
  * @chainable
  */
 ve.dm.SurfaceFragment.prototype.insertContent = function ( content, annotate ) 
{
-   var i, l, lines, annotations, tx, offset, newRange;
+   var i, l, lines, annotations, tx, offset, newRange,
+   doc = this.getDocument();
 
if ( !( this.selection instanceof ve.dm.LinearSelection ) ) {
return this;
@@ -756,21 +757,17 @@
// TODO T126021: Don't reach into properties of document
// FIXME T126022: the logic we actually need for 
annotating inserted content
// correctly is MUCH more complicated
-   annotations = this.document.data
+   annotations = doc.data
.getAnnotationsFromOffset( offset === 0 ? 0 : 
offset - 1 );
}
if ( annotations && annotations.getLength() > 0 ) {
ve.dm.Document.static.addAnnotationsToData( content, 
annotations );
}
-   tx = ve.dm.Transaction.newFromInsertion(
-   this.document,
-   offset,
-   content
-   );
+   tx = ve.dm.Transaction.newFromInsertion( doc, offset, content );
// Set the range to cover the inserted content; the offset 
translation will be wrong
// if newFromInsertion() decided to move the insertion point
newRange = tx.getModifiedRange();
-   this.change( tx, new ve.dm.LinearSelection( this.getDocument(), 
newRange ) );
+   this.change( tx, newRange ? new ve.dm.LinearSelection( doc, 
newRange ) : new ve.dm.NullSelection( doc ) );
}
 
return this;
@@ -801,11 +798,12 @@
  * at a different offset if that is needed to make the document balanced.
  *
  * @method
- * @param {ve.dm.Document} doc Document to insert
+ * @param {ve.dm.Document} newDoc Document to insert
  * @chainable
  */
-ve.dm.SurfaceFragment.prototype.insertDocument = function ( doc ) {
-   var tx, newRange;
+ve.dm.SurfaceFragment.prototype.insertDocument = function ( newDoc ) {
+   var tx, newRange,
+   doc = this.getDocument();
 
if ( !( this.selection instanceof ve.dm.LinearSelection ) ) {
return this;
@@ -816,14 +814,14 @@
}
 
tx = new ve.dm.Transaction.newFromDocumentInsertion(
-   this.getDocument(),
+   doc,
this.getSelection().getRange().start,
-   doc
+   newDoc
);
// Set the range to cover the inserted content; the offset translation 
will be wrong
// if newFromInsertion() decided to move the insertion point
newRange = tx.getModifiedRange();
-   this.change( tx, new ve.dm.LinearSelection( this.getDocument(), 
newRange ) );
+   this.change( tx, newRange ? new ve.dm.LinearSelection( doc, newRange ) 
: new ve.dm.NullSelection( doc ) );
 
return this;
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If3785843b0ae15a52a65fb4def60fddb338cc05f
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.18
Gerrit-Owner: Jforrester 
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] SurfaceFramgent: Guard against tx.getModifiedRange returning... - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: SurfaceFramgent: Guard against tx.getModifiedRange returning 
null
..


SurfaceFramgent: Guard against tx.getModifiedRange returning null

Bug: T130847
Change-Id: If3785843b0ae15a52a65fb4def60fddb338cc05f
---
M src/dm/ve.dm.SurfaceFragment.js
1 file changed, 12 insertions(+), 14 deletions(-)

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



diff --git a/src/dm/ve.dm.SurfaceFragment.js b/src/dm/ve.dm.SurfaceFragment.js
index 48460b9..fa0384b 100644
--- a/src/dm/ve.dm.SurfaceFragment.js
+++ b/src/dm/ve.dm.SurfaceFragment.js
@@ -720,7 +720,8 @@
  * @chainable
  */
 ve.dm.SurfaceFragment.prototype.insertContent = function ( content, annotate ) 
{
-   var i, l, lines, annotations, tx, offset, newRange;
+   var i, l, lines, annotations, tx, offset, newRange,
+   doc = this.getDocument();
 
if ( !( this.selection instanceof ve.dm.LinearSelection ) ) {
return this;
@@ -758,21 +759,17 @@
// TODO T126021: Don't reach into properties of document
// FIXME T126022: the logic we actually need for 
annotating inserted content
// correctly is MUCH more complicated
-   annotations = this.document.data
+   annotations = doc.data
.getAnnotationsFromOffset( offset === 0 ? 0 : 
offset - 1 );
}
if ( annotations && annotations.getLength() > 0 ) {
ve.dm.Document.static.addAnnotationsToData( content, 
annotations );
}
-   tx = ve.dm.Transaction.newFromInsertion(
-   this.document,
-   offset,
-   content
-   );
+   tx = ve.dm.Transaction.newFromInsertion( doc, offset, content );
// Set the range to cover the inserted content; the offset 
translation will be wrong
// if newFromInsertion() decided to move the insertion point
newRange = tx.getModifiedRange();
-   this.change( tx, new ve.dm.LinearSelection( this.getDocument(), 
newRange ) );
+   this.change( tx, newRange ? new ve.dm.LinearSelection( doc, 
newRange ) : new ve.dm.NullSelection( doc ) );
}
 
return this;
@@ -803,11 +800,12 @@
  * at a different offset if that is needed to make the document balanced.
  *
  * @method
- * @param {ve.dm.Document} doc Document to insert
+ * @param {ve.dm.Document} newDoc Document to insert
  * @chainable
  */
-ve.dm.SurfaceFragment.prototype.insertDocument = function ( doc ) {
-   var tx, newRange;
+ve.dm.SurfaceFragment.prototype.insertDocument = function ( newDoc ) {
+   var tx, newRange,
+   doc = this.getDocument();
 
if ( !( this.selection instanceof ve.dm.LinearSelection ) ) {
return this;
@@ -818,14 +816,14 @@
}
 
tx = new ve.dm.Transaction.newFromDocumentInsertion(
-   this.getDocument(),
+   doc,
this.getSelection().getRange().start,
-   doc
+   newDoc
);
// Set the range to cover the inserted content; the offset translation 
will be wrong
// if newFromInsertion() decided to move the insertion point
newRange = tx.getModifiedRange();
-   this.change( tx, new ve.dm.LinearSelection( this.getDocument(), 
newRange ) );
+   this.change( tx, newRange ? new ve.dm.LinearSelection( doc, newRange ) 
: new ve.dm.NullSelection( doc ) );
 
return this;
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If3785843b0ae15a52a65fb4def60fddb338cc05f
Gerrit-PatchSet: 2
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] Add npm entry point - change (mediawiki...DataTransfer)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Add npm entry point
..

Add npm entry point

Change-Id: If7f6850560b84923a1a043af2217e005edb3ea5e
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 32 insertions(+), 1 deletion(-)


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

diff --git a/.gitignore b/.gitignore
index 98b092a..1689d7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-.svn
 *~
 *.kate-swp
 .*.swp
+node_modules/**
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..7756e75
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..41cecca
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.4.0",
+"grunt-jsonlint": "1.0.7"
+  }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7f6850560b84923a1a043af2217e005edb3ea5e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataTransfer
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] SurfaceFramgent: Guard against tx.getModifiedRange returning... - change (VisualEditor/VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: SurfaceFramgent: Guard against tx.getModifiedRange returning 
null
..

SurfaceFramgent: Guard against tx.getModifiedRange returning null

Bug: T130847
Change-Id: If3785843b0ae15a52a65fb4def60fddb338cc05f
---
M src/dm/ve.dm.SurfaceFragment.js
1 file changed, 12 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/32/279532/1

diff --git a/src/dm/ve.dm.SurfaceFragment.js b/src/dm/ve.dm.SurfaceFragment.js
index 041a2d3..04ab04d 100644
--- a/src/dm/ve.dm.SurfaceFragment.js
+++ b/src/dm/ve.dm.SurfaceFragment.js
@@ -720,7 +720,8 @@
  * @chainable
  */
 ve.dm.SurfaceFragment.prototype.insertContent = function ( content, annotate ) 
{
-   var i, l, lines, annotations, tx, offset, newRange;
+   var i, l, lines, annotations, tx, offset, newRange,
+   doc = this.getDocument();
 
if ( !( this.selection instanceof ve.dm.LinearSelection ) ) {
return this;
@@ -756,21 +757,17 @@
// TODO T126021: Don't reach into properties of document
// FIXME T126022: the logic we actually need for 
annotating inserted content
// correctly is MUCH more complicated
-   annotations = this.document.data
+   annotations = doc.data
.getAnnotationsFromOffset( offset === 0 ? 0 : 
offset - 1 );
}
if ( annotations && annotations.getLength() > 0 ) {
ve.dm.Document.static.addAnnotationsToData( content, 
annotations );
}
-   tx = ve.dm.Transaction.newFromInsertion(
-   this.document,
-   offset,
-   content
-   );
+   tx = ve.dm.Transaction.newFromInsertion( doc, offset, content );
// Set the range to cover the inserted content; the offset 
translation will be wrong
// if newFromInsertion() decided to move the insertion point
newRange = tx.getModifiedRange();
-   this.change( tx, new ve.dm.LinearSelection( this.getDocument(), 
newRange ) );
+   this.change( tx, newRange ? new ve.dm.LinearSelection( doc, 
newRange ) : new ve.dm.NullSelection( doc ) );
}
 
return this;
@@ -801,11 +798,12 @@
  * at a different offset if that is needed to make the document balanced.
  *
  * @method
- * @param {ve.dm.Document} doc Document to insert
+ * @param {ve.dm.Document} newDoc Document to insert
  * @chainable
  */
-ve.dm.SurfaceFragment.prototype.insertDocument = function ( doc ) {
-   var tx, newRange;
+ve.dm.SurfaceFragment.prototype.insertDocument = function ( newDoc ) {
+   var tx, newRange,
+   doc = this.getDocument();
 
if ( !( this.selection instanceof ve.dm.LinearSelection ) ) {
return this;
@@ -816,14 +814,14 @@
}
 
tx = new ve.dm.Transaction.newFromDocumentInsertion(
-   this.getDocument(),
+   doc,
this.getSelection().getRange().start,
-   doc
+   newDoc
);
// Set the range to cover the inserted content; the offset translation 
will be wrong
// if newFromInsertion() decided to move the insertion point
newRange = tx.getModifiedRange();
-   this.change( tx, new ve.dm.LinearSelection( this.getDocument(), 
newRange ) );
+   this.change( tx, newRange ? new ve.dm.LinearSelection( doc, newRange ) 
: new ve.dm.NullSelection( doc ) );
 
return this;
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3785843b0ae15a52a65fb4def60fddb338cc05f
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.18
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Esanders 

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

[MediaWiki-commits] [Gerrit] SurfaceFramgent: Guard against tx.getModifiedRange returning... - change (VisualEditor/VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: SurfaceFramgent: Guard against tx.getModifiedRange returning 
null
..

SurfaceFramgent: Guard against tx.getModifiedRange returning null

Bug: T130847
Change-Id: If3785843b0ae15a52a65fb4def60fddb338cc05f
---
M src/dm/ve.dm.SurfaceFragment.js
1 file changed, 5 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/31/279531/1

diff --git a/src/dm/ve.dm.SurfaceFragment.js b/src/dm/ve.dm.SurfaceFragment.js
index 48460b9..08bc159 100644
--- a/src/dm/ve.dm.SurfaceFragment.js
+++ b/src/dm/ve.dm.SurfaceFragment.js
@@ -720,7 +720,8 @@
  * @chainable
  */
 ve.dm.SurfaceFragment.prototype.insertContent = function ( content, annotate ) 
{
-   var i, l, lines, annotations, tx, offset, newRange;
+   var i, l, lines, annotations, tx, offset, newRange,
+   doc = this.getDocument();
 
if ( !( this.selection instanceof ve.dm.LinearSelection ) ) {
return this;
@@ -758,21 +759,17 @@
// TODO T126021: Don't reach into properties of document
// FIXME T126022: the logic we actually need for 
annotating inserted content
// correctly is MUCH more complicated
-   annotations = this.document.data
+   annotations = doc.data
.getAnnotationsFromOffset( offset === 0 ? 0 : 
offset - 1 );
}
if ( annotations && annotations.getLength() > 0 ) {
ve.dm.Document.static.addAnnotationsToData( content, 
annotations );
}
-   tx = ve.dm.Transaction.newFromInsertion(
-   this.document,
-   offset,
-   content
-   );
+   tx = ve.dm.Transaction.newFromInsertion( doc, offset, content );
// Set the range to cover the inserted content; the offset 
translation will be wrong
// if newFromInsertion() decided to move the insertion point
newRange = tx.getModifiedRange();
-   this.change( tx, new ve.dm.LinearSelection( this.getDocument(), 
newRange ) );
+   this.change( tx, newRange ? new ve.dm.LinearSelection( doc, 
newRange ) : new ve.dm.NullSelection( doc ) );
}
 
return this;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3785843b0ae15a52a65fb4def60fddb338cc05f
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] Fix treemap - change (wikidata...gui)

[Jonas Kress (WMDE) (Code Review)]

Jonas Kress (WMDE) has uploaded a new change for review.

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

Change subject: Fix treemap
..

Fix treemap

Broke when removing modernizr.

Change-Id: I3b56d727ed916781bc1893ada13284cea83c62b8
---
M wikibase/queryService/ui/App.js
M wikibase/queryService/ui/resultBrowser/TreeMapResultBrowser.js
2 files changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/30/279530/1

diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index d6a280d..153971b 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -446,8 +446,12 @@
$( '#query-result' ).html( '' );
self._showActionMessage( 'Generating 
View' , 'success', 100);
window.setTimeout( function() {
-   b.object.draw( $( 
'#query-result' ) );
-   self._hideActionMessage();
+   try{
+   b.object.draw( $( 
'#query-result' ) );
+   
self._hideActionMessage();
+   } catch( e ){
+   
self._showActionMessage( 'Unable to display ' + b.label , 'warning' );
+   }
}, 20 );
return false;
} );
diff --git a/wikibase/queryService/ui/resultBrowser/TreeMapResultBrowser.js 
b/wikibase/queryService/ui/resultBrowser/TreeMapResultBrowser.js
index 722b5e0..a3097b3 100644
--- a/wikibase/queryService/ui/resultBrowser/TreeMapResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/TreeMapResultBrowser.js
@@ -110,7 +110,7 @@
//copied from 
http://www.billdwhite.com/wordpress/wp-content/js/treemap_headers_03.html
//with little modification
 
-var supportsForeignObject = Modernizr.svgforeignobject;
+var supportsForeignObject = 
false;//FIXME:Modernizr.svgforeignobject;
var chartWidth = $(window).width();
var chartHeight = $(window).height();
var xscale = d3.scale.linear().range([0, chartWidth]);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b56d727ed916781bc1893ada13284cea83c62b8
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 

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

[MediaWiki-commits] [Gerrit] [parsoidsvc] Update npm tests - change (integration/config)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [parsoidsvc] Update npm tests
..

[parsoidsvc] Update npm tests

Removes the old and no longer supported npm 0.8 test.

Add new npm 4.3 test to parsoidsvc and use it.

Change-Id: I56d6cf94ee6f5da53ae1b09c40a4f1bd667952dd
---
M jjb/parsoidsvc.yaml
M zuul/layout.yaml
2 files changed, 15 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/29/279529/1

diff --git a/jjb/parsoidsvc.yaml b/jjb/parsoidsvc.yaml
index 602b270..0b24f44 100644
--- a/jjb/parsoidsvc.yaml
+++ b/jjb/parsoidsvc.yaml
@@ -126,12 +126,13 @@
  - global-teardown
 
 - job-template:
-name: parsoidsvc-{repository}-npm-0.8
-node: contintLabsSlave && UbuntuPrecise
+name: parsoidsvc-{repository}-npm-4.3
+node: ci-jessie-wikimedia
 defaults: use-remoteonly-zuul
 concurrent: true
 properties:
 - throttle-one-per-node
+- zeromq-event
 wrappers:
 - timeout:
 timeout: 20
@@ -141,10 +142,14 @@
 triggers:
 - zuul
 builders:
-- assert-node-version-0.8
+- assert-node-version-4.3
 - setup-npm-oid:
 repository: '{repository}'
+- castor-load
 - shell: |
+# For archiving build artifacts
+mkdir -p "$WORKSPACE/log"
+
 node --version
 npm --version
 set -e
@@ -153,7 +158,8 @@
 npm test
 npm run doc
 publishers:
- - global-teardown
+ - archive-log-allow-empty
+ - castor-save
 
 # documentation builder (based on `oojs-ui-jsduck-publish` job)
 - job-template:
@@ -194,7 +200,7 @@
 distribution: trusty
 - 'parsoidsvc-{repository}-parse-tool-check'
 - 'parsoidsvc-{repository}-roundtrip-test-check'
-- 'parsoidsvc-{repository}-npm-0.8'
 - 'parsoidsvc-{repository}-npm-0.10'
+- 'parsoidsvc-{repository}-npm-4.3'
 - 'parsoidsvc-{repository}-jsduck-publish'
 - parsoidsvc-php-parsertests
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 31fa968..d79ffb3 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6634,16 +6634,16 @@
   - parsoidsvc-php-parsertests
   - parsoidsvc-source-parse-tool-check
   - parsoidsvc-source-roundtrip-test-check
-  - parsoidsvc-source-npm-0.8
   - parsoidsvc-source-npm-0.10
+  - parsoidsvc-source-npm-4.3
 gate-and-submit:
   - parsoidsvc-jshint
   - parsoidsvc-jsonlint
   - parsoidsvc-php-parsertests
   - parsoidsvc-source-parse-tool-check
   - parsoidsvc-source-roundtrip-test-check
-  - parsoidsvc-source-npm-0.8
   - parsoidsvc-source-npm-0.10
+  - parsoidsvc-source-npm-4.3
 postmerge:
   - beta-parsoid-update-eqiad
   - parsoidsvc-source-jsduck-publish
@@ -6653,13 +6653,13 @@
   - parsoidsvc-debian-glue
   - parsoidsvc-deploy-parse-tool-check
   - parsoidsvc-deploy-roundtrip-test-check
-  - parsoidsvc-deploy-npm-0.8
   - parsoidsvc-deploy-npm-0.10
+  - parsoidsvc-deploy-npm-4.3
 gate-and-submit:
   - parsoidsvc-deploy-parse-tool-check
   - parsoidsvc-deploy-roundtrip-test-check
-  - parsoidsvc-deploy-npm-0.8
   - parsoidsvc-deploy-npm-0.10
+  - parsoidsvc-deploy-npm-4.3
 postmerge:
   - beta-parsoid-update-eqiad
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I56d6cf94ee6f5da53ae1b09c40a4f1bd667952dd
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