date:20161010

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: ve.Range: Don't fixup invalid arguments

2016-10-10 Thread Divec (Code Review)

Divec has uploaded a new change for review.

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

Change subject: ve.Range: Don't fixup invalid arguments
..

ve.Range: Don't fixup invalid arguments

Hitherto, calls such as "new ve.Range( NaN, undefined )" that indicate a 
programming error were
having their invalid arguments whitewashed to 0. This impeded debugging, 
particularly as range
calculation errors can often propagate quite far before surfacing.

Change-Id: I05a99fb8f6760af875aca64400832e9ade236fac
---
M src/ve.Range.js
1 file changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/99/315199/1

diff --git a/src/ve.Range.js b/src/ve.Range.js
index c12dccf..4047200 100644
--- a/src/ve.Range.js
+++ b/src/ve.Range.js
@@ -8,12 +8,16 @@
  * @class
  *
  * @constructor
- * @param {number} from Anchor offset
+ * @param {number} [from=0] Anchor offset
  * @param {number} [to=from] Focus offset
  */
 ve.Range = function VeRange( from, to ) {
-   this.from = from || 0;
-   this.to = to === undefined ? this.from : to;
+   // For ease of debugging, check arguments.length when applying 
defaults, to preserve
+   // invalid arguments such as undefined and NaN that indicate a 
programming error.
+   // Range calculation errors often seem to propagate quite far before 
surfacing, so the
+   // indication is important.
+   this.from = arguments.length >= 1 ? from : 0;
+   this.to = arguments.length >= 2 ? to : this.from;
this.start = this.from < this.to ? this.from : this.to;
this.end = this.from < this.to ? this.to : this.from;
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I05a99fb8f6760af875aca64400832e9ade236fac
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec 

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Apply inserted annotations above background annotation stack

2016-10-10 Thread Divec (Code Review)

Divec has uploaded a new change for review.

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

Change subject: Apply inserted annotations above background annotation stack
..

Apply inserted annotations above background annotation stack

Bug: T142245
Change-Id: I52b0b3de6cf835c16fdee441e48b85a7c920c54e
---
M src/dm/ve.dm.SurfaceFragment.js
M tests/ce/ve.ce.Surface.test.js
2 files changed, 34 insertions(+), 42 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/98/315198/1

diff --git a/src/dm/ve.dm.SurfaceFragment.js b/src/dm/ve.dm.SurfaceFragment.js
index c7456b5..140b09e 100644
--- a/src/dm/ve.dm.SurfaceFragment.js
+++ b/src/dm/ve.dm.SurfaceFragment.js
@@ -851,7 +851,7 @@
  * @chainable
  */
 ve.dm.SurfaceFragment.prototype.insertDocument = function ( newDoc, 
newDocRange, annotate ) {
-   var tx, newRange, annotations, offset,
+   var tx, newRange, annotations, offset, i, item,
range = this.getSelection().getCoveringRange(),
doc = this.getDocument();
 
@@ -877,17 +877,35 @@
.getAnnotationsFromOffset( offset === 0 ? 0 : offset - 
1 );
}
 
-   tx = ve.dm.Transaction.newFromDocumentInsertion( doc, offset, newDoc, 
newDocRange );
+   if ( annotations && annotations.getLength() > 0 ) {
+   // Backup newDoc.data.data, to restore below
+   // TODO: clone newDoc instead? Or just let this method modify 
newDoc?
+   newDoc.data.origData = newDoc.data.slice();
+   for ( i = newDocRange.start; i < newDocRange.end; i++ ) {
+   item = newDoc.data.data[ i ];
+   if ( Array.isArray( item ) ) {
+   newDoc.data.data[ i ] = [
+   item[ 0 ],
+   annotations.storeIndexes.concat( item[ 
1 ] )
+   ];
+   } else {
+   newDoc.data.data[ i ] = [ item, 
annotations.storeIndexes.slice() ];
+   }
+   }
+   }
+   try {
+   tx = ve.dm.Transaction.newFromDocumentInsertion( doc, offset, 
newDoc, newDocRange );
+   } finally {
+   // Restore newDoc.data.data
+   newDoc.data.data = newDoc.data.origData;
+   delete newDoc.data.origData;
+   }
if ( !tx.isNoOp() ) {
// Set the range to cover the inserted content; the offset 
translation will be wrong
// if newFromInsertion() decided to move the insertion point
newRange = tx.getModifiedRange( doc );
this.change( tx, newRange ? new ve.dm.LinearSelection( doc, 
newRange ) : new ve.dm.NullSelection( doc ) );
-   if ( annotations && annotations.getLength() > 0 ) {
-   this.annotateContent( 'set', annotations );
-   }
}
-
return this;
 };
 
diff --git a/tests/ce/ve.ce.Surface.test.js b/tests/ce/ve.ce.Surface.test.js
index 7adbd27..456f7d9 100644
--- a/tests/ce/ve.ce.Surface.test.js
+++ b/tests/ce/ve.ce.Surface.test.js
@@ -1427,28 +1427,15 @@
{ type: 'retain', length: 25 },
{
type: 'replace',
-   insert: [ 'F', 'o', 'o' 
],
+   insert: [
+   [ 'F', [ bold ] 
],
+   [ 'o', [ bold ] 
],
+   [ 'o', [ bold ] 
]
+   ],
remove: []
},
{ type: 'retain', length: 
docLen - 25 }
],
-   [
-   { type: 'retain', length: 25 },
-   {
-   type: 'annotate',
-   method: 'set',
-   bias: 'start',
-   index: 
ve.dm.example.annIndex( 'b', 'Quux' )
-   },
-   { type: 'retain', length: 3 },
-   {
-   type: 'annotate',
-   method:

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Upgrade TranslationTests to JUnit 4

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Upgrade TranslationTests to JUnit 4
..


Upgrade TranslationTests to JUnit 4

A follow-up to 4994f86 and 8d2b632, remove indirect WebView dependency
from missed test, TranslationTests. TranslationTests depended on
PageActivity which uses a WebView. Also, upgrade to JUnit 4. Tested on:

• Pass
• Failure: remove HTML from es/wp_stylized
• Failure: change %s to %d in iw/last_updated_text

Bug: T133183
Change-Id: Ibb476fc463e26f1f5c93f47cf926c08b874b985a
---
M app/src/androidTest/java/org/wikipedia/test/TranslationTests.java
1 file changed, 12 insertions(+), 19 deletions(-)

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



diff --git a/app/src/androidTest/java/org/wikipedia/test/TranslationTests.java 
b/app/src/androidTest/java/org/wikipedia/test/TranslationTests.java
index 9d1f037..54b2b13 100644
--- a/app/src/androidTest/java/org/wikipedia/test/TranslationTests.java
+++ b/app/src/androidTest/java/org/wikipedia/test/TranslationTests.java
@@ -4,18 +4,23 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.support.test.filters.SmallTest;
-import android.test.ActivityInstrumentationTestCase2;
 import android.util.DisplayMetrics;
 import android.util.Log;
+
+import org.junit.Test;
 import org.wikipedia.R;
 import org.wikipedia.model.BaseModel;
-import org.wikipedia.page.PageActivity;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+
+import static android.support.test.InstrumentationRegistry.getInstrumentation;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.fail;
 
 /**
  * Tests to make sure that the string resources don't cause any issues. Mainly 
the goal is to test
@@ -26,26 +31,15 @@
  * TODO: check content_license_html is valid HTML
  */
 @SmallTest
-public class TranslationTests extends 
ActivityInstrumentationTestCase2 {
+public class TranslationTests {
 private static final String TAG = "TrTest";
 
 /** Add more if needed, but then also add some tests. */
 private static final String[] POSSIBLE_PARAMS = new String[] {"%s", 
"%1$s", "%2$s", "%d", "%.2f"};
 
-private PageActivity activity;
 private final StringBuilder mismatches = new StringBuilder();
 
-public TranslationTests() {
-super(PageActivity.class);
-}
-
-@Override
-protected void setUp() throws Exception {
-super.setUp();
-activity = getActivity();
-}
-
-public void testAllTranslations() throws Exception {
+@Test public void testAllTranslations() {
 setLocale(Locale.ROOT.toString());
 String defaultLang = Locale.getDefault().getLanguage();
 List tagRes = new ResourceCollector("<", 
"").collectParameterResources(defaultLang);
@@ -104,12 +98,12 @@
 }
 }
 }
-assertTrue("\n" + mismatches.toString(), mismatches.length() == 0);
+assertThat("\n" + mismatches.toString(), mismatches.length(), is(0));
 }
 
 private Locale myLocale;
 
-void setLocale(String lang) {
+private void setLocale(String lang) {
 myLocale = new Locale(lang);
 Locale.setDefault(myLocale);
 Resources res = getInstrumentation().getTargetContext().getResources();
@@ -117,7 +111,6 @@
 Configuration conf = res.getConfiguration();
 conf.locale = myLocale;
 res.updateConfiguration(conf, dm);
-getInstrumentation().callActivityOnRestart(activity);
 }
 
 private void checkAllStrings(String lang) {
@@ -169,7 +162,7 @@
 }
 }
 
-void checkTranslationHasParameter(Res res, String paramName, Object val1, 
String alternateFormat) {
+private void checkTranslationHasParameter(Res res, String paramName, 
Object val1, String alternateFormat) {
 //Log.i(TAG, myLocale + ":" + res.name + ":" + paramName);
 String translatedString = 
getInstrumentation().getTargetContext().getString(res.id, val1);
 //Log.d(TAG, translatedString);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb476fc463e26f1f5c93f47cf926c08b874b985a
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Normalize ExternalData

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Normalize ExternalData
..


Normalize ExternalData

* Rewrite ExternalData features to only contain a resolved URL and a service id
* Rewrite javascript to use that simplified external data

Bug: T147128
Change-Id: I84b120d3a819725dd016309503c774c064499d01
---
M i18n/en.json
M i18n/qqq.json
M includes/SimpleStyleParser.php
M lib/wikimedia-mapdata.js
M modules/box/Map.js
M modules/box/data.js
M package.json
M schemas/geojson.json
M tests/parserTests.txt
A tests/phpunit/SimpleStyleParserTest.php
D tests/phpunit/data/bad-schemas/36-externaldata.json
D tests/phpunit/data/bad-schemas/37-externaldata.json
D tests/phpunit/data/bad-schemas/38-externaldata.json
D tests/phpunit/data/bad-schemas/39-externaldata.json
D tests/phpunit/data/bad-schemas/40-externaldata.json
D tests/phpunit/data/bad-schemas/41-externaldata.json
M tests/phpunit/data/bad-schemas/42-externaldata.json
M tests/phpunit/data/bad-schemas/43-externaldata.json
M tests/phpunit/data/good-schemas/08-externaldata.json
19 files changed, 417 insertions(+), 304 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 4389006..214de08 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -27,6 +27,7 @@
"kartographer-error-bad_attr": "Attribute \"$1\" has an invalid value",
"kartographer-error-bad_data": "The JSON content is not valid 
GeoJSON+simplestyle",
"kartographer-error-latlon": "Either both \"latitude\" and 
\"longitude\" parameters should be supplied or neither of them",
+   "kartographer-error-service-name": "Invalid cartographic service 
\"$1\"",
"kartographer-tracking-category": "Pages with maps",
"kartographer-tracking-category-desc": "The page includes a map",
"kartographer-coord-combined": "$1 $2",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1960777..5b3294a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -31,6 +31,7 @@
"kartographer-error-bad_attr": "Error shown instead of a map in case of 
a problem with parameters.\n\nParameters:\n* $1 - non-localized attribute name, 
such as 'height', 'latitude', etc",
"kartographer-error-bad_data": "This error is shown if the content of 
the tag is syntactically valid JSON however it does not adhere to GeoJSON and 
simplestyle specifications",
"kartographer-error-latlon": "Error shown by maplink or 
mapframe when certain parameters are incorrect",
+   "kartographer-error-service-name": "Error shown by maplink or 
mapframe. Parameters:\n* $1 - service name.",
"kartographer-tracking-category": "Name of the tracking category",
"kartographer-tracking-category-desc": "Description on 
[[Special:TrackingCategories]] for the 
{{msg-mw|kartographer-tracking-category}} tracking category.",
"kartographer-coord-combined": "{{optional}}\nJoins two parts of 
geogrpahical coordinates. $1 and $2 are latitude and longitude, respectively.",
diff --git a/includes/SimpleStyleParser.php b/includes/SimpleStyleParser.php
index cad1988..5d942c9 100644
--- a/includes/SimpleStyleParser.php
+++ b/includes/SimpleStyleParser.php
@@ -4,6 +4,7 @@
 
 use FormatJson;
 use JsonSchema\Validator;
+use MediaWiki\MediaWikiServices;
 use Parser;
 use PPFrame;
 use Status;
@@ -15,13 +16,16 @@
 class SimpleStyleParser {
private static $parsedProps = [ 'title', 'description' ];
 
+   private static $services = [ 'geoshape', 'geoline' ];
+
/** @var Parser */
private $parser;
 
-   /**
-* @var PPFrame
-*/
+   /** @var PPFrame */
private $frame;
+
+   /** @var string */
+   private $mapService;
 
/**
 * Constructor
@@ -32,6 +36,10 @@
public function __construct( Parser $parser, PPFrame $frame = null ) {
$this->parser = $parser;
$this->frame = $frame;
+   // @fixme: More precise config?
+   $this->mapService = MediaWikiServices::getInstance()
+   ->getMainConfig()
+   ->get( 'KartographerMapServer' );
}
 
/**
@@ -53,7 +61,7 @@
$status = $this->validateContent( $json );
if ( $status->isOK() ) {
$this->sanitize( $json );
-   $status = Status::newGood( $json );
+   $status = $this->normalize( $json );
}
} else {
$status = Status::newFatal( 
'kartographer-error-json', $status->getMessage() );
@@ -164,6 +172,63 @@
}
 
/**
+* Normalizes JSON
+*
+* @param array $json
+* @return Status
+*/
+   private function normalize(

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

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Replace ArticleSaveComplete hook usage
..


Replace ArticleSaveComplete hook usage

Bug: T147390
Change-Id: I5c1fbde1a6ee6afc86ec28fd4190b40c5090839c
---
M OAIHooks.php
M extension.json
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/OAIHooks.php b/OAIHooks.php
index 3aeef7c..4391166 100644
--- a/OAIHooks.php
+++ b/OAIHooks.php
@@ -43,7 +43,7 @@
/**
 * @param $article Article
 * @param $user
-* @param $text
+* @param $content Content
 * @param $summary
 * @param $isminor
 * @param $iswatch
@@ -52,7 +52,7 @@
 * @param $revision
 * @return bool
 */
-   static function updateSave( $article, $user, $text, $summary, $isminor, 
$iswatch, $section, $flags, $revision ) {
+   static function updateSave( $article, $user, $content, $summary, 
$isminor, $iswatch, $section, $flags, $revision ) {
if( $revision ) {
// Only save a record for real updates, not null edits.
$id = $article->getID();
diff --git a/extension.json b/extension.json
index 1538425..e09a5c4 100644
--- a/extension.json
+++ b/extension.json
@@ -14,7 +14,7 @@
"DeleteIds": []
},
"Hooks": {
-   "ArticleSaveComplete": [
+   "PageContentSaveComplete": [
"OAIHook::updateSave"
],
"ArticleDelete": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5c1fbde1a6ee6afc86ec28fd4190b40c5090839c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/OAI
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...SiteMetrics[master]: Add missing SiteMetrics.alias.php file

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Add missing SiteMetrics.alias.php file
..


Add missing SiteMetrics.alias.php file

Bug: T112433
Change-Id: Ie5f9700a2f6af9cbb8f0938ac089a151b37d6701
---
A SiteMetrics.alias.php
M extension.json
2 files changed, 18 insertions(+), 0 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  Raimond Spekking: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/SiteMetrics.alias.php b/SiteMetrics.alias.php
new file mode 100644
index 000..d3b3514
--- /dev/null
+++ b/SiteMetrics.alias.php
@@ -0,0 +1,15 @@
+ array( 'SiteMetrics' ),
+);
diff --git a/extension.json b/extension.json
index 815b785..b1748a5 100644
--- a/extension.json
+++ b/extension.json
@@ -15,6 +15,9 @@
"i18n"
]
},
+   "ExtensionMessagesFiles": {
+   "SiteMetricsAliases": "SiteMetrics.alias.php"
+   },
"AutoloadClasses": {
"SiteMetrics": "SpecialSiteMetrics.php"
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5f9700a2f6af9cbb8f0938ac089a151b37d6701
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/SiteMetrics
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Add a TimedText namespace tab for video files

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Add a TimedText namespace tab for video files
..


Add a TimedText namespace tab for video files

This adds an extra TimedText namespace tab to files that qualify
having TimedText. This would make the TimedText feature more
discoverable.

Bug: T116365
Change-Id: Ia7a378fbbece63b118b5a9356092ff6c3fac192d
---
M TimedMediaHandler.hooks.php
1 file changed, 29 insertions(+), 0 deletions(-)

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



diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index 3e2a69f..0fff12b 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -334,6 +334,8 @@
// Check for timed text page:
$wgHooks[ 'ArticleFromTitle' ][] = 
'TimedMediaHandlerHooks::checkForTimedTextPage';
$wgHooks[ 'ArticleContentOnDiff' ][] = 
'TimedMediaHandlerHooks::checkForTimedTextDiff';
+
+   $wgHooks[ 'SkinTemplateNavigation' ][] = 
'TimedMediaHandlerHooks::onSkinTemplateNavigation';
} else {
// overwrite TimedText.ShowInterface for video with 
mw-provider=local
$wgMwEmbedModuleConfig['TimedText.ShowInterface.local'] 
= 'off';
@@ -426,6 +428,17 @@
return true;
}
 
+   public static function onSkinTemplateNavigation( SkinTemplate 
&$sktemplate, array &$links ) {
+   if ( self::isTimedMediaHandlerTitle( $sktemplate->getTitle() ) 
) {
+   $ttTitle = Title::makeTitleSafe( NS_TIMEDTEXT, 
$sktemplate->getTitle()->getDBkey() );
+   if ( !$ttTitle ) {
+   return;
+   }
+   $links[ 'namespaces' ][ 'timedtext' ] =
+   $sktemplate->tabAction( $ttTitle, 'timedtext', 
false, '', false );
+   }
+   }
+
/**
 * Wraps the isTranscodableFile function
 * @param $title Title
@@ -479,6 +492,22 @@
return false;
}
 
+   public static function isTimedMediaHandlerTitle( $title ) {
+   if ( !$title->inNamespace( NS_FILE ) ) {
+   return false;
+   }
+   $file = wfFindFile( $title );
+   // Can't find file
+   if ( !$file ) {
+   return false;
+   }
+   $handler = $file->getHandler();
+   if ( !$handler ) {
+   return false;
+   }
+   return $handler instanceof TimedMediaHandler;
+   }
+
/**
 * @param $article Article
 * @param $html string

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7a378fbbece63b118b5a9356092ff6c3fac192d
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: TheDJ 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...OpenStackManager[master]: Remove i18n shim

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Remove i18n shim
..


Remove i18n shim

Change-Id: I8bbb57843bf0a1790d75ab54bc45427e38bbb66a
---
D OpenStackManager.i18n.php
M OpenStackManager.php
2 files changed, 0 insertions(+), 36 deletions(-)

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



diff --git a/OpenStackManager.i18n.php b/OpenStackManager.i18n.php
deleted file mode 100644
index 64c40a7..000
--- a/OpenStackManager.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim9a102be1d019a927' ) ) {
-   function wfJsonI18nShim9a102be1d019a927( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim9a102be1d019a927';
-}
diff --git a/OpenStackManager.php b/OpenStackManager.php
index 5cd0515..d37c4c2 100644
--- a/OpenStackManager.php
+++ b/OpenStackManager.php
@@ -162,7 +162,6 @@
 $dir = __DIR__ . '/';
 
 $wgMessagesDirs['OpenStackManager'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['OpenStackManager'] = $dir . 
'OpenStackManager.i18n.php';
 $wgExtensionMessagesFiles['OpenStackManagerAlias'] = $dir . 
'OpenStackManager.alias.php';
 $wgAutoloadClasses['YamlContent'] = $dir . 'includes/YamlContent.php';
 $wgAutoloadClasses['YamlContentHandler'] = $dir . 
'includes/YamlContentHandler.php';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8bbb57843bf0a1790d75ab54bc45427e38bbb66a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: TemplatesOnThisPage: The second paramter in rawElement is at...

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: TemplatesOnThisPage: The second paramter in rawElement is 
attributes, not content
..


TemplatesOnThisPage: The second paramter in rawElement is attributes, not 
content

With proper typehinting this wouldn't have happened

Bug: T147789
Change-Id: I19ef9388acfd9159304b8141c54ce1ead27d0791
---
M includes/TemplatesOnThisPageFormatter.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/TemplatesOnThisPageFormatter.php 
b/includes/TemplatesOnThisPageFormatter.php
index c0ae374..494c7bf 100644
--- a/includes/TemplatesOnThisPageFormatter.php
+++ b/includes/TemplatesOnThisPageFormatter.php
@@ -93,11 +93,11 @@
}
 
if ( $more instanceof LinkTarget ) {
-   $outText .= Html::rawElement( 'li', 
$this->linkRenderer->makeLink(
+   $outText .= Html::rawElement( 'li', [], 
$this->linkRenderer->makeLink(
$more, $this->context->msg( 'moredotdotdot' 
)->text() ) );
} elseif ( $more ) {
// Documented as should already be escaped
-   $outText .= Html::rawElement( 'li', $more );
+   $outText .= Html::rawElement( 'li', [], $more );
}
 
$outText .= '';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19ef9388acfd9159304b8141c54ce1ead27d0791
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.UI: Document explicitly about deprecated .mw-ui-co...

2016-10-10 Thread VolkerE (Code Review)

VolkerE has uploaded a new change for review.

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

Change subject: mediawiki.UI: Document explicitly about deprecated 
.mw-ui-constructive
..

mediawiki.UI: Document explicitly about deprecated .mw-ui-constructive

Changing documentation in mediawiki.UI anchors about deprecated
`.mw-ui-constructive` class.

Bug: T146923
Change-Id: If3686c7c9c071fa708ae1deb82aa465a1f390175
---
M resources/src/mediawiki.ui/components/anchors.less
1 file changed, 11 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/97/315197/1

diff --git a/resources/src/mediawiki.ui/components/anchors.less 
b/resources/src/mediawiki.ui/components/anchors.less
index 5bb69b8..4c4e129 100644
--- a/resources/src/mediawiki.ui/components/anchors.less
+++ b/resources/src/mediawiki.ui/components/anchors.less
@@ -6,15 +6,14 @@
 .mixin-mw-ui-anchor-styles( @mainColor ) {
color: @mainColor;
 
-   // Hover state
&:hover {
color: lighten( @mainColor, @colorLightenPercentage );
}
-   // Focus and active states
+
&:focus,
&:active {
color: darken( @mainColor, @colorDarkenPercentage );
-   outline: none; // outline fix
+   outline: 0;
}
 
// Quiet mode is gray at first
@@ -26,13 +25,13 @@
 /*
 Anchors
 
-The anchor base type can be applied to A elements when a basic context styling 
needs to be given to a link, without
-having to assign it as a button type. mw-ui-anchor only changes the text 
color, and should not be used in combination
-with other base classes, such as mw-ui-button.
+The anchor base type can be applied to `a` elements when a basic context 
styling needs to be given to a link, without
+having to assign it as a button type. `.mw-ui-anchor` only changes the text 
color, and should not be used in combination
+with other base classes, such as `.mw-ui-button`.
+
 
 Markup:
 Progressive
-Constructive
 Destructive
 
 .mw-ui-quiet - Quiet until interaction.
@@ -46,13 +45,14 @@
.mixin-mw-ui-anchor-styles( @colorProgressive );
}
 
-   &.mw-ui-constructive {
-   .mixin-mw-ui-anchor-styles( @colorConstructive );
-   }
-
&.mw-ui-destructive {
.mixin-mw-ui-anchor-styles( @colorDestructive );
}
+
+   //`.mw-ui-constructive` is deprecated; consolidated with `progressive`, 
see T110555
+   &.mw-ui-constructive {
+   .mixin-mw-ui-anchor-styles( @colorConstructive );
+   }
 }
 
 /*

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

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

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Optimize batchPush on small lists

2016-10-10 Thread Divec (Code Review)

Divec has uploaded a new change for review.

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

Change subject: Optimize batchPush on small lists
..

Optimize batchPush on small lists

Doubles the speed of ve.batchPush( [], [ 1, 2, 3, 4, 5 ] ) on Chromium

Change-Id: I187381a3c5dfaed536f15195630365721728bb76
---
M src/ve.utils.js
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/96/315196/1

diff --git a/src/ve.utils.js b/src/ve.utils.js
index d59da58..013d85a 100644
--- a/src/ve.utils.js
+++ b/src/ve.utils.js
@@ -316,6 +316,10 @@
var length,
index = 0,
batchSize = 1024;
+   if ( batchSize >= data.length ) {
+   // Avoid slicing for small lists
+   return arr.push.apply( arr, data );
+   }
while ( index < data.length ) {
// Call arr.push( i0, i1, i2, ..., i1023 );
length = arr.push.apply(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I187381a3c5dfaed536f15195630365721728bb76
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.UI: Align .mw-ui-input appearance to design spec/O...

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: mediawiki.UI: Align .mw-ui-input appearance to design spec/OOjs 
UI
..


mediawiki.UI: Align .mw-ui-input appearance to design spec/OOjs UI

Aligning `.mw-ui-input` appearance to design specification
https://phabricator.wikimedia.org/M101 and implementation in OOjs UI.
Also improving `transition`, simplifying placeholder Less mixin and
adding W3C Selectors Level 4 `:placeholder-shown` pseudo-class.

Change-Id: I3e3299b3d8ff9b3ee58498e2e4dd2f2424ccde05
---
M resources/src/mediawiki.ui/components/inputs.less
1 file changed, 42 insertions(+), 18 deletions(-)

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



diff --git a/resources/src/mediawiki.ui/components/inputs.less 
b/resources/src/mediawiki.ui/components/inputs.less
index 90e769e..8bddb3a 100644
--- a/resources/src/mediawiki.ui/components/inputs.less
+++ b/resources/src/mediawiki.ui/components/inputs.less
@@ -4,11 +4,6 @@
 @import "mediawiki.ui/variables";
 @import "mediawiki.ui/mixins";
 
-// Placeholder text styling helper
-.field-placeholder-styling() {
-   font-style: italic;
-   font-weight: normal;
-}
 // Text inputs
 //
 // Apply the mw-ui-input class to input and textarea fields.
@@ -27,43 +22,72 @@
 //
 // Styleguide 1.1.
 .mw-ui-input {
+   background-color: #fff;
.box-sizing( border-box );
display: block;
width: 100%;
border: 1px solid @colorFieldBorder;
border-radius: @borderRadius;
padding: 0.3em 0.3em 0.3em 0.6em;
+   // necessary for smooth transition
+   box-shadow: inset 0 0 0 0.1em #fff;
font-family: inherit;
font-size: inherit;
line-height: inherit;
vertical-align: middle;
 
-   // Placeholder text styling must be set individually for each browser 
@winter
-   &::-webkit-input-placeholder { // webkit
-   .field-placeholder-styling;
+   // Normalize & style placeholder text, see T139034
+   // Placeholder styles can't be grouped, otherwise they're ignored as 
invalid.
+
+   // Placeholder mixin
+   .mixin-placeholder() {
+   color: @colorGray7;
+   font-style: italic;
}
-   &::-moz-placeholder { // FF 4-18
-   .field-placeholder-styling;
+   // Firefox 4-18
+   &:-moz-placeholder { // stylelint-disable-line selector-no-vendor-prefix
+   .mixin-placeholder;
+   opacity: 1;
}
-   &:-moz-placeholder { // FF >= 19
-   .field-placeholder-styling;
+   // Firefox 19-
+   &::-moz-placeholder { // stylelint-disable-line 
selector-no-vendor-prefix
+   .mixin-placeholder;
+   opacity: 1;
}
-   &:-ms-input-placeholder { // IE >= 10
-   .field-placeholder-styling;
+   // Internet Explorer 10-11
+   &:-ms-input-placeholder { // stylelint-disable-line 
selector-no-vendor-prefix
+   .mixin-placeholder;
+   }
+   // WebKit, Blink, Edge
+   // Don't set `opacity < 1`, see 
https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/3901363/
+   &::-webkit-input-placeholder { // stylelint-disable-line 
selector-no-vendor-prefix
+   .mixin-placeholder;
+   }
+   // W3C Standard Selectors Level 4
+   &:placeholder-shown {
+   .mixin-placeholder;
}
 
-   // Remove red outline from inputs which have required field and invalid 
content.
-   // This is a Firefox only issue
+   // Firefox: Remove red outline when `required` attribute set and 
invalid content.
// See https://developer.mozilla.org/en-US/docs/Web/CSS/:invalid
-   // This should be above :focus so focus behaviour takes preference
+   // This should come before `:focus` so latter rules take preference.
&:invalid {
box-shadow: none;
+   }
+
+   &:hover {
+   border-color: @colorGray7;
}
 
&:focus {
border-color: @colorProgressive;
box-shadow: inset 0 0 0 1px @colorProgressive;
outline: 0;
+   }
+
+   // `:not()` is used exclusively for `transition`s as both are not 
supported by IE < 9.
+   &:not( :disabled ) {
+   .transition( ~'color 100ms, border-color 100ms, box-shadow 
100ms' );
}
 
&:disabled {
@@ -76,7 +100,7 @@
// Correct the odd appearance in Chrome and Safari 5
-webkit-appearance: textfield;
 
-   // Remove proprietary clear button in IE 10-11
+   // Remove proprietary clear button in IE 10-11, Edge 12+
&::-ms-clear {
display: none;
}

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: CapsuleMultiselectWidget: Add placeholder option

2016-10-10 Thread Prtksxna (Code Review)

Prtksxna has uploaded a new change for review.

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

Change subject: CapsuleMultiselectWidget: Add placeholder option
..

CapsuleMultiselectWidget: Add placeholder option

Bug: T147813
Change-Id: If665d261ddba54b8b237c5c3080ecfdc05b14e11
---
M demos/pages/widgets.js
M src/widgets/CapsuleMultiselectWidget.js
2 files changed, 48 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/95/315195/1

diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 2ab84bb..b9d6b08 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -1370,6 +1370,25 @@
),
new OO.ui.FieldLayout(
new OO.ui.CapsuleMultiselectWidget( {
+   placeholder: 'Type like a 
cat...',
+   menu: {
+   items: [
+   new 
OO.ui.MenuOptionWidget( { data: 'abc', label: 'Label for abc' } ),
+   new 
OO.ui.MenuOptionWidget( { data: 'asd', label: 'Label for asd' } ),
+   new 
OO.ui.MenuOptionWidget( { data: 'jkl', label: 'Label for jkl' } ),
+   new 
OO.ui.MenuOptionWidget( { data: 'jjj', label: 'Label for jjj' } ),
+   new 
OO.ui.MenuOptionWidget( { data: 'zxc', label: 'Label for zxc' } ),
+   new 
OO.ui.MenuOptionWidget( { data: 'vbn', label: 'Label for vbn' } )
+   ]
+   }
+   } ),
+   {
+   label: 
'CapsuleMultiselectWidget (with placeholder)',
+   align: 'top'
+   }
+   ),
+   new OO.ui.FieldLayout(
+   new OO.ui.CapsuleMultiselectWidget( {
allowArbitrary: true,
icon: 'tag',
indicator: 'required',
diff --git a/src/widgets/CapsuleMultiselectWidget.js 
b/src/widgets/CapsuleMultiselectWidget.js
index 4a5b682..704103c 100644
--- a/src/widgets/CapsuleMultiselectWidget.js
+++ b/src/widgets/CapsuleMultiselectWidget.js
@@ -50,6 +50,7 @@
  *
  * @constructor
  * @param {Object} [config] Configuration options
+ * @cfg {string} [placeholder] Placeholder text
  * @cfg {boolean} [allowArbitrary=false] Allow data items to be added even if 
not present in the menu.
  * @cfg {Object} [menu] (required) Configuration options to pass to the
  *  {@link OO.ui.MenuSelectWidget menu select widget}.
@@ -76,8 +77,11 @@
}, config );
 
// Properties (must be set before mixin constructor calls)
-   this.$input = config.popup ? null : $( '' );
this.$handle = $( '' );
+   this.$input = config.popup ? null : $( '' );
+   if ( config.placeholder !== undefined && config.placeholder !== '' ) {
+   this.$input.attr( 'placeholder', config.placeholder );
+   }
 
// Mixin constructors
OO.ui.mixin.GroupElement.call( this, config );
@@ -153,7 +157,6 @@
role: 'combobox',
'aria-autocomplete': 'list'
} );
-   this.updateInputSize();
}
if ( config.data ) {
this.setItemsFromData( config.data );
@@ -172,6 +175,14 @@
this.$content.append( this.$input );
this.$overlay.append( this.menu.$element );
}
+
+   // Input size needs to be calculated after everything else is rendered
+   setTimeout( function () {
+   if ( this.$input ) {
+   this.updateInputSize();
+   }
+   } );
+
this.onMenuItemsChange();
 };
 
@@ -628,26 +639,40 @@
  * @param {jQuery.Event} e Event of some sort
  */
 OO.ui.CapsuleMultiselectWidget.prototype.updateInputSize = function () {
-   var $lastItem, direction, contentWidth, currentWidth, bestWidth;
+   var $lastItem, direction, contentWidth, currentWidth, bestWidth, 
movedPlaceholder;
if ( !this.isDisabled() ) {
this.$input.css( 'width', '1em' );
$lastItem = this.$group.children().last();
direction = OO.ui.Element.static.getDir( this.$handle );
+
+   //

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: objectcache: Fix test coverage

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: objectcache: Fix test coverage
..


objectcache: Fix test coverage

Follows-up 24200e88d2. This broke the test coverage build.

Change-Id: Ied93e8ce280accc842418069883ef60cd4e08441
---
M tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php 
b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
index f43a3f3..af5492f 100644
--- a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
+++ b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
@@ -252,7 +252,7 @@
 
/**
 * @dataProvider getMultiWithSetCallback_provider
-* @covers WANObjectCache::geMultitWithSetCallback()
+* @covers WANObjectCache::getMultitWithSetCallback()
 * @covers WANObjectCache::makeMultiKeys()
 * @param array $extOpts
 * @param bool $versioned

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Add different change tag to NWE edits

2016-10-10 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: Add different change tag to NWE edits
..

Add different change tag to NWE edits

Bug: T147587
Change-Id: If9b466ff8449ceeb0e71f9d36ea0b4ec8c1bae2d
---
M ApiVisualEditorEdit.php
M VisualEditor.hooks.php
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
M modules/ve-wmf/i18n/en.json
M modules/ve-wmf/i18n/qqq.json
5 files changed, 14 insertions(+), 3 deletions(-)


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

diff --git a/ApiVisualEditorEdit.php b/ApiVisualEditorEdit.php
index d7bee07..2e0b172 100644
--- a/ApiVisualEditorEdit.php
+++ b/ApiVisualEditorEdit.php
@@ -166,8 +166,12 @@
if ( $this->veConfig->get( 
'VisualEditorUseChangeTagging' ) ) {
// Defer till after the RC row is 
inserted
// @TODO: doEditContent should let 
callers specify desired tags
-   DeferredUpdates::addCallableUpdate( 
function() use ( $newRevId ) {
-   ChangeTags::addTags( 
'visualeditor', null, $newRevId, null );
+   $tag = 'visualeditor';
+   if ( isset( $params['mode'] ) && 
$params['mode'] === 'source' ) {
+   $tag = 
'visualeditor-newwikitext';
+   }
+   DeferredUpdates::addCallableUpdate( 
function() use ( $tag, $newRevId ) {
+   ChangeTags::addTags( $tag, 
null, $newRevId, null );
} );
}
} else {
@@ -263,6 +267,7 @@
'captchaid' => null,
'captchaword' => null,
'cachekey' => null,
+   'mode' => null,
];
}
 
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 242a2f8..966ae9d 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -663,6 +663,7 @@
$tags[] = 'visualeditor';
$tags[] = 'visualeditor-needcheck'; // No longer in active use
$tags[] = 'visualeditor-switched';
+   $tags[] = 'visualeditor-newwikitext';
return true;
}
 
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 545dba5..2892bbb 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -1419,6 +1419,7 @@
 
data = ve.extendObject( {}, options, {
action: 'visualeditoredit',
+   mode: this.mode,
page: this.pageName,
oldid: this.revid,
basetimestamp: this.baseTimeStamp,
diff --git a/modules/ve-wmf/i18n/en.json b/modules/ve-wmf/i18n/en.json
index ae7bb27..2116bb0 100644
--- a/modules/ve-wmf/i18n/en.json
+++ b/modules/ve-wmf/i18n/en.json
@@ -20,6 +20,8 @@
"tag-visualeditor-description": "Edit made using the 
[[{{MediaWiki:visualeditor-descriptionpagelink}}|visual editor]]",
"tag-visualeditor-needcheck": 
"[[{{MediaWiki:visualeditor-descriptionpagelink}}|Visual edit: Check]]",
"tag-visualeditor-needcheck-description": "Edit made using the 
[[{{MediaWiki:visualeditor-descriptionpagelink}}|visual editor]] where the 
system detected the wikitext possibly having unintended changes.",
+   "tag-visualeditor-newwikitext": "New source edit",
+   "tag-visualeditor-newwikitext-description": "Edit made using the 2017 
wikitext editor",
"tag-visualeditor-switched": 
"[[{{MediaWiki:visualeditor-descriptionpagelink}}|Visual edit: Switched]]",
"tag-visualeditor-switched-description": "User started to edit using 
the visual editor, then changed to the wikitext editor.",
"visualeditor-feedback-link": "Project:VisualEditor\/Feedback",
diff --git a/modules/ve-wmf/i18n/qqq.json b/modules/ve-wmf/i18n/qqq.json
index 5ed228f..9433d57 100644
--- a/modules/ve-wmf/i18n/qqq.json
+++ b/modules/ve-wmf/i18n/qqq.json
@@ -24,7 +24,9 @@
"tag-visualeditor": "Short description of the visualeditor 
tag.\n\nShown on lists of changes (history, recentchanges, etc.) for each edit 
made using VisualEditor.\n\nRefers to 
{{msg-mw|Visualeditor-descriptionpagelink}}.\n\nSee also:\n* 
{{msg-mw|Tag-visualeditor-needcheck}}\n{{Related|Tag-visualeditor}}\n{{Identical|VisualEditor}}",
"tag-visualeditor-description": "Long description of the visualeditor 
tag ({{msg-mw|Tag-visualeditor}}).\n\nShown on [[Special:Tags]].\n\nRefers to 
{{msg-mw|Visualeditor-descriptionpagelink}}.\n\nSee

[MediaWiki-commits] [Gerrit] performance/WebPageTest[master]: Collect and summarize devtools cpu time spent for Chrome

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Collect and summarize devtools cpu time spent for Chrome
..


Collect and summarize devtools cpu time spent for Chrome

If the timeline is configured to be collected (two tests for us
right now) then we will send the cpuTime (onLoad) and cpuTimeDoc
(document fully loaded) timings to statsv.

Bug: T145094
Change-Id: I561256271b1b65c33d3c966a6b4fb2c35970ad88
---
M lib/collectMetrics.js
A lib/cpuTime.js
M lib/reporter/statsv.js
3 files changed, 114 insertions(+), 16 deletions(-)

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



diff --git a/lib/collectMetrics.js b/lib/collectMetrics.js
index 8596df8..e4b7a37 100644
--- a/lib/collectMetrics.js
+++ b/lib/collectMetrics.js
@@ -7,6 +7,7 @@
 
 'use strict';
 
+const cpuTime = require('./cpuTime');
 
 module.exports = {
 /**
@@ -20,7 +21,8 @@
 var metricsToSend = {
 timings: {},
 requests: {},
-sizes: {}
+sizes: {},
+cpuTimes: {}
 };
 var namespace = argv.namespace;
 
@@ -54,31 +56,47 @@
 var keyStart = namespace + '.' + location + '.' + browser + 
'.' + view + '.';
 
 metricsToCollect.forEach(function(metric) {
-metricsToSend.timings[keyStart + metric] = 
wptJson.data.median[view][metric];
-});
+metricsToSend.timings[keyStart + metric] = 
wptJson.data.median[view][metric];
+});
+
+// you need to turn on timeline collecting and use Chrome for 
this to work
+if (argv.timeline) {
+const cpuTimes = 
cpuTime.sum(wptJson.data.median[view].cpuTimes);
+for (var time of Object.keys(cpuTimes)) {
+metricsToSend.cpuTimes[keyStart + 'cpuTimes.' + time] =
+cpuTimes[time];
+}
+const cpuTimesDoc = 
cpuTime.sum(wptJson.data.median[view].cpuTimesDoc);
+for (var cpuTimeDoc of Object.keys(cpuTimesDoc)) {
+metricsToSend.cpuTimes[keyStart + 'cpuTimesDoc.' + 
cpuTimeDoc] =
+cpuTimesDoc[cpuTimeDoc];
+}
+}
 
 if (wptJson.data.median[view].userTimes) {
 
Object.keys(wptJson.data.median[view].userTimes).forEach(function(userTiming) {
-metricsToSend.timings[keyStart + userTiming] =
-wptJson.data.median[view].userTimes[userTiming];
-});
+metricsToSend.timings[keyStart + userTiming] =
+wptJson.data.median[view].userTimes[userTiming];
+});
 } else {
 console.error('Missing user timing metrics for view ' + 
view);
 }
 
 // collect sizes & assets
 
Object.keys(wptJson.data.median[view].breakdown).forEach(function(assetType) {
-metricsToSend.requests[keyStart +
-assetType + '.requests'] = 
wptJson.data.median[view].breakdown[assetType].
-requests;
-metricsToSend.sizes[keyStart +
-assetType + '.bytes'] = 
wptJson.data.median[view].breakdown[assetType].bytes;
+metricsToSend.requests[keyStart +
+assetType + '.requests'] = 
wptJson.data.median[view].breakdown[assetType].
+requests;
+metricsToSend.sizes[keyStart +
+assetType + '.bytes'] =
+wptJson.data.median[view].breakdown[assetType].bytes;
 
-// Collect the total size, we need it for Opera Mini and UC 
Mini where the size
-// is not reported per type
-metricsToSend.sizes[keyStart + 'total.bytes'] = 
wptJson.data.median[view].bytesIn;
+// Collect the total size, we need it for Opera Mini and 
UC Mini where the size
+// is not reported per type
+metricsToSend.sizes[keyStart + 'total.bytes'] =
+wptJson.data.median[view].bytesIn;
 
-});
+});
 } else {
 // When we get a result error 8 from WebPageTest, the 
repeat view is left out
 // so then skip the data and log
diff --git a/lib/cpuTime.js b/lib/cpuTime.js
new file mode 100644
index 000..a01d8d8
--- /dev/null
+++ b/lib/cpuTime.js
@@ -0,0 +1,79 @@
+/**
+ * @fileoverview Summarize detvtools timeline metrics provided by WPT.
+ * @author Peter Hedenskog
+ * @copyright (c) 2016, Peter Hedenskog .
+ * Released under the Apache 2.0 License.
+ */
+
+'use strict';
+
+
+// The list comes from WebPageTest and is

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: objectcache: Fix test coverage

2016-10-10 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: objectcache: Fix test coverage
..

objectcache: Fix test coverage

Follows-up 24200e88d2. This broke the test coverage build.

Change-Id: Ied93e8ce280accc842418069883ef60cd4e08441
---
M tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/93/315193/1

diff --git a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php 
b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
index f43a3f3..af5492f 100644
--- a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
+++ b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
@@ -252,7 +252,7 @@
 
/**
 * @dataProvider getMultiWithSetCallback_provider
-* @covers WANObjectCache::geMultitWithSetCallback()
+* @covers WANObjectCache::getMultitWithSetCallback()
 * @covers WANObjectCache::makeMultiKeys()
 * @param array $extOpts
 * @param bool $versioned

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Fix detection of headings in NWE format menu

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Fix detection of headings in NWE format menu
..


Fix detection of headings in NWE format menu

Use regex to include match any character after '='.

Bug: T147585
Change-Id: I8bedf497613506a676eca465d3bc7bc5fe67
---
M modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
1 file changed, 3 insertions(+), 5 deletions(-)

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



diff --git a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js 
b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
index 316facd..2a2be95 100644
--- a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
+++ b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
@@ -28,7 +28,7 @@
  * @inheritdoc
  */
 ve.dm.MWWikitextSurfaceFragment.prototype.hasMatchingAncestor = function ( 
type, attributes ) {
-   var i, len, text, command,
+   var i, len, text,
nodes = this.getSelectedLeafNodes(),
all = !!nodes.length;
 
@@ -48,10 +48,8 @@
all = text.slice( 0, 12 ) === '';
break;
case 'mwHeading':
-   command = ve.ui.wikitextCommandRegistry.lookup( 
'heading' + attributes.level );
-   if ( text.indexOf( command.args[ 0 ] ) !== 0 || 
text.indexOf( command.args[ 1 ] ) !== text.length - command.args[ 1 ].length ) {
-   all = false;
-   }
+   all = text.match( new RegExp( '^={' + 
attributes.level + '}[^=]' ) ) &&
+   text.match( new RegExp( '[^=]={' + 
attributes.level + '}$' ) );
break;
default:
all = false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8bedf497613506a676eca465d3bc7bc5fe67
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Remove 2004 example from spec.yaml

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Remove 2004 example from spec.yaml
..


Remove 2004 example from spec.yaml

This was added for an endpoint check but is causing logged errors.

Take it out while we find a better solution.

Bug: T147619
Change-Id: Iaf2a0ce5f974f79874be1d356eca202e5e7d4dc9
---
M spec.yaml
1 file changed, 0 insertions(+), 11 deletions(-)

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



diff --git a/spec.yaml b/spec.yaml
index 3f108ea..1520400 100644
--- a/spec.yaml
+++ b/spec.yaml
@@ -170,17 +170,6 @@
 source: /.+/
 width: /.+/
 height: /.+/
-- title: retrieve featured image data for date with no featured image 
(with aggregated=true)
-  request:
-params:
-  : "2004"
-  mm: "04"
-  dd: "29"
-query:
-  aggregated: true
-  response:
-status: 200
-body: ""
   # from routes/most-read.js
   /{domain}/v1/page/most-read/{}/{mm}/{dd}:
 get:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf2a0ce5f974f79874be1d356eca202e5e7d4dc9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Jhernandez 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Password reset link is shown when no reset options are avail...

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Password reset link is shown when no reset options are available
..


Password reset link is shown when no reset options are available

Bug: T144705
Change-Id: I7d6b563e32039e7313121de9629f02ad4f02d351
---
M includes/specialpage/LoginSignupSpecialPage.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/specialpage/LoginSignupSpecialPage.php 
b/includes/specialpage/LoginSignupSpecialPage.php
index bf83e7b..275e121 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -1070,7 +1070,7 @@
}
if ( !$this->isSignup() && $this->showExtraInformation() ) {
$passwordReset = new PasswordReset( $this->getConfig(), 
AuthManager::singleton() );
-   if ( $passwordReset->isAllowed( $this->getUser() ) ) {
+   if ( $passwordReset->isAllowed( $this->getUser() 
)->isGood() ) {
$fieldDefinitions['passwordReset'] = [
'type' => 'info',
'raw' => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d6b563e32039e7313121de9629f02ad4f02d351
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Huji 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Add links/buttons for adding features/managing (editing) pro...

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Add links/buttons for adding features/managing (editing) project
..


Add links/buttons for adding features/managing (editing) project

Also add some comments, styling, etc.

bug: I can't find a bug for this.
Change-Id: I0511420372a363a6c9e9e6fde2d1b3b2185b2981
---
M CollaborationKit.hooks.php
M i18n/en.json
M i18n/qqq.json
M includes/content/CollaborationHubContent.php
M modules/ext.CollaborationKit.hub.styles.less
M modules/ext.CollaborationKit.mixins.less
6 files changed, 69 insertions(+), 4 deletions(-)

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



diff --git a/CollaborationKit.hooks.php b/CollaborationKit.hooks.php
index 9191d31..e2d439e 100644
--- a/CollaborationKit.hooks.php
+++ b/CollaborationKit.hooks.php
@@ -4,7 +4,7 @@
 class CollaborationKitHooks {
 
/**
-* Override the Edit tab for for CollaborationHub pages; stolen from 
massmessage
+* Some extra tabs for editing
 * @param &$sktemplate SkinTemplate
 * @param &$links array
 * @return bool
@@ -14,6 +14,7 @@
$request = $sktemplate->getRequest();
if ( isset( $links['views']['edit'] ) ) {
if ( $title->hasContentModel( 
'CollaborationListContent' ) ) {
+   // Edit as JSON
$active = in_array( $request->getVal( 'action' 
), [ 'edit', 'submit' ] )
&& $request->getVal( 'format' ) === 
'application/json';
$links['actions']['editasjson'] = [
@@ -28,11 +29,23 @@
// Make it not be selected when editing 
json.
$links['views']['edit']['class'] = 
false;
}
+   } elseif ( $title->hasContentModel( 
'CollaborationHubContent' ) ) {
+   // Add feature
+   $links['actions']['addnewfeature'] = [
+   'class' => '',
+   'href' => SpecialPage::getTitleFor( 
'CreateHubFeature' )->getFullUrl( [ 'collaborationhub' => $title->getFullText() 
] ),
+   'text' => wfMessage( 
'collaborationkit-hub-addpage' )->text()
+   ];
}
}
return true;
}
 
+   /**
+* TODO DOCUMENT I'M SURE THIS IS IMPORTANT, BUT I HAVE NO IDEA WHY OR 
WHAT FOR
+*
+* @param $parser Parser
+*/
public static function onParserFirstCallInit( $parser ) {
$parser->setFunctionHook( 'transcludelist', 
'CollaborationListContent::transcludeHook' );
// Hack for transclusion.
diff --git a/i18n/en.json b/i18n/en.json
index 4d5d4b6..22e18d9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -75,6 +75,8 @@
"collaborationkit-hub-edit-apierror": "API edit error: $1",
"collaborationkit-hub-edit-tojsonerror": "Error converting to JSON",
"collaborationkit-hub-toc-label": "Project contents",
+   "collaborationkit-hub-addpage": "Add feature",
+   "collaborationkit-hub-manage": "Manage project",
"collaborationkit-subpage-toc-label": "Part of a project:",
"collaborationkit-red1": "Dark red",
"collaborationkit-red2": "Red",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e641a8a..a83df17 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -75,6 +75,8 @@
"collaborationkit-hub-edit-apierror": "Error message for API edit 
error",
"collaborationkit-hub-edit-tojsonerror": "Error message when something 
went wrong converting to JSON",
"collaborationkit-hub-toc-label": "Label for the toc on a Collaboration 
Hub mainpage",
+   "collaborationkit-hub-addpage": "Label for button/link to add a new 
subpage/feature to a Collaboration Hub",
+   "collaborationkit-hub-manage": "Label for extra button/link to edit 
Collaboration Hub",
"collaborationkit-subpage-toc-label": "Label for the toc on a 
Collaboration Hub subpage",
"collaborationkit-red1": "Color label",
"collaborationkit-red2": "Color label",
diff --git a/includes/content/CollaborationHubContent.php 
b/includes/content/CollaborationHubContent.php
index cbadc7b..91fa4a5 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -258,6 +258,11 @@
[ 'class' => 'wp-footer' ],
$this->getParsedFooter( $title, $options )
);
+   $html .= Html::rawElement(
+   'div',
+   [ 'class' => 'wp-footeractions' ],
+   $this->getSecondFooter( $title )
+

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Add links/buttons for adding features/managing (editing) pro...

2016-10-10 Thread Isarra (Code Review)

Isarra has uploaded a new change for review.

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

Change subject: Add links/buttons for adding features/managing (editing) project
..

Add links/buttons for adding features/managing (editing) project

Also add some comments, styling, etc.

bug: I can't find a bug for this.
Change-Id: I0511420372a363a6c9e9e6fde2d1b3b2185b2981
---
M CollaborationKit.hooks.php
M i18n/en.json
M i18n/qqq.json
M includes/content/CollaborationHubContent.php
M modules/ext.CollaborationKit.hub.styles.less
M modules/ext.CollaborationKit.mixins.less
6 files changed, 69 insertions(+), 4 deletions(-)


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

diff --git a/CollaborationKit.hooks.php b/CollaborationKit.hooks.php
index 9191d31..e2d439e 100644
--- a/CollaborationKit.hooks.php
+++ b/CollaborationKit.hooks.php
@@ -4,7 +4,7 @@
 class CollaborationKitHooks {
 
/**
-* Override the Edit tab for for CollaborationHub pages; stolen from 
massmessage
+* Some extra tabs for editing
 * @param &$sktemplate SkinTemplate
 * @param &$links array
 * @return bool
@@ -14,6 +14,7 @@
$request = $sktemplate->getRequest();
if ( isset( $links['views']['edit'] ) ) {
if ( $title->hasContentModel( 
'CollaborationListContent' ) ) {
+   // Edit as JSON
$active = in_array( $request->getVal( 'action' 
), [ 'edit', 'submit' ] )
&& $request->getVal( 'format' ) === 
'application/json';
$links['actions']['editasjson'] = [
@@ -28,11 +29,23 @@
// Make it not be selected when editing 
json.
$links['views']['edit']['class'] = 
false;
}
+   } elseif ( $title->hasContentModel( 
'CollaborationHubContent' ) ) {
+   // Add feature
+   $links['actions']['addnewfeature'] = [
+   'class' => '',
+   'href' => SpecialPage::getTitleFor( 
'CreateHubFeature' )->getFullUrl( [ 'collaborationhub' => $title->getFullText() 
] ),
+   'text' => wfMessage( 
'collaborationkit-hub-addpage' )->text()
+   ];
}
}
return true;
}
 
+   /**
+* TODO DOCUMENT I'M SURE THIS IS IMPORTANT, BUT I HAVE NO IDEA WHY OR 
WHAT FOR
+*
+* @param $parser Parser
+*/
public static function onParserFirstCallInit( $parser ) {
$parser->setFunctionHook( 'transcludelist', 
'CollaborationListContent::transcludeHook' );
// Hack for transclusion.
diff --git a/i18n/en.json b/i18n/en.json
index 4d5d4b6..22e18d9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -75,6 +75,8 @@
"collaborationkit-hub-edit-apierror": "API edit error: $1",
"collaborationkit-hub-edit-tojsonerror": "Error converting to JSON",
"collaborationkit-hub-toc-label": "Project contents",
+   "collaborationkit-hub-addpage": "Add feature",
+   "collaborationkit-hub-manage": "Manage project",
"collaborationkit-subpage-toc-label": "Part of a project:",
"collaborationkit-red1": "Dark red",
"collaborationkit-red2": "Red",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e641a8a..a83df17 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -75,6 +75,8 @@
"collaborationkit-hub-edit-apierror": "Error message for API edit 
error",
"collaborationkit-hub-edit-tojsonerror": "Error message when something 
went wrong converting to JSON",
"collaborationkit-hub-toc-label": "Label for the toc on a Collaboration 
Hub mainpage",
+   "collaborationkit-hub-addpage": "Label for button/link to add a new 
subpage/feature to a Collaboration Hub",
+   "collaborationkit-hub-manage": "Label for extra button/link to edit 
Collaboration Hub",
"collaborationkit-subpage-toc-label": "Label for the toc on a 
Collaboration Hub subpage",
"collaborationkit-red1": "Color label",
"collaborationkit-red2": "Color label",
diff --git a/includes/content/CollaborationHubContent.php 
b/includes/content/CollaborationHubContent.php
index cbadc7b..91fa4a5 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -258,6 +258,11 @@
[ 'class' => 'wp-footer' ],
$this->getParsedFooter( $title, $options )
);
+   $html .= Html::rawElement(
+   'div',
+   [ 'class' => 'wp-footeractions' ],
+

[MediaWiki-commits] [Gerrit] mediawiki...OpenStackManager[master]: Move functions into hooks file

2016-10-10 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Move functions into hooks file
..

Move functions into hooks file

Change-Id: I118cede6b12b1323292f2041cda72ab4c7474a85
---
M OpenStackManager.php
M OpenStackManagerHooks.php
2 files changed, 107 insertions(+), 107 deletions(-)


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

diff --git a/OpenStackManager.php b/OpenStackManager.php
index 5cd0515..e1c4ab6 100644
--- a/OpenStackManager.php
+++ b/OpenStackManager.php
@@ -314,35 +314,11 @@
 $wgAPIListModules['novainstances'] = 'ApiListNovaInstances';
 
 # Schema changes
-$wgHooks['LoadExtensionSchemaUpdates'][] = 'efOpenStackSchemaUpdates';
-
-/**
- * @param $updater DatabaseUpdater
- * @return bool
- */
-function efOpenStackSchemaUpdates( $updater ) {
-   $base = dirname( __FILE__ );
-   switch ( $updater->getDB()->getType() ) {
-   case 'mysql':
-   $updater->addExtensionTable( 'openstack_puppet_groups', 
"$base/openstack.sql" );
-   $updater->addExtensionTable( 'openstack_puppet_classes', 
"$base/openstack.sql" );
-   $updater->addExtensionTable( 'openstack_tokens', 
"$base/schema-changes/tokens.sql" );
-   $updater->addExtensionTable( 'openstack_notification_event', 
"$base/schema-changes/openstack_add_notification_events_table.sql" );
-   $updater->addExtensionUpdate( array( 'addField', 
'openstack_puppet_groups', 'group_project', 
"$base/schema-changes/openstack_project_field.sql", true ) );
-   $updater->addExtensionUpdate( array( 'addField', 
'openstack_puppet_groups', 'group_is_global', 
"$base/schema-changes/openstack_group_is_global_field.sql", true ) );
-   $updater->addExtensionUpdate( array( 'dropField', 
'openstack_puppet_groups', 'group_position', 
"$base/schema-changes/openstack_drop_positions.sql", true ) );
-   $updater->addExtensionUpdate( array( 'dropField', 
'openstack_puppet_classes', 'class_position', 
"$base/schema-changes/openstack_drop_positions.sql", true ) );
-   $updater->addExtensionUpdate( array( 'addIndex', 
'openstack_puppet_classes', 'class_name', 
"$base/schema-changes/openstack_add_name_indexes.sql", true ) );
-   $updater->addExtensionUpdate( array( 'addIndex', 
'openstack_puppet_classes', 'class_group_id', 
"$base/schema-changes/openstack_add_name_indexes.sql", true ) );
-   $updater->addExtensionUpdate( array( 'modifyField', 
'openstack_tokens', 'token', 
"$base/schema-changes/openstack_change_token_size.sql", true ) );
-   break;
-   }
-   return true;
-}
+$wgHooks['LoadExtensionSchemaUpdates'][] = 
'OpenStackManagerHooks::onOpenStackSchemaUpdates';
 
 # Echo integration
-$wgHooks['BeforeCreateEchoEvent'][] = 'efOpenStackOnBeforeCreateEchoEvent';
-$wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'efOpenStackGetDefaultNotifiedUsers';
+$wgHooks['BeforeCreateEchoEvent'][] = 
'OpenStackManagerHooks::onOpenStackOnBeforeCreateEchoEvent';
+$wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'OpenStackManagerHooks::onOpenStackGetDefaultNotifiedUsers';
 $wgDefaultUserOptions['echo-subscriptions-web-osm-instance-build-completed'] = 
true;
 $wgDefaultUserOptions['echo-subscriptions-email-osm-instance-build-completed'] 
= true;
 $wgDefaultUserOptions['echo-subscriptions-web-osm-instance-reboot-completed'] 
= true;
@@ -351,83 +327,4 @@
 $wgDefaultUserOptions['echo-subscriptions-web-osm-projectmembers-add'] = true;
 $wgDefaultUserOptions['echo-subscriptions-email-osm-projectmembers-add'] = 
true;
 
-/**
- * Add OSM events to Echo.
- *
- * @param array $notifications Echo notifications
- * @param array $notificationCategories Echo notification categories
- */
-function efOpenStackOnBeforeCreateEchoEvent(
-   &$notifications, &$notificationCategories
-) {
-   $notifications['osm-instance-build-completed'] = array(
-   'presentation-model' => 'EchoOpenStackManagerPresentationModel',
-   'category' => 'osm-instance-build-completed',
-   'section' => 'message',
-   );
-
-   $notifications['osm-instance-reboot-completed'] = array(
-   'presentation-model' => 'EchoOpenStackManagerPresentationModel',
-   'category' => 'osm-instance-reboot-completed',
-   'section' => 'message',
-   );
-
-   $notifications['osm-instance-deleted'] = array(
-   'presentation-model' => 'EchoOpenStackManagerPresentationModel',
-   'category' => 'osm-instance-deleted',
-   'section' => 'message',
-   );
-
-   $notifications['osm-projectmembers-add'] = array(
-   'presentation-model' => 'EchoOpenStackManagerPresentationModel',
-   'category' => 'osm-projectmembers-add',
-   'section' => 'message',
-   );
-

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add upload_by_url right to Commons bots

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Add upload_by_url right to Commons bots
..


Add upload_by_url right to Commons bots

This patch adds the upload_by_url right to Commons
bots so as to allow uploading files from domains
whitelisted in the wgCopyUploadsDomains array.

Please note that this array only includes known
safe sources so there is no reason why already
trusted and community-approved bots should not be
allowed to mass-upload files from these domains.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index bef9b1b..4bf4dd3 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7679,6 +7679,7 @@
],
'bot' => [
'changetags' => true, // T134196
+   'upload_by_url' => true, // T145010
]
],
'dawiki' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifef405c085c4abfb11c33869ea813a48db561806
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Odder 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Odder 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Fix 'massmessage-sender' group for ur.wikipedia

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Fix 'massmessage-sender' group for ur.wikipedia
..


Fix 'massmessage-sender' group for ur.wikipedia

Bug: T147743
Change-Id: If92903126ab5d08fe24a7aec2dca2853f28f62e7
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 4cee04a..bef9b1b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10440,7 +10440,7 @@
],
'+urwiki' => [
'bureaucrat' => [ 'import', 'confirmed', 'abusefilter', 
'rollbacker', 'massmessage-sender'], // T44737, T47643 and T144701
-   'sysop' => [ 'confirmed', 'interface-editor', 'accountcreator', 
'filemover', 'autopatrolled', 'masssmessage-sender' ], // T44737, T120348, 
T137888, T139302 and T144701
+   'sysop' => [ 'confirmed', 'interface-editor', 'accountcreator', 
'filemover', 'autopatrolled', 'massmessage-sender' ], // T44737, T120348, 
T137888, T139302 and T144701
],
'+viwiki' => [
'sysop' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If92903126ab5d08fe24a7aec2dca2853f28f62e7
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Lingo[master]: Replace ArticleSave hook usage

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Replace ArticleSave hook usage
..


Replace ArticleSave hook usage

Bug: T147390
Change-Id: Ia38aad7fda8d1401d31266bfbd0fdd95231f5a06
---
M src/BasicBackend.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src/BasicBackend.php b/src/BasicBackend.php
index d011845..da46e45 100644
--- a/src/BasicBackend.php
+++ b/src/BasicBackend.php
@@ -60,7 +60,7 @@
 
protected function registerHooks() {
Hooks::register( 'ArticlePurge', array( $this, 'purgeCache' ) );
-   Hooks::register( 'ArticleSave', array( $this, 'purgeCache' ) );
+   Hooks::register( 'PageContentSave', array( $this, 'purgeCache' 
) );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia38aad7fda8d1401d31266bfbd0fdd95231f5a06
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Lingo
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Foxtrott 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add 'message-format' log channel

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Add 'message-format' log channel
..


Add 'message-format' log channel

Logging is added in Id51cf6a5a937bc41a914f317e980ef42e4d385fb.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 4a53047..4cee04a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4562,6 +4562,7 @@
'MassMessage' => 'debug', // for 59464 -legoktm 2013/12/15
'Math' => 'info',  // mobrovac for T121445
'memcached' => 'error', // -aaron 2012/10/24
+   'message-format' => [ 'logstash' => 'warning' ],
'mobile' => 'debug',
'NewUserMessage' => 'debug',
'oai' => 'debug',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4914814c9f9716289ecb5a7d205bf5ff95be64fe
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Add doc block and re-order curUserIsInList()

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Add doc block and re-order curUserIsInList()
..


Add doc block and re-order curUserIsInList()

Change-Id: I82fc2460146511d50d547765a3247632c2389040
---
M modules/ext.CollaborationKit.list.edit.js
1 file changed, 16 insertions(+), 11 deletions(-)

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



diff --git a/modules/ext.CollaborationKit.list.edit.js 
b/modules/ext.CollaborationKit.list.edit.js
index f7f2d8b..593fe17 100644
--- a/modules/ext.CollaborationKit.list.edit.js
+++ b/modules/ext.CollaborationKit.list.edit.js
@@ -18,6 +18,22 @@
windowManager.openWindow( dialog );
};
 
+   /**
+* Find if the current user is already is in list.
+*
+* @return {boolean}
+*/
+   curUserIsInList = function curUserIsInList() {
+   var titleObj, escapedText;
+   titleObj = mw.Title.newFromText( mw.config.get( 'wgUserName' ), 
2 );
+   escapedText = titleObj.getPrefixedText();
+   escapedText = escapedText.replace( /\\/g, '' );
+   escapedText = escapedText.replace( /"/g, '\\"' );
+   query = '.mw-collabkit-list-item[data-collabkit-item-title="' +
+   escapedText + '"]';
+   return $( query ).length > 0;
+   };
+
modifyExistingItem = function ( itemName ) {
getCurrentJson( mw.config.get( 'wgArticleId' ), function ( res 
) {
var done = false;
@@ -582,16 +598,5 @@
}
 
} );
-
-   curUserIsInList = function curUserIsInList() {
-   var titleObj, escapedText;
-   titleObj = mw.Title.newFromText( mw.config.get( 'wgUserName' ), 
2 );
-   escapedText = titleObj.getPrefixedText();
-   escapedText = escapedText.replace( /\\/g, '' );
-   escapedText = escapedText.replace( /"/g, '\\"' );
-   query = '.mw-collabkit-list-item[data-collabkit-item-title="' +
-   escapedText + '"]';
-   return $( query ).length > 0;
-   };
 
 } )( jQuery, mediaWiki, OO );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I82fc2460146511d50d547765a3247632c2389040
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...OpenStackManager[master]: Remove i18n shim

2016-10-10 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Remove i18n shim
..

Remove i18n shim

Change-Id: I8bbb57843bf0a1790d75ab54bc45427e38bbb66a
---
D OpenStackManager.i18n.php
M OpenStackManager.php
2 files changed, 0 insertions(+), 36 deletions(-)


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

diff --git a/OpenStackManager.i18n.php b/OpenStackManager.i18n.php
deleted file mode 100644
index 64c40a7..000
--- a/OpenStackManager.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim9a102be1d019a927' ) ) {
-   function wfJsonI18nShim9a102be1d019a927( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim9a102be1d019a927';
-}
diff --git a/OpenStackManager.php b/OpenStackManager.php
index 5cd0515..d37c4c2 100644
--- a/OpenStackManager.php
+++ b/OpenStackManager.php
@@ -162,7 +162,6 @@
 $dir = __DIR__ . '/';
 
 $wgMessagesDirs['OpenStackManager'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['OpenStackManager'] = $dir . 
'OpenStackManager.i18n.php';
 $wgExtensionMessagesFiles['OpenStackManagerAlias'] = $dir . 
'OpenStackManager.alias.php';
 $wgAutoloadClasses['YamlContent'] = $dir . 'includes/YamlContent.php';
 $wgAutoloadClasses['YamlContentHandler'] = $dir . 
'includes/YamlContentHandler.php';

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Add doc block and re-order curUserIsInList()

2016-10-10 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Add doc block and re-order curUserIsInList()
..

Add doc block and re-order curUserIsInList()

Change-Id: I82fc2460146511d50d547765a3247632c2389040
---
M modules/ext.CollaborationKit.list.edit.js
1 file changed, 16 insertions(+), 11 deletions(-)


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

diff --git a/modules/ext.CollaborationKit.list.edit.js 
b/modules/ext.CollaborationKit.list.edit.js
index f7f2d8b..593fe17 100644
--- a/modules/ext.CollaborationKit.list.edit.js
+++ b/modules/ext.CollaborationKit.list.edit.js
@@ -18,6 +18,22 @@
windowManager.openWindow( dialog );
};
 
+   /**
+* Find if the current user is already is in list.
+*
+* @return {boolean}
+*/
+   curUserIsInList = function curUserIsInList() {
+   var titleObj, escapedText;
+   titleObj = mw.Title.newFromText( mw.config.get( 'wgUserName' ), 
2 );
+   escapedText = titleObj.getPrefixedText();
+   escapedText = escapedText.replace( /\\/g, '' );
+   escapedText = escapedText.replace( /"/g, '\\"' );
+   query = '.mw-collabkit-list-item[data-collabkit-item-title="' +
+   escapedText + '"]';
+   return $( query ).length > 0;
+   };
+
modifyExistingItem = function ( itemName ) {
getCurrentJson( mw.config.get( 'wgArticleId' ), function ( res 
) {
var done = false;
@@ -582,16 +598,5 @@
}
 
} );
-
-   curUserIsInList = function curUserIsInList() {
-   var titleObj, escapedText;
-   titleObj = mw.Title.newFromText( mw.config.get( 'wgUserName' ), 
2 );
-   escapedText = titleObj.getPrefixedText();
-   escapedText = escapedText.replace( /\\/g, '' );
-   escapedText = escapedText.replace( /"/g, '\\"' );
-   query = '.mw-collabkit-list-item[data-collabkit-item-title="' +
-   escapedText + '"]';
-   return $( query ).length > 0;
-   };
 
 } )( jQuery, mediaWiki, OO );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82fc2460146511d50d547765a3247632c2389040
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: wfLoadExtension for many more extensions

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: wfLoadExtension for many more extensions
..


wfLoadExtension for many more extensions

No $wmg/$wg changes

Bug: T140852
Change-Id: I90178de849c29768e367b5980e3de5895fa4db24
---
M wmf-config/CommonSettings.php
1 file changed, 28 insertions(+), 28 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d81c25e..eab0dd1 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1008,7 +1008,7 @@
 }
 
 if ( $wmgUseSecurePoll ) {
-   include( $IP . '/extensions/SecurePoll/SecurePoll.php' );
+   wfLoadExtension( 'SecurePoll' );
 
$wgSecurePollUseNamespace = $wmgSecurePollUseNamespace;
$wgSecurePollScript = 'auth-api.php';
@@ -1029,7 +1029,7 @@
 }
 
 if ( $wmgUseScore ) {
-   include( "$IP/extensions/Score/Score.php" );
+   wfLoadExtension( 'Score' );
$wgScoreFileBackend = $wmgScoreFileBackend;
$wgScorePath = $wmgScorePath;
 }
@@ -1306,7 +1306,7 @@
 
 // CentralAuth
 if ( $wmgUseCentralAuth ) {
-   include "$IP/extensions/CentralAuth/CentralAuth.php";
+   wfLoadExtension( 'CentralAuth' );
 
$wgCentralAuthDryRun = false;
$wgGroupPermissions['steward']['centralauth-rename'] = true;
@@ -1754,7 +1754,7 @@
 require( "$wmfConfigDir/throttle.php" );
 
 if ( $wmgUseNewUserMessage ) {
-   include "$IP/extensions/NewUserMessage/NewUserMessage.php";
+   wfLoadExtension( 'NewUserMessage' );
$wgNewUserSuppressRC = true;
$wgNewUserMinorEdit = $wmgNewUserMinorEdit;
$wgNewUserMessageOnAutoCreate = $wmgNewUserMessageOnAutoCreate;
@@ -1779,7 +1779,7 @@
 }
 
 # AbuseFilter
-include "$IP/extensions/AbuseFilter/AbuseFilter.php";
+wfLoadExtension( 'AbuseFilter' );
 include( "$wmfConfigDir/abusefilter.php" );
 $wgAbuseFilterEmergencyDisableThreshold = 
$wmgAbuseFilterEmergencyDisableThreshold;
 $wgAbuseFilterEmergencyDisableCount = $wmgAbuseFilterEmergencyDisableCount;
@@ -1893,7 +1893,7 @@
 }
 
 if ( $wmgUseMassMessage ) {
-   require_once( "$IP/extensions/MassMessage/MassMessage.php" );
+   wfLoadExtension( 'MassMessage' );
$wgNamespacesToPostIn = $wmgNamespacesToPostIn;
$wgAllowGlobalMessaging = $wmgAllowGlobalMessaging;
 }
@@ -1903,7 +1903,7 @@
 }
 
 if ( $wmgUseUploadWizard ) {
-   require_once( "$IP/extensions/UploadWizard/UploadWizard.php" );
+   wfLoadExtension( 'UploadWizard' );
$wgUploadStashScalerBaseUrl = 
"//{$wmfHostnames['upload']}/$site/$lang/thumb/temp";
$wgUploadWizardConfig = [
# 'debug' => true,
@@ -2056,7 +2056,7 @@
 }
 
 if ( $wmgUseMultimediaViewer ) {
-   require_once( "$IP/extensions/MultimediaViewer/MultimediaViewer.php" );
+   wfLoadExtension( 'MultimediaViewer' );
$wgMediaViewerNetworkPerformanceSamplingFactor = 
$wmgMediaViewerNetworkPerformanceSamplingFactor;
$wgMediaViewerDurationLoggingSamplingFactor = 
$wmgMediaViewerDurationLoggingSamplingFactor;
$wgMediaViewerAttributionLoggingSamplingFactor = 
$wmgMediaViewerAttributionLoggingSamplingFactor;
@@ -2077,7 +2077,7 @@
 }
 
 if ( $wmgUsePopups || ( $wmgPopupsBetaFeature && $wmgUseBetaFeatures ) ) {
-   require_once( "$IP/extensions/Popups/Popups.php" );
+   wfLoadExtension( 'Popups' );
 
// Make sure we don't enable as a beta feature if we are set to be 
enabled by default.
$wgPopupsBetaFeature = $wmgPopupsBetaFeature && !$wmgUsePopups;
@@ -2195,7 +2195,7 @@
}
 
// Citoid
-   require_once "$IP/extensions/Citoid/Citoid.php";
+   wfLoadExtension( 'Citoid' );
$wgCitoidServiceUrl = 'https://citoid.wikimedia.org/api';
 
// Move the citation button from the primary toolbar into the "other" 
group
@@ -2212,7 +2212,7 @@
 }
 
 if ( $wmgUseGoogleNewsSitemap ) {
-   include( "$IP/extensions/GoogleNewsSitemap/GoogleNewsSitemap.php" );
+   wfLoadExtension( 'GoogleNewsSitemap' );
$wgGNSMfallbackCategory = $wmgGNSMfallbackCategory;
$wgGNSMcommentNamespace = $wmgGNSMcommentNamespace;
 }
@@ -2253,7 +2253,7 @@
 }
 
 if ( $wmgUseMoodBar ) {
-   require_once( "$IP/extensions/MoodBar/MoodBar.php" );
+   wfLoadExtension( 'MoodBar' );
$wgMoodBarCutoffTime = $wmgMoodBarCutoffTime;
$wgMoodBarBlackoutInterval = [ '2012061400,2012062900' ];
$wgMoodBarConfig['privacyUrl'] = 
"//wikimediafoundation.org/wiki/Feedback_policy";
@@ -2273,7 +2273,7 @@
 
 # MUST be after MobileFrontend initialization
 if ( $wmgEnableTextExtracts ) {
-   require_once( "$IP/extensions/TextExtracts/TextExtracts.php" );
+   wfLoadExtension( 'TextExtracts' );
if ( isset( $wgExtractsRemoveClasses ) ) {
// Back-compat for pre-extension.json
$wgExtractsRemoveClasses =

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

2016-10-10 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Replace ArticleSaveComplete hook usage
..

Replace ArticleSaveComplete hook usage

Bug: T147390
Change-Id: I6339a5f928f268c8a5219b996110955208c84659
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/InterwikiIntegration 
refs/changes/88/315188/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6339a5f928f268c8a5219b996110955208c84659
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InterwikiIntegration
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove spurious transcoding-labs.org usage

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Remove spurious transcoding-labs.org usage
..


Remove spurious transcoding-labs.org usage

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

Approvals:
  Reedy: Looks good to me, approved
  Alex Monk: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 3b68adb..d81c25e 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1581,10 +1581,6 @@
break;
 }
 
-if ( $wmfRealm == 'labs' && file_exists( '/etc/wikimedia-transcoding' ) ) {
-   require( "$wmfConfigDir/transcoding-labs.org" );
-}
-
 // Banner notice system
 if ( $wmgUseCentralNotice ) {
wfLoadExtension( 'CentralNotice' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5220defd753f69e1fc7cd7e0cbcae949f16561bf
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...GuidedTour[master]: Replace deprecated .mw-ui-constructive class with .mw-ui-pro...

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Replace deprecated .mw-ui-constructive class with 
.mw-ui-progressive
..


Replace deprecated .mw-ui-constructive class with .mw-ui-progressive

Bug: T146923
Change-Id: I7d2907e8e52f9ba72ec9c5dc34f70f5db20710f5
---
M modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
M modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js
M tests/qunit/ext.guidedTour.lib.tests.js
3 files changed, 4 insertions(+), 6 deletions(-)

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



diff --git a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js 
b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
index a20b866..be33c80 100644
--- a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
+++ b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
@@ -245,7 +245,6 @@
 *
 *  * neutral
 *  * progressive
-*  * constructive
 *  * destructive
 *  * quiet
 *
@@ -255,7 +254,6 @@
var buttonTypes = {
neutral: '',
progressive: 'mw-ui-progressive',
-   constructive: 'mw-ui-constructive',
destructive: 'mw-ui-destructive',
quiet: 'mw-ui-quiet'
},
diff --git a/modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js 
b/modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js
index 070d94e..cb157a4 100644
--- a/modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js
+++ b/modules/ext.guidedTour.lib/ext.guidedTour.lib.TourBuilder.js
@@ -171,7 +171,7 @@
 * @param {string} stepSpec.buttons.url URL to link to, only for the
 *  externalLink action
 * @param {string} stepSpec.buttons.type string to add button type
-*  class.  Currently supports: progressive, constructive, destructive.
+*  class.  Currently supports: progressive, destructive.
 * @param {string} [stepSpec.buttons.classString] Space-separated list 
of
 *  additional class names
 *
diff --git a/tests/qunit/ext.guidedTour.lib.tests.js 
b/tests/qunit/ext.guidedTour.lib.tests.js
index 2f82436..26f9833 100644
--- a/tests/qunit/ext.guidedTour.lib.tests.js
+++ b/tests/qunit/ext.guidedTour.lib.tests.js
@@ -1039,7 +1039,7 @@
var buttons = [
{ type: 'destructive' },
{ type: ['progressive', 'quiet'] },
-   { action: 'wikiLink', type: 'constructive' },
+   { action: 'wikiLink', type: 'progressive' },
{ action: 'externalLink' },
{ action: 'back' },
{ action: 'okay', onclick: function() {} },
@@ -1065,8 +1065,8 @@
'A quietly progressive custom button'
);
assert.ok(
-   returnedButtons[2].html['class'].indexOf( 
'mw-ui-constructive' ) !== -1,
-   'Constructive internal link'
+   returnedButtons[2].html['class'].indexOf( 
'mw-ui-progressive' ) !== -1,
+   'Progressive internal link'
);
assert.ok(
returnedButtons[3].html['class'].indexOf( 
'mw-ui-progressive' ) === -1,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d2907e8e52f9ba72ec9c5dc34f70f5db20710f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GuidedTour
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: Swalling 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Lingo[master]: Replace ArticleSave hook usage

2016-10-10 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Replace ArticleSave hook usage
..

Replace ArticleSave hook usage

Bug: T147390
Change-Id: Ia38aad7fda8d1401d31266bfbd0fdd95231f5a06
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia38aad7fda8d1401d31266bfbd0fdd95231f5a06
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Lingo
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove wikimania2013wiki specific translate config

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Remove wikimania2013wiki specific translate config
..


Remove wikimania2013wiki specific translate config

Change-Id: I6130993e61800403ad00df28269df601b4805b3a
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 11 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  Alex Monk: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 98666e0..3b68adb 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2453,17 +2453,6 @@
],
];
 
-   if ( $wgDBname === 'wikimania2013wiki' ) {
-   $wgHooks['TranslatePostInitGroups'][] = function ( &$cc ) {
-   $id = 'wiki-sidebar';
-   $mg = new WikiMessageGroup( $id, 'sidebar-messages' );
-   $mg->setLabel( 'Sidebar' );
-   $mg->setDescription( 'Messages used in the sidebar of 
this wiki' );
-   $cc[$id] = $mg;
-   return true;
-   };
-   }
-
if ( $wgDBname === 'commonswiki' ) {
$wgHooks['TranslatePostInitGroups'][] = function ( &$cc ) {
$id = 'wiki-translatable';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6130993e61800403ad00df28269df601b4805b3a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Re-enable OAuth on wikitech

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Re-enable OAuth on wikitech
..


Re-enable OAuth on wikitech

Bug: T147804
Change-Id: I85decd5a1bb53c126d3dd99d696ed35700b4cb5c
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 6 insertions(+), 7 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f6f5bb1..98666e0 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3115,13 +3115,13 @@
 
 if ( $wmgUseOAuth ) {
wfLoadExtension( 'OAuth' );
-   if ( $wgDBname !== "labswiki" && $wgDBname !== 'labtestwiki' ) {
+   if ( !in_array( $wgDBname, [ 'labswiki', 'labtestwiki' ] ) ) {
$wgMWOAuthCentralWiki = 'metawiki';
$wgMWOAuthSharedUserSource = 'CentralAuth';
}
$wgMWOAuthSecureTokenTransfer = true;
 
-   if ( $wgDBname === $wgMWOAuthCentralWiki ) {
+   if ( in_array( $wgDBname, [ $wgMWOAuthCentralWiki, 'labswiki', 
'labtestwiki' ] ) ) {
// management interfaces are only available on the central wiki
$wgGroupPermissions['autoconfirmed']['mwoauthproposeconsumer'] 
= true;

$wgGroupPermissions['autoconfirmed']['mwoauthupdateownconsumer'] = true;
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 6be50a6..4a53047 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -8307,7 +8307,7 @@
'edit' => false,
'createaccount' => true,
],
-   'bots' => ['skipcaptcha' => true ],
+   'bots' => [ 'skipcaptcha' => true ],
'cloudadmin' => [
'listall' => true,
'manageproject' => true,
@@ -8317,8 +8317,9 @@
'accessrestrictedregions' => true,
'editallhiera' => true,
],
-   'shell' => ['loginviashell' => true ],
-   'shellmanagers' => ['userrights' => false ],
+   'oauthadmin' => [ 'autopatrol' => true ],
+   'shell' => [ 'loginviashell' => true ],
+   'shellmanagers' => [ 'userrights' => false ],
],
'+legalteamwiki' => [ // T63222
'accountcreator' => [ 'noratelimit' => false ],
@@ -11839,10 +11840,8 @@
 
 'wmgUseOAuth' => [
'default' => true,
-   'wikitech' => true,
'private' => false,
'fishbowl' => false,
-   'nonglobal' => false,
 ],
 
 # @}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I85decd5a1bb53c126d3dd99d696ed35700b4cb5c
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

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

2016-10-10 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Replace ArticleSave hook usage
..

Replace ArticleSave hook usage

Bug: T147390
Change-Id: I49c4fa76fdecc580fa36e4bc73fdb66da5cb5da3
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49c4fa76fdecc580fa36e4bc73fdb66da5cb5da3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] analytics/analytics.wikimedia.org[master]: Changing link to browsers to avoid a 301

2016-10-10 Thread Mforns (Code Review)

Mforns has submitted this change and it was merged.

Change subject: Changing link to browsers to avoid a 301
..


Changing link to browsers to avoid a 301

Change-Id: I348dbd998a5c7f919d54153b04cf09e677d43206
---
M index.html
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/index.html b/index.html
index cc9324d..98501a1 100644
--- a/index.html
+++ b/index.html
@@ -36,7 +36,7 @@
   
 Dashboards
 
-  Browser 
Statistics
+  Browser 
Statistics
   Readers:
 Pageviews and Unique Devices 
 
   

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I348dbd998a5c7f919d54153b04cf09e677d43206
Gerrit-PatchSet: 1
Gerrit-Project: analytics/analytics.wikimedia.org
Gerrit-Branch: master
Gerrit-Owner: Nuria 
Gerrit-Reviewer: Mforns 
Gerrit-Reviewer: Milimetric 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Re-enable OAuth on wikitech

2016-10-10 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Re-enable OAuth on wikitech
..

Re-enable OAuth on wikitech

Bug: T147804
Change-Id: I85decd5a1bb53c126d3dd99d696ed35700b4cb5c
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 2 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f6f5bb1..98666e0 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3115,13 +3115,13 @@
 
 if ( $wmgUseOAuth ) {
wfLoadExtension( 'OAuth' );
-   if ( $wgDBname !== "labswiki" && $wgDBname !== 'labtestwiki' ) {
+   if ( !in_array( $wgDBname, [ 'labswiki', 'labtestwiki' ] ) ) {
$wgMWOAuthCentralWiki = 'metawiki';
$wgMWOAuthSharedUserSource = 'CentralAuth';
}
$wgMWOAuthSecureTokenTransfer = true;
 
-   if ( $wgDBname === $wgMWOAuthCentralWiki ) {
+   if ( in_array( $wgDBname, [ $wgMWOAuthCentralWiki, 'labswiki', 
'labtestwiki' ] ) ) {
// management interfaces are only available on the central wiki
$wgGroupPermissions['autoconfirmed']['mwoauthproposeconsumer'] 
= true;

$wgGroupPermissions['autoconfirmed']['mwoauthupdateownconsumer'] = true;
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 6be50a6..3b07ff4 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11839,10 +11839,8 @@
 
 'wmgUseOAuth' => [
'default' => true,
-   'wikitech' => true,
'private' => false,
'fishbowl' => false,
-   'nonglobal' => false,
 ],
 
 # @}

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

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

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

[MediaWiki-commits] [Gerrit] analytics/analytics.wikimedia.org[master]: Changing link to browsers to avoid a 301

2016-10-10 Thread Nuria (Code Review)

Nuria has uploaded a new change for review.

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

Change subject: Changing link to browsers to avoid a 301
..

Changing link to browsers to avoid a 301

Change-Id: I348dbd998a5c7f919d54153b04cf09e677d43206
---
M index.html
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/analytics.wikimedia.org 
refs/changes/84/315184/1

diff --git a/index.html b/index.html
index cc9324d..98501a1 100644
--- a/index.html
+++ b/index.html
@@ -36,7 +36,7 @@
   
 Dashboards
 
-  Browser 
Statistics
+  Browser 
Statistics
   Readers:
 Pageviews and Unique Devices 
 
   

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I348dbd998a5c7f919d54153b04cf09e677d43206
Gerrit-PatchSet: 1
Gerrit-Project: analytics/analytics.wikimedia.org
Gerrit-Branch: master
Gerrit-Owner: Nuria 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Whitelist Pwirth <wi...@hallowelt.biz>

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Whitelist Pwirth 
..


Whitelist Pwirth 

See user contribution which is manly in BlueSpice* projects

https://gerrit.wikimedia.org/r/#/q/owner:%22Pwirth+%253Cwirth%2540hallowelt.biz%253E%22

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index fcb937f..0d69e6b 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -211,6 +211,7 @@
 | wiki@physikerwelt\.de
 | wikiposta@gmail\.com
 | wiki@strainu\.ro
+| wirth@hallowelt\.biz
 | xietaoecho@gmail\.com
 | yaron57@gmail\.com
 | yuriastrakhan@gmail\.com
@@ -444,6 +445,7 @@
- ^w@mzmcbride\.com$
- ^wctaiwan@gmail\.com$
- ^wiki@physikerwelt\.de$
+   - ^wirth@hallowelt\.biz$ # Pwirth
- ^yaron57@gmail\.com$
- ^zhorishna@gmail\.com$ # Isarra
- ^mwalker@khaosdev\.com$ # Matt Walker

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I043b23dd33b6ed8c620879c030eb242587d3418b
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Make size of members list entries smaller on hubpage

2016-10-10 Thread Isarra (Code Review)

Isarra has submitted this change and it was merged.

Change subject: Make size of members list entries smaller on hubpage
..


Make size of members list entries smaller on hubpage

Sizes are made smaller for no icon; we need better handling for fine-tuning of
normal icons (on-wiki files).
Also hided the description, as we don't care in the simple memberlist.

Change-Id: Ifba3d431a1123341cb7a10e9599b4bd6e0e90483
---
M modules/ext.CollaborationKit.hub.styles.less
1 file changed, 14 insertions(+), 2 deletions(-)

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



diff --git a/modules/ext.CollaborationKit.hub.styles.less 
b/modules/ext.CollaborationKit.hub.styles.less
index 45b6240..710c9f9 100644
--- a/modules/ext.CollaborationKit.hub.styles.less
+++ b/modules/ext.CollaborationKit.hub.styles.less
@@ -87,7 +87,7 @@
border-radius: 3px;
}
 }
-.wp-members {
+.mw-body .wp-members {
.grey-box();
 
float: right;
@@ -97,10 +97,22 @@
width: 25%;
 
h3 {
-   margin: 0 0 .75em;
+   margin: 0;
+   margin-bottom: .5em;
padding: 0;
text-align: center;
}
+   .mw-collabkit-list-img,
+   .mw-collabkit-list-noimageplaceholder {
+   height: 32px;
+   width: 32px;
+   }
+   .mw-collabkit-list-container {
+   height: 32px;
+   }
+   .mw-collabkit-list-notes {
+   display: none;
+   }
 }
 .wp-members-buttons {
margin-top: 1em;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifba3d431a1123341cb7a10e9599b4bd6e0e90483
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Isarra 
Gerrit-Reviewer: Isarra 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Make uls not overlap images on hubs

2016-10-10 Thread Isarra (Code Review)

Isarra has submitted this change and it was merged.

Change subject: Make uls not overlap images on hubs
..


Make uls not overlap images on hubs

Change-Id: Icae95d4e6a3495d832a9b4f6c36d732cfe542e29
---
M modules/ext.CollaborationKit.hub.styles.less
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/modules/ext.CollaborationKit.hub.styles.less 
b/modules/ext.CollaborationKit.hub.styles.less
index 710c9f9..fae44f3 100644
--- a/modules/ext.CollaborationKit.hub.styles.less
+++ b/modules/ext.CollaborationKit.hub.styles.less
@@ -72,6 +72,9 @@
}
}
 }
+.wp-collaborationhub ul {
+   display: inline-block;
+}
 
 .wp-header-image {
float: left;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icae95d4e6a3495d832a9b4f6c36d732cfe542e29
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Isarra 
Gerrit-Reviewer: Isarra 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Use current surface's sequence registry in command help dialog

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Use current surface's sequence registry in command help dialog
..


Use current surface's sequence registry in command help dialog

Also hide commands an sections if they end up empty. This fixes
the help dialog in MW's new wikitext editor, which is still
showing sequences as available.

Bug: T147810
Change-Id: I8224ea2540b024502ec101856c09d98ac96118e8
---
M src/ui/dialogs/ve.ui.CommandHelpDialog.js
1 file changed, 23 insertions(+), 13 deletions(-)

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



diff --git a/src/ui/dialogs/ve.ui.CommandHelpDialog.js 
b/src/ui/dialogs/ve.ui.CommandHelpDialog.js
index 9ad8849..8579b1e 100644
--- a/src/ui/dialogs/ve.ui.CommandHelpDialog.js
+++ b/src/ui/dialogs/ve.ui.CommandHelpDialog.js
@@ -80,7 +80,8 @@
  */
 ve.ui.CommandHelpDialog.prototype.initialize = function () {
var i, j, jLen, k, kLen, triggerList, commands, shortcut, platform, 
platformKey,
-   $list, $shortcut, commandGroups, sequence;
+   $list, $shortcut, commandGroups, sequence, hasCommand, 
hasShortcut,
+   sequenceRegistry = ve.init.target.getSurface().sequenceRegistry;
 
// Parent method
ve.ui.CommandHelpDialog.super.prototype.initialize.call( this );
@@ -97,9 +98,11 @@
this.$container = $( '' ).addClass( 
've-ui-commandHelpDialog-container' );
 
for ( i in commandGroups ) {
+   hasCommand = false;
commands = this.constructor.static.sortedCommandsFromGroup( i, 
commandGroups[ i ].promote, commandGroups[ i ].demote );
$list = $( '' ).addClass( 've-ui-commandHelpDialog-list' );
for ( j = 0, jLen = commands.length; j < jLen; j++ ) {
+   hasShortcut = false;
if ( commands[ j ].trigger ) {
triggerList = ve.ui.triggerRegistry.lookup( 
commands[ j ].trigger );
} else {
@@ -121,10 +124,11 @@
$shortcut.append( $( '' ).append(
triggerList[ k ].getMessage( true 
).map( this.constructor.static.buildKeyNode )
).find( 'kbd + kbd' ).before( '+' ).end() );
+   hasShortcut = true;
}
if ( commands[ j ].sequences ) {
for ( k = 0, kLen = commands[ j 
].sequences.length; k < kLen; k++ ) {
-   sequence = 
ve.ui.sequenceRegistry.lookup( commands[ j ].sequences[ k ] );
+   sequence = sequenceRegistry.lookup( 
commands[ j ].sequences[ k ] );
if ( sequence ) {
$shortcut.append( $( '' )
.attr( 'data-label', 
ve.msg( 'visualeditor-shortcuts-sequence-notice' ) )
@@ -132,22 +136,28 @@

sequence.getMessage( true ).map( this.constructor.static.buildKeyNode )
)
);
+   hasShortcut = true;
}
}
}
-   $list.append(
-   $shortcut,
-   $( '' ).text( OO.ui.resolveMsg( commands[ j 
].label ) )
+   if ( hasShortcut ) {
+   $list.append(
+   $shortcut,
+   $( '' ).text( OO.ui.resolveMsg( 
commands[ j ].label ) )
+   );
+   hasCommand = true;
+   }
+   }
+   if ( hasCommand ) {
+   this.$container.append(
+   $( '' )
+   .addClass( 
've-ui-commandHelpDialog-section' )
+   .append(
+   $( '' ).text( 
OO.ui.resolveMsg( commandGroups[ i ].title ) ),
+   $list
+   )
);
}
-   this.$container.append(
-   $( '' )
-   .addClass( 've-ui-commandHelpDialog-section' )
-   .append(
-   $( '' ).text( OO.ui.resolveMsg( 
commandGroups[ i ].title ) ),
-   $list
-   )
-   );

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Allow Commons 'crats to manage accountcreator group

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Allow Commons 'crats to manage accountcreator group
..


Allow Commons 'crats to manage accountcreator group

This patch allows Commons bureaucrats to add users to
and remove them from the accountcreator user group.

Until now, membership of the group has been managed
by Wikimedia stewards, however the Commons community
decided to give this ability to local bureaucrats.

Bug: T144689
Change-Id: I71553c14fefaf200a81345c2f8c07e39fd1fe570
---
M wmf-config/InitialiseSettings.php
1 file changed, 12 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d794590..6be50a6 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9252,7 +9252,12 @@
'bureaucrat' => [ 'autopatrolled' ],
],
'+commonswiki' => [
-   'bureaucrat' => [ 'gwtoolset', 'ipblock-exempt', 
'translationadmin' ], // T26374, T65124, T78814
+   'bureaucrat' => [
+   'gwtoolset', // T65124
+   'ipblock-exempt',
+   'translationadmin', // T50620
+   'accountcreator', // T144689
+   ],
'checkuser' => [ 'ipblock-exempt' ],
'sysop' => [ 'rollbacker', 'confirmed', 'patroller', 
'autopatrolled', 'filemover', 'Image-reviewer', 'upwizcampeditors' ],
'Image-reviewer' => [ 'Image-reviewer' ],
@@ -9917,7 +9922,12 @@
'bureaucrat' => [ 'translationadmin', 'sysop', 'bureaucrat' ],
],
'+commonswiki' => [
-   'bureaucrat' => [ 'gwtoolset', 'ipblock-exempt', 
'translationadmin' ], // T50620, T65124, T78814
+   'bureaucrat' => [
+   'gwtoolset', // T65124
+   'ipblock-exempt',
+   'translationadmin', // T50620
+   'accountcreator', // T144689
+   ],
'checkuser' => [ 'ipblock-exempt' ],
'sysop' => [ 'rollbacker', 'confirmed', 'patroller', 
'autopatrolled', 'filemover', 'Image-reviewer', 'upwizcampeditors' ],
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71553c14fefaf200a81345c2f8c07e39fd1fe570
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Odder 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Odder 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Clean up style, and some style bugs

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Clean up style, and some style bugs
..


Clean up style, and some style bugs

More coding style and some random css, redid subpage toc structure to be
distinct from mainpage everything structure

Change-Id: Ib0fcd9803011494edf782fc6d8aa0125ebfe2c8d
---
M includes/content/CollaborationHubContent.php
M includes/content/CollaborationHubContentSchema.php
M includes/content/CollaborationHubTOC.php
M includes/content/CollaborationListContentSchema.php
M modules/ext.CollaborationKit.hub.styles.less
M modules/ext.CollaborationKit.hub.subpage.styles.less
M modules/ext.CollaborationKit.mixins.less
7 files changed, 79 insertions(+), 98 deletions(-)

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



diff --git a/includes/content/CollaborationHubContent.php 
b/includes/content/CollaborationHubContent.php
index f85d132..cbadc7b 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -327,7 +327,7 @@
// rawElement is used because we don't want [edit] 
links or usual header behavior
$membersHeader = Html::rawElement(
'h3',
-   [ 'style' => 'text-align: center; 
padding-bottom: 1em;' ],
+   [],
wfMessage( 
'collaborationkit-hub-members-header' )
);
 
diff --git a/includes/content/CollaborationHubContentSchema.php 
b/includes/content/CollaborationHubContentSchema.php
index 1509e4c..ee959c4 100644
--- a/includes/content/CollaborationHubContentSchema.php
+++ b/includes/content/CollaborationHubContentSchema.php
@@ -61,74 +61,50 @@
],
] ],
],
-   'scope' =>
-   [
+   'scope' => [
'type' => 'object',
-   'properties' =>
-   [
-   'included_categories' =>
-   [
+   'properties' => [
+   'included_categories' => [
'type' => 'array',
-   'items' =>
-   [
-   [
-   'type' => 'object',
-   'properties' =>
-   [
-   'category_name' 
=>
-   [
-   'type' 
=> 'string'
-   ],
-   
'category_depth' =>
-   [
-   'type' 
=> 'number',
-   
'default' => 9
-   ]
+   'items' => [ [
+   'type' => 'object',
+   'properties' => [
+   'category_name' => [
+   'type' => 
'string'
+   ],
+   'category_depth' => [
+   'type' => 
'number',
+   'default' => 9
]
]
-   ]
+   ] ]
],
-   'excluded_categories' =>
-   [
+   'excluded_categories' => [
'type' => 'array',
-   'items' =>
-   [
-   [
-   'type' => 'object',
-   'properties' =>
-   [
-   'category_name' 
=>
-

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Make uls not overlap images on hubs

2016-10-10 Thread Isarra (Code Review)

Isarra has uploaded a new change for review.

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

Change subject: Make uls not overlap images on hubs
..

Make uls not overlap images on hubs

Change-Id: Icae95d4e6a3495d832a9b4f6c36d732cfe542e29
---
M modules/ext.CollaborationKit.hub.styles.less
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/modules/ext.CollaborationKit.hub.styles.less 
b/modules/ext.CollaborationKit.hub.styles.less
index 710c9f9..fae44f3 100644
--- a/modules/ext.CollaborationKit.hub.styles.less
+++ b/modules/ext.CollaborationKit.hub.styles.less
@@ -72,6 +72,9 @@
}
}
 }
+.wp-collaborationhub ul {
+   display: inline-block;
+}
 
 .wp-header-image {
float: left;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icae95d4e6a3495d832a9b4f6c36d732cfe542e29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Isarra 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [BlueSpiceExtensions] Add dependance on extension BlueSpiceF...

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: [BlueSpiceExtensions] Add dependance on extension 
BlueSpiceFoundation
..


[BlueSpiceExtensions] Add dependance on extension BlueSpiceFoundation

Change-Id: I9b808a7d24bbc33c240a3be27f90321cd812a52c
---
M zuul/parameter_functions.py
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, but someone else must approve
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index a31be86..2fa8630 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -88,6 +88,7 @@
 'ApiFeatureUsage': ['Elastica'],
 'Arrays': ['Loops', 'ParserFunctions', 'Variables'],
 'ArticlePlaceholder': ['Wikibase', 'Scribunto'],
+'BlueSpiceExtensions': ['BlueSpiceFoundation'],
 'Capiunto': ['Scribunto'],
 'Cite': ['VisualEditor'],
 'Citoid': ['Cite', 'VisualEditor'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b808a7d24bbc33c240a3be27f90321cd812a52c
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Make size of members list entries smaller on hubpage

2016-10-10 Thread Isarra (Code Review)

Isarra has uploaded a new change for review.

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

Change subject: Make size of members list entries smaller on hubpage
..

Make size of members list entries smaller on hubpage

Sizes are made smaller for no icon; we need better handling for fine-tuning of
normal icons (on-wiki files).
Also hided the description, as we don't care in the simple memberlist.

Change-Id: Ifba3d431a1123341cb7a10e9599b4bd6e0e90483
---
M modules/ext.CollaborationKit.hub.styles.less
1 file changed, 14 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit 
refs/changes/55/315155/1

diff --git a/modules/ext.CollaborationKit.hub.styles.less 
b/modules/ext.CollaborationKit.hub.styles.less
index 45b6240..710c9f9 100644
--- a/modules/ext.CollaborationKit.hub.styles.less
+++ b/modules/ext.CollaborationKit.hub.styles.less
@@ -87,7 +87,7 @@
border-radius: 3px;
}
 }
-.wp-members {
+.mw-body .wp-members {
.grey-box();
 
float: right;
@@ -97,10 +97,22 @@
width: 25%;
 
h3 {
-   margin: 0 0 .75em;
+   margin: 0;
+   margin-bottom: .5em;
padding: 0;
text-align: center;
}
+   .mw-collabkit-list-img,
+   .mw-collabkit-list-noimageplaceholder {
+   height: 32px;
+   width: 32px;
+   }
+   .mw-collabkit-list-container {
+   height: 32px;
+   }
+   .mw-collabkit-list-notes {
+   display: none;
+   }
 }
 .wp-members-buttons {
margin-top: 1em;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifba3d431a1123341cb7a10e9599b4bd6e0e90483
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Isarra 

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

[MediaWiki-commits] [Gerrit] labs...stewardbots[master]: Removed outdated stuff

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Removed outdated stuff
..


Removed outdated stuff

Change-Id: Iffbc93433bb80a1c22485e25146ab7167a2d96c3
---
D SULWatcher/restart_SULWatcher.sh
D StewardBot/StewardBot-old.html
D StewardBot/restart_stewardbot.sh
3 files changed, 0 insertions(+), 371 deletions(-)

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



diff --git a/SULWatcher/restart_SULWatcher.sh b/SULWatcher/restart_SULWatcher.sh
deleted file mode 100755
index 3dc0d1a..000
--- a/SULWatcher/restart_SULWatcher.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-jstop sulwatcher
-
-if [ $? -eq 0 ]; then
-echo "Waiting for bot to stop so it can be restarted"
-qstat -j sulwatcher 2>&1 > /dev/null
-while [ $? -eq 0 ]; do
-sleep 1
-echo -n '.'
-qstat -j sulwatcher  2>&1 > /dev/null
-done
-fi
-
-jsub -N sulwatcher -mem 2G -continuous -l 
/data/project/stewardbots/SULWatcher/SULWatcher.py
diff --git a/StewardBot/StewardBot-old.html b/StewardBot/StewardBot-old.html
deleted file mode 100644
index 201f451..000
--- a/StewardBot/StewardBot-old.html
+++ /dev/null
@@ -1,336 +0,0 @@
-
-
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;>
-http://www.w3.org/1999/xhtml; lang="en" xml:lang="en">
-
-
-
-StewardBot
-
-http://meta.wikimedia.org/skins-1.5/common/shared.css?165; 
type="text/css" media="screen" />
-
-/*http://meta.wikimedia.org/skins-1.5/monobook/main.css?5";;
-body {
-font-size: 8pt;
-}
-div.header {
-margin: 15px 15px 15px 150px;
-border: #7B68EE solid 1px;
-background-color: #FF;
-font-family: Trebuchet MS, Tahoma, Arial;
-padding: 1px;
-}
-div.content {
-padding: 0px 15px 0px 15px;
-border: #CC solid 1px;
-background-color: #FF;
-margin: 20px 0px 0px 150px;
-}
-/*]]>*/
-
-http://meta.wikimedia.org/w/index.php?title=MediaWiki:Common.cssusemsgcache=yesctype=text%2Fcsssmaxage=2678400action=rawmaxage=2678400ts=20080818041814;
 type="text/css" />
-http://meta.wikimedia.org/w/index.php?title=MediaWiki:Monobook.cssusemsgcache=yesctype=text%2Fcsssmaxage=2678400action=rawmaxage=2678400ts=20080818041814;
 type="text/css" media="screen" />
-
-/*http://upload.wikimedia.org/wikipedia/commons/thumb/b/be/Wikimedia_Community_Logo-Toolserver.svg/130px-Wikimedia_Community_Logo-Toolserver.svg.png);}
- th.c1 {background-color:black;color:white}
-/*]]>*/
-
-
-
-
-
-
-
-StewardBot - Help
-StewardBot (http://en.wiktionary.org/wiki/AKA; class="extiw" 
title="wikt:AKA">aka Stewie) is nice little bot who spends his life in 
#wikimedia-stewards. He makes life easier for the 
stewards and everyone else; he is a good bot!
-
-Commands
-
-
-Command
-Description
-Notes/Example
-
-
-!steward
-Pings all of the stewards (emergency)
-
-
-
-@steward
-Pings a group of stewards who have opted-in (non-emergency)
-kibble@steward Az has gone rouge!
-StewardBotStewards: Attention requested by kibble ( DerHexer Dungodung 
)
-
-
-@quiet
-Makes Stewie be quiet and not speak. :'(
-dungodung@quiet
-StewardBotI'll be quiet :(
-
-
-@speak
-Makes Stewie talk again.
-dungodung@speak
-StewardBotBack in action :)
-
-
-@notify on
-Turns notification (!steward) on
-StewardBotNotification on
-
-
-@notify off
-Turns notification (!steward) off
-StewardBotNotification off
-
-
-@stew
-@privileged
-@ignored
-@stalked
-@listen
-Advanced settings
-See the section below for more 
information.
-
-
-@help
-Displays a link to this help page
-kibble@help
-StewardBotHelp = http://www.toolserver.org/~stewardbots/stewardbot.html; class="external 
free" title="http://www.toolserver.org/~stewardbots/stewardbot.html; 
rel="nofollow">http://www.toolserver.org/~stewardbots/stewardbot.html
-
-
-@huggle
-The huggle command. :D
-
-
-
-@test
-Tests the rc reader and posts what was last received on 
irc.wikimedia.org
-
-
-
-@die
-Quits the bot (http://meta.wikimedia.org/wiki/User:Dungodung; 
title="User:Dungodung">owner-only)
-dungodung @die
-* StewardBot has left irc.freenode.net ("Goodbye!")
-
-
-
-
-Advanced settings
-
-
-Command
-Subcommand
-Parameters
-Description
-Notes/Example
-
-
-stew
-add
-username [nick [cloak [opt-in]]]
-Adds a new steward

[MediaWiki-commits] [Gerrit] labs...stewardbots[master]: Removed outdated stuff

2016-10-10 Thread MarcoAurelio (Code Review)

MarcoAurelio has uploaded a new change for review.

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

Change subject: Removed outdated stuff
..

Removed outdated stuff

Change-Id: Iffbc93433bb80a1c22485e25146ab7167a2d96c3
---
D SULWatcher/restart_SULWatcher.sh
D StewardBot/StewardBot-old.html
D StewardBot/restart_stewardbot.sh
3 files changed, 0 insertions(+), 371 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/stewardbots 
refs/changes/51/315151/1

diff --git a/SULWatcher/restart_SULWatcher.sh b/SULWatcher/restart_SULWatcher.sh
deleted file mode 100755
index 3dc0d1a..000
--- a/SULWatcher/restart_SULWatcher.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-jstop sulwatcher
-
-if [ $? -eq 0 ]; then
-echo "Waiting for bot to stop so it can be restarted"
-qstat -j sulwatcher 2>&1 > /dev/null
-while [ $? -eq 0 ]; do
-sleep 1
-echo -n '.'
-qstat -j sulwatcher  2>&1 > /dev/null
-done
-fi
-
-jsub -N sulwatcher -mem 2G -continuous -l 
/data/project/stewardbots/SULWatcher/SULWatcher.py
diff --git a/StewardBot/StewardBot-old.html b/StewardBot/StewardBot-old.html
deleted file mode 100644
index 201f451..000
--- a/StewardBot/StewardBot-old.html
+++ /dev/null
@@ -1,336 +0,0 @@
-
-
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;>
-http://www.w3.org/1999/xhtml; lang="en" xml:lang="en">
-
-
-
-StewardBot
-
-http://meta.wikimedia.org/skins-1.5/common/shared.css?165; 
type="text/css" media="screen" />
-
-/*http://meta.wikimedia.org/skins-1.5/monobook/main.css?5";;
-body {
-font-size: 8pt;
-}
-div.header {
-margin: 15px 15px 15px 150px;
-border: #7B68EE solid 1px;
-background-color: #FF;
-font-family: Trebuchet MS, Tahoma, Arial;
-padding: 1px;
-}
-div.content {
-padding: 0px 15px 0px 15px;
-border: #CC solid 1px;
-background-color: #FF;
-margin: 20px 0px 0px 150px;
-}
-/*]]>*/
-
-http://meta.wikimedia.org/w/index.php?title=MediaWiki:Common.cssusemsgcache=yesctype=text%2Fcsssmaxage=2678400action=rawmaxage=2678400ts=20080818041814;
 type="text/css" />
-http://meta.wikimedia.org/w/index.php?title=MediaWiki:Monobook.cssusemsgcache=yesctype=text%2Fcsssmaxage=2678400action=rawmaxage=2678400ts=20080818041814;
 type="text/css" media="screen" />
-
-/*http://upload.wikimedia.org/wikipedia/commons/thumb/b/be/Wikimedia_Community_Logo-Toolserver.svg/130px-Wikimedia_Community_Logo-Toolserver.svg.png);}
- th.c1 {background-color:black;color:white}
-/*]]>*/
-
-
-
-
-
-
-
-StewardBot - Help
-StewardBot (http://en.wiktionary.org/wiki/AKA; class="extiw" 
title="wikt:AKA">aka Stewie) is nice little bot who spends his life in 
#wikimedia-stewards. He makes life easier for the 
stewards and everyone else; he is a good bot!
-
-Commands
-
-
-Command
-Description
-Notes/Example
-
-
-!steward
-Pings all of the stewards (emergency)
-
-
-
-@steward
-Pings a group of stewards who have opted-in (non-emergency)
-kibble@steward Az has gone rouge!
-StewardBotStewards: Attention requested by kibble ( DerHexer Dungodung 
)
-
-
-@quiet
-Makes Stewie be quiet and not speak. :'(
-dungodung@quiet
-StewardBotI'll be quiet :(
-
-
-@speak
-Makes Stewie talk again.
-dungodung@speak
-StewardBotBack in action :)
-
-
-@notify on
-Turns notification (!steward) on
-StewardBotNotification on
-
-
-@notify off
-Turns notification (!steward) off
-StewardBotNotification off
-
-
-@stew
-@privileged
-@ignored
-@stalked
-@listen
-Advanced settings
-See the section below for more 
information.
-
-
-@help
-Displays a link to this help page
-kibble@help
-StewardBotHelp = http://www.toolserver.org/~stewardbots/stewardbot.html; class="external 
free" title="http://www.toolserver.org/~stewardbots/stewardbot.html; 
rel="nofollow">http://www.toolserver.org/~stewardbots/stewardbot.html
-
-
-@huggle
-The huggle command. :D
-
-
-
-@test
-Tests the rc reader and posts what was last received on 
irc.wikimedia.org
-
-
-
-@die
-Quits the bot (http://meta.wikimedia.org/wiki/User:Dungodung; 
title="User:Dungodung">owner-only)
-dungodung @die
-* StewardBot has left irc.freenode.net ("Goodbye!")
-
-
-
-
-Advanced settings
-
-
-Command
-Subcommand
-Parameters
-Description
-Notes/Example
-
-
-stew
-add
-username

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resourceloader: Don't cache stale responses in mw.loader.store

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: resourceloader: Don't cache stale responses in mw.loader.store
..


resourceloader: Don't cache stale responses in mw.loader.store

Follows-up 6fa1e56. This is already fixed for http caches by
shortening the Cache-Control max-age in case of a version mismatch.

However the client still cached it blindly in mw.loader.store.
Resolve this by communicating to the client what version of the module
was exported. The client can then compare this version to the version
it originally requested and decide not to cache it.

Adopt the module key format (name@version) from mw.loader.store
in mw.loader.implement() as well.

Bug: T117587
Change-Id: I1a7c44d0222893afefac20bef507bdd1a1a87ecd
---
M includes/resourceloader/ResourceLoader.php
M resources/src/mediawiki/mediawiki.js
M tests/phpunit/ResourceLoaderTestCase.php
M tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php
M tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
M tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
6 files changed, 146 insertions(+), 42 deletions(-)

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



diff --git a/includes/resourceloader/ResourceLoader.php 
b/includes/resourceloader/ResourceLoader.php
index 34a0a99..143f5cc 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -1009,6 +1009,7 @@
foreach ( $modules as $name => $module ) {
try {
$content = $module->getModuleContent( $context 
);
+   $implementKey = $name . '@' . 
$module->getVersionHash( $context );
$strContent = '';
 
// Append output
@@ -1020,7 +1021,7 @@
$strContent = $scripts;
} elseif ( is_array( $scripts ) 
) {
// ...except when 
$scripts is an array of URLs
-   $strContent = 
self::makeLoaderImplementScript( $name, $scripts, [], [], [] );
+   $strContent = 
self::makeLoaderImplementScript( $implementKey, $scripts, [], [], [] );
}
break;
case 'styles':
@@ -1046,7 +1047,7 @@
}
}
$strContent = 
self::makeLoaderImplementScript(
-   $name,
+   $implementKey,
$scripts,
isset( 
$content['styles'] ) ? $content['styles'] : [],
isset( 
$content['messagesBlob'] ) ? new XmlJsCode( $content['messagesBlob'] ) : [],
@@ -1125,7 +1126,7 @@
/**
 * Return JS code that calls mw.loader.implement with given module 
properties.
 *
-* @param string $name Module name
+* @param string $name Module name or implement key (format 
"`[name]@[version]`")
 * @param XmlJsCode|array|string $scripts Code as XmlJsCode (to be 
wrapped in a closure),
 *  list of URLs to JavaScript files, or a string of JavaScript for 
`$.globalEval`.
 * @param mixed $styles Array of CSS strings keyed by media type, or an 
array of lists of URLs
diff --git a/resources/src/mediawiki/mediawiki.js 
b/resources/src/mediawiki/mediawiki.js
index c7715e5..2750765 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1674,6 +1674,35 @@
}
}
 
+   /**
+* Make a versioned key for a specific module.
+*
+* @private
+* @param {string} module Module name
+* @return {string|null} Module key in format 
'`[name]@[version]`',
+*  or null if the module does not exist
+*/
+   function getModuleKey( module ) {
+   return hasOwn.call( registry, module ) ?
+   ( module + '@' + registry[ module 
].version ) : null;
+   }
+
+   /**
+* @private
+* @param {string} key Module name or

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Use current surface's sequence registry in command help dialog

2016-10-10 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Use current surface's sequence registry in command help dialog
..

Use current surface's sequence registry in command help dialog

Also hide commands an sections if they end up empty. This fixes
the help dialog in MW's new wikitext editor, which is still
showing sequences as available.

Change-Id: I8224ea2540b024502ec101856c09d98ac96118e8
---
M src/ui/dialogs/ve.ui.CommandHelpDialog.js
1 file changed, 23 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/48/315148/1

diff --git a/src/ui/dialogs/ve.ui.CommandHelpDialog.js 
b/src/ui/dialogs/ve.ui.CommandHelpDialog.js
index 9ad8849..8579b1e 100644
--- a/src/ui/dialogs/ve.ui.CommandHelpDialog.js
+++ b/src/ui/dialogs/ve.ui.CommandHelpDialog.js
@@ -80,7 +80,8 @@
  */
 ve.ui.CommandHelpDialog.prototype.initialize = function () {
var i, j, jLen, k, kLen, triggerList, commands, shortcut, platform, 
platformKey,
-   $list, $shortcut, commandGroups, sequence;
+   $list, $shortcut, commandGroups, sequence, hasCommand, 
hasShortcut,
+   sequenceRegistry = ve.init.target.getSurface().sequenceRegistry;
 
// Parent method
ve.ui.CommandHelpDialog.super.prototype.initialize.call( this );
@@ -97,9 +98,11 @@
this.$container = $( '' ).addClass( 
've-ui-commandHelpDialog-container' );
 
for ( i in commandGroups ) {
+   hasCommand = false;
commands = this.constructor.static.sortedCommandsFromGroup( i, 
commandGroups[ i ].promote, commandGroups[ i ].demote );
$list = $( '' ).addClass( 've-ui-commandHelpDialog-list' );
for ( j = 0, jLen = commands.length; j < jLen; j++ ) {
+   hasShortcut = false;
if ( commands[ j ].trigger ) {
triggerList = ve.ui.triggerRegistry.lookup( 
commands[ j ].trigger );
} else {
@@ -121,10 +124,11 @@
$shortcut.append( $( '' ).append(
triggerList[ k ].getMessage( true 
).map( this.constructor.static.buildKeyNode )
).find( 'kbd + kbd' ).before( '+' ).end() );
+   hasShortcut = true;
}
if ( commands[ j ].sequences ) {
for ( k = 0, kLen = commands[ j 
].sequences.length; k < kLen; k++ ) {
-   sequence = 
ve.ui.sequenceRegistry.lookup( commands[ j ].sequences[ k ] );
+   sequence = sequenceRegistry.lookup( 
commands[ j ].sequences[ k ] );
if ( sequence ) {
$shortcut.append( $( '' )
.attr( 'data-label', 
ve.msg( 'visualeditor-shortcuts-sequence-notice' ) )
@@ -132,22 +136,28 @@

sequence.getMessage( true ).map( this.constructor.static.buildKeyNode )
)
);
+   hasShortcut = true;
}
}
}
-   $list.append(
-   $shortcut,
-   $( '' ).text( OO.ui.resolveMsg( commands[ j 
].label ) )
+   if ( hasShortcut ) {
+   $list.append(
+   $shortcut,
+   $( '' ).text( OO.ui.resolveMsg( 
commands[ j ].label ) )
+   );
+   hasCommand = true;
+   }
+   }
+   if ( hasCommand ) {
+   this.$container.append(
+   $( '' )
+   .addClass( 
've-ui-commandHelpDialog-section' )
+   .append(
+   $( '' ).text( 
OO.ui.resolveMsg( commandGroups[ i ].title ) ),
+   $list
+   )
);
}
-   this.$container.append(
-   $( '' )
-   .addClass( 've-ui-commandHelpDialog-section' )
-   .append(
-   $( '' ).text( OO.ui.resolveMsg( 
commandGroups[ i ].title ) ),
-   $list
-

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Clean up style, and some style bugs

2016-10-10 Thread Isarra (Code Review)

Isarra has uploaded a new change for review.

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

Change subject: Clean up style, and some style bugs
..

Clean up style, and some style bugs

More coding style and some random css, redid subpage toc structure to be
distinct from mainpage everything structure

Change-Id: Ib0fcd9803011494edf782fc6d8aa0125ebfe2c8d
---
M includes/content/CollaborationHubContent.php
M includes/content/CollaborationHubContentSchema.php
M includes/content/CollaborationHubTOC.php
M includes/content/CollaborationListContentSchema.php
M modules/ext.CollaborationKit.hub.styles.less
M modules/ext.CollaborationKit.hub.subpage.styles.less
M modules/ext.CollaborationKit.mixins.less
7 files changed, 84 insertions(+), 98 deletions(-)


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

diff --git a/includes/content/CollaborationHubContent.php 
b/includes/content/CollaborationHubContent.php
index f85d132..cbadc7b 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -327,7 +327,7 @@
// rawElement is used because we don't want [edit] 
links or usual header behavior
$membersHeader = Html::rawElement(
'h3',
-   [ 'style' => 'text-align: center; 
padding-bottom: 1em;' ],
+   [],
wfMessage( 
'collaborationkit-hub-members-header' )
);
 
diff --git a/includes/content/CollaborationHubContentSchema.php 
b/includes/content/CollaborationHubContentSchema.php
index 1509e4c..ee959c4 100644
--- a/includes/content/CollaborationHubContentSchema.php
+++ b/includes/content/CollaborationHubContentSchema.php
@@ -61,74 +61,50 @@
],
] ],
],
-   'scope' =>
-   [
+   'scope' => [
'type' => 'object',
-   'properties' =>
-   [
-   'included_categories' =>
-   [
+   'properties' => [
+   'included_categories' => [
'type' => 'array',
-   'items' =>
-   [
-   [
-   'type' => 'object',
-   'properties' =>
-   [
-   'category_name' 
=>
-   [
-   'type' 
=> 'string'
-   ],
-   
'category_depth' =>
-   [
-   'type' 
=> 'number',
-   
'default' => 9
-   ]
+   'items' => [ [
+   'type' => 'object',
+   'properties' => [
+   'category_name' => [
+   'type' => 
'string'
+   ],
+   'category_depth' => [
+   'type' => 
'number',
+   'default' => 9
]
]
-   ]
+   ] ]
],
-   'excluded_categories' =>
-   [
+   'excluded_categories' => [
'type' => 'array',
-   'items' =>
-   [
-   [
-   'type' => 'object',
-   'properties' =>
-   [
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: install jenkins+CI site on contint1001

2016-10-10 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: contint: install jenkins+CI site on contint1001
..

contint: install jenkins+CI site on contint1001

Preliminary step to prepare contint1001 to receive Jenkins and Zuul. We
need a basic Jenkins setup, the website and the backup to be configured.
Will then let us migrate Jenkins cruft to contint1001.

There are no jobs defined. Thus this change has no impact beside
prepopulating contint1001.

Change-Id: I56afee83771b9cd357190c5ac61c42f1f76f0b6e
---
M manifests/site.pp
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 94b6c1a..16850c9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -285,6 +285,11 @@
 
 # New CI master
 node 'contint1001.wikimedia.org' {
+role(ci::master,
+ci::slave,
+ci::website,
+backup::host)
+
 include standard
 include contint::firewall
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Show log excerpt by default in review form

2016-10-10 Thread Cenarium (Code Review)

Cenarium has uploaded a new change for review.

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

Change subject: Show log excerpt by default in review form
..

Show log excerpt by default in review form

This shows the stable log excerpt by default in the review form because
it can contain very useful information to reviewers. On enwiki, it is
required by policy to check the reason for pending changes protection.
Thus showing is by default is sensible.
The log excerpt shown when editing remains hidden by default.

Change-Id: I626e8c251f5c06acec93ce72d7cebd77901cbd12
---
M frontend/FlaggedRevsXML.php
M frontend/modules/ext.flaggedRevs.advanced.js
2 files changed, 5 insertions(+), 2 deletions(-)


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

diff --git a/frontend/FlaggedRevsXML.php b/frontend/FlaggedRevsXML.php
index 5b94b88..bad5196 100644
--- a/frontend/FlaggedRevsXML.php
+++ b/frontend/FlaggedRevsXML.php
@@ -349,7 +349,7 @@
public static function logToggle() {
$toggle = '' .
-   wfMessage( 'revreview-log-toggle-show' )->escaped() . 
'';
+   wfMessage( 'revreview-log-toggle-hide' )->escaped() . 
'';
return '' .
wfMessage( 'parentheses' )->rawParams( $toggle 
)->escaped() . '';
}
diff --git a/frontend/modules/ext.flaggedRevs.advanced.js 
b/frontend/modules/ext.flaggedRevs.advanced.js
index 98796f5..785ecb0 100644
--- a/frontend/modules/ext.flaggedRevs.advanced.js
+++ b/frontend/modules/ext.flaggedRevs.advanced.js
@@ -197,7 +197,10 @@
toggle = $( '#mw-fr-logtoggle' );
if ( toggle.length ) {
toggle.css( 'display', 'inline' ); // show toggle 
control
-   $( '#mw-fr-logexcerpt' ).hide();
+   if ( toggle.hasClass( 'fr-logtoggle-details' ) ) {
+   // hide in edit mode
+   $( '#mw-fr-logexcerpt' ).hide();
+   }
}
toggle.children( 'a' ).click( fr.toggleLog );
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: MobilePage: Avoid uncached query for Last modified timestamp

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: MobilePage: Avoid uncached query for Last modified timestamp
..


MobilePage: Avoid uncached query for Last modified timestamp

MediaWiki's SkinTemplate contains a variable "lastmod" for this, set
by Skin::lastModified() via OutputPage::getRevisionTimestamp()
which is filled in from ParserOutput cache in Article.php.

According to Xenon, SkinMinerva::getHistoryLink spends most of its
time doing at least 3 database queries, even for simple page views.

SkinMinerva::getHistoryLink:
- Message::parse
- MobilePage::__construct
  1. Database::select (via PageImages::getPageImage)
- MobilePage::getLatestTimestamp
  2. Database::select (via Revision::getTimestampFromId)
- MobilePage::getLatestEdit
  3. Database::select (via Revision::newFromId)
  4. Database::select (via MobilePage::getLatestTimestamp)

Changes:
* Avoid #2 by calling OutputPage::getRevisionTimestamp instead, which has
  the same value pre-populated from ParserOutput cache.
* Avoid #3 by using Revision::newKnownCurrent, which uses Memcached.
* Avoid #4 in some cases by making MobilePage remember the result of #2
  in the instance instead of querying the same thing twice.

Also:
* Remove redundant explicit User::load() call. Fields are lazy-loaded.
  It was added in 0a68545711 to avoid master queries, but slave-db has
  been the default in User for a while now (mid-2015; dd42294d2).
* Document the non-obvious difference in timestamp format between
  getLatestEdit and getLatestTimestamp.

Change-Id: Ia135e61604fa8551caac50dca43b5dc9154babd4
---
M includes/models/MobilePage.php
M includes/skins/SkinMinerva.php
2 files changed, 41 insertions(+), 10 deletions(-)

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



diff --git a/includes/models/MobilePage.php b/includes/models/MobilePage.php
index 03e53ac..4f24076 100644
--- a/includes/models/MobilePage.php
+++ b/includes/models/MobilePage.php
@@ -17,6 +17,10 @@
 */
private $title;
/**
+* @var Revision|bool
+*/
+   private $rev;
+   /**
 * @var File Associated page image file (see PageImages extension)
 */
private $file;
@@ -43,32 +47,56 @@
}
}
 
+   private function getRevision() {
+   if ( $this->rev === null ) {
+   $this->rev = Revision::newKnownCurrent(
+   wfGetDB( DB_REPLICA ),
+   $this->title->getArticleID(),
+   $this->title->getLatestRevID()
+   );
+   }
+   return $this->rev;
+   }
+
/**
-* Retrieve the last time the page content was modified. Do not reflect 
null edits.
-* @return string timestamp representing last edited time.
+* Retrieve timestamp when the page content was last modified. Does not 
reflect null edits.
+* @return string|bool Timestamp (MW format) or false
 */
public function getLatestTimestamp() {
-   $title = $this->getTitle();
-   return Revision::getTimestampFromId( $title, 
$title->getLatestRevID() );
+   if ( $this->revisionTimestamp === null ) {
+   $rev = $this->getRevision();
+   $this->revisionTimestamp = $rev ? $rev->getTimestamp() 
: false;
+   }
+   return $this->revisionTimestamp;
+   }
+
+   /**
+* Set rev_timestamp of latest edit to this page
+* @param string Timestamp (MW format)
+*/
+   public function setLatestTimestamp( $timestamp ) {
+   $this->revisionTimestamp = $timestamp;
}
 
/**
 * Retrieve the last edit to this page.
-* @return array defining edit with keys name, timestamp and gender
+* @return array defining edit with keys:
+* - string name
+* - string timestamp (Unix format)
+* - string gender
 */
public function getLatestEdit() {
-   $rev = Revision::newFromId( $this->getTitle()->getLatestRevID() 
);
-   $unixTimestamp = wfTimestamp( TS_UNIX, 
$this->getLatestTimestamp() );
+   $rev = $this->getRevision();
$edit = [
-   'timestamp' => $unixTimestamp,
+   'timestamp' => false,
'name' => '',
'gender' => '',
];
if ( $rev ) {
+   $edit['timestamp'] = wfTimestamp( TS_UNIX, 
$rev->getTimestamp() );
$userId = $rev->getUser();
if ( $userId ) {
$revUser = User::newFromId( $userId );
-   $revUser->load( User::READ_NORMAL );

[MediaWiki-commits] [Gerrit] integration/config[master]: [PdfBook] Add jenkins tests

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: [PdfBook] Add jenkins tests
..


[PdfBook] Add jenkins tests

Adds jsonlint and extension-unittests-generic tests

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index fefad95..fcb937f 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5686,6 +5686,11 @@
   - name: jsonlint
   - name: extension-unittests-generic
 
+  - name: mediawiki/extensions/PdfBook
+template:
+  - name: jsonlint
+  - name: extension-unittests-generic
+
   - name: mediawiki/extensions/PdfExport
 template:
   - name: jshint

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I348442e47d57a46e2ddea29b25beaea914305e1e
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...OpenStackManager[REL1_27]: Fix undefined $user in OpenStackNovaProject::deleteMember

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Fix undefined $user in OpenStackNovaProject::deleteMember
..


Fix undefined $user in OpenStackNovaProject::deleteMember

Bug: T147716
Change-Id: Ie1f809375d66237fce85f61202a4e6f5e1eb4605
(cherry picked from commit 548194e2f3dcb2df8f8f87b565cbf5c469eb7979)
---
M nova/OpenStackNovaProject.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/nova/OpenStackNovaProject.php b/nova/OpenStackNovaProject.php
index 8f938ac..bfedd7d 100644
--- a/nova/OpenStackNovaProject.php
+++ b/nova/OpenStackNovaProject.php
@@ -381,6 +381,7 @@
$ldap->printDebug( "Failed to remove 
$username from " . $sudoer->getSudoerName(), NONSENSITIVE );
}
}
+   $user = new OpenStackNovaUser( $username );
$ldap->printDebug( "Successfully removed $user->userDN 
from $this->projectname", NONSENSITIVE );
$this->deleteRoleCaches( $username );
$this->editArticle();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1f809375d66237fce85f61202a4e6f5e1eb4605
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: REL1_27
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: The second paramter in rawElement is attributes, not content

2016-10-10 Thread Ladsgroup (Code Review)

Ladsgroup has uploaded a new change for review.

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

Change subject: The second paramter in rawElement is attributes, not content
..

The second paramter in rawElement is attributes, not content

With proper typehinting this wouldn't have happened

Bug: T147789
Change-Id: I19ef9388acfd9159304b8141c54ce1ead27d0791
---
M includes/TemplatesOnThisPageFormatter.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/44/315144/1

diff --git a/includes/TemplatesOnThisPageFormatter.php 
b/includes/TemplatesOnThisPageFormatter.php
index c0ae374..494c7bf 100644
--- a/includes/TemplatesOnThisPageFormatter.php
+++ b/includes/TemplatesOnThisPageFormatter.php
@@ -93,11 +93,11 @@
}
 
if ( $more instanceof LinkTarget ) {
-   $outText .= Html::rawElement( 'li', 
$this->linkRenderer->makeLink(
+   $outText .= Html::rawElement( 'li', [], 
$this->linkRenderer->makeLink(
$more, $this->context->msg( 'moredotdotdot' 
)->text() ) );
} elseif ( $more ) {
// Documented as should already be escaped
-   $outText .= Html::rawElement( 'li', $more );
+   $outText .= Html::rawElement( 'li', [], $more );
}
 
$outText .= '';

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: campaignManager: jquery.throttle-debounce dependency

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: campaignManager: jquery.throttle-debounce dependency
..


campaignManager: jquery.throttle-debounce dependency

Bug: T145447
Change-Id: Ic28aa8d60aacbec5b3fabc434edbe7eaf1b8afb9
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/extension.json b/extension.json
index 6f5bf16..553a463 100644
--- a/extension.json
+++ b/extension.json
@@ -186,6 +186,7 @@
"ext.centralNotice.adminUi",
"jquery.ui.dialog",
"jquery.ui.slider",
+   "jquery.throttle-debounce",
"mediawiki.template",
"mediawiki.template.mustache"
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic28aa8d60aacbec5b3fabc434edbe7eaf1b8afb9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [PdfBook] Add jenkins tests

2016-10-10 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: [PdfBook] Add jenkins tests
..

[PdfBook] Add jenkins tests

Adds jsonlint and extension-unittests-generic tests

Repo is at
https://phabricator.wikimedia.org/diffusion/EPBO/repository/master/

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/43/315143/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index fefad95..ea27d44 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5686,6 +5686,11 @@
   - name: jsonlint
   - name: extension-unittests-generic
 
+  - name: mediawiki/extensions/PdfBook 
+template:
+  - name: jsonlint
+  - name: extension-unittests-generic
+
   - name: mediawiki/extensions/PdfExport
 template:
   - name: jshint

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.21]: Do not normalise external links to special pages

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Do not normalise external links to special pages
..


Do not normalise external links to special pages

Bug: T147685
Change-Id: I0ec004b3f7194696eaca9541d336b061602e36df
---
M includes/Linker.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/Linker.php b/includes/Linker.php
index 9011f17..d3d1f38 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -319,7 +319,7 @@
 * @return LinkTarget
 */
public static function normaliseSpecialPage( LinkTarget $target ) {
-   if ( $target->getNamespace() == NS_SPECIAL ) {
+   if ( $target->getNamespace() == NS_SPECIAL && 
!$target->isExternal() ) {
list( $name, $subpage ) = 
SpecialPageFactory::resolveAlias( $target->getDBkey() );
if ( !$name ) {
return $target;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ec004b3f7194696eaca9541d336b061602e36df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.21
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[wmf/1.28.0-wmf.21]: Fixup maintenance/CleanDuplicateScores.php

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Fixup maintenance/CleanDuplicateScores.php
..


Fixup maintenance/CleanDuplicateScores.php

Change-Id: Iadf3b002dade4aa3c7ef99c6c3ba7fa824decb5d
---
M maintenance/CleanDuplicateScores.php
1 file changed, 12 insertions(+), 8 deletions(-)

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



diff --git a/maintenance/CleanDuplicateScores.php 
b/maintenance/CleanDuplicateScores.php
index 45f114e..578aac0 100644
--- a/maintenance/CleanDuplicateScores.php
+++ b/maintenance/CleanDuplicateScores.php
@@ -22,22 +22,26 @@
public function execute() {
$dbr = \wfGetDB( DB_REPLICA );
$dbw = \wfGetDB( DB_MASTER );
+   $groupConcat = $dbr->buildGroupConcatField(
+   '|',
+   'ores_classification AS OC',
+   'ores_classification.oresc_id',
+   'OC.oresc_id = ores_classification.oresc_id'
+   );
$res = $dbr->select(
'ores_classification',
-   [ 'oresc_id', 'oresc_rev', 'oresc_model', 'oresc_class' 
],
+   [ 'oresc_rev', 'oresc_model', 'oresc_class' , 'ids' => 
$groupConcat ],
'',
__METHOD__,
[ 'GROUP BY' => 'oresc_rev, oresc_model, oresc_class',
'HAVING' => 'COUNT(*) > 1' ]
);
$ids = [];
-   $dump = [];
-   foreach ( $row as $res ) {
-   $key = implode( ',', [ $row->oresc_rev, 
$row->oresc_model, $row->oresc_class ] );
-   if ( array_has_key( $key, $dump ) ) {
-   $ids[] = $row->oresc_id;
-   } else {
-   $dump[] = $key;
+   foreach ( $res as $row ) {
+   $rowIds = explode( '|', $row->ids );
+   if ( $rowIds > 1 ) { // Sanity
+   $newIds = array_slice( $rowIds, 1 );
+   $ids = array_merge( $ids, $newIds );
}
}
$c = count( $ids );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iadf3b002dade4aa3c7ef99c6c3ba7fa824decb5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: wmf/1.28.0-wmf.21
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Fix coding style, remove some outdated comments, extra var_dumb

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Fix coding style, remove some outdated comments, extra var_dumb
..


Fix coding style, remove some outdated comments, extra var_dumb

Change-Id: Ia2a94ca954080721dcc5b7b7dec902bb3a672cb0
---
M includes/content/CollaborationHubContent.php
M includes/content/CollaborationHubContentSchema.php
M includes/content/CollaborationListContent.php
3 files changed, 51 insertions(+), 67 deletions(-)

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



diff --git a/includes/content/CollaborationHubContent.php 
b/includes/content/CollaborationHubContent.php
index 62c359d..f85d132 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -220,7 +220,6 @@
$html .= Html::rawElement(
'div',
[ 'class' => 'wp-header-image' ],
-   // TODO move all image stuff to ToC class (what is that 
class even going to be, anyway?)
$this->getParsedImage( $this->getImage(), 200 )
);
// get members list
@@ -316,31 +315,31 @@
if ( $membersTitle->exists() ) {
$membersContent = Revision::newFromTitle( $membersTitle 
)->getContent();
$wikitext = $membersContent->convertToWikitext(
-   $lang,
-   [
-   'includeDesc' 
=> false,
-   'maxItems' => 3,
-   'defaultSort' 
=> 'random'
-   ]
-   );
+   $lang,
+   [
+   'includeDesc' => false,
+   'maxItems' => 3,
+   'defaultSort' => 'random'
+   ]
+   );
$membersListHtml = $wgParser->parse( $wikitext, 
$membersTitle, $options )->getText();
 
// rawElement is used because we don't want [edit] 
links or usual header behavior
$membersHeader = Html::rawElement(
-   
'h3',
-   
[ 'style' => 'text-align: center; padding-bottom: 1em;' ],
-   
wfMessage( 'collaborationkit-hub-members-header' )
-   );
+   'h3',
+   [ 'style' => 'text-align: center; 
padding-bottom: 1em;' ],
+   wfMessage( 
'collaborationkit-hub-members-header' )
+   );
 
$membersViewButton = new OOUI\ButtonWidget( [
-   
'label' => wfMessage( 'collaborationkit-hub-members-view' 
)->inContentLanguage()->text(),
-   
'href' => $membersTitle->getLinkURL()
-   ] );
+   'label' => wfMessage( 
'collaborationkit-hub-members-view' )->inContentLanguage()->text(),
+   'href' => $membersTitle->getLinkURL()
+   ] );
$membersJoinButton = new OOUI\ButtonWidget( [
-   
'label' => wfMessage( 'collaborationkit-hub-members-signup' 
)->inContentLanguage()->text(),
-   
'href' => $membersTitle->getEditURL(), // Going through editor is non-JS 
fallback
-   
'flags' => [ 'primary', 'progressive' ]
-   ] );
+   'label' => wfMessage( 
'collaborationkit-hub-members-signup' )->inContentLanguage()->text(),
+   'href' => $membersTitle->getEditURL(), // Going 
through editor is non-JS fallback
+   'flags' => [ 'primary', 'progressive' ]
+   ] );
 
OutputPage::setupOOUI();
$text = $membersHeader . $membersListHtml .

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[wmf/1.28.0-wmf.21]: Don't show warning confirmation dialog when there are no war...

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Don't show warning confirmation dialog when there are no 
warnings
..


Don't show warning confirmation dialog when there are no warnings

In JavaScript, an empty array isn't falsy...

Bug: T147659
Change-Id: Ibaace3d0c07e46c56694683facf00a0ccb2b2bfe
---
M resources/controller/uw.controller.Details.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, but someone else must approve
  Prtksxna: Looks good to me, but someone else must approve
  Dereckson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/controller/uw.controller.Details.js 
b/resources/controller/uw.controller.Details.js
index 9b06a38..0d4fe06 100644
--- a/resources/controller/uw.controller.Details.js
+++ b/resources/controller/uw.controller.Details.js
@@ -214,7 +214,7 @@
return result.concat( 
warnings );
}, [] );
 
-   if ( warnings ) {
+   if ( warnings.length > 0 ) {
// Update warning count before 
dialog
detailsController.showErrors();
return 
detailsController.confirmationDialog( warnings );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibaace3d0c07e46c56694683facf00a0ccb2b2bfe
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: wmf/1.28.0-wmf.21
Gerrit-Owner: Matthias Mullie 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.21]: Do not normalise external links to special pages

2016-10-10 Thread Ladsgroup (Code Review)

Ladsgroup has uploaded a new change for review.

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

Change subject: Do not normalise external links to special pages
..

Do not normalise external links to special pages

Bug: T147685
Change-Id: I0ec004b3f7194696eaca9541d336b061602e36df
---
M includes/Linker.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/42/315142/1

diff --git a/includes/Linker.php b/includes/Linker.php
index 9011f17..d3d1f38 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -319,7 +319,7 @@
 * @return LinkTarget
 */
public static function normaliseSpecialPage( LinkTarget $target ) {
-   if ( $target->getNamespace() == NS_SPECIAL ) {
+   if ( $target->getNamespace() == NS_SPECIAL && 
!$target->isExternal() ) {
list( $name, $subpage ) = 
SpecialPageFactory::resolveAlias( $target->getDBkey() );
if ( !$name ) {
return $target;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ec004b3f7194696eaca9541d336b061602e36df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.21
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Fix transclusion of memberlist to still be memberlist.

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Fix transclusion of memberlist to still be memberlist.
..


Fix transclusion of memberlist to still be memberlist.

Change-Id: I3ea9b9095c226ce065d6e5f45bbfa839eceae657
---
M includes/content/CollaborationListContent.php
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
index 824328d..b45422b 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -155,6 +155,12 @@
$output->addJsConfigVars( 'wgCollaborationKitIsMemberList', 
$listOptions['ismemberlist'] );
}
 
+   private function getOverrideOptions() {
+   $this->decode();
+   $opts = (array)$this->options;
+   return [ 'ismemberlist' => !empty( $opts['ismemberlist'] ) ];
+   }
+
private function getFullRenderListOptions() {
return $listOptions = [
'includeDesc' => true,
@@ -172,7 +178,7 @@
 */
public function convertToWikitext( Language $lang, $options = [] ) {
$this->decode();
-   $options = $options + $this->getDefaultOptions();
+   $options = $options + $this->getOverrideOptions() + 
$this->getDefaultOptions();
$maxItems = $options['maxItems'];
$includeDesc = $options['includeDesc'];
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ea9b9095c226ce065d6e5f45bbfa839eceae657
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[wmf/1.28.0-wmf.21]: Fixup maintenance/CleanDuplicateScores.php

2016-10-10 Thread Ladsgroup (Code Review)

Ladsgroup has uploaded a new change for review.

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

Change subject: Fixup maintenance/CleanDuplicateScores.php
..

Fixup maintenance/CleanDuplicateScores.php

Change-Id: Iadf3b002dade4aa3c7ef99c6c3ba7fa824decb5d
---
M maintenance/CleanDuplicateScores.php
1 file changed, 12 insertions(+), 8 deletions(-)


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

diff --git a/maintenance/CleanDuplicateScores.php 
b/maintenance/CleanDuplicateScores.php
index 45f114e..578aac0 100644
--- a/maintenance/CleanDuplicateScores.php
+++ b/maintenance/CleanDuplicateScores.php
@@ -22,22 +22,26 @@
public function execute() {
$dbr = \wfGetDB( DB_REPLICA );
$dbw = \wfGetDB( DB_MASTER );
+   $groupConcat = $dbr->buildGroupConcatField(
+   '|',
+   'ores_classification AS OC',
+   'ores_classification.oresc_id',
+   'OC.oresc_id = ores_classification.oresc_id'
+   );
$res = $dbr->select(
'ores_classification',
-   [ 'oresc_id', 'oresc_rev', 'oresc_model', 'oresc_class' 
],
+   [ 'oresc_rev', 'oresc_model', 'oresc_class' , 'ids' => 
$groupConcat ],
'',
__METHOD__,
[ 'GROUP BY' => 'oresc_rev, oresc_model, oresc_class',
'HAVING' => 'COUNT(*) > 1' ]
);
$ids = [];
-   $dump = [];
-   foreach ( $row as $res ) {
-   $key = implode( ',', [ $row->oresc_rev, 
$row->oresc_model, $row->oresc_class ] );
-   if ( array_has_key( $key, $dump ) ) {
-   $ids[] = $row->oresc_id;
-   } else {
-   $dump[] = $key;
+   foreach ( $res as $row ) {
+   $rowIds = explode( '|', $row->ids );
+   if ( $rowIds > 1 ) { // Sanity
+   $newIds = array_slice( $rowIds, 1 );
+   $ids = array_merge( $ids, $newIds );
}
}
$c = count( $ids );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadf3b002dade4aa3c7ef99c6c3ba7fa824decb5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: wmf/1.28.0-wmf.21
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Fix transclusion of memberlist to still be memberlist.

2016-10-10 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Fix transclusion of memberlist to still be memberlist.
..

Fix transclusion of memberlist to still be memberlist.

Change-Id: I3ea9b9095c226ce065d6e5f45bbfa839eceae657
---
M includes/content/CollaborationListContent.php
1 file changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
index 824328d..b45422b 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -155,6 +155,12 @@
$output->addJsConfigVars( 'wgCollaborationKitIsMemberList', 
$listOptions['ismemberlist'] );
}
 
+   private function getOverrideOptions() {
+   $this->decode();
+   $opts = (array)$this->options;
+   return [ 'ismemberlist' => !empty( $opts['ismemberlist'] ) ];
+   }
+
private function getFullRenderListOptions() {
return $listOptions = [
'includeDesc' => true,
@@ -172,7 +178,7 @@
 */
public function convertToWikitext( Language $lang, $options = [] ) {
$this->decode();
-   $options = $options + $this->getDefaultOptions();
+   $options = $options + $this->getOverrideOptions() + 
$this->getDefaultOptions();
$maxItems = $options['maxItems'];
$includeDesc = $options['includeDesc'];
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ea9b9095c226ce065d6e5f45bbfa839eceae657
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Scap: modify deploy-local arguments

2016-10-10 Thread Thcipriani (Code Review)

Thcipriani has uploaded a new change for review.

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

Change subject: Scap: modify deploy-local arguments
..

Scap: modify deploy-local arguments

For scap to make fewer (possibly bad) assumptions about the environment
into which it is deploying more information needs be passed from the
command line arguments.

This change modifies any puppetized invocations of deploy-local to use
the new argument format.

This change will need to land along side the deployment of the scap
package that supports this change.

Bug: T146602
Change-Id: I4e0421b6ea6dda854998a59ef3165002ff022355
---
M modules/scap/lib/puppet/provider/package/scap3.rb
M modules/scap/manifests/target.pp
M modules/scap/spec/types/package/scap3_spec.rb
M modules/service/manifests/node.pp
M modules/service/templates/node/apply-config.sh.erb
5 files changed, 22 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/315139/1

diff --git a/modules/scap/lib/puppet/provider/package/scap3.rb 
b/modules/scap/lib/puppet/provider/package/scap3.rb
index 4a28799..45caf06 100644
--- a/modules/scap/lib/puppet/provider/package/scap3.rb
+++ b/modules/scap/lib/puppet/provider/package/scap3.rb
@@ -57,7 +57,7 @@
 
 uid = Etc.getpwnam(deploy_user).uid
 
-execute([self.class.command(:scap), 'deploy-local', '--repo', repo_path, 
'-D', 'log_json:False'],
+execute([self.class.command(:scap), 'deploy-local', '-D', 
'log_json:False', host_path, target_path],
 :uid => uid, :failonfail => true)
   end
 
@@ -124,6 +124,14 @@
 @deploy_user ||= install_option('owner', 'root')
   end
 
+  def host
+@host_name ||= install_option('host', 'deployment.eqiad.wmnet')
+  end
+
+  def host_path
+'http://' + File.join(host, repo_path)
+  end
+
   def repo
 resource[:name]
   end
diff --git a/modules/scap/manifests/target.pp b/modules/scap/manifests/target.pp
index 00a9955..853114e 100644
--- a/modules/scap/manifests/target.pp
+++ b/modules/scap/manifests/target.pp
@@ -87,14 +87,13 @@
 }
 }
 
-
+$deployment_host = hiera('scap::deployment_server')
 
 if $::realm == 'labs' {
 if !defined(Security::Access::Config["scap-allow-${deploy_user}"]) {
 # Allow $deploy_user login from scap deployment host.
 # adds an exception in /etc/security/access.conf
 # to work around labs-specific restrictions
-$deployment_host = hiera('scap::deployment_server')
 $deployment_ip = ipresolve($deployment_host, 4, $::nameservers[0])
 security::access::config { "scap-allow-${deploy_user}":
 content  => "+ : ${deploy_user} : ${deployment_ip}\n",
@@ -104,8 +103,10 @@
 }
 
 package { $package_name:
-install_options => [{
-  owner => $deploy_user}],
+install_options  => [{
+  owner  => $deploy_user,
+  host => $deployment_host,
+}],
 provider=> 'scap3',
 require => [Package['scap'], User[$deploy_user]],
 }
diff --git a/modules/scap/spec/types/package/scap3_spec.rb 
b/modules/scap/spec/types/package/scap3_spec.rb
index 82cf391..650dc03 100644
--- a/modules/scap/spec/types/package/scap3_spec.rb
+++ b/modules/scap/spec/types/package/scap3_spec.rb
@@ -28,8 +28,9 @@
 it 'should specify the right repo' do
   allow(FileUtils).to receive(:cd)
   expect(@provider).to receive(:execute).
-with(['/usr/bin/scap', 'deploy-local', '--repo', 'foo/deploy', '-D', 
'log_json:False'],
- uid: 666, failonfail: true)
+with(['/usr/bin/scap', 'deploy-local', '-D', 'log_json:False',
+  'http://deployment.eqiad.wmnet/foo/deploy', 
'/srv/deployment/foo/deploy'],
+  uid: 666, failonfail: true)
   @provider.install
 end
   end
diff --git a/modules/service/manifests/node.pp 
b/modules/service/manifests/node.pp
index fb466fc..f2c66ba 100644
--- a/modules/service/manifests/node.pp
+++ b/modules/service/manifests/node.pp
@@ -272,6 +272,7 @@
 # the file and install its symlink
 $chown_user = "${deployment_user}:${deployment_user}"
 $chown_target = "/etc/${title}/config.yaml"
+$deployment_host = hiera('scap::deployment_host')
 exec { "chown ${chown_target}":
 command => "/bin/chown ${chown_user} ${chown_target}",
 # perform the chown only if root is the effective owner
diff --git a/modules/service/templates/node/apply-config.sh.erb 
b/modules/service/templates/node/apply-config.sh.erb
index 5ae72d9..9437acd 100755
--- a/modules/service/templates/node/apply-config.sh.erb
+++ b/modules/service/templates/node/apply-config.sh.erb
@@ -3,5 +3,7 @@
 # Do not modify it manually
 
 set -e
-/usr/bin/scap deploy-local -D 'log_json:False' --repo <%= @repo %> --force 
config_deploy;
-<%- if @auto_refresh

[MediaWiki-commits] [Gerrit] mediawiki...Scribunto[master]: Replace EditFilterMerged hook usage

2016-10-10 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Replace EditFilterMerged hook usage
..

Replace EditFilterMerged hook usage

Bug: T147390
Change-Id: Ic5a3b73db8d180c72f48be1368ff44f35dd9bb10
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5a3b73db8d180c72f48be1368ff44f35dd9bb10
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] search/extra[master]: [maven-release-plugin] prepare for next development iteration

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: [maven-release-plugin] prepare for next development iteration
..


[maven-release-plugin] prepare for next development iteration

Change-Id: If986f77342efbe774ca97829f4bb8ca796407634
---
M README.md
M pom.xml
2 files changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/README.md b/README.md
index cf58f6f..0f7fbd9 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,9 @@
 
 | Extra Queries and Filters Plugin |  ElasticSearch  |
 |--|-|
-| 2.4.0, master| 2.4.0   |
+| 2.4.1, master| 2.4.1   |
+| 2.4.0| 2.4.0   |
+| 2.3.5, 2.3 branch| 2.3.5   |
 | 2.3.4| 2.3.4   |
 | 2.3.3| 2.3.3   |
 | 1.7.0 -> 1.7.1, 1.7 branch   | 1.7.X   |
diff --git a/pom.xml b/pom.xml
index 07ee946..46fc3d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search
   extra
-  2.4.1
+  2.4.2-SNAPSHOT
   Extra queries and filters for Elasticsearch.
 
   
@@ -34,7 +34,7 @@
 https://gerrit.wikimedia.org/r/#/admin/projects/search/extra
 
scm:git:https://gerrit.wikimedia.org/r/search/extra
 
scm:git:https://gerrit.wikimedia.org/r/search/extra
-extra-2.4.1
+HEAD
   
 
   

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If986f77342efbe774ca97829f4bb8ca796407634
Gerrit-PatchSet: 1
Gerrit-Project: search/extra
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] search/extra[master]: [maven-release-plugin] prepare release extra-2.4.1

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: [maven-release-plugin] prepare release extra-2.4.1
..


[maven-release-plugin] prepare release extra-2.4.1

Change-Id: Iacea68cd5b82400904ed0d91f166877ca591d225
---
M pom.xml
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/pom.xml b/pom.xml
index 40f9725..07ee946 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search
   extra
-  2.4.1-SNAPSHOT
+  2.4.1
   Extra queries and filters for Elasticsearch.
 
   
@@ -34,7 +34,7 @@
 https://gerrit.wikimedia.org/r/#/admin/projects/search/extra
 
scm:git:https://gerrit.wikimedia.org/r/search/extra
 
scm:git:https://gerrit.wikimedia.org/r/search/extra
-HEAD
+extra-2.4.1
   
 
   

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iacea68cd5b82400904ed0d91f166877ca591d225
Gerrit-PatchSet: 1
Gerrit-Project: search/extra
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] search/highlighter[master]: [maven-release-plugin] prepare release experimental-2.4.1

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: [maven-release-plugin] prepare release experimental-2.4.1
..


[maven-release-plugin] prepare release experimental-2.4.1

Change-Id: Ia3860f234e32f5b1f985e6cdf55ef768469be705
---
M experimental-highlighter-core/pom.xml
M experimental-highlighter-elasticsearch-plugin/pom.xml
M experimental-highlighter-lucene/pom.xml
M pom.xml
4 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/experimental-highlighter-core/pom.xml 
b/experimental-highlighter-core/pom.xml
index a7e128d..c85ff4a 100644
--- a/experimental-highlighter-core/pom.xml
+++ b/experimental-highlighter-core/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1-SNAPSHOT
+2.4.1
   
   experimental-highlighter-core
   jar
diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml 
b/experimental-highlighter-elasticsearch-plugin/pom.xml
index bb3d6bc..4064c65 100644
--- a/experimental-highlighter-elasticsearch-plugin/pom.xml
+++ b/experimental-highlighter-elasticsearch-plugin/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1-SNAPSHOT
+2.4.1
   
   experimental-highlighter-elasticsearch-plugin
   jar
diff --git a/experimental-highlighter-lucene/pom.xml 
b/experimental-highlighter-lucene/pom.xml
index 07c9b8a..180cc5b 100644
--- a/experimental-highlighter-lucene/pom.xml
+++ b/experimental-highlighter-lucene/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1-SNAPSHOT
+2.4.1
   
   experimental-highlighter-lucene
   jar
diff --git a/pom.xml b/pom.xml
index 9c8e489..0c0b744 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search.highlighter
   experimental
-  2.4.1-SNAPSHOT
+  2.4.1
   pom
 
   
@@ -40,7 +40,7 @@
 
https://gerrit.wikimedia.org/r/#/admin/projects/search/highlighter
 
scm:git:https://gerrit.wikimedia.org/r/search/highlighter
 
scm:git:https://gerrit.wikimedia.org/r/search/highlighter
-HEAD
+experimental-2.4.1
   
 
   

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3860f234e32f5b1f985e6cdf55ef768469be705
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] search/extra[master]: Upgrade to elastic 2.4.1

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Upgrade to elastic 2.4.1
..


Upgrade to elastic 2.4.1

Change-Id: Ieb8df903b7e63eec17fa5fa4ae35c626a9e94eaf
---
M pom.xml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/pom.xml b/pom.xml
index 88b84bc..40f9725 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 
   
 UTF-8
-2.4.0
+2.4.1
 5.5.2
 1.7
 1.7

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb8df903b7e63eec17fa5fa4ae35c626a9e94eaf
Gerrit-PatchSet: 1
Gerrit-Project: search/extra
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] search/highlighter[master]: [maven-release-plugin] prepare for next development iteration

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: [maven-release-plugin] prepare for next development iteration
..


[maven-release-plugin] prepare for next development iteration

Change-Id: I14f09a1d33b44b15d06140d2f29e7106ad76db84
---
M README.md
M experimental-highlighter-core/pom.xml
M experimental-highlighter-elasticsearch-plugin/pom.xml
M experimental-highlighter-lucene/pom.xml
M pom.xml
5 files changed, 8 insertions(+), 6 deletions(-)

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



diff --git a/README.md b/README.md
index 594b66e..aa03864 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,9 @@
 
 | Experimental Highlighter Plugin |  ElasticSearch  |
 |-|-|
-| 2.4.0, master branch| 2.4.0   |
+| 2.4.1, master branch| 2.4.1   |
+| 2.4.0,  | 2.4.0   |
+| 2.3.5, 2.3 branch   | 2.3.5   |
 | 2.3.4   | 2.3.4   |
 | 2.3.3   | 2.3.3   |
 | 2.2.2, 2.2 branch   | 2.2.2   |
diff --git a/experimental-highlighter-core/pom.xml 
b/experimental-highlighter-core/pom.xml
index c85ff4a..edfb9fa 100644
--- a/experimental-highlighter-core/pom.xml
+++ b/experimental-highlighter-core/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1
+2.4.2-SNAPSHOT
   
   experimental-highlighter-core
   jar
diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml 
b/experimental-highlighter-elasticsearch-plugin/pom.xml
index 4064c65..82ef6ed 100644
--- a/experimental-highlighter-elasticsearch-plugin/pom.xml
+++ b/experimental-highlighter-elasticsearch-plugin/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1
+2.4.2-SNAPSHOT
   
   experimental-highlighter-elasticsearch-plugin
   jar
diff --git a/experimental-highlighter-lucene/pom.xml 
b/experimental-highlighter-lucene/pom.xml
index 180cc5b..d2d409a 100644
--- a/experimental-highlighter-lucene/pom.xml
+++ b/experimental-highlighter-lucene/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1
+2.4.2-SNAPSHOT
   
   experimental-highlighter-lucene
   jar
diff --git a/pom.xml b/pom.xml
index 0c0b744..3c56d49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search.highlighter
   experimental
-  2.4.1
+  2.4.2-SNAPSHOT
   pom
 
   
@@ -40,7 +40,7 @@
 
https://gerrit.wikimedia.org/r/#/admin/projects/search/highlighter
 
scm:git:https://gerrit.wikimedia.org/r/search/highlighter
 
scm:git:https://gerrit.wikimedia.org/r/search/highlighter
-experimental-2.4.1
+HEAD
   
 
   

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14f09a1d33b44b15d06140d2f29e7106ad76db84
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] search/highlighter[master]: Upgrade to elastic 2.4.1

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Upgrade to elastic 2.4.1
..


Upgrade to elastic 2.4.1

Change-Id: I4f9d369fefd73392601cd2da6c43e2cd17f01f2d
---
M pom.xml
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/pom.xml b/pom.xml
index 7d216f4..9c8e489 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
 
   
 UTF-8
-2.4.0
+2.4.1
 
 5.5.2
@@ -294,7 +294,7 @@
   securemock

-  1.1
+  1.2
   test
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4f9d369fefd73392601cd2da6c43e2cd17f01f2d
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...citoid[master]: Fix typo that cause addItemType to fail

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Fix typo that cause addItemType to fail
..


Fix typo that cause addItemType to fail

A typo in lib/scraper caused the function addItemType to throw errors
and silently cause Promises to fail upstream. This would occur any time
there was dublinCore data but no highwirePress data.

Also Update two tests due to upstream metadata changes.

Bug: T98782
Change-Id: I6cf6aef8985e9ecc8aa0f38b605ee60a47df0a58
---
M lib/Scraper.js
M test/features/scraping/export.js
M test/features/scraping/index.js
3 files changed, 16 insertions(+), 7 deletions(-)

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



diff --git a/lib/Scraper.js b/lib/Scraper.js
index 6cc9efa..d352a49 100644
--- a/lib/Scraper.js
+++ b/lib/Scraper.js
@@ -254,7 +254,6 @@
 if (cr.doi && (citation.itemType === 'journalArticle' || 
citation.itemType === 'conferencePaper')){
 citation.DOI = cr.doi;
 }
-
 return cit;
 });
 
@@ -351,7 +350,6 @@
 function addItemType(metadata, citation){
 citation = citation || {};
 metadata = metadata || {};
-
 // Set citation type from metadata
 if (!citation.itemType){ // Don't overwrite itemtype
 if (metadata.bePress){
@@ -363,7 +361,7 @@
 else if (metadata.openGraph && metadata.openGraph['type'] && 
og.types[metadata.openGraph['type']]){ // if there is a type in the results and 
that type is defined   in openGraph.js
 citation.itemType = og.types[metadata.openGraph['type']];
 }
-else if (metadata.dublinCore && metadata.openGraph['type'] && 
dc.types[metadata.dublinCore['type']]){ // if there is a type in the results 
and that type is defined in dublinCore.js
+else if (metadata.dublinCore && metadata.dublinCore['type'] && 
dc.types[metadata.dublinCore['type']]){ // if there is a type in the results 
and that type is defined in dublinCore.js
 citation.itemType = dc.types[metadata.dublinCore['type']];
 }
 else {
diff --git a/test/features/scraping/export.js b/test/features/scraping/export.js
index c44c10d..613f320 100644
--- a/test/features/scraping/export.js
+++ b/test/features/scraping/export.js
@@ -65,7 +65,7 @@
 it('doi pointing to Zotero gotten response with name field instead of 
lastName in creators object', function() {
 return server.query('10.1001/jama.296.10.1274', 
'mwDeprecated').then(function(res) {
 assert.status(res, 200);
-assert.checkCitation(res, 'DOes this patient with headache 
have a migraine or need neuroimaging?');
+assert.checkCitation(res, 'Does This Patient With Headache 
Have a Migraine or Need Neuroimaging?');
 assert.deepEqual(!!res.body[0].accessDate, true, 'No 
accessDate present');
 assert.notDeepEqual(res.body[0].accessDate, 
'CURRENT_TIMESTAMP', 'Access date uncorrected');
 assert.ok(res.body[0]['author1-last']);
diff --git a/test/features/scraping/index.js b/test/features/scraping/index.js
index 3853c36..eb67b26 100644
--- a/test/features/scraping/index.js
+++ b/test/features/scraping/index.js
@@ -199,7 +199,8 @@
 });
 
 // Correctly adds authors from zotero 'name' field
-it('Correctly skips bad authors from Zotero whilst converting to 
mediawiki format', function() {
+// TODO: Add new tests to test this issue
+it.skip('Correctly skips bad authors from Zotero whilst converting to 
mediawiki format', function() {
 return 
server.query('http://dx.doi.org/10.1001/jama.296.10.1274').then(function(res) {
 var expectedAuthor = [
 [ '', 'Detsky ME'],
@@ -210,7 +211,7 @@
 ['','Booth CM']
 ];
 assert.status(res, 200);
-assert.checkCitation(res, 'DOes this patient with headache 
have a migraine or need neuroimaging?'); // Title from crossRef
+assert.checkCitation(res, 'Does This Patient With Headache 
Have a Migraine or Need Neuroimaging?'); // Title from crossRef
 assert.deepEqual(res.body[0].author, expectedAuthor);
 assert.deepEqual(res.body[0].itemType, 'journalArticle', 
'Wrong itemType; expected journalArticle, got' + res.body[0].itemType);
 });
@@ -313,7 +314,17 @@
 assert.checkCitation(res, 'Pinlig for Skåber');
 assert.isInArray(res.body[0].source, 'citoid');
 assert.deepEqual(res.body[0].itemType, 'newspaperArticle');
-assert.deepEqual(res.body[0].publicationTitle, 'Aftenposten')
+assert.deepEqual(res.body[0].publicationTitle, 'Aftenposten');
+});
+});
+
+it('dublinCore data but no highWire metadata', function() {
+return

[MediaWiki-commits] [Gerrit] search/repository-swift[master]: [maven-release-plugin] prepare for next development iteration

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: [maven-release-plugin] prepare for next development iteration
..


[maven-release-plugin] prepare for next development iteration

Change-Id: Ia287582e2583a7704e2ae082fdbb93502d5147fb
---
M README.md
M pom.xml
2 files changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/README.md b/README.md
index 7c3d3b8..3a4317d 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,9 @@
 | 2.1.1   | 2.1.1 | 2016-05-12   |
 | 2.3.3.1 | 2.3.3 | 2016-06-27   |
 | 2.3.4   | 2.3.4 | 2016-08-03   |
+| 2.3.5   | 2.3.5 | 2016-09-09   |
 | 2.4.0   | 2.4.0 | 2016-09-09   |
+| 2.4.1   | 2.4.1 | 2016-10-10   |
 
 Only the versions in the table above should be used. The in-between releases
 were buggy and are not recommended.
diff --git a/pom.xml b/pom.xml
index cee6428..fd7356f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 org.wikimedia.elasticsearch.swift
 swift-repository-plugin
-2.4.1
+2.4.2-SNAPSHOT
 jar
 SwiftRepositoryPlugin
 Repository plugin for Elasticsearch backed by 
Swift

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia287582e2583a7704e2ae082fdbb93502d5147fb
Gerrit-PatchSet: 1
Gerrit-Project: search/repository-swift
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] search/repository-swift[master]: [maven-release-plugin] prepare release swift-repository-plug...

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: [maven-release-plugin] prepare release 
swift-repository-plugin-2.4.1
..


[maven-release-plugin] prepare release swift-repository-plugin-2.4.1

Change-Id: I7e9a47ab22165940ee82eec2afaeffa480539178
---
M pom.xml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/pom.xml b/pom.xml
index 8ea8beb..cee6428 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 org.wikimedia.elasticsearch.swift
 swift-repository-plugin
-2.4.1-SNAPSHOT
+2.4.1
 jar
 SwiftRepositoryPlugin
 Repository plugin for Elasticsearch backed by 
Swift

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e9a47ab22165940ee82eec2afaeffa480539178
Gerrit-PatchSet: 1
Gerrit-Project: search/repository-swift
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] search/repository-swift[master]: Upgrade to elastic 2.4.1

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Upgrade to elastic 2.4.1
..


Upgrade to elastic 2.4.1

Change-Id: I7c6328c33faeb49832cd64feb8b629c47b57b064
---
M pom.xml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/pom.xml b/pom.xml
index bfee359..8ea8beb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 
 
 UTF-8
-2.4.0
+2.4.1
 swift-repository
 1.7
 1.7

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c6328c33faeb49832cd64feb8b629c47b57b064
Gerrit-PatchSet: 1
Gerrit-Project: search/repository-swift
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Mark 1 hooks deprecated by ContentHandler as such

2016-10-10 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Mark 1 hooks deprecated by ContentHandler as such
..

Mark 1 hooks deprecated by ContentHandler as such

EditFilterMerged hook now marked as deprecated in 1.21.

Bug: T145728
Change-Id: I1c0589b617b5aa3dc444259fad06d9c10379728f
---
M RELEASE-NOTES-1.28
M includes/EditPage.php
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/37/315137/1

diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 8a25a05..8065a6b 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -225,8 +225,8 @@
   migrate to using the same functions on a ProxyLookup instance, obtainable 
from
   MediaWikiServices.
 * The ArticleAfterFetchContent, ArticleInsertComplete, ArticleSave, 
ArticleSaveComplete,
-  ArticleViewCustom, EditPageGetDiffText, EditPageGetPreviewText and 
ShowRawCssJs hooks
-  will now emit deprecation warnings if used.
+  ArticleViewCustom, EditFilterMerged, EditPageGetDiffText, 
EditPageGetPreviewText
+  and ShowRawCssJs hooks will now emit deprecation warnings if used.
 
 == Compatibility ==
 
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 8226da5..3c9ec41 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1613,7 +1613,7 @@
protected function runPostMergeFilters( Content $content, Status 
$status, User $user ) {
// Run old style post-section-merge edit filter
if ( !ContentHandler::runLegacyHooks( 'EditFilterMerged',
-   [ $this, $content, &$this->hookError, $this->summary ]
+   [ $this, $content, &$this->hookError, $this->summary ], 
'1.21'
) ) {
# Error messages etc. could be handled within the 
hook...
$status->fatal( 'hookaborted' );

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

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

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

[MediaWiki-commits] [Gerrit] search/highlighter[master]: [maven-release-plugin] prepare for next development iteration

2016-10-10 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: [maven-release-plugin] prepare for next development iteration
..

[maven-release-plugin] prepare for next development iteration

Change-Id: I14f09a1d33b44b15d06140d2f29e7106ad76db84
---
M README.md
M experimental-highlighter-core/pom.xml
M experimental-highlighter-elasticsearch-plugin/pom.xml
M experimental-highlighter-lucene/pom.xml
M pom.xml
5 files changed, 8 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/36/315136/1

diff --git a/README.md b/README.md
index 594b66e..aa03864 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,9 @@
 
 | Experimental Highlighter Plugin |  ElasticSearch  |
 |-|-|
-| 2.4.0, master branch| 2.4.0   |
+| 2.4.1, master branch| 2.4.1   |
+| 2.4.0,  | 2.4.0   |
+| 2.3.5, 2.3 branch   | 2.3.5   |
 | 2.3.4   | 2.3.4   |
 | 2.3.3   | 2.3.3   |
 | 2.2.2, 2.2 branch   | 2.2.2   |
diff --git a/experimental-highlighter-core/pom.xml 
b/experimental-highlighter-core/pom.xml
index c85ff4a..edfb9fa 100644
--- a/experimental-highlighter-core/pom.xml
+++ b/experimental-highlighter-core/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1
+2.4.2-SNAPSHOT
   
   experimental-highlighter-core
   jar
diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml 
b/experimental-highlighter-elasticsearch-plugin/pom.xml
index 4064c65..82ef6ed 100644
--- a/experimental-highlighter-elasticsearch-plugin/pom.xml
+++ b/experimental-highlighter-elasticsearch-plugin/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1
+2.4.2-SNAPSHOT
   
   experimental-highlighter-elasticsearch-plugin
   jar
diff --git a/experimental-highlighter-lucene/pom.xml 
b/experimental-highlighter-lucene/pom.xml
index 180cc5b..d2d409a 100644
--- a/experimental-highlighter-lucene/pom.xml
+++ b/experimental-highlighter-lucene/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1
+2.4.2-SNAPSHOT
   
   experimental-highlighter-lucene
   jar
diff --git a/pom.xml b/pom.xml
index 0c0b744..3c56d49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search.highlighter
   experimental
-  2.4.1
+  2.4.2-SNAPSHOT
   pom
 
   
@@ -40,7 +40,7 @@
 
https://gerrit.wikimedia.org/r/#/admin/projects/search/highlighter
 
scm:git:https://gerrit.wikimedia.org/r/search/highlighter
 
scm:git:https://gerrit.wikimedia.org/r/search/highlighter
-experimental-2.4.1
+HEAD
   
 
   

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I14f09a1d33b44b15d06140d2f29e7106ad76db84
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] search/highlighter[master]: Upgrade to elastic 2.4.1

2016-10-10 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: Upgrade to elastic 2.4.1
..

Upgrade to elastic 2.4.1

Change-Id: I4f9d369fefd73392601cd2da6c43e2cd17f01f2d
---
M pom.xml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/34/315134/1

diff --git a/pom.xml b/pom.xml
index 7d216f4..9c8e489 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
 
   
 UTF-8
-2.4.0
+2.4.1
 
 5.5.2
@@ -294,7 +294,7 @@
   securemock

-  1.1
+  1.2
   test
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f9d369fefd73392601cd2da6c43e2cd17f01f2d
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] search/highlighter[master]: [maven-release-plugin] prepare release experimental-2.4.1

2016-10-10 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: [maven-release-plugin] prepare release experimental-2.4.1
..

[maven-release-plugin] prepare release experimental-2.4.1

Change-Id: Ia3860f234e32f5b1f985e6cdf55ef768469be705
---
M experimental-highlighter-core/pom.xml
M experimental-highlighter-elasticsearch-plugin/pom.xml
M experimental-highlighter-lucene/pom.xml
M pom.xml
4 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/highlighter 
refs/changes/35/315135/1

diff --git a/experimental-highlighter-core/pom.xml 
b/experimental-highlighter-core/pom.xml
index a7e128d..c85ff4a 100644
--- a/experimental-highlighter-core/pom.xml
+++ b/experimental-highlighter-core/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1-SNAPSHOT
+2.4.1
   
   experimental-highlighter-core
   jar
diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml 
b/experimental-highlighter-elasticsearch-plugin/pom.xml
index bb3d6bc..4064c65 100644
--- a/experimental-highlighter-elasticsearch-plugin/pom.xml
+++ b/experimental-highlighter-elasticsearch-plugin/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1-SNAPSHOT
+2.4.1
   
   experimental-highlighter-elasticsearch-plugin
   jar
diff --git a/experimental-highlighter-lucene/pom.xml 
b/experimental-highlighter-lucene/pom.xml
index 07c9b8a..180cc5b 100644
--- a/experimental-highlighter-lucene/pom.xml
+++ b/experimental-highlighter-lucene/pom.xml
@@ -3,7 +3,7 @@
   
 org.wikimedia.search.highlighter
 experimental
-2.4.1-SNAPSHOT
+2.4.1
   
   experimental-highlighter-lucene
   jar
diff --git a/pom.xml b/pom.xml
index 9c8e489..0c0b744 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search.highlighter
   experimental
-  2.4.1-SNAPSHOT
+  2.4.1
   pom
 
   
@@ -40,7 +40,7 @@
 
https://gerrit.wikimedia.org/r/#/admin/projects/search/highlighter
 
scm:git:https://gerrit.wikimedia.org/r/search/highlighter
 
scm:git:https://gerrit.wikimedia.org/r/search/highlighter
-HEAD
+experimental-2.4.1
   
 
   

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3860f234e32f5b1f985e6cdf55ef768469be705
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] search/extra[master]: [maven-release-plugin] prepare release extra-2.4.1

2016-10-10 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: [maven-release-plugin] prepare release extra-2.4.1
..

[maven-release-plugin] prepare release extra-2.4.1

Change-Id: Iacea68cd5b82400904ed0d91f166877ca591d225
---
M pom.xml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/extra 
refs/changes/32/315132/1

diff --git a/pom.xml b/pom.xml
index 40f9725..07ee946 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search
   extra
-  2.4.1-SNAPSHOT
+  2.4.1
   Extra queries and filters for Elasticsearch.
 
   
@@ -34,7 +34,7 @@
 https://gerrit.wikimedia.org/r/#/admin/projects/search/extra
 
scm:git:https://gerrit.wikimedia.org/r/search/extra
 
scm:git:https://gerrit.wikimedia.org/r/search/extra
-HEAD
+extra-2.4.1
   
 
   

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacea68cd5b82400904ed0d91f166877ca591d225
Gerrit-PatchSet: 1
Gerrit-Project: search/extra
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] search/extra[master]: [maven-release-plugin] prepare for next development iteration

2016-10-10 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: [maven-release-plugin] prepare for next development iteration
..

[maven-release-plugin] prepare for next development iteration

Change-Id: If986f77342efbe774ca97829f4bb8ca796407634
---
M README.md
M pom.xml
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/extra 
refs/changes/33/315133/1

diff --git a/README.md b/README.md
index cf58f6f..0f7fbd9 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,9 @@
 
 | Extra Queries and Filters Plugin |  ElasticSearch  |
 |--|-|
-| 2.4.0, master| 2.4.0   |
+| 2.4.1, master| 2.4.1   |
+| 2.4.0| 2.4.0   |
+| 2.3.5, 2.3 branch| 2.3.5   |
 | 2.3.4| 2.3.4   |
 | 2.3.3| 2.3.3   |
 | 1.7.0 -> 1.7.1, 1.7 branch   | 1.7.X   |
diff --git a/pom.xml b/pom.xml
index 07ee946..46fc3d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   org.wikimedia.search
   extra
-  2.4.1
+  2.4.2-SNAPSHOT
   Extra queries and filters for Elasticsearch.
 
   
@@ -34,7 +34,7 @@
 https://gerrit.wikimedia.org/r/#/admin/projects/search/extra
 
scm:git:https://gerrit.wikimedia.org/r/search/extra
 
scm:git:https://gerrit.wikimedia.org/r/search/extra
-extra-2.4.1
+HEAD
   
 
   

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If986f77342efbe774ca97829f4bb8ca796407634
Gerrit-PatchSet: 1
Gerrit-Project: search/extra
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] search/extra[master]: Upgrade to elastic 2.4.1

2016-10-10 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: Upgrade to elastic 2.4.1
..

Upgrade to elastic 2.4.1

Change-Id: Ieb8df903b7e63eec17fa5fa4ae35c626a9e94eaf
---
M pom.xml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/extra 
refs/changes/31/315131/1

diff --git a/pom.xml b/pom.xml
index 88b84bc..40f9725 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 
   
 UTF-8
-2.4.0
+2.4.1
 5.5.2
 1.7
 1.7

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb8df903b7e63eec17fa5fa4ae35c626a9e94eaf
Gerrit-PatchSet: 1
Gerrit-Project: search/extra
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] search/repository-swift[master]: [maven-release-plugin] prepare for next development iteration

2016-10-10 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: [maven-release-plugin] prepare for next development iteration
..

[maven-release-plugin] prepare for next development iteration

Change-Id: Ia287582e2583a7704e2ae082fdbb93502d5147fb
---
M README.md
M pom.xml
2 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/repository-swift 
refs/changes/30/315130/1

diff --git a/README.md b/README.md
index 7c3d3b8..3a4317d 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,9 @@
 | 2.1.1   | 2.1.1 | 2016-05-12   |
 | 2.3.3.1 | 2.3.3 | 2016-06-27   |
 | 2.3.4   | 2.3.4 | 2016-08-03   |
+| 2.3.5   | 2.3.5 | 2016-09-09   |
 | 2.4.0   | 2.4.0 | 2016-09-09   |
+| 2.4.1   | 2.4.1 | 2016-10-10   |
 
 Only the versions in the table above should be used. The in-between releases
 were buggy and are not recommended.
diff --git a/pom.xml b/pom.xml
index cee6428..fd7356f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 org.wikimedia.elasticsearch.swift
 swift-repository-plugin
-2.4.1
+2.4.2-SNAPSHOT
 jar
 SwiftRepositoryPlugin
 Repository plugin for Elasticsearch backed by 
Swift

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia287582e2583a7704e2ae082fdbb93502d5147fb
Gerrit-PatchSet: 1
Gerrit-Project: search/repository-swift
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] search/repository-swift[master]: Upgrade to elastic 2.4.1

2016-10-10 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: Upgrade to elastic 2.4.1
..

Upgrade to elastic 2.4.1

Change-Id: I7c6328c33faeb49832cd64feb8b629c47b57b064
---
M pom.xml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/repository-swift 
refs/changes/28/315128/1

diff --git a/pom.xml b/pom.xml
index bfee359..8ea8beb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 
 
 UTF-8
-2.4.0
+2.4.1
 swift-repository
 1.7
 1.7

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c6328c33faeb49832cd64feb8b629c47b57b064
Gerrit-PatchSet: 1
Gerrit-Project: search/repository-swift
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] search/repository-swift[master]: [maven-release-plugin] prepare release swift-repository-plug...

2016-10-10 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: [maven-release-plugin] prepare release 
swift-repository-plugin-2.4.1
..

[maven-release-plugin] prepare release swift-repository-plugin-2.4.1

Change-Id: I7e9a47ab22165940ee82eec2afaeffa480539178
---
M pom.xml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/repository-swift 
refs/changes/29/315129/1

diff --git a/pom.xml b/pom.xml
index 8ea8beb..cee6428 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 org.wikimedia.elasticsearch.swift
 swift-repository-plugin
-2.4.1-SNAPSHOT
+2.4.1
 jar
 SwiftRepositoryPlugin
 Repository plugin for Elasticsearch backed by 
Swift

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e9a47ab22165940ee82eec2afaeffa480539178
Gerrit-PatchSet: 1
Gerrit-Project: search/repository-swift
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] mediawiki...CategorySlideShow[master]: Remove dependency on 'jquery' and 'mediawiki' modules

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Remove dependency on 'jquery' and 'mediawiki' modules
..


Remove dependency on 'jquery' and 'mediawiki' modules

Follows-up ec77226078.

Not needed since these are base modules, which are not valid
dependencies (PHPUnit structure test fails).

Change-Id: I2129de25d78ce68ab4aa875f62276dcf801a8216
---
M CategorySlideShow.php
1 file changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/CategorySlideShow.php b/CategorySlideShow.php
index 11404db..65c79ea 100644
--- a/CategorySlideShow.php
+++ b/CategorySlideShow.php
@@ -40,10 +40,8 @@
),
 
'dependencies' => array(
-   'mediawiki',
'mediawiki.Title',
-   'mediawiki.api.query',
-   'jquery',
+   'mediawiki.api',
'jquery.ui.dialog',
),
 ) + $moduleInfo;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2129de25d78ce68ab4aa875f62276dcf801a8216
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/CategorySlideShow
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Fix var_dump() and undefined var warning.

2016-10-10 Thread jenkins-bot (Code Review)

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

Change subject: Fix var_dump() and undefined var warning.
..


Fix var_dump() and undefined var warning.

Change-Id: Iddb4d3bb8dfd42007ead37cf609f421ffb7067b8
---
M includes/content/CollaborationListContent.php
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
index 33d32aa..824328d 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -147,7 +147,9 @@
if ( !$lang ) {
$lang = $title->getPageLanguage();
}
-   $listOptions = $this->getFullRenderListOptions() + 
(array)$this->options;
+   $listOptions = $this->getFullRenderListOptions()
+   + (array)$this->options
+   + $this->getDefaultOptions();
$text = $this->convertToWikitext( $lang, $listOptions );
$output = $wgParser->parse( $text, $title, $options, true, 
true, $revId );
$output->addJsConfigVars( 'wgCollaborationKitIsMemberList', 
$listOptions['ismemberlist'] );
@@ -235,7 +237,6 @@
// you also need to change it in the 
stylesheet.
$text .= '[[File:' . $image->getName() 
. "|left|64px|alt=]]\n";
} else {
-var_dump( $options );
if ( $options['ismemberlist'] ) {
$placeholderIcon = 
'mw-ckicon-user-grey2';
} else {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iddb4d3bb8dfd42007ead37cf609f421ffb7067b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Fix var_dump() and undefined var warning.

2016-10-10 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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

Change subject: Fix var_dump() and undefined var warning.
..

Fix var_dump() and undefined var warning.

Change-Id: Iddb4d3bb8dfd42007ead37cf609f421ffb7067b8
---
M includes/content/CollaborationListContent.php
1 file changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
index 33d32aa..824328d 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -147,7 +147,9 @@
if ( !$lang ) {
$lang = $title->getPageLanguage();
}
-   $listOptions = $this->getFullRenderListOptions() + 
(array)$this->options;
+   $listOptions = $this->getFullRenderListOptions()
+   + (array)$this->options
+   + $this->getDefaultOptions();
$text = $this->convertToWikitext( $lang, $listOptions );
$output = $wgParser->parse( $text, $title, $options, true, 
true, $revId );
$output->addJsConfigVars( 'wgCollaborationKitIsMemberList', 
$listOptions['ismemberlist'] );
@@ -235,7 +237,6 @@
// you also need to change it in the 
stylesheet.
$text .= '[[File:' . $image->getName() 
. "|left|64px|alt=]]\n";
} else {
-var_dump( $options );
if ( $options['ismemberlist'] ) {
$placeholderIcon = 
'mw-ckicon-user-grey2';
} else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddb4d3bb8dfd42007ead37cf609f421ffb7067b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Do not relocate first paragraph in new endpoint

2016-10-10 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Do not relocate first paragraph in new endpoint
..

Do not relocate first paragraph in new endpoint

This moves the logic for relocating a lead paragraph into the routes
that serve it. Previously we did this for all endpoints but it doesn't
seem necessary for the media endpoint.

This means the transformation is not invoked in the new endpoint.

The method is also updated to take the lead as an input to avoid an
addition node lookup.

Change-Id: Iedd38dca724d62e7b9a86cf04d9858b213aae27c
---
M lib/parsoid-access.js
M lib/transformations/relocateFirstParagraph.js
M lib/transforms.js
M routes/mobile-sections.js
M routes/mobile-summary.js
5 files changed, 21 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/26/315126/1

diff --git a/lib/parsoid-access.js b/lib/parsoid-access.js
index abbd482..420589b 100644
--- a/lib/parsoid-access.js
+++ b/lib/parsoid-access.js
@@ -13,7 +13,6 @@
 var parseSection = require('./parseSection');
 var parseProperty = require('./parseProperty');
 var parseDefinition = require('./parseDefinition');
-var relocateFirstParagraph = 
require('./transformations/relocateFirstParagraph');
 var transforms = require('./transforms');
 var HTTPError = sUtil.HTTPError;
 
@@ -151,13 +150,6 @@
 transforms.stripUnneededMarkup(doc);
 addSectionDivs(doc);
 transforms.addRequiredMarkup(doc);
-
-// Move the first good paragraph up for any page except main pages.
-// It's ok to do unconditionally since we throw away the page
-// content if this turns out to be a main page.
-//
-// TODO: should we also exclude file and other special pages?
-relocateFirstParagraph(doc);
 
 page.sections = getSectionsText(doc);
 return page;
diff --git a/lib/transformations/relocateFirstParagraph.js 
b/lib/transformations/relocateFirstParagraph.js
index 5d5dcf1..b910600 100644
--- a/lib/transformations/relocateFirstParagraph.js
+++ b/lib/transformations/relocateFirstParagraph.js
@@ -77,12 +77,15 @@
 return leadSpan;
 }
 
-// Move the first non-empty paragraph (and related elements) of the lead 
section
-// to the top of the lead section.
-// This will have the effect of shifting the infobox and/or any images at the 
top of the page
-// below the first paragraph, allowing the user to start reading the page 
right away.
-function moveFirstGoodParagraphUp(doc) {
-var leadSection = doc.getElementById('section_0');
+/**
+ * Move the first non-empty paragraph (and related elements) of the lead 
section
+ * to the top of the lead section.
+ * This will have the effect of shifting the infobox and/or any images at the 
top of the page
+ * below the first paragraph, allowing the user to start reading the page 
right away.
+ * @param {Document} lead a document that has the lead section as the body
+ */
+function moveFirstGoodParagraphUp(lead) {
+var leadSection = lead.body;
 if ( !leadSection ) {
 return;
 }
@@ -92,7 +95,7 @@
 return;
 }
 
-var leadSpan = createLeadSpan( doc, childNodes );
+var leadSpan = createLeadSpan( lead, childNodes );
 leadSection.insertBefore( leadSpan, leadSection.firstChild );
 }
 
diff --git a/lib/transforms.js b/lib/transforms.js
index c20bfa9..08ce2e1 100644
--- a/lib/transforms.js
+++ b/lib/transforms.js
@@ -11,6 +11,7 @@
 var hideRedLinks = require('./transformations/hideRedLinks');
 var hideIPA = require('./transformations/hideIPA');
 var extractHatnotes = require('./transformations/extractHatnotes');
+var relocateFirstParagraph = 
require('./transformations/relocateFirstParagraph');
 
 var transforms = {};
 
@@ -258,6 +259,7 @@
 transforms._rmBracketSpans = _rmBracketSpans;
 transforms._rmElementsWithSelectors = _rmElementsWithSelectors;
 
+transforms.relocateFirstParagraph = relocateFirstParagraph;
 transforms.extractHatnotes = extractHatnotes;
 
 module.exports = transforms;
diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js
index e1524ba..cd2d41e 100644
--- a/routes/mobile-sections.js
+++ b/routes/mobile-sections.js
@@ -84,6 +84,14 @@
  */
 function buildLead(input, removeNodes) {
 var lead = domino.createDocument(input.page.sections[0].text);
+if ( !removeNodes ) {
+// Move the first good paragraph up for any page except main pages.
+// It's ok to do unconditionally since we throw away the page
+// content if this turns out to be a main page.
+//
+// TODO: should we also exclude file and other special pages?
+transforms.relocateFirstParagraph(lead);
+}
 var hatnotes = transforms.extractHatnotes(lead, removeNodes);
 
 // update text after extractions have taken place
diff --git

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

2016-10-10 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Replace ArticleSaveComplete hook usage
..

Replace ArticleSaveComplete hook usage

Bug: T147390
Change-Id: I3f835ad758685792b8be0d18746591122d81b476
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f835ad758685792b8be0d18746591122d81b476
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EtherEditor
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

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

2016-10-10 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Replace ArticleSaveComplete hook usage
..

Replace ArticleSaveComplete hook usage

Bug: T147390
Change-Id: I8536dd78d03772f40ffb4815354ef59a204db086
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8536dd78d03772f40ffb4815354ef59a204db086
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [BlueSpiceExtensions] Add dependance on extension BlueSpiceF...

2016-10-10 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: [BlueSpiceExtensions] Add dependance on extension 
BlueSpiceFoundation
..

[BlueSpiceExtensions] Add dependance on extension BlueSpiceFoundation

Change-Id: I9b808a7d24bbc33c240a3be27f90321cd812a52c
---
M zuul/parameter_functions.py
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/23/315123/1

diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index a31be86..2fa8630 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -88,6 +88,7 @@
 'ApiFeatureUsage': ['Elastica'],
 'Arrays': ['Loops', 'ParserFunctions', 'Variables'],
 'ArticlePlaceholder': ['Wikibase', 'Scribunto'],
+'BlueSpiceExtensions': ['BlueSpiceFoundation'],
 'Capiunto': ['Scribunto'],
 'Cite': ['VisualEditor'],
 'Citoid': ['Cite', 'VisualEditor'],

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

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

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

1 2 3 >

1 - 100 of 241 matches

Mail list logo