[MediaWiki-commits] [Gerrit] Simplify trebuchet developer environment creation - change (operations/puppet)

[Ryan Lane (Code Review)]

Ryan Lane has submitted this change and it was merged.

Change subject: Simplify trebuchet developer environment creation
..


Simplify trebuchet developer environment creation

This change simplifies the creation of developer environments in
labs, allowing users to specify generic labs roles and override
masters/deployment servers as necessary.

Change-Id: I9297b297e26489f149ea1701756d7313acfaf042
---
M manifests/role/deployment.pp
M manifests/role/salt.pp
2 files changed, 38 insertions(+), 94 deletions(-)

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



diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 5741c65..f93eb11 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -1,14 +1,7 @@
 # vim: sw=2 ts=2 et
 
-# repo not showing up on tin even after puppet has run on
-# sockpuppet, palladium and tin? one possible explanation:
-# Ryan_Lane: https://gerrit.wikimedia.org/r/operations/ocg-config.git
-# Ryan_Lane: ^^ that's wrong
-# Ryan_Lane: just use https://gerrit.wikimedia.org/r/operations/ocg-config
-# Ryan_Lane: I ran this on tin: salt-call deploy.deployment_server_init
-# Ryan_Lane: to see that
-# Ryan_Lane: it showed a git exit code of 128
-
+# Configuration info: 
https://wikitech.wikimedia.org/wiki/Trebuchet#Adding_a_new_repo
+# Troubleshooting: 
https://wikitech.wikimedia.org/wiki/Trebuchet#Troubleshooting
 class role::deployment::config {
   $repo_config = {
 'integration/kss' => {
@@ -155,46 +148,6 @@
   }
 }
 
-class role::deployment::salt_masters::labs {
-  $deployment_config = {
-'parent_dir' => '/srv/deployment',
-'servers'=> {
-'pmtpa' => 'i-0390.pmtpa.wmflabs',
-'eqiad' => 'i-0390.pmtpa.wmflabs',
-},
-'redis'  => {
-  'host' => 'i-0390.pmtpa.wmflabs',
-  'port' => '6379',
-  'db'   => '0',
-},
-  }
-  class { '::role::deployment::config': }
-  class { 'deployment::salt_master':
-repo_config   => $role::deployment::config::repo_config,
-deployment_config => $deployment_config,
-  }
-}
-
-class role::deployment::salt_masters::sartoris {
-  $deployment_config = {
-'parent_dir' => '/srv/deployment',
-'servers'=> {
-'pmtpa' => 'i-0822.pmtpa.wmflabs',
-'eqiad' => 'i-0822.pmtpa.wmflabs',
-},
-'redis'  => {
-  'host' => 'i-0822.pmtpa.wmflabs',
-  'port' => '6379',
-  'db'   => '0',
-},
-  }
-  class { '::role::deployment::config': }
-  class { 'deployment::salt_master':
-repo_config   => $role::deployment::config::repo_config,
-deployment_config => $deployment_config,
-  }
-}
-
 class role::deployment::deployment_servers::common {
   # Can't include this while scap is present on tin:
   # include misc::deployment::scripts
@@ -251,46 +204,42 @@
   }
 }
 
-class role::deployment::deployment_servers::labs {
-  include role::deployment::deployment_servers::common
-
-  apache::vhost { "i-0390.pmtpa.wmflabs":
-priority   => 10,
-vhost_name => "10.4.0.58",
-port   => 80,
-docroot=> "/srv/deployment",
-docroot_owner  => "sartoris",
-docroot_group  => "project-deployment-prep",
-docroot_dir_allows  => ["10.4.0.0/16"],
-serveradmin=> "n...@wikimedia.org",
-configure_firewall => false,
+class role::deployment::salt_masters::labs {
+  # Enable multiple test environments within a single project
+  if ( $::deployment_server_override != undef ) {
+$deployment_server = $::deployment_server_override
+  } else {
+$deployment_server = "${::instanceproject}-deploy.eqiad.wmflabs"
   }
-  class { "redis":
-dir => "/srv/redis",
-maxmemory => "500Mb",
-monitor => "false",
-  }
-  sudo_group { "project_deployment_prep_deployment_server":
-privileges => [
-  "ALL = (root) NOPASSWD: /usr/bin/salt-call -l quiet --out=json 
pillar.data",
-  "ALL = (root) NOPASSWD: /usr/bin/salt-call -l quiet publish.runner 
deploy.fetch *",
-  "ALL = (root) NOPASSWD: /usr/bin/salt-call -l quiet publish.runner 
deploy.checkout *",
-  "ALL = (root) NOPASSWD: /usr/bin/salt-call -l quiet --out=json 
publish.runner deploy.restart *",
-],
-group => "project-deployment-prep",
+  $deployment_config = {
+'parent_dir' => '/srv/deployment',
+'servers'=> {
+'pmtpa' => $deployment_server,
+'eqiad' => $deployment_server,
+},
+'redis'  => {
+  'host' => $deployment_server,
+  'port' => '6379',
+  'db'   => '0',
+},
   }
 }
 
-class role::deployment::deployment_servers::sartoris {
+class role::deployment::deployment_servers::labs {
   include role::deployment::deployment_servers::common
 
-  apache::vhost { "i-0822.pmtpa.wmflabs":
+  # Enable multiple test environments within a single project
+  if ( $::deploy

[MediaWiki-commits] [Gerrit] Fix eqiad labs range - change (operations/puppet)

[Ryan Lane (Code Review)]

Ryan Lane has uploaded a new change for review.

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

Change subject: Fix eqiad labs range
..

Fix eqiad labs range

Change-Id: I4e175227a79437cea8a63f0a24fd3a63306881b4
---
M manifests/role/openstack.pp
M modules/puppet/manifests/self/master.pp
2 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/manifests/role/openstack.pp b/manifests/role/openstack.pp
index 032e9cd..fe94685 100644
--- a/manifests/role/openstack.pp
+++ b/manifests/role/openstack.pp
@@ -9,7 +9,7 @@
 private_interface   => 'eth1',
 internal_address=> '10.64.20.4',
 floating_range  => '208.80.153.177/32',
-fixed_range => '10.68.0.0/21',
+fixed_range => '10.68.16.0/21',
 multi_host  => true,
 network_manager => 'nova.network.manager.FlatDHCPManager',
 admin_email => 'root@localhost',
@@ -41,7 +41,7 @@
 private_interface  => 'eth1',
 internal_address   => $::ipaddress_eth0,
 libvirt_type   => 'kvm',
-fixed_range=> '10.68.0.0/21',
+fixed_range=> '10.68.16.0/21',
 network_manager=> 'nova.network.manager.FlatDHCPManager',
 multi_host => true,
 rabbit_host=> '10.64.20.4',
diff --git a/modules/puppet/manifests/self/master.pp 
b/modules/puppet/manifests/self/master.pp
index 9f446b8..9fcc753 100644
--- a/modules/puppet/manifests/self/master.pp
+++ b/modules/puppet/manifests/self/master.pp
@@ -32,7 +32,7 @@
 'localhost' => '127.0.0.1',
 default => $::site ? {
 'pmtpa' => '10.4.0.0/21',
-'eqiad' => '10.68.0.0/21',
+'eqiad' => '10.68.16.0/21',
 }
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e175227a79437cea8a63f0a24fd3a63306881b4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane 

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

[MediaWiki-commits] [Gerrit] SpecialCentralAutoLogin: Clean up javascript - change (mediawiki...CentralAuth)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: SpecialCentralAutoLogin: Clean up javascript
..

SpecialCentralAutoLogin: Clean up javascript

Mostly as follow-up to I8285b26e9394a6c1d504, though most of the
underlying things were already there.

* Consistently use <<< strings to make the scripts easier to
  read. We already don't have any tests or linting for these,
  at least we can make it easier to review by humans.

* Apply coding conventions:
  - Single quotes.
  - Whitespace (I'm fine with this being slightly more minified
as it is served raw, though I don't think we're worried about
size in particular here, either way, whatever whitespace
there is should be consistent. Only a few of the lines
we'ren't properly indented so fixed those.

* Remove redundant 'window' host access for the location.href
  assignment. 'location' is a global variable. Accessing
  through window is only useful if you intend to account for
  absence (e.g. 'if ( window.location )') but that isn't
  happening here (and wouldn't be needed since location is
  always present).

* Give 'url' and 'u' variables more descriptive names.

* Use the Promise interface of $.getJSON for the success handler
  as well, not just the error handler.

* Use Promise.fail instead of the deprecated jqXhr.error alias
  to it.

* Add "; charset=utf-8" to the Content-Type header
  (matching MediaWiki core's behaviour for index.php's text/html,
  api.php's application.json, and load.php's text/javascript).

* Respond with json instead of javascript in the error for
  the /toolslist request.

* Call mw.messages.set() with an object instead of three times
  with one key/value pair.

Change-Id: I2d7f27520f37991d3975920d6a70233475630348
---
M specials/SpecialCentralAutoLogin.php
1 file changed, 61 insertions(+), 44 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth 
refs/changes/29/118429/1

diff --git a/specials/SpecialCentralAutoLogin.php 
b/specials/SpecialCentralAutoLogin.php
index d416a7e..0a321a7 100644
--- a/specials/SpecialCentralAutoLogin.php
+++ b/specials/SpecialCentralAutoLogin.php
@@ -17,13 +17,16 @@
 
$request = $this->getRequest();
 
-   $notLoggedInScript = "var t = new Date();" .
-   "t.setTime( t.getTime() + 8640 );" .
-   "if ( 'localStorage' in window ) {" .
-   "localStorage.setItem( 'CentralAuthAnon', t.getTime() 
);" .
-   "} else {" .
-   "document.cookie = 'CentralAuthAnon=1; expires=' + 
t.toGMTString() + '; path=/';" .
-   "}";
+   $notLoggedInScript = <loginWiki ) {
@@ -77,7 +80,7 @@
}
$this->doFinalOutput( true, 'OK', $json, 'json' 
);
} else {
-   $this->doFinalOutput( false, 'Not logged in' );
+   $this->doFinalOutput( false, 'Not logged in', 
'', 'json' );
}
return;
 
@@ -377,12 +380,14 @@
return;
}
 
-   $script = "if ( 'localStorage' in window ) {" .
-   "localStorage.removeItem( 'CentralAuthAnon' );" 
.
-   "}" .
-   "if ( /(^|; )CentralAuthAnon=/.test( 
document.cookie ) ) {" .
-   "document.cookie = 'CentralAuthAnon=0; 
expires=Thu, 01 Jan 1970 00:00:01 GMT; path=/';" .
-   "}\n";
+   $script = <getFullURL( 
$returnToQuery );
 
-   $script .= "window.location.href = " . 
Xml::encodeJsVar( $redirectUrl ) . ';';
+   $script .= 'location.href = ' . 
Xml::encodeJsVar( $redirectUrl ) . ';';
 
$this->doFinalOutput( true, 'success', $script 
);
return;
@@ -427,61 +432,73 @@
$code = RequestContext::sanitizeLangCode( $code );
wfRunHooks( 'UserGetLanguageObject', array( 
$this->getUser(), &$code, $this->getContext() ) );
$script .= Xml::encodeJsCall( 'mediaWiki.messages.set', 
array(
-   'centralauth-centralautologin-logged-in',
-   wfMessage( 
'centralauth-centralautologin-logged-in' )
-   ->inLanguage( $code )->plain()
-   ) );
-   $script .= Xml::encodeJsCall( 'mediaWiki.messag

[MediaWiki-commits] [Gerrit] SpecialCentralAutoLogin: Move javascript to separate files a... - change (mediawiki...CentralAuth)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: SpecialCentralAutoLogin: Move javascript to separate files and 
minify
..

SpecialCentralAutoLogin: Move javascript to separate files and minify

* To make this stuff easier to edit, maintain, use and lint; move
  them to actual javascript files. They'll be automatically
  picked up by the jshint check for this repository from now on.

* Set up logic to serve these minified. Based on ResourceLoader's
  internals (this should be abstracted by MediaWiki core ideally,
  but kept it as simple as possible for now).

* Added a few line breaks to separate the different concatenated
  scripts from each another.

Change-Id: I132ea06f82ad74ba51186e698dbb917e931534a2
---
A modules/inline/anon-remove.js
A modules/inline/anon-set.js
A modules/inline/autologin.js
M specials/SpecialCentralAutoLogin.php
4 files changed, 113 insertions(+), 77 deletions(-)


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

diff --git a/modules/inline/anon-remove.js b/modules/inline/anon-remove.js
new file mode 100644
index 000..125197a
--- /dev/null
+++ b/modules/inline/anon-remove.js
@@ -0,0 +1,6 @@
+if ( 'localStorage' in window ) {
+   localStorage.removeItem( 'CentralAuthAnon' );
+}
+if ( /(^|; )CentralAuthAnon=/.test( document.cookie ) ) {
+   document.cookie = 'CentralAuthAnon=0; expires=Thu, 01 Jan 1970 00:00:01 
GMT; path=/';
+}
diff --git a/modules/inline/anon-set.js b/modules/inline/anon-set.js
new file mode 100644
index 000..75fb1ea
--- /dev/null
+++ b/modules/inline/anon-set.js
@@ -0,0 +1,8 @@
+var t = new Date();
+// Sets CentralAuthAnon for 1 day in the future
+t.setTime( t.getTime() + 8640 );
+if ( 'localStorage' in window ) {
+   localStorage.setItem( 'CentralAuthAnon', t.getTime() );
+} else {
+   document.cookie = 'CentralAuthAnon=1; expires=' + t.toGMTString() + '; 
path=/';
+}
diff --git a/modules/inline/autologin.js b/modules/inline/autologin.js
new file mode 100644
index 000..b916dc0
--- /dev/null
+++ b/modules/inline/autologin.js
@@ -0,0 +1,52 @@
+( function ( mw, $ ) {
+   mw.loader.using( 'mediawiki.Uri', function () {
+   var current, login;
+
+   // Set returnto and returntoquery so the logout link in the 
returned
+   // html is correct.
+   current = new mw.Uri();
+   delete current.query.title;
+   delete current.query.returnto;
+   delete current.query.returntoquery;
+
+   login = new mw.Uri(
+   mw.config.get( 'wgArticlePath' ).replace( '$1', 
'Special:CentralAutoLogin/toolslist' )
+   );
+   login.query.returnto = mw.config.get( 'wgPageName' );
+   login.query.returntoquery = current.getQueryString();
+
+   $.getJSON( login.toString() )
+   .done( function ( data ) {
+   if ( data.toolslist ) {
+   $( '#p-personal ul' ).html( data.toolslist );
+   $( '#p-personal' ).addClass( 
'centralAuthPPersonalAnimation' );
+   mw.hook( 'centralauth-p-personal-reset' 
).fire();
+   } else if ( data.notify ) {
+   mw.notify(
+   mw.message(
+   
'centralauth-centralautologin-logged-in',
+   data.notify.username,
+   data.notify.gender
+   ),
+   {
+   title: mw.message( 
'centralautologin' ),
+   autoHide: false,
+   tag: 'CentralAutoLogin'
+   }
+   );
+   }
+   } )
+   .fail( function () {
+   // This happens if the user is logged in securely,
+   // while also auto-loggedin from an http page.
+   mw.notify(
+   mw.message( 
'centralauth-centralautologin-logged-in-nouser' ),
+   {
+   title: mw.message( 'centralautologin' ),
+   autoHide: false,
+   tag: 'CentralAutoLogin'
+   }
+   );
+   } );
+   } );
+}( mediaWiki, jQuery ) );
diff --git a/specials/SpecialCentralAutoLogin.php 
b/specials/SpecialCentralAutoLogin.php
index 0a321a7..d76c6c0 100644
--- a/specials/SpecialCentralAutoLogin.p

[MediaWiki-commits] [Gerrit] Add jobs for GuidedTour jsduck build - change (integration/jenkins-job-builder-config)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: Add jobs for GuidedTour jsduck build
..

Add jobs for GuidedTour jsduck build

Change-Id: Ied052470d8e317da444af93aad39bba19895f12b
---
M mediawiki-extensions.yaml
1 file changed, 31 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/28/118428/1

diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index c18be6a..005ec04 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -154,6 +154,34 @@
 results: 'log/junit*.xml'
 
 - job-template:
+name: 'mwext-GuidedTour-doc-test'
+defaults: use-remote-zuul
+concurrent: true
+triggers:
+ - zuul
+builders:
+ - jsduck:
+config: '$WORKSPACE/.docs/config.json'
+
+- job-template:
+name: 'mwext-GuidedTour-doc-publish'
+node: gallium
+defaults: use-remote-zuul
+triggers:
+ - zuul
+builders:
+ - shell: |
+# Generate documentation
+$WORKSPACE/.docs/generate.sh
+# Set destination and version directory therein
+DEST_DIR="/srv/org/wikimedia/doc/GuidedTour"
+DEST_VERSIONDIR=`echo "$ZUUL_BRANCH" | tr '/' '-'`
+# Ensure the destination exists
+mkdir -p $DEST_DIR
+# Publish it (trailing slash is important!)
+rsync --recursive --delete-after --force $WORKSPACE/docs/ 
"$DEST_DIR/$DEST_VERSIONDIR/"
+
+- job-template:
 name: 'mwext-PoolCounter-build'
 defaults: use-remote-zuul
 triggers:
@@ -654,6 +682,9 @@
 ext-name: VisualEditor
 
# Documentation jobs for extensions
+ - 'mwext-GuidedTour-doc-test':
+ - 'mwext-GuidedTour-doc-publish':
+
  - 'mwext-MultimediaViewer-doc-test':
  - 'mwext-MultimediaViewer-doc-publish':
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied052470d8e317da444af93aad39bba19895f12b
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 

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

[MediaWiki-commits] [Gerrit] Fix regression bug 'default size' change on alignment - change (mediawiki...VisualEditor)

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review.

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

Change subject: Fix regression bug 'default size' change on alignment
..

Fix regression bug 'default size' change on alignment

* Corrected the condition that set default size only if the image
  wasn't smaller than the default.
* Added a couple of sanity check conditions for the OO.Compare
  condition

Bug: 62586
Bug: 62581
Change-Id: I4db996cec33ac9d53ef485b53568100e3912c4ae
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
1 file changed, 13 insertions(+), 7 deletions(-)


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

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index 0711073..1d20a0d 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -353,6 +353,10 @@
this.sizeSelectWidget.selectItem(
this.sizeSelectWidget.getItemFromData(
thumbOrFrameless &&
+   // Sanity check just in case before the 
comparison
+   this.sizeWidget.getCurrentDimensions() &&
+   // Make sure there are original dimensions set 
up
+   this.sizeWidget.getOriginalDimensions() &&
OO.compare(
this.sizeWidget.getCurrentDimensions(),
this.sizeWidget.getOriginalDimensions()
@@ -378,24 +382,24 @@
  * @param {OO.ui.ButtonOptionWidget} item Selected item
  */
 ve.ui.MWMediaEditDialog.prototype.onTypeChange = function ( item ) {
-   var selectedType = item ? item.getData() : '',
+   var originalDimensions = this.sizeWidget.getOriginalDimensions(),
+   selectedType = item ? item.getData() : '',
thumbOrFrameless = selectedType === 'thumb' || selectedType === 
'frameless';
 
// As per wikitext docs, both 'thumb' and 'frameless' have
// explicitly limited size, as opposed to the similar case
// of having no type specified
if ( thumbOrFrameless ) {
-
// Set the placeholders to be wiki default, but only if the 
image
// is not smaller. Limit on width only (according to wikitext 
default)
-   if ( this.mediaNode.getAttribute( 'width' ) > 
this.defaultThumbSize ) {
+   if ( originalDimensions.width > this.defaultThumbSize ) {
this.sizeWidget.setPlaceholderDimensions( {
'width': this.defaultThumbSize,
} );
} else {
// The image is smaller than wiki default. Make the 
default dimensions
// the image max size
-   this.sizeWidget.setPlaceholderDimensions( 
this.sizeWidget.getOriginalDimensions() );
+   this.sizeWidget.setPlaceholderDimensions( 
originalDimensions );
}
 
// Enable the size select widget 'default' option
@@ -408,9 +412,7 @@
// Technically, this is the 'default' of non thumb/frameless
// images, as that is the size that they render in when
// no size is specified.
-   this.sizeWidget.setPlaceholderDimensions(
-   this.sizeWidget.getOriginalDimensions()
-   );
+   this.sizeWidget.setPlaceholderDimensions( originalDimensions );
 
// Don't allow for 'default' choice
this.sizeSelectWidget.getItemFromData( 'default' ).setDisabled( 
true );
@@ -443,6 +445,10 @@
// thumbnail or frameless
if (
thumbOrFrameless &&
+   // Sanity check just in case before the comparison
+   this.sizeWidget.getCurrentDimensions() &&
+   // Make sure there are original dimensions set up
+   this.sizeWidget.getOriginalDimensions() &&
OO.compare(
this.sizeWidget.getCurrentDimensions(),
this.sizeWidget.getOriginalDimensions()

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

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

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

[MediaWiki-commits] [Gerrit] Test and publish jsduck for GuidedTour - change (integration/zuul-config)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: Test and publish jsduck for GuidedTour
..

Test and publish jsduck for GuidedTour

Change-Id: I331f95e1c90081958ec7c58d9fd48274a2a37702
---
M layout.yaml
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config 
refs/changes/26/118426/1

diff --git a/layout.yaml b/layout.yaml
index 6b304f9..7bd775a 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -572,6 +572,9 @@
   # Nonvoting until we can be sure it works
   - name: 'integration-jjb-config-test'
 
+  - name: 'mwext-GuidedTour-doc-publish'
+branch: ^master$
+
   - name: 'mwext-MultimediaViewer-doc-publish'
 branch: ^master$
 
@@ -1901,16 +1904,21 @@
 check:
  - mwext-GuidedTour-jslint
  - mwext-GuidedTour-lint
+ - mwext-GuidedTour-doc-test
 test:
  - mwext-GuidedTour-jslint
  - mwext-GuidedTour-lint:
- mwext-GuidedTour-testextensions-master
- mwext-GuidedTour-qunit
+ - mwext-GuidedTour-doc-test
 gate-and-submit:
  - mwext-GuidedTour-jslint
  - mwext-GuidedTour-lint:
- mwext-GuidedTour-testextensions-master
- mwext-GuidedTour-qunit
+  - mwext-GuidedTour-doc-test
+postmerge:
+  - mwext-GuidedTour-doc-publish
 
   - name: mediawiki/extensions/GWToolset
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I331f95e1c90081958ec7c58d9fd48274a2a37702
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 

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

[MediaWiki-commits] [Gerrit] ntp: Work around Labs network error - change (operations/puppet)

[coren (Code Review)]

coren has submitted this change and it was merged.

Change subject: ntp: Work around Labs network error
..


ntp: Work around Labs network error

On Labs the default "interface" configuration leads to ntpd
complaining that it can't create a IPv6 socket for eth0.  To work
around that, we let ntpd listen only on IPv4.

Bug: 60166
Change-Id: Ia88671965bb447bf306e97685ae35472cae721a9
---
M modules/ntp/templates/ntp-server.erb
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/modules/ntp/templates/ntp-server.erb 
b/modules/ntp/templates/ntp-server.erb
index 3df250c..ba6bc56 100644
--- a/modules/ntp/templates/ntp-server.erb
+++ b/modules/ntp/templates/ntp-server.erb
@@ -62,3 +62,11 @@
 # next lines.  Please do this only if you trust everybody on the network!
 #disable auth
 #broadcastclient
+<% if @realm == "labs" then -%>
+
+# On Labs the default "interface" configuration leads to ntpd
+# complaining that it can't create a IPv6 socket for eth0
+# (cf. https://bugzilla.wikimedia.org/60166).  To work around that, we
+# let ntpd listen only on IPv4.
+interface listen ipv4
+<% end -%>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia88671965bb447bf306e97685ae35472cae721a9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Petrb 
Gerrit-Reviewer: Ryan Lane 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Execute LocalFilePurgeThumbnails hook before purging thumbnails - change (mediawiki/core)

[Prod (Code Review)]

Prod has uploaded a new change for review.

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

Change subject: Execute LocalFilePurgeThumbnails hook before purging thumbnails
..

Execute LocalFilePurgeThumbnails hook before purging thumbnails

bug: 62273
Change-Id: I08ae902debb36039d2c0be829eec07a109e70a24
---
M includes/filerepo/file/LocalFile.php
1 file changed, 6 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/24/118424/1

diff --git a/includes/filerepo/file/LocalFile.php 
b/includes/filerepo/file/LocalFile.php
index c7b257a..cfa26b0 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -903,11 +903,12 @@
 
// Get a list of old thumbnails and URLs
$files = $this->getThumbnails( $archiveName );
-   $dir = array_shift( $files );
-   $this->purgeThumbList( $dir, $files );
 
// Purge any custom thumbnail caches
wfRunHooks( 'LocalFilePurgeThumbnails', array( $this, 
$archiveName ) );
+
+   $dir = array_shift( $files );
+   $this->purgeThumbList( $dir, $files );
 
// Purge the squid
if ( $wgUseSquid ) {
@@ -947,12 +948,12 @@
}
}
 
-   $dir = array_shift( $files );
-   $this->purgeThumbList( $dir, $files );
-
// Purge any custom thumbnail caches
wfRunHooks( 'LocalFilePurgeThumbnails', array( $this, false ) );
 
+   $dir = array_shift( $files );
+   $this->purgeThumbList( $dir, $files );
+
// Purge the squid
if ( $wgUseSquid ) {
SquidUpdate::purge( $urls );

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

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

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

[MediaWiki-commits] [Gerrit] Create remaining meta items in DM - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Create remaining meta items in DM
..


Create remaining meta items in DM

Add meta items for the four remaining mwPageProp behavioural flags from Parsoid
that are added by MediaWiki core. These are each waiting for UX implementation,
based on the lack of context information in MWMetaDialog about the page, or
about the wiki:

* __NOGALLERY__
* __HIDDENCAT__

  — These only make sense in a Category: page.

* __NOTITLECONVERT__ // __NOTC__
* __NOCONTENTCONVERT__ // __NOCC__

  — These only make sense on wikis that have content or title conversion.

Change-Id: I752705f65cfbd79c7f3f71270659793996868aff
---
M VisualEditor.php
A modules/ve-mw/dm/metaitems/ve.dm.MWHiddenCategoryMetaItem.js
A modules/ve-mw/dm/metaitems/ve.dm.MWNoContentConvertMetaItem.js
A modules/ve-mw/dm/metaitems/ve.dm.MWNoGalleryMetaItem.js
A modules/ve-mw/dm/metaitems/ve.dm.MWNoTitleConvertMetaItem.js
M modules/ve-mw/test/dm/ve.dm.mwExample.js
6 files changed, 209 insertions(+), 3 deletions(-)

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



diff --git a/VisualEditor.php b/VisualEditor.php
index 85fbdd3..b702220 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -755,12 +755,16 @@
'scripts' => array(

'modules/ve-mw/dm/metaitems/ve.dm.MWCategoryMetaItem.js',

'modules/ve-mw/dm/metaitems/ve.dm.MWDefaultSortMetaItem.js',
+   
'modules/ve-mw/dm/metaitems/ve.dm.MWHiddenCategoryMetaItem.js',

'modules/ve-mw/dm/metaitems/ve.dm.MWIndexDisableMetaItem.js',

'modules/ve-mw/dm/metaitems/ve.dm.MWIndexForceMetaItem.js',

'modules/ve-mw/dm/metaitems/ve.dm.MWLanguageMetaItem.js',

'modules/ve-mw/dm/metaitems/ve.dm.MWNewSectionEditDisableMetaItem.js',

'modules/ve-mw/dm/metaitems/ve.dm.MWNewSectionEditForceMetaItem.js',
+   
'modules/ve-mw/dm/metaitems/ve.dm.MWNoContentConvertMetaItem.js',

'modules/ve-mw/dm/metaitems/ve.dm.MWNoEditSectionMetaItem.js',
+   
'modules/ve-mw/dm/metaitems/ve.dm.MWNoGalleryMetaItem.js',
+   
'modules/ve-mw/dm/metaitems/ve.dm.MWNoTitleConvertMetaItem.js',

'modules/ve-mw/dm/metaitems/ve.dm.MWRedirectMetaItem.js',

'modules/ve-mw/dm/metaitems/ve.dm.MWStaticRedirectMetaItem.js',

'modules/ve-mw/dm/metaitems/ve.dm.MWTOCDisableMetaItem.js',
diff --git a/modules/ve-mw/dm/metaitems/ve.dm.MWHiddenCategoryMetaItem.js 
b/modules/ve-mw/dm/metaitems/ve.dm.MWHiddenCategoryMetaItem.js
new file mode 100644
index 000..84bcb63
--- /dev/null
+++ b/modules/ve-mw/dm/metaitems/ve.dm.MWHiddenCategoryMetaItem.js
@@ -0,0 +1,47 @@
+/*!
+ * VisualEditor DataModel MWHiddenCategoryMetaItem class.
+ *
+ * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+/**
+ * DataModel hidden category meta item (for __HIDDENCAT__).
+ *
+ * @class
+ * @extends ve.dm.MetaItem
+ * @constructor
+ * @param {Object} element Reference to element in meta-linmod
+ */
+ve.dm.MWHiddenCategoryMetaItem = function VeDmMWHiddenCategoryMetaItem( 
element ) {
+   // Parent constructor
+   ve.dm.MetaItem.call( this, element );
+};
+
+/* Inheritance */
+
+OO.inheritClass( ve.dm.MWHiddenCategoryMetaItem, ve.dm.MetaItem );
+
+/* Static Properties */
+
+ve.dm.MWHiddenCategoryMetaItem.static.name = 'mwNoGallery';
+
+ve.dm.MWHiddenCategoryMetaItem.static.group = 'mwNoGallery';
+
+ve.dm.MWHiddenCategoryMetaItem.static.matchTagNames = [ 'meta' ];
+
+ve.dm.MWHiddenCategoryMetaItem.static.matchRdfaTypes = [ 
'mw:PageProp/hiddencat' ];
+
+ve.dm.MWHiddenCategoryMetaItem.static.toDataElement = function ( ) {
+   return { 'type': this.name };
+};
+
+ve.dm.MWHiddenCategoryMetaItem.static.toDomElements = function ( dataElement, 
doc ) {
+   var meta = doc.createElement( 'meta' );
+   meta.setAttribute( 'property', 'mw:PageProp/hiddencat' );
+   return [ meta ];
+};
+
+/* Registration */
+
+ve.dm.modelRegistry.register( ve.dm.MWHiddenCategoryMetaItem );
diff --git a/modules/ve-mw/dm/metaitems/ve.dm.MWNoContentConvertMetaItem.js 
b/modules/ve-mw/dm/metaitems/ve.dm.MWNoContentConvertMetaItem.js
new file mode 100644
index 000..b2a6363
--- /dev/null
+++ b/modules/ve-mw/dm/metaitems/ve.dm.MWNoContentConvertMetaItem.js
@@ -0,0 +1,54 @@
+/*!
+ * VisualEditor DataModel MWNoContentConvertMetaItem class.
+ *
+ * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+/**
+ * DataModel disable content conversion meta item (for __NOCONTENTCONVERT__ 
and __NOCC__).
+ *
+ * @class
+ * @extends ve.dm.MetaItem
+ * @const

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 3316a0a..4c67908 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 3316a0a..4c67908
..

Syncronize VisualEditor: 3316a0a..4c67908

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


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

diff --git a/VisualEditor b/VisualEditor
index 3316a0a..4c67908 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 3316a0ac624c76b3148d4723e0bc144969a62059
+Subproject commit 4c67908f97b5902c6b7432af71fb4782d89f39dc

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I152775ccf811a450658d5feb7b8cad75dfa0870c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 3316a0a..4c67908 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 3316a0a..4c67908
..


Syncronize VisualEditor: 3316a0a..4c67908

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

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 3316a0a..4c67908 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 3316a0ac624c76b3148d4723e0bc144969a62059
+Subproject commit 4c67908f97b5902c6b7432af71fb4782d89f39dc

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I152775ccf811a450658d5feb7b8cad75dfa0870c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Test commit (DO NOT MERGE) - change (mediawiki/core)

[Parent5446 (Code Review)]

Parent5446 has uploaded a new change for review.

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

Change subject: Test commit (DO NOT MERGE)
..

Test commit (DO NOT MERGE)

Change-Id: I14dd0918cfbabecec3c72405224d9346dc68344b
---
M README
1 file changed, 0 insertions(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/23/118423/1

diff --git a/README b/README
index a4185ba..e69de29 100644
--- a/README
+++ b/README
@@ -1,33 +0,0 @@
-== MediaWiki ==
-
-MediaWiki is a popular and free, open-source wiki software package written in
-PHP. It serves as the platform for Wikipedia and the other projects of the 
Wikimedia
-Foundation, which deliver content in over 280 languages to more than half a 
billion
-people each month. MediaWiki's reliability and robust feature set have earned 
it a
-large and vibrant community of third-party users and developers.
-
-MediaWiki is:
-
-* feature-rich and extensible, both on-wiki and with over 2,000 extensions;
-* scalable and suitable for both small and large sites;
-* available in your language; and
-* simple to install, working on most hardware/software combinations.
-
-For system requirements, installation, and upgrade details, see the files
-RELEASE-NOTES, INSTALL, and UPGRADE.
-
-* Ready to get started?
-** https://www.mediawiki.org/wiki/Download
-* Looking for the technical manual?
-** https://www.mediawiki.org/wiki/Manual:Contents
-* Seeking help from a person?
-** https://www.mediawiki.org/wiki/Communication
-* Looking to file a bug report or a feature request?
-** https://bugs.mediawiki.org/
-* Interested in helping out?
-** https://www.mediawiki.org/wiki/How_to_contribute
-
-MediaWiki is the result of global collaboration and cooperation. The CREDITS
-file lists technical contributors to the project. The COPYING file explains
-MediaWiki's copyright and license (GNU General Public License, version 2 or
-later). Many thanks to the Wikimedia community for testing and suggestions.

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

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

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

[MediaWiki-commits] [Gerrit] Remove pointless $wgTitle and commented global mess - change (mediawiki...WYSIWYG)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Remove pointless $wgTitle and commented global mess
..

Remove pointless $wgTitle and commented global mess

Change-Id: I63b6866365ba4522e8145cb763964154fcf70d28
---
M WYSIWYG/CKeditor.body.php
M WYSIWYG/CKeditorParser.body.php
2 files changed, 2 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WYSIWYG 
refs/changes/22/118422/1

diff --git a/WYSIWYG/CKeditor.body.php b/WYSIWYG/CKeditor.body.php
index 036013b..d9900b4 100644
--- a/WYSIWYG/CKeditor.body.php
+++ b/WYSIWYG/CKeditor.body.php
@@ -220,7 +220,7 @@
   }
 
   public function onParserAfterTidy(&$parser, &$text) {
-global $wgUseTeX, $wgUser, $wgTitle, $wgFCKEditorIsCompatible;
+global $wgUseTeX, $wgUser, $wgFCKEditorIsCompatible;
 
 MagicWord::get('NORICHEDITOR')->matchAndRemove($text);
 
@@ -230,7 +230,7 @@
 }
 
 # Are we editing a page that's in an excluded namespace? If so, bail out.
-if (is_object($wgTitle) && in_array($wgTitle->getNamespace(), 
$this->getExcludedNamespaces())) {
+if (in_array($parser->getTitle()->getNamespace(), 
$this->getExcludedNamespaces())) {
   return true;
 }
 
diff --git a/WYSIWYG/CKeditorParser.body.php b/WYSIWYG/CKeditorParser.body.php
index 1b3136a..9b15b37 100644
--- a/WYSIWYG/CKeditorParser.body.php
+++ b/WYSIWYG/CKeditorParser.body.php
@@ -1173,20 +1173,10 @@
   /**
* Replace wikitext for rules with place holder FckmwXfckmw
*
-   * @global Title $wgTitle
-   * @global Request $wgRequest
* @param  String $text
* @return String
*/
   private function replaceRules($text) {
-//global $wgTitle, $wgRequest;
-// rules exist in poperty and category pages only.
-// if it's an ajax call we don't know the page name, so do it always
-/*
-  if (($wgRequest->getVal('action') == 'ajax') ||
-  ($wgTitle && (defined('SMW_NS_PROPERTY') && $wgTitle->getNamespace() == 
SMW_NS_PROPERTY) ||
-  $wgTitle->getNamespace() == NS_CATEGORY )) {
- */
 if (preg_match_all('/]*>.*?<\/rule>/is', $text, $matches)) {
   for ($i = 0; $i < count($matches[0]); $i++) {
 
preg_match_all('/]*>(.*?)<\/rule>/is',
 $matches[0][$i], $ruleContent);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I63b6866365ba4522e8145cb763964154fcf70d28
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WYSIWYG
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] Fix title display in mwgrep - change (operations/puppet)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Fix title display in mwgrep
..

Fix title display in mwgrep

This actually is a list with one element (like: [u'string'])

Change-Id: Ibcde8a435be5bf366a05462515430d7d5ab3ac32
---
M files/misc/scripts/mwgrep
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/118421/1

diff --git a/files/misc/scripts/mwgrep b/files/misc/scripts/mwgrep
index e256cf0..6dae193 100755
--- a/files/misc/scripts/mwgrep
+++ b/files/misc/scripts/mwgrep
@@ -36,7 +36,7 @@
 
 for hit in result['hits']:
 db = hit['_index'].split('_', 1)[0]
-title = hit['fields']['title']
+title = hit['fields']['title'][0]
 print('{:<20}{}'.format(db, title))
 
 print('(total: %s, shown: %s)' % (result['total'], len(result['hits'])))

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcde8a435be5bf366a05462515430d7d5ab3ac32
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hoo man 

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

[MediaWiki-commits] [Gerrit] Remove $wgTitle from all maintenance scripts - change (mediawiki/core)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Remove $wgTitle from all maintenance scripts
..

Remove $wgTitle from all maintenance scripts

Shouldn't be needed and aren't for any core operations. If any
extension relies on these $wgTitles being set in maintenance
environments those extensions are broken and should be fixed.

Change-Id: Ie02a5042ab96e155d783d56d5340dd0da8e3d55c
---
M maintenance/doMaintenance.php
M maintenance/install.php
M maintenance/namespaceDupes.php
M maintenance/orphans.php
M maintenance/rebuildFileCache.php
M maintenance/rebuildtextindex.php
M maintenance/runJobs.php
M maintenance/update.php
8 files changed, 8 insertions(+), 30 deletions(-)


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

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 978d44f..2b637cb 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -99,9 +99,6 @@
 // Some last includes
 require_once "$IP/includes/Setup.php";
 
-// Much much faster startup than creating a title object
-$wgTitle = null;
-
 // Do the work
 try {
$maintenance->execute();
diff --git a/maintenance/install.php b/maintenance/install.php
index d118747..44c117e 100644
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -70,10 +70,9 @@
}
 
function execute() {
-   global $IP, $wgTitle;
+   global $IP;
$siteName = isset( $this->mArgs[0] ) ? $this->mArgs[0] : "Don't 
care"; // Will not be set if used with --env-checks
$adminName = isset( $this->mArgs[1] ) ? $this->mArgs[1] : null;
-   $wgTitle = Title::newFromText( 'Installer script' );
 
$dbpassfile = $this->getOption( 'dbpassfile', false );
if ( $dbpassfile !== false ) {
diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index ff02468..95d2c08 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -50,10 +50,7 @@
}
 
public function execute() {
-   global $wgTitle;
-
$this->db = wfGetDB( DB_MASTER );
-   $wgTitle = Title::newFromText( 'Namespace title conflict 
cleanup script' );
 
$fix = $this->hasOption( 'fix' );
$suffix = $this->getOption( 'suffix', '' );
diff --git a/maintenance/orphans.php b/maintenance/orphans.php
index b4d255a..b856baf 100644
--- a/maintenance/orphans.php
+++ b/maintenance/orphans.php
@@ -47,8 +47,6 @@
}
 
public function execute() {
-   global $wgTitle;
-   $wgTitle = Title::newFromText( 'Orphan revision cleanup script' 
);
$this->checkOrphans( $this->hasOption( 'fix' ) );
$this->checkSeparation( $this->hasOption( 'fix' ) );
# Does not work yet, do not use
diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php
index 12ed9fa..6ce54b9 100644
--- a/maintenance/rebuildFileCache.php
+++ b/maintenance/rebuildFileCache.php
@@ -49,7 +49,7 @@
 
public function execute() {
global $wgUseFileCache, $wgReadOnly, $wgContentNamespaces, 
$wgRequestTime;
-   global $wgTitle, $wgOut;
+   global $wgOut;
if ( !$wgUseFileCache ) {
$this->error( "Nothing to do -- \$wgUseFileCache is 
disabled.", true );
}
@@ -104,22 +104,22 @@
$rebuilt = false;
$wgRequestTime = microtime( true ); # bug 22852
 
-   $wgTitle = Title::makeTitleSafe( 
$row->page_namespace, $row->page_title );
-   if ( null == $wgTitle ) {
+   $title = Title::makeTitleSafe( 
$row->page_namespace, $row->page_title );
+   if ( null == $title ) {
$this->output( "Page {$row->page_id} 
has bad title\n" );
continue; // broken title?
}
 
$context = new RequestContext;
-   $context->setTitle( $wgTitle );
-   $article = Article::newFromTitle( $wgTitle, 
$context );
+   $context->setTitle( $title );
+   $article = Article::newFromTitle( $title, 
$context );
$context->setWikiPage( $article->getPage() );
 
$wgOut = $context->getOutput(); // set display 
title
 
// If the article is cacheable, then load it
if ( $article->isFileCacheable() ) {
-   $cache = HTMLFi

[MediaWiki-commits] [Gerrit] icinga: update check_mysql-replication to v 0.2.6 - change (operations/puppet)

[Springle (Code Review)]

Springle has submitted this change and it was merged.

Change subject: icinga: update check_mysql-replication to v 0.2.6
..


icinga: update check_mysql-replication to v 0.2.6

See changelog in file for updates

Change-Id: I86aa1868d0ec83b10bb9f493d5115c9b8bfb6df3
---
M files/icinga/check_mysql-replication.pl
1 file changed, 118 insertions(+), 62 deletions(-)

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



diff --git a/files/icinga/check_mysql-replication.pl 
b/files/icinga/check_mysql-replication.pl
index 211403b..db080d2 100755
--- a/files/icinga/check_mysql-replication.pl
+++ b/files/icinga/check_mysql-replication.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 
 #  ---
 # -=-  -=-
@@ -7,7 +7,11 @@
 #  Description : yet another plugin to check your mysql
 #  replication threads and your lag synchronisation
 #
-#  Version : 0.1
+#  Just want to thank Bartlomiej 'guzik' Syryjczyk,
+#  Brian Rudy, Leif Neland, Christoph Maser and Peter Lecki
+#  to help me to improve this little script
+#
+#  Version : 0.2.6
 #  ---
 #  In :
 # - see the How to use section
@@ -21,6 +25,7 @@
 #  Fix Me/Todo :
 # - too many things ;) but let me know what do you think about it
 # - what about a comparaison with the master status ?
+# - use the Nagios lib for the return code
 #
 # 
 
@@ -46,16 +51,44 @@
 #
 # 1 - first you have to create an user with the REPLICATION CLIENT
 # (or you can just grant this privilege)
-# mysql> GRANT REPLICATION CLIENT ON *.* TO 'replicateur'@'localhost'
+# mysql> GRANT REPLICATION CLIENT TO 'replicateur'@'localhost' IDENTIFIED
+#BY 'password';
+# or
+# mysql> GRANT REPLICATION CLIENT TO 'replicateur'@'localhost'
 #
 # 2 - then just run the script :
-# $./check_mysql-replication.pl --help
+# $ ./check_mysql-replication.pl --help
 # 
 
 # 
 # Changelog :
 # ---
-#
+#   Date:30/04/2013   Version:0.2.6 Author:Erwan Ben Souiden
+#   >> Fix http://yoolink.to/DWq
+# 
+#   Date:24/07/2012   Version:0.2.5 Author:Erwan Ben Souiden
+#   >> Little fix by Peter Lecki to return exit code 2 when lag value
+#   is null for lag action
+# 
+#   Date:25/03/2010   Version:0.2.4 Author:Christoph Maser
+#   >> Add a little check if replication is up otherwise 
+#   $result->{Slave_IO_State} is undefined.
+# 
+#   Date:18/03/2010   Version:0.2.3 Author:Erwan Ben Souiden
+#   >> Bugfix to catch condition when lag check is run and 
+#   relication is not running. Minor Perl synax fixes for ePN. 
+#   from Brian Rudy (brud...@spampraecogito.com)
+# 
+#   Date:09/03/2010   Version:0.2.2 Author:Erwan Ben Souiden
+#   >> Updates to allow both process and lag checks in one pass
+#   from Brian Rudy (brud...@spampraecogito.com)
+# 
+#   Date:15/02/2010   Version:0.2.1 Author:Erwan Ben Souiden
+#   >> little security update in DSN thank to Leif Neland
+# 
+#   Date:22/10/2009   Version:0.2 Author:Erwan Ben Souiden
+#   >> little update thank to Bartlomiej 'guzik' Syryjczyk
+#   for now, no database is needed in DSN
 # 
 #   Date:22/06/2009   Version:0.1 Author:Erwan Ben Souiden
 #   >> creation
@@ -72,7 +105,7 @@
 
 # Generic variables
 # -
-my $version = '0.1';
+my $version = '0.2.6';
 my $author = 'Erwan Labynocle Ben Souiden';
 my $a_mail = 'er...@aleikoum.net';
 my $script_name = 'check_mysql-replication.pl';
@@ -97,8 +130,8 @@
 'slave-port=i' => \ $slave_port,
 'sl=s' => \ $slave_login,
 'slave-login=s' => \ $slave_login,
-'spd=s' => \ $slave_pwd,
-'slave-password=s' => \ $slave_pwd,
+'spd:s' => \ $slave_pwd,
+'slave-password:s' => \ $slave_pwd,
 'w=i' => \ $warning,
 'warning=i' => \ $warning,
 'c=i' => \ $critical,
@@ -120,8 +153,8 @@
 'verbose' => \ $verbose_value
 );
 
-print_usage() if ($help_value);
-print_version() if ($version_value);
+&print_usage() if ($help_value);
+&print_version() if ($version_value);
 
 
 # Syntax check of your specified options
@@ -151,61 +184,83 @@
 
 print "DEBUG : action = $action\n" if ($verbose_value);
 
-# process action
-# --
-if ($action eq 'process') {
-
-

[MediaWiki-commits] [Gerrit] Use cURL to keep the connection alive - change (mediawiki...Minifier)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Use cURL to keep the connection alive
..

Use cURL to keep the connection alive

Change-Id: I3bb0bb3773fcae86b334bbf62adc9a87c4280428
---
A MinificationException.php
M Minifier.body.php
M Minifier.php
3 files changed, 61 insertions(+), 41 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Minifier 
refs/changes/19/118419/1

diff --git a/MinificationException.php b/MinificationException.php
new file mode 100644
index 000..18b5009
--- /dev/null
+++ b/MinificationException.php
@@ -0,0 +1,8 @@
+options = $wgMinifierConnectionOptions;
-   $this->options['method'] = 'POST';
-   }
+   /** @var Resource */
+   private static $curl;
 
public function filter( $js ) {
-   wfProfileIn( __METHOD__ );
-   $req = $this->getRequest( array( 'id' => md5( $js ) ) );
-   $req->setData( array(
-   'code' => 'minify',
-   'text' => $js,
-   ) );
-   $status = $req->execute();
-   $err = '';
-   if ( !$status->isGood() ) {
-   $err = "Error requesting minification: 
{$status->getMessage()}";
-   }
-   $statusCode = $req->getStatus();
-   $returnedText = $req->getContent();
-   if ( $statusCode != 200 ) {
-   $err = "Request to minifier ended with code 
$statusCode: $returnedText";
-   }
-   wfProfileOut( __METHOD__ );
-   if ( $err ) {
-   wfDebugLog( 'minifier', $err );
-   throw new MWException( $err );
-   }
-   return $returnedText;
+   $profile = new ProfileSection( __METHOD__ );
+   return $this->performRequest(
+   array( 'id' => md5( $js ) ),
+   array(
+   'code' => 'minify',
+   'text' => $js,
+   )
+   );
}
 
/**
-* @param array $params
-* @return MWHttpRequest
+* @param array $urlParams
+* @param array $postData
+*
+* @return string
 */
-   private function getRequest( array $params = array() ) {
-   global $wgMinifierHosts;
+   private function performRequest( array $urlParams, array $postData ) {
+   global $wgMinifierConnectionOptions, $wgMinifierHost;
 
-   $host = ArrayUtils::pickRandom( $wgMinifierHosts );
-   $query = $params ? '?' . wfArrayToCgi( $params ) : '';
-   return MWHttpRequest::factory( "http://$host/$query";, 
$this->options );
+   if ( !self::$curl ) {
+   $options = $wgMinifierConnectionOptions + array(
+   CURLOPT_POST => true,
+   CURLOPT_RETURNTRANSFER => true,
+   );
+   self::$curl = curl_init();
+   curl_setopt_array( self::$curl, $options );
+   }
+   $query = $urlParams ? '?' . wfArrayToCgi( $urlParams ) : '';
+   $url = "http://$wgMinifierHost/$query";;
+   curl_setopt( self::$curl, CURLOPT_URL, $url );
+   curl_setopt( self::$curl, CURLOPT_POSTFIELDS, $postData );
+
+   $result = curl_exec( self::$curl );
+   if ( $result === false ) {
+   throw new MinificationException( "Error performing 
minification request to $url: "
+   . curl_error( self::$curl)
+   );
+   }
+
+   $httpCode = curl_getinfo( self::$curl, CURLINFO_HTTP_CODE );
+   if ( $httpCode != 200 ) {
+   throw new MinificationException( "Minification request 
to $url ended with code $httpCode: $result" );
+   }
+
+   return $result;
}
 }
\ No newline at end of file
diff --git a/Minifier.php b/Minifier.php
index 09df9d4..4a75d56 100644
--- a/Minifier.php
+++ b/Minifier.php
@@ -1,7 +1,7 @@
  10,
-   //'timeout' => 1,
+   CURLOPT_CONNECTTIMEOUT_MS => 1000,
+   CURLOPT_TIMEOUT_MS => 1,
 );
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bb0bb3773fcae86b334bbf62adc9a87c4280428
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Minifier
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Allow minor Express updates, pin Jade - change (mediawiki...Minifier)

[MaxSem (Code Review)]

MaxSem has submitted this change and it was merged.

Change subject: Allow minor Express updates, pin Jade
..


Allow minor Express updates, pin Jade

Change-Id: Ib0865c2e1c7131e0749fa8097ac9bc660e43c39c
---
M server/package.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/server/package.json b/server/package.json
index 5c1f673..5e658d5 100644
--- a/server/package.json
+++ b/server/package.json
@@ -9,7 +9,7 @@
"dependencies": {
"lru-cache": "2.x.x",
"uglify-js": "2.x.x",
-   "express": "3.3.4",
-   "jade": "*"
+   "express": "3.4.x",
+   "jade": "1.3.x"
}
 }
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0865c2e1c7131e0749fa8097ac9bc660e43c39c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Minifier
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: JGonera 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: MaxSem 

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

[MediaWiki-commits] [Gerrit] Clean up HHVM build - change (integration/jenkins-job-builder-config)

[jenkins-bot (Code Review)]

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

Change subject: Clean up HHVM build
..


Clean up HHVM build

- Hourly instead of daily (rename to match)
- Use project storage so we don't waste instance space
- Clean instead of clone, clean's fine here

Change-Id: I9bfb5d2e8b9ad223f2b197de118d72d3c6d1c592
---
M hhvm.yaml
1 file changed, 6 insertions(+), 5 deletions(-)

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



diff --git a/hhvm.yaml b/hhvm.yaml
index 3439d44..75c0dfd 100644
--- a/hhvm.yaml
+++ b/hhvm.yaml
@@ -2,18 +2,19 @@
 
 # Build hhvm from master daily
 - job:
-name: hhvm-daily-build
+name: hhvm-hourly-build
 node: hhvm-build
 
 triggers:
-  - timed: '@daily'
+  - timed: '@hourly'
 
 scm:
   - git:
   url: 'https://github.com/facebook/hhvm'
   branches:
 - 'master'
-  wipe-workspace: true
+  wipe-workspace: false
+  clean: true
 
 wrappers:
   - timeout:
@@ -26,5 +27,5 @@
   - shell: |
   cmake .
   make -j4
-  cp "$WORKSPACE/hphp/hhvm/hhvm" /var/www/hhvm
-  cp "$WORKSPACE/hphp/hhvm/hhvm" "/var/www/hhvm-$GIT_COMMIT"
+  cp "$WORKSPACE/hphp/hhvm/hhvm" /data/project/hhvm-builds/hhvm
+  cp "$WORKSPACE/hphp/hhvm/hhvm" 
"/data/project/hhvm-builds/hhvm-$GIT_COMMIT"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9bfb5d2e8b9ad223f2b197de118d72d3c6d1c592
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Clean up HHVM build - change (integration/jenkins-job-builder-config)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Clean up HHVM build
..

Clean up HHVM build

- Hourly instead of daily (rename to match)
- Use project storage so we don't waste instance space
- Clean instead of clone, clean's fine here

Change-Id: I9bfb5d2e8b9ad223f2b197de118d72d3c6d1c592
---
M hhvm.yaml
1 file changed, 6 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/18/118418/1

diff --git a/hhvm.yaml b/hhvm.yaml
index 3439d44..75c0dfd 100644
--- a/hhvm.yaml
+++ b/hhvm.yaml
@@ -2,18 +2,19 @@
 
 # Build hhvm from master daily
 - job:
-name: hhvm-daily-build
+name: hhvm-hourly-build
 node: hhvm-build
 
 triggers:
-  - timed: '@daily'
+  - timed: '@hourly'
 
 scm:
   - git:
   url: 'https://github.com/facebook/hhvm'
   branches:
 - 'master'
-  wipe-workspace: true
+  wipe-workspace: false
+  clean: true
 
 wrappers:
   - timeout:
@@ -26,5 +27,5 @@
   - shell: |
   cmake .
   make -j4
-  cp "$WORKSPACE/hphp/hhvm/hhvm" /var/www/hhvm
-  cp "$WORKSPACE/hphp/hhvm/hhvm" "/var/www/hhvm-$GIT_COMMIT"
+  cp "$WORKSPACE/hphp/hhvm/hhvm" /data/project/hhvm-builds/hhvm
+  cp "$WORKSPACE/hphp/hhvm/hhvm" 
"/data/project/hhvm-builds/hhvm-$GIT_COMMIT"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9bfb5d2e8b9ad223f2b197de118d72d3c6d1c592
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 5825389..3316a0a - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 5825389..3316a0a
..


Syncronize VisualEditor: 5825389..3316a0a

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

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 5825389..3316a0a 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 5825389447c0c1b97f1bdc6a1f4127b8dcfb85e6
+Subproject commit 3316a0ac624c76b3148d4723e0bc144969a62059

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b272d547275515caa59f804b5cc28774b4c505a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 5825389..3316a0a - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 5825389..3316a0a
..

Syncronize VisualEditor: 5825389..3316a0a

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/16/118416/1

diff --git a/VisualEditor b/VisualEditor
index 5825389..3316a0a 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 5825389447c0c1b97f1bdc6a1f4127b8dcfb85e6
+Subproject commit 3316a0ac624c76b3148d4723e0bc144969a62059

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b272d547275515caa59f804b5cc28774b4c505a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Add createSurface() to Target - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Add createSurface() to Target
..


Add createSurface() to Target

This can be overriden in subclasses (such as MobileViewTarget) so that
we can customize the way the surface is created.

Change-Id: Id17695c8c75c7ae6c549f915625667389aad5f2f
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 12 insertions(+), 1 deletion(-)

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



diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 5306576..7b1d1f7 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -1150,6 +1150,17 @@
 // FIXME: split out view specific functionality, emit to subclass
 
 /**
+ * Create a surface.
+ *
+ * @method
+ * @param {ve.dm.Document} dmDoc Document model
+ * @returns {ve.ui.Surface}
+ */
+ve.init.mw.Target.prototype.createSurface = function ( dmDoc ) {
+   return new ve.ui.Surface( dmDoc );
+};
+
+/**
  * Switch to editing mode.
  *
  * @method
@@ -1163,7 +1174,7 @@
var dmDoc = ve.dm.converter.getModelFromDom( doc );
setTimeout( function () {
// Create ui.Surface (also creates ce.Surface and 
dm.Surface and builds CE tree)
-   target.surface = new ve.ui.Surface( dmDoc );
+   target.surface = target.createSurface( dmDoc );
target.surface.$element.addClass( 
've-init-mw-viewPageTarget-surface' );
setTimeout( function () {
// Initialize surface

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id17695c8c75c7ae6c549f915625667389aad5f2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: JGonera 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Trevor Parscal 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 3a378cc..5825389 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 3a378cc..5825389
..


Syncronize VisualEditor: 3a378cc..5825389

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

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 3a378cc..5825389 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 3a378ccc6c1967824bd3fb13dcca6b24315e90d3
+Subproject commit 5825389447c0c1b97f1bdc6a1f4127b8dcfb85e6

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I40aede94bdf3324525f351c5b83e5453bf8c62b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Fix JS error trying to access this.saveDialog from switch to... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Fix JS error trying to access this.saveDialog from switch to 
source mode code path
..


Fix JS error trying to access this.saveDialog from switch to source mode code 
path

The switch to source mode code path was causing onSerializeComplete to
be called, which accesses this.saveDialog because it assumes it's being
called from onSaveDialogReview.

In fact, onSaveDialogReview was calling it twice, once as the callback
it passes to serialize() and once in response to the serializeComplete
event. Cleaned this up by renaming the function and removing the
event binding, so it's now only called once and only for reviewing
changes to new pages, not in the switch to source mode code path.

Bug: 62544
Change-Id: I86eea57806a20408c8dc89a234c39cae1d969bca
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 15 insertions(+), 16 deletions(-)

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



diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 95a43bc..8de4d41 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -106,7 +106,6 @@
'showChanges': 'onShowChanges',
'showChangesError': 'onShowChangesError',
'noChanges': 'onNoChanges',
-   'serializeComplete': 'onSerializeComplete',
'serializeError': 'onSerializeError',
'sanityCheckComplete': 'updateToolbarSaveButtonState'
} );
@@ -572,20 +571,6 @@
 };
 
 /**
- * Handle Serialize event.
- *
- * @method
- * @param {string} wikitext
- */
-ve.init.mw.ViewPageTarget.prototype.onSerializeComplete = function ( wikitext 
) {
-   // Invalidate the viewer wikitext on next change
-   this.surface.getModel().getDocument().once( 'transact',
-   ve.bind( this.saveDialog.clearDiff, this.saveDialog )
-   );
-   this.saveDialog.setDiffAndReview( $( '' ).text( wikitext ) );
-};
-
-/**
  * Handle failed show changes event.
  *
  * @method
@@ -758,7 +743,7 @@
// Has no callback, handled via target.onShowChanges
this.showChanges( this.docToSave );
} else {
-   this.serialize( this.docToSave, ve.bind( 
this.onSerialize, this ) );
+   this.serialize( this.docToSave, ve.bind( 
this.onSaveDialogReviewComplete, this ) );
}
} else {
this.saveDialog.swapPanel( 'review' );
@@ -766,6 +751,20 @@
 };
 
 /**
+ * Handle completed serialize request for diff views for new page creations.
+ *
+ * @method
+ * @param {string} wikitext
+ */
+ve.init.mw.ViewPageTarget.prototype.onSaveDialogReviewComplete = function ( 
wikitext ) {
+   // Invalidate the viewer wikitext on next change
+   this.surface.getModel().getDocument().once( 'transact',
+   ve.bind( this.saveDialog.clearDiff, this.saveDialog )
+   );
+   this.saveDialog.setDiffAndReview( $( '' ).text( wikitext ) );
+};
+
+/**
  * Try to save the current document.
  * @fires saveInitiated
  */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I86eea57806a20408c8dc89a234c39cae1d969bca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Trevor Parscal 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 3a378cc..5825389 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 3a378cc..5825389
..

Syncronize VisualEditor: 3a378cc..5825389

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


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

diff --git a/VisualEditor b/VisualEditor
index 3a378cc..5825389 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 3a378ccc6c1967824bd3fb13dcca6b24315e90d3
+Subproject commit 5825389447c0c1b97f1bdc6a1f4127b8dcfb85e6

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I40aede94bdf3324525f351c5b83e5453bf8c62b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: af41547..3a378cc - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: af41547..3a378cc
..


Syncronize VisualEditor: af41547..3a378cc

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

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index af41547..3a378cc 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit af4154732759d8206be40be19a69c853ae791672
+Subproject commit 3a378ccc6c1967824bd3fb13dcca6b24315e90d3

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia38ddcde5fb3f109592658e6ebe00b73d009cbb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: af41547..3a378cc - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: af41547..3a378cc
..

Syncronize VisualEditor: af41547..3a378cc

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/14/118414/1

diff --git a/VisualEditor b/VisualEditor
index af41547..3a378cc 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit af4154732759d8206be40be19a69c853ae791672
+Subproject commit 3a378ccc6c1967824bd3fb13dcca6b24315e90d3

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia38ddcde5fb3f109592658e6ebe00b73d009cbb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] More gracefully handle situations where Parsoid returns a ti... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: More gracefully handle situations where Parsoid returns a 
timeout failure code (HTTP 504)
..


More gracefully handle situations where Parsoid returns a timeout failure code 
(HTTP 504)

Bug: 50475
Change-Id: I36d0dc2c44a509d4e40ecadcfb5e3df81e01bca9
---
M VisualEditor.php
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
4 files changed, 14 insertions(+), 2 deletions(-)

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



diff --git a/VisualEditor.php b/VisualEditor.php
index 3735bd0..37da6d4 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -204,6 +204,7 @@
// Messages needed by VE in init phase only (rest go 
below)
'visualeditor-loadwarning',
'visualeditor-loadwarning-token',
+   'visualeditor-timeout',
'visualeditor-notification-created',
'visualeditor-notification-restored',
'visualeditor-notification-saved',
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 7103467..72a8b1c 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -153,6 +153,7 @@
 "visualeditor-linkinspector-suggest-new-page": "New page",
 "visualeditor-loadwarning": "Error loading data from server: $1. Would you 
like to retry?",
 "visualeditor-loadwarning-token": "Error loading edit token from server: 
$1. Would you like to retry?",
+"visualeditor-timeout":"It looks like full editing is currently 
unavailable; would you like to edit in source mode instead?",
 "visualeditor-mainnamespacepagelink": "Project:Main namespace",
 "visualeditor-media-input-placeholder": "Search for media",
 "visualeditor-meta-tool": "Options",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 2dd3649..dce2407 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -158,6 +158,7 @@
 "visualeditor-linkinspector-suggest-new-page": "Label for a new page in 
the link inspector.\n{{Identical|New page}}",
 "visualeditor-loadwarning": "Text (JavaScript confirm()) shown when the 
editor fails to load properly.\n\nParameters:\n* $1 - the error message from 
the server, in English. e.g. \"parsoidserver-http-bad-status: 404\"",
 "visualeditor-loadwarning-token": "Text (JavaScript confirm()) shown when 
the editor fails to load properly.\n\nParameters:\n* $1 - the error message 
from the server.",
+"visualeditor-timeout":"Text (JavaScript confirm()) shown when the editor 
fails to load properly due to a 504 Gateway Timeout error.",
 "visualeditor-mainnamespacepagelink": "Name of a page describing the main 
namespace (NS0) in this project.\n{{doc-important|Do not translate \"Project\"; 
it is automatically converted to the wiki's project namespace.}}",
 "visualeditor-media-input-placeholder": "Place holder text for media 
search input",
 "visualeditor-meta-tool": "Text of tool in the toolbar the lets users set 
categories, language links and other page settings.\n{{Identical|Options}}",
@@ -230,4 +231,4 @@
 "visualeditor-wikitext-warning": "Contents of notification displayed when 
Wikitext has been detected.\n\nRefers to:\n* 
{{msg-mw|Visualeditor-wikitext-warning-link}}\n* 
{{msg-mw|Visualeditor-ca-editsource}}",
 "visualeditor-wikitext-warning-link": "Link to page describing what 
Wikitext is.\n\nUsed in:\n* {{msg-mw|Visualeditor-wikitext-warning}}.",
 "visualeditor-wikitext-warning-title": "Title of notification displayed 
when Wikitext has been detected"
-}
\ No newline at end of file
+}
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index d90bd2c..def5829 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -315,10 +315,19 @@
// The response.status check here is to catch aborts triggered by 
navigation away from the page
if (
status !== 'abort' &&
-   ( !jqXHR || jqXHR.status !== 0 ) &&
+   ( !jqXHR || ( jqXHR.status !== 0 && jqXHR.status !== 504 ) ) &&
confirm( ve.msg( 'visualeditor-loadwarning', status ) )
) {
this.load();
+   } else if (
+   jqXHR && jqXHR.status === 504 &&
+   confirm( ve.msg( 'visualeditor-timeout' ) )
+   ) {
+   if ( 'veaction' in this.currentUri.query ) {
+   delete this.currentUri.query.veaction;
+   }
+   this.currentUri.query.action = 'edit';
+   window.location.href = this.currentUri.toString();
} else {
   

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (46ccd5b3a7) - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Update OOjs UI to v0.1.0-pre (46ccd5b3a7)
..


Update OOjs UI to v0.1.0-pre (46ccd5b3a7)

New changes:
3ab4d6d Balance margins around icon on iconed ButtonWidget
8d69f53 Add missing 75% transparency to add-item
2c0ae23 Add indicators to demo page
1700e98 Localisation updates from https://translatewiki.net.
262cb8d Localisation updates from https://translatewiki.net.
9247e3a Localisation updates from https://translatewiki.net.
0a078dc Localisation updates from https://translatewiki.net.
3027b13 readme: Fix broken Markdown list syntax
d7ab327 Update oojs to v1.0.8
4dd7320 Drop file "OO.ui" file prefix
7c607c2 Localisation updates from https://translatewiki.net.
46ccd5b Make dialogs a little taller

Change-Id: If0c875d9ebdd91848c512752ade31ab96f2bbc00
---
M lib/oojs-ui/i18n/ce.json
M lib/oojs-ui/i18n/cu.json
M lib/oojs-ui/i18n/fa.json
M lib/oojs-ui/i18n/fi.json
M lib/oojs-ui/i18n/gl.json
M lib/oojs-ui/i18n/he.json
M lib/oojs-ui/i18n/hu.json
M lib/oojs-ui/i18n/ilo.json
M lib/oojs-ui/i18n/pt.json
M lib/oojs-ui/i18n/sq.json
M lib/oojs-ui/images/icons/add-item.png
M lib/oojs-ui/images/icons/add-item.svg
M lib/oojs-ui/oojs-ui.js
M lib/oojs-ui/oojs-ui.svg.css
14 files changed, 33 insertions(+), 20 deletions(-)

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



diff --git a/lib/oojs-ui/i18n/ce.json b/lib/oojs-ui/i18n/ce.json
index 1e145ea..ff14ff3 100644
--- a/lib/oojs-ui/i18n/ce.json
+++ b/lib/oojs-ui/i18n/ce.json
@@ -8,5 +8,6 @@
 "ooui-dialog-action-close": "ДӀачӀагӀа",
 "ooui-outline-control-move-down": "Лаха яккха элемент",
 "ooui-outline-control-move-up": "Лаккха яккха элемент",
+"ooui-outline-control-remove": "ДӀадаха меттиг",
 "ooui-toolbar-more": "Кхин тӀе"
 }
\ No newline at end of file
diff --git a/lib/oojs-ui/i18n/cu.json b/lib/oojs-ui/i18n/cu.json
index fa9b1cf..55594c1 100644
--- a/lib/oojs-ui/i18n/cu.json
+++ b/lib/oojs-ui/i18n/cu.json
@@ -4,5 +4,6 @@
 "ОйЛ"
 ]
 },
-"ooui-dialog-action-close": "ꙁакрꙑи"
+"ooui-dialog-action-close": "ꙁакрꙑи",
+"ooui-toolbar-more": "вѧщє"
 }
\ No newline at end of file
diff --git a/lib/oojs-ui/i18n/fa.json b/lib/oojs-ui/i18n/fa.json
index 173acd7..3f1ad0c 100644
--- a/lib/oojs-ui/i18n/fa.json
+++ b/lib/oojs-ui/i18n/fa.json
@@ -9,11 +9,13 @@
 "Nojan Madinehi",
 "Reza1615",
 "Taha",
-"درفش کاویانی"
+"درفش کاویانی",
+"Armin1392"
 ]
 },
 "ooui-dialog-action-close": "بستن",
 "ooui-outline-control-move-down": "انتقال مورد به پایین",
 "ooui-outline-control-move-up": "انتقال مورد به بالا",
+"ooui-outline-control-remove": "حذف مورد",
 "ooui-toolbar-more": "بیشتر"
 }
\ No newline at end of file
diff --git a/lib/oojs-ui/i18n/fi.json b/lib/oojs-ui/i18n/fi.json
index dcd367f..ce2f6d0 100644
--- a/lib/oojs-ui/i18n/fi.json
+++ b/lib/oojs-ui/i18n/fi.json
@@ -19,5 +19,6 @@
 "ooui-dialog-action-close": "Sulje",
 "ooui-outline-control-move-down": "Siirrä kohdetta alaspäin",
 "ooui-outline-control-move-up": "Siirrä kohdetta ylöspäin",
+"ooui-outline-control-remove": "Poista kohde",
 "ooui-toolbar-more": "Lisää"
 }
\ No newline at end of file
diff --git a/lib/oojs-ui/i18n/gl.json b/lib/oojs-ui/i18n/gl.json
index 5d0928f..a029456 100644
--- a/lib/oojs-ui/i18n/gl.json
+++ b/lib/oojs-ui/i18n/gl.json
@@ -9,5 +9,6 @@
 "ooui-dialog-action-close": "Pechar",
 "ooui-outline-control-move-down": "Mover o elemento abaixo",
 "ooui-outline-control-move-up": "Mover o elemento arriba",
+"ooui-outline-control-remove": "Eliminar o elemento",
 "ooui-toolbar-more": "Máis"
 }
\ No newline at end of file
diff --git a/lib/oojs-ui/i18n/he.json b/lib/oojs-ui/i18n/he.json
index 31b693c..404dc82 100644
--- a/lib/oojs-ui/i18n/he.json
+++ b/lib/oojs-ui/i18n/he.json
@@ -18,5 +18,6 @@
 "ooui-dialog-action-close": "סגירה",
 "ooui-outline-control-move-down": "להזיז את הפריט מטה",
 "ooui-outline-control-move-up": "להזיז את הפריט מעלה",
+"ooui-outline-control-remove": "הסרת פריט",
 "ooui-toolbar-more": "עוד"
 }
\ No newline at end of file
diff --git a/lib/oojs-ui/i18n/hu.json b/lib/oojs-ui/i18n/hu.json
index 9f7b435..b2cf2c0 100644
--- a/lib/oojs-ui/i18n/hu.json
+++ b/lib/oojs-ui/i18n/hu.json
@@ -4,11 +4,13 @@
 "Dj",
 "Einstein2",
 "Misibacsi",
-"ViDam"
+"ViDam",
+"Tacsipacsi"
 ]
 },
 "ooui-dialog-action-close": "Bezár",
 "ooui-outline-control-move-down": "Elem mozgatása lefelé",
 "ooui-outline-control-move-up": "Elem mozgatása felfelé",
+"ooui-outline-control-remove": "Elem eltávolítása",
 "ooui-toolbar-more": "Tovább..."
 }
\ No newline at end of file
diff --git a/lib/oojs-ui/i18n/ilo.json b/lib/oojs-ui/i18n/ilo.json
index 15f42e5..838

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (46ccd5b3a7) - change (VisualEditor/VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Update OOjs UI to v0.1.0-pre (46ccd5b3a7)
..

Update OOjs UI to v0.1.0-pre (46ccd5b3a7)

New changes:
3ab4d6d Balance margins around icon on iconed ButtonWidget
8d69f53 Add missing 75% transparency to add-item
2c0ae23 Add indicators to demo page
1700e98 Localisation updates from https://translatewiki.net.
262cb8d Localisation updates from https://translatewiki.net.
9247e3a Localisation updates from https://translatewiki.net.
0a078dc Localisation updates from https://translatewiki.net.
3027b13 readme: Fix broken Markdown list syntax
d7ab327 Update oojs to v1.0.8
4dd7320 Drop file "OO.ui" file prefix
7c607c2 Localisation updates from https://translatewiki.net.
46ccd5b Make dialogs a little taller

Change-Id: If0c875d9ebdd91848c512752ade31ab96f2bbc00
---
M lib/oojs-ui/i18n/ce.json
M lib/oojs-ui/i18n/cu.json
M lib/oojs-ui/i18n/fa.json
M lib/oojs-ui/i18n/fi.json
M lib/oojs-ui/i18n/gl.json
M lib/oojs-ui/i18n/he.json
M lib/oojs-ui/i18n/hu.json
M lib/oojs-ui/i18n/ilo.json
M lib/oojs-ui/i18n/pt.json
M lib/oojs-ui/i18n/sq.json
M lib/oojs-ui/images/icons/add-item.png
M lib/oojs-ui/images/icons/add-item.svg
M lib/oojs-ui/oojs-ui.js
M lib/oojs-ui/oojs-ui.svg.css
14 files changed, 33 insertions(+), 20 deletions(-)


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

diff --git a/lib/oojs-ui/i18n/ce.json b/lib/oojs-ui/i18n/ce.json
index 1e145ea..ff14ff3 100644
--- a/lib/oojs-ui/i18n/ce.json
+++ b/lib/oojs-ui/i18n/ce.json
@@ -8,5 +8,6 @@
 "ooui-dialog-action-close": "ДӀачӀагӀа",
 "ooui-outline-control-move-down": "Лаха яккха элемент",
 "ooui-outline-control-move-up": "Лаккха яккха элемент",
+"ooui-outline-control-remove": "ДӀадаха меттиг",
 "ooui-toolbar-more": "Кхин тӀе"
 }
\ No newline at end of file
diff --git a/lib/oojs-ui/i18n/cu.json b/lib/oojs-ui/i18n/cu.json
index fa9b1cf..55594c1 100644
--- a/lib/oojs-ui/i18n/cu.json
+++ b/lib/oojs-ui/i18n/cu.json
@@ -4,5 +4,6 @@
 "ОйЛ"
 ]
 },
-"ooui-dialog-action-close": "ꙁакрꙑи"
+"ooui-dialog-action-close": "ꙁакрꙑи",
+"ooui-toolbar-more": "вѧщє"
 }
\ No newline at end of file
diff --git a/lib/oojs-ui/i18n/fa.json b/lib/oojs-ui/i18n/fa.json
index 173acd7..3f1ad0c 100644
--- a/lib/oojs-ui/i18n/fa.json
+++ b/lib/oojs-ui/i18n/fa.json
@@ -9,11 +9,13 @@
 "Nojan Madinehi",
 "Reza1615",
 "Taha",
-"درفش کاویانی"
+"درفش کاویانی",
+"Armin1392"
 ]
 },
 "ooui-dialog-action-close": "بستن",
 "ooui-outline-control-move-down": "انتقال مورد به پایین",
 "ooui-outline-control-move-up": "انتقال مورد به بالا",
+"ooui-outline-control-remove": "حذف مورد",
 "ooui-toolbar-more": "بیشتر"
 }
\ No newline at end of file
diff --git a/lib/oojs-ui/i18n/fi.json b/lib/oojs-ui/i18n/fi.json
index dcd367f..ce2f6d0 100644
--- a/lib/oojs-ui/i18n/fi.json
+++ b/lib/oojs-ui/i18n/fi.json
@@ -19,5 +19,6 @@
 "ooui-dialog-action-close": "Sulje",
 "ooui-outline-control-move-down": "Siirrä kohdetta alaspäin",
 "ooui-outline-control-move-up": "Siirrä kohdetta ylöspäin",
+"ooui-outline-control-remove": "Poista kohde",
 "ooui-toolbar-more": "Lisää"
 }
\ No newline at end of file
diff --git a/lib/oojs-ui/i18n/gl.json b/lib/oojs-ui/i18n/gl.json
index 5d0928f..a029456 100644
--- a/lib/oojs-ui/i18n/gl.json
+++ b/lib/oojs-ui/i18n/gl.json
@@ -9,5 +9,6 @@
 "ooui-dialog-action-close": "Pechar",
 "ooui-outline-control-move-down": "Mover o elemento abaixo",
 "ooui-outline-control-move-up": "Mover o elemento arriba",
+"ooui-outline-control-remove": "Eliminar o elemento",
 "ooui-toolbar-more": "Máis"
 }
\ No newline at end of file
diff --git a/lib/oojs-ui/i18n/he.json b/lib/oojs-ui/i18n/he.json
index 31b693c..404dc82 100644
--- a/lib/oojs-ui/i18n/he.json
+++ b/lib/oojs-ui/i18n/he.json
@@ -18,5 +18,6 @@
 "ooui-dialog-action-close": "סגירה",
 "ooui-outline-control-move-down": "להזיז את הפריט מטה",
 "ooui-outline-control-move-up": "להזיז את הפריט מעלה",
+"ooui-outline-control-remove": "הסרת פריט",
 "ooui-toolbar-more": "עוד"
 }
\ No newline at end of file
diff --git a/lib/oojs-ui/i18n/hu.json b/lib/oojs-ui/i18n/hu.json
index 9f7b435..b2cf2c0 100644
--- a/lib/oojs-ui/i18n/hu.json
+++ b/lib/oojs-ui/i18n/hu.json
@@ -4,11 +4,13 @@
 "Dj",
 "Einstein2",
 "Misibacsi",
-"ViDam"
+"ViDam",
+"Tacsipacsi"
 ]
 },
 "ooui-dialog-action-close": "Bezár",
 "ooui-outline-control-move-down": "Elem mozgatása lefelé",
 "ooui-outline-control-move-up": "Elem mozgatása felfelé",
+"ooui-outline-control-remove": "Elem eltávolítása",
 "ooui-toolbar-more": "Tovább..."
 }
\ No newline at end of file
diff --git a/lib/oojs-ui/i18n/ilo.json

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: da5d884..af41547 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: da5d884..af41547
..


Syncronize VisualEditor: da5d884..af41547

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

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index da5d884..af41547 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit da5d8847ea0403c6a27b9976fa11ee81fa02029e
+Subproject commit af4154732759d8206be40be19a69c853ae791672

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I58a47ca5a46051dd5f2ecaa870be43f7ad221b72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: da5d884..af41547 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: da5d884..af41547
..

Syncronize VisualEditor: da5d884..af41547

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/12/118412/1

diff --git a/VisualEditor b/VisualEditor
index da5d884..af41547 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit da5d8847ea0403c6a27b9976fa11ee81fa02029e
+Subproject commit af4154732759d8206be40be19a69c853ae791672

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I58a47ca5a46051dd5f2ecaa870be43f7ad221b72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (46ccd5b3a7) - change (mediawiki/core)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Update OOjs UI to v0.1.0-pre (46ccd5b3a7)
..

Update OOjs UI to v0.1.0-pre (46ccd5b3a7)

New changes:
9247e3a Localisation updates from https://translatewiki.net.
0a078dc Localisation updates from https://translatewiki.net.
3027b13 readme: Fix broken Markdown list syntax
d7ab327 Update oojs to v1.0.8
4dd7320 Drop file "OO.ui" file prefix
7c607c2 Localisation updates from https://translatewiki.net.
46ccd5b Make dialogs a little taller

Change-Id: I51caa22711fd10ff464b895e90a69292cbf003f8
---
M resources/oojs-ui/i18n/ce.json
M resources/oojs-ui/i18n/gl.json
M resources/oojs-ui/i18n/hu.json
M resources/oojs-ui/i18n/ilo.json
M resources/oojs-ui/i18n/pt.json
M resources/oojs-ui/oojs-ui.js
M resources/oojs-ui/oojs-ui.svg.css
7 files changed, 16 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/11/118411/1

diff --git a/resources/oojs-ui/i18n/ce.json b/resources/oojs-ui/i18n/ce.json
index 1e145ea..ff14ff3 100644
--- a/resources/oojs-ui/i18n/ce.json
+++ b/resources/oojs-ui/i18n/ce.json
@@ -8,5 +8,6 @@
 "ooui-dialog-action-close": "ДӀачӀагӀа",
 "ooui-outline-control-move-down": "Лаха яккха элемент",
 "ooui-outline-control-move-up": "Лаккха яккха элемент",
+"ooui-outline-control-remove": "ДӀадаха меттиг",
 "ooui-toolbar-more": "Кхин тӀе"
 }
\ No newline at end of file
diff --git a/resources/oojs-ui/i18n/gl.json b/resources/oojs-ui/i18n/gl.json
index 5d0928f..a029456 100644
--- a/resources/oojs-ui/i18n/gl.json
+++ b/resources/oojs-ui/i18n/gl.json
@@ -9,5 +9,6 @@
 "ooui-dialog-action-close": "Pechar",
 "ooui-outline-control-move-down": "Mover o elemento abaixo",
 "ooui-outline-control-move-up": "Mover o elemento arriba",
+"ooui-outline-control-remove": "Eliminar o elemento",
 "ooui-toolbar-more": "Máis"
 }
\ No newline at end of file
diff --git a/resources/oojs-ui/i18n/hu.json b/resources/oojs-ui/i18n/hu.json
index 9f7b435..b2cf2c0 100644
--- a/resources/oojs-ui/i18n/hu.json
+++ b/resources/oojs-ui/i18n/hu.json
@@ -4,11 +4,13 @@
 "Dj",
 "Einstein2",
 "Misibacsi",
-"ViDam"
+"ViDam",
+"Tacsipacsi"
 ]
 },
 "ooui-dialog-action-close": "Bezár",
 "ooui-outline-control-move-down": "Elem mozgatása lefelé",
 "ooui-outline-control-move-up": "Elem mozgatása felfelé",
+"ooui-outline-control-remove": "Elem eltávolítása",
 "ooui-toolbar-more": "Tovább..."
 }
\ No newline at end of file
diff --git a/resources/oojs-ui/i18n/ilo.json b/resources/oojs-ui/i18n/ilo.json
index 15f42e5..838face 100644
--- a/resources/oojs-ui/i18n/ilo.json
+++ b/resources/oojs-ui/i18n/ilo.json
@@ -7,5 +7,6 @@
 "ooui-dialog-action-close": "Irekep",
 "ooui-outline-control-move-down": "Ipababa ti banag",
 "ooui-outline-control-move-up": "Ipangato ti banag",
+"ooui-outline-control-remove": "Ikkaten ti banag",
 "ooui-toolbar-more": "Adu pay"
 }
\ No newline at end of file
diff --git a/resources/oojs-ui/i18n/pt.json b/resources/oojs-ui/i18n/pt.json
index a4dba27..53b5280 100644
--- a/resources/oojs-ui/i18n/pt.json
+++ b/resources/oojs-ui/i18n/pt.json
@@ -9,11 +9,13 @@
 "Jaideraf",
 "Jdforrester",
 "Luckas",
-"Vitorvicentevalente"
+"Vitorvicentevalente",
+"SandroHc"
 ]
 },
 "ooui-dialog-action-close": "Fechar",
 "ooui-outline-control-move-down": "Mover item para baixo",
 "ooui-outline-control-move-up": "Mover item para cima",
+"ooui-outline-control-remove": "Remover elemento",
 "ooui-toolbar-more": "Mais"
 }
\ No newline at end of file
diff --git a/resources/oojs-ui/oojs-ui.js b/resources/oojs-ui/oojs-ui.js
index 1f13047..7878219 100644
--- a/resources/oojs-ui/oojs-ui.js
+++ b/resources/oojs-ui/oojs-ui.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (efc7297353)
+ * OOjs UI v0.1.0-pre (46ccd5b3a7)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: Fri Mar 07 2014 17:36:48 GMT-0800 (PST)
+ * Date: Wed Mar 12 2014 17:44:18 GMT-0700 (PDT)
  */
 ( function () {
 
diff --git a/resources/oojs-ui/oojs-ui.svg.css 
b/resources/oojs-ui/oojs-ui.svg.css
index daf6f35..59e3f4e 100644
--- a/resources/oojs-ui/oojs-ui.svg.css
+++ b/resources/oojs-ui/oojs-ui.svg.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.1.0-pre (efc7297353)
+ * OOjs UI v0.1.0-pre (46ccd5b3a7)
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2014 OOjs Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: Fri Mar 07 2014 17:36:48 GMT-0800 (PST)
+ * Date: Wed Mar 12 2014 17:44:18 GMT-0700 (PDT)
  */
 
 /* Textures */
@@ -66,

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: aae2fb0..da5d884 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: aae2fb0..da5d884
..


Syncronize VisualEditor: aae2fb0..da5d884

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

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index aae2fb0..da5d884 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit aae2fb09de33c772aafadbd4c3476f182e401e7c
+Subproject commit da5d8847ea0403c6a27b9976fa11ee81fa02029e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ea12fb24c3abd905a2168fa9dd515eb55a2f7cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: aae2fb0..da5d884 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: aae2fb0..da5d884
..

Syncronize VisualEditor: aae2fb0..da5d884

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


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

diff --git a/VisualEditor b/VisualEditor
index aae2fb0..da5d884 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit aae2fb09de33c772aafadbd4c3476f182e401e7c
+Subproject commit da5d8847ea0403c6a27b9976fa11ee81fa02029e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ea12fb24c3abd905a2168fa9dd515eb55a2f7cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Make the reference dialog medium, not large - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Make the reference dialog medium, not large
..


Make the reference dialog medium, not large

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

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



diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index 8640e3f..4c7a731 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -16,6 +16,9 @@
  * @param {Object} [config] Configuration options
  */
 ve.ui.MWReferenceDialog = function VeUiMWReferenceDialog( surface, config ) {
+   // Configuration initialization
+   config = ve.extendObject( { 'size': 'medium' }, config );
+
// Parent constructor
ve.ui.MWDialog.call( this, surface, config );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iada77f7f61ee70a33c77f25b34a2cb6e612da6a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Trevor Parscal 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Adding a comment explaining where the i18n messages are - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Adding a comment explaining where the i18n messages are
..


Adding a comment explaining where the i18n messages are

Change-Id: I0e01f8d21575ffaa77bac0d79dc1f5e1c2883438
---
M VisualEditor.i18n.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/VisualEditor.i18n.php b/VisualEditor.i18n.php
index aac50fe..6200df4 100644
--- a/VisualEditor.i18n.php
+++ b/VisualEditor.i18n.php
@@ -1,4 +1,5 @@
 https://gerrit.wikimedia.org/r/118409
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e01f8d21575ffaa77bac0d79dc1f5e1c2883438
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
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] Adding a comment explaining where the i18n messages are - change (mediawiki...VisualEditor)

[Kaldari (Code Review)]

Kaldari has uploaded a new change for review.

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

Change subject: Adding a comment explaining where the i18n messages are
..

Adding a comment explaining where the i18n messages are

Change-Id: I0e01f8d21575ffaa77bac0d79dc1f5e1c2883438
---
M VisualEditor.i18n.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/VisualEditor.i18n.php b/VisualEditor.i18n.php
index aac50fe..6200df4 100644
--- a/VisualEditor.i18n.php
+++ b/VisualEditor.i18n.php
@@ -1,4 +1,5 @@
 https://gerrit.wikimedia.org/r/118409
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] Make the reference dialog medium, not large - change (mediawiki...VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Make the reference dialog medium, not large
..

Make the reference dialog medium, not large

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


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

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index 8640e3f..4c7a731 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -16,6 +16,9 @@
  * @param {Object} [config] Configuration options
  */
 ve.ui.MWReferenceDialog = function VeUiMWReferenceDialog( surface, config ) {
+   // Configuration initialization
+   config = ve.extendObject( { 'size': 'medium' }, config );
+
// Parent constructor
ve.ui.MWDialog.call( this, surface, config );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iada77f7f61ee70a33c77f25b34a2cb6e612da6a6
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] Syncronize VisualEditor: 744886a..aae2fb0 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 744886a..aae2fb0
..

Syncronize VisualEditor: 744886a..aae2fb0

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


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

diff --git a/VisualEditor b/VisualEditor
index 744886a..aae2fb0 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 744886ac1a10d0bbf932e775de3d2add7955b9da
+Subproject commit aae2fb09de33c772aafadbd4c3476f182e401e7c

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia73c104618ac0742f65ff0c91df30461a0564ab6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Actually make the save dialog grow when showing a diff - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Actually make the save dialog grow when showing a diff
..


Actually make the save dialog grow when showing a diff

There was code doing it, but its effects were undone by a switch-case 
fall-through.

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

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



diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 47d14eb..56f515b 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -102,6 +102,7 @@
  */
 ve.ui.MWSaveDialog.prototype.swapPanel = function ( panel ) {
var currentEditSummaryWikitext,
+   size = 'medium',
dialog = this,
panelObj = dialog[panel + 'Panel'];
 
@@ -120,7 +121,6 @@
 
switch ( panel ) {
case 'save':
-   this.setSize( 'medium' );
if ( !this.sanityCheckVerified ) {
this.showMessage( 'dirtywarning', mw.msg( 
'visualeditor-savedialog-warning-dirty' ) );
}
@@ -139,14 +139,13 @@
} );
break;
case 'conflict':
-   this.setSize( 'medium' );
this.saveButton.setDisabled( true ).$element.hide();
this.reviewButton.$element.hide();
this.reviewGoodButton.$element.hide();
this.resolveConflictButton.$element.show();
break;
case 'review':
-   this.setSize( 'large' );
+   size = 'large';
currentEditSummaryWikitext = 
this.editSummaryInput.getValue();
if ( this.lastEditSummaryWikitext === undefined || 
this.lastEditSummaryWikitext !== currentEditSummaryWikitext ) {
if ( this.editSummaryXhr ) {
@@ -172,7 +171,6 @@
}
/* falls through */
case 'nochanges':
-   this.setSize( 'medium' );
this.saveButton.$element.hide();
this.reviewButton.$element.hide();
this.reviewGoodButton.$element.show();
@@ -180,6 +178,8 @@
break;
}
 
+   // Set the size
+   this.setSize( size );
// Show the target panel
this.panel.setItem( panelObj );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I59abc1bbbf086eb29bda86f15bfac3acec3b0950
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Trevor Parscal 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 744886a..aae2fb0 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 744886a..aae2fb0
..


Syncronize VisualEditor: 744886a..aae2fb0

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

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 744886a..aae2fb0 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 744886ac1a10d0bbf932e775de3d2add7955b9da
+Subproject commit aae2fb09de33c772aafadbd4c3476f182e401e7c

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia73c104618ac0742f65ff0c91df30461a0564ab6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Make dialogs a little taller - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: Make dialogs a little taller
..


Make dialogs a little taller

And perhaps, just a little but prouder.

Change-Id: I09c986e33be66444d2d6bedeb4ae8c278272dbfa
---
M src/styles/Dialog.less
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/src/styles/Dialog.less b/src/styles/Dialog.less
index ab8473f..0d00c65 100644
--- a/src/styles/Dialog.less
+++ b/src/styles/Dialog.less
@@ -32,17 +32,17 @@
 
&-small .oo-ui-window-frame {
width: 400px;
-   max-height: 200px;
+   max-height: 230px;
}
 
&-medium .oo-ui-window-frame {
width: 600px;
-   max-height: 400px;
+   max-height: 460px;
}
 
&-large .oo-ui-window-frame {
width: 800px;
-   max-height: 600px;
+   max-height: 690px;
}
 
.oo-ui-frame {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I09c986e33be66444d2d6bedeb4ae8c278272dbfa
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal 
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] Actually make the save dialog grow when showing a diff - change (mediawiki...VisualEditor)

[Catrope (Code Review)]

Catrope has uploaded a new change for review.

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

Change subject: Actually make the save dialog grow when showing a diff
..

Actually make the save dialog grow when showing a diff

There was code doing it, but its effects were undone by a switch-case 
fall-through.

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


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

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 47d14eb..56f515b 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -102,6 +102,7 @@
  */
 ve.ui.MWSaveDialog.prototype.swapPanel = function ( panel ) {
var currentEditSummaryWikitext,
+   size = 'medium',
dialog = this,
panelObj = dialog[panel + 'Panel'];
 
@@ -120,7 +121,6 @@
 
switch ( panel ) {
case 'save':
-   this.setSize( 'medium' );
if ( !this.sanityCheckVerified ) {
this.showMessage( 'dirtywarning', mw.msg( 
'visualeditor-savedialog-warning-dirty' ) );
}
@@ -139,14 +139,13 @@
} );
break;
case 'conflict':
-   this.setSize( 'medium' );
this.saveButton.setDisabled( true ).$element.hide();
this.reviewButton.$element.hide();
this.reviewGoodButton.$element.hide();
this.resolveConflictButton.$element.show();
break;
case 'review':
-   this.setSize( 'large' );
+   size = 'large';
currentEditSummaryWikitext = 
this.editSummaryInput.getValue();
if ( this.lastEditSummaryWikitext === undefined || 
this.lastEditSummaryWikitext !== currentEditSummaryWikitext ) {
if ( this.editSummaryXhr ) {
@@ -172,7 +171,6 @@
}
/* falls through */
case 'nochanges':
-   this.setSize( 'medium' );
this.saveButton.$element.hide();
this.reviewButton.$element.hide();
this.reviewGoodButton.$element.show();
@@ -180,6 +178,8 @@
break;
}
 
+   // Set the size
+   this.setSize( size );
// Show the target panel
this.panel.setItem( panelObj );
 

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

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

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

[MediaWiki-commits] [Gerrit] Make dialogs a little taller - change (oojs/ui)

[Trevor Parscal (Code Review)]

Trevor Parscal has uploaded a new change for review.

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

Change subject: Make dialogs a little taller
..

Make dialogs a little taller

And perhaps, just a little but prouder.

Change-Id: I09c986e33be66444d2d6bedeb4ae8c278272dbfa
---
M src/styles/Dialog.less
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/05/118405/1

diff --git a/src/styles/Dialog.less b/src/styles/Dialog.less
index ab8473f..0d00c65 100644
--- a/src/styles/Dialog.less
+++ b/src/styles/Dialog.less
@@ -32,17 +32,17 @@
 
&-small .oo-ui-window-frame {
width: 400px;
-   max-height: 200px;
+   max-height: 230px;
}
 
&-medium .oo-ui-window-frame {
width: 600px;
-   max-height: 400px;
+   max-height: 460px;
}
 
&-large .oo-ui-window-frame {
width: 800px;
-   max-height: 600px;
+   max-height: 690px;
}
 
.oo-ui-frame {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I09c986e33be66444d2d6bedeb4ae8c278272dbfa
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: b13844b..744886a - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: b13844b..744886a
..


Syncronize VisualEditor: b13844b..744886a

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

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index b13844b..744886a 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit b13844b051a5161ae309724dfa78e3abea4d7311
+Subproject commit 744886ac1a10d0bbf932e775de3d2add7955b9da

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91296a9dee86e42e2b336998bd20e57ec33ab17e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: b13844b..744886a - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: b13844b..744886a
..

Syncronize VisualEditor: b13844b..744886a

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


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

diff --git a/VisualEditor b/VisualEditor
index b13844b..744886a 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit b13844b051a5161ae309724dfa78e3abea4d7311
+Subproject commit 744886ac1a10d0bbf932e775de3d2add7955b9da

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91296a9dee86e42e2b336998bd20e57ec33ab17e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Make references list dialog small, and vary 'insert' vs. 'ap... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Make references list dialog small, and vary 'insert' vs. 
'apply' button text
..


Make references list dialog small, and vary 'insert' vs. 'apply' button text

Change-Id: I4bbe60ae6a978e73ca55bf55cddbdaca05c56414
---
M VisualEditor.php
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
4 files changed, 18 insertions(+), 6 deletions(-)

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



diff --git a/VisualEditor.php b/VisualEditor.php
index 47f0009..85fbdd3 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -868,6 +868,7 @@
'visualeditor-dialog-reference-title',
'visualeditor-dialog-reference-useexisting-label',
'visualeditor-dialog-referencelist-title',
+   'visualeditor-dialog-referencelist-insert-button',
'visualeditor-dialogbutton-reference-tooltip',
'visualeditor-dialogbutton-referencelist-tooltip',
'visualeditor-reference-input-placeholder',
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 7635244..c4d8f01 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -109,6 +109,7 @@
 "visualeditor-dialog-reference-options-section": "Options",
 "visualeditor-dialog-reference-title": "Reference",
 "visualeditor-dialog-reference-useexisting-label": "Use an existing 
reference",
+"visualeditor-dialog-referencelist-insert-button": "Insert references 
list",
 "visualeditor-dialog-referencelist-title": "References list",
 "visualeditor-dialog-template-title": "Template",
 "visualeditor-dialog-transclusion-add-content": "Add content",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 0e67166..1adc2d4 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -106,7 +106,7 @@
 "visualeditor-dialog-meta-settings-toc-force": "Label for the TOC behavior 
option to always show.\n{{Related|Visualeditor-dialog-meta-settings-toc}}",
 "visualeditor-dialog-meta-settings-toc-label": "Prompt to let the user set 
the Table Of Contents (TOC) behaviour.",
 "visualeditor-dialog-meta-title": "Text of the title for the meta dialog 
to set categories, language links and other page 
settings.\n{{Identical|Options}}",
-"visualeditor-dialog-reference-insert-button": "Used as label for the 
button.\n{{Identical|Insert reference}}",
+"visualeditor-dialog-reference-insert-button": "Used as label for the 
button to insert a new reference.\n{{Identical|Insert reference}}",
 "visualeditor-dialog-reference-insert-title": "Reference insert dialog 
title text.\n{{Identical|Insert reference}}",
 "visualeditor-dialog-reference-options-group-label": "Label for the 
reference group input",
 "visualeditor-dialog-reference-options-group-placeholder": "Placeholder 
for the reference group input",
@@ -114,6 +114,7 @@
 "visualeditor-dialog-reference-options-section": "Label for the reference 
options sub-section.\n{{Identical|Options}}",
 "visualeditor-dialog-reference-title": "{{Identical|Reference}}",
 "visualeditor-dialog-reference-useexisting-label": "Label for button in 
reference dialog to insert a re-use of an existing reference",
+"visualeditor-dialog-referencelist-insert-button": "Used as label for the 
button to insert a new references list.\n{{Identical|Insert references list}}",
 "visualeditor-dialog-referencelist-title": "{{Identical|References list}}",
 "visualeditor-dialog-template-title": "{{Identical|Template}}",
 "visualeditor-dialog-transclusion-add-content": "Label for button that 
adds parameter content to a transclusion.",
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
index 546df5f..f27df95 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
@@ -16,8 +16,14 @@
  * @param {Object} [config] Configuration options
  */
 ve.ui.MWReferenceListDialog = function VeUiMWReferenceListDialog( surface, 
config ) {
+   // Configuration initialization
+   config = ve.extendObject( { 'size': 'small' }, config );
+
// Parent constructor
ve.ui.MWDialog.call( this, surface, config );
+
+   // Properties
+   this.inserting = false;
 };
 
 /* Inheritance */
@@ -47,9 +53,7 @@
'$': this.$, 'scrollable': true, 'padded': true
} );
this.optionsFieldset = new OO.ui.FieldsetLayout( {
-   '$': this.$,
-   'label': ve.msg( 
'visualeditor-dialog-reference-options-section' ),
-   'icon': 'settings'
+   '$': this.$
  

[MediaWiki-commits] [Gerrit] Re-sort the i18n files alphabetically - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Re-sort the i18n files alphabetically
..


Re-sort the i18n files alphabetically

Change-Id: Icbe7b26bf3a6d59e40113675bbae88d32a5b2460
---
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
2 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index c4d8f01..dbf7513 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -151,11 +151,11 @@
 "visualeditor-languageinspector-widget-changelang": "Find language",
 "visualeditor-languages-tool": "Languages",
 "visualeditor-linkinspector-illegal-title": "Invalid page title",
+"visualeditor-linkinspector-suggest-disambig-page": 
"{{PLURAL:$1|Disambiguation page|Disambiguation pages}}",
 "visualeditor-linkinspector-suggest-external-link": "External link",
 "visualeditor-linkinspector-suggest-matching-page": "{{PLURAL:$1|Matching 
page|Matching pages}}",
-"visualeditor-linkinspector-suggest-disambig-page": 
"{{PLURAL:$1|Disambiguation page|Disambiguation pages}}",
-"visualeditor-linkinspector-suggest-redirect-page": "{{PLURAL:$1|Redirect 
page|Redirect pages}}",
 "visualeditor-linkinspector-suggest-new-page": "New page",
+"visualeditor-linkinspector-suggest-redirect-page": "{{PLURAL:$1|Redirect 
page|Redirect pages}}",
 "visualeditor-loadwarning": "Error loading data from server: $1. Would you 
like to retry?",
 "visualeditor-loadwarning-token": "Error loading edit token from server: 
$1. Would you like to retry?",
 "visualeditor-mainnamespacepagelink": "Project:Main namespace",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 1adc2d4..e71cade 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -73,8 +73,8 @@
 "visualeditor-dialog-meta-categories-data-label": "Label for the 
categories sub-section.\n{{Identical|Category}}",
 "visualeditor-dialog-meta-categories-defaultsort-label": "Label for field 
setting the category default sort",
 "visualeditor-dialog-meta-categories-hidden": "Text shown on the category 
popup if the category is hidden",
-"visualeditor-dialog-meta-categories-input-matchingcategorieslabel": 
"Label for hidden suggested category or categories",
 "visualeditor-dialog-meta-categories-input-hiddencategorieslabel": 
"{{Identical|Hidden category}}",
+"visualeditor-dialog-meta-categories-input-matchingcategorieslabel": 
"Label for hidden suggested category or categories",
 "visualeditor-dialog-meta-categories-input-movecategorylabel": "Label for 
moving a given category or categories to end of list",
 "visualeditor-dialog-meta-categories-input-newcategorylabel": "Label for a 
suggested uncreated category",
 "visualeditor-dialog-meta-categories-input-placeholder": "Placeholder text 
for category input\n{{Identical|Add category}}",
@@ -156,11 +156,11 @@
 "visualeditor-languageinspector-widget-changelang": "Used as label for the 
button which is used to change the language of the given block in the language 
inspector.\n{{Identical|Change language}}",
 "visualeditor-languages-tool": "Tool for opening the languages links 
section of the meta dialog.\n{{Identical|Language}}",
 "visualeditor-linkinspector-illegal-title": "Warning that the entered text 
is not a valid page title.",
+"visualeditor-linkinspector-suggest-disambig-page": "Label for suggested 
disambiguation pages in the link inspector. Parameters:\n* $1 - number of 
disambiguation pages, used for plural\n{{Identical|Disambiguation page}}",
 "visualeditor-linkinspector-suggest-external-link": "Label for an external 
(Web) link in the link inspector.\n{{Identical|External link}}",
 "visualeditor-linkinspector-suggest-matching-page": "Label for suggested 
matching local wiki page or pages in the link inspector\nParams:\n* $1 - number 
of matching pages, used for plural",
-"visualeditor-linkinspector-suggest-disambig-page": "Label for suggested 
disambiguation pages in the link inspector. Parameters:\n* $1 - number of 
disambiguation pages, used for plural\n{{Identical|Disambiguation page}}",
-"visualeditor-linkinspector-suggest-redirect-page": "Label for suggested 
redirect pages in the link inspector. Parameters:\n* $1 - number of redirect 
pages, used for plural\n{{Identical|Redirect page}}",
 "visualeditor-linkinspector-suggest-new-page": "Label for a new page in 
the link inspector.\n{{Identical|New page}}",
+"visualeditor-linkinspector-suggest-redirect-page": "Label for suggested 
redirect pages in the link inspector. Parameters:\n* $1 - number of redirect 
pages, used for plural\n{{Identical|Redirect page}}",
 "visualeditor-loadwarning": "Text (JavaScript confirm()) shown when the 
editor fails to lo

[MediaWiki-commits] [Gerrit] Fix parsoidConfig.storeDataParsoid - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

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

Change subject: Fix parsoidConfig.storeDataParsoid
..


Fix parsoidConfig.storeDataParsoid

Should have been part of 2f8c1ee01df524a853ef298994fa958972cbc478.

Change-Id: I922f763553f08d58469a88d9f1e6dbef9669ac04
---
M lib/mediawiki.DOMPostProcessor.js
M lib/mediawiki.DOMUtils.js
2 files changed, 22 insertions(+), 8 deletions(-)

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



diff --git a/lib/mediawiki.DOMPostProcessor.js 
b/lib/mediawiki.DOMPostProcessor.js
index a66492c..19b36c8 100644
--- a/lib/mediawiki.DOMPostProcessor.js
+++ b/lib/mediawiki.DOMPostProcessor.js
@@ -211,12 +211,12 @@
 
// holder for data-parsoid
if ( psd.storeDataParsoid ) {
-   document.data = {
+   DU.setNodeData(document, {
parsoid: {
counter: -1,
ids: {}
}
-   };
+   });
}
 
for (var i = 0; i < this.processors.length; i++) {
@@ -299,6 +299,19 @@
// that our relative links resolve fine when the DOM is viewed directly
// from the web API. (Add the page name, in case it's a subpage.)
appendToHead(document, 'base', { href: wikiPageUrl } );
+
+   // stick data-parsoid in the head
+   if ( psd.storeDataParsoid ) {
+   var dp = JSON.stringify( DU.getDataParsoid( document ) );
+   var script = document.createElement("script");
+   DU.addAttributes(script, {
+   id: "mw-data-parsoid",
+   type: "application/json; 
spec=mediawiki.org/specs/parsoid/data/1.0"
+   });
+   script.appendChild( document.createTextNode(dp) );
+   document.head.appendChild( script );
+   }
+
this.emit( 'document', document );
 };
 
diff --git a/lib/mediawiki.DOMUtils.js b/lib/mediawiki.DOMUtils.js
index fffcdc5..a1ac7b4 100644
--- a/lib/mediawiki.DOMUtils.js
+++ b/lib/mediawiki.DOMUtils.js
@@ -1682,17 +1682,18 @@
//   mw
// but attempts to keep user defined ids.
storeDataParsoid: function ( node, dp ) {
-   var uid = node.id;
-   var document = node.ownerDocument;
+   var uid = node.id,
+   document = node.ownerDocument,
+   docDp = this.getDataParsoid( document );
if ( !uid ) {
do {
-   document.data.parsoid.counter += 1;
-   uid = "mw" + JSUtils.counterToBase64( 
document.data.parsoid.counter );
+   docDp.counter += 1;
+   uid = "mw" + JSUtils.counterToBase64( 
docDp.counter );
} while ( document.getElementById( uid ) );
node.setAttribute( "id", uid );
}
-   document.data.parsoid.ids[uid] = dp;
-   delete node.data.parsoid;
+   docDp.ids[uid] = dp;
+   delete this.getNodeData( node ).parsoid;
}
 
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I922f763553f08d58469a88d9f1e6dbef9669ac04
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] clean up schema migrations - change (wikimedia...crm)

[Mwalker (Code Review)]

Mwalker has submitted this change and it was merged.

Change subject: clean up schema migrations
..


clean up schema migrations

NOTE: apparently the hook_update_N return value is being ignored.
No idea how long that's been the case.  We should rewrite any updates
which should fail hard to use exceptions.

Change-Id: I3ac0a8f6bbed342d75ed4b5d26e435626297de68
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 74d5890..7291261 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -20,6 +20,8 @@
 wmf_civicrm_update_6013();
 wmf_civicrm_update_7014();
 wmf_civicrm_update_7015();
+wmf_civicrm_update_7016();
+wmf_civicrm_update_7017();
 }
 
 /**
@@ -750,7 +752,7 @@
 {
 $ret = array();
 $api = wmf_civicrm_bootstrap_civi();
-$success = $api->CustomTag->create(array(
+$success = $api->Tag->create(array(
 'name' => 'RecurringRestarted',
 'description' => 'For the first contribution of a restarted recurring 
subscription.',
 'is_selectable' => false,
@@ -758,19 +760,18 @@
 'used_for' => 'civicrm_contribution'
 ));
 if (!$success) {
-$ret[] = $api->errorMsg();
+throw new Exception( $api->errorMsg() );
 }
-return $ret;
 }
 
 /**
- * Create recurring restarted contribution tag
+ * Create truncated address tag
  */
 function wmf_civicrm_update_7017()
 {
 $ret = array();
 $api = wmf_civicrm_bootstrap_civi();
-$success = $api->CustomTag->create(array(
+$success = $api->Tag->create(array(
 'name' => 'AddressTruncated',
 'description' => 'Tag applied to a contact when the address was 
truncated on import.',
 'is_selectable' => true,
@@ -778,7 +779,6 @@
 'used_for' => 'civicrm_contact'
 ));
 if (!$success) {
-$ret[] = $api->errorMsg();
+throw new Exception( $api->errorMsg() );
 }
-return $ret;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ac0a8f6bbed342d75ed4b5d26e435626297de68
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Adamw 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] clean up schema migrations - change (wikimedia...crm)

[Adamw (Code Review)]

Adamw has uploaded a new change for review.

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

Change subject: clean up schema migrations
..

clean up schema migrations

NOTE: apparently the hook_update_N return value is being ignored.
No idea how long that's been the case.  We should rewrite any updates
which should fail hard to use exceptions.

Change-Id: I3ac0a8f6bbed342d75ed4b5d26e435626297de68
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/03/118403/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 74d5890..7291261 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -20,6 +20,8 @@
 wmf_civicrm_update_6013();
 wmf_civicrm_update_7014();
 wmf_civicrm_update_7015();
+wmf_civicrm_update_7016();
+wmf_civicrm_update_7017();
 }
 
 /**
@@ -750,7 +752,7 @@
 {
 $ret = array();
 $api = wmf_civicrm_bootstrap_civi();
-$success = $api->CustomTag->create(array(
+$success = $api->Tag->create(array(
 'name' => 'RecurringRestarted',
 'description' => 'For the first contribution of a restarted recurring 
subscription.',
 'is_selectable' => false,
@@ -758,19 +760,18 @@
 'used_for' => 'civicrm_contribution'
 ));
 if (!$success) {
-$ret[] = $api->errorMsg();
+throw new Exception( $api->errorMsg() );
 }
-return $ret;
 }
 
 /**
- * Create recurring restarted contribution tag
+ * Create truncated address tag
  */
 function wmf_civicrm_update_7017()
 {
 $ret = array();
 $api = wmf_civicrm_bootstrap_civi();
-$success = $api->CustomTag->create(array(
+$success = $api->Tag->create(array(
 'name' => 'AddressTruncated',
 'description' => 'Tag applied to a contact when the address was 
truncated on import.',
 'is_selectable' => true,
@@ -778,7 +779,6 @@
 'used_for' => 'civicrm_contact'
 ));
 if (!$success) {
-$ret[] = $api->errorMsg();
+throw new Exception( $api->errorMsg() );
 }
-return $ret;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ac0a8f6bbed342d75ed4b5d26e435626297de68
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Adamw 

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

[MediaWiki-commits] [Gerrit] Adding WP tests to donation interface - change (mediawiki...DonationInterface)

[Katie Horn (Code Review)]

Katie Horn has uploaded a new change for review.

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

Change subject: Adding WP tests to donation interface
..

Adding WP tests to donation interface

Change-Id: Iab00a75a5aaa88ca696ef303b4dc7b1ebf5fc80a
---
M tests/Adapter/AllTests.php
A tests/Adapter/WorldPay/AllTests.php
A tests/Adapter/WorldPay/WorldPayTestCase.php
M tests/AllTests.php
M tests/includes/test_gateway/test.adapter.php
5 files changed, 112 insertions(+), 6 deletions(-)


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

diff --git a/tests/Adapter/AllTests.php b/tests/Adapter/AllTests.php
index c138a13..2a89c86 100644
--- a/tests/Adapter/AllTests.php
+++ b/tests/Adapter/AllTests.php
@@ -14,9 +14,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- *
- * @since  r98249
- * @author Jeremy Postlethwaite 
  */
 
 /**
@@ -28,6 +25,7 @@
 require_once dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'PayPal/AllTests.php';
 require_once dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'Amazon/AllTests.php';
 require_once dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'Adyen/AllTests.php';
+require_once dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 
'WorldPay/AllTests.php';
 
 /**
  * AllTests
@@ -62,6 +60,7 @@
$suite->addTestSuite( 
'DonationInterface_Adapter_PayPal_AllTests' );
$suite->addTestSuite( 
'DonationInterface_Adapter_Amazon_AllTests' );
$suite->addTestSuite( 
'DonationInterface_Adapter_Adyen_AllTests' );
+   $suite->addTestSuite( 
'DonationInterface_Adapter_WorldPay_AllTests' );
 
return $suite;
}
diff --git a/tests/Adapter/WorldPay/AllTests.php 
b/tests/Adapter/WorldPay/AllTests.php
new file mode 100644
index 000..9e696e9
--- /dev/null
+++ b/tests/Adapter/WorldPay/AllTests.php
@@ -0,0 +1,53 @@
+addTestSuite( 
'DonationInterface_Adapter_WorldPay_WorldPayTestCase' );
+   return $suite;
+   }
+}
diff --git a/tests/Adapter/WorldPay/WorldPayTestCase.php 
b/tests/Adapter/WorldPay/WorldPayTestCase.php
new file mode 100644
index 000..22db4c7
--- /dev/null
+++ b/tests/Adapter/WorldPay/WorldPayTestCase.php
@@ -0,0 +1,49 @@
+testAdapterClass = 'TestingWorldPayAdapter';
+   }
+
+   /**
+* Just making sure we can instantiate the thing without blowing up 
completely
+*/
+   function testConstruct() {
+   $options = $this->getDonorTestData();
+   $class = $this->testAdapterClass;
+
+   $_SERVER['REQUEST_URI'] = 
GatewayFormChooser::buildPaymentsFormURL( 'testytest', array ( 'gateway' => 
$class::getIdentifier() ) );
+   $gateway = $this->getFreshGatewayObject( $options );
+
+   $this->assertInstanceOf( 'TestingWorldPayAdapter', $gateway );
+   }
+}
diff --git a/tests/AllTests.php b/tests/AllTests.php
index 8c3c8b3..44ab0db 100644
--- a/tests/AllTests.php
+++ b/tests/AllTests.php
@@ -14,8 +14,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- * @since  r98249
- * @author Jeremy Postlethwaite 
  */
 
 /**
@@ -52,7 +50,7 @@
 
$suite->addTestSuite( 'DonationInterface_Adapter_AllTests' );
$suite->addTestSuite( 'DonationInterface_DonationDataTestCase' 
);
-   //$suite->addTest(DonationInterface_Adapter_AllTests::suite());
+// $suite->addTest(DonationInterface_Adapter_AllTests::suite());
 
return $suite;
}
diff --git a/tests/includes/test_gateway/test.adapter.php 
b/tests/includes/test_gateway/test.adapter.php
index 1a4a8b6..5662672 100644
--- a/tests/includes/test_gateway/test.adapter.php
+++ b/tests/includes/test_gateway/test.adapter.php
@@ -324,3 +324,10 @@
 
 }
 
+/**
+ * TestingWorldPayAdapter
+ */
+class TestingWorldPayAdapter extends WorldPayAdapter {
+
+}
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab00a75a5aaa88ca696ef303b4dc7b1ebf5fc80a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Katie Horn 

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

[MediaWiki-commits] [Gerrit] Don't squash images - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Don't squash images
..

Don't squash images

Since all images added in wikitext get wrapped in a link to the
file page let's restrict the max-width rule to images in links.
This should cover the majority of use cases without impacting
VisualEditor shields

Bug: 62460
Change-Id: I855f9b30b9eecadfe548ab414037cf5f3df086f9
---
M less/common/common.less
1 file changed, 5 insertions(+), 1 deletion(-)


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

diff --git a/less/common/common.less b/less/common/common.less
index bbf530f..d8cecfb 100644
--- a/less/common/common.less
+++ b/less/common/common.less
@@ -274,10 +274,14 @@
}
}
 
-   img {
+   // Prevent inline styles on images in wikitext
+   // Note we restrict to img's to avoid conflicts with VisualEditor 
shields
+   // See bug 62460
+   a > img {
// make sure that images in articles don't cause a horizontal 
scrollbar
// on small screens
max-width: 100% !important;
+   height: auto !important;
}
 
ul {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I855f9b30b9eecadfe548ab414037cf5f3df086f9
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] Updating CentralNotice again to master - change (mediawiki/core)

[Mwalker (Code Review)]

Mwalker has submitted this change and it was merged.

Change subject: Updating CentralNotice again to master
..


Updating CentralNotice again to master

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

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



diff --git a/extensions/CentralNotice b/extensions/CentralNotice
index 6bde6c2..8da7637 16
--- a/extensions/CentralNotice
+++ b/extensions/CentralNotice
-Subproject commit 6bde6c2934415677154a7e291c42710cf90f46b9
+Subproject commit 8da7637165bf7ffc02081498df757ee28c5a4acd

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac7b303271e0fd527938dc39624cdccf36cf209c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf16
Gerrit-Owner: Mwalker 
Gerrit-Reviewer: Mwalker 

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

[MediaWiki-commits] [Gerrit] Updating CentralNotice again to master - change (mediawiki/core)

[Mwalker (Code Review)]

Mwalker has submitted this change and it was merged.

Change subject: Updating CentralNotice again to master
..


Updating CentralNotice again to master

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

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



diff --git a/extensions/CentralNotice b/extensions/CentralNotice
index 6bde6c2..8da7637 16
--- a/extensions/CentralNotice
+++ b/extensions/CentralNotice
-Subproject commit 6bde6c2934415677154a7e291c42710cf90f46b9
+Subproject commit 8da7637165bf7ffc02081498df757ee28c5a4acd

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f50f3f7d8470ae3dcb7b0917c541574a0c6d583
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf17
Gerrit-Owner: Mwalker 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Updating CentralNotice again to master - change (mediawiki/core)

[Mwalker (Code Review)]

Mwalker has uploaded a new change for review.

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

Change subject: Updating CentralNotice again to master
..

Updating CentralNotice again to master

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/00/118400/1

diff --git a/extensions/CentralNotice b/extensions/CentralNotice
index 6bde6c2..8da7637 16
--- a/extensions/CentralNotice
+++ b/extensions/CentralNotice
-Subproject commit 6bde6c2934415677154a7e291c42710cf90f46b9
+Subproject commit 8da7637165bf7ffc02081498df757ee28c5a4acd

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac7b303271e0fd527938dc39624cdccf36cf209c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf16
Gerrit-Owner: Mwalker 

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

[MediaWiki-commits] [Gerrit] Closing & reopening topic - change (mediawiki...Flow)

[Bsitu (Code Review)]

Bsitu has uploaded a new change for review.

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

Change subject: Closing & reopening topic
..

Closing & reopening topic

This is far from complete, just some code to start with.
This will provide the api access for closing/reopenning topic

Change-Id: I4001a21856a9e7e044704ee6f42908e09578ddb8
---
M Flow.i18n.php
M Flow.php
M FlowActions.php
M includes/Block/Topic.php
M includes/Model/AbstractRevision.php
5 files changed, 67 insertions(+), 3 deletions(-)


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

diff --git a/Flow.i18n.php b/Flow.i18n.php
index 02ebf97..fa1591b 100644
--- a/Flow.i18n.php
+++ b/Flow.i18n.php
@@ -89,6 +89,7 @@
'flow-topic-action-history' => 'History',
'flow-topic-action-hide-topic' => 'Hide topic',
'flow-topic-action-delete-topic' => 'Delete topic',
+   'flow-topic-action-close-topic' => 'Close topic',
'flow-topic-action-suppress-topic' => 'Suppress topic',
'flow-topic-action-restore-topic' => 'Restore topic',
 
@@ -111,6 +112,7 @@
'flow-error-restore-failure' => 'Restoration of this item failed.',
'flow-error-invalid-moderation-state' => 'An invalid value was provided 
for moderationState.',
'flow-error-invalid-moderation-reason' => 'Please provide a reason for 
the moderation.',
+   'flow-error-invalid-summary' => 'Please provide a summary.',
'flow-error-not-allowed' => 'Insufficient permissions to execute this 
action.',
'flow-error-title-too-long' => 'Topic titles are restricted to $1 
{{PLURAL:$1|byte|bytes}}.',
'flow-error-no-existing-workflow' => 'This workflow does not yet 
exist.',
@@ -159,6 +161,7 @@
'flow-rev-message-hid-topic' => '$1 {{GENDER:$2|hid}} the [$4 topic] $6 
($5).',
'flow-rev-message-deleted-topic' => '$1 {{GENDER:$2|deleted}} the [$4 
topic] $6 ($5).',
'flow-rev-message-suppressed-topic' => '$1 {{GENDER:$2|suppressed}} the 
[$4 topic] $6 ($5).',
+   'flow-rev-message-closed-topic' => '$1 {{GENDER:$2|closed}} the [$4 
topic] $6 ($5).',
'flow-rev-message-restored-topic' => '$1 {{GENDER:$2|restored}} the [$4 
topic] $6 ($5).',
 
'flow-board-history' => '"$1" history',
@@ -595,6 +598,7 @@
 
 Valid values for moderationState are: (none), hidden, deleted, suppressed',
'flow-error-invalid-moderation-reason' => 'Used as error message when 
no reason is given for the moderation of a post.',
+   'flow-error-invalid-summary' => 'Used as error message when no summary 
is given for actions like closing/reopenning a topic',
'flow-error-not-allowed' => 'Error message when the user has 
insufficient permissions to execute this action',
'flow-error-title-too-long' => 'Used as error message when a user 
submits a topic title that is too long to save.
 
diff --git a/Flow.php b/Flow.php
index b5ac749..addf0ed 100755
--- a/Flow.php
+++ b/Flow.php
@@ -219,9 +219,11 @@
 $wgFlowGroupPermissions = array();
 $wgFlowGroupPermissions['user']['flow-hide'] = true;
 $wgFlowGroupPermissions['sysop']['flow-hide'] = true;
+$wgFlowGroupPermissions['sysop']['flow-close'] = true;
 $wgFlowGroupPermissions['sysop']['flow-delete'] = true;
 $wgFlowGroupPermissions['sysop']['flow-edit-post'] = true;
 $wgFlowGroupPermissions['oversight']['flow-suppress'] = true;
+$wgFlowGroupPermissions['oversight']['flow-close'] = true;
 $wgGroupPermissions = array_merge_recursive( $wgGroupPermissions, 
$wgFlowGroupPermissions );
 
 // Exception
diff --git a/FlowActions.php b/FlowActions.php
index f55e735..b0b5ee0 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -262,6 +262,30 @@
),
),
 
+   'close-topic' => array(
+   'performs-writes' => true,
+   'log_type' => 'close',
+   'permissions' => array(
+   PostRevision::MODERATED_NONE => 'flow-close',
+   PostRevision::MODERATED_HIDDEN => 'flow-close',
+   PostRevision::MODERATED_DELETED => 'flow-close',
+   PostRevision::MODERATED_CLOSED => 'flow-close',
+   ),
+   'button-method' => 'POST',
+   'history' => array(
+   'i18n-message' => 'flow-rev-message-closed-topic',
+   'i18n-params' => array(
+   'user-links',
+   'user-text',
+   'creator-text',
+   'workflow-url',
+   'moderated-reason',
+   'topic-of-post',
+   ),
+   'class' => 'flow-history-closed-topic',
+   ),
+   ),
+
'restore-post' => array(
'performs-writes' => true,
'log_type' => function( PostRevision $revisi

[MediaWiki-commits] [Gerrit] More gracefully handle situations where Parsoid returns a ti... - change (mediawiki...VisualEditor)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: More gracefully handle situations where Parsoid returns a 
timeout failure code (HTTP 504)
..

More gracefully handle situations where Parsoid returns a timeout failure code 
(HTTP 504)

Bug: 50475
Change-Id: I36d0dc2c44a509d4e40ecadcfb5e3df81e01bca9
---
M VisualEditor.php
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
4 files changed, 10 insertions(+), 2 deletions(-)


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

diff --git a/VisualEditor.php b/VisualEditor.php
index 3735bd0..37da6d4 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -204,6 +204,7 @@
// Messages needed by VE in init phase only (rest go 
below)
'visualeditor-loadwarning',
'visualeditor-loadwarning-token',
+   'visualeditor-timeout',
'visualeditor-notification-created',
'visualeditor-notification-restored',
'visualeditor-notification-saved',
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 7103467..8a65a5e 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -153,6 +153,7 @@
 "visualeditor-linkinspector-suggest-new-page": "New page",
 "visualeditor-loadwarning": "Error loading data from server: $1. Would you 
like to retry?",
 "visualeditor-loadwarning-token": "Error loading edit token from server: 
$1. Would you like to retry?",
+"visualeditor-timeout":"It looks like the visual editor is currently 
unavailable; would you like to edit in source mode instead?",
 "visualeditor-mainnamespacepagelink": "Project:Main namespace",
 "visualeditor-media-input-placeholder": "Search for media",
 "visualeditor-meta-tool": "Options",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 2dd3649..dce2407 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -158,6 +158,7 @@
 "visualeditor-linkinspector-suggest-new-page": "Label for a new page in 
the link inspector.\n{{Identical|New page}}",
 "visualeditor-loadwarning": "Text (JavaScript confirm()) shown when the 
editor fails to load properly.\n\nParameters:\n* $1 - the error message from 
the server, in English. e.g. \"parsoidserver-http-bad-status: 404\"",
 "visualeditor-loadwarning-token": "Text (JavaScript confirm()) shown when 
the editor fails to load properly.\n\nParameters:\n* $1 - the error message 
from the server.",
+"visualeditor-timeout":"Text (JavaScript confirm()) shown when the editor 
fails to load properly due to a 504 Gateway Timeout error.",
 "visualeditor-mainnamespacepagelink": "Name of a page describing the main 
namespace (NS0) in this project.\n{{doc-important|Do not translate \"Project\"; 
it is automatically converted to the wiki's project namespace.}}",
 "visualeditor-media-input-placeholder": "Place holder text for media 
search input",
 "visualeditor-meta-tool": "Text of tool in the toolbar the lets users set 
categories, language links and other page settings.\n{{Identical|Options}}",
@@ -230,4 +231,4 @@
 "visualeditor-wikitext-warning": "Contents of notification displayed when 
Wikitext has been detected.\n\nRefers to:\n* 
{{msg-mw|Visualeditor-wikitext-warning-link}}\n* 
{{msg-mw|Visualeditor-ca-editsource}}",
 "visualeditor-wikitext-warning-link": "Link to page describing what 
Wikitext is.\n\nUsed in:\n* {{msg-mw|Visualeditor-wikitext-warning}}.",
 "visualeditor-wikitext-warning-title": "Title of notification displayed 
when Wikitext has been detected"
-}
\ No newline at end of file
+}
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index d90bd2c..b26f2f4 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -315,10 +315,15 @@
// The response.status check here is to catch aborts triggered by 
navigation away from the page
if (
status !== 'abort' &&
-   ( !jqXHR || jqXHR.status !== 0 ) &&
+   ( !jqXHR || ( jqXHR.status !== 0 && jqXHR.status !== 504 ) ) &&
confirm( ve.msg( 'visualeditor-loadwarning', status ) )
) {
this.load();
+   } else if (
+   jqXHR && jqXHR.status === 504 &&
+   confirm( ve.msg( 'visualeditor-timeout' ) )
+   ) {
+   window.location.search = 'action=edit';
} else {
this.activating = false;
// User interface changes

-- 
To view, visit https://gerrit.wikimedia.org/r/118398
To unsubscribe, vis

[MediaWiki-commits] [Gerrit] Re-sort the i18n files alphabetically - change (mediawiki...VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Re-sort the i18n files alphabetically
..

Re-sort the i18n files alphabetically

Change-Id: Icbe7b26bf3a6d59e40113675bbae88d32a5b2460
---
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
2 files changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index c4d8f01..dbf7513 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -151,11 +151,11 @@
 "visualeditor-languageinspector-widget-changelang": "Find language",
 "visualeditor-languages-tool": "Languages",
 "visualeditor-linkinspector-illegal-title": "Invalid page title",
+"visualeditor-linkinspector-suggest-disambig-page": 
"{{PLURAL:$1|Disambiguation page|Disambiguation pages}}",
 "visualeditor-linkinspector-suggest-external-link": "External link",
 "visualeditor-linkinspector-suggest-matching-page": "{{PLURAL:$1|Matching 
page|Matching pages}}",
-"visualeditor-linkinspector-suggest-disambig-page": 
"{{PLURAL:$1|Disambiguation page|Disambiguation pages}}",
-"visualeditor-linkinspector-suggest-redirect-page": "{{PLURAL:$1|Redirect 
page|Redirect pages}}",
 "visualeditor-linkinspector-suggest-new-page": "New page",
+"visualeditor-linkinspector-suggest-redirect-page": "{{PLURAL:$1|Redirect 
page|Redirect pages}}",
 "visualeditor-loadwarning": "Error loading data from server: $1. Would you 
like to retry?",
 "visualeditor-loadwarning-token": "Error loading edit token from server: 
$1. Would you like to retry?",
 "visualeditor-mainnamespacepagelink": "Project:Main namespace",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 1adc2d4..e71cade 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -73,8 +73,8 @@
 "visualeditor-dialog-meta-categories-data-label": "Label for the 
categories sub-section.\n{{Identical|Category}}",
 "visualeditor-dialog-meta-categories-defaultsort-label": "Label for field 
setting the category default sort",
 "visualeditor-dialog-meta-categories-hidden": "Text shown on the category 
popup if the category is hidden",
-"visualeditor-dialog-meta-categories-input-matchingcategorieslabel": 
"Label for hidden suggested category or categories",
 "visualeditor-dialog-meta-categories-input-hiddencategorieslabel": 
"{{Identical|Hidden category}}",
+"visualeditor-dialog-meta-categories-input-matchingcategorieslabel": 
"Label for hidden suggested category or categories",
 "visualeditor-dialog-meta-categories-input-movecategorylabel": "Label for 
moving a given category or categories to end of list",
 "visualeditor-dialog-meta-categories-input-newcategorylabel": "Label for a 
suggested uncreated category",
 "visualeditor-dialog-meta-categories-input-placeholder": "Placeholder text 
for category input\n{{Identical|Add category}}",
@@ -156,11 +156,11 @@
 "visualeditor-languageinspector-widget-changelang": "Used as label for the 
button which is used to change the language of the given block in the language 
inspector.\n{{Identical|Change language}}",
 "visualeditor-languages-tool": "Tool for opening the languages links 
section of the meta dialog.\n{{Identical|Language}}",
 "visualeditor-linkinspector-illegal-title": "Warning that the entered text 
is not a valid page title.",
+"visualeditor-linkinspector-suggest-disambig-page": "Label for suggested 
disambiguation pages in the link inspector. Parameters:\n* $1 - number of 
disambiguation pages, used for plural\n{{Identical|Disambiguation page}}",
 "visualeditor-linkinspector-suggest-external-link": "Label for an external 
(Web) link in the link inspector.\n{{Identical|External link}}",
 "visualeditor-linkinspector-suggest-matching-page": "Label for suggested 
matching local wiki page or pages in the link inspector\nParams:\n* $1 - number 
of matching pages, used for plural",
-"visualeditor-linkinspector-suggest-disambig-page": "Label for suggested 
disambiguation pages in the link inspector. Parameters:\n* $1 - number of 
disambiguation pages, used for plural\n{{Identical|Disambiguation page}}",
-"visualeditor-linkinspector-suggest-redirect-page": "Label for suggested 
redirect pages in the link inspector. Parameters:\n* $1 - number of redirect 
pages, used for plural\n{{Identical|Redirect page}}",
 "visualeditor-linkinspector-suggest-new-page": "Label for a new page in 
the link inspector.\n{{Identical|New page}}",
+"visualeditor-linkinspector-suggest-redirect-page": "Label for suggested 
redirect pages in the link inspector. Parameters:\n* $1 - number of redirect 
pages, used for plural\n{{Identical|Redirect page}}",
 "visualeditor-loadwarning": "Text (J

[MediaWiki-commits] [Gerrit] Updating CentralNotice again to master - change (mediawiki/core)

[Mwalker (Code Review)]

Mwalker has uploaded a new change for review.

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

Change subject: Updating CentralNotice again to master
..

Updating CentralNotice again to master

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/96/118396/1

diff --git a/extensions/CentralNotice b/extensions/CentralNotice
index 6bde6c2..8da7637 16
--- a/extensions/CentralNotice
+++ b/extensions/CentralNotice
-Subproject commit 6bde6c2934415677154a7e291c42710cf90f46b9
+Subproject commit 8da7637165bf7ffc02081498df757ee28c5a4acd

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f50f3f7d8470ae3dcb7b0917c541574a0c6d583
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf17
Gerrit-Owner: Mwalker 

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

[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'gerrit/master' into wmf_deploy - change (mediawiki...CentralNotice)

[Mwalker (Code Review)]

Mwalker has submitted this change and it was merged.

Change subject: Merge remote-tracking branch 'gerrit/master' into wmf_deploy
..


Merge remote-tracking branch 'gerrit/master' into wmf_deploy

* gerrit/master:
  IE needs lists apparently

Change-Id: I77dbed0838ede6412ad876f3a197f01331515258
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Mwalker: Looks good to me, approved




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I77dbed0838ede6412ad876f3a197f01331515258
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: wmf_deploy
Gerrit-Owner: Mwalker 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'gerrit/master' into wmf_deploy - change (mediawiki...CentralNotice)

[Mwalker (Code Review)]

Mwalker has uploaded a new change for review.

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

Change subject: Merge remote-tracking branch 'gerrit/master' into wmf_deploy
..

Merge remote-tracking branch 'gerrit/master' into wmf_deploy

* gerrit/master:
  IE needs lists apparently

Change-Id: I77dbed0838ede6412ad876f3a197f01331515258
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice 
refs/changes/95/118395/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77dbed0838ede6412ad876f3a197f01331515258
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: wmf_deploy
Gerrit-Owner: Mwalker 

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

[MediaWiki-commits] [Gerrit] Make references list dialog small, and vary 'insert' vs. 'ap... - change (mediawiki...VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Make references list dialog small, and vary 'insert' vs. 
'apply' button text
..

Make references list dialog small, and vary 'insert' vs. 'apply' button text

Change-Id: I4bbe60ae6a978e73ca55bf55cddbdaca05c56414
---
M VisualEditor.php
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
4 files changed, 16 insertions(+), 2 deletions(-)


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

diff --git a/VisualEditor.php b/VisualEditor.php
index 47f0009..85fbdd3 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -868,6 +868,7 @@
'visualeditor-dialog-reference-title',
'visualeditor-dialog-reference-useexisting-label',
'visualeditor-dialog-referencelist-title',
+   'visualeditor-dialog-referencelist-insert-button',
'visualeditor-dialogbutton-reference-tooltip',
'visualeditor-dialogbutton-referencelist-tooltip',
'visualeditor-reference-input-placeholder',
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 7635244..c4d8f01 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -109,6 +109,7 @@
 "visualeditor-dialog-reference-options-section": "Options",
 "visualeditor-dialog-reference-title": "Reference",
 "visualeditor-dialog-reference-useexisting-label": "Use an existing 
reference",
+"visualeditor-dialog-referencelist-insert-button": "Insert references 
list",
 "visualeditor-dialog-referencelist-title": "References list",
 "visualeditor-dialog-template-title": "Template",
 "visualeditor-dialog-transclusion-add-content": "Add content",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 0e67166..1adc2d4 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -106,7 +106,7 @@
 "visualeditor-dialog-meta-settings-toc-force": "Label for the TOC behavior 
option to always show.\n{{Related|Visualeditor-dialog-meta-settings-toc}}",
 "visualeditor-dialog-meta-settings-toc-label": "Prompt to let the user set 
the Table Of Contents (TOC) behaviour.",
 "visualeditor-dialog-meta-title": "Text of the title for the meta dialog 
to set categories, language links and other page 
settings.\n{{Identical|Options}}",
-"visualeditor-dialog-reference-insert-button": "Used as label for the 
button.\n{{Identical|Insert reference}}",
+"visualeditor-dialog-reference-insert-button": "Used as label for the 
button to insert a new reference.\n{{Identical|Insert reference}}",
 "visualeditor-dialog-reference-insert-title": "Reference insert dialog 
title text.\n{{Identical|Insert reference}}",
 "visualeditor-dialog-reference-options-group-label": "Label for the 
reference group input",
 "visualeditor-dialog-reference-options-group-placeholder": "Placeholder 
for the reference group input",
@@ -114,6 +114,7 @@
 "visualeditor-dialog-reference-options-section": "Label for the reference 
options sub-section.\n{{Identical|Options}}",
 "visualeditor-dialog-reference-title": "{{Identical|Reference}}",
 "visualeditor-dialog-reference-useexisting-label": "Label for button in 
reference dialog to insert a re-use of an existing reference",
+"visualeditor-dialog-referencelist-insert-button": "Used as label for the 
button to insert a new references list.\n{{Identical|Insert references list}}",
 "visualeditor-dialog-referencelist-title": "{{Identical|References list}}",
 "visualeditor-dialog-template-title": "{{Identical|Template}}",
 "visualeditor-dialog-transclusion-add-content": "Label for button that 
adds parameter content to a transclusion.",
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
index 546df5f..bc5a8aa 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
@@ -16,8 +16,14 @@
  * @param {Object} [config] Configuration options
  */
 ve.ui.MWReferenceListDialog = function VeUiMWReferenceListDialog( surface, 
config ) {
+   // Configuration initialization
+   config = ve.extendObject( { 'size': 'small' }, config );
+
// Parent constructor
ve.ui.MWDialog.call( this, surface, config );
+
+   // Properties
+   this.inserting = false;
 };
 
 /* Inheritance */
@@ -64,7 +70,11 @@
 
this.applyButton = new OO.ui.ButtonWidget( {
'$': this.$,
-   'label': ve.msg( 'visualeditor-dialog-action-apply' ),
+   'label': ve.msg (
+   !this.inserting ?
+   

[MediaWiki-commits] [Gerrit] IE needs lists apparently - change (mediawiki...CentralNotice)

[Adamw (Code Review)]

Adamw has submitted this change and it was merged.

Change subject: IE needs lists apparently
..


IE needs lists apparently

Follow up to I3aafd584fb4b4d15bfe82c6550c648006915c144

Bug: 62552

Change-Id: Ib1995266bb8c4ad52eb735a8623d7890b50fd2a7
---
M modules/ext.centralNotice.bannerController/bannerController.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Adamw: Looks good to me, approved



diff --git a/modules/ext.centralNotice.bannerController/bannerController.js 
b/modules/ext.centralNotice.bannerController/bannerController.js
index cce89af..02d8d36 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -39,7 +39,7 @@
if ( typeof window.Geo !== 'object' ) {
window.Geo = ( function ( match, country, city, lat, lon, af ) {
return { country: country, city: city, lat: lat, lon: 
lon, af: af };
-   } ).apply( null, document.cookie.match( 
/(?:\bGeoIP=)([^:]*):([^:]*):([^:]*):([^:]*):([^;]*)/ ) || {} );
+   } ).apply( null, document.cookie.match( 
/(?:\bGeoIP=)([^:]*):([^:]*):([^:]*):([^:]*):([^;]*)/ ) || [] );
}
 
mw.centralNotice = {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1995266bb8c4ad52eb735a8623d7890b50fd2a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Mwalker 
Gerrit-Reviewer: Adamw 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] IE needs lists apparently - change (mediawiki...CentralNotice)

[Mwalker (Code Review)]

Mwalker has uploaded a new change for review.

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

Change subject: IE needs lists apparently
..

IE needs lists apparently

Follow up to I3aafd584fb4b4d15bfe82c6550c648006915c144

Bug: 62552

Change-Id: Ib1995266bb8c4ad52eb735a8623d7890b50fd2a7
---
M modules/ext.centralNotice.bannerController/bannerController.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice 
refs/changes/93/118393/1

diff --git a/modules/ext.centralNotice.bannerController/bannerController.js 
b/modules/ext.centralNotice.bannerController/bannerController.js
index cce89af..02d8d36 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -39,7 +39,7 @@
if ( typeof window.Geo !== 'object' ) {
window.Geo = ( function ( match, country, city, lat, lon, af ) {
return { country: country, city: city, lat: lat, lon: 
lon, af: af };
-   } ).apply( null, document.cookie.match( 
/(?:\bGeoIP=)([^:]*):([^:]*):([^:]*):([^:]*):([^;]*)/ ) || {} );
+   } ).apply( null, document.cookie.match( 
/(?:\bGeoIP=)([^:]*):([^:]*):([^:]*):([^:]*):([^;]*)/ ) || [] );
}
 
mw.centralNotice = {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1995266bb8c4ad52eb735a8623d7890b50fd2a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Mwalker 

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

[MediaWiki-commits] [Gerrit] Changing URLs of mediawiki.org in scripts to the SSL-based w... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Changing URLs of mediawiki.org in scripts to the SSL-based 
website
..


Changing URLs of mediawiki.org in scripts to the SSL-based website

http://www.mediawiki.org --> https://www.mediawiki.org

Part 2

Change-Id: I3be61fe3dfb502cc20180486eb1a8016eac151df
---
M img_auth.php
M includes/AuthPlugin.php
M includes/DefaultSettings.php
M includes/Export.php
M includes/Feed.php
M includes/Import.php
M includes/PHPVersionError.php
M includes/ProtectionForm.php
M includes/Sanitizer.php
M includes/WebRequest.php
M includes/WikiMap.php
M includes/db/CloneDatabase.php
M includes/htmlform/HTMLForm.php
M includes/installer/InstallDocFormatter.php
M includes/installer/LocalSettingsGenerator.php
M includes/installer/WebInstallerOutput.php
M tests/phpunit/includes/installer/InstallDocFormatterTest.php
17 files changed, 29 insertions(+), 29 deletions(-)

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



diff --git a/img_auth.php b/img_auth.php
index 72a7dab..7765dd3 100644
--- a/img_auth.php
+++ b/img_auth.php
@@ -2,7 +2,7 @@
 /**
  * Image authorisation script
  *
- * To use this, see http://www.mediawiki.org/wiki/Manual:Image_Authorization
+ * To use this, see https://www.mediawiki.org/wiki/Manual:Image_Authorization
  *
  * - Set $wgUploadDirectory to a non-public directory (not web accessible)
  * - Set $wgUploadPath to point to this file
diff --git a/includes/AuthPlugin.php b/includes/AuthPlugin.php
index c7b0c97..217744e 100644
--- a/includes/AuthPlugin.php
+++ b/includes/AuthPlugin.php
@@ -3,7 +3,7 @@
  * Authentication plugin interface
  *
  * Copyright © 2004 Brion Vibber 
- * http://www.mediawiki.org/
+ * https://www.mediawiki.org/
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 28f37d2..50db6c7 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -15,7 +15,7 @@
  * performed in LocalSettings.php.
  *
  * Documentation is in the source and on:
- * http://www.mediawiki.org/wiki/Manual:Configuration_settings
+ * https://www.mediawiki.org/wiki/Manual:Configuration_settings
  *
  * @warning  Note: this (and other things) will break if the autoloader is not
  * enabled. Please include includes/AutoLoader.php before including this file.
@@ -2256,7 +2256,7 @@
  * although they are referred to as Squid settings for historical reasons.
  *
  * Achieving a high hit ratio with an HTTP proxy requires special
- * configuration. See http://www.mediawiki.org/wiki/Manual:Squid_caching for
+ * configuration. See https://www.mediawiki.org/wiki/Manual:Squid_caching for
  * more details.
  *
  * @{
@@ -2264,7 +2264,7 @@
 
 /**
  * Enable/disable Squid.
- * See http://www.mediawiki.org/wiki/Manual:Squid_caching
+ * See https://www.mediawiki.org/wiki/Manual:Squid_caching
  */
 $wgUseSquid = false;
 
@@ -3927,7 +3927,7 @@
  * if $wgUseCommaCount is false, it will be 'link', if it is true
  * it will be 'comma'
  *
- * See also See http://www.mediawiki.org/wiki/Manual:Article_count
+ * See also See https://www.mediawiki.org/wiki/Manual:Article_count
  *
  * Retroactively changing this variable will not affect the existing count,
  * to update it, you will need to run the maintenance/updateArticleCount.php
@@ -4173,7 +4173,7 @@
  *
  * @note Also that this will only protect _pages in the wiki_. Uploaded files
  * will remain readable. You can use img_auth.php to protect uploaded files,
- * see http://www.mediawiki.org/wiki/Manual:Image_Authorization
+ * see https://www.mediawiki.org/wiki/Manual:Image_Authorization
  */
 $wgWhitelistRead = false;
 
@@ -4910,7 +4910,7 @@
  */
 
 /**
- * Filename for debug logging. See http://www.mediawiki.org/wiki/How_to_debug
+ * Filename for debug logging. See https://www.mediawiki.org/wiki/How_to_debug
  * The debug log file should be not be publicly accessible if it is used, as it
  * may contain private data.
  */
@@ -5197,7 +5197,7 @@
  *
  * Something like this:
  * $wgParserTestRemote = array(
- * 'api-url' => 'http://www.mediawiki.org/w/api.php',
+ * 'api-url' => 'https://www.mediawiki.org/w/api.php',
  * 'repo'=> 'MediaWiki',
  * 'suite'   => 'ParserTests',
  * 'path'=> '/trunk/phase3', // not used client-side; for reference
@@ -6605,7 +6605,7 @@
  * Enable the MediaWiki API for convenient access to
  * machine-readable data via api.php
  *
- * See http://www.mediawiki.org/wiki/API
+ * See https://www.mediawiki.org/wiki/API
  */
 $wgEnableAPI = true;
 
diff --git a/includes/Export.php b/includes/Export.php
index 639ba28..56fe452 100644
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -3,7 +3,7 @@
  * Base classes for dumps and export
  *
  * Copyright © 2003, 2005, 2006 Brion 

[MediaWiki-commits] [Gerrit] Add fallback template description with link to template page - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Add fallback template description with link to template page
..


Add fallback template description with link to template page

Shown when there's no template data.

Someday in the future, we will support adding a description inline. Not
yet. Calm down.

Change-Id: I18c0a591b60de53bc124d82c688d71d30ad1d5dd
---
M VisualEditor.php
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
M modules/ve-mw/ui/styles/ve.ui.MWPage.css
5 files changed, 28 insertions(+), 3 deletions(-)

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



diff --git a/VisualEditor.php b/VisualEditor.php
index b249c9f..d32945e 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -922,6 +922,7 @@
'visualeditor-dialog-transclusion-insert-transclusion',
'visualeditor-dialog-transclusion-loading',
'visualeditor-dialog-transclusion-multiple-mode',
+   
'visualeditor-dialog-transclusion-no-template-description',
'visualeditor-dialog-transclusion-options',
'visualeditor-dialog-transclusion-placeholder',
'visualeditor-dialog-transclusion-remove-content',
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 8dc3963..7635244 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -119,6 +119,7 @@
 "visualeditor-dialog-transclusion-insert-transclusion": "Insert 
transclusion",
 "visualeditor-dialog-transclusion-loading": "Loading...",
 "visualeditor-dialog-transclusion-multiple-mode": "Show options",
+"visualeditor-dialog-transclusion-no-template-description": "You are 
adding the \"$1\" template to this page. It doesn't yet have a description, but 
there might be some information on the template's page.",
 "visualeditor-dialog-transclusion-options": "Options",
 "visualeditor-dialog-transclusion-placeholder": "New template",
 "visualeditor-dialog-transclusion-remove-content": "Remove content",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 677b6f9..0e67166 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -124,6 +124,7 @@
 "visualeditor-dialog-transclusion-insert-transclusion": "Label for button 
in the transclusion dialog while in multiple mode that closes the dialog 
inserts a transclusion",
 "visualeditor-dialog-transclusion-loading": "Label for the apply button in 
the transclusion dialog while it is disabled and loading",
 "visualeditor-dialog-transclusion-multiple-mode": "Label for button that 
shows advanced options in transclusion dialog",
+"visualeditor-dialog-transclusion-no-template-description": "Message to 
user that no template information is available for the template.\n\n* $1 is the 
title of the template.\n* $2 contains attributes for the link to the template's 
page.",
 "visualeditor-dialog-transclusion-options": "Label for section with 
options for templates, content or parameters.\n{{Identical|Options}}",
 "visualeditor-dialog-transclusion-placeholder": "Label for section with 
options for adding a new template to a multi part transclusion",
 "visualeditor-dialog-transclusion-remove-content": "Label for button that 
removes content between transclusion parts",
@@ -233,4 +234,4 @@
 "visualeditor-wikitext-warning": "Contents of notification displayed when 
Wikitext has been detected.\n\nRefers to:\n* 
{{msg-mw|Visualeditor-wikitext-warning-link}}\n* 
{{msg-mw|Visualeditor-ca-editsource}}",
 "visualeditor-wikitext-warning-link": "Link to page describing what 
Wikitext is.\n\nUsed in:\n* {{msg-mw|Visualeditor-wikitext-warning}}.",
 "visualeditor-wikitext-warning-title": "Title of notification displayed 
when Wikitext has been detected"
-}
\ No newline at end of file
+}
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
index a02e266..4de22ef 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
@@ -5,6 +5,8 @@
  * @license The MIT License (MIT); see LICENSE.txt
  */
 
+/*global mw */
+
 /**
  * MediaWiki transclusion dialog template page.
  *
@@ -17,6 +19,8 @@
  * @param {Object} [config] Configuration options
  */
 ve.ui.MWTemplatePage = function VeUiMWTemplatePage( template, name, config ) {
+   var title;
+
// Parent constructor
OO.ui.PageLayout.call( this, name, config );
 
@@ -24,6 +28,7 @@
this.template = template;
this.spec = template.getSpec();
this.$more = this.$( '' );
+   this.$description = this.$( '' );
this.removeButton = new OO.ui.ButtonWidget( {
'$': this.$,

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 1381192..b13844b - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 1381192..b13844b
..


Syncronize VisualEditor: 1381192..b13844b

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

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 1381192..b13844b 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 13811925b9eae9e874a9ef771148e9c0c27c029d
+Subproject commit b13844b051a5161ae309724dfa78e3abea4d7311

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7b3142c0b10b3f1851bf5e45b60983d2715fdc6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 1381192..b13844b - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 1381192..b13844b
..

Syncronize VisualEditor: 1381192..b13844b

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/92/118392/1

diff --git a/VisualEditor b/VisualEditor
index 1381192..b13844b 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 13811925b9eae9e874a9ef771148e9c0c27c029d
+Subproject commit b13844b051a5161ae309724dfa78e3abea4d7311

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7b3142c0b10b3f1851bf5e45b60983d2715fdc6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

___
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 (8c017ae) - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

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


Update VE core submodule to master (8c017ae)

Also update VE-MW for the comment changes in VE core

New changes:
4ad6a3d Add text direction to SA demo
89503e8 ve.ce.Node: Emphasise slug transition with increasing outline offset
864046e Update oojs to v1.0.8
65d1338 Localisation updates from https://translatewiki.net.
b66d482 Stop special-casing comments and recognize them as tagName='#comment' 
instead
09dda12 ve.ce.getDomText: Document node types and use .data instead of 
.nodeValue
b0a3b2a Make ve.dm.Converter assertions actually display message
ef791cc Make 'comment' its own metaitem type
d5ef0d7 ve.dm.Converter: Refer to nodes instead of elements where appropiate
c22c8af Fix JS error when pressing Enter with selection across multiple 
paragraphs
a26a708 Add ve.dm.Transaction.newFromReplacement
a9e136e Don't cause needless surface refreshes on overwriting.
6fd35ee Split part of getOpeningHtmlTag out to getHtmlAttributes
2c31f67 ve.ce.Surface: Document version number in focus workaround for Opera
e069e74 Add some more characters to the special character inserter

Change-Id: I859805fb261468e8fae9454c4992115369066b49
---
M VisualEditor.php
M lib/ve
M modules/ve-mw/test/dm/ve.dm.Converter.test.js
M modules/ve-mw/test/dm/ve.dm.mwExample.js
4 files changed, 17 insertions(+), 16 deletions(-)

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



diff --git a/VisualEditor.php b/VisualEditor.php
index 3735bd0..5848494 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -359,6 +359,7 @@

'lib/ve/modules/ve/dm/annotations/ve.dm.TextStyleAnnotation.js',
 
'lib/ve/modules/ve/dm/metaitems/ve.dm.AlienMetaItem.js',
+   
'lib/ve/modules/ve/dm/metaitems/ve.dm.CommentMetaItem.js',
 
// ce
'lib/ve/modules/ve/ce/ve.ce.js',
diff --git a/lib/ve b/lib/ve
index a2ac637..8c017ae 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit a2ac637d82dcf14e9b8e3ce5bbb2929489b0df39
+Subproject commit 8c017aedbee8d6a30ef949a67d483e7b072537b5
diff --git a/modules/ve-mw/test/dm/ve.dm.Converter.test.js 
b/modules/ve-mw/test/dm/ve.dm.Converter.test.js
index 0f1240a..d03ae05 100644
--- a/modules/ve-mw/test/dm/ve.dm.Converter.test.js
+++ b/modules/ve-mw/test/dm/ve.dm.Converter.test.js
@@ -35,7 +35,7 @@
originalConfig = setMwConfig( caseItem.mwConfig );
}
 
-   ve.test.utils.runGetModelFromDomTest( assert, caseItem );
+   ve.test.utils.runGetModelFromDomTest( assert, caseItem, msg );
 
if ( caseItem.mwConfig ) {
setMwConfig( originalConfig );
@@ -56,7 +56,7 @@
originalConfig = setMwConfig( caseItem.mwConfig );
}
 
-   ve.test.utils.runGetDomFromModelTest( assert, caseItem );
+   ve.test.utils.runGetDomFromModelTest( assert, caseItem, msg );
 
if ( caseItem.mwConfig ) {
setMwConfig( originalConfig );
diff --git a/modules/ve-mw/test/dm/ve.dm.mwExample.js 
b/modules/ve-mw/test/dm/ve.dm.mwExample.js
index d16e528..3e8d8a8 100644
--- a/modules/ve-mw/test/dm/ve.dm.mwExample.js
+++ b/modules/ve-mw/test/dm/ve.dm.mwExample.js
@@ -289,12 +289,12 @@
 
 ve.dm.mwExample.withMeta = [
{
-   'type': 'alienMeta',
+   'type': 'comment',
'attributes': {
-   'domElements': $( '' 
).toArray()
+   'text': ' No content conversion '
}
},
-   { 'type': '/alienMeta' },
+   { 'type': '/comment' },
{
'type': 'mwAlienMeta',
'attributes': {
@@ -341,12 +341,12 @@
'B',
'a',
{
-   'type': 'alienMeta',
+   'type': 'comment',
'attributes': {
-   'domElements': $( '' ).toArray()
+   'text': ' inline '
}
},
-   { 'type': '/alienMeta' },
+   { 'type': '/comment' },
'z',
{ 'type': '/paragraph' },
{
@@ -357,12 +357,12 @@
},
{ 'type': '/mwAlienMeta' },
{
-   'type': 'alienMeta',
+   'type': 'comment',
'attributes': {
-   'domElements': $( '' ).toArray()
+   'text': 'barbaz'
}
},
-   { 'type': '/alienMeta' },
+   { 'type': '/comment' },
{
'type': 'mwCategory',
'attributes': {
@@ -482,9 +482,9 @@
}
},
{
-   'type': 'alienMeta',
+   'type': 'comment',
'

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 85b4f8c..1381192 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 85b4f8c..1381192
..


Syncronize VisualEditor: 85b4f8c..1381192

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

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 85b4f8c..1381192 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 85b4f8c063c5cf95b1f97538f3d2b1ba82677727
+Subproject commit 13811925b9eae9e874a9ef771148e9c0c27c029d

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f2e18c8b1b6f53b829d523f91fdc8e18ccd4f9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 85b4f8c..1381192 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 85b4f8c..1381192
..

Syncronize VisualEditor: 85b4f8c..1381192

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/91/118391/1

diff --git a/VisualEditor b/VisualEditor
index 85b4f8c..1381192 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 85b4f8c063c5cf95b1f97538f3d2b1ba82677727
+Subproject commit 13811925b9eae9e874a9ef771148e9c0c27c029d

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f2e18c8b1b6f53b829d523f91fdc8e18ccd4f9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 37277c7..85b4f8c - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 37277c7..85b4f8c
..


Syncronize VisualEditor: 37277c7..85b4f8c

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

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 37277c7..85b4f8c 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 37277c762f76f2dcddb1cc47c41a432d9ce5929e
+Subproject commit 85b4f8c063c5cf95b1f97538f3d2b1ba82677727

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd3219e3323bab2467de9620c32add4caa0ae94d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 37277c7..85b4f8c - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 37277c7..85b4f8c
..

Syncronize VisualEditor: 37277c7..85b4f8c

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/90/118390/1

diff --git a/VisualEditor b/VisualEditor
index 37277c7..85b4f8c 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 37277c762f76f2dcddb1cc47c41a432d9ce5929e
+Subproject commit 85b4f8c063c5cf95b1f97538f3d2b1ba82677727

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd3219e3323bab2467de9620c32add4caa0ae94d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Keep label and disabled state of transclusion dialog apply b... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Keep label and disabled state of transclusion dialog apply 
button in sync
..


Keep label and disabled state of transclusion dialog apply button in sync

* Use "Insert template" when adding a single template
* Use "Insert transclusion" when adding a multi-part template
* Use "Apply changes" when working with an existing tranclusion
* Use "Loading..." and disable while waiting for template data
* Disable when the transclusion has only a template placeholder

Bug: 50998
Change-Id: Ib2fb3d8711ed6d3ef41cc0db55740c95394dd3f9
---
M VisualEditor.php
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
4 files changed, 66 insertions(+), 17 deletions(-)

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



diff --git a/VisualEditor.php b/VisualEditor.php
index 3735bd0..b249c9f 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -918,6 +918,9 @@
'visualeditor-dialog-transclusion-add-param',
'visualeditor-dialog-transclusion-add-template',
'visualeditor-dialog-transclusion-content',
+   'visualeditor-dialog-transclusion-insert-template',
+   'visualeditor-dialog-transclusion-insert-transclusion',
+   'visualeditor-dialog-transclusion-loading',
'visualeditor-dialog-transclusion-multiple-mode',
'visualeditor-dialog-transclusion-options',
'visualeditor-dialog-transclusion-placeholder',
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 7103467..8dc3963 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -115,6 +115,9 @@
 "visualeditor-dialog-transclusion-add-param": "Add parameter",
 "visualeditor-dialog-transclusion-add-template": "Add template",
 "visualeditor-dialog-transclusion-content": "Content",
+"visualeditor-dialog-transclusion-insert-template": "Insert template",
+"visualeditor-dialog-transclusion-insert-transclusion": "Insert 
transclusion",
+"visualeditor-dialog-transclusion-loading": "Loading...",
 "visualeditor-dialog-transclusion-multiple-mode": "Show options",
 "visualeditor-dialog-transclusion-options": "Options",
 "visualeditor-dialog-transclusion-placeholder": "New template",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 2dd3649..677b6f9 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -120,6 +120,9 @@
 "visualeditor-dialog-transclusion-add-param": "Label for button that adds 
parameter a parameter to a template.\n{{Identical|Add parameter}}",
 "visualeditor-dialog-transclusion-add-template": "Label for button that 
adds parameter a template to a transclusion.\n{{Identical|Add template}}",
 "visualeditor-dialog-transclusion-content": "Label for editor of content 
between transclusion parts.\n{{Identical|Content}}",
+"visualeditor-dialog-transclusion-insert-template": "Label for button in 
the transclusion dialog while in single mode that closes the dialog inserts a 
template",
+"visualeditor-dialog-transclusion-insert-transclusion": "Label for button 
in the transclusion dialog while in multiple mode that closes the dialog 
inserts a transclusion",
+"visualeditor-dialog-transclusion-loading": "Label for the apply button in 
the transclusion dialog while it is disabled and loading",
 "visualeditor-dialog-transclusion-multiple-mode": "Label for button that 
shows advanced options in transclusion dialog",
 "visualeditor-dialog-transclusion-options": "Label for section with 
options for templates, content or parameters.\n{{Identical|Options}}",
 "visualeditor-dialog-transclusion-placeholder": "Label for section with 
options for adding a new template to a multi part transclusion",
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
index 31fd68c..5f82af1 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
@@ -25,6 +25,7 @@
this.loaded = false;
this.preventReselection = false;
this.mode = null;
+   this.inserting = false;
 };
 
 /* Inheritance */
@@ -150,7 +151,7 @@
  * @param {ve.dm.MWTransclusionPartModel} added Added part
  */
 ve.ui.MWTransclusionDialog.prototype.onReplacePart = function ( removed, added 
) {
-   var i, len, page, name, names, params, partPage, reselect,
+   var i, len, page, name, names, params, partPage, reselect, single,
removePages = [];
 
if ( removed ) {
@@ -216,7 +217,19 @@
} else if ( reselect ) {
 

[MediaWiki-commits] [Gerrit] Updating CentralNotice to master - change (mediawiki/core)

[Mwalker (Code Review)]

Mwalker has submitted this change and it was merged.

Change subject: Updating CentralNotice to master
..


Updating CentralNotice to master

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

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



diff --git a/extensions/CentralNotice b/extensions/CentralNotice
index 76aeea1..6bde6c2 16
--- a/extensions/CentralNotice
+++ b/extensions/CentralNotice
-Subproject commit 76aeea160e8cd67f882110f50bd9f1e0316faeb6
+Subproject commit 6bde6c2934415677154a7e291c42710cf90f46b9

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e3d04abe5d033afd5d88c63b591a9a871857054
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf16
Gerrit-Owner: Mwalker 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Updating CentralNotice to master - change (mediawiki/core)

[Mwalker (Code Review)]

Mwalker has submitted this change and it was merged.

Change subject: Updating CentralNotice to master
..


Updating CentralNotice to master

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

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



diff --git a/extensions/CentralNotice b/extensions/CentralNotice
index 76aeea1..6bde6c2 16
--- a/extensions/CentralNotice
+++ b/extensions/CentralNotice
-Subproject commit 76aeea160e8cd67f882110f50bd9f1e0316faeb6
+Subproject commit 6bde6c2934415677154a7e291c42710cf90f46b9

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief556f66fd5036319a1cfd47e8b52934b1aab943
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf17
Gerrit-Owner: Mwalker 
Gerrit-Reviewer: Mwalker 
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 JS hash to URL to allow consistent hashing via Varnish, ... - change (mediawiki...Minifier)

[Jdlrobson (Code Review)]

Jdlrobson has submitted this change and it was merged.

Change subject: Add JS hash to URL to allow consistent hashing via Varnish, 
support multiple hosts
..


Add JS hash to URL to allow consistent hashing via Varnish, support multiple 
hosts

Change-Id: If5b9af0ab9bb1b76f12cf8ede6d7efcdb49c03a3
---
M Minifier.body.php
1 file changed, 6 insertions(+), 4 deletions(-)

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



diff --git a/Minifier.body.php b/Minifier.body.php
index 81c552d..ee882fa 100644
--- a/Minifier.body.php
+++ b/Minifier.body.php
@@ -11,7 +11,7 @@
 
public function filter( $js ) {
wfProfileIn( __METHOD__ );
-   $req = $this->getRequest();
+   $req = $this->getRequest( array( 'id' => md5( $js ) ) );
$req->setData( array(
'code' => 'minify',
'text' => $js,
@@ -35,12 +35,14 @@
}
 
/**
+* @param array $params
 * @return MWHttpRequest
 */
-   private function getRequest() {
+   private function getRequest( array $params = array() ) {
global $wgMinifierHosts;
 
-   // @todo:
-   return MWHttpRequest::factory( "http://{$wgMinifierHosts[0]}/";, 
$this->options );
+   $host = ArrayUtils::pickRandom( $wgMinifierHosts );
+   $query = $params ? '?' . wfArrayToCgi( $params ) : '';
+   return MWHttpRequest::factory( "http://$host/$query";, 
$this->options );
}
 }
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If5b9af0ab9bb1b76f12cf8ede6d7efcdb49c03a3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Minifier
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: JGonera 
Gerrit-Reviewer: Jdlrobson 

___
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 (8c017ae) - change (mediawiki...VisualEditor)

[Catrope (Code Review)]

Catrope has uploaded a new change for review.

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

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

Update VE core submodule to master (8c017ae)

New changes:
4ad6a3d Add text direction to SA demo
89503e8 ve.ce.Node: Emphasise slug transition with increasing outline offset
864046e Update oojs to v1.0.8
65d1338 Localisation updates from https://translatewiki.net.
b66d482 Stop special-casing comments and recognize them as tagName='#comment' 
instead
09dda12 ve.ce.getDomText: Document node types and use .data instead of 
.nodeValue
b0a3b2a Make ve.dm.Converter assertions actually display message
ef791cc Make 'comment' its own metaitem type
d5ef0d7 ve.dm.Converter: Refer to nodes instead of elements where appropiate
c22c8af Fix JS error when pressing Enter with selection across multiple 
paragraphs
a26a708 Add ve.dm.Transaction.newFromReplacement
a9e136e Don't cause needless surface refreshes on overwriting.
6fd35ee Split part of getOpeningHtmlTag out to getHtmlAttributes
2c31f67 ve.ce.Surface: Document version number in focus workaround for Opera
e069e74 Add some more characters to the special character inserter

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


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

diff --git a/lib/ve b/lib/ve
index a2ac637..8c017ae 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit a2ac637d82dcf14e9b8e3ce5bbb2929489b0df39
+Subproject commit 8c017aedbee8d6a30ef949a67d483e7b072537b5

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

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

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

[MediaWiki-commits] [Gerrit] db10: decom - change (operations/dns)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: db10: decom
..

db10: decom

was decomed in https://gerrit.wikimedia.org/r/#/c/61620/

Change-Id: I692c93e314dafdb22675901ddb7e802a20ea0078
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/88/118388/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 0b26e58..02d205c 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -66,7 +66,6 @@
 2361H  IN PTR  es7.pmtpa.wmnet.
 2371H  IN PTR  es8.pmtpa.wmnet.
 2391H  IN PTR  db6.pmtpa.wmnet.
-2431H  IN PTR  db10.pmtpa.wmnet.
 2441H  IN PTR  nfs1.pmtpa.wmnet.
 2471H  IN PTR  nfs2.pmtpa.wmnet.
 2521H  IN PTR  ms5.pmtpa.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 5ba1c08..a67f5b9 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -57,7 +57,6 @@
 
 ; Servers (alphabetic order)
 
-db10   1H  IN A10.0.0.243
 db35   1H  IN A10.0.6.45
 db38   1H  IN A10.0.6.48
 db40   1H  IN A10.0.6.50

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I692c93e314dafdb22675901ddb7e802a20ea0078
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Matanya 

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

[MediaWiki-commits] [Gerrit] Allow minor Express updates, pin Jade - change (mediawiki...Minifier)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Allow minor Express updates, pin Jade
..

Allow minor Express updates, pin Jade

Change-Id: Ib0865c2e1c7131e0749fa8097ac9bc660e43c39c
---
M server/package.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Minifier 
refs/changes/87/118387/1

diff --git a/server/package.json b/server/package.json
index 5c1f673..5e658d5 100644
--- a/server/package.json
+++ b/server/package.json
@@ -9,7 +9,7 @@
"dependencies": {
"lru-cache": "2.x.x",
"uglify-js": "2.x.x",
-   "express": "3.3.4",
-   "jade": "*"
+   "express": "3.4.x",
+   "jade": "1.3.x"
}
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0865c2e1c7131e0749fa8097ac9bc660e43c39c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Minifier
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] backup: remove db10 from disklist - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: backup: remove db10 from disklist
..


backup: remove db10 from disklist

was decommissioned in :https://gerrit.wikimedia.org/r/#/c/61620/

Change-Id: I81f7c16c5b44928f96def638e46900a0a1f21759
---
M files/backup/disklist-daily
M files/backup/disklist-monthly
M files/backup/disklist-weekly
3 files changed, 0 insertions(+), 6 deletions(-)

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



diff --git a/files/backup/disklist-daily b/files/backup/disklist-daily
index 8d6f483..afdc411 100644
--- a/files/backup/disklist-daily
+++ b/files/backup/disklist-daily
@@ -1,8 +1,4 @@
 mchenry.wikimedia.org   /root default
-db10.pmtpa.wmnet /a/sqldata {
-   default
-   include "./db10-bin.*"
-}
 brewster.wikimedia.org /srv/wikimedia  default
 brewster.wikimedia.org /srv/autoinstalldefault
 brewster.wikimedia.org /srv/tftpboot   default
diff --git a/files/backup/disklist-monthly b/files/backup/disklist-monthly
index 4420288..2964cf9 100644
--- a/files/backup/disklist-monthly
+++ b/files/backup/disklist-monthly
@@ -1,5 +1,4 @@
 mchenry.wikimedia.org   /root default
-db10.pmtpa.wmnet /mnt/a default
 stat1.wikimedia.org /home default
 stat1.wikimedia.org /a/eventlogging default
 stat1002.eqiad.wmnet/home default
diff --git a/files/backup/disklist-weekly b/files/backup/disklist-weekly
index 4420288..2964cf9 100644
--- a/files/backup/disklist-weekly
+++ b/files/backup/disklist-weekly
@@ -1,5 +1,4 @@
 mchenry.wikimedia.org   /root default
-db10.pmtpa.wmnet /mnt/a default
 stat1.wikimedia.org /home default
 stat1.wikimedia.org /a/eventlogging default
 stat1002.eqiad.wmnet/home default

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81f7c16c5b44928f96def638e46900a0a1f21759
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: Springle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Simplify error output a tad in updateOneSearchIndexConfig - change (mediawiki...CirrusSearch)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Simplify error output a tad in updateOneSearchIndexConfig
..

Simplify error output a tad in updateOneSearchIndexConfig

Change-Id: I0a9dbbca5bcfbe9db7736e8ad1172f7a14a29a55
---
M maintenance/updateOneSearchIndexConfig.php
1 file changed, 2 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/86/118386/1

diff --git a/maintenance/updateOneSearchIndexConfig.php 
b/maintenance/updateOneSearchIndexConfig.php
index f0ff634..3e4772f 100644
--- a/maintenance/updateOneSearchIndexConfig.php
+++ b/maintenance/updateOneSearchIndexConfig.php
@@ -806,12 +806,8 @@
}
if ( count( $found ) > 1 ) {
$this->output( "error\n" );
-   $this->error("Looks like the index has more 
than one identifier.  You should delete all\n" .
-   "but the one of them currently active.  
Here is the list:");
-   foreach ( $found as $name ) {
-   $this->error( $name );
-   }
-   die( 1 );
+   $this->error( "Looks like the index has more 
than one identifier. You should delete all\n" .
+   "but the one of them currently active. 
Here is the list: " .  implode( $found, ',' ), 1 );
}
if ( $found ) {
$identifier = substr( $found[0], strlen( 
$typeName ) + 1 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a9dbbca5bcfbe9db7736e8ad1172f7a14a29a55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] Add README - change (mediawiki...Minifier)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Add README
..

Add README

Change-Id: If63ac3750af9cc8367cb29de3ecbfbc6147c9fa9
---
A README
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Minifier 
refs/changes/84/118384/1

diff --git a/README b/README
new file mode 100644
index 000..481ede0
--- /dev/null
+++ b/README
@@ -0,0 +1,10 @@
+== Setting up ==
+* Add Minifier to LocalSettings.php: require_once( 
"$IP/extensions/Minifier/Minifier.php" );
+* Set $wgMinifierHosts = array( 'localhost:' );
+* Checkout https://gerrit.wikimedia.org/r/74293 in MedaWiki core.
+* Copy server/settings.json.sample to settings.json.
+* Install node.js dependencies: cd server && npm install
+* Start server with node app.js
+
+== Debugging ==
+Don't forget to clear your object cache!

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If63ac3750af9cc8367cb29de3ecbfbc6147c9fa9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Minifier
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Simplify a little bit of logic in a few places - change (mediawiki...CirrusSearch)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Simplify a little bit of logic in a few places
..

Simplify a little bit of logic in a few places

Change-Id: If52a8e6e648737c52f75173946a1f4cbe7e12e5a
---
M includes/ElasticsearchIntermediary.php
M includes/Searcher.php
2 files changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/83/118383/1

diff --git a/includes/ElasticsearchIntermediary.php 
b/includes/ElasticsearchIntermediary.php
index 8802521..a753d97 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -27,7 +27,7 @@
 * @var string|null the name or ip of the user for which we're 
performing this search or null in the case of
 * requests kicked off by jobs
 */
-   private $user;
+   private $user = 'nobody';
/**
 * @var float|null start time of current request or null if none is 
running
 */
@@ -55,8 +55,6 @@
protected function __construct( $user, $slowSeconds ) {
if ( $user ) {
$this->user = 'User:' . $user->getName(); // name is 
the ip address of anonymous users
-   } else {
-   $this->user = 'nobody';
}
$this->slowMillis = round( 1000 * $slowSeconds );
}
diff --git a/includes/Searcher.php b/includes/Searcher.php
index 65ce7e8..bd48b01 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -1233,9 +1233,8 @@
static $defaultBoostTemplates = null;
if ( $defaultBoostTemplates === null ) {
$source = wfMessage( 'cirrussearch-boost-templates' 
)->inContentLanguage();
-   if( $source->isDisabled() ) {
-   $defaultBoostTemplates = array();
-   } else {
+   $defaultBoostTemplates = array();
+   if( !$source->isDisabled() ) {
$lines = explode( "\n", $source->plain() );
$lines = preg_replace( '/#.*$/', '', $lines ); 
// Remove comments
$lines = array_map( 'trim', $lines );  
// Remove extra spaces

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If52a8e6e648737c52f75173946a1f4cbe7e12e5a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] Split part of getOpeningHtmlTag out to getHtmlAttributes - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Split part of getOpeningHtmlTag out to getHtmlAttributes
..


Split part of getOpeningHtmlTag out to getHtmlAttributes

Change-Id: Iad198ec4f3c6a2a5c9471ffc788d26094bf8c66d
---
M modules/ve/test/ve.test.js
M modules/ve/ve.js
2 files changed, 78 insertions(+), 27 deletions(-)

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



diff --git a/modules/ve/test/ve.test.js b/modules/ve/test/ve.test.js
index 93ef848..f95a8d6 100644
--- a/modules/ve/test/ve.test.js
+++ b/modules/ve/test/ve.test.js
@@ -57,7 +57,45 @@
assert.ok( !element.hasAttribute( 'onclick' ), 'event attributes are 
blocked when sanitizing' );
 } );
 
-QUnit.test( 'getOpeningHtmlTag', 5, function ( assert ) {
+QUnit.test( 'getHtmlAttributes', 7, function ( assert ) {
+   assert.deepEqual(
+   ve.getHtmlAttributes(),
+   '',
+   'no attributes argument'
+   );
+   assert.deepEqual(
+   ve.getHtmlAttributes( NaN + 'px' ),
+   '',
+   'invalid attributes argument'
+   );
+   assert.deepEqual(
+   ve.getHtmlAttributes( {} ),
+   '',
+   'empty attributes argument'
+   );
+   assert.deepEqual(
+   ve.getHtmlAttributes( { 'src': 'foo' } ),
+   'src="foo"',
+   'one attribute'
+   );
+   assert.deepEqual(
+   ve.getHtmlAttributes( { 'href': 'foo', 'rel': 'bar' } ),
+   'href="foo" rel="bar"',
+   'two attributes'
+   );
+   assert.deepEqual(
+   ve.getHtmlAttributes( { 'selected': true, 'blah': false, 
'value': 3 } ),
+   'selected="selected" value="3"',
+   'handling of booleans and numbers'
+   );
+   assert.deepEqual(
+   ve.getHtmlAttributes( { 'placeholder': '&"bar"&\'baz\'' } 
),
+   
'placeholder="&"bar"&'baz'"',
+   'escaping of attribute values'
+   );
+} );
+
+QUnit.test( 'getOpeningHtmlTag', 3, function ( assert ) {
assert.deepEqual(
ve.getOpeningHtmlTag( 'code', {} ),
'',
@@ -72,16 +110,6 @@
ve.getOpeningHtmlTag( 'a', { 'href': 'foo', 'rel': 'bar' } ),
'',
'tag with two attributes'
-   );
-   assert.deepEqual(
-   ve.getOpeningHtmlTag( 'option', { 'selected': true, 'blah': 
false, 'value': 3 } ),
-   '',
-   'handling of booleans and numbers'
-   );
-   assert.deepEqual(
-   ve.getOpeningHtmlTag( 'input', { 'placeholder': 
'&"bar"&\'baz\'' } ),
-   '',
-   'escaping of attribute values'
);
 } );
 
diff --git a/modules/ve/ve.js b/modules/ve/ve.js
index 6a16fdc..bccc9c1 100644
--- a/modules/ve/ve.js
+++ b/modules/ve/ve.js
@@ -512,6 +512,42 @@
};
 
/**
+* Generate HTML attributes.
+*
+* This method copies part of `mw.html.element` from MediaWiki.
+*
+* NOTE: While the values of attributes are escaped, the names of 
attributes (i.e. the keys in
+* the attributes objects) are NOT ESCAPED. The caller is responsible 
for making sure these are
+* sane tag/attribute names and do not contain unsanitized content from 
an external source
+* (e.g. from the user or from the web).
+*
+* @param {Object} [attributes] Key-value map of attributes for the tag
+* @returns {string} HTML attributes
+*/
+   ve.getHtmlAttributes = function ( attributes ) {
+   var attrName, attrValue,
+   parts = [];
+
+   if ( !ve.isPlainObject( attributes ) || ve.isEmptyObject( 
attributes ) ) {
+   return '';
+   }
+
+   for ( attrName in attributes ) {
+   attrValue = attributes[attrName];
+   if ( attrValue === true ) {
+   // Convert name=true to name=name
+   attrValue = attrName;
+   } else if ( attrValue === false ) {
+   // Skip name=false
+   continue;
+   }
+   parts.push( attrName + '="' + ve.escapeHtml( String( 
attrValue ) ) + '"' );
+   }
+
+   return parts.join( ' ' );
+   };
+
+   /**
 * Generate an opening HTML tag.
 *
 * This method copies part of `mw.html.element` from MediaWiki.
@@ -522,25 +558,12 @@
 * unsanitized content from an external source (e.g. from the user or 
from the web).
 *
 * @param {string} tag HTML tag name
-* @param {Object} attributes Key-value map of attributes for the tag
+* @para

[MediaWiki-commits] [Gerrit] Simplify getIndexSuffixForNamespace() logic a tiny bit - change (mediawiki...CirrusSearch)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Simplify getIndexSuffixForNamespace() logic a tiny bit
..

Simplify getIndexSuffixForNamespace() logic a tiny bit

Change-Id: I8be452dfb3e80809441503b4ff384b957f88175b
---
M includes/Connection.php
1 file changed, 7 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/82/118382/1

diff --git a/includes/Connection.php b/includes/Connection.php
index 15f1caa..5f9bc8f 100644
--- a/includes/Connection.php
+++ b/includes/Connection.php
@@ -88,12 +88,13 @@
 */
public static function getIndexSuffixForNamespace( $namespace ) {
global $wgCirrusSearchNamespaceMappings;
-   if ( isset( $wgCirrusSearchNamespaceMappings[$namespace] ) ) {
-   return $wgCirrusSearchNamespaceMappings[$namespace];
-   } elseif ( MWNamespace::isContent( $namespace ) ) {
-   return self::CONTENT_INDEX_TYPE;
-   } else {
-   return self::GENERAL_INDEX_TYPE;
+   switch ( $namespace ) {
+   case isset( 
$wgCirrusSearchNamespaceMappings[$namespace] ):
+   return 
$wgCirrusSearchNamespaceMappings[$namespace];
+   case MWNamespace::isContent( $namespace ):
+   return self::CONTENT_INDEX_TYPE;
+   default:
+   return self::GENERAL_INDEX_TYPE;
}
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8be452dfb3e80809441503b4ff384b957f88175b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] Add some more characters to the special character inserter - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Add some more characters to the special character inserter
..


Add some more characters to the special character inserter

Mostly just adding the capital variants of the accented characters and a few
further symbols as used on the French Wikipedia.

Change-Id: I0c622ce7b02f1f99147f78a79aedf6b75d5129b6
---
M modules/ve/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ve/i18n/en.json b/modules/ve/i18n/en.json
index a458b89..ad691a2 100644
--- a/modules/ve/i18n/en.json
+++ b/modules/ve/i18n/en.json
@@ -72,7 +72,7 @@
 "visualeditor-shortcuts-text-style": "Text formatting",
 "visualeditor-specialcharacter-button-tooltip": "Special character",
 "visualeditor-specialcharacterinspector-title": "Special character",
-"visualeditor-specialcharinspector-characterlist-insert": 
"{\n\t\"symbols\": {\n\t\t\"−\": \"−\",\n\t\t\"—\": \"—\",\n\t\t\"°\": 
\"°\",\n\t\t\"″\": \"″\",\n\t\t\"′\": \"′\",\n\t\t\"←\": \"←\",\n\t\t\"→\": 
\"→\",\n\t\t\"·\": \"·\",\n\t\t\"§\": \"§\"\n\t},\n\t\"accents\": {\n\t\t\"à\": 
\"à\",\n\t\t\"á\": \"á\",\n\t\t\"â\": \"â\",\n\t\t\"ä\": \"ä\",\n\t\t\"ç\": 
\"ç\",\n\t\t\"è\": \"è\",\n\t\t\"é\": \"é\",\n\t\t\"ê\": \"ê\",\n\t\t\"ë\": 
\"ë\",\n\t\t\"ì\": \"ì\",\n\t\t\"í\": \"í\",\n\t\t\"î\": \"î\",\n\t\t\"ï\": 
\"ï\",\n\t\t\"ò\": \"ò\",\n\t\t\"ó\": \"ó\",\n\t\t\"ô\": \"ô\",\n\t\t\"ö\": 
\"ö\",\n\t\t\"ø\": \"ø\",\n\t\t\"ù\": \"ù\",\n\t\t\"ú\": \"ú\",\n\t\t\"û\": 
\"û\",\n\t\t\"ü\": \"ü\"\n\t},\n\t\"math\": {\n\t\t\"−\": \"−\",\n\t\t\"×\": 
\"×\",\n\t\t\"÷\": \"÷\",\n\t\t\"≈\": \"≈\",\n\t\t\"≠\": \"≠\",\n\t\t\"≤\": 
\"≤\",\n\t\t\"≥\": \"≥\",\n\t\t\"±\": \"±\"\n\t}\n}",
+"visualeditor-specialcharinspector-characterlist-insert": 
"{\n\t\"Symbols\": {\n\t\t\"−\": \"−\",\n\t\t\"—\": \"—\",\n\t\t\"°\": 
\"°\",\n\t\t\"″\": \"″\",\n\t\t\"′\": \"′\",\n\t\t\"←\": \"←\",\n\t\t\"→\": 
\"→\",\n\t\t\"« »\" : \"« »\",\n\t\t\"“”\" : \"“”\",\n\t\t\"#\" : 
\"#\",\n\t\t\"@\" : \"@\",\n\t\t\"|\" : \"|\",\n\t\t\"~\" : \"~\",\n\t\t\"§\": 
\"§\",\n\t\t\"•\" : \"•\",\n\t\t\"·\": \"·\",\n\t\t\"…\" : \"…\",\n\t\t\"€\" : 
\"€\"\n\t},\n\t\"Accents\": {\n\t\t\"Æ\" : \"Æ\",\n\t\t\"æ\" : 
\"æ\",\n\t\t\"À\" : \"À\",\n\t\t\"à\" : \"à\",\n\t\t\"Â\" : \"Â\",\n\t\t\"â\" : 
\"â\",\n\t\t\"Ä\" : \"Ä\",\n\t\t\"ä\" : \"ä\",\n\t\t\"Å\" : \"Å\",\n\t\t\"å\" : 
\"å\",\n\t\t\"Ç\" : \"Ç\",\n\t\t\"ç\" : \"ç\",\n\t\t\"È\" : \"È\",\n\t\t\"è\" : 
\"è\",\n\t\t\"É\" : \"É\",\n\t\t\"é\" : \"é\",\n\t\t\"Ê\" : \"Ê\",\n\t\t\"ê\" : 
\"ê\",\n\t\t\"Ë\" : \"Ë\",\n\t\t\"ë\" : \"ë\",\n\t\t\"Î\" : \"Î\",\n\t\t\"î\" : 
\"î\",\n\t\t\"Ï\" : \"Ï\",\n\t\t\"ï\" : \"ï\",\n\t\t\"Ô\" : \"Ô\",\n\t\t\"ô\" : 
\"ô\",\n\t\t\"Ö\" : \"Ö\",\n\t\t\"ö\" : \"ö\",\n\t\t\"Ø\" : \"Ø\",\n\t\t\"ø\" : 
\"ø\",\n\t\t\"Ù\" : \"Ù\",\n\t\t\"ù\" : \"ù\",\n\t\t\"Û\" : \"Û\",\n\t\t\"û\" : 
\"û\",\n\t\t\"Ü\" : \"Ü\",\n\t\t\"ü\" : \"ü\",\n\t\t\"Ÿ\" : \"Ÿ\",\n\t\t\"ÿ\" : 
\"ÿ\",\n\t\t\"Œ\" : \"Œ\",\n\t\t\"œ\" : \"œ\"\n\t},\n\t\"Mathematical\": 
{\n\t\t\"−\": \"−\",\n\t\t\"×\": \"×\",\n\t\t\"÷\": \"÷\",\n\t\t\"≈\": 
\"≈\",\n\t\t\"≠\": \"≠\",\n\t\t\"≤\": \"≤\",\n\t\t\"≥\": \"≥\",\n\t\t\"±\": 
\"±\",\n\t\t\"¹\" : \"¹\",\n\t\t\"²\" : \"²\",\n\t\t\"³\" : \"³\",\n\t\t\"⁴\" : 
\"⁴\",\n\t\t\"⁵\" : \"⁵\",\n\t\t\"⁶\" : \"⁶\",\n\t\t\"⁷\" : \"⁷\",\n\t\t\"⁸\" : 
\"⁸\",\n\t\t\"⁹\" : \"⁹\",\n\t\t\"⁰\" : \"⁰\",\n\t\t\"½\" : \"½\"\n\t}\n}",
 "visualeditor-toolbar-insert": "Insert",
 "visualeditor-version-label": "Version"
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0c622ce7b02f1f99147f78a79aedf6b75d5129b6
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jforrester 
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] ve.ce.Node: Emphasise slug transition with increasing outlin... - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: ve.ce.Node: Emphasise slug transition with increasing outline 
offset
..


ve.ce.Node: Emphasise slug transition with increasing outline offset

The outline is outside the boundary of the box model and as such doesn't
affect the page flow (cheap transition on a separate layer).

Re-ordered some of the rules as it wasn't working otherwise due
to cascading weight.

Change-Id: I42717be02360a45890539062c587c46141ad61df
---
M modules/ve/ce/styles/ve.ce.Node.css
1 file changed, 21 insertions(+), 19 deletions(-)

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



diff --git a/modules/ve/ce/styles/ve.ce.Node.css 
b/modules/ve/ce/styles/ve.ce.Node.css
index 98931a0..801d047 100644
--- a/modules/ve/ce/styles/ve.ce.Node.css
+++ b/modules/ve/ce/styles/ve.ce.Node.css
@@ -211,28 +211,14 @@
 
 /* ve.ce.BranchNode */
 
-.ve-ce-branchNode-blockSlugWrapper-unfocused {
-   margin: 0 0 -0.2em 0;
-}
-
 .ve-ce-branchNode-blockSlugWrapper {
background-color: transparent;
outline: transparent dashed 1px;
-   -webkit-transition: outline-color 400ms ease-out, background-color 
400ms ease-out;
-   -moz-transition: outline-color 400ms ease-out, background-color 400ms 
ease-out;
-   -o-transition: outline-color 400ms ease-out, background-color 400ms 
ease-out;
-   transition: outline-color 400ms ease-out, background-color 400ms 
ease-out;
-}
-
-.ve-ce-branchNode-blockSlugWrapper-unfocused:hover {
-   outline-color: #ccc;
-   /* rgba(#f1f7fb, 0.5) */
-   background-color: rgba(241, 247, 251, 0.5);
-}
-
-.ve-ce-branchNode-blockSlugWrapper-unfocused .ve-ce-branchNode-blockSlug {
-   font-size: 0.8em;
-   margin: 0.2em 0;
+   outline-offset: 10px;
+   -webkit-transition: background-color 400ms ease-out, outline-color 
400ms ease-out, outline-offset 400ms ease-out;
+   -moz-transition: background-color 400ms ease-out, outline-color 400ms 
ease-out, outline-offset 400ms ease-out;
+   -o-transition: background-color 400ms ease-out, outline-color 400ms 
ease-out, outline-offset 400ms ease-out;
+   transition: background-color 400ms ease-out, outline-color 400ms 
ease-out, outline-offset 400ms ease-out;
 }
 
 .ve-ce-branchNode-blockSlugWrapper .ve-ce-branchNode-blockSlug {
@@ -243,6 +229,22 @@
transition: font-size 200ms ease-out, margin 200ms ease-out;
 }
 
+.ve-ce-branchNode-blockSlugWrapper-unfocused {
+   margin: 0 0 -0.2em 0;
+   outline-offset: 0;
+}
+
+.ve-ce-branchNode-blockSlugWrapper-unfocused:hover {
+   outline-color: #ccc;
+   /* rgba(#f1f7fb, 0.5) */
+   background-color: rgba(241, 247, 251, 0.75);
+}
+
+.ve-ce-branchNode-blockSlugWrapper-unfocused .ve-ce-branchNode-blockSlug {
+   font-size: 0.8em;
+   margin: 0.2em 0;
+}
+
 /* ve.ce.PreformattedNode */
 
 pre.ve-ce-branchNode {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I42717be02360a45890539062c587c46141ad61df
Gerrit-PatchSet: 5
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Trevor Parscal 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Return captcha information via createaccount API only if no ... - change (mediawiki...ConfirmEdit)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Return captcha information via createaccount API only if no 
other errors
..

Return captcha information via createaccount API only if no other errors

Bug: 61704
Change-Id: I707aab2c0accff8ab5a3c49815106356b2c7
---
M Captcha.php
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit 
refs/changes/81/118381/1

diff --git a/Captcha.php b/Captcha.php
index df9a314..746b890 100644
--- a/Captcha.php
+++ b/Captcha.php
@@ -823,23 +823,23 @@
 
return true;
}
-   
+
/**
 * Pass extra data back in API results for account creation.
 *
 * @param ApiCreateAccount $apiModule
-* @param LoginForm &loginForm
-* @param array &$params
-* @return hook return value
+* @param LoginForm &loginPage
+* @param array &$result
+* @return bool: Hook return value
 */
function addNewAccountApiResult( $apiModule, $loginPage, &$result ) {
if ( $result['result'] !== 'Success' && 
$this->needCreateAccountCaptcha() ) {
-   $this->addCaptchaAPI( $result );
 
// If we failed a captcha, override the generic 
'Warning' result string
if ( $result['result'] === 'Warning' && isset( 
$result['warnings'] ) ) {
foreach ( $result['warnings'] as $warning ) {
if ( $warning['message'] === 
'captcha-createaccount-fail' ) {
+   $this->addCaptchaAPI( $result );
$result['result'] = 
'NeedCaptcha';
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I707aab2c0accff8ab5a3c49815106356b2c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ve.ce.Surface: Document version number in focus workaround f... - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: ve.ce.Surface: Document version number in focus workaround for 
Opera
..


ve.ce.Surface: Document version number in focus workaround for Opera

Follows-up I7962f59bd02e075.

Change-Id: I93d37d5a511a958c30543606979f298e8945852f
---
M modules/ve/ce/ve.ce.Surface.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index 9b4e5b3..35c1bee 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -86,7 +86,7 @@
 
$documentNode.on( $.browser.msie ? 'beforepaste' : 'paste', ve.bind( 
this.onPaste, this ) );
$documentNode.on( 'focus', 'a', function () {
-   // Opera triggers 'blur' on document node before any link is
+   // Opera <= 12 triggers 'blur' on document node before any link 
is
// focused and we don't want that
$documentNode.focus();
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I93d37d5a511a958c30543606979f298e8945852f
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
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] ersch: decom - change (operations/dns)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: ersch: decom
..

ersch: decom

RT #6265 left mgmt in

Change-Id: Id94e0597830a3fa020ebcfcf0c83668faa16bd84
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/80/118380/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 0b26e58..b1e0ce8 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -30,7 +30,6 @@
 16 1H  IN PTR  vl2-eth0.lvs6.wikimedia.org.
 
 21 1H  IN PTR  tarin.pmtpa.wmnet.
-22 1H  IN PTR  ersch.pmtpa.wmnet.
 24 1H  IN PTR  stafford.pmtpa.wmnet.
 26 1H  IN PTR  tmh1.pmtpa.wmnet.
 27 1H  IN PTR  tmh2.pmtpa.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 5ba1c08..16344d3 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -79,7 +79,6 @@
 db75   1H  IN A10.0.6.85
 db76   1H  IN A10.0.6.86
 db77   1H  IN A10.0.6.87
-ersch  1H  IN A10.0.0.22
 es11H  IN A10.0.0.225
 es21H  IN A10.0.0.226
 es31H  IN A10.0.0.227

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id94e0597830a3fa020ebcfcf0c83668faa16bd84
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Matanya 

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

[MediaWiki-commits] [Gerrit] ve.ce.Surface: Document version number in focus workaround f... - change (VisualEditor/VisualEditor)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: ve.ce.Surface: Document version number in focus workaround for 
Opera
..

ve.ce.Surface: Document version number in focus workaround for Opera

Follows-up I7962f59bd02e075.

Change-Id: I93d37d5a511a958c30543606979f298e8945852f
---
M modules/ve/ce/ve.ce.Surface.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/79/118379/1

diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index 9b4e5b3..35c1bee 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -86,7 +86,7 @@
 
$documentNode.on( $.browser.msie ? 'beforepaste' : 'paste', ve.bind( 
this.onPaste, this ) );
$documentNode.on( 'focus', 'a', function () {
-   // Opera triggers 'blur' on document node before any link is
+   // Opera <= 12 triggers 'blur' on document node before any link 
is
// focused and we don't want that
$documentNode.focus();
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93d37d5a511a958c30543606979f298e8945852f
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
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] http://www.mediawiki.org --> https://www.mediawiki.org - change (mediawiki/core)

[Ladsgroup (Code Review)]

Ladsgroup has uploaded a new change for review.

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

Change subject: http://www.mediawiki.org --> https://www.mediawiki.org
..

http://www.mediawiki.org --> https://www.mediawiki.org

Part 2

Change-Id: I3be61fe3dfb502cc20180486eb1a8016eac151df
---
M img_auth.php
M includes/AuthPlugin.php
M includes/DefaultSettings.php
M includes/Export.php
M includes/Feed.php
M includes/Import.php
M includes/PHPVersionError.php
M includes/ProtectionForm.php
M includes/Sanitizer.php
M includes/WebRequest.php
M includes/WikiMap.php
M includes/db/CloneDatabase.php
M includes/htmlform/HTMLForm.php
M includes/installer/InstallDocFormatter.php
M includes/installer/LocalSettingsGenerator.php
M includes/installer/WebInstallerOutput.php
16 files changed, 26 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/78/118378/1

diff --git a/img_auth.php b/img_auth.php
index 72a7dab..7765dd3 100644
--- a/img_auth.php
+++ b/img_auth.php
@@ -2,7 +2,7 @@
 /**
  * Image authorisation script
  *
- * To use this, see http://www.mediawiki.org/wiki/Manual:Image_Authorization
+ * To use this, see https://www.mediawiki.org/wiki/Manual:Image_Authorization
  *
  * - Set $wgUploadDirectory to a non-public directory (not web accessible)
  * - Set $wgUploadPath to point to this file
diff --git a/includes/AuthPlugin.php b/includes/AuthPlugin.php
index c7b0c97..217744e 100644
--- a/includes/AuthPlugin.php
+++ b/includes/AuthPlugin.php
@@ -3,7 +3,7 @@
  * Authentication plugin interface
  *
  * Copyright © 2004 Brion Vibber 
- * http://www.mediawiki.org/
+ * https://www.mediawiki.org/
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 28f37d2..50db6c7 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -15,7 +15,7 @@
  * performed in LocalSettings.php.
  *
  * Documentation is in the source and on:
- * http://www.mediawiki.org/wiki/Manual:Configuration_settings
+ * https://www.mediawiki.org/wiki/Manual:Configuration_settings
  *
  * @warning  Note: this (and other things) will break if the autoloader is not
  * enabled. Please include includes/AutoLoader.php before including this file.
@@ -2256,7 +2256,7 @@
  * although they are referred to as Squid settings for historical reasons.
  *
  * Achieving a high hit ratio with an HTTP proxy requires special
- * configuration. See http://www.mediawiki.org/wiki/Manual:Squid_caching for
+ * configuration. See https://www.mediawiki.org/wiki/Manual:Squid_caching for
  * more details.
  *
  * @{
@@ -2264,7 +2264,7 @@
 
 /**
  * Enable/disable Squid.
- * See http://www.mediawiki.org/wiki/Manual:Squid_caching
+ * See https://www.mediawiki.org/wiki/Manual:Squid_caching
  */
 $wgUseSquid = false;
 
@@ -3927,7 +3927,7 @@
  * if $wgUseCommaCount is false, it will be 'link', if it is true
  * it will be 'comma'
  *
- * See also See http://www.mediawiki.org/wiki/Manual:Article_count
+ * See also See https://www.mediawiki.org/wiki/Manual:Article_count
  *
  * Retroactively changing this variable will not affect the existing count,
  * to update it, you will need to run the maintenance/updateArticleCount.php
@@ -4173,7 +4173,7 @@
  *
  * @note Also that this will only protect _pages in the wiki_. Uploaded files
  * will remain readable. You can use img_auth.php to protect uploaded files,
- * see http://www.mediawiki.org/wiki/Manual:Image_Authorization
+ * see https://www.mediawiki.org/wiki/Manual:Image_Authorization
  */
 $wgWhitelistRead = false;
 
@@ -4910,7 +4910,7 @@
  */
 
 /**
- * Filename for debug logging. See http://www.mediawiki.org/wiki/How_to_debug
+ * Filename for debug logging. See https://www.mediawiki.org/wiki/How_to_debug
  * The debug log file should be not be publicly accessible if it is used, as it
  * may contain private data.
  */
@@ -5197,7 +5197,7 @@
  *
  * Something like this:
  * $wgParserTestRemote = array(
- * 'api-url' => 'http://www.mediawiki.org/w/api.php',
+ * 'api-url' => 'https://www.mediawiki.org/w/api.php',
  * 'repo'=> 'MediaWiki',
  * 'suite'   => 'ParserTests',
  * 'path'=> '/trunk/phase3', // not used client-side; for reference
@@ -6605,7 +6605,7 @@
  * Enable the MediaWiki API for convenient access to
  * machine-readable data via api.php
  *
- * See http://www.mediawiki.org/wiki/API
+ * See https://www.mediawiki.org/wiki/API
  */
 $wgEnableAPI = true;
 
diff --git a/includes/Export.php b/includes/Export.php
index 639ba28..56fe452 100644
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -3,7 +3,7 @@
  * Base classes for dumps and export
  *
  * Copyright © 2003, 2005, 2006 Brion Vibber 
- * http://www.mediawiki.org/
+ * https://www.mediawiki.org/
  *
  * This program is free softw

[MediaWiki-commits] [Gerrit] Set 'lang' and 'dir' attribs on HTML body; fixes basic RTL a... - change (apps...wikipedia)

[Brion VIBBER (Code Review)]

Brion VIBBER has uploaded a new change for review.

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

Change subject: Set 'lang' and 'dir' attribs on HTML body; fixes basic RTL 
articles
..

Set 'lang' and 'dir' attribs on HTML body; fixes basic RTL articles

Bug: 61867
Change-Id: Id34c8257e812fef71d14556a738af3cb1abef143
---
M Wikipedia-iOS.xcodeproj/project.pbxproj
M Wikipedia-iOS/View Controllers/WebView/WebViewController.m
M Wikipedia-iOS/mw-bridge/css/pagestyles.css
M Wikipedia-iOS/mw-bridge/js/main.js
A Wikipedia-iOS/mw-support/MWLanguageInfo.h
A Wikipedia-iOS/mw-support/MWLanguageInfo.m
6 files changed, 91 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/77/118377/1

diff --git a/Wikipedia-iOS.xcodeproj/project.pbxproj 
b/Wikipedia-iOS.xcodeproj/project.pbxproj
index 73a9f32..56c080e 100644
--- a/Wikipedia-iOS.xcodeproj/project.pbxproj
+++ b/Wikipedia-iOS.xcodeproj/project.pbxproj
@@ -266,6 +266,8 @@
C9180ECA18AED3B6006C1DCA /* ZeroConfigState.m in Sources */ = 
{isa = PBXBuildFile; fileRef = C9180EC818AED3B6006C1DCA /* ZeroConfigState.m 
*/; };
C9928B8618AD5C6A00FCCA9A /* DownloadWikipediaZeroMessageOp.m in 
Sources */ = {isa = PBXBuildFile; fileRef = C9928B8518AD5C6A00FCCA9A /* 
DownloadWikipediaZeroMessageOp.m */; };
C9928B8818AD5E1000FCCA9A /* Settings.bundle in Resources */ = 
{isa = PBXBuildFile; fileRef = C9928B8718AD5E1000FCCA9A /* Settings.bundle */; 
};
+   D42E75EB18D11237002EA7E5 /* MWLanguageInfo.m in Sources */ = 
{isa = PBXBuildFile; fileRef = D42E75EA18D11237002EA7E5 /* MWLanguageInfo.m */; 
};
+   D42E75EC18D11237002EA7E5 /* MWLanguageInfo.m in Sources */ = 
{isa = PBXBuildFile; fileRef = D42E75EA18D11237002EA7E5 /* MWLanguageInfo.m */; 
};
D469889518B52DA200DBE014 /* Main_iPhone.strings in Resources */ 
= {isa = PBXBuildFile; fileRef = D469889318B52DA200DBE014 /* 
Main_iPhone.strings */; };
D46CD8C418A1AC4F0042959E /* InfoPlist.strings in Resources */ = 
{isa = PBXBuildFile; fileRef = D46CD8C018A1AC4F0042959E /* InfoPlist.strings 
*/; };
D46CD8C518A1AC4F0042959E /* Localizable.strings in Resources */ 
= {isa = PBXBuildFile; fileRef = D46CD8C218A1AC4F0042959E /* 
Localizable.strings */; };
@@ -527,6 +529,8 @@
C9928B8418AD5C6A00FCCA9A /* DownloadWikipediaZeroMessageOp.h */ 
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.h; path = DownloadWikipediaZeroMessageOp.h; sourceTree = 
""; };
C9928B8518AD5C6A00FCCA9A /* DownloadWikipediaZeroMessageOp.m */ 
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.objc; path = DownloadWikipediaZeroMessageOp.m; sourceTree = 
""; };
C9928B8718AD5E1000FCCA9A /* Settings.bundle */ = {isa = 
PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = 
Settings.bundle; sourceTree = ""; };
+   D42E75E918D11237002EA7E5 /* MWLanguageInfo.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = 
MWLanguageInfo.h; path = "mw-support/MWLanguageInfo.h"; sourceTree = ""; 
};
+   D42E75EA18D11237002EA7E5 /* MWLanguageInfo.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name 
= MWLanguageInfo.m; path = "mw-support/MWLanguageInfo.m"; sourceTree = 
""; };
D469889118B52DA200DBE014 /* ru */ = {isa = PBXFileReference; 
lastKnownFileType = text.plist.strings; name = ru; path = 
ru.lproj/InfoPlist.strings; sourceTree = ""; };
D469889218B52DA200DBE014 /* ru */ = {isa = PBXFileReference; 
lastKnownFileType = text.plist.strings; name = ru; path = 
ru.lproj/Localizable.strings; sourceTree = ""; };
D469889418B52DA200DBE014 /* ru */ = {isa = PBXFileReference; 
lastKnownFileType = text.plist.strings; name = ru; path = 
ru.lproj/Main_iPhone.strings; sourceTree = ""; };
@@ -1170,6 +1174,8 @@
D4EE00B8182443FC0090790F /* MWPageTitle.m */,
D474CC13182AE196002BDE45 /* MWSite.h */,
D474CC14182AE196002BDE45 /* MWSite.m */,
+   D42E75E918D11237002EA7E5 /* MWLanguageInfo.h */,
+   D42E75EA18D11237002EA7E5 /* MWLanguageInfo.m */,
);
name = "mw-support";
sourceTree = "";
@@ -1408,6 +1414,7 @@
044786881856E4DB0050563B /* UIWebView+Reveal.m 
in Sources */,
04D34DD91863F70A00610A87 /* Section.m in 
Sources */,
04D34DA1186283AA00610A87 /* 
MainMenuSectionHeadingLabel.m in Sources */,
+   D42E75EB18D11237002EA7E5 /* MWLanguageInfo.m in 
Sources */,
  

[MediaWiki-commits] [Gerrit] Split part of getOpeningHtmlTag out to getHtmlAttributes - change (VisualEditor/VisualEditor)

[Trevor Parscal (Code Review)]

Trevor Parscal has uploaded a new change for review.

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

Change subject: Split part of getOpeningHtmlTag out to getHtmlAttributes
..

Split part of getOpeningHtmlTag out to getHtmlAttributes

Change-Id: Iad198ec4f3c6a2a5c9471ffc788d26094bf8c66d
---
M modules/ve/test/ve.test.js
M modules/ve/ve.js
2 files changed, 78 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/76/118376/1

diff --git a/modules/ve/test/ve.test.js b/modules/ve/test/ve.test.js
index 93ef848..f95a8d6 100644
--- a/modules/ve/test/ve.test.js
+++ b/modules/ve/test/ve.test.js
@@ -57,7 +57,45 @@
assert.ok( !element.hasAttribute( 'onclick' ), 'event attributes are 
blocked when sanitizing' );
 } );
 
-QUnit.test( 'getOpeningHtmlTag', 5, function ( assert ) {
+QUnit.test( 'getHtmlAttributes', 7, function ( assert ) {
+   assert.deepEqual(
+   ve.getHtmlAttributes(),
+   '',
+   'no attributes argument'
+   );
+   assert.deepEqual(
+   ve.getHtmlAttributes( NaN + 'px' ),
+   '',
+   'invalid attributes argument'
+   );
+   assert.deepEqual(
+   ve.getHtmlAttributes( {} ),
+   '',
+   'empty attributes argument'
+   );
+   assert.deepEqual(
+   ve.getHtmlAttributes( { 'src': 'foo' } ),
+   'src="foo"',
+   'one attribute'
+   );
+   assert.deepEqual(
+   ve.getHtmlAttributes( { 'href': 'foo', 'rel': 'bar' } ),
+   'href="foo" rel="bar"',
+   'two attributes'
+   );
+   assert.deepEqual(
+   ve.getHtmlAttributes( { 'selected': true, 'blah': false, 
'value': 3 } ),
+   'selected="selected" value="3"',
+   'handling of booleans and numbers'
+   );
+   assert.deepEqual(
+   ve.getHtmlAttributes( { 'placeholder': '&"bar"&\'baz\'' } 
),
+   
'placeholder="&"bar"&'baz'"',
+   'escaping of attribute values'
+   );
+} );
+
+QUnit.test( 'getOpeningHtmlTag', 3, function ( assert ) {
assert.deepEqual(
ve.getOpeningHtmlTag( 'code', {} ),
'',
@@ -72,16 +110,6 @@
ve.getOpeningHtmlTag( 'a', { 'href': 'foo', 'rel': 'bar' } ),
'',
'tag with two attributes'
-   );
-   assert.deepEqual(
-   ve.getOpeningHtmlTag( 'option', { 'selected': true, 'blah': 
false, 'value': 3 } ),
-   '',
-   'handling of booleans and numbers'
-   );
-   assert.deepEqual(
-   ve.getOpeningHtmlTag( 'input', { 'placeholder': 
'&"bar"&\'baz\'' } ),
-   '',
-   'escaping of attribute values'
);
 } );
 
diff --git a/modules/ve/ve.js b/modules/ve/ve.js
index 6a16fdc..bccc9c1 100644
--- a/modules/ve/ve.js
+++ b/modules/ve/ve.js
@@ -512,6 +512,42 @@
};
 
/**
+* Generate HTML attributes.
+*
+* This method copies part of `mw.html.element` from MediaWiki.
+*
+* NOTE: While the values of attributes are escaped, the names of 
attributes (i.e. the keys in
+* the attributes objects) are NOT ESCAPED. The caller is responsible 
for making sure these are
+* sane tag/attribute names and do not contain unsanitized content from 
an external source
+* (e.g. from the user or from the web).
+*
+* @param {Object} [attributes] Key-value map of attributes for the tag
+* @returns {string} HTML attributes
+*/
+   ve.getHtmlAttributes = function ( attributes ) {
+   var attrName, attrValue,
+   parts = [];
+
+   if ( !ve.isPlainObject( attributes ) || ve.isEmptyObject( 
attributes ) ) {
+   return '';
+   }
+
+   for ( attrName in attributes ) {
+   attrValue = attributes[attrName];
+   if ( attrValue === true ) {
+   // Convert name=true to name=name
+   attrValue = attrName;
+   } else if ( attrValue === false ) {
+   // Skip name=false
+   continue;
+   }
+   parts.push( attrName + '="' + ve.escapeHtml( String( 
attrValue ) ) + '"' );
+   }
+
+   return parts.join( ' ' );
+   };
+
+   /**
 * Generate an opening HTML tag.
 *
 * This method copies part of `mw.html.element` from MediaWiki.
@@ -522,25 +558,12 @@
 * unsanitized content from an external source (e.g. from the user or 
from the web).
 *
 * @param {string} tag HTML tag name
-* @param {Object} attribute

[MediaWiki-commits] [Gerrit] ersch: decom - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: ersch: decom
..

ersch: decom

RT #6265 tampa apaches are out, so this one can go too

Change-Id: I481ba631612086cba48de6cc73e30d34327509ee
---
M files/dsh/group/misc_pmtpa
M files/dsh/group/pmtpa
M manifests/site.pp
M modules/install-server/files/autoinstall/netboot.cfg
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
5 files changed, 2 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/118375/1

diff --git a/files/dsh/group/misc_pmtpa b/files/dsh/group/misc_pmtpa
index 1780e1f..aa07d52 100644
--- a/files/dsh/group/misc_pmtpa
+++ b/files/dsh/group/misc_pmtpa
@@ -3,7 +3,6 @@
 dobson
 ekrem
 emery
-ersch
 fenari
 formey
 hume
diff --git a/files/dsh/group/pmtpa b/files/dsh/group/pmtpa
index 9cdccef..1bdefca 100644
--- a/files/dsh/group/pmtpa
+++ b/files/dsh/group/pmtpa
@@ -1,6 +1,5 @@
 brewster
 dobson
-ersch
 fenari
 formey
 hume
diff --git a/manifests/site.pp b/manifests/site.pp
index f9b0ca2..0d49f36 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -864,7 +864,7 @@
 include role::logging::udp2log::emery
 }
 
-node /(ersch|tarin)\.pmtpa\.wmnet/ {
+node tarin.pmtpa.wmnet {
 $ganglia_aggregator = true
 include standard
 include role::poolcounter
diff --git a/modules/install-server/files/autoinstall/netboot.cfg 
b/modules/install-server/files/autoinstall/netboot.cfg
index 7ef8d7d..1b3cc1d 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -81,5 +81,5 @@
virt100[1-9]) echo partman/virt-raid10-cisco.cfg ;; \
labnet1001) echo partman/lvm.cfg ;; \
wtp100[5-9]|wtp10[1-2][0-9]carbon|hafnium) echo 
partman/raid1-lvm.cfg ;; \
-   ersch|hydrogen|krypton|tarin) echo partman/raid1-1partition.cfg 
;; \
+   hydrogen|krypton|tarin) echo partman/raid1-1partition.cfg ;; \
esac
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600 
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
index aff002b..851b675 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
@@ -23,11 +23,6 @@
fixed-address dobson.wikimedia.org;
 }
 
-host ersch {
-   hardware ethernet A4:BA:DB:0E:09:43;
-   fixed-address ersch.pmtpa.wmnet;
-}
-
 host fenari {
hardware ethernet 00:1E:C9:EA:AB:95;
fixed-address fenari.wikimedia.org;

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

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

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