[MediaWiki-commits] [Gerrit] Optimize how user options are delivered to the client - change (mediawiki/core)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/177501 Change subject: Optimize how user options are delivered to the client .. Optimize how user options are delivered to the client We currently embed the full set of user options in a
[MediaWiki-commits] [Gerrit] Use LocalisationCache::getMessagesDirs() - change (mediawiki...LocalisationUpdate)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177500
Change subject: Use LocalisationCache::getMessagesDirs()
..
Use LocalisationCache::getMessagesDirs()
Depends on I2399ddd7fd in mediawiki/core which makes the method
public.
Change-Id: Ic8fb0b2ab127c20518a055c0b4f8bc28980c9123
---
M update.php
1 file changed, 10 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LocalisationUpdate
refs/changes/00/177500/1
diff --git a/update.php b/update.php
index 1f66e73..bb94980 100644
--- a/update.php
+++ b/update.php
@@ -25,7 +25,7 @@
ini_set( "max_execution_time", 0 );
ini_set( 'memory_limit', -1 );
- global $wgExtensionMessagesFiles, $wgMessagesDirs, $IP;
+ global $wgExtensionMessagesFiles, $IP;
global $wgLocalisationUpdateRepositories;
global $wgLocalisationUpdateRepository;
@@ -35,7 +35,15 @@
return;
}
- $finder = new LU_Finder( $wgExtensionMessagesFiles,
$wgMessagesDirs, $IP );
+ $lc = Language::getLocalisationCache();
+ if ( is_callable( array( $lc, 'getMessagesDirs' ) ) ) { //
Introduced in 1.25
+ $messagesDirs = $lc->getMessagesDirs();
+ } else {
+ global $wgMessagesDirs;
+ $messagesDirs = $wgMessagesDirs;
+ }
+
+ $finder = new LU_Finder( $wgExtensionMessagesFiles,
$messagesDirs, $IP );
$readerFactory = new LU_ReaderFactory();
$fetcherFactory = new LU_FetcherFactory();
--
To view, visit https://gerrit.wikimedia.org/r/177500
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8fb0b2ab127c20518a055c0b4f8bc28980c9123
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LocalisationUpdate
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make LocalisationCache::getMessagesDirs() public - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177499
Change subject: Make LocalisationCache::getMessagesDirs() public
..
Make LocalisationCache::getMessagesDirs() public
So it can be used inside LocalisationUpdate
Change-Id: I2399ddd7fd4462f2c6d1bf81036af451a67c58b1
---
M includes/cache/LocalisationCache.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/99/177499/1
diff --git a/includes/cache/LocalisationCache.php
b/includes/cache/LocalisationCache.php
index 2c908af..7d5450e 100644
--- a/includes/cache/LocalisationCache.php
+++ b/includes/cache/LocalisationCache.php
@@ -799,7 +799,7 @@
* @since 1.25
* @return array
*/
- protected function getMessagesDirs() {
+ public function getMessagesDirs() {
global $wgMessagesDirs, $IP;
return array(
'core' => "$IP/languages/i18n",
--
To view, visit https://gerrit.wikimedia.org/r/177499
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2399ddd7fd4462f2c6d1bf81036af451a67c58b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add config from upstream - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Add config from upstream
..
Add config from upstream
Change-Id: Ifccb466fe80086165c42e067fa55e14e7ae3f316
---
M bin/wikiupdate
M composer.json
2 files changed, 5 insertions(+), 1 deletion(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/wikiupdate b/bin/wikiupdate
index c89d64e..48424c1 100755
--- a/bin/wikiupdate
+++ b/bin/wikiupdate
@@ -13,7 +13,7 @@
if [ -f "$WIKI/composer.json" ]
then
- composer -n -d="$WIKI" update -o
+ composer -n -d="$WIKI" update
else
echo "Skipping composer update"
fi
diff --git a/composer.json b/composer.json
index a80a906..8d6c92f 100644
--- a/composer.json
+++ b/composer.json
@@ -17,5 +17,9 @@
"scripts": {
"pre-update-cmd": "ComposerHookHandler::onPreUpdate",
"pre-install-cmd": "ComposerHookHandler::onPreInstall"
+ },
+ "config": {
+ "optimize-autoloader": true,
+ "prepend-autoloader": false
}
}
--
To view, visit https://gerrit.wikimedia.org/r/177496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifccb466fe80086165c42e067fa55e14e7ae3f316
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve pr_quality CSS - change (mediawiki...ProofreadPage)
Tpt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177498
Change subject: Improve pr_quality CSS
..
Improve pr_quality CSS
Change-Id: I057ec61ac21fcc32184ffe09f55c2b04ad52dca1
---
M ProofreadPage.body.php
M modules/article/ext.proofreadpage.article.css
2 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/98/177498/1
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 1f255f7..a4dae12 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -567,15 +567,17 @@
$q3 = $n3 * 100 / $n;
$q4 = $n4 * 100 / $n;
$qe = $ne * 100 / $n;
- $void_cell = $ne ? '' :
'';
- $output = '
-
-
-
-
-
+ $void_cell = $ne ? '' : '';
+ $output = '
+
+
+
+
+
+
' . $void_cell . '
-';
+
+';
$out->setSubtitle( $out->getSubtitle() . $output );
return true;
}
diff --git a/modules/article/ext.proofreadpage.article.css
b/modules/article/ext.proofreadpage.article.css
index 6a04abd..bd82372 100644
--- a/modules/article/ext.proofreadpage.article.css
+++ b/modules/article/ext.proofreadpage.article.css
@@ -1,14 +1,12 @@
.pr_quality {
border-collapse: separate;
border-spacing: 0px 0px;
- border-width: 1px;
- border-style: dotted;
- line-height: 2em;
- margin: -0.45em 0.00em 0.00em 0.01em;
+ border: 1px #B8B8B8;
text-align: center;
+ width: 100px;
}
.pr_quality td {
padding: 0;
- height: 0.2em;
+ height: 0.4em;
}
--
To view, visit https://gerrit.wikimedia.org/r/177498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I057ec61ac21fcc32184ffe09f55c2b04ad52dca1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove Profiler::isStub() - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove Profiler::isStub()
..
Remove Profiler::isStub()
Just check for ProfilerStub directly.
Change-Id: I503916599f182df4206da5282193ae6ec9324ee6
---
M includes/GlobalFunctions.php
M includes/db/Database.php
M includes/profiler/Profiler.php
M includes/profiler/ProfilerStandard.php
M includes/profiler/ProfilerStub.php
M includes/profiler/ProfilerXhprof.php
6 files changed, 3 insertions(+), 27 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 1a901f3..14326ec 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1196,7 +1196,7 @@
$profiler = Profiler::instance();
# Profiling must actually be enabled...
- if ( $profiler->isStub() ) {
+ if ( $profiler instanceof ProfilerStub ) {
return;
}
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 41b70c3..a805fa5 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -963,7 +963,7 @@
$isMaster = !is_null( $this->getLBInfo( 'master' ) );
$profiler = Profiler::instance();
- if ( !$profiler->isStub() ) {
+ if ( !$profiler instanceof ProfilerStub ) {
# generalizeSQL will probably cut down the query to
reasonable
# logging size most of the time. The substr is really
just a sanity check.
if ( $isMaster ) {
diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index 9650ff5..2be142f 100644
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -101,13 +101,6 @@
}
/**
-* Return whether this a stub profiler
-*
-* @return bool
-*/
- abstract public function isStub();
-
- /**
* @param string $id
*/
public function setProfileID( $id ) {
@@ -178,7 +171,7 @@
public function logData() {
$output = isset( $this->params['output'] ) ?
$this->params['output'] : null;
- if ( !$output || $this->isStub() ) {
+ if ( !$output || $this instanceof ProfilerStub ) {
// return early when no output classes defined or we're
a stub
return;
}
diff --git a/includes/profiler/ProfilerStandard.php
b/includes/profiler/ProfilerStandard.php
index ab5e3ab..87706e6 100644
--- a/includes/profiler/ProfilerStandard.php
+++ b/includes/profiler/ProfilerStandard.php
@@ -58,15 +58,6 @@
}
/**
-* Return whether this a stub profiler
-*
-* @return bool
-*/
- public function isStub() {
- return false;
- }
-
- /**
* Add the inital item in the stack.
*/
protected function addInitialStack() {
diff --git a/includes/profiler/ProfilerStub.php
b/includes/profiler/ProfilerStub.php
index 6fc74ef..b400601 100644
--- a/includes/profiler/ProfilerStub.php
+++ b/includes/profiler/ProfilerStub.php
@@ -27,10 +27,6 @@
* @ingroup Profiler
*/
class ProfilerStub extends Profiler {
- public function isStub() {
- return true;
- }
-
public function profileIn( $fn ) {
}
diff --git a/includes/profiler/ProfilerXhprof.php
b/includes/profiler/ProfilerXhprof.php
index 88196db..69d2552 100644
--- a/includes/profiler/ProfilerXhprof.php
+++ b/includes/profiler/ProfilerXhprof.php
@@ -95,10 +95,6 @@
$this->xhprof = new Xhprof( $params );
}
- public function isStub() {
- return false;
- }
-
/**
* No-op for xhprof profiling.
*
--
To view, visit https://gerrit.wikimedia.org/r/177488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I503916599f182df4206da5282193ae6ec9324ee6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Chad
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change "articles" to "pages" in the message - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177497
Change subject: Change "articles" to "pages" in the message
..
Change "articles" to "pages" in the message
Change-Id: I689e3c8cd2b96587864e0139a5975df22fe197b1
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/97/177497/1
diff --git a/i18n/en.json b/i18n/en.json
index d6a712e..b94b2c4 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -37,7 +37,7 @@
"tag-contenttranslation": "ContentTranslation",
"cx-source-loading": "Loading $1",
"cx-beta": "Content translation",
- "cx-beta-desc": "A tool to quickly translate articles into your
language. Start translations from your contributions page, and edit them with
our side-by-side editor especially designed for translation. Some of the tools
may be only available for specific languages.",
+ "cx-beta-desc": "A tool to quickly translate pages into your language.
Start translations from your contributions page, and edit them with our
side-by-side editor especially designed for translation. Some of the tools may
be only available for specific languages.",
"cx-entrypoint-title": "Translate this page to $1",
"cx-entrypoint-dialog-page-doesnt-exist-yet": "This page does not exist
in $1 yet. Do {{GENDER:|you}} want to create it?",
"cx-entrypoint-dialog-title-in": "Title for the new page in $1:",
--
To view, visit https://gerrit.wikimedia.org/r/177497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I689e3c8cd2b96587864e0139a5975df22fe197b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow OCG to read the contents of its output/temp/postmortem... - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Allow OCG to read the contents of its output/temp/postmortem directories. .. Allow OCG to read the contents of its output/temp/postmortem directories. Apparmor was allowing OCG to create files underneath these directories, but throwing EACCESS when the OCG garbage collector attempted to readdir the directory itself. Change-Id: I026c374eadfd2b3623d7d11b3a8d82d17bcac49b --- M modules/ocg/templates/usr.bin.nodejs.apparmor.erb 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: CSteipp: Looks good to me, but someone else must approve Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ocg/templates/usr.bin.nodejs.apparmor.erb b/modules/ocg/templates/usr.bin.nodejs.apparmor.erb index ac9476c..f368631 100644 --- a/modules/ocg/templates/usr.bin.nodejs.apparmor.erb +++ b/modules/ocg/templates/usr.bin.nodejs.apparmor.erb @@ -15,8 +15,11 @@ /etc/ocg/mw-ocg-service.js r, /srv/deployment/ocg/ocg/** r, /srv/deployment/ocg/ocg/node_modules/**.node mr, + <%= @temp_dir %> r, <%= @temp_dir %>/** rwlk, + <%= @output_dir %> r, <%= @output_dir %>/** rw, + <%= @postmortem_dir %> r, <%= @postmortem_dir %>/** rwk, /tmp/** rwk, -- To view, visit https://gerrit.wikimedia.org/r/177384 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I026c374eadfd2b3623d7d11b3a8d82d17bcac49b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Cscott Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: CSteipp Gerrit-Reviewer: Cscott Gerrit-Reviewer: Dzahn Gerrit-Reviewer: GWicke Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add config from upstream - change (translatewiki)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177496
Change subject: Add config from upstream
..
Add config from upstream
Change-Id: Ifccb466fe80086165c42e067fa55e14e7ae3f316
---
M bin/wikiupdate
M composer.json
2 files changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/96/177496/1
diff --git a/bin/wikiupdate b/bin/wikiupdate
index c89d64e..48424c1 100755
--- a/bin/wikiupdate
+++ b/bin/wikiupdate
@@ -13,7 +13,7 @@
if [ -f "$WIKI/composer.json" ]
then
- composer -n -d="$WIKI" update -o
+ composer -n -d="$WIKI" update
else
echo "Skipping composer update"
fi
diff --git a/composer.json b/composer.json
index a80a906..8d6c92f 100644
--- a/composer.json
+++ b/composer.json
@@ -17,5 +17,9 @@
"scripts": {
"pre-update-cmd": "ComposerHookHandler::onPreUpdate",
"pre-install-cmd": "ComposerHookHandler::onPreInstall"
+ },
+ "config": {
+ "optimize-autoloader": true,
+ "prepend-autoloader": false
}
}
--
To view, visit https://gerrit.wikimedia.org/r/177496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifccb466fe80086165c42e067fa55e14e7ae3f316
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added ExtendedSearch support for other skins - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Added ExtendedSearch support for other skins
..
Added ExtendedSearch support for other skins
Support other skins than bluespiceskin.
Change-Id: I02f1db45b3f05ecf0e39d671547e819a7bf0d2b4
---
M ExtendedSearch/ExtendedSearch.class.php
M ExtendedSearch/ExtendedSearch.setup.php
M ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.js
M ExtendedSearch/resources/bluespice.extendedSearch.focus.js
A ExtendedSearch/resources/bluespice.extendedSearch.form.css
A ExtendedSearch/resources/bluespice.extendedSearch.form.js
6 files changed, 65 insertions(+), 11 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/ExtendedSearch/ExtendedSearch.class.php
b/ExtendedSearch/ExtendedSearch.class.php
index 3ebd57c..8f55b34 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -172,6 +172,7 @@
$oOut->addModuleStyles(
'ext.bluespice.extendedsearch.autocomplete.style' );
$oOut->addModules( 'ext.bluespice.extendedsearch.autocomplete'
);
$oOut->addModules( 'ext.bluespice.extendedsearch.focus' );
+ $oOut->addModules( 'ext.bluespice.extendedsearch.form' );
return true;
}
diff --git a/ExtendedSearch/ExtendedSearch.setup.php
b/ExtendedSearch/ExtendedSearch.setup.php
index 8489419..e53fd6e 100644
--- a/ExtendedSearch/ExtendedSearch.setup.php
+++ b/ExtendedSearch/ExtendedSearch.setup.php
@@ -15,6 +15,11 @@
'scripts' => 'bluespice.extendedSearch.focus.js',
) + $aResourceModuleTemplate;
+$wgResourceModules['ext.bluespice.extendedsearch.form'] = array(
+ 'scripts' => 'bluespice.extendedSearch.form.js',
+ 'styles' => 'bluespice.extendedSearch.form.css'
+) + $aResourceModuleTemplate;
+
$wgResourceModules['ext.bluespice.extendedsearch.autocomplete.style'] = array(
'styles' => 'bluespice.extendedSearch.autocomplete.css'
) + $aResourceModuleTemplate;
@@ -96,4 +101,4 @@
$wgSpecialPages['SpecialExtendedSearch'] = 'SpecialExtendedSearch';
$wgHooks['LoadExtensionSchemaUpdates'][] = 'ExtendedSearch::getSchemaUpdates';
-$GLOBALS['wgHooks']['OpenSearchUrls'][] = 'ExtendedSearch::onOpenSearchUrls';
+$GLOBALS['wgHooks']['OpenSearchUrls'][] = 'ExtendedSearch::onOpenSearchUrls';
\ No newline at end of file
diff --git a/ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.js
b/ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.js
index d07f200..e8e02ec 100644
--- a/ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.js
+++ b/ExtendedSearch/resources/bluespice.extendedSearch.autocomplete.js
@@ -10,7 +10,7 @@
* @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
* @filesource
*/
-mw.loader.using( 'jquery.ui.autocomplete', function() {
+mw.loader.using( [ 'jquery.ui.autocomplete',
'ext.bluespice.extendedsearch.form' ], function() {
var cache = [];
var lastXhr = {};
@@ -19,6 +19,7 @@
var container = $( "" );
$( "body" ).append( container );
+
$( "#bs-extendedsearch-input, .bs-autocomplete-field" ).autocomplete( {
appendTo: container,
position: {
diff --git a/ExtendedSearch/resources/bluespice.extendedSearch.focus.js
b/ExtendedSearch/resources/bluespice.extendedSearch.focus.js
index 9a07efa..255705a 100644
--- a/ExtendedSearch/resources/bluespice.extendedSearch.focus.js
+++ b/ExtendedSearch/resources/bluespice.extendedSearch.focus.js
@@ -1,12 +1,22 @@
-( function( mw, $ ) {
- $( function() {
+/**
+ * ExtendedSearch extension
+ *
+ * Part of BlueSpice for MediaWiki
+ *
+ * @author Stephan Muggli
+ * @packageBluespice_Extensions
+ * @subpackage ExtendedSearch
+ * @copyright Copyright (C) 2014 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
+ * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
+ * @filesource
+ */
+mw.loader.using( 'ext.bluespice.extendedsearch.form', function() {
if ( typeof bsExtendedSearchSetFocus === "boolean" ) {
- //$(document).scrollTop(): prevent loosing last scroll
position on history back
- if ( wgIsArticle === true && bsExtendedSearchSetFocus
=== true && $( document ).scrollTop() < 1 ) {
- if ( window.location.hash === '' ) {
- $( '#bs-extendedsearch-input' ).focus();
- }
+ //$(document).scrollTop(): prevent loosing last scroll position
on history back
+ if ( wgIsArticle === true && bsExtendedSearchSetFocus === true
&& $( document ).scrollTop() < 1 ) {
+ if ( window.location.hash === '' ) {
+ $( '#bs-extendedsearch-input' ).focus();
[MediaWiki-commits] [Gerrit] Remove emty sections before publishing - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove emty sections before publishing
..
Remove emty sections before publishing
Bug: T76569
Change-Id: I86e368d7eb8e9700edc18695ed0405445fd41f4e
---
M modules/publish/ext.cx.publish.js
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/publish/ext.cx.publish.js
b/modules/publish/ext.cx.publish.js
index fd4d18b..ada7e17 100644
--- a/modules/publish/ext.cx.publish.js
+++ b/modules/publish/ext.cx.publish.js
@@ -188,6 +188,14 @@
// Remove placeholder sections
$content.find( '.placeholder' ).remove();
+ // Remove empty sections.
+ $content.find( mw.cx.getSectionSelector() ).each( function () {
+ var $section = $( this );
+
+ if ( !$.trim( $section.text() ) ) {
+ $section.remove();
+ }
+ } );
return $content.html();
}
--
To view, visit https://gerrit.wikimedia.org/r/177192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I86e368d7eb8e9700edc18695ed0405445fd41f4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
Gerrit-Reviewer: KartikMistry
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Changed return type from DatabaseBase to DBConnRef - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Changed return type from DatabaseBase to DBConnRef
..
Changed return type from DatabaseBase to DBConnRef
Change-Id: I70211187c7927a38e039860eb92fedaa917e6fa9
---
M includes/Database.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Database.php b/includes/Database.php
index d9b0b54..ccbc183 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -8,7 +8,7 @@
/**
* Gets a database connection to the ContentTranslation database
* @param int $type Either DB_SLAVE or DB_MASTER
-* @return DatabaseBase
+* @return DBConnRef
*/
public static function getConnection( $type ) {
global $wgContentTranslationDatabase,
$wgContentTranslationCluster;
--
To view, visit https://gerrit.wikimedia.org/r/177226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I70211187c7927a38e039860eb92fedaa917e6fa9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: KartikMistry
Gerrit-Reviewer: Santhosh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix up interwiki search results in API - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix up interwiki search results in API
..
Fix up interwiki search results in API
getInterwikiResults() returns an array of result objects, not
just a single result object
Change-Id: I4ea3f814c276e6fb9fd2b86ea405047aa3783fc7
---
M includes/api/ApiQuerySearch.php
1 file changed, 39 insertions(+), 36 deletions(-)
Approvals:
Anomie: Looks good to me, but someone else must approve
Chad: Looks good to me, approved
Manybubbles: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index 66ef8db..c6999df 100644
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -204,47 +204,50 @@
}
$hasInterwikiResults = false;
+ $totalhits = null;
if ( $interwiki && $resultPageSet === null &&
$matches->hasInterwikiResults() ) {
- $matches = $matches->getInterwikiResults();
- $hasInterwikiResults = true;
+ foreach( $matches->getInterwikiResults() as $matches ) {
+ $matches = $matches->getInterwikiResults();
+ $hasInterwikiResults = true;
- // Include number of results if requested
- if ( $resultPageSet === null && isset(
$searchInfo['totalhits'] ) ) {
- $totalhits = $matches->getTotalHits();
- if ( $totalhits !== null ) {
- $apiResult->addValue( array( 'query',
'interwikisearchinfo' ),
- 'totalhits', $totalhits );
- }
- }
-
- $result = $matches->next();
- while ( $result ) {
- $title = $result->getTitle();
-
- if ( $resultPageSet === null ) {
- $vals = array(
- 'namespace' =>
$result->getInterwikiNamespaceText(),
- 'title' => $title->getText(),
- 'url' => $title->getFullUrl(),
- );
-
- // Add item to results and see whether
it fits
- $fit = $apiResult->addValue(
- array( 'query', 'interwiki' .
$this->getModuleName(), $result->getInterwikiPrefix() ),
- null,
- $vals
- );
-
- if ( !$fit ) {
- // We hit the limit. We can't
really provide any meaningful
- // pagination info so just bail
out
- break;
- }
- } else {
- $titles[] = $title;
+ // Include number of results if requested
+ if ( $resultPageSet === null && isset(
$searchInfo['totalhits'] ) ) {
+ $totalhits += $matches->getTotalHits();
}
$result = $matches->next();
+ while ( $result ) {
+ $title = $result->getTitle();
+
+ if ( $resultPageSet === null ) {
+ $vals = array(
+ 'namespace' =>
$result->getInterwikiNamespaceText(),
+ 'title' =>
$title->getText(),
+ 'url' =>
$title->getFullUrl(),
+ );
+
+ // Add item to results and see
whether it fits
+ $fit = $apiResult->addValue(
+ array( 'query',
'interwiki' . $this->getModuleName(), $result->getInterwikiPrefix() ),
+ null,
+ $vals
+ );
+
+ if ( !$fit ) {
+ // We hit the limit.
[MediaWiki-commits] [Gerrit] Disable ConfirmEdit on closed wikis - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Disable ConfirmEdit on closed wikis .. Disable ConfirmEdit on closed wikis Nobody ever hits it, but less code to load in a request is always a good thing :) Change-Id: I88fe124f311d2f4bba4286200b607cbe892ea5fb --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5d48294..36b1eb8 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -9513,9 +9513,10 @@ 'wmgEnableCaptcha' => array( 'default' => true, - // private wikis don't need it + // private/closed wikis don't need it 'private' => false, 'fishbowl' => false, + 'closed' => false, // testing 'testwiki' => false, -- To view, visit https://gerrit.wikimedia.org/r/177495 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I88fe124f311d2f4bba4286200b607cbe892ea5fb Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Chad Gerrit-Reviewer: Chad Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable ConfirmEdit on private wikis - change (operations/mediawiki-config)
Chad has uploaded a new change for review. https://gerrit.wikimedia.org/r/177495 Change subject: Disable ConfirmEdit on private wikis .. Disable ConfirmEdit on private wikis Nobody ever hits it, but less code to load in a request is always a good thing :) Change-Id: I88fe124f311d2f4bba4286200b607cbe892ea5fb --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/95/177495/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5d48294..36b1eb8 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -9513,9 +9513,10 @@ 'wmgEnableCaptcha' => array( 'default' => true, - // private wikis don't need it + // private/closed wikis don't need it 'private' => false, 'fishbowl' => false, + 'closed' => false, // testing 'testwiki' => false, -- To view, visit https://gerrit.wikimedia.org/r/177495 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I88fe124f311d2f4bba4286200b607cbe892ea5fb Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Expand ConfirmEdit disabling test to all group0 wikis - change (operations/mediawiki-config)
Chad has uploaded a new change for review. https://gerrit.wikimedia.org/r/177494 Change subject: Expand ConfirmEdit disabling test to all group0 wikis .. Expand ConfirmEdit disabling test to all group0 wikis They're all test wikis, except mw.org which is sort of a test wiki too. Change-Id: I01026fd12cb142bc7c6054879c0ade3ef75e8f35 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/94/177494/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5d48294..ef05cb3 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -9518,7 +9518,7 @@ 'fishbowl' => false, // testing - 'testwiki' => false, + 'group0' => false, ), 'wmgEmergencyCaptcha' => array( -- To view, visit https://gerrit.wikimedia.org/r/177494 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01026fd12cb142bc7c6054879c0ade3ef75e8f35 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Image caching -- sorta working? :D - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177493
Change subject: Image caching -- sorta working? :D
..
Image caching -- sorta working? :D
- saving stub image info to individual .plist files as well as in a straight
URL list for the article
-- may want to break the list down to per-section if we want to replicate some
previous behaviors
- went with shorter filenames (last filename only without path info), may break
in some rare corner cases but the long ones were breaking frequently
- using the live session articleStore for caching so it actually uses the right
article!
This doesn't yet handle thumbnails in list pages real well, as global cache
doesn't know
which article is which.
Change-Id: I923a7f6f2eb58d03edc9d3b7efe68c98595e9acb
---
M MediaWikiKit/MediaWikiKit.xcodeproj/project.pbxproj
M MediaWikiKit/MediaWikiKit/MWKArticleStore.h
M MediaWikiKit/MediaWikiKit/MWKArticleStore.m
M MediaWikiKit/MediaWikiKit/MWKDataStore.m
M MediaWikiKit/MediaWikiKit/MWKImage.h
M MediaWikiKit/MediaWikiKit/MWKImage.m
A MediaWikiKit/MediaWikiKit/MWKImageList.h
A MediaWikiKit/MediaWikiKit/MWKImageList.m
M MediaWikiKit/MediaWikiKit/MediaWikiKit.h
M wikipedia/Networking/Fetchers/ArticleFetcher.m
M wikipedia/Web Image Interception/URLCache.m
11 files changed, 216 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/93/177493/1
diff --git a/MediaWikiKit/MediaWikiKit.xcodeproj/project.pbxproj
b/MediaWikiKit/MediaWikiKit.xcodeproj/project.pbxproj
index cb1a3ba..af8a4f9 100644
--- a/MediaWikiKit/MediaWikiKit.xcodeproj/project.pbxproj
+++ b/MediaWikiKit/MediaWikiKit.xcodeproj/project.pbxproj
@@ -50,6 +50,8 @@
D49ADCCC1A0031580010F839 /* golden-gate.jpg in Resources */ =
{isa = PBXBuildFile; fileRef = D49ADCCB1A0031580010F839 /* golden-gate.jpg */;
};
D49ADCCE1A00346B0010F839 /* MWKArticleStoreTestCase.m in
Sources */ = {isa = PBXBuildFile; fileRef = D49ADCCD1A00346B0010F839 /*
MWKArticleStoreTestCase.m */; };
D4B94B1C1A2FB7D2007FC79B /* organization-anon.json in Resources
*/ = {isa = PBXBuildFile; fileRef = D4B94B1B1A2FB7D2007FC79B /*
organization-anon.json */; };
+ D4B94B1F1A2FE975007FC79B /* MWKImageList.m in Sources */ = {isa
= PBXBuildFile; fileRef = D4B94B1E1A2FE975007FC79B /* MWKImageList.m */; };
+ D4B94B201A2FE975007FC79B /* MWKImageList.m in Sources */ = {isa
= PBXBuildFile; fileRef = D4B94B1E1A2FE975007FC79B /* MWKImageList.m */; };
D4C3FA5519E4783A00EB08CC /* MWKSite.m in Sources */ = {isa =
PBXBuildFile; fileRef = D4C3FA5419E4783A00EB08CC /* MWKSite.m */; };
D4C3FA5A19E47AA500EB08CC /* MWKSiteTests.m in Sources */ = {isa
= PBXBuildFile; fileRef = D4C3FA5919E47AA500EB08CC /* MWKSiteTests.m */; };
D4C3FA5B19E47ABE00EB08CC /* MWKSite.m in Sources */ = {isa =
PBXBuildFile; fileRef = D4C3FA5419E4783A00EB08CC /* MWKSite.m */; };
@@ -130,6 +132,8 @@
D49ADCCD1A00346B0010F839 /* MWKArticleStoreTestCase.m */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
path = MWKArticleStoreTestCase.m; sourceTree = ""; };
D49ADCCF1A0041570010F839 /* MWKArticleStoreTestCase.h */ = {isa
= PBXFileReference; lastKnownFileType = sourcecode.c.h; path =
MWKArticleStoreTestCase.h; sourceTree = ""; };
D4B94B1B1A2FB7D2007FC79B /* organization-anon.json */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path =
"organization-anon.json"; sourceTree = ""; };
+ D4B94B1D1A2FE975007FC79B /* MWKImageList.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
MWKImageList.h; sourceTree = ""; };
+ D4B94B1E1A2FE975007FC79B /* MWKImageList.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= MWKImageList.m; sourceTree = ""; };
D4C3FA5319E4783A00EB08CC /* MWKSite.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
MWKSite.h; sourceTree = ""; };
D4C3FA5419E4783A00EB08CC /* MWKSite.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= MWKSite.m; sourceTree = ""; };
D4C3FA5919E47AA500EB08CC /* MWKSiteTests.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= MWKSiteTests.m; sourceTree = ""; };
@@ -272,6 +276,8 @@
D44EA7881A1BCD1400631A1D /*
MWKRecentSearchEntry.m */,
D44EA78B1A1BCD2600631A1D /*
MWKRecentSearchList.h */,
D44EA78C1A1BCD2600631A1D /*
MWKRecentSearchList.m */,
+ D4B94B1D1A2FE975007FC79B /* MWKImageList.h */,
+
[MediaWiki-commits] [Gerrit] Delete the draft translation after publish - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177492
Change subject: Delete the draft translation after publish
..
Delete the draft translation after publish
Drafts can not be further edited after publishing. So delete them
once published
Bug: T75986
Change-Id: I82df741a934bbd6ac5a6392f2ba8151b86e42fc8
---
M api/ApiContentTranslationPublish.php
M includes/Draft.php
2 files changed, 19 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/92/177492/1
diff --git a/api/ApiContentTranslationPublish.php
b/api/ApiContentTranslationPublish.php
index c6128dc..2fab165 100644
--- a/api/ApiContentTranslationPublish.php
+++ b/api/ApiContentTranslationPublish.php
@@ -195,7 +195,11 @@
$translationId = $translation->getTranslationId();
$translator->addTranslation( $translationId );
if ( $params['status'] === 'draft' ) {
+ // Save the draft
ContentTranslation\Draft::save( $translationId,
$params['html'] );
+ } else {
+ // Delete the draft
+ ContentTranslation\Draft::delete( $translationId );
}
}
diff --git a/includes/Draft.php b/includes/Draft.php
index 9ee9923..dbd8333 100644
--- a/includes/Draft.php
+++ b/includes/Draft.php
@@ -22,4 +22,19 @@
);
}
+ /**
+* Delete the draft for the given draftId
+* @param {string} $draftId
+*/
+ public static function delete( $draftId ) {
+ $dbw = Database::getConnection( DB_MASTER );
+ $dbw->delete(
+ 'cx_drafts',
+ array(
+ 'draft_id' => $draftId,
+ ),
+ __METHOD__
+ );
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/177492
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82df741a934bbd6ac5a6392f2ba8151b86e42fc8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Create citoid-npm job and enable (non-voting) - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Create citoid-npm job and enable (non-voting)
..
Create citoid-npm job and enable (non-voting)
Change-Id: I6973bc83bf3a6dc88efe876113ed8c75512469ce
---
M jjb/misc.yaml
M zuul/layout.yaml
2 files changed, 14 insertions(+), 0 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index a6b7980..d5289db 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -108,3 +108,8 @@
- '{name}-phplint'
- '{name}-phpunit'
- php-composer-validate
+
+- project:
+name: 'citoid'
+jobs:
+ - '{name}-npm'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 9077915..aae495c 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1538,6 +1538,9 @@
- name: cdb-phpunit
voting: false
+ - name: citoid-npm
+voting: false
+
# Rejecting changes having trailing whitespaces cause too many false
# positives. So only report the whitespace issues, but don't let it vote.
- name: ^.*-whitespaces$
@@ -5150,6 +5153,12 @@
gate-and-submit:
- jobrunner-phplint
+ - name: mediawiki/services/citoid
+test:
+ - citoid-npm
+gate-and-submit:
+ - citoid-npm
+
- name: mediawiki/services/mathoid
test:
- mathoidsvc-debian-glue
--
To view, visit https://gerrit.wikimedia.org/r/177484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6973bc83bf3a6dc88efe876113ed8c75512469ce
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove sub-functional profiling from Updater - change (mediawiki...CirrusSearch)
Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177491
Change subject: Remove sub-functional profiling from Updater
..
Remove sub-functional profiling from Updater
The -basic one isn't all that interesting because nothing about
it is should be slow. The -parse one was more interesting before
I moved all of the logic to the *Builder classes
Change-Id: Ifed4f84b6911e720cbe9b08eaaa4ba00455563ed
---
M includes/Updater.php
1 file changed, 0 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/91/177491/1
diff --git a/includes/Updater.php b/includes/Updater.php
index 00eb248..e006f57 100644
--- a/includes/Updater.php
+++ b/includes/Updater.php
@@ -287,12 +287,10 @@
$documents = array();
foreach ( $pages as $page ) {
- wfProfileIn( __METHOD__ . '-basic' );
$title = $page->getTitle();
if ( !$page->exists() ) {
wfLogWarning( 'Attempted to build a document
for a page that doesn\'t exist. This should be caught ' .
"earlier but wasn't. Page: $title" );
- wfProfileOut( __METHOD__ . '-basic' );
continue;
}
@@ -312,11 +310,8 @@
// regular types or lists of objects and lists are
overwritten.
$doc->setDocAsUpsert( $fullDocument || $indexOnSkip );
$doc->setRetryOnConflict(
$wgCirrusSearchUpdateConflictRetryCount );
- wfProfileOut( __METHOD__ . '-basic' );
if ( !$skipParse ) {
- wfProfileIn( __METHOD__ . '-parse' );
-
// Get text to index, based on content and
parser output
list( $content, $parserOutput ) =
$this->getContentAndParserOutput( $page );
@@ -336,8 +331,6 @@
// Then let hooks have a go
wfRunHooks( 'CirrusSearchBuildDocumentParse',
array( $doc, $title, $content, $parserOutput ) );
-
- wfProfileOut( __METHOD__ . '-parse' );
}
if ( !$skipLinks ) {
--
To view, visit https://gerrit.wikimedia.org/r/177491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifed4f84b6911e720cbe9b08eaaa4ba00455563ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Chad
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use "all translations" link on the translation view when dra... - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177490
Change subject: Use "all translations" link on the translation view when drafts
enabled
..
Use "all translations" link on the translation view when drafts enabled
Bug: T75976
Change-Id: I7e70d7941b3faf0a36ad4f960b9adebc89858e4f
---
M Resources.php
M i18n/en.json
M i18n/qqq.json
M modules/header/ext.cx.header.js
4 files changed, 9 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/90/177490/1
diff --git a/Resources.php b/Resources.php
index 87f1323..e7123a0 100644
--- a/Resources.php
+++ b/Resources.php
@@ -99,6 +99,7 @@
'cx-error-server-connection',
'cx-error-page-not-found',
'cx-header-new-translation',
+ 'cx-header-all-translations',
'cx-publish-button',
'cx-save-draft-button',
'cx-special-login-error',
diff --git a/i18n/en.json b/i18n/en.json
index d6a712e..3f9f26f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -17,6 +17,7 @@
"cx-header-progressbar-text-mt": "($1% from machine translation)",
"cx-header-translation-center": "Translation center",
"cx-header-new-translation": "New translation",
+ "cx-header-all-translations": "All translations",
"cx-source-view-page": "view page",
"cx-publish-page-success": "Page published at $1",
"cx-publish-page-error": "Error while saving page.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 2c61b1b..66c2574 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -21,6 +21,7 @@
"cx-header-progressbar-text-mt": "Text to be shown with the progress
bar in [[Special:ContentTranslation]]. $1 is the estimated percent of
machine-translated text out of all the translation text that was written so
far.",
"cx-header-translation-center": "Text for the translation center
title.",
"cx-header-new-translation": "A link at the top of the translation
interface to the main Special:ContentTranslation page that creates a new
translation.\n{{Identical|New translation}}",
+ "cx-header-all-translations": "A link at the top of the translation
interface to the main Special:ContentTranslation page that lists all
translations by the user.\n{{Identical|New translation}}",
"cx-source-view-page": "A link that points to the source page under the
heading of the source article.\n{{Identical|View page}}",
"cx-publish-page-success": "Message shown when page is published
successfully. Parameters:\n* $1 - Link to the published page",
"cx-publish-page-error": "Error message to display when page saving
fails.",
diff --git a/modules/header/ext.cx.header.js b/modules/header/ext.cx.header.js
index a3ce082..a5320b3 100644
--- a/modules/header/ext.cx.header.js
+++ b/modules/header/ext.cx.header.js
@@ -175,10 +175,14 @@
.append( $logo, $titleText );
$translationCenterLink = $( '' )
- // TODO update the text when the dashboard is ready
- .text( mw.msg( 'cx-header-new-translation' ) )
.attr( 'href', mw.util.getUrl(
'Special:ContentTranslation' ) );
+ if ( mw.config.get( 'wgContentTranslationDatabase' ) !== null )
{
+ $translationCenterLink.text( mw.msg(
'cx-header-all-translations' ) );
+ } else {
+ $translationCenterLink.text( mw.msg(
'cx-header-new-translation' ) );
+ }
+
$translationCenter = $( '' )
.addClass( 'cx-header__translation-center' )
.append( $translationCenterLink );
--
To view, visit https://gerrit.wikimedia.org/r/177490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e70d7941b3faf0a36ad4f960b9adebc89858e4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added handling for when form name is not set - change (mediawiki...SemanticForms)
Yaron Koren has submitted this change and it was merged.
Change subject: Added handling for when form name is not set
..
Added handling for when form name is not set
Change-Id: I56164808c99775fb3f21c513c0090c1e4b943e8b
---
M includes/SF_Utils.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index ee82f18..a9d33c8 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -1028,7 +1028,10 @@
$formSpecialPage = SpecialPageFactory::getPage(
'FormEdit' );
}
- if ( strpos( $inFormName, '/' ) == true ) {
+ if ( $inFormName == '' ) {
+ $query = array( 'target' => $inTargetName );
+ $link_url = $formSpecialPage->getTitle()->getLocalURL(
$query );
+ } elseif ( strpos( $inFormName, '/' ) == true ) {
$query = array( 'form' => $inFormName, 'target' =>
$inTargetName );
$link_url = $formSpecialPage->getTitle()->getLocalURL(
$query );
} else {
--
To view, visit https://gerrit.wikimedia.org/r/177489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I56164808c99775fb3f21c513c0090c1e4b943e8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
Gerrit-Reviewer: Yaron Koren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added handling for when form name is not set - change (mediawiki...SemanticForms)
Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177489
Change subject: Added handling for when form name is not set
..
Added handling for when form name is not set
Change-Id: I56164808c99775fb3f21c513c0090c1e4b943e8b
---
M includes/SF_Utils.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/89/177489/1
diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index ee82f18..a9d33c8 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -1028,7 +1028,10 @@
$formSpecialPage = SpecialPageFactory::getPage(
'FormEdit' );
}
- if ( strpos( $inFormName, '/' ) == true ) {
+ if ( $inFormName == '' ) {
+ $query = array( 'target' => $inTargetName );
+ $link_url = $formSpecialPage->getTitle()->getLocalURL(
$query );
+ } elseif ( strpos( $inFormName, '/' ) == true ) {
$query = array( 'form' => $inFormName, 'target' =>
$inTargetName );
$link_url = $formSpecialPage->getTitle()->getLocalURL(
$query );
} else {
--
To view, visit https://gerrit.wikimedia.org/r/177489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I56164808c99775fb3f21c513c0090c1e4b943e8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move validateIndexSettings code into 3 separate classes - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Move validateIndexSettings code into 3 separate classes
..
Move validateIndexSettings code into 3 separate classes
Change-Id: I027f2d7044237f7a9a9c12d7a7adfb2c94194177
---
M CirrusSearch.php
A includes/Maintenance/Validators/MaxShardsPerNodeValidator.php
A includes/Maintenance/Validators/NumberOfShardsValidator.php
A includes/Maintenance/Validators/ReplicaRangeValidator.php
M maintenance/updateOneSearchIndexConfig.php
5 files changed, 160 insertions(+), 34 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CirrusSearch.php b/CirrusSearch.php
index ccdbc20..473e698 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -584,6 +584,9 @@
$wgAutoloadClasses['CirrusSearch\Maintenance\Validators\Validator'] =
$maintenanceDir . '/Validators/Validator.php';
$wgAutoloadClasses['CirrusSearch\Maintenance\Validators\CacheWarmersValidator']
= $maintenanceDir . '/Validators/CacheWarmersValidator.php';
$wgAutoloadClasses['CirrusSearch\Maintenance\Validators\ShardAllocationValidator']
= $maintenanceDir . '/Validators/ShardAllocationValidator.php';
+$wgAutoloadClasses['CirrusSearch\Maintenance\Validators\MaxShardsPerNodeValidator']
= $maintenanceDir . '/Validators/MaxShardsPerNodeValidator.php';
+$wgAutoloadClasses['CirrusSearch\Maintenance\Validators\NumberOfShardsValidator']
= $maintenanceDir . '/Validators/NumberOfShardsValidator.php';
+$wgAutoloadClasses['CirrusSearch\Maintenance\Validators\ReplicaRangeValidator']
= $maintenanceDir . '/Validators/ReplicaRangeValidator.php';
$wgAutoloadClasses['CirrusSearch\Maintenance\UpdateVersionIndex'] = __DIR__ .
'/maintenance/updateVersionIndex.php';
$wgAutoloadClasses['CirrusSearch\NearMatchPicker'] = $includes .
'NearMatchPicker.php';
$wgAutoloadClasses['CirrusSearch\OtherIndexes'] = $includes .
'OtherIndexes.php';
diff --git a/includes/Maintenance/Validators/MaxShardsPerNodeValidator.php
b/includes/Maintenance/Validators/MaxShardsPerNodeValidator.php
new file mode 100644
index 000..92bd2b6
--- /dev/null
+++ b/includes/Maintenance/Validators/MaxShardsPerNodeValidator.php
@@ -0,0 +1,61 @@
+index = $index;
+ $this->indexType = $indexType;
+ $this->maxShardsPerNode = $maxShardsPerNode;
+ }
+
+ public function validate() {
+ $this->outputIndented( "\tValidating max shards per node..." );
+ $settings = $this->index->getSettings()->get();
+ // Elasticsearch uses negative numbers or an unset value to
represent unlimited. We use the word 'unlimited'
+ // because that is easier to read.
+ $actualMaxShardsPerNode = isset( $settings[ 'routing' ][
'allocation' ][ 'total_shards_per_node' ] ) ?
+ $settings[ 'routing' ][ 'allocation' ][
'total_shards_per_node' ] : 'unlimited';
+ $actualMaxShardsPerNode = $actualMaxShardsPerNode < 0 ?
'unlimited' : $actualMaxShardsPerNode;
+ $expectedMaxShardsPerNode = isset( $this->maxShardsPerNode[
$this->indexType ] ) ?
+ $this->maxShardsPerNode[ $this->indexType ] :
'unlimited';
+ if ( $actualMaxShardsPerNode == $expectedMaxShardsPerNode ) {
+ $this->output( "ok\n" );
+ } else {
+ $this->output( "is $actualMaxShardsPerNode but should
be $expectedMaxShardsPerNode..." );
+ $expectedMaxShardsPerNode = $expectedMaxShardsPerNode
=== 'unlimited' ? -1 : $expectedMaxShardsPerNode;
+ $this->index->getSettings()->set( array(
+ 'routing.allocation.total_shards_per_node' =>
$expectedMaxShardsPerNode
+ ) );
+ $this->output( "corrected\n" );
+ }
+
+ return true;
+ }
+}
diff --git a/includes/Maintenance/Validators/NumberOfShardsValidator.php
b/includes/Maintenance/Validators/NumberOfShardsValidator.php
new file mode 100644
index 000..203dc94
--- /dev/null
+++ b/includes/Maintenance/Validators/NumberOfShardsValidator.php
@@ -0,0 +1,44 @@
+index = $index;
+ $this->shardCount = $shardCount;
+ }
+
+ public function validate() {
+ $this->outputIndented( "\tValidating number of shards..." );
+ $settings = $this->index->getSettings()->get();
+ $actualShardCount = $settings['number_of_shards'];
+ if ( $actualShardCount == $this->shardCount ) {
+ $this->output( "ok\n" );
+ } else {
+ $this->output( "is $actualShardCount but should be " .
$this->shardCount . "...cannot correct!\n" );
+ return false;
+ }
+
+ return true;
+ }
+}
diff --git a/includes/Maintenance/Va
[MediaWiki-commits] [Gerrit] Implement Profiler::isStub() directly - change (mediawiki/core)
Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177488
Change subject: Implement Profiler::isStub() directly
..
Implement Profiler::isStub() directly
Most profilers won't be stubs
Change-Id: I503916599f182df4206da5282193ae6ec9324ee6
---
M includes/profiler/Profiler.php
M includes/profiler/ProfilerStandard.php
M includes/profiler/ProfilerXhprof.php
3 files changed, 4 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/88/177488/1
diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index 9650ff5..b9eb4f6 100644
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -101,11 +101,13 @@
}
/**
-* Return whether this a stub profiler
+* Return whether this a stub profiler. Most profilers aren't stubs.
*
* @return bool
*/
- abstract public function isStub();
+ public function isStub() {
+ return false;
+ }
/**
* @param string $id
diff --git a/includes/profiler/ProfilerStandard.php
b/includes/profiler/ProfilerStandard.php
index ab5e3ab..87706e6 100644
--- a/includes/profiler/ProfilerStandard.php
+++ b/includes/profiler/ProfilerStandard.php
@@ -58,15 +58,6 @@
}
/**
-* Return whether this a stub profiler
-*
-* @return bool
-*/
- public function isStub() {
- return false;
- }
-
- /**
* Add the inital item in the stack.
*/
protected function addInitialStack() {
diff --git a/includes/profiler/ProfilerXhprof.php
b/includes/profiler/ProfilerXhprof.php
index 88196db..69d2552 100644
--- a/includes/profiler/ProfilerXhprof.php
+++ b/includes/profiler/ProfilerXhprof.php
@@ -95,10 +95,6 @@
$this->xhprof = new Xhprof( $params );
}
- public function isStub() {
- return false;
- }
-
/**
* No-op for xhprof profiling.
*
--
To view, visit https://gerrit.wikimedia.org/r/177488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I503916599f182df4206da5282193ae6ec9324ee6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make Dashiki responsive - change (analytics/dashiki)
Unicodesnowman has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177487
Change subject: Make Dashiki responsive
..
Make Dashiki responsive
Makes Dashiki responsive and more friendly on mobile devices and smaller
viewports. The project selector is hidden with CSS media queries and
overflow of the graph is enabled to allow panning.
This also vastly improves Dashiki on desktops when the window is small -
the graph will no longer extend past the viewport.
For screenshots, see the Phabricator task.
Bug: T75030
Change-Id: I22a89f0dd76e4fb1dbcf602f0109126a47efd750
---
A src/css/responsive.css
M src/css/styles.css
M src/index.html
3 files changed, 28 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/dashiki
refs/changes/87/177487/1
diff --git a/src/css/responsive.css b/src/css/responsive.css
new file mode 100644
index 000..aa3f367
--- /dev/null
+++ b/src/css/responsive.css
@@ -0,0 +1,24 @@
+/* responsive media queries */
+@media only screen and (max-width:640px) {
+
+section.projects {
+/* hide the projects menu */
+display: none;
+}
+
+section.main {
+/* override space left for section.projects which is hidden */
+left: 0;
+}
+
+.ui.vertical.menu {
+/* override minimum menu width - we don't have the luxury of
whitespace */
+width: auto;
+}
+
+.graph {
+/* more suitable for mobile */
+height: 75vh;
+}
+
+}
diff --git a/src/css/styles.css b/src/css/styles.css
index 14e3f69..f6fe44f 100644
--- a/src/css/styles.css
+++ b/src/css/styles.css
@@ -111,7 +111,8 @@
left: 300px;
}
.graph {
-height: 90vh;
+height: 85vh;
+overflow: auto;
}
.graph .parent-of-resizable {
height: 100%;
diff --git a/src/index.html b/src/index.html
index 3161fbd..48547bb 100644
--- a/src/index.html
+++ b/src/index.html
@@ -3,6 +3,7 @@
+
Dashiki
@@ -19,6 +20,7 @@
+
--
To view, visit https://gerrit.wikimedia.org/r/177487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I22a89f0dd76e4fb1dbcf602f0109126a47efd750
Gerrit-PatchSet: 1
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Unicodesnowman
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] package.json: Pin dependencies at a fixed version - change (mediawiki...citoid)
Krinkle has submitted this change and it was merged.
Change subject: package.json: Pin dependencies at a fixed version
..
package.json: Pin dependencies at a fixed version
Upgrade explicitly to avoid silently upgrading to newer versions.
When an in compatibility is found and using 'latest' (or '*') it'll
be hard to track which version worked using e.g. git-bisect as
it'd get the latest still.
It also ensures that the dependencies are the same for different
developers with and without npm-cache locally.
Using a service like https://david-dm.org/wikimedia/citoid one
can quickly check if there are newer versions available.
Change-Id: I98cced5d5eeedbb7554103f449bbc2afa073327c
---
M package.json
1 file changed, 12 insertions(+), 12 deletions(-)
Approvals:
Krinkle: Verified; Looks good to me, approved
diff --git a/package.json b/package.json
index a007ada..f427361 100644
--- a/package.json
+++ b/package.json
@@ -1,19 +1,19 @@
{
"name" : "citoid",
- "description" : "Converts search terms such as URL or title into
citations",
"version" : "0.0.0",
+ "description" : "Converts search terms such as URL or title into
citations.",
"dependencies" : {
- "async" : "latest",
- "bluebird" : "latest",
- "body-parser" : "latest",
- "bunyan" : "latest",
- "cheerio" : "latest",
- "express" : "latest",
- "path": "latest",
- "request" : "latest",
- "xmldom" : "latest",
- "xpath" : "latest",
- "yargs": "latest"
+ "async" : "0.9.0",
+ "bluebird" : "2.3.11",
+ "body-parser" : "1.10.0",
+ "bunyan" : "1.2.3",
+ "cheerio" : "0.18.0",
+ "express" : "4.10.4",
+ "path": "0.4.9",
+ "request" : "2.49.0",
+ "xmldom" : "0.1.19",
+ "xpath" : "0.0.7",
+ "yargs": "1.3.3"
},
"repository": {
"type": "git",
--
To view, visit https://gerrit.wikimedia.org/r/177486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I98cced5d5eeedbb7554103f449bbc2afa073327c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Mvolz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] package.json: Point git-url to Git repository instead of Ger... - change (mediawiki...citoid)
Krinkle has submitted this change and it was merged.
Change subject: package.json: Point git-url to Git repository instead of Gerrit
project page
..
package.json: Point git-url to Git repository instead of Gerrit project page
Change-Id: I014a9bd91cb33d30e877fbf7715b20b7975aa16b
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Krinkle: Verified; Looks good to me, approved
diff --git a/package.json b/package.json
index bc76360..a007ada 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,6 @@
},
"repository": {
"type": "git",
- "url":
"https://gerrit.wikimedia.org/r/p/mediawiki/services/citoid";
+ "url":
"https://gerrit.wikimedia.org/r/mediawiki/services/citoid";
}
}
--
To view, visit https://gerrit.wikimedia.org/r/177485
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I014a9bd91cb33d30e877fbf7715b20b7975aa16b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] package.json: Pin dependencies at a fixed version - change (mediawiki...citoid)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177486
Change subject: package.json: Pin dependencies at a fixed version
..
package.json: Pin dependencies at a fixed version
Upgrade explicitly to avoid silently upgrading to newer versions.
When an in compatibility is found and using 'latest' (or '*') it'll
be hard to track which version worked using e.g. git-bisect as
it'd get the latest still.
It also ensures that the dependencies are the same for different
developers with and without npm-cache locally.
Using a service like https://david-dm.org/wikimedia/citoid one
can quickly check if there are newer versions available.
Change-Id: I98cced5d5eeedbb7554103f449bbc2afa073327c
---
M package.json
1 file changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid
refs/changes/86/177486/1
diff --git a/package.json b/package.json
index a007ada..f427361 100644
--- a/package.json
+++ b/package.json
@@ -1,19 +1,19 @@
{
"name" : "citoid",
- "description" : "Converts search terms such as URL or title into
citations",
"version" : "0.0.0",
+ "description" : "Converts search terms such as URL or title into
citations.",
"dependencies" : {
- "async" : "latest",
- "bluebird" : "latest",
- "body-parser" : "latest",
- "bunyan" : "latest",
- "cheerio" : "latest",
- "express" : "latest",
- "path": "latest",
- "request" : "latest",
- "xmldom" : "latest",
- "xpath" : "latest",
- "yargs": "latest"
+ "async" : "0.9.0",
+ "bluebird" : "2.3.11",
+ "body-parser" : "1.10.0",
+ "bunyan" : "1.2.3",
+ "cheerio" : "0.18.0",
+ "express" : "4.10.4",
+ "path": "0.4.9",
+ "request" : "2.49.0",
+ "xmldom" : "0.1.19",
+ "xpath" : "0.0.7",
+ "yargs": "1.3.3"
},
"repository": {
"type": "git",
--
To view, visit https://gerrit.wikimedia.org/r/177486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I98cced5d5eeedbb7554103f449bbc2afa073327c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
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] package.json: Point git-url to Git repository instead of Ger... - change (mediawiki...citoid)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177485
Change subject: package.json: Point git-url to Git repository instead of Gerrit
project page
..
package.json: Point git-url to Git repository instead of Gerrit project page
Change-Id: I014a9bd91cb33d30e877fbf7715b20b7975aa16b
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid
refs/changes/85/177485/1
diff --git a/package.json b/package.json
index bc76360..a007ada 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,6 @@
},
"repository": {
"type": "git",
- "url":
"https://gerrit.wikimedia.org/r/p/mediawiki/services/citoid";
+ "url":
"https://gerrit.wikimedia.org/r/mediawiki/services/citoid";
}
}
--
To view, visit https://gerrit.wikimedia.org/r/177485
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I014a9bd91cb33d30e877fbf7715b20b7975aa16b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
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] Create citoid-npm job and enable (non-voting) - change (integration/config)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177484
Change subject: Create citoid-npm job and enable (non-voting)
..
Create citoid-npm job and enable (non-voting)
Change-Id: I6973bc83bf3a6dc88efe876113ed8c75512469ce
---
M jjb/misc.yaml
M zuul/layout.yaml
2 files changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/84/177484/1
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index a6b7980..d5289db 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -108,3 +108,8 @@
- '{name}-phplint'
- '{name}-phpunit'
- php-composer-validate
+
+- project:
+name: 'citoid'
+jobs:
+ - '{name}-npm'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 9077915..aae495c 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1538,6 +1538,9 @@
- name: cdb-phpunit
voting: false
+ - name: citoid-npm
+voting: false
+
# Rejecting changes having trailing whitespaces cause too many false
# positives. So only report the whitespace issues, but don't let it vote.
- name: ^.*-whitespaces$
@@ -5150,6 +5153,12 @@
gate-and-submit:
- jobrunner-phplint
+ - name: mediawiki/services/citoid
+test:
+ - citoid-npm
+gate-and-submit:
+ - citoid-npm
+
- name: mediawiki/services/mathoid
test:
- mathoidsvc-debian-glue
--
To view, visit https://gerrit.wikimedia.org/r/177484
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6973bc83bf3a6dc88efe876113ed8c75512469ce
Gerrit-PatchSet: 1
Gerrit-Project: integration/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] Import stdlib from operations/puppet - change (mediawiki/vagrant)
Chad has uploaded a new change for review. https://gerrit.wikimedia.org/r/177483 Change subject: Import stdlib from operations/puppet .. Import stdlib from operations/puppet Change-Id: I1d2b3a1e3c6598693a902d0a2c856d45f3b48be6 --- A puppet/modules/stdlib/CHANGELOG.md A puppet/modules/stdlib/LICENSE A puppet/modules/stdlib/Modulefile A puppet/modules/stdlib/README.markdown A puppet/modules/stdlib/README_DEVELOPER.markdown A puppet/modules/stdlib/RELEASE_PROCESS.markdown A puppet/modules/stdlib/Rakefile A puppet/modules/stdlib/lib/facter/facter_dot_d.rb A puppet/modules/stdlib/lib/facter/pe_version.rb A puppet/modules/stdlib/lib/facter/puppet_vardir.rb A puppet/modules/stdlib/lib/facter/root_home.rb A puppet/modules/stdlib/lib/facter/util/puppet_settings.rb A puppet/modules/stdlib/lib/puppet/parser/functions/abs.rb A puppet/modules/stdlib/lib/puppet/parser/functions/bool2num.rb A puppet/modules/stdlib/lib/puppet/parser/functions/capitalize.rb A puppet/modules/stdlib/lib/puppet/parser/functions/chomp.rb A puppet/modules/stdlib/lib/puppet/parser/functions/chop.rb A puppet/modules/stdlib/lib/puppet/parser/functions/defined_with_params.rb A puppet/modules/stdlib/lib/puppet/parser/functions/delete.rb A puppet/modules/stdlib/lib/puppet/parser/functions/delete_at.rb A puppet/modules/stdlib/lib/puppet/parser/functions/downcase.rb A puppet/modules/stdlib/lib/puppet/parser/functions/empty.rb A puppet/modules/stdlib/lib/puppet/parser/functions/ensure_packages.rb A puppet/modules/stdlib/lib/puppet/parser/functions/ensure_resource.rb A puppet/modules/stdlib/lib/puppet/parser/functions/flatten.rb A puppet/modules/stdlib/lib/puppet/parser/functions/floor.rb A puppet/modules/stdlib/lib/puppet/parser/functions/fqdn_rotate.rb A puppet/modules/stdlib/lib/puppet/parser/functions/get_module_path.rb A puppet/modules/stdlib/lib/puppet/parser/functions/getvar.rb A puppet/modules/stdlib/lib/puppet/parser/functions/grep.rb A puppet/modules/stdlib/lib/puppet/parser/functions/has_interface_with.rb A puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_address.rb A puppet/modules/stdlib/lib/puppet/parser/functions/has_ip_network.rb A puppet/modules/stdlib/lib/puppet/parser/functions/has_key.rb A puppet/modules/stdlib/lib/puppet/parser/functions/hash.rb A puppet/modules/stdlib/lib/puppet/parser/functions/is_array.rb A puppet/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb A puppet/modules/stdlib/lib/puppet/parser/functions/is_float.rb A puppet/modules/stdlib/lib/puppet/parser/functions/is_hash.rb A puppet/modules/stdlib/lib/puppet/parser/functions/is_integer.rb A puppet/modules/stdlib/lib/puppet/parser/functions/is_ip_address.rb A puppet/modules/stdlib/lib/puppet/parser/functions/is_mac_address.rb A puppet/modules/stdlib/lib/puppet/parser/functions/is_numeric.rb A puppet/modules/stdlib/lib/puppet/parser/functions/is_string.rb A puppet/modules/stdlib/lib/puppet/parser/functions/join.rb A puppet/modules/stdlib/lib/puppet/parser/functions/join_keys_to_values.rb A puppet/modules/stdlib/lib/puppet/parser/functions/keys.rb A puppet/modules/stdlib/lib/puppet/parser/functions/loadyaml.rb A puppet/modules/stdlib/lib/puppet/parser/functions/lstrip.rb A puppet/modules/stdlib/lib/puppet/parser/functions/max.rb A puppet/modules/stdlib/lib/puppet/parser/functions/member.rb A puppet/modules/stdlib/lib/puppet/parser/functions/merge.rb A puppet/modules/stdlib/lib/puppet/parser/functions/min.rb A puppet/modules/stdlib/lib/puppet/parser/functions/num2bool.rb A puppet/modules/stdlib/lib/puppet/parser/functions/parsejson.rb A puppet/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb A puppet/modules/stdlib/lib/puppet/parser/functions/pick.rb A puppet/modules/stdlib/lib/puppet/parser/functions/prefix.rb A puppet/modules/stdlib/lib/puppet/parser/functions/range.rb A puppet/modules/stdlib/lib/puppet/parser/functions/reject.rb A puppet/modules/stdlib/lib/puppet/parser/functions/reverse.rb A puppet/modules/stdlib/lib/puppet/parser/functions/rstrip.rb A puppet/modules/stdlib/lib/puppet/parser/functions/shuffle.rb A puppet/modules/stdlib/lib/puppet/parser/functions/size.rb A puppet/modules/stdlib/lib/puppet/parser/functions/sort.rb A puppet/modules/stdlib/lib/puppet/parser/functions/squeeze.rb A puppet/modules/stdlib/lib/puppet/parser/functions/str2bool.rb A puppet/modules/stdlib/lib/puppet/parser/functions/str2saltedsha512.rb A puppet/modules/stdlib/lib/puppet/parser/functions/strftime.rb A puppet/modules/stdlib/lib/puppet/parser/functions/strip.rb A puppet/modules/stdlib/lib/puppet/parser/functions/swapcase.rb A puppet/modules/stdlib/lib/puppet/parser/functions/time.rb A puppet/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb A puppet/modules/stdlib/lib/puppet/parser/functions/type.rb A puppet/modules/stdlib/lib/puppet/parser/functions/unique.rb A puppet/modules/stdlib/lib/puppet/parser/functions/upcase.rb A puppet/modules/stdlib/lib/puppet/parser/functions/uries
[MediaWiki-commits] [Gerrit] Add default nodeName to annotations - change (VisualEditor/VisualEditor)
Divec has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177482
Change subject: Add default nodeName to annotations
..
Add default nodeName to annotations
Previously, annotations from document parsing were treated as different from
annotations generated in the UI, the latter having no nodeName.
Change-Id: Iab164197877ce992a87f326560c2f41f790b9994
---
M src/dm/ve.dm.Annotation.js
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/82/177482/1
diff --git a/src/dm/ve.dm.Annotation.js b/src/dm/ve.dm.Annotation.js
index be6ac14..30c333a 100644
--- a/src/dm/ve.dm.Annotation.js
+++ b/src/dm/ve.dm.Annotation.js
@@ -21,6 +21,15 @@
ve.dm.Annotation = function VeDmAnnotation( element ) {
// Parent constructor
ve.dm.Model.call( this, element );
+
+ // Add default nodeName
+ if ( !element.attributes ) {
+ element.attributes = {};
+ }
+ if ( !element.attributes.nodeName ) {
+ element.attributes.nodeName =
this.constructor.static.matchTagNames[0];
+ }
+
// Properties
this.name = this.constructor.static.name; // For ease of filtering
};
--
To view, visit https://gerrit.wikimedia.org/r/177482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab164197877ce992a87f326560c2f41f790b9994
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Declare profiler in CLI mode (though it is not used) to supp... - change (operations/mediawiki-config)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177481
Change subject: Declare profiler in CLI mode (though it is not used) to support
--profiler
..
Declare profiler in CLI mode (though it is not used) to support --profiler
Change-Id: I520e146f48f4d41eb773d4042f7aec79f3d2bf87
---
M wmf-config/StartProfiler.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/81/177481/1
diff --git a/wmf-config/StartProfiler.php b/wmf-config/StartProfiler.php
index 6d233af..5ccd260 100644
--- a/wmf-config/StartProfiler.php
+++ b/wmf-config/StartProfiler.php
@@ -23,7 +23,7 @@
$wgProfiler['output'] = 'udp';
$wgProfiler['profileID'] = 'test2';
# Normal case: randomly (or not) selected for logged profiling sample
-} elseif ( PHP_SAPI !== 'cli' && $wmfDatacenter == 'eqiad' ) {
+} elseif ( $wmfDatacenter == 'eqiad' ) {
$wgProfiler['class'] = 'ProfilerStandard';
$wgProfiler['output'] = 'udp';
$wgProfiler['sampling'] = 50;
--
To view, visit https://gerrit.wikimedia.org/r/177481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I520e146f48f4d41eb773d4042f7aec79f3d2bf87
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] Bump master - change (mediawiki...deploy)
GWicke has submitted this change and it was merged. Change subject: Bump master .. Bump master Change-Id: I565828d6797019e6c70880a92ed1cf5bedbe86d6 --- M restbase 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: GWicke: Verified; Looks good to me, approved diff --git a/restbase b/restbase index 6a97546..3f9e631 16 --- a/restbase +++ b/restbase -Subproject commit 6a97546fbc38af4105d90320de26c50fa4cc5a55 +Subproject commit 3f9e63130b23fe1319cc38bed0fed42ef72a9522 -- To view, visit https://gerrit.wikimedia.org/r/177480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I565828d6797019e6c70880a92ed1cf5bedbe86d6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: GWicke Gerrit-Reviewer: GWicke ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump master - change (mediawiki...deploy)
GWicke has uploaded a new change for review. https://gerrit.wikimedia.org/r/177480 Change subject: Bump master .. Bump master Change-Id: I565828d6797019e6c70880a92ed1cf5bedbe86d6 --- M restbase 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/80/177480/1 diff --git a/restbase b/restbase index 6a97546..3f9e631 16 --- a/restbase +++ b/restbase -Subproject commit 6a97546fbc38af4105d90320de26c50fa4cc5a55 +Subproject commit 3f9e63130b23fe1319cc38bed0fed42ef72a9522 -- To view, visit https://gerrit.wikimedia.org/r/177480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I565828d6797019e6c70880a92ed1cf5bedbe86d6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: GWicke ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Install php5-xhprof unconditionally for PHP5 users - change (mediawiki/vagrant)
Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177479
Change subject: Install php5-xhprof unconditionally for PHP5 users
..
Install php5-xhprof unconditionally for PHP5 users
We're relying on it for development nowadays considering HHVM ships
it by default and it far outperforms MediaWiki's homegrown profiler.
Drop the role as it was pretty buggy anyway. We lose the fancy UI
stuff but I think that's an ok tradeoff for a working install and
parity with HHVM. You don't really need it for MediaWiki profiling
anyway.
Change-Id: Icac3c46e8838633c7bf52f54ebc51cc72ff9b020
---
M puppet/modules/php/manifests/init.pp
M puppet/modules/role/manifests/xhprof.pp
D puppet/modules/xhprof/files/xhprof-apache-config
D puppet/modules/xhprof/manifests/init.pp
4 files changed, 2 insertions(+), 84 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/79/177479/1
diff --git a/puppet/modules/php/manifests/init.pp
b/puppet/modules/php/manifests/init.pp
index 6b42f6d..f6aeaa9 100644
--- a/puppet/modules/php/manifests/init.pp
+++ b/puppet/modules/php/manifests/init.pp
@@ -24,6 +24,7 @@
'php5-mysql',
'php5-sqlite',
'php5-readline',
+'php5-xhprof',
]:
ensure => present,
require => Class['::apache::mod::php5'],
diff --git a/puppet/modules/role/manifests/xhprof.pp
b/puppet/modules/role/manifests/xhprof.pp
index 4b81ffc..7d16ccb 100644
--- a/puppet/modules/role/manifests/xhprof.pp
+++ b/puppet/modules/role/manifests/xhprof.pp
@@ -15,7 +15,5 @@
# } );
#
class role::xhprof {
-include ::xhprof
-
-require_package('graphviz')
+# include ::xhprof
}
diff --git a/puppet/modules/xhprof/files/xhprof-apache-config
b/puppet/modules/xhprof/files/xhprof-apache-config
deleted file mode 100644
index 4d83082..000
--- a/puppet/modules/xhprof/files/xhprof-apache-config
+++ /dev/null
@@ -1,11 +0,0 @@
-# vim: filetype=apache sts=4 sw=4 autoindent
-#
-# Apache site configuration for XHProf
-# This file is managed by Puppet.
-#
-
-
-
-
-Alias /xhprof "/usr/share/php/xhprof_html"
-
diff --git a/puppet/modules/xhprof/manifests/init.pp
b/puppet/modules/xhprof/manifests/init.pp
deleted file mode 100644
index 3772adb..000
--- a/puppet/modules/xhprof/manifests/init.pp
+++ /dev/null
@@ -1,70 +0,0 @@
-# == Class: xhprof
-#
-# This Puppet class configures XHProf, a function-level hierarchical
-# profiler for PHP with a simple HTML based navigational interface.
-#
-# === Parameters
-#
-# [*profile_storage_dir*]
-# Path where profiles should be stored. Default: '/vagrant/profiles'.
-#
-class xhprof (
-$profile_storage_dir = '/vagrant/profiles'
-) {
-
-$xhprof_version = '0.9.4'
-$installed_module= '/usr/lib/php5/20121212/xhprof.so'
-
-exec { 'download_xhprof':
-cwd => '/tmp',
-creates => $installed_module,
-command => "wget http://pecl.php.net/get/xhprof-${xhprof_version}.tgz";,
-}
-
-exec { 'extract_xhprof':
-cwd => '/tmp',
-command => "tar -xzf xhprof-${xhprof_version}.tgz",
-creates => $installed_module,
-require => Exec['download_xhprof'],
-}
-
-exec { 'install_xhprof':
-cwd => "/tmp/xhprof-${xhprof_version}/extension",
-command => 'phpize && ./configure && make && make install',
-creates => $installed_module,
-require => [ Exec['extract_xhprof'], Package['php5-dev'] ],
-}
-
-exec { 'install_xhprof_assets':
-cwd => "/tmp/xhprof-${xhprof_version}",
-command => "cp -rf /tmp/xhprof-${xhprof_version}/xhprof_html
/tmp/xhprof-${xhprof_version}/xhprof_lib /usr/share/php",
-creates => '/usr/share/php/xhprof_html',
-# php-pear ensures existance of /usr/share/php, better way?
-require => [ Exec['install_xhprof'], Package['php-pear'] ],
-}
-
-php::ini { 'xhprof':
-require => Exec['install_xhprof'],
-settings => {
-'extension' => 'xhprof.so',
-# Not used by the extension directly, used by the
-# XHProf_Runs utility class
-'xhprof.output_dir' => $profile_storage_dir,
-}
-}
-
-# Directory used, by default, to store profile runs
-file { $profile_storage_dir:
-ensure => directory,
-owner => $::share_owner,
-group => $::share_group,
-mode => '0775',
-}
-
-# Enable xhprof viewer on /xhprof directory of devwiki
-apache::conf { 'xhprof':
-ensure => present,
-source => 'puppet:///modules/xhprof/xhprof-apache-config',
-require => Php::Ini['xhprof'],
-}
-}
--
To view, visit https://gerrit.wikimedia.org/r/177479
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icac3c46e8838633c7bf52f54ebc51cc72ff9b020
Gerrit-PatchSet: 1
Gerrit-Project:
[MediaWiki-commits] [Gerrit] Citoid: Implement BibTeX format - change (mediawiki...citoid)
Sn1per has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177478
Change subject: Citoid: Implement BibTeX format
..
Citoid: Implement BibTeX format
Adds BibTeX format so that requested citation of URL is returned in BibTeX
format. Unfortunately the method for getting the Zotero translation server URL
in zotero.js is kinda cheap (it saves the opts when ZoteroWebRequest is run
from requestFromWeb), so if you have a better solution, I will definitely
change it.
Bug:T1083
Change-Id: Ib5f7a178bb94082cb155172ec2165f55353ec174
---
M lib/requests.js
M lib/zotero.js
2 files changed, 72 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid
refs/changes/78/177478/1
diff --git a/lib/requests.js b/lib/requests.js
index e1e82bc..31babf2 100644
--- a/lib/requests.js
+++ b/lib/requests.js
@@ -10,20 +10,19 @@
var log = bunyan.createLogger({name: "citoid"});
var unshorten = require('./unshorten.js');
var scrape = require('./scrape.js').scrape;
-var zoteroRequest = require('./zotero.js').zoteroRequest;
+var zoteroWebRequest = require('./zotero.js').zoteroWebRequest;
var pubMedRequest = require('./pubMedRequest.js');
var util = require('util');
/**
* Request citation metadata from a URL
* @param {String} requestedURL URL metadata is being requested about
- * @param {Object} opts zoteroRequest options object
+ * @param {Object} opts zoteroWebRequest options object
* @param {Function} callback callback (error, statusCode, body)
*/
var requestFromURL = function (requestedURL, opts, callback){
- opts.zoteroURL = util.format(opts.zoteroURL, 'web'); //use web endpoint
- zoteroRequest(requestedURL, opts, function(error, response, body){
+ zoteroWebRequest(requestedURL, opts, function(error, response, body){
log.info("Zotero request made for: " + requestedURL);
if (error) {
log.error(error);
@@ -44,7 +43,7 @@
unshorten(requestedURL, function(detected,
expandedURL) {
if (detected) {
log.info("Redirect detected to
"+ expandedURL);
- zoteroRequest(expandedURL,
opts, function(error, response, body){
+ zoteroWebRequest(expandedURL,
opts, function(error, response, body){
if (response && !error
&& response.statusCode == 200){
log.info("Successfully retrieved and translated body from Zotero");
callback(null,
200, body);
@@ -84,7 +83,7 @@
/**
* Request citation metadata from a DOI
* @param {String} requestedDOI DOI pointing to URL metadata is being
requested about
- * @param {Object} opts zoteroRequest options object
+ * @param {Object} opts zoteroWebRequest options object
* @param {Function} callback callback (error, statusCode, body)
*/
@@ -99,7 +98,7 @@
/**
* Request citation metadata from a PubMed identifier. Supports PMID, PMCID,
Manuscript ID and versioned identifiers
* @param {String} requestedPubMedID PubMed identifier for which metadata
is being requested. PMCID identifiers must begin with 'PMC'
- * @param {Object} opts zoteroRequest options object
+ * @param {Object} opts zoteroWebRequest options object
* @param {Function} callback callback (error, statusCode, body)
*/
diff --git a/lib/zotero.js b/lib/zotero.js
index 32aad12..03c5634 100644
--- a/lib/zotero.js
+++ b/lib/zotero.js
@@ -7,17 +7,22 @@
var request = require('request');
var async = require('async');
+var util = require('util');
var pubMedRequest = require('./pubMedRequest.js');
+var globalOpts;
+
/**
- * Requests to Zotero server
+ * Requests to Zotero server endpoint /web
* @param {String} requestedURL url being requested
* @param {Object} opts options for request
* @param {Function} callback callback(error, response, body)
*/
-var zoteroRequest = function(requestedURL, opts, callback){
+var zoteroWebRequest = function(requestedURL, opts, callback){
+globalOpts = opts;
+
var options = {
- url: opts.zoteroURL,
+ url: util.format(opts.zoteroURL, 'web'),
method: 'POST',
json: {
"url": requestedURL,
@@ -39,12 +44,37 @@
});
};
+/**
+ * Request to Zotero server endpoint /export
+ * @param {Object} citation Zotero JSON citation to be converted
+ * @param {Object} opts options for request
+ * @param {Function} callback callback(error, response, body)
+
[MediaWiki-commits] [Gerrit] Rename #wikimedia-corefeatures to #wikimedia-collaboration - change (labs...wikibugs2)
Legoktm has submitted this change and it was merged.
Change subject: Rename #wikimedia-corefeatures to #wikimedia-collaboration
..
Rename #wikimedia-corefeatures to #wikimedia-collaboration
Added a note about #core-features project as well.
Change-Id: I82602c1e9a61738c5e55ccac6a0b7183b04ca18f
---
M channels.yaml
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Verified; Looks good to me, approved
diff --git a/channels.yaml b/channels.yaml
index c398aa3..24d793c 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -18,7 +18,7 @@
# x.get("X-Bugzilla-Component", None) in ["Wikidata"]
- Wikimedia-Wikidata
-"#wikimedia-corefeatures":
+"#wikimedia-collaboration":
# x.get("X-Bugzilla-Product", None) == "MediaWiki extensions") and \
# x.get("X-Bugzilla-Component", None) in ["Echo", "Flow",
"PageCuration", "Thanks", "WikiLove"]),
- MediaWiki-extensions-Echo
@@ -26,6 +26,7 @@
- MediaWiki-extensions-PageCuration
- MediaWiki-extensions-Thanks
- MediaWiki-extensions-WikiLove
+- Collaboration-Team
"#mediawiki-i18n":
# x.get("X-Bugzilla-Component", None) in ["ContentTranslation"]),
--
To view, visit https://gerrit.wikimedia.org/r/177372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I82602c1e9a61738c5e55ccac6a0b7183b04ca18f
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Mattflaschen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't attempt to stash new section edits - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't attempt to stash new section edits
..
Don't attempt to stash new section edits
The parser output of edits produced via the 'new section' interface varies on
both the edit body and the edit summary (since it determines the new section's
name). So there isn't an early point in the edit process where we can start
computing the edit output. We have to wait for the user to be completely
done, by which point edit-stashing provides no advantage.
Change-Id: Ida461e08189b75c5a508628d11dc929a6138814a
---
M resources/src/mediawiki.action/mediawiki.action.edit.stash.js
1 file changed, 14 insertions(+), 3 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
index 895cb03..9972321 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
@@ -13,7 +13,7 @@
token: token,
title: mw.config.get( 'wgPageName' ),
section: data.wpSection,
- sectiontitle: data.wpSection === 'new' ?
data.wpSummary : '',
+ sectiontitle: '',
text: data.wpTextbox1,
contentmodel: data.model,
contentformat: data.format,
@@ -21,11 +21,22 @@
} );
}
- $form.on( 'change', function () {
+ function onEditChanged() {
+ // If a stash request is already in flight, abort it,
since its
+ // payload has just been invalidated by this change.
if ( pending ) {
pending.abort();
}
api.getToken( 'edit' ).then( stashEdit );
- } );
+ }
+
+ // We don't attempt to stash new section edits because in such
cases
+ // the parser output varies on the edit summary (since it
determines
+ // the new section's name).
+ if ( $form.find( 'input[name=wpSection]' ).val() === 'new' ) {
+ return;
+ }
+
+ $form.find( '#wpTextbox1' ).on( 'change', onEditChanged );
} );
}( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/177470
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida461e08189b75c5a508628d11dc929a6138814a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update dependencies - change (mediawiki...deploy)
GWicke has submitted this change and it was merged. Change subject: Update dependencies .. Update dependencies Change-Id: I035f437bbeb2a5e6be847c854242e04ded325d02 --- M node_modules/bunyan/AUTHORS M node_modules/bunyan/CHANGES.md M node_modules/bunyan/Makefile M node_modules/bunyan/README.md M node_modules/bunyan/bin/bunyan M node_modules/bunyan/lib/bunyan.js D node_modules/bunyan/node_modules/dtrace-provider/.npmignore D node_modules/bunyan/node_modules/dtrace-provider/CHANGES.md D node_modules/bunyan/node_modules/dtrace-provider/LICENCE D node_modules/bunyan/node_modules/dtrace-provider/README.md D node_modules/bunyan/node_modules/dtrace-provider/TODO.md D node_modules/bunyan/node_modules/dtrace-provider/compile.py D node_modules/bunyan/node_modules/dtrace-provider/dtrace-provider.js D node_modules/bunyan/node_modules/dtrace-provider/dtrace_argument.cc D node_modules/bunyan/node_modules/dtrace-provider/dtrace_probe.cc D node_modules/bunyan/node_modules/dtrace-provider/dtrace_provider.cc D node_modules/bunyan/node_modules/dtrace-provider/dtrace_provider.h D node_modules/bunyan/node_modules/dtrace-provider/libusdt-arch.js D node_modules/bunyan/node_modules/dtrace-provider/libusdt-build.sh D node_modules/bunyan/node_modules/dtrace-provider/libusdt/.npmignore D node_modules/bunyan/node_modules/dtrace-provider/libusdt/LICENCE D node_modules/bunyan/node_modules/dtrace-provider/libusdt/Makefile D node_modules/bunyan/node_modules/dtrace-provider/libusdt/README.md D node_modules/bunyan/node_modules/dtrace-provider/libusdt/test.pl D node_modules/bunyan/node_modules/dtrace-provider/libusdt/test_mem_usage.c D node_modules/bunyan/node_modules/dtrace-provider/libusdt/test_usdt.c D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt.c D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt.h D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_dof.c D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_dof_file.c D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_dof_sections.c D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_internal.h D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_probe.c D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_tracepoints_i386.s D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_tracepoints_x86_64.s D node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/.dntrc D node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/CHANGELOG.md D node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/LICENSE D node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/README.md D node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/appveyor.yml D node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/include_dirs.js D node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan.h D node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/package.json D node_modules/bunyan/node_modules/dtrace-provider/package.json D node_modules/bunyan/node_modules/dtrace-provider/package.json.rej D node_modules/bunyan/node_modules/dtrace-provider/scripts/install.js D node_modules/bunyan/node_modules/dtrace-provider/test/32probe-char.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/32probe-char_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/32probe.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/32probe_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/add-probes.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/add-probes_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/basic.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/basic_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/create-destroy.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/create-destroy_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/disambiguation.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/disambiguation_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/dtrace-test.js D node_modules/bunyan/node_modules/dtrace-provider/test/enabled-disabled.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/enabled-disabled_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/enabledagain.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/enabledagain_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/fewer-args-json.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/fewer-args-json_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/fewer-args.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/fewer-args_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/gc.js D node_modules/bunyan/node_modules/dtrace-provider/test/gc.te
[MediaWiki-commits] [Gerrit] Update dependencies - change (mediawiki...deploy)
GWicke has uploaded a new change for review. https://gerrit.wikimedia.org/r/177477 Change subject: Update dependencies .. Update dependencies Change-Id: I035f437bbeb2a5e6be847c854242e04ded325d02 --- M node_modules/bunyan/AUTHORS M node_modules/bunyan/CHANGES.md M node_modules/bunyan/Makefile M node_modules/bunyan/README.md M node_modules/bunyan/bin/bunyan M node_modules/bunyan/lib/bunyan.js D node_modules/bunyan/node_modules/dtrace-provider/.npmignore D node_modules/bunyan/node_modules/dtrace-provider/CHANGES.md D node_modules/bunyan/node_modules/dtrace-provider/LICENCE D node_modules/bunyan/node_modules/dtrace-provider/README.md D node_modules/bunyan/node_modules/dtrace-provider/TODO.md D node_modules/bunyan/node_modules/dtrace-provider/compile.py D node_modules/bunyan/node_modules/dtrace-provider/dtrace-provider.js D node_modules/bunyan/node_modules/dtrace-provider/dtrace_argument.cc D node_modules/bunyan/node_modules/dtrace-provider/dtrace_probe.cc D node_modules/bunyan/node_modules/dtrace-provider/dtrace_provider.cc D node_modules/bunyan/node_modules/dtrace-provider/dtrace_provider.h D node_modules/bunyan/node_modules/dtrace-provider/libusdt-arch.js D node_modules/bunyan/node_modules/dtrace-provider/libusdt-build.sh D node_modules/bunyan/node_modules/dtrace-provider/libusdt/.npmignore D node_modules/bunyan/node_modules/dtrace-provider/libusdt/LICENCE D node_modules/bunyan/node_modules/dtrace-provider/libusdt/Makefile D node_modules/bunyan/node_modules/dtrace-provider/libusdt/README.md D node_modules/bunyan/node_modules/dtrace-provider/libusdt/test.pl D node_modules/bunyan/node_modules/dtrace-provider/libusdt/test_mem_usage.c D node_modules/bunyan/node_modules/dtrace-provider/libusdt/test_usdt.c D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt.c D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt.h D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_dof.c D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_dof_file.c D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_dof_sections.c D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_internal.h D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_probe.c D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_tracepoints_i386.s D node_modules/bunyan/node_modules/dtrace-provider/libusdt/usdt_tracepoints_x86_64.s D node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/.dntrc D node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/CHANGELOG.md D node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/LICENSE D node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/README.md D node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/appveyor.yml D node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/include_dirs.js D node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan.h D node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/package.json D node_modules/bunyan/node_modules/dtrace-provider/package.json D node_modules/bunyan/node_modules/dtrace-provider/package.json.rej D node_modules/bunyan/node_modules/dtrace-provider/scripts/install.js D node_modules/bunyan/node_modules/dtrace-provider/test/32probe-char.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/32probe-char_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/32probe.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/32probe_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/add-probes.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/add-probes_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/basic.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/basic_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/create-destroy.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/create-destroy_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/disambiguation.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/disambiguation_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/dtrace-test.js D node_modules/bunyan/node_modules/dtrace-provider/test/enabled-disabled.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/enabled-disabled_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/enabledagain.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/enabledagain_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/fewer-args-json.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/fewer-args-json_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/fewer-args.test.js D node_modules/bunyan/node_modules/dtrace-provider/test/fewer-args_fire.js D node_modules/bunyan/node_modules/dtrace-provider/test/gc.js D node_modules/bunyan/node_m
[MediaWiki-commits] [Gerrit] Rename #wikimedia-corefeatures to #wikimedia-collaboration - change (labs...grrrit)
jenkins-bot has submitted this change and it was merged.
Change subject: Rename #wikimedia-corefeatures to #wikimedia-collaboration
..
Rename #wikimedia-corefeatures to #wikimedia-collaboration
Change-Id: I13066f3d4f95563c4e3e3797ae01960c910eebe7
---
M config.yaml
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
Spage: Looks good to me, but someone else must approve
EBernhardson: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/config.yaml b/config.yaml
index 38901ec..1e1d916 100644
--- a/config.yaml
+++ b/config.yaml
@@ -50,7 +50,7 @@
"analytics/.*"
}
"#wikimedia-dev": {
-# These are sent to #wikimedia-corefeatures too
+# These are sent to #wikimedia-collaboration too
"mediawiki/extensions/Echo",
"mediawiki/extensions/Flow",
"mediawiki/extensions/PageTriage",
@@ -82,7 +82,7 @@
wikimedia/fundraising/.*:
mediawiki/core:
branch: ^fundraising
-"#wikimedia-corefeatures": {
+"#wikimedia-collaboration": {
"mediawiki/extensions/Echo",
"mediawiki/extensions/Flow",
"mediawiki/extensions/PageTriage",
--
To view, visit https://gerrit.wikimedia.org/r/177371
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I13066f3d4f95563c4e3e3797ae01960c910eebe7
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Spage
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove w/COPYING and w/CREDITS dead symlinks - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Remove w/COPYING and w/CREDITS dead symlinks .. Remove w/COPYING and w/CREDITS dead symlinks Not sure how useful these were to be exposed. But considering they were added on purpose, maybe we should add the new versions of these. Or add redirects, or keep back-compat symlinks. For now, removing the dead symlinks. Change-Id: I6594bc82b9de3f52a38e896db3f8dbfbda2ebed2 --- D w/COPYING D w/CREDITS 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/w/COPYING b/w/COPYING deleted file mode 12 index aace6cc..000 --- a/w/COPYING +++ /dev/null @@ -1 +0,0 @@ -../../php/COPYING \ No newline at end of file diff --git a/w/CREDITS b/w/CREDITS deleted file mode 12 index 7ef12ef..000 --- a/w/CREDITS +++ /dev/null @@ -1 +0,0 @@ -../../php/CREDITS \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/177476 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6594bc82b9de3f52a38e896db3f8dbfbda2ebed2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Krinkle 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] Remove w/COPYING and w/CREDITS dead symlinks - change (operations/mediawiki-config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/177476 Change subject: Remove w/COPYING and w/CREDITS dead symlinks .. Remove w/COPYING and w/CREDITS dead symlinks Not sure how useful these were to be exposed. But considering they were added on purpose, maybe we should add the new versions of these. Or add redirects, or keep back-compat symlinks. For now, removing the dead symlinks. Change-Id: I6594bc82b9de3f52a38e896db3f8dbfbda2ebed2 --- D w/COPYING D w/CREDITS 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/76/177476/1 diff --git a/w/COPYING b/w/COPYING deleted file mode 12 index aace6cc..000 --- a/w/COPYING +++ /dev/null @@ -1 +0,0 @@ -../../php/COPYING \ No newline at end of file diff --git a/w/CREDITS b/w/CREDITS deleted file mode 12 index 7ef12ef..000 --- a/w/CREDITS +++ /dev/null @@ -1 +0,0 @@ -../../php/CREDITS \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/177476 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6594bc82b9de3f52a38e896db3f8dbfbda2ebed2 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] Warn if a campaign's bucket assignments look funky - change (mediawiki...CentralNotice)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177475
Change subject: Warn if a campaign's bucket assignments look funky
..
Warn if a campaign's bucket assignments look funky
Change-Id: I72467516a491f008a93ebb5849e0dae1496b530d
---
M special/SpecialCentralNotice.php
1 file changed, 34 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/75/177475/1
diff --git a/special/SpecialCentralNotice.php b/special/SpecialCentralNotice.php
index 893bacb..15c59f8 100644
--- a/special/SpecialCentralNotice.php
+++ b/special/SpecialCentralNotice.php
@@ -675,6 +675,8 @@
// Begin Campaign detail fieldset
$htmlOut .= Xml::openElement( 'fieldset', array( 'class' =>
'prefsection' ) );
+ $this->calculateCampaignWarnings( $c );
+
if ( $this->editable ) {
$htmlOut .= Xml::openElement( 'form',
array(
@@ -736,6 +738,38 @@
}
/**
+* Look for any issues with this campaign's configuration
+*/
+ function calculateCampaignWarnings( Campaign $campaign ) {
+ // Test for campaign buckets without an assigned banner or with
multiple banners.
+ $assignedBuckets = array();
+ $banners = Banner::getCampaignBanners( $campaign->getId() );
+ $numBuckets = $campaign->getBuckets();
+ foreach ( $banners as $banner ) {
+ $bannerBucket = $banner['bucket'];
+
+ // If this campaign uses bucketing, is more than one
banner is
+ // assigned to any bucket?
+ if ( $numBuckets > 1
+ && array_key_exists( $bannerBucket,
$assignedBuckets )
+ // Note this nonsense. Banners appear once *per
device* :'-(
+ && $assignedBuckets[$bannerBucket] !==
$banner['name']
+ ) {
+ $this->getOutput()->wrapWikiMsg( "\n$1\n", 'cn-banner-overflowing-bucket',
$banner['name'] );
+ }
+ // If the bucket assignment is off the scale, something
went wrong.
+ if ( $bannerBucket >= $numBuckets ) {
+ $this->getOutput()->wrapWikiMsg( "\n$1\n", 'cn-banner-bad-bucket', $banner['name'] );
+ }
+ $assignedBuckets[$bannerBucket] = $banner['name'];
+ }
+ // Do any buckets not have a banner assigned?
+ if ( count( $assignedBuckets ) < $numBuckets ) {
+ $this->getOutput()->wrapWikiMsg( "\n$1\n", 'cn-banner-empty-bucket' );
+ }
+ }
+
+ /**
* Create form for managing campaign settings (start date, end date,
languages, etc.)
*/
function noticeDetailForm( $notice ) {
--
To view, visit https://gerrit.wikimedia.org/r/177475
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I72467516a491f008a93ebb5849e0dae1496b530d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Small fixups - change (mediawiki...CentralNotice)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177474
Change subject: Small fixups
..
Small fixups
Change-Id: I423f1cff99551fa8bb29356a41d3a11e535962f0
---
M includes/Banner.php
M includes/Campaign.php
2 files changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/74/177474/1
diff --git a/includes/Banner.php b/includes/Banner.php
index 37405bb..7af0f72 100644
--- a/includes/Banner.php
+++ b/includes/Banner.php
@@ -1219,7 +1219,7 @@
/**
* Given one or more campaign ids, return all banners bound to them
*
-* @param array $campaigns list of campaign numeric IDs
+* @param integer|array $campaigns list of campaign numeric IDs
*
* @return array a 2D array of banners with associated weights and
settings
*/
diff --git a/includes/Campaign.php b/includes/Campaign.php
index 7c65f1c..72f2145 100644
--- a/includes/Campaign.php
+++ b/includes/Campaign.php
@@ -180,11 +180,11 @@
* @return int
*/
public function getBuckets() {
- if ( $this->priority === null ) {
+ if ( $this->buckets === null ) {
$this->loadBasicSettings();
}
- return $this->priority;
+ return $this->buckets;
}
/**
@@ -224,6 +224,8 @@
__METHOD__
);
if ( $row ) {
+ $this->id = $row->not_id;
+ $this->name = $row->not_name;
$this->start = new MWTimestamp( $row->not_start );
$this->end = new MWTimestamp( $row->not_end );
$this->enabled = (bool)$row->not_enabled;
@@ -412,7 +414,7 @@
$campaign[ 'languages' ] = implode( ", ", $languages );
$campaign[ 'countries' ] = implode( ", ", $geo_countries );
- $bannersIn = Banner::getCampaignBanners( $row->not_id, true );
+ $bannersIn = Banner::getCampaignBanners( $row->not_id );
$bannersOut = array();
// All we want are the banner names, weights, and buckets
foreach ( $bannersIn as $key => $row ) {
--
To view, visit https://gerrit.wikimedia.org/r/177474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I423f1cff99551fa8bb29356a41d3a11e535962f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Remove !important from .flow-revision-content - change (mediawiki...Flow)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177473
Change subject: Hygiene: Remove !important from .flow-revision-content
..
Hygiene: Remove !important from .flow-revision-content
This class is only used when viewing single revisions of a header
(timestamp link in history page) or a post(not linked afaik). This
!important selector does not appear to be necessary anymore. Looking
through the git history it was added in the first commit I928373
without expanation.
Change-Id: Ie3e90aa4ae4b6f112e03d473344edaba20aaad04
---
M modules/styles/common.less
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/73/177473/1
diff --git a/modules/styles/common.less b/modules/styles/common.less
index 9d15db8..df955b9 100644
--- a/modules/styles/common.less
+++ b/modules/styles/common.less
@@ -41,7 +41,7 @@
// Revision view
.flow-revision-content {
background: none repeat scroll 0 0 #EDEDED;
- color: #77 !important;
+ color: #77;
margin-top: 20px;
padding: 10px;
}
--
To view, visit https://gerrit.wikimedia.org/r/177473
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3e90aa4ae4b6f112e03d473344edaba20aaad04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
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] Minor code clean up PHP and HTML files in w/ - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Minor code clean up PHP and HTML files in w/
..
Minor code clean up PHP and HTML files in w/
* Consistently use 'require_once' and 'require' fo the inclusion
of MWVersion and WebStart (extra2.php used 'include' still).
* {favicon,touch}.php
- Add doctype to avoid quirks mode.
- Remove redundant html/body tag.
- Do escaping closer to output.
* Whitespace, single quotes.
* 'require' and 'require_once' are not functions.
Change-Id: Ifbfb7dfd8fc0cd822b084d955f8afdbc51f26522
---
M extract2.php
M mobilelanding.php
M w/MWVersion.php
M w/favicon.php
M w/img_auth.php
M w/index.php
M w/load.php
M w/opensearch_desc.php
M w/query.php
M w/robots.php
M w/thumb.php
M w/touch.php
M w/wiki.phtml
13 files changed, 32 insertions(+), 31 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
Ori.livneh: Looks good to me, but someone else must approve
Reedy: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/extract2.php b/extract2.php
index 903bd5e..6443f49 100644
--- a/extract2.php
+++ b/extract2.php
@@ -2,8 +2,8 @@
$lang = 'meta';
putenv( "MW_LANG={$lang}" ); // notify MWMultiVersion
-include '/srv/mediawiki/w/MWVersion.php';
-include getMediaWiki( 'includes/WebStart.php' );
+require '/srv/mediawiki/w/MWVersion.php';
+require getMediaWiki( 'includes/WebStart.php' );
$allowed_templates = array(
'Www.wikimedia.org_template',
diff --git a/mobilelanding.php b/mobilelanding.php
index d1515c7..f2ca3bc 100644
--- a/mobilelanding.php
+++ b/mobilelanding.php
@@ -1,5 +1,5 @@
$html\n";
+ echo "\n" . htmlspecialchars( $text ) . "\n";
}
function streamFavicon() {
@@ -13,15 +13,15 @@
if ( $wgFavicon === '/favicon.ico' ) {
# That's not very helpful, that's where we are already
header( 'HTTP/1.1 404 Not Found' );
- faviconShowError( "\$wgFavicon is configured incorrectly, " .
- "it must be set to something other than /favicon.ico\n"
);
+ faviconShowError( '$wgFavicon is configured incorrectly, ' .
+ 'it must be set to something other than /favicon.ico' );
return;
}
$req = RequestContext::getMain()->getRequest();
if ( $req->getHeader( 'X-Favicon-Loop' ) !== false ) {
header( 'HTTP/1.1 500 Internal Server Error' );
- faviconShowError( "Proxy forwarding loop detected" );
+ faviconShowError( 'Proxy forwarding loop detected' );
return;
}
@@ -32,7 +32,7 @@
$status = $client->execute();
if ( !$status->isOK() ) {
header( 'HTTP/1.1 500 Internal Server Error' );
- faviconShowError( htmlspecialchars( "Failed to fetch URL
\"$url\"" ) );
+ faviconShowError( "Failed to fetch URL \"$url\"" );
return;
}
diff --git a/w/img_auth.php b/w/img_auth.php
index f5ea1d2..11d37cd 100644
--- a/w/img_auth.php
+++ b/w/img_auth.php
@@ -1,3 +1,3 @@
+header( 'HTTP/1.x 500 Gone' );
+?>
+
query.php is dead
@@ -13,7 +14,7 @@
are actively maintained..
";
+echo '';
?>
diff --git a/w/robots.php b/w/robots.php
index 1fe53fa..7e1910b 100644
--- a/w/robots.php
+++ b/w/robots.php
@@ -1,5 +1,5 @@
$html\n";
+ echo "\n" . htmlspecialchars( $text ) . "\n";
}
function streamAppleTouch() {
@@ -13,15 +13,15 @@
if ( $wgAppleTouchIcon === false ) {
# That's not very helpful, that's where we are already
header( 'HTTP/1.1 404 Not Found' );
- faviconShowError( "\$wgAppleTouchIcon is configured
incorrectly, " .
- "it must be set to something other than false \n" );
+ faviconShowError( '$wgAppleTouchIcon is configured incorrectly,
' .
+ 'it must be set to something other than false \n' );
return;
}
$req = RequestContext::getMain()->getRequest();
if ( $req->getHeader( 'X-Favicon-Loop' ) !== false ) {
header( 'HTTP/1.1 500 Internal Server Error' );
- faviconShowError( "Proxy forwarding loop detected" );
+ faviconShowError( 'Proxy forwarding loop detected' );
return;
}
@@ -32,7 +32,7 @@
$status = $client->execute();
if ( !$status->isOK() ) {
header( 'HTTP/1.1 500 Internal Server Error' );
- faviconShowError( htmlspecialchars( "Failed to fetch URL
\"$url\"" ) );
+ faviconShowError( "Failed to fetch URL \"$url\"" );
return;
}
diff --git a/w/wiki.phtml b/w/wiki.phtml
index 1a229a1..e40d9a9 100644
--- a/w/wiki.phtml
+++ b/w/wiki.phtml
@@ -1,3 +1,3 @@
https://gerrit.wikimedia.org/r/177459
To unsubscribe, visit https://gerrit.wikimedia.
[MediaWiki-commits] [Gerrit] Increase specificity of api interaction selectors and remove... - change (mediawiki...Flow)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177472
Change subject: Increase specificity of api interaction selectors and remove
!important
..
Increase specificity of api interaction selectors and remove !important
I looked around and the two prefixed id's appear to be enough to win,
but I'm not sure i found every possible place they are used. I also
grepped through most of the flow specific css after less processing
to verify that we hardly use id selectors unless its to increase
specificity, and everywhere except this just one id.
Change-Id: Ia16671cf9cdbcc3e545103790b55e1b9007d9556
---
M modules/styles/js.less
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/72/177472/1
diff --git a/modules/styles/js.less b/modules/styles/js.less
index 029afe0..8766113 100644
--- a/modules/styles/js.less
+++ b/modules/styles/js.less
@@ -22,9 +22,9 @@
}
// API interaction indicator
- .flow-api-inprogress {
+ div#content div#bodyContent & .flow-api-inprogress {
opacity: 0.5;
- cursor: wait !important;
+ cursor: wait;
}
// A preview version of a given block
@@ -34,8 +34,8 @@
color: @colorRegressive;
}
- .flow-preview-target-hidden {
- display: none !important;
+ div#content div#bodyContent & .flow-preview-target-hidden {
+ display: none;
}
// With JS, hide .flow-nojs & display .flow-js elements
--
To view, visit https://gerrit.wikimedia.org/r/177472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia16671cf9cdbcc3e545103790b55e1b9007d9556
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
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] Resources: Split oojs-ui module styling into oojs-ui.styling - change (mediawiki/core)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/177471 Change subject: Resources: Split oojs-ui module styling into oojs-ui.styling .. Resources: Split oojs-ui module styling into oojs-ui.styling Change-Id: I56e7802c58ccf546c83901382abd8fcbe370fd0a --- M resources/Resources.php 1 file changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/71/177471/1 diff --git a/resources/Resources.php b/resources/Resources.php index c39ba3b..b096d7d 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1606,6 +1606,15 @@ 'default' => 'resources/lib/oojs-ui/oojs-ui-apex.js', 'minerva' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.js', ), + 'dependencies' => array( + 'es5-shim', + 'oojs', + 'oojs-ui.styling', + ), + 'targets' => array( 'desktop', 'mobile' ), + ), + + 'oojs-ui.styling' => array( 'skinStyles' => array( 'default' => 'resources/lib/oojs-ui/oojs-ui-apex.svg.css', 'minerva' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css', @@ -1623,10 +1632,6 @@ 'ooui-toolbar-more', 'ooui-toolgroup-collapse', 'ooui-toolgroup-expand', - ), - 'dependencies' => array( - 'es5-shim', - 'oojs', ), 'targets' => array( 'desktop', 'mobile' ), ), -- To view, visit https://gerrit.wikimedia.org/r/177471 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56e7802c58ccf546c83901382abd8fcbe370fd0a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't attempt to stash new section edits - change (mediawiki/core)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177470
Change subject: Don't attempt to stash new section edits
..
Don't attempt to stash new section edits
The parser output of edits produced via the 'new section' interface varies on
both the edit body and the edit summary (since it determines the new section's
name). So there isn't an early point in the edit process where we can start
computing the edit output. We have to wait for the user to be completely
done, by which point edit-stashing provides no advantage.
Change-Id: Ida461e08189b75c5a508628d11dc929a6138814a
---
M resources/src/mediawiki.action/mediawiki.action.edit.stash.js
1 file changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/70/177470/1
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
index 895cb03..22eb5f3 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.stash.js
@@ -5,6 +5,13 @@
$( function () {
var api = new mw.Api(), pending = null, $form = $( '#editform'
);
+ // We don't attempt to stash new section edits because in such
cases
+ // the parser output varies on the edit summary (since it
determines
+ // the new section's name).
+ if ( $form.find( 'input[name=wpSection]' ).val() === 'new' ) {
+ return;
+ }
+
function stashEdit( token ) {
var data = $form.serializeObject();
@@ -13,7 +20,7 @@
token: token,
title: mw.config.get( 'wgPageName' ),
section: data.wpSection,
- sectiontitle: data.wpSection === 'new' ?
data.wpSummary : '',
+ sectiontitle: '',
text: data.wpTextbox1,
contentmodel: data.model,
contentformat: data.format,
@@ -22,6 +29,8 @@
}
$form.on( 'change', function () {
+ // If a stash request is already in flight, abort it,
since its
+ // payload has just been invalidated by this change.
if ( pending ) {
pending.abort();
}
--
To view, visit https://gerrit.wikimedia.org/r/177470
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida461e08189b75c5a508628d11dc929a6138814a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Increase specificity of selector in .flow-topic-sum... - change (mediawiki...Flow)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177469
Change subject: Hygiene: Increase specificity of selector in
.flow-topic-summary and remove !important
..
Hygiene: Increase specificity of selector in .flow-topic-summary and remove
!important
Change-Id: Ib29229d6e35ce8f35097ffc126b2229f97bef02a
---
M modules/styles/board/topic/summary.less
1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/69/177469/1
diff --git a/modules/styles/board/topic/summary.less
b/modules/styles/board/topic/summary.less
index 11ee187..87ea676 100644
--- a/modules/styles/board/topic/summary.less
+++ b/modules/styles/board/topic/summary.less
@@ -7,11 +7,12 @@
border-top: 1px dotted @colorGrayLight;
margin-top: .33em;
- > p {
+ // Needs increased specificity to override `div#content p`
+ div#content & > p {
font-style: italic;
&:last-of-type {
// Remove margin-bottom from last p in summary, to
remove excess bottom whitespace
- margin-bottom: 0 !important; // @todo find a better way
to override div#content p
+ margin-bottom: 0;
}
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/177469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib29229d6e35ce8f35097ffc126b2229f97bef02a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
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] Merge remote-tracking branch 'origin/master' into HEAD - change (wikimedia...crm)
jenkins-bot has submitted this change and it was merged. Change subject: Merge remote-tracking branch 'origin/master' into HEAD .. Merge remote-tracking branch 'origin/master' into HEAD 38bd81aa7a77408dfe6d016b4f4a7d87aa0cebd3 Insert nulls for missing data Change-Id: I8762f8a49fb36e91cbe5e2087f1ca9ae06f3866f --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Awight: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/177467 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8762f8a49fb36e91cbe5e2087f1ca9ae06f3866f Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Awight Gerrit-Reviewer: Awight Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make jquery.client recognize IE12 correctly - change (mediawiki/core)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177468
Change subject: Make jquery.client recognize IE12 correctly
..
Make jquery.client recognize IE12 correctly
IE12's User-Agent is, unhelpfully:
Mozilla/5.0 (Windows NT 6.4; WOW64) AppleWebKit/537.36 (KHTML, like Gecko)
Chrome/36.0.1985.143 Safari/537.36 Edge/12.0
Unsurprisingly, this is currently recognized as Chrome 36.
The word "Trident" also doesn't appear any more, because IE12's
new layout engine is called "Edge". So look for that string instead.
Change-Id: I94a4ff2cc37ae6ce0c677ef92eeb6a2dff30c1f4
---
M resources/src/jquery/jquery.client.js
1 file changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/68/177468/1
diff --git a/resources/src/jquery/jquery.client.js
b/resources/src/jquery/jquery.client.js
index 662a688..3796b0b 100644
--- a/resources/src/jquery/jquery.client.js
+++ b/resources/src/jquery/jquery.client.js
@@ -87,11 +87,11 @@
// Tanslations for conforming browser names
nameTranslations = [],
// Names of known layout engines
- layouts = ['gecko', 'konqueror', 'msie',
'trident', 'opera', 'webkit'],
+ layouts = ['gecko', 'konqueror', 'msie',
'trident', 'edge', 'opera', 'webkit'],
// Translations for conforming layout names
layoutTranslations = [ ['konqueror', 'khtml'],
['msie', 'trident'], ['opera', 'presto'] ],
// Names of supported layout engines for
version number
- layoutVersions = ['applewebkit', 'gecko',
'trident'],
+ layoutVersions = ['applewebkit', 'gecko',
'trident', 'edge'],
// Names of known operating systems
platforms = ['win', 'wow64', 'mac', 'linux',
'sunos', 'solaris', 'iphone'],
// Translations for conforming operating system
names
@@ -173,6 +173,13 @@
version = match[1];
}
}
+ // And IE 12's different lies about not being IE
+ if ( name === 'chrome' && ( match = ua.match(
/\bedge\/([0-9\.]*)/ ) ) ) {
+ name = 'msie';
+ version = match[1];
+ layout = 'edge';
+ layoutversion = parseInt( match[1], 10 );
+ }
// And Amazon Silk's lies about being Android on mobile
or Safari on desktop
if ( match = ua.match( /\bsilk\/([0-9.\-_]*)/ ) ) {
if ( match[1] ) {
--
To view, visit https://gerrit.wikimedia.org/r/177468
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94a4ff2cc37ae6ce0c677ef92eeb6a2dff30c1f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'origin/master' into HEAD - change (wikimedia...crm)
Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/177467 Change subject: Merge remote-tracking branch 'origin/master' into HEAD .. Merge remote-tracking branch 'origin/master' into HEAD 38bd81aa7a77408dfe6d016b4f4a7d87aa0cebd3 Insert nulls for missing data Change-Id: I8762f8a49fb36e91cbe5e2087f1ca9ae06f3866f --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/67/177467/1 -- To view, visit https://gerrit.wikimedia.org/r/177467 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8762f8a49fb36e91cbe5e2087f1ca9ae06f3866f Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Awight ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Simplify Campaign editor banner list - change (mediawiki...CentralNotice)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177466
Change subject: Simplify Campaign editor banner list
..
Simplify Campaign editor banner list
Since we've disabled banner previewing, there's no reason to make lots of
queries to build the pager. Just link to the banners.
Change-Id: I3e4ac18eeccd4cf111e942003e06d805a236293a
---
M includes/BannerRenderer.php
M special/SpecialCentralNotice.php
2 files changed, 10 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/66/177466/1
diff --git a/includes/BannerRenderer.php b/includes/BannerRenderer.php
index 36fcdca..8b64845 100644
--- a/includes/BannerRenderer.php
+++ b/includes/BannerRenderer.php
@@ -52,6 +52,15 @@
);
}
+ // TODO: consolidate with above function
+ public static function linkToBanner( $name ) {
+ return Linker::link(
+ SpecialPage::getTitleFor( 'CentralNoticeBanners',
"edit/{$name}" ),
+ htmlspecialchars( $name ),
+ array( 'class' => 'cn-banner-title' )
+ );
+ }
+
/**
* Render the banner as an html fieldset
*/
diff --git a/special/SpecialCentralNotice.php b/special/SpecialCentralNotice.php
index 893bacb..86d0cc9 100644
--- a/special/SpecialCentralNotice.php
+++ b/special/SpecialCentralNotice.php
@@ -1018,11 +1018,8 @@
);
// Banner
- $banner = Banner::fromName( $row->tmp_name );
- $renderer = new BannerRenderer( $this->getContext(),
$banner );
$htmlOut .= Xml::tags( 'td', array( 'valign' => 'top' ),
- $renderer->linkTo() . '' .
- $renderer->previewFieldSet()
+ BannerRenderer::linkToBanner( $row->tmp_name )
);
$htmlOut .= Xml::closeElement( 'tr' );
--
To view, visit https://gerrit.wikimedia.org/r/177466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e4ac18eeccd4cf111e942003e06d805a236293a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: increase specificity of .flow-topic-title and remov... - change (mediawiki...Flow)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177465
Change subject: Hygiene: increase specificity of .flow-topic-title and remove
!important
..
Hygiene: increase specificity of .flow-topic-title and remove !important
Change-Id: I1cde1fe6cb4b4f92271518724165ad515325dc6e
---
M modules/styles/board/topic/titlebar.less
1 file changed, 4 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/65/177465/1
diff --git a/modules/styles/board/topic/titlebar.less
b/modules/styles/board/topic/titlebar.less
index 0990f3c..b127041 100644
--- a/modules/styles/board/topic/titlebar.less
+++ b/modules/styles/board/topic/titlebar.less
@@ -17,30 +17,12 @@
}
}
-// ...but only when titlebar is active
-.flow-element-collapsible-active {
- .flow-topic-titlebar {
- cursor: pointer;
-
- // Render a shadow
- &:hover,
- &:focus {
- .box-shadow( ~"inset 0 -1px 0px 1px
@{colorGrayLighter}, 0 1px 1px @{colorGrayLightest}" );
- }
-
- // Fade out the posts to show they will disappear
- &:hover + .flow-post {
- opacity: .85;
- }
- }
-}
-
-.flow-topic-title {
+// needs extra specificity to override `div#content h2` from Vector
+div#content .flow-topic-title {
padding: 0;
border-bottom: none;
- // @todo: !important needed to override default Vector styles on
div#content h2
- margin: 0 2.5em .15em 0 !important;
- font-family: sans-serif !important;
+ margin: 0 2.5em .15em 0;
+ font-family: sans-serif;
font-weight: bold;
word-break: break-word;
word-wrap: break-word;
--
To view, visit https://gerrit.wikimedia.org/r/177465
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1cde1fe6cb4b4f92271518724165ad515325dc6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
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] Show WikiGrok error - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Show WikiGrok error
..
Show WikiGrok error
An error dialog is shown whenever an error related to
WikiGrokResponseApi, WikiDataApi, or WikiGrokSuggestionApi happens.
The dialog informs the user about the error and can be dismissed.
Change-Id: I84270f602a8adaa853f6b2827ecc9e0921b12557
---
M includes/Resources.php
M javascripts/modules/wikigrok/WikiGrokDialog.js
M javascripts/modules/wikigrok/WikiGrokDialogB.js
M less/modules/wikigrok/WikiGrokDialog.less
A less/modules/wikigrok/images/w.svg
M templates/modules/wikigrok/WikiGrokDialog.hogan
M templates/modules/wikigrok/WikiGrokDialogB.hogan
A templates/modules/wikigrok/WikiGrokError.hogan
M tests/qunit/modules/wikigrok/test_WikiGrokDialogB.js
9 files changed, 148 insertions(+), 23 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 5dc50b4..c466587 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -954,6 +954,7 @@
'mobile.wikigrok.api',
),
'templates' => array(
+ 'Error.hogan' =>
'templates/modules/wikigrok/WikiGrokError.hogan',
'Dialog.hogan' =>
'templates/modules/wikigrok/WikiGrokDialog.hogan',
'WikiGrokMoreInfo/content.hogan' =>
'templates/modules/wikigrok/WikiGrokMoreInfo.hogan',
),
diff --git a/javascripts/modules/wikigrok/WikiGrokDialog.js
b/javascripts/modules/wikigrok/WikiGrokDialog.js
index 6dbcd99..df7d26d 100644
--- a/javascripts/modules/wikigrok/WikiGrokDialog.js
+++ b/javascripts/modules/wikigrok/WikiGrokDialog.js
@@ -46,6 +46,9 @@
noticeMsg: 'Tell me more'
},
template: mw.template.get( 'mobile.wikigrok.dialog',
'Dialog.hogan' ),
+ templatePartials: {
+ error: mw.template.get( 'mobile.wikigrok.dialog',
'Error.hogan' )
+ },
initialize: function ( options ) {
var self = this;
@@ -115,10 +118,21 @@
userToken: this.options.userToken,
isLoggedIn: !mw.user.isAnon()
};
+
if ( this.options.testing ) {
data.testing = true;
}
errorSchema.log( data );
+ },
+
+ /**
+* Display error message and log 'error'
+* @method
+* @param {String} error
+*/
+ handleError: function ( error ) {
+ this.showError();
+ this.logError( error );
},
/**
@@ -200,22 +214,20 @@
'href="#/wikigrok/about">released freely';
self.render( options );
} else {
- self.showError( options, 'There was an
error retrieving tag labels.' );
+ self.handleError(
'no-impression-cannot-fetch-labels' );
}
} ).fail( function () {
- self.logError(
'no-impression-cannot-fetch-labels' );
+ self.handleError(
'no-impression-cannot-fetch-labels' );
} );
},
- showError: function ( options, errorMsg ) {
- options.contentMsg = errorMsg;
- options.buttons = [
- {
- classes: 'cancel inline mw-ui-button
mw-ui-progressive',
- label: 'OK'
- }
- ];
- this.render( options );
+ /**
+* Show the error message
+*/
+ showError: function () {
+ this.$( '.pane.content' ).hide();
+ this.$( '.pane.error' ).show();
+ this.show();
},
// Record answer in temporary database for analysis.
@@ -238,10 +250,10 @@
claim.prop = 'instance of';
}
- this.apiWikiGrokResponse.recordClaims( [ claim ]
).always( function () {
+ this.apiWikiGrokResponse.recordClaims( [ claim ]
).done( function () {
self.thankUser( options, true );
} ).fail( function () {
- self.logError(
'no-response-cannot-reco
[MediaWiki-commits] [Gerrit] xhprof: Guard against division by 0 when computing percentages - change (mediawiki/core)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177464
Change subject: xhprof: Guard against division by 0 when computing percentages
..
xhprof: Guard against division by 0 when computing percentages
Change-Id: Icce3b5be1136c541dc87c44b01a42709f19ca885
---
M includes/libs/Xhprof.php
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/64/177464/1
diff --git a/includes/libs/Xhprof.php b/includes/libs/Xhprof.php
index 990e2c3..01f479a 100644
--- a/includes/libs/Xhprof.php
+++ b/includes/libs/Xhprof.php
@@ -273,8 +273,13 @@
'mean' => $value->m1,
'max' => $value->max,
'variance' =>
$value->m2,
- 'percent' => 100 *
$total / $main[$name],
);
+ if ( isset( $main[$name] ) &&
$main[$name] ) {
+
$this->inclusive[$func][$name]['percent'] =
+ 100 * $total /
$main[$name];
+ } else {
+
$this->inclusive[$func][$name]['percent'] = 0;
+ }
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/177464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icce3b5be1136c541dc87c44b01a42709f19ca885
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change the way unlogged-in screen looks - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177463
Change subject: Change the way unlogged-in screen looks
..
Change the way unlogged-in screen looks
Change-Id: Ib7c443cbcbd00050ee3c0faef2c3cedc5bf076b8
---
M src/components/app-content/app-content.html
M src/components/app-content/app-content.js
M src/components/nav-bar/nav-bar.html
M src/components/nav-bar/nav-bar.js
M src/css/style.css
M src/index.html
6 files changed, 45 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/63/177463/1
diff --git a/src/components/app-content/app-content.html
b/src/components/app-content/app-content.html
index 4606be5..df8f32d 100644
--- a/src/components/app-content/app-content.html
+++ b/src/components/app-content/app-content.html
@@ -1,4 +1,8 @@
-
+
+
+
+
+
@@ -6,3 +10,12 @@
+
+
+
+
+ Welcome To Dash.
+ Please Log in to continue.
+
+
+
diff --git a/src/components/app-content/app-content.js
b/src/components/app-content/app-content.js
index 4a5558c..6dcd170 100644
--- a/src/components/app-content/app-content.js
+++ b/src/components/app-content/app-content.js
@@ -18,6 +18,17 @@
return value === e;
};
};
+
+self.loggedIn = ko.observable(false);
+self.welcome = ko.observable('');
+$.get('/user/info', function(userInfo) {
+if (userInfo) {
+var name = userInfo.name;
+self.welcome(userInfo['name'].charAt(0).toUpperCase() +
userInfo['name'].slice(1));
+} else {
+self.loggedIn(true);
+}
+});
}
return { viewModel: AppContent, template: templateMarkup };
diff --git a/src/components/nav-bar/nav-bar.html
b/src/components/nav-bar/nav-bar.html
index 2504971..9b6db58 100644
--- a/src/components/nav-bar/nav-bar.html
+++ b/src/components/nav-bar/nav-bar.html
@@ -24,10 +24,9 @@
-
- Log
in
-
- Log out
+
+ Log out
+
diff --git a/src/components/nav-bar/nav-bar.js
b/src/components/nav-bar/nav-bar.js
index 4f498e4..a273622 100644
--- a/src/components/nav-bar/nav-bar.js
+++ b/src/components/nav-bar/nav-bar.js
@@ -6,8 +6,8 @@
function NavBarViewModel( params ){
var self = this;
-
-self.route = params.route;
+self.loggedIn = ko.observable(params.loggedIn),
+self.welcome = ko.observable(params.welcome);
self.hideNav = function(){
//make the nav menu fold out of view.
@@ -22,16 +22,6 @@
$('#dashApp').css('padding-left', '175px');
}, 200);
};
-
-self.showLogIn = ko.observable(false);
-self.welcome = ko.observable('');
-$.get('/user/info', function(userInfo) {
-if (userInfo) {
-self.welcome('Welcome, ' + userInfo.name);
-} else {
-self.showLogIn(true);
-}
-});
}
return { viewModel: NavBarViewModel, template: template };
diff --git a/src/css/style.css b/src/css/style.css
index 2298c52..e60c807 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -105,6 +105,19 @@
border-bottom: 1px #555 solid;
}
+.loginWelcome > i {
+padding: 0 3px;
+}
+
+.loginWelcome {
+width: 100px;
+padding: 3px;
+background-color: rgba(255,255,255,0.4);
+overflow-wrap: break-word;
+padding: 3px;
+font-size: .8em;
+}
+
.titlebrand, .titlebrandToggle {
background-color: #d9534f;
overflow: hidden;
diff --git a/src/index.html b/src/index.html
index e8c5e44..7c2acc6 100644
--- a/src/index.html
+++ b/src/index.html
@@ -18,13 +18,11 @@
-
-
-
-
+
+
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/177463
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7c443cbcbd00050ee3c0faef2c3cedc5bf076b8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Un-break usd_per_second graph - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177462
Change subject: Un-break usd_per_second graph
..
Un-break usd_per_second graph
Screwed up merging my 'efficiency' fixes over the donation count
Change-Id: I9777efe31d710ec835ebb9ae2eb31cda31b60bc9
---
M src/components/boards/bigEnglish/bigEnglishBoard.js
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/62/177462/1
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.js
b/src/components/boards/bigEnglish/bigEnglishBoard.js
index ca7d2f0..9c0b106 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.js
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.js
@@ -73,7 +73,7 @@
total = el.usd_total;
self.dayObj[d][h + 1] = { total: total, count:
el.donations };
-
+ self.secondsByHourDonationData[(d - 1) * 24 +
h] = el.usd_per_second;
runningTotal += total;
self.dailyDataArray[d] += total;
self.dailyCountArray[d] += el.donations;
diff --git
a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
index 634e1e9..33f6998 100644
--- a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
+++ b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
@@ -17,7 +17,7 @@
self.needPerSecond = ['Needed Per Second'];
for( var d = 1; d < params.dayObj.length; d++ ) {
for ( var h = 1; h < 25; h++ ) {
- self.updatedGoal = self.updatedGoal -
params.dayObj[d][h];
+ self.updatedGoal = self.updatedGoal -
params.dayObj[d][h].total;
var hoursLeft = ( 31 - d) * 24 + ( 24 -
h );
self.needPerSecond[( d - 1 ) * 24 + h]
= ( hoursLeft > 0 ) ? self.updatedGoal / hoursLeft / 3600 : 0;
}
--
To view, visit https://gerrit.wikimedia.org/r/177462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9777efe31d710ec835ebb9ae2eb31cda31b60bc9
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
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] Update IE detection to include Edge - change (VisualEditor/VisualEditor)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177461
Change subject: Update IE detection to include Edge
..
Update IE detection to include Edge
The IE12 User-Agent no longer includes Trident, but instead
identifies itself as Edge/12.0
Change-Id: I0ef927af1b85706974a6f38b0ad45ee3f58f8be6
---
M src/init/ve.init.Platform.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/61/177461/1
diff --git a/src/init/ve.init.Platform.js b/src/init/ve.init.Platform.js
index 1b17191..e88a3e1 100644
--- a/src/init/ve.init.Platform.js
+++ b/src/init/ve.init.Platform.js
@@ -51,7 +51,7 @@
* @returns {boolean} Whether we are in IE
*/
ve.init.Platform.static.isInternetExplorer = function () {
- return navigator.appVersion.indexOf( 'Trident' ) !== -1;
+ return navigator.appVersion.indexOf( 'Trident' ) !== -1 ||
navigator.appVersion.indexOf( 'Edge' ) !== -1;
};
/* Methods */
--
To view, visit https://gerrit.wikimedia.org/r/177461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ef927af1b85706974a6f38b0ad45ee3f58f8be6
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make ApiStashEdit use the StashEdit log group, rather than P... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Make ApiStashEdit use the StashEdit log group, rather than
PreparedEdit
..
Make ApiStashEdit use the StashEdit log group, rather than PreparedEdit
An early version of what ultimately became commit 3a6c9d36c used
'ApiPreparedEdit' instead of 'ApiStashEdit'. The class / file were renamed but
not the log group.
Change-Id: Ib4de1f1f21f058d3be627048bc93e7730515d340
---
M includes/api/ApiStashEdit.php
1 file changed, 8 insertions(+), 8 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiStashEdit.php b/includes/api/ApiStashEdit.php
index d8c7077..00f6814 100644
--- a/includes/api/ApiStashEdit.php
+++ b/includes/api/ApiStashEdit.php
@@ -131,14 +131,14 @@
$ok = $wgMemc->set( $key, $stashInfo, $ttl );
if ( $ok ) {
$status = 'stashed';
- wfDebugLog( 'PreparedEdit', "Cached
parser output for key '$key'." );
+ wfDebugLog( 'StashEdit', "Cached parser
output for key '$key'." );
} else {
$status = 'error';
- wfDebugLog( 'PreparedEdit', "Failed to
cache parser output for key '$key'." );
+ wfDebugLog( 'StashEdit', "Failed to
cache parser output for key '$key'." );
}
} else {
$status = 'uncacheable';
- wfDebugLog( 'PreparedEdit', "Uncacheable parser
output for key '$key'." );
+ wfDebugLog( 'StashEdit', "Uncacheable parser
output for key '$key'." );
}
}
@@ -196,7 +196,7 @@
$editInfo = $wgMemc->get( $key );
$wgMemc->unlock( $key );
$sec = microtime( true ) - $start;
- wfDebugLog( 'PreparedEdit', "Waited $sec
seconds on '$key'." );
+ wfDebugLog( 'StashEdit', "Waited $sec seconds
on '$key'." );
}
}
@@ -206,7 +206,7 @@
$time = wfTimestamp( TS_UNIX, $editInfo->output->getTimestamp()
);
if ( ( time() - $time ) <= 3 ) {
- wfDebugLog( 'PreparedEdit', "Timestamp-based cache hit
for key '$key'." );
+ wfDebugLog( 'StashEdit', "Timestamp-based cache hit for
key '$key'." );
return $editInfo; // assume nothing changed
}
@@ -224,7 +224,7 @@
$change = $dbr->selectField( 'page', '1', $dbr->makeList(
$cWhr, LIST_OR ), __METHOD__ );
$n = $dbr->selectField( 'page', 'COUNT(*)', $dbr->makeList(
$dWhr, LIST_OR ), __METHOD__ );
if ( $change || $n != count( $dWhr ) ) {
- wfDebugLog( 'PreparedEdit', "Stale cache for key
'$key'; template changed." );
+ wfDebugLog( 'StashEdit', "Stale cache for key '$key';
template changed." );
return false;
}
@@ -239,11 +239,11 @@
$change = $dbr->selectField( 'image', '1', $dbr->makeList(
$cWhr, LIST_OR ), __METHOD__ );
$n = $dbr->selectField( 'image', 'COUNT(*)', $dbr->makeList(
$dWhr, LIST_OR ), __METHOD__ );
if ( $change || $n != count( $dWhr ) ) {
- wfDebugLog( 'PreparedEdit', "Stale cache for key
'$key'; file changed." );
+ wfDebugLog( 'StashEdit', "Stale cache for key '$key';
file changed." );
return false;
}
- wfDebugLog( 'PreparedEdit', "Cache hit for key '$key'." );
+ wfDebugLog( 'StashEdit', "Cache hit for key '$key'." );
return $editInfo;
}
--
To view, visit https://gerrit.wikimedia.org/r/177458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4de1f1f21f058d3be627048bc93e7730515d340
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove function-level profiling - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove function-level profiling
..
Remove function-level profiling
Real developers use xhprof.
Change-Id: Ic806edb89cdfb73886e0fa1b6f0e2a4d9ebabee8
---
M includes/NearMatchPicker.php
M includes/Sanity/Checker.php
M includes/Search/Escaper.php
M includes/Searcher.php
M includes/Updater.php
M includes/Version.php
M maintenance/forceSearchIndex.php
M maintenance/updateOneSearchIndexConfig.php
8 files changed, 0 insertions(+), 49 deletions(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/NearMatchPicker.php b/includes/NearMatchPicker.php
index f4c3afe..044e37b 100644
--- a/includes/NearMatchPicker.php
+++ b/includes/NearMatchPicker.php
@@ -1,7 +1,6 @@
titles ) {
return null;
}
diff --git a/includes/Sanity/Checker.php b/includes/Sanity/Checker.php
index e45b854..00ee595 100644
--- a/includes/Sanity/Checker.php
+++ b/includes/Sanity/Checker.php
@@ -3,7 +3,6 @@
namespace CirrusSearch\Sanity;
use \CirrusSearch\Connection;
use \CirrusSearch\Searcher;
-use \ProfileSection;
use \Status;
use \Title;
use \WikiPage;
diff --git a/includes/Search/Escaper.php b/includes/Search/Escaper.php
index 06cf51e..5059f94 100644
--- a/includes/Search/Escaper.php
+++ b/includes/Search/Escaper.php
@@ -2,8 +2,6 @@
namespace CirrusSearch\Search;
-use \ProfileSection;
-
/**
* Escapes queries.
*
@@ -30,7 +28,6 @@
}
public function escapeQuotes( $text ) {
- $profiler = new ProfileSection( __METHOD__ );
if ( $this->language === 'he' ) {
// Hebrew uses the double quote (") character as a
standin for quotation marks (“”)
// which delineate phrases. It also uses double quotes
as a standin for another
@@ -56,8 +53,6 @@
* at the end of the term to make sure elasticsearch doesn't barf at us.
*/
public function fixupQueryStringPart( $string ) {
- $profiler = new ProfileSection( __METHOD__ );
-
// Escape characters that can be escaped with \\
$string = preg_replace( '/(
\(| (?# no user supplied groupings)
@@ -84,8 +79,6 @@
* @return array(string, boolean) (fixedup query string, is this a
fuzzy query?)
*/
public function fixupWholeQueryString( $string ) {
- $profiler = new ProfileSection( __METHOD__ );
-
// Be careful when editing this method because the ordering of
the replacements matters.
// Escape ~ that don't follow a term or a quote
@@ -153,7 +146,6 @@
}
public function balanceQuotes( $text ) {
- $profiler = new ProfileSection( __METHOD__ );
$inQuote = false;
$inEscape = false;
$len = strlen( $text );
diff --git a/includes/Searcher.php b/includes/Searcher.php
index ee10a7c..f9c0b0d 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -11,7 +11,6 @@
use \CirrusSearch\Search\ResultsType;
use \Language;
use \MWNamespace;
-use \ProfileSection;
use \RequestContext;
use \Sanitizer;
use \SearchResultSet;
@@ -246,8 +245,6 @@
public function nearMatchTitleSearch( $search ) {
global $wgCirrusSearchAllFields;
- $profiler = new ProfileSection( __METHOD__ );
-
self::checkTitleSearchRequestLength( $search );
// Elasticsearch seems to have trouble extracting the proper
terms to highlight
@@ -279,8 +276,6 @@
public function prefixSearch( $search ) {
global $wgCirrusSearchPrefixSearchStartsWithAnyWord,
$wgCirrusSearchPrefixWeights;
-
- $profiler = new ProfileSection( __METHOD__ );
self::checkTitleSearchRequestLength( $search );
@@ -320,8 +315,6 @@
* @param Status(mixed) status containing results defined by
resultsType on success
*/
public function randomSearch( $seed ) {
- $profiler = new ProfileSection( __METHOD__ );
-
$this->setResultsType( new IdResultsType() );
$this->sort = 'random';
@@ -352,8 +345,6 @@
$wgCirrusSearchBoostLinks,
$wgCirrusSearchAllFields,
$wgCirrusSearchAllFieldsForRescore;
-
- $profiler = new ProfileSection( __METHOD__ );
// Transform Mediawiki specific syntax to filters and extra
(pre-escaped) query string
$searcher = $this;
@@ -791,8 +782,6 @@
public function moreLikeTheseArticles( $titles, $options =
Searcher::MORE_LIKE_THESE_NONE ) {
global $wgCirrusSearchMoreLikeThisConfig;
- $profiler = new ProfileSection( __METHOD__
[MediaWiki-commits] [Gerrit] Replace Bugzilla with Phabricator on the support page - change (analytics/wikimetrics)
Bmansurov has uploaded a new change for review. https://gerrit.wikimedia.org/r/177460 Change subject: Replace Bugzilla with Phabricator on the support page .. Replace Bugzilla with Phabricator on the support page Bug: T76521 Change-Id: I926bfce8ef908b51bc865d9932a7aa849440dfa5 --- M wikimetrics/templates/support.html 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics refs/changes/60/177460/1 diff --git a/wikimetrics/templates/support.html b/wikimetrics/templates/support.html index 9d514a0..bc21137 100644 --- a/wikimetrics/templates/support.html +++ b/wikimetrics/templates/support.html @@ -17,7 +17,7 @@ Submit a Bug Report - If you discover a bug, please file a https://bugzilla.wikimedia.org/enter_bug.cgi?product=Analytics&component=Wikimetrics";>bug report in Bugzilla. + If you discover a bug, please file a https://phabricator.wikimedia.org/maniphest/task/create/?projects=Analytics-Wikimetrics,Analytics-Engineering";>bug report in Phabricator. -- To view, visit https://gerrit.wikimedia.org/r/177460 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I926bfce8ef908b51bc865d9932a7aa849440dfa5 Gerrit-PatchSet: 1 Gerrit-Project: analytics/wikimetrics Gerrit-Branch: master Gerrit-Owner: Bmansurov ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Minor code clean up PHP and HTML files in w/ - change (operations/mediawiki-config)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177459
Change subject: Minor code clean up PHP and HTML files in w/
..
Minor code clean up PHP and HTML files in w/
* Consistently use 'require_once' and 'require' fo the inclusion
of MWVersion and WebStart (extra2.php used 'include' still).
* {favicon,touch}.php
- Add doctype to avoid quirks mode.
- Remove redundant html/body tag.
- Do escaping closer to output.
* Whitespace, single quotes.
* 'require' and 'require_once' are not functions.
Change-Id: Ifbfb7dfd8fc0cd822b084d955f8afdbc51f26522
---
M extract2.php
M mobilelanding.php
M w/MWVersion.php
M w/favicon.php
M w/img_auth.php
M w/index.php
M w/load.php
M w/opensearch_desc.php
M w/query.php
M w/robots.php
M w/thumb.php
M w/touch.php
M w/wiki.phtml
13 files changed, 32 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/59/177459/1
diff --git a/extract2.php b/extract2.php
index 903bd5e..6443f49 100644
--- a/extract2.php
+++ b/extract2.php
@@ -2,8 +2,8 @@
$lang = 'meta';
putenv( "MW_LANG={$lang}" ); // notify MWMultiVersion
-include '/srv/mediawiki/w/MWVersion.php';
-include getMediaWiki( 'includes/WebStart.php' );
+require '/srv/mediawiki/w/MWVersion.php';
+require getMediaWiki( 'includes/WebStart.php' );
$allowed_templates = array(
'Www.wikimedia.org_template',
diff --git a/mobilelanding.php b/mobilelanding.php
index d1515c7..f2ca3bc 100644
--- a/mobilelanding.php
+++ b/mobilelanding.php
@@ -1,5 +1,5 @@
$html\n";
+ echo "\n" . htmlspecialchars( $text ) . "\n";
}
function streamFavicon() {
@@ -13,15 +13,15 @@
if ( $wgFavicon === '/favicon.ico' ) {
# That's not very helpful, that's where we are already
header( 'HTTP/1.1 404 Not Found' );
- faviconShowError( "\$wgFavicon is configured incorrectly, " .
- "it must be set to something other than /favicon.ico\n"
);
+ faviconShowError( '$wgFavicon is configured incorrectly, ' .
+ 'it must be set to something other than /favicon.ico' );
return;
}
$req = RequestContext::getMain()->getRequest();
if ( $req->getHeader( 'X-Favicon-Loop' ) !== false ) {
header( 'HTTP/1.1 500 Internal Server Error' );
- faviconShowError( "Proxy forwarding loop detected" );
+ faviconShowError( 'Proxy forwarding loop detected' );
return;
}
@@ -32,7 +32,7 @@
$status = $client->execute();
if ( !$status->isOK() ) {
header( 'HTTP/1.1 500 Internal Server Error' );
- faviconShowError( htmlspecialchars( "Failed to fetch URL
\"$url\"" ) );
+ faviconShowError( "Failed to fetch URL \"$url\"" );
return;
}
diff --git a/w/img_auth.php b/w/img_auth.php
index f5ea1d2..11d37cd 100644
--- a/w/img_auth.php
+++ b/w/img_auth.php
@@ -1,3 +1,3 @@
+header( 'HTTP/1.x 500 Gone' );
+?>
+
query.php is dead
@@ -13,7 +14,7 @@
are actively maintained..
";
+echo '';
?>
diff --git a/w/robots.php b/w/robots.php
index 1fe53fa..7e1910b 100644
--- a/w/robots.php
+++ b/w/robots.php
@@ -1,5 +1,5 @@
$html\n";
+ echo "\n" . htmlspecialchars( $text ) . "\n";
}
function streamAppleTouch() {
@@ -13,15 +13,15 @@
if ( $wgAppleTouchIcon === false ) {
# That's not very helpful, that's where we are already
header( 'HTTP/1.1 404 Not Found' );
- faviconShowError( "\$wgAppleTouchIcon is configured
incorrectly, " .
- "it must be set to something other than false \n" );
+ faviconShowError( '$wgAppleTouchIcon is configured incorrectly,
' .
+ 'it must be set to something other than false \n' );
return;
}
$req = RequestContext::getMain()->getRequest();
if ( $req->getHeader( 'X-Favicon-Loop' ) !== false ) {
header( 'HTTP/1.1 500 Internal Server Error' );
- faviconShowError( "Proxy forwarding loop detected" );
+ faviconShowError( 'Proxy forwarding loop detected' );
return;
}
@@ -32,7 +32,7 @@
$status = $client->execute();
if ( !$status->isOK() ) {
header( 'HTTP/1.1 500 Internal Server Error' );
- faviconShowError( htmlspecialchars( "Failed to fetch URL
\"$url\"" ) );
+ faviconShowError( "Failed to fetch URL \"$url\"" );
return;
}
diff --git a/w/wiki.phtml b/w/wiki.phtml
index 1a229a1..e40d9a9 100644
--- a/w/wiki.phtml
+++ b/w/wiki.phtml
@@ -1,3 +1,3 @@
https://gerrit.wikimedia.org/r/177459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If
[MediaWiki-commits] [Gerrit] Make ApiStashEdit use the StashEdit log group, rather than P... - change (mediawiki/core)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177458
Change subject: Make ApiStashEdit use the StashEdit log group, rather than
PreparedEdit
..
Make ApiStashEdit use the StashEdit log group, rather than PreparedEdit
An early version of what ultimately became commit 3a6c9d36c used
'ApiPreparedEdit' instead of 'ApiStashEdit'. The class / file were renamed but
not the log group.
Change-Id: Ib4de1f1f21f058d3be627048bc93e7730515d340
---
M includes/api/ApiStashEdit.php
1 file changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/58/177458/1
diff --git a/includes/api/ApiStashEdit.php b/includes/api/ApiStashEdit.php
index d8c7077..00f6814 100644
--- a/includes/api/ApiStashEdit.php
+++ b/includes/api/ApiStashEdit.php
@@ -131,14 +131,14 @@
$ok = $wgMemc->set( $key, $stashInfo, $ttl );
if ( $ok ) {
$status = 'stashed';
- wfDebugLog( 'PreparedEdit', "Cached
parser output for key '$key'." );
+ wfDebugLog( 'StashEdit', "Cached parser
output for key '$key'." );
} else {
$status = 'error';
- wfDebugLog( 'PreparedEdit', "Failed to
cache parser output for key '$key'." );
+ wfDebugLog( 'StashEdit', "Failed to
cache parser output for key '$key'." );
}
} else {
$status = 'uncacheable';
- wfDebugLog( 'PreparedEdit', "Uncacheable parser
output for key '$key'." );
+ wfDebugLog( 'StashEdit', "Uncacheable parser
output for key '$key'." );
}
}
@@ -196,7 +196,7 @@
$editInfo = $wgMemc->get( $key );
$wgMemc->unlock( $key );
$sec = microtime( true ) - $start;
- wfDebugLog( 'PreparedEdit', "Waited $sec
seconds on '$key'." );
+ wfDebugLog( 'StashEdit', "Waited $sec seconds
on '$key'." );
}
}
@@ -206,7 +206,7 @@
$time = wfTimestamp( TS_UNIX, $editInfo->output->getTimestamp()
);
if ( ( time() - $time ) <= 3 ) {
- wfDebugLog( 'PreparedEdit', "Timestamp-based cache hit
for key '$key'." );
+ wfDebugLog( 'StashEdit', "Timestamp-based cache hit for
key '$key'." );
return $editInfo; // assume nothing changed
}
@@ -224,7 +224,7 @@
$change = $dbr->selectField( 'page', '1', $dbr->makeList(
$cWhr, LIST_OR ), __METHOD__ );
$n = $dbr->selectField( 'page', 'COUNT(*)', $dbr->makeList(
$dWhr, LIST_OR ), __METHOD__ );
if ( $change || $n != count( $dWhr ) ) {
- wfDebugLog( 'PreparedEdit', "Stale cache for key
'$key'; template changed." );
+ wfDebugLog( 'StashEdit', "Stale cache for key '$key';
template changed." );
return false;
}
@@ -239,11 +239,11 @@
$change = $dbr->selectField( 'image', '1', $dbr->makeList(
$cWhr, LIST_OR ), __METHOD__ );
$n = $dbr->selectField( 'image', 'COUNT(*)', $dbr->makeList(
$dWhr, LIST_OR ), __METHOD__ );
if ( $change || $n != count( $dWhr ) ) {
- wfDebugLog( 'PreparedEdit', "Stale cache for key
'$key'; file changed." );
+ wfDebugLog( 'StashEdit', "Stale cache for key '$key';
file changed." );
return false;
}
- wfDebugLog( 'PreparedEdit', "Cache hit for key '$key'." );
+ wfDebugLog( 'StashEdit', "Cache hit for key '$key'." );
return $editInfo;
}
--
To view, visit https://gerrit.wikimedia.org/r/177458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4de1f1f21f058d3be627048bc93e7730515d340
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Expand db setSessionOptions to handle any param - change (mediawiki/core)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177457
Change subject: Expand db setSessionOptions to handle any param
..
Expand db setSessionOptions to handle any param
Previously, it only supported one hardcoded param.
Change-Id: Ic0a5db43727ed9c3ea13d0898a06009f5d94034c
---
M includes/db/DatabaseMysqlBase.php
1 file changed, 8 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/57/177457/1
diff --git a/includes/db/DatabaseMysqlBase.php
b/includes/db/DatabaseMysqlBase.php
index 7dfae63..764e428 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -813,10 +813,14 @@
* @param array $options
*/
public function setSessionOptions( array $options ) {
- if ( isset( $options['connTimeout'] ) ) {
- $timeout = (int)$options['connTimeout'];
- $this->query( "SET net_read_timeout=$timeout" );
- $this->query( "SET net_write_timeout=$timeout" );
+ foreach ( $options as $name => $value ) {
+ if ( $name === 'connTimeout' ) {
+ $timeout = (int)$value;
+ $this->query( "SET net_read_timeout=$timeout" );
+ $this->query( "SET net_write_timeout=$timeout"
);
+ } else {
+ $this->query( "SET SESSION $name = $value" );
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/177457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0a5db43727ed9c3ea13d0898a06009f5d94034c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add status codes parsing - change (mediawiki...BounceHandler)
M4tx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177456
Change subject: Add status codes parsing
..
Add status codes parsing
Extension now looks for status code returned by SMTP server and differentiates
between permanent and temporary failures. Sticks to RFC3464 whenever possible
and uses heuristic way to obtain the status code otherwise.
Change-Id: Ice9d580ba81d7f3575a37267e97f33a9dafdcef5
---
M includes/ProcessBounceEmails.php
M includes/ProcessBounceWithRegex.php
M tests/ProcessBounceWithRegexTest.php
A tests/bounce_emails/emailStatus
A tests/bounce_emails/emailStatus2
5 files changed, 230 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BounceHandler
refs/changes/56/177456/1
diff --git a/includes/ProcessBounceEmails.php b/includes/ProcessBounceEmails.php
index 13609de..58e0633 100644
--- a/includes/ProcessBounceEmails.php
+++ b/includes/ProcessBounceEmails.php
@@ -149,11 +149,26 @@
* @return bool
*/
protected function checkPermanentFailure( $emailHeaders ) {
- $permanentFailure = $emailHeaders[ 'x-failed-recipients' ];
- if ( $permanentFailure == null ) {
- return false;
- } else {
+ if ( isset( $emailHeaders['status'] ) ) {
+ $status = explode( '.', $emailHeaders['status'] );
+ if ( $status[0] == 5 ) {
+ // According to RFC1893 status codes starting
with 5 mean Permanent Failures
+ return true;
+ } else {
+ return false;
+ }
+ } elseif ( isset( $emailHeaders['smtp-status'] ) ) {
+ if ( $emailHeaders['smtp-status'] >= 500 ) {
+ return true;
+ } else {
+ return false;
+ }
+ } elseif ( isset( $emailHeaders['x-failed-recipients'] ) ) {
+ // If not status code was found, let's presume that the
presence of
+ // X-Failed-Recipients means permanent failure
return true;
+ } else {
+ return false;
}
}
diff --git a/includes/ProcessBounceWithRegex.php
b/includes/ProcessBounceWithRegex.php
index c651e34..09b8858 100644
--- a/includes/ProcessBounceWithRegex.php
+++ b/includes/ProcessBounceWithRegex.php
@@ -16,6 +16,49 @@
}
/**
+* Parse the single part of delivery status message
+*
+* @param array $partLines array of strings that contain single lines
of the email part
+* @return string|null String that contains the status code or null if
it wasn't found
+*/
+ private function parseMessagePart( $partLines ) {
+ foreach ( $partLines as $partLine ) {
+ if ( preg_match( "/^Content-Type: (.+)/", $partLine,
$contentTypeMatch ) ) {
+ if ( $contentTypeMatch[1] !=
'message/delivery-status' ) {
+ break;
+ }
+ }
+ if ( preg_match( "/^Status:
(\\d\\.\\d{1,3}\\.\\d{1,3})/", $partLine, $statusMatch ) ) {
+ return $statusMatch[1];
+ }
+ }
+ return null;
+ }
+
+ /**
+* Parse the multi-part delivery status message (DSN) according to
RFC3464
+*
+* @param array $emailLines array of strings that contain single lines
of the email
+* @return string|null String that contains the status code or null if
it wasn't found
+*/
+ private function parseDeliveryStatusMessage( $emailLines ) {
+ for ( $i = 0; $i < count( $emailLines ) - 1; ++$i ) {
+ $line = $emailLines[$i] . "\n" . $emailLines[$i + 1];
+ if ( preg_match( "/Content-Type:
multipart\\/report;\\s*report-type=delivery-status;\\s*boundary=\"(.+?)\"/",
+ $line, $contentTypeMatch ) ) {
+ $partIndices = array_keys( $emailLines,
"--$contentTypeMatch[1]" );
+ foreach ( $partIndices as $index ) {
+ $result = $this->parseMessagePart(
array_slice( $emailLines, $index ) );
+ if ( !is_null( $result ) ) {
+ return $result;
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
* Extract headers from the receiv
[MediaWiki-commits] [Gerrit] Insert nulls for missing data - change (wikimedia...crm)
Ejegg has submitted this change and it was merged.
Change subject: Insert nulls for missing data
..
Insert nulls for missing data
Otherwise our db_insert placeholders are off by some.
Change-Id: I4d3bf807108fb5c96e26acde0084181df3448be8
---
M sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
index 3b75921..ea1553a 100644
--- a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
+++ b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
@@ -206,6 +206,7 @@
throw new WmfException('fredge', $error);
//so... add fields to DI first when you do schema changes.
}
+ $insert[$field] = null;
} else {
//the field exists. Woot.
if (array_key_exists('mysql_type', $definition) &&
$definition['mysql_type'] === 'DATETIME') {
--
To view, visit https://gerrit.wikimedia.org/r/177450
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4d3bf807108fb5c96e26acde0084181df3448be8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Katie Horn
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add memory-cache - change (wikimedia...node_modules)
Ejegg has submitted this change and it was merged.
Change subject: Add memory-cache
..
Add memory-cache
Change-Id: Ib288a5aefc8949ccd7ae147c3bfad31497f5ce9f
---
A memory-cache/README.md
A memory-cache/index.js
A memory-cache/package.json
A memory-cache/test.js
4 files changed, 268 insertions(+), 0 deletions(-)
Approvals:
Ejegg: Verified; Looks good to me, approved
diff --git a/memory-cache/README.md b/memory-cache/README.md
new file mode 100644
index 000..7ea2ba2
--- /dev/null
+++ b/memory-cache/README.md
@@ -0,0 +1,83 @@
+# node-cache
+
+A simple in-memory cache for node.js
+
+## Installation
+
+npm install memory-cache
+
+## Usage
+
+var cache = require('memory-cache');
+
+// now just use the cache
+
+cache.put('foo', 'bar');
+console.log(cache.get('foo'))
+
+// that wasn't too interesting, here's the good part
+
+cache.put('houdini', 'disapear', 100) // Time in ms
+console.log('Houdini will now ' + cache.get('houdini'));
+
+setTimeout(function() {
+ console.log('Houdini is ' + cache.get('houdini'));
+}, 200);
+
+which should print
+
+bar
+Houdini will now disapear
+Houdini is null
+
+## API
+
+### put = function(key, value, time)
+
+* Simply stores a value.
+* If time isn't passed in, it is stored forever.
+* Will actually remove the value in the specified time (via `setTimeout`)
+
+### get = function(key)
+
+* Retreives a value for a given key
+
+### del = function(key)
+
+* Deletes a key
+
+### clear = function()
+
+* Deletes all keys
+
+### size = function()
+
+* Returns the current number of entries in the cache
+
+### memsize = function()
+
+* Returns the number of entries taking up space in the cache
+* Will usually `== size()` unless a `setTimeout` removal went wrong
+
+### debug = function(bool)
+
+* Turns on or off debugging
+
+### hits = function()
+
+* Returns the number of cache hits
+
+### misses = function()
+
+* Returns the number of cache misses.
+
+## TODO
+
+* Namespaces
+* A way of walking the cache for diagnostic purposes
+
+## Note on Patches/Pull Requests
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Send me a pull request.
diff --git a/memory-cache/index.js b/memory-cache/index.js
new file mode 100644
index 000..3409f1c
--- /dev/null
+++ b/memory-cache/index.js
@@ -0,0 +1,82 @@
+var cache = {}
+function now() { return (new Date).getTime(); }
+var debug = false;
+var hitCount = 0;
+var missCount = 0;
+
+exports.put = function(key, value, time, timeoutCallback) {
+ if (debug) console.log('caching: '+key+' = '+value+' (@'+time+')');
+ var oldRecord = cache[key];
+ if (oldRecord) {
+ clearTimeout(oldRecord.timeout);
+ }
+
+ var expire = time + now();
+ var record = {value: value, expire: expire};
+
+ if (!isNaN(expire)) {
+ var timeout = setTimeout(function() {
+ exports.del(key);
+ if (typeof timeoutCallback === 'function') {
+ timeoutCallback(key);
+ }
+ }, time);
+ record.timeout = timeout;
+ }
+
+ cache[key] = record;
+}
+
+exports.del = function(key) {
+ delete cache[key];
+}
+
+exports.clear = function() {
+ cache = {};
+}
+
+exports.get = function(key) {
+ var data = cache[key];
+ if (typeof data != "undefined") {
+if (isNaN(data.expire) || data.expire >= now()) {
+ if (debug) hitCount++;
+ return data.value;
+} else {
+ // free some space
+ if (debug) missCount++;
+ exports.del(key);
+}
+ }
+ return null;
+}
+
+exports.size = function() {
+ var size = 0, key;
+ for (key in cache) {
+if (cache.hasOwnProperty(key))
+ if (exports.get(key) !== null)
+size++;
+ }
+ return size;
+}
+
+exports.memsize = function() {
+ var size = 0, key;
+ for (key in cache) {
+if (cache.hasOwnProperty(key))
+ size++;
+ }
+ return size;
+}
+
+exports.debug = function(bool) {
+ debug = bool;
+}
+
+exports.hits = function() {
+ return hitCount;
+}
+
+exports.misses = function() {
+ return missCount;
+}
diff --git a/memory-cache/package.json b/memory-cache/package.json
new file mode 100644
index 000..eecdc7f
--- /dev/null
+++ b/memory-cache/package.json
@@ -0,0 +1,46 @@
+{
+ "name": "memory-cache",
+ "description": "A simple in-memory cache. put() get() and delete()",
+ "author": {
+"name": "Paul Tarjan",
+"email": "n...@paulisageek.com"
+ },
+ "url": "https://github.com/ptarjan/node-cache";,
+ "keywords": [
+"cache",
+"ram",
+"simple",
+"storage"
+ ],
+ "main": "./index.js",
+ "version": "0.0.5",
+ "repository": {
+"type": "git",
+"url": "git://github.com/ptarjan/node-cache.git"
+ },
+ "readme": "# node-cache\n\nA simple in-memory cache for node.js\n\n##
Installation\n\nnpm install memory-cache\n\n## Usage\n\nvar cache =
require('memory-cache');\n\n
[MediaWiki-commits] [Gerrit] Cache db query results for 5 minutes - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177455
Change subject: Cache db query results for 5 minutes
..
Cache db query results for 5 minutes
TODO: sync auto-refresh interval with cache duration
Change-Id: I7565c5ef21659bcaa63b61603117cae285fd273d
---
M defaults.js
M node_modules
M routes/data.js
M src/components/boards/bigEnglish/bigEnglishBoard.js
4 files changed, 43 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/55/177455/1
diff --git a/defaults.js b/defaults.js
index 016acde..4c93e6b 100644
--- a/defaults.js
+++ b/defaults.js
@@ -12,5 +12,6 @@
// given in providerBackendURL. This can be useful for SSL behind
firewalls
consumerKey: 'kKq6LbU4ctDUzubSUdHJ7Pn9NvVWwQ2f',
consumerSecret: 'JfGs4nnfyoRQ9i9JQeTYP7geCEKQrenX',
-sessionSecret: 'ds87naowiy3icaywri73tcin7eyyeI8634I71NYFIEA764'
+sessionSecret: 'ds87naowiy3icaywri73tcin7eyyeI8634I71NYFIEA764',
+cacheDuration: 30 // 5 min in ms
};
diff --git a/node_modules b/node_modules
index 9f71c38..f7d9d58 16
--- a/node_modules
+++ b/node_modules
-Subproject commit 9f71c38597921daa0b926f4044f5a49a1a13e56a
+Subproject commit f7d9d58629d35f63eb5a4a8380fa246475be8340
diff --git a/routes/data.js b/routes/data.js
index 423a3b0..a063c94 100644
--- a/routes/data.js
+++ b/routes/data.js
@@ -2,7 +2,11 @@
odataParser = require( 'odata-parser' ),
mysql = require ( 'mysql'),
config = require( '../config.js' ),
- util = require( 'util');
+ util = require( 'util'),
+ cache = require( 'memory-cache' ),
+ urlParser = require( 'url' ),
+ querystringParser = require( 'querystring' ),
+ logger = require( '../logger.js' );
/**
* Throws an error if an value is invalid for the given column
@@ -168,7 +172,8 @@
module.exports = function(req, res) {
var widget = widgets[req.params.widget],
- qs = require( 'url' ).parse(req.url).query,
+ qs = urlParser.parse( req.url ).query,
+ parsedQs = querystringParser.parse( qs ),
connection,
sqlQuery = '',
parsedFilters,
@@ -177,7 +182,9 @@
values = [],
joins = [],
joinClause = '',
- i;
+ i,
+ result,
+ cacheKey;
if ( !config.debug &&
( !req.session || !req.session.passport ||
!req.session.passport.user )
@@ -191,6 +198,19 @@
return;
}
+ cacheKey = '/data/' + req.params.widget;
+ if ( parsedQs.$filter ) {
+ cacheKey += '-' + parsedQs.$filter;
+ }
+
+ if ( !parsedQs.cache || parsedQs.cache === 'false' ) {
+ result = cache.get( cacheKey );
+ if ( result ) {
+ logger.debug( 'Serving results from cache key ' +
cacheKey );
+ res.json( result );
+ return;
+ }
+ }
sqlQuery = widget.query;
if ( widget.defaultFilter || ( qs && qs !== '' ) ) {
try {
@@ -229,11 +249,14 @@
return;
}
});
- connection.query( sqlQuery, values, function( error, results ) {
+ connection.query( sqlQuery, values, function( error, dbResults ) {
if ( error ) {
res.json( { error: 'Query error: ' + error } );
return;
}
- res.json( { results: results, sqlQuery: sqlQuery } );
+ result = { results: dbResults, sqlQuery: sqlQuery };
+ logger.debug( 'Storing results at cache key ' + cacheKey );
+ cache.put( req.url, result, config.cacheDuration );
+ res.json( result );
});
};
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.js
b/src/components/boards/bigEnglish/bigEnglishBoard.js
index ca7d2f0..20dd884 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.js
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.js
@@ -83,16 +83,23 @@
self.raised(runningTotal);
};
- // Reload the data
- self.reloadBigEnglish = function(){
- $.get( '/data/big-english' , function ( dataget ) {
+ // Reload the data. For the automatic reload, we're fine
getting
+ // something from the cache.
+ self.reloadBigEnglish = function( automatic ){
+ var url = '/data/big-english';
+ if ( !automatic ) {
+ url += '/?cache=false';
+ }
+ $.get( url , function ( dataget ) {
self.loadData( dat
[MediaWiki-commits] [Gerrit] Enable $wgAjaxEditStash on Beta - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable $wgAjaxEditStash on Beta .. Enable $wgAjaxEditStash on Beta Change-Id: Ibfad9e29fb6a3a6fbf676c749c74885594e6d5bb --- M wmf-config/CommonSettings-labs.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings-labs.php b/wmf-config/CommonSettings-labs.php index c5c9af7..fc8a106 100644 --- a/wmf-config/CommonSettings-labs.php +++ b/wmf-config/CommonSettings-labs.php @@ -209,4 +209,6 @@ // Experimental $wgGadgetsCaching = false; +$wgAjaxEditStash = true; + } # end safeguard -- To view, visit https://gerrit.wikimedia.org/r/177454 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibfad9e29fb6a3a6fbf676c749c74885594e6d5bb Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Ori.livneh Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable $wgAjaxEditStash on Beta - change (operations/mediawiki-config)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/177454 Change subject: Enable $wgAjaxEditStash on Beta .. Enable $wgAjaxEditStash on Beta Change-Id: Ibfad9e29fb6a3a6fbf676c749c74885594e6d5bb --- M wmf-config/CommonSettings-labs.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/54/177454/1 diff --git a/wmf-config/CommonSettings-labs.php b/wmf-config/CommonSettings-labs.php index c5c9af7..fc8a106 100644 --- a/wmf-config/CommonSettings-labs.php +++ b/wmf-config/CommonSettings-labs.php @@ -209,4 +209,6 @@ // Experimental $wgGadgetsCaching = false; +$wgAjaxEditStash = true; + } # end safeguard -- To view, visit https://gerrit.wikimedia.org/r/177454 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibfad9e29fb6a3a6fbf676c749c74885594e6d5bb Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix path to MobileWindowManager.js - change (mediawiki...VisualEditor)
Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/177453 Change subject: Fix path to MobileWindowManager.js .. Fix path to MobileWindowManager.js Bug: T76660 Change-Id: I0479fbd127190b924cbd32b7eab4711482a968b8 --- M VisualEditor.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/53/177453/1 diff --git a/VisualEditor.php b/VisualEditor.php index 2c72a4b..7d0718e 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -757,7 +757,7 @@ 'scripts' => array( 'lib/ve/src/ui/ve.ui.MobileSurface.js', 'lib/ve/src/ui/ve.ui.MobileContext.js', - 'lib/ve/src/ui/ve.ui.MobileWindowManager.js', + 'lib/ve/src/ui/windowmanagers/ve.ui.MobileWindowManager.js', 'lib/ve/src/ui/widgets/ve.ui.MobileContextOptionWidget.js', ), 'styles' => array( -- To view, visit https://gerrit.wikimedia.org/r/177453 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0479fbd127190b924cbd32b7eab4711482a968b8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: wmf/1.25wmf11 Gerrit-Owner: Catrope ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move subselects into the main pager query - change (mediawiki...CentralNotice)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177452
Change subject: Move subselects into the main pager query
..
Move subselects into the main pager query
This saves a few thousand round-trips to the db cluster...
Change-Id: Ib7834cb3d49b7f02bdabfc5512ff075c40139a9c
---
M includes/CNCampaignPager.php
1 file changed, 32 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/52/177452/1
diff --git a/includes/CNCampaignPager.php b/includes/CNCampaignPager.php
index 4900aa5..8195170 100644
--- a/includes/CNCampaignPager.php
+++ b/includes/CNCampaignPager.php
@@ -84,11 +84,34 @@
);
} else {
+ $db = CNDatabase::getDb();
+ $join_fields = array(
+ $db->buildGroupConcatField(
+ ',',
+ array( 'cn_notice_countries' ),
+ 'nc_country',
+ 'nc_notice_id = not_id'
+ ) . ' AS countries',
+ $db->buildGroupConcatField(
+ ',',
+ array( 'cn_notice_languages' ),
+ 'nl_language',
+ 'nl_notice_id = not_id'
+ ) . ' AS languages',
+ $db->buildGroupConcatField(
+ ',',
+ array( 'cn_notice_projects' ),
+ 'np_project',
+ 'np_notice_id = not_id'
+ ) . ' AS projects',
+ );
// Query for all campaigns
return array(
- 'tables' => 'cn_notices',
- 'fields' => array(
+ 'tables' => array(
+ 'notices' => 'cn_notices',
+ ),
+ 'fields' => array_merge( $join_fields, array(
'not_id',
'not_name',
'not_start',
@@ -98,9 +121,9 @@
'not_throttle',
'not_geo',
'not_locked',
- 'not_archived'
- ),
- 'conds' => array()
+ 'not_archived',
+ ) ),
+ 'conds' => array(),
);
}
}
@@ -179,17 +202,18 @@
);
case 'projects':
- $p = Campaign::getNoticeProjects( $name );
+ $p = explode( ',', $this->mCurrentRow->projects
);
return $this->onSpecialCN->listProjects( $p );
case 'languages':
- $l = Campaign::getNoticeLanguages( $name );
+ $l = explode( ',',
$this->mCurrentRow->languages );
return $this->onSpecialCN->listLanguages( $l );
case 'countries':
if ( $this->mCurrentRow->not_geo ) {
- $c = Campaign::getNoticeCountries(
$name );
+ $c = explode( ',',
$this->mCurrentRow->countries );
} else {
+ // FIXME: this is silly.
$c = array_keys(
GeoTarget::getCountriesList( 'en' ) );
}
--
To view, visit https://gerrit.wikimedia.org/r/177452
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7834cb3d49b7f02bdabfc5512ff075c40139a9c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove function-level profiling - change (mediawiki...CirrusSearch)
Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177451
Change subject: Remove function-level profiling
..
Remove function-level profiling
Real developers use xhprof.
Change-Id: Ic806edb89cdfb73886e0fa1b6f0e2a4d9ebabee8
---
M includes/NearMatchPicker.php
M includes/Sanity/Checker.php
M includes/Search/Escaper.php
M includes/Searcher.php
M includes/Updater.php
M includes/Version.php
M maintenance/forceSearchIndex.php
M maintenance/updateOneSearchIndexConfig.php
8 files changed, 0 insertions(+), 49 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/51/177451/1
diff --git a/includes/NearMatchPicker.php b/includes/NearMatchPicker.php
index f4c3afe..044e37b 100644
--- a/includes/NearMatchPicker.php
+++ b/includes/NearMatchPicker.php
@@ -1,7 +1,6 @@
titles ) {
return null;
}
diff --git a/includes/Sanity/Checker.php b/includes/Sanity/Checker.php
index e45b854..00ee595 100644
--- a/includes/Sanity/Checker.php
+++ b/includes/Sanity/Checker.php
@@ -3,7 +3,6 @@
namespace CirrusSearch\Sanity;
use \CirrusSearch\Connection;
use \CirrusSearch\Searcher;
-use \ProfileSection;
use \Status;
use \Title;
use \WikiPage;
diff --git a/includes/Search/Escaper.php b/includes/Search/Escaper.php
index 06cf51e..5059f94 100644
--- a/includes/Search/Escaper.php
+++ b/includes/Search/Escaper.php
@@ -2,8 +2,6 @@
namespace CirrusSearch\Search;
-use \ProfileSection;
-
/**
* Escapes queries.
*
@@ -30,7 +28,6 @@
}
public function escapeQuotes( $text ) {
- $profiler = new ProfileSection( __METHOD__ );
if ( $this->language === 'he' ) {
// Hebrew uses the double quote (") character as a
standin for quotation marks (“”)
// which delineate phrases. It also uses double quotes
as a standin for another
@@ -56,8 +53,6 @@
* at the end of the term to make sure elasticsearch doesn't barf at us.
*/
public function fixupQueryStringPart( $string ) {
- $profiler = new ProfileSection( __METHOD__ );
-
// Escape characters that can be escaped with \\
$string = preg_replace( '/(
\(| (?# no user supplied groupings)
@@ -84,8 +79,6 @@
* @return array(string, boolean) (fixedup query string, is this a
fuzzy query?)
*/
public function fixupWholeQueryString( $string ) {
- $profiler = new ProfileSection( __METHOD__ );
-
// Be careful when editing this method because the ordering of
the replacements matters.
// Escape ~ that don't follow a term or a quote
@@ -153,7 +146,6 @@
}
public function balanceQuotes( $text ) {
- $profiler = new ProfileSection( __METHOD__ );
$inQuote = false;
$inEscape = false;
$len = strlen( $text );
diff --git a/includes/Searcher.php b/includes/Searcher.php
index ee10a7c..f9c0b0d 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -11,7 +11,6 @@
use \CirrusSearch\Search\ResultsType;
use \Language;
use \MWNamespace;
-use \ProfileSection;
use \RequestContext;
use \Sanitizer;
use \SearchResultSet;
@@ -246,8 +245,6 @@
public function nearMatchTitleSearch( $search ) {
global $wgCirrusSearchAllFields;
- $profiler = new ProfileSection( __METHOD__ );
-
self::checkTitleSearchRequestLength( $search );
// Elasticsearch seems to have trouble extracting the proper
terms to highlight
@@ -279,8 +276,6 @@
public function prefixSearch( $search ) {
global $wgCirrusSearchPrefixSearchStartsWithAnyWord,
$wgCirrusSearchPrefixWeights;
-
- $profiler = new ProfileSection( __METHOD__ );
self::checkTitleSearchRequestLength( $search );
@@ -320,8 +315,6 @@
* @param Status(mixed) status containing results defined by
resultsType on success
*/
public function randomSearch( $seed ) {
- $profiler = new ProfileSection( __METHOD__ );
-
$this->setResultsType( new IdResultsType() );
$this->sort = 'random';
@@ -352,8 +345,6 @@
$wgCirrusSearchBoostLinks,
$wgCirrusSearchAllFields,
$wgCirrusSearchAllFieldsForRescore;
-
- $profiler = new ProfileSection( __METHOD__ );
// Transform Mediawiki specific syntax to filters and extra
(pre-escaped) query string
$searcher = $this;
@@ -791,8 +782,6 @@
public function moreLikeTheseArticles( $titles, $options =
Searcher::MORE_LIKE_THESE_NONE ) {
global $wgCirrusSearchMoreLikeThisConfig;
-
[MediaWiki-commits] [Gerrit] Insert nulls for missing data - change (wikimedia...crm)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177450
Change subject: Insert nulls for missing data
..
Insert nulls for missing data
Otherwise our db_insert placeholders are off by some.
Change-Id: I4d3bf807108fb5c96e26acde0084181df3448be8
---
M sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/50/177450/1
diff --git a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
index 3b75921..ea1553a 100644
--- a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
+++ b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
@@ -206,6 +206,7 @@
throw new WmfException('fredge', $error);
//so... add fields to DI first when you do schema changes.
}
+ $insert[$field] = null;
} else {
//the field exists. Woot.
if (array_key_exists('mysql_type', $definition) &&
$definition['mysql_type'] === 'DATETIME') {
--
To view, visit https://gerrit.wikimedia.org/r/177450
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d3bf807108fb5c96e26acde0084181df3448be8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switched hook profiling to use scopedProfileIn - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177449
Change subject: Switched hook profiling to use scopedProfileIn
..
Switched hook profiling to use scopedProfileIn
Change-Id: Ife242bda8e046990d0d8ac27d628975b7b4a14d7
---
M includes/Hooks.php
1 file changed, 7 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/49/177449/1
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 668c3d9..44f78a5 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -134,7 +134,9 @@
* @throws FatalError
*/
public static function run( $event, array $args = array(),
$deprecatedVersion = null ) {
- wfProfileIn( 'hook: ' . $event );
+ $profiler = Profiler::instance();
+ $eventPS = $profiler->scopedProfileIn( 'hook: ' . $event );
+
foreach ( self::getHandlers( $event ) as $hook ) {
// Turn non-array values into an array. (Can't use
casting because of objects.)
if ( !is_array( $hook ) ) {
@@ -193,8 +195,8 @@
$badhookmsg = null;
$hook_args = array_merge( $hook, $args );
- // Profile first in case the Profiler causes errors.
- wfProfileIn( $func );
+ // Profile first in case the Profiler causes errors
+ $funcPS = $profiler->scopedProfileIn( $func );
set_error_handler( 'Hooks::hookErrorHandler' );
// mark hook as deprecated, if deprecation version is
specified
@@ -210,8 +212,9 @@
restore_error_handler();
throw $e;
}
+
restore_error_handler();
- wfProfileOut( $func );
+ $profiler->scopedProfileOut( $funcPS );
// Process the return value.
if ( is_string( $retval ) ) {
@@ -224,13 +227,11 @@
"Hook $func has invalid call signature;
" . $badhookmsg
);
} elseif ( $retval === false ) {
- wfProfileOut( 'hook: ' . $event );
// False was returned. Stop processing, but no
error.
return false;
}
}
- wfProfileOut( 'hook: ' . $event );
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/177449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife242bda8e046990d0d8ac27d628975b7b4a14d7
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] WIP: response table - change (mediawiki...WikiGrok)
MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177448
Change subject: WIP: response table
..
WIP: response table
Change-Id: I95228e0b16a7d220594892520ce2d8336491ef13
---
M includes/Hooks.php
R sql/wikigrok_questions.sql
2 files changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiGrok
refs/changes/48/177448/1
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 5ebb989..aa4d301 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -106,7 +106,10 @@
* @return bool
*/
public static function onLoadExtensionSchemaUpdates( \DatabaseUpdater
$updater ) {
- $updater->addExtensionTable( 'wikigrok_questions', dirname(
__DIR__ ) . '/WikiGrok.sql' );
+ $dir = dirname( __DIR__ ) . '/sql';
+ $updater->addExtensionTable( 'wikigrok_questions',
"$dir/wikigrok_questions.sql" );
+ $updater->addExtensionTable( 'wikigrok_responses',
"$dir/wikigrok_responses.sql" );
+
return true;
}
diff --git a/WikiGrok.sql b/sql/wikigrok_questions.sql
similarity index 100%
rename from WikiGrok.sql
rename to sql/wikigrok_questions.sql
--
To view, visit https://gerrit.wikimedia.org/r/177448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I95228e0b16a7d220594892520ce2d8336491ef13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiGrok
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] Update Wikidata to minimize SiteList loading - change (mediawiki/core)
MaxSem has submitted this change and it was merged. Change subject: Update Wikidata to minimize SiteList loading .. Update Wikidata to minimize SiteList loading Change-Id: If74340b3a49a4ad3b5074c483d016eddb2752abe --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: MaxSem: Verified; Looks good to me, approved diff --git a/extensions/Wikidata b/extensions/Wikidata index 95ab7f7..96d4944 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit 95ab7f7adc2130af2a86edb6b32c059707944c46 +Subproject commit 96d4944c445505d9d3b145456536088cac9121b1 -- To view, visit https://gerrit.wikimedia.org/r/177447 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If74340b3a49a4ad3b5074c483d016eddb2752abe Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf11 Gerrit-Owner: Hoo man Gerrit-Reviewer: MaxSem ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata to minimize SiteList loading - change (mediawiki/core)
MaxSem has submitted this change and it was merged. Change subject: Update Wikidata to minimize SiteList loading .. Update Wikidata to minimize SiteList loading Change-Id: I3cf7f39005e3d6051cf719779cb62a4b96b2c263 --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: MaxSem: Verified; Looks good to me, approved diff --git a/extensions/Wikidata b/extensions/Wikidata index 95ab7f7..96d4944 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit 95ab7f7adc2130af2a86edb6b32c059707944c46 +Subproject commit 96d4944c445505d9d3b145456536088cac9121b1 -- To view, visit https://gerrit.wikimedia.org/r/177446 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3cf7f39005e3d6051cf719779cb62a4b96b2c263 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf10 Gerrit-Owner: Hoo man Gerrit-Reviewer: MaxSem Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata to minimize SiteList loading - change (mediawiki/core)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/177447 Change subject: Update Wikidata to minimize SiteList loading .. Update Wikidata to minimize SiteList loading Change-Id: If74340b3a49a4ad3b5074c483d016eddb2752abe --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/47/177447/1 diff --git a/extensions/Wikidata b/extensions/Wikidata index 95ab7f7..96d4944 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit 95ab7f7adc2130af2a86edb6b32c059707944c46 +Subproject commit 96d4944c445505d9d3b145456536088cac9121b1 -- To view, visit https://gerrit.wikimedia.org/r/177447 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If74340b3a49a4ad3b5074c483d016eddb2752abe Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf11 Gerrit-Owner: Hoo man ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata to minimize SiteList loading - change (mediawiki/core)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/177446 Change subject: Update Wikidata to minimize SiteList loading .. Update Wikidata to minimize SiteList loading Change-Id: I3cf7f39005e3d6051cf719779cb62a4b96b2c263 --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/46/177446/1 diff --git a/extensions/Wikidata b/extensions/Wikidata index 95ab7f7..96d4944 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit 95ab7f7adc2130af2a86edb6b32c059707944c46 +Subproject commit 96d4944c445505d9d3b145456536088cac9121b1 -- To view, visit https://gerrit.wikimedia.org/r/177446 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3cf7f39005e3d6051cf719779cb62a4b96b2c263 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf10 Gerrit-Owner: Hoo man ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix call to mw.log.warning - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix call to mw.log.warning
..
Fix call to mw.log.warning
Should be mw.log.warn
Added by I76b8
Change-Id: I58b78e89a7f5a21fe050e2a90bf856c388f7213d
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
index 11f4a2d..766ffce 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
@@ -39,7 +39,7 @@
return target;
}, function ( e ) {
- mw.log.warning( 'VisualEditor failed to
load: ' + e );
+ mw.log.warn( 'VisualEditor failed to
load: ' + e );
} );
}
return targetPromise;
--
To view, visit https://gerrit.wikimedia.org/r/177421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I58b78e89a7f5a21fe050e2a90bf856c388f7213d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: fd8f946..b0b53be - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: fd8f946..b0b53be .. Syncronize VisualEditor: fd8f946..b0b53be Change-Id: I9d610ab4fbfc3ee5cf667ef49dcbee63783eca6d --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index fd8f946..b0b53be 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit fd8f9463aae779d2f8b82e540c06247cae29068a +Subproject commit b0b53befdca73df2d0e134bf7ceed14ee7aff0b2 -- To view, visit https://gerrit.wikimedia.org/r/177445 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d610ab4fbfc3ee5cf667ef49dcbee63783eca6d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: fd8f946..b0b53be - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/177445 Change subject: Syncronize VisualEditor: fd8f946..b0b53be .. Syncronize VisualEditor: fd8f946..b0b53be Change-Id: I9d610ab4fbfc3ee5cf667ef49dcbee63783eca6d --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/45/177445/1 diff --git a/VisualEditor b/VisualEditor index fd8f946..b0b53be 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit fd8f9463aae779d2f8b82e540c06247cae29068a +Subproject commit b0b53befdca73df2d0e134bf7ceed14ee7aff0b2 -- To view, visit https://gerrit.wikimedia.org/r/177445 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d610ab4fbfc3ee5cf667ef49dcbee63783eca6d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikibase to minimize SiteList loading - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged.
Change subject: Update Wikibase to minimize SiteList loading
..
Update Wikibase to minimize SiteList loading
Change-Id: Ica1e3ca66ad198ce850e2fa636299d07f06a2a13
---
M composer.lock
M extensions/Wikibase/client/WikibaseClient.hooks.php
M extensions/Wikibase/client/includes/LangLinkHandler.php
M extensions/Wikibase/client/includes/WikibaseClient.php
M extensions/Wikibase/client/tests/phpunit/includes/LangLinkHandlerTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/hooks/ParserAfterParserHookHandlerTest.php
M vendor/composer/installed.json
7 files changed, 28 insertions(+), 27 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 452ed27..039b875 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1188,12 +1188,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "604a6115004f8b895e7c3c10ccd122561e5dd543"
+"reference": "c4c59c4e38523747acc75319d4d6522a2a8f7ae3"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/604a6115004f8b895e7c3c10ccd122561e5dd543";,
-"reference": "604a6115004f8b895e7c3c10ccd122561e5dd543",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c4c59c4e38523747acc75319d4d6522a2a8f7ae3";,
+"reference": "c4c59c4e38523747acc75319d4d6522a2a8f7ae3",
"shasum": ""
},
"require": {
@@ -1259,7 +1259,7 @@
"wikibaserepo",
"wikidata"
],
-"time": "2014-12-03 20:13:18"
+"time": "2014-12-04 00:25:22"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/WikibaseClient.hooks.php
b/extensions/Wikibase/client/WikibaseClient.hooks.php
index 58bda4c..cb01194 100644
--- a/extensions/Wikibase/client/WikibaseClient.hooks.php
+++ b/extensions/Wikibase/client/WikibaseClient.hooks.php
@@ -387,7 +387,7 @@
$siteLinkLookup =
$wikibaseClient->getStore()->getSiteLinkTable();
return $siteLinkLookup->getEntityIdForSiteLink(
new SiteLink(
- $wikibaseClient->getSite()->getGlobalId(),
+ $wikibaseClient->getSettings()->getSetting(
'siteGlobalID' ),
$title->getFullText()
)
);
diff --git a/extensions/Wikibase/client/includes/LangLinkHandler.php
b/extensions/Wikibase/client/includes/LangLinkHandler.php
index 0cb47ab..176aaa2 100644
--- a/extensions/Wikibase/client/includes/LangLinkHandler.php
+++ b/extensions/Wikibase/client/includes/LangLinkHandler.php
@@ -4,12 +4,11 @@
use ParserOutput;
use Site;
-use SiteList;
+use SiteStore;
use Title;
use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
use Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory;
use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
-use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
use Wikibase\Lib\Store\EntityLookup;
@@ -59,9 +58,9 @@
private $entityLookup;
/**
-* @var SiteList
+* @var SiteStore
*/
- private $sites;
+ private $siteStore;
/**
* @var string
@@ -80,7 +79,7 @@
* @param NamespaceChecker $namespaceChecker determines which
namespaces wikibase is enabled on
* @param SiteLinkLookup $siteLinkLookup A site link lookup service
* @param EntityLookup $entityLookup An entity lookup service
-* @param SiteList $sites
+* @param SiteStore $sites
* @param string $siteGroup The ID of the site group to use for showing
language links.
*/
public function __construct(
@@ -90,7 +89,7 @@
NamespaceChecker $namespaceChecker,
SiteLinkLookup $siteLinkLookup,
EntityLookup $entityLookup,
- SiteList $sites,
+ SiteStore $sites,
$siteGroup
) {
$this->otherProjectsSidebarGeneratorFactory =
$otherProjectsSidebarGeneratorFactory;
@@ -99,7 +98,7 @@
$this->namespaceChecker = $namespaceChecker;
$this->siteLinkLookup = $siteLinkLookup;
$this->entityLookup = $entityLookup;
- $this->sites = $sites;
+ $this->siteStore = $sites;
$this->siteGroup = $siteGroup;
}
@@ -175,7 +174,7 @@
foreach ( $links as $link ) {
[MediaWiki-commits] [Gerrit] implement fileNameNoSizePrefix - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177444
Change subject: implement fileNameNoSizePrefix
..
implement fileNameNoSizePrefix
Change-Id: I463c8f0f914dd7865438abf145cfd68a4ed08d59
---
M MediaWikiKit/MediaWikiKit/MWKImage.m
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/44/177444/1
diff --git a/MediaWikiKit/MediaWikiKit/MWKImage.m
b/MediaWikiKit/MediaWikiKit/MWKImage.m
index f56b928..eb3dc78 100644
--- a/MediaWikiKit/MediaWikiKit/MWKImage.m
+++ b/MediaWikiKit/MediaWikiKit/MWKImage.m
@@ -54,7 +54,13 @@
-(NSString *)fileNameNoSizePrefix
{
-return self.fileName; // @FIXME IMPLEMENT
+NSRegularExpression *re = [NSRegularExpression
regularExpressionWithPattern:@"^\\d+px-(.*)$" options:0 error:nil];
+NSArray *matches = [re matchesInString:self.fileName options:0
range:NSMakeRange(0, [self.fileName length])];
+if (matches) {
+return matches[1];
+} else {
+return self.fileName;
+}
}
-(id)dataExport
--
To view, visit https://gerrit.wikimedia.org/r/177444
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I463c8f0f914dd7865438abf145cfd68a4ed08d59
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikibase to minimize SiteList loading - change (mediawiki...Wikidata)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177443
Change subject: Update Wikibase to minimize SiteList loading
..
Update Wikibase to minimize SiteList loading
Change-Id: Ica1e3ca66ad198ce850e2fa636299d07f06a2a13
---
M composer.lock
M extensions/Wikibase/client/WikibaseClient.hooks.php
M extensions/Wikibase/client/includes/LangLinkHandler.php
M extensions/Wikibase/client/includes/WikibaseClient.php
M extensions/Wikibase/client/tests/phpunit/includes/LangLinkHandlerTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/hooks/ParserAfterParserHookHandlerTest.php
M vendor/composer/installed.json
7 files changed, 28 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/43/177443/1
diff --git a/composer.lock b/composer.lock
index 452ed27..039b875 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1188,12 +1188,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "604a6115004f8b895e7c3c10ccd122561e5dd543"
+"reference": "c4c59c4e38523747acc75319d4d6522a2a8f7ae3"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/604a6115004f8b895e7c3c10ccd122561e5dd543";,
-"reference": "604a6115004f8b895e7c3c10ccd122561e5dd543",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c4c59c4e38523747acc75319d4d6522a2a8f7ae3";,
+"reference": "c4c59c4e38523747acc75319d4d6522a2a8f7ae3",
"shasum": ""
},
"require": {
@@ -1259,7 +1259,7 @@
"wikibaserepo",
"wikidata"
],
-"time": "2014-12-03 20:13:18"
+"time": "2014-12-04 00:25:22"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/WikibaseClient.hooks.php
b/extensions/Wikibase/client/WikibaseClient.hooks.php
index 58bda4c..cb01194 100644
--- a/extensions/Wikibase/client/WikibaseClient.hooks.php
+++ b/extensions/Wikibase/client/WikibaseClient.hooks.php
@@ -387,7 +387,7 @@
$siteLinkLookup =
$wikibaseClient->getStore()->getSiteLinkTable();
return $siteLinkLookup->getEntityIdForSiteLink(
new SiteLink(
- $wikibaseClient->getSite()->getGlobalId(),
+ $wikibaseClient->getSettings()->getSetting(
'siteGlobalID' ),
$title->getFullText()
)
);
diff --git a/extensions/Wikibase/client/includes/LangLinkHandler.php
b/extensions/Wikibase/client/includes/LangLinkHandler.php
index 0cb47ab..176aaa2 100644
--- a/extensions/Wikibase/client/includes/LangLinkHandler.php
+++ b/extensions/Wikibase/client/includes/LangLinkHandler.php
@@ -4,12 +4,11 @@
use ParserOutput;
use Site;
-use SiteList;
+use SiteStore;
use Title;
use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
use Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory;
use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
-use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
use Wikibase\Lib\Store\EntityLookup;
@@ -59,9 +58,9 @@
private $entityLookup;
/**
-* @var SiteList
+* @var SiteStore
*/
- private $sites;
+ private $siteStore;
/**
* @var string
@@ -80,7 +79,7 @@
* @param NamespaceChecker $namespaceChecker determines which
namespaces wikibase is enabled on
* @param SiteLinkLookup $siteLinkLookup A site link lookup service
* @param EntityLookup $entityLookup An entity lookup service
-* @param SiteList $sites
+* @param SiteStore $sites
* @param string $siteGroup The ID of the site group to use for showing
language links.
*/
public function __construct(
@@ -90,7 +89,7 @@
NamespaceChecker $namespaceChecker,
SiteLinkLookup $siteLinkLookup,
EntityLookup $entityLookup,
- SiteList $sites,
+ SiteStore $sites,
$siteGroup
) {
$this->otherProjectsSidebarGeneratorFactory =
$otherProjectsSidebarGeneratorFactory;
@@ -99,7 +98,7 @@
$this->namespaceChecker = $namespaceChecker;
$this->siteLinkLookup = $siteLinkLookup;
$this->entityLookup = $entityLookup;
- $this->sites = $sites;
+ $this->siteStore = $sites;
$this->siteGroup = $siteGroup;
}
@@ -175,7 +174,7 @
[MediaWiki-commits] [Gerrit] Don't access sites on WikibaseClient::getEntityIdForTitle - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Don't access sites on WikibaseClient::getEntityIdForTitle .. Don't access sites on WikibaseClient::getEntityIdForTitle Change-Id: Iea58553d58f41c46646d1722f3c9419209e5 (cherry picked from commit e7ae35428dc22153d065a103336014970684c925) --- M client/WikibaseClient.hooks.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php index 58bda4c..cb01194 100644 --- a/client/WikibaseClient.hooks.php +++ b/client/WikibaseClient.hooks.php @@ -387,7 +387,7 @@ $siteLinkLookup = $wikibaseClient->getStore()->getSiteLinkTable(); return $siteLinkLookup->getEntityIdForSiteLink( new SiteLink( - $wikibaseClient->getSite()->getGlobalId(), + $wikibaseClient->getSettings()->getSetting( 'siteGlobalID' ), $title->getFullText() ) ); -- To view, visit https://gerrit.wikimedia.org/r/177439 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea58553d58f41c46646d1722f3c9419209e5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: wmf/1.25wmf10 Gerrit-Owner: Hoo man Gerrit-Reviewer: Hoo man Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't load all sites for LangLinkHandler - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't load all sites for LangLinkHandler
..
Don't load all sites for LangLinkHandler
Change-Id: I9e6de257f32dab6d49de5852f56dfba7a182994c
(cherry picked from commit 8c91cfb472f0ade7871917d6ab7e418b144ea63a)
---
M client/includes/LangLinkHandler.php
M client/includes/WikibaseClient.php
M client/tests/phpunit/includes/LangLinkHandlerTest.php
M client/tests/phpunit/includes/hooks/ParserAfterParserHookHandlerTest.php
4 files changed, 19 insertions(+), 18 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/LangLinkHandler.php
b/client/includes/LangLinkHandler.php
index 0cb47ab..176aaa2 100644
--- a/client/includes/LangLinkHandler.php
+++ b/client/includes/LangLinkHandler.php
@@ -4,12 +4,11 @@
use ParserOutput;
use Site;
-use SiteList;
+use SiteStore;
use Title;
use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
use Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory;
use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
-use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
use Wikibase\Lib\Store\EntityLookup;
@@ -59,9 +58,9 @@
private $entityLookup;
/**
-* @var SiteList
+* @var SiteStore
*/
- private $sites;
+ private $siteStore;
/**
* @var string
@@ -80,7 +79,7 @@
* @param NamespaceChecker $namespaceChecker determines which
namespaces wikibase is enabled on
* @param SiteLinkLookup $siteLinkLookup A site link lookup service
* @param EntityLookup $entityLookup An entity lookup service
-* @param SiteList $sites
+* @param SiteStore $sites
* @param string $siteGroup The ID of the site group to use for showing
language links.
*/
public function __construct(
@@ -90,7 +89,7 @@
NamespaceChecker $namespaceChecker,
SiteLinkLookup $siteLinkLookup,
EntityLookup $entityLookup,
- SiteList $sites,
+ SiteStore $sites,
$siteGroup
) {
$this->otherProjectsSidebarGeneratorFactory =
$otherProjectsSidebarGeneratorFactory;
@@ -99,7 +98,7 @@
$this->namespaceChecker = $namespaceChecker;
$this->siteLinkLookup = $siteLinkLookup;
$this->entityLookup = $entityLookup;
- $this->sites = $sites;
+ $this->siteStore = $sites;
$this->siteGroup = $siteGroup;
}
@@ -175,7 +174,7 @@
foreach ( $links as $link ) {
$siteId = $link->getSiteId();
- $site = $this->sites->getSite( $siteId );
+ $site = $this->siteStore->getSite( $siteId );
if ( !$site ) {
continue;
@@ -253,8 +252,9 @@
return array();
}
- if ( $this->sites->hasNavigationId( $code ) ) {
- $site = $this->sites->getSiteByNavigationId(
$code );
+ $sites = $this->siteStore->getSites();
+ if ( $sites->hasNavigationId( $code ) ) {
+ $site = $sites->getSiteByNavigationId( $code );
$wiki = $site->getGlobalId();
unset( $repoLinks[$wiki] );
}
@@ -282,14 +282,14 @@
wfProfileIn( __METHOD__ );
foreach ( $repoLinks as $wiki => $link ) {
- if ( !$this->sites->hasSite( $wiki ) ) {
+ if ( !$this->siteStore->getSite( $wiki ) ) {
wfDebugLog( __CLASS__, __FUNCTION__ . ':
skipping link to unknown site ' . $wiki );
unset( $repoLinks[$wiki] );
continue;
}
- $site = $this->sites->getSite( $wiki );
+ $site = $this->siteStore->getSite( $wiki );
if ( !in_array( $site->getGroup(), $allowedGroups ) ) {
wfDebugLog( __CLASS__, __FUNCTION__ . ':
skipping link to other group: ' . $wiki
@@ -340,8 +340,9 @@
$lang = $parts[0];
$page = $parts[1];
- if ( $this->sites->hasNavigationId( $lang ) ) {
- $site =
$this->sites->getSiteByNavigationId( $lang );
+ $sites = $this->siteStore->getSites();
+ if ( $sites->hasNavigationId( $lang ) ) {
+ $site = $sites->g
[MediaWiki-commits] [Gerrit] hygiene: rename form header to footer on special:search - change (mediawiki/core)
Robmoen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177442
Change subject: hygiene: rename form header to footer on special:search
..
hygiene: rename form header to footer on special:search
It is more of a footer
Change-Id: Ic6ec29817ab7deadc6bc7125f8b4cd16686baa04
---
M includes/specials/SpecialSearch.php
M resources/src/mediawiki.special/mediawiki.special.search.css
2 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/42/177442/1
diff --git a/includes/specials/SpecialSearch.php
b/includes/specials/SpecialSearch.php
index c55a667..25f67a7 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -332,7 +332,7 @@
Xml::closeElement( 'div' ) .
Xml::closeElement( 'form' ) .
$this->didYouMeanHtml .
- $this->formHeader( $term )
+ $this->formFooter( $term )
);
$filePrefix = $wgContLang->getFormattedNsText( NS_FILE ) . ':';
@@ -994,8 +994,8 @@
* @param string $term
* @return string
*/
- protected function formHeader( $term ) {
- $out = Xml::openElement( 'div', array( 'class' =>
'mw-search-formheader' ) );
+ protected function formFooter( $term ) {
+ $out = Xml::openElement( 'div', array( 'class' =>
'mw-search-formfooter' ) );
$bareterm = $term;
if ( $this->startsWithImage( $term ) ) {
diff --git a/resources/src/mediawiki.special/mediawiki.special.search.css
b/resources/src/mediawiki.special/mediawiki.special.search.css
index 4b6c14e..72ef883 100644
--- a/resources/src/mediawiki.special/mediawiki.special.search.css
+++ b/resources/src/mediawiki.special/mediawiki.special.search.css
@@ -40,34 +40,34 @@
color: green;
font-size: 97%;
}
-.mw-search-formheader {
+.mw-search-formfooter {
background-color: #f3f3f3;
margin-top: 1em;
border: 1px solid silver;
}
-.mw-search-formheader div.search-types {
+.mw-search-formfooter div.search-types {
float: left;
padding-left: 0.25em;
}
-.mw-search-formheader div.search-types ul {
+.mw-search-formfooter div.search-types ul {
margin: 0 !important;
padding: 0 !important;
list-style: none !important;
}
-.mw-search-formheader div.search-types ul li {
+.mw-search-formfooter div.search-types ul li {
float: left;
margin: 0;
padding: 0;
}
-.mw-search-formheader div.search-types ul li a {
+.mw-search-formfooter div.search-types ul li a {
display: block;
padding: 0.5em;
}
-.mw-search-formheader div.search-types ul li.current a {
+.mw-search-formfooter div.search-types ul li.current a {
color: #33;
cursor: default;
}
-.mw-search-formheader div.search-types ul li.current a:hover {
+.mw-search-formfooter div.search-types ul li.current a:hover {
text-decoration: none;
}
#mw-search-top-table div.results-info {
--
To view, visit https://gerrit.wikimedia.org/r/177442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6ec29817ab7deadc6bc7125f8b4cd16686baa04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Robmoen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QA: finish watchlist update - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: QA: finish watchlist update .. QA: finish watchlist update Change-Id: I73c53ebc97e35c5c05a366c571361c27efa329a6 --- M tests/browser/features/step_definitions/special_watchlist_steps.rb 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Cmcmahon: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/step_definitions/special_watchlist_steps.rb b/tests/browser/features/step_definitions/special_watchlist_steps.rb index 8cca8f9..41169c4 100644 --- a/tests/browser/features/step_definitions/special_watchlist_steps.rb +++ b/tests/browser/features/step_definitions/special_watchlist_steps.rb @@ -11,17 +11,17 @@ end Then(/^I should see a list of diff summary links$/) do - on(WatchlistPage).page_list_diffs_element.when_present.should be_visible + expect(on(WatchlistPage).page_list_diffs_element.when_present).to be_visible end Then(/^I should see a list of pages I am watching$/) do - on(WatchlistPage).page_list_a_to_z_element.when_present.should be_visible + expect(on(WatchlistPage).page_list_a_to_z_element.when_present).to be_visible end Then(/^the a to z button should be selected$/) do - on(WatchlistPage).list_link_element.parent.element().class_name.should match /active/ + expect(on(WatchlistPage).list_link_element.parent.element().class_name).to match 'active' end Then(/^the modified button should be selected$/) do - on(WatchlistPage).feed_link_element.parent.element().class_name.should match /active/ + expect(on(WatchlistPage).feed_link_element.parent.element().class_name).to match 'active' end -- To view, visit https://gerrit.wikimedia.org/r/177440 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I73c53ebc97e35c5c05a366c571361c27efa329a6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Cmcmahon Gerrit-Reviewer: Awjrichards Gerrit-Reviewer: Cmcmahon Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Force CommonsMetadata on beta to recalculate data from prod - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Force CommonsMetadata on beta to recalculate data from prod
..
Force CommonsMetadata on beta to recalculate data from prod
This will cause CMD on beta to throw away the CMD results received
from (non-beta) Commons and derive the metadata locally. This
helps testing changes in CMD logic which have been deployed on
beta but not on production.
Soft-depends on I721dfcdb283b81c63cc4241786f593b1e5dcd065.
Also remove a duplicate key from labs config.
Change-Id: I40a62571cbe2fc0ace202df4f0d7ae1845457c1b
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
3 files changed, 8 insertions(+), 4 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0656dd6..0dbe399 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1921,6 +1921,7 @@
if ( $wmgUseCommonsMetadata ) {
require_once( "$IP/extensions/CommonsMetadata/CommonsMetadata.php" );
$wgCommonsMetadataSetTrackingCategories =
$wmgCommonsMetadataSetTrackingCategories;
+ $wgCommonsMetadataForceRecalculate =
$wmgCommonsMetadataForceRecalculate;
}
if ( $wmgUseGWToolset ) {
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 066f91b..558a5c8 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -270,6 +270,9 @@
'wmgUseCommonsMetadata' => array(
'default' => true,
),
+ 'wmgCommonsMetadataForceRecalculate' => array(
+ 'default' => true,
+ ),
'wmgUseGWToolset' => array(
'default' => false,
@@ -289,10 +292,6 @@
// Enable all Beta Features in Beta Labs, even if not in production
whitelist
'wmgBetaFeaturesWhitelist' => array(
'default' => false,
- ),
-
- 'wmgUseCommonsMetadata' => array(
- 'default' => true,
),
'wmgUseMultimediaViewer' => array(
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 3dfa2b6..88624db 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11281,6 +11281,10 @@
'default' => true,
),
+'wmgCommonsMetadataForceRecalculate' => array(
+ 'default' => false,
+),
+
// NOTE: Extension:Popups has a hard dependency on TextExtracts and PageImages.
// @todo The pattern "everywhere but loginwiki and votewiki" repeats 32 times
in this file.
'wmgUsePopups' => array(
--
To view, visit https://gerrit.wikimedia.org/r/177271
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40a62571cbe2fc0ace202df4f0d7ae1845457c1b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ensure that we exit when `clear-host-cache` is done. - change (mediawiki...OfflineContentGenerator)
jenkins-bot has submitted this change and it was merged. Change subject: Ensure that we exit when `clear-host-cache` is done. .. Ensure that we exit when `clear-host-cache` is done. On the deployment machines we seem to leave a task hanging (redis?) and never exit unless we have an explicit `process.exit(0)` at the end. Change-Id: I8195f413ac6393e0317a6d925d9741b24fdd0024 --- M scripts/clear-host-cache.js 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Arlolra: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/clear-host-cache.js b/scripts/clear-host-cache.js index 78985ef..8edb445 100755 --- a/scripts/clear-host-cache.js +++ b/scripts/clear-host-cache.js @@ -119,4 +119,5 @@ process.exit(1); } } + process.exit(0); }).done(); -- To view, visit https://gerrit.wikimedia.org/r/177381 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8195f413ac6393e0317a6d925d9741b24fdd0024 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator Gerrit-Branch: master Gerrit-Owner: Cscott Gerrit-Reviewer: Arlolra Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't swallow console output from helper scripts unless `--q... - change (mediawiki...OfflineContentGenerator)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't swallow console output from helper scripts unless
`--quiet` is given.
..
Don't swallow console output from helper scripts unless `--quiet` is given.
Change-Id: I5cc46be37030e7464110e0470feb20f15eaa779d
---
M scripts/clear-host-cache.js
M scripts/clear-queue.js
M scripts/run-garbage-collect.js
3 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/clear-host-cache.js b/scripts/clear-host-cache.js
index 8edb445..a41942d 100755
--- a/scripts/clear-host-cache.js
+++ b/scripts/clear-host-cache.js
@@ -56,7 +56,7 @@
.usage('[options] ')
.option( '-c, --config ', 'Path to the local configuration file' )
.option( '-f, --force', 'Remove even pending jobs' )
- .option( '--quiet', "Don't add stdout to configured loggers")
+ .option( '-q, --quiet', "Don't add stdout to configured loggers")
.parse( process.argv );
var config = cli.parseConfig( commander.config );
diff --git a/scripts/clear-queue.js b/scripts/clear-queue.js
index 0e1103c..8592b78 100755
--- a/scripts/clear-queue.js
+++ b/scripts/clear-queue.js
@@ -40,10 +40,11 @@
commander
.version( cli.version )
.option( '-c, --config ', 'Path to the local configuration file' )
+ .option( '-q, --quiet', "Don't add stdout to configured loggers")
.parse( process.argv );
var config = cli.parseConfig( commander.config );
-cli.setupLogging( config );
+cli.setupLogging( config, !commander.quiet );
/* === Do the deed
* Basically, we check the number of entries in the list before, and then
diff --git a/scripts/run-garbage-collect.js b/scripts/run-garbage-collect.js
index 7ff96c2..7a4d672 100755
--- a/scripts/run-garbage-collect.js
+++ b/scripts/run-garbage-collect.js
@@ -37,10 +37,11 @@
commander
.version( cli.version )
.option( '-c, --config ', 'Path to the local configuration file' )
+ .option( '-q, --quiet', "Don't add stdout to configured loggers")
.parse( process.argv );
var config = cli.parseConfig( commander.config );
-cli.setupLogging( config );
+cli.setupLogging( config, !commander.quiet );
cli.setupStatsD( config );
/* === Do the deed = */
--
To view, visit https://gerrit.wikimedia.org/r/177383
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5cc46be37030e7464110e0470feb20f15eaa779d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator
Gerrit-Branch: master
Gerrit-Owner: Cscott
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Split things out of search element on Special:Search - change (mediawiki/core)
Robmoen has uploaded a new change for review. https://gerrit.wikimedia.org/r/177441 Change subject: Split things out of search element on Special:Search .. Split things out of search element on Special:Search While keeping these in the same order, pulling them out of the form helps mobile display search suggestions on non RL devices. Change-Id: Id267f66485b95788e682b912e8d2540c826d83fd --- M includes/specials/SpecialSearch.php 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/41/177441/1 diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index b1baf67..c55a667 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -330,8 +330,9 @@ Xml::openElement( 'div', array( 'id' => 'mw-search-top-table' ) ) . $this->shortDialog( $term, $num, $totalRes ) . Xml::closeElement( 'div' ) . - $this->formHeader( $term ) . - Xml::closeElement( 'form' ) + Xml::closeElement( 'form' ) . + $this->didYouMeanHtml . + $this->formHeader( $term ) ); $filePrefix = $wgContLang->getFormattedNsText( NS_FILE ) . ':'; @@ -1083,7 +1084,7 @@ Xml::element( 'div', array( 'style' => 'clear:both' ), '', false ); } - return $out . $this->didYouMeanHtml; + return $out; } /** -- To view, visit https://gerrit.wikimedia.org/r/177441 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id267f66485b95788e682b912e8d2540c826d83fd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Robmoen ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't access sites on WikibaseClient::getEntityIdForTitle - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/177439 Change subject: Don't access sites on WikibaseClient::getEntityIdForTitle .. Don't access sites on WikibaseClient::getEntityIdForTitle Change-Id: Iea58553d58f41c46646d1722f3c9419209e5 (cherry picked from commit e7ae35428dc22153d065a103336014970684c925) --- M client/WikibaseClient.hooks.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/39/177439/1 diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php index 58bda4c..cb01194 100644 --- a/client/WikibaseClient.hooks.php +++ b/client/WikibaseClient.hooks.php @@ -387,7 +387,7 @@ $siteLinkLookup = $wikibaseClient->getStore()->getSiteLinkTable(); return $siteLinkLookup->getEntityIdForSiteLink( new SiteLink( - $wikibaseClient->getSite()->getGlobalId(), + $wikibaseClient->getSettings()->getSetting( 'siteGlobalID' ), $title->getFullText() ) ); -- To view, visit https://gerrit.wikimedia.org/r/177439 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea58553d58f41c46646d1722f3c9419209e5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: wmf/1.25wmf10 Gerrit-Owner: Hoo man ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
