date:20150217

[MediaWiki-commits] [Gerrit] IconElement: Add description - change (oojs/ui)

2015-02-17 Thread Kmenger (Code Review)

Kmenger has uploaded a new change for review.

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

Change subject: IconElement: Add description
..

IconElement: Add description

Change-Id: I9b1c86743567e72eed607186816e025de30538ae
---
M src/elements/IconElement.js
1 file changed, 6 insertions(+), 5 deletions(-)


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

diff --git a/src/elements/IconElement.js b/src/elements/IconElement.js
index beed804..f90d2eb 100644
--- a/src/elements/IconElement.js
+++ b/src/elements/IconElement.js
@@ -1,10 +1,11 @@
 /**
- * Element containing an icon.
+ * IconElement is often mixed into other classes to generate an icon.
+ * Icons are graphics, about the size of normal text. They are used to aid the 
user
+ * in locating a control or to convey information in a space-efficient way. 
See the
+ * [OOjs UI documentation on MediaWiki] [1] for a list of icons
+ * included in the library.
  *
- * Icons are graphics, about the size of normal text. They can be used to aid 
the user in locating
- * a control or convey information in a more space efficient way. Icons should 
rarely be used
- * without labels; such as in a toolbar where space is at a premium or within 
a context where the
- * meaning is very clear to the user.
+ * [1]: 
https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Icons,_Indicators,_and_Labels#Icons
  *
  * @abstract
  * @class

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b1c86743567e72eed607186816e025de30538ae
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Kmenger kmen...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] sort by last modified column - change (mediawiki...PagesList)

2015-02-17 Thread tosfos (Code Review)

tosfos has uploaded a new change for review.

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

Change subject: sort by last modified column
..

sort by last modified column

Change-Id: I8561ba75058f7ddc29b4ade51ad37e90558431bc
---
M PagesList.class.php
M PagesList.php
2 files changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/PagesList.class.php b/PagesList.class.php
index cad50ef..1f8bc7e 100644
--- a/PagesList.class.php
+++ b/PagesList.class.php
@@ -60,7 +60,6 @@
/**
 * The index to actually be used for ordering. This is a single column,
 * for one ordering, even if multiple orderings are supported.
-* @todo fixme
 * @var string
 */
protected $indexField = 'rev_timestamp';
@@ -131,7 +130,7 @@
$options = isset( $info['options'] ) ? $info['options'] : 
array();
$join_conds = isset( $info['join_conds'] ) ? 
$info['join_conds'] : array();
 
-   #$options['ORDER BY'] = $this-indexField . ' DESC';
+   $options['ORDER BY'] = $this-indexField . ' DESC';
 
return array( $tables, $fields, $conds, $fname, $options, 
$join_conds );
}
diff --git a/PagesList.php b/PagesList.php
index c332498..9918805 100644
--- a/PagesList.php
+++ b/PagesList.php
@@ -6,7 +6,7 @@
  *
  * @file
  * @ingroup Extensions
- * @author Ike Hecht, 2014
+ * @author Ike Hecht, 2015
  * @license GNU General Public Licence 2.0 or later
  */
 $wgExtensionCredits['other'][] = array(
@@ -15,7 +15,7 @@
'author' = array(
'Ike Hecht',
),
-   'version' = '0.1.0',
+   'version' = '0.1.1',
'url' = 'https://www.mediawiki.org/wiki/Extension:PagesList',
'descriptionmsg' = 'pageslist-desc',
 );
@@ -68,7 +68,8 @@
  *
  * Example:
  * $wgPagesListDataTablesOptions = array(
- * 'iDisplayLength' = 25
+ * 'iDisplayLength' = 25,
+ * 'aaSorting' = array() // Don't sort by first column - results in sort 
by last modified, descending
  * );
  */
 $wgPagesListDataTablesOptions = array();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8561ba75058f7ddc29b4ade51ad37e90558431bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PagesList
Gerrit-Branch: master
Gerrit-Owner: tosfos tos...@yahoo.com

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

[MediaWiki-commits] [Gerrit] IndicatorElement: Add description - change (oojs/ui)

2015-02-17 Thread Kmenger (Code Review)

Kmenger has uploaded a new change for review.

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

Change subject: IndicatorElement: Add description
..

IndicatorElement: Add description

Change-Id: Iac55ac0229e99ec4fa06a8f5f8470c6ca04d047a
---
M src/elements/IndicatorElement.js
1 file changed, 11 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/08/191208/1

diff --git a/src/elements/IndicatorElement.js b/src/elements/IndicatorElement.js
index f299a98..5e1bf99 100644
--- a/src/elements/IndicatorElement.js
+++ b/src/elements/IndicatorElement.js
@@ -1,10 +1,16 @@
 /**
- * Element containing an indicator.
+ * IndicatorElement is often mixed into other classes to generate an indicator.
+ * Indicators are small graphics that are generally used in two ways:
  *
- * Indicators are graphics, smaller than normal text. They can be used to 
describe unique status or
- * behavior. Indicators should only be used in exceptional cases; such as a 
button that opens a menu
- * instead of performing an action directly, or an item in a list which has 
errors that need to be
- * resolved.
+ * - To draw attention to the status of an item. For example, an indicator 
might be
+ *   used to show that an item in a list has errors that need to be resolved.
+ * - To clarify the function of a control that acts in an exceptional way (a 
button
+ *   that opens a menu instead of performing an action directly, for example).
+ *
+ * For a list of indicators included in the library, please see the
+ * [OOjs UI documentation on MediaWiki] [1].
+ *
+ * [1]: 
https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Icons,_Indicators,_and_Labels#Indicators
  *
  * @abstract
  * @class

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac55ac0229e99ec4fa06a8f5f8470c6ca04d047a
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Kmenger kmen...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Always log for mw.flow.debug - change (mediawiki...Flow)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: Always log for mw.flow.debug
..


Always log for mw.flow.debug

The former conditions can cause bugs to lurk.

Change-Id: If2f741e3f004e5c1b8e1e3a1ad6c82ab900fab62
---
M modules/engine/components/flow-component.js
1 file changed, 1 insertion(+), 5 deletions(-)

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



diff --git a/modules/engine/components/flow-component.js 
b/modules/engine/components/flow-component.js
index 4838819..ffba356 100644
--- a/modules/engine/components/flow-component.js
+++ b/modules/engine/components/flow-component.js
@@ -57,11 +57,7 @@
 * @param {...*} args
 */
mw.flow.debug = FlowComponent.prototype.debug = function ( isError, 
args ) {
-   if ( window.console  (
-   window.flow_debug ||
-   ( window.localStorage  localStorage.getItem( 
'flow_debug' ) ) ||
-   ( mw.user  !mw.user.isAnon()  
mw.user.getName().match( /(^Admin$)|\(WMF\)/ ) )
-   ) ) {
+   if ( window.console ) {
args = Array.prototype.slice.call( arguments, 0 );
 
if ( typeof isError === 'boolean' ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If2f741e3f004e5c1b8e1e3a1ad6c82ab900fab62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] (Labs only) Ugly URLs to override mobile redirect for Centra... - change (operations/mediawiki-config)

2015-02-17 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: (Labs only) Ugly URLs to override mobile redirect for 
CentralNotice
..


(Labs only) Ugly URLs to override mobile redirect for CentralNotice

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

Approvals:
  Ejegg: Looks good to me, approved



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 82e4b3c..f34f594 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -103,8 +103,8 @@
$wgCentralGeoScriptURL = false;
 
$wgCentralPagePath = //meta.wikimedia.beta.wmflabs.org/w/index.php;
-   $wgCentralSelectedBannerDispatcher = 
//meta.wikimedia.beta.wmflabs.org/wiki/Special:BannerLoader;
-   $wgCentralBannerRecorder = 
//meta.wikimedia.beta.wmflabs.org/wiki/Special:RecordImpression;
+   $wgCentralSelectedBannerDispatcher = 
//meta.wikimedia.beta.wmflabs.org/w/index.php?title=Special:BannerLoader;
+   $wgCentralBannerRecorder = 
//meta.wikimedia.beta.wmflabs.org/w/index.php?title=Special:RecordImpression;
$wgCentralDBname = 'metawiki';
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6783b868d6c975776c763df0faacb28f9afffba
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] vbench: Allow 'stage' to be specified from the command line - change (operations/puppet)

2015-02-17 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: vbench: Allow 'stage' to be specified from the command line
..

vbench: Allow 'stage' to be specified from the command line

Make it possible to profile a specific stage in the initialization of
VisualEditor by binding the profile start and stop actions to trace.*.enter and
trace.*.exit events, which VisualEditor will emit.

Bug: T89536
Change-Id: Iec8036392e3d8c74c718731692ef7ea22e5cf170
---
M files/ve/vbench
1 file changed, 17 insertions(+), 6 deletions(-)


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

diff --git a/files/ve/vbench b/files/ve/vbench
index 5683c2d..fb022f2 100755
--- a/files/ve/vbench
+++ b/files/ve/vbench
@@ -62,10 +62,16 @@
 # FIXME: Make this configurable.
 JS = '''
 window.onload = function () {
-// Bind a handler to VE's ready event that stops the profiler.
-mw.trackSubscribe( 'event.Edit', function ( _, event ) {
-if ( event.action === 'ready' )
-console.profileEnd( 've' );
+var stage = %s;
+ve.trackSubscribe( 'trace.' + stage + '.', function ( topic ) {
+switch ( topic.split( '.' ).pop() ) {
+case 'enter':
+console.profile( stage );
+break;
+case 'exit':
+console.profileEnd( stage );
+break;
+}
 } );
 
 // Don't show the welcome dialog.
@@ -74,7 +80,6 @@
 
 // Wait 200ms for any load handlers to run, then start VE.
 setTimeout( function () {
-  console.profile( 've' );
   mw.libs.ve.onEditTabClick( { preventDefault: $.noop } );
 }, 200 );
 };
@@ -264,7 +269,8 @@
 self.__dict__[domain_name] = domain
 yield domain.enable()
 
-yield self.page.addScriptToEvaluateOnLoad(scriptSource=JS)
+scriptSource = JS % self.factory.stage
+yield self.page.addScriptToEvaluateOnLoad(scriptSource=scriptSource)
 yield self.profiler.setSamplingInterval(interval=100)
 
 if self.factory.disable_cache:
@@ -413,6 +419,11 @@
 help='disable network cache',
 )
 ap.add_argument(
+'--stage',
+default='init',
+help='Name of Specific stage to profile (default: init)',
+)
+ap.add_argument(
 'target_url',
 metavar='URL',
 help='URL to load',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec8036392e3d8c74c718731692ef7ea22e5cf170
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Browser test for chunked uploads - change (mediawiki...UploadWizard)

2015-02-17 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Browser test for chunked uploads
..

Browser test for chunked uploads

Bug: T89289
Change-Id: Id5ecf50a09a9f5032253c7a9c6a78cebfb7a264c
---
A tests/browser/features/chunked_upload.feature
A tests/browser/features/step_definitions/chunked_upload_steps.rb
M tests/browser/features/step_definitions/upload_wizard_steps.rb
M tests/browser/features/support/env.rb
A tests/browser/features/support/file_helper.rb
M tests/browser/features/support/pages/upload_wizard_page.rb
6 files changed, 69 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/46/191246/1

diff --git a/tests/browser/features/chunked_upload.feature 
b/tests/browser/features/chunked_upload.feature
new file mode 100644
index 000..a00cf0e
--- /dev/null
+++ b/tests/browser/features/chunked_upload.feature
@@ -0,0 +1,8 @@
+@login @chrome @firefox @commons.wikimedia.beta.wmflabs.org 
@test2.wikipedia.org
+Feature: Chunked upload
+
+  Scenario: Upload large file
+Given I am on the file upload step
+  And chunked upload is enabled in my preferences
+When I upload a large file
+Then the upload should finish
diff --git a/tests/browser/features/step_definitions/chunked_upload_steps.rb 
b/tests/browser/features/step_definitions/chunked_upload_steps.rb
new file mode 100644
index 000..4ee0c2f
--- /dev/null
+++ b/tests/browser/features/step_definitions/chunked_upload_steps.rb
@@ -0,0 +1,17 @@
+Given(/^I am on the file upload step$/) do
+  step I am logged in
+  visit(UploadWizardPage).bypass_learn_step
+end
+
+And(/^chunked upload is enabled in my preferences$/) do
+  on(UploadWizardPage).enable_chunked_uploads
+end
+
+When(/^I upload a large file$/) do
+  path = create_large_file(10)
+  on(UploadPage).add_file(path)
+end
+
+Then(/^the upload should finish$/) do
+  on(UploadPage).continue_element.when_present(15).should be_visible
+end
diff --git a/tests/browser/features/step_definitions/upload_wizard_steps.rb 
b/tests/browser/features/step_definitions/upload_wizard_steps.rb
index 7ef8814..3559da0 100644
--- a/tests/browser/features/step_definitions/upload_wizard_steps.rb
+++ b/tests/browser/features/step_definitions/upload_wizard_steps.rb
@@ -10,14 +10,6 @@
 # 
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FUploadWizard/HEAD/CREDITS
 #
 require tempfile
-require chunky_png
-
-def make_temp_image(filename, shade, width, height)
-  path = #{Dir.tmpdir}/#{filename}
-  image = ChunkyPNG::Image.new(shade, width, height)
-  image.save path
-  path
-end
 
 Given(/^I am logged out$/) do
   visit LogoutPage
diff --git a/tests/browser/features/support/env.rb 
b/tests/browser/features/support/env.rb
index 1464413..7254d26 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -11,5 +11,9 @@
 #
 require mediawiki_selenium
 
+require_relative file_helper
+
+World(FileHelper)
+
 # This allows us to use wait_for_ajax in step definitions.
 PageObject.javascript_framework = :jquery
diff --git a/tests/browser/features/support/file_helper.rb 
b/tests/browser/features/support/file_helper.rb
new file mode 100644
index 000..8351b32
--- /dev/null
+++ b/tests/browser/features/support/file_helper.rb
@@ -0,0 +1,23 @@
+require 'tempfile'
+require 'securerandom'
+require 'chunky_png'
+
+module FileHelper
+  def make_temp_image(filename, shade, width, height)
+path = #{Dir.tmpdir}/#{filename}
+image = ChunkyPNG::Image.new(shade, width, height)
+image.save path
+path
+  end
+
+  def create_large_file(size)
+path = Tempfile.new(['temp', '.png']).path
+# making the image consist of many triggers might trigger MediaWiki pixel 
limits
+# instead make it 1x1 and pump it up with metadata
+image = ChunkyPNG::Image.new(1, 1)
+# Chunky will compress long fields so we need to make sure it is 
incomrpessible
+image.metadata['Comment'] = SecureRandom.random_bytes(size)
+   image.save path
+   path
+  end
+end
diff --git a/tests/browser/features/support/pages/upload_wizard_page.rb 
b/tests/browser/features/support/pages/upload_wizard_page.rb
index 1f1832a..d520556 100644
--- a/tests/browser/features/support/pages/upload_wizard_page.rb
+++ b/tests/browser/features/support/pages/upload_wizard_page.rb
@@ -18,6 +18,23 @@
   end
   page_url url
 
+  # if we are on the learn step, move to next step, otherwise do nothing
+  def bypass_learn_step
+   if not stepdiv_file_element.visible?
+  next_element.when_present(15).click
+  wait_for_ajax
+end
+  end
+
+  def enable_chunked_uploads
+# quite a nasty hack. Faster than actually enabling and reloading, though, 
and does not have race conditions
+@browser.execute_script('mw.UploadWizard.config.enableChunked = true;')
+# by default chunked upload triggers for 100+M

[MediaWiki-commits] [Gerrit] Fix incorrectly closed string in qq/strings.xml - change (apps...wikipedia)

2015-02-17 Thread Deskana (Code Review)

Deskana has uploaded a new change for review.

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

Change subject: Fix incorrectly closed string in qq/strings.xml
..

Fix incorrectly closed string in qq/strings.xml

There is a string tag which was closed incorrectly, encasing the
documentation for three strings inside the documentation for another string.
This patch fixes that by closing the string tags correctly.

Change-Id: I6c2fcd0024983855beddec492ba5d47834f6f975
---
M wikipedia/res/values-qq/strings.xml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/47/191247/1

diff --git a/wikipedia/res/values-qq/strings.xml 
b/wikipedia/res/values-qq/strings.xml
index b5d2a3f..b7bf2df 100644
--- a/wikipedia/res/values-qq/strings.xml
+++ b/wikipedia/res/values-qq/strings.xml
@@ -365,10 +365,10 @@
   string name=table_other{{Identical|More information}}/string
   string name=table_close{{Identical|Close}}/string
   string name=app_store_descriptionDescription of the app as put up on the 
Google Play Store/string
-  string name=alpha_update_notification_titleTitle for notification when 
new alpha update is available.
+  string name=alpha_update_notification_titleTitle for notification when 
new alpha update is available./string
   string name=widget_name_featured_pageName of the Widget (as seen in the 
Android widget picker) that displays today\'s featured page./string
   string name=widget_title_featured_pageText shown inside the widget that 
tells the user that the link below is today\'s featured page./string
-  string name=widget_name_searchName of the Widget (as seen in the Android 
widget picker) for searching Wikipedia/string
+  string name=widget_name_searchName of the Widget (as seen in the Android 
widget picker) for searching Wikipedia
 
 Followed by {{msg-wm|Wikipedia-android-strings-alpha update notification 
text}}./string
   string name=alpha_update_notification_textText for notification when new 
alpha update is available.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c2fcd0024983855beddec492ba5d47834f6f975
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Deskana dga...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] l10nupdate: use --no-shared-authsock with sync-dir - change (operations/puppet)

2015-02-17 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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

Change subject: l10nupdate: use --no-shared-authsock with sync-dir
..

l10nupdate: use --no-shared-authsock with sync-dir

Call sync-dir using the --no-shared-authsock argument introduced in
I3eac26b094dec4713240be233e8e28fd7c0bc499 to bypass the shared
ssh-auth socket used by deployers and instead use the ssh key prepared
via sudo-withagent.

Bug: T76061
Change-Id: I3c990d45d36397082b675bab7f9e9ddc0f85437f
---
M modules/scap/files/l10nupdate-1
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/51/191251/1

diff --git a/modules/scap/files/l10nupdate-1 b/modules/scap/files/l10nupdate-1
index 3807972..824772f 100755
--- a/modules/scap/files/l10nupdate-1
+++ b/modules/scap/files/l10nupdate-1
@@ -103,7 +103,7 @@
SYNC_START=$(date +%s)
# FIXME: This should use the keyholder proxy so we can kill the
# l10nupdate private key.
-   NOLOGMSG=1 $BINDIR/sudo-withagent l10nupdate $SCAPDIR/sync-dir 
php-$mwVerNum/cache/l10n
+   NOLOGMSG=1 $BINDIR/sudo-withagent l10nupdate $SCAPDIR/sync-dir 
--no-shared-authsock php-$mwVerNum/cache/l10n
if [[ $? -ne 0 ]]; then
echo Failed to sync-dir 'php-$mwVerNum/cache/l10n'
exit 1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c990d45d36397082b675bab7f9e9ddc0f85437f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis bda...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] [BREAKING CHANGE] ButtonWidget: remove deprecated nofollow o... - change (oojs/ui)

2015-02-17 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: [BREAKING CHANGE] ButtonWidget: remove deprecated nofollow 
option alias
..

[BREAKING CHANGE] ButtonWidget: remove deprecated nofollow option alias

This property was renamed in I30eb9683e120224b3182e2da23e04b66c135e05a
and the old `nofollow` spelling was deprecated at that time.

Bug: T89767
Change-Id: I1d399ea48ca831b304bb5cfed994f8ee306ad123
---
M php/widgets/ButtonWidget.php
M src/widgets/ButtonWidget.js
2 files changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/04/191204/1

diff --git a/php/widgets/ButtonWidget.php b/php/widgets/ButtonWidget.php
index 934aaab..490e48b 100644
--- a/php/widgets/ButtonWidget.php
+++ b/php/widgets/ButtonWidget.php
@@ -60,10 +60,6 @@
$this-setHref( isset( $config['href'] ) ? $config['href'] : 
null );
$this-setTarget( isset( $config['target'] ) ? 
$config['target'] : null );
$this-setNoFollow( isset( $config['noFollow'] ) ? 
$config['noFollow'] : true );
-   // FIXME: The `nofollow` alias is deprecated and will be 
removed (T89767)
-   if ( isset( $config['nofollow'] ) ) {
-   $this-setNoFollow( $config['nofollow'] );
-   }
}
 
/**
diff --git a/src/widgets/ButtonWidget.js b/src/widgets/ButtonWidget.js
index 2e07f64..5bd0304 100644
--- a/src/widgets/ButtonWidget.js
+++ b/src/widgets/ButtonWidget.js
@@ -24,8 +24,7 @@
  */
 OO.ui.ButtonWidget = function OoUiButtonWidget( config ) {
// Configuration initialization
-   // FIXME: The `nofollow` alias is deprecated and will be removed 
(T89767)
-   config = $.extend( { noFollow: config  config.nofollow }, config );
+   config = config || {};
 
// Parent constructor
OO.ui.ButtonWidget.super.call( this, config );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d399ea48ca831b304bb5cfed994f8ee306ad123
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] phabricator using mysql fulltext T89274, tweaked for mariadb... - change (operations/puppet)

2015-02-17 Thread Springle (Code Review)

Springle has submitted this change and it was merged.

Change subject: phabricator using mysql fulltext T89274, tweaked for 
mariadb/aria
..


phabricator using mysql fulltext T89274, tweaked for mariadb/aria

Change-Id: I133948e0c9bfe2625b39e3d92a2dee68368aa721
---
M manifests/role/mariadb.pp
A templates/mariadb/phabricator-init.sql.erb
A templates/mariadb/phabricator-stopwords.txt.erb
A templates/mariadb/phabricator.my.cnf.erb
4 files changed, 148 insertions(+), 1 deletion(-)

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



diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 6076cec..07fbe44 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -102,7 +102,7 @@
 
 class { 'mariadb::config':
 prompt= MISC ${shard},
-config= 'mariadb/misc.my.cnf.erb',
+config= 'mariadb/phabricator.my.cnf.erb',
 password  = $passwords::misc::scripts::mysql_root_pass,
 datadir   = '/a/sqldata',
 tmpdir= '/a/tmp',
@@ -110,6 +110,22 @@
 read_only = $read_only,
 }
 
+file { '/etc/mysql/phabricator-init.sql':
+ensure  = present,
+owner   = 'mysql',
+group   = 'mysql',
+mode= '0644',
+content = template('mariadb/phabricator-init.sql.erb'),
+}
+
+file { '/etc/mysql/phabricator-stopwords.txt':
+ensure  = present,
+owner   = 'mysql',
+group   = 'mysql',
+mode= '0644',
+content = template('mariadb/phabricator-stopwords.txt.erb'),
+}
+
 if $snapshot {
 include coredb_mysql::snapshot
 }
diff --git a/templates/mariadb/phabricator-init.sql.erb 
b/templates/mariadb/phabricator-init.sql.erb
new file mode 100644
index 000..7e19fe8
--- /dev/null
+++ b/templates/mariadb/phabricator-init.sql.erb
@@ -0,0 +1 @@
+set global ft_boolean_syntax = ' |-()~*:^';
\ No newline at end of file
diff --git a/templates/mariadb/phabricator-stopwords.txt.erb 
b/templates/mariadb/phabricator-stopwords.txt.erb
new file mode 100644
index 000..c2a09ac
--- /dev/null
+++ b/templates/mariadb/phabricator-stopwords.txt.erb
@@ -0,0 +1,50 @@
+the
+be
+and
+of
+a
+in
+to
+have
+to
+it
+I
+that
+for
+you
+he
+with
+on
+do
+say
+this
+they
+at
+but
+we
+his
+from
+that
+not
+by
+or
+as
+what
+go
+their
+can
+who
+get
+if
+would
+all
+my
+will
+as
+up
+there
+so
+its
+us
+in
+on
\ No newline at end of file
diff --git a/templates/mariadb/phabricator.my.cnf.erb 
b/templates/mariadb/phabricator.my.cnf.erb
new file mode 100644
index 000..b6c5845
--- /dev/null
+++ b/templates/mariadb/phabricator.my.cnf.erb
@@ -0,0 +1,80 @@
+# Phabricator cluster (shards m3)
+
+[client]
+port   = 3306
+socket = /tmp/mysql.sock
+
+[mysqld]
+
+user   = mysql
+socket = /tmp/mysql.sock
+port   = 3306
+extra_port = 3307
+datadir= %= @datadir %
+tmpdir = %= @tmpdir %
+server_id  = %= @server_id %
+sql-mode   = %= @sql_mode %
+read_only  = %= @read_only %
+
+log_bin
+log_slave_updates
+skip-external-locking
+skip-name-resolve
+temp-pool
+
+max_connections= 500
+extra_max_connections  = 10
+max_connect_errors = 10
+max_allowed_packet = 16M
+connect_timeout= 3
+query_cache_size   = 0
+query_cache_type   = 0
+event_scheduler= 1
+userstat   = 1
+log-warnings   = 0
+thread_stack   = 192K
+thread_cache_size  = 100
+interactive_timeout= 28800
+wait_timeout   = 3600
+
+sync_binlog= 1
+binlog_cache_size  = 1M
+max_binlog_size= 1000M
+binlog_format  = MIXED
+expire_logs_days   = 7
+slave_transaction_retries  = 4294967295
+
+table_open_cache   = 5000
+table_definition_cache = 4000
+character_set_server   = binary
+character_set_filesystem   = binary
+collation_server   = binary
+
+default-storage-engine = InnoDB
+innodb_file_per_table  = 1
+innodb_buffer_pool_size= %= (Float(@memorysize.split[0]) * 0.5).round 
%G
+innodb_buffer_pool_instances   = 1
+innodb_log_file_size   = 1G
+innodb_flush_log_at_trx_commit = 1
+innodb_flush_method= O_DIRECT
+innodb_thread_concurrency  = 0
+innodb_io_capacity = 1000
+innodb_read_io_threads = 16
+innodb_write_io_threads= 8
+innodb_stats_sample_pages  = 16
+innodb_stats_method= nulls_unequal
+innodb_locks_unsafe_for_binlog = 1
+
+# T89274 and https://secure.phabricator.com/T6747 and 
http://bugs.mysql.com/bug.php?id=13913
+# Setting ft_boolean_syntax with a leading white space explodes and it isn't 
clear there was
+# ever a way to escape things or use set-variable here. For now, run a SET 
GLOBAL at startup:

[MediaWiki-commits] [Gerrit] Add backwards-compat metadata so booleans keep working right - change (mediawiki...Flow)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: Add backwards-compat metadata so booleans keep working right
..


Add backwards-compat metadata so booleans keep working right

In preparation for I7b37295e8862b188d1f3b0cd07f66ac34629678f

Without this, there is at least one user-facing issue, T86852,
but probably more, with that core patch checked out.

This is the approach Anomie recommended.

Bug: T86852
Change-Id: Ief36f80d55d76211839786f7e60aad20ad10c98b
---
M includes/Formatter/RevisionFormatter.php
M includes/Formatter/RevisionViewFormatter.php
2 files changed, 30 insertions(+), 5 deletions(-)

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



diff --git a/includes/Formatter/RevisionFormatter.php 
b/includes/Formatter/RevisionFormatter.php
index 8ca5be1..767adda 100644
--- a/includes/Formatter/RevisionFormatter.php
+++ b/includes/Formatter/RevisionFormatter.php
@@ -182,6 +182,13 @@
$moderatedRevision = $this-templating-getModeratedRevision( 
$row-revision );
$ts = $row-revision-getRevisionId()-getTimestampObj();
$res = array(
+   // Change all '_BC_bools' to ApiResult::META_BC_BOOLS 
when core
+   // change is merged.
+   '_BC_bools' = array(
+   // https://gerrit.wikimedia.org/r/#/c/182858/
+   'isOriginalContent',
+   'isModerated',
+   ),
'workflowId' = 
$row-workflow-getId()-getAlphadecimal(),
'revisionId' = 
$row-revision-getRevisionId()-getAlphadecimal(),
'timestamp' = $ts-getTimestamp( TS_MW ),
@@ -241,6 +248,13 @@
}
 
if ( $row instanceof TopicRow ) {
+   $res['_BC_bools'] = array_merge(
+   $res['_BC_bools'],
+   array(
+   'isWatched',
+   'watchable',
+   )
+   );
if (
$row-summary 
$this-permissions-isAllowed( $row-summary, 
'view' )
@@ -263,6 +277,13 @@
}
 
if ( $row-revision instanceof PostRevision ) {
+   $res['_BC_bools'] = array_merge(
+   $res['_BC_bools'],
+   array(
+   'isMaxThreadingDepth',
+   )
+   );
+
$replyTo = $row-revision-getReplyToId();
$res['replyToId'] = $replyTo ? 
$replyTo-getAlphadecimal() : null;
$res['postId'] = 
$row-revision-getPostId()-getAlphadecimal();
@@ -309,17 +330,22 @@
$blockTitle = \SpecialPage::getTitleFor( 'Block', $name );
 
$userContribsTitle = \SpecialPage::getTitleFor( 
'Contributions', $name );
+   $userLinksBCBools = array(
+   '_BC_bools' = array(
+   'exists',
+   ),
+   );
$links = array(
'contribs' = array(
'url' = $userContribsTitle-getLinkURL(),
'title' = $userContribsTitle-getText(),
'exists' = true,
-   ),
+   ) + $userLinksBCBools,
'userpage' = array(
'url' = $userTitle-getLinkURL(),
'title' = $userTitle-getText(),
'exists' = $userTitle-isKnown(),
-   )
+   ) + $userLinksBCBools,
);
 
if ( $talkPageTitle ) {
@@ -327,7 +353,7 @@
'url' = $talkPageTitle-getLinkURL(),
'title' = $talkPageTitle-getPrefixedText(),
'exists' = $talkPageTitle-isKnown()
-   );
+   ) + $userLinksBCBools;
}
// is this right permissions? typically this would
// be sourced from Linker::userToolLinks, but that
@@ -339,7 +365,7 @@
'url' = $blockTitle-getLinkURL(),
'title' = wfMessage( 'blocklink' ),
'exists' = true
-   ),
+   ) + $userLinksBCBools,
);
}
 
diff --git a/includes/Formatter/RevisionViewFormatter.php

[MediaWiki-commits] [Gerrit] Adding original language of this work campaign for WikiGrok - change (operations/mediawiki-config)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: Adding original language of this work campaign for WikiGrok
..


Adding original language of this work campaign for WikiGrok

Change-Id: I4d80a2ca052bdba63c6515ab63a9cbc9ff1088aa
See: https://trello.com/c/xGwY2peL
---
M wmf-config/mobile.php
1 file changed, 18 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index 3c6b83f..6e60cff 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -132,6 +132,24 @@
'ifAll' = array( 'P31'/* instance of */ = 
'Q482994'/* album */ ),
'suggestions' = array( 'Q208569'/* studio 
album */, 'Q209939'/* live album */ ),
),
+   // 
https://www.mediawiki.org/wiki/Extension:MobileFrontend/WikiGrok/Claim_suggestions#Original_language_of_this_work
+   'language1' = array(
+   'type' = 'Simple',
+   'property' = 'P364'/* original language of 
this work */,
+   'ifAll' = array( 'P495'/* country of origin */ 
= 'Q30'/* United States */ ),
+   'ifAny' = array( 'P31'/* instance of */ = 
'Q571'/* book */, 'P31'/* instance of */ = 'Q11424'/* film */, 'P31'/* 
instance of */ = 'Q15416'/* television program */ ),
+   'ifNotAny' = array( 'P364'/* original language 
of this work */ = 'Q1860'/* English */ ),
+   'suggestions' = array( 'Q1860'/* English */ ),
+   ),
+   // 
https://www.mediawiki.org/wiki/Extension:MobileFrontend/WikiGrok/Claim_suggestions#Original_language_of_this_work
+   'language2' = array(
+   'type' = 'Simple',
+   'property' = 'P364'/* original language of 
this work */,
+   'ifAll' = array( 'P495'/* country of origin */ 
= 'Q145'/* United Kingdom */ ),
+   'ifAny' = array( 'P31'/* instance of */ = 
'Q571'/* book */, 'P31'/* instance of */ = 'Q11424'/* film */, 'P31'/* 
instance of */ = 'Q15416'/* television program */ ),
+   'ifNotAny' = array( 'P364'/* original language 
of this work */ = 'Q1860'/* English */ ),
+   'suggestions' = array( 'Q1860'/* English */ ),
+   ),
);
 
// These are deprecated. Remove after change I3ec0190a is fully 
deployed.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d80a2ca052bdba63c6515ab63a9cbc9ff1088aa
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] [WIP] Schema:Edit instrumentation - change (mediawiki...WikiEditor)

2015-02-17 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: [WIP] Schema:Edit instrumentation
..

[WIP] Schema:Edit instrumentation

This is not ready yet, but I am open to comments on the general ideas and
potentially controversial aspects.

Depends on Ib8612626 and I5a7a2370

Bug: T88027
Change-Id: I67f1000d23cb257df29d5d4be8ae85764458e6c1
---
M WikiEditor.hooks.php
M WikiEditor.php
A modules/ext.wikiEditor.init.js
M modules/jquery.wikiEditor.js
4 files changed, 248 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor 
refs/changes/21/191221/1

diff --git a/WikiEditor.hooks.php b/WikiEditor.hooks.php
index 321c959..631edcf 100644
--- a/WikiEditor.hooks.php
+++ b/WikiEditor.hooks.php
@@ -165,6 +165,35 @@
}
 
/**
+* EditPage::showEditForm:fields hook
+*
+* Adds the event fields to the edit form
+*
+* @param EditPage $editPage the current EditPage object.
+* @param OutputPage $outputPage object.
+* @return bool
+*/
+   public static function editPageShowEditFormFields( $editPage, 
$outputPage ) {
+   $req = $outputPage-getContext()-getRequest();
+   $editingStatsId = $req-getVal( 'editingStatsId' );
+   if ( !$editingStatsId ) {
+   $editingStatsId = self::getEditingStatsId();
+   }
+   $outputPage-addHTML(
+   Xml::element(
+   'input',
+   array(
+   'type' = 'hidden',
+   'name' = 'editingStatsId',
+   'id' = 'editingStatsId',
+   'value' = $editingStatsId
+   )
+   )
+   );
+   return true;
+   }
+
+   /**
 * EditPageBeforeEditToolbar hook
 *
 * Disable the old toolbar if the new one is enabled
@@ -296,4 +325,107 @@
$vars['wgWikiEditorMagicWords'] = $magicWords;
}
 
+
+   /**
+* Adds WikiEditor JS to the output.
+*
+* This is attached to the MediaWiki 'BeforePageDisplay' hook.
+*
+* @param OutputPage $output
+* @param Skin $skin
+* @return boolean
+*/
+   public static function onBeforePageDisplay( OutputPage $output, Skin 
$skin ) {
+   $output-addModules( array( 'ext.wikiEditor.init' ) );
+   return true;
+   }
+
+   /**
+* Gets a 32 character alphanumeric random string to be used for stats.
+* @return string
+*/
+   private static function getEditingStatsId() {
+   $id = '';
+   $seed = 
'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+   for ( $i = 0; $i  32; $i++ ) {
+   $id .= $seed[ (int) floor( rand() / getrandmax() * 
strlen( $seed ) ) ];
+   }
+   return $id;
+   }
+
+   /**
+* This is attached to the MediaWiki 'BeforePageDisplay' hook.
+*
+* @param SkinTemplate $sktemplate
+* @param array $links Structured navigation links. This is used to 
alter the navigation for
+*  skins which use buildNavigationUrls such as Vector.
+* @return boolean
+*/
+   public static function onSkinTemplateNavigation( SkinTemplate 
$sktemplate, array $links ) {
+   if ( !isset( $links['views']['edit'] ) ) {
+   return true;
+   }
+
+   $links['views']['edit']['href'] .= 'editingStatsId=' . 
self::getEditingStatsId();
+
+   return true;
+   }
+
+   /**
+* This is attached to the MediaWiki 'EditPage::attemptSave:after' hook.
+*
+* @param EditPage $editPage
+* @param Status $status
+* @return boolean
+*/
+   public static function editPageAttemptSaveAfter( EditPage $editPage, 
Status $status ) {
+   $request = $editPage-getArticle()-getContext()-getRequest();
+   if ( class_exists( 'EventLogging' )  $request-getVal( 
'editingStatsId', false ) !== false ) {
+   $article = $editPage-getArticle();
+   $user = $article-getContext()-getUser();
+   $page = $article-getPage();
+   $title = $article-getTitle();
+   $data = array(
+   'version' = 1,
+   'editor' = 'wikitext',
+   'platform' = 'desktop', // FIXME
+   'integration' = 'page',
+   'page.length' = -1, // FIXME
+

[MediaWiki-commits] [Gerrit] wikilove-terms-url - protorel - change (mediawiki...WikiLove)

2015-02-17 Thread Jeremyb (Code Review)

Jeremyb has uploaded a new change for review.

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

Change subject: wikilove-terms-url - protorel
..

wikilove-terms-url - protorel

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLove 
refs/changes/23/191223/1

diff --git a/i18n/en.json b/i18n/en.json
index 04aa4ad..8d82905 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -181,7 +181,7 @@
wikilove-commons-url: http://commons.wikimedia.org;,
wikilove-terms: By submitting, you agree to transparency under these 
$1.,
wikilove-terms-link: terms,
-   wikilove-terms-url: 
http://wikimediafoundation.org/wiki/Feedback_privacy_statement;,
+   wikilove-terms-url: 
//wikimediafoundation.org/wiki/Feedback_privacy_statement,
tag-wikilove-description: Edit made using the WikiLove tool,
WikiLove.js: /* JavaScript placed here customizes WikiLove, see 
https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:WikiLove#Custom_configuration
 */,
apihelp-wikilove-description: Give WikiLove to another 
user.\n\nWikiLove is a positive message posted to a user's talk page through a 
convenient interface with preset or locally defined templates. This action adds 
the specified wikitext to a certain talk page. For statistical purposes, the 
type and other data are logged.,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d63f4cbafb2d7f88d4ab34de10ba1b03b9978e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLove
Gerrit-Branch: master
Gerrit-Owner: Jeremyb jer...@tuxmachine.com

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

[MediaWiki-commits] [Gerrit] vbench: Allow 'stage' to be specified from the command line - change (operations/puppet)

2015-02-17 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: vbench: Allow 'stage' to be specified from the command line
..


vbench: Allow 'stage' to be specified from the command line

Make it possible to profile a specific stage in the initialization of
VisualEditor by binding the profile start and stop actions to trace.*.enter and
trace.*.exit events, which VisualEditor will emit.

Bug: T89536
Change-Id: Iec8036392e3d8c74c718731692ef7ea22e5cf170
---
M files/ve/vbench
1 file changed, 17 insertions(+), 6 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/files/ve/vbench b/files/ve/vbench
index 5683c2d..fb022f2 100755
--- a/files/ve/vbench
+++ b/files/ve/vbench
@@ -62,10 +62,16 @@
 # FIXME: Make this configurable.
 JS = '''
 window.onload = function () {
-// Bind a handler to VE's ready event that stops the profiler.
-mw.trackSubscribe( 'event.Edit', function ( _, event ) {
-if ( event.action === 'ready' )
-console.profileEnd( 've' );
+var stage = %s;
+ve.trackSubscribe( 'trace.' + stage + '.', function ( topic ) {
+switch ( topic.split( '.' ).pop() ) {
+case 'enter':
+console.profile( stage );
+break;
+case 'exit':
+console.profileEnd( stage );
+break;
+}
 } );
 
 // Don't show the welcome dialog.
@@ -74,7 +80,6 @@
 
 // Wait 200ms for any load handlers to run, then start VE.
 setTimeout( function () {
-  console.profile( 've' );
   mw.libs.ve.onEditTabClick( { preventDefault: $.noop } );
 }, 200 );
 };
@@ -264,7 +269,8 @@
 self.__dict__[domain_name] = domain
 yield domain.enable()
 
-yield self.page.addScriptToEvaluateOnLoad(scriptSource=JS)
+scriptSource = JS % self.factory.stage
+yield self.page.addScriptToEvaluateOnLoad(scriptSource=scriptSource)
 yield self.profiler.setSamplingInterval(interval=100)
 
 if self.factory.disable_cache:
@@ -413,6 +419,11 @@
 help='disable network cache',
 )
 ap.add_argument(
+'--stage',
+default='init',
+help='Name of Specific stage to profile (default: init)',
+)
+ap.add_argument(
 'target_url',
 metavar='URL',
 help='URL to load',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec8036392e3d8c74c718731692ef7ea22e5cf170
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] reduce db1065 non-api load - change (operations/mediawiki-config)

2015-02-17 Thread Springle (Code Review)

Springle has uploaded a new change for review.

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

Change subject: reduce db1065 non-api load
..

reduce db1065 non-api load

Change-Id: Ifd192e0371389900e2c75888c7b6516e23c5581c
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index beb7c3a..fa82e74 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -92,7 +92,7 @@
'db1051' = 0,   # 2.8TB  96GB, vslow, dump
'db1055' = 0,   # 2.8TB  96GB, watchlist, recentchangeslinked, 
contributions, logpager
'db1057' = 100, # 2.8TB  96GB
-   'db1065' = 200, # 2.8TB 160GB, api
+   'db1065' = 0,   # 2.8TB 160GB, api, = 0 T88084
'db1066' = 200, # 2.8TB 160GB, api
'db1072' = 500, # 2.8TB 160GB
'db1073' = 500, # 2.8TB 160GB

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd192e0371389900e2c75888c7b6516e23c5581c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Springle sprin...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 3dcad4e..237bb05 - change (mediawiki/extensions)

2015-02-17 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: 3dcad4e..237bb05
..

Syncronize VisualEditor: 3dcad4e..237bb05

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/38/191238/1

diff --git a/VisualEditor b/VisualEditor
index 3dcad4e..237bb05 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 3dcad4e5674caa0fd1b82c89b4172456957ff118
+Subproject commit 237bb053d6146c757518cc27b09595e2399706c7

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4760574f88c4e5aaa768747e4c32b741713d1691
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 3dcad4e..237bb05 - change (mediawiki/extensions)

2015-02-17 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: 3dcad4e..237bb05
..


Syncronize VisualEditor: 3dcad4e..237bb05

Change-Id: I4760574f88c4e5aaa768747e4c32b741713d1691
---
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 3dcad4e..237bb05 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 3dcad4e5674caa0fd1b82c89b4172456957ff118
+Subproject commit 237bb053d6146c757518cc27b09595e2399706c7

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4760574f88c4e5aaa768747e4c32b741713d1691
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org
Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] PostgreSQL: Fix text search on moved pages - change (mediawiki/core)

2015-02-17 Thread Jjanes (Code Review)

Jjanes has uploaded a new change for review.

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

Change subject: PostgreSQL: Fix text search on moved pages
..

PostgreSQL: Fix text search on moved pages

When a page is updated under PostgreSQL, there is code to
de-index all but the most recent version of the page.  But
when a page is moved, it was accidentally de-indexing the
most recent version as well, because rev_text_id is not
incremented in that case.  A simple tweak to the SQL
fixes that.

I added code to the update script to find pages
previously corrupted by this problem and reindex them.

Bug: 66650
Change-Id: I52e1bbbd8592be5e7c7383c225e6b4c19bbe5b9e
---
M includes/installer/PostgresUpdater.php
M includes/search/SearchPostgres.php
A maintenance/postgres/archives/patch-textsearch_bug66650.sql
M maintenance/postgres/update-keys.sql
4 files changed, 21 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/45/191245/1

diff --git a/includes/installer/PostgresUpdater.php 
b/includes/installer/PostgresUpdater.php
index d9608b6..a3068d8 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -409,6 +409,8 @@
array( 'addPgField', 'mwuser', 'user_password_expires', 
'TIMESTAMPTZ NULL' ),
array( 'changeFieldPurgeTable', 'l10n_cache', 
'lc_value', 'bytea',
replace(lc_value,'\','')::bytea ),
+   // 1.23.9
+   array( 'rebuildTextSearch'),
 
// 1.24
array( 'addPgField', 'page_props', 'pp_sortkey', 'float 
NULL' ),
@@ -947,4 +949,12 @@
$this-applyPatch( 'patch-tsearch2funcs.sql', false, 
Rewriting tsearch2 triggers );
}
}
+
+   protected function rebuildTextSearch() {
+   if ( $this-updateRowExists( 'patch-textsearch_bug66650.sql' ) 
) {
+   $this-output( ...bug 66650 already fixed or not 
applicable.\n );
+   return true;
+   };
+   $this-applyPatch( 'patch-textsearch_bug66650.sql', false, 
Rebuilding text search for bug 66650 );
+   }
 }
diff --git a/includes/search/SearchPostgres.php 
b/includes/search/SearchPostgres.php
index 59b0c31..bd2484f 100644
--- a/includes/search/SearchPostgres.php
+++ b/includes/search/SearchPostgres.php
@@ -186,7 +186,7 @@
function update( $pageid, $title, $text ) {
## We don't want to index older revisions
$sql = UPDATE pagecontent SET textvector = NULL WHERE 
textvector IS NOT NULL and old_id IN  .
-   (SELECT rev_text_id FROM revision WHERE 
rev_page =  . intval( $pageid ) .
+   (SELECT DISTINCT rev_text_id FROM revision 
WHERE rev_page =  . intval( $pageid ) .
 ORDER BY rev_text_id DESC OFFSET 1);
$this-db-query( $sql );
return true;
diff --git a/maintenance/postgres/archives/patch-textsearch_bug66650.sql 
b/maintenance/postgres/archives/patch-textsearch_bug66650.sql
new file mode 100644
index 000..e4f5681
--- /dev/null
+++ b/maintenance/postgres/archives/patch-textsearch_bug66650.sql
@@ -0,0 +1,5 @@
+UPDATE /*_*/pagecontent SET textvector=to_tsvector(old_text)
+WHERE textvector IS NULL AND old_id IN 
+(SELECT  max(rev_text_id) FROM revision GROUP BY rev_page);
+
+INSERT INTO /*_*/updatelog(ul_key) VALUES ('patch-textsearch_bug66650.sql');
diff --git a/maintenance/postgres/update-keys.sql 
b/maintenance/postgres/update-keys.sql
index 7761d0c..b858551 100644
--- a/maintenance/postgres/update-keys.sql
+++ b/maintenance/postgres/update-keys.sql
@@ -27,3 +27,8 @@
VALUES( 
'user_former_groups-ufg_group-patch-ufg_group-length-increase-255.sql', null );
 INSERT INTO /*_*/updatelog (ul_key, ul_value)
VALUES( 'user_properties-up_property-patch-up_property.sql', null );
+
+-- PostgreSQL-specific patches.
+
+INSERT INTO /*_*/updatelog (ul_key, ul_value)
+   VALUES( 'patch-textsearch_bug66650.sql', null );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52e1bbbd8592be5e7c7383c225e6b4c19bbe5b9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_24
Gerrit-Owner: Jjanes jeff.ja...@gmail.com

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

[MediaWiki-commits] [Gerrit] sort by last modified column - change (mediawiki...PagesList)

2015-02-17 Thread tosfos (Code Review)

tosfos has submitted this change and it was merged.

Change subject: sort by last modified column
..


sort by last modified column

Change-Id: I8561ba75058f7ddc29b4ade51ad37e90558431bc
---
M PagesList.class.php
M PagesList.php
2 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/PagesList.class.php b/PagesList.class.php
index cad50ef..1f8bc7e 100644
--- a/PagesList.class.php
+++ b/PagesList.class.php
@@ -60,7 +60,6 @@
/**
 * The index to actually be used for ordering. This is a single column,
 * for one ordering, even if multiple orderings are supported.
-* @todo fixme
 * @var string
 */
protected $indexField = 'rev_timestamp';
@@ -131,7 +130,7 @@
$options = isset( $info['options'] ) ? $info['options'] : 
array();
$join_conds = isset( $info['join_conds'] ) ? 
$info['join_conds'] : array();
 
-   #$options['ORDER BY'] = $this-indexField . ' DESC';
+   $options['ORDER BY'] = $this-indexField . ' DESC';
 
return array( $tables, $fields, $conds, $fname, $options, 
$join_conds );
}
diff --git a/PagesList.php b/PagesList.php
index c332498..9918805 100644
--- a/PagesList.php
+++ b/PagesList.php
@@ -6,7 +6,7 @@
  *
  * @file
  * @ingroup Extensions
- * @author Ike Hecht, 2014
+ * @author Ike Hecht, 2015
  * @license GNU General Public Licence 2.0 or later
  */
 $wgExtensionCredits['other'][] = array(
@@ -15,7 +15,7 @@
'author' = array(
'Ike Hecht',
),
-   'version' = '0.1.0',
+   'version' = '0.1.1',
'url' = 'https://www.mediawiki.org/wiki/Extension:PagesList',
'descriptionmsg' = 'pageslist-desc',
 );
@@ -68,7 +68,8 @@
  *
  * Example:
  * $wgPagesListDataTablesOptions = array(
- * 'iDisplayLength' = 25
+ * 'iDisplayLength' = 25,
+ * 'aaSorting' = array() // Don't sort by first column - results in sort 
by last modified, descending
  * );
  */
 $wgPagesListDataTablesOptions = array();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8561ba75058f7ddc29b4ade51ad37e90558431bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PagesList
Gerrit-Branch: master
Gerrit-Owner: tosfos tos...@yahoo.com
Gerrit-Reviewer: tosfos tos...@yahoo.com

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

[MediaWiki-commits] [Gerrit] ButtonWidget: Rename nofollow config option to noFollow - change (oojs/ui)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: ButtonWidget: Rename nofollow config option to noFollow
..


ButtonWidget: Rename nofollow config option to noFollow

Use consistent camel case.  The old `nofollow` property still works,
for backward compatibility, but it is deprecated and will be removed
in the next major release (T89767).

Change-Id: I30eb9683e120224b3182e2da23e04b66c135e05a
---
M php/widgets/ButtonWidget.php
M src/widgets/ButtonWidget.js
2 files changed, 24 insertions(+), 19 deletions(-)

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



diff --git a/php/widgets/ButtonWidget.php b/php/widgets/ButtonWidget.php
index b387eb4..934aaab 100644
--- a/php/widgets/ButtonWidget.php
+++ b/php/widgets/ButtonWidget.php
@@ -28,13 +28,13 @@
 *
 * @var boolean
 */
-   protected $nofollow = true;
+   protected $noFollow = true;
 
/**
 * @param array $config Configuration options
 * @param string $config['href'] Hyperlink to visit when clicked
 * @param string $config['target'] Target to open hyperlink in
-* @param boolean $config['nofollow'] Search engine traversal hint 
(default: true)
+* @param boolean $config['noFollow'] Search engine traversal hint 
(default: true)
 */
public function __construct( array $config = array() ) {
// Parent constructor
@@ -59,7 +59,11 @@
 
$this-setHref( isset( $config['href'] ) ? $config['href'] : 
null );
$this-setTarget( isset( $config['target'] ) ? 
$config['target'] : null );
-   $this-setNoFollow( isset( $config['nofollow'] ) ? 
$config['nofollow'] : true );
+   $this-setNoFollow( isset( $config['noFollow'] ) ? 
$config['noFollow'] : true );
+   // FIXME: The `nofollow` alias is deprecated and will be 
removed (T89767)
+   if ( isset( $config['nofollow'] ) ) {
+   $this-setNoFollow( $config['nofollow'] );
+   }
}
 
/**
@@ -86,7 +90,7 @@
 * @return boolean Whether search engines should avoid traversing this 
hyperlink.
 */
public function getNoFollow() {
-   return $this-nofollow;
+   return $this-noFollow;
}
 
/**
@@ -126,12 +130,12 @@
/**
 * Set search engine traversal hint.
 *
-* @param boolean $nofollow True if search engines should avoid 
traversing this hyperlink
+* @param boolean $noFollow True if search engines should avoid 
traversing this hyperlink
 */
-   public function setNoFollow( $nofollow ) {
-   $this-nofollow = is_bool( $nofollow ) ? $nofollow : true;
+   public function setNoFollow( $noFollow ) {
+   $this-noFollow = is_bool( $noFollow ) ? $noFollow : true;
 
-   if ( $this-nofollow ) {
+   if ( $this-noFollow ) {
$this-button-setAttributes( array( 'rel' = 
'nofollow' ) );
} else {
$this-button-removeAttributes( array( 'rel' ) );
diff --git a/src/widgets/ButtonWidget.js b/src/widgets/ButtonWidget.js
index 0ae2c89..2e07f64 100644
--- a/src/widgets/ButtonWidget.js
+++ b/src/widgets/ButtonWidget.js
@@ -20,11 +20,12 @@
  * @param {Object} [config] Configuration options
  * @cfg {string} [href] Hyperlink to visit when clicked
  * @cfg {string} [target] Target to open hyperlink in
- * @cfg {boolean} [nofollow] Search engine traversal hint (default: true)
+ * @cfg {boolean} [noFollow] Search engine traversal hint (default: true)
  */
 OO.ui.ButtonWidget = function OoUiButtonWidget( config ) {
// Configuration initialization
-   config = config || {};
+   // FIXME: The `nofollow` alias is deprecated and will be removed 
(T89767)
+   config = $.extend( { noFollow: config  config.nofollow }, config );
 
// Parent constructor
OO.ui.ButtonWidget.super.call( this, config );
@@ -41,7 +42,7 @@
// Properties
this.href = null;
this.target = null;
-   this.nofollow = false;
+   this.noFollow = false;
this.isHyperlink = false;
 
// Initialization
@@ -51,7 +52,7 @@
.append( this.$button );
this.setHref( config.href );
this.setTarget( config.target );
-   this.setNoFollow( config.nofollow );
+   this.setNoFollow( config.noFollow );
 };
 
 /* Setup */
@@ -137,7 +138,7 @@
  * @return {boolean} Whether search engines should avoid traversing this 
hyperlink
  */
 OO.ui.ButtonWidget.prototype.getNoFollow = function () {
-   return this.nofollow;
+   return this.noFollow;
 };
 
 /**
@@ -185,14 +186,14 @@
 /**
  * Set search engine traversal hint.
  *
- * @param {boolean} nofollow True if search engines should avoid traversing 
this hyperlink
+ * @param {boolean}

[MediaWiki-commits] [Gerrit] InputWidget: Add description - change (oojs/ui)

2015-02-17 Thread Kmenger (Code Review)

Kmenger has uploaded a new change for review.

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

Change subject: InputWidget: Add description
..

InputWidget: Add description

Change-Id: I81a31f28c1d39d1a644d8041dd7ab19be0e6
---
M src/widgets/InputWidget.js
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/10/191210/1

diff --git a/src/widgets/InputWidget.js b/src/widgets/InputWidget.js
index 0e2470e..acf9ed2 100644
--- a/src/widgets/InputWidget.js
+++ b/src/widgets/InputWidget.js
@@ -1,5 +1,10 @@
 /**
- * Base class for input widgets.
+ * InputWidget is the base class for all input widgets, which
+ * include {@link OO.ui.TextInputWidget text inputs}, {@link 
OO.ui.CheckboxInputWidget checkbox inputs},
+ * {@link OO.ui.RadioInputWidget radio inputs}, and {@link 
OO.ui.ButtonInputWidget button inputs}.
+ * See the [OOjs UI documentation on MediaWiki] [1] for more information and 
examples.
+ *
+ * [1]: https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Inputs
  *
  * @abstract
  * @class

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81a31f28c1d39d1a644d8041dd7ab19be0e6
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Kmenger kmen...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Bump WikiGrok for https://gerrit.wikimedia.org/r/#/c/190562/ - change (mediawiki/core)

2015-02-17 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Bump WikiGrok for https://gerrit.wikimedia.org/r/#/c/190562/
..

Bump WikiGrok for https://gerrit.wikimedia.org/r/#/c/190562/

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/09/191209/1

diff --git a/extensions/WikiGrok b/extensions/WikiGrok
index 787009d..799984b 16
--- a/extensions/WikiGrok
+++ b/extensions/WikiGrok
-Subproject commit 787009db66df16010a4cc1c36904771db640c83e
+Subproject commit 799984b781e271322dfd41829d7fa5893856405e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b26e3e2d95da54a3ed19bb1cf2322f141930c13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf16
Gerrit-Owner: MaxSem maxsem.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] Bump WikiGrok for https://gerrit.wikimedia.org/r/#/c/190562/ - change (mediawiki/core)

2015-02-17 Thread MaxSem (Code Review)

MaxSem has submitted this change and it was merged.

Change subject: Bump WikiGrok for https://gerrit.wikimedia.org/r/#/c/190562/
..


Bump WikiGrok for https://gerrit.wikimedia.org/r/#/c/190562/

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

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



diff --git a/extensions/WikiGrok b/extensions/WikiGrok
index 787009d..799984b 16
--- a/extensions/WikiGrok
+++ b/extensions/WikiGrok
-Subproject commit 787009db66df16010a4cc1c36904771db640c83e
+Subproject commit 799984b781e271322dfd41829d7fa5893856405e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b26e3e2d95da54a3ed19bb1cf2322f141930c13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf16
Gerrit-Owner: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Bump WikiGrok for https://gerrit.wikimedia.org/r/#/c/190562/ - change (mediawiki/core)

2015-02-17 Thread MaxSem (Code Review)

MaxSem has submitted this change and it was merged.

Change subject: Bump WikiGrok for https://gerrit.wikimedia.org/r/#/c/190562/
..


Bump WikiGrok for https://gerrit.wikimedia.org/r/#/c/190562/

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

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



diff --git a/extensions/WikiGrok b/extensions/WikiGrok
index 42b3904..c5df249 16
--- a/extensions/WikiGrok
+++ b/extensions/WikiGrok
-Subproject commit 42b390418c84787b7944a19eee0923e098e659ca
+Subproject commit c5df249a44a117b5b4d32e3ca018adc40fd36b3b

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic740694ac9d336f5a11d171ff81b4ad850846525
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf17
Gerrit-Owner: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Allow other extensions to add or override discovery tools - change (mediawiki...MobileFrontend)

2015-02-17 Thread Bmansurov (Code Review)

Bmansurov has uploaded a new change for review.

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

Change subject: Allow other extensions to add or override discovery tools
..

Allow other extensions to add or override discovery tools

Change-Id: I14d7e04bb22df8407cf99dba4c99f5f287cc3684
---
M includes/skins/SkinMinerva.php
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 7080a4c..f9a3d1d 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -464,6 +464,10 @@
) {
unset( $items['nearby'] );
}
+
+   // Allow other extensions to add or override discovery tools
+   Hooks::run( 'MobileDiscoveryTools', array( $items ) );
+
return $items;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I14d7e04bb22df8407cf99dba4c99f5f287cc3684
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov bmansu...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Use noc@ for apache2 ServerAdmin - change (operations/puppet)

2015-02-17 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: Use noc@ for apache2 ServerAdmin
..


Use noc@ for apache2 ServerAdmin

Change from root@ to noc@ for apache2 ServerAdmin
to remain consistent with other configurations.

Change-Id: Idf44c33c931a74777e44949130dc0aedb6976f5e
---
M manifests/role/kibana.pp
M manifests/role/wikimania_scholarships.pp
M modules/ganglia_new/templates/ganglia.wikimedia.org.erb
M modules/mediawiki/templates/apache/apache2.conf.erb
M modules/webserver/manifests/apache/site.pp
M modules/wikimania_scholarships/manifests/init.pp
M templates/apache/sites/ganglia.wikimedia.org.erb
7 files changed, 10 insertions(+), 10 deletions(-)

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



diff --git a/manifests/role/kibana.pp b/manifests/role/kibana.pp
index 6819f10..625773b 100644
--- a/manifests/role/kibana.pp
+++ b/manifests/role/kibana.pp
@@ -42,7 +42,7 @@
 # Production
 $hostname  = 'logstash.wikimedia.org'
 $deploy_dir= '/srv/deployment/kibana/kibana'
-$serveradmin   = 'r...@wikimedia.org'
+$serveradmin   = 'n...@wikimedia.org'
 $require_ssl   = true
 
 $ldap_authurl  = 'ldaps://ldap-eqiad.wikimedia.org 
ldap-codfw.wikimedia.org/ou=people,dc=wikimedia,dc=org?cn'
diff --git a/manifests/role/wikimania_scholarships.pp 
b/manifests/role/wikimania_scholarships.pp
index 4efa716..4139a68 100644
--- a/manifests/role/wikimania_scholarships.pp
+++ b/manifests/role/wikimania_scholarships.pp
@@ -14,7 +14,7 @@
 cache_dir= '/var/cache/scholarships',
 # Send logs to fluorine
 udp2log_dest = '10.64.0.21:8420',
-serveradmin  = 'r...@wikimedia.org',
+serveradmin  = 'n...@wikimedia.org',
 # Misc MySQL shard
 mysql_host   = 'm2-master.eqiad.wmnet',
 mysql_db = 'scholarships',
diff --git a/modules/ganglia_new/templates/ganglia.wikimedia.org.erb 
b/modules/ganglia_new/templates/ganglia.wikimedia.org.erb
index daadda5..66849bd 100644
--- a/modules/ganglia_new/templates/ganglia.wikimedia.org.erb
+++ b/modules/ganglia_new/templates/ganglia.wikimedia.org.erb
@@ -2,7 +2,7 @@
 ServerName %= @ganglia_servername %
 ServerAlias %= @ganglia_serveralias %
 DocumentRoot /var/www
-ServerAdmin r...@wikimedia.org
+ServerAdmin n...@wikimedia.org
 
 Directory /var/www
 Options FollowSymLinks
@@ -21,7 +21,7 @@
 ServerName %= @ganglia_servername %
 ServerAlias %= @ganglia_serveralias %
 DocumentRoot /var/www
-ServerAdmin r...@wikimedia.org
+ServerAdmin n...@wikimedia.org
 
 SSLEngine on
 SSLCertificateFile %= @ganglia_ssl_cert %
diff --git a/modules/mediawiki/templates/apache/apache2.conf.erb 
b/modules/mediawiki/templates/apache/apache2.conf.erb
index 15fcd48..7acb7b7 100644
--- a/modules/mediawiki/templates/apache/apache2.conf.erb
+++ b/modules/mediawiki/templates/apache/apache2.conf.erb
@@ -56,7 +56,7 @@
 User %= scope.lookupvar('::mediawiki::users::web') %
 Group %= scope.lookupvar('::mediawiki::users::web') %
 
-ServerAdmin r...@wikimedia.org
+ServerAdmin n...@wikimedia.org
 
 ServerTokens Prod
 ServerName wikimedia.org
diff --git a/modules/webserver/manifests/apache/site.pp 
b/modules/webserver/manifests/apache/site.pp
index ee3d09e..358f436 100644
--- a/modules/webserver/manifests/apache/site.pp
+++ b/modules/webserver/manifests/apache/site.pp
@@ -9,7 +9,7 @@
 #   $docroot=undef- defaults to: $title == 'stats.wikimedia.org', then 
/srv/stats.wikimedia.org
 #   $custom=[]- custom Apache config strings to put into virtual host 
site file
 #   $includes=[]
-#   $server_admin=r...@wikimedia.org,
+#   $server_admin=n...@wikimedia.org,
 #   $access_log   - path to access log, default: 
/var/log/apache2/access.log
 #   $error_log- path to error log,  default: /var/log/apache2/error.log
 #   $ensure=present
@@ -24,7 +24,7 @@
 $docroot  = undef,
 $custom   = [],
 $includes = [],
-$server_admin = 'r...@wikimedia.org',
+$server_admin = 'n...@wikimedia.org',
 $access_log   = /var/log/apache2/${title}.access.log,
 $error_log= /var/log/apache2/${title}.error.log,
 $ensure   = 'present',
diff --git a/modules/wikimania_scholarships/manifests/init.pp 
b/modules/wikimania_scholarships/manifests/init.pp
index 2be3464..776033b 100644
--- a/modules/wikimania_scholarships/manifests/init.pp
+++ b/modules/wikimania_scholarships/manifests/init.pp
@@ -29,7 +29,7 @@
 $deploy_dir   = '/srv/deployment/scholarships/scholarships',
 $cache_dir= '/var/cache/scholarships',
 $udp2log_dest = '10.64.0.21:8420',
-$serveradmin  = 'r...@wikimedia.org',
+$serveradmin  = 'n...@wikimedia.org',
 $mysql_host   = 'localhost',
 $mysql_db = 'scholarships',
 $smtp_host= 'localhost'
diff --git a/templates/apache/sites/ganglia.wikimedia.org.erb

[MediaWiki-commits] [Gerrit] Bump up dependencies - change (mediawiki...deploy)

2015-02-17 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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

Change subject: Bump up dependencies
..

Bump up dependencies

Change-Id: If50f4864ddc27767a13d5313e8eabc650569b7ae
---
M node_modules/istanbul/node_modules/async/package.json
M node_modules/mocha/node_modules/glob/package.json
M node_modules/node-uuid/node_modules/microtime/node_modules/nan/package.json
M node_modules/restbase-mod-table-cassandra/node_modules/async/package.json
M 
node_modules/restbase-mod-table-cassandra/node_modules/restify/node_modules/lru-cache/package.json
A node_modules/service-runner/.npmignore
M node_modules/service-runner/README.md
M node_modules/service-runner/config.yaml
D node_modules/service-runner/lib/es6.js
M node_modules/service-runner/lib/logger.js
A node_modules/service-runner/node_modules/core-js/.gitattributes
A node_modules/service-runner/node_modules/core-js/.npmignore
A node_modules/service-runner/node_modules/core-js/Gruntfile.js
A node_modules/service-runner/node_modules/core-js/README.md
A node_modules/service-runner/node_modules/core-js/bower.json
A node_modules/service-runner/node_modules/core-js/build/Gruntfile.ls
A node_modules/service-runner/node_modules/core-js/build/build.ls
A node_modules/service-runner/node_modules/core-js/build/config.ls
A node_modules/service-runner/node_modules/core-js/build/core-stable.js
A node_modules/service-runner/node_modules/core-js/client/core.js
A node_modules/service-runner/node_modules/core-js/client/core.min.js
A node_modules/service-runner/node_modules/core-js/client/core.min.js.map
A node_modules/service-runner/node_modules/core-js/client/library.js
A node_modules/service-runner/node_modules/core-js/client/library.min.js
A node_modules/service-runner/node_modules/core-js/client/library.min.js.map
A node_modules/service-runner/node_modules/core-js/client/shim.js
A node_modules/service-runner/node_modules/core-js/client/shim.min.js
A node_modules/service-runner/node_modules/core-js/client/shim.min.js.map
A node_modules/service-runner/node_modules/core-js/index.js
A node_modules/service-runner/node_modules/core-js/library.js
A node_modules/service-runner/node_modules/core-js/package.json
A node_modules/service-runner/node_modules/core-js/shim.js
A node_modules/service-runner/node_modules/core-js/src/common.js
A node_modules/service-runner/node_modules/core-js/src/core.$for.js
A node_modules/service-runner/node_modules/core-js/src/core.array.js
A node_modules/service-runner/node_modules/core-js/src/core.binding.js
A node_modules/service-runner/node_modules/core-js/src/core.date.js
A node_modules/service-runner/node_modules/core-js/src/core.delay.js
A node_modules/service-runner/node_modules/core-js/src/core.dict.js
A node_modules/service-runner/node_modules/core-js/src/core.global.js
A node_modules/service-runner/node_modules/core-js/src/core.iterator.js
A node_modules/service-runner/node_modules/core-js/src/core.log.js
A node_modules/service-runner/node_modules/core-js/src/core.number.js
A node_modules/service-runner/node_modules/core-js/src/core.object.js
A node_modules/service-runner/node_modules/core-js/src/core.string.js
A node_modules/service-runner/node_modules/core-js/src/es5.js
A node_modules/service-runner/node_modules/core-js/src/es6.array.js
A node_modules/service-runner/node_modules/core-js/src/es6.collections.js
A node_modules/service-runner/node_modules/core-js/src/es6.function.js
A node_modules/service-runner/node_modules/core-js/src/es6.iterators.js
A node_modules/service-runner/node_modules/core-js/src/es6.math.js
A node_modules/service-runner/node_modules/core-js/src/es6.number.constructor.js
A node_modules/service-runner/node_modules/core-js/src/es6.number.js
A node_modules/service-runner/node_modules/core-js/src/es6.object.js
A 
node_modules/service-runner/node_modules/core-js/src/es6.object.statics-accept-primitives.js
A node_modules/service-runner/node_modules/core-js/src/es6.promise.js
A node_modules/service-runner/node_modules/core-js/src/es6.reflect.js
A node_modules/service-runner/node_modules/core-js/src/es6.regexp.js
A node_modules/service-runner/node_modules/core-js/src/es6.string.js
A node_modules/service-runner/node_modules/core-js/src/es6.symbol.js
A node_modules/service-runner/node_modules/core-js/src/es7.abstract-refs.js
A node_modules/service-runner/node_modules/core-js/src/es7.proposals.js
A node_modules/service-runner/node_modules/core-js/src/js.array.statics.js
A node_modules/service-runner/node_modules/core-js/src/web.console.js
A node_modules/service-runner/node_modules/core-js/src/web.dom.itarable.js
A node_modules/service-runner/node_modules/core-js/src/web.immediate.js
A node_modules/service-runner/node_modules/core-js/src/web.timers.js
D node_modules/service-runner/node_modules/es6-collections/.npmignore
D node_modules/service-runner/node_modules/es6-collections/.travis.yml
D

[MediaWiki-commits] [Gerrit] Bump up dependencies - change (mediawiki...deploy)

2015-02-17 Thread GWicke (Code Review)

GWicke has submitted this change and it was merged.

Change subject: Bump up dependencies
..


Bump up dependencies

Change-Id: If50f4864ddc27767a13d5313e8eabc650569b7ae
---
M node_modules/istanbul/node_modules/async/package.json
M node_modules/mocha/node_modules/glob/package.json
M node_modules/node-uuid/node_modules/microtime/node_modules/nan/package.json
M node_modules/restbase-mod-table-cassandra/node_modules/async/package.json
M 
node_modules/restbase-mod-table-cassandra/node_modules/restify/node_modules/lru-cache/package.json
A node_modules/service-runner/.npmignore
M node_modules/service-runner/README.md
M node_modules/service-runner/config.yaml
D node_modules/service-runner/lib/es6.js
M node_modules/service-runner/lib/logger.js
A node_modules/service-runner/node_modules/core-js/.gitattributes
A node_modules/service-runner/node_modules/core-js/.npmignore
A node_modules/service-runner/node_modules/core-js/Gruntfile.js
A node_modules/service-runner/node_modules/core-js/README.md
A node_modules/service-runner/node_modules/core-js/bower.json
A node_modules/service-runner/node_modules/core-js/build/Gruntfile.ls
A node_modules/service-runner/node_modules/core-js/build/build.ls
A node_modules/service-runner/node_modules/core-js/build/config.ls
A node_modules/service-runner/node_modules/core-js/build/core-stable.js
A node_modules/service-runner/node_modules/core-js/client/core.js
A node_modules/service-runner/node_modules/core-js/client/core.min.js
A node_modules/service-runner/node_modules/core-js/client/core.min.js.map
A node_modules/service-runner/node_modules/core-js/client/library.js
A node_modules/service-runner/node_modules/core-js/client/library.min.js
A node_modules/service-runner/node_modules/core-js/client/library.min.js.map
A node_modules/service-runner/node_modules/core-js/client/shim.js
A node_modules/service-runner/node_modules/core-js/client/shim.min.js
A node_modules/service-runner/node_modules/core-js/client/shim.min.js.map
A node_modules/service-runner/node_modules/core-js/index.js
A node_modules/service-runner/node_modules/core-js/library.js
A node_modules/service-runner/node_modules/core-js/package.json
A node_modules/service-runner/node_modules/core-js/shim.js
A node_modules/service-runner/node_modules/core-js/src/common.js
A node_modules/service-runner/node_modules/core-js/src/core.$for.js
A node_modules/service-runner/node_modules/core-js/src/core.array.js
A node_modules/service-runner/node_modules/core-js/src/core.binding.js
A node_modules/service-runner/node_modules/core-js/src/core.date.js
A node_modules/service-runner/node_modules/core-js/src/core.delay.js
A node_modules/service-runner/node_modules/core-js/src/core.dict.js
A node_modules/service-runner/node_modules/core-js/src/core.global.js
A node_modules/service-runner/node_modules/core-js/src/core.iterator.js
A node_modules/service-runner/node_modules/core-js/src/core.log.js
A node_modules/service-runner/node_modules/core-js/src/core.number.js
A node_modules/service-runner/node_modules/core-js/src/core.object.js
A node_modules/service-runner/node_modules/core-js/src/core.string.js
A node_modules/service-runner/node_modules/core-js/src/es5.js
A node_modules/service-runner/node_modules/core-js/src/es6.array.js
A node_modules/service-runner/node_modules/core-js/src/es6.collections.js
A node_modules/service-runner/node_modules/core-js/src/es6.function.js
A node_modules/service-runner/node_modules/core-js/src/es6.iterators.js
A node_modules/service-runner/node_modules/core-js/src/es6.math.js
A node_modules/service-runner/node_modules/core-js/src/es6.number.constructor.js
A node_modules/service-runner/node_modules/core-js/src/es6.number.js
A node_modules/service-runner/node_modules/core-js/src/es6.object.js
A 
node_modules/service-runner/node_modules/core-js/src/es6.object.statics-accept-primitives.js
A node_modules/service-runner/node_modules/core-js/src/es6.promise.js
A node_modules/service-runner/node_modules/core-js/src/es6.reflect.js
A node_modules/service-runner/node_modules/core-js/src/es6.regexp.js
A node_modules/service-runner/node_modules/core-js/src/es6.string.js
A node_modules/service-runner/node_modules/core-js/src/es6.symbol.js
A node_modules/service-runner/node_modules/core-js/src/es7.abstract-refs.js
A node_modules/service-runner/node_modules/core-js/src/es7.proposals.js
A node_modules/service-runner/node_modules/core-js/src/js.array.statics.js
A node_modules/service-runner/node_modules/core-js/src/web.console.js
A node_modules/service-runner/node_modules/core-js/src/web.dom.itarable.js
A node_modules/service-runner/node_modules/core-js/src/web.immediate.js
A node_modules/service-runner/node_modules/core-js/src/web.timers.js
D node_modules/service-runner/node_modules/es6-collections/.npmignore
D node_modules/service-runner/node_modules/es6-collections/.travis.yml
D node_modules/service-runner/node_modules/es6-collections/LICENSE.txt
D

[MediaWiki-commits] [Gerrit] Two more fixes for the new layout - change (operations/puppet)

2015-02-17 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Two more fixes for the new layout
..


Two more fixes for the new layout

- Path resolution is now relative to package.json and node_modules, so use
  ./restbase/lib/server to reference the server module in the deploy repo.
- Remove stray port entry in config.

Change-Id: Ifdc5cd1ca2db6edecdd1e082f1790fcbd3e18394
---
M modules/restbase/templates/config.yaml.erb
1 file changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/restbase/templates/config.yaml.erb 
b/modules/restbase/templates/config.yaml.erb
index b04c423..80164f9 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -113,8 +113,7 @@
 # The main service setup. Each worker can offer one or more services.
 services:
   - name: restbase
-module: ./lib/server
+module: ./restbase/lib/server
 conf:
   port: %= @port %
-  port: 7231
   spec: *spec

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifdc5cd1ca2db6edecdd1e082f1790fcbd3e18394
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Make Special:ApiHelp query string parameters work - change (mediawiki/core)

2015-02-17 Thread Spage (Code Review)

Spage has uploaded a new change for review.

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

Change subject: Make Special:ApiHelp query string parameters work
..

Make Special:ApiHelp query string parameters work

With this Special:ApiHelp passes query string parameters on to
api.php?action=help, and when transcluding it parses query string
parameters in its subpage argument.

Bug: T89768
Change-Id: I03612fb0997eefe568938ba031f3c4282d22c909
---
M includes/specials/SpecialApiHelp.php
1 file changed, 23 insertions(+), 3 deletions(-)


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

diff --git a/includes/specials/SpecialApiHelp.php 
b/includes/specials/SpecialApiHelp.php
index b43911f..f6a8a1b 100644
--- a/includes/specials/SpecialApiHelp.php
+++ b/includes/specials/SpecialApiHelp.php
@@ -39,13 +39,15 @@
 
// These come from transclusions
$request = $this-getRequest();
-   $options = array(
+   // Initialize options to query string parameters.
+   $options = $request-getQueryValues();
+   $options = array_merge( $options, array(
'action' = 'help',
'nolead' = true,
'submodules' = $request-getCheck( 'submodules' ),
'recursivesubmodules' = $request-getCheck( 
'recursivesubmodules' ),
'title' = $request-getVal( 'title', 
$this-getPageTitle( '$1' )-getPrefixedText() ),
-   );
+   ) );
 
// These are for linking from wikitext, since url parameters 
are a pain
// to do.
@@ -62,9 +64,19 @@
continue;
}
 
-   $moduleName = $par;
break;
}
+
+   // If the subpage contains a '?', parse what comes after as a 
query string.
+   $split = explode( '?', $par, 2 ); 
+   if ( count( $split )  1 ) {
+   $par = $split[0];
+   parse_str( $split[1], $qsOpts );
+   // Options from the subpage won't override those from 
setup and the actual query string.
+   $options = array_merge( $qsOpts, $options );
+   }
+
+   $moduleName = $par;
 
if ( !$this-including() ) {
unset( $options['nolead'], $options['title'] );
@@ -74,6 +86,14 @@
return;
}
 
+   // From here on the Api help is transcluded.
+
+   // Set some $options into the current context before getting 
help.
+   // FIXME for now focus on language.
+   if ( isset( $options['uselang'] ) ) {
+   $this-getContext()-setLanguage( $options['uselang'] );
+   }
+
$main = new ApiMain( $this-getContext(), false );
try {
$module = $main-getModuleFromPath( $moduleName );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I03612fb0997eefe568938ba031f3c4282d22c909
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Spage sp...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 9239f95..549d1e8 - change (mediawiki/extensions)

2015-02-17 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: 9239f95..549d1e8
..


Syncronize VisualEditor: 9239f95..549d1e8

Change-Id: Ib397561e95d5928307c11a044ad2b89ef1126938
---
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 9239f95..549d1e8 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 9239f950d832bdccc8dc3240caa7f04f0df8baf0
+Subproject commit 549d1e89c638740412c457c3a19d24ceca84f761

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib397561e95d5928307c11a044ad2b89ef1126938
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org
Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix V8 deopt for ve.ce.BranchNode#onSplice - change (VisualEditor/VisualEditor)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: Fix V8 deopt for ve.ce.BranchNode#onSplice
..


Fix V8 deopt for ve.ce.BranchNode#onSplice

Fix Not optimized: Bad value context for arguments value.

Change-Id: I8030d824a3274368b5fbfebf188556e14bd46076
---
M src/ce/ve.ce.BranchNode.js
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/src/ce/ve.ce.BranchNode.js b/src/ce/ve.ce.BranchNode.js
index cbb4011..5ef8919 100644
--- a/src/ce/ve.ce.BranchNode.js
+++ b/src/ce/ve.ce.BranchNode.js
@@ -180,12 +180,16 @@
 ve.ce.BranchNode.prototype.onSplice = function ( index ) {
var i, j,
length,
-   args = Array.prototype.slice.call( arguments ),
+   args = [],
$anchor,
afterAnchor,
node,
parentNode,
removals;
+
+   for ( i = 0, length = arguments.length; i  length; i++ ) {
+   args.push( arguments[i] );
+   }
// Convert models to views and attach them to this node
if ( args.length = 3 ) {
for ( i = 2, length = args.length; i  length; i++ ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8030d824a3274368b5fbfebf188556e14bd46076
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 9239f95..549d1e8 - change (mediawiki/extensions)

2015-02-17 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: 9239f95..549d1e8
..

Syncronize VisualEditor: 9239f95..549d1e8

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/13/191213/1

diff --git a/VisualEditor b/VisualEditor
index 9239f95..549d1e8 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 9239f950d832bdccc8dc3240caa7f04f0df8baf0
+Subproject commit 549d1e89c638740412c457c3a19d24ceca84f761

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib397561e95d5928307c11a044ad2b89ef1126938
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update VE core submodule to master (4d6cd42) - change (mediawiki...VisualEditor)

2015-02-17 Thread jenkins-bot (Code Review)

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

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


Update VE core submodule to master (4d6cd42)

New changes:
9a0ef06 ve.dm.ElementLinearData: Remove unused rules.removeStyles feature
6174608 Remove a Rubocop exception that doesn't produce offenses
5612b8f Make the Gemfile more like the one in the MW repo
75d20ca Add round-trip test to getModelFromDom tests
f4ac9ac ElementLinearData tests: compare stores more elegantly
d00a4b9 Add fromDataBody property for DomFromModel tests
ccb5452 Remove data-parsoid hack in ve.dm.Annotation#isGenerated
166e0e2 Fix the Rubocop offense SpaceAroundOperators
e1abdbb Fix the Rubocop offense StringLiterals
da95fc0 Use OO.initClass() rather than setting .static manually
f3146c3 Ignore duplicates when comparing class lists

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

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



diff --git a/lib/ve b/lib/ve
index e56418a..4d6cd42 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit e56418af29a4ada8e632d0c9595a38f09dc4f879
+Subproject commit 4d6cd424ce1684f61b9113c480fd2bd66bc155a0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic068b09f1975830e49e49bfdf83f503845e27741
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 549d1e8..3dcad4e - change (mediawiki/extensions)

2015-02-17 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: 549d1e8..3dcad4e
..

Syncronize VisualEditor: 549d1e8..3dcad4e

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


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

diff --git a/VisualEditor b/VisualEditor
index 549d1e8..3dcad4e 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 549d1e89c638740412c457c3a19d24ceca84f761
+Subproject commit 3dcad4e5674caa0fd1b82c89b4172456957ff118

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3110eb5c7fb06a97626d7e1cf5344031d9091af7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] mw.Target: Hopefully fix plugin garbage removal code - change (mediawiki...VisualEditor)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: mw.Target: Hopefully fix plugin garbage removal code
..


mw.Target: Hopefully fix plugin garbage removal code

Follows-up 0547d8c8.

It's still very difficult to test whether this code works, but
doing $( newDoc ).remove( 'selector1' ).remove( 'selector2' )...
demonstrably doesn't work, because 1) the selector passed to remove()
filters the collection, it doesn't descend into it, and 2) remove()
returns the collection of removed items, so chaining it doesn't work.

Instead, use $( newDoc ).find( 'selector1, selector2, ...' ).remove();

Also normalise selectors.

Change-Id: I97f3b28c4d5120f08e5d7fbf4598ddc0c01d4ecf
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 13 insertions(+), 10 deletions(-)

Approvals:
  Alex Monk: 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 9a3f9db..715e477 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -984,16 +984,19 @@
copyAttributes( oldDoc.head, newDoc.head );
copyAttributes( oldDoc.body, newDoc.body );
$( newDoc )
-   .remove( 'div[id = myEventWatcherDiv]' ) // Bug 51423
-   .remove( 'embed[type = application/iodbc]' ) // Bug 51521
-   .remove( 'embed[type = application/x-datavault]' ) // Bug 
52791
-   .remove( 'script[id = FoxLingoJs]' ) // Bug 52884
-   .remove( 'style[id = _clearly_component__css]' ) // Bug 53252
-   .remove( 'div[id = sendToInstapaperResults]' ) // Bug 61776
-   .remove( 'embed[id ^= xunlei_com_thunder_helper_plugin]' ) // 
Bug 63121
-   .remove( 'object[type = cosymantecnisbfw], 
script[id=NortonInternetSecurityBF]' ) // Bug 63229
-   .remove( 'div[id = kloutify]' ) // Bug 67006
-   .remove( 'div[id ^= mittoHidden]' ); // Bug 68900#c1
+   .find(
+   'div[id=myEventWatcherDiv], ' + // Bug 51423
+   'embed[type=application/iodbc], ' + // Bug 51521
+   'embed[type=application/x-datavault], ' + // Bug 52791
+   'script[id=FoxLingoJs], ' + // Bug 52884
+   'style[id=_clearly_component__css], ' + // Bug 53252
+   'div[id=sendToInstapaperResults], ' + // Bug 61776
+   'embed[id^=xunlei_com_thunder_helper_plugin], ' + // 
Bug 63121
+   'object[type=cosymantecnisbfw], 
script[id=NortonInternetSecurityBF], ' + // Bug 63229
+   'div[id=kloutify], ' + // Bug 67006
+   'div[id^=mittoHidden]' // Bug 68900#c1
+   )
+   .remove();
// Add doctype manually
return '!doctype html' + ve.serializeXhtml( newDoc );
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I97f3b28c4d5120f08e5d7fbf4598ddc0c01d4ecf
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 549d1e8..3dcad4e - change (mediawiki/extensions)

2015-02-17 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: 549d1e8..3dcad4e
..


Syncronize VisualEditor: 549d1e8..3dcad4e

Change-Id: I3110eb5c7fb06a97626d7e1cf5344031d9091af7
---
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 549d1e8..3dcad4e 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 549d1e89c638740412c457c3a19d24ceca84f761
+Subproject commit 3dcad4e5674caa0fd1b82c89b4172456957ff118

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3110eb5c7fb06a97626d7e1cf5344031d9091af7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org
Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] actually put ft_stopword_file into the db config this time - change (operations/puppet)

2015-02-17 Thread Springle (Code Review)

Springle has uploaded a new change for review.

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

Change subject: actually put ft_stopword_file into the db config this time
..

actually put ft_stopword_file into the db config this time

Change-Id: I71ee3c2e69b621e310898b5c77a891b46c7e3cdd
---
M templates/mariadb/phabricator.my.cnf.erb
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/templates/mariadb/phabricator.my.cnf.erb 
b/templates/mariadb/phabricator.my.cnf.erb
index b6c5845..311f4c7 100644
--- a/templates/mariadb/phabricator.my.cnf.erb
+++ b/templates/mariadb/phabricator.my.cnf.erb
@@ -69,6 +69,7 @@
 # Setting ft_boolean_syntax with a leading white space explodes and it isn't 
clear there was
 # ever a way to escape things or use set-variable here. For now, run a SET 
GLOBAL at startup:
 init_file  = /etc/mysql/phabricator-init.sql
+ft_stopword_file   = /etc/mysql/phabricator-stopwords.txt
 ft_min_word_len= 3
 aria_pagecache_buffer_size = 4G
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71ee3c2e69b621e310898b5c77a891b46c7e3cdd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle sprin...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Made TransactionProfiler affected-row warnings not trigger f... - change (mediawiki/core)

2015-02-17 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Made TransactionProfiler affected-row warnings not trigger for 
JobRunner
..

Made TransactionProfiler affected-row warnings not trigger for JobRunner

* The CLI check did not work since jobs can work via HTTP requests

Change-Id: I524e79fd51275777c1505e29ecf0725b998eabcc
---
M includes/MediaWiki.php
M includes/profiler/TransactionProfiler.php
2 files changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 2a0a405..c21f5e9 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -497,6 +497,7 @@
$trxProfiler = 
Profiler::instance()-getTransactionProfiler();
$trxProfiler-setExpectation( 'masterConns', 0, 
__METHOD__ );
$trxProfiler-setExpectation( 'writes', 0, __METHOD__ );
+   $trxProfiler-setExpectation( 'maxAffected', 500, 
__METHOD__ );
}
 
// If the user has forceHTTPS set to true, or if the user
diff --git a/includes/profiler/TransactionProfiler.php 
b/includes/profiler/TransactionProfiler.php
index 9609bd3..b313558 100644
--- a/includes/profiler/TransactionProfiler.php
+++ b/includes/profiler/TransactionProfiler.php
@@ -34,8 +34,6 @@
protected $dbLockThreshold = 3.0;
/** @var float Seconds */
protected $eventThreshold = .25;
-   /** @var integer */
-   protected $affectedThreshold = 500;
 
/** @var array transaction ID = (write start time, list of DBs 
involved) */
protected $dbTrxHoldingLocks = array();
@@ -54,7 +52,8 @@
'writes'  = INF,
'queries' = INF,
'conns'   = INF,
-   'masterConns' = INF
+   'masterConns' = INF,
+   'maxAffected' = INF
);
/** @var array */
protected $expectBy = array();
@@ -154,9 +153,9 @@
$eTime = microtime( true );
$elapsed = ( $eTime - $sTime );
 
-   if ( $isWrite  $n  $this-affectedThreshold  PHP_SAPI !== 
'cli' ) {
+   if ( $isWrite  $n  $this-expect['maxAffected'] ) {
wfDebugLog( 'DBPerformance',
-   Query affected $n rows:\n . $query . \n . 
wfBacktrace( true ) );
+   Query affected $n row(s):\n . $query . \n . 
wfBacktrace( true ) );
}
 
// Report when too many writes/queries happen...

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I524e79fd51275777c1505e29ecf0725b998eabcc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update restbase config.yaml.erb for service-runner - change (operations/puppet)

2015-02-17 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Update restbase config.yaml.erb for service-runner
..


Update restbase config.yaml.erb for service-runner

We are now using a generic service-runner module, which expects a slightly
different config file. This patch updates the puppetized config to match this.

Change-Id: Ib7912ec2491aae446af2b123eb970c0d3eb7c22e
---
M modules/restbase/templates/config.yaml.erb
1 file changed, 18 insertions(+), 23 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/restbase/templates/config.yaml.erb 
b/modules/restbase/templates/config.yaml.erb
index 1b857c0..395f900 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -1,6 +1,7 @@
 # RESTBase config
 
-port: %= @port %
+info:
+  name: restbase
 
 logging:
   name: restbase
@@ -11,9 +12,14 @@
 host: %= @logstash_host %
 port: %= @logstash_port %
 
-monitoring:
-  statsdHost: %= @statsd_host %
+# StatsD metrics collection
+metrics:
+  type: txstatsd
+  host: %= @statsd_host %
+  port: %= @statsd_port %
 
+# Swagger spec templates, referenced using yaml references in the spec section
+# below.
 templates:
 
   wmf-content-1.0.0: wp/content/1.0.0
@@ -87,22 +93,6 @@
 options:
   apiURI: http://{domain}/w/api.php
 
-#  /{module:revscore}:
-#title: Simple revscore service wrapper
-#x-modules:
-#  # Generic revision service interface; Expects requests of the form
-#  # /{title}/{revision}.
-#  # Specific interface documentation (content types etc) at public
-#  # entry point, although we might also want to enforce them
-#  # internally.
-#  - name: restbase-mod-service
-#version: 1.0.0 # simple service module, to be shared
-#options:
-#  storage:
-#uri: 
/{domain}/sys/key_rev_value/revscore.scores/{title}/{revision}
-#  service:
-#uri: http://revscore.wikimedia.org/{domain}/{title}/{revision}
-
   wp-default-1.0.0: wp/default/1.0.0
 x-subspecs:
   - paths:
@@ -113,13 +103,18 @@
 x-subspec: *wp/sys/1.0.0
 
 
+# Swagger spec root.
 spec:
   title: The RESTBase root
   # Some more general RESTBase info
   paths:
 /{domain:en.wikipedia.org}: *wp/default/1.0.0
-#/{domain:de.wikipedia.org}: *wp/default/1.0.0
-#/{domain:es.wikipedia.org}: *wp/default/1.0.0
-#/{domain:nl.wikipedia.org}: *wp/default/1.0.0
-#/{domain:en.wikipedia.test.local}: *wp/default/1.0.0
 
+# The main service setup. Each worker can offer one or more services.
+services:
+  - name: restbase
+module: ./lib/server
+conf:
+  port: %= @port %
+  port: 7231
+  spec: *spec

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7912ec2491aae446af2b123eb970c0d3eb7c22e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Gage jger...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Add universal argument to ignore ssh_auth_sock - change (mediawiki...scap)

2015-02-17 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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

Change subject: Add universal argument to ignore ssh_auth_sock
..

Add universal argument to ignore ssh_auth_sock

Add a universal `--no-shared-authsock` command line argument that will
bypass changing SSH_AUTH_SOCK based on the ssh_auth_sock configuration
setting. This can be used by callers who have a valid ssh key pair but
are not in the proper user group to access the shared ssh-auth socket.

Bug: T76061
Change-Id: I3eac26b094dec4713240be233e8e28fd7c0bc499
---
M scap/cli.py
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap 
refs/changes/48/191248/1

diff --git a/scap/cli.py b/scap/cli.py
index a02b366..241ec3f 100644
--- a/scap/cli.py
+++ b/scap/cli.py
@@ -141,6 +141,9 @@
 parser.add_argument('-v', '--verbose', action='store_const',
 const=logging.DEBUG, default=logging.INFO, dest='loglevel',
 help='Verbose output')
+parser.add_argument('--no-shared-authsock', dest='shared_authsock',
+action='store_false',
+help='Ignore any shared ssh-auth configuration')
 
 return parser
 
@@ -171,7 +174,7 @@
 def _setup_environ(self):
 Setup shell environment.
 auth_sock = self.config.get('ssh_auth_sock')
-if auth_sock is not None:
+if auth_sock is not None and self.arguments.shared_authsock:
 os.environ['SSH_AUTH_SOCK'] = auth_sock
 
 def main(self, *extra_args):

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3eac26b094dec4713240be233e8e28fd7c0bc499
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: BryanDavis bda...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] PostgreSQL: Fix text search on moved pages - change (mediawiki/core)

2015-02-17 Thread Jjanes (Code Review)

Jjanes has uploaded a new change for review.

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

Change subject: PostgreSQL: Fix text search on moved pages
..

PostgreSQL: Fix text search on moved pages

When a page is updated under PostgreSQL, there is code to
de-index all but the most recent version of the page.  But
when a page is moved, it was accidentally de-indexing the
most recent version as well, because rev_text_id is not
incremented in that case.  A simple tweak to the SQL
fixes that.

I added code to the update script to find pages
previously corrupted by this problem and reindex them.

Bug: 66650
Change-Id: I52e1bbbd8592be5e7c7383c225e6b4c19bbe5b9e
---
M RELEASE-NOTES-1.23
M includes/installer/PostgresUpdater.php
M includes/search/SearchPostgres.php
A maintenance/postgres/archives/patch-textsearch_bug66650.sql
4 files changed, 19 insertions(+), 2 deletions(-)


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

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 1178c5b..15eb146 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -7,6 +7,8 @@
 
 == Changes since 1.23.8 ==
 
+* (bug T68650) Fix indexing of moved pages with PostgreSQL. Requires running
+  update.php to fix.
 * (bug T70087) Fix Special:ActiveUsers page for installations using 
   PostgreSQL.
 
diff --git a/includes/installer/PostgresUpdater.php 
b/includes/installer/PostgresUpdater.php
index ab0be18..f158a12 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -407,6 +407,8 @@
array( 'addPgField', 'page', 'page_links_updated', 
TIMESTAMPTZ NULL ),
array( 'addPgField', 'mwuser', 'user_password_expires', 
'TIMESTAMPTZ NULL' ),
array( 'changeFieldPurgeTable', 'l10n_cache', 
'lc_value', 'bytea', replace(lc_value,'\','')::bytea ),
+   // 1.23.9
+   array( 'rebuildTextSearch'),
);
}
 
@@ -914,4 +916,12 @@
$this-applyPatch( 'patch-tsearch2funcs.sql', false, 
Rewriting tsearch2 triggers );
}
}
+
+   protected function rebuildTextSearch() {
+   if ( $this-updateRowExists( 'patch-textsearch_bug66650.sql' ) 
) {
+   $this-output( ...bug 66650 already fixed or not 
applicable.\n );
+   return true;
+   };
+   $this-applyPatch( 'patch-textsearch_bug66650.sql', false, 
Rebuilding text search for bug 66650 );
+   }
 }
diff --git a/includes/search/SearchPostgres.php 
b/includes/search/SearchPostgres.php
index 4da63b3..c3cb9a4 100644
--- a/includes/search/SearchPostgres.php
+++ b/includes/search/SearchPostgres.php
@@ -191,8 +191,8 @@
 
function update( $pageid, $title, $text ) {
## We don't want to index older revisions
-   $sql = UPDATE pagecontent SET textvector = NULL WHERE old_id 
IN  .
-   (SELECT rev_text_id FROM revision WHERE 
rev_page =  . intval( $pageid ) .
+   $sql = UPDATE pagecontent SET textvector = NULL WHERE 
textvector IS NOT NULL and old_id IN  .
+   (SELECT DISTINCT rev_text_id FROM revision 
WHERE rev_page =  . intval( $pageid ) .
 ORDER BY rev_text_id DESC OFFSET 1);
$this-db-query( $sql );
return true;
diff --git a/maintenance/postgres/archives/patch-textsearch_bug66650.sql 
b/maintenance/postgres/archives/patch-textsearch_bug66650.sql
new file mode 100644
index 000..e4f5681
--- /dev/null
+++ b/maintenance/postgres/archives/patch-textsearch_bug66650.sql
@@ -0,0 +1,5 @@
+UPDATE /*_*/pagecontent SET textvector=to_tsvector(old_text)
+WHERE textvector IS NULL AND old_id IN 
+(SELECT  max(rev_text_id) FROM revision GROUP BY rev_page);
+
+INSERT INTO /*_*/updatelog(ul_key) VALUES ('patch-textsearch_bug66650.sql');

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52e1bbbd8592be5e7c7383c225e6b4c19bbe5b9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
Gerrit-Owner: Jjanes jeff.ja...@gmail.com

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

[MediaWiki-commits] [Gerrit] Reduce database locking - change (mediawiki...WikiGrok)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: Reduce database locking
..


Reduce database locking

Bug: T89359
Change-Id: I0e19b3f7017fc25d3382eea0c98c38516312e91c
(cherry picked from commit 0927b63933952400b8a90fae350cdd92e49ad5f0)
---
M includes/QuestionStore.php
1 file changed, 30 insertions(+), 13 deletions(-)

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



diff --git a/includes/QuestionStore.php b/includes/QuestionStore.php
index c7af37b..01f5eb0 100644
--- a/includes/QuestionStore.php
+++ b/includes/QuestionStore.php
@@ -20,6 +20,36 @@
}
 
$dbw = wfGetDB( DB_MASTER );
+
+   // Select rows to be deleted instead of deadlocking with blind 
DELETE over mostly 0 rows
+   // Old versions
+   $or = 'wgq_version  ' . self::FORMAT_VERSION;
+   // Campaigns not in the new list
+   if ( $campaigns ) {
+   $names = self::campaignList( array_keys( $campaigns ) );
+   $or .=  OR wgq_campaign NOT IN($names);
+   }
+   $conds = array(
+   'wgq_page' = $pageId,
+   $or,
+   );
+   $res = $dbw-select(
+   'wikigrok_questions',
+   array( 'wgq_page', 'wgq_campaign', 'wgq_version' ),
+   $conds,
+   __METHOD__
+   );
+   foreach ( $res as $row ) {
+   $dbw-delete( 'wikigrok_questions',
+   array(
+   'wgq_page' = $row-wgq_page,
+   'wgq_campaign' = $row-wgq_campaign,
+   'wgq_version' = $row-wgq_version,
+   ),
+   __METHOD__
+   );
+   }
+
$rows = array();
foreach ( $campaigns as $name = $data ) {
$rows[] = array(
@@ -33,19 +63,6 @@
if ( $rows ) {
$dbw-insert( 'wikigrok_questions', $rows, __METHOD__, 
array( 'IGNORE' ) );
}
-
-   $conds = array( 'wgq_page' = $pageId );
-   // Kill old versions
-   $dbw-delete( 'wikigrok_questions',
-   $conds + array( 'wgq_version  ' . 
self::FORMAT_VERSION ),
-   __METHOD__
-   );
-   if ( $campaigns ) {
-   $names = self::campaignList( array_keys( $campaigns ) );
-   $conds[] = wgq_campaign NOT IN($names);
-   }
-   // Delete campaigns not in the new list
-   $dbw-delete( 'wikigrok_questions', $conds, __METHOD__ );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e19b3f7017fc25d3382eea0c98c38516312e91c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: wmf/1.25wmf16
Gerrit-Owner: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Increase editcount for existing Flow revisions - change (mediawiki...Flow)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: Increase editcount for existing Flow revisions
..


Increase editcount for existing Flow revisions

Bug: T63887
Change-Id: I3fedc4aa16d94c0099091321cd5321c11e57eedd
---
A maintenance/FlowFixEditCount.php
1 file changed, 126 insertions(+), 0 deletions(-)

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



diff --git a/maintenance/FlowFixEditCount.php b/maintenance/FlowFixEditCount.php
new file mode 100644
index 000..bf51c1d
--- /dev/null
+++ b/maintenance/FlowFixEditCount.php
@@ -0,0 +1,126 @@
+?php
+
+use Flow\Container;
+use Flow\FlowActions;
+use Flow\Model\UUID;
+
+require_once ( getenv( 'MW_INSTALL_PATH' ) !== false
+   ? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
+   : dirname( __FILE__ ) . '/../../../maintenance/Maintenance.php' );
+
+/**
+ * Adjusts edit counts for all existing Flow data.
+ *
+ * @ingroup Maintenance
+ */
+class FlowFixEditCount extends LoggedUpdateMaintenance {
+   /**
+* Array of [username = increased edit count]
+*
+* @var array
+*/
+   protected $updates = array();
+
+   public function __construct() {
+   parent::__construct();
+
+   $this-mDescription = 'Adjusts edit counts for all existing 
Flow data';
+
+   $this-addOption( 'start', 'Timestamp to start counting 
revisions at', false, true );
+   $this-addOption( 'stop', 'Timestamp to stop counting revisions 
at', false, true );
+
+   $this-setBatchSize( 300 );
+   }
+
+   protected function getUpdateKey() {
+   return 'FlowFixEditCount';
+   }
+
+   protected function doDBUpdates() {
+   /** @var DatabaseBase $dbr */
+   $dbr = Container::get( 'db.factory' )-getDB( DB_SLAVE );
+   $countableActions = $this-getCountableActions();
+
+   // defaults = date of first Flow commit up until now
+   $continue = UUID::getComparisonUUID( $this-getOption( 'start', 
'20130710230511' ) );
+   $stop = UUID::getComparisonUUID( $this-getOption( 'stop', 
time() ) );
+   while ( $continue !== false ) {
+   $continue = $this-refreshBatch( $dbr, $continue, 
$countableActions, $stop );
+
+   // wait for core (we're updating user table) slaves to 
catch up
+   wfWaitForSlaves();
+   }
+
+   $this-output( Done increasing edit counts. Increased:\n );
+   foreach ( $this-updates as $userId = $count ) {
+   $userName = User::newFromId( $userId )-getName();
+   $this-output(   User $userId ($userName): +$count\n 
);
+   }
+
+   return true;
+   }
+
+   public function refreshBatch( DatabaseBase $dbr, UUID $continue, 
$countableActions, UUID $stop ) {
+   $rows = $dbr-select(
+   'flow_revision',
+   array( 'rev_id', 'rev_user_id' ),
+   array(
+   'rev_id  ' . $dbr-addQuotes( 
$continue-getBinary() ),
+   'rev_id = ' . $dbr-addQuotes( 
$stop-getBinary() ),
+   'rev_user_id  0',
+   'rev_user_wiki' = wfWikiID(),
+   'rev_change_type' = $countableActions,
+   ),
+   __METHOD__,
+   array( 'ORDER BY' = 'rev_id ASC' )
+   );
+
+   // end of data
+   if ( !$rows || $rows-numRows() === 0 ) {
+   return false;
+   }
+
+   foreach ( $rows as $row ) {
+   // User::incEditCount only allows for edit count to be 
increased 1
+   // at a time. It'd be better to immediately be able to 
increase the
+   // edit count by the exact number it should be 
increased with, but
+   // I'd rather re-use existing code, especially in a 
run-once script,
+   // where performance is not the most important thing ;)
+   $user = User::newFromId( $row-rev_user_id );
+   $user-incEditCount();
+
+   // save updates so we can print them when the script is 
done running
+   if ( !isset( $this-updates[$user-getId()] ) ) {
+   $this-updates[$user-getId()] = 0;
+   }
+   $this-updates[$user-getId()]++;
+
+   // set value for next batch to continue at
+   $continue = $row-rev_id;
+   }
+
+   return UUID::create( $continue );
+   }
+
+   /**
+*

[MediaWiki-commits] [Gerrit] [WIP] Don't use positional arguments to constructors that ta... - change (oojs/ui)

2015-02-17 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: [WIP] Don't use positional arguments to constructors that take 
'config' objects
..

[WIP] Don't use positional arguments to constructors that take 'config' objects

However, retain the ability to do so for backwards compatibility.

WIP because should probably update the demo. Not going to update all
callers.

Skipped:
* Toolbar-related things.
* LookupInputWidget because we're killing it.
* TextInputMenuSelectWidget because, while it doesn't accept an
  'input' config option, its parent MenuSelectWidget does, so this
  would technically be a breaking change? Messed up, not touching it
  now.

Bug: T89687
Change-Id: Ice897687ac02cd22a6e8c969b483667a4669a5c2
---
M bin/testsuitegenerator.rb
M php/layouts/FieldLayout.php
M php/layouts/GridLayout.php
M src/layouts/ActionFieldLayout.js
M src/layouts/FieldLayout.js
M src/layouts/GridLayout.js
M src/layouts/PageLayout.js
M src/widgets/OutlineControlsWidget.js
8 files changed, 85 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/14/191214/1

diff --git a/bin/testsuitegenerator.rb b/bin/testsuitegenerator.rb
index 089aaba..20e438a 100644
--- a/bin/testsuitegenerator.rb
+++ b/bin/testsuitegenerator.rb
@@ -19,7 +19,7 @@
.reject{|c| !c[:parent] || c[:parent] == 'ElementMixin' || 
c[:parent] == 'Theme' } # can't test abstract
.reject{|c| %w[Element Widget Layout Theme].include? c[:name] } 
# no toplevel
.reject{|c| c[:name] == 'DropdownInputWidget' } # different PHP 
and JS implementations
-   .select{|c| c[:methods][0][:params].empty? } # only without 
params :(
+   .reject{|c| %w[FieldLayout GridLayout].include? c[:name] } # 
required config options cause issues
 
# values to test for each type
expandos = {
diff --git a/php/layouts/FieldLayout.php b/php/layouts/FieldLayout.php
index b3ae9c8..68b8568 100644
--- a/php/layouts/FieldLayout.php
+++ b/php/layouts/FieldLayout.php
@@ -34,14 +34,20 @@
private $field, $body, $help;
 
/**
-* @param Widget $fieldWidget Field widget
+* For backwards compatibility, the `fieldWidget` configuration option 
can also be passed as the
+* first positional parameter.
+*
 * @param array $config Configuration options
+* @param Widget $config['fieldWidget'] Field widget
 * @param string $config['align'] Alignment mode, either 'left', 
'right', 'top' or 'inline'
 *   (default: 'left')
 * @param string $config['help'] Explanatory text shown as a '?' icon.
 */
-   public function __construct( Widget $fieldWidget, array $config = 
array() ) {
-   $hasInputWidget = $fieldWidget instanceof InputWidget;
+   public function __construct( $config = array() ) {
+   if ( !is_array( $config ) ) {
+   $config = func_get_arg( 1 ) ?: array();
+   $config['fieldWidget'] = func_get_arg( 0 );
+   }
 
// Config initialization
$config = array_merge( array( 'align' = 'left' ), $config );
@@ -50,7 +56,8 @@
parent::__construct( $config );
 
// Properties
-   $this-fieldWidget = $fieldWidget;
+   $this-fieldWidget = $config['fieldWidget'];
+   $hasInputWidget = $this-fieldWidget instanceof InputWidget;
$this-field = new Tag( 'div' );
$this-body = new Tag( $hasInputWidget ? 'label' : 'div' );
if ( isset( $config['help'] ) ) {
diff --git a/php/layouts/GridLayout.php b/php/layouts/GridLayout.php
index 0730766..45c71c2 100644
--- a/php/layouts/GridLayout.php
+++ b/php/layouts/GridLayout.php
@@ -33,18 +33,26 @@
protected $heights = array();
 
/**
-* @param PanelLayout[] $panels Panels in the grid
+* For backwards compatibility, the `panels` configuration option can 
also be passed as the
+* first positional parameter.
+*
 * @param array $config Configuration options
+* @param PanelLayout[] $config['panels'] Panels in the grid
 * @param number[] $config['widths'] Widths of columns as ratios
 * @param number[] $config['heights'] Heights of rows as ratios
 */
-   public function __construct( array $panels, array $config = array() ) {
+   public function __construct( array $config = array() ) {
+   if ( isset( $config[0] ) ) {
+   $config = func_get_arg( 1 ) ?: array();
+   $config['panels'] = func_get_arg( 0 );
+   }
+
// Parent constructor
parent::__construct( $config );
 
// Initialization
$this-addClasses( array(

[MediaWiki-commits] [Gerrit] add jamesur to analytics-privatedata-users - change (operations/puppet)

2015-02-17 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: add jamesur to analytics-privatedata-users
..

add jamesur to analytics-privatedata-users

Requested on T89739 with reasoning and approval.

James already has a shell users.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/191218/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 610dee1..0d18f7e 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -220,7 +220,7 @@
   kleduc, nuria, haithams, otto, deskana,
   bsitzmann, dbrant, declerambaul, ellery, nettrom, leila,
   ezachte, mforns, reedy, west1, phuedx, ananthrk, awight,
-  joal]
+  joal, jamesur]
   analytics-admins:
 gid: 732
 description: Admin access to analytics cluster.

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

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

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

[MediaWiki-commits] [Gerrit] Don't show edit pencils on main page - change (mediawiki...MobileFrontend)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: Don't show edit pencils on main page
..


Don't show edit pencils on main page

They are unstyled and overlaps the notifications bell.

Follow up: I8d8d47cd608d59fb1723758106547f1ab137daa2

Bug: T89559
Change-Id: I8688ddda81d292b80e280f758d6d434f7c748aa7
(cherry picked from commit 830a70e413d4ce1241bf51888ab0e31a500a5395)
---
M includes/MobileFormatter.php
M javascripts/modules/editor/init.js
2 files changed, 24 insertions(+), 14 deletions(-)

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



diff --git a/includes/MobileFormatter.php b/includes/MobileFormatter.php
index a95210e..f207104 100644
--- a/includes/MobileFormatter.php
+++ b/includes/MobileFormatter.php
@@ -250,18 +250,21 @@
 */
protected function headingTransform( $s, $tagName = 'h2' ) {
// add in-block class to all headings included in this section 
(except the first one)
-   $s = preg_replace_callback(
-   '/(h[1-6])/si',
-   function ( $match ) use ( $tagName ) {
-   $tag = $match[1];
-   $cssClass = '';
-   if ( $tag !== $tagName ) {
-   $cssClass = ' class=in-block';
-   }
-   return '' . $tag . $cssClass . '';
-   },
-   $s
-   );
+   // don't do this for the main page, it breaks things - Bug 
190662
+   if ( !$this-mainPage ) {
+   $s = preg_replace_callback(
+   '/(h[1-6])/si',
+   function ( $match ) use ( $tagName ) {
+   $tag = $match[1];
+   $cssClass = '';
+   if ( $tag !== $tagName ) {
+   $cssClass = ' class=in-block';
+   }
+   return '' . $tag . $cssClass . '';
+   },
+   $s
+   );
+   }
 
// Makes sections expandable
$tagRegEx = '' . $tagName . '.*/' . $tagName . '';
diff --git a/javascripts/modules/editor/init.js 
b/javascripts/modules/editor/init.js
index d5fb544..101fd20 100644
--- a/javascripts/modules/editor/init.js
+++ b/javascripts/modules/editor/init.js
@@ -121,7 +121,8 @@
 * @param {Page} page The page to edit.
 */
function setupEditor( page ) {
-   var isNewPage = page.options.id === 0;
+   var isNewPage = page.options.id === 0,
+   $editPencils = $( '.edit-page' );
if ( query.undo ) {
window.alert( mw.msg( 
'mobile-frontend-editor-undo-unsupported' ) );
}
@@ -199,7 +200,13 @@
}
}
 
-   $( '.edit-page' ).show().on( 'click', function ( ev ) {
+   // enable all edit pencils on the page (not only toggleable 
sections) except for the main
+   // page, the pencils are unstyled there, see bug T89559
+   // FIXME: Merge this with the line under it after main page 
special handling is killed
+   if ( !mw.config.get( 'wgIsMainPage' ) ) {
+   $editPencils.show();
+   }
+   $editPencils.on( 'click', function ( ev ) {
// prevent folding section when clicking Edit
ev.stopPropagation();
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8688ddda81d292b80e280f758d6d434f7c748aa7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.25wmf17
Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Kaldari2 kald...@gmail.com
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Enable gather extension on en beta labs - change (operations/mediawiki-config)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: Enable gather extension on en beta labs
..


Enable gather extension on en beta labs

Change-Id: Ie558a5077389287e4bb4b2b7d0cf734898fff6cb
Dependency: I17c38eb465ab2087b9109a83b506bdaf46ed9e67
---
M wmf-config/InitialiseSettings-labs.php
M wmf-config/extension-list-labs
M wmf-config/mobile-labs.php
3 files changed, 9 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index c596d67..64dde1f 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -450,7 +450,10 @@
'-wmgFlowCluster' = array(
'default' = false,
),
-
+   'wmgUseGather' = array(
+   'default' = false,
+   'enwiki' = true,
+   ),
'wmgUseGuidedTour' = array(
'wikidatawiki' = true,
),
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index 73d29d3..e8df457 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -1,4 +1,5 @@
 $IP/extensions/ApiFeatureUsage/ApiFeatureUsage.php
 $IP/extensions/Citoid/Citoid.php
+$IP/extensions/Gather/Gather.php
 $IP/extensions/GlobalUserPage/GlobalUserPage.php
 $IP/extensions/Sentry/Sentry.php
diff --git a/wmf-config/mobile-labs.php b/wmf-config/mobile-labs.php
index e9101ef..c7808d4 100644
--- a/wmf-config/mobile-labs.php
+++ b/wmf-config/mobile-labs.php
@@ -13,6 +13,10 @@
$wgJsonConfigs['JsonZeroConfig']['remote']['url'] = 
'http://zero.wikimedia.beta.wmflabs.org/w/api.php';
}
}
+
+   if ( $wmgUseGather ) {
+   require_once $IP/extensions/Gather/Gather.php;
+   }
 }
 
 $wgMFForceSecureLogin = false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie558a5077389287e4bb4b2b7d0cf734898fff6cb
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Robmoen rm...@wikimedia.org
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Greg Grossmeier g...@wikimedia.org
Gerrit-Reviewer: Jhernandez jhernan...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Bump MobileFrontend - change (mediawiki/core)

2015-02-17 Thread MaxSem (Code Review)

MaxSem has submitted this change and it was merged.

Change subject: Bump MobileFrontend
..


Bump MobileFrontend

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

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



diff --git a/extensions/MobileFrontend b/extensions/MobileFrontend
index fc826ff..d03a8fa 16
--- a/extensions/MobileFrontend
+++ b/extensions/MobileFrontend
-Subproject commit fc826ff6a73336ca904e803de80da419e3742d5c
+Subproject commit d03a8fab2033b1aaa3c5466eb4f62ced891ed139

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I042b9313850946514328cce00d43947d32d15e38
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf17
Gerrit-Owner: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Small fix in restbase config - change (operations/puppet)

2015-02-17 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Small fix in restbase config
..


Small fix in restbase config

Forgot to define a yaml reference in the config format update.

Change-Id: I7ad42d3e69f71a53672a05443e584ab903d20e2c
---
M modules/restbase/templates/config.yaml.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/modules/restbase/templates/config.yaml.erb 
b/modules/restbase/templates/config.yaml.erb
index 395f900..b04c423 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -104,7 +104,7 @@
 
 
 # Swagger spec root.
-spec:
+spec: spec
   title: The RESTBase root
   # Some more general RESTBase info
   paths:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ad42d3e69f71a53672a05443e584ab903d20e2c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Small fix in restbase config - change (operations/puppet)

2015-02-17 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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

Change subject: Small fix in restbase config
..

Small fix in restbase config

Forgot to define a yaml reference in the config format update.

Change-Id: I7ad42d3e69f71a53672a05443e584ab903d20e2c
---
M modules/restbase/templates/config.yaml.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/191237/1

diff --git a/modules/restbase/templates/config.yaml.erb 
b/modules/restbase/templates/config.yaml.erb
index 395f900..b04c423 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -104,7 +104,7 @@
 
 
 # Swagger spec root.
-spec:
+spec: spec
   title: The RESTBase root
   # Some more general RESTBase info
   paths:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ad42d3e69f71a53672a05443e584ab903d20e2c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke gwi...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Reduce database locking - change (mediawiki...WikiGrok)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: Reduce database locking
..


Reduce database locking

Bug: T89359
Change-Id: I0e19b3f7017fc25d3382eea0c98c38516312e91c
(cherry picked from commit 0927b63933952400b8a90fae350cdd92e49ad5f0)
---
M includes/QuestionStore.php
1 file changed, 30 insertions(+), 13 deletions(-)

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



diff --git a/includes/QuestionStore.php b/includes/QuestionStore.php
index c7af37b..01f5eb0 100644
--- a/includes/QuestionStore.php
+++ b/includes/QuestionStore.php
@@ -20,6 +20,36 @@
}
 
$dbw = wfGetDB( DB_MASTER );
+
+   // Select rows to be deleted instead of deadlocking with blind 
DELETE over mostly 0 rows
+   // Old versions
+   $or = 'wgq_version  ' . self::FORMAT_VERSION;
+   // Campaigns not in the new list
+   if ( $campaigns ) {
+   $names = self::campaignList( array_keys( $campaigns ) );
+   $or .=  OR wgq_campaign NOT IN($names);
+   }
+   $conds = array(
+   'wgq_page' = $pageId,
+   $or,
+   );
+   $res = $dbw-select(
+   'wikigrok_questions',
+   array( 'wgq_page', 'wgq_campaign', 'wgq_version' ),
+   $conds,
+   __METHOD__
+   );
+   foreach ( $res as $row ) {
+   $dbw-delete( 'wikigrok_questions',
+   array(
+   'wgq_page' = $row-wgq_page,
+   'wgq_campaign' = $row-wgq_campaign,
+   'wgq_version' = $row-wgq_version,
+   ),
+   __METHOD__
+   );
+   }
+
$rows = array();
foreach ( $campaigns as $name = $data ) {
$rows[] = array(
@@ -33,19 +63,6 @@
if ( $rows ) {
$dbw-insert( 'wikigrok_questions', $rows, __METHOD__, 
array( 'IGNORE' ) );
}
-
-   $conds = array( 'wgq_page' = $pageId );
-   // Kill old versions
-   $dbw-delete( 'wikigrok_questions',
-   $conds + array( 'wgq_version  ' . 
self::FORMAT_VERSION ),
-   __METHOD__
-   );
-   if ( $campaigns ) {
-   $names = self::campaignList( array_keys( $campaigns ) );
-   $conds[] = wgq_campaign NOT IN($names);
-   }
-   // Delete campaigns not in the new list
-   $dbw-delete( 'wikigrok_questions', $conds, __METHOD__ );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e19b3f7017fc25d3382eea0c98c38516312e91c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: wmf/1.25wmf17
Gerrit-Owner: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Some documentation tweaks - change (oojs/ui)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: Some documentation tweaks
..


Some documentation tweaks

Change-Id: I68620f01551aa8eb18bd6da37632f5483c311581
---
M php/elements/TabIndexedElement.php
M php/widgets/ButtonWidget.php
M php/widgets/LabelWidget.php
3 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/php/elements/TabIndexedElement.php 
b/php/elements/TabIndexedElement.php
index 4acb7da..66f261c 100644
--- a/php/elements/TabIndexedElement.php
+++ b/php/elements/TabIndexedElement.php
@@ -21,7 +21,7 @@
 * @param Element $element Element being mixed into
 * @param array $config Configuration options
 * @param number|null $config['tabIndex'] Tab index value. Use 0 to use 
default ordering, use -1 to
-*   prevent tab focusing, use null for no tabindex attribute. 
(default: 0)
+*   prevent tab focusing, use null to suppress the `tabindex` 
attribute. (default: 0)
 */
public function __construct( Element $element, array $config = array() 
) {
// Parent constructor
@@ -35,7 +35,7 @@
/**
 * Set tab index value.
 *
-* @param number|null $tabIndex Tab index value or null for no tabIndex
+* @param number|null $tabIndex Tab index value or null for no tab index
 * @chainable
 */
public function setTabIndex( $tabIndex ) {
diff --git a/php/widgets/ButtonWidget.php b/php/widgets/ButtonWidget.php
index b387eb4..f451c09 100644
--- a/php/widgets/ButtonWidget.php
+++ b/php/widgets/ButtonWidget.php
@@ -83,7 +83,7 @@
/**
 * Get search engine traversal hint.
 *
-* @return boolean Whether search engines should avoid traversing this 
hyperlink.
+* @return boolean Whether search engines should avoid traversing this 
hyperlink
 */
public function getNoFollow() {
return $this-nofollow;
diff --git a/php/widgets/LabelWidget.php b/php/widgets/LabelWidget.php
index 7404a49..79e52e8 100644
--- a/php/widgets/LabelWidget.php
+++ b/php/widgets/LabelWidget.php
@@ -22,7 +22,7 @@
 
/**
 * @param array $config Configuration options
-* @param InputWidget $config['input'] Input widget this label is for 
(default: null)
+* @param InputWidget $config['input'] Input widget this label is for
 */
public function __construct( array $config = array() ) {
// Parent constructor

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68620f01551aa8eb18bd6da37632f5483c311581
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Change global class variables to mw.TemplateData - change (mediawiki...TemplateData)

2015-02-17 Thread Mooeypoo (Code Review)

Mooeypoo has uploaded a new change for review.

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

Change subject: Change global class variables to mw.TemplateData
..

Change global class variables to mw.TemplateData

Nest all classes for the templatedata dialog in mw.TemplateData
namespace.

Change-Id: Ib514378c9fbc0fb993b3cbc2fa48ced920167226
---
M .jshintrc
M TemplateData.php
M modules/ext.templateDataGenerator.data.js
A modules/ext.templateDataGenerator.js
M modules/ext.templateDataGenerator.ui.js
M modules/ext.templateDataGenerator.ui.tdDialog.js
M modules/widgets/ext.templateDataGenerator.dragDropItemWidget.js
M modules/widgets/ext.templateDataGenerator.dragDropWidget.js
M modules/widgets/ext.templateDataGenerator.languageResultWidget.js
M modules/widgets/ext.templateDataGenerator.languageSearchWidget.js
M modules/widgets/ext.templateDataGenerator.optionImportWidget.js
M modules/widgets/ext.templateDataGenerator.optionWidget.js
M tests/ext.templateData.tests.js
13 files changed, 138 insertions(+), 144 deletions(-)


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

diff --git a/.jshintrc b/.jshintrc
index dccd4af..269c0e5 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -23,14 +23,6 @@
QUnit: false,
unicodeJS: false,
jQuery: false,
-   mediaWiki: false,
-   TemplateDataModel: true,
-   TemplateDataDialog: true,
-   TemplateDataOptionWidget: true,
-   TemplateDataOptionImportWidget: true,
-   TemplateDataLanguageSearchWidget: true,
-   TemplateDataLanguageResultWidget: true,
-   TemplateDataDragDropItemWidget: true,
-   TemplateDataDragDropWidget: true
+   mediaWiki: false
}
 }
diff --git a/TemplateData.php b/TemplateData.php
index 3f23cd3..58aeff2 100644
--- a/TemplateData.php
+++ b/TemplateData.php
@@ -77,6 +77,7 @@
'localBasePath' = $dir,
'remoteExtPath' = 'TemplateData',
'scripts' = array(
+   'modules/ext.templateDataGenerator.js',
'modules/ext.templateDataGenerator.data.js'
),
'dependencies' = array(
diff --git a/modules/ext.templateDataGenerator.data.js 
b/modules/ext.templateDataGenerator.data.js
index 53868f2..1f82b10 100644
--- a/modules/ext.templateDataGenerator.data.js
+++ b/modules/ext.templateDataGenerator.data.js
@@ -3,7 +3,7 @@
 * TemplateData Dialog
 * @param {Object} config Dialog configuration object
 */
-   TemplateDataModel = function TemplateDataModel( config ) {
+   mw.TemplateData.Model = function mwTemplateDataModel( config ) {
config = config || {};
 
// Mixin constructors
@@ -28,8 +28,8 @@
};
 
/* Setup */
-   OO.initClass( TemplateDataModel );
-   OO.mixinClass( TemplateDataModel, OO.EventEmitter );
+   OO.initClass( mw.TemplateData.Model );
+   OO.mixinClass( mw.TemplateData.Model, OO.EventEmitter );
 
/* Events */
 
@@ -64,7 +64,7 @@
 * @param {string} page Page name
 * @return {jQuery.Promise} API promise
 */
-   TemplateDataModel.static.getApi = function ( page ) {
+   mw.TemplateData.Model.static.getApi = function ( page ) {
var api = new mediaWiki.Api();
return api.get( {
action: 'query',
@@ -83,7 +83,7 @@
 *  partial object (or a subset) of the first.
 * @return {boolean} Objects have equal values
 */
-   TemplateDataModel.static.compare = function ( obj1, obj2, allowSubset ) 
{
+   mw.TemplateData.Model.static.compare = function ( obj1, obj2, 
allowSubset ) {
if ( allowSubset  obj2 === undefined ) {
return true;
}
@@ -107,7 +107,7 @@
 * @param {string} paramType Given type
 * @return {string} Normalized non-obsolete type
 */
-   TemplateDataModel.static.translateObsoleteParamTypes = function ( 
paramType ) {
+   mw.TemplateData.Model.static.translateObsoleteParamTypes = function ( 
paramType ) {
switch ( paramType ) {
case 'string/wiki-page-name':
return 'wiki-page-name';
@@ -128,7 +128,7 @@
 * @return {Object|string[]} Legal property names with or without their
 *  definition data
 */
-   TemplateDataModel.static.getAllProperties = function ( getFullData ) {
+   mw.TemplateData.Model.static.getAllProperties = function ( getFullData 
) {
var properties = {
name: {
type: 'string',
@@ -193,7 +193,7 @@
 * Retrieve the list of property names that allow for multiple 
languages.
 * @return {string[]} Property names
 */
-

[MediaWiki-commits] [Gerrit] SelectWidget: Add description - change (oojs/ui)

2015-02-17 Thread Kmenger (Code Review)

Kmenger has uploaded a new change for review.

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

Change subject: SelectWidget: Add description
..

SelectWidget: Add description

Change-Id: Ic0274c6e5485960891cc2209713b6ef032f02707
---
M src/widgets/SelectWidget.js
1 file changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/16/191216/1

diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js
index 7cd40d3..fbf6d9c 100644
--- a/src/widgets/SelectWidget.js
+++ b/src/widgets/SelectWidget.js
@@ -1,10 +1,14 @@
 /**
- * Generic selection of options.
+ * A SelectWidget is of a generic selection of options. The OOjs UI library 
contains several types of
+ * select widgets, including {@link OO.ui.ButtonSelectWidget button selects},
+ * {@link OO.ui.RadioSelectWidget radio selects}, and {@link 
OO.ui.MenuSelectWidget
+ * menu selects}.
  *
- * Items can contain any rendering. Any widget that provides options, from 
which the user must
- * choose one, should be built on this class.
+ * This class should be used together with OO.ui.OptionWidget.
  *
- * Use together with OO.ui.OptionWidget.
+ * For more information, please see the [OOjs UI documentation on 
MediaWiki][1].
+ *
+ * [1]: https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Selects_and_Options
  *
  * @class
  * @extends OO.ui.Widget

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0274c6e5485960891cc2209713b6ef032f02707
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Kmenger kmen...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update to latest master - change (mediawiki...deploy)

2015-02-17 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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

Change subject: Update to latest master
..

Update to latest master

Change-Id: I88161b02abbea91aea42472156d75aa6ce080f62
---
M 
node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
M 
node_modules/coveralls/node_modules/request/node_modules/form-data/node_modules/async/package.json
M node_modules/istanbul/node_modules/async/package.json
M node_modules/mocha/node_modules/glob/node_modules/inherits/package.json
M node_modules/mocha/node_modules/glob/package.json
M node_modules/mocha/node_modules/jade/package.json
M node_modules/node-uuid/node_modules/microtime/node_modules/nan/package.json
M node_modules/preq/index.js
M node_modules/preq/node_modules/bluebird/package.json
M node_modules/preq/package.json
M node_modules/restbase-mod-table-cassandra/index.js
M node_modules/restbase-mod-table-cassandra/lib/db.js
M node_modules/restbase-mod-table-cassandra/lib/index.js
M node_modules/restbase-mod-table-cassandra/lib/secondaryIndexes.js
M node_modules/restbase-mod-table-cassandra/node_modules/async/package.json
M node_modules/restbase-mod-table-cassandra/package.json
M node_modules/restbase-mod-table-cassandra/test/index.js
A node_modules/restbase-mod-table-cassandra/test/test_cassandra_index.js.txt
D node_modules/restbase-mod-table-cassandra/tmp/create-varint-tbl.json
D node_modules/restbase-mod-table-cassandra/tmp/get-varint-range.json
D node_modules/restbase-mod-table-cassandra/tmp/insert-varint.json
D node_modules/restbase-mod-table-cassandra/tmp/proba.js
M node_modules/swagger-router/node_modules/bluebird/package.json
23 files changed, 81 insertions(+), 123 deletions(-)


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

diff --git 
a/node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
 
b/node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
index 754a114..3d69f4f 100644
--- 
a/node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
+++ 
b/node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
@@ -32,7 +32,7 @@
 shasum: b17d08d326b4423e568eff719f91b0b1cbdf69f1,
 tarball: http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz;
   },
-  _from: inherits@2,
+  _from: inherits@~2.0.1,
   _npmVersion: 1.3.8,
   _npmUser: {
 name: isaacs,
diff --git 
a/node_modules/coveralls/node_modules/request/node_modules/form-data/node_modules/async/package.json
 
b/node_modules/coveralls/node_modules/request/node_modules/form-data/node_modules/async/package.json
index 9d15cd7..bdbe740 100644
--- 
a/node_modules/coveralls/node_modules/request/node_modules/form-data/node_modules/async/package.json
+++ 
b/node_modules/coveralls/node_modules/request/node_modules/form-data/node_modules/async/package.json
@@ -41,7 +41,7 @@
 shasum: ac3613b1da9bed1b47510bb4651b8931e47146c7,
 tarball: http://registry.npmjs.org/async/-/async-0.9.0.tgz;
   },
-  _from: async@0.9.x,
+  _from: async@~0.9.0,
   _npmVersion: 1.4.3,
   _npmUser: {
 name: caolan,
diff --git a/node_modules/istanbul/node_modules/async/package.json 
b/node_modules/istanbul/node_modules/async/package.json
index 9d15cd7..bdbe740 100644
--- a/node_modules/istanbul/node_modules/async/package.json
+++ b/node_modules/istanbul/node_modules/async/package.json
@@ -41,7 +41,7 @@
 shasum: ac3613b1da9bed1b47510bb4651b8931e47146c7,
 tarball: http://registry.npmjs.org/async/-/async-0.9.0.tgz;
   },
-  _from: async@0.9.x,
+  _from: async@~0.9.0,
   _npmVersion: 1.4.3,
   _npmUser: {
 name: caolan,
diff --git 
a/node_modules/mocha/node_modules/glob/node_modules/inherits/package.json 
b/node_modules/mocha/node_modules/glob/node_modules/inherits/package.json
index 3d69f4f..754a114 100644
--- a/node_modules/mocha/node_modules/glob/node_modules/inherits/package.json
+++ b/node_modules/mocha/node_modules/glob/node_modules/inherits/package.json
@@ -32,7 +32,7 @@
 shasum: b17d08d326b4423e568eff719f91b0b1cbdf69f1,
 tarball: http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz;
   },
-  _from: inherits@~2.0.1,
+  _from: inherits@2,
   _npmVersion: 1.3.8,
   _npmUser: {
 name: isaacs,
diff --git a/node_modules/mocha/node_modules/glob/package.json 
b/node_modules/mocha/node_modules/glob/package.json
index aa7a4e2..3ffcb1b 100644
--- a/node_modules/mocha/node_modules/glob/package.json
+++ b/node_modules/mocha/node_modules/glob/package.json
@@ -52,5 +52,6 @@
   directories: {},
   _shasum: e313eeb249c7affaa5c475286b0e115b59839467,
   _resolved: https://registry.npmjs.org/glob/-/glob-3.2.3.tgz;,
-  readme: ERROR: No README data found!
+  readme: ERROR: No README data found!,
+  homepage: https://github.com/isaacs/node-glob;
 }
diff --git a/node_modules/mocha/node_modules/jade/package.json

[MediaWiki-commits] [Gerrit] Add javascript dev and test tools - change (mediawiki...WikiGrok)

2015-02-17 Thread Bmansurov (Code Review)

Bmansurov has uploaded a new change for review.

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

Change subject: Add javascript dev and test tools
..

Add javascript dev and test tools

Also add .gitignore
Change-Id: Ibed28536597e4edd7b0e26aab79a2e2bb2e5f65d
---
A .docs/jsduckCustomTags.rb
A .gitignore
A .jsbeautifyrc
A .jscsrc
A .jscsrctest.js
A .jshintignore
A .jshintrc
A Gruntfile.js
M WikiGrok.php
M includes/Hooks.php
A package.json
11 files changed, 441 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiGrok 
refs/changes/32/191232/1

diff --git a/.docs/jsduckCustomTags.rb b/.docs/jsduckCustomTags.rb
new file mode 100644
index 000..e862411
--- /dev/null
+++ b/.docs/jsduckCustomTags.rb
@@ -0,0 +1,70 @@
+# Custom tags for JSDuck 5.x
+# Originally implemented of VisualEditor-Team:
+# 
https://github.com/wikimedia/mediawiki-extensions-VisualEditor/blob/master/.docs/CustomTags.rb
+# See also:
+# - https://github.com/senchalabs/jsduck/wiki/Tags
+# - https://github.com/senchalabs/jsduck/wiki/Custom-tags
+# - 
https://github.com/senchalabs/jsduck/wiki/Custom-tags/7f5c32e568eab9edc8e3365e935bcb836cb11f1d
+
+require 'jsduck/tag/tag'
+
+class CommonTag  JsDuck::Tag::Tag
+  def initialize
+@html_position = POS_DOC + 0.1
+@repeatable = true
+  end
+
+  def parse_doc(scanner, position)
+if @multiline
+  return { :tagname = @tagname, :doc = :multiline }
+else
+  text = scanner.match(/.*$/)
+  return { :tagname = @tagname, :doc = text }
+end
+  end
+
+  def process_doc(context, tags, position)
+context[@tagname] = tags
+  end
+
+  def format(context, formatter)
+context[@tagname].each do |tag|
+  tag[:doc] = formatter.format(tag[:doc])
+end
+  end
+end
+
+class SeeTag  CommonTag
+  def initialize
+@tagname = :see
+@pattern = see
+super
+  end
+
+  def format(context, formatter)
+position = context[:files][0]
+context[@tagname].each do |tag|
+  tag[:doc] = 'li' + render_long_see(tag[:doc], formatter, position) + 
'/li'
+end
+  end
+
+  def to_html(context)
+-EOHTML
+  h3 class=paRelated/h3
+  ul
+  #{ context[@tagname].map { |tag| tag[:doc] }.join(\n) }
+  /ul
+EOHTML
+  end
+
+  def render_long_see(tag, formatter, position)
+if tag =~ /\A([^\s]+)( .*)?\Z/m
+  name = $1
+  doc = $2 ? ': ' + $2 : ''
+  return formatter.format({@link #{name}} #{doc})
+else
+  JsDuck::Logger.warn(nil, 'Unexpected @see argument: '+tag+'', position)
+  return tag
+end
+  end
+end
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..e900ac6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,16 @@
+.svn
+*~
+*.kate-swp
+.*.swp
+.idea/
+/composer.phar
+/vendor/
+node_modules/
+tmp/
+docs/
+dev-scripts/remotes
+vendor/
+composer.phar
+.DS_Store
+composer.lock
+tests/report
diff --git a/.jsbeautifyrc b/.jsbeautifyrc
new file mode 100644
index 000..cef4838
--- /dev/null
+++ b/.jsbeautifyrc
@@ -0,0 +1,18 @@
+{
+indent_level: 0,
+indent_with_tabs: true,
+preserve_newlines: true,
+max_preserve_newlines: 10,
+jslint_happy: false,
+space_after_anon_function: true,
+brace_style: collapse,
+keep_array_indentation: false,
+keep_function_indentation: false,
+space_before_conditional: true,
+space_in_paren: true,
+break_chained_methods: false,
+eval_code: false,
+unescape_strings: false,
+wrap_line_length: 0,
+end_with_newline: true
+}
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..f1c731b
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,32 @@
+{
+  preset: wikimedia,
+  requireMultipleVarDecl: onevar,
+  requireLineBreakAfterVariableAssignment: true,
+  disallowOperatorBeforeLineBreak: [.],
+  requireBlocksOnNewline: true,
+  requireLineFeedAtFileEnd: true,
+  requirePaddingNewLinesInObjects: true,
+  disallowDanglingUnderscores: null,
+  requireSpacesInsideParentheses: all,
+  disallowImplicitTypeConversion: [numeric, boolean, binary, string],
+  validateJSDoc: {
+checkParamNames: true,
+requireParamTypes: true,
+checkRedundantParams: true
+  },
+  validateIndentation: \t,
+  excludeFiles: [javascripts/externals/**/*.js, javascripts/README.md],
+  additionalRules: [
+node_modules/jscs-jsdoc/lib/rules/*.js
+  ],
+  jsDoc: {
+checkParamNames: true,
+   checkRedundantParams: true,
+enforceExistence: true,
+checkReturnTypes: true,
+checkRedundantReturns: true,
+requireReturnTypes: true,
+checkTypes: capitalizedNativeCase,
+checkParamExistence: true
+  }
+}
diff --git a/.jscsrctest.js b/.jscsrctest.js
new file mode 100644
index 000..6435c26
--- /dev/null
+++ b/.jscsrctest.js
@@ -0,0 +1,6 @@
+var fs = require( 'fs' ),
+   config = JSON.parse( fs.readFileSync( '.jscsrc' ) );
+
+delete config.jsDoc;
+
+module.exports = exports = config;
diff --git a/.jshintignore

[MediaWiki-commits] [Gerrit] Remove the sanity check - change (mediawiki...VisualEditor)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: Remove the sanity check
..


Remove the sanity check

It's slow, especially on large pages, and it's triggered
very infrequently these days, and only for known bugs.

In the future we should replace this with a debugging
interface that displays the DOM diff between the original
DOM and the round-tripped DOM, as opposed to the boolean
interface we have now.

By extension, this also means the visualeditor-needcheck
tag won't be applied to new edits any more, although
its registration and messages are kept around because
edits with this tag still exist in page histories.

Bug: T87161
Change-Id: I909153492a5786b4b69fccd42ce3c1d4bdb3a059
---
M ApiVisualEditorEdit.php
M VisualEditor.hooks.php
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
6 files changed, 4 insertions(+), 114 deletions(-)

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



diff --git a/ApiVisualEditorEdit.php b/ApiVisualEditorEdit.php
index c2595c6..b917ac8 100644
--- a/ApiVisualEditorEdit.php
+++ b/ApiVisualEditorEdit.php
@@ -113,12 +113,6 @@
intval( $saveresult['edit']['newrevid'] 
),
null
);
-   if ( $params['needcheck'] ) {
-   ChangeTags::addTags( 
'visualeditor-needcheck', null,
-   intval( 
$saveresult['edit']['newrevid'] ),
-   null
-   );
-   }
}
 
// Return result of parseWikitext instead of 
saveWikitext so that the
@@ -183,9 +177,6 @@
'wikitext' = null,
'basetimestamp' = null,
'starttimestamp' = null,
-   'needcheck' = array(
-   ApiBase::PARAM_TYPE = 'boolean'
-   ),
'oldid' = null,
'minor' = null,
'watch' = null,
@@ -228,8 +219,6 @@
'starttimestamp' = 'When saving, set this to the 
timestamp of when the page was loaded.'
. ' Used to detect edit conflicts.',
'token' = 'Edit token',
-   'needcheck' = 'When saving, set this parameter if the 
revision might have roundtrip'
-   . ' problems. This will result in the edit 
being tagged.',
'captchaid' = 'Captcha ID (when saving with a captcha 
response).',
'captchaword' = 'Answer to the captcha (when saving 
with a captcha response).',
'cachekey' = 'Use the result of a previous 
serializeforcache request with this key.'
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index b1ceae8..60834e9 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -392,7 +392,7 @@
 */
public static function onListDefinedTags( $tags ) {
$tags[] = 'visualeditor';
-   $tags[] = 'visualeditor-needcheck';
+   $tags[] = 'visualeditor-needcheck'; // No longer in active use
$tags[] = 'visualeditor-switched';
return true;
}
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css 
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
index 7866f47..73d0f37 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
@@ -62,8 +62,3 @@
margin-right: 0.25em;
margin-top: 0.2em;
 }
-
-/* Needs to override .oo-ui.widget.oo-ui-widget-disabled */
-.ve-init-mw-viewPageTarget-waiting.oo-ui-widget.oo-ui-widget-disabled {
-   cursor: progress;
-}
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 926ed57..f71fd4c 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -96,8 +96,7 @@
showChanges: 'onShowChanges',
showChangesError: 'onShowChangesError',
noChanges: 'onNoChanges',
-   serializeError: 'onSerializeError',
-   sanityCheckComplete: 'updateToolbarSaveButtonState'
+   serializeError: 'onSerializeError'
} );
 
if ( history.replaceState ) {
@@ -873,10 +872,9 @@
var isDisabled;

[MediaWiki-commits] [Gerrit] Fixed backwards $group check in LoadBalancer - change (mediawiki/core)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: Fixed backwards $group check in LoadBalancer
..


Fixed backwards $group check in LoadBalancer

* Fixes 9190427

bug: T89507
Change-Id: I192ac3b00160c85e22e18d69cea5d9c46d2a301a
---
M includes/db/LoadBalancer.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 4c9fd32..f357880 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -328,7 +328,7 @@
$this-mServers[$i]['slave pos'] = 
$conn-getSlavePos();
}
}
-   if ( $this-mReadIndex = 0  $this-mLoads[$i]  0  
$group !== false ) {
+   if ( $this-mReadIndex = 0  $this-mLoads[$i]  0  
$group === false ) {
$this-mReadIndex = $i;
}
}
@@ -477,7 +477,7 @@
$groupIndex = $this-getReaderIndex( $group, 
$wiki );
if ( $groupIndex !== false ) {
$serverName = $this-getServerName( 
$groupIndex );
-   wfDebug( __METHOD__ . : using server 
$serverName for group $group\n );
+   wfDebug( __METHOD__ . : using server 
$serverName for group '$group'\n );
$i = $groupIndex;
break;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I192ac3b00160c85e22e18d69cea5d9c46d2a301a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] More gracefully handle unavailability of ParserFunctions in ... - change (mediawiki...Echo)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: More gracefully handle unavailability of ParserFunctions in 
phpunit
..


More gracefully handle unavailability of ParserFunctions in phpunit

Change-Id: I375c13e937892062b061940b2b9ac5bdd832ac9d
---
M tests/phpunit/includes/DiscussionParserTest.php
1 file changed, 18 insertions(+), 1 deletion(-)

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



diff --git a/tests/phpunit/includes/DiscussionParserTest.php 
b/tests/phpunit/includes/DiscussionParserTest.php
index 84f0230..0b9f3c1 100644
--- a/tests/phpunit/includes/DiscussionParserTest.php
+++ b/tests/phpunit/includes/DiscussionParserTest.php
@@ -244,6 +244,7 @@
'agent' = 'PatHadley',
),
),
+   'precondition' = 'isParserFunctionsInstalled',
),
array(
'new' = 647260329,
@@ -271,7 +272,15 @@
/**
 * @dataProvider generateEventsForRevisionData
 */
-   public function testGenerateEventsForRevision( $newId, $oldId, 
$username, $lang, $pages, $title, $expected ) {
+   public function testGenerateEventsForRevision( $newId, $oldId, 
$username, $lang, $pages, $title, $expected, $precondition = '' ) {
+   if ( $precondition !== '' ) {
+   $result = $this-$precondition();
+   if ( $result !== true ) {
+   $this-markTestSkipped( $result );
+   return;
+   }
+   }
+
$this-setMwGlobals( array(
// this global is used by the code that interprets the 
namespace part of
// titles (Title::getTitleParser), so should be the 
fake language ;)
@@ -1064,4 +1073,12 @@
$this-assertEquals( 2, EchoDiscussionParser::getSectionCount( 
$one . $three ) );
$this-assertEquals( 3, EchoDiscussionParser::getSectionCount( 
$one . $two . $three ) );
}
+
+   protected function isParserFunctionsInstalled() {
+   if ( class_exists( 'ExtParserFunctions' ) ) {
+   return true;
+   } else {
+   return ParserFunctions not enabled;
+   }
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I375c13e937892062b061940b2b9ac5bdd832ac9d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Bump WikiGrok for https://gerrit.wikimedia.org/r/#/c/190562/ - change (mediawiki/core)

2015-02-17 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Bump WikiGrok for https://gerrit.wikimedia.org/r/#/c/190562/
..

Bump WikiGrok for https://gerrit.wikimedia.org/r/#/c/190562/

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


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

diff --git a/extensions/WikiGrok b/extensions/WikiGrok
index 42b3904..c5df249 16
--- a/extensions/WikiGrok
+++ b/extensions/WikiGrok
-Subproject commit 42b390418c84787b7944a19eee0923e098e659ca
+Subproject commit c5df249a44a117b5b4d32e3ca018adc40fd36b3b

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic740694ac9d336f5a11d171ff81b4ad850846525
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf17
Gerrit-Owner: MaxSem maxsem.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] image gallery - change (apps...wikipedia)

2015-02-17 Thread Mhurd (Code Review)

Mhurd has submitted this change and it was merged.

Change subject: image gallery
..


image gallery

- [x] show gallery w/ placeholders immediately, fetching metadata
  afterwards
- [x] give visual indication that high-res has been downloaded
- [x] nice UI to show description, copyright,  owner
- [x] persist image info to save a round trip
- [x] smarter caching for placholder  high-res images
- [x] implement copyright - glyph logic
- [x] ensure that image info is deleted when articles are deleted
  offline
- [x] make copyright a button that opens license URL
- [x] cache high-res thumbnails in memory
- [x] limit size of high-res gallery images
- [x] fixed X button hit area  line truncation
- [x] fix class-less link element JS exception
- [x] fix iOS 6 crash when using -[UICollectionViewController
  collectionViewLayout] (iOS 7 only)
- [x] fix collectionViewFlowLayout warning on portrait - landscape
  rotation

Change-Id: I25deb84259cd9cd2028b7bd36bf0042b4b95acf4
---
D MediaWikiKit/MediaWikiKit.xcodeproj/project.pbxproj
M MediaWikiKit/MediaWikiKit/MWKDataStore.h
M MediaWikiKit/MediaWikiKit/MWKDataStore.m
M MediaWikiKit/MediaWikiKit/MWKImage.h
M MediaWikiKit/MediaWikiKit/MWKImage.m
A MediaWikiKit/MediaWikiKit/MWKImageInfo+MWKImageComparison.h
A MediaWikiKit/MediaWikiKit/MWKImageInfo+MWKImageComparison.m
A MediaWikiKit/MediaWikiKit/MWKImageInfo.h
A MediaWikiKit/MediaWikiKit/MWKImageInfo.m
M MediaWikiKit/MediaWikiKit/MWKImageList.h
M MediaWikiKit/MediaWikiKit/MWKImageList.m
D MediaWikiKit/MediaWikiKit/MWKImageMetadata.h
D MediaWikiKit/MediaWikiKit/MWKImageMetadata.m
D MediaWikiKit/MediaWikiKit/MWKImageMetadataItem.h
D MediaWikiKit/MediaWikiKit/MWKImageMetadataItem.m
A MediaWikiKit/MediaWikiKit/MWKLicense.h
A MediaWikiKit/MediaWikiKit/MWKLicense.m
M MediaWikiKit/MediaWikiKit/MWKSite.h
M MediaWikiKit/MediaWikiKit/MWKSite.m
M MediaWikiKit/MediaWikiKit/MediaWikiKit.h
D MediaWikiKit/MediaWikiKitTests/Info.plist
A MediaWikiKit/MediaWikiKitTests/MWKImageInfo+MWKImageComparisonTests.m
A MediaWikiKit/MediaWikiKitTests/MWKImageListTests.m
M Wikipedia.xcodeproj/project.pbxproj
A WikipediaUnitTests/CircularBitwiseRotationTests.m
A WikipediaUnitTests/NSArray+BKIndexTests.m
A WikipediaUnitTests/NSMutableDictionary+MaybeSetTests.m
A WikipediaUnitTests/WMFErrorForApiErrorObjectTests.m
A WikipediaUnitTests/WMFJoinedPropertyParametersTests.m
M wikipedia/AppDelegate.m
A wikipedia/Categories/AFHTTPRequestOperationManager+UniqueRequests.h
A wikipedia/Categories/AFHTTPRequestOperationManager+UniqueRequests.m
A wikipedia/Categories/MWKLicense+ToGlyph.h
A wikipedia/Categories/MWKLicense+ToGlyph.m
A wikipedia/Categories/NSArray+BKIndex.h
A wikipedia/Categories/NSArray+BKIndex.m
A wikipedia/Categories/NSMutableDictionary+WMFMaybeSet.h
A wikipedia/Categories/NSMutableDictionary+WMFMaybeSet.m
A wikipedia/Categories/NSString+WMFHTMLParsing.h
A wikipedia/Categories/NSString+WMFHTMLParsing.m
A wikipedia/Categories/UICollectionViewFlowLayout+NSCopying.h
A wikipedia/Categories/UICollectionViewFlowLayout+NSCopying.m
A wikipedia/Categories/UICollectionViewFlowLayout+WMFItemSizeThatFits.h
A wikipedia/Categories/UICollectionViewFlowLayout+WMFItemSizeThatFits.m
M wikipedia/Categories/UIFont+WMFStyle.m
M wikipedia/Defines/WikiGlyph_Chars.h
M wikipedia/Networking/Fetchers/ArticleFetcher.m
A wikipedia/Networking/Fetchers/MWKImageInfoFetcher.h
A wikipedia/Networking/Fetchers/MWKImageInfoFetcher.m
A wikipedia/Networking/Queues/AFHTTPRequestOperationManager+WMFConfig.h
A wikipedia/Networking/Queues/AFHTTPRequestOperationManager+WMFConfig.m
M wikipedia/Networking/Queues/QueuesSingleton.m
A wikipedia/Networking/Serializers/MWKImageInfoResponseSerializer.h
A wikipedia/Networking/Serializers/MWKImageInfoResponseSerializer.m
A wikipedia/Networking/WMFNetworkUtilities.h
A wikipedia/Networking/WMFNetworkUtilities.m
A wikipedia/View Controllers/Image Gallery/WMFImageGalleryCollectionViewCell.h
A wikipedia/View Controllers/Image Gallery/WMFImageGalleryCollectionViewCell.m
A wikipedia/View Controllers/Image Gallery/WMFImageGalleryDetailOverlayView.h
A wikipedia/View Controllers/Image Gallery/WMFImageGalleryDetailOverlayView.m
A wikipedia/View Controllers/Image Gallery/WMFImageGalleryDetailOverlayView.xib
A wikipedia/View Controllers/Image Gallery/WMFImageGalleryViewController.h
A wikipedia/View Controllers/Image Gallery/WMFImageGalleryViewController.m
M wikipedia/View Controllers/LeadImage/LeadImageContainer.h
M wikipedia/View Controllers/LeadImage/LeadImageContainer.m
M wikipedia/View Controllers/LeadImage/LeadImageContainer.xib
M wikipedia/View Controllers/SearchResults/SearchResultPrototypeView.xib
A wikipedia/View 
Controllers/WebView/WebViewController+ImageGalleryPresentation.h
A wikipedia/View 
Controllers/WebView/WebViewController+ImageGalleryPresentation.m
M wikipedia/View Controllers/WebView/WebViewController.h
M wikipedia/View Controllers/WebView/WebViewController.m
A wikipedia/View

[MediaWiki-commits] [Gerrit] FieldLayout: Clean up and remove lies - change (oojs/ui)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: FieldLayout: Clean up and remove lies
..


FieldLayout: Clean up and remove lies

Follow-up to abc1244b9cb9b87ff9adf0bc82ab9c1a5ed55d20.

Change-Id: Ie791e21cf6621f74e641d2e0ed764b8cd774b54f
---
M php/layouts/FieldLayout.php
M src/layouts/ActionFieldLayout.js
M src/layouts/FieldLayout.js
3 files changed, 6 insertions(+), 14 deletions(-)

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



diff --git a/php/layouts/FieldLayout.php b/php/layouts/FieldLayout.php
index 3e73fd6..b3ae9c8 100644
--- a/php/layouts/FieldLayout.php
+++ b/php/layouts/FieldLayout.php
@@ -46,13 +46,11 @@
// Config initialization
$config = array_merge( array( 'align' = 'left' ), $config );
 
-   // Properties (must be set before parent constructor, which 
calls #getTagName)
-   $this-fieldWidget = $fieldWidget;
-
// Parent constructor
parent::__construct( $config );
 
// Properties
+   $this-fieldWidget = $fieldWidget;
$this-field = new Tag( 'div' );
$this-body = new Tag( $hasInputWidget ? 'label' : 'div' );
if ( isset( $config['help'] ) ) {
@@ -76,8 +74,8 @@
$this-body-addClasses( array( 'oo-ui-fieldLayout-body' ) );
$this-field
-addClasses( array( 'oo-ui-fieldLayout-field' ) )
-   -toggleClasses( array( 'oo-ui-fieldLayout-disable' ), 
$fieldWidget-isDisabled() )
-   -appendContent( $fieldWidget );
+   -toggleClasses( array( 'oo-ui-fieldLayout-disable' ), 
$this-fieldWidget-isDisabled() )
+   -appendContent( $this-fieldWidget );
 
$this-setAlignment( $config['align'] );
}
diff --git a/src/layouts/ActionFieldLayout.js b/src/layouts/ActionFieldLayout.js
index 8cfbdac..7a0500d 100644
--- a/src/layouts/ActionFieldLayout.js
+++ b/src/layouts/ActionFieldLayout.js
@@ -15,10 +15,6 @@
// Configuration initialization
config = $.extend( { align: 'left' }, config );
 
-   // Properties (must be set before parent constructor, which calls 
#getTagName)
-   this.fieldWidget = fieldWidget;
-   this.buttonWidget = buttonWidget;
-
// Parent constructor
OO.ui.ActionFieldLayout.super.call( this, fieldWidget, config );
 
@@ -26,14 +22,14 @@
OO.ui.LabelElement.call( this, config );
 
// Properties
+   this.fieldWidget = fieldWidget;
+   this.buttonWidget = buttonWidget;
this.$button = $( 'div' )
.addClass( 'oo-ui-actionFieldLayout-button' )
.append( this.buttonWidget.$element );
-
this.$input = $( 'div' )
.addClass( 'oo-ui-actionFieldLayout-input' )
.append( this.fieldWidget.$element );
-
this.$field
.addClass( 'oo-ui-actionFieldLayout' )
.append( this.$input, this.$button );
diff --git a/src/layouts/FieldLayout.js b/src/layouts/FieldLayout.js
index dc58e81..8a81e8d 100644
--- a/src/layouts/FieldLayout.js
+++ b/src/layouts/FieldLayout.js
@@ -27,9 +27,6 @@
// Configuration initialization
config = $.extend( { align: 'left' }, config );
 
-   // Properties (must be set before parent constructor, which calls 
#getTagName)
-   this.fieldWidget = fieldWidget;
-
// Parent constructor
OO.ui.FieldLayout.super.call( this, config );
 
@@ -37,6 +34,7 @@
OO.ui.LabelElement.call( this, config );
 
// Properties
+   this.fieldWidget = fieldWidget;
this.$field = $( 'div' );
this.$body = $( '' + ( hasInputWidget ? 'label' : 'div' ) + '' );
this.align = null;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie791e21cf6621f74e641d2e0ed764b8cd774b54f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] PHP: Remove redundant documentation for getInputElement() - change (oojs/ui)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: PHP: Remove redundant documentation for getInputElement()
..


PHP: Remove redundant documentation for getInputElement()

Inherited from InputWidget.

Change-Id: Ie7e6acf2ae8dba58eaec80a1ea45e442933302cc
---
M php/widgets/ButtonInputWidget.php
M php/widgets/TextInputWidget.php
2 files changed, 0 insertions(+), 12 deletions(-)

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



diff --git a/php/widgets/ButtonInputWidget.php 
b/php/widgets/ButtonInputWidget.php
index 9f319c6..f9c7891 100644
--- a/php/widgets/ButtonInputWidget.php
+++ b/php/widgets/ButtonInputWidget.php
@@ -60,12 +60,6 @@
$this-addClasses( array( 'oo-ui-buttonInputWidget' ) );
}
 
-   /**
-* Get input element.
-*
-* @param array $config Configuration options
-* @return Tag Input element
-*/
protected function getInputElement( $config ) {
$input = new Tag( $config['useInputTag'] ? 'input' : 'button' );
$input-setAttributes( array( 'type' = $config['type'] ) );
diff --git a/php/widgets/TextInputWidget.php b/php/widgets/TextInputWidget.php
index 5c3ee7c..f07113a 100644
--- a/php/widgets/TextInputWidget.php
+++ b/php/widgets/TextInputWidget.php
@@ -89,12 +89,6 @@
return $this;
}
 
-   /**
-* Get input element.
-*
-* @param array $config Configuration options
-* @return Tag Input element
-*/
protected function getInputElement( $config ) {
if ( isset( $config['multiline'] )  $config['multiline'] ) {
return new Tag( 'textarea' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7e6acf2ae8dba58eaec80a1ea45e442933302cc
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Enable JS console recruitment on mobile. - change (operations/mediawiki-config)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: Enable JS console recruitment on mobile.
..


Enable JS console recruitment on mobile.

Bug: T85815
Change-Id: I0be36f7f91a01037d640a682889e7ba8229086a4
---
M wmf-config/mobile.php
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  MaxSem: Looks good to me, approved
  Florianschmidtwelzow: Looks good to me, but someone else must approve
  Phuedx: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index 170fc42..9575f70 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -136,4 +136,7 @@
$wgMFWikiGrokAbTestStartDate = 1416272400; // Tue, 18 Nov 2014 
01:00:00 GMT
$wgMFWikiGrokAbTestEndDate = 1417482000; // Tue, 02 Dec 2014 
01:00:00 GMT
}
+
+   // Turn on volunteer recruitment
+   $wgMFEnableJSConsoleRecruitment = true;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0be36f7f91a01037d640a682889e7ba8229086a4
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] core: Add missing leading '.' to oo-ui-buttonedElement-butto... - change (mediawiki...Popups)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: core: Add missing leading '.' to oo-ui-buttonedElement-button 
in IGNORE_CLASSES
..


core: Add missing leading '.' to oo-ui-buttonedElement-button in IGNORE_CLASSES

Follows up I418508fad97e81127084150221e10ccec418167a

Change-Id: Ib3c187feeb8de053416bb3ef131c8f5cfedf0c63
---
M resources/ext.popups.core.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Krinkle: Looks good to me, approved
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/resources/ext.popups.core.js b/resources/ext.popups.core.js
index 653b9aa..d41ce7f 100644
--- a/resources/ext.popups.core.js
+++ b/resources/ext.popups.core.js
@@ -43,7 +43,7 @@
'.new',
'.internal',
'.external',
-   'oo-ui-buttonedElement-button'
+   '.oo-ui-buttonedElement-button'
];
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3c187feeb8de053416bb3ef131c8f5cfedf0c63
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fixed backwards $group check in LoadBalancer - change (mediawiki/core)

2015-02-17 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Fixed backwards $group check in LoadBalancer
..

Fixed backwards $group check in LoadBalancer

* Fixes 9190427

Change-Id: I192ac3b00160c85e22e18d69cea5d9c46d2a301a
---
M includes/db/LoadBalancer.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/35/191235/1

diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 4c9fd32..f357880 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -328,7 +328,7 @@
$this-mServers[$i]['slave pos'] = 
$conn-getSlavePos();
}
}
-   if ( $this-mReadIndex = 0  $this-mLoads[$i]  0  
$group !== false ) {
+   if ( $this-mReadIndex = 0  $this-mLoads[$i]  0  
$group === false ) {
$this-mReadIndex = $i;
}
}
@@ -477,7 +477,7 @@
$groupIndex = $this-getReaderIndex( $group, 
$wiki );
if ( $groupIndex !== false ) {
$serverName = $this-getServerName( 
$groupIndex );
-   wfDebug( __METHOD__ . : using server 
$serverName for group $group\n );
+   wfDebug( __METHOD__ . : using server 
$serverName for group '$group'\n );
$i = $groupIndex;
break;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I192ac3b00160c85e22e18d69cea5d9c46d2a301a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Two more fixes for the new layout - change (operations/puppet)

2015-02-17 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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

Change subject: Two more fixes for the new layout
..

Two more fixes for the new layout

- Path resolution is now relative to package.json and node_modules, so use
  ./restbase/lib/server to reference the server module in the deploy repo.
- Remove stray port entry in config.

Change-Id: Ifdc5cd1ca2db6edecdd1e082f1790fcbd3e18394
---
M modules/cdh
M modules/restbase/templates/config.yaml.erb
2 files changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/191240/1

diff --git a/modules/cdh b/modules/cdh
index 6e5d310..0f17cec 16
--- a/modules/cdh
+++ b/modules/cdh
-Subproject commit 6e5d3103894cd1a64ffa323a28fdc40611a576a1
+Subproject commit 0f17cec0b681fa2b1def5b0a7190c6f6e186ddf2
diff --git a/modules/restbase/templates/config.yaml.erb 
b/modules/restbase/templates/config.yaml.erb
index b04c423..80164f9 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -113,8 +113,7 @@
 # The main service setup. Each worker can offer one or more services.
 services:
   - name: restbase
-module: ./lib/server
+module: ./restbase/lib/server
 conf:
   port: %= @port %
-  port: 7231
   spec: *spec

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifdc5cd1ca2db6edecdd1e082f1790fcbd3e18394
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke gwi...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix 'Thank' title text being lower case - change (mediawiki...Flow)

2015-02-17 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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

Change subject: Fix 'Thank' title text being lower case
..

Fix 'Thank' title text being lower case

* Actually use flow-thank-link
* Remove text-transform: capitalize.  This was hiding the error since
  it only applied to the actual text, not the title text.

  Also, if this is needed, that is  a sign we might not be following
  https://www.mediawiki.org/wiki/Localisation#Avoid_message_reuse .

Change-Id: I76758fab8f06461891e24d725e25785570e922e9
---
M i18n/qqq.json
M includes/UrlGenerator.php
M modules/styles/board/topic/post.less
3 files changed, 2 insertions(+), 3 deletions(-)


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

diff --git a/i18n/qqq.json b/i18n/qqq.json
index 6353546..19b9625 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -68,7 +68,7 @@
flow-reply-topic-title-placeholder: Used as placeholder for the 
content textarea when replying. Parameters:\n* $1 - When writing a top-level 
reply, the topic title. When replying to a comment, the first words of the 
comment to which the reply is being written.\n{{Identical|Reply to}},
flow-reply-submit: Used as label for the Submit button. 
Parameters:\n* $1 - username, can be used for GENDER\nAlso used in:\n* 
{{msg-mw|Flow-terms-of-use-reply}}\n* 
{{msg-mw|Wikimedia-flow-terms-of-use-reply}}\n{{Identical|Reply}},
flow-reply-link: Text for the link that appears near the post and 
offers the user to reply to it. Clicking the link will display the reply 
editor. Parameters:\n* $1 - username, can be used for 
GENDER\n{{Identical|Reply}},
-   flow-thank-link: Link text of the button that will (when clicked) 
thank the editor of the comment Parameters:\n* $1 - username, can be used for 
GENDER\n{{Identical|Thank}},
+   flow-thank-link: Link and title text of the button that will (when 
clicked) thank the editor of the comment Parameters:\n* $1 - username, can be 
used for GENDER\n{{Identical|Thank}},
flow-lock-link: Text for the link for closing topic/post. 
Parameters:\n* $1 - username, can be used for GENDER\n{{Identical|Lock}},
flow-history-action-suppress-post: Text link for suppressing a post 
or topic from the board history page.\n\nFor meaning of \suppress\ see 
[[Thread:Support/About MediaWiki:Flow-post-action-suppress-post/qqq]] and 
[[Thread:Support/About 
MediaWiki:Flow-suppress-post-content/sv]].\n\n{{Identical|Suppress}},
flow-history-action-delete-post: Text link for deleting a post or 
topic from the board history page.\n{{Identical|Delete}},
diff --git a/includes/UrlGenerator.php b/includes/UrlGenerator.php
index 24b3a18..dc2b497 100644
--- a/includes/UrlGenerator.php
+++ b/includes/UrlGenerator.php
@@ -724,7 +724,7 @@
 
public function thankAction( UUID $postId ) {
return new Anchor(
-   wfMessage( 'thanks-thank' ),
+   wfMessage( 'flow-thank-link' ),
SpecialPage::getTitleFor( 'Thanks', 'Flow/' . 
$postId-getAlphadecimal() )
);
}
diff --git a/modules/styles/board/topic/post.less 
b/modules/styles/board/topic/post.less
index 90b0332..5080b3b 100644
--- a/modules/styles/board/topic/post.less
+++ b/modules/styles/board/topic/post.less
@@ -134,7 +134,6 @@
 
 .flow-post-meta-actions {
float: left;
-   text-transform: capitalize;
a {
::after {
content: \2022;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76758fab8f06461891e24d725e25785570e922e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add custom title text for Yes and No Thank confirmations - change (mediawiki...Thanks)

2015-02-17 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review.

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

Change subject: Add custom title text for Yes and No Thank confirmations
..

Add custom title text for Yes and No Thank confirmations

Bug: T89572
Change-Id: I54bfaf7852182c2b22bd897fe55480c2b0e7f1ab
---
M Thanks.php
M i18n/en.json
M i18n/qqq.json
M modules/ext.thanks.revthank.js
4 files changed, 11 insertions(+), 1 deletion(-)


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

diff --git a/Thanks.php b/Thanks.php
index 465311b..cdd2382 100644
--- a/Thanks.php
+++ b/Thanks.php
@@ -96,6 +96,8 @@
'thanks-error-invalidrevision',
'thanks-error-ratelimited',
'thanks-confirmation2',
+   'thanks-thank-tooltip-no',
+   'thanks-thank-tooltip-yes',
'ok',
'cancel',
),
diff --git a/i18n/en.json b/i18n/en.json
index 60edf48..4deacf3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -13,6 +13,8 @@
thanks-error-invalidrevision: Revision ID is not valid.,
thanks-error-ratelimited: {{GENDER:$1|You}}'ve exceeded your rate 
limit. Please wait some time and try again.,
thanks-thank-tooltip: {{GENDER:$1|Send}} a thank you notification to 
this {{GENDER:$2|user}},
+   thanks-thank-tooltip-no: {{GENDER:$1|Cancel}} the thank you 
notification,
+   thanks-thank-tooltip-yes: {{GENDER:$1|Send}} the thank you 
notification,
thanks-confirmation2: {{GENDER:$1|Send}} thanks for this edit?,
thanks-thanked-notice: $1 received your thanks for 
{{GENDER:$2|his|her|their}} edit.,
thanks: Send thanks,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 20fab65..2df1b1b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -18,6 +18,8 @@
thanks-error-invalidrevision: Error message that is displayed when 
the revision ID is not valid,
thanks-error-ratelimited: Error message that is displayed when user 
exceeds rate limit. Parameters:\n* $1 - gender,
thanks-thank-tooltip: Tooltip that appears when a user hovers over 
the \thank\ link. Parameters:\n* $1 - The user sending the thanks.  Can be 
used for GENDER support.\n* $2 - The user receiving the thanks.  Can be used 
for GENDER support,
+   thanks-thank-tooltip-no: Tooltip that appears when a user hovers 
over the \No\ confirmation link (which cancels the thank action). 
Parameters:\n* $1 - The user sending the thanks.  Can be used for GENDER 
support.,
+   thanks-thank-tooltip-yes: Tooltip that appears when a user hovers 
over the \Yes\ confirmation link (which confirms the thank action). 
Parameters:\n* $1 - The user sending the thanks.  Can be used for GENDER 
support.,
thanks-confirmation2: A confirmation message to make sure the user 
actually wants to send thanks to another user.\n\nParameters:\n* $1 - The user 
sending the thanks. Can be used for GENDER.\nSee also:\n* 
{{msg-mw|Thanks-confirmation-special}},
thanks-thanked-notice: {{doc-singularthey}}\nPop-up message that is 
displayed after a user has thanked another user for their 
edit.\n\nParameters:\n* $1 - the username of the user that was thanked\n* $2 - 
the gender of the user that was thanked\nSee also:\n* 
{{msg-mw|Flow-thanks-thanked-notice}},
thanks: {{doc-special|Thanks|unlisted=1}}\nThe special page contains 
the form to thank for the edit.,
diff --git a/modules/ext.thanks.revthank.js b/modules/ext.thanks.revthank.js
index 51287b8..6b98086 100644
--- a/modules/ext.thanks.revthank.js
+++ b/modules/ext.thanks.revthank.js
@@ -56,7 +56,11 @@
$( function() {
if ( mw.config.get( 'thanks-confirmation-required' ) ) {
$( 'a.mw-thanks-thank-link' ).confirmable( {
-   i18n: { confirm: mw.msg( 
'thanks-confirmation2', mw.user ) },
+   i18n: {
+   confirm: mw.msg( 
'thanks-confirmation2', mw.user ),
+   noTitle: mw.msg( 
'thanks-thank-tooltip-no', mw.user ),
+   yesTitle: mw.msg( 
'thanks-thank-tooltip-yes', mw.user )
+   },
handler: function ( e ) {
var $thankLink = $( this );
e.preventDefault();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I54bfaf7852182c2b22bd897fe55480c2b0e7f1ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] Increase editcount for Flow contributions - change (mediawiki...Flow)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: Increase editcount for Flow contributions
..


Increase editcount for Flow contributions

Bug: T63887
Change-Id: I3dc45ca67c777f2b5616e732d0ebcffaed2d4189
---
M FlowActions.php
M autoload.php
M container.php
A includes/Data/Listener/EditCountListener.php
4 files changed, 61 insertions(+), 1 deletion(-)

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



diff --git a/FlowActions.php b/FlowActions.php
index f8af072..906df8d 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -34,6 +34,7 @@
  *   * immediate: watchlist the title in the current process
  * * rc_title: Either 'article' or 'owner' to select between 
Workflow::getArticleTitle
  * or Workflow::getOwnerTitle being used as the related recentchanges 
entry on insert
+ * * editcount: True to increment user's edit count for this action
  */
 $wgFlowActions = array(
'create-header' = array(
@@ -53,6 +54,7 @@
),
'class' = 'flow-history-create-header',
),
+   'editcount' = true,
),
 
'edit-header' = array(
@@ -73,6 +75,7 @@
'class' = 'flow-history-edit-header',
),
'handler-class' = 'Flow\Actions\EditHeaderAction',
+   'editcount' = true,
),
 
'create-topic-summary' = array(
@@ -97,6 +100,7 @@
),
'class' = 'flow-history-create-topic-summary',
),
+   'editcount' = true,
),
 
'edit-topic-summary' = array(
@@ -122,6 +126,7 @@
'class' = 'flow-history-edit-topic-summary',
),
'handler-class' = 'Flow\Actions\EditTopicSummaryAction',
+   'editcount' = true,
),
 
'edit-title' = array(
@@ -148,6 +153,7 @@
'watch' = array(
'immediate' = array( 
'Flow\\Data\\Listener\\ImmediateWatchTopicListener', 'getCurrentUser' ),
),
+   'editcount' = true,
),
 
// Normal posts are the 'reply' type.
@@ -175,6 +181,7 @@
'watch' = array(
'immediate' = array( 
'Flow\\Data\\Listener\\ImmediateWatchTopicListener', 'getCurrentUser' ),
),
+   'editcount' = true,
),
 
'edit-post' = array(
@@ -206,6 +213,7 @@
'watch' = array(
'immediate' = array( 
'Flow\\Data\\Listener\\ImmediateWatchTopicListener', 'getCurrentUser' ),
),
+   'editcount' = true,
),
 
'hide-post' = array(
@@ -548,6 +556,7 @@
'watch' = array(
'immediate' = array( 
'Flow\\Data\\Listener\\ImmediateWatchTopicListener', 'getCurrentUser' ),
),
+   'editcount' = true,
),
 
'history' = array(
diff --git a/autoload.php b/autoload.php
index c8e4451..1950c7f 100644
--- a/autoload.php
+++ b/autoload.php
@@ -81,6 +81,7 @@
'Flow\\Data\\LifecycleHandler' = __DIR__ . 
'/includes/Data/LifecycleHandler.php',
'Flow\\Data\\Listener\\AbstractTopicInsertListener' = __DIR__ . 
'/includes/Data/Listener/WatchTopicListener.php',
'Flow\\Data\\Listener\\DeferredInsertLifecycleHandler' = __DIR__ . 
'/includes/Data/Listener/DeferredInsertLifecycleHandler.php',
+   'Flow\\Data\\Listener\\EditCountListener' = __DIR__ . 
'/includes/Data/Listener/EditCountListener.php',
'Flow\\Data\\Listener\\ImmediateWatchTopicListener' = __DIR__ . 
'/includes/Data/Listener/WatchTopicListener.php',
'Flow\\Data\\Listener\\NotificationListener' = __DIR__ . 
'/includes/Data/Listener/NotificationListener.php',
'Flow\\Data\\Listener\\OccupationListener' = __DIR__ . 
'/includes/Data/Listener/OccupationListener.php',
diff --git a/container.php b/container.php
index e73c9e3..0ac7728 100644
--- a/container.php
+++ b/container.php
@@ -305,7 +305,8 @@
$c['reference.recorder'],
$c['storage.board_history.indexes.primary'],
$c['storage.header.listeners.username'],
-   $c['listener.recentchanges']
+   $c['listener.recentchanges'],
+   $c['listener.editcount'],
);
 } );
 $c['storage.header.primary_key'] = array( 'rev_id' );
@@ -383,6 +384,7 @@
$c['listener.recentchanges'],
$c['storage.post_summary.listeners.username'],
$c['storage.board_history.indexes.primary'],
+   $c['listener.editcount'],
// topic history -- to keep a history by topic we have to know 
what topic every post
// belongs to, not just its parent. TopicHistoryIndex is a 
slight tweak to TopKIndex
// using TreeRepository

[MediaWiki-commits] [Gerrit] Followup 0547d8c8: hopefully fix plugin garbage removal code - change (mediawiki...VisualEditor)

2015-02-17 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Followup 0547d8c8: hopefully fix plugin garbage removal code
..

Followup 0547d8c8: hopefully fix plugin garbage removal code

It's still very difficult to test whether this code works, but
doing $( newDoc ).remove( 'selector1' ).remove( 'selector2' )...
demonstrably doesn't work, because 1) the selector passed to remove()
filters the collection, it doesn't descend into it, and 2) remove()
returns the collection of removed items, so chaining it doesn't work.

Instead, use $( newDoc ).find( 'selector1, selector2, ...' ).remove();

Change-Id: I97f3b28c4d5120f08e5d7fbf4598ddc0c01d4ecf
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 13 insertions(+), 10 deletions(-)


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

diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 9a3f9db..2a3c41f 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -984,16 +984,19 @@
copyAttributes( oldDoc.head, newDoc.head );
copyAttributes( oldDoc.body, newDoc.body );
$( newDoc )
-   .remove( 'div[id = myEventWatcherDiv]' ) // Bug 51423
-   .remove( 'embed[type = application/iodbc]' ) // Bug 51521
-   .remove( 'embed[type = application/x-datavault]' ) // Bug 
52791
-   .remove( 'script[id = FoxLingoJs]' ) // Bug 52884
-   .remove( 'style[id = _clearly_component__css]' ) // Bug 53252
-   .remove( 'div[id = sendToInstapaperResults]' ) // Bug 61776
-   .remove( 'embed[id ^= xunlei_com_thunder_helper_plugin]' ) // 
Bug 63121
-   .remove( 'object[type = cosymantecnisbfw], 
script[id=NortonInternetSecurityBF]' ) // Bug 63229
-   .remove( 'div[id = kloutify]' ) // Bug 67006
-   .remove( 'div[id ^= mittoHidden]' ); // Bug 68900#c1
+   .find(
+   'div[id = myEventWatcherDiv], ' + // Bug 51423
+   'embed[type = application/iodbc], ' + // Bug 51521
+   'embed[type = application/x-datavault], ' + // Bug 
52791
+   'script[id = FoxLingoJs], ' + // Bug 52884
+   'style[id = _clearly_component__css], ' + // Bug 53252
+   'div[id = sendToInstapaperResults], ' + // Bug 61776
+   'embed[id ^= xunlei_com_thunder_helper_plugin], ' + // 
Bug 63121
+   'object[type = cosymantecnisbfw], 
script[id=NortonInternetSecurityBF], ' + // Bug 63229
+   'div[id = kloutify], ' + // Bug 67006
+   'div[id ^= mittoHidden]' // Bug 68900#c1
+   )
+   .remove();
// Add doctype manually
return '!doctype html' + ve.serializeXhtml( newDoc );
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97f3b28c4d5120f08e5d7fbf4598ddc0c01d4ecf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com

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

[MediaWiki-commits] [Gerrit] Bump Echo submodule in 1.25wmf16 - change (mediawiki/core)

2015-02-17 Thread MaxSem (Code Review)

MaxSem has submitted this change and it was merged.

Change subject: Bump Echo submodule in 1.25wmf16
..


Bump Echo submodule in 1.25wmf16

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

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



diff --git a/extensions/Echo b/extensions/Echo
index 4298fb3..04ba5b4 16
--- a/extensions/Echo
+++ b/extensions/Echo
-Subproject commit 4298fb345f095d4e069fc5e38554ddea37871ebd
+Subproject commit 04ba5b428c11ba7c8ff59679834425428b575279

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib96aca305d6087bdfdbb5ce0dc2f722b9aa42f6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf16
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Performance: Use core-js/shim instead of es6-shim - change (mediawiki...parsoid)

2015-02-17 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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

Change subject: Performance: Use core-js/shim instead of es6-shim
..

Performance: Use core-js/shim instead of es6-shim

Get a ~15% speed-up by swapping out the es6 shim.

With es6-shim:
[info][enwiki/Barack_Obama] started parsing
[info][enwiki/Barack_Obama] completed parsing in 12251 ms

With core-js:
[info][enwiki/Barack_Obama] started parsing
[info][enwiki/Barack_Obama] completed parsing in 10600 ms

The only changes required to make the tests pass are the use of plain
assert.equal instead of .should on `Number`s.

Change-Id: Iaa5cb8ce904a39836f5ce3e54683b20f329ec35c
---
M lib/core-upgrade.js
M tests/mocha/api.js
M tests/mocha/parse.js
3 files changed, 15 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/20/191220/1

diff --git a/lib/core-upgrade.js b/lib/core-upgrade.js
index 5238230..f010455 100644
--- a/lib/core-upgrade.js
+++ b/lib/core-upgrade.js
@@ -1,5 +1,5 @@
 use strict;
-require('es6-shim');
+require('core-js/shim');
 require('prfun');
 if (!Array.prototype.last) {
Object.defineProperty(Array.prototype, 'last', {
diff --git a/tests/mocha/api.js b/tests/mocha/api.js
index 28bf57a..99f6e1c 100644
--- a/tests/mocha/api.js
+++ b/tests/mocha/api.js
@@ -8,6 +8,7 @@
url = require('url'),
path = require('path'),
should = require('chai').should();
+var assert = require('assert');
 
 describe('Parsoid API', function() {
var api, mockHost;
@@ -39,17 +40,17 @@
doc.outerHTML.startsWith('!DOCTYPE 
html').should.equal(true);

doc.outerHTML.endsWith('/body/html').should.equal(true);
// verify that body has only one html tag, one body 
tag, etc.
-   doc.childNodes.length.should.equal(2);// !DOCTYPE and 
html
+   assert.equal(doc.childNodes.length, 2);// !DOCTYPE 
and html
doc.firstChild.nodeName.should.equal('html');
doc.lastChild.nodeName.should.equal('HTML');
// html children should be head and body
var html = doc.documentElement;
-   html.childNodes.length.should.equal(2);
+   assert.equal(html.childNodes.length, 2);
html.firstChild.nodeName.should.equal('HEAD');
html.lastChild.nodeName.should.equal('BODY');
// body should have one child, p
var body = doc.body;
-   body.childElementCount.should.equal(1);
+   assert.equal(body.childElementCount, 1);
body.firstElementChild.nodeName.should.equal('P');
var p = doc.body.firstElementChild;
p.innerHTML.should.equal('foo');
diff --git a/tests/mocha/parse.js b/tests/mocha/parse.js
index eee121c..9b8649b 100644
--- a/tests/mocha/parse.js
+++ b/tests/mocha/parse.js
@@ -2,6 +2,7 @@
 use strict;
 require( '../../lib/core-upgrade.js' );
 /*global describe, it, Promise*/
+var assert = require('assert');
 
 var should = require(chai).should();
 
@@ -39,17 +40,17 @@
doc.outerHTML.startsWith('!DOCTYPE 
htmlhtml').should.equal(true);

doc.outerHTML.endsWith('/body/html').should.equal(true);
// verify that body has only one html tag, 
one body tag, etc.
-   doc.childNodes.length.should.equal(2);// 
!DOCTYPE and html
+   assert.equal(doc.childNodes.length, 2);// 
!DOCTYPE and html
doc.firstChild.nodeName.should.equal('html');
doc.lastChild.nodeName.should.equal('HTML');
// html children should be head and body
var html = doc.documentElement;
-   html.childNodes.length.should.equal(2);
+   assert.equal(html.childNodes.length, 2);
html.firstChild.nodeName.should.equal('HEAD');
html.lastChild.nodeName.should.equal('BODY');
// body should have one child, p
var body = doc.body;
-   body.childElementCount.should.equal(1);
+   assert.equal(body.childElementCount, 1);

body.firstElementChild.nodeName.should.equal('P');
var p = doc.body.firstElementChild;
p.innerHTML.should.equal('foo');
@@ -145,7 +146,7 @@
}).then(function(doc)

[MediaWiki-commits] [Gerrit] Really update to latest master - change (mediawiki...deploy)

2015-02-17 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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

Change subject: Really update to latest master
..

Really update to latest master

Change-Id: Ie03fb7021674aac62998da873e0efd56342d9a44
---
A node_modules/.bin/service-runner
M node_modules/istanbul/node_modules/mkdirp/package.json
M node_modules/mocha/node_modules/mkdirp/package.json
M node_modules/restbase-mod-table-cassandra/package.json
A node_modules/service-runner/.jshintrc
A node_modules/service-runner/LICENSE
A node_modules/service-runner/README.md
A node_modules/service-runner/config.yaml
A node_modules/service-runner/lib/es6.js
A node_modules/service-runner/lib/logger.js
A node_modules/service-runner/lib/statsd.js
A node_modules/service-runner/node_modules/.bin/bunyan
A node_modules/service-runner/node_modules/bunyan/.npmignore
A node_modules/service-runner/node_modules/bunyan/AUTHORS
A node_modules/service-runner/node_modules/bunyan/CHANGES.md
A node_modules/service-runner/node_modules/bunyan/LICENSE.txt
A node_modules/service-runner/node_modules/bunyan/Makefile
A node_modules/service-runner/node_modules/bunyan/README.md
A node_modules/service-runner/node_modules/bunyan/TODO.md
A node_modules/service-runner/node_modules/bunyan/bin/bunyan
A node_modules/service-runner/node_modules/bunyan/docs/bunyan.1
A node_modules/service-runner/node_modules/bunyan/docs/bunyan.1.html
A node_modules/service-runner/node_modules/bunyan/docs/bunyan.1.ronn
A node_modules/service-runner/node_modules/bunyan/docs/img/bunyan.browserify.png
A node_modules/service-runner/node_modules/bunyan/docs/index.html
A node_modules/service-runner/node_modules/bunyan/lib/bunyan.js
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/.npmignore
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/CHANGES.md
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/LICENCE
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/README.md
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/TODO.md
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/compile.py
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/dtrace-provider.js
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/dtrace_argument.cc
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/dtrace_probe.cc
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/dtrace_provider.cc
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/dtrace_provider.h
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt-arch.js
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt-build.sh
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/.npmignore
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/LICENCE
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/Makefile
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/README.md
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/test.pl
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/test_mem_usage.c
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/test_usdt.c
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt.c
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt.h
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_dof.c
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_dof_file.c
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_dof_sections.c
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_internal.h
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_probe.c
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_tracepoints_i386.s
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_tracepoints_x86_64.s
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/.dntrc
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/CHANGELOG.md
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/LICENSE.md
A

[MediaWiki-commits] [Gerrit] Update to latest master - change (mediawiki...deploy)

2015-02-17 Thread GWicke (Code Review)

GWicke has submitted this change and it was merged.

Change subject: Update to latest master
..


Update to latest master

Change-Id: I88161b02abbea91aea42472156d75aa6ce080f62
---
M 
node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
M 
node_modules/coveralls/node_modules/request/node_modules/form-data/node_modules/async/package.json
M node_modules/istanbul/node_modules/async/package.json
M node_modules/mocha/node_modules/glob/node_modules/inherits/package.json
M node_modules/mocha/node_modules/glob/package.json
M node_modules/mocha/node_modules/jade/package.json
M node_modules/node-uuid/node_modules/microtime/node_modules/nan/package.json
M node_modules/preq/index.js
M node_modules/preq/node_modules/bluebird/package.json
M node_modules/preq/package.json
M node_modules/restbase-mod-table-cassandra/index.js
M node_modules/restbase-mod-table-cassandra/lib/db.js
M node_modules/restbase-mod-table-cassandra/lib/index.js
M node_modules/restbase-mod-table-cassandra/lib/secondaryIndexes.js
M node_modules/restbase-mod-table-cassandra/node_modules/async/package.json
M node_modules/restbase-mod-table-cassandra/package.json
M node_modules/restbase-mod-table-cassandra/test/index.js
A node_modules/restbase-mod-table-cassandra/test/test_cassandra_index.js.txt
D node_modules/restbase-mod-table-cassandra/tmp/create-varint-tbl.json
D node_modules/restbase-mod-table-cassandra/tmp/get-varint-range.json
D node_modules/restbase-mod-table-cassandra/tmp/insert-varint.json
D node_modules/restbase-mod-table-cassandra/tmp/proba.js
M node_modules/swagger-router/node_modules/bluebird/package.json
23 files changed, 81 insertions(+), 123 deletions(-)

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



diff --git 
a/node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
 
b/node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
index 754a114..3d69f4f 100644
--- 
a/node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
+++ 
b/node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
@@ -32,7 +32,7 @@
 shasum: b17d08d326b4423e568eff719f91b0b1cbdf69f1,
 tarball: http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz;
   },
-  _from: inherits@2,
+  _from: inherits@~2.0.1,
   _npmVersion: 1.3.8,
   _npmUser: {
 name: isaacs,
diff --git 
a/node_modules/coveralls/node_modules/request/node_modules/form-data/node_modules/async/package.json
 
b/node_modules/coveralls/node_modules/request/node_modules/form-data/node_modules/async/package.json
index 9d15cd7..bdbe740 100644
--- 
a/node_modules/coveralls/node_modules/request/node_modules/form-data/node_modules/async/package.json
+++ 
b/node_modules/coveralls/node_modules/request/node_modules/form-data/node_modules/async/package.json
@@ -41,7 +41,7 @@
 shasum: ac3613b1da9bed1b47510bb4651b8931e47146c7,
 tarball: http://registry.npmjs.org/async/-/async-0.9.0.tgz;
   },
-  _from: async@0.9.x,
+  _from: async@~0.9.0,
   _npmVersion: 1.4.3,
   _npmUser: {
 name: caolan,
diff --git a/node_modules/istanbul/node_modules/async/package.json 
b/node_modules/istanbul/node_modules/async/package.json
index 9d15cd7..bdbe740 100644
--- a/node_modules/istanbul/node_modules/async/package.json
+++ b/node_modules/istanbul/node_modules/async/package.json
@@ -41,7 +41,7 @@
 shasum: ac3613b1da9bed1b47510bb4651b8931e47146c7,
 tarball: http://registry.npmjs.org/async/-/async-0.9.0.tgz;
   },
-  _from: async@0.9.x,
+  _from: async@~0.9.0,
   _npmVersion: 1.4.3,
   _npmUser: {
 name: caolan,
diff --git 
a/node_modules/mocha/node_modules/glob/node_modules/inherits/package.json 
b/node_modules/mocha/node_modules/glob/node_modules/inherits/package.json
index 3d69f4f..754a114 100644
--- a/node_modules/mocha/node_modules/glob/node_modules/inherits/package.json
+++ b/node_modules/mocha/node_modules/glob/node_modules/inherits/package.json
@@ -32,7 +32,7 @@
 shasum: b17d08d326b4423e568eff719f91b0b1cbdf69f1,
 tarball: http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz;
   },
-  _from: inherits@~2.0.1,
+  _from: inherits@2,
   _npmVersion: 1.3.8,
   _npmUser: {
 name: isaacs,
diff --git a/node_modules/mocha/node_modules/glob/package.json 
b/node_modules/mocha/node_modules/glob/package.json
index aa7a4e2..3ffcb1b 100644
--- a/node_modules/mocha/node_modules/glob/package.json
+++ b/node_modules/mocha/node_modules/glob/package.json
@@ -52,5 +52,6 @@
   directories: {},
   _shasum: e313eeb249c7affaa5c475286b0e115b59839467,
   _resolved: https://registry.npmjs.org/glob/-/glob-3.2.3.tgz;,
-  readme: ERROR: No README data found!
+  readme: ERROR: No README data found!,
+  homepage: https://github.com/isaacs/node-glob;
 }
diff --git a/node_modules/mocha/node_modules/jade/package.json 
b/node_modules/mocha/node_modules/jade/package.json
index 191cb4d..1c79f30 100644
---

[MediaWiki-commits] [Gerrit] Really update to latest master - change (mediawiki...deploy)

2015-02-17 Thread GWicke (Code Review)

GWicke has submitted this change and it was merged.

Change subject: Really update to latest master
..


Really update to latest master

Change-Id: Ie03fb7021674aac62998da873e0efd56342d9a44
---
A node_modules/.bin/service-runner
M node_modules/istanbul/node_modules/mkdirp/package.json
M node_modules/mocha/node_modules/mkdirp/package.json
M node_modules/restbase-mod-table-cassandra/package.json
A node_modules/service-runner/.jshintrc
A node_modules/service-runner/LICENSE
A node_modules/service-runner/README.md
A node_modules/service-runner/config.yaml
A node_modules/service-runner/lib/es6.js
A node_modules/service-runner/lib/logger.js
A node_modules/service-runner/lib/statsd.js
A node_modules/service-runner/node_modules/.bin/bunyan
A node_modules/service-runner/node_modules/bunyan/.npmignore
A node_modules/service-runner/node_modules/bunyan/AUTHORS
A node_modules/service-runner/node_modules/bunyan/CHANGES.md
A node_modules/service-runner/node_modules/bunyan/LICENSE.txt
A node_modules/service-runner/node_modules/bunyan/Makefile
A node_modules/service-runner/node_modules/bunyan/README.md
A node_modules/service-runner/node_modules/bunyan/TODO.md
A node_modules/service-runner/node_modules/bunyan/bin/bunyan
A node_modules/service-runner/node_modules/bunyan/docs/bunyan.1
A node_modules/service-runner/node_modules/bunyan/docs/bunyan.1.html
A node_modules/service-runner/node_modules/bunyan/docs/bunyan.1.ronn
A node_modules/service-runner/node_modules/bunyan/docs/img/bunyan.browserify.png
A node_modules/service-runner/node_modules/bunyan/docs/index.html
A node_modules/service-runner/node_modules/bunyan/lib/bunyan.js
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/.npmignore
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/CHANGES.md
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/LICENCE
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/README.md
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/TODO.md
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/compile.py
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/dtrace-provider.js
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/dtrace_argument.cc
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/dtrace_probe.cc
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/dtrace_provider.cc
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/dtrace_provider.h
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt-arch.js
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt-build.sh
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/.npmignore
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/LICENCE
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/Makefile
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/README.md
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/test.pl
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/test_mem_usage.c
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/test_usdt.c
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt.c
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt.h
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_dof.c
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_dof_file.c
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_dof_sections.c
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_internal.h
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_probe.c
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_tracepoints_i386.s
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_tracepoints_x86_64.s
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/.dntrc
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/CHANGELOG.md
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/LICENSE.md
A 
node_modules/service-runner/node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/README.md
A

[MediaWiki-commits] [Gerrit] Remove the sanity check - change (mediawiki...VisualEditor)

2015-02-17 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Remove the sanity check
..

Remove the sanity check

It's slow, especially on large pages, and it's triggered
very infrequently these days, and only for known bugs.

In the future we should replace this with a debugging
interface that displays the DOM diff between the original
DOM and the round-tripped DOM, as opposed to the boolean
interface we have now.

By extension, this also means the visualeditor-needcheck
tag won't be applied to new edits any more, although
its registration and messages are kept around because
edits with this tag still exist in page histories.

Bug: T87161
Change-Id: I909153492a5786b4b69fccd42ce3c1d4bdb3a059
---
M ApiVisualEditorEdit.php
M VisualEditor.hooks.php
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
6 files changed, 4 insertions(+), 114 deletions(-)


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

diff --git a/ApiVisualEditorEdit.php b/ApiVisualEditorEdit.php
index c2595c6..b917ac8 100644
--- a/ApiVisualEditorEdit.php
+++ b/ApiVisualEditorEdit.php
@@ -113,12 +113,6 @@
intval( $saveresult['edit']['newrevid'] 
),
null
);
-   if ( $params['needcheck'] ) {
-   ChangeTags::addTags( 
'visualeditor-needcheck', null,
-   intval( 
$saveresult['edit']['newrevid'] ),
-   null
-   );
-   }
}
 
// Return result of parseWikitext instead of 
saveWikitext so that the
@@ -183,9 +177,6 @@
'wikitext' = null,
'basetimestamp' = null,
'starttimestamp' = null,
-   'needcheck' = array(
-   ApiBase::PARAM_TYPE = 'boolean'
-   ),
'oldid' = null,
'minor' = null,
'watch' = null,
@@ -228,8 +219,6 @@
'starttimestamp' = 'When saving, set this to the 
timestamp of when the page was loaded.'
. ' Used to detect edit conflicts.',
'token' = 'Edit token',
-   'needcheck' = 'When saving, set this parameter if the 
revision might have roundtrip'
-   . ' problems. This will result in the edit 
being tagged.',
'captchaid' = 'Captcha ID (when saving with a captcha 
response).',
'captchaword' = 'Answer to the captcha (when saving 
with a captcha response).',
'cachekey' = 'Use the result of a previous 
serializeforcache request with this key.'
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index b1ceae8..60834e9 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -392,7 +392,7 @@
 */
public static function onListDefinedTags( $tags ) {
$tags[] = 'visualeditor';
-   $tags[] = 'visualeditor-needcheck';
+   $tags[] = 'visualeditor-needcheck'; // No longer in active use
$tags[] = 'visualeditor-switched';
return true;
}
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css 
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
index 7866f47..73d0f37 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
@@ -62,8 +62,3 @@
margin-right: 0.25em;
margin-top: 0.2em;
 }
-
-/* Needs to override .oo-ui.widget.oo-ui-widget-disabled */
-.ve-init-mw-viewPageTarget-waiting.oo-ui-widget.oo-ui-widget-disabled {
-   cursor: progress;
-}
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 926ed57..f71fd4c 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -96,8 +96,7 @@
showChanges: 'onShowChanges',
showChangesError: 'onShowChangesError',
noChanges: 'onNoChanges',
-   serializeError: 'onSerializeError',
-   sanityCheckComplete: 'updateToolbarSaveButtonState'
+   serializeError: 'onSerializeError'
} );
 
if ( history.replaceState ) {
@@ -873,10 +872,9 @@
var isDisabled;

[MediaWiki-commits] [Gerrit] Fix incorrectly closed string in qq/strings.xml - change (apps...wikipedia)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: Fix incorrectly closed string in qq/strings.xml
..


Fix incorrectly closed string in qq/strings.xml

There is a string tag which was closed incorrectly, encasing the
documentation for three strings inside the documentation for another string.
This patch fixes that by closing the string tags correctly.

Change-Id: I6c2fcd0024983855beddec492ba5d47834f6f975
---
M wikipedia/res/values-qq/strings.xml
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wikipedia/res/values-qq/strings.xml 
b/wikipedia/res/values-qq/strings.xml
index b5d2a3f..b7bf2df 100644
--- a/wikipedia/res/values-qq/strings.xml
+++ b/wikipedia/res/values-qq/strings.xml
@@ -365,10 +365,10 @@
   string name=table_other{{Identical|More information}}/string
   string name=table_close{{Identical|Close}}/string
   string name=app_store_descriptionDescription of the app as put up on the 
Google Play Store/string
-  string name=alpha_update_notification_titleTitle for notification when 
new alpha update is available.
+  string name=alpha_update_notification_titleTitle for notification when 
new alpha update is available./string
   string name=widget_name_featured_pageName of the Widget (as seen in the 
Android widget picker) that displays today\'s featured page./string
   string name=widget_title_featured_pageText shown inside the widget that 
tells the user that the link below is today\'s featured page./string
-  string name=widget_name_searchName of the Widget (as seen in the Android 
widget picker) for searching Wikipedia/string
+  string name=widget_name_searchName of the Widget (as seen in the Android 
widget picker) for searching Wikipedia
 
 Followed by {{msg-wm|Wikipedia-android-strings-alpha update notification 
text}}./string
   string name=alpha_update_notification_textText for notification when new 
alpha update is available.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c2fcd0024983855beddec492ba5d47834f6f975
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Deskana dga...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] IconWidget: Add description and example - change (oojs/ui)

2015-02-17 Thread Kmenger (Code Review)

Kmenger has uploaded a new change for review.

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

Change subject: IconWidget: Add description and example
..

IconWidget: Add description and example

Change-Id: I0b3e58b381c90e98b76c7f0b3a36593db31bf54a
---
M src/widgets/IconWidget.js
1 file changed, 16 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/07/191207/1

diff --git a/src/widgets/IconWidget.js b/src/widgets/IconWidget.js
index b444d43..359edc7 100644
--- a/src/widgets/IconWidget.js
+++ b/src/widgets/IconWidget.js
@@ -1,7 +1,21 @@
 /**
- * Icon widget.
+ * IconWidget is a generic widget for {@link OO.ui.IconElement icons}. In 
general, IconWidgets should be used with OO.ui.LabelWidget,
+ * which creates a label that identifies the icon’s function. See the [OOjs UI 
documentation on MediaWiki] [1]
+ * for a list of icons included in the library.
  *
- * See OO.ui.IconElement for more information.
+ * @example
+ * // An icon widget with a label
+ * var myIcon = new OO.ui.IconWidget({
+ * icon: 'help',
+ * iconTitle: 'Help'
+ *  });
+ *  // Create a label.
+ *  var iconLabel = new OO.ui.LabelWidget({
+ *  label: 'Help'
+ *  });
+ *  $('body').append(myIcon.$element, iconLabel.$element);
+ *
+ * [1]: 
https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Icons,_Indicators,_and_Labels#Icons
  *
  * @class
  * @extends OO.ui.Widget

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b3e58b381c90e98b76c7f0b3a36593db31bf54a
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Kmenger kmen...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] create shell account for Tyler Cipriani - change (operations/puppet)

2015-02-17 Thread RobH (Code Review)

RobH has submitted this change and it was merged.

Change subject: create shell account for Tyler Cipriani
..


create shell account for Tyler Cipriani

Creates a shell account for Tyler, new release engineer,
and adds him to contint-admins and bastion hosts.

cn: Thcipriani
uidNumber: 11634

https://wikitech.wikimedia.org/wiki/User:Thcipriani

Bug:T89378
Change-Id: I527f503c8cf18ac6dee3f54c01070ce00d2462ee
---
M modules/admin/data/data.yaml
1 file changed, 10 insertions(+), 3 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 1c79bcd..610dee1 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -61,7 +61,7 @@
   haithams, mhurd, dbrant, mglaser, mah, kleduc, bsitzmann, deskana,
   jzerebecki, declerambaul, ellery, dduvall, nettrom, mforns, jkatz,
   bmansurov, west1, jhernandez, smalyshev, ananthrk, tbayer, zfilipin,
-  joal]
+  joal, thcipriani]
   cassandra-test-roots:
 gid: 708
 description: users with root on cassandra hosts
@@ -123,7 +123,7 @@
   contint-admins:
 gid: 719
 description: users with some sudo permissions on jenkins hosts
-members: [bd808, cmcmahon, cscott, dduvall, demon, krinkle, reedy, 
marktraceur, twentyafterfour, zfilipin]
+members: [bd808, cmcmahon, cscott, dduvall, demon, krinkle, reedy, 
marktraceur, twentyafterfour, zfilipin, thcipriani]
 privileges: ['ALL = (jenkins) NOPASSWD: ALL',
 'ALL = (jenkins-slave) NOPASSWD: ALL',
 'ALL = (gerritslave) NOPASSWD: ALL',
@@ -1311,4 +1311,11 @@
 name: joal
 realname: Joseph Allemandou
 ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAACAQDm3GrTqoPRJv0pUaE/BJk9osJkVaRGQyR3RlNL4sGoap6oIwRhdJb6ThKm8hpDT2zSfUIGC0XjMG5Y0rx9pmeVByHzqpV5c7uAwNmRAtZQpb+PFHZbIXWMh46sx7bDq3ZUoypdMVVLFqrxALwpw1rlQI4pjWeGympwdvH1lKUPTC9p02RgCZgYLGxC15V412aJM2Z+oNk+5oHJBEL7bnKpePI6asoJLSBd4c9QxbhrMRIf0WDvq+hQgXVugCZIW3zHLkseQEyMtgqrys7RlWF3FkyDA2WDC/OwGgDCRRjzUI2O/FGhuA5oiJgk7Z5Aorx5VIxNESjoOLQEyD8Ur58SAr5z0e+EdZNpt3BtbobPJzIiB19cl7mBOFfCEWpwSCO9tSQrHiyd1Lid5BQ1JitdErYX/uLm82y3aQkKFLhcqHtA4mqu7o53mr5pP5d0LfoOtSlzNa4dvgXDSiGAts00GZd1Ce9JCz8pEe/tttyhFgb32RNYGEwGMyzpZ8bOy49m5gTtlN/rOCgqF2XXnWsiTg+eycHZgZwRonK8ORPa0irqqH2cdMA36mFbVC74F7h2lwArlbfF/uPQgwdDABJ9N83DXuyqhGs9aycPRn9zWi9mTLRnp4BoY/Ty1P5kH3TdF30Pl65uPuo2NItJj2wQSyMhdCrfisXnwaTtZfhpWw==
 j...@wikimedia.org]
-uid: 11654
\ No newline at end of file
+uid: 11654
+  thcipriani:
+ensure: present
+gid: 500
+name: thcipriani
+realname: Tyler Cipriani
+ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAACAQCiy95u6XMT41V+ISpDql7n26m/ENqbS6xmF8neK4LOTdHp8dE6jZN3+HgrbssDoTYibBmyZsIzH+nmqJXQtXz9l0uPs1q3jdzv2LQrW1TpbaMt5L3sQ6eW+eWD/F05/+OL00zIhhI7yWaBfptCYGfU9NGkTQJJIWVcTGBLb2qOGPedIwtQjt5E2Ng3dlYK0dX0+rSUi60QDI/WAisXVCpZSvofoULxd7hEXIbADFe0w8r+ZUtI4EnBFSAbM+ffQ4duyiqO3UNcFxjWicD8WUPvG6YOeLX/UwUw+USh9bQBuewnDp5TIRLCGBCdxKPvl0qBQfmwj1fCOjtxdm5PZ11d+/zVQBKe2kCXdyLeRQF+BE+HDLePcOLs5Gujx1e9UKIiNtN8BuKDZ5fFCfVdjSbE0CTeWzAYsWx+uzT1PzXw1j7lDYUVI3BExdkQp8UDfF81OW+3WmvsN+HbgKl3zB5hR4lJ2h1F1s+MWxrnrtjnn+UqheS9xWeSJgtwuN/2TY/N30u/s0hfGEv+M/djRUtSWlqK9APSe9o4/2iprIs7EQJFu8eV/dN3UyAf0jVfvemdcnNXWIKD4c18+8k6uQzbiPF8vcYn9N49vmPCzMUIYnJKUA847A/poxavzcW3wdtmup4k8VIYYciyqCA9yJTgG5ueqw97a31XRhk+CG+i8Q==
 thcipriani@wikimedia-prod]
+uid: 11634

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I527f503c8cf18ac6dee3f54c01070ce00d2462ee
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Greg Grossmeier g...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: RobH r...@wikimedia.org
Gerrit-Reviewer: Thcipriani tcipri...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fix TOC error caused by there being no TOC on Topic pages - change (mediawiki...Flow)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: Fix TOC error caused by there being no TOC on Topic pages
..


Fix TOC error caused by there being no TOC on Topic pages

Bug: T87278
Change-Id: Id9000e005a8426adfcaf0dc40d13823d71404b37
---
M modules/engine/components/board/features/flow-board-toc.js
1 file changed, 15 insertions(+), 8 deletions(-)

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



diff --git a/modules/engine/components/board/features/flow-board-toc.js 
b/modules/engine/components/board/features/flow-board-toc.js
index 66fccfc..4d64730 100644
--- a/modules/engine/components/board/features/flow-board-toc.js
+++ b/modules/engine/components/board/features/flow-board-toc.js
@@ -251,14 +251,21 @@
 * @param {jQuery} $topicTitle
 */
function flowBoardComponentTocFeatureElementLoadTopicTitle( $topicTitle 
) {
-   var currentTopicId = $topicTitle.closest( '[data-flow-id]' 
).data( 'flowId' ),
-   topicData = {
-   posts: {},
-   revisions: {},
-   roots: [ currentTopicId ],
-   noLoadMore: true
-   },
-   $kids, $target;
+   var currentTopicId, topicData, $kids, $target;
+
+   if ( !this.$tocMenu ) {
+   // No TOC (expected if we're on Topic page)
+
+   return;
+   }
+
+   currentTopicId = $topicTitle.closest( '[data-flow-id]' ).data( 
'flowId' );
+   topicData = {
+   posts: {},
+   revisions: {},
+   roots: [ currentTopicId ],
+   noLoadMore: true
+   };
 
if ( !this.topicIdsInToc[ currentTopicId ] ) {
// If we get in here, this must have been loaded by 
topics infinite scroll and NOT by jumpTo

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9000e005a8426adfcaf0dc40d13823d71404b37
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Bump Echo submodule in 1.25wmf17 - change (mediawiki/core)

2015-02-17 Thread MaxSem (Code Review)

MaxSem has submitted this change and it was merged.

Change subject: Bump Echo submodule in 1.25wmf17
..


Bump Echo submodule in 1.25wmf17

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

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



diff --git a/extensions/Echo b/extensions/Echo
index ab43b05..555f954 16
--- a/extensions/Echo
+++ b/extensions/Echo
-Subproject commit ab43b050637f17a36f355d3eda43b2980b8dd66b
+Subproject commit 555f95409cf6566e06b27ecd2d2e84dbc463d805

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1746a4c286a83e7b26c54499c9bb121a48d99f6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf17
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] actually put ft_stopword_file into the db config this time - change (operations/puppet)

2015-02-17 Thread Springle (Code Review)

Springle has submitted this change and it was merged.

Change subject: actually put ft_stopword_file into the db config this time
..


actually put ft_stopword_file into the db config this time

Change-Id: I71ee3c2e69b621e310898b5c77a891b46c7e3cdd
---
M templates/mariadb/phabricator.my.cnf.erb
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/templates/mariadb/phabricator.my.cnf.erb 
b/templates/mariadb/phabricator.my.cnf.erb
index b6c5845..311f4c7 100644
--- a/templates/mariadb/phabricator.my.cnf.erb
+++ b/templates/mariadb/phabricator.my.cnf.erb
@@ -69,6 +69,7 @@
 # Setting ft_boolean_syntax with a leading white space explodes and it isn't 
clear there was
 # ever a way to escape things or use set-variable here. For now, run a SET 
GLOBAL at startup:
 init_file  = /etc/mysql/phabricator-init.sql
+ft_stopword_file   = /etc/mysql/phabricator-stopwords.txt
 ft_min_word_len= 3
 aria_pagecache_buffer_size = 4G
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71ee3c2e69b621e310898b5c77a891b46c7e3cdd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle sprin...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Bump MobileFrontend - change (mediawiki/core)

2015-02-17 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Bump MobileFrontend
..

Bump MobileFrontend

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/28/191228/1

diff --git a/extensions/MobileFrontend b/extensions/MobileFrontend
index fc826ff..d03a8fa 16
--- a/extensions/MobileFrontend
+++ b/extensions/MobileFrontend
-Subproject commit fc826ff6a73336ca904e803de80da419e3742d5c
+Subproject commit d03a8fab2033b1aaa3c5466eb4f62ced891ed139

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I042b9313850946514328cce00d43947d32d15e38
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf17
Gerrit-Owner: MaxSem maxsem.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] Update restbase config.yaml.erb for service-runner - change (operations/puppet)

2015-02-17 Thread GWicke (Code Review)

GWicke has uploaded a new change for review.

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

Change subject: Update restbase config.yaml.erb for service-runner
..

Update restbase config.yaml.erb for service-runner

We are now using a generic service-runner module, which expects a slightly
different config file. This patch updates the puppetized config to match this.

Change-Id: Ib7912ec2491aae446af2b123eb970c0d3eb7c22e
---
M modules/restbase/templates/config.yaml.erb
1 file changed, 18 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/191230/1

diff --git a/modules/restbase/templates/config.yaml.erb 
b/modules/restbase/templates/config.yaml.erb
index 1b857c0..395f900 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -1,6 +1,7 @@
 # RESTBase config
 
-port: %= @port %
+info:
+  name: restbase
 
 logging:
   name: restbase
@@ -11,9 +12,14 @@
 host: %= @logstash_host %
 port: %= @logstash_port %
 
-monitoring:
-  statsdHost: %= @statsd_host %
+# StatsD metrics collection
+metrics:
+  type: txstatsd
+  host: %= @statsd_host %
+  port: %= @statsd_port %
 
+# Swagger spec templates, referenced using yaml references in the spec section
+# below.
 templates:
 
   wmf-content-1.0.0: wp/content/1.0.0
@@ -87,22 +93,6 @@
 options:
   apiURI: http://{domain}/w/api.php
 
-#  /{module:revscore}:
-#title: Simple revscore service wrapper
-#x-modules:
-#  # Generic revision service interface; Expects requests of the form
-#  # /{title}/{revision}.
-#  # Specific interface documentation (content types etc) at public
-#  # entry point, although we might also want to enforce them
-#  # internally.
-#  - name: restbase-mod-service
-#version: 1.0.0 # simple service module, to be shared
-#options:
-#  storage:
-#uri: 
/{domain}/sys/key_rev_value/revscore.scores/{title}/{revision}
-#  service:
-#uri: http://revscore.wikimedia.org/{domain}/{title}/{revision}
-
   wp-default-1.0.0: wp/default/1.0.0
 x-subspecs:
   - paths:
@@ -113,13 +103,18 @@
 x-subspec: *wp/sys/1.0.0
 
 
+# Swagger spec root.
 spec:
   title: The RESTBase root
   # Some more general RESTBase info
   paths:
 /{domain:en.wikipedia.org}: *wp/default/1.0.0
-#/{domain:de.wikipedia.org}: *wp/default/1.0.0
-#/{domain:es.wikipedia.org}: *wp/default/1.0.0
-#/{domain:nl.wikipedia.org}: *wp/default/1.0.0
-#/{domain:en.wikipedia.test.local}: *wp/default/1.0.0
 
+# The main service setup. Each worker can offer one or more services.
+services:
+  - name: restbase
+module: ./lib/server
+conf:
+  port: %= @port %
+  port: 7231
+  spec: *spec

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7912ec2491aae446af2b123eb970c0d3eb7c22e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke gwi...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Do not set ready on child thread if it is already set - change (mediawiki...EventLogging)

2015-02-17 Thread Nuria (Code Review)

Nuria has uploaded a new change for review.

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

Change subject: Do not set ready on child thread if it is already set
..

Do not set ready on child thread if it is already set

Change-Id: I633ba2ed026a66a5126407976701433933de1a7c
---
M server/eventlogging/handlers.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging 
refs/changes/31/191231/1

diff --git a/server/eventlogging/handlers.py b/server/eventlogging/handlers.py
index b08fdd0..73fa246 100644
--- a/server/eventlogging/handlers.py
+++ b/server/eventlogging/handlers.py
@@ -109,7 +109,7 @@
 while worker.is_alive():
 event = (yield)
 events.append(event)
-if len(events) = 100:
+if len(events) = 100 and not worker.ready.isSet():
 worker.ready.set()
 except GeneratorExit:
 # Allow the worker to complete any work that is

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I633ba2ed026a66a5126407976701433933de1a7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Nuria nu...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] reduce db1065 non-api load - change (operations/mediawiki-config)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: reduce db1065 non-api load
..


reduce db1065 non-api load

Change-Id: Ifd192e0371389900e2c75888c7b6516e23c5581c
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index beb7c3a..fa82e74 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -92,7 +92,7 @@
'db1051' = 0,   # 2.8TB  96GB, vslow, dump
'db1055' = 0,   # 2.8TB  96GB, watchlist, recentchangeslinked, 
contributions, logpager
'db1057' = 100, # 2.8TB  96GB
-   'db1065' = 200, # 2.8TB 160GB, api
+   'db1065' = 0,   # 2.8TB 160GB, api, = 0 T88084
'db1066' = 200, # 2.8TB 160GB, api
'db1072' = 500, # 2.8TB 160GB
'db1073' = 500, # 2.8TB 160GB

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd192e0371389900e2c75888c7b6516e23c5581c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Springle sprin...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Element.php: Add data property - change (oojs/ui)

2015-02-17 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: Element.php: Add data property
..

Element.php: Add data property

This makes the PHP API match the JS API.  The Element data isn't terribly
useful on the PHP side at the moment, but after T74716 allows us to
create JS widgets corresponding to PHP widgets this will allow us to
pass information from server-side to client-side.

Change-Id: I5261784081cb395747b2f5289b53baf2b7f50d3f
---
M php/Element.php
1 file changed, 31 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/43/191243/1

diff --git a/php/Element.php b/php/Element.php
index 35ab53a..f327154 100644
--- a/php/Element.php
+++ b/php/Element.php
@@ -32,6 +32,13 @@
/* Members */
 
/**
+* Element data.
+*
+* @var mixed
+*/
+   protected $data = null;
+
+   /**
 * Mixins.
 *
 * @var array List mixed in objects.
@@ -46,12 +53,16 @@
 * @param string $config['id'] HTML id attribute
 * @param array $config['content'] Content to append, strings or 
Element objects. Strings will
 *   be HTML-escaped for output, use a HtmlSnippet instance to prevent 
that.
+* @param Mixed $config['data'] Element data
 */
public function __construct( array $config = array() ) {
// Parent constructor
parent::__construct( $this-getTagName() );
 
// Initialization
+   if ( isset( $config['data'] ) ) {
+   $this-setData( $config['data'] );
+   }
if ( isset( $config['classes'] )  is_array( 
$config['classes'] ) ) {
$this-addClasses( $config['classes'] );
}
@@ -124,6 +135,26 @@
}
 
/**
+* Get element data.
+*
+* @return {Mixed} Element data
+*/
+   public function getData() {
+   return $this-data;
+   }
+
+   /**
+* Set element data.
+*
+* @param {Mixed} Element data
+* @chainable
+*/
+   public function setData( $data ) {
+   $this-data = $data;
+   return $this;
+   }
+
+   /**
 * Check if element supports one or more methods.
 *
 * @param string|string[] $methods Method or list of methods to check

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5261784081cb395747b2f5289b53baf2b7f50d3f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Element.php: Add text configuration option - change (oojs/ui)

2015-02-17 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: Element.php: Add text configuration option
..

Element.php: Add text configuration option

This makes the PHP API better match the JS API, even though it's a little
redundant on the PHP side.

Change-Id: I085e6a72a15eb31f58177201f2b088b16ccf27b7
---
M php/Element.php
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/44/191244/1

diff --git a/php/Element.php b/php/Element.php
index f327154..0fd9f4f 100644
--- a/php/Element.php
+++ b/php/Element.php
@@ -51,7 +51,8 @@
 * @param array $config Configuration options
 * @param string[] $config['classes'] CSS class names to add
 * @param string $config['id'] HTML id attribute
-* @param array $config['content'] Content to append, strings or 
Element objects. Strings will
+* @param string $config['text'] Text to insert
+* @param array $config['content'] Content to append (after text), 
strings or Element objects. Strings will
 *   be HTML-escaped for output, use a HtmlSnippet instance to prevent 
that.
 * @param Mixed $config['data'] Element data
 */
@@ -69,6 +70,10 @@
if ( isset( $config['id'] ) ) {
$this-setAttributes( array( 'id' = $config['id'] ) );
}
+   if ( isset( $config['text'] ) ) {
+   // JS compatibility
+   $this-appendContent( $config['text'] );
+   }
if ( isset( $config['content'] ) ) {
$this-appendContent( $config['content'] );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I085e6a72a15eb31f58177201f2b088b16ccf27b7
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Use array of target languages for Dictionary configuration - change (mediawiki...cxserver)

2015-02-17 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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

Change subject: Use array of target languages for Dictionary configuration
..

Use array of target languages for Dictionary configuration

Bug: T89712
Change-Id: I5db6c82fdaf74578899cbbeb70e518f402646f8b
---
M config.defaults.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/53/191253/1

diff --git a/config.defaults.js b/config.defaults.js
index caf1fd3..ef81e81 100644
--- a/config.defaults.js
+++ b/config.defaults.js
@@ -67,8 +67,8 @@
},
dictionary: {
JsonDict: {
-   ca: 'es',
-   es: 'ca'
+   ca: [ 'es', 'en' ],
+   es: [ 'ca' ]
}
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5db6c82fdaf74578899cbbeb70e518f402646f8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com

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

[MediaWiki-commits] [Gerrit] logstash: Ship logs via syslog udp datagrams - change (operations/mediawiki-config)

2015-02-17 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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

Change subject: logstash: Ship logs via syslog udp datagrams
..

logstash: Ship logs via syslog udp datagrams

Use the support for syslog UDP datagram logging in 1.25wmf18 to ship log
events directly to Logstash.

Initially enabled only for group0 wikis.

Bug: T88732
Change-Id: Ie226587277d0ea7d8ea558d9882b63944e051aae
---
M wmf-config/InitialiseSettings.php
M wmf-config/logging.php
2 files changed, 33 insertions(+), 28 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 3efe349..c1337af 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14893,9 +14893,10 @@
'default' = true,
 ),
 
-// Disabled on suspicion of being implicated in 5-Feb-2015 outage. --Ori
+// Needs 1.25wmf18 or newer
 'wmgUseMonologLogger' = array(
'default' = false,
+   'group0'  = true,
 ),
 
 'wmgUseXAnalytics' = array(
diff --git a/wmf-config/logging.php b/wmf-config/logging.php
index 56f83e1..4aeb137 100644
--- a/wmf-config/logging.php
+++ b/wmf-config/logging.php
@@ -1,32 +1,28 @@
 ?php
 if ( $wmgUseMonologLogger ) {
/**
-   * Create a config array for a \Monolog\Handler\RedisHandler instance.
+   * Create a config array for a MWLoggerMonologSyslogHandler instance.
* @param int $level Minimum logging level at which this handler will be
* triggered
* @return array
*/
-   function wmMonologRedisConfigFactory( $level ) {
-   global $wmgLogstashPassword;
-   return array(
-   'class' = '\\Monolog\\Handler\\RedisHandler',
-   'args' = array(
-   function () use ( $wmgLogstashPassword ) {
-   $servers = array(
-   '10.64.32.138', // 
logstash1001.eqiad.wmnet
-   '10.64.32.137', // 
logstash1002.eqiad.wmnet
-   '10.64.32.136', // 
logstash1003.eqiad.wmnet
-   );
-   // Connect to a random logstash host
-   $server = $servers[ mt_rand( 0, 
count($servers) - 1 ) ];
+   function wmMonologSyslogConfigFactory( $level ) {
+   static $servers = array(
+   '10.64.32.138', // logstash1001.eqiad.wmnet
+   '10.64.32.137', // logstash1002.eqiad.wmnet
+   '10.64.32.136', // logstash1003.eqiad.wmnet
+   );
 
-   $redis = new Redis();
-   $redis-connect( $server, 6379, .25 );
-   $redis-auth( $wmgLogstashPassword );
-   return $redis;
-   },
-   'logstash',
-   $level
+   return array(
+   'class' = 'MWLoggerMonologSyslogHandler',
+   'args' = array(
+   'mediawiki',// syslog appname
+   function () use ( $servers ) {
+   return $servers[ mt_rand( 0, count( 
$servers ) - 1 ) ];
+   },  // randomly chose server
+   10514,  // logstash syslog listener port
+   LOG_USER,   // syslog facility
+   $level, // minimum log level to pass to 
logstash
),
'formatter' = 'logstash',
);
@@ -66,7 +62,7 @@
'class' = '\\Monolog\\Handler\\NullHandler',
'formatter' = 'line',
),
-   'logstash' = wmMonologRedisConfigFactory( 
\Monolog\Logger::DEBUG ),
+   'logstash' = wmMonologSyslogConfigFactory( 'debug' ),
),
 
'formatters' = array(
@@ -101,14 +97,18 @@
 
if ( $sendToLogstash ) {
if ( $level !== false ) {
+   // Register handler that will only pass events 
of the given
+   // log level
$logstashHandler = filtered-{$group};
$wmgMonologConfig['handlers'][$logstashHandler] 
=
-   wmMonologRedisConfigFactory( $level );
+   wmMonologSyslogConfigFactory( $level

[MediaWiki-commits] [Gerrit] Also allow user CSS (user JS is already allowed) - change (mediawiki/vagrant)

2015-02-17 Thread jenkins-bot (Code Review)

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

Change subject: Also allow user CSS (user JS is already allowed)
..


Also allow user CSS (user JS is already allowed)

Change-Id: If93828fa3b780f0b113f4f1816fa95ca81b7f5af
---
M LocalSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/LocalSettings.php b/LocalSettings.php
index 635174a..5a468ca 100644
--- a/LocalSettings.php
+++ b/LocalSettings.php
@@ -52,6 +52,7 @@
 
 // User settings and permissions
 $wgAllowUserJs = true;
+$wgAllowUserCss = true;
 
 // Eligibility for autoconfirmed group
 $wgAutoConfirmAge = 3600 * 24; // one day

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If93828fa3b780f0b113f4f1816fa95ca81b7f5af
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] service_unit: allow custom init script in a single initsystem - change (operations/puppet)

2015-02-17 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: service_unit: allow custom init script in a single initsystem
..


service_unit: allow custom init script in a single initsystem

Adding the parameter $strict with a default value of true I don't change
the default behaviour, but allows to set it to false in cases where we
want to install a custom init script for e.g. systemd alone, a thing
that may happen in fact quite regularly.

Change-Id: I8990484cac56cb5fae891c9665756ab718d8022f
---
M modules/base/lib/puppet/parser/functions/pick_initscript.rb
M modules/base/manifests/service_unit.pp
M modules/base/spec/functions/pick_initscript_spec.rb
3 files changed, 24 insertions(+), 11 deletions(-)

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



diff --git a/modules/base/lib/puppet/parser/functions/pick_initscript.rb 
b/modules/base/lib/puppet/parser/functions/pick_initscript.rb
index 8a97c2c..a5a71fd 100644
--- a/modules/base/lib/puppet/parser/functions/pick_initscript.rb
+++ b/modules/base/lib/puppet/parser/functions/pick_initscript.rb
@@ -2,29 +2,32 @@
 
 Puppet::Parser::Functions.newfunction(:pick_initscript,
:type = :rvalue,
-   :arity = 4,
+   :arity = 5,
:doc = -'HEREDOC'
 Takes as an input the init system currently installed, the
 available init scripts, and returns the chosen one.
 HEREDOC
 ) do |vals|
-  init_system, has_systemd, has_upstart, has_sysvinit = vals
-  has_custom = has_systemd || has_upstart || has_sysvinit
+  init_system, has_systemd, has_upstart, has_sysvinit, strict  = vals
+  has_custom = (has_systemd || has_upstart || has_sysvinit)
   # if we don't have custom scripts, we use the system defaults
   return false unless has_custom
   case init_system
   when 'systemd'
 return 'systemd' if has_systemd
 return 'sysvinit' if has_sysvinit
+return false unless strict
 raise(ArgumentError,
   'This service unit has an upstart script but nothing useful for 
systemd')
   when 'upstart'
 return 'upstart' if has_upstart
 return 'sysvinit' if has_sysvinit
+return false unless strict
 raise(ArgumentError,
   'This service unit has a systemd script but nothing useful for 
upstart')
   when 'sysvinit'
 return 'sysvinit' if has_sysvinit
+return false unless strict
 raise(ArgumentError,
   'This service unit lacks a custom sysvinit script')
   else
diff --git a/modules/base/manifests/service_unit.pp 
b/modules/base/manifests/service_unit.pp
index 360307d..14b7ad8 100644
--- a/modules/base/manifests/service_unit.pp
+++ b/modules/base/manifests/service_unit.pp
@@ -24,6 +24,12 @@
 #[*sysvinit*]
 # As the preceding param, but for traditional sysvinit scripts
 #
+#[*strict*]
+# Boolean - if true (default), only allows to have customized scripts
+# for all init systems; if false allows to use standard scripts from
+# the distro (e.g. memcached will need a custom systemd unit, but use
+# the standard init file on upstart).
+#
 #[*refresh*]
 # Boolean - tells puppet if a change in the config should notify the service 
directly
 #
@@ -50,6 +56,7 @@
 $systemd  = false,
 $upstart  = false,
 $sysvinit = false,
+$strict   = true,
 $refresh  = true,
 $service_params   = {},
 ) {
@@ -57,7 +64,7 @@
 validate_ensure($ensure)
 # Validates the service name, and picks the valid init script
 $initscript = pick_initscript(
-$::initsystem, $systemd, $upstart, $sysvinit)
+$::initsystem, $systemd, $upstart, $sysvinit, $strict)
 # we assume init scripts are templated
 if $initscript {
 if $caller_module_name {
diff --git a/modules/base/spec/functions/pick_initscript_spec.rb 
b/modules/base/spec/functions/pick_initscript_spec.rb
index 80745f2..88280b4 100755
--- a/modules/base/spec/functions/pick_initscript_spec.rb
+++ b/modules/base/spec/functions/pick_initscript_spec.rb
@@ -8,22 +8,25 @@
   end
 
   it 'Returns false if no init script provided' do
-should run.with_params('systemd', false, false, false).and_return(false)
+should run.with_params('systemd', false, false, false, 
true).and_return(false)
   end
 
   it 'Returns systemd if provided, sysvinit otherwise' do
-should run.with_params('systemd', true, true, true).and_return('systemd')
-should run.with_params('systemd', false, true, true).and_return('sysvinit')
+should run.with_params('systemd', true, true, true, 
true).and_return('systemd')
+should run.with_params('systemd', false, true, true, 
true).and_return('sysvinit')
   end
 
   it 'Returns upstart if provided, sysvinit otherwise' do
-should run.with_params('upstart', true, true, true).and_return('upstart')
-should

[MediaWiki-commits] [Gerrit] [SemanticSignup] Update path for i18n files - change (translatewiki)

2015-02-17 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: [SemanticSignup] Update path for i18n files
..


[SemanticSignup] Update path for i18n files

https://github.com/SemanticMediaWiki/SemanticSignup/pull/19

Change-Id: I8af17d4e2ada6f8804280c940484723971178af3
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 71da051..5af12b5 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1901,8 +1901,8 @@
 Semantic Sifter
 
 Semantic Signup
-aliasfile = SemanticSignup/SemanticSignup.i18n.aliases.php
-magicfile = SemanticSignup/SemanticSignup.i18n.magic.php
+aliasfile = SemanticSignup/i18n/SemanticSignup.i18n.aliases.php
+magicfile = SemanticSignup/i18n/SemanticSignup.i18n.magic.php
 
 Semantic Tasks
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8af17d4e2ada6f8804280c940484723971178af3
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] [SemanticSignup] Update path for i18n files - change (translatewiki)

2015-02-17 Thread Raimond Spekking (Code Review)

Raimond Spekking has uploaded a new change for review.

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

Change subject: [SemanticSignup] Update path for i18n files
..

[SemanticSignup] Update path for i18n files

https://github.com/SemanticMediaWiki/SemanticSignup/pull/19

Change-Id: I8af17d4e2ada6f8804280c940484723971178af3
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/65/191265/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 71da051..5af12b5 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1901,8 +1901,8 @@
 Semantic Sifter
 
 Semantic Signup
-aliasfile = SemanticSignup/SemanticSignup.i18n.aliases.php
-magicfile = SemanticSignup/SemanticSignup.i18n.magic.php
+aliasfile = SemanticSignup/i18n/SemanticSignup.i18n.aliases.php
+magicfile = SemanticSignup/i18n/SemanticSignup.i18n.magic.php
 
 Semantic Tasks
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8af17d4e2ada6f8804280c940484723971178af3
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com

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

[MediaWiki-commits] [Gerrit] PostgreSQL: Improve dropping of foreign key constraint - change (mediawiki/core)

2015-02-17 Thread Jjanes (Code Review)

Jjanes has uploaded a new change for review.

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

Change subject: PostgreSQL: Improve dropping of foreign key constraint
..

PostgreSQL: Improve dropping of foreign key constraint

Change I2abd650c8ce83c5b725aec054 to fix bug T76254 was
inefficient upon subsequent updates, as update.php would
first add the constraint, and then remove it again.

Remove the older code responsible for adding the doomed
constraint.

Also, make the do nothing output message more consistent
with other messages of the same nature.

Change-Id: Id6a05c1234fbdc5849480d13fb7d6476eac52857
---
M includes/installer/PostgresUpdater.php
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/58/191258/1

diff --git a/includes/installer/PostgresUpdater.php 
b/includes/installer/PostgresUpdater.php
index d9608b6..df2f0e3 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -384,8 +384,6 @@
'page(page_id) ON DELETE CASCADE' ),
array( 'changeFkeyDeferrable', 'protected_titles', 
'pt_user',
'mwuser(user_id) ON DELETE SET NULL' ),
-   array( 'changeFkeyDeferrable', 'recentchanges', 
'rc_cur_id',
-   'page(page_id) ON DELETE SET NULL' ),
array( 'changeFkeyDeferrable', 'recentchanges', 
'rc_user',
'mwuser(user_id) ON DELETE SET NULL' ),
array( 'changeFkeyDeferrable', 'redirect', 'rd_from', 
'page(page_id) ON DELETE CASCADE' ),
@@ -787,7 +785,7 @@
$command = ALTER TABLE $table DROP CONSTRAINT 
$conname;
$this-db-query( $command );
} else {
-   $this-output( Foreign key constraint on 
'$table.$field' already does not exist\n );
+   $this-output( ...foreign key constraint on 
'$table.$field' already does not exist\n );
};
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6a05c1234fbdc5849480d13fb7d6476eac52857
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_24
Gerrit-Owner: Jjanes jeff.ja...@gmail.com

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

[MediaWiki-commits] [Gerrit] depool db1054, T89801 - change (operations/mediawiki-config)

2015-02-17 Thread Springle (Code Review)

Springle has uploaded a new change for review.

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

Change subject: depool db1054, T89801
..

depool db1054, T89801

Change-Id: I312cdf3bfea15599c3aa4e028dfdcbb5694a8a88
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index fa82e74..e66fef0 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -101,7 +101,7 @@
'db1024' = 0,   # 1.4TB  64GB
'db1018' = 0,   # 1.4TB  64GB, snapshot, dump, vslow
'db1036' = 0,   # 1.4TB  64GB, watchlist, recentchangeslinked, 
contributions, logpager
-   'db1054' = 200, # 2.8TB  96GB, api
+   # T89801 mce errors 'db1054' = 200, # 2.8TB  96GB, api
'db1060' = 200, # 2.8TB  96GB, api
'db1063' = 500, # 2.8TB 128GB
'db1067' = 500, # 2.8TB 160GB

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I312cdf3bfea15599c3aa4e028dfdcbb5694a8a88
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Springle sprin...@wikimedia.org

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

1 2 3 4 5 >

1 - 100 of 447 matches

Mail list logo