[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Update documentation
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370305 )
Change subject: Update documentation
..
Update documentation
Rendered the installation guide up-to-date and matched the
documentation of the tag attributes to the code. Made other (than
`raw`) boolean attributes consistant with `raw`.
Bug: T113046
Change-Id: Ie4818d6a9edc18c1cefdbcbff217ed0721130f1c
---
M README
M Score.body.php
2 files changed, 20 insertions(+), 33 deletions(-)
Approvals:
jenkins-bot: Verified
Nikerabbit: Looks good to me, approved
diff --git a/README b/README
index bece82e..a9b2a4d 100644
--- a/README
+++ b/README
@@ -9,30 +9,28 @@
The extension is also capable of creating Ogg/Vorbis files from the MIDI files
generated by LilyPond. If you want to make use of this functionality, you need
-to have the OggHandler extension installed, see
+to have the TimedMediaHandler extension installed, see
-https://www.mediawiki.org/wiki/Extension:OggHandler
+https://www.mediawiki.org/wiki/Extension:TimedMediaHandler
for more information.
-This extension was tested with LilyPond 2.12.3.
+This extension was tested with LilyPond 2.12.3 through 2.18.2.
Setup
=
1. Change to the "extensions" directory of your MediaWiki installation.
-2. Create a new subdirectory named "Score".
-3. Copy the files Score.php, Score.body.php and Score.i18n.php into the new
- subdirectory. Make sure they are readable by your webserver.
-4. Create a subdirectory named "lilypond" in your $wgUploadDirectory (usually
+2. Clone this repository.
+3. Create a subdirectory named "lilypond" in your $wgUploadDirectory (usually
the directory named "images" in in your MediaWiki directory). Make sure
the directory is writable by your webserver. If you do not create this
directory, the Score extension will attempt to create it for you with the
rights available to it.
-5. Add the lines
+4. Add the lines
- require_once("$IP/extensions/Score/Score.php");
+ wfLoadExtension( 'score' );
$wgScoreLilyPond = '/path/to/your/lilypond/executable'; /* required */
$wgScoreAbc2Ly = '/path/to/your/abc2ly/executable'; /* if you want ABC to
LilyPond conversion
*/
@@ -79,9 +77,8 @@
.
* Attribute: midi
- Allowed values: 0 (default), 1
- Effect: If set to 1, the rendered image(s) will be embedded into a hyperlink
- to an appropriate MIDI file.
+ Effect: If included in the tag, the rendered image(s) will be embedded into a
+ hyperlink to an appropriate MIDI file.
* Attribute: override_ogg
Allowed values: Known file name, that is, if override_ogg="name" is given,
@@ -95,16 +92,13 @@
page, if you prefer.
* Attribute: raw
- Allowed valued: 0 (default), 1
- Effect: If set to 1, the score code is interpreted as a complete LilyPond
- file. Use this option if you want to create more complex scores.
- If the score language (lang attribute) is not set to lilypond, this
- attribute is ignored.
+ Effect: If included in the tag, the score code is interpreted as a complete
+ LilyPond file. Use this option if you want to create more complex
+ scores. If the score language (lang attribute) is not set to
+ lilypond, this attribute is ignored.
* Attribute: vorbis
- Allowed values: 0 (default), 1
- Effect: If set to 1, an Ogg/Vorbis file will be generated for the score,
- provided you installed and configured the OggHandler extension.
- An Ogg/Vorbis player will be embedded in the HTML below the score
- image(s).
-
+ Effect: If included in the tag, an Ogg/Vorbis file will be generated for the
+ score, provided you installed and configured the OggHandler
+ extension. An Ogg/Vorbis player will be embedded in the HTML below
+ the score image(s).
diff --git a/Score.body.php b/Score.body.php
index 0a6517f..ea1cd3e 100644
--- a/Score.body.php
+++ b/Score.body.php
@@ -236,11 +236,7 @@
$options['raw'] = array_key_exists( 'raw', $args );
/* Midi linking? */
- if ( array_key_exists( 'midi', $args ) ) {
- $options['link_midi'] = $args['midi'];
- } else {
- $options['link_midi'] = false;
- }
+ $options['link_midi'] = array_key_exists( 'midi', $args
);
/* Override OGG file? */
if ( array_key_exists( 'override_ogg', $args ) ) {
@@ -260,11 +256,8 @@
}
/* Vorbis rendering? */
- if ( array_key_exists( 'vorbis', $args ) ) {
- $options['generate_ogg'] = $args['vorbis'];
- } el
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSkin[master]: BSSkin: Fixed if statement for newer versions of echo
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372340 )
Change subject: BSSkin: Fixed if statement for newer versions of echo
..
BSSkin: Fixed if statement for newer versions of echo
* in newer versions than 1.27 of echo, this text can be a message obect
Change-Id: I9cfbc0e9fa71187a7934bf022cb9906687d2eaeb
---
M includes/BlueSpiceSkinHooks.php
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/BlueSpiceSkinHooks.php b/includes/BlueSpiceSkinHooks.php
index 5c43323..0e43c9c 100644
--- a/includes/BlueSpiceSkinHooks.php
+++ b/includes/BlueSpiceSkinHooks.php
@@ -148,8 +148,10 @@
'class' => 'mw-echo-notification-badge-nojs
oo-ui-icon-bell oo-ui-widget-enabled mw-echo-notifications-badge',
) + $tpl->data['personal_urls']['notifications-alert'];
- if ( isset(
$tpl->data['personal_urls']['notifications-alert']['text'] )
- &&
$tpl->data['personal_urls']['notifications-alert']['text'] > 0 ) {
+ $bNotifications = !empty(
+
$tpl->data['personal_urls']['notifications-alert']['text']
+ );
+ if ( $bNotifications ) {
$tpl->data['bs_personal_info'][10]['active'] = true;
}
--
To view, visit https://gerrit.wikimedia.org/r/372340
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9cfbc0e9fa71187a7934bf022cb9906687d2eaeb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Pwirth
Gerrit-Reviewer: Dvogel hallowelt
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: BSFoundation: Replaced deprecated DB_WRITE with DB_MASTER
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372344 )
Change subject: BSFoundation: Replaced deprecated DB_WRITE with DB_MASTER
..
BSFoundation: Replaced deprecated DB_WRITE with DB_MASTER
Change-Id: I8742ea4ed838f69a2194643691b2b4479b34887c
---
M includes/Config.class.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Config.class.php b/includes/Config.class.php
index 2486bd6..16eaf8a 100644
--- a/includes/Config.class.php
+++ b/includes/Config.class.php
@@ -299,7 +299,7 @@
* @return bool false if an error occurs
*/
public static function saveSettings() {
- $dbw = wfGetDB ( DB_WRITE );
+ $dbw = wfGetDB ( DB_MASTER );
$dbw->delete( 'bs_settings', '*' );
--
To view, visit https://gerrit.wikimedia.org/r/372344
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8742ea4ed838f69a2194643691b2b4479b34887c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSPermissionManager: Replaced deprecated DB_WRITE with DB_MA...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372343 )
Change subject: BSPermissionManager: Replaced deprecated DB_WRITE with DB_MASTER
..
BSPermissionManager: Replaced deprecated DB_WRITE with DB_MASTER
Change-Id: I5b09f358dc2349c6935c4bd50488ac9981517b28
---
M PermissionManager/PermissionManager.class.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PermissionManager/PermissionManager.class.php
b/PermissionManager/PermissionManager.class.php
index 2fa245c..f9cfcf3 100644
--- a/PermissionManager/PermissionManager.class.php
+++ b/PermissionManager/PermissionManager.class.php
@@ -235,7 +235,7 @@
public static function setTemplateData( $oTemplate ) {
global $wgRequest;
- $dbw = wfGetDB( DB_WRITE );
+ $dbw = wfGetDB( DB_MASTER );
//return false if $oTemplate is empty
if ( $oTemplate == null ) {
$aResult = array(
--
To view, visit https://gerrit.wikimedia.org/r/372343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5b09f358dc2349c6935c4bd50488ac9981517b28
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pwirth
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: BSFoundation: Replaced all wfRunHooks with Hooks::run
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372404 )
Change subject: BSFoundation: Replaced all wfRunHooks with Hooks::run
..
BSFoundation: Replaced all wfRunHooks with Hooks::run
Change-Id: I9617e0ce162ae792aecd84bde35e8eac20e7c2f8
---
M includes/Config.class.php
M includes/Core.class.php
M includes/CoreHooks.php
M includes/Entity.php
M includes/EntityRegistry.php
M includes/api/BSApiExtJSStoreBase.php
M includes/api/BSApiPingTasks.php
M includes/outputhandler/views/view.UserMiniProfile.php
M includes/skins/BsBaseTemplate.php
M includes/utility/WidgetListHelper.class.php
M maintenance/DeployJavaWebApps.php
11 files changed, 20 insertions(+), 20 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Config.class.php b/includes/Config.class.php
index 2486bd6..f87a727 100644
--- a/includes/Config.class.php
+++ b/includes/Config.class.php
@@ -183,7 +183,7 @@
wfProfileIn ( 'BS::Core::ConfigGet' );
$mReturn = null;
- if( !wfRunHooks ( "BSCoreConfigGet", array ( $sPath, &$mReturn
) ) ) {
+ if( !Hooks::run ( "BSCoreConfigGet", array ( $sPath, &$mReturn
) ) ) {
wfProfileOut ( 'BS::Core::ConfigGet' );
return $mReturn;
}
@@ -331,12 +331,12 @@
);
}
- wfRunHooks( 'BsSettingsBeforeSaveSettings', array( &$aSettings
) );
+ Hooks::run( 'BsSettingsBeforeSaveSettings', array( &$aSettings
) );
# write the settings array to the database
$bReturn = $dbw->insert('bs_settings', $aSettings);
- wfRunHooks( 'BsSettingsAfterSaveSettings', array( $aSettings )
);
+ Hooks::run( 'BsSettingsAfterSaveSettings', array( $aSettings )
);
BsCacheHelper::invalidateCache(
BsCacheHelper::getCacheKey( 'BlueSpice', 'BsConfig',
'settings' )
diff --git a/includes/Core.class.php b/includes/Core.class.php
index 8f83052..de26310 100644
--- a/includes/Core.class.php
+++ b/includes/Core.class.php
@@ -519,7 +519,7 @@
$oUserMiniProfileView->setOptions( $aParams );
$oUserMiniProfileView->setOption( 'user', $oUser );
- wfRunHooks( 'BSCoreGetUserMiniProfileBeforeInit', array(
&$oUserMiniProfileView, &$oUser, &$aParams ) );
+ Hooks::run( 'BSCoreGetUserMiniProfileBeforeInit', array(
&$oUserMiniProfileView, &$oUser, &$aParams ) );
$oUserMiniProfileView->init();
diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php
index e53c7ac..da40d81 100755
--- a/includes/CoreHooks.php
+++ b/includes/CoreHooks.php
@@ -203,7 +203,7 @@
$oUser = $out->getUser();
$aScriptSettings = BsConfig::getScriptSettings();
- wfRunHooks('BsFoundationBeforeMakeGlobalVariablesScript',
array( $oUser, &$aScriptSettings ) );
+ Hooks::run('BsFoundationBeforeMakeGlobalVariablesScript',
array( $oUser, &$aScriptSettings ) );
foreach ( $aScriptSettings as $oVar ) {
$mValue = $oVar->getValue();
@@ -535,7 +535,7 @@
$oTitle = $skin->getTitle();
$aSettingViews = array();
- wfRunHooks( 'BS:UserPageSettings', array( $oUser, $oTitle,
&$aSettingViews ) );
+ Hooks::run( 'BS:UserPageSettings', array( $oUser, $oTitle,
&$aSettingViews ) );
$oUserPageSettingsView = new ViewBaseElement();
$oUserPageSettingsView->setAutoWrap(
diff --git a/includes/Entity.php b/includes/Entity.php
index df4bcb0..c5e816d 100644
--- a/includes/Entity.php
+++ b/includes/Entity.php
@@ -283,7 +283,7 @@
$this->setUnsavedChanges( false );
- wfRunHooks( 'BSEntitySaveComplete', array( $this, $oStatus,
$oUser ) );
+ Hooks::run( 'BSEntitySaveComplete', array( $this, $oStatus,
$oUser ) );
$this->invalidateCache();
return $oStatus;
@@ -299,7 +299,7 @@
$oStatus = null;
$oWikiPage = WikiPage::factory( $oTitle );
- wfRunHooks( 'BSEntityDelete', array( $this, $oStatus, $oUser )
);
+ Hooks::run( 'BSEntityDelete', array( $this, $oStatus, $oUser )
);
if( $oStatus instanceof Status && $oStatus->isOK() ) {
return $oStatus;
}
@@ -312,7 +312,7 @@
return Status::newFatal( $e->getMessage() );
}
- wfRunHooks( 'BSEntityDeleteComplete', array( $this, $oStatus )
);
+ Hooks::run( 'BSEntityDeleteComplete', array( $this, $oStatus )
);
if( !$oStatus->isOK() ) {
return $oStatus;
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: BSFoudation: Moved the Hook base class out of the Hook names...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372350 ) Change subject: BSFoudation: Moved the Hook base class out of the Hook namespace .. BSFoudation: Moved the Hook base class out of the Hook namespace Change-Id: I4b3e81ebf20579dc9a997212d7235eb2847d3991 --- R src/Hook.php M src/Hook/BeforePageDisplay.php M src/Hook/LinkEnd.php M src/Hook/LoadExtensionSchemaUpdates.php M src/Hook/MakeGlobalVariablesScript.php M src/Hook/PageContentSaveComplete.php M src/Hook/ParserFirstCallInit.php M src/Hook/SkinTemplateNavigation.php M src/Hook/SoftwareInfo.php M src/Hook/UserCan.php M src/Hook/UserGetRights.php 11 files changed, 11 insertions(+), 1 deletion(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/src/Hook/Hook.php b/src/Hook.php similarity index 97% rename from src/Hook/Hook.php rename to src/Hook.php index 9ee8e18..4725063 100644 --- a/src/Hook/Hook.php +++ b/src/Hook.php @@ -1,5 +1,5 @@ https://gerrit.wikimedia.org/r/372350 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4b3e81ebf20579dc9a997212d7235eb2847d3991 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Pwirth Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: PageAssignments: Fixed I18N for notifications
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370181 )
Change subject: PageAssignments: Fixed I18N for notifications
..
PageAssignments: Fixed I18N for notifications
The messages are being used in an e-mail. Therefore the sentence should end
with a full stop.
Change-Id: Icb134eee15baaa3319797e9615e40fdaf6085c8c
---
M PageAssignments/i18n/en.json
1 file changed, 7 insertions(+), 7 deletions(-)
Approvals:
Pwirth: Looks good to me, but someone else must approve
Robert Vogel: Looks good to me, approved
Raimond Spekking: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/PageAssignments/i18n/en.json b/PageAssignments/i18n/en.json
index 1b759e0..7de2b59 100644
--- a/PageAssignments/i18n/en.json
+++ b/PageAssignments/i18n/en.json
@@ -36,25 +36,25 @@
"bs-pageassignments-notification-reason-group": "You are a member of
{{PLURAL:$1|the group|the groups}}: $2",
"notification-bs-pageassignments-assignment-change-add-summary": "$1
{{GENDER:$2|assigned}} you to $3",
"notification-bs-pageassignments-assignment-change-add-subject":
"Assignment to $2",
- "notification-bs-pageassignments-assignment-change-add-body": "$1
{{GENDER:$2|assigned}} you to the page $2",
+ "notification-bs-pageassignments-assignment-change-add-body": "$1
{{GENDER:$2|assigned}} you to the page $2.",
"notification-bs-pageassignments-assignment-change-remove-summary": "$1
{{GENDER:$2|removed}} your assignment to $3",
"notification-bs-pageassignments-assignment-change-remove-subject":
"Removal of assignment to $2",
- "notification-bs-pageassignments-assignment-change-remove-body": "Your
assignment to the page $2 was {{GENDER:$2|removed}} by $1",
+ "notification-bs-pageassignments-assignment-change-remove-body": "Your
assignment to the page $2 was {{GENDER:$2|removed}} by $1.",
"notification-bs-pageassignments-page-move-summary": "$3 was
{{GENDER:$2|moved}} by $1",
"notification-bs-pageassignments-page-move-subject": "$2 was moved",
- "notification-bs-pageassignments-page-move-body": "$1
{{GENDER:$2|moved}} the page $2",
+ "notification-bs-pageassignments-page-move-body": "$1
{{GENDER:$2|moved}} the page $2.",
"notification-bs-pageassignments-page-edit-summary": "$3 was
{{GENDER:$2|edited}} by $1",
"notification-bs-pageassignments-page-edit-subject": "$2 was edited",
- "notification-bs-pageassignments-page-edit-body": "$1
{{GENDER:$2|edited}} the page $2",
+ "notification-bs-pageassignments-page-edit-body": "$1
{{GENDER:$2|edited}} the page $2.",
"notification-bs-pageassignments-page-delete-summary": "$3 was
{{GENDER:$2|deleted}} by $1",
"notification-bs-pageassignments-page-delete-subject": "$2 was deleted",
- "notification-bs-pageassignments-page-delete-body": "$1
{{GENDER:$2|deleted}} the page $2",
+ "notification-bs-pageassignments-page-delete-body": "$1
{{GENDER:$2|deleted}} the page $2.",
"notification-bs-pageassignments-user-group-add-summary": "You have
been added to the group $4",
"notification-bs-pageassignments-user-group-add-subject": "Added to
group $4",
- "notification-bs-pageassignments-user-group-add-body": "$1
{{GENDER:$2|added}} you to the group $4. Please check your assignment on $3",
+ "notification-bs-pageassignments-user-group-add-body": "$1
{{GENDER:$2|added}} you to the group $4. Please check your assignment on $3.",
"notification-bs-pageassignments-user-group-remove-summary": "You have
been removed from the {{PLURAL:$5|group|groups}} $4",
"notification-bs-pageassignments-user-group-remove-subject": "Removed
from {{PLURAL:$5|group|groups}} $4",
- "notification-bs-pageassignments-user-group-remove-body": "$1
{{GENDER:$2|removed}} you from the {{PLURAL:$5|group|groups}} $4. Please check
your assignment on $3",
+ "notification-bs-pageassignments-user-group-remove-body": "$1
{{GENDER:$2|removed}} you from the {{PLURAL:$5|group|groups}} $4. Please check
your assignment on $3.",
"prefs-pageassignments": "Page Assignments",
"bs-pageassignments-pref-permissions": "Add additional permissions to
assigned users",
"bs-pageassignments-yourassignments": "Your assignments",
--
To view, visit https://gerrit.wikimedia.org/r/370181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb134eee15baaa3319797e9615e40fdaf6085c8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Raimond Spekking
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
__
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: PageAssignments: Fixed I18N for notifications
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372500 )
Change subject: PageAssignments: Fixed I18N for notifications
..
PageAssignments: Fixed I18N for notifications
The messages are being used in an e-mail. Therefore the sentence should end
with a full stop.
Change-Id: Icb134eee15baaa3319797e9615e40fdaf6085c8c
---
M PageAssignments/i18n/en.json
1 file changed, 7 insertions(+), 7 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PageAssignments/i18n/en.json b/PageAssignments/i18n/en.json
index 1b759e0..7de2b59 100644
--- a/PageAssignments/i18n/en.json
+++ b/PageAssignments/i18n/en.json
@@ -36,25 +36,25 @@
"bs-pageassignments-notification-reason-group": "You are a member of
{{PLURAL:$1|the group|the groups}}: $2",
"notification-bs-pageassignments-assignment-change-add-summary": "$1
{{GENDER:$2|assigned}} you to $3",
"notification-bs-pageassignments-assignment-change-add-subject":
"Assignment to $2",
- "notification-bs-pageassignments-assignment-change-add-body": "$1
{{GENDER:$2|assigned}} you to the page $2",
+ "notification-bs-pageassignments-assignment-change-add-body": "$1
{{GENDER:$2|assigned}} you to the page $2.",
"notification-bs-pageassignments-assignment-change-remove-summary": "$1
{{GENDER:$2|removed}} your assignment to $3",
"notification-bs-pageassignments-assignment-change-remove-subject":
"Removal of assignment to $2",
- "notification-bs-pageassignments-assignment-change-remove-body": "Your
assignment to the page $2 was {{GENDER:$2|removed}} by $1",
+ "notification-bs-pageassignments-assignment-change-remove-body": "Your
assignment to the page $2 was {{GENDER:$2|removed}} by $1.",
"notification-bs-pageassignments-page-move-summary": "$3 was
{{GENDER:$2|moved}} by $1",
"notification-bs-pageassignments-page-move-subject": "$2 was moved",
- "notification-bs-pageassignments-page-move-body": "$1
{{GENDER:$2|moved}} the page $2",
+ "notification-bs-pageassignments-page-move-body": "$1
{{GENDER:$2|moved}} the page $2.",
"notification-bs-pageassignments-page-edit-summary": "$3 was
{{GENDER:$2|edited}} by $1",
"notification-bs-pageassignments-page-edit-subject": "$2 was edited",
- "notification-bs-pageassignments-page-edit-body": "$1
{{GENDER:$2|edited}} the page $2",
+ "notification-bs-pageassignments-page-edit-body": "$1
{{GENDER:$2|edited}} the page $2.",
"notification-bs-pageassignments-page-delete-summary": "$3 was
{{GENDER:$2|deleted}} by $1",
"notification-bs-pageassignments-page-delete-subject": "$2 was deleted",
- "notification-bs-pageassignments-page-delete-body": "$1
{{GENDER:$2|deleted}} the page $2",
+ "notification-bs-pageassignments-page-delete-body": "$1
{{GENDER:$2|deleted}} the page $2.",
"notification-bs-pageassignments-user-group-add-summary": "You have
been added to the group $4",
"notification-bs-pageassignments-user-group-add-subject": "Added to
group $4",
- "notification-bs-pageassignments-user-group-add-body": "$1
{{GENDER:$2|added}} you to the group $4. Please check your assignment on $3",
+ "notification-bs-pageassignments-user-group-add-body": "$1
{{GENDER:$2|added}} you to the group $4. Please check your assignment on $3.",
"notification-bs-pageassignments-user-group-remove-summary": "You have
been removed from the {{PLURAL:$5|group|groups}} $4",
"notification-bs-pageassignments-user-group-remove-subject": "Removed
from {{PLURAL:$5|group|groups}} $4",
- "notification-bs-pageassignments-user-group-remove-body": "$1
{{GENDER:$2|removed}} you from the {{PLURAL:$5|group|groups}} $4. Please check
your assignment on $3",
+ "notification-bs-pageassignments-user-group-remove-body": "$1
{{GENDER:$2|removed}} you from the {{PLURAL:$5|group|groups}} $4. Please check
your assignment on $3.",
"prefs-pageassignments": "Page Assignments",
"bs-pageassignments-pref-permissions": "Add additional permissions to
assigned users",
"bs-pageassignments-yourassignments": "Your assignments",
--
To view, visit https://gerrit.wikimedia.org/r/372500
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb134eee15baaa3319797e9615e40fdaf6085c8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: PageAssignments: Fixed I18N for notifications
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372500 )
Change subject: PageAssignments: Fixed I18N for notifications
..
PageAssignments: Fixed I18N for notifications
The messages are being used in an e-mail. Therefore the sentence should end
with a full stop.
Change-Id: Icb134eee15baaa3319797e9615e40fdaf6085c8c
---
M PageAssignments/i18n/en.json
1 file changed, 7 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/00/372500/1
diff --git a/PageAssignments/i18n/en.json b/PageAssignments/i18n/en.json
index 1b759e0..7de2b59 100644
--- a/PageAssignments/i18n/en.json
+++ b/PageAssignments/i18n/en.json
@@ -36,25 +36,25 @@
"bs-pageassignments-notification-reason-group": "You are a member of
{{PLURAL:$1|the group|the groups}}: $2",
"notification-bs-pageassignments-assignment-change-add-summary": "$1
{{GENDER:$2|assigned}} you to $3",
"notification-bs-pageassignments-assignment-change-add-subject":
"Assignment to $2",
- "notification-bs-pageassignments-assignment-change-add-body": "$1
{{GENDER:$2|assigned}} you to the page $2",
+ "notification-bs-pageassignments-assignment-change-add-body": "$1
{{GENDER:$2|assigned}} you to the page $2.",
"notification-bs-pageassignments-assignment-change-remove-summary": "$1
{{GENDER:$2|removed}} your assignment to $3",
"notification-bs-pageassignments-assignment-change-remove-subject":
"Removal of assignment to $2",
- "notification-bs-pageassignments-assignment-change-remove-body": "Your
assignment to the page $2 was {{GENDER:$2|removed}} by $1",
+ "notification-bs-pageassignments-assignment-change-remove-body": "Your
assignment to the page $2 was {{GENDER:$2|removed}} by $1.",
"notification-bs-pageassignments-page-move-summary": "$3 was
{{GENDER:$2|moved}} by $1",
"notification-bs-pageassignments-page-move-subject": "$2 was moved",
- "notification-bs-pageassignments-page-move-body": "$1
{{GENDER:$2|moved}} the page $2",
+ "notification-bs-pageassignments-page-move-body": "$1
{{GENDER:$2|moved}} the page $2.",
"notification-bs-pageassignments-page-edit-summary": "$3 was
{{GENDER:$2|edited}} by $1",
"notification-bs-pageassignments-page-edit-subject": "$2 was edited",
- "notification-bs-pageassignments-page-edit-body": "$1
{{GENDER:$2|edited}} the page $2",
+ "notification-bs-pageassignments-page-edit-body": "$1
{{GENDER:$2|edited}} the page $2.",
"notification-bs-pageassignments-page-delete-summary": "$3 was
{{GENDER:$2|deleted}} by $1",
"notification-bs-pageassignments-page-delete-subject": "$2 was deleted",
- "notification-bs-pageassignments-page-delete-body": "$1
{{GENDER:$2|deleted}} the page $2",
+ "notification-bs-pageassignments-page-delete-body": "$1
{{GENDER:$2|deleted}} the page $2.",
"notification-bs-pageassignments-user-group-add-summary": "You have
been added to the group $4",
"notification-bs-pageassignments-user-group-add-subject": "Added to
group $4",
- "notification-bs-pageassignments-user-group-add-body": "$1
{{GENDER:$2|added}} you to the group $4. Please check your assignment on $3",
+ "notification-bs-pageassignments-user-group-add-body": "$1
{{GENDER:$2|added}} you to the group $4. Please check your assignment on $3.",
"notification-bs-pageassignments-user-group-remove-summary": "You have
been removed from the {{PLURAL:$5|group|groups}} $4",
"notification-bs-pageassignments-user-group-remove-subject": "Removed
from {{PLURAL:$5|group|groups}} $4",
- "notification-bs-pageassignments-user-group-remove-body": "$1
{{GENDER:$2|removed}} you from the {{PLURAL:$5|group|groups}} $4. Please check
your assignment on $3",
+ "notification-bs-pageassignments-user-group-remove-body": "$1
{{GENDER:$2|removed}} you from the {{PLURAL:$5|group|groups}} $4. Please check
your assignment on $3.",
"prefs-pageassignments": "Page Assignments",
"bs-pageassignments-pref-permissions": "Add additional permissions to
assigned users",
"bs-pageassignments-yourassignments": "Your assignments",
--
To view, visit https://gerrit.wikimedia.org/r/372500
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb134eee15baaa3319797e9615e40fdaf6085c8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: http.py: Show a more descriptive warning
Dalba has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372499 )
Change subject: http.py: Show a more descriptive warning
..
http.py: Show a more descriptive warning
Change-Id: I1c1e69ef97d1aebfc591ad58ed28f6394bcd4557
---
M pywikibot/comms/http.py
1 file changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/99/372499/1
diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py
index e889975..0e578fe 100644
--- a/pywikibot/comms/http.py
+++ b/pywikibot/comms/http.py
@@ -341,8 +341,12 @@
if len(config.authenticate[path]) in [2, 4]:
return config.authenticate[path]
else:
-warn('Invalid authentication tokens for %s '
- 'set in `config.authenticate`' % path)
+warn('Invalid authentication tokens for {path} '
+ 'set in `config.authenticate`. '
+ 'It should contain 2 or 4 items, not {length}. See '
+ 'https://www.mediawiki.org/wiki/Manual:Pywikibot/OAuth'
+ ' for more information.'
+ .format(path=path, length=len(config.authenticate[path])))
return None
--
To view, visit https://gerrit.wikimedia.org/r/372499
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c1e69ef97d1aebfc591ad58ed28f6394bcd4557
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Add href to refresh icon on Special:Nearby to change cursor
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372492 ) Change subject: Add href to refresh icon on Special:Nearby to change cursor .. Add href to refresh icon on Special:Nearby to change cursor Added the href option to the refresh icon on the Special:Nearby page so that the icon can change cursor from pointer to hand as done when one hovers on a link. Bug: T126387 Change-Id: I4939c9b5fd2189028bb2404392161fc935aca222 --- M resources/mobile.special.nearby.scripts/nearby.js 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: jenkins-bot: Verified Jdlrobson: Looks good to me, approved diff --git a/resources/mobile.special.nearby.scripts/nearby.js b/resources/mobile.special.nearby.scripts/nearby.js index 10dbaca..892c3eb 100644 --- a/resources/mobile.special.nearby.scripts/nearby.js +++ b/resources/mobile.special.nearby.scripts/nearby.js @@ -27,6 +27,7 @@ id: 'secondary-button', additionalClassNames: 'main-header-button', tagName: 'a', + href: '#', title: mw.msg( 'mobile-frontend-nearby-refresh' ), label: mw.msg( 'mobile-frontend-nearby-refresh' ) } ); -- To view, visit https://gerrit.wikimedia.org/r/372492 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4939c9b5fd2189028bb2404392161fc935aca222 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: D3r1ck01 Gerrit-Reviewer: Brian Wolff Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: Legoktm Gerrit-Reviewer: MaxSem Gerrit-Reviewer: Pmiazga Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Check if SpecialMobileWatchlist exist
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372470 )
Change subject: Check if SpecialMobileWatchlist exist
..
Check if SpecialMobileWatchlist exist
If MobileFrontend doesn't exist this will throw an error
Bug: T171241
Change-Id: Ie61cfa61b78a53598ac59aea15c8a4e6a261238d
---
M includes/skins/SkinMinerva.php
1 file changed, 10 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index e6d66f4..d108b48 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -470,13 +470,16 @@
$watchlistQuery = [];
$user = $this->getUser();
if ( $user ) {
- $view = $user->getOption(
SpecialMobileWatchlist::VIEW_OPTION_NAME, false );
- $filter = $user->getOption(
SpecialMobileWatchlist::FILTER_OPTION_NAME, false );
- if ( $view ) {
- $watchlistQuery['watchlistview'] = $view;
- }
- if ( $filter && $view === 'feed' ) {
- $watchlistQuery['filter'] = $filter;
+ // Avoid fatal when MobileFrontend not available
(T171241)
+ if ( class_exists( 'SpecialMobileWatchlist' ) ) {
+ $view = $user->getOption(
SpecialMobileWatchlist::VIEW_OPTION_NAME, false );
+ $filter = $user->getOption(
SpecialMobileWatchlist::FILTER_OPTION_NAME, false );
+ if ( $view ) {
+ $watchlistQuery['watchlistview'] =
$view;
+ }
+ if ( $filter && $view === 'feed' ) {
+ $watchlistQuery['filter'] = $filter;
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/372470
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie61cfa61b78a53598ac59aea15c8a4e6a261238d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Pmiazga
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove deprecated jquery.mwExtension module
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372498 )
Change subject: Remove deprecated jquery.mwExtension module
..
Remove deprecated jquery.mwExtension module
* Deprecated since MediaWiki 1.26.
* Not used anywhere in Wikimedia Git.
* Grafana mw-js-deprecate dashboard shows < 1 hit per day on average
for any of the jquery.mwExtension properties, during the past 3 weeks.
Most days 0, some days 18 individual hits.
By comparison, legacy wikibits before we removed it in May 2017 was down
to about 6,000/24h (combined), so removal is quite overdue.
* Keep module registration for now as no-op that logs a warning.
To be removed in a couple of weeks.
Change-Id: Ib66d1844b4fb8d7185b0e6607b9f98c1be632bb5
---
M resources/Resources.php
D resources/src/jquery/jquery.mwExtension.js
M tests/qunit/QUnitTestResources.php
D tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js
4 files changed, 1 insertion(+), 195 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/98/372498/1
diff --git a/resources/Resources.php b/resources/Resources.php
index 09bd4dc..79dadc11 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -302,7 +302,7 @@
'targets' => [ 'desktop', 'mobile' ],
],
'jquery.mwExtension' => [
- 'scripts' => 'resources/src/jquery/jquery.mwExtension.js',
+ 'deprecated' => 'Use of "jquery.mwExtension" is deprecated
since MediaWiki 1.26.0',
'targets' => [ 'desktop', 'mobile' ],
],
'jquery.placeholder' => [
diff --git a/resources/src/jquery/jquery.mwExtension.js
b/resources/src/jquery/jquery.mwExtension.js
deleted file mode 100644
index 9d970ed..000
--- a/resources/src/jquery/jquery.mwExtension.js
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * JavaScript backwards-compatibility alternatives and other convenience
functions
- *
- * @deprecated since 1.26 Dated collection of miscellaneous utilities. Methods
are
- * either trivially inline, obsolete, or have a better place elsewhere.
- */
-( function ( $, mw ) {
- $.each( {
- trimLeft: function ( str ) {
- return str === null ? '' : str.toString().replace(
/^\s+/, '' );
- },
- trimRight: function ( str ) {
- return str === null ?
- '' : str.toString().replace( /\s+$/, '' );
- },
- ucFirst: function ( str ) {
- return str.charAt( 0 ).toUpperCase() + str.slice( 1 );
- },
- isDomElement: function ( el ) {
- return !!el && !!el.nodeType;
- },
- isEmpty: function ( v ) {
- var key;
- if (
- v === '' || v === 0 || v === '0' || v === null
|| v === false || v === undefined
- ) {
- return true;
- }
- // the for-loop could potentially contain prototypes
- // to avoid that we check its length first
- if ( v.length === 0 ) {
- return true;
- }
- if ( typeof v === 'object' ) {
- for ( key in v ) {
- return false;
- }
- return true;
- }
- return false;
- },
- compareArray: function ( arrThis, arrAgainst ) {
- var i;
- if ( arrThis.length !== arrAgainst.length ) {
- return false;
- }
- for ( i = 0; i < arrThis.length; i++ ) {
- if ( Array.isArray( arrThis[ i ] ) ) {
- if ( !$.compareArray( arrThis[ i ],
arrAgainst[ i ] ) ) {
- return false;
- }
- } else if ( arrThis[ i ] !== arrAgainst[ i ] ) {
- return false;
- }
- }
- return true;
- },
- compareObject: function ( objectA, objectB ) {
- var prop, type;
-
- // Do a simple check if the types match
- if ( typeof objectA === typeof objectB ) {
-
- // Only loop over the contents if it really is
an object
- if ( typeof objectA === 'object' ) {
- // If they a
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: rdbms: Support secondary autocommit connections in LoadBalancer
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/366507 )
Change subject: rdbms: Support secondary autocommit connections in LoadBalancer
..
rdbms: Support secondary autocommit connections in LoadBalancer
This is useful for things like SqlBagOStuff and JobQueueDB
being able to write in auto-commit mode while the main
transaction round still goes on.
SqlBagOStuff already had this sort of logic.
JobQueueDB now also takes this approach so it does not have to
defer insertion except for sqlite. This makes callers more likely
to know when insertion failed or not.
Make sure LoadBalancer sets "master"/"replica" LB info itself;
this fixes a bug found in the new tests.
Bug: T140338
Bug: T42451
Change-Id: I4199a9598d7afbf976a6efa8ed84b85b56da02bd
---
M includes/jobqueue/JobQueueDB.php
M includes/libs/rdbms/database/DBConnRef.php
M includes/libs/rdbms/loadbalancer/ILoadBalancer.php
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
M includes/objectcache/SqlBagOStuff.php
A tests/phpunit/includes/db/LoadBalancerTest.php
6 files changed, 334 insertions(+), 121 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/jobqueue/JobQueueDB.php b/includes/jobqueue/JobQueueDB.php
index b7cc133..b5f331b 100644
--- a/includes/jobqueue/JobQueueDB.php
+++ b/includes/jobqueue/JobQueueDB.php
@@ -184,15 +184,22 @@
* @return void
*/
protected function doBatchPush( array $jobs, $flags ) {
- DeferredUpdates::addUpdate(
- new AutoCommitUpdate(
- $this->getMasterDB(),
- __METHOD__,
- function ( IDatabase $dbw, $fname ) use (
$jobs, $flags ) {
- $this->doBatchPushInternal( $dbw,
$jobs, $flags, $fname );
- }
- ),
- DeferredUpdates::PRESEND
+ $dbw = $this->getMasterDB();
+ // In general, there will be two cases here:
+ // a) sqlite; DB connection is probably a regular round-aware
handle.
+ // If the connection is busy with a transaction, then defer the
job writes
+ // until right before the main round commit step. Any errors
that bubble
+ // up will rollback the main commit round.
+ // b) mysql/postgres; DB connection is generally a separate
CONN_TRX_AUTO handle.
+ // No transaction is active nor will be started by writes, so
enqueue the jobs
+ // now so that any errors will show up immediately as the
interface expects. Any
+ // errors that bubble up will rollback the main commit round.
+ $fname = __METHOD__;
+ $dbw->onTransactionPreCommitOrIdle(
+ function () use ( $dbw, $jobs, $flags, $fname ) {
+ $this->doBatchPushInternal( $dbw, $jobs,
$flags, $fname );
+ },
+ $fname
);
}
@@ -771,7 +778,12 @@
? $lbFactory->getExternalLB( $this->cluster )
: $lbFactory->getMainLB( $this->wiki );
- return $lb->getConnectionRef( $index, [], $this->wiki );
+ return ( $lb->getServerType( $lb->getWriterIndex() ) !==
'sqlite' )
+ // Keep a separate connection to avoid contention and
deadlocks;
+ // However, SQLite has the opposite behavior due to
DB-level locking.
+ ? $lb->getConnectionRef( $index, [], $this->wiki,
$lb::CONN_TRX_AUTO )
+ // Jobs insertion will be defered until the PRESEND
stage to reduce contention.
+ : $lb->getConnectionRef( $index, [], $this->wiki );
}
/**
diff --git a/includes/libs/rdbms/database/DBConnRef.php
b/includes/libs/rdbms/database/DBConnRef.php
index eb0e954..ef2953e 100644
--- a/includes/libs/rdbms/database/DBConnRef.php
+++ b/includes/libs/rdbms/database/DBConnRef.php
@@ -23,16 +23,17 @@
const FLD_INDEX = 0;
const FLD_GROUP = 1;
const FLD_DOMAIN = 2;
+ const FLD_FLAGS = 3;
/**
* @param ILoadBalancer $lb Connection manager for $conn
-* @param Database|array $conn New connection handle or (server index,
query groups, domain)
+* @param Database|array $conn Database handle or (server index, query
groups, domain, flags)
*/
public function __construct( ILoadBalancer $lb, $conn ) {
$this->lb = $lb;
if ( $conn instanceof Database ) {
$this->conn = $conn; // live handle
- } elseif ( count( $conn ) >= 3 && $conn[self::FLD_DOMAIN] !==
false ) {
+
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Replace fixed `border-radius` values with central vars
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372482 )
Change subject: Replace fixed `border-radius` values with central vars
..
Replace fixed `border-radius` values with central vars
Replacing and aligning fixed `border-radius` values with central
mediawiki.ui vars. With this patch these will be easier replaceable
by WikimediaUI Base vars in future.
Change-Id: I13767df1b5831a763bdecaa04687789983c1980a
---
M modules/dashboard/styles/ext.cx.translationlist.less
M modules/publish/styles/ext.cx.publish.dialog.less
M modules/publish/styles/ext.cx.publish.less
M modules/source/styles/ext.cx.source.selector.less
M modules/tools/styles/ext.cx.tools.card.less
M modules/tools/styles/ext.cx.tools.categories.less
M modules/tools/styles/ext.cx.tools.dictionary.less
M modules/tools/styles/ext.cx.tools.formatter.less
M modules/tools/styles/ext.cx.tools.template.card.less
M modules/ui/styles/widgets/mw.cx.ui.TranslationToolWidget.less
M modules/widgets/common/ext.cx.highlight.less
11 files changed, 17 insertions(+), 15 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dashboard/styles/ext.cx.translationlist.less
b/modules/dashboard/styles/ext.cx.translationlist.less
index f1d4964..4e7d487 100644
--- a/modules/dashboard/styles/ext.cx.translationlist.less
+++ b/modules/dashboard/styles/ext.cx.translationlist.less
@@ -47,7 +47,7 @@
background-color: #fff;
border: 1px solid #ddd;
border-bottom: 3px solid #ddd;
- border-radius: 2px;
+ border-radius: @borderRadius;
li {
padding: 5px 30px;
@@ -97,7 +97,7 @@
margin: 10px 0 10px 0;
padding: 0;
height: 6px;
- border-radius: 3px;
+ border-radius: @borderRadius;
overflow: hidden;
.cx-progressbar__bar {
@@ -178,7 +178,7 @@
background: #fff;
border: 1px solid #ddd;
border-bottom-width: 3px;
- border-radius: 3px;
+ border-radius: @borderRadius;
padding: 0;
top: 30%;
left: 30%;
diff --git a/modules/publish/styles/ext.cx.publish.dialog.less
b/modules/publish/styles/ext.cx.publish.dialog.less
index be98ed6..b7d9d8e 100644
--- a/modules/publish/styles/ext.cx.publish.dialog.less
+++ b/modules/publish/styles/ext.cx.publish.dialog.less
@@ -9,7 +9,7 @@
background: #fff;
border: 1px solid #ccc;
border-bottom-width: 3px;
- border-radius: 3px;
+ border-radius: @borderRadius;
padding: 5px;
padding-bottom: 10px;
box-shadow: 0 5px 10px rgba( 0, 0, 0, 0.2 );
diff --git a/modules/publish/styles/ext.cx.publish.less
b/modules/publish/styles/ext.cx.publish.less
index 6952001..7557b9f 100644
--- a/modules/publish/styles/ext.cx.publish.less
+++ b/modules/publish/styles/ext.cx.publish.less
@@ -10,7 +10,7 @@
height: auto;
padding: 10px;
z-index: 1000;
- border-radius: 2px;
+ border-radius: @borderRadius;
:after,
:before {
diff --git a/modules/source/styles/ext.cx.source.selector.less
b/modules/source/styles/ext.cx.source.selector.less
index f90ed85..468035f 100644
--- a/modules/source/styles/ext.cx.source.selector.less
+++ b/modules/source/styles/ext.cx.source.selector.less
@@ -11,7 +11,7 @@
background: #fff;
border: 1px solid #ddd;
border-bottom-width: 3px;
- border-radius: 3px;
+ border-radius: @borderRadius;
padding: 0;
box-shadow: 0 5px 10px rgba( 0, 0, 0, 0.2 );
z-index: 1001;
diff --git a/modules/tools/styles/ext.cx.tools.card.less
b/modules/tools/styles/ext.cx.tools.card.less
index d3f9ff2..e5dda88 100644
--- a/modules/tools/styles/ext.cx.tools.card.less
+++ b/modules/tools/styles/ext.cx.tools.card.less
@@ -3,7 +3,7 @@
.card {
background: #fff;
border: 1px solid #c9c9c9;
- border-radius: 2px;
+ border-radius: @borderRadius;
box-shadow: 0 1px 0 #c9c9c9;
margin-top: 15px;
diff --git a/modules/tools/styles/ext.cx.tools.categories.less
b/modules/tools/styles/ext.cx.tools.categories.less
index 672ac19..b5f02ac 100644
--- a/modules/tools/styles/ext.cx.tools.categories.less
+++ b/modules/tools/styles/ext.cx.tools.categories.less
@@ -49,7 +49,7 @@
padding-top: 0.5em;
padding-bottom: 0.5em;
border: 1px solid #ddd;
- border-radius: 2px;
+ border-radius: @borderRadius;
.cx-category-nocategories {
padding-left: 0.5em;
diff --git a/modules/tools/styles/ext.cx.tools.dictionary.less
b/modules/tools/styles/ext.cx.tools.dictionary.less
index 6489a15..ca48f7c 100644
[MediaWiki-commits] [Gerrit] labs...wikibugs2[master]: Add #wiki-dev-africa to channel list
D3r1ck01 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372497 ) Change subject: Add #wiki-dev-africa to channel list .. Add #wiki-dev-africa to channel list Integrating Africa Wikimedia Developers IRC channel to the wikibugs so it tracks activities on the work board and log to the IRC channel. Bug: T173555 Change-Id: Ida7f3fec2f2cca4b89b380ea6c1aece956e3e9ba --- M channels.yaml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 refs/changes/97/372497/1 diff --git a/channels.yaml b/channels.yaml index b51bdea..62927ed 100644 --- a/channels.yaml +++ b/channels.yaml @@ -290,5 +290,8 @@ "##goat": - Goatification +"#wiki-dev-africa": +- Africa-Wikimedia-Developers + firehose-channel: '#mediawiki-feed' default-channel: '#wikimedia-dev' -- To view, visit https://gerrit.wikimedia.org/r/372497 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida7f3fec2f2cca4b89b380ea6c1aece956e3e9ba Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: D3r1ck01 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: jquery.migrate: Instrument with mw.track()
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372496 )
Change subject: jquery.migrate: Instrument with mw.track()
..
jquery.migrate: Instrument with mw.track()
Inspired by cb20b5aa5a68d, which added similar instrumentation
during the jQuery 1.11 migration for MediaWiki in 2014.
This way we can plot overall usage in a Grafana dashboard and
help us track the progres of the on-going migration.
Bug: T124742
Change-Id: Ifab13d52d5681189cfb2faae342373558369b8c0
---
M resources/lib/jquery/jquery.migrate.js
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/96/372496/1
diff --git a/resources/lib/jquery/jquery.migrate.js
b/resources/lib/jquery/jquery.migrate.js
index f094aaa..12212ff 100644
--- a/resources/lib/jquery/jquery.migrate.js
+++ b/resources/lib/jquery/jquery.migrate.js
@@ -6,6 +6,7 @@
* - Preserve handler of uncaught exceptions in promise chains
* https://gerrit.wikimedia.org/r/#/c/360999/
* https://github.com/jquery/jquery-migrate/pull/262
+ * - Add mw.track instrumentation for statistics.
*/
;( function( factory ) {
if ( typeof define === "function" && define.amd ) {
@@ -81,6 +82,8 @@
if ( !warnedAbout[ msg ] ) {
warnedAbout[ msg ] = true;
jQuery.migrateWarnings.push( msg );
+ // PATCH: Add instrumentation for statistics --Krinkle
+ mw.track( "mw.deprecate", "jquery-migrate" );
if ( console && console.warn && !jQuery.migrateMute ) {
console.warn( "JQMIGRATE: " + msg );
if ( jQuery.migrateTrace && console.trace ) {
--
To view, visit https://gerrit.wikimedia.org/r/372496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifab13d52d5681189cfb2faae342373558369b8c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Followup Ia5d07908: Fix sentry class's base::service_unit to...
Alex Monk has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372495 )
Change subject: Followup Ia5d07908: Fix sentry class's base::service_unit to
require correct resource class
..
Followup Ia5d07908: Fix sentry class's base::service_unit to require correct
resource class
Bug: T173554
Change-Id: I95d185b6e7a64d9cccda64339573d61f0a8afb43
---
M modules/sentry/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/372495/1
diff --git a/modules/sentry/manifests/init.pp b/modules/sentry/manifests/init.pp
index 9882aaa..49e1ac1 100644
--- a/modules/sentry/manifests/init.pp
+++ b/modules/sentry/manifests/init.pp
@@ -118,7 +118,7 @@
base::service_unit { 'sentry':
systemd => true,
subscribe => File['/etc/sentry.conf.py'],
-require => Base::Service_unit['sentry-worker'],
+require => Systemd::Service['sentry-worker'],
}
nginx::site { 'sentry':
--
To view, visit https://gerrit.wikimedia.org/r/372495
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I95d185b6e7a64d9cccda64339573d61f0a8afb43
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...dash[deployment]: Update all node modules
Ejegg has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372481 ) Change subject: Update all node modules .. Update all node modules Change-Id: I151f201dbda21839f98e3cabd89c726c122e3804 --- M node_modules 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/node_modules b/node_modules index 46fd5d9..ed68957 16 --- a/node_modules +++ b/node_modules @@ -1 +1 @@ -Subproject commit 46fd5d9b2f1fa278218e929bf2f007d47e09db4a +Subproject commit ed68957143bc677be857cdada068d92fbf81bd08 -- To view, visit https://gerrit.wikimedia.org/r/372481 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I151f201dbda21839f98e3cabd89c726c122e3804 Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ejegg Gerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...dash[deployment]: Merge branch 'master' into deployment
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372480 ) Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment c758a2b Update all the node_modules Change-Id: I0dbe9cbbeb1e1fa3d26365fb91004091d2bb3fb8 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/372480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0dbe9cbbeb1e1fa3d26365fb91004091d2bb3fb8 Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ejegg Gerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...dash[master]: Update all the node_modules
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372477 )
Change subject: Update all the node_modules
..
Update all the node_modules
except the ones we weren't using. delete those.
Change-Id: If5cdd790831d394bd53b7dd9320f7544854e7f6f
---
M package.json
M server.js
M src/app/router.js
3 files changed, 71 insertions(+), 66 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/package.json b/package.json
index 6a9bbb7..624f398 100644
--- a/package.json
+++ b/package.json
@@ -1,56 +1,53 @@
{
- "name": "dash",
- "description": "Fundraising Dashboard App",
- "version": "0.0.1",
- "scripts": {
- "test": "grunt test"
- },
- "private": true,
- "repository": {
- "type": "git",
- "url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/dash";
- },
- "dependencies": {
- "amdrequire": "0.0.3",
- "commander": "~2.2.0",
- "dotenv": "^0.4.0",
- "evil-dns": "0.1.0",
- "express": "3.x",
- "gulp": "^3.8.8",
- "gulp-jshint": "^1.8.4",
- "gulp-rename": "^1.2.0",
- "gulp-rev": "^1.1.0",
- "jade": ">= 0.0.1",
- "lodash": "^2.4.1",
- "memory-cache": "0.0.5",
- "mysql": "^2.4.3",
- "mysql-promise": "^1.3.0",
- "odata-parser": "~1.0.0",
- "passport": "^0.2.1",
- "passport-drupal": "0.3.3",
- "passport-oauth": "^1.0.0",
- "node.extend": "1.1.3"
- },
- "optionalDependencies": {
- "modern-syslog": "~1.1.2",
-"node-syslog": "~1.1.7"
-},
- "devDependencies": {
- "bower": "1.8.0",
- "chalk": "^0.5.1",
- "deeply": "^0.1.0",
- "event-stream": "^3.1.7",
- "grunt": "0.4.5",
- "grunt-cli": "0.1.13",
- "grunt-contrib-jshint": "0.11.3",
- "grunt-jscs": "2.6.0",
- "gulp-clean": "^0.3.1",
- "gulp-concat": "^2.4.1",
- "gulp-css-url-adjuster": "^0.2.3",
- "gulp-flatten": "^0.2.0",
- "gulp-html-replace": "^1.3.0",
- "gulp-replace": "^0.4.0",
- "gulp-requirejs-bundler": "^0.1.1",
- "gulp-uglify": "^1.0.1"
- }
+ "name": "dash",
+ "description": "Fundraising Dashboard App",
+ "version": "0.0.1",
+ "scripts": {
+"test": "grunt test"
+ },
+ "private": true,
+ "repository": {
+"type": "git",
+"url": "https://gerrit.wikimedia.org/r/wikimedia/fundraising/dash";
+ },
+ "dependencies": {
+"body-parser": "^1.17.2",
+"commander": "~2.11.0",
+"evil-dns": "0.2.0",
+"express": "4.x",
+"express-session": "^1.15.5",
+"memory-cache": "0.2.0",
+"mysql": "^2.14.1",
+"mysql-promise": "^4.1.0",
+"node.extend": "2.0.0",
+"odata-parser": "~1.4.1",
+"passport": "^0.4.0",
+"passport-drupal": "0.3.3",
+"passport-oauth": "^1.0.0"
+ },
+ "optionalDependencies": {
+"modern-syslog": "~1.1.4"
+ },
+ "devDependencies": {
+"bower": "1.8.0",
+"chalk": "^2.1.0",
+"deeply": "^2.0.3",
+"event-stream": "^3.3.4",
+"grunt": "1.0.1",
+"grunt-cli": "1.2.0",
+"grunt-contrib-jshint": "1.1.0",
+"grunt-jscs": "3.0.1",
+"gulp": "^3.9.1",
+"gulp-jshint": "^2.0.4",
+"gulp-rename": "^1.2.2",
+"gulp-rev": "^8.0.0",
+"gulp-clean": "^0.3.2",
+"gulp-concat": "^2.6.1",
+"gulp-css-url-adjuster": "^0.2.3",
+"gulp-flatten": "^0.3.1",
+"gulp-html-replace": "^1.6.2",
+"gulp-replace": "^0.6.1",
+"gulp-requirejs-bundler": "^0.1.1",
+"gulp-uglify": "^3.0.0"
+ }
}
diff --git a/server.js b/server.js
index 368afef..48046ce 100644
--- a/server.js
+++ b/server.js
@@ -1,5 +1,7 @@
var express = require( 'express' ),
app = express(),
+ session = require( 'express-session' ),
+ bodyParser = require( 'body-parser' ),
routes = require( './routes' ),
passport = require( 'passport' ),
DrupalStrategy = require( 'passport-drupal' ).DrupalStrategy,
@@ -16,6 +18,7 @@
// Log errors
process.on( 'uncaughtException', function ( err ) {
logger.error( 'Application error: ' + err );
+ logger.error( err.stack );
} );
serverConfig = /(([0-9\.]*|\[[0-9a-fA-F\:]*\]):)?([0-9]+)/.exec( config.listen
);
@@ -45,9 +48,14 @@
}
}
-app.use( express.json() );
+app.use( bodyParser.json() );
-app.use( express.session( { secret: config.sessionSecret } ) );
+app.use( session( {
+ secret: config.sessionSecret,
+ resave: false,
+ saveUninitialized: false
+
+} ) );
// Authentication
passport.use(
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update jQuery Migrate to v3.0.1-pre (9e3dfcb)
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372494 )
Change subject: Update jQuery Migrate to v3.0.1-pre (9e3dfcb)
..
Update jQuery Migrate to v3.0.1-pre (9e3dfcb)
Highlights:
* Event: Warn and fill jQuery.event.props.concat
> Adds back-compat for a removed property. (Undocumented)
> This makes jQuery 3 compatible with jQuery Mobile pre-1.5
* Effects: Warn on use of jQuery.fx.interval
> Adds detection for a deprecated property.
* Event: Warn about late use of $(window).on("load"...)
* Data: Fix support for object as second argument
> Fixes minor regression that jQuery Migrate introduced
> over jQuery 3.0 plain.
* Docs: Clarify wording around deprecated/removed methods
> Avoids confusion between whether a method was removed
> in jQuery 3, or merely deprecated.
Full change log:
https://github.com/jquery/jquery-migrate/compare/3.0.0...9e3dfcb
Also re-apply and document hot patch from a77525e56ac1a.
Bug: T124742
Change-Id: Ia55b6aad1648667648cc511eddea12b808d7e898
---
M resources/lib/jquery/jquery.migrate.js
1 file changed, 102 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/94/372494/1
diff --git a/resources/lib/jquery/jquery.migrate.js
b/resources/lib/jquery/jquery.migrate.js
index 879509f..f094aaa 100644
--- a/resources/lib/jquery/jquery.migrate.js
+++ b/resources/lib/jquery/jquery.migrate.js
@@ -1,13 +1,34 @@
/*!
- * jQuery Migrate - v3.0.0 - 2016-06-09
+ * jQuery Migrate - v3.0.1-pre - 2017-08-17
* Copyright jQuery Foundation and other contributors
+ *
+ * Patched for MediaWiki:
+ * - Preserve handler of uncaught exceptions in promise chains
+ * https://gerrit.wikimedia.org/r/#/c/360999/
+ * https://github.com/jquery/jquery-migrate/pull/262
*/
-(function( jQuery, window ) {
+;( function( factory ) {
+ if ( typeof define === "function" && define.amd ) {
+
+ // AMD. Register as an anonymous module.
+ define( [ "jquery" ], window, factory );
+ } else if ( typeof module === "object" && module.exports ) {
+
+ // Node/CommonJS
+ // eslint-disable-next-line no-undef
+ module.exports = factory( require( "jquery" ), window );
+ } else {
+
+ // Browser globals
+ factory( jQuery, window );
+ }
+} )( function( jQuery, window ) {
"use strict";
-jQuery.migrateVersion = "3.0.0";
+jQuery.migrateVersion = "3.0.1-pre";
+/* exported migrateWarn, migrateWarnFunc, migrateWarnProp */
( function() {
@@ -15,7 +36,9 @@
// IE9 only creates console object when dev tools are first opened
// Also, avoid Function#bind here to simplify PhantomJS usage
var log = window.console && window.console.log &&
- function() { window.console.log.apply( window.console,
arguments ); },
+ function() {
+ window.console.log.apply( window.console, arguments );
+ },
rbadVersions = /^[12]\./;
if ( !log ) {
@@ -74,11 +97,22 @@
get: function() {
migrateWarn( msg );
return value;
+ },
+ set: function( newValue ) {
+ migrateWarn( msg );
+ value = newValue;
}
} );
}
-if ( document.compatMode === "BackCompat" ) {
+function migrateWarnFunc( obj, prop, newFunc, msg ) {
+ obj[ prop ] = function() {
+ migrateWarn( msg );
+ return newFunc.apply( this, arguments );
+ };
+}
+
+if ( window.document.compatMode === "BackCompat" ) {
// JQuery has never supported or tested Quirks Mode
migrateWarn( "jQuery is not compatible with Quirks Mode" );
@@ -115,7 +149,7 @@
// The nonstandard and undocumented unquoted-hash was removed
in jQuery 1.12.0
// First see if qS thinks it's a valid selector, if so avoid a
false positive
try {
- document.querySelector( selector );
+ window.document.querySelector( selector );
} catch ( err1 ) {
// Didn't *look* valid to qSA, warn and try quoting
what we think is the value
@@ -126,7 +160,7 @@
// If the regexp *may* have created an invalid
selector, don't update it
// Note that there may be false alarms if selector uses
jQuery extensions
try {
- document.querySelector( selector );
+ window.document.querySelector( selector );
migrateWarn( "Attribute selector with '#' must
be quoted: " + args[ 0 ] );
args[ 0 ] = selector;
} catch (
[MediaWiki-commits] [Gerrit] mediawiki...Thanks[master]: [WIP] Proof-of-concept of logging on Thanks setting changes
Happy5214 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372493 )
Change subject: [WIP] Proof-of-concept of logging on Thanks setting changes
..
[WIP] Proof-of-concept of logging on Thanks setting changes
TODO: Fill in
Bug: T120753
Change-Id: I695b81f1d0ad2e291472eebc92e63a346c918e36
---
M Thanks.hooks.php
M extension.json
M i18n/en.json
3 files changed, 10 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Thanks
refs/changes/93/372493/1
diff --git a/Thanks.hooks.php b/Thanks.hooks.php
index 4067dc5..daa0b05 100644
--- a/Thanks.hooks.php
+++ b/Thanks.hooks.php
@@ -171,9 +171,13 @@
public static function onBeforeCreateEchoEvent(
&$notifications, &$notificationCategories, &$icons
) {
+ global $wgThanksLoggingOnEnableDisableNotifications;
+ $tooltip = $wgThanksLoggingOnEnableDisableNotifications
+ ? 'echo-pref-tooltip-edit-thank-logged' :
'echo-pref-tooltip-edit-thank';
+
$notificationCategories['edit-thank'] = [
'priority' => 3,
- 'tooltip' => 'echo-pref-tooltip-edit-thank',
+ 'tooltip' => $tooltip,
];
$notifications['edit-thank'] = [
diff --git a/extension.json b/extension.json
index ada16a9..ea1e5f0 100644
--- a/extension.json
+++ b/extension.json
@@ -178,7 +178,8 @@
"config": {
"ThanksSendToBots": false,
"ThanksLogging": true,
- "ThanksConfirmationRequired": true
+ "ThanksConfirmationRequired": true,
+ "ThanksLoggingOnEnableDisableNotifications": true
},
"manifest_version": 1
}
diff --git a/i18n/en.json b/i18n/en.json
index 997b6e9..268fda1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -29,6 +29,7 @@
"thanks-form-revid": "Revision ID for edit",
"echo-pref-subscription-edit-thank": "Thanks me for my edit",
"echo-pref-tooltip-edit-thank": "Notify me when someone thanks me for
an edit I made.",
+ "echo-pref-tooltip-edit-thank-logged": "Notify me when someone thanks
me for an edit I made. Changes to this preference are logged.",
"echo-category-title-edit-thank": "Thanks",
"notification-thanks-diff-link": "your edit",
"notification-header-edit-thank": "$1 {{GENDER:$2|thanked}}
{{GENDER:$4|you}} for your edit on $3.",
@@ -37,6 +38,8 @@
"log-name-thanks": "Thanks log",
"log-description-thanks": "Below is a list of users thanked by other
users.",
"logentry-thanks-thank": "$1 {{GENDER:$2|thanked}} {{GENDER:$4|$3}}",
+ "logentry-thanks-enabled": "$1 {{GENDER:$2|enabled}} notifications for
thanks",
+ "logentry-thanks-disabled": "$1 {{GENDER:$2|disabled}} notifications
for thanks",
"log-show-hide-thanks": "$1 thanks log",
"thanks-error-no-id-specified": "You must specify a revision ID to send
thanks.",
"thanks-confirmation-special": "Do you want to publicly send thanks for
this edit?",
--
To view, visit https://gerrit.wikimedia.org/r/372493
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I695b81f1d0ad2e291472eebc92e63a346c918e36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Happy5214
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Add href to refresh icon on Special:nearby to change cursor
D3r1ck01 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372492 ) Change subject: Add href to refresh icon on Special:nearby to change cursor .. Add href to refresh icon on Special:nearby to change cursor Added the href option to the refresh icon on the Special:Nearby page so that the icon can change cursor from pointer to hand as done when one hovers on a link. Bug: T126387 Change-Id: I4939c9b5fd2189028bb2404392161fc935aca222 --- M resources/mobile.special.nearby.scripts/nearby.js 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/92/372492/1 diff --git a/resources/mobile.special.nearby.scripts/nearby.js b/resources/mobile.special.nearby.scripts/nearby.js index 10dbaca..892c3eb 100644 --- a/resources/mobile.special.nearby.scripts/nearby.js +++ b/resources/mobile.special.nearby.scripts/nearby.js @@ -27,6 +27,7 @@ id: 'secondary-button', additionalClassNames: 'main-header-button', tagName: 'a', + href: '#', title: mw.msg( 'mobile-frontend-nearby-refresh' ), label: mw.msg( 'mobile-frontend-nearby-refresh' ) } ); -- To view, visit https://gerrit.wikimedia.org/r/372492 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4939c9b5fd2189028bb2404392161fc935aca222 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: D3r1ck01 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.14]: Increase enwiki sampling of cirrus to 1k session per day per...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372491 )
Change subject: Increase enwiki sampling of cirrus to 1k session per day per
bucket
..
Increase enwiki sampling of cirrus to 1k session per day per bucket
Bug: T171213
Change-Id: Ib474dd0d87496e6a7ebb8ceb25132c782c074bf0
(cherry picked from commit 26a03469c13248827f45b1151bf54ce948929bc6)
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index ef871c4..b1f1c78 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -140,8 +140,8 @@
subTest: null
},
enwiki: {
- test: 250,
- subTest: 0.75
+ test: 80,
+ subTest: 0.96
},
enwiktionary: {
test: 40,
--
To view, visit https://gerrit.wikimedia.org/r/372491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib474dd0d87496e6a7ebb8ceb25132c782c074bf0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Increase enwiki sampling of cirrus to 1k session per day per...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372490 )
Change subject: Increase enwiki sampling of cirrus to 1k session per day per
bucket
..
Increase enwiki sampling of cirrus to 1k session per day per bucket
Bug: T171213
Change-Id: Ib474dd0d87496e6a7ebb8ceb25132c782c074bf0
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index ef871c4..b1f1c78 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -140,8 +140,8 @@
subTest: null
},
enwiki: {
- test: 250,
- subTest: 0.75
+ test: 80,
+ subTest: 0.96
},
enwiktionary: {
test: 40,
--
To view, visit https://gerrit.wikimedia.org/r/372490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib474dd0d87496e6a7ebb8ceb25132c782c074bf0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.14]: Increase enwiki sampling of cirrus to 1k session per day per...
EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372491 )
Change subject: Increase enwiki sampling of cirrus to 1k session per day per
bucket
..
Increase enwiki sampling of cirrus to 1k session per day per bucket
Bug: T171213
Change-Id: Ib474dd0d87496e6a7ebb8ceb25132c782c074bf0
(cherry picked from commit 26a03469c13248827f45b1151bf54ce948929bc6)
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/91/372491/1
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index ef871c4..b1f1c78 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -140,8 +140,8 @@
subTest: null
},
enwiki: {
- test: 250,
- subTest: 0.75
+ test: 80,
+ subTest: 0.96
},
enwiktionary: {
test: 40,
--
To view, visit https://gerrit.wikimedia.org/r/372491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib474dd0d87496e6a7ebb8ceb25132c782c074bf0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Replace outdated `border-radius` value with WikimediaUI one
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372488 )
Change subject: Replace outdated `border-radius` value with WikimediaUI one
..
Replace outdated `border-radius` value with WikimediaUI one
Change-Id: Iebfd55c8e7f52f207f45dc547fccaf89107e8a32
---
M modules/styles/mw.echo.ui.ConfirmationPopupWidget.less
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/styles/mw.echo.ui.ConfirmationPopupWidget.less
b/modules/styles/mw.echo.ui.ConfirmationPopupWidget.less
index 7c36cdb..bede9d8 100644
--- a/modules/styles/mw.echo.ui.ConfirmationPopupWidget.less
+++ b/modules/styles/mw.echo.ui.ConfirmationPopupWidget.less
@@ -7,7 +7,7 @@
&-popup {
display: inline-block;
background-color: #333;
- border-radius: 0.5em;
+ border-radius: 2px;
padding: 0.5em 1em;
text-align: left;
color: #fff;
--
To view, visit https://gerrit.wikimedia.org/r/372488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iebfd55c8e7f52f207f45dc547fccaf89107e8a32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: VolkerE
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Increase enwiki sampling of cirrus to 1k session per day per...
EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372490 )
Change subject: Increase enwiki sampling of cirrus to 1k session per day per
bucket
..
Increase enwiki sampling of cirrus to 1k session per day per bucket
Bug: T171213
Change-Id: Ib474dd0d87496e6a7ebb8ceb25132c782c074bf0
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/90/372490/1
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index ef871c4..b1f1c78 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -140,8 +140,8 @@
subTest: null
},
enwiki: {
- test: 250,
- subTest: 0.75
+ test: 80,
+ subTest: 0.96
},
enwiktionary: {
test: 40,
--
To view, visit https://gerrit.wikimedia.org/r/372490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib474dd0d87496e6a7ebb8ceb25132c782c074bf0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Refreshed[master]: Remove old Echo fixes
MacFan4000 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372489 )
Change subject: Remove old Echo fixes
..
Remove old Echo fixes
Theese arn't really necessary and they prevent the badges from being seen on
Mobile on 1.29+. I can confirm that nothing is broken when I remove theese.
Bug: T170773
Change-Id: I6ce6d298575a72b158724c92bb59180ccbbbf3b2
---
M refreshed/styles/screen/medium.css
M refreshed/styles/screen/small.css
M skin.json
3 files changed, 1 insertion(+), 60 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Refreshed
refs/changes/89/372489/1
diff --git a/refreshed/styles/screen/medium.css
b/refreshed/styles/screen/medium.css
index cd2b1c5..c229f6f 100644
--- a/refreshed/styles/screen/medium.css
+++ b/refreshed/styles/screen/medium.css
@@ -129,16 +129,6 @@
font-size: 1.313em !important;
}
-/* Extension:Echo fixes */
-#pt-notifications {
- margin-right: 0.75em;
-}
-
-.mw-echo-overlay:before,
-.mw-echo-overlay::before {
- left: 238px !important; /* centering dropdown arrow on notifications
badge */
-}
-
/* Image thumbnails */
.thumb {
width: 100% !important;
diff --git a/refreshed/styles/screen/small.css
b/refreshed/styles/screen/small.css
index ad2b753..b5cf798 100644
--- a/refreshed/styles/screen/small.css
+++ b/refreshed/styles/screen/small.css
@@ -357,55 +357,6 @@
border: 0 !important;
}
-/* Extension:Echo fixes */
-
-#pt-mytalk a.mw-echo-alert { /* "you have new messages" alert in the personal
tools dropdown */
- margin: 0.1em;
-}
-
-#pt-notifications-personaltools { /* "Notifications" item in the personal
tools dropdown */
- display: list-item;
-}
-
-.pt-notifications-personaltools-unread {
- background-color: #c00;
- color: #fff;
- border-radius: 2px; /* matching the notification badge itself and the
"you have new messages" notice, which both have border-radius */
- margin: 0.1em;
-}
-
-.pt-notifications-personaltools-unread:hover {
- background-color: #bf !important;
-}
-
-#pt-notifications {
- position: absolute;
- margin: 0;
- top: 0; /* the container height is greater than that of the
notification button itself so this still leaves some space above the button */
- right: 2.9em; /* 2.75em for the search button, 0.25em of padding within
user button */
- max-width: 2.25em; /* 2.75em (width of user button) - 0.25em of padding
on each side */
- z-index: 1; /* above user button */
- padding: 0;
- width: auto;
- pointer-events: none; /* prevent click event (stop notifications
dropdown from appearing on click) */
-}
-
-.mw-echo-notifications-badge {
- font-size: 0.5em;
- min-width: 3.5px; /* min-width of 7px * 0.5em (stops badge from looking
too wide when it contains a single-digit number) */
- max-width: 2.25em; /* (2.75em (width of user button) - 0.25em of
padding on each side) * 2 because the font size is 0.5em */
- overflow: hidden;
- display: none; /* hide if there are no noticiations */
-}
-
-.mw-echo-unread-notifications {
- display: inline;
-}
-
-.mw-echo-overlay {
- display: none; /* if pointer-events isn't supported (so
#mw-echo-overlay is generated when the notifications badge is clicked), hide
#mw-echo-overlay so it's not visible */
-}
-
/* Image thumbnails */
.thumb {
width: 100% !important;
diff --git a/skin.json b/skin.json
index 75f7f9e..216a78b 100755
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
{
"name": "Refreshed",
- "version": "3.3.4",
+ "version": "3.3.5",
"author": [
"Adam Carter",
"Drew1200",
--
To view, visit https://gerrit.wikimedia.org/r/372489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ce6d298575a72b158724c92bb59180ccbbbf3b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Refreshed
Gerrit-Branch: master
Gerrit-Owner: MacFan4000
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Replace outdated `border-radius` value with WikimediaUI one
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372488 )
Change subject: Replace outdated `border-radius` value with WikimediaUI one
..
Replace outdated `border-radius` value with WikimediaUI one
Change-Id: Iebfd55c8e7f52f207f45dc547fccaf89107e8a32
---
M modules/styles/mw.echo.ui.ConfirmationPopupWidget.less
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/88/372488/1
diff --git a/modules/styles/mw.echo.ui.ConfirmationPopupWidget.less
b/modules/styles/mw.echo.ui.ConfirmationPopupWidget.less
index 7c36cdb..bede9d8 100644
--- a/modules/styles/mw.echo.ui.ConfirmationPopupWidget.less
+++ b/modules/styles/mw.echo.ui.ConfirmationPopupWidget.less
@@ -7,7 +7,7 @@
&-popup {
display: inline-block;
background-color: #333;
- border-radius: 0.5em;
+ border-radius: 2px;
padding: 0.5em 1em;
text-align: left;
color: #fff;
--
To view, visit https://gerrit.wikimedia.org/r/372488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebfd55c8e7f52f207f45dc547fccaf89107e8a32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.14]: Bump enwiki sampling to 1:250 for search satisfaction
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372487 )
Change subject: Bump enwiki sampling to 1:250 for search satisfaction
..
Bump enwiki sampling to 1:250 for search satisfaction
We increased the search satisfaction sampling from 1:2000 to
1:500 for enwiki, but then redirected 75% of the events (all
the "extra") to sub tests. for some reason those sub tests arn't
collecting any data though.
Lets check that things generally work by bumping the sampling rate
again but not reassigning those extra events. This should show a
direct increase in the number of events if it works correctly.
Change-Id: I0bb88c64757654a2f608fcce54a407fcc1e82142
(cherry picked from commit 0dd2e2e67340ca516a657f4f0c8c371259e8b557)
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 6d16eed..ef871c4 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -140,7 +140,7 @@
subTest: null
},
enwiki: {
- test: 500,
+ test: 250,
subTest: 0.75
},
enwiktionary: {
--
To view, visit https://gerrit.wikimedia.org/r/372487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0bb88c64757654a2f608fcce54a407fcc1e82142
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.14]: Bump enwiki sampling to 1:250 for search satisfaction
EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372487 )
Change subject: Bump enwiki sampling to 1:250 for search satisfaction
..
Bump enwiki sampling to 1:250 for search satisfaction
We increased the search satisfaction sampling from 1:2000 to
1:500 for enwiki, but then redirected 75% of the events (all
the "extra") to sub tests. for some reason those sub tests arn't
collecting any data though.
Lets check that things generally work by bumping the sampling rate
again but not reassigning those extra events. This should show a
direct increase in the number of events if it works correctly.
Change-Id: I0bb88c64757654a2f608fcce54a407fcc1e82142
(cherry picked from commit 0dd2e2e67340ca516a657f4f0c8c371259e8b557)
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/87/372487/1
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 6d16eed..ef871c4 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -140,7 +140,7 @@
subTest: null
},
enwiki: {
- test: 500,
+ test: 250,
subTest: 0.75
},
enwiktionary: {
--
To view, visit https://gerrit.wikimedia.org/r/372487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bb88c64757654a2f608fcce54a407fcc1e82142
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Bump enwiki sampling to 1:250 for search satisfaction
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372486 )
Change subject: Bump enwiki sampling to 1:250 for search satisfaction
..
Bump enwiki sampling to 1:250 for search satisfaction
We increased the search satisfaction sampling from 1:2000 to
1:500 for enwiki, but then redirected 75% of the events (all
the "extra") to sub tests. for some reason those sub tests arn't
collecting any data though.
Lets check that things generally work by bumping the sampling rate
again but not reassigning those extra events. This should show a
direct increase in the number of events if it works correctly.
Change-Id: I0bb88c64757654a2f608fcce54a407fcc1e82142
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 6d16eed..ef871c4 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -140,7 +140,7 @@
subTest: null
},
enwiki: {
- test: 500,
+ test: 250,
subTest: 0.75
},
enwiktionary: {
--
To view, visit https://gerrit.wikimedia.org/r/372486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0bb88c64757654a2f608fcce54a407fcc1e82142
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Bump enwiki sampling to 1:250 for search satisfaction
EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372486 )
Change subject: Bump enwiki sampling to 1:250 for search satisfaction
..
Bump enwiki sampling to 1:250 for search satisfaction
We increased the search satisfaction sampling from 1:2000 to
1:500 for enwiki, but then redirected 75% of the events (all
the "extra") to sub tests. for some reason those sub tests arn't
collecting any data though.
Lets check that things generally work by bumping the sampling rate
again but not reassigning those extra events. This should show a
direct increase in the number of events if it works correctly.
Change-Id: I0bb88c64757654a2f608fcce54a407fcc1e82142
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/86/372486/1
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 6d16eed..ef871c4 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -140,7 +140,7 @@
subTest: null
},
enwiki: {
- test: 500,
+ test: 250,
subTest: 0.75
},
enwiktionary: {
--
To view, visit https://gerrit.wikimedia.org/r/372486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bb88c64757654a2f608fcce54a407fcc1e82142
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable jQuery 3 on mediawiki.org and test.wikidata.org
Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372485 ) Change subject: Enable jQuery 3 on mediawiki.org and test.wikidata.org .. Enable jQuery 3 on mediawiki.org and test.wikidata.org Follows-up eb0602173542. Bug: T124742 Change-Id: Id4d42d8c533b58dd24233b4cf1ada8b7099c8854 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/85/372485/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 1f05ad4..aa4287b 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14907,6 +14907,8 @@ // group 0 'testwiki' => true, 'test2wiki' => true, + 'testwikidatawiki' => true, + 'mediawikiwiki' => true, ], // Whether to use OOUI to render the buttons on EditPage.php -- To view, visit https://gerrit.wikimedia.org/r/372485 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4d42d8c533b58dd24233b4cf1ada8b7099c8854 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Krinkle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...GeoData[master]: Add GeoData.php into the repo
D3r1ck01 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372484 )
Change subject: Add GeoData.php into the repo
..
Add GeoData.php into the repo
Added a GeoData.php file in the repo to make it visible
in the LocalSettings.php and to match the general construct
of all MediaWiki extensions.
Bug: T173548
Change-Id: Ic345ea1ef37485b615e1d524b43dc7efb1228e36
---
A GeoData.php
1 file changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GeoData
refs/changes/84/372484/1
diff --git a/GeoData.php b/GeoData.php
new file mode 100644
index 000..acd3a23
--- /dev/null
+++ b/GeoData.php
@@ -0,0 +1,13 @@
+https://www.mediawiki.org/wiki/Extension_registration for
more details.'
+ ); */
+ return;
+} else {
+ die( 'This version of the Mailgun extension requires MediaWiki 1.25+' );
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/372484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic345ea1ef37485b615e1d524b43dc7efb1228e36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: webperf: Convert navtiming.py to use KafkaConsumer
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372483 )
Change subject: webperf: Convert navtiming.py to use KafkaConsumer
..
webperf: Convert navtiming.py to use KafkaConsumer
Test plain:
* Copy file to hafnium
* Hot fix dispatch_stat:
- `sock.sendto(stat.encode('utf-8'), addr)`
+ `print stat.encode('utf-8')`
* Invoke as:
$ python nav-test.py --brokers
kafka1018.eqiad.wmnet:9092,kafka1022.eqiad.wmnet:9092 --consumer-group testing
...
frontend.navtiming.domInteractive.by_continent.Europe:807|ms
mw.performance.save:905|ms
mw.performance.save_by_version.1_30_0-wmf_14:905|ms
...
Bug: T110903
Change-Id: I39daa310f350ca5e166463ba835481fbe9b23d2c
---
M modules/role/manifests/webperf.pp
M modules/webperf/files/navtiming.py
M modules/webperf/manifests/navtiming.pp
M modules/webperf/templates/navtiming.systemd.erb
4 files changed, 35 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/372483/1
diff --git a/modules/role/manifests/webperf.pp
b/modules/role/manifests/webperf.pp
index 5814b62..5ee14ad 100644
--- a/modules/role/manifests/webperf.pp
+++ b/modules/role/manifests/webperf.pp
@@ -20,8 +20,6 @@
# See
class { '::webperf::navtiming':
endpoint => "tcp://${eventlogging_host}:8600",
-eventlogging_path => $eventlogging_path,
-statsd_host => $statsd_host,
}
# Report VisualEditor performance measurements to Graphite.
diff --git a/modules/webperf/files/navtiming.py
b/modules/webperf/files/navtiming.py
index 57b415e..353a2bc 100755
--- a/modules/webperf/files/navtiming.py
+++ b/modules/webperf/files/navtiming.py
@@ -6,15 +6,14 @@
sys.setdefaultencoding("utf-8")
import argparse
+import json
import logging
import re
import socket
import unittest
-
-import eventlogging
import yaml
-import json
+from kafka import KafkaConsumer
handlers = {}
@@ -396,7 +395,10 @@
if __name__ == '__main__':
ap = argparse.ArgumentParser(description='NavigationTiming subscriber')
-ap.add_argument('endpoint', help='URI of EventLogging endpoint')
+ap.add_argument('--brokers', required=True,
+help='Comma-separated list of kafka brokers')
+ap.add_argument('--consumer-group', required=True,
+help='Consumer group to register with Kafka')
ap.add_argument('--statsd-host', default='localhost',
type=socket.gethostbyname)
ap.add_argument('--statsd-port', default=8125, type=int)
@@ -408,12 +410,30 @@
addr = args.statsd_host, args.statsd_port
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-events = eventlogging.connect(args.endpoint)
+kafka_bootstrap_servers = tuple(args.brokers.split(','))
+kafka_topics = ('eventlogging_' + key for key in handlers.keys())
+kafka_consumer_timeout_seconds = 60
+consumer = KafkaConsumer(
+*kafka_topics,
+bootstrap_servers=kafka_bootstrap_servers,
+group_id=args.consumer_group,
+auto_offset_reset='latest',
+enable_auto_commit=False,
+consumer_timeout_ms=kafka_consumer_timeout_seconds * 1000
+)
-for meta in events:
-f = handlers.get(meta['schema'])
-if f is not None:
-f(meta)
+logging.info('Starting statsv Kafka consumer.')
+try:
+for message in consumer:
+meta = json.loads(message.value)
+if 'schema' in meta:
+f = handlers.get(meta['schema'])
+if f is not None:
+f(meta)
+# If we reach this line, consumer_timeout_ms elapsed without events
+raise RuntimeError('No messages received in %d seconds.' %
kafka_consumer_timeout_seconds)
+finally:
+consumer.close()
# # Tests ##
diff --git a/modules/webperf/manifests/navtiming.pp
b/modules/webperf/manifests/navtiming.pp
index 02e4500..c516c08 100644
--- a/modules/webperf/manifests/navtiming.pp
+++ b/modules/webperf/manifests/navtiming.pp
@@ -6,14 +6,6 @@
#
# === Parameters
#
-# [*endpoint*]
-# URI of EventLogging event publisher to subscribe to.
-# Example: 'tcp://eventlogging.corp.org:8600'.
-#
-# [*eventlogging_path*]
-# Path where the EventLogging python library is installed.
-# Example: '/srv/deployment/eventlogging'.
-#
# [*statsd_host*]
# Write stats to this StatsD instance. Default: '127.0.0.1'.
#
@@ -21,14 +13,15 @@
# Write stats to this StatsD instance. Default: 8125.
#
class webperf::navtiming(
-$endpoint,
-$eventlogging_path,
$statsd_host = '127.0.0.1',
$statsd_port = 8125,
) {
include ::webperf
require_package('python-yaml')
+
+$kafka_config = kafka_config('analytics')
+$kafka_brokers = $kafka_config['brokers']['string']
file { '/srv/webperf/navt
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Replace fixed `border-radius` values with central vars
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372482 )
Change subject: Replace fixed `border-radius` values with central vars
..
Replace fixed `border-radius` values with central vars
Replacing and aligning fixed `border-radius` values with central
mediawiki.ui vars. With this patch these will be easier replaceable
by WikimediaUI Base vars in future.
Change-Id: I13767df1b5831a763bdecaa04687789983c1980a
---
M modules/dashboard/styles/ext.cx.translationlist.less
M modules/publish/styles/ext.cx.publish.dialog.less
M modules/publish/styles/ext.cx.publish.less
M modules/source/styles/ext.cx.source.selector.less
M modules/tools/styles/ext.cx.tools.card.less
M modules/tools/styles/ext.cx.tools.categories.less
M modules/tools/styles/ext.cx.tools.dictionary.less
M modules/tools/styles/ext.cx.tools.formatter.less
M modules/tools/styles/ext.cx.tools.template.card.less
M modules/ui/styles/widgets/mw.cx.ui.TranslationToolWidget.less
M modules/widgets/common/ext.cx.highlight.less
11 files changed, 17 insertions(+), 15 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/82/372482/1
diff --git a/modules/dashboard/styles/ext.cx.translationlist.less
b/modules/dashboard/styles/ext.cx.translationlist.less
index f1d4964..4e7d487 100644
--- a/modules/dashboard/styles/ext.cx.translationlist.less
+++ b/modules/dashboard/styles/ext.cx.translationlist.less
@@ -47,7 +47,7 @@
background-color: #fff;
border: 1px solid #ddd;
border-bottom: 3px solid #ddd;
- border-radius: 2px;
+ border-radius: @borderRadius;
li {
padding: 5px 30px;
@@ -97,7 +97,7 @@
margin: 10px 0 10px 0;
padding: 0;
height: 6px;
- border-radius: 3px;
+ border-radius: @borderRadius;
overflow: hidden;
.cx-progressbar__bar {
@@ -178,7 +178,7 @@
background: #fff;
border: 1px solid #ddd;
border-bottom-width: 3px;
- border-radius: 3px;
+ border-radius: @borderRadius;
padding: 0;
top: 30%;
left: 30%;
diff --git a/modules/publish/styles/ext.cx.publish.dialog.less
b/modules/publish/styles/ext.cx.publish.dialog.less
index be98ed6..b7d9d8e 100644
--- a/modules/publish/styles/ext.cx.publish.dialog.less
+++ b/modules/publish/styles/ext.cx.publish.dialog.less
@@ -9,7 +9,7 @@
background: #fff;
border: 1px solid #ccc;
border-bottom-width: 3px;
- border-radius: 3px;
+ border-radius: @borderRadius;
padding: 5px;
padding-bottom: 10px;
box-shadow: 0 5px 10px rgba( 0, 0, 0, 0.2 );
diff --git a/modules/publish/styles/ext.cx.publish.less
b/modules/publish/styles/ext.cx.publish.less
index 6952001..7557b9f 100644
--- a/modules/publish/styles/ext.cx.publish.less
+++ b/modules/publish/styles/ext.cx.publish.less
@@ -10,7 +10,7 @@
height: auto;
padding: 10px;
z-index: 1000;
- border-radius: 2px;
+ border-radius: @borderRadius;
:after,
:before {
diff --git a/modules/source/styles/ext.cx.source.selector.less
b/modules/source/styles/ext.cx.source.selector.less
index f90ed85..468035f 100644
--- a/modules/source/styles/ext.cx.source.selector.less
+++ b/modules/source/styles/ext.cx.source.selector.less
@@ -11,7 +11,7 @@
background: #fff;
border: 1px solid #ddd;
border-bottom-width: 3px;
- border-radius: 3px;
+ border-radius: @borderRadius;
padding: 0;
box-shadow: 0 5px 10px rgba( 0, 0, 0, 0.2 );
z-index: 1001;
diff --git a/modules/tools/styles/ext.cx.tools.card.less
b/modules/tools/styles/ext.cx.tools.card.less
index d3f9ff2..e5dda88 100644
--- a/modules/tools/styles/ext.cx.tools.card.less
+++ b/modules/tools/styles/ext.cx.tools.card.less
@@ -3,7 +3,7 @@
.card {
background: #fff;
border: 1px solid #c9c9c9;
- border-radius: 2px;
+ border-radius: @borderRadius;
box-shadow: 0 1px 0 #c9c9c9;
margin-top: 15px;
diff --git a/modules/tools/styles/ext.cx.tools.categories.less
b/modules/tools/styles/ext.cx.tools.categories.less
index 672ac19..b5f02ac 100644
--- a/modules/tools/styles/ext.cx.tools.categories.less
+++ b/modules/tools/styles/ext.cx.tools.categories.less
@@ -49,7 +49,7 @@
padding-top: 0.5em;
padding-bottom: 0.5em;
border: 1px solid #ddd;
- border-radius: 2px;
+ border-radius: @borderRadius;
.cx-category-nocategories {
padding-left: 0.5em;
diff --git a/modules/tools/styles/ext.cx.tools.dictionary.less
b/modules/tools/styles/ext.cx.tools.dictionary.less
index
[MediaWiki-commits] [Gerrit] wikimedia...dash[deployment]: Merge branch 'master' into deployment
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372480 ) Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 9117b45 Update all the node_modules Change-Id: I0dbe9cbbeb1e1fa3d26365fb91004091d2bb3fb8 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/80/372480/1 -- To view, visit https://gerrit.wikimedia.org/r/372480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0dbe9cbbeb1e1fa3d26365fb91004091d2bb3fb8 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...dash[deployment]: Update all node modules
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372481 )
Change subject: Update all node modules
..
Update all node modules
Change-Id: I151f201dbda21839f98e3cabd89c726c122e3804
---
M node_modules
M src/app/router.js
2 files changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/81/372481/1
diff --git a/node_modules b/node_modules
index 46fd5d9..ed68957 16
--- a/node_modules
+++ b/node_modules
@@ -1 +1 @@
-Subproject commit 46fd5d9b2f1fa278218e929bf2f007d47e09db4a
+Subproject commit ed68957143bc677be857cdada068d92fbf81bd08
diff --git a/src/app/router.js b/src/app/router.js
index 75c1a34..fb0da70 100644
--- a/src/app/router.js
+++ b/src/app/router.js
@@ -9,6 +9,16 @@
defaultParams: { page: 'home', action: 'view' }
};
+ function startCrossroads() {
+ function parseHash( newHash, oldHash ) {
crossroads.parse( newHash ); }
+
+ crossroads.normalizeFn = crossroads.NORM_AS_OBJECT;
+
+ hasher.initialized.add( parseHash );
+ hasher.changed.add( parseHash );
+ hasher.init();
+ }
+
function Router( config ) {
var self = this;
@@ -27,16 +37,6 @@
startCrossroads();
- }
-
- function startCrossroads() {
- function parseHash( newHash, oldHash ) {
crossroads.parse( newHash ); }
-
- crossroads.normalizeFn = crossroads.NORM_AS_OBJECT;
-
- hasher.initialized.add( parseHash );
- hasher.changed.add( parseHash );
- hasher.init();
}
return new Router( routerConfig );
--
To view, visit https://gerrit.wikimedia.org/r/372481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I151f201dbda21839f98e3cabd89c726c122e3804
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...node_modules[master]: Delete unused modules, update the rest
Ejegg has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372478 ) Change subject: Delete unused modules, update the rest .. Delete unused modules, update the rest Change-Id: I6f964390d1166e565b82025b1949cecb82ce3f08 --- A .bin/mime A accepts/HISTORY.md A accepts/LICENSE A accepts/README.md A accepts/index.js A accepts/package.json D amdrequire/LICENSE D amdrequire/README.md D amdrequire/amdrequire.js D amdrequire/changelog.md D amdrequire/package.json A array-flatten/LICENSE A array-flatten/README.md A array-flatten/array-flatten.js A array-flatten/package.json A bignumber.js/LICENCE A bignumber.js/README.md A bignumber.js/bignumber.js A bignumber.js/bignumber.js.map A bignumber.js/bignumber.min.js A bignumber.js/bower.json A bignumber.js/doc/API.html A bignumber.js/package.json A bluebird/LICENSE A bluebird/README.md A bluebird/changelog.md A bluebird/js/browser/bluebird.core.js A bluebird/js/browser/bluebird.core.min.js A bluebird/js/browser/bluebird.js A bluebird/js/browser/bluebird.min.js A bluebird/js/release/any.js A bluebird/js/release/assert.js A bluebird/js/release/async.js A bluebird/js/release/bind.js A bluebird/js/release/bluebird.js A bluebird/js/release/call_get.js A bluebird/js/release/cancel.js A bluebird/js/release/catch_filter.js A bluebird/js/release/context.js A bluebird/js/release/debuggability.js A bluebird/js/release/direct_resolve.js A bluebird/js/release/each.js A bluebird/js/release/errors.js A bluebird/js/release/es5.js R bluebird/js/release/filter.js A bluebird/js/release/finally.js A bluebird/js/release/generators.js A bluebird/js/release/join.js A bluebird/js/release/map.js A bluebird/js/release/method.js A bluebird/js/release/nodeback.js A bluebird/js/release/nodeify.js A bluebird/js/release/promise.js A bluebird/js/release/promise_array.js A bluebird/js/release/promisify.js A bluebird/js/release/props.js A bluebird/js/release/queue.js A bluebird/js/release/race.js A bluebird/js/release/reduce.js A bluebird/js/release/schedule.js A bluebird/js/release/settle.js A bluebird/js/release/some.js A bluebird/js/release/synchronous_inspection.js A bluebird/js/release/thenables.js A bluebird/js/release/timers.js A bluebird/js/release/using.js A bluebird/js/release/util.js A bluebird/package.json A body-parser/HISTORY.md A body-parser/LICENSE A body-parser/README.md A body-parser/index.js A body-parser/lib/read.js A body-parser/lib/types/json.js A body-parser/lib/types/raw.js A body-parser/lib/types/text.js A body-parser/lib/types/urlencoded.js A body-parser/package.json A bytes/History.md A bytes/LICENSE A bytes/Readme.md A bytes/index.js A bytes/package.json A commander/History.md A commander/LICENSE M commander/Readme.md M commander/index.js M commander/package.json A content-disposition/HISTORY.md C content-disposition/LICENSE A content-disposition/README.md A content-disposition/index.js A content-disposition/package.json A content-type/HISTORY.md A content-type/LICENSE A content-type/README.md A content-type/index.js A content-type/package.json R cookie-signature/.npmignore A cookie-signature/History.md R cookie-signature/Readme.md A cookie-signature/index.js A cookie-signature/package.json A cookie/HISTORY.md A cookie/LICENSE A cookie/README.md A cookie/index.js A cookie/package.json A core-util-is/LICENSE M core-util-is/lib/util.js M core-util-is/package.json A core-util-is/test.js D core-util-is/util.js A crc/LICENSE A crc/README.md A crc/lib/crc1.js A crc/lib/crc16.js A crc/lib/crc16_ccitt.js A crc/lib/crc16_kermit.js A crc/lib/crc16_modbus.js A crc/lib/crc16_xmodem.js A crc/lib/crc24.js A crc/lib/crc32.js A crc/lib/crc8.js A crc/lib/crc8_1wire.js A crc/lib/create_buffer.js A crc/lib/define_crc.js A crc/lib/index.js A crc/package.json A debug/.coveralls.yml A debug/.eslintrc A debug/.npmignore A debug/.travis.yml A debug/CHANGELOG.md A debug/LICENSE A debug/Makefile A debug/README.md A debug/component.json A debug/karma.conf.js A debug/node.js A debug/package.json A debug/src/browser.js A debug/src/debug.js A debug/src/index.js A debug/src/node.js A depd/History.md A depd/LICENSE A depd/Readme.md A depd/index.js A depd/lib/browser/index.js A depd/lib/compat/callsite-tostring.js A depd/lib/compat/event-listener-count.js A depd/lib/compat/index.js A depd/package.json R destroy/LICENSE A destroy/README.md A destroy/index.js A destroy/package.json D dotenv/.env D dotenv/.env.development D dotenv/.env.production D dotenv/.env.staging D dotenv/.npmignore D dotenv/.travis.yml D dotenv/README.md D dotenv/lib/main.js D dotenv/package.json D dotenv/test/main.js R ee-first/LICENSE A ee-first/README.md A ee-first/index.js A ee-first/package.json A encodeurl/HISTORY.md A encodeurl/LICENSE A encodeurl/README.md A encodeurl/index.js A encodeurl/package.json A escape-html/LICENSE A escape-html/Readme.md A escape-html/index.js A escape-html/package.json A etag/HISTORY.md A etag/LICENSE A etag/R
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [WIP] Crimean Tatar Transliteration
Tjones has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372479 )
Change subject: [WIP] Crimean Tatar Transliteration
..
[WIP] Crimean Tatar Transliteration
This is a first attempt at Latin/Cyrillic translitertion for
Crimean Tatar (crh).
Includes transliteration tables, prefix/suffix mappings, regex mappings
and exceptions lists for words and abbreviations.
Regularize language name in messages/* files.
Bug: T23582
Change-Id: I424703f99adf837f6217872b882d1ea26bfdd068
---
M languages/LanguageConverter.php
A languages/classes/LanguageCrh.php
A languages/data/CrhExceptions.php
A languages/i18n/crh.json
M languages/messages/MessagesCrh.php
M languages/messages/MessagesCrh_cyrl.php
M languages/messages/MessagesCrh_latn.php
7 files changed, 928 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/79/372479/1
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 6d0368c..a670594 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -37,6 +37,7 @@
*/
static public $languagesWithVariants = [
'en',
+ 'crh',
'gan',
'iu',
'kk',
diff --git a/languages/classes/LanguageCrh.php
b/languages/classes/LanguageCrh.php
new file mode 100644
index 000..5ed9379
--- /dev/null
+++ b/languages/classes/LanguageCrh.php
@@ -0,0 +1,300 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Language
+ */
+
+// Defines working character ranges
+define( 'WORD_BEGINS', '\r\s\"\'\(\)\-<>\[\]\/.,:;!?' ); #
+define( 'WORD_ENDS', '\r\s\"\'\(\)\-<>\[\]\/.,:;!?' ); #
+
+// Cyrillic
+define( 'CRH_C_UC', 'АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ' ); # Crimean Tatar
Cyrillic uppercase
+define( 'CRH_C_LC', 'абвгдеёжзийклмнопрстуфхцчшщъыьэюя' ); # Crimean Tatar
Cyrillic lowercase
+define( 'CRH_C_CONS_UC', 'БВГДЖЗЙКЛМНПРСТФХЦЧШЩCÑ' ); # Crimean Tatar Cyrillic
+ CÑ uppercase consonants
+define( 'CRH_C_CONS_LC', 'бвгджзйклмнпрстфхцчшщcñ' ); # Crimean Tatar Cyrillic
+ CÑ lowercase consonants
+define( 'CRH_C_CONS', 'бвгджзйклмнпрстфхцчшщcñБВГДЖЗЙКЛМНПРСТФХЦЧШЩCÑ' ); #
Crimean Tatar Cyrillic + CÑ consonants
+define( 'CRH_C_M_CONS', 'бгкмпшcБГКМПШC' ); # Crimean Tatar Cyrillic M-type
consonants
+
+// Latin
+define( 'CRH_L_UC', 'AÂBCÇDEFGĞHIİJKLMNÑOÖPQRSŞTUÜVXYZ' ); # Crimean Tatar
Latin uppercase
+define( 'CRH_L_LC', 'aâbcçdefgğhıijklmnñoöpqrsştuüvxyz' ); # Crimean Tatar
Latin lowercase
+define( 'CRH_L_N_CONS_UC', 'ÇNRSTZ' ); # Crimean Tatar Latin N-type upper case
consonants
+define( 'CRH_L_N_CONS_LC', 'çnrstz' ); # Crimean Tatar Latin N-type lower case
consonants
+define( 'CRH_L_N_CONS', 'çnrstzÇNRSTZ' ); # Crimean Tatar Latin N-type
consonants
+define( 'CRH_L_M_CONS', 'bcgkmpşBCGKMPŞ' ); # Crimean Tatar Latin M-type
consonants
+define( 'CRH_L_CONS_UC', 'BCÇDFGHJKLMNÑPRSŞTVZ' ); # Crimean Tatar Latin
uppercase consonants
+define( 'CRH_L_CONS_LC', 'bcçdfghjklmnñprsştvz' ); # Crimean Tatar Latin
lowercase consonants
+define( 'CRH_L_CONS', 'bcçdfghjklmnñprsştvzBCÇDFGHJKLMNÑPRSŞTVZ' ); # Crimean
Tatar Latin consonants
+define( 'CRH_L_VOW_UC', 'AÂEIİOÖUÜ' ); # Crimean Tatar Latin uppercase vowels
+define( 'CRH_L_VOW', 'aâeıioöuüAÂEIİOÖUÜ' ); # Crimean Tatar Latin vowels
+define( 'CRH_L_F_UC', 'EİÖÜ' ); # Crimean Tatar Latin uppercase front vowels
+define( 'CRH_L_F', 'eiöüEİÖÜ' ); # Crimean Tatar Latin front vowels
+
+/**
+ * Crimean Tatar (Qırımtatarca) converter routines
+ *
+ * @ingroup Language
+ */
+class CrhConverter extends LanguageConverter {
+
+ public $mCyrillicToLatin = [
+
+ ## these are independent of location in the word, but have
+ ## to go first so other transforms don't bleed them
+ 'гъ' => 'ğ', 'Гъ' => 'Ğ', 'ГЪ' => 'Ğ',
+ 'къ' => 'q', 'Къ' => 'Q', 'КЪ' => 'Q',
+ 'нъ' => 'ñ', 'Нъ' => 'Ñ', 'НЪ' => 'Ñ',
+ 'дж' => 'c', 'Дж' => 'C', 'ДЖ' => 'C',
+
+ 'А' => 'A', 'а' => 'a', 'Б' => 'B', 'б' => 'b',
+ 'В' => 'V', 'в' => 'v', 'Г' => 'G', 'г' => 'g',
+ 'Д' => 'D', 'д' => 'd', 'Ж' => 'J', 'ж' => 'j',
+ 'З' => 'Z', 'з' => 'z', 'И' => 'İ', 'и' => 'i',
+ 'Й' => 'Y', 'й' => 'y', 'К' => 'K', 'к' => 'k',
+ 'Л' => 'L', 'л' => 'l', 'М' => 'M', 'м' => 'm',
+ 'Н' => 'N', 'н' => 'n', 'П' => 'P', 'п' => 'p',
+ 'Р' => 'R', 'р' => 'r', 'С' => 'S', 'с' => 's',
+ 'Т' => 'T', 'т' => 't', 'Ф' => 'F', 'ф' => 'f',
+ 'Х' => 'H', 'х' => 'h', 'Ч' => 'Ç', 'ч' => 'ç',
+ 'Ш' => 'Ş', 'ш' => 'ş', 'Ы' => 'I', 'ы' => 'ı',
+ 'Э' => 'E', 'э' => 'e', 'Е' => 'E', 'е' => 'e',
+ 'Я' => 'Â', 'я' => 'â', 'У' => 'U', 'у' => 'u',
+ 'О' => 'O', 'о' => 'o',
+
+ 'Ё' => 'Yo', 'ё
[MediaWiki-commits] [Gerrit] wikimedia...node_modules[master]: Delete unused modules, update the rest
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372478 ) Change subject: Delete unused modules, update the rest .. Delete unused modules, update the rest Change-Id: I6f964390d1166e565b82025b1949cecb82ce3f08 --- A .bin/mime A accepts/HISTORY.md A accepts/LICENSE A accepts/README.md A accepts/index.js A accepts/package.json D amdrequire/LICENSE D amdrequire/README.md D amdrequire/amdrequire.js D amdrequire/changelog.md D amdrequire/package.json A array-flatten/LICENSE A array-flatten/README.md A array-flatten/array-flatten.js A array-flatten/package.json A bignumber.js/LICENCE A bignumber.js/README.md A bignumber.js/bignumber.js A bignumber.js/bignumber.js.map A bignumber.js/bignumber.min.js A bignumber.js/bower.json A bignumber.js/doc/API.html A bignumber.js/package.json A bluebird/LICENSE A bluebird/README.md A bluebird/changelog.md A bluebird/js/browser/bluebird.core.js A bluebird/js/browser/bluebird.core.min.js A bluebird/js/browser/bluebird.js A bluebird/js/browser/bluebird.min.js A bluebird/js/release/any.js A bluebird/js/release/assert.js A bluebird/js/release/async.js A bluebird/js/release/bind.js A bluebird/js/release/bluebird.js A bluebird/js/release/call_get.js A bluebird/js/release/cancel.js A bluebird/js/release/catch_filter.js A bluebird/js/release/context.js A bluebird/js/release/debuggability.js A bluebird/js/release/direct_resolve.js A bluebird/js/release/each.js A bluebird/js/release/errors.js A bluebird/js/release/es5.js R bluebird/js/release/filter.js A bluebird/js/release/finally.js A bluebird/js/release/generators.js A bluebird/js/release/join.js A bluebird/js/release/map.js A bluebird/js/release/method.js A bluebird/js/release/nodeback.js A bluebird/js/release/nodeify.js A bluebird/js/release/promise.js A bluebird/js/release/promise_array.js A bluebird/js/release/promisify.js A bluebird/js/release/props.js A bluebird/js/release/queue.js A bluebird/js/release/race.js A bluebird/js/release/reduce.js A bluebird/js/release/schedule.js A bluebird/js/release/settle.js A bluebird/js/release/some.js A bluebird/js/release/synchronous_inspection.js A bluebird/js/release/thenables.js A bluebird/js/release/timers.js A bluebird/js/release/using.js A bluebird/js/release/util.js A bluebird/package.json A body-parser/HISTORY.md A body-parser/LICENSE A body-parser/README.md A body-parser/index.js A body-parser/lib/read.js A body-parser/lib/types/json.js A body-parser/lib/types/raw.js A body-parser/lib/types/text.js A body-parser/lib/types/urlencoded.js A body-parser/package.json A bytes/History.md A bytes/LICENSE A bytes/Readme.md A bytes/index.js A bytes/package.json A commander/History.md A commander/LICENSE M commander/Readme.md M commander/index.js M commander/package.json A content-disposition/HISTORY.md C content-disposition/LICENSE A content-disposition/README.md A content-disposition/index.js A content-disposition/package.json A content-type/HISTORY.md A content-type/LICENSE A content-type/README.md A content-type/index.js A content-type/package.json R cookie-signature/.npmignore A cookie-signature/History.md R cookie-signature/Readme.md A cookie-signature/index.js A cookie-signature/package.json A cookie/HISTORY.md A cookie/LICENSE A cookie/README.md A cookie/index.js A cookie/package.json A core-util-is/LICENSE M core-util-is/lib/util.js M core-util-is/package.json A core-util-is/test.js D core-util-is/util.js A crc/LICENSE A crc/README.md A crc/lib/crc1.js A crc/lib/crc16.js A crc/lib/crc16_ccitt.js A crc/lib/crc16_kermit.js A crc/lib/crc16_modbus.js A crc/lib/crc16_xmodem.js A crc/lib/crc24.js A crc/lib/crc32.js A crc/lib/crc8.js A crc/lib/crc8_1wire.js A crc/lib/create_buffer.js A crc/lib/define_crc.js A crc/lib/index.js A crc/package.json A debug/.coveralls.yml A debug/.eslintrc A debug/.npmignore A debug/.travis.yml A debug/CHANGELOG.md A debug/LICENSE A debug/Makefile A debug/README.md A debug/component.json A debug/karma.conf.js A debug/node.js A debug/package.json A debug/src/browser.js A debug/src/debug.js A debug/src/index.js A debug/src/node.js A depd/History.md A depd/LICENSE A depd/Readme.md A depd/index.js A depd/lib/browser/index.js A depd/lib/compat/callsite-tostring.js A depd/lib/compat/event-listener-count.js A depd/lib/compat/index.js A depd/package.json R destroy/LICENSE A destroy/README.md A destroy/index.js A destroy/package.json D dotenv/.env D dotenv/.env.development D dotenv/.env.production D dotenv/.env.staging D dotenv/.npmignore D dotenv/.travis.yml D dotenv/README.md D dotenv/lib/main.js D dotenv/package.json D dotenv/test/main.js R ee-first/LICENSE A ee-first/README.md A ee-first/index.js A ee-first/package.json A encodeurl/HISTORY.md A encodeurl/LICENSE A encodeurl/README.md A encodeurl/index.js A encodeurl/package.json A escape-html/LICENSE A escape-html/Readme.md A escape-html/index.js A escape-html/package.json A etag/HISTORY.md A etag/LICENSE A etag/README.md
[MediaWiki-commits] [Gerrit] wikimedia...dash[master]: Update all the node_modules
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372477 )
Change subject: Update all the node_modules
..
Update all the node_modules
except the ones we weren't using. delete those.
Change-Id: If5cdd790831d394bd53b7dd9320f7544854e7f6f
---
M package.json
M server.js
2 files changed, 61 insertions(+), 56 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/77/372477/1
diff --git a/package.json b/package.json
index 6a9bbb7..624f398 100644
--- a/package.json
+++ b/package.json
@@ -1,56 +1,53 @@
{
- "name": "dash",
- "description": "Fundraising Dashboard App",
- "version": "0.0.1",
- "scripts": {
- "test": "grunt test"
- },
- "private": true,
- "repository": {
- "type": "git",
- "url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/dash";
- },
- "dependencies": {
- "amdrequire": "0.0.3",
- "commander": "~2.2.0",
- "dotenv": "^0.4.0",
- "evil-dns": "0.1.0",
- "express": "3.x",
- "gulp": "^3.8.8",
- "gulp-jshint": "^1.8.4",
- "gulp-rename": "^1.2.0",
- "gulp-rev": "^1.1.0",
- "jade": ">= 0.0.1",
- "lodash": "^2.4.1",
- "memory-cache": "0.0.5",
- "mysql": "^2.4.3",
- "mysql-promise": "^1.3.0",
- "odata-parser": "~1.0.0",
- "passport": "^0.2.1",
- "passport-drupal": "0.3.3",
- "passport-oauth": "^1.0.0",
- "node.extend": "1.1.3"
- },
- "optionalDependencies": {
- "modern-syslog": "~1.1.2",
-"node-syslog": "~1.1.7"
-},
- "devDependencies": {
- "bower": "1.8.0",
- "chalk": "^0.5.1",
- "deeply": "^0.1.0",
- "event-stream": "^3.1.7",
- "grunt": "0.4.5",
- "grunt-cli": "0.1.13",
- "grunt-contrib-jshint": "0.11.3",
- "grunt-jscs": "2.6.0",
- "gulp-clean": "^0.3.1",
- "gulp-concat": "^2.4.1",
- "gulp-css-url-adjuster": "^0.2.3",
- "gulp-flatten": "^0.2.0",
- "gulp-html-replace": "^1.3.0",
- "gulp-replace": "^0.4.0",
- "gulp-requirejs-bundler": "^0.1.1",
- "gulp-uglify": "^1.0.1"
- }
+ "name": "dash",
+ "description": "Fundraising Dashboard App",
+ "version": "0.0.1",
+ "scripts": {
+"test": "grunt test"
+ },
+ "private": true,
+ "repository": {
+"type": "git",
+"url": "https://gerrit.wikimedia.org/r/wikimedia/fundraising/dash";
+ },
+ "dependencies": {
+"body-parser": "^1.17.2",
+"commander": "~2.11.0",
+"evil-dns": "0.2.0",
+"express": "4.x",
+"express-session": "^1.15.5",
+"memory-cache": "0.2.0",
+"mysql": "^2.14.1",
+"mysql-promise": "^4.1.0",
+"node.extend": "2.0.0",
+"odata-parser": "~1.4.1",
+"passport": "^0.4.0",
+"passport-drupal": "0.3.3",
+"passport-oauth": "^1.0.0"
+ },
+ "optionalDependencies": {
+"modern-syslog": "~1.1.4"
+ },
+ "devDependencies": {
+"bower": "1.8.0",
+"chalk": "^2.1.0",
+"deeply": "^2.0.3",
+"event-stream": "^3.3.4",
+"grunt": "1.0.1",
+"grunt-cli": "1.2.0",
+"grunt-contrib-jshint": "1.1.0",
+"grunt-jscs": "3.0.1",
+"gulp": "^3.9.1",
+"gulp-jshint": "^2.0.4",
+"gulp-rename": "^1.2.2",
+"gulp-rev": "^8.0.0",
+"gulp-clean": "^0.3.2",
+"gulp-concat": "^2.6.1",
+"gulp-css-url-adjuster": "^0.2.3",
+"gulp-flatten": "^0.3.1",
+"gulp-html-replace": "^1.6.2",
+"gulp-replace": "^0.6.1",
+"gulp-requirejs-bundler": "^0.1.1",
+"gulp-uglify": "^3.0.0"
+ }
}
diff --git a/server.js b/server.js
index 368afef..48046ce 100644
--- a/server.js
+++ b/server.js
@@ -1,5 +1,7 @@
var express = require( 'express' ),
app = express(),
+ session = require( 'express-session' ),
+ bodyParser = require( 'body-parser' ),
routes = require( './routes' ),
passport = require( 'passport' ),
DrupalStrategy = require( 'passport-drupal' ).DrupalStrategy,
@@ -16,6 +18,7 @@
// Log errors
process.on( 'uncaughtException', function ( err ) {
logger.error( 'Application error: ' + err );
+ logger.error( err.stack );
} );
serverConfig = /(([0-9\.]*|\[[0-9a-fA-F\:]*\]):)?([0-9]+)/.exec( config.listen
);
@@ -45,9 +48,14 @@
}
}
-app.use( express.json() );
+app.use( bodyParser.json() );
-app.use( express.session( { secret: config.sessionSecret } ) );
+app.use( session( {
+ secret: config.sessionSecret,
+ resave: false,
+ saveUninitialized: false
+
+} ) );
// Authentication
passport.use( new Drup
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.14]: Revert "Disable cirrus MLR ab test"
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372476 )
Change subject: Revert "Disable cirrus MLR ab test"
..
Revert "Disable cirrus MLR ab test"
The original test collected far less data than expected. Turn
back on while investigating why there are less events.
This reverts commit 70ffd669df35046e346142540f77464fb1be31dc.
Change-Id: I2080c95c5695c5ce12f58f1858726af294b09118
(cherry picked from commit 1a695cefc01f3d8e628c974c6195e052d915db6d)
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 8 insertions(+), 3 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index fcf85bc..6d16eed 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -113,7 +113,12 @@
function initialize( session ) {
var sessionId = session.get( 'sessionId' ),
- validBuckets = [],
+ // LTR sub test
+ // Test is running on enwiki only, which
reports ~14k sessions per day
+ // at the 1:2000 sampling. Sampling increased
to 1:500, so 56k sessions
+ // per day. Those 56k sessions will be split
15k to dashboards, and
+ // 7k per bucket, for ~50k per bucket in a week.
+ validBuckets = [ 'control', 'ltr-20',
'ltr-i-20', 'ltr-1024', 'ltr-i-1024', 'ltr-i-20-1024' ],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname'
),
// Provides a place to handle
wiki-specific sampling,
@@ -135,8 +140,8 @@
subTest: null
},
enwiki: {
- test: 2000,
- subTest: null
+ test: 500,
+ subTest: 0.75
},
enwiktionary: {
test: 40,
--
To view, visit https://gerrit.wikimedia.org/r/372476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2080c95c5695c5ce12f58f1858726af294b09118
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: Thcipriani
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.14]: RCFilters: Fix validation for single_option groups
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372449 )
Change subject: RCFilters: Fix validation for single_option groups
..
RCFilters: Fix validation for single_option groups
The single_option groups have a base definition that means they
always must have a value, and must never have more than one value.
The previous way we attempted to do that was confusing and missed
a case where after resetting filters, two values were selected before
one could be unselected, which then broke the behavior in the
entire group.
This fix reorganizes the validation when an item in the group is
selected or unselected to make sure the group retains its promised
behavior.
Bug: T173303
Change-Id: I5758ec324a26c0e5e6f5c473d206e818a1d22523
(cherry picked from commit 4f6624451aa979a49840a10071cac75a1a5aae80)
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
1 file changed, 31 insertions(+), 26 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index 6acc44d..4dc86f6 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -222,34 +222,39 @@
mw.rcfilters.dm.FilterGroup.prototype.onFilterItemUpdate = function (
item ) {
// Update state
var changed = false,
- active = this.areAnySelected();
+ active = this.areAnySelected(),
+ model = this;
- if (
- item.isSelected() &&
- this.getType() === 'single_option' &&
- this.currSelected &&
- this.currSelected !== item
- ) {
- this.currSelected.toggleSelected( false );
- }
+ if ( this.getType() === 'single_option' ) {
+ // This group must have one item selected always
+ // and must never have more than one item selected at a
time
+ if ( this.getSelectedItems().length === 0 ) {
+ // Nothing is selected anymore
+ // Select the default or the first item
+ this.currSelected = this.getItemByParamName(
this.defaultParams[ this.getName() ] ) ||
+ this.getItems()[ 0 ];
+ this.currSelected.toggleSelected( true );
+ changed = true;
+ } else if ( this.getSelectedItems().length > 1 ) {
+ // There is more than one item selected
+ // This should only happen if the item given
+ // is the one that is selected, so unselect
+ // all items that is not it
+ this.getSelectedItems().forEach( function (
itemModel ) {
+ // Note that in case the given item is
actually
+ // not selected, this loop will end up
unselecting
+ // all items, which would trigger the
case above
+ // when the last item is unselected
anyways
+ var selected = itemModel.getName() ===
item.getName() &&
+ item.isSelected();
- // For 'single_option' groups, check if we just unselected all
- // items. This should never be the result. If we did unselect
- // all (like resetting all filters to false) then this group
- // must choose its default item or the first item in the group
- if (
- this.getType() === 'single_option' &&
- !this.getItems().some( function ( filterItem ) {
- return filterItem.isSelected();
- } )
- ) {
- // Single option means there must be a single option
- // selected, so we have to either select the default
- // or select the first option
- this.currSelected = this.getItemByParamName(
this.defaultParams[ this.getName() ] ) ||
- this.getItems()[ 0 ];
- this.currSelected.toggleSelected( true );
- changed = true;
+ itemModel.toggleSelected( selected );
+ if ( sel
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Reapply "Remove temporary wgStructuredChangeFiltersEnableExp...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372446 ) Change subject: Reapply "Remove temporary wgStructuredChangeFiltersEnableExperimentalViews setting" .. Reapply "Remove temporary wgStructuredChangeFiltersEnableExperimentalViews setting" This reverts commit 21ed25e584024e8541047719d8a5bf5d61bb2914 and reapplies commit 590fac6d6a734c76e9a7da16eb1a0d0cd5237c96. Change-Id: I7f43a8c473f8d6c52ec078cebae715f3f331578e --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: Thcipriani: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 2a12875..1f05ad4 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19406,11 +19406,6 @@ 'commonswiki' => [ NS_FILE ], ], -// Temporarily enable until 1.30.0-wmf.12 rolls out -RK -'wgStructuredChangeFiltersEnableExperimentalViews' => [ - 'default' => true, -], - 'wmgUseTimeless' => [ 'default' => false, 'testwiki' => true, -- To view, visit https://gerrit.wikimedia.org/r/372446 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7f43a8c473f8d6c52ec078cebae715f3f331578e Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Catrope Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Niharika29 Gerrit-Reviewer: Thcipriani Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.14]: Revert "Disable cirrus MLR ab test"
EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372476 )
Change subject: Revert "Disable cirrus MLR ab test"
..
Revert "Disable cirrus MLR ab test"
The original test collected far less data than expected. Turn
back on while investigating why there are less events.
This reverts commit 70ffd669df35046e346142540f77464fb1be31dc.
Change-Id: I2080c95c5695c5ce12f58f1858726af294b09118
(cherry picked from commit 1a695cefc01f3d8e628c974c6195e052d915db6d)
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 8 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/76/372476/1
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index fcf85bc..6d16eed 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -113,7 +113,12 @@
function initialize( session ) {
var sessionId = session.get( 'sessionId' ),
- validBuckets = [],
+ // LTR sub test
+ // Test is running on enwiki only, which
reports ~14k sessions per day
+ // at the 1:2000 sampling. Sampling increased
to 1:500, so 56k sessions
+ // per day. Those 56k sessions will be split
15k to dashboards, and
+ // 7k per bucket, for ~50k per bucket in a week.
+ validBuckets = [ 'control', 'ltr-20',
'ltr-i-20', 'ltr-1024', 'ltr-i-1024', 'ltr-i-20-1024' ],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname'
),
// Provides a place to handle
wiki-specific sampling,
@@ -135,8 +140,8 @@
subTest: null
},
enwiki: {
- test: 2000,
- subTest: null
+ test: 500,
+ subTest: 0.75
},
enwiktionary: {
test: 40,
--
To view, visit https://gerrit.wikimedia.org/r/372476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2080c95c5695c5ce12f58f1858726af294b09118
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Revert "Disable cirrus MLR ab test"
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372475 )
Change subject: Revert "Disable cirrus MLR ab test"
..
Revert "Disable cirrus MLR ab test"
The original test collected far less data than expected. Turn
back on while investigating why there are less events.
This reverts commit 70ffd669df35046e346142540f77464fb1be31dc.
Change-Id: I2080c95c5695c5ce12f58f1858726af294b09118
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 8 insertions(+), 3 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index fcf85bc..6d16eed 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -113,7 +113,12 @@
function initialize( session ) {
var sessionId = session.get( 'sessionId' ),
- validBuckets = [],
+ // LTR sub test
+ // Test is running on enwiki only, which
reports ~14k sessions per day
+ // at the 1:2000 sampling. Sampling increased
to 1:500, so 56k sessions
+ // per day. Those 56k sessions will be split
15k to dashboards, and
+ // 7k per bucket, for ~50k per bucket in a week.
+ validBuckets = [ 'control', 'ltr-20',
'ltr-i-20', 'ltr-1024', 'ltr-i-1024', 'ltr-i-20-1024' ],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname'
),
// Provides a place to handle
wiki-specific sampling,
@@ -135,8 +140,8 @@
subTest: null
},
enwiki: {
- test: 2000,
- subTest: null
+ test: 500,
+ subTest: 0.75
},
enwiktionary: {
test: 40,
--
To view, visit https://gerrit.wikimedia.org/r/372475
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2080c95c5695c5ce12f58f1858726af294b09118
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Revert "Disable cirrus MLR ab test"
EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372475 )
Change subject: Revert "Disable cirrus MLR ab test"
..
Revert "Disable cirrus MLR ab test"
The original test collected far less data than expected. Turn
back on while investigating why there are less events.
This reverts commit 70ffd669df35046e346142540f77464fb1be31dc.
Change-Id: I2080c95c5695c5ce12f58f1858726af294b09118
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 8 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/75/372475/1
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index fcf85bc..6d16eed 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -113,7 +113,12 @@
function initialize( session ) {
var sessionId = session.get( 'sessionId' ),
- validBuckets = [],
+ // LTR sub test
+ // Test is running on enwiki only, which
reports ~14k sessions per day
+ // at the 1:2000 sampling. Sampling increased
to 1:500, so 56k sessions
+ // per day. Those 56k sessions will be split
15k to dashboards, and
+ // 7k per bucket, for ~50k per bucket in a week.
+ validBuckets = [ 'control', 'ltr-20',
'ltr-i-20', 'ltr-1024', 'ltr-i-1024', 'ltr-i-20-1024' ],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname'
),
// Provides a place to handle
wiki-specific sampling,
@@ -135,8 +140,8 @@
subTest: null
},
enwiki: {
- test: 2000,
- subTest: null
+ test: 500,
+ subTest: 0.75
},
enwiktionary: {
test: 40,
--
To view, visit https://gerrit.wikimedia.org/r/372475
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2080c95c5695c5ce12f58f1858726af294b09118
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Replace remaining solid greys and blue with WikimediaUI pale...
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372474 )
Change subject: Replace remaining solid greys and blue with WikimediaUI palette
ones
..
Replace remaining solid greys and blue with WikimediaUI palette ones
Replacing remaining hex color greys and references drawer link blue
with WikimediaUI color palette one.
References drawer blue also ensures WCAG 2.0 level AA conformance,
as our Accent50 works on black and white.
Bug: T146799
Change-Id: I5e688e31802335b1d4cd0f0052251d226a0976fd
---
M resources/mobile.backtotop/backtotop.less
M resources/mobile.editor.common/editor.less
M resources/mobile.references/references.less
3 files changed, 7 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/74/372474/1
diff --git a/resources/mobile.backtotop/backtotop.less
b/resources/mobile.backtotop/backtotop.less
index 240bafc..fa7dcef 100644
--- a/resources/mobile.backtotop/backtotop.less
+++ b/resources/mobile.backtotop/backtotop.less
@@ -11,7 +11,7 @@
width: 2.5em;
height: 2.5em;
border-radius: 100%;
- box-shadow: 0.1em 0.2em 0.3em #d3d3d3;
+ box-shadow: 0.1em 0.2em 0.3em #c8ccd1;
bottom: 20px;
right: 0;
cursor: pointer;
diff --git a/resources/mobile.editor.common/editor.less
b/resources/mobile.editor.common/editor.less
index bbae338..3fe5069 100644
--- a/resources/mobile.editor.common/editor.less
+++ b/resources/mobile.editor.common/editor.less
@@ -37,7 +37,8 @@
}
.editor-switcher {
- border-left: 1px solid #ddd;
+ border-left: 1px solid #c8ccd1;
+
.oo-ui-toolbar-bar {
font-size: unit( 0.8 * @targetIconSize / @baseIconSize,
em );
border-collapse: separate;
diff --git a/resources/mobile.references/references.less
b/resources/mobile.references/references.less
index e7c68a3..c9c7557 100644
--- a/resources/mobile.references/references.less
+++ b/resources/mobile.references/references.less
@@ -14,13 +14,16 @@
max-height: 400px; // or half of window height, whichever is smaller
(see ReferencesDrawerBeta.js)
overflow-y: auto;
padding: @drawerPadding;
+
&.text {
font-size: 1em;
}
a {
+ // Removing external images here
background-image: none;
- color: #5880c0;
+ color: #36c;
+ padding-right: 0;
}
.cite {
--
To view, visit https://gerrit.wikimedia.org/r/372474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e688e31802335b1d4cd0f0052251d226a0976fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Verify the existance of `url` key when parsing lang objects
Pmiazga has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372473 )
Change subject: Verify the existance of `url` key when parsing lang objects
..
Verify the existance of `url` key when parsing lang objects
Some langLink retrieved from API do not contain url property, only
code and title. If that happens do not throw PHP notice error. Log
the error and skip broken lang object.
Changes:
- extracted langObject validation to a separate function
- added url property existence check
- renamed $code to $index as $langLinks is an array without keys
- introduced MobileContext::LOGGER_CHANNEL as it's used in couple
places
Bug: T172316
Change-Id: I4ef5b1ad4a37b96407f7f758680a6177cafdf128
---
M includes/MobileContext.php
M includes/specials/SpecialMobileLanguages.php
M tests/phpunit/specials/SpecialMobileLanguagesTest.php
3 files changed, 67 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/73/372473/1
diff --git a/includes/MobileContext.php b/includes/MobileContext.php
index fbadd60..a04e2ca 100644
--- a/includes/MobileContext.php
+++ b/includes/MobileContext.php
@@ -21,7 +21,7 @@
const LAZY_LOAD_IMAGES_COOKIE_VALUE = 'A';
const LAZY_LOAD_REFERENCES_COOKIE_NAME = 'mfLazyLoadReferences';
const LAZY_LOAD_REFERENCES_COOKIE_VALUE = 'A';
-
+ const LOGGER_CHANNEL = 'mobile';
/**
* Saves the testing mode user has opted in: 'beta' or 'stable'
* @var string $mobileMode
diff --git a/includes/specials/SpecialMobileLanguages.php
b/includes/specials/SpecialMobileLanguages.php
index 91e9783..735645e 100644
--- a/includes/specials/SpecialMobileLanguages.php
+++ b/includes/specials/SpecialMobileLanguages.php
@@ -58,15 +58,14 @@
// Set the name of each language based on the system
list of language names
$languageMap = Language::fetchLanguageNames();
$languages = $page['langlinks'];
- foreach ( $page['langlinks'] as $code => $langObject ) {
- if ( !isset( $languageMap[$langObject['lang']]
) ) {
- // Bug T93500: DB might still have
preantiquated rows with bogus languages
- unset( $languages[$code] );
+ foreach ( $page['langlinks'] as $index => $langObject )
{
+ if ( !$this->isLanguageObjectValid(
$languageMap, $langObject ) ) {
+ unset( $languages[$index] );
continue;
}
$langObject['langname'] =
$languageMap[$langObject['lang']];
$langObject['url'] =
MobileContext::singleton()->getMobileUrl( $langObject['url'] );
- $languages[$code] = $langObject;
+ $languages[$index] = $langObject;
}
$compareLanguage = function ( $a, $b ) {
return strcasecmp( $a['langname'],
$b['langname'] );
@@ -80,6 +79,33 @@
}
/**
+* Verify if passed language object contains all necessary information
+*
+* @see https://phabricator.wikimedia.org/T93500
+* @see https://phabricator.wikimedia.org/T172316
+* @param array $languageMap array of language names, indexed by code.
+* @param array $langObject array of lang objects
+* @return bool
+*/
+ private function isLanguageObjectValid( $languageMap, $langObject ) {
+ if ( !isset( $languageMap[$langObject['lang']] ) ) {
+ // Bug T93500: DB might still have preantiquated rows
with bogus languages
+ return false;
+ }
+ if ( !array_key_exists( 'url', $langObject ) ) {
+ // Bug T172316: Some lang objects do not have url. We
would like to log those instances
+ \MediaWiki\Logger\LoggerFactory::getInstance(
MobileContext::LOGGER_CHANNEL )->warning(
+ '`url` key is undefined in language object',
+ [
+ 'uri' =>
RequestContext::getMain()->getRequest()->getFullRequestURL(),
+ 'langObject' => $langObject,
+ ]
+ );
+ return false;
+ }
+ return true;
+ }
+ /**
* Returns an array of language variants that the page is available in
* @return array
*/
diff --git a/tests/phpunit/specials/SpecialMobileLanguagesTest.php
b/tests/phpunit/specials/SpecialMobile
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Standardise on MinervaNeue skin name
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372472 )
Change subject: Standardise on MinervaNeue skin name
..
Standardise on MinervaNeue skin name
Bug: T171644
Change-Id: Ieffb6334168047dcf05dcb60281865ab47056dc0
---
M includes/skins/SkinMinerva.php
M skin.json
2 files changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/72/372472/1
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index e6d66f4..3f14562 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -21,7 +21,7 @@
const OPTIONS_MOBILE_BETA = 'beta';
/** @var string $skinname Name of this skin */
- public $skinname = 'minerva';
+ public $skinname = 'minervaneue';
/** @var string $template Name of this used template */
public $template = 'MinervaTemplate';
/** @var bool $useHeadElement Specify whether show head elements */
diff --git a/skin.json b/skin.json
index 54548c2..e503645 100644
--- a/skin.json
+++ b/skin.json
@@ -35,7 +35,7 @@
"remoteSkinPath": "MinervaNeue"
},
"ResourceModuleSkinStyles": {
- "minerva": {
+ "minervaneue": {
"mediawiki.skinning.content.parsoid": [],
"mediawiki.hlist": [
"skinStyles/mediawiki.hlist/minerva.less"
@@ -514,8 +514,7 @@
}
},
"ValidSkinNames": {
- "minervaneue": "MinervaNeue",
- "minerva": "Minerva"
+ "minervaneue": "MinervaNeue"
},
"author": [],
"config": {
--
To view, visit https://gerrit.wikimedia.org/r/372472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieffb6334168047dcf05dcb60281865ab47056dc0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Skin: Remove redundant use of QuickTemplate::setRef()
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372471 )
Change subject: Skin: Remove redundant use of QuickTemplate::setRef()
..
Skin: Remove redundant use of QuickTemplate::setRef()
As part of long-term moving towards having skins consume prepared
data and not making additional run-time database queries or additional
PHP-specific semantics and global state, try to phase out use
of QuickTemplate::setRef(), which is incompatible with the idea of
data only flowing in one direction (given it allows the value to
change at any time).
* jsmimetype: Deprecated/unused, has a constant value for compat.
* mimetype: Obsolete, Content-Type header comes from OutputPage.
* skin: Objects are references by default, '$this' can't be
modified anyway.
Bug: T140664
Change-Id: Ia505cc3e1b774a380fb36b4f0e2522550aef5bbd
---
M includes/skins/SkinTemplate.php
1 file changed, 18 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/71/372471/1
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index 5ad1b11..cbffe1e 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -306,8 +306,8 @@
$tpl->set( 'pagetitle', $out->getHTMLTitle() );
$tpl->set( 'displaytitle', $out->mPageLinkTitle );
- $tpl->setRef( 'thispage', $this->thispage );
- $tpl->setRef( 'titleprefixeddbkey', $this->thispage );
+ $tpl->set( 'thispage', $this->thispage );
+ $tpl->set( 'titleprefixeddbkey', $this->thispage );
$tpl->set( 'titletext', $title->getText() );
$tpl->set( 'articleid', $title->getArticleID() );
@@ -336,32 +336,32 @@
'href' => $link
];
}
- $tpl->setRef( 'feeds', $feeds );
+ $tpl->set( 'feeds', $feeds );
} else {
$tpl->set( 'feeds', false );
}
- $tpl->setRef( 'mimetype', $wgMimeType );
- $tpl->setRef( 'jsmimetype', $wgJsMimeType );
+ $tpl->set( 'mimetype', $wgMimeType );
+ $tpl->set( 'jsmimetype', $wgJsMimeType );
$tpl->set( 'charset', 'UTF-8' );
- $tpl->setRef( 'wgScript', $wgScript );
- $tpl->setRef( 'skinname', $this->skinname );
+ $tpl->set( 'wgScript', $wgScript );
+ $tpl->set( 'skinname', $this->skinname );
$tpl->set( 'skinclass', static::class );
- $tpl->setRef( 'skin', $this );
- $tpl->setRef( 'stylename', $this->stylename );
+ $tpl->set( 'skin', $this );
+ $tpl->set( 'stylename', $this->stylename );
$tpl->set( 'printable', $out->isPrintable() );
$tpl->set( 'handheld', $request->getBool( 'handheld' ) );
- $tpl->setRef( 'loggedin', $this->loggedin );
+ $tpl->set( 'loggedin', $this->loggedin );
$tpl->set( 'notspecialpage', !$title->isSpecialPage() );
$tpl->set( 'searchaction', $this->escapeSearchLink() );
$tpl->set( 'searchtitle', SpecialPage::getTitleFor( 'Search'
)->getPrefixedDBkey() );
$tpl->set( 'search', trim( $request->getVal( 'search' ) ) );
- $tpl->setRef( 'stylepath', $wgStylePath );
- $tpl->setRef( 'articlepath', $wgArticlePath );
- $tpl->setRef( 'scriptpath', $wgScriptPath );
- $tpl->setRef( 'serverurl', $wgServer );
- $tpl->setRef( 'logopath', $wgLogo );
- $tpl->setRef( 'sitename', $wgSitename );
+ $tpl->set( 'stylepath', $wgStylePath );
+ $tpl->set( 'articlepath', $wgArticlePath );
+ $tpl->set( 'scriptpath', $wgScriptPath );
+ $tpl->set( 'serverurl', $wgServer );
+ $tpl->set( 'logopath', $wgLogo );
+ $tpl->set( 'sitename', $wgSitename );
$userLang = $this->getLanguage();
$userLangCode = $userLang->getHtmlCode();
@@ -374,8 +374,8 @@
$tpl->set( 'capitalizeallnouns',
$userLang->capitalizeAllNouns() ? ' capitalize-all-nouns' : '' );
$tpl->set( 'showjumplinks', true ); // showjumplinks preference
has been removed
$tpl->set( 'username', $this->loggedin ? $this->username : null
);
- $tpl->setRef( 'userpage', $this->userpage );
- $tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href']
);
+ $tpl->set( 'userpage', $this->userpage );
+ $tpl->set( 'userpageurl', $this->userpageUrlDetails['href'] );
$tpl->set( 'userlang', $userLangCode );
// Users can
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Disable cirrus MLR ab test
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372153 )
Change subject: Disable cirrus MLR ab test
..
Disable cirrus MLR ab test
Bug: T171214
Change-Id: Iee8ba571885f80636bb2a0cd155f6aadaa34a659
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 3 insertions(+), 8 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index 6d16eed..fcf85bc 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -113,12 +113,7 @@
function initialize( session ) {
var sessionId = session.get( 'sessionId' ),
- // LTR sub test
- // Test is running on enwiki only, which
reports ~14k sessions per day
- // at the 1:2000 sampling. Sampling increased
to 1:500, so 56k sessions
- // per day. Those 56k sessions will be split
15k to dashboards, and
- // 7k per bucket, for ~50k per bucket in a week.
- validBuckets = [ 'control', 'ltr-20',
'ltr-i-20', 'ltr-1024', 'ltr-i-1024', 'ltr-i-20-1024' ],
+ validBuckets = [],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname'
),
// Provides a place to handle
wiki-specific sampling,
@@ -140,8 +135,8 @@
subTest: null
},
enwiki: {
- test: 500,
- subTest: 0.75
+ test: 2000,
+ subTest: null
},
enwiktionary: {
test: 40,
--
To view, visit https://gerrit.wikimedia.org/r/372153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee8ba571885f80636bb2a0cd155f6aadaa34a659
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Replace abandoned `@colorGray13` with current WikimediaUI one
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372468 )
Change subject: Replace abandoned `@colorGray13` with current WikimediaUI one
..
Replace abandoned `@colorGray13` with current WikimediaUI one
Replacing abandoned `@colorGray13` (`#ddd`) with
appropriate variable `colorGray12` (`#c8ccd1`) from WikimediaUI
color palette, which is used for borders elsewhere.
Bug: T146799
Bug: T172850
Change-Id: Id529d79901aab32d30e2b50820b59a84bd9b3693
---
M resources/skins.minerva.base.styles/ui.less
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/resources/skins.minerva.base.styles/ui.less
b/resources/skins.minerva.base.styles/ui.less
index b17320e..91a955b 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -26,7 +26,7 @@
}
.header-container {
- border-bottom: 1px solid @colorGray13;
+ border-bottom: 1px solid @colorGray12;
&.header-chrome {
background-color: @chromeColor;
--
To view, visit https://gerrit.wikimedia.org/r/372468
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id529d79901aab32d30e2b50820b59a84bd9b3693
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: VolkerE
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Pmiazga
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: rdbms: Fix grammar in DBTransactionSizeError log message
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372459 )
Change subject: rdbms: Fix grammar in DBTransactionSizeError log message
..
rdbms: Fix grammar in DBTransactionSizeError log message
Change-Id: Icc09d674359012f60494b95a36127c14c1a8d630
---
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 72217da..f8f7708 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -1172,7 +1172,7 @@
if ( $limit > 0 && $time > $limit ) {
throw new DBTransactionSizeError(
$conn,
- "Transaction spent $time second(s) in
writes, exceeding the $limit limit.",
+ "Transaction spent $time second(s) in
writes, exceeding the limit of $limit.",
[ $time, $limit ]
);
}
--
To view, visit https://gerrit.wikimedia.org/r/372459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc09d674359012f60494b95a36127c14c1a8d630
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Check if SpecialMobileWatchlist exist
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372470 )
Change subject: Check if SpecialMobileWatchlist exist
..
Check if SpecialMobileWatchlist exist
If MobileFrontend doesn't exist this will throw an error
Bug: T171241
Change-Id: Ie61cfa61b78a53598ac59aea15c8a4e6a261238d
---
M includes/skins/SkinMinerva.php
1 file changed, 10 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/70/372470/1
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 2435f1d..94fe7bc 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -470,13 +470,16 @@
$watchlistQuery = [];
$user = $this->getUser();
if ( $user ) {
- $view = $user->getOption(
SpecialMobileWatchlist::VIEW_OPTION_NAME, false );
- $filter = $user->getOption(
SpecialMobileWatchlist::FILTER_OPTION_NAME, false );
- if ( $view ) {
- $watchlistQuery['watchlistview'] = $view;
- }
- if ( $filter && $view === 'feed' ) {
- $watchlistQuery['filter'] = $filter;
+ // Avoid fatal when MobileFrontend not available
(T171241)
+ if ( class_exists( 'SpecialMobileWatchlist' ) ) {
+ $view = $user->getOption(
SpecialMobileWatchlist::VIEW_OPTION_NAME, false );
+ $filter = $user->getOption(
SpecialMobileWatchlist::FILTER_OPTION_NAME, false );
+ if ( $view ) {
+ $watchlistQuery['watchlistview'] =
$view;
+ }
+ if ( $filter && $view === 'feed' ) {
+ $watchlistQuery['filter'] = $filter;
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/372470
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie61cfa61b78a53598ac59aea15c8a4e6a261238d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make mysql getHeartbeatData() method not count query/RTT in ...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372438 )
Change subject: Make mysql getHeartbeatData() method not count query/RTT in
estimate
..
Make mysql getHeartbeatData() method not count query/RTT in estimate
Optimize for the common case where lag does not strictly increase
during trip times instead of being pessimistic.
Change-Id: Ibb0e3faad23862d397e1cc2a9f7e2a8293fa5f2b
---
M includes/libs/rdbms/database/DatabaseMysqlBase.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php
b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index 991e0c6..692ddb7 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -778,6 +778,8 @@
* @see
https://www.percona.com/doc/percona-toolkit/2.1/pt-heartbeat.html
*/
protected function getHeartbeatData( array $conds ) {
+ // Query time and trip time are not counted
+ $nowUnix = microtime( true );
// Do not bother starting implicit transactions here
$this->clearFlag( self::DBO_TRX, self::REMEMBER_PRIOR );
try {
@@ -793,7 +795,7 @@
$this->restoreFlags();
}
- return [ $row ? $row->ts : null, microtime( true ) ];
+ return [ $row ? $row->ts : null, $nowUnix ];
}
protected function getApproximateLagStatus() {
--
To view, visit https://gerrit.wikimedia.org/r/372438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb0e3faad23862d397e1cc2a9f7e2a8293fa5f2b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Jcrespo
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Restore the newFromId() approach in SpecialNewpages::feedIte...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372447 )
Change subject: Restore the newFromId() approach in
SpecialNewpages::feedItemDesc
..
Restore the newFromId() approach in SpecialNewpages::feedItemDesc
Trying to use the row data is problematic since the text related
fields are missing. This fixing a regression from 4475e1c8c.
Also make SpecialNewpages::feedItemDesc() handle null content.
Bug: T173541
Change-Id: I2213675d3392c6e9761bdc7acde35fd1caee4517
---
M includes/specials/SpecialNewpages.php
1 file changed, 14 insertions(+), 9 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialNewpages.php
b/includes/specials/SpecialNewpages.php
index 6a79714..e3b73a9 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -494,17 +494,22 @@
}
protected function feedItemDesc( $row ) {
- $revision = $this->revisionFromRcResult( $row );
- if ( $revision ) {
- // XXX: include content model/type in feed item?
- return '' . htmlspecialchars(
$revision->getUserText() ) .
- $this->msg( 'colon-separator'
)->inContentLanguage()->escaped() .
- htmlspecialchars( FeedItem::stripComment(
$revision->getComment() ) ) .
- "\n\n" .
- nl2br( htmlspecialchars(
$revision->getContent()->serialize() ) ) . "";
+ $revision = Revision::newFromId( $row->rev_id );
+ if ( !$revision ) {
+ return '';
}
- return '';
+ $content = $revision->getContent();
+ if ( $content === null ) {
+ return '';
+ }
+
+ // XXX: include content model/type in feed item?
+ return '' . htmlspecialchars( $revision->getUserText() ) .
+ $this->msg( 'colon-separator'
)->inContentLanguage()->escaped() .
+ htmlspecialchars( FeedItem::stripComment(
$revision->getComment() ) ) .
+ "\n\n" .
+ nl2br( htmlspecialchars( $content->serialize() ) ) .
"";
}
protected function getGroupName() {
--
To view, visit https://gerrit.wikimedia.org/r/372447
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2213675d3392c6e9761bdc7acde35fd1caee4517
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Use absolute paths for `data_file_directories`
Eevans has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372469 )
Change subject: Use absolute paths for `data_file_directories`
..
Use absolute paths for `data_file_directories`
For JBOD configurations, we need to be able to configure paths outside of
the "base directory" (where commitlogs, et al. are store).
Bug: T169939
Change-Id: I89c8db6cc4a3a7399c45974a906670789fd3aa75
---
M hieradata/role/common/restbase/dev_cluster.yaml
M modules/cassandra/manifests/instance.pp
2 files changed, 17 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/69/372469/1
diff --git a/hieradata/role/common/restbase/dev_cluster.yaml
b/hieradata/role/common/restbase/dev_cluster.yaml
index d1a5ee9..e646261 100644
--- a/hieradata/role/common/restbase/dev_cluster.yaml
+++ b/hieradata/role/common/restbase/dev_cluster.yaml
@@ -85,44 +85,44 @@
a:
listen_address: 10.64.0.167
data_file_directories:
-- data_0
-- data_1
-- data_2
-- data_3
+- /srv/cassandra-a/data_0
+- /srv/cassandra-a/data_1
+- /srv/cassandra-a/data_2
+- /srv/cassandra-a/data_3
jmx_exporter_enabled: true
b:
listen_address: 10.64.0.168
data_file_directories:
-- data_0
-- data_1
-- data_2
-- data_3
+- /srv/cassandra-a/data_0
+- /srv/cassandra-a/data_1
+- /srv/cassandra-a/data_2
+- /srv/cassandra-a/data_3
jmx_exporter_enabled: true
"restbase-dev1005.eqiad.wmnet":
a:
listen_address: 10.64.16.97
data_file_directories:
-- data_0
-- data_1
+- /srv/cassandra-a/data_0
+- /srv/cassandra-a/data_1
jmx_exporter_enabled: true
b:
listen_address: 10.64.16.98
data_file_directories:
-- data_0
-- data_1
+- /srv/cassandra-a/data_0
+- /srv/cassandra-a/data_1
jmx_exporter_enabled: true
"restbase-dev1006.eqiad.wmnet":
a:
listen_address: 10.64.48.168
data_file_directories:
-- data_0
-- data_1
+- /srv/cassandra-a/data_0
+- /srv/cassandra-a/data_1
jmx_exporter_enabled: true
b:
listen_address: 10.64.48.169
data_file_directories:
-- data_0
-- data_1
+- /srv/cassandra-a/data_0
+- /srv/cassandra-a/data_1
jmx_exporter_enabled: true
profile::cassandra::settings:
diff --git a/modules/cassandra/manifests/instance.pp
b/modules/cassandra/manifests/instance.pp
index d466b2e..1d0cb51 100644
--- a/modules/cassandra/manifests/instance.pp
+++ b/modules/cassandra/manifests/instance.pp
@@ -76,8 +76,7 @@
$tls_hostname= "${::hostname}-${instance_name}"
$pid_file=
"/var/run/cassandra/cassandra-${instance_name}.pid"
$instance_id = "${::hostname}-${instance_name}"
-$data_directories= pick($this_instance['data_file_directories'],
['data'])
-$data_file_directories = prefix($data_directories,
"${data_directory_base}/")
+$data_file_directories =
pick($this_instance['data_file_directories'], ["${data_directory_base}/data"])
$commitlog_directory= "${data_directory_base}/commitlog"
$hints_directory= "${data_directory_base}/data/hints"
$heapdump_directory = $data_directory_base
--
To view, visit https://gerrit.wikimedia.org/r/372469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I89c8db6cc4a3a7399c45974a906670789fd3aa75
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Eevans
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Deprecation of 3DES: Bump pageview replacement to 5%
BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372467 )
Change subject: Deprecation of 3DES: Bump pageview replacement to 5%
..
Deprecation of 3DES: Bump pageview replacement to 5%
Bug: T163251
Change-Id: I8ef96b271cc0a69d4dd9503dfafaacc7fe036b53
---
M modules/varnish/templates/text-frontend.inc.vcl.erb
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/varnish/templates/text-frontend.inc.vcl.erb
b/modules/varnish/templates/text-frontend.inc.vcl.erb
index 6036d11..e4b7f62 100644
--- a/modules/varnish/templates/text-frontend.inc.vcl.erb
+++ b/modules/varnish/templates/text-frontend.inc.vcl.erb
@@ -175,17 +175,17 @@
// TLS terms: those using DES-CBC3-SHA, which is not forward-secret,
// and the bulk of which are also IE[78]/XP) that their connection
// security is awful and point them at our wikitech page for more info.
- // The X-Conn-Props cipher filter matches < 0.2% of traffic. We
+ // The X-Conn-Props cipher filter matches ~0.1% of traffic. We
// further restrict to the GET method on /wiki/ URLs which do not
// contain colons (e.g. Special:, which is localized on many wikis) in
// an attempt to mostly apply this only to article pageview fetches.
- // We then only apply the synth to 1% of matching traffic randomly.
+ // We then only apply the synth to 5% of matching traffic randomly.
// Note that a magic test URL is also included for viewing
// the warning content with modern browsers.
if (req.url == "/test-sec-warning"
|| (req.http.X-Connection-Properties ~ "C=DES-CBC3-SHA;"
&& req.url ~ "^/wiki/" && req.url !~ ":" && req.method == "GET"
- && std.random(0,100) < 1.0)) {
+ && std.random(0,100) < 5.0)) {
return (synth(418, "Browser Connection Security Warning"));
}
--
To view, visit https://gerrit.wikimedia.org/r/372467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ef96b271cc0a69d4dd9503dfafaacc7fe036b53
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: Ema
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Replace abandoned `@colorGray13` with current WikimediaUI one
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372468 )
Change subject: Replace abandoned `@colorGray13` with current WikimediaUI one
..
Replace abandoned `@colorGray13` with current WikimediaUI one
Replacing abandoned `@colorGray13` (`#ddd`) with
appropriate variable `colorGray12` (`#c8ccd1`) from WikimediaUI
color palette, which is used for borders elsewhere.
Bug: T146799
Bug: T172850
Change-Id: Id529d79901aab32d30e2b50820b59a84bd9b3693
---
M resources/skins.minerva.base.styles/ui.less
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/68/372468/1
diff --git a/resources/skins.minerva.base.styles/ui.less
b/resources/skins.minerva.base.styles/ui.less
index b17320e..91a955b 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -26,7 +26,7 @@
}
.header-container {
- border-bottom: 1px solid @colorGray13;
+ border-bottom: 1px solid @colorGray12;
&.header-chrome {
background-color: @chromeColor;
--
To view, visit https://gerrit.wikimedia.org/r/372468
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id529d79901aab32d30e2b50820b59a84bd9b3693
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.14]: Restore the newFromId() approach in SpecialNewpages::feedIte...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372465 )
Change subject: Restore the newFromId() approach in
SpecialNewpages::feedItemDesc
..
Restore the newFromId() approach in SpecialNewpages::feedItemDesc
Trying to use the row data is problematic since the text related
fields are missing. This fixing a regression from 4475e1c8c.
Also make SpecialNewpages::feedItemDesc() handle null content.
Bug: T173541
Change-Id: I2213675d3392c6e9761bdc7acde35fd1caee4517
---
M includes/specials/SpecialNewpages.php
1 file changed, 14 insertions(+), 9 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialNewpages.php
b/includes/specials/SpecialNewpages.php
index 6a79714..e3b73a9 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -494,17 +494,22 @@
}
protected function feedItemDesc( $row ) {
- $revision = $this->revisionFromRcResult( $row );
- if ( $revision ) {
- // XXX: include content model/type in feed item?
- return '' . htmlspecialchars(
$revision->getUserText() ) .
- $this->msg( 'colon-separator'
)->inContentLanguage()->escaped() .
- htmlspecialchars( FeedItem::stripComment(
$revision->getComment() ) ) .
- "\n\n" .
- nl2br( htmlspecialchars(
$revision->getContent()->serialize() ) ) . "";
+ $revision = Revision::newFromId( $row->rev_id );
+ if ( !$revision ) {
+ return '';
}
- return '';
+ $content = $revision->getContent();
+ if ( $content === null ) {
+ return '';
+ }
+
+ // XXX: include content model/type in feed item?
+ return '' . htmlspecialchars( $revision->getUserText() ) .
+ $this->msg( 'colon-separator'
)->inContentLanguage()->escaped() .
+ htmlspecialchars( FeedItem::stripComment(
$revision->getComment() ) ) .
+ "\n\n" .
+ nl2br( htmlspecialchars( $content->serialize() ) ) .
"";
}
protected function getGroupName() {
--
To view, visit https://gerrit.wikimedia.org/r/372465
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2213675d3392c6e9761bdc7acde35fd1caee4517
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Thcipriani
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Thcipriani
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: phabricator: Only send logmail on prod not labs, pt.2
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372463 )
Change subject: phabricator: Only send logmail on prod not labs, pt.2
..
phabricator: Only send logmail on prod not labs, pt.2
follow-up to Iec8fb20db413f to ensure logmail is only sent
from a prod host that has it explicitly enabled in Hiera,
to avoid duplicate mails/spam to lists from standby/test/labs.
But unlike before make it a separate thing from "active_server".
Use a puppet selector instead of if/else.
Bug: T173297
Change-Id: I4b010fb9a4985626a3846d31b476028c4b4ae7c3
---
M modules/profile/manifests/phabricator/main.pp
1 file changed, 26 insertions(+), 25 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/profile/manifests/phabricator/main.pp
b/modules/profile/manifests/phabricator/main.pp
index bd1ac9c..3fe1fdc 100644
--- a/modules/profile/manifests/phabricator/main.pp
+++ b/modules/profile/manifests/phabricator/main.pp
@@ -29,18 +29,23 @@
include passwords::phabricator
include passwords::mysql::phabricator
-# logmail and dumps are only enabled on the active server set in Hiera
+# dumps are only enabled on the active server set in Hiera
$phabricator_active_server = hiera('phabricator_active_server')
if $::hostname == $phabricator_active_server {
-$logmail_ensure = 'present'
$dump_rsync_ensure = 'present'
$dump_enabled = true
$ferm_ensure = 'present'
} else {
-$logmail_ensure = 'absent'
$dump_rsync_ensure ='absent'
$dump_enabled = false
$ferm_ensure = 'absent'
+}
+
+# logmail must be explictly enabled in Hiera with 'phabricator_logmail:
true'
+# to avoid duplicate mails from labs and standby (T173297)
+$logmail_ensure = $logmail ? {
+true=> 'present',
+default => 'absent',
}
# todo: change the password for app_user
@@ -156,8 +161,6 @@
conf_files => $conf_files,
}
# lint:endignore
-
-
# This exists to offer git services at git-ssh.wikimedia.org
$vcs_ip_v4 = hiera('phabricator::vcs::address::v4', undef)
@@ -275,27 +278,25 @@
require => Package[$deploy_target],
}
-if $logmail {
- # community metrics mail (T81784, T1003)
- phabricator::logmail {'communitymetrics':
- ensure => $logmail_ensure,
- script_name => 'community_metrics.sh',
- rcpt_address => 'wikitec...@lists.wikimedia.org',
- sndr_address => 'communitymetr...@wikimedia.org',
- monthday => '1',
- require => Package[$deploy_target],
- }
+# community metrics mail (T81784, T1003)
+phabricator::logmail {'communitymetrics':
+ensure => $logmail_ensure,
+script_name => 'community_metrics.sh',
+rcpt_address => 'wikitec...@lists.wikimedia.org',
+sndr_address => 'communitymetr...@wikimedia.org',
+monthday => '1',
+require => Package[$deploy_target],
+}
- # project changes mail (T85183)
- phabricator::logmail {'projectchanges':
- ensure => $logmail_ensure,
- script_name => 'project_changes.sh',
- rcpt_address => [ 'phabricator-repo...@lists.wikimedia.org' ],
- sndr_address => 'aklap...@wikimedia.org',
- monthday => '*',
- weekday => 1, # Monday
- require => Package[$deploy_target],
- }
+# project changes mail (T85183)
+phabricator::logmail {'projectchanges':
+ensure => $logmail_ensure,
+script_name => 'project_changes.sh',
+rcpt_address => [ 'phabricator-repo...@lists.wikimedia.org' ],
+sndr_address => 'aklap...@wikimedia.org',
+monthday => '*',
+weekday => 1, # Monday
+require => Package[$deploy_target],
}
if $active_server != undef {
--
To view, visit https://gerrit.wikimedia.org/r/372463
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b010fb9a4985626a3846d31b476028c4b4ae7c3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Deprecation of 3DES: Bump pageview replacement to 5%
BBlack has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372467 )
Change subject: Deprecation of 3DES: Bump pageview replacement to 5%
..
Deprecation of 3DES: Bump pageview replacement to 5%
Change-Id: I8ef96b271cc0a69d4dd9503dfafaacc7fe036b53
---
M modules/varnish/templates/text-frontend.inc.vcl.erb
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/372467/1
diff --git a/modules/varnish/templates/text-frontend.inc.vcl.erb
b/modules/varnish/templates/text-frontend.inc.vcl.erb
index 6036d11..e4b7f62 100644
--- a/modules/varnish/templates/text-frontend.inc.vcl.erb
+++ b/modules/varnish/templates/text-frontend.inc.vcl.erb
@@ -175,17 +175,17 @@
// TLS terms: those using DES-CBC3-SHA, which is not forward-secret,
// and the bulk of which are also IE[78]/XP) that their connection
// security is awful and point them at our wikitech page for more info.
- // The X-Conn-Props cipher filter matches < 0.2% of traffic. We
+ // The X-Conn-Props cipher filter matches ~0.1% of traffic. We
// further restrict to the GET method on /wiki/ URLs which do not
// contain colons (e.g. Special:, which is localized on many wikis) in
// an attempt to mostly apply this only to article pageview fetches.
- // We then only apply the synth to 1% of matching traffic randomly.
+ // We then only apply the synth to 5% of matching traffic randomly.
// Note that a magic test URL is also included for viewing
// the warning content with modern browsers.
if (req.url == "/test-sec-warning"
|| (req.http.X-Connection-Properties ~ "C=DES-CBC3-SHA;"
&& req.url ~ "^/wiki/" && req.url !~ ":" && req.method == "GET"
- && std.random(0,100) < 1.0)) {
+ && std.random(0,100) < 5.0)) {
return (synth(418, "Browser Connection Security Warning"));
}
--
To view, visit https://gerrit.wikimedia.org/r/372467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ef96b271cc0a69d4dd9503dfafaacc7fe036b53
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update change-propagation to 15fc2dc
Ppchelko has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372466 ) Change subject: Update change-propagation to 15fc2dc .. Update change-propagation to 15fc2dc List of changes: xxx Update node module dependencies Change-Id: I79b0ffd3e97edb777088d94fd0990d700ba89f07 --- M node_modules/bunyan/bin/bunyan M node_modules/bunyan/lib/bunyan.js M node_modules/bunyan/package.json M node_modules/core-js/Gruntfile.js M node_modules/core-js/build/Gruntfile.ls M node_modules/core-js/build/build.ls M node_modules/core-js/build/config.js M node_modules/core-js/build/index.js M node_modules/core-js/client/core.js M node_modules/core-js/client/core.min.js M node_modules/core-js/client/core.min.js.map M node_modules/core-js/client/library.js M node_modules/core-js/client/library.min.js M node_modules/core-js/client/library.min.js.map M node_modules/core-js/client/shim.js M node_modules/core-js/client/shim.min.js M node_modules/core-js/client/shim.min.js.map M node_modules/core-js/core/_.js M node_modules/core-js/core/dict.js M node_modules/core-js/core/number.js M node_modules/core-js/core/regexp.js M node_modules/core-js/core/string.js M node_modules/core-js/es5/index.js M node_modules/core-js/es6/array.js M node_modules/core-js/es6/date.js M node_modules/core-js/es6/function.js M node_modules/core-js/es6/index.js M node_modules/core-js/es6/map.js M node_modules/core-js/es6/math.js M node_modules/core-js/es6/number.js M node_modules/core-js/es6/object.js M node_modules/core-js/es6/parse-float.js M node_modules/core-js/es6/parse-int.js M node_modules/core-js/es6/promise.js M node_modules/core-js/es6/reflect.js M node_modules/core-js/es6/regexp.js M node_modules/core-js/es6/set.js M node_modules/core-js/es6/string.js M node_modules/core-js/es6/symbol.js M node_modules/core-js/es6/typed.js M node_modules/core-js/es6/weak-map.js M node_modules/core-js/es6/weak-set.js M node_modules/core-js/es7/array.js M node_modules/core-js/es7/error.js A node_modules/core-js/es7/global.js M node_modules/core-js/es7/index.js M node_modules/core-js/es7/map.js M node_modules/core-js/es7/math.js M node_modules/core-js/es7/object.js M node_modules/core-js/es7/observable.js A node_modules/core-js/es7/promise.js M node_modules/core-js/es7/set.js M node_modules/core-js/es7/symbol.js M node_modules/core-js/es7/system.js A node_modules/core-js/es7/weak-map.js A node_modules/core-js/es7/weak-set.js M node_modules/core-js/fn/_.js M node_modules/core-js/fn/array/concat.js M node_modules/core-js/fn/array/copy-within.js M node_modules/core-js/fn/array/entries.js M node_modules/core-js/fn/array/every.js M node_modules/core-js/fn/array/fill.js M node_modules/core-js/fn/array/filter.js M node_modules/core-js/fn/array/find-index.js M node_modules/core-js/fn/array/find.js A node_modules/core-js/fn/array/flat-map.js A node_modules/core-js/fn/array/flatten.js M node_modules/core-js/fn/array/for-each.js M node_modules/core-js/fn/array/from.js M node_modules/core-js/fn/array/includes.js M node_modules/core-js/fn/array/index-of.js M node_modules/core-js/fn/array/index.js M node_modules/core-js/fn/array/is-array.js M node_modules/core-js/fn/array/iterator.js M node_modules/core-js/fn/array/join.js M node_modules/core-js/fn/array/keys.js M node_modules/core-js/fn/array/last-index-of.js M node_modules/core-js/fn/array/map.js M node_modules/core-js/fn/array/of.js M node_modules/core-js/fn/array/pop.js M node_modules/core-js/fn/array/push.js M node_modules/core-js/fn/array/reduce-right.js M node_modules/core-js/fn/array/reduce.js M node_modules/core-js/fn/array/reverse.js M node_modules/core-js/fn/array/shift.js M node_modules/core-js/fn/array/slice.js M node_modules/core-js/fn/array/some.js M node_modules/core-js/fn/array/sort.js M node_modules/core-js/fn/array/splice.js M node_modules/core-js/fn/array/unshift.js M node_modules/core-js/fn/array/values.js M node_modules/core-js/fn/array/virtual/copy-within.js M node_modules/core-js/fn/array/virtual/entries.js M node_modules/core-js/fn/array/virtual/every.js M node_modules/core-js/fn/array/virtual/fill.js M node_modules/core-js/fn/array/virtual/filter.js M node_modules/core-js/fn/array/virtual/find-index.js M node_modules/core-js/fn/array/virtual/find.js A node_modules/core-js/fn/array/virtual/flat-map.js A node_modules/core-js/fn/array/virtual/flatten.js M node_modules/core-js/fn/array/virtual/for-each.js M node_modules/core-js/fn/array/virtual/includes.js M node_modules/core-js/fn/array/virtual/index-of.js M node_modules/core-js/fn/array/virtual/index.js M node_modules/core-js/fn/array/virtual/iterator.js M node_modules/core-js/fn/array/virtual/join.js M node_modules/core-js/fn/array/virtual/keys.js M node_modules/core-js/fn/array/virtual/last-index-of.js M node_modules/core-js/fn/array/virtual/map.js M node_modules/core-js/fn/array/virtual/reduce-right.js M node_modules/core-js/fn/array/virtual/reduce.js M node_modules/co
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: [Config] Block Module namespace rerenders.
Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372462 )
Change subject: [Config] Block Module namespace rerenders.
..
[Config] Block Module namespace rerenders.
The 828 Module namespace is used to store the Scribunto
Lua scripts which are counted as a dependency on any page
that accessed them during parsing creating enormous update chains.
The output of these scripts is dynamic, so edot of the script
shouldn't really provoke a rerender of all the pages using it -
it shouldn't be expected due to the dynamic nature of this.
Change-Id: Ibcee40c1768a71b1070afc591f89a1a745e51124
---
M scap/templates/config.yaml.j2
1 file changed, 13 insertions(+), 2 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 4f2af31..563aed7 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -201,6 +201,11 @@
- meta:
domain: /\.wikidata\.org$/
page_namespace: 120
+# Block Scribunto Module dependencies as they create a lot
of load
+# with supposingly very low actual effect
+ - meta:
+ domain: '/wiktionary\.org$/'
+page_namespace: 828
exec:
- method: get
uri: '<%= restbase_uri
%>/{{message.meta.domain}}/v1/page/html/{message.page_title}/{{message.rev_id}}'
@@ -352,8 +357,14 @@
meta:
schema_uri: 'continue/1'
match_not:
- meta:
-domain: ceb.wikipedia.org
+ - meta:
+ domain: ceb.wikipedia.org
+ - original_event:
+ # Block Scribunto Module dependencies as they create
a lot of load
+ # with supposingly very low actual effect
+ meta:
+domain: '/wiktionary\.org$/'
+ page_namespace: 828
exec:
method: post
uri:
'/sys/links/transcludes/{message.original_event.page_title}'
--
To view, visit https://gerrit.wikimedia.org/r/372462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcee40c1768a71b1070afc591f89a1a745e51124
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko
Gerrit-Reviewer: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.14]: Restore the newFromId() approach in SpecialNewpages::feedIte...
Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372465 )
Change subject: Restore the newFromId() approach in
SpecialNewpages::feedItemDesc
..
Restore the newFromId() approach in SpecialNewpages::feedItemDesc
Trying to use the row data is problematic since the text related
fields are missing. This fixing a regression from 4475e1c8c.
Also make SpecialNewpages::feedItemDesc() handle null content.
Bug: T173541
Change-Id: I2213675d3392c6e9761bdc7acde35fd1caee4517
---
M includes/specials/SpecialNewpages.php
1 file changed, 14 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/65/372465/1
diff --git a/includes/specials/SpecialNewpages.php
b/includes/specials/SpecialNewpages.php
index 6a79714..e3b73a9 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -494,17 +494,22 @@
}
protected function feedItemDesc( $row ) {
- $revision = $this->revisionFromRcResult( $row );
- if ( $revision ) {
- // XXX: include content model/type in feed item?
- return '' . htmlspecialchars(
$revision->getUserText() ) .
- $this->msg( 'colon-separator'
)->inContentLanguage()->escaped() .
- htmlspecialchars( FeedItem::stripComment(
$revision->getComment() ) ) .
- "\n\n" .
- nl2br( htmlspecialchars(
$revision->getContent()->serialize() ) ) . "";
+ $revision = Revision::newFromId( $row->rev_id );
+ if ( !$revision ) {
+ return '';
}
- return '';
+ $content = $revision->getContent();
+ if ( $content === null ) {
+ return '';
+ }
+
+ // XXX: include content model/type in feed item?
+ return '' . htmlspecialchars( $revision->getUserText() ) .
+ $this->msg( 'colon-separator'
)->inContentLanguage()->escaped() .
+ htmlspecialchars( FeedItem::stripComment(
$revision->getComment() ) ) .
+ "\n\n" .
+ nl2br( htmlspecialchars( $content->serialize() ) ) .
"";
}
protected function getGroupName() {
--
To view, visit https://gerrit.wikimedia.org/r/372465
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2213675d3392c6e9761bdc7acde35fd1caee4517
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Thcipriani
Gerrit-Reviewer: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: Update bundled CSS
Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372464 )
Change subject: Hygiene: Update bundled CSS
..
Hygiene: Update bundled CSS
Change-Id: Icbd97eda9edb38082a33f24aba9e78e958f5e9a8
---
M app/src/main/assets/preview.css
M app/src/main/assets/styles.css
2 files changed, 160 insertions(+), 80 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/64/372464/1
diff --git a/app/src/main/assets/preview.css b/app/src/main/assets/preview.css
index a66aaee..835c708 100644
--- a/app/src/main/assets/preview.css
+++ b/app/src/main/assets/preview.css
@@ -155,7 +155,10 @@
.content .thumbborder {
border: 1px solid #c8ccd1;
}
-.content .magnify {
+.content .magnify,
+.content figure[typeof*='mw:Image/Thumb'] > a:after,
+.content figure[typeof*='mw:Video/Thumb'] > a:after,
+.content figure[typeof*='mw:Audio/Thumb'] > a:after {
display: none;
}
.content img {
@@ -377,12 +380,14 @@
pre {
padding: 1em;
}
+.mw-ref,
sup {
vertical-align: super;
}
sub {
vertical-align: sub;
}
+.mw-ref,
sub,
sup {
font-size: 0.75em;
@@ -434,11 +439,13 @@
.collapsible td {
width: auto !important;
}
+.content .vertical-navbox,
+.content .navbox {
+ display: none;
+}
.content .tmbox,
.content .ambox,
.content #coordinates,
-.content .navbox,
-.content .vertical-navbox,
.content .topicon,
.content .metadata {
display: none !important;
@@ -506,6 +513,12 @@
.quotebox {
margin: 0 0 0.8em !important;
width: auto !important;
+}
+@media all and (min-width: 720px) {
+ .content .vertical-navbox,
+ .content .navbox {
+display: inherit;
+ }
}
@media all and (max-width: 720px) {
.gallery .gallerybox {
@@ -706,31 +719,31 @@
vertical-align: top;
display: inline-block;
}
-
+
ul.gallery,
li.gallerybox {
zoom: 1;
*display: inline;
}
-
+
ul.gallery {
margin: 2px;
padding: 2px;
display: block;
}
-
+
li.gallerycaption {
font-weight: bold;
text-align: center;
display: block;
word-wrap: break-word;
}
-
+
li.gallerybox div.thumb {
background-color: #fff;
border: 1px solid #ccc;
}
-
+
div.gallerytext {
overflow: hidden;
font-size: 10pt;
@@ -1317,6 +1330,7 @@
figure[typeof*='mw:Video'],
figure[typeof*='mw:Audio'] {
margin: 0;
+ /* Hide the caption for frameless and plain floated images */
}
figure[typeof*='mw:Image'] a,
figure[typeof*='mw:Video'] a,
@@ -1355,31 +1369,14 @@
figure[typeof*='mw:Audio'].mw-halign-center {
margin: 0 auto 0.5em auto;
display: table;
+ border-collapse: collapse;
clear: none;
float: none;
}
figure[typeof*='mw:Image'] > figcaption,
figure[typeof*='mw:Video'] > figcaption,
figure[typeof*='mw:Audio'] > figcaption {
- display: table-caption;
- caption-side: bottom;
- /* In mw-core the font-size is duplicated, 94% in thumbiner
-* and again 94% in thumbcaption. 88.4% for font size of the
-* caption results in the same behavior. */
- font-size: 88.4%;
- line-height: 1.4em;
- text-align: left;
- border: 1px solid #c8ccd1;
- border-top: 0;
- /* taken from .thumbcaption, plus .thumbinner */
- padding: 0 6px 6px 6px;
- background-color: #f8f9fa;
-}
-figure[typeof*='mw:Image'] > figcaption table,
-figure[typeof*='mw:Video'] > figcaption table,
-figure[typeof*='mw:Audio'] > figcaption table {
- /* reset caption side for tables inside figcaptions */
- caption-side: top;
+ display: none;
}
figure[typeof~='mw:Image/Thumb'],
figure[typeof~='mw:Video/Thumb'],
@@ -1388,15 +1385,23 @@
figure[typeof~='mw:Video/Frame'],
figure[typeof~='mw:Audio/Frame'] {
display: table;
- overflow: auto;
text-align: center;
border: 1px solid #c8ccd1;
- border-bottom: 0;
- border-collapse: collapse;
+ border-collapse: separate;
+ border-spacing: 3px;
background-color: #f8f9fa;
+ width: 1px;
margin: 0.5em 0 1.3em 1.4em;
clear: right;
float: right;
+}
+figure[typeof~='mw:Image/Thumb'].mw-halign-center,
+figure[typeof~='mw:Video/Thumb'].mw-halign-center,
+figure[typeof~='mw:Audio/Thumb'].mw-halign-center,
+figure[typeof~='mw:Image/Frame'].mw-halign-center,
+figure[typeof~='mw:Video/Frame'].mw-halign-center,
+figure[typeof~='mw:Audio/Frame'].mw-halign-center {
+ border-collapse: separate;
}
figure[typeof~='mw:Image/Thumb'] > *:first-child > img,
figure[typeof~='mw:Video/Thumb'] > *:first-child > img,
@@ -1411,20 +1416,55 @@
figure[typeof~='mw:Video/Frame'] > *:first-child > video,
figure[typeof~='mw:Audio/Frame'] > *:first-child > video {
border: 1px solid #c8ccd1;
- margin: 3px;
background: #fff;
+}
+figure[ty
[MediaWiki-commits] [Gerrit] operations/puppet[production]: phabricator: Only send logmail on prod not labs, pt.2
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372463 )
Change subject: phabricator: Only send logmail on prod not labs, pt.2
..
phabricator: Only send logmail on prod not labs, pt.2
follow-up to Iec8fb20db413f to ensure logmail is only sent
from a prod host that has it explicitly enabled in Hiera,
to avoid duplicate mails/spam to lists from standby/test/labs.
But unlike before make it a separate thing from "active_server".
Use a puppet selector instead of if/else.
Bug: T173297
Change-Id: I4b010fb9a4985626a3846d31b476028c4b4ae7c3
---
M modules/profile/manifests/phabricator/main.pp
1 file changed, 26 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/63/372463/1
diff --git a/modules/profile/manifests/phabricator/main.pp
b/modules/profile/manifests/phabricator/main.pp
index bd1ac9c..d11570b 100644
--- a/modules/profile/manifests/phabricator/main.pp
+++ b/modules/profile/manifests/phabricator/main.pp
@@ -29,18 +29,23 @@
include passwords::phabricator
include passwords::mysql::phabricator
-# logmail and dumps are only enabled on the active server set in Hiera
+# dumps are only enabled on the active server set in Hiera
$phabricator_active_server = hiera('phabricator_active_server')
if $::hostname == $phabricator_active_server {
-$logmail_ensure = 'present'
$dump_rsync_ensure = 'present'
$dump_enabled = true
$ferm_ensure = 'present'
} else {
-$logmail_ensure = 'absent'
$dump_rsync_ensure ='absent'
$dump_enabled = false
$ferm_ensure = 'absent'
+}
+
+# logmail must be explictly enabled in Hiera with 'phabricator_logmail:
true'
+# to avoid duplicate mails from labs and standby (T173297)
+$logmail_ensure = $logmail ? {
+true=> 'present',
+default => 'absent',
}
# todo: change the password for app_user
@@ -156,8 +161,6 @@
conf_files => $conf_files,
}
# lint:endignore
-
-
# This exists to offer git services at git-ssh.wikimedia.org
$vcs_ip_v4 = hiera('phabricator::vcs::address::v4', undef)
@@ -275,27 +278,25 @@
require => Package[$deploy_target],
}
-if $logmail {
- # community metrics mail (T81784, T1003)
- phabricator::logmail {'communitymetrics':
- ensure => $logmail_ensure,
- script_name => 'community_metrics.sh',
- rcpt_address => 'wikitec...@lists.wikimedia.org',
- sndr_address => 'communitymetr...@wikimedia.org',
- monthday => '1',
- require => Package[$deploy_target],
- }
+# community metrics mail (T81784, T1003)
+phabricator::logmail {'communitymetrics':
+ensure => $logmail_ensure,
+script_name => 'community_metrics.sh',
+rcpt_address => 'wikitec...@lists.wikimedia.org',
+sndr_address => 'communitymetr...@wikimedia.org',
+monthday => '1',
+require => Package[$deploy_target],
+}
- # project changes mail (T85183)
- phabricator::logmail {'projectchanges':
- ensure => $logmail_ensure,
- script_name => 'project_changes.sh',
- rcpt_address => [ 'phabricator-repo...@lists.wikimedia.org' ],
- sndr_address => 'aklap...@wikimedia.org',
- monthday => '*',
- weekday => 1, # Monday
- require => Package[$deploy_target],
- }
+# project changes mail (T85183)
+phabricator::logmail {'projectchanges':
+ensure => $logmail_ensure,
+script_name => 'project_changes.sh',
+rcpt_address => [ 'phabricator-repo...@lists.wikimedia.org' ],
+sndr_address => 'aklap...@wikimedia.org',
+monthday => '*',
+weekday => 1, # Monday
+ require => Package[$deploy_target],
}
if $active_server != undef {
--
To view, visit https://gerrit.wikimedia.org/r/372463
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b010fb9a4985626a3846d31b476028c4b4ae7c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Popups A/B test infrastructure
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/371129 ) Change subject: Popups A/B test infrastructure .. Popups A/B test infrastructure Introduce PopupsAnonsExperimentalGroupSize config variable. This defines a population size who will be subject to experimentation. If the group size is undefined or 0 (default) and PopupsBetaFeature is false (default value) Popups will be enabled for everyone. If it is any other value, half that group will see page previews. Drop the config variable PopupsSchemaSamplingRate - we will now only EventLog when an experiment is occuring. This means we can simplify the MWEventLogger class as shouldLog will always be truthy. Given server side eventlogging is only used for preference changes traffic should be low and not need sampling. Introduce getUserBucket which determines whether a user is in a bucket on, off or control based on the value of PopupsAnonsExperimentalGroupSize. Add tests showing how these buckets are calculated. Caution: A kill switch wgPopupsEventLogging is provided for safety. It defaults to false. Before merging, please check if any config changes are necessary. Bug: T171853 Change-Id: If2a0c5fceae78262c44cb522af38a925cc5919d3 --- M extension.json M includes/EventLogging/MWEventLogger.php M includes/PopupsHooks.php M resources/dist/index.js M resources/dist/index.js.map M src/constants.js A src/getUserBucket.js M src/index.js M src/instrumentation/eventLogging.js M src/isEnabled.js A tests/node-qunit/getUserBucket.test.js M tests/node-qunit/instrumentation/eventLogging.test.js M tests/node-qunit/isEnabled.test.js M tests/node-qunit/stubs.js D tests/phpunit/EventLogging/MWEventLoggerTest.php M tests/phpunit/PopupsHooksTest.php 16 files changed, 195 insertions(+), 208 deletions(-) Approvals: Bmansurov: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/371129 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2a0c5fceae78262c44cb522af38a925cc5919d3 Gerrit-PatchSet: 8 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: master Gerrit-Owner: Jdlrobson Gerrit-Reviewer: BarryTheBrowserTestBot Gerrit-Reviewer: Bmansurov Gerrit-Reviewer: Frankiebot Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: Phuedx Gerrit-Reviewer: Pmiazga Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...GettingStarted[master]: Replace abandoned colors with current WikimediaUI ones
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372460 )
Change subject: Replace abandoned colors with current WikimediaUI ones
..
Replace abandoned colors with current WikimediaUI ones
Replacing abandoned grey colors with
appropriate variable or colors from WikimediaUI color
palette.
Additional changes:
* Also replacing fixed `border-radius` value with variable.
Bug: T172850
Change-Id: I13a455e7bc72e9ebb418c2c33e82a60c239ef47a
---
M resources/ext.gettingstarted.return.less
M resources/lightbulb/lightbulb.common.less
M resources/lightbulb/lightbulb.flyout.less
3 files changed, 8 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/resources/ext.gettingstarted.return.less
b/resources/ext.gettingstarted.return.less
index 0fc9d42..2cb90bf 100644
--- a/resources/ext.gettingstarted.return.less
+++ b/resources/ext.gettingstarted.return.less
@@ -1,3 +1,4 @@
+@import 'mediawiki.ui/variables';
@import 'mediawiki.mixins';
/* Specific elements */
@@ -54,7 +55,7 @@
*/
.mw-gettingstarted-cta {
border: 1px solid #999;
- border-radius: 3px;
+ border-radius: @borderRadius;
margin: auto;
background-color: #fff;
padding: 20px 30px;
@@ -74,7 +75,7 @@
margin-top: 15px;
&.mw-gettingstarted-cta-secondary {
- background-color: #f5f5f5;
+ background-color: #f8f9fa;
border: 1px solid #d3d3d3;
color: #444;
@@ -83,7 +84,7 @@
TODO (mattflaschen, 2013-10-03): This is
inconsistent with
normal mw.ui secondary buttons. We should
make them match.
*/
- background-color: #fbfbfb;
+ background-color: #fff;
border-color: #ccc;
}
}
@@ -92,7 +93,7 @@
.mw-gettingstarted-cta-body {
margin-bottom: 5px;
- color: #333;
+ color: @colorGray2;
}
.mw-gettingstarted-cta-close {
@@ -106,7 +107,7 @@
.mw-gettingstarted-cta-heading {
font-weight: bold;
font-size: 1.33em;
- color: #333;
+ color: @colorGray2;
}
.mw-gettingstarted-cta-button-sub {
diff --git a/resources/lightbulb/lightbulb.common.less
b/resources/lightbulb/lightbulb.common.less
index 0a7f7de..7b9ec44 100644
--- a/resources/lightbulb/lightbulb.common.less
+++ b/resources/lightbulb/lightbulb.common.less
@@ -25,7 +25,7 @@
h1 {
position: relative;
- color: @colorGray3;
+ color: @colorGray2;
font-size: 1.1em;
font-weight: bold;
padding: 0;
diff --git a/resources/lightbulb/lightbulb.flyout.less
b/resources/lightbulb/lightbulb.flyout.less
index a28fde8..d6385ed 100644
--- a/resources/lightbulb/lightbulb.flyout.less
+++ b/resources/lightbulb/lightbulb.flyout.less
@@ -74,14 +74,10 @@
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
-
cursor: pointer;
-
font-size: 22px;
-
vertical-align: middle;
-
- color: @colorGray13;
+ color: @colorGray12;
}
.mw-gettingstarted-lightbulb-flyout-pagination-disc.mw-gettingstarted-lightbulb-flyout-selected-page
{
--
To view, visit https://gerrit.wikimedia.org/r/372460
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I13a455e7bc72e9ebb418c2c33e82a60c239ef47a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: VolkerE
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Mattflaschen
Gerrit-Reviewer: Phuedx
Gerrit-Reviewer: Swalling
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: [Config] Block Module namespace rerenders.
Ppchelko has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372462 )
Change subject: [Config] Block Module namespace rerenders.
..
[Config] Block Module namespace rerenders.
The 828 Module namespace is used to store the Scribunto
Lua scripts which are counted as a dependency on any page
that accessed them during parsing creating enormous update chains.
The output of these scripts is dynamic, so edot of the script
shouldn't really provoke a rerender of all the pages using it -
it shouldn't be expected due to the dynamic nature of this.
Change-Id: Ibcee40c1768a71b1070afc591f89a1a745e51124
---
M scap/templates/config.yaml.j2
1 file changed, 9 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/deploy
refs/changes/62/372462/1
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 4f2af31..c3603fa 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -201,6 +201,9 @@
- meta:
domain: /\.wikidata\.org$/
page_namespace: 120
+# Block Scribunto Module dependencies as they create a lot
of load
+# with supposingly very low actual effect
+ - page_namespace: 828:
exec:
- method: get
uri: '<%= restbase_uri
%>/{{message.meta.domain}}/v1/page/html/{message.page_title}/{{message.rev_id}}'
@@ -352,8 +355,12 @@
meta:
schema_uri: 'continue/1'
match_not:
- meta:
-domain: ceb.wikipedia.org
+ - meta:
+ domain: ceb.wikipedia.org
+ - original_event:
+ # Block Scribunto Module dependencies as they create
a lot of load
+ # with supposingly very low actual effect
+ page_namespace: 828
exec:
method: post
uri:
'/sys/links/transcludes/{message.original_event.page_title}'
--
To view, visit https://gerrit.wikimedia.org/r/372462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcee40c1768a71b1070afc591f89a1a745e51124
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Give the Special:preferences page on desktop some love
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372461 )
Change subject: Give the Special:preferences page on desktop some love
..
Give the Special:preferences page on desktop some love
The preferences page is accessible if a user opts into the Minerva
desktop experience. It's not a great first experience.
These changes make the page usable.
* Provide styling for tabs
* Provide padding/borders for unstyled button elements
Change-Id: I107ed3c685910a5e9502b25d22ef7cc489ce3c34
---
M skin.json
A skinStyles/mediawiki.special.preferences.styles/styles.less
2 files changed, 52 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/61/372461/1
diff --git a/skin.json b/skin.json
index 4e54d71..54548c2 100644
--- a/skin.json
+++ b/skin.json
@@ -59,6 +59,9 @@
"mediawiki.action.edit.styles": [
"skinStyles/mediawiki.action.edit.styles/minerva.less"
],
+ "mediawiki.special.preferences.styles": [
+
"skinStyles/mediawiki.special.preferences.styles/styles.less"
+ ],
"mobile.pointerOverlay": [
"skinStyles/mobile.pointerOverlay/minerva.less"
],
diff --git a/skinStyles/mediawiki.special.preferences.styles/styles.less
b/skinStyles/mediawiki.special.preferences.styles/styles.less
new file mode 100644
index 000..882acda
--- /dev/null
+++ b/skinStyles/mediawiki.special.preferences.styles/styles.less
@@ -0,0 +1,49 @@
+@import 'minerva.variables';
+
+// FIXME: All this code can be removed when T117781 is resolved.
+#preftoc {
+ text-align: center;
+
+ li {
+ display: inline-block;
+ color: @colorGray2;
+ border: 1px solid @colorFieldBorder;
+ border-radius: 0;
+
+ &:first-child {
+ border-top-left-radius: 2px;
+ border-bottom-left-radius: 2px;
+ }
+
+ &:last-child {
+ border-top-right-radius: 2px;
+ border-bottom-right-radius: 2px;
+ }
+
+ &:not( :first-child ) {
+ border-left: 0;
+ }
+
+ &.selected {
+ background-color: @colorProgressiveActive;
+ border-color: @colorProgressiveActive;
+ color: #fff;
+ box-shadow: none;
+ }
+
+ a {
+ padding: 0.5em 1em;
+ color: inherit;
+ display: block;
+ }
+ }
+}
+
+.mw-htmlform-submit-buttons,
+.mw-input {
+ select,
+ input {
+ border: solid 1px @colorFieldBorder;
+ padding: 8px;
+ }
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/372461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I107ed3c685910a5e9502b25d22ef7cc489ce3c34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...GettingStarted[master]: Replace abandoned colors with current WikimediaUI ones
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372460 )
Change subject: Replace abandoned colors with current WikimediaUI ones
..
Replace abandoned colors with current WikimediaUI ones
Replacing abandoned grey colors with
appropriate variable or colors from WikimediaUI color
palette.
Additional changes:
* Also replacing fixed `border-radius` value with variable.
Bug: T172850
Change-Id: I13a455e7bc72e9ebb418c2c33e82a60c239ef47a
---
M resources/ext.gettingstarted.return.less
M resources/lightbulb/lightbulb.common.less
M resources/lightbulb/lightbulb.flyout.less
3 files changed, 8 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted
refs/changes/60/372460/1
diff --git a/resources/ext.gettingstarted.return.less
b/resources/ext.gettingstarted.return.less
index 0fc9d42..2cb90bf 100644
--- a/resources/ext.gettingstarted.return.less
+++ b/resources/ext.gettingstarted.return.less
@@ -1,3 +1,4 @@
+@import 'mediawiki.ui/variables';
@import 'mediawiki.mixins';
/* Specific elements */
@@ -54,7 +55,7 @@
*/
.mw-gettingstarted-cta {
border: 1px solid #999;
- border-radius: 3px;
+ border-radius: @borderRadius;
margin: auto;
background-color: #fff;
padding: 20px 30px;
@@ -74,7 +75,7 @@
margin-top: 15px;
&.mw-gettingstarted-cta-secondary {
- background-color: #f5f5f5;
+ background-color: #f8f9fa;
border: 1px solid #d3d3d3;
color: #444;
@@ -83,7 +84,7 @@
TODO (mattflaschen, 2013-10-03): This is
inconsistent with
normal mw.ui secondary buttons. We should
make them match.
*/
- background-color: #fbfbfb;
+ background-color: #fff;
border-color: #ccc;
}
}
@@ -92,7 +93,7 @@
.mw-gettingstarted-cta-body {
margin-bottom: 5px;
- color: #333;
+ color: @colorGray2;
}
.mw-gettingstarted-cta-close {
@@ -106,7 +107,7 @@
.mw-gettingstarted-cta-heading {
font-weight: bold;
font-size: 1.33em;
- color: #333;
+ color: @colorGray2;
}
.mw-gettingstarted-cta-button-sub {
diff --git a/resources/lightbulb/lightbulb.common.less
b/resources/lightbulb/lightbulb.common.less
index 0a7f7de..7b9ec44 100644
--- a/resources/lightbulb/lightbulb.common.less
+++ b/resources/lightbulb/lightbulb.common.less
@@ -25,7 +25,7 @@
h1 {
position: relative;
- color: @colorGray3;
+ color: @colorGray2;
font-size: 1.1em;
font-weight: bold;
padding: 0;
diff --git a/resources/lightbulb/lightbulb.flyout.less
b/resources/lightbulb/lightbulb.flyout.less
index a28fde8..d6385ed 100644
--- a/resources/lightbulb/lightbulb.flyout.less
+++ b/resources/lightbulb/lightbulb.flyout.less
@@ -74,14 +74,10 @@
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
-
cursor: pointer;
-
font-size: 22px;
-
vertical-align: middle;
-
- color: @colorGray13;
+ color: @colorGray12;
}
.mw-gettingstarted-lightbulb-flyout-pagination-disc.mw-gettingstarted-lightbulb-flyout-selected-page
{
--
To view, visit https://gerrit.wikimedia.org/r/372460
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I13a455e7bc72e9ebb418c2c33e82a60c239ef47a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix grammar in DBTransactionSizeError log message
Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372459 )
Change subject: Fix grammar in DBTransactionSizeError log message
..
Fix grammar in DBTransactionSizeError log message
Change-Id: Icc09d674359012f60494b95a36127c14c1a8d630
---
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/59/372459/1
diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 72217da..f8f7708 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -1172,7 +1172,7 @@
if ( $limit > 0 && $time > $limit ) {
throw new DBTransactionSizeError(
$conn,
- "Transaction spent $time second(s) in
writes, exceeding the $limit limit.",
+ "Transaction spent $time second(s) in
writes, exceeding the limit of $limit.",
[ $time, $limit ]
);
}
--
To view, visit https://gerrit.wikimedia.org/r/372459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc09d674359012f60494b95a36127c14c1a8d630
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Replace abandoned `@colorGray3` with current WikimediaUI pal...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372455 ) Change subject: Replace abandoned `@colorGray3` with current WikimediaUI palette one .. Replace abandoned `@colorGray3` with current WikimediaUI palette one Replacing abandoned `@colorGray3` (`#333`) with appropriate variable `@colorGray2` (`#222`) from WikimediaUI color palette, which is used for borders elsewhere. Bug: T146799 Bug: T172850 Change-Id: I5512873a35cb669e7ffa2bdfb0e129b496c530f8 --- M resources/mobile.special.mobilediff.styles/mobilediff.less 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Jdlrobson: Looks good to me, approved diff --git a/resources/mobile.special.mobilediff.styles/mobilediff.less b/resources/mobile.special.mobilediff.styles/mobilediff.less index 3666d61..ca163e1 100644 --- a/resources/mobile.special.mobilediff.styles/mobilediff.less +++ b/resources/mobile.special.mobilediff.styles/mobilediff.less @@ -99,7 +99,7 @@ display: inline-block; text-align: left; margin-top: 1.2em; - color: @colorGray3; + color: @colorGray2; line-height: 1; /* the edit count number */ -- To view, visit https://gerrit.wikimedia.org/r/372455 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5512873a35cb669e7ffa2bdfb0e129b496c530f8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: VolkerE Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: Pmiazga Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Deprecation of 3DES: internationalize and update warning
BBlack has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372448 ) Change subject: Deprecation of 3DES: internationalize and update warning .. Deprecation of 3DES: internationalize and update warning Bug: T163251 Change-Id: Id94ce965391405f1b925bfb5081973b5aa53ab60 --- M modules/varnish/templates/browsersec.body.html.erb 1 file changed, 15 insertions(+), 3 deletions(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/varnish/templates/browsersec.body.html.erb b/modules/varnish/templates/browsersec.body.html.erb index 30a8261..c75a09e 100644 --- a/modules/varnish/templates/browsersec.body.html.erb +++ b/modules/varnish/templates/browsersec.body.html.erb @@ -1,3 +1,15 @@ -Your browser is connecting to our servers with outdated connection security. The most common causes of this are using Internet Explorer on Windows XP (upgrade your operating system or use Firefox!), or interference from corporate or personal "Web Security" software which actually downgrades connection security. -Less than 0.2% of our users fall into this insecure category. Currently, we randomly send a small percentage of such requests to this warning page (you can try again and still view content), but we'll be removing support for these insecure connections completely in the future, which will block your access to our sites if you haven't upgraded in time. -Our https://wikitech.wikimedia.org/wiki/HTTPS:_Browser_Recommendations";>HTTPS: Browser Recommendations page on wikitech has more-detailed information on fixing this situation. + +English: The Wikimedia wikis will soon not work with Internet Explorer 8 on Windows XP. Please use a new operating system or use https://www.mozilla.org/en-US/firefox/organizations/all/";>Firefox 52 ESR. +中文: 维基媒体的wiki将很快无法在Windows XP系统的IE8浏览器上工作。请使用新版操作系统或者使用https://www.mozilla.org/zh-CN/firefox/organizations/all/";>Firefox 52浏览器。 +Español: Las wikis de Wikimedia pronto dejarán de estar accesibles mediante Internet Explorer 8 en Windows XP. Por favor usa un sistema operativo más moderno o https://www.mozilla.org/es/firefox/organizations/all/";>Firefox 52 ESR. +ﺎﻠﻋﺮﺒﻳﺓ: ﻒﻳ ﺎﻠﻗﺮﻴﺑ ﻞﻧ ﻲﻤﻜﻧ ﻒﺘﺣ ﻡﻭﺎﻘﻋ ﺎﻟﻮﻴﻜﻳ ﺎﻠﺗﺎﺒﻋﺓ ﻝﻮﻴﻜﻴﻤﻳﺪﻳﺍ ﻊﻟﻯ ﺈﻨﺗﺮﻨﺗ ﺈﻜﺴﺒﻟﻭﺭﺭ 8 ﻊﻟﻯ ﺄﺠﻫﺯﺓ ﻮﻴﻧﺩﻭﺯ ﺈﻜﺳ ﺐﻳ. ﻱﺮﺟﻯ ﺎﺴﺘﺧﺩﺎﻣ ﻦﻇﺎﻣ ﺖﺸﻐﻴﻟ ﺄﺣﺪﺛ ﺃﻭ ﺎﺴﺘﺧﺩﺎﻣ https://www.mozilla.org/ar/firefox/organizations/all/";>ﻒﻳﺮﻓﻮﻜﺳ 52 ESR. +日本語: Windows XP上のInternet Explorer 8では、まもなく、ウィキメディアのサイトを閲覧できなくなります。あたらしいOSに移行していただくか、https://www.mozilla.org/ja/firefox/organizations/all/";>Firefox 52 ESRをご利用ください。 +Deutsch: Die Wikimedia-Wikis werden bald nicht mehr mit dem Internet Explorer 8 unter Windows XP funktionieren. Bitte benutze ein neueres Betriebssystem oder benutze https://www.mozilla.org/de/firefox/organizations/all/";>Firefox 52 ESR. +Français: Les wikis Wikimedia ne fonctionneront bientôt plus avec Internet Explorer 8 sur Windows XP. Utilisez un nouveau système d’exploitation ou utilisez https://www.mozilla.org/fr/firefox/organizations/all/";>Firefox 52 ESR. +Polski: Wiki Wikimedia wkrótce przestaną działać u użytkowników korzystających z Internet Explorera 8 na Windows XP. Użyjcie nowego systemu operacyjnego lub https://www.mozilla.org/pl/firefox/organizations/all/";>Firefoxa 52 ESR. +Українська: Вікі Вікімедіа невдовзі перестануть працювати в Internet Explorer 8 на Windows XP. Будь ласка, використовуйте новішу операційну систему або ж браузер https://www.mozilla.org/uk/firefox/organizations/all/";>Firefox 52 ESR. +https://meta.wikimedia.org/wiki/User:Johan_(WMF)/IE8XP">Translate + +Your browser is connecting to our servers with outdated connection security. This is usually because of Internet Explorer on Windows XP, but could also be interference from corporate or personal "Web Security" software which actually downgrades connection security. +For now, you can try reloading the page again to continue, but we'll be removing support for these insecure connections completely by October 17, 2017 (2017-10-17), which will block your access to our sites if you haven't upgraded in time. +See also the https://wikitech.wikimedia.org/wiki/HTTPS/Browser_Recommendations";>HTTPS Browser Recommendations page on Wikitech for more-detailed information. -- To view, visit https://gerrit.wikimedia.org/r/372448 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id94ce965391405f1b925bfb5081973b5aa53ab60 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack Gerrit-Reviewer: BBlack Gerrit-Reviewer: Ema Gerrit-Reviewer: Platonides Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...dash[deployment]: update dist
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372458 ) Change subject: update dist .. update dist Change-Id: I42cd920a30ffe0cd36ee7e2eb85b6c78b7adcec3 --- M dist/index.html M dist/js.manifest.json R dist/scripts-124d6319.js 3 files changed, 18 insertions(+), 18 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/372458 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I42cd920a30ffe0cd36ee7e2eb85b6c78b7adcec3 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ejegg Gerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...dash[deployment]: Update node_modules for evil-dns and syslog
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372457 ) Change subject: Update node_modules for evil-dns and syslog .. Update node_modules for evil-dns and syslog Change-Id: I95278a93d48a955e3fd86d3d0898ca3c71aaf52c --- M node_modules 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/node_modules b/node_modules index 2c84559..46fd5d9 16 --- a/node_modules +++ b/node_modules @@ -1 +1 @@ -Subproject commit 2c84559af9dce494a7cd0b400df1ea3462436c3a +Subproject commit 46fd5d9b2f1fa278218e929bf2f007d47e09db4a -- To view, visit https://gerrit.wikimedia.org/r/372457 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I95278a93d48a955e3fd86d3d0898ca3c71aaf52c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ejegg Gerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...dash[deployment]: Merge branch 'master' into deployment
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372440 ) Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment f33e156 Clean up .gitignore 1141cf7 Clean up subscriptions and timers ffafb9f Delete a few more useless things 0639cc6 Update evil-dns to 0.1.0 Change-Id: Ib343b3a5fb134a343d69cccb79ec4b4cf7819489 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/372440 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib343b3a5fb134a343d69cccb79ec4b4cf7819489 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ejegg Gerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: LoginNotify requires Echo
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372456 ) Change subject: LoginNotify requires Echo .. LoginNotify requires Echo Change-Id: Idf3ba3e5b2b643941e8d79f2e82137a78c8836c9 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Niharika29: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index b487259..2a12875 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19351,6 +19351,7 @@ 'wmgUseLoginNotify' => [ 'default' => true, + 'nonecho' => false, ], 'wmgUseCodeMirror' => [ -- To view, visit https://gerrit.wikimedia.org/r/372456 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idf3ba3e5b2b643941e8d79f2e82137a78c8836c9 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSem Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Niharika29 Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Lower the concurrency of transcludes to 100
Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372452 )
Change subject: Lower the concurrency of transcludes to 100
..
Lower the concurrency of transcludes to 100
The current rate of transcludes is around 200 per second. Lower this to
100 concurrent requests (which would set the limit to 100 per second,
given the average transclude re-render time) in order to release
pressure off of Cassandra while we are reshaping the cluster.
Bug: T169939
Change-Id: I196a9c65ad66fd8ed2fb578e957b9c597c2f7269
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 01216e9..4f2af31 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -326,7 +326,7 @@
redirect: false
on_transclusion_update:
-concurrency: <%= concurrency * 8 %>
+concurrency: <%= concurrency * 2 %>
topic: change-prop.transcludes.resource-change
limiters:
blacklist: 'html:{message.meta.uri}'
--
To view, visit https://gerrit.wikimedia.org/r/372452
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I196a9c65ad66fd8ed2fb578e957b9c597c2f7269
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
Gerrit-Reviewer: Mobrovac
Gerrit-Reviewer: Ppchelko
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...dash[deployment]: Update node_modules for evil-dns and syslog
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372457 ) Change subject: Update node_modules for evil-dns and syslog .. Update node_modules for evil-dns and syslog Change-Id: I95278a93d48a955e3fd86d3d0898ca3c71aaf52c --- M node_modules 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/57/372457/1 diff --git a/node_modules b/node_modules index 2c84559..46fd5d9 16 --- a/node_modules +++ b/node_modules @@ -1 +1 @@ -Subproject commit 2c84559af9dce494a7cd0b400df1ea3462436c3a +Subproject commit 46fd5d9b2f1fa278218e929bf2f007d47e09db4a -- To view, visit https://gerrit.wikimedia.org/r/372457 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95278a93d48a955e3fd86d3d0898ca3c71aaf52c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...dash[deployment]: update dist
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372458 ) Change subject: update dist .. update dist Change-Id: I42cd920a30ffe0cd36ee7e2eb85b6c78b7adcec3 --- M dist/index.html M dist/js.manifest.json R dist/scripts-124d6319.js 3 files changed, 18 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash refs/changes/58/372458/1 -- To view, visit https://gerrit.wikimedia.org/r/372458 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I42cd920a30ffe0cd36ee7e2eb85b6c78b7adcec3 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: deployment Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: LoginNotify requires Echo
MaxSem has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372456 ) Change subject: LoginNotify requires Echo .. LoginNotify requires Echo Change-Id: Idf3ba3e5b2b643941e8d79f2e82137a78c8836c9 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/56/372456/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index b487259..2a12875 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19351,6 +19351,7 @@ 'wmgUseLoginNotify' => [ 'default' => true, + 'nonecho' => false, ], 'wmgUseCodeMirror' => [ -- To view, visit https://gerrit.wikimedia.org/r/372456 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf3ba3e5b2b643941e8d79f2e82137a78c8836c9 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSem ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: Only send logmail on prod not labs
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371927 )
Change subject: Phabricator: Only send logmail on prod not labs
..
Phabricator: Only send logmail on prod not labs
This adds a new config that disables logmail by default
but we enable it for phab1001.
Bug: T173297
Change-Id: Iec8fb20db413fffe4e414781b8461feaa38298f3
---
M hieradata/hosts/phab1001.yaml
M modules/profile/manifests/phabricator/main.pp
2 files changed, 23 insertions(+), 20 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/hosts/phab1001.yaml b/hieradata/hosts/phab1001.yaml
index df3a19e..a9b0ae0 100644
--- a/hieradata/hosts/phab1001.yaml
+++ b/hieradata/hosts/phab1001.yaml
@@ -14,3 +14,5 @@
phabricator::vcs::address::v4: "10.64.16.100"
phabricator::vcs::address::v6: "2620:0:861:102:10:64:16:100"
+
+phabricator_logmail: true
diff --git a/modules/profile/manifests/phabricator/main.pp
b/modules/profile/manifests/phabricator/main.pp
index bb123c4..bd1ac9c 100644
--- a/modules/profile/manifests/phabricator/main.pp
+++ b/modules/profile/manifests/phabricator/main.pp
@@ -19,6 +19,7 @@
$cluster_search = hiera('phabricator_cluster_search'),
$active_server = hiera('phabricator_server', undef),
$passive_server = hiera('phabricator_server_failover', undef),
+$logmail = hiera('phabricator_logmail', false),
){
mailalias { 'root':
@@ -274,27 +275,27 @@
require => Package[$deploy_target],
}
-# community metrics mail (T81784, T1003)
-# disabled due to maintenance: T138460, re-enabled T139950
-phabricator::logmail {'communitymetrics':
-ensure => $logmail_ensure,
-script_name => 'community_metrics.sh',
-rcpt_address => 'wikitec...@lists.wikimedia.org',
-sndr_address => 'communitymetr...@wikimedia.org',
-monthday => '1',
-require => Package[$deploy_target],
-}
+if $logmail {
+ # community metrics mail (T81784, T1003)
+ phabricator::logmail {'communitymetrics':
+ ensure => $logmail_ensure,
+ script_name => 'community_metrics.sh',
+ rcpt_address => 'wikitec...@lists.wikimedia.org',
+ sndr_address => 'communitymetr...@wikimedia.org',
+ monthday => '1',
+ require => Package[$deploy_target],
+ }
-# project changes mail (T85183)
-# disabled due to maintenance: T138460, re-enabled T139950
-phabricator::logmail {'projectchanges':
-ensure => $logmail_ensure,
-script_name => 'project_changes.sh',
-rcpt_address => [ 'phabricator-repo...@lists.wikimedia.org' ],
-sndr_address => 'aklap...@wikimedia.org',
-monthday => '*',
-weekday => 1, # Monday
-require => Package[$deploy_target],
+ # project changes mail (T85183)
+ phabricator::logmail {'projectchanges':
+ ensure => $logmail_ensure,
+ script_name => 'project_changes.sh',
+ rcpt_address => [ 'phabricator-repo...@lists.wikimedia.org' ],
+ sndr_address => 'aklap...@wikimedia.org',
+ monthday => '*',
+ weekday => 1, # Monday
+ require => Package[$deploy_target],
+ }
}
if $active_server != undef {
--
To view, visit https://gerrit.wikimedia.org/r/371927
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iec8fb20db413fffe4e414781b8461feaa38298f3
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox
Gerrit-Reviewer: 20after4
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Replace abandoned `@colorGray3` with current WikimediaUI pal...
VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372455 ) Change subject: Replace abandoned `@colorGray3` with current WikimediaUI palette one .. Replace abandoned `@colorGray3` with current WikimediaUI palette one Replacing abandoned `@colorGray3` (`#333`) with appropriate variable `@colorGray2` (`#222`) from WikimediaUI color palette, which is used for borders elsewhere. Bug: T146799 Bug: T172850 Change-Id: I5512873a35cb669e7ffa2bdfb0e129b496c530f8 --- M resources/mobile.special.mobilediff.styles/mobilediff.less 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/55/372455/1 diff --git a/resources/mobile.special.mobilediff.styles/mobilediff.less b/resources/mobile.special.mobilediff.styles/mobilediff.less index 3666d61..ca163e1 100644 --- a/resources/mobile.special.mobilediff.styles/mobilediff.less +++ b/resources/mobile.special.mobilediff.styles/mobilediff.less @@ -99,7 +99,7 @@ display: inline-block; text-align: left; margin-top: 1.2em; - color: @colorGray3; + color: @colorGray2; line-height: 1; /* the edit count number */ -- To view, visit https://gerrit.wikimedia.org/r/372455 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5512873a35cb669e7ffa2bdfb0e129b496c530f8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: VolkerE ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable LoginNotify everywhere
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372450 ) Change subject: Enable LoginNotify everywhere .. Enable LoginNotify everywhere Change-Id: I09ce19d87c17cc4e0ef0547be1fc644929dacc82 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Niharika29: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 201ffc1..b487259 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19349,10 +19349,8 @@ 'testwiki' => true, // T110170 ], -// Enable LoginNotify on testwiki (T165007) 'wmgUseLoginNotify' => [ - 'default' => false, - 'testwiki' => true, + 'default' => true, ], 'wmgUseCodeMirror' => [ -- To view, visit https://gerrit.wikimedia.org/r/372450 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I09ce19d87c17cc4e0ef0547be1fc644929dacc82 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSem Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Niharika29 Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...node_modules[master]: Update evil-dns and syslog packages
Ejegg has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372454 ) Change subject: Update evil-dns and syslog packages .. Update evil-dns and syslog packages Change-Id: Id40724e73a50b0a7b50322d24781ae5f4de3970b --- M evil-dns/.npmignore M evil-dns/README.md M evil-dns/evil-dns.js M evil-dns/package.json A evil-dns/tests/clear.tests.js A evil-dns/tests/lookup.tests.js A modern-syslog/.npmignore A modern-syslog/CHANGES.md A modern-syslog/LICENSE A modern-syslog/Makefile A modern-syslog/README.md A modern-syslog/binding.gyp R modern-syslog/build/Makefile A modern-syslog/build/Release/.deps/Release/core.node.d A modern-syslog/build/Release/.deps/Release/obj.target/core.node.d A modern-syslog/build/Release/.deps/Release/obj.target/core/core.o.d A modern-syslog/build/Release/core.node A modern-syslog/build/Release/obj.target/core.node A modern-syslog/build/Release/obj.target/core/core.o A modern-syslog/build/binding.Makefile A modern-syslog/build/config.gypi A modern-syslog/build/core.target.mk A modern-syslog/core.cc A modern-syslog/index.js A modern-syslog/package.json A nan/CHANGELOG.md A nan/LICENSE.md A nan/README.md A nan/doc/asyncworker.md A nan/doc/buffers.md A nan/doc/callback.md A nan/doc/converters.md A nan/doc/errors.md A nan/doc/json.md A nan/doc/maybe_types.md A nan/doc/methods.md A nan/doc/new.md A nan/doc/node_misc.md A nan/doc/object_wrappers.md A nan/doc/persistent.md A nan/doc/scopes.md A nan/doc/script.md A nan/doc/string_bytes.md A nan/doc/v8_internals.md A nan/doc/v8_misc.md A nan/include_dirs.js A nan/nan.h A nan/nan_callbacks.h A nan/nan_callbacks_12_inl.h A nan/nan_callbacks_pre_12_inl.h A nan/nan_converters.h A nan/nan_converters_43_inl.h A nan/nan_converters_pre_43_inl.h A nan/nan_implementation_12_inl.h A nan/nan_implementation_pre_12_inl.h A nan/nan_json.h A nan/nan_maybe_43_inl.h A nan/nan_maybe_pre_43_inl.h A nan/nan_new.h A nan/nan_object_wrap.h A nan/nan_persistent_12_inl.h A nan/nan_persistent_pre_12_inl.h A nan/nan_private.h A nan/nan_string_bytes.h A nan/nan_typedarray_contents.h A nan/nan_weak.h A nan/package.json A nan/tools/1to2.js A nan/tools/README.md A nan/tools/package.json D node-syslog/.npmignore D node-syslog/Changelog.md D node-syslog/README.md D node-syslog/binding.gyp D node-syslog/build/Release/.deps/Release/obj.target/syslog.node.d D node-syslog/build/Release/.deps/Release/obj.target/syslog/syslog.o.d D node-syslog/build/Release/.deps/Release/syslog.node.d D node-syslog/build/Release/linker.lock D node-syslog/build/Release/obj.target/syslog.node D node-syslog/build/Release/obj.target/syslog/syslog.o D node-syslog/build/Release/syslog.node D node-syslog/build/binding.Makefile D node-syslog/build/config.gypi D node-syslog/build/syslog.target.mk D node-syslog/node-syslog.h D node-syslog/node-syslog.js D node-syslog/package.json D node-syslog/syslog.cc D node-syslog/test.js D node-syslog/test_more.js 90 files changed, 12,577 insertions(+), 688 deletions(-) Approvals: Ejegg: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/372454 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id40724e73a50b0a7b50322d24781ae5f4de3970b Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash/node_modules Gerrit-Branch: master Gerrit-Owner: Ejegg Gerrit-Reviewer: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...node_modules[master]: Update evil-dns and syslog packages
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372454 ) Change subject: Update evil-dns and syslog packages .. Update evil-dns and syslog packages Change-Id: Id40724e73a50b0a7b50322d24781ae5f4de3970b --- M evil-dns/.npmignore M evil-dns/README.md M evil-dns/evil-dns.js M evil-dns/package.json A evil-dns/tests/clear.tests.js A evil-dns/tests/lookup.tests.js A modern-syslog/.npmignore A modern-syslog/CHANGES.md A modern-syslog/LICENSE A modern-syslog/Makefile A modern-syslog/README.md A modern-syslog/binding.gyp R modern-syslog/build/Makefile A modern-syslog/build/Release/.deps/Release/core.node.d A modern-syslog/build/Release/.deps/Release/obj.target/core.node.d A modern-syslog/build/Release/.deps/Release/obj.target/core/core.o.d A modern-syslog/build/Release/core.node A modern-syslog/build/Release/obj.target/core.node A modern-syslog/build/Release/obj.target/core/core.o A modern-syslog/build/binding.Makefile A modern-syslog/build/config.gypi A modern-syslog/build/core.target.mk A modern-syslog/core.cc A modern-syslog/index.js A modern-syslog/package.json A nan/CHANGELOG.md A nan/LICENSE.md A nan/README.md A nan/doc/asyncworker.md A nan/doc/buffers.md A nan/doc/callback.md A nan/doc/converters.md A nan/doc/errors.md A nan/doc/json.md A nan/doc/maybe_types.md A nan/doc/methods.md A nan/doc/new.md A nan/doc/node_misc.md A nan/doc/object_wrappers.md A nan/doc/persistent.md A nan/doc/scopes.md A nan/doc/script.md A nan/doc/string_bytes.md A nan/doc/v8_internals.md A nan/doc/v8_misc.md A nan/include_dirs.js A nan/nan.h A nan/nan_callbacks.h A nan/nan_callbacks_12_inl.h A nan/nan_callbacks_pre_12_inl.h A nan/nan_converters.h A nan/nan_converters_43_inl.h A nan/nan_converters_pre_43_inl.h A nan/nan_implementation_12_inl.h A nan/nan_implementation_pre_12_inl.h A nan/nan_json.h A nan/nan_maybe_43_inl.h A nan/nan_maybe_pre_43_inl.h A nan/nan_new.h A nan/nan_object_wrap.h A nan/nan_persistent_12_inl.h A nan/nan_persistent_pre_12_inl.h A nan/nan_private.h A nan/nan_string_bytes.h A nan/nan_typedarray_contents.h A nan/nan_weak.h A nan/package.json A nan/tools/1to2.js A nan/tools/README.md A nan/tools/package.json D node-syslog/.npmignore D node-syslog/Changelog.md D node-syslog/README.md D node-syslog/binding.gyp D node-syslog/build/Release/.deps/Release/obj.target/syslog.node.d D node-syslog/build/Release/.deps/Release/obj.target/syslog/syslog.o.d D node-syslog/build/Release/.deps/Release/syslog.node.d D node-syslog/build/Release/linker.lock D node-syslog/build/Release/obj.target/syslog.node D node-syslog/build/Release/obj.target/syslog/syslog.o D node-syslog/build/Release/syslog.node D node-syslog/build/binding.Makefile D node-syslog/build/config.gypi D node-syslog/build/syslog.target.mk D node-syslog/node-syslog.h D node-syslog/node-syslog.js D node-syslog/package.json D node-syslog/syslog.cc D node-syslog/test.js D node-syslog/test_more.js 90 files changed, 12,577 insertions(+), 688 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash/node_modules refs/changes/54/372454/1 -- To view, visit https://gerrit.wikimedia.org/r/372454 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id40724e73a50b0a7b50322d24781ae5f4de3970b Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/dash/node_modules Gerrit-Branch: master Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: search: Hyphen to dash for range in results message Change-I...
Gerrit Patch Uploader has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372453 )
Change subject: search: Hyphen to dash for range in results message Change-Id:
I0ace65b08a21b4024f7c9825173dc17b7f408d3d
..
search: Hyphen to dash for range in results message
Change-Id: I0ace65b08a21b4024f7c9825173dc17b7f408d3d
---
M languages/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/53/372453/1
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 3497d80..5c7075e 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -987,7 +987,7 @@
"searchall": "all",
"showingresults": "Showing below up to {{PLURAL:$1|1
result|$1 results}} starting with #$2.",
"showingresultsinrange": "Showing below up to
{{PLURAL:$1|1 result|$1 results}} in range
#$2 to #$3.",
- "search-showingresults": "{{PLURAL:$4|Result $1 of
$3|Results $1 - $2 of $3}}",
+ "search-showingresults": "{{PLURAL:$4|Result $1 of
$3|Results $1 – $2 of $3}}",
"search-nonefound": "There were no results matching the query.",
"search-nonefound-thiswiki": "There were no results matching the query
in this site.",
"powersearch-legend": "Advanced search",
--
To view, visit https://gerrit.wikimedia.org/r/372453
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ace65b08a21b4024f7c9825173dc17b7f408d3d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Lower the concurrency of transcludes to 100
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372452 )
Change subject: Lower the concurrency of transcludes to 100
..
Lower the concurrency of transcludes to 100
The current rate of transcludes is around 200 per second. Lower this to
100 concurrent requests (which would set the limit to 100 per second,
given the average transclude re-render time) in order to release
pressure off of Cassandra while we are reshaping the cluster.
Bug: T169939
Change-Id: I196a9c65ad66fd8ed2fb578e957b9c597c2f7269
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/deploy
refs/changes/52/372452/1
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 01216e9..4f2af31 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -326,7 +326,7 @@
redirect: false
on_transclusion_update:
-concurrency: <%= concurrency * 8 %>
+concurrency: <%= concurrency * 2 %>
topic: change-prop.transcludes.resource-change
limiters:
blacklist: 'html:{message.meta.uri}'
--
To view, visit https://gerrit.wikimedia.org/r/372452
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I196a9c65ad66fd8ed2fb578e957b9c597c2f7269
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Design tweaks for compilation detail view
Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372451 )
Change subject: Design tweaks for compilation detail view
..
Design tweaks for compilation detail view
Bug: T163594
Change-Id: Ifb5d79a7b5982336e50e9e3e94b3209381d97fb6
---
M app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
M app/src/main/res/layout/fragment_compilation_detail.xml
M app/src/main/res/layout/include_compilation_info.xml
3 files changed, 29 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/51/372451/1
diff --git
a/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
b/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
index 469a9bf..918afb2 100644
--- a/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
@@ -73,8 +73,8 @@
nameView.setText(compilation.name());
dateSizeView.setText(String.format(getString(R.string.offline_compilation_detail_date_size),
getShortDateString(compilation.timestamp()),
bytesToGB(compilation.size(;
-summaryView.setText(compilation.summary());
-descriptionView.setText(compilation.description());
+summaryView.setText(compilation.description());
+// descriptionView.setText(""); // TODO: update this to use
description() if a "summary" is added to ZIMs
downloadButton.setText(String.format(getString(R.string.offline_compilation_detail_button_download),
bytesToGB(compilation.size(;
diff --git a/app/src/main/res/layout/fragment_compilation_detail.xml
b/app/src/main/res/layout/fragment_compilation_detail.xml
index 5c4794e..bb96751 100644
--- a/app/src/main/res/layout/fragment_compilation_detail.xml
+++ b/app/src/main/res/layout/fragment_compilation_detail.xml
@@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools";
android:layout_width="match_parent"
android:layout_height="match_parent"
-android:background="?attr/window_background_color"
+android:background="?attr/offline_library_background_color"
android:fitsSystemWindows="true">
@@ -77,8 +78,10 @@
android:id="@+id/button_compilation_detail_download"
android:layout_width="match_parent"
android:layout_height="wrap_content"
-android:layout_marginLeft="10dp"
-android:layout_marginRight="10dp"
+android:layout_marginLeft="0dp"
+android:layout_marginRight="0dp"
+android:layout_marginTop="10dp"
+android:layout_marginBottom="10dp"
style="@style/App.Button.TransparentBlue"
android:text="@string/offline_compilation_detail_button_download"/>
@@ -87,16 +90,14 @@
android:id="@+id/view_compilation_detail_download_control"
android:layout_width="match_parent"
android:layout_height="wrap_content"
-android:layout_marginLeft="16dp"
-android:layout_marginRight="16dp"/>
+android:paddingTop="14dp"
+android:paddingBottom="14dp"/>
@@ -106,6 +107,8 @@
android:layout_height="wrap_content"
android:layout_weight="1"
style="@style/App.Button.TransparentBlue"
+android:layout_marginLeft="0dp"
+android:layout_marginRight="0dp"
android:text="@string/offline_compilation_detail_button_remove"/>
+
+
diff --git a/app/src/main/res/layout/include_compilation_info.xml
b/app/src/main/res/layout/include_compilation_info.xml
index 0e0f986..dd97266 100644
--- a/app/src/main/res/layout/include_compilation_info.xml
+++ b/app/src/main/res/layout/include_compilation_info.xml
@@ -3,14 +3,13 @@
xmlns:android="http://schemas.android.com/apk/res/android";
android:layout_width="match_parent"
android:layout_height="wrap_content"
-android:orientation="vertical"
-android:padding="16dp">
+android:orientation="vertical">
-
-
-https://gerrit.wikimedia.org/r/372451
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb5d79a7b5982336e50e9e3e94b3209381d97fb6
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable LoginNotify everywhere
MaxSem has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372450 ) Change subject: Enable LoginNotify everywhere .. Enable LoginNotify everywhere Change-Id: I09ce19d87c17cc4e0ef0547be1fc644929dacc82 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/50/372450/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 201ffc1..b487259 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19349,10 +19349,8 @@ 'testwiki' => true, // T110170 ], -// Enable LoginNotify on testwiki (T165007) 'wmgUseLoginNotify' => [ - 'default' => false, - 'testwiki' => true, + 'default' => true, ], 'wmgUseCodeMirror' => [ -- To view, visit https://gerrit.wikimedia.org/r/372450 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I09ce19d87c17cc4e0ef0547be1fc644929dacc82 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MaxSem ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.14]: RCFilters: Fix validation for single_option groups
Mooeypoo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372449 )
Change subject: RCFilters: Fix validation for single_option groups
..
RCFilters: Fix validation for single_option groups
The single_option groups have a base definition that means they
always must have a value, and must never have more than one value.
The previous way we attempted to do that was confusing and missed
a case where after resetting filters, two values were selected before
one could be unselected, which then broke the behavior in the
entire group.
This fix reorganizes the validation when an item in the group is
selected or unselected to make sure the group retains its promised
behavior.
Bug: T173303
Change-Id: I5758ec324a26c0e5e6f5c473d206e818a1d22523
(cherry picked from commit 4f6624451aa979a49840a10071cac75a1a5aae80)
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
1 file changed, 31 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/49/372449/1
diff --git
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index 6acc44d..4dc86f6 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -222,34 +222,39 @@
mw.rcfilters.dm.FilterGroup.prototype.onFilterItemUpdate = function (
item ) {
// Update state
var changed = false,
- active = this.areAnySelected();
+ active = this.areAnySelected(),
+ model = this;
- if (
- item.isSelected() &&
- this.getType() === 'single_option' &&
- this.currSelected &&
- this.currSelected !== item
- ) {
- this.currSelected.toggleSelected( false );
- }
+ if ( this.getType() === 'single_option' ) {
+ // This group must have one item selected always
+ // and must never have more than one item selected at a
time
+ if ( this.getSelectedItems().length === 0 ) {
+ // Nothing is selected anymore
+ // Select the default or the first item
+ this.currSelected = this.getItemByParamName(
this.defaultParams[ this.getName() ] ) ||
+ this.getItems()[ 0 ];
+ this.currSelected.toggleSelected( true );
+ changed = true;
+ } else if ( this.getSelectedItems().length > 1 ) {
+ // There is more than one item selected
+ // This should only happen if the item given
+ // is the one that is selected, so unselect
+ // all items that is not it
+ this.getSelectedItems().forEach( function (
itemModel ) {
+ // Note that in case the given item is
actually
+ // not selected, this loop will end up
unselecting
+ // all items, which would trigger the
case above
+ // when the last item is unselected
anyways
+ var selected = itemModel.getName() ===
item.getName() &&
+ item.isSelected();
- // For 'single_option' groups, check if we just unselected all
- // items. This should never be the result. If we did unselect
- // all (like resetting all filters to false) then this group
- // must choose its default item or the first item in the group
- if (
- this.getType() === 'single_option' &&
- !this.getItems().some( function ( filterItem ) {
- return filterItem.isSelected();
- } )
- ) {
- // Single option means there must be a single option
- // selected, so we have to either select the default
- // or select the first option
- this.currSelected = this.getItemByParamName(
this.defaultParams[ this.getName() ] ) ||
- this.getItems()[ 0 ];
- this.currSelected.toggleSelected( true );
- changed = true;
+ itemModel.toggleSelected( selected );
+ if ( select
[MediaWiki-commits] [Gerrit] operations/puppet[production]: 3DES Deprecation: internationalize and update warning
BBlack has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/372448 ) Change subject: 3DES Deprecation: internationalize and update warning .. 3DES Deprecation: internationalize and update warning Bug: T163251 Change-Id: Id94ce965391405f1b925bfb5081973b5aa53ab60 --- M modules/varnish/templates/browsersec.body.html.erb 1 file changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/48/372448/1 diff --git a/modules/varnish/templates/browsersec.body.html.erb b/modules/varnish/templates/browsersec.body.html.erb index 30a8261..fdda133 100644 --- a/modules/varnish/templates/browsersec.body.html.erb +++ b/modules/varnish/templates/browsersec.body.html.erb @@ -1,3 +1,15 @@ -Your browser is connecting to our servers with outdated connection security. The most common causes of this are using Internet Explorer on Windows XP (upgrade your operating system or use Firefox!), or interference from corporate or personal "Web Security" software which actually downgrades connection security. -Less than 0.2% of our users fall into this insecure category. Currently, we randomly send a small percentage of such requests to this warning page (you can try again and still view content), but we'll be removing support for these insecure connections completely in the future, which will block your access to our sites if you haven't upgraded in time. -Our https://wikitech.wikimedia.org/wiki/HTTPS:_Browser_Recommendations";>HTTPS: Browser Recommendations page on wikitech has more-detailed information on fixing this situation. + +English: The Wikimedia wikis will soon not work with Internet Explorer 8 on Windows XP. Please use a new operating system or use https://www.mozilla.org/en-US/firefox/organizations/all/";>Firefox 52 ESR. +普通话: 维基媒体的wiki将很快无法在Windows XP系统的IE8浏览器上工作。请使用新版操作系统或者使用https://www.mozilla.org/zh-CN/firefox/organizations/all/";>Firefox 52浏览器。 +Español: Las wikis de Wikimedia pronto dejarán de estar accesibles mediante Internet Explorer 8 en Windows XP. Por favor usa un sistema operativo más moderno o https://www.mozilla.org/es-ES/firefox/organizations/all/";>Firefox 52 ESR. +ﺎﻠﻋﺮﺒﻳﺓ: ﻒﻳ ﺎﻠﻗﺮﻴﺑ ﻞﻧ ﻲﻤﻜﻧ ﻒﺘﺣ ﻡﻭﺎﻘﻋ ﺎﻟﻮﻴﻜﻳ ﺎﻠﺗﺎﺒﻋﺓ ﻝﻮﻴﻜﻴﻤﻳﺪﻳﺍ ﻊﻟﻯ ﺈﻨﺗﺮﻨﺗ ﺈﻜﺴﺒﻟﻭﺭﺭ 8 ﻊﻟﻯ ﺄﺠﻫﺯﺓ ﻮﻴﻧﺩﻭﺯ ﺈﻜﺳ ﺐﻳ. ﻱﺮﺟﻯ ﺎﺴﺘﺧﺩﺎﻣ ﻦﻇﺎﻣ ﺖﺸﻐﻴﻟ ﺄﺣﺪﺛ ﺃﻭ ﺎﺴﺘﺧﺩﺎﻣ https://www.mozilla.org/ar/firefox/organizations/all/";>ﻒﻳﺮﻓﻮﻜﺳ 52 ESR. +日本語: Windows XP上のInternet Explorer 8では、まもなく、ウィキメディアのサイトを閲覧できなくなります。あたらしいOSに移行していただくか、https://www.mozilla.org/ja/firefox/organizations/all/";>Firefox 52 ESRをご利用ください。 +Deutsch: Die Wikimedia-Wikis werden bald nicht mehr mit dem Internet Explorer 8 unter Windows XP funktionieren. Bitte benutze ein neueres Betriebssystem oder benutze https://www.mozilla.org/de/firefox/organizations/all/";>Firefox 52 ESR. +Français: Les wikis Wikimedia ne fonctionneront bientôt plus avec Internet Explorer 8 sur Windows XP. Utilisez un nouveau système d’exploitation ou utilisez https://www.mozilla.org/fr/firefox/organizations/all/";>Firefox 52 ESR. +Polski: Wiki Wikimedia wkrótce przestaną działać u użytkowników korzystających z Internet Explorera 8 na Windows XP. Użyjcie nowego systemu operacyjnego lub https://www.mozilla.org/pl/firefox/organizations/all/";>Firefoxa 52 ESR. +Українська: Вікі Вікімедіа невдовзі перестануть працювати в Internet Explorer 8 на Windows XP. Будь ласка, використовуйте новішу операційну систему або ж браузер https://www.mozilla.org/uk/firefox/organizations/all/";>Firefox 52 ESR. +https://meta.wikimedia.org/wiki/User:Johan_(WMF)/IE8XP">Translate + +Your browser is connecting to our servers with outdated connection security. This is usually because of Internet Explorer on Windows XP, but could also be interference from corporate or personal "Web Security" software which actually downgrades connection security. +For now, you can try reloading the page again to continue, but we'll be removing support for these insecure connections completely by October 17, 2017 (2017-10-17), which will block your access to our sites if you haven't upgraded in time. +See also the https://wikitech.wikimedia.org/wiki/HTTPS/Browser_Recommendations";>HTTPS Browser Recommendations page on Wikitech for more-detailed information. -- To view, visit https://gerrit.wikimedia.org/r/372448 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id94ce965391405f1b925bfb5081973b5aa53ab60 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Make it easier to run unit tests
BearND has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372080 )
Change subject: Make it easier to run unit tests
..
Make it easier to run unit tests
Currently `npm test` runs integration tests which can be very slow
This adds an alias for unit tests to encourage their usage.
Additional change:
* Test folder for featured-unit should map with lib folder
Change-Id: Ibb5a4b779de9ad8e8aafc55cf1c17646f28d9195
---
M package.json
R test/lib/feed/featured-unit.js
R test/lib/feed/fixtures/bold-inside-anchor.html
R test/lib/feed/fixtures/multiple-bold-links.html
R test/lib/feed/fixtures/only-regular-links.html
5 files changed, 1 insertion(+), 0 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index ace1ab6..8d9ae38 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
"scripts": {
"start": "service-runner",
"test": "npm run -s lint && PREQ_CONNECT_TIMEOUT=15 mocha && nsp check",
+"test:unit": "PREQ_CONNECT_TIMEOUT=15 mocha test/lib",
"lint": "eslint --cache --max-warnings 0 --ext .js --ext .json .",
"docker-start": "service-runner docker-start",
"docker-test": "service-runner docker-test",
diff --git a/test/features/featured/featured-unit.js
b/test/lib/feed/featured-unit.js
similarity index 100%
rename from test/features/featured/featured-unit.js
rename to test/lib/feed/featured-unit.js
diff --git a/test/features/featured/fixtures/bold-inside-anchor.html
b/test/lib/feed/fixtures/bold-inside-anchor.html
similarity index 100%
rename from test/features/featured/fixtures/bold-inside-anchor.html
rename to test/lib/feed/fixtures/bold-inside-anchor.html
diff --git a/test/features/featured/fixtures/multiple-bold-links.html
b/test/lib/feed/fixtures/multiple-bold-links.html
similarity index 100%
rename from test/features/featured/fixtures/multiple-bold-links.html
rename to test/lib/feed/fixtures/multiple-bold-links.html
diff --git a/test/features/featured/fixtures/only-regular-links.html
b/test/lib/feed/fixtures/only-regular-links.html
similarity index 100%
rename from test/features/featured/fixtures/only-regular-links.html
rename to test/lib/feed/fixtures/only-regular-links.html
--
To view, visit https://gerrit.wikimedia.org/r/372080
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb5a4b779de9ad8e8aafc55cf1c17646f28d9195
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: BearND
Gerrit-Reviewer: Dbrant
Gerrit-Reviewer: Fjalapeno
Gerrit-Reviewer: GWicke
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Jhernandez
Gerrit-Reviewer: Mholloway
Gerrit-Reviewer: Mhurd
Gerrit-Reviewer: Mobrovac
Gerrit-Reviewer: Ppchelko
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
