date:20170112

[MediaWiki-commits] [Gerrit] mediawiki...CodeEditor[master]: Use OOUI for prompt dialog

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/326128 )

Change subject: Use OOUI for prompt dialog
..


Use OOUI for prompt dialog

Depends on latest OOUI, and therefore MW 1.29.

Change-Id: I91594f534a2dca657785357a1dcb39e86d072bac
---
M extension.json
M modules/jquery.codeEditor.js
2 files changed, 30 insertions(+), 14 deletions(-)

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



diff --git a/extension.json b/extension.json
index 7143b75..38ee68a 100644
--- a/extension.json
+++ b/extension.json
@@ -10,7 +10,7 @@
"license-name": "GPL-2.0+",
"type": "other",
"requires": {
-   "MediaWiki": ">= 1.27.0",
+   "MediaWiki": ">= 1.29.0",
"extensions": {
"WikiEditor": "*"
}
diff --git a/modules/jquery.codeEditor.js b/modules/jquery.codeEditor.js
index 1ae8ca9..0cd0331 100644
--- a/modules/jquery.codeEditor.js
+++ b/modules/jquery.codeEditor.js
@@ -126,22 +126,38 @@
);
},
aceGotoLineColumn: function () {
-   var lineinput = prompt( mw.msg( 
'codeeditor-gotoline-prompt' ), mw.msg( 'codeeditor-gotoline-placeholder' ) ),
-   matches = lineinput ? lineinput.split( 
':' ) : [],
+   OO.ui.prompt( mw.msg( 
'codeeditor-gotoline-prompt' ), {
+   textInput: { placeholder: mw.msg( 
'codeeditor-gotoline-placeholder' ) }
+   } ).done( function ( result ) {
+   var matches, line, column;
+
+   if ( !result ) {
+   return;
+   }
+
+   matches = result.split( ':' );
line = 0,
column = 0;
 
-   if ( matches.length > 0 ) {
-   line = parseInt( matches[ 0 ], 10 ) || 
0;
-   line--;
-   }
-   if ( matches.length > 1 ) {
-   column = parseInt( matches[ 1 ], 10 ) 
|| 0;
-   column--;
-   }
-   context.codeEditor.navigateTo( line, column );
-   // Scroll up a bit to give some context
-   context.codeEditor.scrollToRow( line - 4 );
+   if ( matches.length > 0 ) {
+   line = +matches[ 0 ];
+   if ( isNaN( line ) ) {
+   return;
+   } else {
+   // Lines are 
zero-indexed
+   line--;
+   }
+   }
+   if ( matches.length > 1 ) {
+   column = +matches[ 1 ];
+   if ( isNaN( column ) ) {
+   column = 0;
+   }
+   }
+   context.codeEditor.navigateTo( line, 
column );
+   // Scroll up a bit to give some context
+   context.codeEditor.scrollToRow( line - 
4 );
+   } );
},
setupCodeEditorToolbar: function () {
var toggleEditor,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91594f534a2dca657785357a1dcb39e86d072bac
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Fomafix 
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...JsonConfig[master]: Always lua-reindex tabular data

2017-01-12 Thread Yurik (Code Review)

Yurik has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331958 )

Change subject: Always lua-reindex tabular data
..

Always lua-reindex tabular data

Bug: T155213
Change-Id: I6b58d3f82ced0e50369eb740287b7296103accb0
---
M includes/JCLuaLibrary.php
1 file changed, 7 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/JsonConfig 
refs/changes/58/331958/1

diff --git a/includes/JCLuaLibrary.php b/includes/JCLuaLibrary.php
index 49a491e..df5781b 100644
--- a/includes/JCLuaLibrary.php
+++ b/includes/JCLuaLibrary.php
@@ -64,12 +64,14 @@
 
if ( !$content ) {
$result = false;
-   } elseif ( $language === null || !method_exists( $content, 
'getLocalizedData' ) ) {
-   $result = $content->getData();
} else {
-   /** @var JCDataContent $content */
-   $result = $content->getLocalizedData( $language );
-
+   if ( $language === null || !method_exists( $content, 
'getLocalizedData' ) ) {
+   $result = $content->getData();
+   } else {
+   /** @var JCDataContent $content */
+   $result = $content->getLocalizedData( $language 
);
+   }
+   // Always re-index tabular data
if ( $content instanceof JCTabularContent ) {
self::reindexTabularData( $result );
}

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Prompt user before selected viewed items are deleted fro...

2017-01-12 Thread Probz360 (Code Review)

Probz360 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331957 )

Change subject: Prompt user before selected viewed items are deleted from 
history
..

Prompt user before selected viewed items are deleted from history

When full history is deleted the user is prompted to confirm deletion, applied 
same functionality to when a single (or several) item(s) are selected for 
deletion to remain consistent. May be preferable to delete via async task, a 
little beyond my abilities, but happy to refactor on a larger effort if 
preferred.

T103685

Change-Id: Ia0a7b24e02bbebe9ef95629218ad28a195fa1fbe
---
M app/src/main/java/org/wikipedia/history/HistoryFragment.java
M app/src/main/java/org/wikipedia/main/MainFragment.java
M app/src/main/res/values/strings.xml
3 files changed, 41 insertions(+), 10 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/history/HistoryFragment.java 
b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
index 3993d25..d5f4f42 100644
--- a/app/src/main/java/org/wikipedia/history/HistoryFragment.java
+++ b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
@@ -50,6 +50,7 @@
 public interface Callback {
 void onLoadPage(PageTitle title, HistoryEntry entry);
 void onClearHistory();
+void onSelectHistoryDelete(ActionMode mode);
 }
 
 private ListView historyEntryList;
@@ -62,6 +63,7 @@
 
 private String currentSearchQuery;
 private LoaderCallback loaderCallback;
+private SparseBooleanArray checkedItems;
 
 private ActionMode actionMode;
 private SearchActionModeCallback searchActionModeCallback = new 
HistorySearchCallback();
@@ -275,18 +277,30 @@
 }
 
 @Override
-public boolean onActionItemClicked(ActionMode mode, MenuItem 
item) {
+public boolean onActionItemClicked(final ActionMode mode, 
MenuItem item) {
 if (item.getItemId() == R.id.menu_delete_selected_history) 
{
-SparseBooleanArray checkedItems = 
historyEntryList.getCheckedItemPositions();
-for (int i = 0; i < checkedItems.size(); i++) {
-if (checkedItems.valueAt(i)) {
-
app.getDatabaseClient(HistoryEntry.class).delete(
-
HistoryEntry.DATABASE_TABLE.fromCursor((Cursor) 
adapter.getItem(checkedItems.keyAt(i))),
-
PageHistoryContract.PageWithImage.SELECTION);
-}
-}
-mode.finish();
+checkedItems = 
historyEntryList.getCheckedItemPositions();
+new AlertDialog.Builder(getContext())
+
.setTitle(R.string.dialog_title_delete_selected_history)
+
.setMessage(R.string.dialog_message_delete_selected_history)
+.setPositiveButton(R.string.yes, new 
DialogInterface.OnClickListener() {
+@Override
+public void onClick(DialogInterface 
dialog, int which) {
+// Clear selected history
+for (int i = 0; i < 
checkedItems.size(); i++) {
+if (checkedItems.valueAt(i)) {
+
app.getDatabaseClient(HistoryEntry.class).delete(
+
HistoryEntry.DATABASE_TABLE.fromCursor((Cursor) 
adapter.getItem(checkedItems.keyAt(i))),
+
PageHistoryContract.PageWithImage.SELECTION);
+}
+}
+
+onSelectHistoryDelete(mode);
+}
+})
+.setNegativeButton(R.string.no, 
null).create().show();
 return true;
+
 } else {
 throw new RuntimeException("Unknown context menu item 
clicked");
 }
@@ -358,6 +372,14 @@
 }
 }
 
+private void onSelectHistoryDelete(ActionMode mode) {
+Callback callback = callback();
+if (callback != null) {
+callback.onSelectHistoryDelete(mode);
+}
+mode.finish();
+}
+
 private void restartLoader() {
 
getActivity().getSupportLoaderManager().restartLoader(HISTORY_FRAGMENT_LOADER_ID,
 null, loaderCallback);
 }
@@ -398,4 +420,5 @@
 @Nullable private Callback callback() {

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Allow extensions to mark a config option as public

2017-01-12 Thread Florianschmidtwelzow (Code Review)

Florianschmidtwelzow has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331954 )

Change subject: Allow extensions to mark a config option as public
..

Allow extensions to mark a config option as public

This value is currently unused but will be used in later changes
for allowing to view configuration options on-wiki.

Bug: T155156
Change-Id: I020c148157818ef8bfee0e79cb5a6f43181c5a8c
---
M docs/extension.schema.v2.json
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/54/331954/1

diff --git a/docs/extension.schema.v2.json b/docs/extension.schema.v2.json
index a5543d1..8a74267 100644
--- a/docs/extension.schema.v2.json
+++ b/docs/extension.schema.v2.json
@@ -706,6 +706,11 @@
"description": {
"type": ["string", 
"array"],
"description": "A 
description of the config setting, mostly for documentation/developers"
+   },
+   "public": {
+   "type": "boolean",
+   "default": false,
+   "description": "Whether 
this configuration option and its value is allowed to be revealed in public or 
not."
}
}
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Allow extensions to set a description message

2017-01-12 Thread Florianschmidtwelzow (Code Review)

Florianschmidtwelzow has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331955 )

Change subject: Allow extensions to set a description message
..

Allow extensions to set a description message

In addition to the general (english) description key in a config
option in extension.json, developers now can give a description message
key. This key will be used in user interfaces, such as viewing configuration
options on-wiki (see later changes).

Bug: T155157
Change-Id: I5c780b3347bd54a05694cfa6de93879656b4e921
---
M docs/extension.schema.v2.json
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/docs/extension.schema.v2.json b/docs/extension.schema.v2.json
index 8a74267..2fffc42 100644
--- a/docs/extension.schema.v2.json
+++ b/docs/extension.schema.v2.json
@@ -707,6 +707,10 @@
"type": ["string", 
"array"],
"description": "A 
description of the config setting, mostly for documentation/developers"
},
+   "deccriptionmsg": {
+   "type": "string",
+   "description": "The 
message key which should be used as a description for this configuration option 
in a user interface. If empty, description will be used."
+   },
"public": {
"type": "boolean",
"default": false,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Expose config array to ExtensionRegistry

2017-01-12 Thread Florianschmidtwelzow (Code Review)

Florianschmidtwelzow has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331956 )

Change subject: Expose config array to ExtensionRegistry
..

Expose config array to ExtensionRegistry

Currently, the ExtensionProcessor processes the config array of the
extension and just sets the value as a global. In this way, however,
the metadata of the configs (description, public, ...) aren't available.

This change exposes the configurations in the extracted data as the
config key.

Change-Id: Ie41e6ecb8d08a5b20b56eb2281af1dfdd808b2c4
---
M includes/registration/ExtensionProcessor.php
M includes/registration/ExtensionRegistry.php
2 files changed, 9 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/56/331956/1

diff --git a/includes/registration/ExtensionProcessor.php 
b/includes/registration/ExtensionProcessor.php
index 1212f99..ce3642f 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -153,6 +153,11 @@
protected $credits = [];
 
/**
+* @var array
+*/
+   protected $config = [];
+
+   /**
 * Any thing else in the $info that hasn't
 * already been processed
 *
@@ -208,6 +213,7 @@
 
return [
'globals' => $this->globals,
+   'config' => $this->config,
'defines' => $this->defines,
'callbacks' => $this->callbacks,
'credits' => $this->credits,
@@ -397,7 +403,7 @@
}
if ( isset( $info['config'] ) ) {
foreach ( $info['config'] as $key => $data ) {
-   $value = $data['value'];
+   $value = &$data['value'];
if ( isset( $data['merge_strategy'] ) ) {

$value[ExtensionRegistry::MERGE_STRATEGY] = $data['merge_strategy'];
}
@@ -405,6 +411,7 @@
$value = "$dir/$value";
}
$this->globals["$prefix$key"] = $value;
+   $this->config[$key] = $data;
}
}
}
diff --git a/includes/registration/ExtensionRegistry.php 
b/includes/registration/ExtensionRegistry.php
index 344dd8f..0c832fe 100644
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -31,7 +31,7 @@
/**
 * Bump whenever the registration cache needs resetting
 */
-   const CACHE_VERSION = 5;
+   const CACHE_VERSION = 6;
 
/**
 * Special key that defines the merge strategy

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Automatically register a Config factory function for extensions

2017-01-12 Thread Florianschmidtwelzow (Code Review)

Florianschmidtwelzow has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331953 )

Change subject: Automatically register a Config factory function for extensions
..

Automatically register a Config factory function for extensions

Instead of requiring all extensions to have a ConfigRegistry entry
in their extension.json, which mostly is the extension name in lowercase
letters and the callback GlobalVarConfig::newInstance, extension
registration now automatically creates an entry on the ConfigRegistry
array for each extension. The key is the name of the extension in lower-
case letters. Whitespaces are removed.

Bug: T155154
Change-Id: If290896a984e5c8b596697cfab6ca621349824a7
---
M docs/extension.schema.v1.json
M docs/extension.schema.v2.json
M includes/registration/ExtensionRegistry.php
3 files changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/53/331953/1

diff --git a/docs/extension.schema.v1.json b/docs/extension.schema.v1.json
index 421ea5c..278ab02 100644
--- a/docs/extension.schema.v1.json
+++ b/docs/extension.schema.v1.json
@@ -333,7 +333,7 @@
},
"ConfigRegistry": {
"type": "object",
-   "description": "Registry of factory functions to create 
Config objects"
+   "description": "Registry of factory functions to create 
Config objects. This option is optional, the extension registration system will 
create an entry for your extension automatically. The config name is the 
extension name in lower case letters."
},
"SessionProviders": {
"type": "object",
diff --git a/docs/extension.schema.v2.json b/docs/extension.schema.v2.json
index a5543d1..9f4ceb8 100644
--- a/docs/extension.schema.v2.json
+++ b/docs/extension.schema.v2.json
@@ -343,7 +343,7 @@
},
"ConfigRegistry": {
"type": "object",
-   "description": "Registry of factory functions to create 
Config objects"
+   "description": "Registry of factory functions to create 
Config objects. This option is optional, the extension registration system will 
create an entry for your extension automatically. The config name is the 
extension name in lower case letters."
},
"SessionProviders": {
"type": "object",
diff --git a/includes/registration/ExtensionRegistry.php 
b/includes/registration/ExtensionRegistry.php
index 344dd8f..441149e 100644
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -304,6 +304,13 @@
throw new UnexpectedValueException( 
"Unknown merge strategy '$mergeStrategy'" );
}
}
+   foreach ( $info['credits'] as $name => $data ) {
+   $configRegistryName = str_replace( ' ', '' , 
strtolower( $name ) );
+
+   if ( !isset( 
$GLOBALS['wgConfigRegistry'][$configRegistryName] ) ) {
+   
$GLOBALS['wgConfigRegistry'][$configRegistryName] = 
'GlobalVarConfig::newInstance';
+   }
+   }
 
foreach ( $info['defines'] as $name => $val ) {
define( $name, $val );
@@ -313,6 +320,7 @@
}
 
$this->loaded += $info['credits'];
+
if ( $info['attributes'] ) {
if ( !$this->attributes ) {
$this->attributes = $info['attributes'];

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: What's %MediaWiki? Remove random % from comment

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331952 )

Change subject: What's %MediaWiki? Remove random % from comment
..


What's %MediaWiki? Remove random % from comment

Change-Id: I5e13a7b408885c390bb0b7b3cc1f585d43e327b2
---
M includes/Setup.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/Setup.php b/includes/Setup.php
index 94da424..ecd164d 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -1,6 +1,6 @@
 https://gerrit.wikimedia.org/r/331952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e13a7b408885c390bb0b7b3cc1f585d43e327b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 
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...ApprovedRevs[master]: Fix for query if there is a DB prefix

2017-01-12 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331951 )

Change subject: Fix for query if there is a DB prefix
..


Fix for query if there is a DB prefix

Change-Id: I74671fbf3149e09aaa327cfa9ecdf63c6cb3a6e2
---
M ApprovedRevs_body.php
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/ApprovedRevs_body.php b/ApprovedRevs_body.php
index 94f6ac0..a0c8ca8 100644
--- a/ApprovedRevs_body.php
+++ b/ApprovedRevs_body.php
@@ -179,12 +179,12 @@
// query - is there an easier way?
$dbr = wfGetDB( DB_SLAVE );
$row = $dbr->selectRow(
-   array( 'revision', 'page' ),
-   'revision.rev_user_text',
-   array( 'page.page_title' => 
$title->getDBkey() ),
+   array( 'r' => 'revision', 'p' 
=> 'page' ),
+   'r.rev_user_text',
+   array( 'p.page_title' => 
$title->getDBkey() ),
null,
-   array( 'ORDER BY' => 
'revision.rev_id ASC' ),
-   array( 'revision' => array( 
'JOIN', 'revision.rev_page = page.page_id' ) )
+   array( 'ORDER BY' => 'r.rev_id 
ASC' ),
+   array( 'revision' => array( 
'JOIN', 'r.rev_page = p.page_id' ) )
);
if ( $row->rev_user_text == 
$wgUser->getName() ) {
self::$mUserCanApprove = true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I74671fbf3149e09aaa327cfa9ecdf63c6cb3a6e2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ApprovedRevs
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ApprovedRevs[master]: Fix for query if there is a DB prefix

2017-01-12 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331951 )

Change subject: Fix for query if there is a DB prefix
..

Fix for query if there is a DB prefix

Change-Id: I74671fbf3149e09aaa327cfa9ecdf63c6cb3a6e2
---
M ApprovedRevs_body.php
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ApprovedRevs 
refs/changes/51/331951/2

diff --git a/ApprovedRevs_body.php b/ApprovedRevs_body.php
index 94f6ac0..a0c8ca8 100644
--- a/ApprovedRevs_body.php
+++ b/ApprovedRevs_body.php
@@ -179,12 +179,12 @@
// query - is there an easier way?
$dbr = wfGetDB( DB_SLAVE );
$row = $dbr->selectRow(
-   array( 'revision', 'page' ),
-   'revision.rev_user_text',
-   array( 'page.page_title' => 
$title->getDBkey() ),
+   array( 'r' => 'revision', 'p' 
=> 'page' ),
+   'r.rev_user_text',
+   array( 'p.page_title' => 
$title->getDBkey() ),
null,
-   array( 'ORDER BY' => 
'revision.rev_id ASC' ),
-   array( 'revision' => array( 
'JOIN', 'revision.rev_page = page.page_id' ) )
+   array( 'ORDER BY' => 'r.rev_id 
ASC' ),
+   array( 'revision' => array( 
'JOIN', 'r.rev_page = p.page_id' ) )
);
if ( $row->rev_user_text == 
$wgUser->getName() ) {
self::$mUserCanApprove = true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I74671fbf3149e09aaa327cfa9ecdf63c6cb3a6e2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ApprovedRevs
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: What's %MediaWiki? Remove random % from comment

2017-01-12 Thread Chad (Code Review)

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331952 )

Change subject: What's %MediaWiki? Remove random % from comment
..

What's %MediaWiki? Remove random % from comment

Change-Id: I5e13a7b408885c390bb0b7b3cc1f585d43e327b2
---
M includes/Setup.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/52/331952/1

diff --git a/includes/Setup.php b/includes/Setup.php
index 94da424..ecd164d 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -1,6 +1,6 @@
 https://gerrit.wikimedia.org/r/331952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Comments[master]: --amend

2017-01-12 Thread Mihir-thakkar (Code Review)

Mihir-thakkar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331950 )

Change subject: --amend
..

--amend

Change-Id: Ia0e9eee1c3063e5a884a078579cde22363a63998
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 26 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Comments 
refs/changes/50/331950/1

diff --git a/i18n/en.json b/i18n/en.json
index ce7af8f..7eefe8b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,6 +11,18 @@
"apihelp-commentlist-description": "The commentlist API retrieves 
multiple comments and outputs them as a list after filling out the following 
parameters: pageID, order, pagerPage, and showForm.",
"apihelp-commentsubmit-description": "The commentsubmit API allows to 
submit/post a comment after filling out the following parameters: pageID, 
parentID, commentText.",
"apihelp-commentvote-description": "The commentvote API allows to vote 
on a comment after filling out the following parameters: commentID, voteValue.",
+   "apihelp-commentblock-param-commentID": "Comment ID of the comment by 
user which is to be blocked",
+   "apihelp-commentdelete-param-commentID": "Comment ID of the comment to 
be deleted",
+   "apihelp-commentlatestid-param-pageID": "Page ID of the page on which 
latest comment is there",
+   "apihelp-commentlist-param-pageID": "Page ID of the page from which 
comment list is retrieved",
+   "apihelp-commentlist-param-order": "Defined whether comment list in 
ascending or descending order",
+   "apihelp-commentlist-param-pagerPage": "Comments page number",
+   "apihelp-commentlist-param-showForm": "Show comments form",
+   "apihelp-commentsubmit-param-pageID": "Page ID of the page on which 
comment is to be submitted",
+   "apihelp-commentsubmit-param-parentID": "Comment ID of the parent 
comment",
+   "apihelp-commentsubmit-param-commentText": "Comment Text",
+   "apihelp-commentvote-param-commentID": "Comment ID of the comment that 
is voted for",
+   "apihelp-commentvote-param-voteValue": "Vote value for the comment",
"comments-comment": "Comment",
"comments-desc": "Adds comments parser hook that 
allows commenting on pages",
"comments-db-locked": "Adding commentsThe database is 
currently locked for routine database maintenance, after which it will be back 
to normal. Please check back later!",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index f676212..6ac962b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -67,11 +67,23 @@
"grouppage-commentadmin": "{{doc-group|commentadmin|page}}",
"right-comment": "{{doc-right|comment}}",
"right-commentadmin": "{{doc-right|commentadmin}}",
-   "right-commentlinks": "{{Doc-right|commentlinks}}",
+   "right-commentlinks": "{{doc-right|commentlinks}}",
"apihelp-commentblock-description": 
"{{doc-apihelp-description|CommentsBlock}}",
+   
"apihelp-commentblock-param-commentID":"{{doc-apihelp-param|CommentsBlock|commentID}}",
"apihelp-commentdelete-description": 
"{{doc-apihelp-description|CommentsDelete}}",
+   
"apihelp-commentdelete-param-commentID":"{{doc-apihelp-param|CommentsDelete|commentID}}",
"apihelp-commentlatestid-description": 
"{{doc-apihelp-description|CommentsLatestid}}",
+   
"apihelp-commentlatestid-param-pageID":"{{doc-apihelp-param|CommentsLatestid|pageID}}",
"apihelp-commentlist-description": 
"{{doc-apihelp-description|CommentsList}}",
+   
"apihelp-commentlist-param-pageID":"{{doc-apihelp-param|CommentsList|pageID}}",
+   "apihelp-commentlist-param-order": 
"{{doc-apihelp-param|CommentsList|order}}",
+   "apihelp-commentlist-param-pagerPage": 
"{{doc-apihelp-param|CommentsList|pagerPage}}",
+   "apihelp-commentlist-param-showForm": 
"{{doc-apihelp-param|CommentsList|showForm}}",
"apihelp-commentsubmit-description": 
"{{doc-apihelp-description|CommentsSubmit}}",
-   "apihelp-commentvote-description": 
"{{doc-apihelp-description|CommentsVote}}"
+   
"apihelp-commentsubmit-param-pageID":"{{doc-apihelp-param|CommentsSubmit|pageID}}",
+   "apihelp-commentsubmit-param-parentID": 
"{{doc-apihelp-param|CommentsSubmit|parentID}}",
+   "apihelp-commentsubmit-param-commentText": 
"{{doc-apihelp-param|CommentsSubmit|commentText}}",
+   "apihelp-commentvote-description": 
"{{doc-apihelp-description|CommentsVote}}",
+   
"apihelp-commentvote-param-commentID":"{{doc-apihelp-param|CommentsVote|commentID}}",
+   "apihelp-commentvote-param-voteValue": 
"{{doc-apihelp-param|CommentsVote|voteValue}}"
 }

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Screenplay[master]: Add grunt-jsonlint and grunt-banana-checker

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331890 )

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I72253072d360a768b11b39ec432f9626dcabdce3
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 34 insertions(+), 0 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..7e5da87
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules/
+vendor/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.5.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I72253072d360a768b11b39ec432f9626dcabdce3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Screenplay
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Bartosz Dziewoński 
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/vagrant[master]: Phase out MWVersion.php, folded all into MWMultiVersion

2017-01-12 Thread Chad (Code Review)

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331949 )

Change subject: Phase out MWVersion.php, folded all into MWMultiVersion
..

Phase out MWVersion.php, folded all into MWMultiVersion

Matches what we're doing in production

Change-Id: I53fbc8acef6aa4dbdf81a62173d93e41f6af9150
---
M puppet/modules/mediawiki/files/multiwiki/stub.php
M puppet/modules/mediawiki/manifests/multiwiki.pp
M puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
M puppet/modules/mediawiki/templates/docroot/w/MWScript.php.erb
D puppet/modules/mediawiki/templates/docroot/w/MWVersion.php.erb
M puppet/modules/mediawiki/templates/docroot/w/RunJobs.php.erb
6 files changed, 74 insertions(+), 83 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/49/331949/1

diff --git a/puppet/modules/mediawiki/files/multiwiki/stub.php 
b/puppet/modules/mediawiki/files/multiwiki/stub.php
index a900e97..f5b696d 100644
--- a/puppet/modules/mediawiki/files/multiwiki/stub.php
+++ b/puppet/modules/mediawiki/files/multiwiki/stub.php
@@ -1,5 +1,5 @@
  template('mediawiki/docroot/w/MWScript.php.erb'),
 }
 
-file { "${script_dir}/MWVersion.php":
-ensure  => present,
-mode=> '0644',
-content => template('mediawiki/docroot/w/MWVersion.php.erb'),
-}
-
 file { "${script_dir}/RunJobs.php":
 ensure  => present,
 mode=> '0644',
diff --git 
a/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb 
b/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
index 83e3ef0..6b3983c 100644
--- a/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
+++ b/puppet/modules/mediawiki/templates/docroot/w/MWMultiVersion.php.erb
@@ -1,6 +1,6 @@
 isMissing() ) {
+   header( "Cache-control: no-cache" );
+   include( MULTIVER_404SCRIPT_PATH_APACHE );
+   exit;
+   }
+
+   $IP = $multiVersion->getMediawikiRoot();
+   chdir( $IP );
+   putenv( "MW_INSTALL_PATH=$IP" );
+
+   return "$IP/$file";
+   }
+
+   /**
+* Get the location of the correct version of a MediaWiki CLI
+* entry-point file given the --wiki parameter passed in.
+*
+* This also has some other effects:
+* (a) Sets the $IP global variable (path to MediaWiki)
+* (b) Sets the MW_INSTALL_PATH environmental variable
+* (c) Changes PHP's current directory to the directory of this file.
+*
+* @param $file string File path (relative to MediaWiki dir)
+* @return string Absolute file path with proper MW location
+*/
+   public static function getMediaWikiCli( $file ) {
+   global $IP;
+
+   $multiVersion = self::getInstance();
+   if ( !$multiVersion ) {
+   $multiVersion = self::initializeForMaintenance();
+   }
+
+   # Get the correct MediaWiki path based on this version...
+   $IP = $multiVersion->getMediawikiRoot();
+   chdir( $IP );
+   putenv( "MW_INSTALL_PATH=$IP" );
+
+   return "$IP/$file";
+   }
 }
diff --git a/puppet/modules/mediawiki/templates/docroot/w/MWScript.php.erb 
b/puppet/modules/mediawiki/templates/docroot/w/MWScript.php.erb
index 8f197bc..ad1faac 100644
--- a/puppet/modules/mediawiki/templates/docroot/w/MWScript.php.erb
+++ b/puppet/modules/mediawiki/templates/docroot/w/MWScript.php.erb
@@ -75,8 +75,8 @@
);
}
 
-   require_once( '<%= @script_dir %>/MWVersion.php' );
-   $file = getMediaWikiCli( $relFile );
+   require_once( '<%= @script_dir %>/MWMultiVersion.php' );
+   $file = MWMultiVersion::getMediaWikiCli( $relFile );
if ( !file_exists( $file ) ) {
fwrite( STDERR, "The MediaWiki script file \"{$file}\" does not 
exist.\n" );
exit( 1 );
diff --git a/puppet/modules/mediawiki/templates/docroot/w/MWVersion.php.erb 
b/puppet/modules/mediawiki/templates/docroot/w/MWVersion.php.erb
deleted file mode 100644
index 8866692..000
--- a/puppet/modules/mediawiki/templates/docroot/w/MWVersion.php.erb
+++ /dev/null
@@ -1,70 +0,0 @@
-isMissing() ) {
-   header( "Cache-control: no-cache" );
-   include( MULTIVER_404SCRIPT_PATH_APACHE );
-   exit;
-   }
-
-   $IP = $multiVersion->getMediawikiRoot();
-   chdir( $IP );
-   putenv( "MW_INSTALL_PATH=$IP" );
-
-   return "$IP/$file";
-}
-
-/**
- * Get the location of the correct version of a MediaWiki CLI
- * entry-point file given the --wiki parameter passed in.
- *
- * This also has some other effects:
- * (a) Sets the $IP global variable (path to MediaWiki)
- * (b) Sets the MW_INSTALL_PATH environmental variable
- * (c) Changes PHP's current

[MediaWiki-commits] [Gerrit] mediawiki...ReplaceText[master]: Fix for null Titles

2017-01-12 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331947 )

Change subject: Fix for null Titles
..


Fix for null Titles

Change-Id: I45cdb759d466ec4f2956bdfe095f75c0e7448ea0
---
M SpecialReplaceText.php
1 file changed, 10 insertions(+), 4 deletions(-)

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



diff --git a/SpecialReplaceText.php b/SpecialReplaceText.php
index 10ef63e..eda3483 100644
--- a/SpecialReplaceText.php
+++ b/SpecialReplaceText.php
@@ -147,6 +147,9 @@
 
foreach ( $res as $row ) {
$title = Title::makeTitleSafe( 
$row->page_namespace, $row->page_title );
+   if ( $title == null ) {
+   continue;
+   }
$context = $this->extractContext( 
$row->old_text, $this->target, $this->use_regex );
$titles_for_edit[] = array( $title, 
$context );
}
@@ -162,7 +165,10 @@
 
foreach ( $res as $row ) {
$title = Title::makeTitleSafe( 
$row->page_namespace, $row->page_title );
-   // see if this move can happen
+   if ( $title == null ) {
+   continue;
+   }
+   // See if this move can happen.
$cur_page_name = str_replace( '_', ' ', 
$row->page_title );
 
if ( $this->use_regex ) {
@@ -184,8 +190,8 @@
}
}
 
-   // if no results were found, check to see if a bad
-   // category name was entered
+   // If no results were found, check to see if a bad
+   // category name was entered.
if ( count( $titles_for_edit ) == 0 && count( 
$titles_for_move ) == 0 ) {
$bad_cat_name = false;
 
@@ -266,7 +272,7 @@
return;
}
 
-   // if we're still here, show the starting form
+   // If we're still here, show the starting form.
$this->showForm();
wfProfileOut( __METHOD__ );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I45cdb759d466ec4f2956bdfe095f75c0e7448ea0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ReplaceText
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [WIP] Adapt content to narrow screens

2017-01-12 Thread TheDJ (Code Review)

TheDJ has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331948 )

Change subject: [WIP] Adapt content to narrow screens
..

[WIP] Adapt content to narrow screens

Move some of the content adaptation rules of MobileFrontend into core.
These rules are set to VERY narrow dimensions to avoid that desktop
users run into them too quickly.

Ideally at some point, make 'chrome' offset known to this kind of
styling.

Also add CSS to make images full width on hidpi screens.

Change-Id: I3d2c38d2f250d99f247e461b9430079e89f7782c
---
M resources/Resources.php
A resources/src/mediawiki.skinning/content-narrow-hidpi.less
A resources/src/mediawiki.skinning/content-narrow.less
3 files changed, 68 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/48/331948/1

diff --git a/resources/Resources.php b/resources/Resources.php
index 7c00feb..419e031 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -101,6 +101,12 @@
'styles' => [
'resources/src/mediawiki.skinning/elements.css' => [ 
'media' => 'screen' ],
'resources/src/mediawiki.skinning/content.css' => [ 
'media' => 'screen' ],
+   'resources/src/mediawiki.skinning/content-narrow.less' 
=> [ 'media' => 'screen'],
+   'resources/src/mediawiki.skinning/content-narrow.less' 
=> [ 'media' => 'screen and (max-width:500px)' ],
+   
'resources/src/mediawiki.skinning/content-narrow-hidpi.less' => [
+   'media' => 'screen and (max-width:500px) and 
(-webkit-min-device-pixel-ratio: 1.5),' .
+   'screen and (max-width:500px) and 
(min-resolution: 1.5dppx)'
+   ],
],
],
// Used in the web installer. Test it after modifying this definition!
@@ -109,6 +115,11 @@
'styles' => [
'resources/src/mediawiki.skinning/elements.css' => [ 
'media' => 'screen' ],
'resources/src/mediawiki.skinning/content.css' => [ 
'media' => 'screen' ],
+   'resources/src/mediawiki.skinning/content-narrow.less' 
=> [ 'media' => 'screen and (max-width:500px)' ],
+   
'resources/src/mediawiki.skinning/content-narrow-hidpi.less' => [
+   'media' => 'screen and (max-width:500px) and 
(-webkit-min-device-pixel-ratio: 1.5),' .
+   'screen and (max-width:500px) and 
(min-resolution: 1.5dppx)'
+   ],
'resources/src/mediawiki.skinning/interface.css' => [ 
'media' => 'screen' ],
],
],
diff --git a/resources/src/mediawiki.skinning/content-narrow-hidpi.less 
b/resources/src/mediawiki.skinning/content-narrow-hidpi.less
new file mode 100644
index 000..ce035cd
--- /dev/null
+++ b/resources/src/mediawiki.skinning/content-narrow-hidpi.less
@@ -0,0 +1,24 @@
+/* Make images fullwidth, if we can ensure aspect ratio */
+@supports (object-fit: contain) {
+   div.thumbinner {
+   width: 100% !important;
+   }
+   div.thumbinner .thumbimage {
+   width: 100%;
+   object-fit: contain;
+   /* Never more than 60 percent of viewport height,
+* to make sure upright images don't fillout the entire screen 
*/
+   max-height: 60vh;
+   }
+
+   /* This isn't really pretty with normal frames, so make them 
transparents */
+   div.thumbinner {
+   box-sizing: border-box;
+   border: 0;
+   background-color: transparent;
+   }
+   html .thumbimage {
+   border: 0;
+   background-color: transparent;
+   }
+}
\ No newline at end of file
diff --git a/resources/src/mediawiki.skinning/content-narrow.less 
b/resources/src/mediawiki.skinning/content-narrow.less
new file mode 100644
index 000..9a7c872
--- /dev/null
+++ b/resources/src/mediawiki.skinning/content-narrow.less
@@ -0,0 +1,33 @@
+/* !important is used to ignore inline styling */
+/* Center clear tables */
+.mw-content-ltr table,
+.mw-content-rtl table {
+   float: none !important;
+   margin-left: auto !important;
+   margin-right: auto !important;
+}
+.mw-content-ltr table,
+.mw-content-rtl table {
+   margin: 1em 0;
+   overflow: auto;
+   overflow-y: hidden;
+   overflow-x: auto;
+   display: block;
+   max-width: 100% !important;
+}
+
+/* Center and clear thumbnails */
+div.thumb {
+   float: none;
+   clear: none;
+   margin: .5em auto;
+}
+div.thumbinner {
+   margin: 0 auto;
+   /* Make sure we don't overflow the viewport */
+   max-width: 100%;
+}
+div.thumbinner .thumbimage {
+   max-width: 100%;
+   height: auto;
+}
\ No newline at

[MediaWiki-commits] [Gerrit] mediawiki...ReplaceText[master]: Fix for null Titles

2017-01-12 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331947 )

Change subject: Fix for null Titles
..

Fix for null Titles

Change-Id: I45cdb759d466ec4f2956bdfe095f75c0e7448ea0
---
M SpecialReplaceText.php
1 file changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ReplaceText 
refs/changes/47/331947/2

diff --git a/SpecialReplaceText.php b/SpecialReplaceText.php
index 10ef63e..eda3483 100644
--- a/SpecialReplaceText.php
+++ b/SpecialReplaceText.php
@@ -147,6 +147,9 @@
 
foreach ( $res as $row ) {
$title = Title::makeTitleSafe( 
$row->page_namespace, $row->page_title );
+   if ( $title == null ) {
+   continue;
+   }
$context = $this->extractContext( 
$row->old_text, $this->target, $this->use_regex );
$titles_for_edit[] = array( $title, 
$context );
}
@@ -162,7 +165,10 @@
 
foreach ( $res as $row ) {
$title = Title::makeTitleSafe( 
$row->page_namespace, $row->page_title );
-   // see if this move can happen
+   if ( $title == null ) {
+   continue;
+   }
+   // See if this move can happen.
$cur_page_name = str_replace( '_', ' ', 
$row->page_title );
 
if ( $this->use_regex ) {
@@ -184,8 +190,8 @@
}
}
 
-   // if no results were found, check to see if a bad
-   // category name was entered
+   // If no results were found, check to see if a bad
+   // category name was entered.
if ( count( $titles_for_edit ) == 0 && count( 
$titles_for_move ) == 0 ) {
$bad_cat_name = false;
 
@@ -266,7 +272,7 @@
return;
}
 
-   // if we're still here, show the starting form
+   // If we're still here, show the starting form.
$this->showForm();
wfProfileOut( __METHOD__ );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45cdb759d466ec4f2956bdfe095f75c0e7448ea0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ReplaceText
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Increase $wgHTTPImportTimeout to 50 seconds

2017-01-12 Thread TTO (Code Review)

TTO has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331946 )

Change subject: Increase $wgHTTPImportTimeout to 50 seconds
..

Increase $wgHTTPImportTimeout to 50 seconds

Double the existing value of 25 seconds (inherited from MediaWiki's
default settings).

Bug: T155209
Change-Id: Ibcf3544273b4d7968296bd5cd45c492260c7e85f
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/46/331946/2

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index a00a871..fc7e0e0 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1288,6 +1288,7 @@
 
 // For transwiki import
 ini_set( 'user_agent', 'Wikimedia internal server fetcher (n...@wikimedia.org' 
);
+$wgHTTPImportTimeout = 50; // T155209
 
 // CentralAuth
 if ( $wmgUseCentralAuth ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcf3544273b4d7968296bd5cd45c492260c7e85f
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: TTO 
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]: Improved HTTP error reporting for the import process

2017-01-12 Thread TTO (Code Review)

TTO has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331945 )

Change subject: Improved HTTP error reporting for the import process
..

Improved HTTP error reporting for the import process

Currently, whenever any kind of HTTP failure occurs, the message displayed
is "Could not open import file". This change gives users more information
about why the import failed, such as timed out, 403 error, host
unreachable, etc.

Bug: T155210
Change-Id: I2a18a4642769f0a7eb313c5c64ff298bd0b2b235
---
M includes/api/ApiImport.php
M includes/import/ImportStreamSource.php
M includes/specials/SpecialImport.php
M languages/i18n/en.json
M languages/i18n/qqq.json
5 files changed, 44 insertions(+), 21 deletions(-)


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

diff --git a/includes/api/ApiImport.php b/includes/api/ApiImport.php
index dffd6b2..539e789 100644
--- a/includes/api/ApiImport.php
+++ b/includes/api/ApiImport.php
@@ -61,6 +61,10 @@
$source = ImportStreamSource::newFromUpload( 'xml' );
}
if ( !$source->isOK() ) {
+   // transform HTTP errors and the like into 
'cantopenfile'
+   if ( $source->hasMessage( 'importcantdownload' ) ) {
+   $this->dieWithError( 
$source->value->getMessage(), 'cantopenfile' );
+   }
$this->dieStatus( $source );
}
 
diff --git a/includes/import/ImportStreamSource.php 
b/includes/import/ImportStreamSource.php
index 8034400..03b1779 100644
--- a/includes/import/ImportStreamSource.php
+++ b/includes/import/ImportStreamSource.php
@@ -24,6 +24,7 @@
  * @ingroup SpecialPage
  */
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Logger\LoggerFactory;
 
 /**
  * Imports a XML dump from a file (either from file upload, files on disk, or 
HTTP)
@@ -106,29 +107,41 @@
 */
static function newFromURL( $url, $method = 'GET' ) {
global $wgHTTPImportTimeout;
+
wfDebug( __METHOD__ . ": opening $url\n" );
-   # Use the standard HTTP fetch function; it times out
-   # quicker and sorts out user-agent problems which might
-   # otherwise prevent importing from large sites, such
-   # as the Wikimedia cluster, etc.
-   $data = Http::request(
-   $method,
+
+   // Use the standard HTTP request class; it times out quicker 
and sorts out
+   // user-agent problems which might otherwise prevent importing 
from large
+   // sites, such as the Wikimedia cluster.
+   $req = MWHttpRequest::factory(
$url,
[
+   'method' => $method,
'followRedirects' => true,
-   'timeout' => $wgHTTPImportTimeout
+   'timeout' => $wgHTTPImportTimeout,
+   'connectTimeout' => 'default'
],
-   __METHOD__
-   );
-   if ( $data !== false ) {
-   $file = tmpfile();
-   fwrite( $file, $data );
-   fflush( $file );
-   fseek( $file, 0 );
-   return Status::newGood( new ImportStreamSource( $file ) 
);
-   } else {
-   return Status::newFatal( 'importcantopen' );
+   __METHOD__ );
+   $status = $req->execute();
+
+   if ( !$status->isOK() ) {
+   $errors = $status->getErrorsByType( 'error' );
+
+   // Log the errors to the HTTP debug log
+   $logger = LoggerFactory::getInstance( 'http' );
+   $logger->warning( Status::wrap( $status )->getWikiText( 
false, false, 'en' ),
+   [ 'error' => $errors, 'caller' => __METHOD__, 
'content' => $req->getContent() ] );
+
+   $result = Status::newFatal( 'importcantdownload' );
+   $result->value = $status;
+   return $result;
}
+
+   $file = tmpfile();
+   fwrite( $file, $req->getContent() );
+   fflush( $file );
+   fseek( $file, 0 );
+   return Status::newGood( new ImportStreamSource( $file ) );
}
 
/**
diff --git a/includes/specials/SpecialImport.php 
b/includes/specials/SpecialImport.php
index ce88624..60ead6f 100644
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -176,8 +176,12 @@
 
$out = $this->getOutput();
if ( !$source->isGood() ) {
+   // Display the

[MediaWiki-commits] [Gerrit] mediawiki...SSLClientAuthentication[master]: Add grunt-jsonlint and grunt-banana-checker

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331886 )

Change subject: Add grunt-jsonlint and grunt-banana-checker
..


Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: I26c7bb88502b3070d69a438d8b62548280db6159
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 35 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index b18cd3e..8ca1cea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+node_modules/
+vendor/
+
 # Repository management
 .svn
 
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.5.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I26c7bb88502b3070d69a438d8b62548280db6159
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SSLClientAuthentication
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Parent5446 
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/puppet[production]: Escape period in wiki.phtml rewrites

2017-01-12 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331944 )

Change subject: Escape period in wiki.phtml rewrites
..

Escape period in wiki.phtml rewrites

Change-Id: I82f4d41c1e2836f2f088a2605747f91aeb022381
---
M modules/mediawiki/files/apache/sites/main.conf
1 file changed, 11 insertions(+), 11 deletions(-)


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

diff --git a/modules/mediawiki/files/apache/sites/main.conf 
b/modules/mediawiki/files/apache/sites/main.conf
index 29413ca..bada75c 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -26,7 +26,7 @@
 ProxyPass   /w/thumb_handler.php 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/mediawiki/w/thumb_handler.php
 ProxyPass   /w/extensions!
 ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/mediawiki/w/$1
-RewriteRule ^/w/wiki.phtml$  /w/index.php [L,QSA,NE]
+RewriteRule ^/w/wiki\.phtml$  /w/index.php [L,QSA,NE]
 
 # Primary wiki redirector:
 Alias /wiki /srv/mediawiki/docroot/mediawiki/w/index.php
@@ -57,7 +57,7 @@
 ProxyPass   /w/thumb_handler.php 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/thumb_handler.php
 ProxyPass   /w/extensions!
 ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/$1
-RewriteRule ^/w/wiki.phtml$  /w/index.php [L,QSA,NE]
+RewriteRule ^/w/wiki\.phtml$  /w/index.php [L,QSA,NE]
 
 # Primary wiki redirector:
 Alias /wiki /srv/mediawiki/docroot/wikidata/w/index.php
@@ -83,7 +83,7 @@
 ProxyPass   /w/thumb_handler.php 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/thumb_handler.php
 ProxyPass   /w/extensions!
 ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikidata/w/$1
-RewriteRule ^/w/wiki.phtml$  /w/index.php [L,QSA,NE]
+RewriteRule ^/w/wiki\.phtml$  /w/index.php [L,QSA,NE]
 
 # Primary wiki redirector:
 Alias /wiki /srv/mediawiki/docroot/wikidata/w/index.php
@@ -115,7 +115,7 @@
 ProxyPass   /w/thumb_handler.php 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/thumb_handler.php
 ProxyPass   /w/extensions!
 ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wiktionary.org/w/$1
-RewriteRule ^/w/wiki.phtml$  /w/index.php [L,QSA,NE]
+RewriteRule ^/w/wiki\.phtml$  /w/index.php [L,QSA,NE]
 
 # ShortURL redirect RT-2121
 RewriteRule ^/s/.*$ /w/index.php
@@ -170,7 +170,7 @@
 ProxyPass   /w/thumb_handler.php 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/thumb_handler.php
 ProxyPass   /w/extensions!
 ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikiquote.org/w/$1
-RewriteRule ^/w/wiki.phtml$  /w/index.php [L,QSA,NE]
+RewriteRule ^/w/wiki\.phtml$  /w/index.php [L,QSA,NE]
 
 # ShortURL redirect RT-2121
 RewriteRule ^/s/.*$ /w/index.php
@@ -260,7 +260,7 @@
 ProxyPass   /w/extensions!
 ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/$1   retry=0
 ProxyPassMatch  ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el)) 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikipedia.org/w/index.phpretry=0
-RewriteRule ^/w/wiki.phtml$  /w/index.php [L,QSA,NE]
+RewriteRule ^/w/wiki\.phtml$  /w/index.php [L,QSA,NE]
 
 
 RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}]
@@ -327,7 +327,7 @@
 ProxyPass   /w/extensions!
 ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/$1
 ProxyPassMatch  ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el)) 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikibooks.org/w/index.phpretry=0
-RewriteRule ^/w/wiki.phtml$  /w/index.php [L,QSA,NE]
+RewriteRule ^/w/wiki\.phtml$  /w/index.php [L,QSA,NE]
 
 # ShortURL redirect RT-2121
 RewriteRule ^/s/.*$ /w/index.php
@@ -383,7 +383,7 @@
 ProxyPass   /w/extensions!
 ProxyPassMatch  ^/w/(.*\.(php|hh))$  
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/w/$1
 ProxyPassMatch  ^/zh(-(hans|hant|cn|hk|sg|tw))|sr(-(ec|el)) 
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikisource.org/w/index.php
retry=0
-RewriteRule ^/w/wiki.phtml$  /w/index.php [L,QSA,NE]
+RewriteRule ^/w/wiki\.phtml$  /w/index.php [L,QSA,NE]
 
 # ShortURL redirect RT-2121
 RewriteRule ^/s/.*$ /w/index.php
@@ -439,7 +439,7 @@
 ProxyPass   /w/extensions!
 ProxyPassMatch  ^/w/(.*\.(php|hh))$

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove wiki.phtml

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/270948 )

Change subject: Remove wiki.phtml
..


Remove wiki.phtml

Change-Id: Ic2d422e16e3db236cf26731eafcec18f29cbcfb0
---
M RELEASE-NOTES-1.29
D wiki.phtml
2 files changed, 7 insertions(+), 3 deletions(-)

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



diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 905ea12..fac6f7e 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -177,6 +177,13 @@
 * RedisConnectionPool::handleException (deprecated since 1.23) was removed.
 * The static properties mw.Api.errors and mw.Api.warnings, containing 
incomplete
   and outdated lists of errors/warnings returned by the API, are now 
deprecated.
+* wiki.phtml entry point was removed.  Refer to index.php instead. If you want 
"wiki.phtml"
+  URLs to continue to work, set up redirects. In Apache, this can be done by 
enabling
+  mod_rewrite and adding the following rules to your configuration:
+
+RewriteEngine On
+RewriteBase /
+RewriteRule ^/w/wiki\.phtml$ /w/index.php [R=301,L]
 
 == Compatibility ==
 
diff --git a/wiki.phtml b/wiki.phtml
deleted file mode 100644
index a197545..000
--- a/wiki.phtml
+++ /dev/null
@@ -1,3 +0,0 @@
-https://gerrit.wikimedia.org/r/270948
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2d422e16e3db236cf26731eafcec18f29cbcfb0
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Ricordisamoa 
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]: Remove check for MW_NO_SETUP

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331941 )

Change subject: Remove check for MW_NO_SETUP
..


Remove check for MW_NO_SETUP

This protection is in place for a single extension, Maintenance.
Said extension is probably broken anyway and has been for quite
some time.

Plus, it doesn't even really work like it would intend, the extension
uses special pages and this is a require_once, so a subsequent
request to WebStart.php (which isn't even called by extensions)
wouldn't re-require it.

tldr: This is pointless

Change-Id: I22e7418d2b46c00d4009c370c24ac4b8bc43190a
---
M includes/WebStart.php
1 file changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/includes/WebStart.php b/includes/WebStart.php
index d063ce3..6e4fb09 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -133,9 +133,7 @@
ob_start( 'wfOutputHandler' );
 }
 
-if ( !defined( 'MW_NO_SETUP' ) ) {
-   require_once "$IP/includes/Setup.php";
-}
+require_once "$IP/includes/Setup.php";
 
 # Multiple DBs or commits might be used; keep the request as transactional as 
possible
 if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] === 
'POST' ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I22e7418d2b46c00d4009c370c24ac4b8bc43190a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Krinkle 
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]: Move libs/time/defines.php inclusion from GlobalFunctions to...

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331938 )

Change subject: Move libs/time/defines.php inclusion from GlobalFunctions to 
Defines.php
..


Move libs/time/defines.php inclusion from GlobalFunctions to Defines.php

* Verified none of these constants depend on each other.
* Move them to the top of Defines.php for consistency.

Change-Id: I19c77e706d69bff513e4abafd0300207de0dbb1d
---
M includes/Defines.php
M includes/GlobalFunctions.php
2 files changed, 5 insertions(+), 16 deletions(-)

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



diff --git a/includes/Defines.php b/includes/Defines.php
index 0616898..35c2a2d 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -20,6 +20,11 @@
  * @file
  */
 
+require_once __DIR__ . '/libs/mime/defines.php';
+require_once __DIR__ . '/libs/time/defines.php';
+require_once __DIR__ . '/libs/rdbms/defines.php';
+require_once __DIR__ . '/compat/normal/UtfNormalDefines.php';
+
 /**
  * @defgroup Constants MediaWiki constants
  */
@@ -97,8 +102,6 @@
 define( 'CACHE_ACCEL', 3 );  // APC, XCache or WinCache
 /**@}*/
 
-require_once __DIR__ . '/libs/mime/defines.php';
-
 /**@{
  * Antivirus result codes, for use in $wgAntivirusSetup.
  */
@@ -152,16 +155,6 @@
 define( 'EDIT_AUTOSUMMARY', 64 );
 define( 'EDIT_INTERNAL', 128 );
 /**@}*/
-
-/**
- * Database related
- */
-require_once __DIR__ . '/libs/rdbms/defines.php';
-
-/**
- * Unicode and normalisation related
- */
-require_once __DIR__ . '/compat/normal/UtfNormalDefines.php';
 
 /**@{
  * Hook support constants
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 6549fdd..5343248 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1999,10 +1999,6 @@
MediaWiki\suppressWarnings( true );
 }
 
-# Autodetect, convert and provide timestamps of various types
-
-require_once __DIR__ . '/libs/time/defines.php';
-
 /**
  * Get a timestamp string in one of various formats
  *

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19c77e706d69bff513e4abafd0300207de0dbb1d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Krinkle 
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]: Remove fully initialized debug message, dubiously useful

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331939 )

Change subject: Remove fully initialized debug message, dubiously useful
..


Remove fully initialized debug message, dubiously useful

Change-Id: I406e44a3751788c4282f5cb22377d258f06671c3
---
M includes/Setup.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/includes/Setup.php b/includes/Setup.php
index f6631ea..b0d0fe7 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -880,7 +880,6 @@
Pingback::schedulePingback();
 }
 
-wfDebug( "Fully initialised\n" );
 $wgFullyInitialised = true;
 
 Profiler::instance()->scopedProfileOut( $ps_extensions );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I406e44a3751788c4282f5cb22377d258f06671c3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Krinkle 
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...deploy[master]: Update trending-edits to 421fa63

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331943 )

Change subject: Update trending-edits to 421fa63
..


Update trending-edits to 421fa63

List of changes:
9b71749 Use 1.4.0 of wikipedia-edits-scorer
14d36c0 Hygiene: Fix typo
05298f3 Track reverts as best as possible
xxx Update node module dependencies

Change-Id: Ie8cc26f57b57167f0f31985833904d3ac9c2da4a
---
M node_modules/bluebird/js/browser/bluebird.core.js
M node_modules/bluebird/js/browser/bluebird.core.min.js
M node_modules/bluebird/js/browser/bluebird.js
M node_modules/bluebird/js/browser/bluebird.min.js
M node_modules/bluebird/js/release/async.js
M node_modules/bluebird/js/release/debuggability.js
M node_modules/bluebird/js/release/promise.js
M node_modules/bluebird/js/release/queue.js
M node_modules/bluebird/js/release/util.js
M node_modules/bluebird/package.json
M node_modules/cassandra-uuid/node_modules/long/.npmignore
M node_modules/cassandra-uuid/node_modules/long/.travis.yml
M node_modules/cassandra-uuid/node_modules/long/LICENSE
M node_modules/cassandra-uuid/node_modules/long/bower.json
M node_modules/cassandra-uuid/node_modules/long/dist/Long.js
M node_modules/cassandra-uuid/node_modules/long/externs/Long.js
M node_modules/cassandra-uuid/node_modules/long/index.js
M node_modules/cassandra-uuid/node_modules/long/jsdoc.json
M node_modules/cassandra-uuid/node_modules/long/scripts/build.js
M node_modules/cassandra-uuid/node_modules/long/src/Long.js
M node_modules/cassandra-uuid/node_modules/long/src/bower.json
M node_modules/cassandra-uuid/node_modules/long/src/wrap.js
M node_modules/cassandra-uuid/node_modules/long/tests/goog.math.long.js
M node_modules/cassandra-uuid/node_modules/long/tests/suite.js
M node_modules/express/node_modules/qs/package.json
M node_modules/heapdump/build/Makefile
M 
node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
M node_modules/heapdump/build/addon.target.mk
M node_modules/heapdump/build/config.gypi
M node_modules/nan/nan.h
M node_modules/nan/nan_maybe_pre_43_inl.h
M node_modules/nan/nan_persistent_12_inl.h
M node_modules/nan/nan_persistent_pre_12_inl.h
A node_modules/nan/nan_private.h
M node_modules/nan/nan_typedarray_contents.h
M node_modules/nan/package.json
M node_modules/node-rdkafka/build/Makefile
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/binding.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/callbacks.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/common.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/config.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/connection.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/consumer.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/errors.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/producer.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/topic.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/workers.o.d
M node_modules/node-rdkafka/build/Release/node-librdkafka.node
M node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka.node
M 
node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka/src/callbacks.o
M 
node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka/src/common.o
M 
node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka/src/config.o
M 
node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka/src/connection.o
M 
node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka/src/consumer.o
M 
node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka/src/producer.o
M node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka/src/topic.o
M 
node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka/src/workers.o
M node_modules/node-rdkafka/build/config.gypi
M node_modules/node-rdkafka/build/node-librdkafka.target.mk
M node_modules/node-rdkafka/deps/librdkafka/win32/librdkafka.vcxproj
M 
node_modules/node-rdkafka/deps/librdkafka/win32/librdkafkacpp/librdkafkacpp.vcxproj
M 
node_modules/node-rdkafka/deps/librdkafka/win32/rdkafka_example/rdkafka_example.vcxproj
M node_modules/node-rdkafka/e2e/both.spec.js
M node_modules/node-rdkafka/e2e/consumer.spec.js
M node_modules/node-rdkafka/e2e/groups.spec.js
M node_modules/node-rdkafka/e2e/producer.spec.js
M node_modules/node-rdkafka/lib/client.js
M node_modules/node-rdkafka/lib/kafka-consumer.js
M node_modules/node-rdkafka/lib/producer.js
M node_modules/node-rdkafka/lib/topic-readable.js
M node_modules/node-rdkafka/lib/util/topicWritable.js
M

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update trending-edits to 421fa63

2017-01-12 Thread BearND (Code Review)

BearND has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331943 )

Change subject: Update trending-edits to 421fa63
..

Update trending-edits to 421fa63

List of changes:
9b71749 Use 1.4.0 of wikipedia-edits-scorer
14d36c0 Hygiene: Fix typo
05298f3 Track reverts as best as possible
xxx Update node module dependencies

Change-Id: Ie8cc26f57b57167f0f31985833904d3ac9c2da4a
---
M node_modules/bluebird/js/browser/bluebird.core.js
M node_modules/bluebird/js/browser/bluebird.core.min.js
M node_modules/bluebird/js/browser/bluebird.js
M node_modules/bluebird/js/browser/bluebird.min.js
M node_modules/bluebird/js/release/async.js
M node_modules/bluebird/js/release/debuggability.js
M node_modules/bluebird/js/release/promise.js
M node_modules/bluebird/js/release/queue.js
M node_modules/bluebird/js/release/util.js
M node_modules/bluebird/package.json
M node_modules/cassandra-uuid/node_modules/long/.npmignore
M node_modules/cassandra-uuid/node_modules/long/.travis.yml
M node_modules/cassandra-uuid/node_modules/long/LICENSE
M node_modules/cassandra-uuid/node_modules/long/bower.json
M node_modules/cassandra-uuid/node_modules/long/dist/Long.js
M node_modules/cassandra-uuid/node_modules/long/externs/Long.js
M node_modules/cassandra-uuid/node_modules/long/index.js
M node_modules/cassandra-uuid/node_modules/long/jsdoc.json
M node_modules/cassandra-uuid/node_modules/long/scripts/build.js
M node_modules/cassandra-uuid/node_modules/long/src/Long.js
M node_modules/cassandra-uuid/node_modules/long/src/bower.json
M node_modules/cassandra-uuid/node_modules/long/src/wrap.js
M node_modules/cassandra-uuid/node_modules/long/tests/goog.math.long.js
M node_modules/cassandra-uuid/node_modules/long/tests/suite.js
M node_modules/express/node_modules/qs/package.json
M node_modules/heapdump/build/Makefile
M 
node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
M node_modules/heapdump/build/addon.target.mk
M node_modules/heapdump/build/config.gypi
M node_modules/nan/nan.h
M node_modules/nan/nan_maybe_pre_43_inl.h
M node_modules/nan/nan_persistent_12_inl.h
M node_modules/nan/nan_persistent_pre_12_inl.h
A node_modules/nan/nan_private.h
M node_modules/nan/nan_typedarray_contents.h
M node_modules/nan/package.json
M node_modules/node-rdkafka/build/Makefile
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/binding.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/callbacks.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/common.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/config.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/connection.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/consumer.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/errors.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/producer.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/topic.o.d
M 
node_modules/node-rdkafka/build/Release/.deps/Release/obj.target/node-librdkafka/src/workers.o.d
M node_modules/node-rdkafka/build/Release/node-librdkafka.node
M node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka.node
M 
node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka/src/callbacks.o
M 
node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka/src/common.o
M 
node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka/src/config.o
M 
node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka/src/connection.o
M 
node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka/src/consumer.o
M 
node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka/src/producer.o
M node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka/src/topic.o
M 
node_modules/node-rdkafka/build/Release/obj.target/node-librdkafka/src/workers.o
M node_modules/node-rdkafka/build/config.gypi
M node_modules/node-rdkafka/build/node-librdkafka.target.mk
M node_modules/node-rdkafka/deps/librdkafka/win32/librdkafka.vcxproj
M 
node_modules/node-rdkafka/deps/librdkafka/win32/librdkafkacpp/librdkafkacpp.vcxproj
M 
node_modules/node-rdkafka/deps/librdkafka/win32/rdkafka_example/rdkafka_example.vcxproj
M node_modules/node-rdkafka/e2e/both.spec.js
M node_modules/node-rdkafka/e2e/consumer.spec.js
M node_modules/node-rdkafka/e2e/groups.spec.js
M node_modules/node-rdkafka/e2e/producer.spec.js
M node_modules/node-rdkafka/lib/client.js
M node_modules/node-rdkafka/lib/kafka-consumer.js
M node_modules/node-rdkafka/lib/producer.js
M node_modules/node-rdkafka/lib/topic-readable.js
M node_modules/node-rdkafka/lib/util/topicWritable.js
M

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Maps: Improve frame genertion

2017-01-12 Thread TheDJ (Code Review)

TheDJ has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331942 )

Change subject: Maps: Improve frame genertion
..

Maps: Improve frame genertion

- Fix missing tnone
- Don't use align classes for fullwidth maps
- Closer emulation of structure as images use
  - No div for none aligned content
  - Makes sure we don't need to redefine floatleft/right and center
  - Use a single consistent 'content' part for framed and frameless
- Use a  element inside the  link.
  -  are one of few elements that feature replacement content.
  - replacement content automagically can keep aspect ratio using
content-fit, which is nice for mobile.
  - Now matches scaling logic for MF
  - Make more sense HTML wise

TODO:
 - I don't understand some of that 'staticframe' stuff
 - lots of commented code should be made actionable
 - probably need to fix the VE editor now.

Change-Id: I9909e47ecc430f384d0fc7166ebb555c093e936a
---
M includes/Tag/MapFrame.php
M modules/staticframe/staticframe.js
M styles/kartographer.less
3 files changed, 21 insertions(+), 59 deletions(-)


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

diff --git a/includes/Tag/MapFrame.php b/includes/Tag/MapFrame.php
index 38627eb..7ce9767 100644
--- a/includes/Tag/MapFrame.php
+++ b/includes/Tag/MapFrame.php
@@ -45,6 +45,7 @@
'left' => 'tleft',
'center' => 'center',
'right' => 'tright',
+   'none' => 'tnone',
];
 
$caption = $this->getText( 'text', null );
@@ -158,7 +159,9 @@
$containerClass = 'mw-kartographer-container';
if ( $fullWidth ) {
$containerClass .= ' mw-kartographer-full';
+   $this->align = 'none';
}
+   $attrs['class'] .= " {$containerClass}";
 
$bgUrl = 
"{$wgKartographerMapServer}/img/{$this->mapStyle},{$staticZoom},{$staticLat},{$staticLon},{$staticWidth}x{$this->height}.png";
if ( $this->showGroups ) {
@@ -167,27 +170,31 @@
$bgUrl .= 
"?domain={$wgServerName}={$title}={$groupList}";
}
 
-   $attrs['style'] = "background-image: url({$bgUrl});";
+   $mapElement = Html::rawElement( 'a', $attrs,
+   Html::rawElement( 'img', [
+   'src' => $bgUrl,
+   'width' => $staticWidth,
+   'height' => 
$this->height,
+   ] ) );
 
if ( !$framed ) {
-   $attrs['style'] .= " width: {$width}; height: 
{$height};";
-   $attrs['class'] .= " {$containerClass} 
{$alignClasses[$this->align]}";
-
-   return Html::rawElement( 'a', $attrs );
+   if ( $this->align === 'none' ) {
+   return $mapElement;
+   }
+   return Html::rawElement( 'div', [
+   'class' => 
"{$alignClasses[$this->align]}"
+   ], $mapElement );
}
-
-   $attrs['style'] .= " height: {$height};";
-   $containerClass .= " thumb {$thumbAlignClasses[$this->align]}";
 
$captionFrame = Html::rawElement( 'div', [ 'class' => 
'thumbcaption' ],
$this->parser->recursiveTagParse( $caption ) );
 
-   $mapDiv = Html::rawElement( 'a', $attrs );
-
-   return Html::rawElement( 'div', [ 'class' => $containerClass ],
+   return Html::rawElement( 'div', [
+   'class' => "thumb 
{$thumbAlignClasses[$this->align]}"
+   ],
Html::rawElement( 'div', [
'class' => 'thumbinner',
'style' => "width: {$width};",
-   ], $mapDiv . $captionFrame ) );
+   ], $mapElement . $captionFrame ) );
}
 }
diff --git a/modules/staticframe/staticframe.js 
b/modules/staticframe/staticframe.js
index ac36428..7cd23de 100644
--- a/modules/staticframe/staticframe.js
+++ b/modules/staticframe/staticframe.js
@@ -72,8 +72,7 @@
maps.pop().remove();
} );
 
-   // need to find 
.mw-kartographer-interactive:not(.mw-kartographer-map) for backward 
compatibility
-   $content.find( '.mw-kartographer-map, 
.mw-kartographer-interactive:not(.mw-kartographer-map)' ).each( function ( 
index ) {
+   $content.find( '.mw-kartographer-map' ).each(

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove check for MW_NO_SETUP

2017-01-12 Thread Chad (Code Review)

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331941 )

Change subject: Remove check for MW_NO_SETUP
..

Remove check for MW_NO_SETUP

This protection is in place for a single extension, Maintenance.
Said extension is probably broken anyway and has been for quite
some time.

Plus, it doesn't even really work like it would intend, the extension
uses special pages and this is a require_once, so a subsequent
request to WebStart.php (which isn't even called by extensions)
wouldn't re-require it.

tldr: This is pointless

Change-Id: I22e7418d2b46c00d4009c370c24ac4b8bc43190a
---
M includes/WebStart.php
1 file changed, 1 insertion(+), 3 deletions(-)


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

diff --git a/includes/WebStart.php b/includes/WebStart.php
index d063ce3..6e4fb09 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -133,9 +133,7 @@
ob_start( 'wfOutputHandler' );
 }
 
-if ( !defined( 'MW_NO_SETUP' ) ) {
-   require_once "$IP/includes/Setup.php";
-}
+require_once "$IP/includes/Setup.php";
 
 # Multiple DBs or commits might be used; keep the request as transactional as 
possible
 if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] === 
'POST' ) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Move conflicting NavPopups gadget name into config var

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331695 )

Change subject: Move conflicting NavPopups gadget name into config var
..


Move conflicting NavPopups gadget name into config var

Changes:
 - removed hardcoded comflicting Navigation Popups gadget name
 - introduced a config variable to specify conflicting gadget name

Bug: T151058
Change-Id: Ief5c6f90ec6dd6c074931f7d9ff20297d4718fe5
---
M extension.json
M includes/PopupsContext.php
M includes/PopupsGadgetsIntegration.php
M tests/phpunit/PopupsContextTest.php
M tests/phpunit/PopupsContextTestWrapper.php
M tests/phpunit/PopupsGadgetsIntegrationTest.php
M tests/phpunit/PopupsHooksTest.php
7 files changed, 122 insertions(+), 43 deletions(-)

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



diff --git a/extension.json b/extension.json
index b6b4bc8..25d76e5 100644
--- a/extension.json
+++ b/extension.json
@@ -52,7 +52,9 @@
"@PopupsHideOptInOnPreferencesPage": "@var bool: Whether the 
option to senable/disable Page Previews should be hidden on Preferences page. 
Please note if PopupsBetaFeature is set to true this option will be always 
hidden. False by default",
"PopupsHideOptInOnPreferencesPage": false,
"@PopupsOptInDefaultState" : "@var string:['1'|'0'] Default 
Page Previews visibility. Has to be a string as a compatibility with beta 
feature settings",
-   "PopupsOptInDefaultState" : "0"
+   "PopupsOptInDefaultState" : "0",
+   "@PopupsConflictingNavPopupsGadgetName": "@var string: 
Navigation popups gadget name",
+   "PopupsConflictingNavPopupsGadgetName": "Navigation_popups"
},
"ResourceModules": {
"ext.popups.images": {
diff --git a/includes/PopupsContext.php b/includes/PopupsContext.php
index cc2b9ac..f74e02c 100644
--- a/includes/PopupsContext.php
+++ b/includes/PopupsContext.php
@@ -23,6 +23,7 @@
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 use ExtensionRegistry;
+use Config;
 
 /**
  * Popups Module
@@ -75,16 +76,17 @@
protected static $instance;
/**
 * Module constructor.
+* @param Config $config
 * @param ExtensionRegistry $extensionRegistry
+* @param PopupsGadgetsIntegration $gadgetsIntegration
 */
-   protected function __construct( ExtensionRegistry $extensionRegistry,
+   protected function __construct( Config $config, ExtensionRegistry 
$extensionRegistry,
PopupsGadgetsIntegration $gadgetsIntegration ) {
/** @todo Use MediaWikiServices Service Locator when it's ready 
*/
$this->extensionRegistry = $extensionRegistry;
$this->gadgetsIntegration = $gadgetsIntegration;
 
-   $this->config = 
MediaWikiServices::getInstance()->getConfigFactory()
-   ->makeConfig( PopupsContext::EXTENSION_NAME );
+   $this->config = $config;
}
 
/**
@@ -94,9 +96,13 @@
 */
public static function getInstance() {
if ( !self::$instance ) {
+   /** @todo Use MediaWikiServices Service Locator when 
it's ready */
+
$registry = ExtensionRegistry::getInstance();
-   self::$instance = new PopupsContext( $registry,
-   new PopupsGadgetsIntegration( $registry ) );
+   $config = 
MediaWikiServices::getInstance()->getConfigFactory()
+   ->makeConfig( PopupsContext::EXTENSION_NAME );
+   $gadgetsIntegration = new PopupsGadgetsIntegration( 
$config, $registry );
+   self::$instance = new PopupsContext( $config, 
$registry, $gadgetsIntegration );
}
return self::$instance;
}
diff --git a/includes/PopupsGadgetsIntegration.php 
b/includes/PopupsGadgetsIntegration.php
index 9a9d6c2..addc0d3 100644
--- a/includes/PopupsGadgetsIntegration.php
+++ b/includes/PopupsGadgetsIntegration.php
@@ -20,25 +20,38 @@
 */
 namespace Popups;
 
+use Config;
+use ExtensionRegistry;
+
 /**
 * Gadgets integration
 *
 * @package Popups
 */
 class PopupsGadgetsIntegration {
-   const NAVIGATION_POPUPS_NAME = 'Navigation_popups';
-
+   /**
+* @var string
+*/
+   const CONFIG_NAVIGATION_POPUPS_NAME = 
'PopupsConflictingNavPopupsGadgetName';
/**
 * @var \ExtensionRegistry
 */
private $extensionRegistry;
 
/**
-* PopupsGadgetsIntegration constructor.
-* @param \ExtensionRegistry $extensionRegistry
+* @var string
 */
-   public function __construct( \ExtensionRegistry $extensionRegistry ) {
+   private $navPopupsGadgetName;
+
+   /**
+* PopupsGadgetsIntegration

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove random check (and possible inclusion) of Autoloader f...

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331937 )

Change subject: Remove random check (and possible inclusion) of Autoloader from 
Setup
..


Remove random check (and possible inclusion) of Autoloader from Setup

This is not even possible. You would've fatal'd 800 ways to Sunday
before you get remotely this far.

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

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



diff --git a/includes/Setup.php b/includes/Setup.php
index f6631ea..4fd222cb 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -499,10 +499,6 @@
MWDebug::init();
 }
 
-if ( !class_exists( 'AutoLoader' ) ) {
-   require_once "$IP/includes/AutoLoader.php";
-}
-
 // Reset the global service locator, so any services that have already been 
created will be
 // re-created while taking into account any custom settings and extensions.
 MediaWikiServices::resetGlobalInstance( new GlobalVarConfig(), 'quick' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf469e56394db93215af1aa54dc96876d5079ea9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Abandon Python 2.6 and indtroduce Python 3.6 on CI infrastru...

2017-01-12 Thread Magul (Code Review)

Magul has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331940 )

Change subject: Abandon Python 2.6 and indtroduce Python 3.6 on CI 
infrastructure
..

Abandon Python 2.6 and indtroduce Python 3.6 on CI infrastructure

Bug: T154771
Change-Id: Ic489d917778bd404b1b4f0c2d841260b9a77716a
---
M .appveyor.yml
M .travis.yml
2 files changed, 49 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/40/331940/1

diff --git a/.appveyor.yml b/.appveyor.yml
index c7eff52..55ea17b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -17,14 +17,25 @@
 
 # Test the lowest supported release of each major Python version.
 
-# Pywikibot support matrix suggests 'should run' on Python 2.6.5+
-# Only Python 2.6.6 is able to be set up on Appveyor.
-# https://github.com/ogrisel/python-appveyor-demo/issues/10
-# fwiw, Redhat Enterprise Linux ships with 2.6.6.
+- PYTHON: "C:\\Python272"
+  PYTHON_VERSION: "2.7.2"
+  PYTHON_ARCH: "32"
 
-- PYTHON: "C:\\Python266-x64"
-  PYTHON_VERSION: "2.6.6"
-  PYTHON_ARCH: "64"
+- PYTHON: "C:\\Python330"
+  PYTHON_VERSION: "3.3.0"
+  PYTHON_ARCH: "32"
+
+- PYTHON: "C:\\Python340"
+  PYTHON_VERSION: "3.4.0"
+  PYTHON_ARCH: "32"
+
+- PYTHON: "C:\\Python350"
+  PYTHON_VERSION: "3.5.0"
+  PYTHON_ARCH: "32"
+
+- PYTHON: "C:\\Python360"
+  PYTHON_VERSION: "3.6.0"
+  PYTHON_ARCH: "32"
 
 - PYTHON: "C:\\Python272-x64"
   PYTHON_VERSION: "2.7.2"
@@ -38,32 +49,55 @@
   PYTHON_VERSION: "3.4.0"
   PYTHON_ARCH: "64"
 
+- PYTHON: "C:\\Python350-x64"
+  PYTHON_VERSION: "3.5.0"
+  PYTHON_ARCH: "64"
+
+- PYTHON: "C:\\Python360-x64"
+  PYTHON_VERSION: "3.6.0"
+  PYTHON_ARCH: "64"
+
 # Appveyor pre-installs these versions onto build machines
 
 - PYTHON: "C:\\Python27"
-  PYTHON_VERSION: "2.7.x" # currently 2.7.9
+  PYTHON_VERSION: "2.7.x"
   PYTHON_ARCH: "32"
 
 - PYTHON: "C:\\Python33"
-  PYTHON_VERSION: "3.3.x" # currently 3.3.5
+  PYTHON_VERSION: "3.3.x"
   PYTHON_ARCH: "32"
 
 - PYTHON: "C:\\Python34"
-  PYTHON_VERSION: "3.4.x" # currently 3.4.3
+  PYTHON_VERSION: "3.4.x"
+  PYTHON_ARCH: "32"
+
+- PYTHON: "C:\\Python35"
+  PYTHON_VERSION: "3.5.x"
+  PYTHON_ARCH: "32"
+
+- PYTHON: "C:\\Python36"
+  PYTHON_VERSION: "3.6.x"
   PYTHON_ARCH: "32"
 
 - PYTHON: "C:\\Python27-x64"
-  PYTHON_VERSION: "2.7.x" # currently 2.7.9
+  PYTHON_VERSION: "2.7.x"
   PYTHON_ARCH: "64"
 
 - PYTHON: "C:\\Python33-x64"
-  PYTHON_VERSION: "3.3.x" # currently 3.3.5
+  PYTHON_VERSION: "3.3.x"
   PYTHON_ARCH: "64"
 
 - PYTHON: "C:\\Python34-x64"
-  PYTHON_VERSION: "3.4.x" # currently 3.4.3
+  PYTHON_VERSION: "3.4.x"
   PYTHON_ARCH: "64"
 
+- PYTHON: "C:\\Python35-x64"
+  PYTHON_VERSION: "3.5.x"
+  PYTHON_ARCH: "64"
+
+- PYTHON: "C:\\Python36-x64"
+  PYTHON_VERSION: "3.6.x"
+  PYTHON_ARCH: "64"
 init:
   - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
diff --git a/.travis.yml b/.travis.yml
index ca5e14b..2066025 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@
   - '3.3'
   - '3.4'
   - '3.5'
-  - '2.6'
+  - '3.6'
 
 # OSX builds do not yet support Python
 os: linux
@@ -167,7 +167,7 @@
   env: LANGUAGE=test FAMILY=wikidata SITE_ONLY=1
 - python: '3.4'
   env: LANGUAGE=ar FAMILY=wiktionary PYWIKIBOT2_TEST_NO_RC=1
-- python: '2.6'
+- python: '2.7'
   env: LANGUAGE=wikidata FAMILY=wikidata SITE_ONLY=1
 
 notifications:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic489d917778bd404b1b4f0c2d841260b9a77716a
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Magul 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove fully initialized debug message, dubiously useful

2017-01-12 Thread Chad (Code Review)

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331939 )

Change subject: Remove fully initialized debug message, dubiously useful
..

Remove fully initialized debug message, dubiously useful

Change-Id: I406e44a3751788c4282f5cb22377d258f06671c3
---
M includes/Setup.php
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/39/331939/1

diff --git a/includes/Setup.php b/includes/Setup.php
index f6631ea..b0d0fe7 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -880,7 +880,6 @@
Pingback::schedulePingback();
 }
 
-wfDebug( "Fully initialised\n" );
 $wgFullyInitialised = true;
 
 Profiler::instance()->scopedProfileOut( $ps_extensions );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move libs/time/defines.php inclusion from GlobalFunctions to...

2017-01-12 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331938 )

Change subject: Move libs/time/defines.php inclusion from GlobalFunctions to 
Defines.php
..

Move libs/time/defines.php inclusion from GlobalFunctions to Defines.php

* Verified none of these constants depend on each other.
* Move them to the top of Defines.php for consistency.

Change-Id: I19c77e706d69bff513e4abafd0300207de0dbb1d
---
M includes/Defines.php
M includes/GlobalFunctions.php
2 files changed, 5 insertions(+), 15 deletions(-)


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

diff --git a/includes/Defines.php b/includes/Defines.php
index 0616898..05e092e 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -20,6 +20,11 @@
  * @file
  */
 
+require_once __DIR__ . '/libs/mime/defines.php';
+require_once __DIR__ . '/libs/time/defines.php';
+require_once __DIR__ . '/libs/rdbms/defines.php';
+require_once __DIR__ . '/compat/normal/UtfNormalDefines.php';
+
 /**
  * @defgroup Constants MediaWiki constants
  */
@@ -97,7 +102,6 @@
 define( 'CACHE_ACCEL', 3 );  // APC, XCache or WinCache
 /**@}*/
 
-require_once __DIR__ . '/libs/mime/defines.php';
 
 /**@{
  * Antivirus result codes, for use in $wgAntivirusSetup.
@@ -152,16 +156,6 @@
 define( 'EDIT_AUTOSUMMARY', 64 );
 define( 'EDIT_INTERNAL', 128 );
 /**@}*/
-
-/**
- * Database related
- */
-require_once __DIR__ . '/libs/rdbms/defines.php';
-
-/**
- * Unicode and normalisation related
- */
-require_once __DIR__ . '/compat/normal/UtfNormalDefines.php';
 
 /**@{
  * Hook support constants
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 6549fdd..5343248 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1999,10 +1999,6 @@
MediaWiki\suppressWarnings( true );
 }
 
-# Autodetect, convert and provide timestamps of various types
-
-require_once __DIR__ . '/libs/time/defines.php';
-
 /**
  * Get a timestamp string in one of various formats
  *

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19c77e706d69bff513e4abafd0300207de0dbb1d
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/core[master]: Remove random check (and possible inclusion) of Autoloader f...

2017-01-12 Thread Chad (Code Review)

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331937 )

Change subject: Remove random check (and possible inclusion) of Autoloader from 
Setup
..

Remove random check (and possible inclusion) of Autoloader from Setup

This is not even possible. You would've fatal'd 800 ways to Sunday
before you get remotely this far.

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


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

diff --git a/includes/Setup.php b/includes/Setup.php
index f6631ea..4fd222cb 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -499,10 +499,6 @@
MWDebug::init();
 }
 
-if ( !class_exists( 'AutoLoader' ) ) {
-   require_once "$IP/includes/AutoLoader.php";
-}
-
 // Reset the global service locator, so any services that have already been 
created will be
 // re-created while taking into account any custom settings and extensions.
 MediaWikiServices::resetGlobalInstance( new GlobalVarConfig(), 'quick' );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove deprecated `.mw-ui-constructive` class for text and a...

2017-01-12 Thread VolkerE (Code Review)

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331936 )

Change subject: Remove deprecated `.mw-ui-constructive` class for text and 
anchors
..

Remove deprecated `.mw-ui-constructive` class for text and anchors

Removing deprecated, no longer in use `.mw-ui-constructive` modifier
CSS class for mediawiki.UI text and anchors.

Bug: T155203
Change-Id: I9bcd90ebbebbaece13e0cf9f36afd5964d49dc3b
---
M resources/src/mediawiki.ui/components/anchors.less
M resources/src/mediawiki.ui/components/text.less
2 files changed, 3 insertions(+), 11 deletions(-)


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

diff --git a/resources/src/mediawiki.ui/components/anchors.less 
b/resources/src/mediawiki.ui/components/anchors.less
index 4c4e129..ff38d0d 100644
--- a/resources/src/mediawiki.ui/components/anchors.less
+++ b/resources/src/mediawiki.ui/components/anchors.less
@@ -48,22 +48,16 @@
&.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 );
-   }
 }
 
 /*
 Quiet anchors
 
-Use quiet anchors when they are less important and alongside other 
progressive/destructive/progressive
+Use quiet anchors when they are less important and alongside other 
progressive/destructive
 anchors. Use of quiet anchors is not recommended on mobile/tablet due to lack 
of hover state.
 
 Markup:
 Progressive
-Constructive
 Destructive
 
 Styleguide 6.2.1.
diff --git a/resources/src/mediawiki.ui/components/text.less 
b/resources/src/mediawiki.ui/components/text.less
index 5551745..30593bf 100644
--- a/resources/src/mediawiki.ui/components/text.less
+++ b/resources/src/mediawiki.ui/components/text.less
@@ -16,7 +16,6 @@
 Context classes may be used on elements with only plain-text content with the 
mw-ui-text base. When the context classes
 are used on interactive and block-level elements, the appropriate alternative 
base type classes should also be used. For
 example, mw-ui-anchor with A, or mw-ui-button with buttons.
-'Constructive' is deprecated and merged with 'Progressive'.
 
 Markup:
 Progressive
@@ -28,11 +27,10 @@
 .mw-ui-text {
// The selector order is like this on purpose; IE 6 ignores the second 
selector,
// so we don't want to accidentally apply this color on all 
mw-ui-CONTEXT classes
-   .mw-ui-progressive&,
-   .mw-ui-constructive& {
+   &.mw-ui-progressive {
color: @colorProgressive;
}
-   .mw-ui-destructive& {
+   &.mw-ui-destructive {
color: @colorDestructive;
}
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9bcd90ebbebbaece13e0cf9f36afd5964d49dc3b
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] mediawiki...trending-edits[master]: Track reverts as best as possible

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331250 )

Change subject: Track reverts as best as possible
..


Track reverts as best as possible

Bug: T152421
Change-Id: I0ea9a3d52e9fb416d4902ea3dc403269528a0fbf
---
M lib/processor.js
M lib/score-pages.js
M test/features/lib/processor.js
3 files changed, 43 insertions(+), 0 deletions(-)

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



diff --git a/lib/processor.js b/lib/processor.js
index cda54b6..ad4e557 100644
--- a/lib/processor.js
+++ b/lib/processor.js
@@ -60,6 +60,19 @@
 }
 
 /**
+ * Guesses whether an edit was a revert of an earlier edit
+ *
+ * @param {Object} edit
+ * @return {Boolean} whether the given edit was a revert
+ */
+function isRevert(edit) {
+if (!edit.comment) {
+return false;
+}
+return /\b(?:reverted|reverting|undid)\b/i.test(edit.comment);
+}
+
+/**
  * Process data structure representing edit
  *
  * @param {Object} edit
@@ -103,6 +116,7 @@
 from: ts,
 updated: ts,
 rev_len: edit.rev_len,
+reverts: 0,
 anonEdits: 0,
 contributors: {
 total: 0,
@@ -130,6 +144,9 @@
 contributors.names[username].edits++;
 }
 page.bytes = edit.rev_len - page.rev_len;
+if (isRevert(edit)) {
+page.reverts++;
+}
 // update
 pages.set(id, page);
 return true;
diff --git a/lib/score-pages.js b/lib/score-pages.js
index 1710f79..adde783 100644
--- a/lib/score-pages.js
+++ b/lib/score-pages.js
@@ -21,6 +21,7 @@
 bytesChanged: candidate.bytes,
 anonEdits: candidate.anonEdits,
 start: candidate.from,
+reverts: candidate.reverts,
 edits: candidate.edits,
 distribution: contrs.names,
 numberContributors: contrs.total
diff --git a/test/features/lib/processor.js b/test/features/lib/processor.js
index ecf4b4f..145e5a7 100644
--- a/test/features/lib/processor.js
+++ b/test/features/lib/processor.js
@@ -249,4 +249,29 @@
 assert.ok( pages[0].id === 0, 'The oldest 100 got removed.' );
 assert.ok( pages[199].id === 199, 'Page with id 199 is now the 
oldest.' );
 });
+
+it('reverts get counted as best as we can', function() {
+var pages,
+i = 0,
+protagonist = 'A',
+villain = 'B',
+date = new Date(),
+time = date.getTime();
+
+function helper( username, comment ) {
+i++;
+return edit( 1, username, minAgo(time, i), 0, false, { comment: 
comment } );
+}
+processor.reset();
+processor.process( helper( villain ) );
+processor.process( helper( protagonist, 'Reverting possible vandalism 
by 192.0.0.1' ) );
+processor.process( helper( villain ) );
+processor.process( helper( protagonist, 'Reverted edits by 
217.111.11.113' ) );
+processor.process( helper( villain ) );
+processor.process( helper( protagonist, 'Undid revision 654662877 by 
50.166.105.123' ) );
+
+pages = processor.getPages();
+assert.ok( pages.length === 1, 'Only one page known about' );
+assert.ok( pages[0].reverts === 3, '3 reverts recorded.' );
+});
 });

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ea9a3d52e9fb416d4902ea3dc403269528a0fbf
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/services/trending-edits
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mobrovac 
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...Vector[master]: collapsibleTabs: Stop the tabs from collapsing back and fort...

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331919 )

Change subject: collapsibleTabs: Stop the tabs from collapsing back and forth 
forever
..


collapsibleTabs: Stop the tabs from collapsing back and forth forever

Update the 'expandedWidth' after we expand in case someone was brazen
enough to change the tab's contents after the page load (gasp).

This doesn't prevent a tab from collapsing back and forth once, but at
least it won't continue to do that forever. This should reduce the
issue from completely awful to mildly annoying.

Bug: T71729
Change-Id: I46bd6584c0f2ddebc4aa7d1103cff1715e1510a5
---
M collapsibleTabs.js
1 file changed, 9 insertions(+), 2 deletions(-)

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



diff --git a/collapsibleTabs.js b/collapsibleTabs.js
index c37d76b..134bc7c 100644
--- a/collapsibleTabs.js
+++ b/collapsibleTabs.js
@@ -172,8 +172,15 @@
.data( 'collapsibleTabsSettings', data )
.animate( { width: expandedWidth + 'px' }, 
'normal', function () {
$( this ).attr( 'style', 'display: 
block;' );
-   expContainerSettings.shifting = false;
-   rAF( $.collapsibleTabs.handleResize );
+   rAF( function () {
+   // Update the 'expandedWidth' 
in case someone was brazen enough to change the tab's
+   // contents after the page load 
*gasp* (T71729). This doesn't prevent a tab from
+   // collapsing back and forth 
once, but at least it won't continue to do that forever.
+   data.expandedWidth = 
$moving.width();
+   $moving.data( 
'collapsibleTabsSettings', data );
+   expContainerSettings.shifting = 
false;
+   
$.collapsibleTabs.handleResize();
+   } );
} )
);
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I46bd6584c0f2ddebc4aa7d1103cff1715e1510a5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
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...Wikibase[master]: Inject SpecialSetSiteLink dependencies

2017-01-12 Thread Ladsgroup (Code Review)

Ladsgroup has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331935 )

Change subject: Inject SpecialSetSiteLink dependencies
..

Inject SpecialSetSiteLink dependencies

Bug: T155205
Change-Id: I6eef4a15872606dd9d7ef4cec50bb04501669cbd
---
M repo/Wikibase.php
M repo/includes/Specials/SpecialSetSiteLink.php
M repo/tests/phpunit/includes/Specials/SpecialSetSiteLinkTest.php
3 files changed, 61 insertions(+), 20 deletions(-)


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

diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index 47039a3..915f913 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -274,7 +274,27 @@
$wgSpecialPages['SetAliases'] = 
Wikibase\Repo\Specials\SpecialSetAliases::class;
$wgSpecialPages['SetLabelDescriptionAliases']
= 
Wikibase\Repo\Specials\SpecialSetLabelDescriptionAliases::class;
-   $wgSpecialPages['SetSiteLink'] = 
Wikibase\Repo\Specials\SpecialSetSiteLink::class;
+   $wgSpecialPages['SetSiteLink'] = function() {
+   $wikibaseRepo = 
\Wikibase\Repo\WikibaseRepo::getDefaultInstance();
+   $siteLookup = $wikibaseRepo->getSiteLookup();
+   $settings = $wikibaseRepo->getSettings();
+
+   $siteLinkChangeOpFactory = 
$wikibaseRepo->getChangeOpFactoryProvider()->getSiteLinkChangeOpFactory();
+   $siteLinkTargetProvider = new 
\Wikibase\Repo\SiteLinkTargetProvider(
+   $siteLookup,
+   $settings->getSetting( 'specialSiteLinkGroups' )
+   );
+
+   $labelDescriptionLookupFactory = 
$wikibaseRepo->getLanguageFallbackLabelDescriptionLookupFactory();
+   return new Wikibase\Repo\Specials\SpecialSetSiteLink(
+   $settings->getSetting( 'badgeItems' ),
+   $settings->getSetting( 'siteLinkGroups' ),
+   $siteLinkChangeOpFactory,
+   $siteLinkTargetProvider,
+   $labelDescriptionLookupFactory,
+   $siteLookup
+   );
+   };
$wgSpecialPages['EntitiesWithoutLabel'] = array(
Wikibase\Repo\Specials\SpecialEntitiesWithoutPageFactory::class,
'newSpecialEntitiesWithoutLabel'
diff --git a/repo/includes/Specials/SpecialSetSiteLink.php 
b/repo/includes/Specials/SpecialSetSiteLink.php
index 4c6d853..02c9691 100644
--- a/repo/includes/Specials/SpecialSetSiteLink.php
+++ b/repo/includes/Specials/SpecialSetSiteLink.php
@@ -14,7 +14,6 @@
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
 use Wikibase\Repo\SiteLinkTargetProvider;
-use Wikibase\Repo\WikibaseRepo;
 use Wikibase\Summary;
 
 /**
@@ -79,26 +78,29 @@
private $siteLookup;
 
/**
-* @since 0.4
+* @param SiteLookup $siteLookup
+* @param array $badgeItems
+* @param array $siteLinkGroups
+* @param SiteLinkChangeOpFactory $siteLinkChangeOpFactory
+* @param SiteLinkTargetProvider $siteLinkTargetProvider
+* @param LanguageFallbackLabelDescriptionLookupFactory 
$labelDescriptionLookupFactory
 */
-   public function __construct() {
+   public function __construct(
+   array $badgeItems,
+   array $siteLinkGroups,
+   SiteLinkChangeOpFactory $siteLinkChangeOpFactory,
+   SiteLinkTargetProvider $siteLinkTargetProvider,
+   LanguageFallbackLabelDescriptionLookupFactory 
$labelDescriptionLookupFactory,
+   SiteLookup $siteLookup
+   ) {
parent::__construct( 'SetSiteLink' );
 
-   $wikibaseRepo = WikibaseRepo::getDefaultInstance();
-   $settings = $wikibaseRepo->getSettings();
-
-   $this->siteLookup = $wikibaseRepo->getSiteLookup();
-
-   $this->badgeItems = $settings->getSetting( 'badgeItems' );
-   $this->siteLinkGroups = $settings->getSetting( 'siteLinkGroups' 
);
-
-   $this->siteLinkChangeOpFactory = 
$wikibaseRepo->getChangeOpFactoryProvider()->getSiteLinkChangeOpFactory();
-   $this->siteLinkTargetProvider = new SiteLinkTargetProvider(
-   $this->siteLookup,
-   $settings->getSetting( 'specialSiteLinkGroups' )
-   );
-
-   $this->labelDescriptionLookupFactory = 
$wikibaseRepo->getLanguageFallbackLabelDescriptionLookupFactory();
+   $this->badgeItems = $badgeItems;
+   $this->siteLinkGroups = $siteLinkGroups;
+   $this->siteLinkChangeOpFactory = $siteLinkChangeOpFactory;
+   $this->siteLinkTargetProvider = $siteLinkTargetProvider;
+   $this->labelDescriptionLookupFactory = 
$labelDescriptionLookupFactory;
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: MWMultiVersion: Use proper (new) cli entry point

2017-01-12 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331931 )

Change subject: MWMultiVersion: Use proper (new) cli entry point
..


MWMultiVersion: Use proper (new) cli entry point

Depends-On: I36e787a759b2f5c413ef82a76bdb29f8a8f0ff38
Change-Id: I7adc5bc9204f8cc6168f84293f2a96d23db870c5
---
M modules/snapshot/files/cron/runphpscriptletonallwikis.py
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/snapshot/files/cron/runphpscriptletonallwikis.py 
b/modules/snapshot/files/cron/runphpscriptletonallwikis.py
index e87ec82..98140c2 100644
--- a/modules/snapshot/files/cron/runphpscriptletonallwikis.py
+++ b/modules/snapshot/files/cron/runphpscriptletonallwikis.py
@@ -46,8 +46,8 @@
 def get_php_code(self):
 if self.multiversion:
 php_setup = (
-"require_once( '%s/MWVersion.php' ); "
-"$dir = getMediaWikiCli(''); "
+"require_once( '%s/MWMultiVersion.php' ); "
+"$dir = MWMultiVersion::getMediaWikiCli(''); "
 "require_once( \"$dir/maintenance/Maintenance.php\" );"
 % self.script_path)
 else:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7adc5bc9204f8cc6168f84293f2a96d23db870c5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Volans 
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]: Bypass warming red link cache for wikitext requests

2017-01-12 Thread Esanders (Code Review)

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331934 )

Change subject: Bypass warming red link cache for wikitext requests
..

Bypass warming red link cache for wikitext requests

Wikitext editor doesn't need to know about redlinks
on the page, so this is a waste of time. If the user
switches to VE, they will do a fresh metadata request
at that point.

Change-Id: I57f3fe3fca47dde03bba7905f763abc8a43d0653
---
M ApiVisualEditor.php
1 file changed, 27 insertions(+), 25 deletions(-)


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

diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index d09ac29..8cf50e8 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -445,34 +445,36 @@
// We do the lookup for the current version. 
This might not be entirely complete
// if we're loading an oldid, but it'll 
probably be close enough, and LinkCache
// will automatically request any additional 
data it needs.
-   $links = [];
-   $wikipage = WikiPage::factory( $title );
-   $popts = $wikipage->makeParserOptions( 
'canonical' );
-   $cached = ParserCache::singleton()->get( 
$article, $popts, true );
-   $links = [
-   // Array of linked pages that are 
missing
-   'missing' => [],
-   // For current revisions: 1 (treat all 
non-missing pages as known)
-   // For old revisions: array of linked 
pages that are known
-   'known' => $restoring || !$cached ? [] 
: 1,
-   ];
-   if ( $cached ) {
-   foreach ( $cached->getLinks() as 
$namespace => $cachedTitles ) {
-   foreach ( $cachedTitles as 
$cachedTitleText => $exists ) {
-   $cachedTitle = 
Title::makeTitle( $namespace, $cachedTitleText );
-   if ( 
!$cachedTitle->isKnown() ) {
-   
$links['missing'][] = $cachedTitle->getPrefixedText();
-   } elseif ( 
$links['known'] !== 1 ) {
-   
$links['known'][] = $cachedTitle->getPrefixedText();
+   $links = null;
+   if ( $params['paction'] !== 'wikitext' ) {
+   $wikipage = WikiPage::factory( $title );
+   $popts = $wikipage->makeParserOptions( 
'canonical' );
+   $cached = 
ParserCache::singleton()->get( $article, $popts, true );
+   $links = [
+   // Array of linked pages that 
are missing
+   'missing' => [],
+   // For current revisions: 1 
(treat all non-missing pages as known)
+   // For old revisions: array of 
linked pages that are known
+   'known' => $restoring || 
!$cached ? [] : 1,
+   ];
+   if ( $cached ) {
+   foreach ( $cached->getLinks() 
as $namespace => $cachedTitles ) {
+   foreach ( $cachedTitles 
as $cachedTitleText => $exists ) {
+   $cachedTitle = 
Title::makeTitle( $namespace, $cachedTitleText );
+   if ( 
!$cachedTitle->isKnown() ) {
+   
$links['missing'][] = $cachedTitle->getPrefixedText();
+   } elseif ( 
$links['known'] !== 1 ) {
+   
$links['known'][] = $cachedTitle->getPrefixedText();
+   }
}
}
}
-   }
-   // Add information about current page
-   if

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove getMediaWikiCli() entry point, unused

2017-01-12 Thread Chad (Code Review)

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331933 )

Change subject: Remove getMediaWikiCli() entry point, unused
..

Remove getMediaWikiCli() entry point, unused

Depends-On: I7adc5bc9204f8cc6168f84293f2a96d23db870c5
Change-Id: I14631b26ca459f2be99ecf95ca6762e253629fb9
---
M multiversion/MWVersion.php
1 file changed, 0 insertions(+), 17 deletions(-)


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

diff --git a/multiversion/MWVersion.php b/multiversion/MWVersion.php
index 76bb232..7466077 100644
--- a/multiversion/MWVersion.php
+++ b/multiversion/MWVersion.php
@@ -52,20 +52,3 @@
 
return "$IP/$file";
 }
-
-/**
- * Get the location of the correct version of a MediaWiki CLI
- * entry-point file given the --wiki parameter passed in.
- *
- * This also has some other effects:
- * (a) Sets the $IP global variable (path to MediaWiki)
- * (b) Sets the MW_INSTALL_PATH environmental variable
- * (c) Changes PHP's current directory to the directory of this file.
- *
- * @param $file string File path (relative to MediaWiki dir)
- * @return string Absolute file path with proper MW location
- */
-function getMediaWikiCli( $file ) {
-   require_once __DIR__ . '/MWMultiVersion.php';
-   return MWMultiVersion::getMediaWikiCli( $file );
-}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Timestamp[master]: tests: Extend coverage of invalid timestamps

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331926 )

Change subject: tests: Extend coverage of invalid timestamps
..


tests: Extend coverage of invalid timestamps

Add "1971:01:01 06:19:385" as invalid timestamp.
Also some minor refactoring and clean up.

Bug: T42038
Change-Id: I31bac87ee0b4298b47010f5607cad52feab3137b
---
M tests/TimestampTest.php
1 file changed, 39 insertions(+), 25 deletions(-)

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



diff --git a/tests/TimestampTest.php b/tests/TimestampTest.php
index df1e1b9..858ebc2 100644
--- a/tests/TimestampTest.php
+++ b/tests/TimestampTest.php
@@ -25,14 +25,11 @@
 
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 
-/**
- * Tests timestamp parsing and output.
- */
 class ConvertibleTimestampTest extends \PHPUnit_Framework_TestCase {
/**
 * @covers \Wikimedia\Timestamp\ConvertibleTimestamp::__construct
 */
-   public function testConstructWithNoTimestamp() {
+   public function testConstructWithoutTimestamp() {
$timestamp = new ConvertibleTimestamp();
$this->assertInternalType( 'string', $timestamp->getTimestamp() 
);
$this->assertNotEmpty( $timestamp->getTimestamp() );
@@ -47,7 +44,7 @@
$this->assertEquals( '1406833268', $timestamp->__toString() );
}
 
-   public static function provideValidTimestampDifferences() {
+   public static function provideDiff() {
return [
[ '1406833268', '1406833269', '00 00 00 01' ],
[ '1406833268', '1406833329', '00 00 01 01' ],
@@ -57,7 +54,7 @@
}
 
/**
-* @dataProvider provideValidTimestampDifferences
+* @dataProvider provideDiff
 * @covers \Wikimedia\Timestamp\ConvertibleTimestamp::diff
 */
public function testDiff( $timestamp1, $timestamp2, $expected ) {
@@ -68,7 +65,8 @@
}
 
/**
-* Test parsing of valid timestamps and outputing to MW format.
+* Parse valid timestamps and output in MW format.
+*
 * @dataProvider provideValidTimestamps
 * @covers \Wikimedia\Timestamp\ConvertibleTimestamp::getTimestamp
 */
@@ -78,22 +76,25 @@
}
 
/**
-* Test outputting valid timestamps to different formats.
-* @dataProvider provideValidTimestamps
-* @covers \Wikimedia\Timestamp\ConvertibleTimestamp::getTimestamp
-*/
-   public function testValidOutput( $format, $expected, $original ) {
-   $timestamp = new ConvertibleTimestamp( $original );
-   $this->assertEquals( $expected, 
(string)$timestamp->getTimestamp( $format ) );
-   }
-
-   /**
-* Test an invalid timestamp.
+* Parse invalid timestamps.
+*
+* @dataProvider provideInvalidTimestamps
 * @expectedException \Wikimedia\Timestamp\TimestampException
 * @covers \Wikimedia\Timestamp\ConvertibleTimestamp
 */
-   public function testInvalidParse() {
-   new ConvertibleTimestamp( "This is not a timestamp." );
+   public function testInvalidParse( $input ) {
+   new ConvertibleTimestamp( $input );
+   }
+
+   /**
+* Output valid timestamps in different formats.
+*
+* @dataProvider provideValidTimestamps
+* @covers \Wikimedia\Timestamp\ConvertibleTimestamp::getTimestamp
+*/
+   public function testValidFormats( $format, $expected, $original ) {
+   $timestamp = new ConvertibleTimestamp( $original );
+   $this->assertEquals( $expected, 
(string)$timestamp->getTimestamp( $format ) );
}
 
/**
@@ -106,17 +107,20 @@
 
/**
 * Format an invalid timestamp.
+*
+* @dataProvider provideInvalidTimestamps
 * @covers \Wikimedia\Timestamp\ConvertibleTimestamp::convert
 */
-   public function testConvertInvalid() {
-   $this->assertSame( false, ConvertibleTimestamp::convert( 'Not a 
timestamp', 0 ) );
+   public function testConvertInvalid( $input ) {
+   $this->assertSame( false, ConvertibleTimestamp::convert( 
$input, 0 ) );
}
 
/**
-* Test an out of range timestamp
+* Test an out-of-range timestamp.
+*
 * @dataProvider provideOutOfRangeTimestamps
-* @expectedException \Wikimedia\Timestamp\TimestampException
 * @covers \Wikimedia\Timestamp\ConvertibleTimestamp
+* @expectedException \Wikimedia\Timestamp\TimestampException
 */
public function testOutOfRangeTimestamps( $format, $input ) {
$timestamp = new ConvertibleTimestamp( $input );
@@ -125,8 +129,8 @@
 
/**
 * Test requesting an invalid output format.
-*

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Open preview links in new tab

2017-01-12 Thread Esanders (Code Review)

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331932 )

Change subject: Open preview links in new tab
..

Open preview links in new tab

Bug: T155159
Change-Id: Idddc6b25303c17382ba1bc763b9001b727e1040e
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 9148a77..0ab38e5 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -1081,7 +1081,12 @@
body = doc.body;
// Import body to current document, then 
resolve attributes against original document (parseDocument called #fixBase)
document.adoptNode( body );
+   // TODO: This code is very similar to 
ve.ui.PreviewElement
ve.resolveAttributes( body, doc, 
ve.dm.Converter.static.computedAttributes );
+   // Make all links open in a new window (sync 
view)
+   Array.prototype.forEach.call( 
body.querySelectorAll( 'a[href]' ), function ( el ) {
+   el.setAttribute( 'target', '_blank' );
+   } );
target.saveDialog.showPreview( $( body 
).contents() );
} else {
target.saveDialog.showPreview( $( '' ).text(

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: MWMultiversion: Move CLI entry point to class and out of MWV...

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331930 )

Change subject: MWMultiversion: Move CLI entry point to class and out of 
MWVersion
..


MWMultiversion: Move CLI entry point to class and out of MWVersion

Self contained, easier, less likely to break than moving the entry
points yet

Change-Id: I36e787a759b2f5c413ef82a76bdb29f8a8f0ff38
---
M multiversion/MWMultiVersion.php
M multiversion/MWScript.php
M multiversion/MWVersion.php
3 files changed, 38 insertions(+), 22 deletions(-)

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



diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index 521b8a8..44fdb58 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -367,4 +367,38 @@
trigger_error( $msg, E_USER_ERROR );
exit( 1 ); // sanity
}
+
+   /**
+* Get the location of the correct version of a MediaWiki CLI
+* entry-point file given the --wiki parameter passed in.
+*
+* This also has some other effects:
+* (a) Sets the $IP global variable (path to MediaWiki)
+* (b) Sets the MW_INSTALL_PATH environmental variable
+* (c) Changes PHP's current directory to the directory of this file.
+*
+* @param $file string File path (relative to MediaWiki dir)
+* @return string Absolute file path with proper MW location
+*/
+   public static function getMediaWikiCli( $file ) {
+   global $IP;
+
+   $multiVersion = self::getInstance();
+   if( !$multiVersion ) {
+   $multiVersion = self::initializeForMaintenance();
+   }
+   if ( $multiVersion->getDatabase() === 'testwiki' ) {
+   define( 'TESTWIKI', 1 );
+   }
+
+   # Get the MediaWiki version running on this wiki...
+   $version = $multiVersion->getVersion();
+
+   # Get the correct MediaWiki path based on this version...
+   $IP = dirname( __DIR__ ) . "/$version";
+
+   putenv( "MW_INSTALL_PATH=$IP" );
+
+   return "$IP/$file";
+   }
 }
diff --git a/multiversion/MWScript.php b/multiversion/MWScript.php
index 281d6ea..19d62bc 100644
--- a/multiversion/MWScript.php
+++ b/multiversion/MWScript.php
@@ -83,8 +83,8 @@
}
 
# MWScript.php should be in common/
-   require_once __DIR__ . '/MWVersion.php';
-   $file = getMediaWikiCli( $relFile );
+   require_once __DIR__ . '/MWMultiVersion.php';
+   $file = MWMultiVersion::getMediaWikiCli( $relFile );
if ( !file_exists( $file ) ) {
fwrite( STDERR, "The MediaWiki script file \"{$file}\" does not 
exist.\n" );
exit( 1 );
diff --git a/multiversion/MWVersion.php b/multiversion/MWVersion.php
index 8c5dcae..76bb232 100644
--- a/multiversion/MWVersion.php
+++ b/multiversion/MWVersion.php
@@ -66,24 +66,6 @@
  * @return string Absolute file path with proper MW location
  */
 function getMediaWikiCli( $file ) {
-   global $IP;
-
-   require_once( __DIR__ . '/MWMultiVersion.php' );
-   $multiVersion = MWMultiVersion::getInstance();
-   if( !$multiVersion ) {
-   $multiVersion = MWMultiVersion::initializeForMaintenance();
-   }
-   if ( $multiVersion->getDatabase() === 'testwiki' ) {
-   define( 'TESTWIKI', 1 );
-   }
-
-   # Get the MediaWiki version running on this wiki...
-   $version = $multiVersion->getVersion();
-
-   # Get the correct MediaWiki path based on this version...
-   $IP = dirname( __DIR__ ) . "/$version";
-
-   putenv( "MW_INSTALL_PATH=$IP" );
-
-   return "$IP/$file";
+   require_once __DIR__ . '/MWMultiVersion.php';
+   return MWMultiVersion::getMediaWikiCli( $file );
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I36e787a759b2f5c413ef82a76bdb29f8a8f0ff38
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
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/puppet[production]: mirrors: Indent @ssl_settings in NGINX configuration

2017-01-12 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329743 )

Change subject: mirrors: Indent @ssl_settings in NGINX configuration
..


mirrors: Indent @ssl_settings in NGINX configuration

Change-Id: I847ae9f6a47ba50cf0c499c16194f358af9badbf
---
M modules/mirrors/templates/mirrors.wikimedia.org.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/mirrors/templates/mirrors.wikimedia.org.conf.erb 
b/modules/mirrors/templates/mirrors.wikimedia.org.conf.erb
index 0f54094..7092503 100644
--- a/modules/mirrors/templates/mirrors.wikimedia.org.conf.erb
+++ b/modules/mirrors/templates/mirrors.wikimedia.org.conf.erb
@@ -27,7 +27,7 @@
 
ssl_certificate /etc/acme/cert/mirrors.chained.crt;
ssl_certificate_key /etc/acme/key/mirrors.key;
-   <%= @ssl_settings.join("\n")  %>
+   <%= @ssl_settings.join("\n   ") %>
 
root /srv/mirrors;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I847ae9f6a47ba50cf0c499c16194f358af9badbf
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Dzahn 
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/puppet[production]: MWMultiVersion: Use proper (new) cli entry point

2017-01-12 Thread Chad (Code Review)

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331931 )

Change subject: MWMultiVersion: Use proper (new) cli entry point
..

MWMultiVersion: Use proper (new) cli entry point

Depends-On: I36e787a759b2f5c413ef82a76bdb29f8a8f0ff38
Change-Id: I7adc5bc9204f8cc6168f84293f2a96d23db870c5
---
M modules/snapshot/files/cron/runphpscriptletonallwikis.py
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/snapshot/files/cron/runphpscriptletonallwikis.py 
b/modules/snapshot/files/cron/runphpscriptletonallwikis.py
index e87ec82..98140c2 100644
--- a/modules/snapshot/files/cron/runphpscriptletonallwikis.py
+++ b/modules/snapshot/files/cron/runphpscriptletonallwikis.py
@@ -46,8 +46,8 @@
 def get_php_code(self):
 if self.multiversion:
 php_setup = (
-"require_once( '%s/MWVersion.php' ); "
-"$dir = getMediaWikiCli(''); "
+"require_once( '%s/MWMultiVersion.php' ); "
+"$dir = MWMultiVersion::getMediaWikiCli(''); "
 "require_once( \"$dir/maintenance/Maintenance.php\" );"
 % self.script_path)
 else:

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Include an i18n example in OO.ui.msg documentation

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/330691 )

Change subject: Include an i18n example in OO.ui.msg documentation
..


Include an i18n example in OO.ui.msg documentation

Example is a streamlined version of how standalone VisualEditor handles i18n,
using jQuery.i18n.

Change-Id: Ie436df50bd2ae061fcbca252dcfe674ff39fc398
---
M src/core.js
1 file changed, 38 insertions(+), 4 deletions(-)

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



diff --git a/src/core.js b/src/core.js
index 9b690d0..ec3dfc4 100644
--- a/src/core.js
+++ b/src/core.js
@@ -372,15 +372,49 @@
/**
 * Get a localized message.
 *
-* In environments that provide a localization system, this function 
should be overridden to
-* return the message translated in the user's language. The default 
implementation always returns
-* English messages.
-*
 * After the message key, message parameters may optionally be passed. 
In the default implementation,
 * any occurrences of $1 are replaced with the first parameter, $2 with 
the second parameter, etc.
 * Alternative implementations of OO.ui.msg may use any substitution 
system they like, as long as
 * they support unnamed, ordered message parameters.
 *
+* In environments that provide a localization system, this function 
should be overridden to
+* return the message translated in the user's language. The default 
implementation always returns
+* English messages. An example of doing this with 
[jQuery.i18n](https://github.com/wikimedia/jquery.i18n)
+* follows.
+*
+* @example
+* var i, iLen, button,
+* messagePath = 'oojs-ui/dist/i18n/',
+* languages = [ $.i18n().locale, 'ur', 'en' ],
+* languageMap = {};
+*
+* for ( i = 0, iLen = languages.length; i < iLen; i++ ) {
+* languageMap[ languages[ i ] ] = messagePath + languages[ i 
].toLowerCase() + '.json';
+* }
+*
+* $.i18n().load( languageMap ).done( function() {
+* // Replace the built-in `msg` only once we've loaded the 
internationalization.
+* // OOjs UI uses `OO.ui.deferMsg` for all initially-loaded 
messages. So long as
+* // you put off creating any widgets until this promise is 
complete, no English
+* // will be displayed.
+* OO.ui.msg = $.i18n;
+*
+* // A button displaying "OK" in the default locale
+* button = new OO.ui.ButtonWidget( {
+* label: OO.ui.msg( 'ooui-dialog-message-accept' ),
+* icon: 'check'
+* } );
+* $( 'body' ).append( button.$element );
+*
+* // A button displaying "OK" in Urdu
+* $.i18n().locale = 'ur';
+* button = new OO.ui.ButtonWidget( {
+* label: OO.ui.msg( 'ooui-dialog-message-accept' ),
+* icon: 'check'
+* } );
+* $( 'body' ).append( button.$element );
+* } );
+*
 * @param {string} key Message key
 * @param {...Mixed} [params] Message parameters
 * @return {string} Translated message with parameters substituted

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie436df50bd2ae061fcbca252dcfe674ff39fc398
Gerrit-PatchSet: 5
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: DLynch 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
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] operations/mediawiki-config[master]: MWMultiversion: Move CLI entry point to class and out of MWV...

2017-01-12 Thread Chad (Code Review)

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331930 )

Change subject: MWMultiversion: Move CLI entry point to class and out of 
MWVersion
..

MWMultiversion: Move CLI entry point to class and out of MWVersion

Self contained, easier, less likely to break than moving the entry
points yet

Change-Id: I36e787a759b2f5c413ef82a76bdb29f8a8f0ff38
---
M multiversion/MWMultiVersion.php
M multiversion/MWScript.php
M multiversion/MWVersion.php
3 files changed, 38 insertions(+), 22 deletions(-)


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

diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index 521b8a8..44fdb58 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -367,4 +367,38 @@
trigger_error( $msg, E_USER_ERROR );
exit( 1 ); // sanity
}
+
+   /**
+* Get the location of the correct version of a MediaWiki CLI
+* entry-point file given the --wiki parameter passed in.
+*
+* This also has some other effects:
+* (a) Sets the $IP global variable (path to MediaWiki)
+* (b) Sets the MW_INSTALL_PATH environmental variable
+* (c) Changes PHP's current directory to the directory of this file.
+*
+* @param $file string File path (relative to MediaWiki dir)
+* @return string Absolute file path with proper MW location
+*/
+   public static function getMediaWikiCli( $file ) {
+   global $IP;
+
+   $multiVersion = self::getInstance();
+   if( !$multiVersion ) {
+   $multiVersion = self::initializeForMaintenance();
+   }
+   if ( $multiVersion->getDatabase() === 'testwiki' ) {
+   define( 'TESTWIKI', 1 );
+   }
+
+   # Get the MediaWiki version running on this wiki...
+   $version = $multiVersion->getVersion();
+
+   # Get the correct MediaWiki path based on this version...
+   $IP = dirname( __DIR__ ) . "/$version";
+
+   putenv( "MW_INSTALL_PATH=$IP" );
+
+   return "$IP/$file";
+   }
 }
diff --git a/multiversion/MWScript.php b/multiversion/MWScript.php
index 281d6ea..19d62bc 100644
--- a/multiversion/MWScript.php
+++ b/multiversion/MWScript.php
@@ -83,8 +83,8 @@
}
 
# MWScript.php should be in common/
-   require_once __DIR__ . '/MWVersion.php';
-   $file = getMediaWikiCli( $relFile );
+   require_once __DIR__ . '/MWMultiVersion.php';
+   $file = MWMultiVersion::getMediaWikiCli( $relFile );
if ( !file_exists( $file ) ) {
fwrite( STDERR, "The MediaWiki script file \"{$file}\" does not 
exist.\n" );
exit( 1 );
diff --git a/multiversion/MWVersion.php b/multiversion/MWVersion.php
index 8c5dcae..76bb232 100644
--- a/multiversion/MWVersion.php
+++ b/multiversion/MWVersion.php
@@ -66,24 +66,6 @@
  * @return string Absolute file path with proper MW location
  */
 function getMediaWikiCli( $file ) {
-   global $IP;
-
-   require_once( __DIR__ . '/MWMultiVersion.php' );
-   $multiVersion = MWMultiVersion::getInstance();
-   if( !$multiVersion ) {
-   $multiVersion = MWMultiVersion::initializeForMaintenance();
-   }
-   if ( $multiVersion->getDatabase() === 'testwiki' ) {
-   define( 'TESTWIKI', 1 );
-   }
-
-   # Get the MediaWiki version running on this wiki...
-   $version = $multiVersion->getVersion();
-
-   # Get the correct MediaWiki path based on this version...
-   $IP = dirname( __DIR__ ) . "/$version";
-
-   putenv( "MW_INSTALL_PATH=$IP" );
-
-   return "$IP/$file";
+   require_once __DIR__ . '/MWMultiVersion.php';
+   return MWMultiVersion::getMediaWikiCli( $file );
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: DNS: Add mgmt and prodcution DNS entres for mw2251-mw2260 Fi...

2017-01-12 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331903 )

Change subject: DNS: Add mgmt and prodcution DNS entres for mw2251-mw2260 Fix: 
Putting server in alphabetical order Bug:T155180
..


DNS: Add mgmt and prodcution DNS entres for mw2251-mw2260
Fix: Putting server in alphabetical order
Bug:T155180

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

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index b63dc2b..daaf27b 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2593,6 +2593,9 @@
 77  1H IN PTR   elastic2025.codfw.wmnet.
 78  1H IN PTR   elastic2026.codfw.wmnet.
 79  1H IN PTR   elastic2027.codfw.wmnet.
+80  1H IN PTR   mw2251.codfw.wmnet.
+81  1H IN PTR   mw2252.codfw.wmnet.
+82  1H IN PTR   mw2253.codfw.wmnet.
 
 119 1H IN PTR   rdb2001.codfw.wmnet.
 120 1H IN PTR   rdb2002.codfw.wmnet.
@@ -3014,6 +3017,13 @@
 156 1H IN PTR   elastic2031.codfw.wmnet.
 157 1H IN PTR   elastic2032.codfw.wmnet.
 158 1H IN PTR   elastic2033.codfw.wmnet.
+159 1H IN PTR   mw2254.codfw.wmnet.
+160 1H IN PTR   mw2255.codfw.wmnet.
+161 1H IN PTR   mw2256.codfw.wmnet.
+162 1H IN PTR   mw2257.codfw.wmnet.
+163 1H IN PTR   mw2258.codfw.wmnet.
+164 1H IN PTR   mw2259.codfw.wmnet.
+165 1H IN PTR   mw2260.codfw.wmnet.
 
 $ORIGIN 33.192.{{ zonename }}.
 1   1H IN PTR   vl2019-eth2.lvs2001.codfw.wmnet.
@@ -3582,7 +3592,18 @@
 237 1H IN PTR  es2003.mgmt.codfw.wmnet.
 237 1H IN PTR  wmf3627.mgmt.codfw.wmnet.
 238 1H IN PTR  es2004.mgmt.codfw.wmnet.
-
+239 1H IN PTR  mw2251.mgmt.codfw.wmnet.
+239 1H IN PTR  wmf6480.mgmt.codfw.wmnet.
+240 1H IN PTR  mw2252.mgmt.codfw.wmnet.
+240 1H IN PTR  wmf6481.mgmt.codfw.wmnet.
+241 1H IN PTR  mw2253.mgmt.codfw.wmnet.
+241 1H IN PTR  wmf6482.mgmt.codfw.wmnet.
+242 1H IN PTR  mw2254.mgmt.codfw.wmnet.
+242 1H IN PTR  wmf6483.mgmt.codfw.wmnet.
+243 1H IN PTR  mw2255.mgmt.codfw.wmnet.
+243 1H IN PTR  wmf6484.mgmt.codfw.wmnet.
+244 1H IN PTR  mw2256.mgmt.codfw.wmnet.
+244 1H IN PTR  wmf6485.mgmt.codfw.wmnet.
 245 1H IN PTR  ms-be2013.mgmt.codfw.wmnet.
 245 1H IN PTR  wmf6138.mgmt.codfw.wmnet.
 246 1H IN PTR  ms-be2014.mgmt.codfw.wmnet.
@@ -4138,7 +4159,14 @@
 10  1H IN PTR  wmf6417.mgmt.codfw.wmnet.
 11  1H IN PTR  maps2004.mgmt.codfw.wmnet.
 11  1H IN PTR  wmf6418.mgmt.codfw.wmnet.
-
+12  1H IN PTR  mw2257.mgmt.codfw.wmnet.
+12  1H IN PTR  wmf6486.mgmt.codfw.wmnet.
+13  1H IN PTR  mw2258.mgmt.codfw.wmnet.
+13  1H IN PTR  wmf6487.mgmt.codfw.wmnet.
+14  1H IN PTR  mw2259.mgmt.codfw.wmnet.
+14  1H IN PTR  wmf6488.mgmt.codfw.wmnet.
+15  1H IN PTR  mw2260.mgmt.codfw.wmnet.
+15  1H IN PTR  wmf6489.mgmt.codfw.wmnet.
 
 ; 10.195.0.0/25 - frack.codfw subnets
 $ORIGIN 0.195.{{ zonename }}.
diff --git a/templates/wmnet b/templates/wmnet
index 3c4731c..eb4504f 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2502,45 +2502,6 @@
 ms-fe2006   1H  IN A10.192.16.190
 ms-fe2007   1H  IN A10.192.32.155
 ms-fe2008   1H  IN A10.192.48.72
-
-mw2215  1H  IN A10.192.0.40
-mw2216  1H  IN A10.192.0.41
-mw2217  1H  IN A10.192.0.42
-mw2218  1H  IN A10.192.0.43
-mw2219  1H  IN A10.192.0.44
-mw2220  1H  IN A10.192.0.45
-mw2221  1H  IN A10.192.0.46
-mw  1H  IN A10.192.0.47
-mw2223  1H  IN A10.192.0.48
-mw2224  1H  IN A10.192.0.49
-mw2225  1H  IN A10.192.0.50
-mw2226  1H  IN A10.192.0.51
-mw2227  1H  IN A10.192.0.52
-mw2228  1H  IN A10.192.0.53
-mw2229  1H  IN A10.192.0.54
-mw2230  1H  IN A10.192.0.55
-mw2017  1H  IN A10.192.0.56
-mw2231  1H  IN A10.192.0.57
-mw2232  1H  IN A10.192.0.58
-mw2233  1H  IN A10.192.0.59
-mw2234  1H  IN A10.192.0.60
-mw2235  1H  IN A10.192.0.61
-mw2236  1H  IN A10.192.0.62
-mw2237  1H  IN A10.192.0.63
-mw2238  1H  IN A10.192.0.64
-mw2239  1H  IN A10.192.0.65
-mw2240  1H  IN A10.192.0.66
-mw2241  1H  IN A10.192.0.67
-mw2242  1H  IN A10.192.0.68
-mw2243  1H  IN A10.192.0.69
-mw2244  1H  IN A10.192.0.70
-mw2245  1H  IN A10.192.0.71
-mw2246  1H  IN A10.192.0.72
-mw2247  1H  IN A10.192.0.73
-mw2248  1H  IN A10.192.0.74
-mw2249  1H  IN A10.192.0.75
-mw2250  1H  IN A10.192.0.76
-
 mw2075  1H  IN A10.192.0.114
 mw2076  1H  IN A10.192.0.115
 mw2077  1H  IN A10.192.0.116
@@ -2681,6 +2642,53 @@
 mw2212  1H  IN A10.192.32.100
 mw2213  1H  IN A10.192.32.101
 mw2214

[MediaWiki-commits] [Gerrit] mediawiki...PagePopups[master]: Remove non-exist descriptionmsg key

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331902 )

Change subject: Remove non-exist descriptionmsg key
..


Remove non-exist descriptionmsg key

There are no message files at all

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

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



diff --git a/extension.json b/extension.json
index 9c12553..34ea04e 100644
--- a/extension.json
+++ b/extension.json
@@ -5,7 +5,6 @@
"Victor Porton"
],
"url": "https://www.mediawiki.org/wiki/Extension:PagePopups;,
-   "descriptionmsg": "pagepopups-desc",
"license-name": "GPL-2.0+",
"type": "other",
"AutoloadClasses": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6fdaa2f809176336971974095fabe9ce9b5ff5c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PagePopups
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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/puppet[production]: DHCP: Add DHCP entries for mw2251-mw2260 Bug:T155180

2017-01-12 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331923 )

Change subject: DHCP: Add DHCP entries for mw2251-mw2260 Bug:T155180
..


DHCP: Add DHCP entries for mw2251-mw2260
Bug:T155180

Change-Id: Id86562c37e11ab1ecb63f1d5502318ca15c8123e
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 49 insertions(+), 0 deletions(-)

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index f416015..8022b7b 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5552,6 +5552,55 @@
 fixed-address mw2250.codfw.wmnet;
 }
 
+host mw2251 {
+hardware ethernet 18:66:DA:84:12:5B;
+fixed-address mw2251.codfw.wmnet;
+}
+
+host mw2252 {
+hardware ethernet 18:66:DA:83:FE:F8;
+fixed-address mw2252.codfw.wmnet;
+}
+
+host mw2253 {
+hardware ethernet 18:66:DA:85:91:6D;
+fixed-address mw2253.codfw.wmnet;
+}
+
+host mw2254 {
+hardware ethernet 18:66:DA:83:04:47;
+fixed-address mw2254.codfw.wmnet;
+}
+
+host mw2255 {
+hardware ethernet 18:66:DA:82:3F:9B;
+fixed-address mw2255.codfw.wmnet;
+}
+
+host mw2256 {
+hardware ethernet 18:66:DA:83:16:47;
+fixed-address mw2256.codfw.wmnet;
+}
+
+host mw2257 {
+hardware ethernet 18:66:DA:85:B2:42;
+fixed-address mw2257.codfw.wmnet;
+}
+
+host mw2258 {
+hardware ethernet 18:66:DA:84:14:49;
+fixed-address mw2258.codfw.wmnet;
+}
+
+host mw2259 {
+hardware ethernet 18:66:DA:84:31:40;
+fixed-address mw2259.codfw.wmnet;
+}
+
+host mw2260 {
+hardware ethernet 18:66:DA:84:0E:A4;
+fixed-address mw2260.codfw.wmnet;
+}
 
 host neodymium {
 hardware ethernet 90:B1:1C:2D:79:8C;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id86562c37e11ab1ecb63f1d5502318ca15c8123e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Papaul 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...wikihiero[master]: Remove entry from ExtensionMessagesFiles

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331898 )

Change subject: Remove entry from ExtensionMessagesFiles
..


Remove entry from ExtensionMessagesFiles

wikihiero.i18n.php is not part of this repo

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

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



diff --git a/extension.json b/extension.json
index b793317..509e4a8 100644
--- a/extension.json
+++ b/extension.json
@@ -20,7 +20,6 @@
]
},
"ExtensionMessagesFiles": {
-   "Wikihiero": "wikihiero.i18n.php",
"HieroglyphsAlias": "wikihiero.alias.php"
},
"AutoloadClasses": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaef9d98f9b6f589dc460de894acc0dd962b65d0b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/wikihiero
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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...Comments[master]: Add missing API i18n messages in Comments extension Bug: T15...

2017-01-12 Thread Mihir-thakkar (Code Review)

Mihir-thakkar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331929 )

Change subject: Add missing API i18n messages in Comments extension Bug: T154036
..

Add missing API i18n messages in Comments extension
Bug: T154036

Change-Id: Ib3cf0ed04c12d340158aea8c798e70655a1c374f
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 17 insertions(+), 3 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index e4a7a87..ce7af8f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,9 +1,16 @@
 {
"@metadata": {
"authors": [
-   "David Pean "
+   "David Pean ",
+   "Mihir Thakkar "
]
},
+   "apihelp-commentblock-description": "The commentblock API allows 
blocking a user from the comment it originated from after filling out the 
following parameters: CommentID.",
+   "apihelp-commentdelete-description": "The commentdelete API allows 
deleting a comment after filling out the following parameters: CommentID.",
+   "apihelp-commentlatestid-description": "The commentlatestID API allows 
to retrieve latest comment ID after filling out the following parameters: 
pageID",
+   "apihelp-commentlist-description": "The commentlist API retrieves 
multiple comments and outputs them as a list after filling out the following 
parameters: pageID, order, pagerPage, and showForm.",
+   "apihelp-commentsubmit-description": "The commentsubmit API allows to 
submit/post a comment after filling out the following parameters: pageID, 
parentID, commentText.",
+   "apihelp-commentvote-description": "The commentvote API allows to vote 
on a comment after filling out the following parameters: commentID, voteValue.",
"comments-comment": "Comment",
"comments-desc": "Adds comments parser hook that 
allows commenting on pages",
"comments-db-locked": "Adding commentsThe database is 
currently locked for routine database maintenance, after which it will be back 
to normal. Please check back later!",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index cd58017..f676212 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -9,7 +9,8 @@
"Shirayuki",
"Siebrand",
"Liuxinyu970226",
-   "Umherirrender"
+   "Umherirrender",
+   "Mihir Thakkar"
]
},
"comments-comment": "This message might be 
unused.\n{{Identical|Comment}}",
@@ -66,5 +67,11 @@
"grouppage-commentadmin": "{{doc-group|commentadmin|page}}",
"right-comment": "{{doc-right|comment}}",
"right-commentadmin": "{{doc-right|commentadmin}}",
-   "right-commentlinks": "{{Doc-right|commentlinks}}"
+   "right-commentlinks": "{{Doc-right|commentlinks}}",
+   "apihelp-commentblock-description": 
"{{doc-apihelp-description|CommentsBlock}}",
+   "apihelp-commentdelete-description": 
"{{doc-apihelp-description|CommentsDelete}}",
+   "apihelp-commentlatestid-description": 
"{{doc-apihelp-description|CommentsLatestid}}",
+   "apihelp-commentlist-description": 
"{{doc-apihelp-description|CommentsList}}",
+   "apihelp-commentsubmit-description": 
"{{doc-apihelp-description|CommentsSubmit}}",
+   "apihelp-commentvote-description": 
"{{doc-apihelp-description|CommentsVote}}"
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3cf0ed04c12d340158aea8c798e70655a1c374f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Comments
Gerrit-Branch: master
Gerrit-Owner: Mihir-thakkar 

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[REL1_28]: Use fake timer in Echo unit tests

2017-01-12 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331927 )

Change subject: Use fake timer in Echo unit tests
..

Use fake timer in Echo unit tests

Freeze time to avoid a race condition
where a second is ticking in the middle
of a unit test.

Author of patch is Sbisson

Cherry picked from I6b0c8ae06360e6da016d97361cc2ccdeaf2e4343

Bug: T154188
Change-Id: I9b73b2964dad43b7d2b14b6fc21883d3302d2f30
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Timestamp[master]: tests: Extend coverage of invalid timestamps

2017-01-12 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331926 )

Change subject: tests: Extend coverage of invalid timestamps
..

tests: Extend coverage of invalid timestamps

Add "1971:01:01 06:19:385" as invalid timestamp.
Also some minor refactoring and clean up.

Bug: T42038
Change-Id: I31bac87ee0b4298b47010f5607cad52feab3137b
---
M tests/TimestampTest.php
1 file changed, 39 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/libs/Timestamp 
refs/changes/26/331926/1

diff --git a/tests/TimestampTest.php b/tests/TimestampTest.php
index df1e1b9..858ebc2 100644
--- a/tests/TimestampTest.php
+++ b/tests/TimestampTest.php
@@ -25,14 +25,11 @@
 
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 
-/**
- * Tests timestamp parsing and output.
- */
 class ConvertibleTimestampTest extends \PHPUnit_Framework_TestCase {
/**
 * @covers \Wikimedia\Timestamp\ConvertibleTimestamp::__construct
 */
-   public function testConstructWithNoTimestamp() {
+   public function testConstructWithoutTimestamp() {
$timestamp = new ConvertibleTimestamp();
$this->assertInternalType( 'string', $timestamp->getTimestamp() 
);
$this->assertNotEmpty( $timestamp->getTimestamp() );
@@ -47,7 +44,7 @@
$this->assertEquals( '1406833268', $timestamp->__toString() );
}
 
-   public static function provideValidTimestampDifferences() {
+   public static function provideDiff() {
return [
[ '1406833268', '1406833269', '00 00 00 01' ],
[ '1406833268', '1406833329', '00 00 01 01' ],
@@ -57,7 +54,7 @@
}
 
/**
-* @dataProvider provideValidTimestampDifferences
+* @dataProvider provideDiff
 * @covers \Wikimedia\Timestamp\ConvertibleTimestamp::diff
 */
public function testDiff( $timestamp1, $timestamp2, $expected ) {
@@ -68,7 +65,8 @@
}
 
/**
-* Test parsing of valid timestamps and outputing to MW format.
+* Parse valid timestamps and output in MW format.
+*
 * @dataProvider provideValidTimestamps
 * @covers \Wikimedia\Timestamp\ConvertibleTimestamp::getTimestamp
 */
@@ -78,22 +76,25 @@
}
 
/**
-* Test outputting valid timestamps to different formats.
-* @dataProvider provideValidTimestamps
-* @covers \Wikimedia\Timestamp\ConvertibleTimestamp::getTimestamp
-*/
-   public function testValidOutput( $format, $expected, $original ) {
-   $timestamp = new ConvertibleTimestamp( $original );
-   $this->assertEquals( $expected, 
(string)$timestamp->getTimestamp( $format ) );
-   }
-
-   /**
-* Test an invalid timestamp.
+* Parse invalid timestamps.
+*
+* @dataProvider provideInvalidTimestamps
 * @expectedException \Wikimedia\Timestamp\TimestampException
 * @covers \Wikimedia\Timestamp\ConvertibleTimestamp
 */
-   public function testInvalidParse() {
-   new ConvertibleTimestamp( "This is not a timestamp." );
+   public function testInvalidParse( $input ) {
+   new ConvertibleTimestamp( $input );
+   }
+
+   /**
+* Output valid timestamps in different formats.
+*
+* @dataProvider provideValidTimestamps
+* @covers \Wikimedia\Timestamp\ConvertibleTimestamp::getTimestamp
+*/
+   public function testValidFormats( $format, $expected, $original ) {
+   $timestamp = new ConvertibleTimestamp( $original );
+   $this->assertEquals( $expected, 
(string)$timestamp->getTimestamp( $format ) );
}
 
/**
@@ -106,17 +107,20 @@
 
/**
 * Format an invalid timestamp.
+*
+* @dataProvider provideInvalidTimestamps
 * @covers \Wikimedia\Timestamp\ConvertibleTimestamp::convert
 */
-   public function testConvertInvalid() {
-   $this->assertSame( false, ConvertibleTimestamp::convert( 'Not a 
timestamp', 0 ) );
+   public function testConvertInvalid( $input ) {
+   $this->assertSame( false, ConvertibleTimestamp::convert( 
$input, 0 ) );
}
 
/**
-* Test an out of range timestamp
+* Test an out-of-range timestamp.
+*
 * @dataProvider provideOutOfRangeTimestamps
-* @expectedException \Wikimedia\Timestamp\TimestampException
 * @covers \Wikimedia\Timestamp\ConvertibleTimestamp
+* @expectedException \Wikimedia\Timestamp\TimestampException
 */
public function testOutOfRangeTimestamps( $format, $input ) {
$timestamp = new ConvertibleTimestamp( $input );
@@ -125,8 +129,8 @@
 
/**
 * Test requesting an invalid output format.
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Grant access to analytics-privatedata-users to demon

2017-01-12 Thread Chad (Code Review)

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331925 )

Change subject: Grant access to analytics-privatedata-users to demon
..

Grant access to analytics-privatedata-users to demon

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/331925/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 24e5580..37395da 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -234,7 +234,7 @@
   bmansurov, atgomez, amire80, kartik, pcoombe, foks, mpany, 
hjiang, jsamra, bcohn,
   jdlrobson, chelsyx, ovasileva, mtizzoni, panisson, paolotti, 
ciro,
   psinger, flemmerich, mkroetzsch, akrausetud, filippo, nschaaf, 
pmiazga, faidon,
-  zareen, piccardi, fdans, eevans]
+  zareen, piccardi, fdans, eevans, demon]
   analytics-admins:
 gid: 732
 description: Admin access to analytics cluster.

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: rsync for Erik Zachte from stat* hosts to dataset1001 other/...

2017-01-12 Thread ArielGlenn (Code Review)

ArielGlenn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331924 )

Change subject: rsync for Erik Zachte from stat* hosts to dataset1001 
other/media
..

rsync for Erik Zachte from stat* hosts to dataset1001 other/media

Change-Id: I712bdf723b18e3229d851de842540c9e4234b2cf
---
A modules/dataset/files/rsync/rsyncd.conf.media
1 file changed, 13 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/331924/1

diff --git a/modules/dataset/files/rsync/rsyncd.conf.media 
b/modules/dataset/files/rsync/rsyncd.conf.media
new file mode 100644
index 000..9e5df8d
--- /dev/null
+++ b/modules/dataset/files/rsync/rsyncd.conf.media
@@ -0,0 +1,13 @@
+#
+### Note: This file is managed by Puppet.
+#
+
+# write access from stat1002 and stat1003 to media directory.
+# Erik Z uses this.
+[media]
+uid = datasets
+gid = wikidev
+read only = false
+path = /data/xmldatadumps/public/other/media
+hosts allow = stat1002.eqiad.wmnet stat1003.eqiad.wmnet
+

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

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

___
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 last of these powerpoints

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331922 )

Change subject: Remove last of these powerpoints
..


Remove last of these powerpoints

This one is by a former employee long since departed. Licensing
is unclear/a mess, content isn't all that terribly interesting in
2017 anyway.

Change-Id: Ie50da58446a2a9fc05d4e194aa25b7dca79eac32
---
D docroot/foundation/presentations/mav/WikipediaPres.ppt
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/docroot/foundation/presentations/mav/WikipediaPres.ppt 
b/docroot/foundation/presentations/mav/WikipediaPres.ppt
deleted file mode 100644
index 9e34011..000
--- a/docroot/foundation/presentations/mav/WikipediaPres.ppt
+++ /dev/null
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie50da58446a2a9fc05d4e194aa25b7dca79eac32
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin: update my production ssh key

2017-01-12 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331920 )

Change subject: admin: update my production ssh key
..


admin: update my production ssh key

Change-Id: Ie18fb474b2d81d6a693d2efa1d9fc50a2b5e7f6d
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index b4b5e63..24e5580 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1437,8 +1437,7 @@
 gid: 500
 name: bsitzmann
 realname: Bernd Sitzmann
-ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCyvGjFrt694WfWaeFBJKsaU25oLBTx/yiYQbnAunn6zu98yW374HqCXAvYdn+V0qNNO8uxp+TvIqibfud4Y59Ija2apeY2ck5E0TEeOJD9sbq+gbczJ+IFTQy4+/sr+MRXAsyAmUr6HrDqQYXgrE04kGkuKAac65ga7mq9KKE9GGIbqFl8kcN8WET8I5wTfb3vvB8unmyrLHYR3ewfXcpoPk6MpEDJD8uvf1fWz/Uqpe9IXhsfV37uiCaG+nfU+PlZA6KJSdZ4ceVHNBMlpeCEGX/BB38TtE7QqtK8ghjsl8/SeJ29uXz3OjPTZ4bjtJ0uD/DEoRoq+dpuNnC1RbLN
-bsitzm...@wikimedia.org]
+ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAACAQCtXfxL/esjFQbskJlnO1q0cBwXOww12q5IBxm/Lwv3k157Klb3AG0syPTvxJF/JvuMCZZZpEKQL6NaySXj4b8ZaQZmF0WePfrauUT8iSDhjS4Bii2RtZ0WhM9o7cqONetZ6w9xHYTR4i+fF4iu3sK+zjST8+0tEQd/G5k9sMloZj7DN+Zt1nDgHftAo6iAyIApKSanVi6vu15p3HryNPsWM5HEy3dJ3I2wGbjvtzLbaFO/ItdZkZvUZGSMuwy67bdTZNpaaw5GtmyPDWENtJJXgDXV2rOFADBTQoCpMe2iU79UWWQ6B9LWSUMbXCeOBvNDlA0XoqO+syjbfC0iMpG2u+r/eG2AcDlMvadHN8hVYUMQn06WE2Pt4f3/7+JH/WQSoZPA8YgR1AUrlQh2563xa+dx9mWFkmX3NY/ZNMi4INPvqt+Ls/7/PudhF00HSs7/LvAPHkiEfmsxfyODQPpmPaF/j8FDVT3pEZR8GwyPKsOC2xhdVIbGFftc5HchtHU9LmUEJaQrOPYyBuMbbl5DUwQ9JE2VveHYLeQP+h05WDAIdFH83IobXldCG2xa/B5ltJ5/e6yrlQ15b4ZFy8YJ+owbgOmQSazXpbluJuTqXINMozyErW6yphs+MY64LKhShYb5ZLJvf7kTCc11vspDQyZ1pFNJ5Hitm/CCm8tdjw==
 besi@besiair.local]
 uid: 5037
   deskana:
 ensure: present

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie18fb474b2d81d6a693d2efa1d9fc50a2b5e7f6d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BearND 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dzahn 
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/puppet[production]: DHCP: Add DHCP entries for mw2251-mw2260 Bug:T155180

2017-01-12 Thread Papaul (Code Review)

Papaul has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331923 )

Change subject: DHCP: Add DHCP entries for mw2251-mw2260 Bug:T155180
..

DHCP: Add DHCP entries for mw2251-mw2260
Bug:T155180

Change-Id: Id86562c37e11ab1ecb63f1d5502318ca15c8123e
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 49 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/331923/1

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index f416015..8022b7b 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5552,6 +5552,55 @@
 fixed-address mw2250.codfw.wmnet;
 }
 
+host mw2251 {
+hardware ethernet 18:66:DA:84:12:5B;
+fixed-address mw2251.codfw.wmnet;
+}
+
+host mw2252 {
+hardware ethernet 18:66:DA:83:FE:F8;
+fixed-address mw2252.codfw.wmnet;
+}
+
+host mw2253 {
+hardware ethernet 18:66:DA:85:91:6D;
+fixed-address mw2253.codfw.wmnet;
+}
+
+host mw2254 {
+hardware ethernet 18:66:DA:83:04:47;
+fixed-address mw2254.codfw.wmnet;
+}
+
+host mw2255 {
+hardware ethernet 18:66:DA:82:3F:9B;
+fixed-address mw2255.codfw.wmnet;
+}
+
+host mw2256 {
+hardware ethernet 18:66:DA:83:16:47;
+fixed-address mw2256.codfw.wmnet;
+}
+
+host mw2257 {
+hardware ethernet 18:66:DA:85:B2:42;
+fixed-address mw2257.codfw.wmnet;
+}
+
+host mw2258 {
+hardware ethernet 18:66:DA:84:14:49;
+fixed-address mw2258.codfw.wmnet;
+}
+
+host mw2259 {
+hardware ethernet 18:66:DA:84:31:40;
+fixed-address mw2259.codfw.wmnet;
+}
+
+host mw2260 {
+hardware ethernet 18:66:DA:84:0E:A4;
+fixed-address mw2260.codfw.wmnet;
+}
 
 host neodymium {
 hardware ethernet 90:B1:1C:2D:79:8C;

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

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

___
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 last of these powerpoints

2017-01-12 Thread Chad (Code Review)

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331922 )

Change subject: Remove last of these powerpoints
..

Remove last of these powerpoints

This one is by a former employee long since departed. Licensing
is unclear/a mess, content isn't all that terribly interesting in
2017 anyway.

Change-Id: Ie50da58446a2a9fc05d4e194aa25b7dca79eac32
---
D docroot/foundation/presentations/mav/WikipediaPres.ppt
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/docroot/foundation/presentations/mav/WikipediaPres.ppt 
b/docroot/foundation/presentations/mav/WikipediaPres.ppt
deleted file mode 100644
index 9e34011..000
--- a/docroot/foundation/presentations/mav/WikipediaPres.ppt
+++ /dev/null
Binary files differ

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Add help messages, refactor forms a bit

2017-01-12 Thread Isarra (Code Review)

Isarra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331921 )

Change subject: Add help messages, refactor forms a bit
..

Add help messages, refactor forms a bit

This is broken.

Change-Id: I7d7a9656618f7388dea59d1311954c48a730ebea
---
M i18n/en.json
M i18n/qqq.json
M includes/CollaborationHubContentEditor.php
M includes/SpecialCreateCollaborationHub.php
4 files changed, 102 insertions(+), 84 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 311394b..21862a1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -6,22 +6,12 @@
"createcollaborationhub": "Create new Collaboration Hub project",
"createhubfeature": "Create a new Collaboration Hub feature",
"collaborationkit-createhub-title": "Page title",
-   "collaborationkit-createhub-displayname": "Project display name",
-   "collaborationkit-createhub-image": "Project image",
-   "collaborationkit-createhub-colour": "Theme color",
-   "collaborationkit-createhub-new": "None",
-   "collaborationkit-createhub-import": "Wikitext",
-   "collaborationkit-createhub-clone": "Clone existing Collaboration Hub",
-   "collaborationkit-createhub-content": "Content import",
-   "collaborationkit-createhub-source": "Source",
-   "collaborationkit-createhub-introduction": "Project introduction",
"collaborationkit-createhub-invalidtitle": "The specified title is 
invalid",
"collaborationkit-createhub-exists": "A page already exists with the 
specified title, and there is no support yet for imports",
"collaborationkit-createhub-nopermission": "You do not have permission 
to create a Collaboration Hub with this title",
-   "collaborationkit-createhub-invalidsource": "The specified source 
cannot be used",
-   "collaborationkit-createhub-editsummary": "Create new Collaboration 
Hub",
-   "collaborationkit-createhubfeature-collaborationhub": "Collaboration 
Hub",
-   "collaborationkit-createhubfeature-featurename": "Name of feature",
+   "collaborationkit-createhub-editsummary": "Created new Collaboration 
Hub",
+   "collaborationkit-createhubfeature-collaborationhub": "Parent 
Collaboration Hub",
+   "collaborationkit-createhubfeature-featurename": "Feature name",
"collaborationkit-createhubfeature-icon": "Icon",
"collaborationkit-createhubfeature-contenttype": "What type of page is 
this?",
"collaborationkit-createhubfeature-invalidtitle": "You have chosen an 
invalid page title",
@@ -62,11 +52,11 @@
"collaborationkit-list-newitem-description": "Description (optional)",
"collaborationkit-listedit-description": "Description",
"collaborationkit-listedit-list": "List items",
-   "collaborationkit-hubedit-displayname": "Name to display",
+   "collaborationkit-hubedit-displayname": "Hub display name",
"collaborationkit-hubedit-introduction": "Introduction",
"collaborationkit-hubedit-footer": "Footer",
"collaborationkit-hubedit-image": "Hub image",
-   "collaborationkit-hubedit-colour": "Color",
+   "collaborationkit-hubedit-colour": "Hub theme Color",
"collaborationkit-hubedit-content": "Features",
"collaborationkit-editjsontab": "Edit as JSON",
"collaborationkit-hub-announcements-initial": "A new collaboration hub 
has been set up!",
@@ -120,5 +110,11 @@
"collaborationkit-green3": "Khaki",
"collaborationkit-black": "Black",
"collaborationkit-column-active": "Active members",
-   "collaborationkit-column-inactive": "Inactive members"
+   "collaborationkit-column-inactive": "Inactive members",
+   "createcollaborationhub-text": "You are creating a new Collaboration 
Hub. Once the page is created, you will be able to add features, as well as 
edit any of this later.",
+   "collaborationkit-createhub-title-help": "Where to create the Hub",
+   "collaborationkit-createhub-title-placeholder": "Project:...",
+   "collaborationkit-hubedit-displayname-help": "Used to refer to the 
project on other pages. Only needed if different from the page title.",
+   "collaborationkit-hubedit-image-help": "An image or icon to represent 
the project",
+   "collaborationkit-hubedit-introduction-placeholder": "Introduce your 
project here! Tell us what you want to do."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 4a9d86c..9f4a019 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -6,19 +6,9 @@
"createcollaborationhub": "Header for Special:CreateCollaborationHub",
"createhubfeature": "Header for Special:CreateHubFeature",
"collaborationkit-createhub-title": "Label for target page title input 
on Special:CreateCollaborationHub",
-   "collaborationkit-createhub-displayname": "Label for

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin: update my production ssh key

2017-01-12 Thread BearND (Code Review)

BearND has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331920 )

Change subject: admin: update my production ssh key
..

admin: update my production ssh key

Change-Id: Ie18fb474b2d81d6a693d2efa1d9fc50a2b5e7f6d
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/20/331920/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index b4b5e63..aef1367 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1437,8 +1437,7 @@
 gid: 500
 name: bsitzmann
 realname: Bernd Sitzmann
-ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCyvGjFrt694WfWaeFBJKsaU25oLBTx/yiYQbnAunn6zu98yW374HqCXAvYdn+V0qNNO8uxp+TvIqibfud4Y59Ija2apeY2ck5E0TEeOJD9sbq+gbczJ+IFTQy4+/sr+MRXAsyAmUr6HrDqQYXgrE04kGkuKAac65ga7mq9KKE9GGIbqFl8kcN8WET8I5wTfb3vvB8unmyrLHYR3ewfXcpoPk6MpEDJD8uvf1fWz/Uqpe9IXhsfV37uiCaG+nfU+PlZA6KJSdZ4ceVHNBMlpeCEGX/BB38TtE7QqtK8ghjsl8/SeJ29uXz3OjPTZ4bjtJ0uD/DEoRoq+dpuNnC1RbLN
-bsitzm...@wikimedia.org]
+ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAACAQCtXfxL/esjFQbskJlnO1q0cBwXOww12q5IBxm/Lwv3k157Klb3AG0syPTvxJF/JvuMCZZZpEKQL6NaySXj4b8ZaQZmF0WePfrauUT8iSDhjS4Bii2RtZ0WhM9o7cqONetZ6w9xHYTR4i+fF4iu3sK+zjST8+0tEQd/G5k9sMloZj7DN+Zt1nDgHftAo6iAyIApKSanVi6vu15p3HryNPsWM5HEy3dJ3I2wGbjvtzLbaFO/ItdZkZvUZGSMuwy67bdTZNpaaw5GtmyPDWENtJJXgDXV2rOFADBTQoCpMe2iU79UWWQ6B9LWSUMbXCeOBvNDlA0XoqO+syjbfC0iMpG2u+r/eG2AcDlMvadHN8hVYUMQn06WE2Pt4f3/7+JH/WQSoZPA8YgR1AUrlQh2563xa+dx9mWFkmX3NY/ZNMi4INPvqt+Ls/7/PudhF00HSs7/LvAPHkiEfmsxfyODQPpmPaF/j8FDVT3pEZR8GwyPKsOC2xhdVIbGFftc5HchtHU9LmUEJaQrOPYyBuMbbl5DUwQ9JE2VveHYLeQP+h05WDAIdFH83IobXldCG2xa/B5ltJ5/e6yrlQ15b4ZFy8YJ+owbgOmQSazXpbluJuTqXINMozyErW6yphs+MY64LKhShYb5ZLJvf7kTCc11vspDQyZ1pFNJ5Hitm/CCm8tdjw==
 besi@besiair.local
 uid: 5037
   deskana:
 ensure: present

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Removing old presentation files from wmfwiki docroot

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331918 )

Change subject: Removing old presentation files from wmfwiki docroot
..


Removing old presentation files from wmfwiki docroot

Spoke with author on-wiki, files have been backed up and
will probably be on Commons (one already is)

Change-Id: I1541a2b385eeff2c75bc5a82a99a630c3a9003df
---
D docroot/foundation/presentations/anthere/Frankfurt4.ppt
D docroot/foundation/presentations/anthere/Helsinki.ppt
D docroot/foundation/presentations/anthere/Pretoria5.ppt
3 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/docroot/foundation/presentations/anthere/Frankfurt4.ppt 
b/docroot/foundation/presentations/anthere/Frankfurt4.ppt
deleted file mode 100644
index 1ee5f6f..000
--- a/docroot/foundation/presentations/anthere/Frankfurt4.ppt
+++ /dev/null
Binary files differ
diff --git a/docroot/foundation/presentations/anthere/Helsinki.ppt 
b/docroot/foundation/presentations/anthere/Helsinki.ppt
deleted file mode 100644
index bc0c7f6..000
--- a/docroot/foundation/presentations/anthere/Helsinki.ppt
+++ /dev/null
Binary files differ
diff --git a/docroot/foundation/presentations/anthere/Pretoria5.ppt 
b/docroot/foundation/presentations/anthere/Pretoria5.ppt
deleted file mode 100644
index 4c25c6a..000
--- a/docroot/foundation/presentations/anthere/Pretoria5.ppt
+++ /dev/null
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1541a2b385eeff2c75bc5a82a99a630c3a9003df
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
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...Vector[master]: collapsibleTabs: Stop the tabs from collapsing back and fort...

2017-01-12 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331919 )

Change subject: collapsibleTabs: Stop the tabs from collapsing back and forth 
forever
..

collapsibleTabs: Stop the tabs from collapsing back and forth forever

Update the 'expandedWidth' after we expand in case someone was brazen
enough to change the tab's contents after the page load (gasp).

This doesn't prevent a tab from collapsing back and forth once, but at
least it won't continue to do that forever. This should reduce the
issue from completely awful to mildly annoying.

Bug: T71729
Change-Id: I46bd6584c0f2ddebc4aa7d1103cff1715e1510a5
---
M collapsibleTabs.js
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/19/331919/1

diff --git a/collapsibleTabs.js b/collapsibleTabs.js
index c37d76b..567e7ba 100644
--- a/collapsibleTabs.js
+++ b/collapsibleTabs.js
@@ -172,6 +172,11 @@
.data( 'collapsibleTabsSettings', data )
.animate( { width: expandedWidth + 'px' }, 
'normal', function () {
$( this ).attr( 'style', 'display: 
block;' );
+   // Update the 'expandedWidth' in case 
someone was brazen enough to change the tab's
+   // contents after the page load *gasp* 
(T71729). This doesn't prevent a tab from
+   // collapsing back and forth once, but 
at least it won't continue to do that forever.
+   data.expandedWidth = $moving.width();
+   $moving.data( 
'collapsibleTabsSettings', data );
expContainerSettings.shifting = false;
rAF( $.collapsibleTabs.handleResize );
} )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I46bd6584c0f2ddebc4aa7d1103cff1715e1510a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Removing old presenation files from wmfwiki docroot

2017-01-12 Thread Chad (Code Review)

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331918 )

Change subject: Removing old presenation files from wmfwiki docroot
..

Removing old presenation files from wmfwiki docroot

Spoke with author on-wiki, files have been backed up and
will probably be on Commons (one already is)

Change-Id: I1541a2b385eeff2c75bc5a82a99a630c3a9003df
---
D docroot/foundation/presentations/anthere/Frankfurt4.ppt
D docroot/foundation/presentations/anthere/Helsinki.ppt
D docroot/foundation/presentations/anthere/Pretoria5.ppt
3 files changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/docroot/foundation/presentations/anthere/Frankfurt4.ppt 
b/docroot/foundation/presentations/anthere/Frankfurt4.ppt
deleted file mode 100644
index 1ee5f6f..000
--- a/docroot/foundation/presentations/anthere/Frankfurt4.ppt
+++ /dev/null
Binary files differ
diff --git a/docroot/foundation/presentations/anthere/Helsinki.ppt 
b/docroot/foundation/presentations/anthere/Helsinki.ppt
deleted file mode 100644
index bc0c7f6..000
--- a/docroot/foundation/presentations/anthere/Helsinki.ppt
+++ /dev/null
Binary files differ
diff --git a/docroot/foundation/presentations/anthere/Pretoria5.ppt 
b/docroot/foundation/presentations/anthere/Pretoria5.ppt
deleted file mode 100644
index 4c25c6a..000
--- a/docroot/foundation/presentations/anthere/Pretoria5.ppt
+++ /dev/null
Binary files differ

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Get global filter name in API

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329211 )

Change subject: Get global filter name in API
..


Get global filter name in API

Bug: T127142
Change-Id: I250771c5ed194f69c9ff837a80de067712955efd
---
M api/ApiQueryAbuseLog.php
1 file changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/api/ApiQueryAbuseLog.php b/api/ApiQueryAbuseLog.php
index 2941e5b..28c5c6e 100644
--- a/api/ApiQueryAbuseLog.php
+++ b/api/ApiQueryAbuseLog.php
@@ -199,7 +199,12 @@
}
}
if ( $fld_filter ) {
-   $entry['filter'] = $row->af_public_comments;
+   $globalIndex = AbuseFilter::decodeGlobalName( 
$row->afl_filter );
+   if ( $globalIndex ) {
+   $entry['filter'] = 
AbuseFilter::getGlobalFilterDescription( $globalIndex );
+   } else {
+   $entry['filter'] = 
$row->af_public_comments;
+   }
}
if ( $fld_user ) {
$entry['user'] = $row->afl_user_text;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I250771c5ed194f69c9ff837a80de067712955efd
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Huji 
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...AbuseFilter[master]: Unify global filters decoding across AbuseFilter

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/330118 )

Change subject: Unify global filters decoding across AbuseFilter
..


Unify global filters decoding across AbuseFilter

Change-Id: I3c97c24b5d0e4818b36e233a8bb3b205cbb2c7d0
---
M includes/AbuseFilter.class.php
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/AbuseFilter.class.php b/includes/AbuseFilter.class.php
index d2dec7e..3686744 100644
--- a/includes/AbuseFilter.class.php
+++ b/includes/AbuseFilter.class.php
@@ -759,7 +759,7 @@
self::getFilter( $filter )->af_public_comments
);
 
-   $global_filter = ( preg_match( '/^global-/', $filter ) 
== 1 );
+   $global_filter = self::decodeGlobalName( $filter ) !== 
false;
 
// If the filter is throttled and throttling is 
available via object
// caching, check to see if the user has hit the 
throttle.
@@ -995,14 +995,14 @@
global $wgAbuseFilterCentralDB;
 
if ( !isset( self::$filterCache[$id] ) ) {
-   $m = [];
-   if ( preg_match( '/^global-(\d+)$/', $id, $m ) ) {
+   $globalIndex = self::decodeGlobalName( $id );
+   if ( $globalIndex ) {
// Global wiki filter
if ( !$wgAbuseFilterCentralDB ) {
return null; // not enabled
}
 
-   $id = $m[1];
+   $id = $globalIndex;
$lb = wfGetLB( $wgAbuseFilterCentralDB );
$dbr = $lb->getConnectionRef( DB_SLAVE, 
array(), $wgAbuseFilterCentralDB );
} else {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c97c24b5d0e4818b36e233a8bb3b205cbb2c7d0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Huji 
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]: build: Upgrade karma-chrome-launcher to support Chromium on ...

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/328383 )

Change subject: build: Upgrade karma-chrome-launcher to support Chromium on 
Mac/Windows
..


build: Upgrade karma-chrome-launcher to support Chromium on Mac/Windows

Before karma-chrome-launcher 2.0.0, Chromium was only detected on Linux
and as part of the "Chrome" setting. "Chromium" is now recognised as a
separate browser and is detected on Mac and Windows as well.

https://github.com/karma-runner/karma-chrome-launcher/issues/45

Add a grunt target for Chromium so users may run the following to use
Chromium instead of Chrome:

grunt karma:chromium

Since we keep the default of "Chrome", we'll need an override for CI
since we install Chromium there instead of Chrome.

Depends on Ie9f906f8 being merged and Nodepool images updated.

Bug: T153756
Change-Id: I6ba0d971e7e8c3022d2ab6268ae637688189d768
---
M Gruntfile.js
M package.json
2 files changed, 4 insertions(+), 1 deletion(-)

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

Objections:
  Hashar: There's a problem with this change, please improve



diff --git a/Gruntfile.js b/Gruntfile.js
index 7b3af54..4cc9721 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -88,6 +88,9 @@
main: {
browsers: [ 'Chrome' ]
},
+   chromium: {
+   browsers: [ 'Chromium' ]
+   },
more: {
browsers: [ 'Chrome', 'Firefox' ]
}
diff --git a/package.json b/package.json
index e415d66..983da09 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
 "grunt-karma": "2.0.0",
 "grunt-stylelint": "0.6.0",
 "karma": "1.1.0",
-"karma-chrome-launcher": "1.0.1",
+"karma-chrome-launcher": "2.0.0",
 "karma-firefox-launcher": "1.0.0",
 "karma-qunit": "1.0.0",
 "qunitjs": "1.22.0",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ba0d971e7e8c3022d2ab6268ae637688189d768
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Suppress tag in lintian

2017-01-12 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331912 )

Change subject: Suppress tag in lintian
..

Suppress tag in lintian

There seems to be a problem with this when building gerrit.

See https://integration.wikimedia.org/ci/job/debian-glue-non-voting/546/console

It's comming out with stuff like

Change-Id: I576e1c9d165d268b134fae7ed7ea34d4c4cb4f97
21:13:19 >N:Each Debian package (which provides a 
/usr/share/doc/pkg directory)
21:13:19 N:has to install a Debian changelog file
21:13:19 N:/usr/share/doc/pkg/changelog.Debian.gz
---
M jjb/operations-debs.yaml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/12/331912/1

diff --git a/jjb/operations-debs.yaml b/jjb/operations-debs.yaml
index 5f272e7..25b7d5e 100644
--- a/jjb/operations-debs.yaml
+++ b/jjb/operations-debs.yaml
@@ -22,9 +22,9 @@
   # We might consider adding --warnings
   set -o pipefail
   # Source package:
-  /usr/bin/lintian-junit-report --filename lintian-binary.txt *.dsc | 
tee lintian-binary.xml
+  /usr/bin/lintian-junit-report --filename 
--lintian-opt=--suppress-tags no-copyright-file --suppress-tags 
debian-changelog-file-missing --suppress-tags 
init.d-script-does-not-implement-required-option etc/init.d/gerrit force-reload 
lintian-binary.txt *.dsc | tee lintian-binary.xml
   # Binary package:
-  /usr/bin/lintian-junit-report --filename lintian-source.txt 
*.changes | tee lintian-source.xml
+  /usr/bin/lintian-junit-report --filename 
--lintian-opt=--suppress-tags no-copyright-file --suppress-tags 
debian-changelog-file-missing --suppress-tags 
init.d-script-does-not-implement-required-option etc/init.d/gerrit force-reload 
lintian-source.txt *.changes | tee lintian-source.xml
   set +o pipefail
 
 # Piuparts test installation / removal of a package

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I576e1c9d165d268b134fae7ed7ea34d4c4cb4f97
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] pywikibot/core[master]: Replace assertRaises with assertRaisesRegex in mediawikivers...

2017-01-12 Thread Awu42 (Code Review)

Awu42 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331913 )

Change subject: Replace assertRaises with assertRaisesRegex in 
mediawikiversion_tests.py
..

Replace assertRaises with assertRaisesRegex in mediawikiversion_tests.py

Bug: T154281
Change-Id: I2fdcfcd358bc8e174ae2625883399c0744fec6df
---
M tests/mediawikiversion_tests.py
1 file changed, 7 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/13/331913/1

diff --git a/tests/mediawikiversion_tests.py b/tests/mediawikiversion_tests.py
index 7c19053..99f1bca 100644
--- a/tests/mediawikiversion_tests.py
+++ b/tests/mediawikiversion_tests.py
@@ -19,6 +19,8 @@
 
 """Test MediaWikiVersion class comparisons."""
 
+GENERATOR_STRING_RE = 'Generator string'
+INVALID_VERSION_RE = 'Invalid version number'
 net = False
 
 def _make(self, version):
@@ -74,17 +76,17 @@
 
 def test_invalid_versions(self):
 """Verify that insufficient version fail creating."""
-self.assertRaises(ValueError, MediaWikiVersion, 'invalid')
-self.assertRaises(ValueError, MediaWikiVersion, '1number')
-self.assertRaises(ValueError, MediaWikiVersion, '1.missing')
+self.assertRaisesRegex(ValueError, self.INVALID_VERSION_RE, 
MediaWikiVersion, 'invalid')
+self.assertRaisesRegex(ValueError, self.INVALID_VERSION_RE, 
MediaWikiVersion, '1number')
+self.assertRaisesRegex(ValueError, self.INVALID_VERSION_RE, 
MediaWikiVersion, '1.missing')
 
-self.assertRaises(AssertionError, MediaWikiVersion, '1.23wmf-1')
+self.assertRaisesRegex(AssertionError, 'Found \"wmf\" in 
\"wmf-1\"',MediaWikiVersion, '1.23wmf-1')
 
 def test_generator(self):
 """Test from_generator classmethod."""
 self.assertEqual(MediaWikiVersion.from_generator('MediaWiki 1.2.3'),
  self._make('1.2.3'))
-self.assertRaises(ValueError, MediaWikiVersion.from_generator,
+self.assertRaisesRegex(ValueError, self.GENERATOR_STRING_RE, 
MediaWikiVersion.from_generator,
   'Invalid 1.2.3')
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fdcfcd358bc8e174ae2625883399c0744fec6df
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Awu42 <9922y...@gmail.com>

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

[MediaWiki-commits] [Gerrit] mediawiki...MultimediaViewer[master]: build: Replace jshint/jscs with eslint

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/327184 )

Change subject: build: Replace jshint/jscs with eslint
..


build: Replace jshint/jscs with eslint

Change-Id: I423add157245353031e36b7e44fee7ace7c753c7
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M package.json
M resources/mmv/logging/mmv.logging.ActionLogger.js
M resources/mmv/logging/mmv.logging.DurationLogger.js
M resources/mmv/mmv.Config.js
M resources/mmv/mmv.EmbedFileFormatter.js
M resources/mmv/mmv.bootstrap.js
M resources/mmv/mmv.js
M resources/mmv/mmv.lightboximage.js
M resources/mmv/model/mmv.model.IwTitle.js
M resources/mmv/model/mmv.model.Repo.js
M resources/mmv/provider/mmv.provider.Api.js
M resources/mmv/provider/mmv.provider.GuessedThumbnailInfo.js
M resources/mmv/provider/mmv.provider.Image.js
M resources/mmv/ui/mmv.ui.canvas.js
M resources/mmv/ui/mmv.ui.canvasButtons.js
M resources/mmv/ui/mmv.ui.dialog.js
M resources/mmv/ui/mmv.ui.download.pane.js
M resources/mmv/ui/mmv.ui.js
M resources/mmv/ui/mmv.ui.metadataPanel.js
M resources/mmv/ui/mmv.ui.metadataPanelScroller.js
M resources/mmv/ui/mmv.ui.reuse.dialog.js
M resources/mmv/ui/mmv.ui.reuse.embed.js
M resources/mmv/ui/mmv.ui.reuse.share.js
M resources/mmv/ui/mmv.ui.reuse.tab.js
M resources/mmv/ui/mmv.ui.stripeButtons.js
M resources/mmv/ui/mmv.ui.tipsyDialog.js
M resources/mmv/ui/mmv.ui.viewingOptions.js
M tests/qunit/mmv/mmv.bootstrap.test.js
M tests/qunit/mmv/mmv.testhelpers.js
M tests/qunit/mmv/routing/mmv.routing.Router.test.js
M tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js
M tests/qunit/mmv/ui/mmv.ui.metadataPanelScroller.test.js
M tests/qunit/mmv/ui/mmv.ui.reuse.dialog.test.js
M tests/qunit/mmv/ui/mmv.ui.reuse.embed.test.js
M tests/qunit/mmv/ui/mmv.ui.reuse.utils.test.js
M tests/qunit/mmv/ui/mmv.ui.stripeButtons.test.js
41 files changed, 242 insertions(+), 228 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..488ab05
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,15 @@
+{
+   "extends": "wikimedia",
+   "env": {
+   "browser": true,
+   "jquery": true,
+   "qunit": true
+   },
+   "globals": {
+   "OO": false,
+   "mediaWiki": false
+   },
+   "rules": {
+   "dot-notation": [ "error", { "allowKeywords": true } ]
+   }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index 831de1c..000
--- a/.jscsrc
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-   "preset": "wikimedia",
-
-   "jsDoc": {
-   "checkAnnotations": {
-   "preset": "jsduck5",
-   "extra": {
-   "source": true,
-   "see": true
-   }
-   },
-   "checkParamNames": true,
-   "checkRedundantAccess": true,
-   "checkRedundantReturns": true,
-   "checkTypes": "strictNativeCase",
-   "requireNewlineAfterDescription": true,
-   "requireParamTypes": true,
-   "requireReturnTypes": true
-   }
-}
\ No newline at end of file
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index bc13f20..000
--- a/.jshintignore
+++ /dev/null
@@ -1,3 +0,0 @@
-resources/jquery.scrollTo
-resources/jquery.hashchange
-docs/js/*
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index acd2da2..000
--- a/.jshintrc
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-   // Enforcing
-   "bitwise": true,
-   "eqeqeq": true,
-   "freeze": true,
-   "latedef": "nofunc",
-   "esversion": "3",
-   "futurehostile": true,
-   "noarg": true,
-   "nonew": true,
-   "undef": true,
-   "unused": true,
-
-   "strict": false,
-
-   // Relaxing
-
-   // Environment
-   "browser": true,
-   "jquery": true,
-
-   "globals": {
-   "mediaWiki": false,
-   "OO": false,
-   "QUnit": false,
-   "moment": false
-   }
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index e667255..2404b9a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,8 +1,8 @@
-/*jshint node:true */
+/* eslint-env node */
+
 module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-banana-checker' );
-   grunt.loadNpmTasks( 'grunt-jscs' );
-   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+   grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-stylelint' );
 
@@ -16,26 +16,12 @@
'!node_modules/**'
]
},
-   jshint: {
-   options: {
-   jshintrc:

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: remove unused css-color-parser JavaScript

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331908 )

Change subject: Hygiene: remove unused css-color-parser JavaScript
..


Hygiene: remove unused css-color-parser JavaScript

Change-Id: Id289c5c404a50f60200088c847cfc871a5c15fbe
---
M www/.jsonlintignore
D www/lib/js/css-color-parser.js
2 files changed, 0 insertions(+), 201 deletions(-)

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



diff --git a/www/.jsonlintignore b/www/.jsonlintignore
index 46f1072..40b878d 100644
--- a/www/.jsonlintignore
+++ b/www/.jsonlintignore
@@ -1,2 +1 @@
-lib/
 node_modules/
\ No newline at end of file
diff --git a/www/lib/js/css-color-parser.js b/www/lib/js/css-color-parser.js
deleted file mode 100644
index d39a6ab..000
--- a/www/lib/js/css-color-parser.js
+++ /dev/null
@@ -1,200 +0,0 @@
-// (c) Dean McNamee , 2012.
-//
-// https://github.com/deanm/css-color-parser-js
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-
-// http://www.w3.org/TR/css3-color/
-var kCSSColorTable = {
-  "transparent": [0,0,0,0], "aliceblue": [240,248,255,1],
-  "antiquewhite": [250,235,215,1], "aqua": [0,255,255,1],
-  "aquamarine": [127,255,212,1], "azure": [240,255,255,1],
-  "beige": [245,245,220,1], "bisque": [255,228,196,1],
-  "black": [0,0,0,1], "blanchedalmond": [255,235,205,1],
-  "blue": [0,0,255,1], "blueviolet": [138,43,226,1],
-  "brown": [165,42,42,1], "burlywood": [222,184,135,1],
-  "cadetblue": [95,158,160,1], "chartreuse": [127,255,0,1],
-  "chocolate": [210,105,30,1], "coral": [255,127,80,1],
-  "cornflowerblue": [100,149,237,1], "cornsilk": [255,248,220,1],
-  "crimson": [220,20,60,1], "cyan": [0,255,255,1],
-  "darkblue": [0,0,139,1], "darkcyan": [0,139,139,1],
-  "darkgoldenrod": [184,134,11,1], "darkgray": [169,169,169,1],
-  "darkgreen": [0,100,0,1], "darkgrey": [169,169,169,1],
-  "darkkhaki": [189,183,107,1], "darkmagenta": [139,0,139,1],
-  "darkolivegreen": [85,107,47,1], "darkorange": [255,140,0,1],
-  "darkorchid": [153,50,204,1], "darkred": [139,0,0,1],
-  "darksalmon": [233,150,122,1], "darkseagreen": [143,188,143,1],
-  "darkslateblue": [72,61,139,1], "darkslategray": [47,79,79,1],
-  "darkslategrey": [47,79,79,1], "darkturquoise": [0,206,209,1],
-  "darkviolet": [148,0,211,1], "deeppink": [255,20,147,1],
-  "deepskyblue": [0,191,255,1], "dimgray": [105,105,105,1],
-  "dimgrey": [105,105,105,1], "dodgerblue": [30,144,255,1],
-  "firebrick": [178,34,34,1], "floralwhite": [255,250,240,1],
-  "forestgreen": [34,139,34,1], "fuchsia": [255,0,255,1],
-  "gainsboro": [220,220,220,1], "ghostwhite": [248,248,255,1],
-  "gold": [255,215,0,1], "goldenrod": [218,165,32,1],
-  "gray": [128,128,128,1], "green": [0,128,0,1],
-  "greenyellow": [173,255,47,1], "grey": [128,128,128,1],
-  "honeydew": [240,255,240,1], "hotpink": [255,105,180,1],
-  "indianred": [205,92,92,1], "indigo": [75,0,130,1],
-  "ivory": [255,255,240,1], "khaki": [240,230,140,1],
-  "lavender": [230,230,250,1], "lavenderblush": [255,240,245,1],
-  "lawngreen": [124,252,0,1], "lemonchiffon": [255,250,205,1],
-  "lightblue": [173,216,230,1], "lightcoral": [240,128,128,1],
-  "lightcyan": [224,255,255,1], "lightgoldenrodyellow": [250,250,210,1],
-  "lightgray": [211,211,211,1], "lightgreen": [144,238,144,1],
-  "lightgrey": [211,211,211,1], "lightpink": [255,182,193,1],
-  "lightsalmon": [255,160,122,1], "lightseagreen": [32,178,170,1],
-  "lightskyblue": [135,206,250,1], "lightslategray": [119,136,153,1],
-  "lightslategrey": [119,136,153,1], "lightsteelblue": [176,196,222,1],
-  "lightyellow": [255,255,224,1], "lime": [0,255,0,1],
-  "limegreen": [50,205,50,1], "linen": [250,240,230,1],
-  "magenta": [255,0,255,1], "maroon": [128,0,0,1],
-  "mediumaquamarine": [102,205,170,1], "mediumblue": [0,0,205,1],
-  "mediumorchid": [186,85,211,1], "mediumpurple": [147,112,219,1],
-

[MediaWiki-commits] [Gerrit] mediawiki...Scribunto[master]: Remove entry from ExtensionMessagesFiles

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331909 )

Change subject: Remove entry from ExtensionMessagesFiles
..


Remove entry from ExtensionMessagesFiles

Scribunto.i18n.php is not part of this repo

Change-Id: Id016f163fcebf8f94197968c45c2189a25cb7c2e
---
M Scribunto.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/Scribunto.php b/Scribunto.php
index a703463..15a4c59 100644
--- a/Scribunto.php
+++ b/Scribunto.php
@@ -36,7 +36,6 @@
 define( 'CONTENT_MODEL_SCRIBUNTO', 'Scribunto' );
 
 $wgMessagesDirs['Scribunto'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['Scribunto'] = __DIR__ . '/Scribunto.i18n.php';
 $wgExtensionMessagesFiles['ScribuntoMagic'] = __DIR__ . '/Scribunto.magic.php';
 $wgExtensionMessagesFiles['ScribuntoNamespaces'] = __DIR__ . 
'/Scribunto.namespaces.php';
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id016f163fcebf8f94197968c45c2189a25cb7c2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Anomie 
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] operations/puppet[production]: cassandra: add jmx_exporter to Cassandra in deployment-prep

2017-01-12 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331911 )

Change subject: cassandra: add jmx_exporter to Cassandra in deployment-prep
..

cassandra: add jmx_exporter to Cassandra in deployment-prep

Listen on port 7800 for Prometheus to poll and open the port via ferm.

Bug: T155120
Change-Id: Id5fe919b7e49c87cf70d3b0c595781e1731fa627
---
M hieradata/labs/deployment-prep/common.yaml
M modules/role/manifests/cassandra.pp
2 files changed, 13 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/331911/1

diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index c5ddf9c..8545355 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -97,6 +97,8 @@
 cassandra::logstash_host: deployment-logstash2.deployment-prep.eqiad.wmflabs
 cassandra::target_version: '2.2'
 cassandra::metrics::graphite_host: labmon1001.eqiad.wmnet
+cassandra::additional_jvm_opts:
+  - 
'-javaagent:/srv/deployment/cassandra/jmx_exporter/lib/jmx_prometheus_javaagent-0.8-SNAPSHOT.jar=7800:/etc/cassandra/jmx_exporter.yaml'
 restbase::seeds:
   - 10.68.16.128 # deployment-restbase01
   - 10.68.17.189 # deployment-restbase02
@@ -252,3 +254,5 @@
   # Public EventStreams service
   eventstreams/deploy:
 repository: mediawiki/services/eventstreams/deploy
+prometheus_nodes:
+  - deployment-prometheus01.deployment-prep.eqiad.wmflabs
diff --git a/modules/role/manifests/cassandra.pp 
b/modules/role/manifests/cassandra.pp
index 3567ec4..f093a91 100644
--- a/modules/role/manifests/cassandra.pp
+++ b/modules/role/manifests/cassandra.pp
@@ -42,6 +42,9 @@
 $cassandra_hosts = hiera('cassandra::seeds')
 $cassandra_hosts_ferm = join($cassandra_hosts, ' ')
 
+$prometheus_nodes = hiera('prometheus_nodes')
+$prometheus_nodes_ferm = join($prometheus_nodes, ' ')
+
 # Cassandra intra-node messaging
 ferm::service { 'cassandra-intra-node':
 proto  => 'tcp',
@@ -67,5 +70,11 @@
 port   => '9042',
 srange => "@resolve((${cassandra_hosts_ferm}))",
 }
+# Prometheus jmx_exporter for Cassandra
+ferm::service { 'cassandra-jmx_exporter':
+proto  => 'tcp',
+port   => '7300',
+srange => "@resolve((${prometheus_nodes_ferm}))",
+}
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5fe919b7e49c87cf70d3b0c595781e1731fa627
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Log transcode resets

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331660 )

Change subject: Log transcode resets
..


Log transcode resets

Bug: T154737
Change-Id: I802b089c7eaad3fe52740dffc458b19399b6ac48
---
M ApiTranscodeReset.php
M TimedMediaHandler.php
M i18n/en.json
M i18n/qqq.json
4 files changed, 17 insertions(+), 0 deletions(-)

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



diff --git a/ApiTranscodeReset.php b/ApiTranscodeReset.php
index 543f1c6..e691ec4 100644
--- a/ApiTranscodeReset.php
+++ b/ApiTranscodeReset.php
@@ -98,6 +98,14 @@
// Oh and we wanted to reset it, right? Trigger again.
WebVideoTranscode::updateJobQueue( $file, $transcodeKey );
 
+   $logEntry = new ManualLogEntry( 'timedmediahandler', 
'resettranscode' );
+   $logEntry->setPerformer( $this->getUser() );
+   $logEntry->setTarget( $titleObj );
+   $logEntry->setParameters( [
+   '4::transcodekey' => $transcodeKey,
+   ] );
+   $logid = $logEntry->insert();
+
$this->getResult()->addValue( null, 'success', 'removed 
transcode' );
}
 
diff --git a/TimedMediaHandler.php b/TimedMediaHandler.php
index 15e348a..46c71ef 100644
--- a/TimedMediaHandler.php
+++ b/TimedMediaHandler.php
@@ -340,6 +340,9 @@
 $wgSpecialPages['OrphanedTimedText'] = 'SpecialOrphanedTimedText';
 $wgSpecialPages['TimedMediaHandler'] = 'SpecialTimedMediaHandler';
 
+$wgLogTypes[] = 'timedmediahandler';
+$wgLogActionsHandlers['timedmediahandler/resettranscode'] = 'LogFormatter';
+
 // Extension Credits
 $wgExtensionCredits['media'][] = [
'path' => __FILE__,
diff --git a/i18n/en.json b/i18n/en.json
index 0c72508..9b198c9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -171,6 +171,9 @@
"right-transcode-status": "View [[Special:TimedMediaHandler|information 
about the current transcode activity]]",
"action-transcode-reset": "reset transcodes",
"action-transcode-status": "view the current transcoding status",
+   "log-name-timedmediahandler": "TimedMediaHandler log",
+   "log-description-timedmediahandler": "This is a log of actions related 
to timed media transcodes.",
+   "logentry-timedmediahandler-resettranscode": "$1 {{GENDER:$2|reset}} a 
transcode of $3 to the format \"$4\"",
"orphanedtimedtext": "Orphaned TimedText pages",
"orphanedtimedtext-summary": "List of 
[[{{#special:AllPages/TimedText:}}|{{ns:TimedText}}]] pages which do not have a 
corresponding file.",
"orphanedtimedtext-unsupported": "This special page is only supported 
on MySQL databases.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e3733ad..06c0af2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -189,6 +189,9 @@
"right-transcode-status": "{{doc-right|transcode-status}}",
"action-transcode-reset": "{{doc-action|transcode-reset}}",
"action-transcode-status": "{{doc-action|transcode-status}}",
+   "log-name-timedmediahandler": "{{doc-logpage}}\n\nAs well as log page 
title and page header for [[Special:Log/timedmediahandler]].",
+   "log-description-timedmediahandler": "Log description on 
[[Special:Log/timedmediahandler]].",
+   "logentry-timedmediahandler-resettranscode": 
"{{logentry|[[Special:Log/timedmediahandler]]}}\nParameters:\n* $4 - format to 
transcode to, e.g. '480p.ogv'",
"orphanedtimedtext": "{{doc-special|OrphanedTimedText}}",
"orphanedtimedtext-summary": "Summary of Special:OrphanedTimedText.",
"orphanedtimedtext-unsupported": "Shown if Special:OrphanedTimedText 
isn't supported for the current database back-end.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I802b089c7eaad3fe52740dffc458b19399b6ac48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 
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...Graph[master]: Graph: cleanup styles a bit

2017-01-12 Thread TheDJ (Code Review)

TheDJ has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331910 )

Change subject: Graph: cleanup styles a bit
..

Graph: cleanup styles a bit

- properly divide into agnostic vs client-js vs client-nojs
- remove duplicate display:block; on mw-graph-layover
- hide all layover content (play button, title, loader) when we don't
  have JS.

Change-Id: I1c2b6b0308f77d977b7dc5fcef05833bb600f5ec
---
M styles/common.less
1 file changed, 41 insertions(+), 38 deletions(-)


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

diff --git a/styles/common.less b/styles/common.less
index 94c232e..ed36242 100644
--- a/styles/common.less
+++ b/styles/common.less
@@ -8,42 +8,45 @@
 /* TODO: This file has a lot of descending specificity and needs a cleanup */
 /* stylelint-disable no-descending-specificity */
 
-.client-js {
+.mw-graph {
+   display: inline-block;
+   border: 1px solid transparent;
+   position: relative;
 
-   .mw-graph {
+   .mw-graph-img,
+   canvas {
display: inline-block;
-   border: 1px solid transparent;
-   position: relative;
+   vertical-align: middle;
+   }
+}
 
-   .mw-graph-img,
-   canvas {
-   display: inline-block;
-   vertical-align: middle;
-   }
+.client-nojs {
+   .mw-graph-layover {
+   display: none;
+   }
+}
 
-   &.mw-graph-interactable {
-   &:hover {
-   cursor: pointer;
+.client-js {
+   .mw-graph-interactable {
+   &:hover {
+   cursor: pointer;
 
-   .mw-graph-hover-title {
-   display: block;
+   .mw-graph-hover-title {
+   display: block;
+   }
+
+   .mw-graph-layover {
+   background-color: @colorWhiteOpac;
+   }
+
+   .mw-graph-switch {
+   &.mw-graph-loading {
+   background-color: @colorWhite;
}
 
-   .mw-graph-layover {
-   display: block;
-   background-color: @colorWhiteOpac;
+   &:hover {
+   background-color: @colorWhite;
}
-
-   .mw-graph-switch {
-   &.mw-graph-loading {
-   background-color: @colorWhite;
-   }
-
-   &:hover {
-   background-color: @colorWhite;
-   }
-   }
-
}
}
}
@@ -65,17 +68,17 @@
left: 10px;
top: 10px;
}
+   }
 
-   .mw-graph-hover-title {
-   display: none;
-   position: absolute;
-   top: ~'calc( 50% - 17px )';
-   left: 1em;
-   right: 1em;
-   text-align: center;
-   font-size: 150%;
-   background-color: @colorWhite;
-   }
+   .mw-graph-hover-title {
+   display: none;
+   position: absolute;
+   top: ~'calc( 50% - 17px )';
+   left: 1em;
+   right: 1em;
+   text-align: center;
+   font-size: 150%;
+   background-color: @colorWhite;
}
 
/* common button style */

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Scribunto[master]: Remove entry from ExtensionMessagesFiles

2017-01-12 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331909 )

Change subject: Remove entry from ExtensionMessagesFiles
..

Remove entry from ExtensionMessagesFiles

Scribunto.i18n.php is not part of this repo

Change-Id: Id016f163fcebf8f94197968c45c2189a25cb7c2e
---
M Scribunto.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/Scribunto.php b/Scribunto.php
index a703463..15a4c59 100644
--- a/Scribunto.php
+++ b/Scribunto.php
@@ -36,7 +36,6 @@
 define( 'CONTENT_MODEL_SCRIBUNTO', 'Scribunto' );
 
 $wgMessagesDirs['Scribunto'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['Scribunto'] = __DIR__ . '/Scribunto.i18n.php';
 $wgExtensionMessagesFiles['ScribuntoMagic'] = __DIR__ . '/Scribunto.magic.php';
 $wgExtensionMessagesFiles['ScribuntoNamespaces'] = __DIR__ . 
'/Scribunto.namespaces.php';
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id016f163fcebf8f94197968c45c2189a25cb7c2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: remove unused css-color-parser JavaScript

2017-01-12 Thread Niedzielski (Code Review)

Niedzielski has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331908 )

Change subject: Hygiene: remove unused css-color-parser JavaScript
..

Hygiene: remove unused css-color-parser JavaScript

Change-Id: Id289c5c404a50f60200088c847cfc871a5c15fbe
---
D www/lib/js/css-color-parser.js
1 file changed, 0 insertions(+), 200 deletions(-)


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

diff --git a/www/lib/js/css-color-parser.js b/www/lib/js/css-color-parser.js
deleted file mode 100644
index d39a6ab..000
--- a/www/lib/js/css-color-parser.js
+++ /dev/null
@@ -1,200 +0,0 @@
-// (c) Dean McNamee , 2012.
-//
-// https://github.com/deanm/css-color-parser-js
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-
-// http://www.w3.org/TR/css3-color/
-var kCSSColorTable = {
-  "transparent": [0,0,0,0], "aliceblue": [240,248,255,1],
-  "antiquewhite": [250,235,215,1], "aqua": [0,255,255,1],
-  "aquamarine": [127,255,212,1], "azure": [240,255,255,1],
-  "beige": [245,245,220,1], "bisque": [255,228,196,1],
-  "black": [0,0,0,1], "blanchedalmond": [255,235,205,1],
-  "blue": [0,0,255,1], "blueviolet": [138,43,226,1],
-  "brown": [165,42,42,1], "burlywood": [222,184,135,1],
-  "cadetblue": [95,158,160,1], "chartreuse": [127,255,0,1],
-  "chocolate": [210,105,30,1], "coral": [255,127,80,1],
-  "cornflowerblue": [100,149,237,1], "cornsilk": [255,248,220,1],
-  "crimson": [220,20,60,1], "cyan": [0,255,255,1],
-  "darkblue": [0,0,139,1], "darkcyan": [0,139,139,1],
-  "darkgoldenrod": [184,134,11,1], "darkgray": [169,169,169,1],
-  "darkgreen": [0,100,0,1], "darkgrey": [169,169,169,1],
-  "darkkhaki": [189,183,107,1], "darkmagenta": [139,0,139,1],
-  "darkolivegreen": [85,107,47,1], "darkorange": [255,140,0,1],
-  "darkorchid": [153,50,204,1], "darkred": [139,0,0,1],
-  "darksalmon": [233,150,122,1], "darkseagreen": [143,188,143,1],
-  "darkslateblue": [72,61,139,1], "darkslategray": [47,79,79,1],
-  "darkslategrey": [47,79,79,1], "darkturquoise": [0,206,209,1],
-  "darkviolet": [148,0,211,1], "deeppink": [255,20,147,1],
-  "deepskyblue": [0,191,255,1], "dimgray": [105,105,105,1],
-  "dimgrey": [105,105,105,1], "dodgerblue": [30,144,255,1],
-  "firebrick": [178,34,34,1], "floralwhite": [255,250,240,1],
-  "forestgreen": [34,139,34,1], "fuchsia": [255,0,255,1],
-  "gainsboro": [220,220,220,1], "ghostwhite": [248,248,255,1],
-  "gold": [255,215,0,1], "goldenrod": [218,165,32,1],
-  "gray": [128,128,128,1], "green": [0,128,0,1],
-  "greenyellow": [173,255,47,1], "grey": [128,128,128,1],
-  "honeydew": [240,255,240,1], "hotpink": [255,105,180,1],
-  "indianred": [205,92,92,1], "indigo": [75,0,130,1],
-  "ivory": [255,255,240,1], "khaki": [240,230,140,1],
-  "lavender": [230,230,250,1], "lavenderblush": [255,240,245,1],
-  "lawngreen": [124,252,0,1], "lemonchiffon": [255,250,205,1],
-  "lightblue": [173,216,230,1], "lightcoral": [240,128,128,1],
-  "lightcyan": [224,255,255,1], "lightgoldenrodyellow": [250,250,210,1],
-  "lightgray": [211,211,211,1], "lightgreen": [144,238,144,1],
-  "lightgrey": [211,211,211,1], "lightpink": [255,182,193,1],
-  "lightsalmon": [255,160,122,1], "lightseagreen": [32,178,170,1],
-  "lightskyblue": [135,206,250,1], "lightslategray": [119,136,153,1],
-  "lightslategrey": [119,136,153,1], "lightsteelblue": [176,196,222,1],
-  "lightyellow": [255,255,224,1], "lime": [0,255,0,1],
-  "limegreen": [50,205,50,1], "linen": [250,240,230,1],
-  "magenta": [255,0,255,1], "maroon": [128,0,0,1],
-  "mediumaquamarine": [102,205,170,1], "mediumblue": [0,0,205,1],
-  "mediumorchid": [186,85,211,1], "mediumpurple": [147,112,219,1],
-  "mediumseagreen": [60,179,113,1], "mediumslateblue": [123,104,238,1],
-  "mediumspringgreen": [0,250,154,1], "mediumturquoise": [72,209,204,1],
-  "mediumvioletred": [199,21,133,1], "midnightblue": [25,25,112,1],
-

[MediaWiki-commits] [Gerrit] mediawiki...Patroller[master]: Patroller V2.1

2017-01-12 Thread Cblair91 (Code Review)

Cblair91 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331907 )

Change subject: Patroller V2.1
..

Patroller V2.1

Update Patroller to V2.1:
Update copyright years to cover 2017 (Happy New Year)
Update all SQL to new MediaWiki SQL standards (no hardcoded queries)
Fix credits to my username to reflect "Developaws".
Cleanup formatting style to standards.
Cleaner handling for if/else statements.

Change-Id: I2bb276a900c0213d98a77d2853a94b0f140abdf1
---
M Gruntfile.js
M Patroller.alias.php
M Patroller.hooks.php
M Patroller.php
M SpecialPatroller.php
M composer.json
M extension.json
7 files changed, 128 insertions(+), 88 deletions(-)


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

diff --git a/Gruntfile.js b/Gruntfile.js
index 545b62a..cb511b1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,12 +1,8 @@
 /*jshint node:true */
 module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-jsonlint' );
-   // grunt.loadNpmTasks( 'grunt-banana-checker' );
 
grunt.initConfig( {
-   /* banana: {
-   all: 'i18n/'
-   }, */
jsonlint: {
all: [
'**/*.json',
@@ -15,6 +11,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'jsonlint' /* 'banana' */ ] );
+   grunt.registerTask( 'test', [ 'jsonlint' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/Patroller.alias.php b/Patroller.alias.php
index 22ce3d2..869dde1 100644
--- a/Patroller.alias.php
+++ b/Patroller.alias.php
@@ -3,8 +3,8 @@
  * Patroller
  * Patroller MediaWiki alises
  *
- * @author: Rob Church , Kris Blair (Cblair91)
- * @copyright: 2006-2008 Rob Church, 2015 Kris Blair
+ * @author: Rob Church , Kris Blair (Developaws)
+ * @copyright: 2006-2008 Rob Church, 2015-2017 Kris Blair
  * @license: GNU General Public Licence 2.0
  * @package: Patroller
  * @link: https://mediawiki.org/wiki/Extension:Patroller
diff --git a/Patroller.hooks.php b/Patroller.hooks.php
index b2385e3..daf23a5 100644
--- a/Patroller.hooks.php
+++ b/Patroller.hooks.php
@@ -3,8 +3,8 @@
  * Patroller
  * Patroller MediaWiki main hooks
  *
- * @author: Rob Church , Kris Blair (Cblair91)
- * @copyright: 2006-2008 Rob Church, 2015 Kris Blair
+ * @author: Rob Church , Kris Blair (Developaws)
+ * @copyright: 2006-2008 Rob Church, 2015-2017 Kris Blair
  * @license: GPL General Public Licence 2.0
  * @package: Patroller
  * @link: https://mediawiki.org/wiki/Extension:Patroller
diff --git a/Patroller.php b/Patroller.php
index dd02b45..669a512 100644
--- a/Patroller.php
+++ b/Patroller.php
@@ -3,22 +3,20 @@
  * Patroller
  * Patroller MediaWiki main loader
  *
- * @author: Rob Church , Kris Blair (Cblair91)
- * @copyright: 2006-2008 Rob Church, 2015 Kris Blair
+ * @author: Rob Church , Kris Blair (Developaws)
+ * @copyright: 2006-2008 Rob Church, 2015-2017 Kris Blair
  * @license: GPL General Public Licence 2.0
  * @package: Patroller
  * @link: https://mediawiki.org/wiki/Extension:Patroller
  */
 
+$dir = __DIR__;
+
 if ( function_exists( 'wfLoadExtension' ) ) {
wfLoadExtension( 'Patroller' );
// Keep i18n globals so mergeMessageFileList.php doesn't break
-   $wgMessagesDirs['Patroller'] = __DIR__ . '/i18n';
-   $wgExtensionMessagesFiles['PatrollerAlias'] = __DIR__ . 
'/Patroller.alias.php';
-   /* wfWarn(
-   'Deprecated PHP entry point used for Patroller extension. 
Please use wfLoadExtension instead, ' .
-   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
-   ); */
+   $wgMessagesDirs['Patroller'] = $dir . '/i18n';
+   $wgExtensionMessagesFiles['PatrollerAlias'] = $dir . 
'/Patroller.alias.php';
return true;
 }
 
@@ -26,22 +24,22 @@
'path'  => __FILE__,
'name'  => 'Patroller',
'descriptionmsg'=> 'patrol-desc',
-   'author'=> 'Rob Church, Kris Blair (Cblair91)',
-   'version'   => '2.0.1',
+   'author'=> 'Rob Church, Kris Blair 
(Developaws)',
+   'version'   => '2.1',
'url'   => 
'https://www.mediawiki.org/wiki/Extension:Patroller',
'licence-name'  => 'GPL-2.0'
 ];
 
 // Register hooks
-$wgAutoloadClasses['PatrollerHooks']   = __DIR__ . 
'/Patroller.hooks.php';
-$wgAutoloadClasses['SpecialPatroller'] = 
__DIR__ . '/SpecialPatroller.php';
+$wgAutoloadClasses['PatrollerHooks']   = $dir . 
'/Patroller.hooks.php';
+$wgAutoloadClasses['SpecialPatroller']

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Add DescriptionEditTutorialPageViewTest

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/330314 )

Change subject: Add DescriptionEditTutorialPageViewTest
..


Add DescriptionEditTutorialPageViewTest

Bug: T148205
Change-Id: I94ac6f61cde473fc35f7ce260fe8ff38ee8f8a84
---
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light-PAGE_ONE.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testLayoutDirection-480dp-en-rtl-font1.0x-light-PAGE_TWO.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testTheme-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.0x-light-PAGE_TWO.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.5x-light-PAGE_ONE.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-480dp-en-ltr-font1.5x-light-PAGE_TWO.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.0x-light-PAGE_ONE.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.0x-light-PAGE_TWO.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.5x-light-PAGE_ONE.png
A 
app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testWidth-720dp-en-ltr-font1.5x-light-PAGE_TWO.png
A 
app/src/androidTest/java/org/wikipedia/descriptions/DescriptionEditTutorialPageViewTest.java
21 files changed, 83 insertions(+), 0 deletions(-)

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



diff --git 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
new file mode 100644
index 000..1a6bbf7
--- /dev/null
+++ 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_ONE.png
Binary files differ
diff --git 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
new file mode 100644
index 000..c531a75
--- /dev/null
+++ 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-dark-PAGE_TWO.png
Binary files differ
diff --git 
a/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
new file mode 100644
index 000..1a6bbf7
--- /dev/null
+++ 
b/app/screenshots-ref/org.wikipedia.descriptions.DescriptionEditTutorialPageViewTest.testFocus-480dp-en-ltr-font1.0x-light-PAGE_ONE.png
Binary files differ
diff --git

[MediaWiki-commits] [Gerrit] mediawiki...mathoid[master]: Maintain whitespaces in chem tags

2017-01-12 Thread Physikerwelt (Code Review)

Physikerwelt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331906 )

Change subject: Maintain whitespaces in chem tags
..

Maintain whitespaces in chem tags

texvcjs changed the whitespaces in \ce
commands, which caused rendering issues.
See

http://ctan.mirrors.hoobly.com/macros/latex/contrib/mhchem/mhchem.pdf

for the mhchem syntax.

This change uses the unchanged input for rendering
of chem tags.

Bug: T140217
Change-Id: I4a685c5c4a969d1228271b50ccd64671061297a9
---
M routes/mathoid.js
M test/features/math/simple.js
2 files changed, 8 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid 
refs/changes/06/331906/1

diff --git a/routes/mathoid.js b/routes/mathoid.js
index 433c9ce..0e36e7b 100644
--- a/routes/mathoid.js
+++ b/routes/mathoid.js
@@ -94,6 +94,10 @@
 feedback = texvcInfo.feedback(q, {usemhchem: chem});
 // XXX properly handle errors here!
 if (feedback.success) {
+if (chem) {
+// keep the spacing for chemical formulae
+feedback.checked = q;
+}
 sanitizedTex = feedback.checked || '';
 q = sanitizedTex;
 } else {
@@ -102,12 +106,11 @@
 if (info) {
 if (outFormat === "graph") {
 res.json(texvcInfo.texvcinfo(q, {"format": "json", "compact": 
true}));
-return;
-}
-if (info && outFormat === "texvcinfo") {
+} else {
+// outFormat === "texvcinfo"
 res.json(feedback).end();
-return;
 }
+return;
 }
 }
 
diff --git a/test/features/math/simple.js b/test/features/math/simple.js
index c18acc0..1b321fe 100644
--- a/test/features/math/simple.js
+++ b/test/features/math/simple.js
@@ -161,7 +161,7 @@
 response: {
 status: 200,
 body: {
-"mml": "http://www.w3.org/1998/Math/MathML\; 
alttext=\"upper H Subscript 2 Superscript Baseline upper O\">\n  \n  
  \n  \nH\n 
   \n  2\n
\n\n  \n\n  
\n  O\n\n{\\ce {H2O}}\n  
\n",
+"mml": "http://www.w3.org/1998/Math/MathML\; 
alttext=\"upper H Subscript 2 Superscript Baseline upper O\">\n  \n  
  \n  \nH\n\n  2\n\n
\n  \n\n  \n  
O\n\n\\ce{H2O}\n  \n",
 "speakText": "upper H Subscript 2 Superscript Baseline 
upper O",
 "svg": "\nhttp://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\;>\nhttp://www.w3.org/1999/xlink\; width=\"4.634ex\" 
height=\"2.843ex\" style=\"vertical-align: -1.005ex;\" viewBox=\"0 -791.3 
1995.1 1223.9\" xmlns=\"http://www.w3.org/2000/svg\; role=\"math\" 
aria-labelledby=\"MathJax-SVG-1-Title MathJax-SVG-1-Desc\">\nEquation\nupper H Subscript 2 Superscript Baseline upper 
O\n\n\n\n\n\n\n 
\n \n \n\n",
 "mathoidStyle": "vertical-align: -1.005ex; width:4.634ex; 
height:2.843ex;",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a685c5c4a969d1228271b50ccd64671061297a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Description editing tutorial: further design tweaks

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/330722 )

Change subject: Description editing tutorial: further design tweaks
..


Description editing tutorial: further design tweaks

Moves the PageIndicatorView from the fragment layout to the view layout.
This has two benefits:

(1) we no longer require an offset that can potentially obscure text at
larger text size configurations;

(2) the page indicator view is included in the screenshots used for
testing.

Further tweaks the view layout to accommodate this new arrangement.

Sadly, this means that the page view indicator will no longer remain
stationary while scrolling between the pages but will appear separately
on each page; such is life.

Bug: T148205
Change-Id: Ic443210ef8a6512d19372eaef7a9c99e0a758f46
---
M app/src/main/res/layout/fragment_description_edit_tutorial.xml
M app/src/main/res/layout/view_description_edit_tutorial_page.xml
2 files changed, 50 insertions(+), 47 deletions(-)

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



diff --git a/app/src/main/res/layout/fragment_description_edit_tutorial.xml 
b/app/src/main/res/layout/fragment_description_edit_tutorial.xml
index 55cb467..59b4754 100644
--- a/app/src/main/res/layout/fragment_description_edit_tutorial.xml
+++ b/app/src/main/res/layout/fragment_description_edit_tutorial.xml
@@ -1,23 +1,6 @@
 
-http://schemas.android.com/apk/res/android;
-xmlns:attrs="http://schemas.android.com/apk/res-auto;
+http://schemas.android.com/apk/res/android;
+android:id="@+id/fragment_description_edit_tutorial_view_pager"
 android:layout_width="match_parent"
-android:layout_height="match_parent" >
-
-
-
-
-
-
\ No newline at end of file
+android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_description_edit_tutorial_page.xml 
b/app/src/main/res/layout/view_description_edit_tutorial_page.xml
index 0edf0b0..dcbf81d 100644
--- a/app/src/main/res/layout/view_description_edit_tutorial_page.xml
+++ b/app/src/main/res/layout/view_description_edit_tutorial_page.xml
@@ -1,6 +1,6 @@
 
-http://schemas.android.com/apk/res/android;
+http://schemas.android.com/apk/res/android;
+xmlns:app="http://schemas.android.com/apk/res-auto;
 xmlns:tools="http://schemas.android.com/tools;
 
tools:parentTag="org.wikipedia.descriptions.DescriptionEditTutorialPageView"
 tools:layout_width="match_parent"
@@ -19,32 +19,40 @@
 android:layout_height="0dp"
 android:layout_weight="50"
 android:orientation="vertical"
-android:paddingBottom="48dp"
 android:background="@color/light_blue"
-android:gravity="center">
+android:gravity="bottom|center_horizontal">
 
-
+
 
-
-
+
+
+
+
+
+
 
 
 
+
+
 
 
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic443210ef8a6512d19372eaef7a9c99e0a758f46
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
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...Patroller[master]: Update entry from ExtensionMessagesFiles

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331897 )

Change subject: Update entry from ExtensionMessagesFiles
..


Update entry from ExtensionMessagesFiles

Patroller.i18n.php is not part of this repo
Add PatrollerAlias to ExtensionMessagesFiles

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

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



diff --git a/extension.json b/extension.json
index 26b4471..e79463f 100644
--- a/extension.json
+++ b/extension.json
@@ -26,7 +26,7 @@
]
},
"ExtensionMessagesFiles": {
-   "Patroller": "Patroller.i18n.php"
+   "PatrollerAlias": "Patroller.alias.php"
},
"AutoloadClasses": {
"PatrollerHooks": "Patroller.hooks.php",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If7897a50ee982e50cf12be0c80870406eb65
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Patroller
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Cblair91 
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...Wikispeech[master]: Use PageContentLanguage in requests

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331881 )

Change subject: Use PageContentLanguage in requests
..


Use PageContentLanguage in requests

This allows the right language to be used on wikis which have
activated Special:PageLanguage.

Bug: T144156
Change-Id: I9434037cb8115009aaecf8cc0a4a36e7db7c2b8e
---
M modules/ext.wikispeech.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ext.wikispeech.js b/modules/ext.wikispeech.js
index 759733d..5608e2d 100644
--- a/modules/ext.wikispeech.js
+++ b/modules/ext.wikispeech.js
@@ -531,7 +531,7 @@
);
parameters = $.param( {
// jscs:disable 
requireCamelCaseOrUpperCaseIdentifiers
-   lang: 'en',
+   lang: mw.config.get( 'wgPageContentLanguage' ),
input_type: 'text',
input: text
// jscs:enable 
requireCamelCaseOrUpperCaseIdentifiers

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9434037cb8115009aaecf8cc0a4a36e7db7c2b8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikispeech
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil 
Gerrit-Reviewer: Sebastian Berlin (WMSE) 
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] operations...gerrit[master]: Test: Do not merge

2017-01-12 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331873 )

Change subject: Test: Do not merge
..

Test: Do not merge

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/gerrit 
refs/changes/73/331873/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7fd00f104d58bd9ff79a2705b822ce91fbd8b2a
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/gerrit
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/core[master]: Fix two typos

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331895 )

Change subject: Fix two typos
..


Fix two typos

Changed evaluting > evaluating and catgeories > categories.

Bug: T155135
Change-Id: Ieeaaf76b2fb762810a85ec10e82381f70067884e
---
M includes/api/i18n/en.json
M languages/i18n/en.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 8ac11d0..cb00581 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -820,7 +820,7 @@
"apihelp-query+imageinfo-param-extmetadatamultilang": "If translations 
for extmetadata property are available, fetch all of them.",
"apihelp-query+imageinfo-param-extmetadatafilter": "If specified and 
non-empty, only these keys will be returned for $1prop=extmetadata.",
"apihelp-query+imageinfo-param-urlparam": "A handler specific parameter 
string. For example, PDFs might use page15-100px. 
$1urlwidth must be used and be consistent with 
$1urlparam.",
-   "apihelp-query+imageinfo-param-badfilecontexttitle": "If 
$2prop=badfile is set, this is the page title used when evaluting 
the [[MediaWiki:Bad image list]]",
+   "apihelp-query+imageinfo-param-badfilecontexttitle": "If 
$2prop=badfile is set, this is the page title used when evaluating 
the [[MediaWiki:Bad image list]]",
"apihelp-query+imageinfo-param-localonly": "Look only for files in the 
local repository.",
"apihelp-query+imageinfo-example-simple": "Fetch information about the 
current version of [[:File:Albert Einstein Head.jpg]].",
"apihelp-query+imageinfo-example-dated": "Fetch information about 
versions of [[:File:Test.jpg]] from 2008 and later.",
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 671dce7..1e37d40 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1814,7 +1814,7 @@
"uncategorizedimages-summary": "",
"uncategorizedtemplates": "Uncategorized templates",
"uncategorizedtemplates-summary": "",
-   "uncategorized-categories-exceptionlist": " # Contains a list of 
catgeories, which shouldn't be mentioned on Special:UncategorizedCategories. 
One per line, starting with \"*\". Lines starting with another character 
(including whitespaces) are ignored. Use \"#\" for comments.",
+   "uncategorized-categories-exceptionlist": " # Contains a list of 
categories, which shouldn't be mentioned on Special:UncategorizedCategories. 
One per line, starting with \"*\". Lines starting with another character 
(including whitespaces) are ignored. Use \"#\" for comments.",
"unusedcategories": "Unused categories",
"unusedcategories-summary": "",
"unusedimages": "Unused files",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieeaaf76b2fb762810a85ec10e82381f70067884e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: DatGuy 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Fomafix 
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...Reflect[master]: Fix extension Reflect failing tests

2017-01-12 Thread DatGuy (Code Review)

DatGuy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331905 )

Change subject: Fix extension Reflect failing tests
..

Fix extension Reflect failing tests

Extension Reflect failing tests due to missing apihelp actions.

Bug: T155036
Change-Id: Ic14a8aca067f5113a4d5af5b3e23957176e8f1fd
---
M i18n/en.json
M i18n/qqq.json
M server/api/ApiReflectAction.php
M server/api/ApiReflectStudyAction.php
4 files changed, 57 insertions(+), 48 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 74bb2c9..6ff5efb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,12 +1,37 @@
 {
"@metadata": {
-   "authors": [
-   "Travis Kriplean "
-   ]
+   "authors": [
+   "Travis Kriplean "
+   ]
},
"reflect-desc": "Augmentation of threaded comments",
-   "reflect-bulleted": "Hi $1,\n\t\n$2 has summarized a point that you 
made in the thread \"$3\". \n\nTheir summary: \"$5\".\n\nYou can verify whether 
$2 got your point right by visiting <$4>. \n\nYou will be able to clarify your 
point if there is a misunderstanding.",
+   "reflect-bulleted": "Hi $1,\n\t\n$2 has summarized a point that you 
made in the thread \"$3\". \n\nTheir summary: \"$5\".\n\nYou can verify whether 
$2 got your point right by visiting <$4>. \n\nYou will be able to clarify your 
point if there is a misunderstanding",
"reflect-bulleted-subject": "[{{SITENAME}}] Your point was summarized 
by $2",
-   "reflect-responded": "Hi $1, \n\t\n$2 has responded to your summary of 
a point that they made.\n\nThe summary you left: \"$6\". \nTheir message: 
\"$5\".\n\nIf you want to read the response in context, visit <$4>.",
-   "reflect-responded-subject": "[{{SITENAME}}] $2 has responded to your 
summary bullet point"
+   "reflect-responded": "Hi $1, \n\t\n$2 has responded to your summary of 
a point that they made.\n\nThe summary you left: \"$6\". \nTheir message: 
\"$5\".\n\nIf you want to read the response in context, visit <$4>",
+   "reflect-responded-subject": "[{{SITENAME}}] $2 has responded to your 
summary bullet point",
+   "apihelp-reflectaction-description": "Enables Reflect on posts in 
Liquid-Threaded discussions",
+   "apihelp-reflectaction-param-reflectaction": "The action to take",
+   "apihelp-reflectaction-param-token": "An edit token (from 
?action=query=info=edit)",
+   "apihelp-reflectaction-param-delete": "Whether this post is a delete 
request",
+   "apihelp-reflectaction-param-comment_id": "The id of the relevant 
thread",
+   "apihelp-reflectaction-param-bullet_id": "For modifying existing 
bullets. Don't set if posting new bullet",
+   "apihelp-reflectaction-param-response": "Set to true if the post is 
posting a response",
+   "apihelp-reflectaction-param-response_id": "For modifying existing 
response. Don't set if posting new response",
+   "apihelp-reflectaction-param-text": "The text relevant to the action",
+   "apihelp-reflectaction-param-user": "The user who took the action. We 
actually ignore this and use $wgUser instead",
+   "apihelp-reflectaction-param-highlights": "For posting a bullet. An 
array of element ids corresponding to the highlighted elements of the comment",
+   "apihelp-reflectaction-param-signal": "For responses. ID of response to 
question about whether the commenter thinks the bullet is accurate",
+   "apihelp-reflectaction-param-comments": "For initial GET request. List 
of ids of all the threads on the current page",
+   "apihelp-reflectaction-param-bullet_rev": "The revision of the bullet 
to take action on",
+   "apihelp-reflectaction-param-response_rev": "The revision of the 
response to take action on",
+   "apihelp-reflactstudyaction-description": "Enables in-situ surveys for 
study Reflect activities in Liquid-Threaded discussions",
+   "apihelp-reflectstudyaction-param-reflectstudyaction": "The action to 
take",
+   "apihelp-reflectstudyaction-param-token": "An edit token (from 
?action=query=info=edit)",
+   "apihelp-reflectstudyaction-param-comment_id": "The id of the thread",
+   "apihelp-reflectstudyaction-param-bullet_id": "The id of the bullet the 
survey is asking about",
+   "apihelp-reflectstudyaction-param-bullet_rev": "The revid of the bullet 
the survey is asking about",
+   "apihelp-reflectstudyaction-param-response_id": "An answer to a survey 
question",
+   "apihelp-reflectstudyaction-param-survey_id": "An identifier for the 
specific survey being administered",
+   "apihelp-reflectstudyaction-param-text": "Optional text field for open 
ended survey questions",
+   "apihelp-reflectstudyaction-param-bullets": "list of bullets for survey 
to

[MediaWiki-commits] [Gerrit] mediawiki...NamespacePopups[master]: Fix build

2017-01-12 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331904 )

Change subject: Fix build
..

Fix build

Similar to I215fabe129933a04644e05eb541cbf3b34699095

Update .gitignore to ignore package manager material (node_modules,
vendor and composer.lock).

PHP_CodeSniffer:

Fix up white spaces after comment character.
Add spaces next to parentheses.

PagePopups.hooks.php
Reindent with tabulations

npm:

Bump grunt to 1.x which now ship with a grunt CLI utility. Hence remove
grunt-cli which is no more needed.

Remove jscsc task. It does not pass yet, see BoilerPlates extension to
add it later.

Comment out 'banana' since there is no i18n files yet.

Change-Id: I25fdd0d99dfab483cc7bedd8c7b4e26dcc136978
---
M .gitignore
M Gruntfile.js
M NamespacePopups.hooks.php
M NamespacePopups.php
M package.json
5 files changed, 59 insertions(+), 42 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index b25c15b..abae72d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
+/node_modules
+/vendor
+/composer.lock
 *~
diff --git a/Gruntfile.js b/Gruntfile.js
index 6ad5e33..dbe381d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -3,7 +3,6 @@
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
-   grunt.loadNpmTasks( 'grunt-jscs' );
 
grunt.initConfig( {
jshint: {
@@ -26,6 +25,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'test', [ 'jshint', 'jsonlint', /* 'banana' */ ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/NamespacePopups.hooks.php b/NamespacePopups.hooks.php
index 71c76b2..b152a80 100644
--- a/NamespacePopups.hooks.php
+++ b/NamespacePopups.hooks.php
@@ -4,68 +4,84 @@
 
 class NamespacePopupsHooks {
public static function onHtmlPageLinkRendererEnd( $renderer, $target, 
$isKnown, &$text, &$attribs, &$ret ) {
-global $wgNamespacePopupsNamespaceMap, 
$wgNamespacePopupsAnchor;
+   global $wgNamespacePopupsNamespaceMap, $wgNamespacePopupsAnchor;
 
-if(!$wgNamespacePopupsNamespaceMap) return true;
+   if ( !$wgNamespacePopupsNamespaceMap ) {
+   return true;
+   }
 
-// It does not work with $target instanceof TitleValue (as in 
"search for this page title")
-// $linkNS = $target->getSubjectNsText();
+   // It does not work with $target instanceof TitleValue (as in 
"search for this page title")
+   // $linkNS = $target->getSubjectNsText();
global $wgContLang;
$linkNS = $wgContLang->getNsText( MWNamespace::getSubject( 
$target->getNamespace() ) );
 
-if(!$linkNS) $linkNS = ''; // needed?
+   if ( !$linkNS ) {
+   $linkNS = ''; // needed?
+   }
 
-$popupNS = isset($wgNamespacePopupsNamespaceMap[$linkNS]) ? 
$wgNamespacePopupsNamespaceMap[$linkNS] : null;
-if(!$popupNS) $popupNS = 
isset($wgNamespacePopupsNamespaceMap['*']) ? 
$wgNamespacePopupsNamespaceMap['*'] : null;
-if(!$popupNS) return true;
-if($popupNS === '*') $popupNS = $linkNS;
+   $popupNS = isset( $wgNamespacePopupsNamespaceMap[$linkNS] )
+   ? $wgNamespacePopupsNamespaceMap[$linkNS] : null;
+   if ( !$popupNS ) {
+   $popupNS = isset( $wgNamespacePopupsNamespaceMap['*'] )
+   ? $wgNamespacePopupsNamespaceMap['*'] : null;
+   }
+   if ( !$popupNS ) {
+   return true;
+   }
+   if ( $popupNS === '*' ) {
+   $popupNS = $linkNS;
+   }
 
$remains = $target->getDBkey();
-$anchor = $wgNamespacePopupsAnchor ? $wgNamespacePopupsAnchor 
: '';
-$page = $popupNS === '' ? $remains : "$popupNS:$remains";
+   $anchor = $wgNamespacePopupsAnchor ? $wgNamespacePopupsAnchor : 
'';
+   $page = $popupNS === '' ? $remains : "$popupNS:$remains";
$title = Title::newFromText( $page );
-   if(!$title) return true;
-$url = $title->getLocalUrl();
+   if( !$title ) {
+   return true;
+   }
+   $url = $title->getLocalUrl();
 
$html = HtmlArmor::getHtml( $text );
$html = Html::rawElement( 'a', $attribs, $html );
if ( $title->isKnown() ) {
-$html .= Html::rawElement( 'a', [ 'class' => 
'mw-pagepopup', 'href' =>

[MediaWiki-commits] [Gerrit] operations/dns[master]: DNS: Add mgmt and prodcution DNS entres for mw2251-mw2260 Fi...

2017-01-12 Thread Papaul (Code Review)

Papaul has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331903 )

Change subject: DNS: Add mgmt and prodcution DNS entres for mw2251-mw2260 Fix: 
Putting server in alphabetical order Bug:T155180
..

DNS: Add mgmt and prodcution DNS entres for mw2251-mw2260
Fix: Putting server in alphabetical order
Bug:T155180

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/03/331903/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index b63dc2b..daaf27b 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2593,6 +2593,9 @@
 77  1H IN PTR   elastic2025.codfw.wmnet.
 78  1H IN PTR   elastic2026.codfw.wmnet.
 79  1H IN PTR   elastic2027.codfw.wmnet.
+80  1H IN PTR   mw2251.codfw.wmnet.
+81  1H IN PTR   mw2252.codfw.wmnet.
+82  1H IN PTR   mw2253.codfw.wmnet.
 
 119 1H IN PTR   rdb2001.codfw.wmnet.
 120 1H IN PTR   rdb2002.codfw.wmnet.
@@ -3014,6 +3017,13 @@
 156 1H IN PTR   elastic2031.codfw.wmnet.
 157 1H IN PTR   elastic2032.codfw.wmnet.
 158 1H IN PTR   elastic2033.codfw.wmnet.
+159 1H IN PTR   mw2254.codfw.wmnet.
+160 1H IN PTR   mw2255.codfw.wmnet.
+161 1H IN PTR   mw2256.codfw.wmnet.
+162 1H IN PTR   mw2257.codfw.wmnet.
+163 1H IN PTR   mw2258.codfw.wmnet.
+164 1H IN PTR   mw2259.codfw.wmnet.
+165 1H IN PTR   mw2260.codfw.wmnet.
 
 $ORIGIN 33.192.{{ zonename }}.
 1   1H IN PTR   vl2019-eth2.lvs2001.codfw.wmnet.
@@ -3582,7 +3592,18 @@
 237 1H IN PTR  es2003.mgmt.codfw.wmnet.
 237 1H IN PTR  wmf3627.mgmt.codfw.wmnet.
 238 1H IN PTR  es2004.mgmt.codfw.wmnet.
-
+239 1H IN PTR  mw2251.mgmt.codfw.wmnet.
+239 1H IN PTR  wmf6480.mgmt.codfw.wmnet.
+240 1H IN PTR  mw2252.mgmt.codfw.wmnet.
+240 1H IN PTR  wmf6481.mgmt.codfw.wmnet.
+241 1H IN PTR  mw2253.mgmt.codfw.wmnet.
+241 1H IN PTR  wmf6482.mgmt.codfw.wmnet.
+242 1H IN PTR  mw2254.mgmt.codfw.wmnet.
+242 1H IN PTR  wmf6483.mgmt.codfw.wmnet.
+243 1H IN PTR  mw2255.mgmt.codfw.wmnet.
+243 1H IN PTR  wmf6484.mgmt.codfw.wmnet.
+244 1H IN PTR  mw2256.mgmt.codfw.wmnet.
+244 1H IN PTR  wmf6485.mgmt.codfw.wmnet.
 245 1H IN PTR  ms-be2013.mgmt.codfw.wmnet.
 245 1H IN PTR  wmf6138.mgmt.codfw.wmnet.
 246 1H IN PTR  ms-be2014.mgmt.codfw.wmnet.
@@ -4138,7 +4159,14 @@
 10  1H IN PTR  wmf6417.mgmt.codfw.wmnet.
 11  1H IN PTR  maps2004.mgmt.codfw.wmnet.
 11  1H IN PTR  wmf6418.mgmt.codfw.wmnet.
-
+12  1H IN PTR  mw2257.mgmt.codfw.wmnet.
+12  1H IN PTR  wmf6486.mgmt.codfw.wmnet.
+13  1H IN PTR  mw2258.mgmt.codfw.wmnet.
+13  1H IN PTR  wmf6487.mgmt.codfw.wmnet.
+14  1H IN PTR  mw2259.mgmt.codfw.wmnet.
+14  1H IN PTR  wmf6488.mgmt.codfw.wmnet.
+15  1H IN PTR  mw2260.mgmt.codfw.wmnet.
+15  1H IN PTR  wmf6489.mgmt.codfw.wmnet.
 
 ; 10.195.0.0/25 - frack.codfw subnets
 $ORIGIN 0.195.{{ zonename }}.
diff --git a/templates/wmnet b/templates/wmnet
index 3c4731c..eb4504f 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2502,45 +2502,6 @@
 ms-fe2006   1H  IN A10.192.16.190
 ms-fe2007   1H  IN A10.192.32.155
 ms-fe2008   1H  IN A10.192.48.72
-
-mw2215  1H  IN A10.192.0.40
-mw2216  1H  IN A10.192.0.41
-mw2217  1H  IN A10.192.0.42
-mw2218  1H  IN A10.192.0.43
-mw2219  1H  IN A10.192.0.44
-mw2220  1H  IN A10.192.0.45
-mw2221  1H  IN A10.192.0.46
-mw  1H  IN A10.192.0.47
-mw2223  1H  IN A10.192.0.48
-mw2224  1H  IN A10.192.0.49
-mw2225  1H  IN A10.192.0.50
-mw2226  1H  IN A10.192.0.51
-mw2227  1H  IN A10.192.0.52
-mw2228  1H  IN A10.192.0.53
-mw2229  1H  IN A10.192.0.54
-mw2230  1H  IN A10.192.0.55
-mw2017  1H  IN A10.192.0.56
-mw2231  1H  IN A10.192.0.57
-mw2232  1H  IN A10.192.0.58
-mw2233  1H  IN A10.192.0.59
-mw2234  1H  IN A10.192.0.60
-mw2235  1H  IN A10.192.0.61
-mw2236  1H  IN A10.192.0.62
-mw2237  1H  IN A10.192.0.63
-mw2238  1H  IN A10.192.0.64
-mw2239  1H  IN A10.192.0.65
-mw2240  1H  IN A10.192.0.66
-mw2241  1H  IN A10.192.0.67
-mw2242  1H  IN A10.192.0.68
-mw2243  1H  IN A10.192.0.69
-mw2244  1H  IN A10.192.0.70
-mw2245  1H  IN A10.192.0.71
-mw2246  1H  IN A10.192.0.72
-mw2247  1H  IN A10.192.0.73
-mw2248  1H  IN A10.192.0.74
-mw2249  1H  IN A10.192.0.75
-mw2250  1H  IN A10.192.0.76
-
 mw2075  1H  IN A10.192.0.114
 mw2076  1H  IN A10.192.0.115
 mw2077  1H  IN A10.192.0.116
@@ -2681,6 +2642,53 @@
 mw2212  1H  IN A10.192.32.100
 mw2213  1H  IN A10.192.32.101

[MediaWiki-commits] [Gerrit] mediawiki...PagePopups[master]: Remove non-exist descriptionmsg key

2017-01-12 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331902 )

Change subject: Remove non-exist descriptionmsg key
..

Remove non-exist descriptionmsg key

There are no message files at all

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


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

diff --git a/extension.json b/extension.json
index 9c12553..34ea04e 100644
--- a/extension.json
+++ b/extension.json
@@ -5,7 +5,6 @@
"Victor Porton"
],
"url": "https://www.mediawiki.org/wiki/Extension:PagePopups;,
-   "descriptionmsg": "pagepopups-desc",
"license-name": "GPL-2.0+",
"type": "other",
"AutoloadClasses": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fdaa2f809176336971974095fabe9ce9b5ff5c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PagePopups
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...NamespacePopups[master]: Remove non-exist descriptionmsg key

2017-01-12 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331901 )

Change subject: Remove non-exist descriptionmsg key
..

Remove non-exist descriptionmsg key

There are no message files at all

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


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

diff --git a/extension.json b/extension.json
index 4829755..f54bc92 100644
--- a/extension.json
+++ b/extension.json
@@ -5,7 +5,6 @@
"Victor Porton"
],
"url": "https://www.mediawiki.org/wiki/Extension:NamespacePopups;,
-   "descriptionmsg": "namespacepopups-desc",
"license-name": "GPL-2.0+",
"type": "other",
"requires": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6532230b535516ac799a3ffd1526b4b00d383a66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NamespacePopups
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] labs...wikibugs2[master]: Add mediawiki/extensions/Babel to #wikimedia-dev for gerrit

2017-01-12 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331899 )

Change subject: Add mediawiki/extensions/Babel to #wikimedia-dev for gerrit
..

Add mediawiki/extensions/Babel to #wikimedia-dev

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a0718c3db1969b2ad129d0c39364a772e2bfee7
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
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...BlueSpiceExtensions[master]: Remove entry from AutoloadClasses

2017-01-12 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331900 )

Change subject: Remove entry from AutoloadClasses
..

Remove entry from AutoloadClasses

class BSFilePathResolver is not part of this repo

Change-Id: Iced54ce1998b7338079d257dafe0566bbcbcc04b
---
M UEModulePDF/extension.json
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/UEModulePDF/extension.json b/UEModulePDF/extension.json
index cca600d..6d1dd6e 100644
--- a/UEModulePDF/extension.json
+++ b/UEModulePDF/extension.json
@@ -22,8 +22,7 @@
"BsPDFTemplateProvider": 
"includes/PDFTemplateProvider.class.php",
"BsPDFWebService": "includes/PDFWebService.class.php",
"BsPDFServlet": "includes/PDFServlet.class.php",
-   "BsExportModulePDF": "includes/ExportModulePDF.class.php",
-   "BSFilePathResolver": "includes/BSFilePathResolver.php"
+   "BsExportModulePDF": "includes/ExportModulePDF.class.php"
},
"Hooks": {
"LoadExtensionSchemaUpdates": "UEModulePDF::getSchemaUpdates"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iced54ce1998b7338079d257dafe0566bbcbcc04b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...wikihiero[master]: Remove entry from ExtensionMessagesFiles

2017-01-12 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331898 )

Change subject: Remove entry from ExtensionMessagesFiles
..

Remove entry from ExtensionMessagesFiles

wikihiero.i18n.php is not part of this repo

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


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

diff --git a/extension.json b/extension.json
index b793317..509e4a8 100644
--- a/extension.json
+++ b/extension.json
@@ -20,7 +20,6 @@
]
},
"ExtensionMessagesFiles": {
-   "Wikihiero": "wikihiero.i18n.php",
"HieroglyphsAlias": "wikihiero.alias.php"
},
"AutoloadClasses": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaef9d98f9b6f589dc460de894acc0dd962b65d0b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/wikihiero
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...Patroller[master]: Remove entry from ExtensionMessagesFiles

2017-01-12 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331897 )

Change subject: Remove entry from ExtensionMessagesFiles
..

Remove entry from ExtensionMessagesFiles

Patroller.i18n.php is not part of this repo

Change-Id: If7897a50ee982e50cf12be0c80870406eb65
---
M extension.json
1 file changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/extension.json b/extension.json
index 26b4471..6bb1270 100644
--- a/extension.json
+++ b/extension.json
@@ -25,9 +25,6 @@
"i18n"
]
},
-   "ExtensionMessagesFiles": {
-   "Patroller": "Patroller.i18n.php"
-   },
"AutoloadClasses": {
"PatrollerHooks": "Patroller.hooks.php",
"SpecialPatroller": "SpecialPatroller.php"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7897a50ee982e50cf12be0c80870406eb65
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Patroller
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...HierarchyBuilder[master]: Remove entry from ExtensionMessagesFiles

2017-01-12 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331896 )

Change subject: Remove entry from ExtensionMessagesFiles
..

Remove entry from ExtensionMessagesFiles

HierarchyBuilder.i18n.php is not part of this repo

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/HierarchyBuilder 
refs/changes/96/331896/1

diff --git a/extension.json b/extension.json
index 7daca60..d70e54e 100644
--- a/extension.json
+++ b/extension.json
@@ -14,7 +14,6 @@
]
},
"ExtensionMessagesFiles": {
-   "HierarchyBuilder": "HierarchyBuilder.i18n.php",
"HierarchyBuilderMagic": "HierarchyBuilder.i18n.magic.php"
},
"AutoloadClasses": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0137418bcd12928726b997da6a34cd74092351d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/HierarchyBuilder
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
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 HD logos for several projects

2017-01-12 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331846 )

Change subject: Add HD logos for several projects
..


Add HD logos for several projects

Bug: T150618
Change-Id: I2e27071cb24e2bc970dbfba3376c401aa50f5037
---
A static/images/project-logos/napwiki-1.5x.png
A static/images/project-logos/napwiki-2x.png
A static/images/project-logos/oswiki-1.5x.png
A static/images/project-logos/oswiki-2x.png
A static/images/project-logos/pawiki-1.5x.png
A static/images/project-logos/pawiki-2x.png
A static/images/project-logos/plwiki-1.5x.png
A static/images/project-logos/plwiki-2x.png
A static/images/project-logos/ptwiki-1.5x.png
A static/images/project-logos/ptwiki-2x.png
M wmf-config/InitialiseSettings.php
11 files changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/static/images/project-logos/napwiki-1.5x.png 
b/static/images/project-logos/napwiki-1.5x.png
new file mode 100644
index 000..8d44096
--- /dev/null
+++ b/static/images/project-logos/napwiki-1.5x.png
Binary files differ
diff --git a/static/images/project-logos/napwiki-2x.png 
b/static/images/project-logos/napwiki-2x.png
new file mode 100644
index 000..683f71b
--- /dev/null
+++ b/static/images/project-logos/napwiki-2x.png
Binary files differ
diff --git a/static/images/project-logos/oswiki-1.5x.png 
b/static/images/project-logos/oswiki-1.5x.png
new file mode 100644
index 000..da1cbcc
--- /dev/null
+++ b/static/images/project-logos/oswiki-1.5x.png
Binary files differ
diff --git a/static/images/project-logos/oswiki-2x.png 
b/static/images/project-logos/oswiki-2x.png
new file mode 100644
index 000..2ca427a
--- /dev/null
+++ b/static/images/project-logos/oswiki-2x.png
Binary files differ
diff --git a/static/images/project-logos/pawiki-1.5x.png 
b/static/images/project-logos/pawiki-1.5x.png
new file mode 100644
index 000..eb2a016
--- /dev/null
+++ b/static/images/project-logos/pawiki-1.5x.png
Binary files differ
diff --git a/static/images/project-logos/pawiki-2x.png 
b/static/images/project-logos/pawiki-2x.png
new file mode 100644
index 000..3fd8bb8
--- /dev/null
+++ b/static/images/project-logos/pawiki-2x.png
Binary files differ
diff --git a/static/images/project-logos/plwiki-1.5x.png 
b/static/images/project-logos/plwiki-1.5x.png
new file mode 100644
index 000..f0e0b8f
--- /dev/null
+++ b/static/images/project-logos/plwiki-1.5x.png
Binary files differ
diff --git a/static/images/project-logos/plwiki-2x.png 
b/static/images/project-logos/plwiki-2x.png
new file mode 100644
index 000..f0e45d6
--- /dev/null
+++ b/static/images/project-logos/plwiki-2x.png
Binary files differ
diff --git a/static/images/project-logos/ptwiki-1.5x.png 
b/static/images/project-logos/ptwiki-1.5x.png
new file mode 100644
index 000..a0a5035
--- /dev/null
+++ b/static/images/project-logos/ptwiki-1.5x.png
Binary files differ
diff --git a/static/images/project-logos/ptwiki-2x.png 
b/static/images/project-logos/ptwiki-2x.png
new file mode 100644
index 000..bd14ad8
--- /dev/null
+++ b/static/images/project-logos/ptwiki-2x.png
Binary files differ
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index cb10374..409e7da 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -1181,11 +1181,14 @@
'ladwiki' => [ '1.5x' => 
'/static/images/project-logos/ladwiki-1.5x.png', '2x' => 
'/static/images/project-logos/ladwiki-2x.png' ], // T132120
'maiwiki' => [ '1.5x' => 
'/static/images/project-logos/maiwiki-1.5x.png', '2x' => 
'/static/images/project-logos/maiwiki-2x.png' ], // T149790
'mswiki' => [ '1.5x' => '/static/images/project-logos/mswiki-1.5x.png', 
'2x' => '/static/images/project-logos/mswiki-2x.png' ],
+   'napwiki' => [ '1.5x' => 
'/static/images/project-logos/mapwiki-1.5x.png', '2x' => 
'/static/images/project-logos/napwiki-2x.png' ], // T150618
'newiki' => [ '1.5x' => '/static/images/project-logos/newiki-1.5x.png', 
'2x' => '/static/images/project-logos/newiki-2x.png' ],// T139240
'nlwiki' => [ '1.5x' => '/static/images/project-logos/nlwiki-1.5x.png', 
'2x' => '/static/images/project-logos/nlwiki-2x.png' ],
'olowiki' => ['1.5x' => 
'/static/images/project-logos/olowiki-1.5x.png', '2x' => 
'/static/images/project-logos/olowiki-1.5x.png'], // T146745
+   'oswiki' => [ '1.5x' => '/static/images/project-logos/oswiki-1.5x.png', 
'2x' => '/static/images/project-logos/oswiki-2x.png' ], // T150618
'pawiki' => [ '1.5x' => '/static/images/project-logos/pawiki-1.5x.png', 
'2x' => '/static/images/project-logos/pawiki-2x.png'], // T150618 
'pcdwiki' => [ '1.5x' => 
'/static/images/project-logos/pcdwiki-1.5x.png', '2x' => 
'/static/images/project-logos/pcdwiki-2x.png' ], // T150618
+   'plwiki' => [ '1.5x' =>

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix two typos

2017-01-12 Thread DatGuy (Code Review)

DatGuy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/331895 )

Change subject: Fix two typos
..

Fix two typos

Changed evaluting > evaluating and catgeories > categories.

Bug: T155135
Change-Id: Ieeaaf76b2fb762810a85ec10e82381f70067884e
---
M includes/api/i18n/en.json
M languages/i18n/en.json
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/95/331895/1

diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 8ac11d0..cb00581 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -820,7 +820,7 @@
"apihelp-query+imageinfo-param-extmetadatamultilang": "If translations 
for extmetadata property are available, fetch all of them.",
"apihelp-query+imageinfo-param-extmetadatafilter": "If specified and 
non-empty, only these keys will be returned for $1prop=extmetadata.",
"apihelp-query+imageinfo-param-urlparam": "A handler specific parameter 
string. For example, PDFs might use page15-100px. 
$1urlwidth must be used and be consistent with 
$1urlparam.",
-   "apihelp-query+imageinfo-param-badfilecontexttitle": "If 
$2prop=badfile is set, this is the page title used when evaluting 
the [[MediaWiki:Bad image list]]",
+   "apihelp-query+imageinfo-param-badfilecontexttitle": "If 
$2prop=badfile is set, this is the page title used when evaluating 
the [[MediaWiki:Bad image list]]",
"apihelp-query+imageinfo-param-localonly": "Look only for files in the 
local repository.",
"apihelp-query+imageinfo-example-simple": "Fetch information about the 
current version of [[:File:Albert Einstein Head.jpg]].",
"apihelp-query+imageinfo-example-dated": "Fetch information about 
versions of [[:File:Test.jpg]] from 2008 and later.",
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 671dce7..1e37d40 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1814,7 +1814,7 @@
"uncategorizedimages-summary": "",
"uncategorizedtemplates": "Uncategorized templates",
"uncategorizedtemplates-summary": "",
-   "uncategorized-categories-exceptionlist": " # Contains a list of 
catgeories, which shouldn't be mentioned on Special:UncategorizedCategories. 
One per line, starting with \"*\". Lines starting with another character 
(including whitespaces) are ignored. Use \"#\" for comments.",
+   "uncategorized-categories-exceptionlist": " # Contains a list of 
categories, which shouldn't be mentioned on Special:UncategorizedCategories. 
One per line, starting with \"*\". Lines starting with another character 
(including whitespaces) are ignored. Use \"#\" for comments.",
"unusedcategories": "Unused categories",
"unusedcategories-summary": "",
"unusedimages": "Unused files",

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

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

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

1 2 >

1 - 100 of 196 matches

Mail list logo