[MediaWiki-commits] [Gerrit] Refactor translate sandbox manage code - change (mediawiki...Translate)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87316
Change subject: Refactor translate sandbox manage code
..
Refactor translate sandbox manage code
Change-Id: Ia1024c47ade68329dd0f8079b592558fbf297d2b
---
M resources/js/ext.translate.special.translatesandbox.js
M specials/SpecialTranslateSandbox.php
2 files changed, 62 insertions(+), 59 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/16/87316/1
diff --git a/resources/js/ext.translate.special.translatesandbox.js
b/resources/js/ext.translate.special.translatesandbox.js
index 18ee73a..927ef4a 100644
--- a/resources/js/ext.translate.special.translatesandbox.js
+++ b/resources/js/ext.translate.special.translatesandbox.js
@@ -108,56 +108,58 @@
} );
}
+ function loadRequestDetails ( request ) {
+
+ var $detailsPane = $( '.details.pane' );
+
+ $detailsPane.empty().append(
+ $( 'div' )
+ .addClass( 'username row' )
+ .text( request.username ),
+ $( 'div' )
+ .addClass( 'email row' )
+ .text( request.email ),
+ $( 'div' )
+ .addClass( 'languages row' )
+ .append(
+ $( 'span' ).text( 'Afrikaans' ),
+ $( 'span' ).text( 'español' )
+ ),
+ $( 'div' )
+ .addClass( 'actions row' )
+ .append(
+ $( 'button' )
+ .addClass( 'accept primary
green button' )
+ .text( 'Accept' )
+ .on( 'click', function () {
+ doApiAction( {
+ userid:
request.userid,
+ 'do': 'promote'
+ } );
+ } ),
+ $( 'button' )
+ .addClass( 'remind button' )
+ .text( 'Send email reminder' )
+ .on( 'click', function () {
+ reminderDialog( request
);
+ } ),
+ $( 'button' )
+ .addClass( 'delete destructive
button' )
+ .text( 'Reject' )
+ .on( 'click', function () {
+ doApiAction( {
+ userid:
request.userid,
+ 'do': 'delete'
+ } );
+ } )
+ )
+ );
+ }
+
+
$( document ).ready( function () {
- var $requests, $detailsPane;
-
- $detailsPane = $( '.details.pane' );
- $requests = $( '.requests .request' );
- $requests.on( 'click', function () {
- var $this = $( this );
-
- $detailsPane.empty().append(
- $( 'div' )
- .addClass( 'username row' )
- .text( $this.find( '.username' ).text()
),
- $( 'div' )
- .addClass( 'email row' )
- .text( $this.find( '.email' ).text() ),
- $( 'div' )
- .addClass( 'languages row' )
- .append(
- $( 'span' ).text( 'Afrikaans'
),
- $( 'span' ).text( 'español' )
- ),
- $( 'div' )
- .addClass( 'actions row' )
- .append(
- $( 'button' )
- .addClass( 'accept
primary button' )
-
[MediaWiki-commits] [Gerrit] Removed more FORCE INDEX clauses for logging - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Removed more FORCE INDEX clauses for logging
..
Removed more FORCE INDEX clauses for logging
* Same reasons as 7003a7c5e825f391c1a83f8e46cdf332a228d874
bug: 54876
Change-Id: I743bd21e81395c2866b4241730caa8c5990cc73f
---
M includes/logging/LogPager.php
1 file changed, 0 insertions(+), 7 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/logging/LogPager.php b/includes/logging/LogPager.php
index f8403ca..09ae3b8 100644
--- a/includes/logging/LogPager.php
+++ b/includes/logging/LogPager.php
@@ -249,13 +249,6 @@
# no duplicate log rows. Otherwise, we need to
remove the duplicates.
$options[] = 'DISTINCT';
}
- # Avoid usage of the wrong index by limiting
- # the choices of available indexes. This mainly
- # avoids site-breaking filesorts.
- } elseif ( $this-title || $this-pattern || $this-performer )
{
- $index['logging'] = array( 'page_time', 'user_time',
'log_user_type_time' );
- } elseif ( count( $this-types ) == 1 ) {
- $index['logging'] = 'type_time'; // @TODO: sucks for
change tags
}
if ( count( $index ) ) {
$options['USE INDEX'] = $index;
--
To view, visit https://gerrit.wikimedia.org/r/87168
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I743bd21e81395c2866b4241730caa8c5990cc73f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use HPHP_VERSION constant to detect HipHop - change (mediawiki/core)
PleaseStand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87317
Change subject: Use HPHP_VERSION constant to detect HipHop
..
Use HPHP_VERSION constant to detect HipHop
Follows-up Ic3e769f1fbad4f7ad26dd819406796fee48c6b45.
Change-Id: I0210002c05efd79242b00592639b7be50a79020b
---
M includes/GlobalFunctions.php
M maintenance/Maintenance.php
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/17/87317/1
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 318b151..b11bce9b 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2459,7 +2459,7 @@
* @return Bool
*/
function wfIsHipHop() {
- return function_exists( 'hphp_thread_set_warmup_enabled' );
+ return defined( 'HPHP_VERSION' );
}
/**
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 0023c6d..1712b24 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -485,7 +485,7 @@
}
# Make sure we can handle script parameters
- if ( !function_exists( 'hphp_thread_set_warmup_enabled' )
!ini_get( 'register_argc_argv' ) ) {
+ if ( !defined( 'HPHP_VERSION' ) !ini_get(
'register_argc_argv' ) ) {
$this-error( 'Cannot get command line arguments,
register_argc_argv is set to false', true );
}
--
To view, visit https://gerrit.wikimedia.org/r/87317
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0210002c05efd79242b00592639b7be50a79020b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand pleasest...@live.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable $wmgBug54847 for default private, but gate also on ... - change (operations/mediawiki-config)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87318
Change subject: Enable $wmgBug54847 for default private, but gate also on
$wmgUseCentralAuth
..
Enable $wmgBug54847 for default private, but gate also on $wmgUseCentralAuth
Change-Id: Ice503ff04baafd4ec8a7c900d6ad584ca196d10a
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/18/87318/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 3d5b7e3..0ca9b6b 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2700,7 +2700,7 @@
}
// Bug 54847
-if ( $wmgBug54847 ) {
+if ( $wmgBug54847 $wmgUseCentralAuth ) {
require( $wmfConfigDir/Bug54847.php );
}
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 005a554..7aea4fa 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12739,9 +12739,8 @@
),
'wmgBug54847' = array(
- 'default' = false,
- 'testwiki' = true,
- 'test2wiki' = true,
+ 'default' = true,
+ 'private' = false,
),
);
--
To view, visit https://gerrit.wikimedia.org/r/87318
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice503ff04baafd4ec8a7c900d6ad584ca196d10a
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not show password reset interface unless password is correct - change (operations/mediawiki-config)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87319
Change subject: Do not show password reset interface unless password is correct
..
Do not show password reset interface unless password is correct
Change-Id: I91cd92ab4511fee877fdfd5f5510bf4cf1c1dc4f
---
M wmf-config/Bug54847.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/19/87319/1
diff --git a/wmf-config/Bug54847.php b/wmf-config/Bug54847.php
index 5ee4c7b..ebf0e14 100644
--- a/wmf-config/Bug54847.php
+++ b/wmf-config/Bug54847.php
@@ -131,7 +131,7 @@
$wgHooks[ 'AbortLogin' ][] = function ( User $user, $password, $retval, $msg
) {
global $wgOut, $egBug54847;
- if ( empty( $egBug54847 ) efUserIsAffected( $user ) ) {
+ if ( empty( $egBug54847 ) $user-checkPassword( $password )
efUserIsAffected( $user ) ) {
wfDebugLog( Bug54847, Aborting login until they reset
password: . $user-getName() );
$msg = 'word-separator';
$wgOut-addWikiText( wfMessage(
'bug-54847-password-reset-prompt' )-text() );
--
To view, visit https://gerrit.wikimedia.org/r/87319
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I91cd92ab4511fee877fdfd5f5510bf4cf1c1dc4f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Maintenance: detect missing parent::__construct() - change (mediawiki/core)
PleaseStand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87320
Change subject: Maintenance: detect missing parent::__construct()
..
Maintenance: detect missing parent::__construct()
The first time I forgot to include that line in a maintenance script,
I spent a few minutes debugging Notice: Undefined variable: IP.
Hopefully, this change will save someone else a few minutes of his
or her own time.
Change-Id: Icd26a5dc59e25d2bcc6da9bf0a2f6e95d494e5a6
---
M maintenance/Maintenance.php
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/20/87320/1
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 1712b24..30e93c9 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -477,13 +477,18 @@
* Do some sanity checking and basic setup
*/
public function setup() {
- global $wgCommandLineMode, $wgRequestTime;
+ global $IP, $wgCommandLineMode, $wgRequestTime;
# Abort if called from a web server
if ( isset( $_SERVER ) isset( $_SERVER['REQUEST_METHOD'] ) )
{
$this-error( 'This script must be run from the command
line', true );
}
+ if ( $IP === null ) {
+ $this-error( \$IP not set, aborting!\n .
+ '(Did you forget to call parent::__construct()
in your maintenance script?)', 1 );
+ }
+
# Make sure we can handle script parameters
if ( !defined( 'HPHP_VERSION' ) !ini_get(
'register_argc_argv' ) ) {
$this-error( 'Cannot get command line arguments,
register_argc_argv is set to false', true );
--
To view, visit https://gerrit.wikimedia.org/r/87320
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd26a5dc59e25d2bcc6da9bf0a2f6e95d494e5a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand pleasest...@live.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] renamed $wgHideOpenIDLoginLink to $wgOpenHideOpenIDLoginLink... - change (mediawiki...OpenID)
Wikinaut has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87321
Change subject: renamed $wgHideOpenIDLoginLink to $wgOpenHideOpenIDLoginLink
(harmonizing names)
..
renamed $wgHideOpenIDLoginLink to $wgOpenHideOpenIDLoginLink (harmonizing names)
Bug 54506: $wgHideOpenIDLoginLink was not completely renamed to
$wgOpenIDHideOpenIDLoginLink
Change-Id: I4dde628a18169e2430bc9b22adb8071075fd1ba6
---
M CHANGES
M OpenID.hooks.php
M OpenID.php
M README
4 files changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenID
refs/changes/21/87321/3
diff --git a/CHANGES b/CHANGES
index 0c8e51c..71d968a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
CHANGES
===
+3.41 20131003 bug 54506: $wgHideOpenIDLoginLink was not completely renamed to
+$wgOpenIDHideOpenIDLoginLink
3.40 20130821 bug 47151 Special:OpenIDConvert can be used even when forcing
an
openid provider
bug 44819 introduction of array of $wgOpenIDProviders and
diff --git a/OpenID.hooks.php b/OpenID.hooks.php
index 7eca34b..d84c434 100644
--- a/OpenID.hooks.php
+++ b/OpenID.hooks.php
@@ -84,9 +84,9 @@
* @return bool
*/
public static function onPersonalUrls( $personal_urls, $title ) {
- global $wgHideOpenIDLoginLink, $wgUser, $wgOpenIDLoginOnly;
+ global $wgOpenIDHideOpenIDLoginLink, $wgUser,
$wgOpenIDLoginOnly;
- if ( !$wgHideOpenIDLoginLink $wgUser-getID() == 0 ) {
+ if ( !$wgOpenIDHideOpenIDLoginLink $wgUser-getID() == 0 ) {
$sk = $wgUser-getSkin();
$returnto = $title-isSpecial( 'Userlogout' ) ? '' : (
'returnto=' . $title-getPrefixedURL() );
@@ -115,10 +115,10 @@
* @return bool
*/
public static function onBeforePageDisplay( $out, $sk ) {
- global $wgHideOpenIDLoginLink, $wgUser;
+ global $wgOpenIDHideOpenIDLoginLink, $wgUser;
# We need to do this *before* PersonalUrls is called
- if ( !$wgHideOpenIDLoginLink $wgUser-getID() == 0 ) {
+ if ( !$wgOpenIDHideOpenIDLoginLink $wgUser-getID() == 0 ) {
$out-addHeadItem( 'openid-loginstyle',
self::loginStyle() );
}
diff --git a/OpenID.php b/OpenID.php
index 50407e1..f850090 100644
--- a/OpenID.php
+++ b/OpenID.php
@@ -29,7 +29,7 @@
exit( 1 );
}
-define( 'MEDIAWIKI_OPENID_VERSION', '3.40 20130821' );
+define( 'MEDIAWIKI_OPENID_VERSION', '3.41 20131003' );
$path = dirname( __FILE__ );
set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR .
get_include_path() );
diff --git a/README b/README
index 64119e8..6519555 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
MediaWiki OpenID extension README
-version 3.40 20130811
+version 3.41 20131003
Homepage and manual
http://www.mediawiki.org/wiki/Extension:OpenID
--
To view, visit https://gerrit.wikimedia.org/r/87321
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4dde628a18169e2430bc9b22adb8071075fd1ba6
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/OpenID
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] renamed $wgHideOpenIDLoginLink to $wgOpenHideOpenIDLoginLink... - change (mediawiki...OpenID)
Wikinaut has submitted this change and it was merged.
Change subject: renamed $wgHideOpenIDLoginLink to $wgOpenHideOpenIDLoginLink
(harmonizing names)
..
renamed $wgHideOpenIDLoginLink to $wgOpenHideOpenIDLoginLink (harmonizing names)
Bug 54506: $wgHideOpenIDLoginLink was not completely renamed to
$wgOpenIDHideOpenIDLoginLink
Change-Id: I4dde628a18169e2430bc9b22adb8071075fd1ba6
---
M CHANGES
M OpenID.hooks.php
M OpenID.php
M README
4 files changed, 8 insertions(+), 6 deletions(-)
Approvals:
Wikinaut: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/CHANGES b/CHANGES
index 0c8e51c..71d968a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
CHANGES
===
+3.41 20131003 bug 54506: $wgHideOpenIDLoginLink was not completely renamed to
+$wgOpenIDHideOpenIDLoginLink
3.40 20130821 bug 47151 Special:OpenIDConvert can be used even when forcing
an
openid provider
bug 44819 introduction of array of $wgOpenIDProviders and
diff --git a/OpenID.hooks.php b/OpenID.hooks.php
index 7eca34b..d84c434 100644
--- a/OpenID.hooks.php
+++ b/OpenID.hooks.php
@@ -84,9 +84,9 @@
* @return bool
*/
public static function onPersonalUrls( $personal_urls, $title ) {
- global $wgHideOpenIDLoginLink, $wgUser, $wgOpenIDLoginOnly;
+ global $wgOpenIDHideOpenIDLoginLink, $wgUser,
$wgOpenIDLoginOnly;
- if ( !$wgHideOpenIDLoginLink $wgUser-getID() == 0 ) {
+ if ( !$wgOpenIDHideOpenIDLoginLink $wgUser-getID() == 0 ) {
$sk = $wgUser-getSkin();
$returnto = $title-isSpecial( 'Userlogout' ) ? '' : (
'returnto=' . $title-getPrefixedURL() );
@@ -115,10 +115,10 @@
* @return bool
*/
public static function onBeforePageDisplay( $out, $sk ) {
- global $wgHideOpenIDLoginLink, $wgUser;
+ global $wgOpenIDHideOpenIDLoginLink, $wgUser;
# We need to do this *before* PersonalUrls is called
- if ( !$wgHideOpenIDLoginLink $wgUser-getID() == 0 ) {
+ if ( !$wgOpenIDHideOpenIDLoginLink $wgUser-getID() == 0 ) {
$out-addHeadItem( 'openid-loginstyle',
self::loginStyle() );
}
diff --git a/OpenID.php b/OpenID.php
index 50407e1..f850090 100644
--- a/OpenID.php
+++ b/OpenID.php
@@ -29,7 +29,7 @@
exit( 1 );
}
-define( 'MEDIAWIKI_OPENID_VERSION', '3.40 20130821' );
+define( 'MEDIAWIKI_OPENID_VERSION', '3.41 20131003' );
$path = dirname( __FILE__ );
set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR .
get_include_path() );
diff --git a/README b/README
index 64119e8..6519555 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
MediaWiki OpenID extension README
-version 3.40 20130811
+version 3.41 20131003
Homepage and manual
http://www.mediawiki.org/wiki/Extension:OpenID
--
To view, visit https://gerrit.wikimedia.org/r/87321
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4dde628a18169e2430bc9b22adb8071075fd1ba6
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/OpenID
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
Gerrit-Reviewer: Wikinaut m...@tgries.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added search and replace within selection functionality - change (mediawiki...WikiEditor)
Netbrain has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87322
Change subject: Added search and replace within selection functionality
..
Added search and replace within selection functionality
This enables users to first select some text in the textarea, and
click the checkbox labeled Search/replace within text selection
when searching / replacing text.
When this checkbox is checked, the text searched/replaced will a subset
of the original text determined by the user's text selection.
Change-Id: Id0060b03f080106520f7a28ea6411b4d60086392
---
M WikiEditor.i18n.php
M WikiEditor.php
M modules/jquery.wikiEditor.dialogs.config.js
3 files changed, 40 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor
refs/changes/22/87322/1
diff --git a/WikiEditor.i18n.php b/WikiEditor.i18n.php
index 0cd1f0b..980476b 100644
--- a/WikiEditor.i18n.php
+++ b/WikiEditor.i18n.php
@@ -173,6 +173,7 @@
'wikieditor-toolbar-tool-replace-search' = 'Search for:',
'wikieditor-toolbar-tool-replace-replace' = 'Replace with:',
'wikieditor-toolbar-tool-replace-case' = 'Match case',
+ 'wikieditor-toolbar-tool-replace-selection' = 'Search/replace within
text selection',
'wikieditor-toolbar-tool-replace-regex' = 'Treat search string as a
regular expression',
'wikieditor-toolbar-tool-replace-button-findnext' = 'Find next',
'wikieditor-toolbar-tool-replace-button-replace' = 'Replace',
@@ -460,6 +461,7 @@
'wikieditor-toolbar-tool-replace-search' = '{{Identical|Search}}',
'wikieditor-toolbar-tool-replace-case' = 'This could as well be
translated as case sensitive search -
case refers to character case, that is upper case, or lower case.',
+ 'wikieditor-toolbar-tool-replace-selection' = 'This could be
translated as search/replace using selection, giving the meaning that
search/replace should focus on a subset of the thext, specified by the text
selection.',
'wikieditor-toolbar-tool-replace-regex' = 'A regular expression is a
syntax to find strings based on patterns, for more see [[wikipedia:Regular
expression|the Wikipedia article]].
More notes:
diff --git a/WikiEditor.php b/WikiEditor.php
index 103c9eb..10eaa53 100644
--- a/WikiEditor.php
+++ b/WikiEditor.php
@@ -309,6 +309,7 @@
'wikieditor-toolbar-tool-replace-search',
'wikieditor-toolbar-tool-replace-replace',
'wikieditor-toolbar-tool-replace-case',
+ 'wikieditor-toolbar-tool-replace-selection',
'wikieditor-toolbar-tool-replace-regex',
'wikieditor-toolbar-tool-replace-button-findnext',
'wikieditor-toolbar-tool-replace-button-replace',
diff --git a/modules/jquery.wikiEditor.dialogs.config.js
b/modules/jquery.wikiEditor.dialogs.config.js
index 0d76916..f81baa2 100644
--- a/modules/jquery.wikiEditor.dialogs.config.js
+++ b/modules/jquery.wikiEditor.dialogs.config.js
@@ -1127,6 +1127,10 @@
input type=checkbox
id=wikieditor-toolbar-replace-case/\
label
for=wikieditor-toolbar-replace-case
rel=wikieditor-toolbar-tool-replace-case/label\
/div\
+ div
class=wikieditor-toolbar-field-wrapper\
+ input type=checkbox
id=wikieditor-toolbar-replace-selection/\
+ label
for=wikieditor-toolbar-replace-selection
rel=wikieditor-toolbar-tool-replace-selection/label\
+ /div\
div
class=wikieditor-toolbar-field-wrapper\
input type=checkbox
id=wikieditor-toolbar-replace-regex/\
label
for=wikieditor-toolbar-replace-regex
rel=wikieditor-toolbar-tool-replace-regex/label\
@@ -1180,9 +1184,22 @@
return;
}
- var $textarea = $(this).data(
'context' ).$textarea;
- var text =
$textarea.textSelection( 'getContents' );
- var match = false;
+
+var $textarea = $(this).data( 'context' ).$textarea;
+var text = $textarea.textSelection( 'getContents' );
+var selection = $(this).data( 'selection' );
+var searchStart,searchEnd;
+if ( $(
[MediaWiki-commits] [Gerrit] Introducing TranslationStash - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Introducing TranslationStash
..
Introducing TranslationStash
It's the place where sandboxed users can store their translations
before they are approved.
Also introduced whitelisting of write api modules. The list now
contains 'options' and 'translationstash'
Some minor unrelated changed due to sorting few lists and other
small cleanups.
Change-Id: I7c6b9747aa28fbc0e914e692f395f7afc64f4137
---
M Translate.php
M TranslateHooks.php
M _autoload.php
A api/ApiTranslationStash.php
A sql/translate_stash.sql
A stash/StashedTranslation.php
A stash/TranslationStashStorage.php
A tests/TranslationStashStorageTest.php
M utils/TranslateSandbox.php
9 files changed, 334 insertions(+), 21 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Translate.php b/Translate.php
index 2e88fd2..e6a47d2 100644
--- a/Translate.php
+++ b/Translate.php
@@ -94,20 +94,21 @@
$wgSpecialPages['TranslateSandbox'] = 'SpecialTranslateSandbox';
// API
+$wgAPIGeneratorModules['messagecollection'] = 'ApiQueryMessageCollection';
$wgAPIListModules['messagecollection'] = 'ApiQueryMessageCollection';
$wgAPIMetaModules['languagestats'] = 'ApiQueryLanguageStats';
$wgAPIMetaModules['messagegroups'] = 'ApiQueryMessageGroups';
$wgAPIMetaModules['messagegroupstats'] = 'ApiQueryMessageGroupStats';
$wgAPIMetaModules['messagetranslations'] = 'ApiQueryMessageTranslations';
-$wgAPIModules['translationreview'] = 'ApiTranslationReview';
-$wgAPIModules['groupreview'] = 'ApiGroupReview';
$wgAPIModules['aggregategroups'] = 'ApiAggregateGroups';
-$wgAPIModules['ttmserver'] = 'ApiTTMServer';
-$wgAPIModules['translateuser'] = 'ApiTranslateUser';
-$wgAPIModules['translationaids'] = 'ApiTranslationAids';
+$wgAPIModules['groupreview'] = 'ApiGroupReview';
$wgAPIModules['hardmessages'] = 'ApiHardMessages';
$wgAPIModules['translatesandbox'] = 'ApiTranslateSandbox';
-$wgAPIGeneratorModules['messagecollection'] = 'ApiQueryMessageCollection';
+$wgAPIModules['translateuser'] = 'ApiTranslateUser';
+$wgAPIModules['translationaids'] = 'ApiTranslationAids';
+$wgAPIModules['translationreview'] = 'ApiTranslationReview';
+$wgAPIModules['translationstash'] = 'ApiTranslationStash';
+$wgAPIModules['ttmserver'] = 'ApiTTMServer';
// Before MW 1.20
$wgHooks['APIQueryInfoTokens'][] = 'ApiTranslationReview::injectTokenFunction';
@@ -183,6 +184,7 @@
// Sandbox
$wgHooks['UserGetRights'][] = 'TranslateSandbox::enforcePermissions';
+$wgHooks['ApiCheckCanExecute'][] = 'TranslateSandbox::onApiCheckCanExecute';
// Internal event listeners
$wgHooks['TranslateEventTranslationEdit'][] = 'MessageGroupStats::clear';
diff --git a/TranslateHooks.php b/TranslateHooks.php
index 227a1dd..d15578e 100644
--- a/TranslateHooks.php
+++ b/TranslateHooks.php
@@ -200,10 +200,10 @@
/**
* Hook: LoadExtensionSchemaUpdates
-* @param $updater DatabaseUpdater
-* @return bool
+ * @param $updater DatabaseUpdater
+ * @return bool
*/
- public static function schemaUpdates( $updater ) {
+ public static function schemaUpdates( DatabaseUpdater $updater ) {
$dir = __DIR__ . '/sql';
$updater-addExtensionUpdate( array(
@@ -287,18 +287,24 @@
true
) );
+ $updater-addExtensionUpdate( array(
+ 'addTable',
+ 'translate_stash',
+ $dir/translate_stash.sql,
+ true
+ ) );
+
return true;
}
/**
* Hook: ParserTestTables
-* @param $tables array
-* @return bool
*/
- public static function parserTestTables( $tables ) {
+ public static function parserTestTables( array $tables ) {
$tables[] = 'revtag';
$tables[] = 'translate_groupstats';
$tables[] = 'translate_messageindex';
+ $tables[] = 'translate_stash';
return true;
}
diff --git a/_autoload.php b/_autoload.php
index bd836bc..8e8c290 100644
--- a/_autoload.php
+++ b/_autoload.php
@@ -196,18 +196,19 @@
*/
$wgAutoloadClasses['ApiAggregateGroups'] = $dir/api/ApiAggregateGroups.php;
$wgAutoloadClasses['ApiGroupReview'] = $dir/api/ApiGroupReview.php;
+$wgAutoloadClasses['ApiHardMessages'] = $dir/api/ApiHardMessages.php;
$wgAutoloadClasses['ApiQueryLanguageStats'] =
$dir/api/ApiQueryLanguageStats.php;
$wgAutoloadClasses['ApiQueryMessageCollection'] =
$dir/api/ApiQueryMessageCollection.php;
$wgAutoloadClasses['ApiQueryMessageGroupStats'] =
$dir/api/ApiQueryMessageGroupStats.php;
$wgAutoloadClasses['ApiQueryMessageGroups'] =
$dir/api/ApiQueryMessageGroups.php;
$wgAutoloadClasses['ApiQueryMessageTranslations'] =
$dir/api/ApiQueryMessageTranslations.php;
[MediaWiki-commits] [Gerrit] id changed for searchButton in master; also had bogus step - change (qa/browsertests)
Zfilipin has submitted this change and it was merged. Change subject: id changed for searchButton in master; also had bogus step .. id changed for searchButton in master; also had bogus step Change-Id: Id77fe9b9f9a2bfd1e2330ca27883bef863614176 --- M features/search.feature M features/support/pages/random_page.rb M features/support/pages/search_page.rb 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Manybubbles: Looks good to me, approved Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/features/search.feature b/features/search.feature index 63140c8..b5e2b8d 100644 --- a/features/search.feature +++ b/features/search.feature @@ -14,6 +14,6 @@ Then I should land on Search Results page Scenario: Search with accent yields result page with accent -Given I visit a random page +Given I am at random page When I search for África Then the page I arrive on has title África diff --git a/features/support/pages/random_page.rb b/features/support/pages/random_page.rb index fe0ebae..cc97b08 100644 --- a/features/support/pages/random_page.rb +++ b/features/support/pages/random_page.rb @@ -20,7 +20,7 @@ a(:print_export, text: 'Print/export') a(:printable_version, text: 'Printable version') li(:uls_malayalam_inscript2_item, data_ime_inputmethod: 'ml-inscript2') - button(:search_button, id: 'searchButton') + button(:search_button, id: 'mw-searchButton') text_field(:search_input, id: 'searchInput') a(:uls_trigger, class: 'uls-trigger') end diff --git a/features/support/pages/search_page.rb b/features/support/pages/search_page.rb index 2d1fd83..6a4fc4a 100644 --- a/features/support/pages/search_page.rb +++ b/features/support/pages/search_page.rb @@ -2,7 +2,7 @@ include PageObject div(:one_result, class: 'suggestions-result') - button(:search_button, id: 'searchButton') + button(:search_button, id: 'mw-searchButton') text_field(:search_input, id: 'searchInput') div(:search_results, class: 'suggestions-results') end -- To view, visit https://gerrit.wikimedia.org/r/87292 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id77fe9b9f9a2bfd1e2330ca27883bef863614176 Gerrit-PatchSet: 2 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] test: remove date from @author docs statements - change (mediawiki/core)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87323
Change subject: test: remove date from @author docs statements
..
test: remove date from @author docs statements
phpunit interprets '@author' documentation statements to generate group.
Appending the year to the author name created duplicates entry:
$ php phpunit.php --list-groups|grep Antoine
Antoine Musso
Antoine Musso, 2012
$
Removing the date fix the duplication.
Change-Id: I65b19adb59c4894314ce68a0c815c5d3e4c30df0
---
M tests/phpunit/structure/ResourcesTest.php
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/23/87323/1
diff --git a/tests/phpunit/structure/ResourcesTest.php
b/tests/phpunit/structure/ResourcesTest.php
index 3af805a..7dabcb2 100644
--- a/tests/phpunit/structure/ResourcesTest.php
+++ b/tests/phpunit/structure/ResourcesTest.php
@@ -3,10 +3,10 @@
* Sanity checks for making sure registered resources are sane.
*
* @file
- * @author Niklas Laxström, 2012
- * @author Antoine Musso, 2012
- * @author Santhosh Thottingal, 2012
- * @author Timo Tijhof, 2012
+ * @author Niklas Laxström
+ * @author Antoine Musso
+ * @author Santhosh Thottingal
+ * @author Timo Tijhof
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
*/
class ResourcesTest extends MediaWikiTestCase {
--
To view, visit https://gerrit.wikimedia.org/r/87323
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65b19adb59c4894314ce68a0c815c5d3e4c30df0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mw-run-phpunit.sh replace mw-phpunit-allexts macro - change (integration/jenkins)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/87324 Change subject: mw-run-phpunit.sh replace mw-phpunit-allexts macro .. mw-run-phpunit.sh replace mw-phpunit-allexts macro Let us more easily tweak all jobs by simply editing the shell scripts instead of having to refresh all dependant jobs. Change-Id: I7eb5d4d0ccbb6563a37e988a2b7ea34140dd2271 --- A bin/mw-run-phpunit.sh 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins refs/changes/24/87324/1 diff --git a/bin/mw-run-phpunit.sh b/bin/mw-run-phpunit.sh new file mode 100644 index 000..a041939 --- /dev/null +++ b/bin/mw-run-phpunit.sh @@ -0,0 +1,18 @@ +#!/bin/bash -xe +# This script used to be a Jenkins Job Builder macro 'mw-phpunit-allexts' +# +# References: +# bug: 42506 +# bug: 48147 +# Ib0fdffb97cdf237a49b43d7abaa81b81afe8c499 + +JUNIT_DEST=$WORKSPACE/junit-phpunit-allexts.xml + +# We have to move to the tests/phpunit directory where suite.xml is located or +# the relative paths referenced in that file will not get properly resolved by +# PHPUnit +# The Jenkins publishers are usually expecting the .xml file to be at the root +# of the workspace, so make sure we use an absolute path. +cd $WORKSPACE/tests/phpunit + +php phpunit.php --log-junit $JUNIT_DEST --testsuite extensions -- To view, visit https://gerrit.wikimedia.org/r/87324 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7eb5d4d0ccbb6563a37e988a2b7ea34140dd2271 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] UI and UX for SpecialTranslateSandbox - change (mediawiki...Translate)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87325
Change subject: UI and UX for SpecialTranslateSandbox
..
UI and UX for SpecialTranslateSandbox
WIP.
Change-Id: Ib4a0f1134a0d4ee5c673d06b05415542180bcf30
---
M TranslateSandbox.i18n.php
M resources/css/ext.translate.special.translatesandbox.css
M resources/js/ext.translate.special.translatesandbox.js
M specials/SpecialTranslateSandbox.php
4 files changed, 66 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/25/87325/1
diff --git a/TranslateSandbox.i18n.php b/TranslateSandbox.i18n.php
index 38ab96e..b288a95 100644
--- a/TranslateSandbox.i18n.php
+++ b/TranslateSandbox.i18n.php
@@ -24,6 +24,7 @@
access.
Please come to $2 and make some more translations.',
+ 'tsb-request-count' = '{{PLURAL:$1|One request|$1 requests}}',
);
/** Message documentation (Message documentation)
@@ -50,7 +51,7 @@
'tsb-reminder-title-generic' = Voltooi u bekendstelling om 'n
geverifieerde vertaler te word,
'tsb-reminder-content-generic' = Hallo $1,
-Dankie dat u op {{SITENAME}} geregistreer het. As u u toesvertalings voltooi,
sal die administrateurs spoedig volle regte aan u toeken.
+Dankie dat u op {{SITENAME}} geregistreer het. As u u toesvertalings voltooi,
sal die administrateurs spoedig volle regte aan u toeken.
Gaan asseblief na $2 om 'n paar vertalings te maak.,
);
@@ -349,7 +350,7 @@
'tsb-reminder-title-generic' = 'Завершіть своє представлення, щоб
стати перевіреним перекладачем',
'tsb-reminder-content-generic' = 'Привіт, $1!
-Дякуємо за реєстрацію у проекті {{SITENAME}}. Якщо Ви завершите свої тестові
+Дякуємо за реєстрацію у проекті {{SITENAME}}. Якщо Ви завершите свої тестові
переклади, адміністратори зможуть скоро надати Вам повні права на переклад.
Будь ласка, перейдіть на $2 і зробіть ще декілька перекладів.',
diff --git a/resources/css/ext.translate.special.translatesandbox.css
b/resources/css/ext.translate.special.translatesandbox.css
index 28c62c2..d16dd3a 100644
--- a/resources/css/ext.translate.special.translatesandbox.css
+++ b/resources/css/ext.translate.special.translatesandbox.css
@@ -20,7 +20,6 @@
/* Requests pane */
.request {
- height: 50px;
border-right: 1px solid #c9c8c8;
border-bottom: 1px solid #c9c8c8;
cursor: pointer;
@@ -41,7 +40,7 @@
}
.request .username,
-.request .selector {
+.request .request-selector {
height: 30px;
line-height: 30px;
font-size: 16px;
@@ -112,3 +111,34 @@
.actions .button {
margin-right: 1.5em;
}
+
+.request-header {
+ border-right: 1px solid #c9c8c8;
+ border-bottom: 1px solid #c9c8c8;
+ padding: 10px;
+ color: #96989A;
+ background-color: #F7F8F8;
+}
+
+.language-selector {
+ margin-left: 10px;
+ border-radius: 3px;
+ background: #f8f8f8;
+ border: 1px solid #CC;
+ cursor: pointer;
+ font-size: 1em;
+}
+
+.language-selector:hover {
+ border-color: #AA;
+}
+
+.language-selector:after {
+ content: ;
+ border-top: 4px solid #AA;
+ border-left: 4px solid transparent;
+ border-right: 4px solid transparent;
+ display: inline-block;
+ vertical-align: middle;
+ margin-left: 0.5em;
+}
\ No newline at end of file
diff --git a/resources/js/ext.translate.special.translatesandbox.js
b/resources/js/ext.translate.special.translatesandbox.js
index 927ef4a..aba708e 100644
--- a/resources/js/ext.translate.special.translatesandbox.js
+++ b/resources/js/ext.translate.special.translatesandbox.js
@@ -158,8 +158,23 @@
$( document ).ready( function () {
+ $( '.request-selector-all' ).click(function () {
+ $( '.request-selector' ).attr( 'checked', this.checked
);
+ } );
+
+ // if all checkbox are selected, check the selectall checkbox
+ // and viceversa
+ $( '.request-selector' ).on( 'click', function () {
+ if ( $( '.request-selector' ).length === $(
'.request-selector:checked' ).length ) {
+ $( '.request-selector-all' ).attr( 'checked',
'checked' );
+ } else {
+ $( '.request-selector-all' ).removeAttr(
'checked' );
+ }
+ } );
$( '.requests .request' ).on( 'click', function () {
loadRequestDetails( $( this ).data( 'data' ) );
} );
+
+ $( '.language-selector' ).uls();
} );
}( jQuery, mediaWiki ) );
diff --git a/specials/SpecialTranslateSandbox.php
b/specials/SpecialTranslateSandbox.php
index 1e1b7ce..801a24f 100644
--- a/specials/SpecialTranslateSandbox.php
+++
[MediaWiki-commits] [Gerrit] Add ulsfo IPv6 transfer nets - change (operations/dns)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87326
Change subject: Add ulsfo IPv6 transfer nets
..
Add ulsfo IPv6 transfer nets
Change-Id: I1e432eee477ea56545404e8d1f96f5d5f173154a
---
M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
1 file changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/26/87326/1
diff --git a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 4ebc150..82812e1 100644
--- a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -15,6 +15,19 @@
1D IN NS ns2.wikimedia.org.
; Loopback IPs
+; cr1-ulsfo -- cr2-ulsfo (2620:0:863:fe00::/64)
+
+$ORIGIN 0.0.e.f.{{ zonename }}.
+
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR ae0.cr1-ulsfo.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR ae0.cr2-ulsfo.wikimedia.org.
+
+; cr1-ulsfo -- cr2-eqiad (2620:0:863:fe01::/64)
+
+$ORIGIN 1.0.e.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
xe-5-2-2.cr2-eqiad.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
xe-0-0-3-538.cr1-ulsfo.wikimedia.org.
+
$ORIGIN f.f.f.f.{{ zonename }}.
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR cr1-ulsfo.wikimedia.org.
--
To view, visit https://gerrit.wikimedia.org/r/87326
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e432eee477ea56545404e8d1f96f5d5f173154a
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add ulsfo IPv6 transfer nets - change (operations/dns)
Mark Bergsma has submitted this change and it was merged.
Change subject: Add ulsfo IPv6 transfer nets
..
Add ulsfo IPv6 transfer nets
Change-Id: I1e432eee477ea56545404e8d1f96f5d5f173154a
---
M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
1 file changed, 13 insertions(+), 0 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 4ebc150..82812e1 100644
--- a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -15,6 +15,19 @@
1D IN NS ns2.wikimedia.org.
; Loopback IPs
+; cr1-ulsfo -- cr2-ulsfo (2620:0:863:fe00::/64)
+
+$ORIGIN 0.0.e.f.{{ zonename }}.
+
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR ae0.cr1-ulsfo.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR ae0.cr2-ulsfo.wikimedia.org.
+
+; cr1-ulsfo -- cr2-eqiad (2620:0:863:fe01::/64)
+
+$ORIGIN 1.0.e.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
xe-5-2-2.cr2-eqiad.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
xe-0-0-3-538.cr1-ulsfo.wikimedia.org.
+
$ORIGIN f.f.f.f.{{ zonename }}.
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR cr1-ulsfo.wikimedia.org.
--
To view, visit https://gerrit.wikimedia.org/r/87326
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e432eee477ea56545404e8d1f96f5d5f173154a
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable ESI processing for the Testing carrier range - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Enable ESI processing for the Testing carrier range
..
Enable ESI processing for the Testing carrier range
The Enable-ESI response header from MediaWiki indicates there are
ESI directives in the body. The X-FORCE-ESI request header suggests
to MediaWiki to use ESI.
Change-Id: I317d5b637d63d371a897c7853d4e887389baa334
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 12 insertions(+), 0 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 19b4e7e..9f3893c 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -87,6 +87,13 @@
set req.hash_ignore_busy = true;
+ if (req.http.X-CS == -TEST) {
+ set req.http.X-FORCE-ESI = 1;
+ }
+ else {
+ unset req.http.X-FORCE-ESI;
+ }
+
/* Default (now modified) Varnish vcl_recv function */
if (req.request != GET req.request != HEAD) {
/* We only deal with GET and HEAD by default */
@@ -100,6 +107,10 @@
}
sub vcl_fetch {
+ if (beresp.http.Enable-ESI == 1) {
+ set beresp.do_esi = true;
+ }
+
if (req.url ~ mobileaction= || req.url ~ useformat=) {
set beresp.ttl = 60 s;
}
@@ -131,6 +142,7 @@
}
sub vcl_deliver {
+ unset resp.http.Enable-ESI;
unset resp.http.X-CS;
# We used to incorrectly set them in vcl_fetch(), which means that our
--
To view, visit https://gerrit.wikimedia.org/r/86258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I317d5b637d63d371a897c7853d4e887389baa334
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Yurik yu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable X-FORCE-ESI for now - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87327
Change subject: Disable X-FORCE-ESI for now
..
Disable X-FORCE-ESI for now
We need to wait until all frontends have ESI enabled.
Change-Id: I5e128f28ee7e24565f839dff7ef949cc9eb725c4
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/87327/1
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 9f3893c..697e161 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -87,12 +87,15 @@
set req.hash_ignore_busy = true;
+/*
if (req.http.X-CS == -TEST) {
set req.http.X-FORCE-ESI = 1;
}
else {
unset req.http.X-FORCE-ESI;
}
+*/
+ unset req.http.X-FORCE-ESI;
/* Default (now modified) Varnish vcl_recv function */
if (req.request != GET req.request != HEAD) {
--
To view, visit https://gerrit.wikimedia.org/r/87327
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e128f28ee7e24565f839dff7ef949cc9eb725c4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable X-FORCE-ESI for now - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Disable X-FORCE-ESI for now
..
Disable X-FORCE-ESI for now
We need to wait until all frontends have ESI enabled.
Change-Id: I5e128f28ee7e24565f839dff7ef949cc9eb725c4
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 9f3893c..697e161 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -87,12 +87,15 @@
set req.hash_ignore_busy = true;
+/*
if (req.http.X-CS == -TEST) {
set req.http.X-FORCE-ESI = 1;
}
else {
unset req.http.X-FORCE-ESI;
}
+*/
+ unset req.http.X-FORCE-ESI;
/* Default (now modified) Varnish vcl_recv function */
if (req.request != GET req.request != HEAD) {
--
To view, visit https://gerrit.wikimedia.org/r/87327
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e128f28ee7e24565f839dff7ef949cc9eb725c4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reenable ESI now all frontends are prepared for it - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87328
Change subject: Reenable ESI now all frontends are prepared for it
..
Reenable ESI now all frontends are prepared for it
Change-Id: I7b23b2ebea6066c0cd7d6f0f7d675bf09f9a24ed
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 0 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/87328/1
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 697e161..9f3893c 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -87,15 +87,12 @@
set req.hash_ignore_busy = true;
-/*
if (req.http.X-CS == -TEST) {
set req.http.X-FORCE-ESI = 1;
}
else {
unset req.http.X-FORCE-ESI;
}
-*/
- unset req.http.X-FORCE-ESI;
/* Default (now modified) Varnish vcl_recv function */
if (req.request != GET req.request != HEAD) {
--
To view, visit https://gerrit.wikimedia.org/r/87328
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b23b2ebea6066c0cd7d6f0f7d675bf09f9a24ed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reenable ESI now all frontends are prepared for it - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Reenable ESI now all frontends are prepared for it
..
Reenable ESI now all frontends are prepared for it
Change-Id: I7b23b2ebea6066c0cd7d6f0f7d675bf09f9a24ed
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 0 insertions(+), 3 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 697e161..9f3893c 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -87,15 +87,12 @@
set req.hash_ignore_busy = true;
-/*
if (req.http.X-CS == -TEST) {
set req.http.X-FORCE-ESI = 1;
}
else {
unset req.http.X-FORCE-ESI;
}
-*/
- unset req.http.X-FORCE-ESI;
/* Default (now modified) Varnish vcl_recv function */
if (req.request != GET req.request != HEAD) {
--
To view, visit https://gerrit.wikimedia.org/r/87328
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7b23b2ebea6066c0cd7d6f0f7d675bf09f9a24ed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change ve.dm.DocumentSlice to a mixin to ve.dm.LinearData - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87330
Change subject: Change ve.dm.DocumentSlice to a mixin to ve.dm.LinearData
..
Change ve.dm.DocumentSlice to a mixin to ve.dm.LinearData
Document slice only ever contained linear data, with extra functionality
to preserve the range. It pre-dated LinearData, but now we should
refactor it to reflect its purpose.
Change-Id: Ifc908f7526c83a43a51372c8d2494d7260e7facd
---
M .docs/categories.json
M VisualEditor.php
M demos/ve/index.php
M modules/ve/ce/ve.ce.Surface.js
M modules/ve/dm/lineardata/ve.dm.ElementLinearData.js
A modules/ve/dm/lineardata/ve.dm.SlicedLinearData.js
M modules/ve/dm/ve.dm.Document.js
D modules/ve/dm/ve.dm.DocumentSlice.js
M modules/ve/test/dm/ve.dm.Document.test.js
M modules/ve/test/index.php
10 files changed, 129 insertions(+), 88 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/30/87330/1
diff --git a/.docs/categories.json b/.docs/categories.json
index d5eba63..beb9719 100644
--- a/.docs/categories.json
+++ b/.docs/categories.json
@@ -37,7 +37,6 @@
ve.dm.ModelRegistry,
ve.dm.Converter,
ve.dm.DataString,
- ve.dm.DocumentSlice,
ve.dm.DocumentSynchronizer,
ve.dm.IndexValueStore,
ve.dm.NodeFactory,
diff --git a/VisualEditor.php b/VisualEditor.php
index 25c1d28..1829e0d 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -294,11 +294,11 @@
've/dm/ve.dm.DataString.js',
've/dm/ve.dm.Document.js',
've/dm/ve.dm.LinearData.js',
- 've/dm/ve.dm.DocumentSlice.js',
've/dm/ve.dm.DocumentSynchronizer.js',
've/dm/ve.dm.IndexValueStore.js',
've/dm/ve.dm.Converter.js',
+ 've/dm/lineardata/ve.dm.SlicedLinearData.js',
've/dm/lineardata/ve.dm.ElementLinearData.js',
've/dm/lineardata/ve.dm.MetaLinearData.js',
diff --git a/demos/ve/index.php b/demos/ve/index.php
index eef13e0..c3e5f29 100644
--- a/demos/ve/index.php
+++ b/demos/ve/index.php
@@ -147,10 +147,10 @@
script src=../../modules/ve/dm/ve.dm.DataString.js/script
script src=../../modules/ve/dm/ve.dm.Document.js/script
script src=../../modules/ve/dm/ve.dm.LinearData.js/script
- script
src=../../modules/ve/dm/ve.dm.DocumentSlice.js/script
script
src=../../modules/ve/dm/ve.dm.DocumentSynchronizer.js/script
script
src=../../modules/ve/dm/ve.dm.IndexValueStore.js/script
script src=../../modules/ve/dm/ve.dm.Converter.js/script
+ script
src=../../modules/ve/dm/lineardata/ve.dm.SlicedLinearData.js/script
script
src=../../modules/ve/dm/lineardata/ve.dm.ElementLinearData.js/script
script
src=../../modules/ve/dm/lineardata/ve.dm.MetaLinearData.js/script
script
src=../../modules/ve/dm/nodes/ve.dm.GeneratedContentNode.js/script
diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index c3d4d68..db9867a 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -655,7 +655,7 @@
clipboardIndex, clipboardItem,
scrollTop,
view = this,
- slice = this.documentView.model.getSlice(
this.model.getSelection() ),
+ slice = this.documentView.model.getSlicedLinearData(
this.model.getSelection() ),
clipboardData = e.originalEvent.clipboardData,
$window = $( ve.Element.getWindow( this.$$.context ) );
@@ -666,7 +666,7 @@
ve.dm.converter.store = this.documentView.model.getStore();
ve.dm.converter.internalList =
this.documentView.model.getInternalList();
- ve.dm.converter.getDomSubtreeFromData( slice.getBalancedData(),
this.$pasteTarget[0] );
+ ve.dm.converter.getDomSubtreeFromData( slice.getData(),
this.$pasteTarget[0] );
clipboardItem = { 'data': slice, 'hash': null };
clipboardIndex = this.clipboard.push( clipboardItem ) - 1;
@@ -813,7 +813,8 @@
if ( !beforePasteData.plain ) {
beforePasteData.plain = this.$pasteTarget.text();
}
- slice = new ve.dm.DocumentSlice(
+ slice = new ve.dm.ElementLinearDataSlice(
+ new ve.dm.IndexValueStore(),
ve.splitClusters(
// TODO: handle plain text line breaks better
[MediaWiki-commits] [Gerrit] Rename getDocumentSlice to cloneFromRange - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87329
Change subject: Rename getDocumentSlice to cloneFromRange
..
Rename getDocumentSlice to cloneFromRange
We already getSlice which returns a ve.dm.DocumentSlice, so using
the word slice in this method is very confusing. What we are actually
doing is creating a ve.dm.Document from a range. Also remove argument
overloading as it's not particularly helpful and would make the new
name a lie.
Change-Id: I93da3419510410b170396e6765fbe2a87f9795be
---
M modules/ve-mw/test/dm/ve.dm.Transaction.test.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
M modules/ve/dm/ve.dm.Document.js
M modules/ve/test/dm/ve.dm.Document.test.js
M modules/ve/test/dm/ve.dm.Transaction.test.js
6 files changed, 17 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/29/87329/1
diff --git a/modules/ve-mw/test/dm/ve.dm.Transaction.test.js
b/modules/ve-mw/test/dm/ve.dm.Transaction.test.js
index c38b7c1..5435092 100644
--- a/modules/ve-mw/test/dm/ve.dm.Transaction.test.js
+++ b/modules/ve-mw/test/dm/ve.dm.Transaction.test.js
@@ -127,7 +127,7 @@
if ( cases[i].newDocData ) {
doc2 = new ve.dm.Document( cases[i].newDocData
);
} else {
- doc2 = doc.getDocumentSlice( cases[i].range );
+ doc2 = doc.cloneFromRange( cases[i].range
instanceof ve.Range ? cases[i].range : cases[i].range.getRange() );
cases[i].modify( doc2 );
}
tx = ve.dm.Transaction.newFromDocumentReplace( doc,
cases[i].range, doc2 );
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index b332463..c0bcf6f 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -97,7 +97,7 @@
this.mediaNode = this.surface.getView().getFocusedNode().getModel();
this.captionNode = this.mediaNode.getCaptionNode();
if ( this.captionNode this.captionNode.getLength() 0 ) {
- newDoc = doc.getDocumentSlice( this.captionNode );
+ newDoc = doc.cloneFromRange( this.captionNode.getRange() );
} else {
newDoc = [
{ 'type': 'paragraph', 'internal': { 'generated':
'wrapper' } },
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index 12c0f87..2720cd1 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -279,7 +279,7 @@
'refGroup': ref.refGroup,
'listIndex': ref.listIndex
};
- newDoc = doc.getDocumentSlice(
doc.getInternalList().getItemNode( ref.listIndex ) );
+ newDoc = doc.cloneFromRange( doc.getInternalList().getItemNode(
ref.listIndex ).getRange() );
refGroup = ref.refGroup;
} else {
// Create a new reference
diff --git a/modules/ve/dm/ve.dm.Document.js b/modules/ve/dm/ve.dm.Document.js
index d71e9c1..e5b3724 100644
--- a/modules/ve/dm/ve.dm.Document.js
+++ b/modules/ve/dm/ve.dm.Document.js
@@ -304,24 +304,17 @@
};
/**
- * Get a document from a slice of this document. The new document's store and
internal list will be
+ * Clone a sub-document from a range in this document. The new document's
store and internal list will be
* clones of the ones in this document.
*
- * @param {ve.Range|ve.dm.Node} rangeOrNode Range of data to clone, or node
whose contents should be cloned
+ * @param {ve.Range} range Range of data to clone
* @returns {ve.dm.Document} New document
- * @throws {Error} rangeOrNode must be a ve.Range or a ve.dm.Node
*/
-ve.dm.Document.prototype.getDocumentSlice = function ( rangeOrNode ) {
- var data, range, newDoc,
+ve.dm.Document.prototype.cloneFromRange = function ( range ) {
+ var data, newDoc,
store = this.store.clone(),
listRange = this.internalList.getListNode().getOuterRange();
- if ( rangeOrNode instanceof ve.dm.Node ) {
- range = rangeOrNode.getRange();
- } else if ( rangeOrNode instanceof ve.Range ) {
- range = rangeOrNode;
- } else {
- throw new Error( 'rangeOrNode must be a ve.Range or a
ve.dm.Node' );
- }
+
data = ve.copy( this.getFullData( range, true ) );
if ( range.start listRange.start || range.end listRange.end ) {
// The range does not include the entire internal list, so add
it
diff --git
[MediaWiki-commits] [Gerrit] Topic creator should be notified on post reply/edit/moderation - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Topic creator should be notified on post reply/edit/moderation
..
Topic creator should be notified on post reply/edit/moderation
depends on Echo patch: https://gerrit.wikimedia.org/r/#/c/87277/
Change-Id: Ife2e63855a334d031b3b94191fd22b0c7bd9c4c9
---
M Flow.i18n.php
M includes/Notifications/Controller.php
M includes/Notifications/Formatter.php
M includes/Notifications/Notifications.php
4 files changed, 79 insertions(+), 42 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Flow.i18n.php b/Flow.i18n.php
index 24fb4b8..95a8854 100644
--- a/Flow.i18n.php
+++ b/Flow.i18n.php
@@ -84,7 +84,8 @@
// Notification message
'flow-notification-reply' = '$1 {{GENDER:$1|replied}} to your [$5
post] in $2 on $4.',
'flow-notification-reply-bundle' = '$1 and $5
{{PLURAL:$6|other|others}} {{GENDER:$1|replied}} to your [$4 post] in $2 on
$3.',
- 'flow-notification-edit' = '$1 {{GENDER:$1|edited}} your [$5 post] in
$2 on [[$3|$4]].',
+ 'flow-notification-edit' = '$1 {{GENDER:$1|edited}} a [$5 post] in $2
on [[$3|$4]].',
+ 'flow-notification-edit-bundle' = '$1 and $5
{{PLURAL:$6|other|others}} {{GENDER:$1|edited}} a [$4 post] in $2 on $3.',
'flow-notification-newtopic' = '$1 {{GENDER:$1|created}} a [$5 new
topic] on [[$2|$3]]: $4.',
'flow-notification-rename' = '$1 {{GENDER:$1|changed}} the title of
[$2 $3] to $4 on [[$5|$6]].',
'flow-notification-mention' = '$1 {{GENDER:$1|mentioned}} you in their
[$2 post] in $3 on $4',
@@ -102,6 +103,7 @@
'flow-notification-mention-email-batch-body' = '$1
{{GENDER:$1|mentioned}} you in their post in $2 on $3',
'flow-notification-edit-email-subject' = '$1 {{GENDER:$1|edited}} your
post',
'flow-notification-edit-email-batch-body' = '$1 {{GENDER:$1|edited}}
your post in $2 on $3',
+ 'flow-notification-edit-email-batch-bundle-body' = '$1 and $4
{{PLURAL:$5|other|others}} {{GENDER:$1|edited}} a post in $2 on $3',
'flow-notification-rename-email-subject' = '$1 {{GENDER:$1|renamed}}
your topic',
'flow-notification-rename-email-batch-body' = '$1
{{GENDER:$1|renamed}} your topic $2 to $3 on $4',
'flow-notification-newtopic-email-subject' = '$1 {{GENDER:$1|created}}
a new topic on $2',
@@ -274,6 +276,16 @@
* $1 Name of the user that edited the post
* $2 Name of the topic the edited post belongs to
* $3 Title of the page the topic belongs to',
+ 'flow-notification-edit-email-batch-bundle-body' = 'Email notification
body when a user receives post edits from multiple users, this message is used
in both single email and email digest.
+
+Parameters:
+* $1 - username of the person who replied
+* $2 - title of the topic
+* $3 - title for the page that the Flow board is attached to
+* $4 - the count of other action performers, could be number or
{{msg-mw|Echo-notification-count}}. e.g. 7 others or 99+ others
+* $5 - a number used for plural support
+See also:
+* {{msg-mw|Flow-notification-edit-bundle}}',
'flow-notification-rename-email-subject' = 'Subject line of
notification E-mail for topic being renamed
* $1 - Name of the user that renamed the topic',
'flow-notification-rename-email-batch-body' = 'E-mail notification for
topic being renamed
@@ -295,7 +307,7 @@
* $4 - Title for the page that the Flow board is attached to
* $5 - Permanent URL for the post
{{Related|Flow-notification}}',
- 'flow-notification-reply-bundle' = 'Notification text for when a user
receives replies from multiple users on the same post/topic.
+ 'flow-notification-reply-bundle' = 'Notification text for when a user
receives replies from multiple users on the same topic.
Parameters:
* $1 - username of the person who replied
@@ -313,6 +325,17 @@
* $4 - Title for the page that the Flow board is attached to
* $5 - Permanent URL for the post
{{Related|Flow-notification}},
+ 'flow-notification-edit-bundle' = 'Notification text for when a user
receives post edits from multiple users on the same topic.
+
+Parameters:
+* $1 - username of the person who edited post
+* $2 - title of the topic
+* $3 - title for the page that the Flow board is attached to
+* $4 - permantent URL for the topic
+* $5 - the count of other action performers, could be number or
{{msg-mw|Echo-notification-count}}. e.g. 7 others or 99+ others
+* $6 - a number used for plural support
+See also:
+* {{msg-mw|Flow-notification-edit-email-batch-bundle-body}}',
'flow-notification-newtopic' = 'Notification text for when a new topic
is created. Parameters:
* $1 - Username of the person who created the topic
* $2 - Title for the Flow board
diff --git a/includes/Notifications/Controller.php
b/includes/Notifications/Controller.php
index f5dee8e..d3fc96b 100644
---
[MediaWiki-commits] [Gerrit] Typo fix + conditional fix - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged.
Change subject: Typo fix + conditional fix
..
Typo fix + conditional fix
bundleTitle['message'] defaults to empty string, it would never
be null, should just check if the string is empty
Change-Id: I6b9dd8b8a94fed114c0799004848daed472daf3a
---
M formatters/BasicFormatter.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/formatters/BasicFormatter.php b/formatters/BasicFormatter.php
index e3c226c..e4ee214 100644
--- a/formatters/BasicFormatter.php
+++ b/formatters/BasicFormatter.php
@@ -134,7 +134,7 @@
}
/**
-* Apply some custom change beforing formatting, child class
overwriting this method
+* Apply some custom change before formatting, child class overwriting
this method
* should always invoke a call to the parent method unless child class
wants to overwrite
* the default completely
*
@@ -145,7 +145,7 @@
protected function applyChangeBeforeFormatting( EchoEvent $event, User
$user, $type ) {
// Use the bundle message if use-bundle is true and there is a
bundle message
$this-generateBundleData( $event, $user, $type );
- if ( $this-bundleData['use-bundle'] isset(
$this-bundleTitle['message'] ) ) {
+ if ( $this-bundleData['use-bundle']
$this-bundleTitle['message'] ) {
$this-title = $this-flyoutTitle = $this-bundleTitle;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/86738
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b9dd8b8a94fed114c0799004848daed472daf3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bsitu bs...@wikimedia.org
Gerrit-Reviewer: EBernhardson (WMF) ebernhard...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Reenable ESI now all frontends are prepared for it - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Revert Reenable ESI now all frontends are prepared for it
..
Revert Reenable ESI now all frontends are prepared for it
Reverting until I have time to debug this
This reverts commit 86e99656af4d177247dc7cf07235463ac4938c3f.
Change-Id: I30f25b584426827487ae00a4f014cbc285af11d0
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Mark Bergsma: Verified; Looks good to me, approved
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 9f3893c..697e161 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -87,12 +87,15 @@
set req.hash_ignore_busy = true;
+/*
if (req.http.X-CS == -TEST) {
set req.http.X-FORCE-ESI = 1;
}
else {
unset req.http.X-FORCE-ESI;
}
+*/
+ unset req.http.X-FORCE-ESI;
/* Default (now modified) Varnish vcl_recv function */
if (req.request != GET req.request != HEAD) {
--
To view, visit https://gerrit.wikimedia.org/r/87331
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I30f25b584426827487ae00a4f014cbc285af11d0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Drac: Convert into a module. - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87332
Change subject: Drac: Convert into a module.
..
Drac: Convert into a module.
Change-Id: Ifb1ccc6e8615ea5d6a92658a9808f468545d0d44
---
D manifests/drac.pp
R modules/drac/files/drac.py
A modules/drac/manifests/init.pp
3 files changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/87332/1
diff --git a/manifests/drac.pp b/manifests/drac.pp
deleted file mode 100644
index 177841e..000
--- a/manifests/drac.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-class drac::management {
-
- package { [ 'python-paramiko' ]:
- ensure = latest;
- }
-
- file {
- /usr/local/sbin/drac:
- owner = root,
- group = root,
- mode = 0755,
- require = Package[ 'python-paramiko' ],
- source = puppet:///files/drac/drac.py;
- }
-
-}
diff --git a/files/drac/drac.py b/modules/drac/files/drac.py
similarity index 100%
rename from files/drac/drac.py
rename to modules/drac/files/drac.py
diff --git a/modules/drac/manifests/init.pp b/modules/drac/manifests/init.pp
new file mode 100644
index 000..3b2bea6
--- /dev/null
+++ b/modules/drac/manifests/init.pp
@@ -0,0 +1,16 @@
+class drac::management {
+
+package { 'python-paramiko' :
+ensure = latest,
+}
+
+file {
+'/usr/local/sbin/drac':
+owner = root,
+group = root,
+mode= '0755',
+require = Package['python-paramiko'],
+source = 'puppet:///modules/drac/files/drac/drac.py',
+}
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/87332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb1ccc6e8615ea5d6a92658a9808f468545d0d44
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya matanya.mo...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix some notification badge related issue - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix some notification badge related issue
..
Fix some notification badge related issue
* In some languages like persian, the number 0 is represented as '.', we can't
compare
'.' with either 0 or '0' to detect the no-notification status of the badge
* The markread API doesn't respect uselang param, it would return 0 instead of
. in a url with uselang=fa
Note: we need to provide raw and formatted count in the API since client side
javascript
doesn't provide fancy function like $wgLang-formatNum()
bug: 54575
Change-Id: I0a49828253ec346ed27c5b9a976f8bdff4e1fa90
---
M Echo.php
M api/ApiEchoMarkRead.php
M api/ApiEchoNotifications.php
A modules/desktop/ext.echo.desktop.js
M modules/overlay/ext.echo.overlay.js
M modules/special/ext.echo.special.js
6 files changed, 67 insertions(+), 42 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Echo.php b/Echo.php
index 29d78ce..d4777f5 100644
--- a/Echo.php
+++ b/Echo.php
@@ -152,6 +152,16 @@
),
'targets' = array( 'desktop', 'mobile' ),
),
+ 'ext.echo.desktop' = $echoResourceTemplate + array(
+ 'scripts' = 'desktop/ext.echo.desktop.js',
+ 'dependencies' = array(
+ 'ext.echo.base',
+ 'mediawiki.api',
+ 'mediawiki.Uri',
+ 'mediawiki.jqueryMsg',
+ 'mediawiki.user',
+ ),
+ ),
'ext.echo.overlay' = $echoResourceTemplate + array(
'scripts' = array(
'overlay/ext.echo.overlay.js',
@@ -162,12 +172,8 @@
'monobook' = 'overlay/ext.echo.overlay.monobook.css',
),
'dependencies' = array(
- 'ext.echo.base',
- 'mediawiki.api',
- 'mediawiki.Uri',
+ 'ext.echo.desktop',
'mediawiki.util',
- 'mediawiki.jqueryMsg',
- 'mediawiki.user',
),
'messages' = array(
'echo-overlay-title',
@@ -185,12 +191,8 @@
),
'styles' = 'special/ext.echo.special.css',
'dependencies' = array(
- 'ext.echo.base',
- 'mediawiki.api',
- 'mediawiki.Uri',
+ 'ext.echo.desktop',
'mediawiki.ui',
- 'mediawiki.jqueryMsg',
- 'mediawiki.user',
),
'messages' = array(
'echo-load-more-error',
diff --git a/api/ApiEchoMarkRead.php b/api/ApiEchoMarkRead.php
index 5467af7..6183e05 100644
--- a/api/ApiEchoMarkRead.php
+++ b/api/ApiEchoMarkRead.php
@@ -29,7 +29,13 @@
}
}
- $result = array( 'result' = 'success', 'count' =
$notifUser-getFormattedNotificationCount() );
+ $rawCount = $notifUser-getNotificationCount();
+
+ $result = array(
+ 'result' = 'success',
+ 'rawcount' = $rawCount,
+ 'count' =
EchoNotificationController::formatNotificationCount( $rawCount ),
+ );
$this-getResult()-addValue( 'query', $this-getModuleName(),
$result );
}
@@ -45,6 +51,7 @@
'token' = array(
ApiBase::PARAM_REQUIRED = true,
),
+ 'uselang' = null
);
}
@@ -53,6 +60,7 @@
'list' = 'A list of notification IDs to mark as read',
'all' = If set to true, marks all of a user's
notifications as read,
'token' = 'edit token',
+ 'uselang' = 'the desired language to format the output'
);
}
diff --git a/api/ApiEchoNotifications.php b/api/ApiEchoNotifications.php
index af827f1..a570b61 100644
--- a/api/ApiEchoNotifications.php
+++ b/api/ApiEchoNotifications.php
@@ -50,7 +50,9 @@
}
if ( in_array( 'count', $prop ) ) {
- $result['count'] =
$notifUser-getFormattedNotificationCount();
+ $rawCount = $notifUser-getNotificationCount();
+ $result['rawcount'] = $rawCount;
+ $result['count'] =
EchoNotificationController::formatNotificationCount( $rawCount );
}
if ( in_array( 'index', $prop ) ) {
diff --git a/modules/desktop/ext.echo.desktop.js
b/modules/desktop/ext.echo.desktop.js
new file mode 100644
index
[MediaWiki-commits] [Gerrit] Better error handling for memc and some comments - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Better error handling for memc and some comments
..
Better error handling for memc and some comments
Change-Id: Ibdd49677c7eac6b8d601ea1d317c0a4d61e42943
---
M includes/Data/MultiDimArray.php
M includes/Data/ObjectManager.php
M includes/Data/RevisionStorage.php
M includes/Model/AbstractRevision.php
M includes/Repository/MultiGetList.php
M includes/Repository/TreeRepository.php
6 files changed, 128 insertions(+), 28 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Data/MultiDimArray.php b/includes/Data/MultiDimArray.php
index 3a89928..9ed77db 100644
--- a/includes/Data/MultiDimArray.php
+++ b/includes/Data/MultiDimArray.php
@@ -2,6 +2,29 @@
namespace Flow\Data;
+/**
+ * This object can be used to easily set keys in a multi-dimensional array.
+ *
+ * Usage:
+ *
+ * $arr = new Flow\Data\MultiDimArray;
+ * $arr[array(1,2,3)] = 4;
+ * $arr[array(2,3,4)] = 5;
+ * var_export( $arr-all() );
+ *
+ * array (
+ * 1 = array (
+ * 2 = array (
+ * 3 = 4,
+ * ),
+ * ),
+ * 2 = array (
+ * 3 = array (
+ * 4 = 5,
+ * ),
+ * ),
+ * )
+ */
class MultiDimArray implements \ArrayAccess {
protected $data = array();
diff --git a/includes/Data/ObjectManager.php b/includes/Data/ObjectManager.php
index 8ac2e5b..dd19e56 100644
--- a/includes/Data/ObjectManager.php
+++ b/includes/Data/ObjectManager.php
@@ -76,36 +76,75 @@
function fromStorageRow( array $row, $object = null );
}
-// An Index is just a store that receives updates via handler.
-// backing store's can be passed via constructor
+/**
+ * Indexes store one or more values bucketed by exact key/value combinations.
+ */
interface Index extends LifecycleHandler {
- /// Indexes accept no query options
+ /**
+* Find data models matching the provided equality condition.
+*
+* @param array $keys A map of k,v pairs to find via equality condition
+* @return array|false Cached subset of data model rows matching the
+* equality conditions provided in $keys.
+*/
function find( array $keys );
- /// Indexes accept no query options
+ /**
+* Batch together multiple calls to self::find with minimal network
round trips.
+*
+* @param array $queries An array of arrays in the form of $keys
parameter of self::find
+* @return array|false Array of arrays in same order as $queries
representing batched result set.
+*/
function findMulti( array $queries );
- // Maximum number of items in a single index value
+ /**
+* @return integer Maximum number of items in a single index value
+*/
function getLimit();
- // Can the index locate a result for this keys and options pair
+ /**
+* Query options are not supported at the query level, the index always
+* returns the same value for the same key/value combination.
Depending on what
+* the query stores it may contain the answers to various options,
which will require
+* post-processing by the caller.
+*
+* @return boolean Can the index locate a result for this keys and
options pair
+*/
function canAnswer( array $keys, array $options );
}
-// Compact rows before writing to memcache, expand when receiving back
-// Still returns arrays, just removes unneccessary values
+/**
+ * Compact rows before writing to memcache, expand when receiving back
+ * Still returns arrays, just removes unneccessary values
+ */
interface Compactor {
- // Return only the values in $row that will be written to the cache
+ /**
+* @param array $row A data model row to strip unnecessary data from
+* @return array Only the values in $row that will be written to the
cache
+*/
public function compactRow( array $row );
- // perform self::compactRow against an array of rows
+
+ /**
+* @param array $rows Multiple data model rows to strip unnecesssary
data from
+* @return array The provided rows now containing only the values the
will be written to cache
+*/
public function compactRows( array $rows );
- // Repopulate BagOStuff::multiGet results with any values removed in
self::compactRow
+
+ /**
+* Repopulate BagOStuff::multiGet results with any values removed in
self::compactRow
+*
+* @param array $cached The multi-dimensional array results of
BagOStuff::multiGet
+* @param array $keyToQuery An array mapping memcache-key to the values
used to generate that cache key
+* @return array The cached content from memcache along with any data
stripped in self::compactRow
+*/
[MediaWiki-commits] [Gerrit] removing mw1125 from dsh files - change (operations/puppet)
Cmjohnson has uploaded a new change for review. https://gerrit.wikimedia.org/r/87333 Change subject: removing mw1125 from dsh files .. removing mw1125 from dsh files Change-Id: I964563fd87c2d0f8e871cd3e7c3e0d40534fe181 --- M files/dsh/group/apache-eqiad M files/dsh/group/apaches M files/dsh/group/mediawiki-installation M files/dsh/group/mw-eqiad M files/dsh/group/nagios 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/33/87333/1 diff --git a/files/dsh/group/apache-eqiad b/files/dsh/group/apache-eqiad index f3e741d..81770ce 100644 --- a/files/dsh/group/apache-eqiad +++ b/files/dsh/group/apache-eqiad @@ -122,7 +122,7 @@ mw1122 mw1123 mw1124 -mw1125 + mw1126 mw1127 mw1128 diff --git a/files/dsh/group/apaches b/files/dsh/group/apaches index ba45d04..49e6d88 100644 --- a/files/dsh/group/apaches +++ b/files/dsh/group/apaches @@ -297,7 +297,7 @@ mw1122 mw1123 mw1124 -mw1125 + mw1126 mw1127 mw1128 diff --git a/files/dsh/group/mediawiki-installation b/files/dsh/group/mediawiki-installation index f905866..e20c300 100644 --- a/files/dsh/group/mediawiki-installation +++ b/files/dsh/group/mediawiki-installation @@ -332,7 +332,7 @@ mw1122 mw1123 mw1124 -mw1125 + mw1126 mw1127 mw1128 diff --git a/files/dsh/group/mw-eqiad b/files/dsh/group/mw-eqiad index bf4103b..c165e70 100644 --- a/files/dsh/group/mw-eqiad +++ b/files/dsh/group/mw-eqiad @@ -123,7 +123,7 @@ mw1122 mw1123 mw1124 -mw1125 + mw1126 mw1127 mw1128 diff --git a/files/dsh/group/nagios b/files/dsh/group/nagios index 233ce46..f745efd 100644 --- a/files/dsh/group/nagios +++ b/files/dsh/group/nagios @@ -280,7 +280,7 @@ grosley db1021 db1010 -mw1125 + mw1009 db36 arsenic -- To view, visit https://gerrit.wikimedia.org/r/87333 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I964563fd87c2d0f8e871cd3e7c3e0d40534fe181 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] removing mw1125 from dsh files - change (operations/puppet)
Cmjohnson has submitted this change and it was merged. Change subject: removing mw1125 from dsh files .. removing mw1125 from dsh files Change-Id: I964563fd87c2d0f8e871cd3e7c3e0d40534fe181 --- M files/dsh/group/apache-eqiad M files/dsh/group/apaches M files/dsh/group/mediawiki-installation M files/dsh/group/mw-eqiad M files/dsh/group/nagios 5 files changed, 5 insertions(+), 5 deletions(-) Approvals: Cmjohnson: Looks good to me, approved jenkins-bot: Verified diff --git a/files/dsh/group/apache-eqiad b/files/dsh/group/apache-eqiad index f3e741d..81770ce 100644 --- a/files/dsh/group/apache-eqiad +++ b/files/dsh/group/apache-eqiad @@ -122,7 +122,7 @@ mw1122 mw1123 mw1124 -mw1125 + mw1126 mw1127 mw1128 diff --git a/files/dsh/group/apaches b/files/dsh/group/apaches index ba45d04..49e6d88 100644 --- a/files/dsh/group/apaches +++ b/files/dsh/group/apaches @@ -297,7 +297,7 @@ mw1122 mw1123 mw1124 -mw1125 + mw1126 mw1127 mw1128 diff --git a/files/dsh/group/mediawiki-installation b/files/dsh/group/mediawiki-installation index f905866..e20c300 100644 --- a/files/dsh/group/mediawiki-installation +++ b/files/dsh/group/mediawiki-installation @@ -332,7 +332,7 @@ mw1122 mw1123 mw1124 -mw1125 + mw1126 mw1127 mw1128 diff --git a/files/dsh/group/mw-eqiad b/files/dsh/group/mw-eqiad index bf4103b..c165e70 100644 --- a/files/dsh/group/mw-eqiad +++ b/files/dsh/group/mw-eqiad @@ -123,7 +123,7 @@ mw1122 mw1123 mw1124 -mw1125 + mw1126 mw1127 mw1128 diff --git a/files/dsh/group/nagios b/files/dsh/group/nagios index 233ce46..f745efd 100644 --- a/files/dsh/group/nagios +++ b/files/dsh/group/nagios @@ -280,7 +280,7 @@ grosley db1021 db1010 -mw1125 + mw1009 db36 arsenic -- To view, visit https://gerrit.wikimedia.org/r/87333 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I964563fd87c2d0f8e871cd3e7c3e0d40534fe181 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org Gerrit-Reviewer: Cmjohnson cmjohn...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Deprecate ApiQueryRevisionContentFlow. - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Deprecate ApiQueryRevisionContentFlow.
..
Deprecate ApiQueryRevisionContentFlow.
Its functionality is duplicated in the more generic ApiQueryFlow, and both
occasions
where it was used were in situations where the data in question was already
available
from other sources without an API call.
Also moved ui-functions.js to the base module instead of the discussion module.
Change-Id: I834ab83e532b14c957d629e1a2de161b1180d9ca
---
M Flow.php
M Resources.php
D includes/api/ApiQueryRevisionContentFlow.php
M modules/base/ext.flow.base.js
R modules/base/ui-functions.js
M modules/discussion/forms.js
M modules/editor/ext.flow.editor.js
M modules/summary/summary.js
8 files changed, 21 insertions(+), 110 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Flow.php b/Flow.php
index 2808605..da8fcd0 100755
--- a/Flow.php
+++ b/Flow.php
@@ -127,10 +127,8 @@
// API modules
$wgAutoloadClasses['ApiQueryFlow'] = $dir/includes/api/ApiQueryFlow.php;
-$wgAutoloadClasses['ApiQueryRevisionContentFlow'] =
$dir/includes/api/ApiQueryRevisionContentFlow.php;
$wgAutoloadClasses['ApiParsoidUtilsFlow'] =
$dir/includes/api/ApiParsoidUtilsFlow.php;
$wgAutoloadClasses['ApiFlow'] = $dir/includes/api/ApiFlow.php;
-$wgAPIListModules['flow-revision-content'] = 'ApiQueryRevisionContentFlow';
$wgAPIListModules['flow'] = 'ApiQueryFlow';
$wgAPIModules['flow-parsoid-utils'] = 'ApiParsoidUtilsFlow';
$wgAPIModules['flow'] = 'ApiFlow';
diff --git a/Resources.php b/Resources.php
index 9a37df4..9d73ddb 100644
--- a/Resources.php
+++ b/Resources.php
@@ -9,7 +9,10 @@
$wgResourceModules += array(
'ext.flow.base' = $flowResourceTemplate + array(
// 'styles' = 'base/ext.flow.base.css',
- 'scripts' = 'base/ext.flow.base.js',
+ 'scripts' = array(
+ 'base/ext.flow.base.js',
+ 'base/ui-functions.js',
+ ),
'dependencies' = array(
'mediawiki.api',
'jquery.json',
@@ -29,7 +32,6 @@
'discussion/agora2-override.css',
),
'scripts' = array(
- 'discussion/ui-functions.js',
'discussion/ui.js',
'discussion/forms.js',
'discussion/paging.js',
diff --git a/includes/api/ApiQueryRevisionContentFlow.php
b/includes/api/ApiQueryRevisionContentFlow.php
deleted file mode 100644
index c5c6df3..000
--- a/includes/api/ApiQueryRevisionContentFlow.php
+++ /dev/null
@@ -1,80 +0,0 @@
-?php
-
-use Flow\Model\UUID;
-use Flow\Container;
-
-class ApiQueryRevisionContentFlow extends ApiQueryBase {
- public function __construct( $query, $moduleName ) {
- parent::__construct( $query, $moduleName, 'rev' );
- }
-
- public function execute() {
- $params = $this-extractRequestParams();
-
- $container = Container::getContainer();
- $storage = $container['storage']-getStorage(
$params['container'] );
-
- $id = UUID::create( $params['id'] );
- $post = null;
-
- if ( $id ) {
- $post = $storage-find(
- array( 'tree_rev_descendant_id' =
$id-getBinary() ),
- array( 'sort' = 'rev_id', 'order' = 'DESC',
'limit' = 1 )
- );
- }
-
- if ( !$post ) {
- throw new \MWException( 'Unknown post: '. $params['id']
);
- }
- $post = reset( $post );
-
- $result = array(
- 'format' = $params['format'],
- 'content' = $post-getContent( $this-getUser(),
$params['format'] ),
- );
- $this-getResult()-addValue( 'query', $this-getModuleName(),
$result );
- }
-
- public function getAllowedParams() {
- return array(
- 'id' = array(
- ApiBase::PARAM_REQUIRED = true,
- ),
- 'container' = array(
- ApiBase::PARAM_REQUIRED = true,
- ),
- 'format' = array(
- ApiBase::PARAM_REQUIRED = false,
- ApiBase::PARAM_DFLT = 'html',
- ApiBase::PARAM_TYPE = array( 'html',
'wikitext' ),
- ),
- );
- }
-
- public function getParamDescription() {
- return array(
- 'id' = 'Hex-encoded rev_id',
- 'container' = 'Revision storage container',
-
[MediaWiki-commits] [Gerrit] Convert wikitext to html, depending on editor needs - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87335
Change subject: Convert wikitext to html, depending on editor needs
..
Convert wikitext to html, depending on editor needs
Change-Id: Iab7bae8aa93c95f7c36d86533f469e709fc0533b
---
M modules/editor/ext.flow.editor.js
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/35/87335/1
diff --git a/modules/editor/ext.flow.editor.js
b/modules/editor/ext.flow.editor.js
index ce75c98..3953870 100644
--- a/modules/editor/ext.flow.editor.js
+++ b/modules/editor/ext.flow.editor.js
@@ -36,7 +36,7 @@
/**
* @param {jQuery} $node
-* @param {string} [content] Existing content to load
+* @param {string} [content] Existing content to load, in
wikitext format
*/
load: function ( $node, content ) {
/**
@@ -56,7 +56,9 @@
return;
}
- if ( ! content ) {
+ if ( content ) {
+ content = mw.flow.parsoid.convert(
'wikitext', mw.flow.editor.getFormat(), content );
+ } else {
content = '';
}
--
To view, visit https://gerrit.wikimedia.org/r/87335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab7bae8aa93c95f7c36d86533f469e709fc0533b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VisualEditor to wmf19 branch to pick up cherry-pick o... - change (mediawiki/core)
Reedy has submitted this change and it was merged. Change subject: Update VisualEditor to wmf19 branch to pick up cherry-pick of Ia585b42 .. Update VisualEditor to wmf19 branch to pick up cherry-pick of Ia585b42 Change-Id: I3d0c39a54701a6034b5438c0454fdaae19b4b9b4 --- M extensions/VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/VisualEditor b/extensions/VisualEditor index 401e562..cfe1f53 16 --- a/extensions/VisualEditor +++ b/extensions/VisualEditor -Subproject commit 401e5624e606a434599ac7ff3b2dd2a756ed8eb3 +Subproject commit cfe1f536abcbeddfef6c58f76a17ed8d246abffe -- To view, visit https://gerrit.wikimedia.org/r/87305 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d0c39a54701a6034b5438c0454fdaae19b4b9b4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf19 Gerrit-Owner: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo. - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix typo.
..
Fix typo.
Spotted by McDutchie in
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Echo-pref-tooltip-flow-discussion/ia_%282%29
Change-Id: If367e8937e2afe9aa68f3a2573571b9a91dbd415
---
M Flow.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Flow.i18n.php b/Flow.i18n.php
index 9633d3c..c6e3816 100644
--- a/Flow.i18n.php
+++ b/Flow.i18n.php
@@ -113,7 +113,7 @@
// Notification preference
'echo-category-title-flow-discussion' =
'{{PLURAL:$1|Discussion|Discussions}}',
- 'echo-pref-tooltip-flow-discussion' = 'Notify me when actions related
to me occur in the disucssion board.',
+ 'echo-pref-tooltip-flow-discussion' = 'Notify me when actions related
to me occur in the discussion board.',
);
/** Message documentation (Message documentation)
--
To view, visit https://gerrit.wikimedia.org/r/87334
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If367e8937e2afe9aa68f3a2573571b9a91dbd415
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: L10n-bot l10n-...@translatewiki.net
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tab and navigation improvements - change (analytics/wikimetrics)
Milimetric has submitted this change and it was merged.
Change subject: tab and navigation improvements
..
tab and navigation improvements
Change-Id: I4ae07c2cd055ab112c69c1b1a20056caf3eaf0a0
---
M wikimetrics/controllers/metrics.py
M wikimetrics/static/js/cohortList.js
A wikimetrics/static/js/metricList.js
M wikimetrics/static/js/reportCreate.js
M wikimetrics/static/js/site.js
M wikimetrics/templates/cohorts.html
M wikimetrics/templates/metrics.html
7 files changed, 32 insertions(+), 3 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/wikimetrics/controllers/metrics.py
b/wikimetrics/controllers/metrics.py
index 24971ac..ebdc56d 100644
--- a/wikimetrics/controllers/metrics.py
+++ b/wikimetrics/controllers/metrics.py
@@ -19,7 +19,7 @@
new_record['metricClass'] = metric
records.append(new_record)
-return records
+return sorted(records, key=lambda r: r['label'])
@app.route('/metrics/')
diff --git a/wikimetrics/static/js/cohortList.js
b/wikimetrics/static/js/cohortList.js
index 4679eeb..cef26af 100644
--- a/wikimetrics/static/js/cohortList.js
+++ b/wikimetrics/static/js/cohortList.js
@@ -41,7 +41,7 @@
.done(site.handleWith(function(data){
setWikiusers(data.cohorts);
viewModel.cohorts(data.cohorts);
-$('ul.nav-tabs li a').first().click();
+site.enableTabNavigation();
}))
.fail(site.failure);
diff --git a/wikimetrics/static/js/metricList.js
b/wikimetrics/static/js/metricList.js
new file mode 100644
index 000..c08cbab
--- /dev/null
+++ b/wikimetrics/static/js/metricList.js
@@ -0,0 +1,3 @@
+$(document).ready(function(){
+site.enableTabNavigation();
+});
diff --git a/wikimetrics/static/js/reportCreate.js
b/wikimetrics/static/js/reportCreate.js
index bb8c6fd..b3978f5 100644
--- a/wikimetrics/static/js/reportCreate.js
+++ b/wikimetrics/static/js/reportCreate.js
@@ -104,6 +104,14 @@
.done(site.handleWith(function(data){
setSelected(data.cohorts);
viewModel.cohorts(data.cohorts);
+// pre-select any selected cohorts
+if (location.hash){
+try {
+viewModel.cohorts().filter(function(c){
+return c.id == location.hash.substring(1);
+})[0].selected(true);
+} catch(e) {}
+}
}))
.fail(site.failure);
diff --git a/wikimetrics/static/js/site.js b/wikimetrics/static/js/site.js
index bf08ee5..5ad5911 100644
--- a/wikimetrics/static/js/site.js
+++ b/wikimetrics/static/js/site.js
@@ -102,6 +102,20 @@
.fail(site.failure);
},
+// persists the bootstrap tab hash in the url and navigates to it on page
load
+enableTabNavigation: function(){
+$('ul.nav-tabs li a').on('shown', function (e) {
+location.hash = e.target.hash;
+// negate jumping down to the tab anchor
+window.scrollTo(0, 0);
+})
+if (location.hash){
+$('ul.nav-tabs li a[href='+location.hash+']').click();
+} else {
+$('ul.nav-tabs li a').first().click();
+}
+},
+
// ***
// Just some util functions so I don't have to
// import huge libraries like Underscore
diff --git a/wikimetrics/templates/cohorts.html
b/wikimetrics/templates/cohorts.html
index 30eb35c..f7d25eb 100644
--- a/wikimetrics/templates/cohorts.html
+++ b/wikimetrics/templates/cohorts.html
@@ -21,7 +21,7 @@
div class=hero-unit
h5 data-bind=text: name/h5
p data-bind=text: description/p
-a href={{url_for('reports_request')}} class=btn
btn-primary
+a
data-bind=attr:{href:'{{url_for('reports_request')}}#'+id} class=btn
btn-primary
Create Report
/a
/div
diff --git a/wikimetrics/templates/metrics.html
b/wikimetrics/templates/metrics.html
index 183e276..258e1de 100644
--- a/wikimetrics/templates/metrics.html
+++ b/wikimetrics/templates/metrics.html
@@ -40,3 +40,7 @@
/div
{% endblock %}
+
+{% block scripts %}
+script src={{ url_for('static', filename='js/metricList.js') }}/script
+{% endblock %}
--
To view, visit https://gerrit.wikimedia.org/r/87336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4ae07c2cd055ab112c69c1b1a20056caf3eaf0a0
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
Gerrit-Reviewer: Milimetric dandree...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] tab and navigation improvements - change (analytics/wikimetrics)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87336
Change subject: tab and navigation improvements
..
tab and navigation improvements
Change-Id: I4ae07c2cd055ab112c69c1b1a20056caf3eaf0a0
---
M wikimetrics/controllers/metrics.py
M wikimetrics/static/js/cohortList.js
A wikimetrics/static/js/metricList.js
M wikimetrics/static/js/reportCreate.js
M wikimetrics/static/js/site.js
M wikimetrics/templates/cohorts.html
M wikimetrics/templates/metrics.html
7 files changed, 32 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/36/87336/1
diff --git a/wikimetrics/controllers/metrics.py
b/wikimetrics/controllers/metrics.py
index 24971ac..ebdc56d 100644
--- a/wikimetrics/controllers/metrics.py
+++ b/wikimetrics/controllers/metrics.py
@@ -19,7 +19,7 @@
new_record['metricClass'] = metric
records.append(new_record)
-return records
+return sorted(records, key=lambda r: r['label'])
@app.route('/metrics/')
diff --git a/wikimetrics/static/js/cohortList.js
b/wikimetrics/static/js/cohortList.js
index 4679eeb..cef26af 100644
--- a/wikimetrics/static/js/cohortList.js
+++ b/wikimetrics/static/js/cohortList.js
@@ -41,7 +41,7 @@
.done(site.handleWith(function(data){
setWikiusers(data.cohorts);
viewModel.cohorts(data.cohorts);
-$('ul.nav-tabs li a').first().click();
+site.enableTabNavigation();
}))
.fail(site.failure);
diff --git a/wikimetrics/static/js/metricList.js
b/wikimetrics/static/js/metricList.js
new file mode 100644
index 000..c08cbab
--- /dev/null
+++ b/wikimetrics/static/js/metricList.js
@@ -0,0 +1,3 @@
+$(document).ready(function(){
+site.enableTabNavigation();
+});
diff --git a/wikimetrics/static/js/reportCreate.js
b/wikimetrics/static/js/reportCreate.js
index bb8c6fd..b3978f5 100644
--- a/wikimetrics/static/js/reportCreate.js
+++ b/wikimetrics/static/js/reportCreate.js
@@ -104,6 +104,14 @@
.done(site.handleWith(function(data){
setSelected(data.cohorts);
viewModel.cohorts(data.cohorts);
+// pre-select any selected cohorts
+if (location.hash){
+try {
+viewModel.cohorts().filter(function(c){
+return c.id == location.hash.substring(1);
+})[0].selected(true);
+} catch(e) {}
+}
}))
.fail(site.failure);
diff --git a/wikimetrics/static/js/site.js b/wikimetrics/static/js/site.js
index bf08ee5..5ad5911 100644
--- a/wikimetrics/static/js/site.js
+++ b/wikimetrics/static/js/site.js
@@ -102,6 +102,20 @@
.fail(site.failure);
},
+// persists the bootstrap tab hash in the url and navigates to it on page
load
+enableTabNavigation: function(){
+$('ul.nav-tabs li a').on('shown', function (e) {
+location.hash = e.target.hash;
+// negate jumping down to the tab anchor
+window.scrollTo(0, 0);
+})
+if (location.hash){
+$('ul.nav-tabs li a[href='+location.hash+']').click();
+} else {
+$('ul.nav-tabs li a').first().click();
+}
+},
+
// ***
// Just some util functions so I don't have to
// import huge libraries like Underscore
diff --git a/wikimetrics/templates/cohorts.html
b/wikimetrics/templates/cohorts.html
index 30eb35c..f7d25eb 100644
--- a/wikimetrics/templates/cohorts.html
+++ b/wikimetrics/templates/cohorts.html
@@ -21,7 +21,7 @@
div class=hero-unit
h5 data-bind=text: name/h5
p data-bind=text: description/p
-a href={{url_for('reports_request')}} class=btn
btn-primary
+a
data-bind=attr:{href:'{{url_for('reports_request')}}#'+id} class=btn
btn-primary
Create Report
/a
/div
diff --git a/wikimetrics/templates/metrics.html
b/wikimetrics/templates/metrics.html
index 183e276..258e1de 100644
--- a/wikimetrics/templates/metrics.html
+++ b/wikimetrics/templates/metrics.html
@@ -40,3 +40,7 @@
/div
{% endblock %}
+
+{% block scripts %}
+script src={{ url_for('static', filename='js/metricList.js') }}/script
+{% endblock %}
--
To view, visit https://gerrit.wikimedia.org/r/87336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ae07c2cd055ab112c69c1b1a20056caf3eaf0a0
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] Reverse order of class / sites check - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87337
Change subject: Reverse order of class / sites check
..
Reverse order of class / sites check
Some classes are completely irrelevant for some sites. By changing the order
we don't need to handle each site in every class.
Change-Id: Ibebc56cbfecd2a808d5a216d9bbc045120080163
---
M modules/pybal/templates/pybal.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/87337/1
diff --git a/modules/pybal/templates/pybal.conf.erb
b/modules/pybal/templates/pybal.conf.erb
index ad85fdc..f63d79d 100644
--- a/modules/pybal/templates/pybal.conf.erb
+++ b/modules/pybal/templates/pybal.conf.erb
@@ -14,7 +14,7 @@
#
% lvs_services.sort.each do |servicename, service| -%
-% if
lvs_class_hosts[service['class']].include?(scope.lookupvar(::hostname)) and
service['sites'].include?(site) then -%
+% if service['sites'].include?(site) and
lvs_class_hosts[service['class']].include?(scope.lookupvar(::hostname)) then
-%
% if service['ip'].class.eql?(String) then
service['ip'] = { servicename = service['ip'] }
end -%
--
To view, visit https://gerrit.wikimedia.org/r/87337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibebc56cbfecd2a808d5a216d9bbc045120080163
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reverse order of class / sites check - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Reverse order of class / sites check
..
Reverse order of class / sites check
Some classes are completely irrelevant for some sites. By changing the order
we don't need to handle each site in every class.
Change-Id: Ibebc56cbfecd2a808d5a216d9bbc045120080163
---
M modules/pybal/templates/pybal.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/pybal/templates/pybal.conf.erb
b/modules/pybal/templates/pybal.conf.erb
index ad85fdc..f63d79d 100644
--- a/modules/pybal/templates/pybal.conf.erb
+++ b/modules/pybal/templates/pybal.conf.erb
@@ -14,7 +14,7 @@
#
% lvs_services.sort.each do |servicename, service| -%
-% if
lvs_class_hosts[service['class']].include?(scope.lookupvar(::hostname)) and
service['sites'].include?(site) then -%
+% if service['sites'].include?(site) and
lvs_class_hosts[service['class']].include?(scope.lookupvar(::hostname)) then
-%
% if service['ip'].class.eql?(String) then
service['ip'] = { servicename = service['ip'] }
end -%
--
To view, visit https://gerrit.wikimedia.org/r/87337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibebc56cbfecd2a808d5a216d9bbc045120080163
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] increase refresh speed - change (analytics/wikimetrics)
Milimetric has submitted this change and it was merged.
Change subject: increase refresh speed
..
increase refresh speed
Change-Id: I10717ce00aa6489b8dfb79e377cdca192c4ede74
---
M wikimetrics/static/js/reportList.js
M wikimetrics/templates/reports.html
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/wikimetrics/static/js/reportList.js
b/wikimetrics/static/js/reportList.js
index a373182..9b72e61 100644
--- a/wikimetrics/static/js/reportList.js
+++ b/wikimetrics/static/js/reportList.js
@@ -2,6 +2,7 @@
var viewModel = {
reports: ko.observableArray([]),
+refreshEvery: 5,
};
viewModel.reports_sorted = ko.computed(function() {
@@ -19,7 +20,7 @@
site.populateReports(viewModel);
};
getReports();
-setInterval(getReports, 1);
+setInterval(getReports, viewModel.refreshEvery * 1000);
ko.applyBindings(viewModel);
});
diff --git a/wikimetrics/templates/reports.html
b/wikimetrics/templates/reports.html
index cc8c108..9916c48 100644
--- a/wikimetrics/templates/reports.html
+++ b/wikimetrics/templates/reports.html
@@ -6,7 +6,7 @@
Create New Report
/a
table class=table table-striped
-captionThis table refreshes automatically every 10 seconds. Reports
will expire after 30 days, please save the output if you would like to keep it
longer./caption
+captionThis table refreshes automatically every span data-bind=text:
refreshEvery/span seconds. Reports will expire after 30 days, please save
the output if you would like to keep it longer./caption
thead
tr
thCreated/th
--
To view, visit https://gerrit.wikimedia.org/r/87338
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I10717ce00aa6489b8dfb79e377cdca192c4ede74
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
Gerrit-Reviewer: Milimetric dandree...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] increase refresh speed - change (analytics/wikimetrics)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87338
Change subject: increase refresh speed
..
increase refresh speed
Change-Id: I10717ce00aa6489b8dfb79e377cdca192c4ede74
---
M wikimetrics/static/js/reportList.js
M wikimetrics/templates/reports.html
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/38/87338/1
diff --git a/wikimetrics/static/js/reportList.js
b/wikimetrics/static/js/reportList.js
index a373182..9b72e61 100644
--- a/wikimetrics/static/js/reportList.js
+++ b/wikimetrics/static/js/reportList.js
@@ -2,6 +2,7 @@
var viewModel = {
reports: ko.observableArray([]),
+refreshEvery: 5,
};
viewModel.reports_sorted = ko.computed(function() {
@@ -19,7 +20,7 @@
site.populateReports(viewModel);
};
getReports();
-setInterval(getReports, 1);
+setInterval(getReports, viewModel.refreshEvery * 1000);
ko.applyBindings(viewModel);
});
diff --git a/wikimetrics/templates/reports.html
b/wikimetrics/templates/reports.html
index cc8c108..9916c48 100644
--- a/wikimetrics/templates/reports.html
+++ b/wikimetrics/templates/reports.html
@@ -6,7 +6,7 @@
Create New Report
/a
table class=table table-striped
-captionThis table refreshes automatically every 10 seconds. Reports
will expire after 30 days, please save the output if you would like to keep it
longer./caption
+captionThis table refreshes automatically every span data-bind=text:
refreshEvery/span seconds. Reports will expire after 30 days, please save
the output if you would like to keep it longer./caption
thead
tr
thCreated/th
--
To view, visit https://gerrit.wikimedia.org/r/87338
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I10717ce00aa6489b8dfb79e377cdca192c4ede74
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adjust SA score for DEAR_SOMETHING test to 1.500 - change (operations/puppet)
Jgreen has uploaded a new change for review. https://gerrit.wikimedia.org/r/87339 Change subject: adjust SA score for DEAR_SOMETHING test to 1.500 .. adjust SA score for DEAR_SOMETHING test to 1.500 Change-Id: I658adf80408d05d54f44f991f976887a191a821f --- M templates/spamassassin/local.cf 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/39/87339/1 diff --git a/templates/spamassassin/local.cf b/templates/spamassassin/local.cf index f35e228..4d9220c 100644 --- a/templates/spamassassin/local.cf +++ b/templates/spamassassin/local.cf @@ -96,4 +96,5 @@ score RCVD_IN_RP_CERTIFIED 2.000 score SPF_SOFTFAIL 2.000 score SUSPICIOUS_RECIPS 2.000 +score DEAR_SOMETHING 1.500 % end -% -- To view, visit https://gerrit.wikimedia.org/r/87339 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I658adf80408d05d54f44f991f976887a191a821f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jgreen jgr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adjust SA score for DEAR_SOMETHING test to 1.500 - change (operations/puppet)
Jgreen has submitted this change and it was merged. Change subject: adjust SA score for DEAR_SOMETHING test to 1.500 .. adjust SA score for DEAR_SOMETHING test to 1.500 Change-Id: I658adf80408d05d54f44f991f976887a191a821f --- M templates/spamassassin/local.cf 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jgreen: Checked; Looks good to me, approved jenkins-bot: Verified diff --git a/templates/spamassassin/local.cf b/templates/spamassassin/local.cf index f35e228..4d9220c 100644 --- a/templates/spamassassin/local.cf +++ b/templates/spamassassin/local.cf @@ -96,4 +96,5 @@ score RCVD_IN_RP_CERTIFIED 2.000 score SPF_SOFTFAIL 2.000 score SUSPICIOUS_RECIPS 2.000 +score DEAR_SOMETHING 1.500 % end -% -- To view, visit https://gerrit.wikimedia.org/r/87339 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I658adf80408d05d54f44f991f976887a191a821f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jgreen jgr...@wikimedia.org Gerrit-Reviewer: Jgreen jgr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename Toolserver to Intuition - change (translatewiki)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87340
Change subject: Rename Toolserver to Intuition
..
Rename Toolserver to Intuition
Change-Id: I7ee78e0a38f344d92b276f380516c2e3b0c2c6a6
---
M REPOCONF
M TranslateSettings.php
M bin/repocommit
M bin/repocreate
M bin/repoexport
M bin/repoupdate
M bin/stats-toolserver
M bin/update-externals
A groups/Intuition/IntuitionAgg.yaml
A groups/Intuition/README
R groups/Intuition/intuition-textdomains.txt
D groups/Toolserver/README
D groups/Toolserver/ToolserverAgg.yaml
13 files changed, 51 insertions(+), 54 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/40/87340/1
diff --git a/REPOCONF b/REPOCONF
index 171895e..a6cdc0a 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -18,6 +18,7 @@
REPO_IHRIS=http://bazaar.launchpad.net/~intrahealth%2Binformatics
REPO_IHRIS_BRANCH=4.1-dev
REPO_IHRIS_MODULES=i2ce ihris-common ihris-manage ihris-qualify
+REPO_INTUITION=git://github.com/Krinkle/TsIntuition.git
REPO_JQUERY_ULS=git://github.com/wikimedia/jquery.uls.git
REPO_KIWIX=git://git.code.sf.net/p/kiwix/maintenance
REPO_MANTIS=git://github.com/mantisbt/mantisbt.git
@@ -34,7 +35,6 @@
REPO_POTLATCH2=git://github.com/systemed/potlatch2.git
REPO_PYWIKIPEDIA=https://gerrit.wikimedia.org/r/pywikibot/i18n
REPO_SHAPADO=git://gitorious.org/shapado/shapado.git
-REPO_TOOLSERVER=git://github.com/Krinkle/TsIntuition.git
REPO_VICUNA=git://github.com/yarl/vicuna.git
REPO_WAYMARKEDTRAILS=git://github.com/lonvia/waymarked-trails-site.git
REPO_WIKIA=git://github.com/Wikia/app.git
diff --git a/TranslateSettings.php b/TranslateSettings.php
index 12443c7..e50b8b1 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -207,14 +207,14 @@
return true;
}
-$wgHooks['TranslatePostInitGroups'][] = array( 'setupToolserver' );
-function setupToolserver( $list, $deps, $autoload ) {
+$wgHooks['TranslatePostInitGroups'][] = array( 'setupIntuition' );
+function setupIntuition( $list, $deps, $autoload ) {
global $GROUPS;
- $def = $GROUPS/Toolserver/toolserver-textdomains.txt;
- $path = '%GROUPROOT%/toolserver/language/messages/';
+ $def = $GROUPS/Intuition/intuition-textdomains.txt;
+ $path = '%GROUPROOT%/intuition/language/messages/';
- $foo = new PremadeToolserverTextdomains( $def, $path );
+ $foo = new PremadeIntuitionTextdomains( $def, $path );
$foo-register( $list, $deps, $autoload );
return true;
@@ -373,8 +373,8 @@
wfAddNamespace( 1238, 'Pywikipedia' );
$wgTranslateGroupFiles[] = $GROUPS/Pywikipedia/Pywikipedia.yaml;
-wfAddNamespace( 1240, 'Toolserver' );
-$wgTranslateGroupFiles[] = $GROUPS/Toolserver/ToolserverAgg.yaml;
+wfAddNamespace( 1240, 'Intuition' );
+$wgTranslateGroupFiles[] = $GROUPS/Intuition/IntuitionAgg.yaml;
wfAddNamespace( 1242, 'EOL' );
$wgTranslateGroupFiles[] = $GROUPS/EOL/EOL.yaml;
diff --git a/bin/repocommit b/bin/repocommit
index e7cf112..f2a022c 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -44,6 +44,7 @@
freecol \
frontlinesms \
fuel \
+intuition \
jquery.uls \
kiwix \
mantis \
@@ -51,7 +52,6 @@
mifos \
pywikipedia \
shapado \
-toolserver \
vicuna \
waymarked-trails-site \
wikia \
diff --git a/bin/repocreate b/bin/repocreate
index fec145d..629ec11 100755
--- a/bin/repocreate
+++ b/bin/repocreate
@@ -98,6 +98,13 @@
fi
done
+elif [ $PROJECT = intuition ]
+then
+ if [ -z $REPO_INTUITION ]
+ then echo Add REPO_INTUITION to REPOCONF; exit 1
+ fi
+ git clone $REPO_INTUITION $PROJECT
+
elif [ $PROJECT = jquery.uls ]
then
if [ -z $REPO_JQUERY_ULS ]
@@ -191,8 +198,8 @@
mkdir en
cd en
ln -s ../mozilla-aurora/browser/locales/en-US/ browser
- ln -s ..//mozilla-aurora/toolkit/locales/en-US/ toolkit
- ln -s ..//mozilla-aurora/dom/locales/en-US dom
+ ln -s ../mozilla-aurora/toolkit/locales/en-US/ toolkit
+ ln -s ../mozilla-aurora/dom/locales/en-US dom
mkdir security
cd security
ln -s ../../mozilla-aurora/security/manager/locales/en-US
manager
@@ -285,13 +292,6 @@
then echo Add REPO_MIFOS to REPOCONF; exit 1
fi
git clone $REPO_SHAPADO $PROJECT
-
-elif [ $PROJECT = toolserver ]
-then
- if [ -z $REPO_TOOLSERVER ]
- then echo Add REPO_TOOLSERVER to REPOCONF; exit 1
- fi
- git clone $REPO_TOOLSERVER $PROJECT
elif [ $PROJECT = vicuna ]
then
diff --git a/bin/repoexport b/bin/repoexport
index b334ba1..cdc093d 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -59,6 +59,10 @@
then
php $EXPORTER --target . --group=out-ihris* --lang='*' --skip en,qqq
$THRESHOLD --ppgettext=/resources/projects
+elif [ $PROJECT = intuition ]
+then
+ php $EXPORTER --target .
[MediaWiki-commits] [Gerrit] Rename Toolserver to Intuition - change (mediawiki...Translate)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87341
Change subject: Rename Toolserver to Intuition
..
Rename Toolserver to Intuition
Change-Id: I634f247728ae732bc0d0951404cccf8d146d405a
---
M TranslateGroupDescriptions.i18n.php
M _autoload.php
R ffs/IntuitionTextdomains.php
3 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/41/87341/1
diff --git a/TranslateGroupDescriptions.i18n.php
b/TranslateGroupDescriptions.i18n.php
index a2ea013..00fcf9d 100644
--- a/TranslateGroupDescriptions.i18n.php
+++ b/TranslateGroupDescriptions.i18n.php
@@ -53,7 +53,7 @@
'translate-group-desc-potlatch2' =
'[[Translating:OpenStreetMap|Potlatch2]] is a Flash-based OpenStreetMap editor',
'translate-group-desc-pywikipedia' =
'[[Translating:Pywikibot|Pywikibot]] is a collection of tools to edit
Wikipedia',
'bw-desc-shapado' = '[[Translating:Shapado|Shapado]] is web-based
Question and Answer software',
- 'translate-group-desc-tsint' = 'A message group for
[[Translating:Toolserver|Toolserver Intuition]], the i18n system for
[//toolserver.org Toolserver] tools (span class=plainlinks[[Translating
talk:Toolserver|support]]/span)',
+ 'translate-group-desc-tsint' = 'A message group for
[[Translating:Intuition|Intuition]], the i18n system for [//toolserver.org
Toolserver] tools (span class=plainlinks[[Translating
talk:Intuition|support]]/span)',
'translate-group-desc-vicuna' =
'[[Translating:VicuñaUploader|VicuñaUploader]] is a tool to upload files to
Wikimedia Commons and other Wikimedia projects',
'translate-group-desc-waymarked-trails' = '[[Translating:Waymarked
Trails|Waymarked Trails]] is a service showing routes for hiking, cycling,
mountain biking and inline skating around the world. It uses the GNU GPL
license',
'bw-desc-wikiblame' = '[[Translating:WikiBlame|WikiBlame]] is able to
quickly find the authors of a part of a page in a Wikimedia wiki',
diff --git a/_autoload.php b/_autoload.php
index 8e8c290..e728f16 100644
--- a/_autoload.php
+++ b/_autoload.php
@@ -117,7 +117,7 @@
* @{
*/
$wgAutoloadClasses['PremadeMediawikiExtensionGroups'] =
$dir/ffs/MediaWikiExtensions.php;
-$wgAutoloadClasses['PremadeToolserverTextdomains'] =
$dir/ffs/ToolserverTextdomains.php;
+$wgAutoloadClasses['PremadeIntuitionTextdomains'] =
$dir/ffs/IntuitionTextdomains.php;
/**@}*/
/**
diff --git a/ffs/ToolserverTextdomains.php b/ffs/IntuitionTextdomains.php
similarity index 85%
rename from ffs/ToolserverTextdomains.php
rename to ffs/IntuitionTextdomains.php
index 42a87c9..c6a0423 100644
--- a/ffs/ToolserverTextdomains.php
+++ b/ffs/IntuitionTextdomains.php
@@ -1,6 +1,6 @@
?php
/**
- * Class for Toolserver Intuition for Translatewiki.net
+ * Class for Intuition for Translatewiki.net
*
* @file
* @author Niklas Laxström
@@ -11,13 +11,13 @@
*/
/**
- * Support for tools using Toolserver Intuition at the Toolserver.
+ * Support for tools using Intuition at the Toolserver and Wikimedia Labs.
*/
-class PremadeToolserverTextdomains extends PremadeMediawikiExtensionGroups {
+class PremadeIntuitionTextdomains extends PremadeMediawikiExtensionGroups {
protected $useConfigure = false;
protected $groups;
protected $idPrefix = 'tsint-';
- protected $namespace = NS_TOOLSERVER;
+ protected $namespace = NS_INTUITION;
protected function processGroups( $groups ) {
$fixedGroups = array();
@@ -38,7 +38,7 @@
if ( isset( $g['file'] ) ) {
$file = $g['file'];
} else {
- // Toolserver Intuition text-domains are
case-insensitive and internally
+ // Intuition text-domains are case-insensitive
and internally
// converts to lowercase names starting with a
capital letter.
// eg. MyTool - Mytool.i18n.php
// No subdirectories!
@@ -58,7 +58,7 @@
}
$newgroup = array(
- 'name' = 'Toolserver - ' . $name,
+ 'name' = 'Intuition - ' . $name,
'file' = $file,
'descmsg' = $descmsg,
'url' = $url,
--
To view, visit https://gerrit.wikimedia.org/r/87341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I634f247728ae732bc0d0951404cccf8d146d405a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing
[MediaWiki-commits] [Gerrit] Add 'MemoryAlpha' namespace for parser tests. - change (mediawiki...Parsoid)
jenkins-bot has submitted this change and it was merged. Change subject: Add 'MemoryAlpha' namespace for parser tests. .. Add 'MemoryAlpha' namespace for parser tests. Bug: 51680 Change-Id: I06a173976a69fb659fdb9fef285e36e2a10f7d08 --- M js/tests/parserTests.js 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Marcoil: Looks good to me, approved jenkins-bot: Verified diff --git a/js/tests/parserTests.js b/js/tests/parserTests.js index 10b470f..289fa00 100755 --- a/js/tests/parserTests.js +++ b/js/tests/parserTests.js @@ -1667,6 +1667,10 @@ // expect the old value (as set in parserTest.inc:setupDatabase()) this.env.conf.wiki.interwikiMap.meatball.url = 'http://www.usemod.com/cgi-bin/mb.pl?$1'; + // Add 'MemoryAlpha' namespace (bug 51680) + this.env.conf.wiki.namespaceNames['100'] = 'MemoryAlpha'; + this.env.conf.wiki.namespaceIds.memoryalpha = + this.env.conf.wiki.canonicalNamespaces.memoryalpha = 100; async.series( this.buildTasks( item, targetModes, options ), nextCallback ); -- To view, visit https://gerrit.wikimedia.org/r/87272 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I06a173976a69fb659fdb9fef285e36e2a10f7d08 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Parsoid Gerrit-Branch: master Gerrit-Owner: Cscott canan...@wikimedia.org Gerrit-Reviewer: Marcoil marc...@wikimedia.org Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename Toolserver to Intuition - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Rename Toolserver to Intuition
..
Rename Toolserver to Intuition
Change-Id: I7ee78e0a38f344d92b276f380516c2e3b0c2c6a6
---
M REPOCONF
M TranslateSettings.php
M bin/repocommit
M bin/repocreate
M bin/repoexport
M bin/repoupdate
M bin/stats-toolserver
M bin/update-externals
A groups/Intuition/IntuitionAgg.yaml
A groups/Intuition/README
R groups/Intuition/intuition-textdomains.txt
D groups/Toolserver/README
D groups/Toolserver/ToolserverAgg.yaml
13 files changed, 51 insertions(+), 54 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/REPOCONF b/REPOCONF
index 171895e..a6cdc0a 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -18,6 +18,7 @@
REPO_IHRIS=http://bazaar.launchpad.net/~intrahealth%2Binformatics
REPO_IHRIS_BRANCH=4.1-dev
REPO_IHRIS_MODULES=i2ce ihris-common ihris-manage ihris-qualify
+REPO_INTUITION=git://github.com/Krinkle/TsIntuition.git
REPO_JQUERY_ULS=git://github.com/wikimedia/jquery.uls.git
REPO_KIWIX=git://git.code.sf.net/p/kiwix/maintenance
REPO_MANTIS=git://github.com/mantisbt/mantisbt.git
@@ -34,7 +35,6 @@
REPO_POTLATCH2=git://github.com/systemed/potlatch2.git
REPO_PYWIKIPEDIA=https://gerrit.wikimedia.org/r/pywikibot/i18n
REPO_SHAPADO=git://gitorious.org/shapado/shapado.git
-REPO_TOOLSERVER=git://github.com/Krinkle/TsIntuition.git
REPO_VICUNA=git://github.com/yarl/vicuna.git
REPO_WAYMARKEDTRAILS=git://github.com/lonvia/waymarked-trails-site.git
REPO_WIKIA=git://github.com/Wikia/app.git
diff --git a/TranslateSettings.php b/TranslateSettings.php
index 12443c7..e50b8b1 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -207,14 +207,14 @@
return true;
}
-$wgHooks['TranslatePostInitGroups'][] = array( 'setupToolserver' );
-function setupToolserver( $list, $deps, $autoload ) {
+$wgHooks['TranslatePostInitGroups'][] = array( 'setupIntuition' );
+function setupIntuition( $list, $deps, $autoload ) {
global $GROUPS;
- $def = $GROUPS/Toolserver/toolserver-textdomains.txt;
- $path = '%GROUPROOT%/toolserver/language/messages/';
+ $def = $GROUPS/Intuition/intuition-textdomains.txt;
+ $path = '%GROUPROOT%/intuition/language/messages/';
- $foo = new PremadeToolserverTextdomains( $def, $path );
+ $foo = new PremadeIntuitionTextdomains( $def, $path );
$foo-register( $list, $deps, $autoload );
return true;
@@ -373,8 +373,8 @@
wfAddNamespace( 1238, 'Pywikipedia' );
$wgTranslateGroupFiles[] = $GROUPS/Pywikipedia/Pywikipedia.yaml;
-wfAddNamespace( 1240, 'Toolserver' );
-$wgTranslateGroupFiles[] = $GROUPS/Toolserver/ToolserverAgg.yaml;
+wfAddNamespace( 1240, 'Intuition' );
+$wgTranslateGroupFiles[] = $GROUPS/Intuition/IntuitionAgg.yaml;
wfAddNamespace( 1242, 'EOL' );
$wgTranslateGroupFiles[] = $GROUPS/EOL/EOL.yaml;
diff --git a/bin/repocommit b/bin/repocommit
index e7cf112..f2a022c 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -44,6 +44,7 @@
freecol \
frontlinesms \
fuel \
+intuition \
jquery.uls \
kiwix \
mantis \
@@ -51,7 +52,6 @@
mifos \
pywikipedia \
shapado \
-toolserver \
vicuna \
waymarked-trails-site \
wikia \
diff --git a/bin/repocreate b/bin/repocreate
index fec145d..629ec11 100755
--- a/bin/repocreate
+++ b/bin/repocreate
@@ -98,6 +98,13 @@
fi
done
+elif [ $PROJECT = intuition ]
+then
+ if [ -z $REPO_INTUITION ]
+ then echo Add REPO_INTUITION to REPOCONF; exit 1
+ fi
+ git clone $REPO_INTUITION $PROJECT
+
elif [ $PROJECT = jquery.uls ]
then
if [ -z $REPO_JQUERY_ULS ]
@@ -191,8 +198,8 @@
mkdir en
cd en
ln -s ../mozilla-aurora/browser/locales/en-US/ browser
- ln -s ..//mozilla-aurora/toolkit/locales/en-US/ toolkit
- ln -s ..//mozilla-aurora/dom/locales/en-US dom
+ ln -s ../mozilla-aurora/toolkit/locales/en-US/ toolkit
+ ln -s ../mozilla-aurora/dom/locales/en-US dom
mkdir security
cd security
ln -s ../../mozilla-aurora/security/manager/locales/en-US
manager
@@ -285,13 +292,6 @@
then echo Add REPO_MIFOS to REPOCONF; exit 1
fi
git clone $REPO_SHAPADO $PROJECT
-
-elif [ $PROJECT = toolserver ]
-then
- if [ -z $REPO_TOOLSERVER ]
- then echo Add REPO_TOOLSERVER to REPOCONF; exit 1
- fi
- git clone $REPO_TOOLSERVER $PROJECT
elif [ $PROJECT = vicuna ]
then
diff --git a/bin/repoexport b/bin/repoexport
index b334ba1..cdc093d 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -59,6 +59,10 @@
then
php $EXPORTER --target . --group=out-ihris* --lang='*' --skip en,qqq
$THRESHOLD --ppgettext=/resources/projects
+elif [ $PROJECT = intuition ]
+then
+ php $EXPORTER --target . --group=tsint* --lang '*' --skip en
[MediaWiki-commits] [Gerrit] assert(ip) is stupid, fails on 0.0.0.0 - change (operations...libvmod-netmapper)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87342
Change subject: assert(ip) is stupid, fails on 0.0.0.0
..
assert(ip) is stupid, fails on 0.0.0.0
Change-Id: I53d31ed70446bb24a4eac88cbeea365f882f8ff6
---
M src/nlt/ntree.c
1 file changed, 1 insertion(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-netmapper
refs/changes/42/87342/1
diff --git a/src/nlt/ntree.c b/src/nlt/ntree.c
index 2e050d8..7cef9da 100644
--- a/src/nlt/ntree.c
+++ b/src/nlt/ntree.c
@@ -114,8 +114,7 @@
}
static unsigned ntree_lookup_v4(const ntree_t* tree, const uint32_t ip) {
-assert(tree); assert(ip);
-assert(tree-ipv4);
+assert(tree); assert(tree-ipv4);
unsigned chkbit = 0;
unsigned offset = tree-ipv4;
--
To view, visit https://gerrit.wikimedia.org/r/87342
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I53d31ed70446bb24a4eac88cbeea365f882f8ff6
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-netmapper
Gerrit-Branch: master
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename Toolserver to Intuition - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Rename Toolserver to Intuition
..
Rename Toolserver to Intuition
Change-Id: I634f247728ae732bc0d0951404cccf8d146d405a
---
M TranslateGroupDescriptions.i18n.php
M _autoload.php
R ffs/IntuitionTextdomains.php
3 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TranslateGroupDescriptions.i18n.php
b/TranslateGroupDescriptions.i18n.php
index a2ea013..00fcf9d 100644
--- a/TranslateGroupDescriptions.i18n.php
+++ b/TranslateGroupDescriptions.i18n.php
@@ -53,7 +53,7 @@
'translate-group-desc-potlatch2' =
'[[Translating:OpenStreetMap|Potlatch2]] is a Flash-based OpenStreetMap editor',
'translate-group-desc-pywikipedia' =
'[[Translating:Pywikibot|Pywikibot]] is a collection of tools to edit
Wikipedia',
'bw-desc-shapado' = '[[Translating:Shapado|Shapado]] is web-based
Question and Answer software',
- 'translate-group-desc-tsint' = 'A message group for
[[Translating:Toolserver|Toolserver Intuition]], the i18n system for
[//toolserver.org Toolserver] tools (span class=plainlinks[[Translating
talk:Toolserver|support]]/span)',
+ 'translate-group-desc-tsint' = 'A message group for
[[Translating:Intuition|Intuition]], the i18n system for [//toolserver.org
Toolserver] tools (span class=plainlinks[[Translating
talk:Intuition|support]]/span)',
'translate-group-desc-vicuna' =
'[[Translating:VicuñaUploader|VicuñaUploader]] is a tool to upload files to
Wikimedia Commons and other Wikimedia projects',
'translate-group-desc-waymarked-trails' = '[[Translating:Waymarked
Trails|Waymarked Trails]] is a service showing routes for hiking, cycling,
mountain biking and inline skating around the world. It uses the GNU GPL
license',
'bw-desc-wikiblame' = '[[Translating:WikiBlame|WikiBlame]] is able to
quickly find the authors of a part of a page in a Wikimedia wiki',
diff --git a/_autoload.php b/_autoload.php
index 8e8c290..e728f16 100644
--- a/_autoload.php
+++ b/_autoload.php
@@ -117,7 +117,7 @@
* @{
*/
$wgAutoloadClasses['PremadeMediawikiExtensionGroups'] =
$dir/ffs/MediaWikiExtensions.php;
-$wgAutoloadClasses['PremadeToolserverTextdomains'] =
$dir/ffs/ToolserverTextdomains.php;
+$wgAutoloadClasses['PremadeIntuitionTextdomains'] =
$dir/ffs/IntuitionTextdomains.php;
/**@}*/
/**
diff --git a/ffs/ToolserverTextdomains.php b/ffs/IntuitionTextdomains.php
similarity index 85%
rename from ffs/ToolserverTextdomains.php
rename to ffs/IntuitionTextdomains.php
index 42a87c9..c6a0423 100644
--- a/ffs/ToolserverTextdomains.php
+++ b/ffs/IntuitionTextdomains.php
@@ -1,6 +1,6 @@
?php
/**
- * Class for Toolserver Intuition for Translatewiki.net
+ * Class for Intuition for Translatewiki.net
*
* @file
* @author Niklas Laxström
@@ -11,13 +11,13 @@
*/
/**
- * Support for tools using Toolserver Intuition at the Toolserver.
+ * Support for tools using Intuition at the Toolserver and Wikimedia Labs.
*/
-class PremadeToolserverTextdomains extends PremadeMediawikiExtensionGroups {
+class PremadeIntuitionTextdomains extends PremadeMediawikiExtensionGroups {
protected $useConfigure = false;
protected $groups;
protected $idPrefix = 'tsint-';
- protected $namespace = NS_TOOLSERVER;
+ protected $namespace = NS_INTUITION;
protected function processGroups( $groups ) {
$fixedGroups = array();
@@ -38,7 +38,7 @@
if ( isset( $g['file'] ) ) {
$file = $g['file'];
} else {
- // Toolserver Intuition text-domains are
case-insensitive and internally
+ // Intuition text-domains are case-insensitive
and internally
// converts to lowercase names starting with a
capital letter.
// eg. MyTool - Mytool.i18n.php
// No subdirectories!
@@ -58,7 +58,7 @@
}
$newgroup = array(
- 'name' = 'Toolserver - ' . $name,
+ 'name' = 'Intuition - ' . $name,
'file' = $file,
'descmsg' = $descmsg,
'url' = $url,
--
To view, visit https://gerrit.wikimedia.org/r/87341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I634f247728ae732bc0d0951404cccf8d146d405a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
[MediaWiki-commits] [Gerrit] Sync up with Parsoid parserTests. - change (mediawiki/core)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87343
Change subject: Sync up with Parsoid parserTests.
..
Sync up with Parsoid parserTests.
This now aligns with Parsoid commit 3d6d0723f93e2a838df717b5036e5cd6b0345eca
Change-Id: Iadc98cc4cc33c7725e5fbf4a16df7e1a898aee80
---
M tests/parser/parserTests.txt
1 file changed, 206 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/43/87343/1
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index e21ee3d..3266b16 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -17035,6 +17035,29 @@
b/p
!! end
+ --- Behavior Switches
+!! test
+1. Valid behavior switches should be escaped
+!! options
+parsoid=html2wt
+!! input
+nowiki__TOC__/nowiki
+!! result
+__TOC__
+!! end
+
+!! test
+2. Invalid behavior switches should not be escaped
+!! options
+parsoid=html2wt
+!! input
+__TOO__
+__|__
+!! result
+__TOO__
+__|__
+!! end
+
--- HTML tags ---
1. a tags
2. other tags
@@ -17499,6 +17522,176 @@
table/table
!!end
+!!test
+Encapsulation properly handles null DSR information from foster box
+!!options
+parsoid=wt2html,wt2wt
+!!input
+{{echo|tablefootrtdbar/td/tr/table}}
+!!result
+span typeof=mw:Transclusion
data-mw={quot;partsquot;:[{quot;templatequot;:{quot;targetquot;:{quot;wtquot;:quot;echoquot;,quot;hrefquot;:quot;./Template:Echoquot;},quot;paramsquot;:{quot;1quot;:{quot;wtquot;:quot;
+tablefoo
+tr
+tdbar/td/tr/tablequot;}},quot;iquot;:0}}]}foo/span
+table
+tbody
+tr
+tdbar/td/tr/tbody/table
+!!end
+
+!!test
+1. Encapsulate foster-parented transclusion content
+!!options
+parsoid=wt2wt,wt2html
+!!input
+table{{echo|footrtdbar/td/tr}}/table
+!!result
+span typeof=mw:Transclusion data-mw={quot;partsquot;:[quot;
+tablequot;,{quot;templatequot;:{quot;targetquot;:{quot;wtquot;:quot;echoquot;,quot;hrefquot;:quot;./Template:Echoquot;},quot;paramsquot;:{quot;1quot;:{quot;wtquot;:quot;foo
+tr
+tdbar/td/trquot;}},quot;iquot;:0}},quot;/tablequot;]}foo/span
+table
+tbody
+tr
+tdbar/td/tr/tbody/table
+!!end
+
+!!test
+2. Encapsulate foster-parented transclusion content
+!!options
+parsoid=wt2wt,wt2html
+!!input
+tablediv{{echo|foo}}/divtrtdbar/td/tr/table
+!!result
+div typeof=mw:Transclusion data-mw={quot;partsquot;:[quot;
+table
+divquot;,{quot;templatequot;:{quot;targetquot;:{quot;wtquot;:quot;echoquot;,quot;hrefquot;:quot;./Template:Echoquot;},quot;paramsquot;:{quot;1quot;:{quot;wtquot;:quot;fooquot;}},quot;iquot;:0}},quot;/div
+tr
+tdbar/td/tr/tablequot;]}foo/div
+table
+tbody
+tr
+tdbar/td/tr/tbody/table
+!!end
+
+!!test
+3. Encapsulate foster-parented transclusion content
+!!options
+parsoid=wt2wt,wt2html
+!!input
+tabledivp{{echo|foo/p/divtrtd}}bar/td/tr/table
+!!result
+div typeof=mw:Transclusion data-mw={quot;partsquot;:[quot;
+table
+div
+pquot;,{quot;templatequot;:{quot;targetquot;:{quot;wtquot;:quot;echoquot;,quot;hrefquot;:quot;./Template:Echoquot;},quot;paramsquot;:{quot;1quot;:{quot;wtquot;:quot;foo/p/div
+tr
+tdquot;}},quot;iquot;:0}},quot;bar/td/tr/tablequot;]}
+pfoo/p/div
+table
+tbody
+tr
+tdbar/td/tr/tbody/table
+!!end
+
+!!test
+4. Encapsulate foster-parented transclusion content
+!!options
+parsoid=wt2wt,wt2html
+!!input
+tabledivp{{echo|foo/p/divtrtd}}bar/td/tr/table
+!!result
+div typeof=mw:Transclusion data-mw={quot;partsquot;:[quot;
+table
+div
+pquot;,{quot;templatequot;:{quot;targetquot;:{quot;wtquot;:quot;echoquot;,quot;hrefquot;:quot;./Template:Echoquot;},quot;paramsquot;:{quot;1quot;:{quot;wtquot;:quot;foo/p/div
+tr
+tdquot;}},quot;iquot;:0}},quot;bar/td/tr/tablequot;]}
+pfoo/p/div
+table
+tbody
+tr
+tdbar/td/tr/tbody/table
+!!end
+
+!!test
+5. Encapsulate foster-parented transclusion content
+!!options
+parsoid=wt2wt,wt2html
+!!input
+tabletrtddivp{{echo|foo/p/div/tdfoo}}/tr/table
+!!result
+span typeof=mw:Transclusion data-mw={quot;partsquot;:[quot;
+table
+tr
+td
+div
+pquot;,{quot;templatequot;:{quot;targetquot;:{quot;wtquot;:quot;echoquot;,quot;hrefquot;:quot;./Template:Echoquot;},quot;paramsquot;:{quot;1quot;:{quot;wtquot;:quot;foo/p/div/tdfooquot;}},quot;iquot;:0}},quot;/tr/tablequot;]}foo/span
+table
+tbody
+tr
+td
+div
+pfoo/p/div/td/tr/tbody/table
+!!end
+
+!!test
+6. Encapsulate foster-parented transclusion content
+!!options
+parsoid=wt2wt,wt2html
+!!input
+tabletrtddivp{{echo|foo/p/div/tdfoo/tr/table}}pok/p
+!!result
+span typeof=mw:Transclusion data-mw={quot;partsquot;:[quot;
+table
+tr
+td
+div
+pquot;,{quot;templatequot;:{quot;targetquot;:{quot;wtquot;:quot;echoquot;,quot;hrefquot;:quot;./Template:Echoquot;},quot;paramsquot;:{quot;1quot;:{quot;wtquot;:quot;foo/p/div/tdfoo/tr/tablequot;}},quot;iquot;:0}}]}foo/span
+table
+tbody
+tr
+td
+div
+pfoo/p/div/td/tr/tbody/table
+pok/p
+!!end
+
+!!test
+7. Encapsulate foster-parented transclusion
[MediaWiki-commits] [Gerrit] assert(ip) is stupid, fails on 0.0.0.0 - change (operations...libvmod-netmapper)
BBlack has submitted this change and it was merged.
Change subject: assert(ip) is stupid, fails on 0.0.0.0
..
assert(ip) is stupid, fails on 0.0.0.0
Change-Id: I53d31ed70446bb24a4eac88cbeea365f882f8ff6
---
M src/nlt/ntree.c
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/src/nlt/ntree.c b/src/nlt/ntree.c
index 2e050d8..7cef9da 100644
--- a/src/nlt/ntree.c
+++ b/src/nlt/ntree.c
@@ -114,8 +114,7 @@
}
static unsigned ntree_lookup_v4(const ntree_t* tree, const uint32_t ip) {
-assert(tree); assert(ip);
-assert(tree-ipv4);
+assert(tree); assert(tree-ipv4);
unsigned chkbit = 0;
unsigned offset = tree-ipv4;
--
To view, visit https://gerrit.wikimedia.org/r/87342
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I53d31ed70446bb24a4eac88cbeea365f882f8ff6
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-netmapper
Gerrit-Branch: master
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync up with Parsoid parserTests. - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync up with Parsoid parserTests.
..
Sync up with Parsoid parserTests.
This now aligns with Parsoid commit 3d6d0723f93e2a838df717b5036e5cd6b0345eca
Change-Id: Iadc98cc4cc33c7725e5fbf4a16df7e1a898aee80
---
M tests/parser/parserTests.txt
1 file changed, 206 insertions(+), 4 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index e21ee3d..3266b16 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -17035,6 +17035,29 @@
b/p
!! end
+ --- Behavior Switches
+!! test
+1. Valid behavior switches should be escaped
+!! options
+parsoid=html2wt
+!! input
+nowiki__TOC__/nowiki
+!! result
+__TOC__
+!! end
+
+!! test
+2. Invalid behavior switches should not be escaped
+!! options
+parsoid=html2wt
+!! input
+__TOO__
+__|__
+!! result
+__TOO__
+__|__
+!! end
+
--- HTML tags ---
1. a tags
2. other tags
@@ -17499,6 +17522,176 @@
table/table
!!end
+!!test
+Encapsulation properly handles null DSR information from foster box
+!!options
+parsoid=wt2html,wt2wt
+!!input
+{{echo|tablefootrtdbar/td/tr/table}}
+!!result
+span typeof=mw:Transclusion
data-mw={quot;partsquot;:[{quot;templatequot;:{quot;targetquot;:{quot;wtquot;:quot;echoquot;,quot;hrefquot;:quot;./Template:Echoquot;},quot;paramsquot;:{quot;1quot;:{quot;wtquot;:quot;
+tablefoo
+tr
+tdbar/td/tr/tablequot;}},quot;iquot;:0}}]}foo/span
+table
+tbody
+tr
+tdbar/td/tr/tbody/table
+!!end
+
+!!test
+1. Encapsulate foster-parented transclusion content
+!!options
+parsoid=wt2wt,wt2html
+!!input
+table{{echo|footrtdbar/td/tr}}/table
+!!result
+span typeof=mw:Transclusion data-mw={quot;partsquot;:[quot;
+tablequot;,{quot;templatequot;:{quot;targetquot;:{quot;wtquot;:quot;echoquot;,quot;hrefquot;:quot;./Template:Echoquot;},quot;paramsquot;:{quot;1quot;:{quot;wtquot;:quot;foo
+tr
+tdbar/td/trquot;}},quot;iquot;:0}},quot;/tablequot;]}foo/span
+table
+tbody
+tr
+tdbar/td/tr/tbody/table
+!!end
+
+!!test
+2. Encapsulate foster-parented transclusion content
+!!options
+parsoid=wt2wt,wt2html
+!!input
+tablediv{{echo|foo}}/divtrtdbar/td/tr/table
+!!result
+div typeof=mw:Transclusion data-mw={quot;partsquot;:[quot;
+table
+divquot;,{quot;templatequot;:{quot;targetquot;:{quot;wtquot;:quot;echoquot;,quot;hrefquot;:quot;./Template:Echoquot;},quot;paramsquot;:{quot;1quot;:{quot;wtquot;:quot;fooquot;}},quot;iquot;:0}},quot;/div
+tr
+tdbar/td/tr/tablequot;]}foo/div
+table
+tbody
+tr
+tdbar/td/tr/tbody/table
+!!end
+
+!!test
+3. Encapsulate foster-parented transclusion content
+!!options
+parsoid=wt2wt,wt2html
+!!input
+tabledivp{{echo|foo/p/divtrtd}}bar/td/tr/table
+!!result
+div typeof=mw:Transclusion data-mw={quot;partsquot;:[quot;
+table
+div
+pquot;,{quot;templatequot;:{quot;targetquot;:{quot;wtquot;:quot;echoquot;,quot;hrefquot;:quot;./Template:Echoquot;},quot;paramsquot;:{quot;1quot;:{quot;wtquot;:quot;foo/p/div
+tr
+tdquot;}},quot;iquot;:0}},quot;bar/td/tr/tablequot;]}
+pfoo/p/div
+table
+tbody
+tr
+tdbar/td/tr/tbody/table
+!!end
+
+!!test
+4. Encapsulate foster-parented transclusion content
+!!options
+parsoid=wt2wt,wt2html
+!!input
+tabledivp{{echo|foo/p/divtrtd}}bar/td/tr/table
+!!result
+div typeof=mw:Transclusion data-mw={quot;partsquot;:[quot;
+table
+div
+pquot;,{quot;templatequot;:{quot;targetquot;:{quot;wtquot;:quot;echoquot;,quot;hrefquot;:quot;./Template:Echoquot;},quot;paramsquot;:{quot;1quot;:{quot;wtquot;:quot;foo/p/div
+tr
+tdquot;}},quot;iquot;:0}},quot;bar/td/tr/tablequot;]}
+pfoo/p/div
+table
+tbody
+tr
+tdbar/td/tr/tbody/table
+!!end
+
+!!test
+5. Encapsulate foster-parented transclusion content
+!!options
+parsoid=wt2wt,wt2html
+!!input
+tabletrtddivp{{echo|foo/p/div/tdfoo}}/tr/table
+!!result
+span typeof=mw:Transclusion data-mw={quot;partsquot;:[quot;
+table
+tr
+td
+div
+pquot;,{quot;templatequot;:{quot;targetquot;:{quot;wtquot;:quot;echoquot;,quot;hrefquot;:quot;./Template:Echoquot;},quot;paramsquot;:{quot;1quot;:{quot;wtquot;:quot;foo/p/div/tdfooquot;}},quot;iquot;:0}},quot;/tr/tablequot;]}foo/span
+table
+tbody
+tr
+td
+div
+pfoo/p/div/td/tr/tbody/table
+!!end
+
+!!test
+6. Encapsulate foster-parented transclusion content
+!!options
+parsoid=wt2wt,wt2html
+!!input
+tabletrtddivp{{echo|foo/p/div/tdfoo/tr/table}}pok/p
+!!result
+span typeof=mw:Transclusion data-mw={quot;partsquot;:[quot;
+table
+tr
+td
+div
+pquot;,{quot;templatequot;:{quot;targetquot;:{quot;wtquot;:quot;echoquot;,quot;hrefquot;:quot;./Template:Echoquot;},quot;paramsquot;:{quot;1quot;:{quot;wtquot;:quot;foo/p/div/tdfoo/tr/tablequot;}},quot;iquot;:0}}]}foo/span
+table
+tbody
+tr
+td
+div
+pfoo/p/div/td/tr/tbody/table
+pok/p
+!!end
+
+!!test
+7. Encapsulate foster-parented transclusion content
+!!options
[MediaWiki-commits] [Gerrit] Keep old Toolserver namespace as alias - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/87344 Change subject: Keep old Toolserver namespace as alias .. Keep old Toolserver namespace as alias Change-Id: Ic0bacdacd43f2ae28312874718c35208ac62b8b3 --- M TranslatewikiSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/44/87344/1 diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php index 8457647..57aa632 100644 --- a/TranslatewikiSettings.php +++ b/TranslatewikiSettings.php @@ -107,6 +107,8 @@ $wgNamespaceAliases['Betawiki'] = NS_PROJECT; $wgNamespaceAliases['Betawiki_talk'] = NS_PROJECT_TALK; +$wgNamespaceAliases['Toolserver'] = NS_INTUITION; +$wgNamespaceAliases['Toolserver_talk'] = NS_INTUITION_TALK; $wgMetaNamespace = 'Project'; define( NS_PORTAL, 100 ); -- To view, visit https://gerrit.wikimedia.org/r/87344 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0bacdacd43f2ae28312874718c35208ac62b8b3 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...Parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87346
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit bc97a03f06bfb4bfd33cd2ec2a127c2f607e34e2.
Change-Id: Ic21439a6b65eff1d0f9ce9ab4a9f9bb66f9ed0eb
---
M js/tests/fetch-parserTests.txt.js
M js/tests/parserTests.txt
2 files changed, 18 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/46/87346/1
diff --git a/js/tests/fetch-parserTests.txt.js
b/js/tests/fetch-parserTests.txt.js
index 056a741..a8d6318 100755
--- a/js/tests/fetch-parserTests.txt.js
+++ b/js/tests/fetch-parserTests.txt.js
@@ -10,9 +10,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = d5f8745cfeb34ce00762a47f0ed883c9c98b4b56;
+var expectedSHA1 = 49478d2615f9f51c78b5a9b941015887817715ba;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = e450b18e09b90a67dcd8f216216c9fa7c0752038;
+var latestCommit = bc97a03f06bfb4bfd33cd2ec2a127c2f607e34e2;
var fs = require('fs'),
path = require('path'),
diff --git a/js/tests/parserTests.txt b/js/tests/parserTests.txt
index b2919dc..3266b16 100644
--- a/js/tests/parserTests.txt
+++ b/js/tests/parserTests.txt
@@ -4634,6 +4634,22 @@
/p
!! end
+!! article
+MemoryAlpha:AlphaTest
+!! text
+This is an article in the MemoryAlpha namespace
+(which shadows the memoryalpha interwiki link).
+!! endarticle
+
+!! test
+Namespace takes precedence over interwiki link (bug 51680)
+!! input
+[[MemoryAlpha:AlphaTest]]
+!! result
+pa href=/wiki/MemoryAlpha:AlphaTest
title=MemoryAlpha:AlphaTestMemoryAlpha:AlphaTest/a
+/p
+!! end
+
!! test
Piped link to namespace
!! input
--
To view, visit https://gerrit.wikimedia.org/r/87346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic21439a6b65eff1d0f9ce9ab4a9f9bb66f9ed0eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow appending text to redirects from moved pages - change (mediawiki/core)
Jackmcbarn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87345
Change subject: Allow appending text to redirects from moved pages
..
Allow appending text to redirects from moved pages
Add message move-redirect-text, which is appended to redirects created by
page moves (empty by default). This could be used on enwiki to automatically
add {{R from move}} while still allowing non-admins to revert the move, for
example.
Change-Id: Ic2158897ce46177b695a7fb90c8ed3349df18bde
---
M includes/Title.php
M includes/content/ContentHandler.php
M includes/content/WikitextContentHandler.php
M languages/messages/MessagesEn.php
M maintenance/language/messageTypes.inc
M maintenance/language/messages.inc
6 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/45/87345/1
diff --git a/includes/Title.php b/includes/Title.php
index cdbebf1..2bd2a96 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -3840,7 +3840,7 @@
if ( $createRedirect ) {
$contentHandler = ContentHandler::getForTitle( $this );
- $redirectContent =
$contentHandler-makeRedirectContent( $nt );
+ $redirectContent =
$contentHandler-makeRedirectContent( $nt, wfMessage( 'move-redirect-text'
)-plain() );
// NOTE: If this page's content model does not support
redirects, $redirectContent will be null.
} else {
diff --git a/includes/content/ContentHandler.php
b/includes/content/ContentHandler.php
index 2de8408..29e3ac6 100644
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -449,10 +449,11 @@
* @since 1.21
*
* @param Title $destination the page to redirect to.
+* @param $text string text to include in the redirect, if possible.
*
* @return Content
*/
- public function makeRedirectContent( Title $destination ) {
+ public function makeRedirectContent( Title $destination, $text = '' ) {
return null;
}
diff --git a/includes/content/WikitextContentHandler.php
b/includes/content/WikitextContentHandler.php
index 8be85bc..7310fca 100644
--- a/includes/content/WikitextContentHandler.php
+++ b/includes/content/WikitextContentHandler.php
@@ -55,10 +55,11 @@
* @see ContentHandler::makeRedirectContent
*
* @param Title $destination the page to redirect to.
+* @param $text string text to include in the redirect, if possible.
*
* @return Content
*/
- public function makeRedirectContent( Title $destination ) {
+ public function makeRedirectContent( Title $destination, $text = '' ) {
$optionalColon = '';
if ( $destination-getNamespace() == NS_CATEGORY ) {
@@ -72,6 +73,9 @@
$mwRedir = MagicWord::get( 'redirect' );
$redirectText = $mwRedir-getSynonym( 0 ) . ' [[' .
$optionalColon . $destination-getFullText() . ']]';
+ if($text != '') {
+ $redirectText .= ' ' . $text;
+ }
return new WikitextContent( $redirectText );
}
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 87f729f..d6f1f6a 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3499,6 +3499,7 @@
'movesubpagetext' = 'This page has $1
{{PLURAL:$1|subpage|subpages}} shown below.',
'movenosubpage'= 'This page has no subpages.',
'movereason' = 'Reason:',
+'move-redirect-text' = '', # do not translate or duplicate this
message to other languages
'revertmove' = 'revert',
'delete_and_move' = 'Delete and move',
'delete_and_move_text' = '== Deletion required ==
diff --git a/maintenance/language/messageTypes.inc
b/maintenance/language/messageTypes.inc
index c153fa7..d47138d 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -261,6 +261,7 @@
'redirect-text',
'edithelppage',
'autocomment-prefix',
+ 'move-redirect-text',
);
/** Optional messages, which may be translated only if changed in the target
language. */
diff --git a/maintenance/language/messages.inc
b/maintenance/language/messages.inc
index 65933f3..e21b3c7 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2448,6 +2448,7 @@
'movesubpagetext',
'movenosubpage',
'movereason',
+ 'move-redirect-text',
'revertmove',
'delete_and_move',
'delete_and_move_text',
--
To view, visit https://gerrit.wikimedia.org/r/87345
To
[MediaWiki-commits] [Gerrit] Print/export open by default on test2wiki. see Bug 54886 for... - change (qa/browsertests)
Zfilipin has submitted this change and it was merged. Change subject: Print/export open by default on test2wiki. see Bug 54886 for beta .. Print/export open by default on test2wiki. see Bug 54886 for beta Change-Id: I9fd071b48be59753215b8bcafd62302df3fcb985 --- M features/pdf.feature M features/print_export_menu.feature M features/step_definitions/print_export_menu_steps.rb 3 files changed, 9 insertions(+), 9 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/features/pdf.feature b/features/pdf.feature index 2aacc41..9bb18f1 100644 --- a/features/pdf.feature +++ b/features/pdf.feature @@ -3,11 +3,9 @@ Scenario: Check for Download as PDF link Given I am at random page -When I click Print/export Then Download as PDF should be present Scenario: Click on Download as PDF link Given I am at random page -When I click Print/export - And I click on Download as PDF +When I click on Download as PDF Then Download the file link should be present diff --git a/features/print_export_menu.feature b/features/print_export_menu.feature index d3f06cd..deb69b9 100644 --- a/features/print_export_menu.feature +++ b/features/print_export_menu.feature @@ -1,17 +1,17 @@ @en.wikipedia.beta.wmflabs.org @test2.wikipedia.org Feature: Print/Export menu Expand and Collapse - Scenario: Check for Print/export section Collapsed -Given I am at random page -Then Print/export section should be collapsed - Scenario: Check for Print/export section Expanded Given I am at random page -When I click Print/export Then Print/export section should be expanded + + Scenario: Check for Print/export section Collapsed +Given I am at random page +When I click Print/export +Then Print/export section should be collapsed Scenario: Print/export section collapses after it is expanded Given I am at random page When I click Print/export And I click Print/export again -Then Print/export section should be collapsed +Then Print/export section should be expanded diff --git a/features/step_definitions/print_export_menu_steps.rb b/features/step_definitions/print_export_menu_steps.rb index 828336c..a3efd21 100644 --- a/features/step_definitions/print_export_menu_steps.rb +++ b/features/step_definitions/print_export_menu_steps.rb @@ -1,5 +1,6 @@ Then(/^Print\/export section should be collapsed$/) do on(RandomPage) do |page| +sleep 1 page.create_a_book_element.should_not be_visible page.download_as_pdf_element.should_not be_visible page.printable_version_element.should_not be_visible @@ -8,6 +9,7 @@ Then(/^Print\/export section should be expanded$/) do on(RandomPage) do |page| +sleep 1 page.create_a_book_element.should be_visible page.download_as_pdf_element.should be_visible page.printable_version_element.should be_visible -- To view, visit https://gerrit.wikimedia.org/r/87198 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9fd071b48be59753215b8bcafd62302df3fcb985 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bump netmapper patch to netmapper:b62b6c7a for assert(ip) fix - change (operations...varnish)
BBlack has submitted this change and it was merged.
Change subject: bump netmapper patch to netmapper:b62b6c7a for assert(ip) fix
..
bump netmapper patch to netmapper:b62b6c7a for assert(ip) fix
Change-Id: Ied267224d410864840b6e239cd03a7e0a27b67df
---
M debian/patches/0098-libvmod-netmapper-src.patch
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/debian/patches/0098-libvmod-netmapper-src.patch
b/debian/patches/0098-libvmod-netmapper-src.patch
index ccdbfc9..f826b44 100644
--- a/debian/patches/0098-libvmod-netmapper-src.patch
+++ b/debian/patches/0098-libvmod-netmapper-src.patch
@@ -1588,10 +1588,10 @@
+#endif // NLIST_H
diff --git a/lib/libvmod_netmapper/src/nlt/ntree.c
b/lib/libvmod_netmapper/src/nlt/ntree.c
new file mode 100644
-index 000..2e050d8
+index 000..7cef9da
--- /dev/null
+++ b/lib/libvmod_netmapper/src/nlt/ntree.c
-@@ -0,0 +1,177 @@
+@@ -0,0 +1,176 @@
+/* Copyright © 2012 Brandon L Black blbl...@gmail.com
+ *
+ * This file is part of gdnsd-plugin-geoip.
@@ -1708,8 +1708,7 @@
+}
+
+static unsigned ntree_lookup_v4(const ntree_t* tree, const uint32_t ip) {
-+assert(tree); assert(ip);
-+assert(tree-ipv4);
++assert(tree); assert(tree-ipv4);
+
+unsigned chkbit = 0;
+unsigned offset = tree-ipv4;
--
To view, visit https://gerrit.wikimedia.org/r/87347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied267224d410864840b6e239cd03a7e0a27b67df
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/varnish
Gerrit-Branch: testing/3.0.3plus-rc1
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish (3.0.3plus~rc1-wm17) precise; urgency=low - change (operations...varnish)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/87348 Change subject: varnish (3.0.3plus~rc1-wm17) precise; urgency=low .. varnish (3.0.3plus~rc1-wm17) precise; urgency=low * Update netmapper from b62b6c7a Change-Id: I2283e880cfbf5bb13d6874b1950d82adc9cc3d60 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish refs/changes/48/87348/1 diff --git a/debian/changelog b/debian/changelog index 43e0f0c..baed245 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +varnish (3.0.3plus~rc1-wm17) precise; urgency=low + + * Update netmapper from b62b6c7a + + -- Brandon Black bbl...@wikimedia.org Thu, 03 Oct 2013 15:19:46 + + varnish (3.0.3plus~rc1-wm16) precise; urgency=low * Fix netmapper library deps -- To view, visit https://gerrit.wikimedia.org/r/87348 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2283e880cfbf5bb13d6874b1950d82adc9cc3d60 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish Gerrit-Branch: testing/3.0.3plus-rc1 Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bump netmapper patch to netmapper:b62b6c7a for assert(ip) fix - change (operations...varnish)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87347
Change subject: bump netmapper patch to netmapper:b62b6c7a for assert(ip) fix
..
bump netmapper patch to netmapper:b62b6c7a for assert(ip) fix
Change-Id: Ied267224d410864840b6e239cd03a7e0a27b67df
---
M debian/patches/0098-libvmod-netmapper-src.patch
1 file changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish
refs/changes/47/87347/1
diff --git a/debian/patches/0098-libvmod-netmapper-src.patch
b/debian/patches/0098-libvmod-netmapper-src.patch
index ccdbfc9..f826b44 100644
--- a/debian/patches/0098-libvmod-netmapper-src.patch
+++ b/debian/patches/0098-libvmod-netmapper-src.patch
@@ -1588,10 +1588,10 @@
+#endif // NLIST_H
diff --git a/lib/libvmod_netmapper/src/nlt/ntree.c
b/lib/libvmod_netmapper/src/nlt/ntree.c
new file mode 100644
-index 000..2e050d8
+index 000..7cef9da
--- /dev/null
+++ b/lib/libvmod_netmapper/src/nlt/ntree.c
-@@ -0,0 +1,177 @@
+@@ -0,0 +1,176 @@
+/* Copyright © 2012 Brandon L Black blbl...@gmail.com
+ *
+ * This file is part of gdnsd-plugin-geoip.
@@ -1708,8 +1708,7 @@
+}
+
+static unsigned ntree_lookup_v4(const ntree_t* tree, const uint32_t ip) {
-+assert(tree); assert(ip);
-+assert(tree-ipv4);
++assert(tree); assert(tree-ipv4);
+
+unsigned chkbit = 0;
+unsigned offset = tree-ipv4;
--
To view, visit https://gerrit.wikimedia.org/r/87347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied267224d410864840b6e239cd03a7e0a27b67df
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/varnish
Gerrit-Branch: testing/3.0.3plus-rc1
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish (3.0.3plus~rc1-wm17) precise; urgency=low - change (operations...varnish)
BBlack has submitted this change and it was merged. Change subject: varnish (3.0.3plus~rc1-wm17) precise; urgency=low .. varnish (3.0.3plus~rc1-wm17) precise; urgency=low * Update netmapper from b62b6c7a Change-Id: I2283e880cfbf5bb13d6874b1950d82adc9cc3d60 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 43e0f0c..baed245 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +varnish (3.0.3plus~rc1-wm17) precise; urgency=low + + * Update netmapper from b62b6c7a + + -- Brandon Black bbl...@wikimedia.org Thu, 03 Oct 2013 15:19:46 + + varnish (3.0.3plus~rc1-wm16) precise; urgency=low * Fix netmapper library deps -- To view, visit https://gerrit.wikimedia.org/r/87348 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2283e880cfbf5bb13d6874b1950d82adc9cc3d60 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish Gerrit-Branch: testing/3.0.3plus-rc1 Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use HPHP_VERSION constant to detect HipHop - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Use HPHP_VERSION constant to detect HipHop
..
Use HPHP_VERSION constant to detect HipHop
Follows-up Ic3e769f1fbad4f7ad26dd819406796fee48c6b45.
Change-Id: I0210002c05efd79242b00592639b7be50a79020b
---
M includes/GlobalFunctions.php
M maintenance/Maintenance.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Parent5446: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 318b151..b11bce9b 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2459,7 +2459,7 @@
* @return Bool
*/
function wfIsHipHop() {
- return function_exists( 'hphp_thread_set_warmup_enabled' );
+ return defined( 'HPHP_VERSION' );
}
/**
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 0023c6d..1712b24 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -485,7 +485,7 @@
}
# Make sure we can handle script parameters
- if ( !function_exists( 'hphp_thread_set_warmup_enabled' )
!ini_get( 'register_argc_argv' ) ) {
+ if ( !defined( 'HPHP_VERSION' ) !ini_get(
'register_argc_argv' ) ) {
$this-error( 'Cannot get command line arguments,
register_argc_argv is set to false', true );
}
--
To view, visit https://gerrit.wikimedia.org/r/87317
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0210002c05efd79242b00592639b7be50a79020b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand pleasest...@live.com
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add symlink stuff - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/87350 Change subject: Add symlink stuff .. Add symlink stuff Change-Id: Icebb72ec09a15f53d7ebdb3b3417b1f0f9419541 --- A docroot/bits/static-1.22wmf20/extensions A docroot/bits/static-1.22wmf20/resources A docroot/bits/static-1.22wmf20/skins A w/static-1.22wmf20/extensions A w/static-1.22wmf20/resources A w/static-1.22wmf20/skins 6 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/50/87350/1 diff --git a/docroot/bits/static-1.22wmf20/extensions b/docroot/bits/static-1.22wmf20/extensions new file mode 12 index 000..b3b7dbd --- /dev/null +++ b/docroot/bits/static-1.22wmf20/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf20/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.22wmf20/resources b/docroot/bits/static-1.22wmf20/resources new file mode 12 index 000..0f11ef6 --- /dev/null +++ b/docroot/bits/static-1.22wmf20/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf20/resources \ No newline at end of file diff --git a/docroot/bits/static-1.22wmf20/skins b/docroot/bits/static-1.22wmf20/skins new file mode 12 index 000..c8b4f59 --- /dev/null +++ b/docroot/bits/static-1.22wmf20/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf20/skins/ \ No newline at end of file diff --git a/w/static-1.22wmf20/extensions b/w/static-1.22wmf20/extensions new file mode 12 index 000..b3b7dbd --- /dev/null +++ b/w/static-1.22wmf20/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf20/extensions \ No newline at end of file diff --git a/w/static-1.22wmf20/resources b/w/static-1.22wmf20/resources new file mode 12 index 000..0f11ef6 --- /dev/null +++ b/w/static-1.22wmf20/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf20/resources \ No newline at end of file diff --git a/w/static-1.22wmf20/skins b/w/static-1.22wmf20/skins new file mode 12 index 000..d6bc2c9 --- /dev/null +++ b/w/static-1.22wmf20/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf20/skins \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/87350 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icebb72ec09a15f53d7ebdb3b3417b1f0f9419541 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid extra HEADs for stash clearing - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87349
Change subject: Avoid extra HEADs for stash clearing
..
Avoid extra HEADs for stash clearing
Change-Id: I96e78b219fe12b43daf4a313eb297b98577ef955
---
M maintenance/cleanupUploadStash.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/49/87349/1
diff --git a/maintenance/cleanupUploadStash.php
b/maintenance/cleanupUploadStash.php
index 9dd62a3..c2ba555 100644
--- a/maintenance/cleanupUploadStash.php
+++ b/maintenance/cleanupUploadStash.php
@@ -113,7 +113,7 @@
// Apparently lots of stash files are not registered in the
DB...
$dir = $tempRepo-getZonePath( 'public' );
- $iterator = $tempRepo-getBackend()-getFileList( array( 'dir'
= $dir ) );
+ $iterator = $tempRepo-getBackend()-getFileList( array( 'dir'
= $dir, 'adviseStat' = 1 ) );
$this-output( Deleting orphaned temp files...\n );
if ( strpos( $dir, '/local-temp' ) === false ) { // sanity check
$this-error( Temp repo is not using the temp
container., 1 ); // die
--
To view, visit https://gerrit.wikimedia.org/r/87349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I96e78b219fe12b43daf4a313eb297b98577ef955
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove mobile part - change (analytics...dashboard)
Milimetric has submitted this change and it was merged.
Change subject: Remove mobile part
..
Remove mobile part
The mobile part is now computen using the wp-zero repository.
Change-Id: I338ee012119d361fa884aebf88a6e67b674b221a
---
M deploy_git.sh
D mobile/count.py
D mobile/report.py
D mobile/run.py
4 files changed, 1 insertion(+), 663 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/deploy_git.sh b/deploy_git.sh
index b188503..a206efa 100755
--- a/deploy_git.sh
+++ b/deploy_git.sh
@@ -9,7 +9,7 @@
git pull
cd ../dashboard
-for source in geowiki grants mobile historical db_size
+for source in geowiki grants historical db_size
do
for type in dashboards datasources datafiles graphs geo
do
diff --git a/mobile/count.py b/mobile/count.py
deleted file mode 100755
index d20baee..000
--- a/mobile/count.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/python
-import argparse
-import pprint
-import datetime
-import pandas as pd
-import logging
-from squid.mapreduce import count_files
-
-logger = logging.getLogger(__name__)
-logger.setLevel(logging.DEBUG)
-
-# output format
-# 2013-04-01 ar wikipedia.org M CI orange-ivory-coast
4
-
-def parse_args():
-parser = argparse.ArgumentParser('generate count file from all history '\
-'udp-filter zero logs')
-parser.add_argument('--glob',
-default='/a/squid/archive/zero/zero-*.log-201305*.gz',
-help='directory in which to find the zero log files')
-opts = vars(parser.parse_args())
-return opts
-
-def main():
-opts = parse_args()
-criteria = (lambda r : r.site() in ['M', 'Z'], lambda r :
r.old_init_request())
-fields = ('date', 'lang', 'project', 'site', 'country_code2',
'provider_from_fname')
-counts = count_files(opts['glob'],
-fields,
-criteria,
-count_event=10,
-fname='carrier.local.all.incremental', limit=1)
-df = pd.DataFrame([v + (c,) for v,c in counts.items()],
-columns = ['date', 'lang', 'project', 'site', 'country',
'carrier', 'count'])
-df.date = df.date.apply(lambda d : datetime.datetime.strftime(d,
'%Y-%m-%d'))
-logger.info('carriers: %s', pprint.pformat(df.carrier.unique()))
-df.to_csv('carrier.local.all', index=False, sep='\t')
-
-if __name__ == '__main__':
-main()
diff --git a/mobile/report.py b/mobile/report.py
deleted file mode 100644
index 6fe8fbc..000
--- a/mobile/report.py
+++ /dev/null
@@ -1,62 +0,0 @@
-import logging
-import dateutil.parser
-import argparse
-import pandas as pd
-import os
-
-logger = logging.getLogger(__name__)
-
-FIELDS = ['date', 'lang', 'project', 'site', 'country', 'provider']
-COUNT_FIELDS = ['count'] + FIELDS
-OLD_FIELDS = ['date', 'lang', 'project', 'site', 'count']
-
-SAMPLE_LENGTH = 10
-
-def parse_args():
-parser = argparse.ArgumentParser('loads cached squid log count files and
selects a specific date range')
-parser.add_argument('--cache_dir', default='zero_counts')
-parser.add_argument('--start',required=True)
-parser.add_argument('--end',required=True)
-parser.add_argument('-o','--outfile', default=None)
-
-opts = vars(parser.parse_args())
-opts['start'] = dateutil.parser.parse(opts['start'])
-opts['end'] = dateutil.parser.parse(opts['end'])
-if opts['outfile'] is None:
-opts['outfile'] = 'zero_report_%s_%s' %
(opts['start'].strftime('%Y%m%d'), opts['end'].strftime('%Y%m%d'))
-return opts
-
-def load(cache_dir):
-cache = pd.DataFrame(columns=COUNT_FIELDS)
-date_col_ind = COUNT_FIELDS.index('date')
-num_cached = len(os.listdir(cache_dir))
-logger.info('loading %d cached files from %s', num_cached, cache_dir)
-for i, count_file in enumerate(os.listdir(cache_dir)):
-# if i 2:
-# break
-try:
-df = pd.read_table(os.path.join(cache_dir, count_file),
parse_dates=[date_col_ind], sep=',', header=None)
-df.columns = COUNT_FIELDS
-logging.debug('loaded %d lines from %s (%d / %d)', len(df),
count_file, i, num_cached)
-cache = cache.append(df)
-except:
-logger.exception('exception caught while loading cache file: %s',
count_file)
-return cache
-
-def old_fmt(cache, opts):
-for prov in cache.provider.unique():
-prov_counts = cache[cache.provider == prov]
-prov_counts = prov_counts[OLD_FIELDS]
-prov_counts.to_csv(opts['outfile'] + prov.replace('-', '_') + '.csv',
index=False)
-
-def main():
-opts = parse_args()
-cache = load(opts['cache_dir'])
-cache = cache[cache['date'] = opts['start']]
-cache = cache[cache['date'] opts['end']]
-cache['count'] = cache['count'] * SAMPLE_LENGTH
-cache.to_csv(opts['outfile'] + '.csv', index=False)
-old_fmt(cache, opts)
-
-if __name__ == '__main__':
-main()
[MediaWiki-commits] [Gerrit] Remove geowiki part - change (analytics...dashboard)
Milimetric has submitted this change and it was merged.
Change subject: Remove geowiki part
..
Remove geowiki part
The mobile part is now computen using the geowiki repository.
It seems this geowiki/format_geo_editors.py became geowiki's
make_limn_files.py.
Change-Id: If5cc5f79691129e17b725748bb29fc18c0a0d828
---
M deploy_git.sh
D geowiki/format_geo_editors.py
2 files changed, 1 insertion(+), 358 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/deploy_git.sh b/deploy_git.sh
index a206efa..2f8d942 100755
--- a/deploy_git.sh
+++ b/deploy_git.sh
@@ -9,7 +9,7 @@
git pull
cd ../dashboard
-for source in geowiki grants historical db_size
+for source in grants historical db_size
do
for type in dashboards datasources datafiles graphs geo
do
diff --git a/geowiki/format_geo_editors.py b/geowiki/format_geo_editors.py
deleted file mode 100755
index 7f422bc..000
--- a/geowiki/format_geo_editors.py
+++ /dev/null
@@ -1,357 +0,0 @@
-#! /usr/bin/python
-
-import argparse
-import logging
-import json, pprint
-import datetime, dateutil.parser
-from collections import defaultdict, OrderedDict, Container
-import itertools
-import operator
-from operator import itemgetter
-import re
-import os
-import MySQLdb as sql
-#import sqlite3 as sql
-import MySQLdb.cursors
-import multiprocessing
-
-import limnpy
-import gcat
-
-root_logger = logging.getLogger()
-ch = logging.StreamHandler()
-formatter =
logging.Formatter('[%(levelname)s]\t[%(name)s]\t[%(funcName)s:%(lineno)d]\t%(message)s')
-ch.setFormatter(formatter)
-root_logger.addHandler(ch)
-root_logger.setLevel(logging.DEBUG)
-
-logger = logging.getLogger(__name__)
-
-# Parameters for interacting with Google Drive doc which holds Global South
categories etc.
-META_DATA_TITLE= 'Global South and Region Classifications.bak'
-META_DATA_SHEET= 'data'
-META_DATA_COUNTRY_FIELD = 'MaxMind Country'
-META_DATA_REGION_FIELD = 'Region'
-META_DATA_GLOBAL_SOUTH_FIELD = 'Global South'
-
-LIMN_GROUP = 'gp'
-
-def make_limn_rows(rows, col_prim_key, count_key = 'count'):
-if not rows:
-return
-logger.debug('making limn rows from rows with keys:%s', rows[0].keys())
-logger.debug('col_prim_key: %s', col_prim_key)
-logger.debug('len(rows): %s', len(rows))
-rows = map(dict, rows) # need real dicts, not sqlite.Rows
-
-filtered = filter(lambda r : r['cohort'] in ['all', '5+', '100+'], rows)
-
-transformed = []
-# logger.debug('transforming rows to {\'date\' : end, \'%s (cohort)\' :
count}', col_prim_key)
-for row in filtered:
-if col_prim_key in row:
-transformed.append({'date' : row['end'], '%s (%s)' %
(row[col_prim_key], row['cohort']) : row[count_key]})
-else:
-logger.debug('row does not contain col_prim_key (%s): %s',
col_prim_key, row)
-
-logger.debug('len(transformed): %s', len(transformed))
-limn_rows = []
-for date, date_rows in itertools.groupby(sorted(transformed,
key=itemgetter('date')), key=itemgetter('date')):
-limn_row = {'date' : date}
-for date_row in date_rows:
-limn_row.update(date_row)
-limn_rows.append(limn_row)
-return limn_rows
-
-def write_default_graphs(source, limn_id, limn_name, basedir):
-if source:
-source_id = source['id']
-
-cohorts = [('all', 'all', 'All'), ('5\+', 'active', 'Active'),
('100\+', 'very_active', 'Very Active')]
-for cohort_str, cohort_id, cohort_name in cohorts:
-cols = [name for name in source['columns']['labels'] if
re.match('.*%s.*' % cohort_str, name)]
-source_cols = list(itertools.product([source_id], cols))
-limnpy.write_graph(limn_id + '_' + cohort_id, cohort_name + ' ' +
limn_name, [source], source_cols, basedir=basedir)
-
-
-def write_project_mysql(proj, cursor, basedir, country_graphs=False):
-logger.debug('writing project datasource for: %s', proj)
-limn_id = proj + '_all'
-limn_name = '%s Editors by Country' % proj.upper()
-
-if sql.paramstyle == 'qmark':
-query = SELECT * FROM erosen_geocode_active_editors_country WHERE
project=? AND end = start + INTERVAL 30 day
-logger.debug('making query: %s', query)
-elif sql.paramstyle == 'format':
-query = SELECT * FROM erosen_geocode_active_editors_country WHERE
project=%s AND end = start + INTERVAL 30 day
-cursor.execute(query, [proj])
-proj_rows = cursor.fetchall()
-
-logger.debug('len(proj_rows): %d', len(proj_rows))
-if not proj_rows and sql.paramstyle == 'format':
-logger.debug('GOT NUTHIN!: %s', query % proj)
-return
-limn_rows = make_limn_rows(proj_rows, 'country')
-source = limnpy.DataSource(limn_id, limn_name, limn_rows,
limn_group=LIMN_GROUP)
-source.write(basedir=basedir)
-source.write_graph(basedir=basedir)
-
-# construct single column graphs
-
[MediaWiki-commits] [Gerrit] Keep old Toolserver namespace as alias - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Keep old Toolserver namespace as alias .. Keep old Toolserver namespace as alias Change-Id: Ic0bacdacd43f2ae28312874718c35208ac62b8b3 --- M TranslatewikiSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php index 8457647..57aa632 100644 --- a/TranslatewikiSettings.php +++ b/TranslatewikiSettings.php @@ -107,6 +107,8 @@ $wgNamespaceAliases['Betawiki'] = NS_PROJECT; $wgNamespaceAliases['Betawiki_talk'] = NS_PROJECT_TALK; +$wgNamespaceAliases['Toolserver'] = NS_INTUITION; +$wgNamespaceAliases['Toolserver_talk'] = NS_INTUITION_TALK; $wgMetaNamespace = 'Project'; define( NS_PORTAL, 100 ); -- To view, visit https://gerrit.wikimedia.org/r/87344 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic0bacdacd43f2ae28312874718c35208ac62b8b3 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move editor fraction computations to geowiki - change (analytics...dashboard)
Milimetric has submitted this change and it was merged.
Change subject: Move editor fraction computations to geowiki
..
Move editor fraction computations to geowiki
Since editor fraction computation depends on global_south.csv, which
has been moved to geowiki, we also move editor fractions computations
to geowiki.
Change-Id: I1cce360170380f4106ef2f43b606950fbf60049b
---
M grants/format_grants_qr.py
1 file changed, 0 insertions(+), 18 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/grants/format_grants_qr.py b/grants/format_grants_qr.py
index 2f2ef81..e8801b8 100755
--- a/grants/format_grants_qr.py
+++ b/grants/format_grants_qr.py
@@ -28,23 +28,6 @@
logger = logging.getLogger(__name__)
-def plot_gs_editor_fraction(basedir):
-df = pd.read_csv('data/datafiles/global_south.csv', index_col='date',
parse_dates=['date'])
-df['Global South Fraction (100+)'] = df['Global South (100+)'] /
(df['Global South (100+)'] + df['Global North (100+)'] + df['Unkown
(100+)']).apply(float)
-df['Global South Fraction (5+)'] = df['Global South (5+)'] / (df['Global
South (5+)'] + df['Global North (5+)'] + df['Unkown (5+)']).apply(float)
-df['Global South Fraction (all)'] = df['Global South (all)'] / (df['Global
South (all)'] + df['Global North (all)'] + df['Unkown (all)']).apply(float)
-df_frac = df[['Global South Fraction (100+)', 'Global South Fraction
(5+)', 'Global South Fraction (all)']]
-
-ds_frac = limnpy.DataSource(limn_id='global_south_editor_fractions',
-limn_name='Global South Editor Fractions',
-limn_group='gp',
-data = df_frac)
-ds_frac.write(basedir)
-g = ds_frac.get_graph(metric_ids=['Global South Fraction (5+)'],
-title='Global South Active Editor Fraction',
-graph_id='global_south_editor_fractions')
-g.write(basedir)
-
def plot_spending_by_country(df, country_df, basedir):
#{
#editors100: 221,
@@ -314,7 +297,6 @@
plot_spending_by_global_south(df, country_df, basedir)
plot_grants_over_time(df, basedir)
plot_grants_by_global_south(df, country_df, basedir)
-plot_gs_editor_fraction(basedir)
if __name__ == '__main__':
main()
--
To view, visit https://gerrit.wikimedia.org/r/84312
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1cce360170380f4106ef2f43b606950fbf60049b
Gerrit-PatchSet: 1
Gerrit-Project: analytics/global-dev/dashboard
Gerrit-Branch: master
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Milimetric dandree...@wikimedia.org
Gerrit-Reviewer: QChris christ...@quelltextlich.at
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hooks to force password reset for some users - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Hooks to force password reset for some users
..
Hooks to force password reset for some users
Bug: 54847
Change-Id: I0c16ad385fcb6649bdd52a94d8d7421ce9b6c251
---
A wmf-config/Bug54847.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
3 files changed, 252 insertions(+), 0 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/Bug54847.php b/wmf-config/Bug54847.php
new file mode 100644
index 000..5ee4c7b
--- /dev/null
+++ b/wmf-config/Bug54847.php
@@ -0,0 +1,240 @@
+?php
+
+function efUserIsAffected ( $user, $loggedout = null, $isGlobal = false ) {
+ global $wgMemc;
+
+ if ( !$user-getID() ) {
+ return false;
+ }
+
+ // Query the slave to eliminate the most common case where user is not
on our list
+ $cacheData = $wgMemc-get( 'centralauth:reset-pass:' . md5(
$user-getName() ) );
+ if ( !$cacheData ) {
+ $dbr = CentralAuthUser::getCentralSlaveDB();
+ $res = $dbr-select(
+ 'bug_54847_password_resets',
+ array( 'r_wiki', 'r_username' ),
+ array( 'r_username' = $user-getName() ),
+ __METHOD__
+ );
+ if ( $res-numRows() 1 ) {
+ $cacheData = 'no';
+ } else {
+ $cacheData = 'yes';
+ }
+ $wgMemc-set( 'centralauth:reset-pass:' . md5( $user-getName()
), $cacheData );
+ }
+ if ( $cacheData === 'no' ) {
+ return false;
+ }
+
+ $dbw = CentralAuthUser::getCentralDB();
+ $result = $dbw-select(
+ 'bug_54847_password_resets',
+ array( 'r_wiki', 'r_username', 'r_logged_out', 'r_reset' ),
+ array( 'r_username' = $user-getName(),
+ 'r_reset is null'
+ ),
+ __METHOD__
+ );
+
+ if ( $result-numRows() 1 ) {
+ return false;
+ }
+
+
+ $centralUser = CentralAuthUser::getInstance( $user );
+ if ( $centralUser-exists() $centralUser-isAttached() ) {
+ $isGlobal = true;
+ }
+
+ $affectedWikis = array();
+ foreach ( $result as $row ) {
+ $affectedWikis[] = $row-r_wiki;
+ if ( $row-r_logged_out 0 ) {
+ $loggedout = true;
+ }
+ }
+
+ if ( in_array( wfWikiID(), $affectedWikis ) ) {
+ // This user on this wiki affected
+ return true;
+ }
+
+
+ if ( $isGlobal ) {
+ foreach ( $affectedWikis as $wiki ) {
+ if ( $centralUser-attachedOn( $wiki ) ) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+
+}
+
+// Abort existing open sessions for affected users. (But not
+// repeatedly, only once.)
+// Maybe we dont do this and just reset everyone's tokens instead?
+
+$wgHooks['UserLoadAfterLoadFromSession'][] = function ( $user ) {
+ if ( efUserIsAffected( $user ) ) {
+ $dbw = CentralAuthUser::getCentralDB();
+ $dbw-update(
+ 'bug_54847_password_resets',
+ array( 'r_logged_out' = 1 ),
+ array( 'r_username' = $user-getName(),
+ 'r_wiki' = wfWikiID()
+ ),
+ __METHOD__
+ );
+ $user-logout();
+ }
+};
+
+
+$wgHooks['UserLoadFromSession'][] = function ( $user, $result ) {
+
+ $loggedout = false;
+ $isGlobal = false;
+ if ( efUserIsAffected( $user, $loggedout, $isGlobal ) ) {
+ if ( $loggedout ) {
+ // Already logged them out
+ return true;
+ }
+
+ wfDebugLog( Bug54847, Logging out user . $user-getName()
);
+
+ $dbw = CentralAuthUser::getCentralDB();
+
+ $updateWikis = wfWikiID();
+ if ( $isGlobal ) {
+ $centralUser = CentralAuthUser::getInstance( $user );
+ $updateWikis = $centralUser-listAttached();
+ }
+ $dbw-update(
+ 'bug_54847_password_resets',
+ array( 'r_logged_out' = 1 ),
+ array( 'r_username' = $user-getName(),
+ 'r_wiki' = $updateWikis
+ ),
+ __METHOD__
+ );
+
+ $user-logout();
+ $result = false;
+ return false;
+ }
+ return true;
+};
+
+$wgHooks[ 'AbortLogin' ][] = function ( User $user,
[MediaWiki-commits] [Gerrit] Add argument parsing skeleton for monitoring script - change (analytics/geowiki)
Milimetric has submitted this change and it was merged.
Change subject: Add argument parsing skeleton for monitoring script
..
Add argument parsing skeleton for monitoring script
Change-Id: I572ada6804380ccbb94dbdc6d10f44e6cc7909bb
---
M scripts/check_web_page.sh
1 file changed, 22 insertions(+), 0 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/scripts/check_web_page.sh b/scripts/check_web_page.sh
index bd2bd91..0b39e3b 100755
--- a/scripts/check_web_page.sh
+++ b/scripts/check_web_page.sh
@@ -81,6 +81,27 @@
#DEBUG=local
#---
+# Parses arguments to the script
+#
+# Input:
+# $1, $2, ... arguments that should get processed
+#
+# Output:
+# -
+#
+parse_arguments() {
+while [ $# -gt 0 ]
+do
+ local ARGUMENT=$1
+ shift
+case $ARGUMENT in
+ * )
+ error unknown argument '$ARGUMENT'
+esac
+done
+}
+
+#---
# Dumps an error message to stderr and exits the script
#
# Concatenation of Error: $1, $2, ... gets used as error message.
@@ -1040,6 +1061,7 @@
#---
+parse_arguments $@
check
echo geowiki: Ok
--
To view, visit https://gerrit.wikimedia.org/r/85605
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I572ada6804380ccbb94dbdc6d10f44e6cc7909bb
Gerrit-PatchSet: 1
Gerrit-Project: analytics/geowiki
Gerrit-Branch: master
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Milimetric dandree...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable $wmgBug54847 for default private, but gate also on ... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Enable $wmgBug54847 for default private, but gate also on
$wmgUseCentralAuth
..
Enable $wmgBug54847 for default private, but gate also on $wmgUseCentralAuth
Change-Id: Ice503ff04baafd4ec8a7c900d6ad584ca196d10a
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 3 insertions(+), 4 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 3d5b7e3..0ca9b6b 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2700,7 +2700,7 @@
}
// Bug 54847
-if ( $wmgBug54847 ) {
+if ( $wmgBug54847 $wmgUseCentralAuth ) {
require( $wmfConfigDir/Bug54847.php );
}
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 005a554..7aea4fa 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12739,9 +12739,8 @@
),
'wmgBug54847' = array(
- 'default' = false,
- 'testwiki' = true,
- 'test2wiki' = true,
+ 'default' = true,
+ 'private' = false,
),
);
--
To view, visit https://gerrit.wikimedia.org/r/87318
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice503ff04baafd4ec8a7c900d6ad584ca196d10a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gerrit: linkify references to Analytics Mingle projects. - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: gerrit: linkify references to Analytics Mingle projects.
..
gerrit: linkify references to Analytics Mingle projects.
All of the following (and some other) expressions now link to Mingle
card 42 on our Mingle's analytics project:
analytics card 42
analytics card #42
analytics-card 42
analytics-card #42
Card: analytics 42
Card: analytics-42
Card:analytics#42
Change-Id: Ic79b7e74ca716670512af4e0496474c6b97f8761
---
M templates/gerrit/gerrit.config.erb
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/templates/gerrit/gerrit.config.erb
b/templates/gerrit/gerrit.config.erb
index 5c2ac18..45e8c0c 100644
--- a/templates/gerrit/gerrit.config.erb
+++ b/templates/gerrit/gerrit.config.erb
@@ -80,6 +80,9 @@
[commentlink cve]
match = \\b(CVE\\-\\d{4}\\-\\d+)\\b
link = https://cve.mitre.org/cgi-bin/cvename.cgi?name=$1
+[commentlink mingle-analytics]
+match =
\\b([aA]nalytics\\s*[:-]?\\s*[cC]ard|[cC]ard\\s*[:-]?\\s*[aA]nalytics)\\s*\\#?\\s*(\\d+)\\b
+link = https://mingle.corp.wikimedia.org/projects/analytics/cards/$2
[mimetype application/javascript]
safe = true
[mimetype application/x-php]
--
To view, visit https://gerrit.wikimedia.org/r/84338
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic79b7e74ca716670512af4e0496474c6b97f8761
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Diederik dvanli...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Diederik dvanli...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Ryan Lane rl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not show password reset interface unless password is correct - change (operations/mediawiki-config)
Reedy has submitted this change and it was merged.
Change subject: Do not show password reset interface unless password is correct
..
Do not show password reset interface unless password is correct
Change-Id: I91cd92ab4511fee877fdfd5f5510bf4cf1c1dc4f
---
M wmf-config/Bug54847.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/Bug54847.php b/wmf-config/Bug54847.php
index 5ee4c7b..2110a78 100644
--- a/wmf-config/Bug54847.php
+++ b/wmf-config/Bug54847.php
@@ -131,7 +131,7 @@
$wgHooks[ 'AbortLogin' ][] = function ( User $user, $password, $retval, $msg
) {
global $wgOut, $egBug54847;
- if ( empty( $egBug54847 ) efUserIsAffected( $user ) ) {
+ if ( empty( $egBug54847 ) $user-checkPassword( $password )
efUserIsAffected( $user ) ) {
wfDebugLog( Bug54847, Aborting login until they reset
password: . $user-getName() );
$msg = 'word-separator';
$wgOut-addWikiText( wfMessage(
'bug-54847-password-reset-prompt' )-text() );
--
To view, visit https://gerrit.wikimedia.org/r/87319
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I91cd92ab4511fee877fdfd5f5510bf4cf1c1dc4f
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: Tim Starling tstarl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add help screen to monitoring script - change (analytics/geowiki)
Milimetric has submitted this change and it was merged.
Change subject: Add help screen to monitoring script
..
Add help screen to monitoring script
Change-Id: Id7cac95900fd6c0c658e3094bd36b0e5d5f8a811
---
M scripts/check_web_page.sh
1 file changed, 26 insertions(+), 0 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/scripts/check_web_page.sh b/scripts/check_web_page.sh
index 0b39e3b..f8c8cd2 100755
--- a/scripts/check_web_page.sh
+++ b/scripts/check_web_page.sh
@@ -81,6 +81,28 @@
#DEBUG=local
#---
+# Prints the script's help screen
+#
+# Input:
+# -
+#
+# Output:
+# -
+#
+print_help() {
+cat EOF
+check_web_page.sh [ OPTIONS ]
+
+checks if the data served for the geowiki repository is up-to-date and
+the columns meet expectations.
+
+OPTIONS:
+--help, -h -- prints this help page
+
+EOF
+}
+
+#---
# Parses arguments to the script
#
# Input:
@@ -95,6 +117,10 @@
local ARGUMENT=$1
shift
case $ARGUMENT in
+--help | -h )
+print_help
+exit 0
+;;
* )
error unknown argument '$ARGUMENT'
esac
--
To view, visit https://gerrit.wikimedia.org/r/85606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id7cac95900fd6c0c658e3094bd36b0e5d5f8a811
Gerrit-PatchSet: 1
Gerrit-Project: analytics/geowiki
Gerrit-Branch: master
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Milimetric dandree...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add symlink stuff - change (operations/mediawiki-config)
Reedy has submitted this change and it was merged. Change subject: Add symlink stuff .. Add symlink stuff Change-Id: Icebb72ec09a15f53d7ebdb3b3417b1f0f9419541 --- A docroot/bits/static-1.22wmf20/extensions A docroot/bits/static-1.22wmf20/resources A docroot/bits/static-1.22wmf20/skins A w/static-1.22wmf20/extensions A w/static-1.22wmf20/resources A w/static-1.22wmf20/skins 6 files changed, 6 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/docroot/bits/static-1.22wmf20/extensions b/docroot/bits/static-1.22wmf20/extensions new file mode 12 index 000..b3b7dbd --- /dev/null +++ b/docroot/bits/static-1.22wmf20/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf20/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.22wmf20/resources b/docroot/bits/static-1.22wmf20/resources new file mode 12 index 000..0f11ef6 --- /dev/null +++ b/docroot/bits/static-1.22wmf20/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf20/resources \ No newline at end of file diff --git a/docroot/bits/static-1.22wmf20/skins b/docroot/bits/static-1.22wmf20/skins new file mode 12 index 000..c8b4f59 --- /dev/null +++ b/docroot/bits/static-1.22wmf20/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf20/skins/ \ No newline at end of file diff --git a/w/static-1.22wmf20/extensions b/w/static-1.22wmf20/extensions new file mode 12 index 000..b3b7dbd --- /dev/null +++ b/w/static-1.22wmf20/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf20/extensions \ No newline at end of file diff --git a/w/static-1.22wmf20/resources b/w/static-1.22wmf20/resources new file mode 12 index 000..0f11ef6 --- /dev/null +++ b/w/static-1.22wmf20/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf20/resources \ No newline at end of file diff --git a/w/static-1.22wmf20/skins b/w/static-1.22wmf20/skins new file mode 12 index 000..d6bc2c9 --- /dev/null +++ b/w/static-1.22wmf20/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.22wmf20/skins \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/87350 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icebb72ec09a15f53d7ebdb3b3417b1f0f9419541 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename DEBUG to USE_CACHE for monitoring - change (analytics/geowiki)
Milimetric has submitted this change and it was merged.
Change subject: Rename DEBUG to USE_CACHE for monitoring
..
Rename DEBUG to USE_CACHE for monitoring
As DEBUG is effectively only used to control caching, USE_CACHE is the
better name for it.
Change-Id: I0e24e7116851030c76f47ccd9b0997cc44fd6263
---
M scripts/check_web_page.sh
1 file changed, 29 insertions(+), 30 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/scripts/check_web_page.sh b/scripts/check_web_page.sh
index f8c8cd2..1176683 100755
--- a/scripts/check_web_page.sh
+++ b/scripts/check_web_page.sh
@@ -7,10 +7,10 @@
set -e
# Automatic cleanup of temporary file by trapping EXIT. (See
-# DEBUG=local below)
+# USE_CACHE variable below)
TMP_FILES_ABS=()
cleanup() {
-if [ $DEBUG != local ]
+if [ $USE_CACHE != yes ]
then
for TMP_FILE_ABS in ${TMP_FILES_ABS[@]}
do
@@ -73,12 +73,12 @@
EXPECTED_LAST_DATE_OVERRIDE[ve_all]=2013-07-31
EXPECTED_LAST_DATE_OVERRIDE[ve_top10]=2013-06-07
-# Set DEBUG to local to download files into /tmp and use those copies
-# instead of fetching the files again and again for each run. Files do
-# not get removed upon script exit. This is only useful when
-# debugging/developing the script
-DEBUG=
-#DEBUG=local
+# Set USE_CACHE to yes to download files into /tmp and use those
+# copies instead of fetching the files again and again for each
+# run. Files do not get removed upon script exit. This is only useful
+# when debugging/developing the script.
+USE_CACHE=no
+#USE_CACHE=yes
#---
# Prints the script's help screen
@@ -147,8 +147,8 @@
# Creates a temporary file
#
# The temporary file gets added to the TMP_FILES_ABS array, and hence
-# removed upon exit of the script, if not in DEBUG=local mode. (See
-# trap at top of this script).
+# removed upon exit of the script, if not in using caching. (See trap
+# at top of this script).
#
# Input:
# $1 - stencil to be used for the temporary file. This stencil gets
@@ -157,8 +157,8 @@
#
# Output:
# TMP_FILE_ABS - The absolucte name of the created temporary file. Do
-# not clean up the file. It is removed automatically (when not
-# in DEBUG=local).
+# not clean up the file. It is removed automatically when not
+# using caching.
#
mktemp_file() {
local NAME=$1
@@ -206,7 +206,7 @@
# Rather use the download_file function instead, as do_download_file
# does not pick up previously downloaded files.
#
-# This function does not respect DEBUG=local.
+# This function overrides caching, and forces downloading the URL.
#
# Input:
# $1 - The url to download
@@ -223,14 +223,13 @@
#---
# Downloads a URL to $DOWNLOADED_FILE_ABS.
#
-# When not in DEBUG=local mode, the file is downloaded from the given
-# URL into a temporary file (which automatically gets removed upon
-# script exit). The name of this temporary file is passed back.
+# When not using caching, the file is downloaded from the given URL
+# into a temporary file (which automatically gets removed upon script
+# exit). The name of this temporary file is passed back.
#
-# When in DEBUG=local mode, a canonical file name for the URL is
-# generated under /tmp/. If the file does not exist, the URL gets
-# downloaded into this URL. The canonical file name for the URL is
-# returned.
+# When using caching, a canonical file name for the URL is generated
+# under /tmp/. If the file does not exist, the URL gets downloaded
+# into this URL. The canonical file name for the URL is returned.
#
# Input:
# $1 - The url to download
@@ -238,16 +237,16 @@
# Output:
# DOWNLOADED_FILE_ABS - The absolute name of the file into which the
# URL's content can be found. Do not modify this file, as it may
-# be reused for different runs, when in DEBUG=local mode. Do not
-# clean up the file. It is removed automatically (when not in
-# DEBUG=local).
+# be reused for different runs, when using caching. Do not clean
+# up the file. It is removed automatically when not using
+# caching.
#
download_file() {
local URL=$1
local SAFE_URL=$(echo $URL | sed -e 's/[^a-zA-Z0-9_.-]/_/g')
-if [ $DEBUG = local ]
+if [ $USE_CACHE = yes ]
then
DOWNLOADED_FILE_ABS=/tmp/geowiki_monitor.$SAFE_URL
if [ ! -e $DOWNLOADED_FILE_ABS ]
@@ -278,9 +277,9 @@
# Output:
# DOWNLOADED_FILE_ABS - The absolute name of the file into which the
# URL's content can be found. Do not modify this file, as it may
-# be reused for different runs, when in DEBUG=local mode. Do not
-# clean up the file. It is removed automatically (when not in
-# DEBUG=local).
+# be reused for different runs, when using caching. Do not clean
+# up the file. It is removed automatically when
[MediaWiki-commits] [Gerrit] Add caching option to monitoring script - change (analytics/geowiki)
Milimetric has submitted this change and it was merged.
Change subject: Add caching option to monitoring script
..
Add caching option to monitoring script
Change-Id: I444fe8e3a25b09ef579283499ef08bd8342a062d
---
M scripts/check_web_page.sh
1 file changed, 11 insertions(+), 1 deletion(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/scripts/check_web_page.sh b/scripts/check_web_page.sh
index 1176683..d91aa55 100755
--- a/scripts/check_web_page.sh
+++ b/scripts/check_web_page.sh
@@ -77,6 +77,8 @@
# copies instead of fetching the files again and again for each
# run. Files do not get removed upon script exit. This is only useful
# when debugging/developing the script.
+#
+# (You can use the --cache parameter to set USE_CACHE=yes temporarily)
USE_CACHE=no
#USE_CACHE=yes
@@ -98,6 +100,11 @@
OPTIONS:
--help, -h -- prints this help page
+--cache -- cache the downloaded documents into /tmp/geowiki_monitor...
+and reuse them on subsequent runs. This is useful
+for debugging the script. But you'll have to
+cleanup the /tmp/geowiki_monitor... files by hand
+on your own.
EOF
}
@@ -109,7 +116,7 @@
# $1, $2, ... arguments that should get processed
#
# Output:
-# -
+# USE_CACHE
#
parse_arguments() {
while [ $# -gt 0 ]
@@ -121,6 +128,9 @@
print_help
exit 0
;;
+--cache )
+USE_CACHE=yes
+;;
* )
error unknown argument '$ARGUMENT'
esac
--
To view, visit https://gerrit.wikimedia.org/r/85608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I444fe8e3a25b09ef579283499ef08bd8342a062d
Gerrit-PatchSet: 1
Gerrit-Project: analytics/geowiki
Gerrit-Branch: master
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Milimetric dandree...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add verbosity option to show downloaded urls - change (analytics/geowiki)
Milimetric has submitted this change and it was merged.
Change subject: Add verbosity option to show downloaded urls
..
Add verbosity option to show downloaded urls
Change-Id: I894bbae9877341a96d7e588c149e0e602a81c70f
---
M scripts/check_web_page.sh
1 file changed, 32 insertions(+), 0 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/scripts/check_web_page.sh b/scripts/check_web_page.sh
index d91aa55..b942168 100755
--- a/scripts/check_web_page.sh
+++ b/scripts/check_web_page.sh
@@ -27,6 +27,11 @@
# Absolute path to this script
SCRIPT_DIR_ABS=$(dirname $0)
+# Verbosity levels
+VERBOSITY_NORMAL=10
+VERBOSITY_VERBOSE=11
+VERBOSITY=$VERBOSITY_NORMAL
+
# Urls to download files from
URL_BASE=http://gp.wmflabs.org/;
URL_BASE_DASHBOARD=$URL_BASE/dashboards
@@ -105,6 +110,7 @@
for debugging the script. But you'll have to
cleanup the /tmp/geowiki_monitor... files by hand
on your own.
+--verbose-- More verbose output.
EOF
}
@@ -117,6 +123,7 @@
#
# Output:
# USE_CACHE
+# VERBOSITY
#
parse_arguments() {
while [ $# -gt 0 ]
@@ -130,6 +137,9 @@
;;
--cache )
USE_CACHE=yes
+;;
+--verbose )
+VERBOSITY=$VERBOSITY_VERBOSE
;;
* )
error unknown argument '$ARGUMENT'
@@ -151,6 +161,27 @@
error() {
echo Error: $@ 2
exit 1
+}
+
+#---
+# Logs a message if its not above the verbosity threshold
+#
+# Concatenation of Error: $1, $2, ... gets used as error message.
+#
+# Input:
+# $1 - Verbosity threshold
+# $2, $3, ... used as message
+#
+# Output:
+# -
+#
+log() {
+local MESSAGE_VERBOSITY=$1
+shift
+if [ $MESSAGE_VERBOSITY -le $VERBOSITY ]
+then
+ echo $@
+fi
}
#---
@@ -227,6 +258,7 @@
#
do_download_file() {
local URL=$1
+log $VERBOSITY_VERBOSE Downloading $URL ...
wget -O $DOWNLOADED_FILE_ABS -o /dev/null $URL
}
--
To view, visit https://gerrit.wikimedia.org/r/85609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I894bbae9877341a96d7e588c149e0e602a81c70f
Gerrit-PatchSet: 1
Gerrit-Project: analytics/geowiki
Gerrit-Branch: master
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Milimetric dandree...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...Parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit bc97a03f06bfb4bfd33cd2ec2a127c2f607e34e2.
Added Namespace takes precedence over interwiki link (bug 51680) to
blacklist for html2wt and html2html because without rel=mw:WikiLink the
link is not recognized correctly.
Change-Id: Ic21439a6b65eff1d0f9ce9ab4a9f9bb66f9ed0eb
---
M js/tests/fetch-parserTests.txt.js
M js/tests/parserTests-blacklist.js
M js/tests/parserTests.txt
3 files changed, 33 insertions(+), 2 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
Marcoil: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/js/tests/fetch-parserTests.txt.js
b/js/tests/fetch-parserTests.txt.js
index 056a741..a8d6318 100755
--- a/js/tests/fetch-parserTests.txt.js
+++ b/js/tests/fetch-parserTests.txt.js
@@ -10,9 +10,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = d5f8745cfeb34ce00762a47f0ed883c9c98b4b56;
+var expectedSHA1 = 49478d2615f9f51c78b5a9b941015887817715ba;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = e450b18e09b90a67dcd8f216216c9fa7c0752038;
+var latestCommit = bc97a03f06bfb4bfd33cd2ec2a127c2f607e34e2;
var fs = require('fs'),
path = require('path'),
diff --git a/js/tests/parserTests-blacklist.js
b/js/tests/parserTests-blacklist.js
index 8b0e514..5bcd207 100644
--- a/js/tests/parserTests-blacklist.js
+++ b/js/tests/parserTests-blacklist.js
@@ -788,6 +788,7 @@
add(html2html, Link with HTML entity in suffix / tail);
add(html2html, Link with multiple pipes);
add(html2html, Link to namespaces);
+add(html2html, Namespace takes precedence over interwiki link (bug 51680));
add(html2html, Piped link to namespace);
add(html2html, Link containing % (not as a hex sequence));
add(html2html, Link containing % as a single hex sequence interpreted to
char);
@@ -1426,6 +1427,7 @@
add(html2wt, Link with HTML entity in suffix / tail);
add(html2wt, Link with multiple pipes);
add(html2wt, Link to namespaces);
+add(html2wt, Namespace takes precedence over interwiki link (bug 51680));
add(html2wt, Piped link to namespace);
add(html2wt, Link containing % (not as a hex sequence));
add(html2wt, Link containing % as a single hex sequence interpreted to
char);
diff --git a/js/tests/parserTests.txt b/js/tests/parserTests.txt
index b2919dc..79e91fb 100644
--- a/js/tests/parserTests.txt
+++ b/js/tests/parserTests.txt
@@ -4634,6 +4634,35 @@
/p
!! end
+!! article
+MemoryAlpha:AlphaTest
+!! text
+This is an article in the MemoryAlpha namespace
+(which shadows the memoryalpha interwiki link).
+!! endarticle
+
+!! test
+Namespace takes precedence over interwiki link (bug 51680)
+!! input
+[[MemoryAlpha:AlphaTest]]
+!! result
+pa href=/wiki/MemoryAlpha:AlphaTest
title=MemoryAlpha:AlphaTestMemoryAlpha:AlphaTest/a
+/p
+!! end
+
+# The previous test doesn't work correctly in html2*, due to not recognizing
the
+# link as an internal one. This one checks for the correct behavior.
+!! test
+Link to namespace preferred over interwiki with correct rel attribute
+!! options
+parsoid=html2wt,html2html
+!! input
+[[MemoryAlpha:AlphaTest]]
+!! result
+pa rel=mw:WikiLink
href=./MemoryAlpha:AlphaTestMemoryAlpha:AlphaTest/a
+/p
+!! end
+
!! test
Piped link to namespace
!! input
--
To view, visit https://gerrit.wikimedia.org/r/87346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic21439a6b65eff1d0f9ce9ab4a9f9bb66f9ed0eb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Marcoil marc...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename folder to Pywikibot - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/87353 Change subject: Rename folder to Pywikibot .. Rename folder to Pywikibot Change-Id: I95f52fafd08987ad5f27c751538a85a5b78f4511 --- R groups/Pywikibot/Pywikipedia.yaml 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/53/87353/1 diff --git a/groups/Pywikipedia/Pywikipedia.yaml b/groups/Pywikibot/Pywikipedia.yaml similarity index 100% rename from groups/Pywikipedia/Pywikipedia.yaml rename to groups/Pywikibot/Pywikipedia.yaml -- To view, visit https://gerrit.wikimedia.org/r/87353 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95f52fafd08987ad5f27c751538a85a5b78f4511 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename folder to Pywikibot - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Rename folder to Pywikibot .. Rename folder to Pywikibot Change-Id: I95f52fafd08987ad5f27c751538a85a5b78f4511 --- R groups/Pywikibot/Pywikibot.yaml 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/Pywikipedia/Pywikipedia.yaml b/groups/Pywikibot/Pywikibot.yaml similarity index 100% rename from groups/Pywikipedia/Pywikipedia.yaml rename to groups/Pywikibot/Pywikibot.yaml -- To view, visit https://gerrit.wikimedia.org/r/87353 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I95f52fafd08987ad5f27c751538a85a5b78f4511 Gerrit-PatchSet: 2 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Optimize count queries - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Optimize count queries
..
Optimize count queries
Use nested selects to count the number of rows on server and avoid pointlessly
sending 500 rows to apaches.
Change-Id: I08182b7626dcf0509d1dc5f5aa8e87814c153acc
---
M includes/specials/SpecialUserProfile.php
1 file changed, 16 insertions(+), 6 deletions(-)
Approvals:
Jdlrobson: Looks good to me, but someone else must approve
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialUserProfile.php
b/includes/specials/SpecialUserProfile.php
index 17f8ce8..dac85ec 100644
--- a/includes/specials/SpecialUserProfile.php
+++ b/includes/specials/SpecialUserProfile.php
@@ -41,10 +41,15 @@
$constraints = array(
'limit' = self::LIMIT + 1,
);
- $res = $dbr-select( 'recentchanges', 'rc_timestamp', $where,
__METHOD__, $constraints );
- $res = $res-numRows();
+ $innerSelect = $dbr-selectSQLText( 'recentchanges',
'rc_timestamp', $where, __METHOD__, $constraints );
+ $res = $dbr-query( SELECT COUNT(*) FROM ($innerSelect) t,
__METHOD__ );
+ $row = $res-fetchRow();
+ $result = 0;
+ if ( $row ) {
+ $result = $row[0];
+ }
wfProfileOut( __METHOD__ );
- return $res;
+ return $result;
}
/**
@@ -76,10 +81,15 @@
$constraints = array(
'limit' = self::LIMIT + 1,
);
- $res = $dbr-select( 'image', 'img_timestamp', $where,
__METHOD__, $constraints );
- $res = $res-numRows();
+ $innerSelect = $dbr-selectSQLText( 'image', 'img_timestamp',
$where, __METHOD__, $constraints );
+ $res = $dbr-query( SELECT COUNT(*) FROM ($innerSelect) t,
__METHOD__ );
+ $row = $res-fetchRow();
+ $result = 0;
+ if ( $row ) {
+ $result = $row[0];
+ }
wfProfileOut( __METHOD__ );
- return $res;
+ return $result;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/86683
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I08182b7626dcf0509d1dc5f5aa8e87814c153acc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] partman: add a new layout for ms-be @ eqiad - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87354
Change subject: partman: add a new layout for ms-be @ eqiad
..
partman: add a new layout for ms-be @ eqiad
Instead of moving disks 13 14 (SSDs) to logical disks 0 1 (sda sdb) and
having the rest offset by 2, make the setup as easy as an exact mapping
between PD LD. This will hopefully help us identify disks more easily
and, in the short term, allows us to configure via megacli
-CfgEachDskRaid0 WB RA Direct CachedBadBBU -a0
Create a new profile for this, as it'd be best to not have Swift @ pmtpa
be non-homogeneous.
While at it:
- Point ms-be30xx to ceph-ssd.cfg and make the profile referenced
again. Useful in case we want to revive Ceph in those boxes.
- Drop virt-raid10-cisco-ceph.cfg altogether. Unused, deprecated,
clutter.
Change-Id: Id0df94c8e0281b59580529398ec1469a101d3ec5
---
M files/autoinstall/netboot.cfg
A files/autoinstall/partman/ms-be-eqiad.cfg
D files/autoinstall/partman/virt-raid10-cisco-ceph.cfg
3 files changed, 60 insertions(+), 50 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/87354/1
diff --git a/files/autoinstall/netboot.cfg b/files/autoinstall/netboot.cfg
index a3c8e27..f3ab1c5 100755
--- a/files/autoinstall/netboot.cfg
+++ b/files/autoinstall/netboot.cfg
@@ -56,8 +56,9 @@
ms-fe[1-4]) echo partman/raid1-1partition.cfg ;; \
ms-be[1-9]|ms-be1[0-2]) echo partman/ms-be-ssd.cfg ;; \
ms-fe10[0-9][0-9]) echo partman/raid1-1partition.cfg ;; \
- ms-be10[0-9][0-9]) echo partman/ms-be-ssd.cfg ;; \
- ms-be30[0-9][0-9]) echo partman/raid1-varnish.cfg ;; \
+ ms-be10[0-9][0-9]) echo partman/ms-be-eqiad.cfg ;; \
+ ms-fe30[0-9][0-9]) echo partman/raid1-1partition.cfg ;; \
+ ms-be30[0-9][0-9]) echo partman/ceph-ssd.cfg ;; \
labsdb[1-3]|mw[0-9]*|srv[0-9]*|bast*) echo partman/mw.cfg ;; \
labsdb100[1-3]) echo partman/mw.cfg ;; \
nickel) echo partman/raid1.cfg ;; \
diff --git a/files/autoinstall/partman/ms-be-eqiad.cfg
b/files/autoinstall/partman/ms-be-eqiad.cfg
new file mode 100644
index 000..6597b9d
--- /dev/null
+++ b/files/autoinstall/partman/ms-be-eqiad.cfg
@@ -0,0 +1,57 @@
+# Automatic software RAID partitioning
+#
+# * two disks, sdm sdn (720xd internal bays, SSDs)
+# * primary partitions, no LVM
+# * layout:
+# - / : ext3, RAID1, 60GB
+# - swap: RAID1, 1GB
+# - the rest of each respective disk (no RAID) formatted as xfs, unmounted
+
+d-ipartman-auto/method string raid
+
+d-ipartman-md/device_remove_md boolean true
+d-ipartman-lvm/device_remove_lvm boolean true
+
+d-ipartman-auto/disk string /dev/sdm /dev/sdn
+d-igrub-installer/bootdev string /dev/sdm /dev/sdn
+
+# this workarounds LP #1012629 / Debian #666974
+# it makes grub-installer to jump to step 2, where it uses bootdev
+d-igrub-installer/only_debian boolean false
+
+# Define physical partitions
+d-ipartman-auto/expert_recipe string \
+ multiraid ::\
+ 6 80006 raid\
+ $primary{ } method{ raid } \
+ . \
+ 100010001000raid\
+ $primary{ } method{ raid } \
+ . \
+ 100 500 -1 xfs \
+ $primary{ } method{ format }\
+ format{ } use_filesystem{ } \
+ filesystem{ xfs } \
+ .
+
+# Parameters are:
+# raidtype devcount sparecount fstype mountpoint \
+# devices sparedevices
+d-ipartman-auto-raid/recipestring \
+ 1 2 0 ext3/ \
+ /dev/sdm1#/dev/sdn1 \
+ . \
+ 1 2 0 swap- \
+ /dev/sdm2#/dev/sdn2 \
+ .
+
+d-ipartman-md/confirm boolean true
+d-ipartman-md/confirm_nooverwrite boolean true
+d-ipartman/confirm_write_new_label boolean true
+d-ipartman/choose_partitionselect finish
+d-ipartman/confirm boolean true
+d-ipartman/confirm_nooverwrite boolean true
+
+# the first is for lucid, the second for precise (partman-xfs = 45)
+d-ipartman-xfs/no_mount_point boolean false
+d-ipartman-basicfilesystems/no_mount_point boolean false
diff --git
[MediaWiki-commits] [Gerrit] partman: cleanup external store profiles - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87355
Change subject: partman: cleanup external store profiles
..
partman: cleanup external store profiles
Remove apache.cfg, this seems to be the old setup where application
servers were also external storage. It's unreferenced and replaced by
mw.cfg es.cfg for the two distinct roles.
Rename es.cfg to db.cfg and discard the old db.cfg: it was
incomprehensible, unreferenced all db boxes seem to be configured
to be partitioned using the es.cfg profile.
Split netboot.cfg lines that use es.cfg to two, to clearly distinct
database/external boxes from misc boxes.
All of the above are non-functional changes.
Change-Id: If3a1406cd0e7730f499adf7c0f9f66ca7dc671c1
---
M files/autoinstall/netboot.cfg
D files/autoinstall/partman/apache.cfg
M files/autoinstall/partman/db.cfg
D files/autoinstall/partman/es.cfg
4 files changed, 52 insertions(+), 82 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/55/87355/1
diff --git a/files/autoinstall/netboot.cfg b/files/autoinstall/netboot.cfg
index f3ab1c5..162ee04 100755
--- a/files/autoinstall/netboot.cfg
+++ b/files/autoinstall/netboot.cfg
@@ -36,7 +36,8 @@
analytics100[1-9]|analytics1010) echo
partman/analytics-cisco.cfg ;; \
analytics101[1-9]|analytics102[0-2]) echo partman/raid1-30G.cfg
;; \
analytics102[3-7]) echo partman/analytics-dell.cfg ;; \
-
bayes|db[0-8][0-9]|db10[0-6][0-9]|es10[0-2][0-9]|es[0-9]|es1[0-9]|netmon1001|stat1002|tungsten)
echo partman/es.cfg ;; \
+ db[0-8][0-9]|db10[0-6][0-9]|es10[0-2][0-9]|es[0-9]|es1[0-9])
echo partman/db.cfg ;; \
+ bayes|netmon1001|stat1002|tungsten) echo partman/db.cfg ;; \
boron|chromium|hydrogen) echo partman/lvm.cfg ;; \
calcium|helium|potassium|tmh1001|tmh1002) echo
partman/raid1-1partition.cfg ;; \
capella) echo partman/lvs.cfg ;; \
diff --git a/files/autoinstall/partman/apache.cfg
b/files/autoinstall/partman/apache.cfg
deleted file mode 100644
index 095a22b..000
--- a/files/autoinstall/partman/apache.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-# Application server specific configuration
-
-# Implementation specific hack:
-d-ipartman-auto/init_automatically_partition select
20some_device__/var/lib/partman/devices/=dev=sda
-d-i partman-auto/method string regular
-d-ipartman-auto/disk string /dev/sda
-
-d-ipartman/choose_partitionselect Finish partitioning and write
changes to disk
-d-ipartman/confirm boolean true
-
-# Note, expert_recipe wants to fill up the entire disk
-# See
http://d-i.alioth.debian.org/svn/debian-installer/installer/doc/devel/partman-auto-recipe.txt
-d-ipartman-auto/expert_recipe string apache : 3000 5000 8000 ext3
$primary{ } $bootable{ } method{ format } format{ } use_filesystem{ }
filesystem{ ext3 } mountpoint{ / } . 1000 1000 1000 linux-swap method{ swap }
format{ } . 2000 2000 2000 ext method{ format } format{ } use_filesystem{ }
filesystem{ ext3 } mountpoint{ /tmp } . 64 1000 1000 jfs method{ format }
format{ } use_filesystem{ } filesystem{ jfs } mountpoint{ /a } .
-d-ipartman-auto/choose_recipe apache
-
-# Preseeding of other packages
-fontconfig fontconfig/enable_bitmaps boolean true
diff --git a/files/autoinstall/partman/db.cfg b/files/autoinstall/partman/db.cfg
index 5c2d5c1..8d0c408 100644
--- a/files/autoinstall/partman/db.cfg
+++ b/files/autoinstall/partman/db.cfg
@@ -1,14 +1,54 @@
-# Core DB specific configuration
+# configuration to create:
+# * no RAID (either single disk or hardware raid presenting a single device)
+# * 40G /
+# * 8G swap
+# * the rest formatted with LVM with 90% used
+# ** the rest as xfs on /a
+# ** 10% empty space for later growth
-# Implementation specific hack:
-d-ipartman-auto/init_automatically_partition select
20some_device__/var/lib/partman/devices/=dev=sda
-d-i partman-auto/method string regular
+
+d-ipartman-auto/method string lvm
d-ipartman-auto/disk string /dev/sda
-d-ipartman/choose_partitionselect Finish partitioning and write
changes to disk
-d-ipartman/confirm boolean true
+# the install makes sure we want to wipe the lvm
+d-ipartman-lvm/device_remove_lvm boolean true
+d-ipartman-auto/confirmboolean true
-# Note, expert_recipe wants to fill up the entire disk
-# See
http://d-i.alioth.debian.org/svn/debian-installer/installer/doc/devel/partman-auto-recipe.txt
-d-ipartman-auto/expert_recipe string db : 3000 5000 8000 ext3
$primary{ } $bootable{ } method{ format } format{ } use_filesystem{ }
filesystem{ ext3 } mountpoint{ / } . 1000 1000 1000 linux-swap method{ swap }
format{ } . 64 1000 1000 xfs method{ format }
[MediaWiki-commits] [Gerrit] Added SVG logos in new style, rm'd old pngs - change (mediawiki...VisualEditor)
MarkTraceur has uploaded a new change for review. https://gerrit.wikimedia.org/r/87356 Change subject: Added SVG logos in new style, rm'd old pngs .. Added SVG logos in new style, rm'd old pngs Change-Id: I1f77c645a9fc92bc2a81391107ddb3a54ef37a50 --- M VisualEditor.hooks.php D logo-experimental.png M logo-experimental.svg D logo.png M logo.svg 5 files changed, 195 insertions(+), 151 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/56/87356/1 diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php index a0a93c2..f3ed522 100644 --- a/VisualEditor.hooks.php +++ b/VisualEditor.hooks.php @@ -245,7 +245,7 @@ 'info-link' = false, // TODO: use message 'visualeditor-preference-core-discussion-link' 'discussion-link' = false, - 'screenshot' = $wgExtensionAssetsPath . '/VisualEditor/logo.png', + 'screenshot' = $wgExtensionAssetsPath . '/VisualEditor/logo.svg', ); $preferences['visualeditor-enable-experimental'] = array( @@ -256,7 +256,7 @@ 'info-link' = false, // TODO: use message 'visualeditor-preference-experimental-discussion-link' 'discussion-link' = false, - 'screenshot' = $wgExtensionAssetsPath . '/VisualEditor/logo-experimental.png', + 'screenshot' = $wgExtensionAssetsPath . '/VisualEditor/logo-experimental.svg', ); } diff --git a/logo-experimental.png b/logo-experimental.png deleted file mode 100644 index fc54ecb..000 --- a/logo-experimental.png +++ /dev/null Binary files differ diff --git a/logo-experimental.svg b/logo-experimental.svg index 12a818b..433c095 100644 --- a/logo-experimental.svg +++ b/logo-experimental.svg @@ -1,86 +1,72 @@ -?xml version=1.0 encoding=UTF-8 standalone=no? -!-- Created with Inkscape (http://www.inkscape.org/) -- - -svg - xmlns:dc=http://purl.org/dc/elements/1.1/; - xmlns:cc=http://creativecommons.org/ns#; - xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; - xmlns:svg=http://www.w3.org/2000/svg; - xmlns=http://www.w3.org/2000/svg; - version=1.1 - width=640 - height=320 - viewBox=72.5 191.5 640 320 - id=Layer_1 - xml:space=preservemetadata - id=metadata4389rdf:RDFcc:Work - rdf:about=dc:formatimage/svg+xml/dc:formatdc:type - rdf:resource=http://purl.org/dc/dcmitype/StillImage; /dc:title/dc:title/cc:Work/rdf:RDF/metadatadefs - id=defs4387 / - g id=VisualEditor transform=translate(0,55) - path - d=m 144.765,242.56 h 13.097 l -26.967,62.11 H 126.81 L 99.199,242.56 h 13.221 l 16.476,37.556 15.869,-37.556 z - id=path4357 - style=fill:#2ba9e0 /path - d=m 173.123,216.878 c 1.991,0 3.69,0.687 5.106,2.059 1.417,1.37 2.127,3.052 2.127,5.043 0,1.948 -0.71,3.628 -2.127,5.042 -1.416,1.417 -3.115,2.122 -5.106,2.122 -1.858,0 -3.496,-0.717 -4.913,-2.155 -1.416,-1.438 -2.122,-3.108 -2.122,-5.009 0,-1.859 0.706,-3.507 2.122,-4.944 1.417,-1.435 3.055,-2.158 4.913,-2.158 z m -5.972,25.682 h 12.076 v 61.047 H 167.151 V 242.56 z - id=path4359 - style=fill:#2ba9e0 /path - d=m 193.694,299.228 v -13.003 c 3.407,2.388 6.886,4.322 10.452,5.805 3.559,1.482 6.556,2.224 8.989,2.224 2.522,0 4.688,-0.619 6.504,-1.859 1.812,-1.24 2.72,-2.721 2.72,-4.445 0,-1.77 -0.588,-3.243 -1.76,-4.415 -1.172,-1.172 -3.703,-2.864 -7.596,-5.076 -7.789,-4.336 -12.886,-8.04 -15.295,-11.114 -2.415,-3.076 -3.619,-6.426 -3.619,-10.055 0,-4.689 1.826,-8.513 5.473,-11.481 3.653,-2.962 8.354,-4.442 14.105,-4.442 5.972,0 12.1,1.68 18.382,5.04 v 11.947 c -7.168,-4.334 -13.031,-6.504 -17.587,-6.504 -2.344,0 -4.236,0.5 -5.671,1.497 -1.44,0.996 -2.16,2.313 -2.16,3.951 0,1.418 0.649,2.77 1.953,4.052 1.304,1.285 3.591,2.833 6.866,4.645 l 4.315,2.456 c 10.175,5.749 15.268,12.119 15.268,19.105 0,4.999 -1.958,9.1 -5.874,12.305 -3.915,3.207 -8.946,4.81 -15.098,4.81 -3.628,0 -6.856,-0.388 -9.685,-1.16 -2.831,-0.775 -6.395,-2.203 -10.682,-4.283 z - id=path4361 - style=fill:#2ba9e0 /path - d=m 287.856,303.607 v -7.829 c -2.565,2.807 -5.497,4.993 -8.796,6.553 -3.294,1.558 -6.58,2.339 -9.851,2.339 -3.85,0 -7.402,-0.962 -10.655,-2.888 -3.251,-1.922 -5.703,-4.531 -7.364,-7.831 -1.657,-3.294 -2.485,-8.768 -2.485,-16.423 V 242.56 h 12.076 v 34.793 c 0,6.407 0.918,10.881 2.753,13.419 1.836,2.542 5.055,3.81 9.657,3.81 5.747,0 10.637,-2.807 14.665,-8.426 V 242.56 h 12.076 v 61.047 h -12.076 z - id=path4363 - style=fill:#2ba9e0 /path - d=m 355.272,266.913 v 25.947 c 0,2.078 0.711,3.118 2.123,3.118 1.464,0 3.741,-1.085 6.838,-3.252 v 7.366 c -2.743,1.769 -4.946,2.977 -6.604,3.617 -1.661,0.64 -3.397,0.962 -5.209,0.962 -5.177,0 -8.231,-2.035 -9.158,-6.104 -5.13,3.981
[MediaWiki-commits] [Gerrit] partman: add a new layout for ms-be @ eqiad - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: partman: add a new layout for ms-be @ eqiad
..
partman: add a new layout for ms-be @ eqiad
Instead of moving disks 13 14 (SSDs) to logical disks 0 1 (sda sdb) and
having the rest offset by 2, make the setup as easy as an exact mapping
between PD LD. This will hopefully help us identify disks more easily
and, in the short term, allows us to configure via megacli
-CfgEachDskRaid0 WB RA Direct CachedBadBBU -a0
Create a new profile for this, as it'd be best to not have Swift @ pmtpa
be non-homogeneous.
While at it:
- Point ms-be30xx to ceph-ssd.cfg and make the profile referenced
again. Useful in case we want to revive Ceph in those boxes.
- Drop virt-raid10-cisco-ceph.cfg altogether. Unused, deprecated,
clutter.
Change-Id: Id0df94c8e0281b59580529398ec1469a101d3ec5
---
M files/autoinstall/netboot.cfg
A files/autoinstall/partman/ms-be-eqiad.cfg
D files/autoinstall/partman/virt-raid10-cisco-ceph.cfg
3 files changed, 60 insertions(+), 50 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/autoinstall/netboot.cfg b/files/autoinstall/netboot.cfg
index a3c8e27..f3ab1c5 100755
--- a/files/autoinstall/netboot.cfg
+++ b/files/autoinstall/netboot.cfg
@@ -56,8 +56,9 @@
ms-fe[1-4]) echo partman/raid1-1partition.cfg ;; \
ms-be[1-9]|ms-be1[0-2]) echo partman/ms-be-ssd.cfg ;; \
ms-fe10[0-9][0-9]) echo partman/raid1-1partition.cfg ;; \
- ms-be10[0-9][0-9]) echo partman/ms-be-ssd.cfg ;; \
- ms-be30[0-9][0-9]) echo partman/raid1-varnish.cfg ;; \
+ ms-be10[0-9][0-9]) echo partman/ms-be-eqiad.cfg ;; \
+ ms-fe30[0-9][0-9]) echo partman/raid1-1partition.cfg ;; \
+ ms-be30[0-9][0-9]) echo partman/ceph-ssd.cfg ;; \
labsdb[1-3]|mw[0-9]*|srv[0-9]*|bast*) echo partman/mw.cfg ;; \
labsdb100[1-3]) echo partman/mw.cfg ;; \
nickel) echo partman/raid1.cfg ;; \
diff --git a/files/autoinstall/partman/ms-be-eqiad.cfg
b/files/autoinstall/partman/ms-be-eqiad.cfg
new file mode 100644
index 000..6597b9d
--- /dev/null
+++ b/files/autoinstall/partman/ms-be-eqiad.cfg
@@ -0,0 +1,57 @@
+# Automatic software RAID partitioning
+#
+# * two disks, sdm sdn (720xd internal bays, SSDs)
+# * primary partitions, no LVM
+# * layout:
+# - / : ext3, RAID1, 60GB
+# - swap: RAID1, 1GB
+# - the rest of each respective disk (no RAID) formatted as xfs, unmounted
+
+d-ipartman-auto/method string raid
+
+d-ipartman-md/device_remove_md boolean true
+d-ipartman-lvm/device_remove_lvm boolean true
+
+d-ipartman-auto/disk string /dev/sdm /dev/sdn
+d-igrub-installer/bootdev string /dev/sdm /dev/sdn
+
+# this workarounds LP #1012629 / Debian #666974
+# it makes grub-installer to jump to step 2, where it uses bootdev
+d-igrub-installer/only_debian boolean false
+
+# Define physical partitions
+d-ipartman-auto/expert_recipe string \
+ multiraid ::\
+ 6 80006 raid\
+ $primary{ } method{ raid } \
+ . \
+ 100010001000raid\
+ $primary{ } method{ raid } \
+ . \
+ 100 500 -1 xfs \
+ $primary{ } method{ format }\
+ format{ } use_filesystem{ } \
+ filesystem{ xfs } \
+ .
+
+# Parameters are:
+# raidtype devcount sparecount fstype mountpoint \
+# devices sparedevices
+d-ipartman-auto-raid/recipestring \
+ 1 2 0 ext3/ \
+ /dev/sdm1#/dev/sdn1 \
+ . \
+ 1 2 0 swap- \
+ /dev/sdm2#/dev/sdn2 \
+ .
+
+d-ipartman-md/confirm boolean true
+d-ipartman-md/confirm_nooverwrite boolean true
+d-ipartman/confirm_write_new_label boolean true
+d-ipartman/choose_partitionselect finish
+d-ipartman/confirm boolean true
+d-ipartman/confirm_nooverwrite boolean true
+
+# the first is for lucid, the second for precise (partman-xfs = 45)
+d-ipartman-xfs/no_mount_point boolean false
+d-ipartman-basicfilesystems/no_mount_point boolean false
diff --git a/files/autoinstall/partman/virt-raid10-cisco-ceph.cfg
[MediaWiki-commits] [Gerrit] partman: cleanup external store profiles - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: partman: cleanup external store profiles
..
partman: cleanup external store profiles
Remove apache.cfg, this seems to be the old setup where application
servers were also external storage. It's unreferenced and replaced by
mw.cfg es.cfg for the two distinct roles.
Rename es.cfg to db.cfg and discard the old db.cfg: it was
incomprehensible, unreferenced all db boxes seem to be configured
to be partitioned using the es.cfg profile.
Split netboot.cfg lines that use es.cfg to two, to clearly distinct
database/external boxes from misc boxes.
All of the above are non-functional changes.
Change-Id: If3a1406cd0e7730f499adf7c0f9f66ca7dc671c1
---
M files/autoinstall/netboot.cfg
D files/autoinstall/partman/apache.cfg
M files/autoinstall/partman/db.cfg
D files/autoinstall/partman/es.cfg
4 files changed, 52 insertions(+), 82 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/autoinstall/netboot.cfg b/files/autoinstall/netboot.cfg
index f3ab1c5..162ee04 100755
--- a/files/autoinstall/netboot.cfg
+++ b/files/autoinstall/netboot.cfg
@@ -36,7 +36,8 @@
analytics100[1-9]|analytics1010) echo
partman/analytics-cisco.cfg ;; \
analytics101[1-9]|analytics102[0-2]) echo partman/raid1-30G.cfg
;; \
analytics102[3-7]) echo partman/analytics-dell.cfg ;; \
-
bayes|db[0-8][0-9]|db10[0-6][0-9]|es10[0-2][0-9]|es[0-9]|es1[0-9]|netmon1001|stat1002|tungsten)
echo partman/es.cfg ;; \
+ db[0-8][0-9]|db10[0-6][0-9]|es10[0-2][0-9]|es[0-9]|es1[0-9])
echo partman/db.cfg ;; \
+ bayes|netmon1001|stat1002|tungsten) echo partman/db.cfg ;; \
boron|chromium|hydrogen) echo partman/lvm.cfg ;; \
calcium|helium|potassium|tmh1001|tmh1002) echo
partman/raid1-1partition.cfg ;; \
capella) echo partman/lvs.cfg ;; \
diff --git a/files/autoinstall/partman/apache.cfg
b/files/autoinstall/partman/apache.cfg
deleted file mode 100644
index 095a22b..000
--- a/files/autoinstall/partman/apache.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-# Application server specific configuration
-
-# Implementation specific hack:
-d-ipartman-auto/init_automatically_partition select
20some_device__/var/lib/partman/devices/=dev=sda
-d-i partman-auto/method string regular
-d-ipartman-auto/disk string /dev/sda
-
-d-ipartman/choose_partitionselect Finish partitioning and write
changes to disk
-d-ipartman/confirm boolean true
-
-# Note, expert_recipe wants to fill up the entire disk
-# See
http://d-i.alioth.debian.org/svn/debian-installer/installer/doc/devel/partman-auto-recipe.txt
-d-ipartman-auto/expert_recipe string apache : 3000 5000 8000 ext3
$primary{ } $bootable{ } method{ format } format{ } use_filesystem{ }
filesystem{ ext3 } mountpoint{ / } . 1000 1000 1000 linux-swap method{ swap }
format{ } . 2000 2000 2000 ext method{ format } format{ } use_filesystem{ }
filesystem{ ext3 } mountpoint{ /tmp } . 64 1000 1000 jfs method{ format }
format{ } use_filesystem{ } filesystem{ jfs } mountpoint{ /a } .
-d-ipartman-auto/choose_recipe apache
-
-# Preseeding of other packages
-fontconfig fontconfig/enable_bitmaps boolean true
diff --git a/files/autoinstall/partman/db.cfg b/files/autoinstall/partman/db.cfg
index 5c2d5c1..8d0c408 100644
--- a/files/autoinstall/partman/db.cfg
+++ b/files/autoinstall/partman/db.cfg
@@ -1,14 +1,54 @@
-# Core DB specific configuration
+# configuration to create:
+# * no RAID (either single disk or hardware raid presenting a single device)
+# * 40G /
+# * 8G swap
+# * the rest formatted with LVM with 90% used
+# ** the rest as xfs on /a
+# ** 10% empty space for later growth
-# Implementation specific hack:
-d-ipartman-auto/init_automatically_partition select
20some_device__/var/lib/partman/devices/=dev=sda
-d-i partman-auto/method string regular
+
+d-ipartman-auto/method string lvm
d-ipartman-auto/disk string /dev/sda
-d-ipartman/choose_partitionselect Finish partitioning and write
changes to disk
-d-ipartman/confirm boolean true
+# the install makes sure we want to wipe the lvm
+d-ipartman-lvm/device_remove_lvm boolean true
+d-ipartman-auto/confirmboolean true
-# Note, expert_recipe wants to fill up the entire disk
-# See
http://d-i.alioth.debian.org/svn/debian-installer/installer/doc/devel/partman-auto-recipe.txt
-d-ipartman-auto/expert_recipe string db : 3000 5000 8000 ext3
$primary{ } $bootable{ } method{ format } format{ } use_filesystem{ }
filesystem{ ext3 } mountpoint{ / } . 1000 1000 1000 linux-swap method{ swap }
format{ } . 64 1000 1000 xfs method{ format } format{ } use_filesystem{ }
[MediaWiki-commits] [Gerrit] Remove jfsutils from base::standard-packages - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Remove jfsutils from base::standard-packages
..
Remove jfsutils from base::standard-packages
JFS is not used anywhere. Purging it as well
Change-Id: I7e3643a21942fba004f54338e07bc93b28032f11
---
M modules/base/manifests/standard-packages.pp
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/manifests/standard-packages.pp
b/modules/base/manifests/standard-packages.pp
index 7b38928..f913f47 100644
--- a/modules/base/manifests/standard-packages.pp
+++ b/modules/base/manifests/standard-packages.pp
@@ -5,7 +5,6 @@
'wipe',
'tzdata',
'zsh-beta',
-'jfsutils',
'xfsprogs',
'wikimedia-raid-utils',
'screen',
@@ -27,6 +26,10 @@
ensure = latest;
}
+package { 'jfsutils':
+ensure = absent,
+}
+
if $::network_zone == internal {
include nrpe
}
--
To view, visit https://gerrit.wikimedia.org/r/86252
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e3643a21942fba004f54338e07bc93b28032f11
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Akosiaris akosia...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: change eqiad to the new partition layout - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87357
Change subject: swift: change eqiad to the new partition layout
..
swift: change eqiad to the new partition layout
Change label_filesystem/mount_filesystem targets to swap sdm with sda
and sdn with sdb in accordance with the new partitioning layout.
See Id0df94 for the rationale.
Change-Id: I62c16fc7a7f2356d2afb722d4aa66d6a4e5bc166
---
M manifests/site.pp
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/87357/1
diff --git a/manifests/site.pp b/manifests/site.pp
index a412262..6407cad 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1951,19 +1951,19 @@
node /^ms-be10[0-9][0-9]\.eqiad\.wmnet$/ {
$all_drives = [
-'/dev/sdc', '/dev/sdd', '/dev/sde', '/dev/sdf',
-'/dev/sdg', '/dev/sdh', '/dev/sdi', '/dev/sdj',
-'/dev/sdk', '/dev/sdl', '/dev/sdm', '/dev/sdn'
+'/dev/sda', '/dev/sdb', '/dev/sdc', '/dev/sdd',
+'/dev/sde', '/dev/sdf', '/dev/sdg', '/dev/sdh',
+'/dev/sdi', '/dev/sdj', '/dev/sdk', '/dev/sdl'
]
include role::swift::eqiad-prod::storage
swift::create_filesystem{ $all_drives: partition_nr = '1' }
# these are already partitioned and xfs formatted by the installer
-swift::label_filesystem{ '/dev/sda3': }
-swift::label_filesystem{ '/dev/sdb3': }
-swift::mount_filesystem{ '/dev/sda3': }
-swift::mount_filesystem{ '/dev/sdb3': }
+swift::label_filesystem{ '/dev/sdm3': }
+swift::label_filesystem{ '/dev/sdn3': }
+swift::mount_filesystem{ '/dev/sdm3': }
+swift::mount_filesystem{ '/dev/sdn3': }
}
node /^ms-be300[1-4]\.esams\.wikimedia\.org$/ {
--
To view, visit https://gerrit.wikimedia.org/r/87357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I62c16fc7a7f2356d2afb722d4aa66d6a4e5bc166
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: change eqiad to the new partition layout - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: swift: change eqiad to the new partition layout
..
swift: change eqiad to the new partition layout
Change create_filesystem/mount_filesystem targets to swap sdm with sda
and sdn with sdb in accordance with the new partitioning layout.
See Id0df94 for the rationale.
Change-Id: I62c16fc7a7f2356d2afb722d4aa66d6a4e5bc166
---
M manifests/site.pp
1 file changed, 7 insertions(+), 7 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index a412262..6407cad 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1951,19 +1951,19 @@
node /^ms-be10[0-9][0-9]\.eqiad\.wmnet$/ {
$all_drives = [
-'/dev/sdc', '/dev/sdd', '/dev/sde', '/dev/sdf',
-'/dev/sdg', '/dev/sdh', '/dev/sdi', '/dev/sdj',
-'/dev/sdk', '/dev/sdl', '/dev/sdm', '/dev/sdn'
+'/dev/sda', '/dev/sdb', '/dev/sdc', '/dev/sdd',
+'/dev/sde', '/dev/sdf', '/dev/sdg', '/dev/sdh',
+'/dev/sdi', '/dev/sdj', '/dev/sdk', '/dev/sdl'
]
include role::swift::eqiad-prod::storage
swift::create_filesystem{ $all_drives: partition_nr = '1' }
# these are already partitioned and xfs formatted by the installer
-swift::label_filesystem{ '/dev/sda3': }
-swift::label_filesystem{ '/dev/sdb3': }
-swift::mount_filesystem{ '/dev/sda3': }
-swift::mount_filesystem{ '/dev/sdb3': }
+swift::label_filesystem{ '/dev/sdm3': }
+swift::label_filesystem{ '/dev/sdn3': }
+swift::mount_filesystem{ '/dev/sdm3': }
+swift::mount_filesystem{ '/dev/sdn3': }
}
node /^ms-be300[1-4]\.esams\.wikimedia\.org$/ {
--
To view, visit https://gerrit.wikimedia.org/r/87357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I62c16fc7a7f2356d2afb722d4aa66d6a4e5bc166
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Updates to handling of templated-generated attributes - change (mediawiki...Parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87358
Change subject: WIP: Updates to handling of templated-generated attributes
..
WIP: Updates to handling of templated-generated attributes
* First pass done dealing with the wt -- html bit where
data-mw is added according to revised spec.
* Reverse direction html -- wt is yet to be implemented.
Change-Id: I4d132e611547996e99b8376e089bc6fa5b9b63bf
---
M js/lib/ext.core.AttributeExpander.js
M js/lib/ext.core.DOMFragmentBuilder.js
M js/lib/ext.core.LinkHandler.js
M js/lib/mediawiki.Util.js
4 files changed, 157 insertions(+), 176 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/58/87358/1
diff --git a/js/lib/ext.core.AttributeExpander.js
b/js/lib/ext.core.AttributeExpander.js
index e7504c0..48cef6e 100644
--- a/js/lib/ext.core.AttributeExpander.js
+++ b/js/lib/ext.core.AttributeExpander.js
@@ -3,26 +3,28 @@
*/
use strict;
-var Util = require('./mediawiki.Util.js').Util,
+var async = require('async'),
+ Util = require('./mediawiki.Util.js').Util,
AttributeTransformManager =
require('./mediawiki.TokenTransformManager.js').
AttributeTransformManager,
defines = require('./mediawiki.parser.defines.js');
// define some constructor shortcuts
var KV = defines.KV,
+EOFTk = defines.EOFTk,
TagTk = defines.TagTk,
SelfclosingTagTk = defines.SelfclosingTagTk;
/* --
* This helper method does two different things:
*
- * 1. Strips all meta tags
+ * 1. Strips all meta tags (introduced by transclusions, etc)
* 2. In wrap-template mode, it identifies the meta-object type
*and returns it.
* -- */
function stripMetaTags( tokens, wrapTemplates ) {
var isPushed, buf = [],
wikitext = [],
- metaObjTypes = [],
+ hasGeneratedContent = false,
inTpl = false,
inInclude = false;
@@ -40,17 +42,14 @@
var t = token.getAttribute(typeof);
var typeMatch = t
t.match(/(mw:(Transclusion|Param|Extension|Includes\/)(.*)?$)/);
if (typeMatch) {
- if (typeMatch[1].match(/\/End$/)) {
- inTpl = false;
- inInclude = false;
- } else {
+ if (!typeMatch[1].match(/\/End$/)) {
inTpl =
typeMatch[1].match(/Transclusion|Param|Extension/);
inInclude = !inTpl;
- }
-
- if (inTpl || inInclude) {
- metaObjTypes.push(typeMatch[1]);
+ hasGeneratedContent = true;
wikitext.push(token.dataAttribs.src);
+ } else {
+ inTpl = false;
+ inInclude = false;
}
} else {
isPushed = true;
@@ -74,34 +73,10 @@
}
return {
- // SSS FIXME: Assumes that either the attr. has only 1 expansion
- // OR all expansions are of the same type.
- // Consider the attr composed of pieces: s1, s2, s3
- // - s1 can be generated by a template
- // - s2 can be plain text
- // - s3 can be generated by an extension.
- // While that might be considered utter madness, there is
nothing in
- // the spec right now that prevents this. In any case, not sure
- // we do require all expandable types to be tracked.
- metaObjType: metaObjTypes[0],
+ hasGeneratedContent: hasGeneratedContent,
wikitext: Util.tokensToString(wikitext),
value: buf
};
-}
-
-function makeTplAffectedMeta( contentType, key, val ) {
- // SSS FIXME: Assumes that all expanded attrs. have the same expandable
type
- // - attr1 can be expanded by a template
- // - attr2 can be expanded by an extension
- // While that might be considered madness, there is nothing in the spec
right
- // not that prevents this. In any case, not sure we do require all
- // expandable types to be tracked.
-
- // meta about=#mwt1 property=mw:objectAttr#href
[MediaWiki-commits] [Gerrit] Only enable Bug 54847 code if on production - change (operations/mediawiki-config)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87359
Change subject: Only enable Bug 54847 code if on production
..
Only enable Bug 54847 code if on production
Change-Id: I773ad990f126ac780cd329c691f1ddb238c53b9d
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/59/87359/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0ca9b6b..21c9e1b 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2700,7 +2700,7 @@
}
// Bug 54847
-if ( $wmgBug54847 $wmgUseCentralAuth ) {
+if ( $wmgBug54847 $wmgUseCentralAuth $wmfRealm == 'production' ) {
require( $wmfConfigDir/Bug54847.php );
}
--
To view, visit https://gerrit.wikimedia.org/r/87359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I773ad990f126ac780cd329c691f1ddb238c53b9d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Schema for campaign throttling - change (mediawiki...CentralNotice)
Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87360
Change subject: Schema for campaign throttling
..
Schema for campaign throttling
Change-Id: Ib82117a1b53eeca3e2aeeeb8e4676e61291146fa
---
M CentralNotice.sql
M patches/CNDatabasePatcher.php
2 files changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/60/87360/1
diff --git a/CentralNotice.sql b/CentralNotice.sql
index 0d081bb..875cac0 100644
--- a/CentralNotice.sql
+++ b/CentralNotice.sql
@@ -9,6 +9,7 @@
`not_end` char(14) NOT NULL,
`not_enabled` tinyint(1) NOT NULL DEFAULT '0',
`not_preferred` tinyint(1) NOT NULL DEFAULT '0',
+ `not_throttle` int NOT NULL DEFAULT '100',
`not_locked` tinyint(1) NOT NULL DEFAULT '0',
`not_geo` tinyint(1) NOT NULL DEFAULT '0',
`not_buckets` tinyint(1) NOT NULL DEFAULT '1',
@@ -119,6 +120,8 @@
`notlog_end_enabled` tinyint(1) DEFAULT NULL,
`notlog_begin_preferred` tinyint(1) DEFAULT NULL,
`notlog_end_preferred` tinyint(1) DEFAULT NULL,
+ `notlog_begin_throttle` int DEFAULT NULL,
+ `notlog_end_throttle` int DEFAULT NULL,
`notlog_begin_locked` tinyint(1) DEFAULT NULL,
`notlog_end_locked` tinyint(1) DEFAULT NULL,
`notlog_begin_geo` tinyint(1) DEFAULT NULL,
diff --git a/patches/CNDatabasePatcher.php b/patches/CNDatabasePatcher.php
index 0887100..60a260d 100644
--- a/patches/CNDatabasePatcher.php
+++ b/patches/CNDatabasePatcher.php
@@ -117,6 +117,12 @@
$base . '/patch-custom-groups.sql',
true
)
);
+ $updater-addExtensionUpdate(
+ array(
+'addField', 'cn_notices',
'not_throttle',
+$base .
'/patch-campaign_throttle.sql', true
+ )
+ );
} elseif ( $updater-getDB()-getType() == 'sqlite' ) {
$updater-addExtensionUpdate(
array(
--
To view, visit https://gerrit.wikimedia.org/r/87360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib82117a1b53eeca3e2aeeeb8e4676e61291146fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Adamw awi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable wmgBug54847 on labs - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/87361 Change subject: Disable wmgBug54847 on labs .. Disable wmgBug54847 on labs Change-Id: I230a60ee4c9496700b86b81c310ff81b223bd1a3 --- M wmf-config/InitialiseSettings-labs.php 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/61/87361/1 diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 33ddaba..54f16a5 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -271,9 +271,9 @@ ), 'wgSecureLogin' = array( -'default' = false, -'loginwiki' = true, -), + 'default' = false, + 'loginwiki' = true, + ), 'wgSearchSuggestCacheExpiry' = array( 'default' = 1800, @@ -285,7 +285,11 @@ 'wmgUseFlow' = array( 'enwiki' = true, - ) + ), + + 'wmgBug54847' = array( + 'default' = false, + ), ); } # wmflLabsSettings() -- To view, visit https://gerrit.wikimedia.org/r/87361 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I230a60ee4c9496700b86b81c310ff81b223bd1a3 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable wmgBug54847 on labs - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Disable wmgBug54847 on labs .. Disable wmgBug54847 on labs Change-Id: I230a60ee4c9496700b86b81c310ff81b223bd1a3 --- M wmf-config/InitialiseSettings-labs.php 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 33ddaba..54f16a5 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -271,9 +271,9 @@ ), 'wgSecureLogin' = array( -'default' = false, -'loginwiki' = true, -), + 'default' = false, + 'loginwiki' = true, + ), 'wgSearchSuggestCacheExpiry' = array( 'default' = 1800, @@ -285,7 +285,11 @@ 'wmgUseFlow' = array( 'enwiki' = true, - ) + ), + + 'wmgBug54847' = array( + 'default' = false, + ), ); } # wmflLabsSettings() -- To view, visit https://gerrit.wikimedia.org/r/87361 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I230a60ee4c9496700b86b81c310ff81b223bd1a3 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Test. Do not merge. - change (mediawiki...Nostalgia)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87362
Change subject: Test. Do not merge.
..
Test. Do not merge.
Change-Id: Icc19146dc173c04685ce11a036a4484d784099b0
---
M Nostalgia_body.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Nostalgia
refs/changes/62/87362/1
diff --git a/Nostalgia_body.php b/Nostalgia_body.php
index 6c5a381..b518a5f 100644
--- a/Nostalgia_body.php
+++ b/Nostalgia_body.php
@@ -21,6 +21,7 @@
* @ingroup Skins
*/
+
if( !defined( 'MEDIAWIKI' ) ) {
die( -1 );
}
--
To view, visit https://gerrit.wikimedia.org/r/87362
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc19146dc173c04685ce11a036a4484d784099b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Nostalgia
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Wikipedias to 1.22wmf19 - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/87363 Change subject: Wikipedias to 1.22wmf19 .. Wikipedias to 1.22wmf19 Change-Id: I9e5558b4b188d25e185ec2e7d658622f163659c5 --- M wikiversions.dat 1 file changed, 287 insertions(+), 287 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/63/87363/1 diff --git a/wikiversions.dat b/wikiversions.dat index fc635d3..ad9aa38 100644 --- a/wikiversions.dat +++ b/wikiversions.dat @@ -1,200 +1,200 @@ aawikibooks php-1.22wmf19 * -aawiki php-1.22wmf18 * +aawiki php-1.22wmf19 * aawiktionary php-1.22wmf19 * -abwiki php-1.22wmf18 * +abwiki php-1.22wmf19 * abwiktionary php-1.22wmf19 * -acewiki php-1.22wmf18 * +acewiki php-1.22wmf19 * advisorywiki php-1.22wmf19 * afwikibooks php-1.22wmf19 * -afwiki php-1.22wmf18 * +afwiki php-1.22wmf19 * afwikiquote php-1.22wmf19 * afwiktionary php-1.22wmf19 * akwikibooks php-1.22wmf19 * -akwiki php-1.22wmf18 * +akwiki php-1.22wmf19 * akwiktionary php-1.22wmf19 * alswikibooks php-1.22wmf19 * -alswiki php-1.22wmf18 * +alswiki php-1.22wmf19 * alswikiquote php-1.22wmf19 * alswiktionary php-1.22wmf19 * -amwiki php-1.22wmf18 * +amwiki php-1.22wmf19 * amwikiquote php-1.22wmf19 * amwiktionary php-1.22wmf19 * angwikibooks php-1.22wmf19 * -angwiki php-1.22wmf18 * +angwiki php-1.22wmf19 * angwikiquote php-1.22wmf19 * angwikisource php-1.22wmf19 * angwiktionary php-1.22wmf19 * -anwiki php-1.22wmf18 * +anwiki php-1.22wmf19 * anwiktionary php-1.22wmf19 * arbcom_dewiki php-1.22wmf19 * arbcom_enwiki php-1.22wmf19 * arbcom_fiwiki php-1.22wmf19 * arbcom_nlwiki php-1.22wmf19 * -arcwiki php-1.22wmf18 * +arcwiki php-1.22wmf19 * arwikibooks php-1.22wmf19 * arwikimedia php-1.22wmf19 * arwikinews php-1.22wmf19 * -arwiki php-1.22wmf18 * +arwiki php-1.22wmf19 * arwikiquote php-1.22wmf19 * arwikisource php-1.22wmf19 * arwikiversity php-1.22wmf19 * arwiktionary php-1.22wmf19 * -arzwiki php-1.22wmf18 * +arzwiki php-1.22wmf19 * astwikibooks php-1.22wmf19 * -astwiki php-1.22wmf18 * +astwiki php-1.22wmf19 * astwikiquote php-1.22wmf19 * astwiktionary php-1.22wmf19 * aswikibooks php-1.22wmf19 * -aswiki php-1.22wmf18 * +aswiki php-1.22wmf19 * aswikisource php-1.22wmf19 * aswiktionary php-1.22wmf19 * auditcomwiki php-1.22wmf19 * -avwiki php-1.22wmf18 * +avwiki php-1.22wmf19 * avwiktionary php-1.22wmf19 * aywikibooks php-1.22wmf19 * -aywiki php-1.22wmf18 * +aywiki php-1.22wmf19 * aywiktionary php-1.22wmf19 * azwikibooks php-1.22wmf19 * -azwiki php-1.22wmf18 * +azwiki php-1.22wmf19 * azwikiquote php-1.22wmf19 * azwikisource php-1.22wmf19 * azwiktionary php-1.22wmf19 * -barwiki php-1.22wmf18 * -bat_smgwiki php-1.22wmf18 * +barwiki php-1.22wmf19 * +bat_smgwiki php-1.22wmf19 * bawikibooks php-1.22wmf19 * -bawiki php-1.22wmf18 * -bclwiki php-1.22wmf18 * +bawiki php-1.22wmf19 * +bclwiki php-1.22wmf19 * bdwikimedia php-1.22wmf19 * betawikiversity php-1.22wmf19 * bewikibooks php-1.22wmf19 * bewikimedia php-1.22wmf19 * -bewiki php-1.22wmf18 * +bewiki php-1.22wmf19 * bewikiquote php-1.22wmf19 * bewikisource php-1.22wmf19 * bewiktionary php-1.22wmf19 * -be_x_oldwiki php-1.22wmf18 * +be_x_oldwiki php-1.22wmf19 * bgwikibooks php-1.22wmf19 * bgwikinews php-1.22wmf19 * -bgwiki php-1.22wmf18 * +bgwiki php-1.22wmf19 * bgwikiquote php-1.22wmf19 * bgwikisource php-1.22wmf19 * bgwiktionary php-1.22wmf19 * -bhwiki php-1.22wmf18 * +bhwiki php-1.22wmf19 * bhwiktionary php-1.22wmf19 * biwikibooks php-1.22wmf19 * -biwiki php-1.22wmf18 * +biwiki php-1.22wmf19 * biwiktionary php-1.22wmf19 * -bjnwiki php-1.22wmf18 * +bjnwiki php-1.22wmf19 * bmwikibooks php-1.22wmf19 * -bmwiki php-1.22wmf18 * +bmwiki php-1.22wmf19 * bmwikiquote php-1.22wmf19 * bmwiktionary php-1.22wmf19 * bnwikibooks php-1.22wmf19 * -bnwiki php-1.22wmf18 * +bnwiki php-1.22wmf19 * bnwikisource php-1.22wmf19 * bnwiktionary php-1.22wmf19 * boardgovcomwiki php-1.22wmf19 * boardwiki php-1.22wmf19 * bowikibooks php-1.22wmf19 * -bowiki php-1.22wmf18 * +bowiki php-1.22wmf19 * bowiktionary php-1.22wmf19 * -bpywiki php-1.22wmf18 * +bpywiki php-1.22wmf19 * brwikimedia php-1.22wmf19 * -brwiki php-1.22wmf18 * +brwiki php-1.22wmf19 * brwikiquote php-1.22wmf19 * brwikisource php-1.22wmf19 * brwiktionary php-1.22wmf19 * bswikibooks php-1.22wmf19 * bswikinews php-1.22wmf19 * -bswiki php-1.22wmf18 * +bswiki php-1.22wmf19 * bswikiquote php-1.22wmf19 * bswikisource php-1.22wmf19 * bswiktionary php-1.22wmf19 * -bugwiki php-1.22wmf18 * -bxrwiki php-1.22wmf18 * +bugwiki php-1.22wmf19 * +bxrwiki php-1.22wmf19 * cawikibooks php-1.22wmf19 * cawikinews php-1.22wmf19 * -cawiki php-1.22wmf18 * +cawiki php-1.22wmf19 * cawikiquote php-1.22wmf19 * cawikisource php-1.22wmf19 * cawiktionary php-1.22wmf19 * -cbk_zamwiki php-1.22wmf18 * -cdowiki php-1.22wmf18 * -cebwiki php-1.22wmf18 * -cewiki php-1.22wmf18 * +cbk_zamwiki php-1.22wmf19 *
[MediaWiki-commits] [Gerrit] testwiki, test2wiki, testwikidatawiki, loginwiki and mediawi... - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/87364 Change subject: testwiki, test2wiki, testwikidatawiki, loginwiki and mediawikiwiki to 1.22wmf20 .. testwiki, test2wiki, testwikidatawiki, loginwiki and mediawikiwiki to 1.22wmf20 Change-Id: I98a7286eedc6f46ac0e026d683dbc85f2afff16d --- M wikiversions.dat 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/64/87364/1 diff --git a/wikiversions.dat b/wikiversions.dat index ad9aa38..ae62f2f 100644 --- a/wikiversions.dat +++ b/wikiversions.dat @@ -451,7 +451,7 @@ lnwikibooks php-1.22wmf19 * lnwiki php-1.22wmf19 * lnwiktionary php-1.22wmf19 * -loginwiki php-1.22wmf19 * +loginwiki php-1.22wmf20 * lowiki php-1.22wmf19 * lowiktionary php-1.22wmf19 * ltgwiki php-1.22wmf19 * @@ -465,7 +465,7 @@ lvwiktionary php-1.22wmf19 * map_bmswiki php-1.22wmf19 * mdfwiki php-1.22wmf19 * -mediawikiwiki php-1.22wmf19 * +mediawikiwiki php-1.22wmf20 * metawiki php-1.22wmf19 * mgwikibooks php-1.22wmf19 * mgwiki php-1.22wmf19 * @@ -731,9 +731,9 @@ tawikisource php-1.22wmf19 * tawiktionary php-1.22wmf19 * tenwiki php-1.22wmf19 * -test2wiki php-1.22wmf19 * -testwiki php-1.22wmf19 * -testwikidatawiki php-1.22wmf19 * +test2wiki php-1.22wmf20 * +testwiki php-1.22wmf20 * +testwikidatawiki php-1.22wmf20 * tetwiki php-1.22wmf19 * tewikibooks php-1.22wmf19 * tewiki php-1.22wmf19 * -- To view, visit https://gerrit.wikimedia.org/r/87364 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I98a7286eedc6f46ac0e026d683dbc85f2afff16d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP (FR #1048) Allocations perform campaign throttling - change (mediawiki...CentralNotice)
Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87366
Change subject: WIP (FR #1048) Allocations perform campaign throttling
..
WIP (FR #1048) Allocations perform campaign throttling
Note: This patch can be safely reverted independently without damaging the rest
of the feature, or normal CentralNotice operation.
Change-Id: Ib5a4c9459cc365584e35c9fa62e606aedca63e13
---
M CentralNotice.hooks.php
M includes/BannerChooser.php
A tests/AllocationsTest.php
3 files changed, 155 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/66/87366/1
diff --git a/CentralNotice.hooks.php b/CentralNotice.hooks.php
index 6bbb078..6cf39a9 100644
--- a/CentralNotice.hooks.php
+++ b/CentralNotice.hooks.php
@@ -321,6 +321,7 @@
* @return bool
*/
function efCentralNoticeUnitTests( $files ) {
+ $files[ ] = __DIR__ . '/tests/AllocationsTest.php';
$files[ ] = __DIR__ . '/tests/ApiAllocationsTest.php';
$files[ ] = __DIR__ . '/tests/CentralNoticeTest.php';
$files[ ] = __DIR__ . '/tests/BannerTest.php';
diff --git a/includes/BannerChooser.php b/includes/BannerChooser.php
index b4ddbda..81bbed7 100644
--- a/includes/BannerChooser.php
+++ b/includes/BannerChooser.php
@@ -112,13 +112,6 @@
$this-filterBannersOnColumn( 'device',
$this-allocContext-getDevice() );
}
- // Always filter out lower Z-levels
- $highest_z = CentralNotice::LOW_PRIORITY;
- foreach ( $this-banners as $banner ) {
- $highest_z = max( $banner[ 'campaign_z_index' ],
$highest_z );
- }
- $this-filterBannersOnColumn( 'campaign_z_index', $highest_z );
-
// Filter for the provided bucket.
$bucket = $this-allocContext-getBucket();
$this-banners = array_filter(
@@ -153,29 +146,79 @@
}
/**
-* Calculate allocation proportions and store them in the banners
-*
-* note: lumps all campaigns weights together according to absolute
proportions of total.
+* Calculate allocation proportions and store them in the banners.
*/
protected function allocate() {
- $total = array_reduce(
- $this-banners,
- function ( $result, $banner ) {
- return $result + $banner[ 'weight' ];
- },
- 0
- );
-
- if ( $total === 0 ) {
- //TODO wfDebug
- return;
+ // Normalize banners to a proportion of the total campaign
weight.
+ $campaignTotalWeights = array();
+ foreach ( $this-banners as $banner ) {
+ if ( empty( $campaignTotalWeights[$banner['campaign']]
) ) {
+ $campaignTotalWeights[$banner['campaign']] = 0;
+ }
+ $campaignTotalWeights[$banner['campaign']] +=
$banner['weight'];
+ }
+ foreach ( $this-banners as $banner ) {
+ // Adjust the maximum allocation for the banner
according to
+ // campaign throttle settings. The max_allocation
would be
+ // this banner's allocation if only one campaign were
present.
+ $banner['max_allocation'] = ( $banner['weight'] /
$campaignTotalWeights[$banner['campaign']] )
+ * ( $banner['campaign_throttle'] / 100.0 );
}
- // Sort the banners by weight, smallest to largest - this helps
in slot allocation
- // because we are not guaranteed to underallocate but we do
want to attempt to give
- // one slot per banner
- usort( $this-banners, function( $a, $b ) {
- return ( $a[ 'weight' ] = $b[ 'weight' ] ) ? 1
: -1;
+ // Collect banners by priority level, and determine total
desired
+ // allocation for each level.
+ $priorityTotalAllocations = array();
+ $priorityBanners = array();
+ foreach ( $this-banners as $banner ) {
+ $priorityBanners[$banner['campaign_z_index']][] =
$banner;
+
+ if ( empty(
$priorityTotalAllocations[$banner['campaign_z_index']] ) ) {
+
$priorityTotalAllocations[$banner['campaign_z_index']] = 0;
+ }
+ $priorityTotalAllocations[$banner['campaign_z_index']]
+= $banner['max_allocation'];
+ }
+
+ // Distribute allocation by priority.
+ $remainingAllocation = 1.0;
+ // Order by
[MediaWiki-commits] [Gerrit] (FR #1048) Campaign throttle knob - change (mediawiki...CentralNotice)
Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87365
Change subject: (FR #1048) Campaign throttle knob
..
(FR #1048) Campaign throttle knob
This patch contains the support and UI for the feature, but does not affect
allocations.
Campaign throttle allows CentralNotice admins to limit the traffic going to
their banners to a percentage of the total potential maximum allocation.
Leftover allocations are rolled over to campaigns at the next lower priority
levels.
Change-Id: I04d81df646c62580b5337b90f32db04c2ca37f59
---
M CentralNotice.i18n.php
M CentralNotice.modules.php
M includes/Banner.php
M includes/Campaign.php
M modules/ext.centralNotice.adminUi.campaignManager/campaignManager.css
M modules/ext.centralNotice.adminUi.campaignManager/campaignManager.js
M modules/ext.centralNotice.adminUi/centralnotice.css
M special/SpecialCentralNotice.php
M tests/ApiAllocationsTest.php
M tests/BannerTest.php
M tests/CentralNoticeTest.php
M tests/CentralNoticeTestFixtures.php
12 files changed, 126 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/65/87365/1
diff --git a/CentralNotice.i18n.php b/CentralNotice.i18n.php
index b9d27ac..eb474d3 100644
--- a/CentralNotice.i18n.php
+++ b/CentralNotice.i18n.php
@@ -52,6 +52,8 @@
'centralnotice-banner' = 'Banner',
'centralnotice-banner-heading' = 'Banner: $1',
'centralnotice-templates' = 'Banners',
+ 'centralnotice-throttle' = 'Limit traffic',
+ 'centralnotice-throttle-amount' = 'Limit traffic to proportion of
total',
'centralnotice-balanced' = 'Equal weight banners',
'centralnotice-weight' = 'Weight',
'centralnotice-locked' = 'Locked',
@@ -349,6 +351,8 @@
'centralnotice-templates' = '* Used as code$1/code in
{{msg-mw|Centralnotice-log-label}}.
* Used as column header of the table.
* Used as link text. The link points to [[Special:NoticeTemplate]].',
+ 'centralnotice-throttle' = 'Label for a checkbox used to limit traffic
to a campaign',
+ 'centralnotice-throttle-amount' = 'Label for a dropdown menu listing
the maximum percentage of traffic which will be allocated to a campaign',
'centralnotice-balanced' = 'Label for a checkbox which will cause all
banners in a campaign to be given the same weight',
'centralnotice-weight' = 'Used in Notice Details page of
[[meta:Special:CentralNotice|Central Notice]] special page.
* Used as label for the Weight select box.
diff --git a/CentralNotice.modules.php b/CentralNotice.modules.php
index ae89cc3..e70f7e3 100644
--- a/CentralNotice.modules.php
+++ b/CentralNotice.modules.php
@@ -127,7 +127,8 @@
'remoteExtPath' = 'CentralNotice/modules',
'dependencies' = array(
'ext.centralNotice.adminUi',
- 'jquery.ui.dialog'
+ 'jquery.ui.dialog',
+ 'jquery.ui.slider',
),
'scripts' =
'ext.centralNotice.adminUi.campaignManager/campaignManager.js',
'styles'=
'ext.centralNotice.adminUi.campaignManager/campaignManager.css',
diff --git a/includes/Banner.php b/includes/Banner.php
index 3b25baa..ac94134 100644
--- a/includes/Banner.php
+++ b/includes/Banner.php
@@ -1246,6 +1246,7 @@
'not_preferred',
'asn_bucket',
'not_buckets',
+ 'not_throttle',
'dev_name',
),
array(
@@ -1276,6 +1277,7 @@
'campaign' = $row-not_name,
// campaign the banner is assigned to
'campaign_z_index' =
$row-not_preferred, // z level of the campaign
'campaign_num_buckets' = intval(
$row-not_buckets ),
+ 'campaign_throttle' = intval(
$row-not_throttle ),
'bucket' = ( intval(
$row-not_buckets ) == 1 ) ? 0 : intval( $row-asn_bucket ),
);
}
diff --git a/includes/Campaign.php b/includes/Campaign.php
index 42a083a..c2b78a2 100644
--- a/includes/Campaign.php
+++ b/includes/Campaign.php
@@ -218,6 +218,7 @@
'not_archived',
'not_geo',
'not_buckets',
+'not_throttle',
),
$selector,
__METHOD__
@@ -231,6 +232,7 @@
$this-archived = (bool)$row-not_archived;
$this-geotargeted = (bool)$row-not_geo;
$this-buckets =
[MediaWiki-commits] [Gerrit] Bundle message should show diff of all included revisions - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged.
Change subject: Bundle message should show diff of all included revisions
..
Bundle message should show diff of all included revisions
bug: 54391
Change-Id: I6c726d9d36e87fb5092b3c3e205e10ae0de557b4
---
M formatters/BasicFormatter.php
M formatters/NotificationFormatter.php
M formatters/PageLinkFormatter.php
M includes/DbEchoBackend.php
M includes/EchoBackend.php
5 files changed, 95 insertions(+), 32 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/formatters/BasicFormatter.php b/formatters/BasicFormatter.php
index 82d2a79..08e34f5 100644
--- a/formatters/BasicFormatter.php
+++ b/formatters/BasicFormatter.php
@@ -4,6 +4,9 @@
* @Todo - Consider having $event/$user as class properties since the
formatter is
* always tied to these two entities, in this case, we won't have to pass it
around
* in all the internal method
+ * @Todo - Instance variable $distributionType has been added, the local
distribution
+ * type variable $type passed along all the protected/private method should be
removed
+ * from all formatters
*/
class EchoBasicFormatter extends EchoNotificationFormatter {
@@ -61,6 +64,14 @@
'raw-data-count' = 1
);
+ /**
+* Max number of raw bundle data to query for each bundle event
+*/
+ protected static $maxRawBundleData = 250;
+
+ /**
+* @param array
+*/
public function __construct( $params ) {
parent::__construct( $params );
@@ -141,7 +152,7 @@
*
* @param $event EchoEvent that the notification is for.
* @param $user User to format the notification for.
-* @param $type string The type of notification being distributed (e.g.
email, web)
+* @deprecated $type
*/
protected function applyChangeBeforeFormatting( EchoEvent $event, User
$user, $type ) {
// Use the bundle message if use-bundle is true and there is a
bundle message
@@ -162,6 +173,7 @@
public function format( $event, $user, $type ) {
global $wgExtensionAssetsPath, $wgEchoNotificationIcons;
+ $this-setDistributionType( $type );
$this-applyChangeBeforeFormatting( $event, $user, $type );
if ( $this-outputFormat === 'email' ) {
@@ -245,7 +257,7 @@
*
* @param $event EchoEvent
* @param $user User
-* @param $type string
+* @deprecated $type
* @return array
*/
protected function formatEmail( $event, $user, $type ) {
@@ -253,7 +265,7 @@
$this-language = $user-getOption( 'language' );
// Email digest
- if ( $type === 'emaildigest' ) {
+ if ( $this-distributionType === 'emaildigest' ) {
return $this-formatEmailDigest( $event, $user );
}
@@ -522,7 +534,7 @@
* Get raw bundle data for an event so it can be manipulated
* @param $event EchoEvent
* @param $user User
-* @param $type string Notification distribution type: web/email
+* @deprecated $type
* @return ResultWrapper|bool
*/
protected function getRawBundleData( $event, $user, $type ) {
@@ -535,11 +547,11 @@
return false;
}
- $data = $wgEchoBackend-getRawBundleData( $user,
$event-getBundleHash(), $type );
+ $data = $wgEchoBackend-getRawBundleData( $user,
$event-getBundleHash(), $this-distributionType, 'DESC',
self::$maxRawBundleData );
if ( $data ) {
$this-bundleData['raw-data-count'] += $data-numRows();
- if ( $type !== 'web' ) {
+ if ( $this-distributionType !== 'web' ) {
$this-bundleData['raw-data-count']--;
}
}
@@ -553,12 +565,16 @@
* this function to use a differnt group iterator such as title,
namespace
* @param $event EchoEvent
* @param $user User
-* @param $type string Notification distribution type
+* @deprecated $type
*/
protected function generateBundleData( $event, $user, $type ) {
global $wgEchoMaxNotificationCount;
$data = $this-getRawBundleData( $event, $user, $type );
+
+ // Default the last raw data to false, which means there is no
+ // bundle data other than the base
+ $this-bundleData['last-raw-data'] = false;
if ( !$data ) {
return;
@@ -584,15 +600,18 @@
$agents[$row-$key] = $row-$key;
$count++;
}
-
-
