[MediaWiki-commits] [Gerrit] [WIP] The bottleneck is the processer! Parallelize it! - change (mediawiki...EventLogging)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222064
Change subject: [WIP] The bottleneck is the processer! Parallelize it!
..
[WIP] The bottleneck is the processer! Parallelize it!
This only parallelizes the parsing and validating part of
the eventlogging-processor. Perhaps we could make this
generic somehow for for use by eventlogging-consumer too.
Also, this does not make an attempt to parallelize reading
in data from Kafka topics. That could be an additional
speedup.
Change-Id: Ib308d24063f8dd6fb34d03ab9fb95cd126af1225
---
M server/bin/eventlogging-processor
1 file changed, 123 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging
refs/changes/64/222064/1
diff --git a/server/bin/eventlogging-processor
b/server/bin/eventlogging-processor
index 5e87fd6..f685229 100755
--- a/server/bin/eventlogging-processor
+++ b/server/bin/eventlogging-processor
@@ -30,6 +30,7 @@
"""
from __future__ import unicode_literals
+import os
import sys
reload(sys)
sys.setdefaultencoding('utf-8')
@@ -42,6 +43,8 @@
uri_force_raw, uri_append_query_items)
from jsonschema import ValidationError
+from multiprocessing import Manager, Process, Queue
+from Queue import Empty
setup_logging()
@@ -68,31 +71,25 @@
'used to write invalid events. Invalid events are written using the '
'EventError schema.'
)
-args = ap.parse_args()
-parser = LogParser(args.format)
+ap.add_argument(
+'--num-processes',
+default=1,
+type=int,
+)
-writers_list = []
-for output_uri in args.output:
-writers_list.append(get_writer(output_uri))
-logging.info('Publishing valid JSON events to %s.', output_uri)
+ap.add_argument(
+'--num-messages',
+default=None,
+type=int,
+)
-if args.output_invalid:
-# If --output-invalid was supplied without a value,
-# use the same writer for both invalid and valid events.
-if args.output_invalid is True:
-args.output_invalid = args.output[0]
-writer_invalid = writers_list[0]
-else:
-writer_invalid = get_writer(args.output_invalid)
-
-logging.info('Publishing invalid raw events to %s.', args.output_invalid)
-else:
-writer_invalid = None
-
-if args.sid:
-args.input = uri_append_query_items(args.input, {'identity': args.sid})
-
+# Make a thread safe global variable that
+# will be used to keep track of the number
+# of messages processed.
+manager = Manager()
+global_namespace = manager.Namespace()
+global_namespace.messages_processed = 0
def write_event_error(writer, raw_event, error_message, error_code):
try:
@@ -101,28 +98,111 @@
logging.error('Unable to create EventError object: %s' % e.message)
writer.send(event_error)
-for raw_event in get_reader(args.input):
-try:
-event = parser.parse(raw_event)
-event.pop('clientValidated', None)
-event.pop('isTruncated', None)
-validate(event)
-event['uuid'] = capsule_uuid(event)
+def process_event_worker(queue, parser, writers, num_messages=None):
+while True:
+logging.info("(pid: %s) read %s / %s, queue size: %s" %
+(os.getpid(), global_namespace.messages_processed, num_messages,
queue.qsize())
+)
+if (num_messages
+and global_namespace.messages_processed >= num_messages
+and queue.empty()):
+break
-except ValidationError as e:
-logging.error('Unable to validate: %s (%s)', raw_event, e.message)
-if writer_invalid:
-write_event_error(
-writer_invalid, raw_event, e.message, 'validation'
-)
+try:
+raw_event = queue.get(block=True, timeout=1)
+except Empty:
+pass
+else:
+try:
+event = parser.parse(raw_event)
+event.pop('clientValidated', None)
+event.pop('isTruncated', None)
+validate(event)
+event['uuid'] = capsule_uuid(event)
-except Exception as e:
-logging.error('Unable to process: %s (%s)', raw_event, e.message)
-if writer_invalid:
-write_event_error(
-writer_invalid, raw_event, e.message, 'processor'
-)
+except ValidationError as e:
+logging.error('Unable to validate: %s (%s)', raw_event,
e.message)
+if writer_invalid:
+write_event_error(
+writer_invalid, raw_event, e.message, 'validation'
+)
+except Exception as e:
+logging.error('Unable to process: %s (%s)', raw_event,
e.message)
+if writer_invalid:
+write_event_error(
+writer_invalid, raw_event, e.message, 'processor'
+
[MediaWiki-commits] [Gerrit] Remove TODOs from parserTests.txt - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review. https://gerrit.wikimedia.org/r/222063 Change subject: Remove TODOs from parserTests.txt .. Remove TODOs from parserTests.txt Change-Id: Id72a7396b164cf95c49a5930c035ec4f0c3387b7 --- M tests/parserTests.txt 1 file changed, 0 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/63/222063/1 diff --git a/tests/parserTests.txt b/tests/parserTests.txt index 7b63d94..4ab1a65 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -24753,10 +24753,3 @@ foobar !! end - -TODO: -more images -more tables -character entities -and much more -Try for 100% code coverage -- To view, visit https://gerrit.wikimedia.org/r/222063 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id72a7396b164cf95c49a5930c035ec4f0c3387b7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: add testAll* Gradle tasks - change (apps...wikipedia)
Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222062
Change subject: Hygiene: add testAll* Gradle tasks
..
Hygiene: add testAll* Gradle tasks
Add testAll* Gradle tasks that execute both JVM JUnit and Android
instrumentation tests per variant.
Change-Id: I75e660991225b6a09c7a94d61f51bf124e357f76
---
M wikipedia/build.gradle
1 file changed, 27 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/62/222062/1
diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index 5334535..57c0214 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -138,3 +138,30 @@
System.err.println propFile.toString() + ' not found'
android.buildTypes.release.signingConfig = null
}
+
+// --- testAll tasks ---
+// These tasks execute both JVM JUnit and Android instrumentation tests (per
variant).
+
+def addTestAllTask = { testAllName, jvmJUnitName, androidInstrumentationName ->
+def testAllTask = task (testAllName) {
+// Run JVM JUnit tests and Android instrumentation tests.
+dependsOn ([jvmJUnitName, androidInstrumentationName])
+}
+
+// JVM JUnit tests execute quickest and should be attempted prior to
Android instrumentation tests.
+testAllTask.shouldRunAfter jvmJUnitName
+}
+
+// Add testAll tasks for each build variant.
+android.applicationVariants.all { variant ->
+def variantName = variant.name.capitalize()
+def testAllName = "testAll${variantName}"
+def jvmJUnitName = "test${variantName}"
+def androidInstrumentationName = "connectedAndroidTest${variantName}"
+
+addTestAllTask(testAllName, jvmJUnitName, androidInstrumentationName)
+}
+
+// Add testAll task for all configurations.
+addTestAllTask('testAll', 'test', 'connectedAndroidTest')
+// --- /testAll ---
--
To view, visit https://gerrit.wikimedia.org/r/222062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I75e660991225b6a09c7a94d61f51bf124e357f76
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Get rid of 'mediawiki.api.edit' dependency - change (mediawiki...WikiLove)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222061
Change subject: Get rid of 'mediawiki.api.edit' dependency
..
Get rid of 'mediawiki.api.edit' dependency
Change-Id: I6a2462e63e1c6495cc91784ac6c0dfc5e2d842f7
---
M WikiLove.php
M resources/ext.wikiLove.core.js
2 files changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLove
refs/changes/61/222061/1
diff --git a/WikiLove.php b/WikiLove.php
index 2ce3db0..558c2f3 100644
--- a/WikiLove.php
+++ b/WikiLove.php
@@ -279,7 +279,6 @@
),
'dependencies' => array(
'mediawiki.api',
- 'mediawiki.api.edit',
'ext.wikiLove.defaultOptions',
'jquery.ui.dialog',
'mediawiki.ui.button',
diff --git a/resources/ext.wikiLove.core.js b/resources/ext.wikiLove.core.js
index 395a906..de5c1b1 100644
--- a/resources/ext.wikiLove.core.js
+++ b/resources/ext.wikiLove.core.js
@@ -661,7 +661,7 @@
if ( email ) {
sendData.email = email;
}
- api.postWithEditToken( sendData )
+ api.postWithToken( 'edit', sendData )
.done( function ( data ) {
wikiLoveNumberAttempted++;
if ( wikiLoveNumberAttempted ===
targets.length ) {
--
To view, visit https://gerrit.wikimedia.org/r/222061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a2462e63e1c6495cc91784ac6c0dfc5e2d842f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLove
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] SpecialChangeContentModel: Use autocomplete for title field - change (mediawiki/core)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/222060 Change subject: SpecialChangeContentModel: Use autocomplete for title field .. SpecialChangeContentModel: Use autocomplete for title field Change-Id: I766da59e6cbf7ed8f887d1a684ea9e284e9cf67e --- M includes/specials/SpecialChangeContentModel.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/60/222060/1 diff --git a/includes/specials/SpecialChangeContentModel.php b/includes/specials/SpecialChangeContentModel.php index 7647999..b3f5fd5 100644 --- a/includes/specials/SpecialChangeContentModel.php +++ b/includes/specials/SpecialChangeContentModel.php @@ -80,6 +80,7 @@ $fields = array( 'pagetitle' => array( 'type' => 'text', + 'autocomplete' => 'title', 'name' => 'pagetitle', 'default' => $this->par, 'label-message' => 'changecontentmodel-title-label', -- To view, visit https://gerrit.wikimedia.org/r/222060 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I766da59e6cbf7ed8f887d1a684ea9e284e9cf67e 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 missing dependency to mediawiki.widgets - change (mediawiki/core)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/222058 Change subject: Add missing dependency to mediawiki.widgets .. Add missing dependency to mediawiki.widgets mw.widgets.TitleOptionWidget.js depends upon jquery.autoEllipsis. Change-Id: I042d0630fce576911daaa891e1ab55650d1823a0 --- M resources/Resources.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/58/222058/1 diff --git a/resources/Resources.php b/resources/Resources.php index bd9788e..2db3aff 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1737,6 +1737,7 @@ 'default' => 'resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.css', ), 'dependencies' => array( + 'jquery.autoEllipsis', 'mediawiki.Title', 'mediawiki.api', 'oojs-ui', -- To view, visit https://gerrit.wikimedia.org/r/222058 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I042d0630fce576911daaa891e1ab55650d1823a0 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] OOUIHTMLForm: Add 'autocomplete' option for TitleInputWidget - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222059
Change subject: OOUIHTMLForm: Add 'autocomplete' option for TitleInputWidget
..
OOUIHTMLForm: Add 'autocomplete' option for TitleInputWidget
Setting 'autocomplete' => 'title' on a text field will configure it to
use a TitleInputWidget instead.
Bug: T104420
Change-Id: I45718462570d0a523a148c3830b1116b634df050
---
M includes/htmlform/HTMLTextField.php
1 file changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/59/222059/1
diff --git a/includes/htmlform/HTMLTextField.php
b/includes/htmlform/HTMLTextField.php
index 5c04ee2..7bf534d 100644
--- a/includes/htmlform/HTMLTextField.php
+++ b/includes/htmlform/HTMLTextField.php
@@ -118,9 +118,22 @@
$attribs['readOnly'] = true;
}
+ if ( isset( $this->mParams['autocomplete'] ) ) {
+ if ( $this->mParams['autocomplete'] === 'title' ) {
+ $class = 'MediaWiki\\Widget\\TitleInputWidget';
+ $this->mParent->getOutput()->addModules(
'mediawiki.widgets' );
+ } else {
+ // @todo add a user autocomplete
+ throw new UnexpectedValueException(
"Unrecognized value '{$this->mParams['autocomplete']}'"
+ . " for 'autocomplete' parameter" );
+ }
+ } else {
+ $class = 'OOUI\\TextInputWidget';
+ }
+
$type = $this->getType( $attribs );
- return new OOUI\TextInputWidget( array(
+ return new $class( array(
'id' => $this->mID,
'name' => $this->mName,
'value' => $value,
--
To view, visit https://gerrit.wikimedia.org/r/222059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I45718462570d0a523a148c3830b1116b634df050
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] Set initial Staff password policy - change (operations/mediawiki-config)
CSteipp has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222057
Change subject: Set initial Staff password policy
..
Set initial Staff password policy
Increase minimum length to 8-bytes.
Bug: T104370
Change-Id: Ifc12c74d5382f8adc1c261c8d6c12ef5892bf642
---
M wmf-config/CommonSettings.php
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/57/222057/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0d6fa89..2f83253 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -325,6 +325,14 @@
$wgPasswordPolicy['policies']['sysop']['MinimalPasswordLength'] = 1;
$wgPasswordPolicy['policies']['bot']['MinimalPasswordLength'] = 1;
+// Require 8-byte password for staff. Set MinimumPasswordLengthToLogin
+// to 8 also, once staff have time to update.
+$wgPasswordPolicy['policies']['staff'] = array(
+ 'MinimalPasswordLength' => 8,
+ 'MinimumPasswordLengthToLogin' => 1,
+ 'PasswordCannotMatchUsername' => true,
+);
+
# Not CLI, see http://bugs.php.net/bug.php?id=47540
if ( PHP_SAPI != 'cli' ) {
ignore_user_abort( true );
--
To view, visit https://gerrit.wikimedia.org/r/222057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc12c74d5382f8adc1c261c8d6c12ef5892bf642
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: CSteipp
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use config variable to enable ApiFlowSearch, rather than com... - change (mediawiki...Flow)
Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222056
Change subject: Use config variable to enable ApiFlowSearch, rather than
commenting out
..
Use config variable to enable ApiFlowSearch, rather than commenting out
This causes fewer issues when changing branches.
Change-Id: I6aad3bc5594b13149d5239661b26910653b00264
---
M Flow.php
M includes/Api/ApiFlow.php
2 files changed, 20 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/56/222056/1
diff --git a/Flow.php b/Flow.php
index ac93cf4..291ef10 100644
--- a/Flow.php
+++ b/Flow.php
@@ -367,6 +367,12 @@
'require' => array(),
); // see $wgCirrusSearchIndexAllocation
+// This allows running Flow without the search functionality. Right now, it's
because
+// the search functionality isn't ready for production, but we need to test it
locally.
+// We can decide later (after it's in production) whether to get rid of this
setting.
+// For example, this controls whether ApiFlowSearch is available.
+$wgFlowSearchEnabled = false;
+
// Custom group name for AbuseFilter
// Acceptable values:
// * a specific value for flow-specific filters
diff --git a/includes/Api/ApiFlow.php b/includes/Api/ApiFlow.php
index 7065351..d519754 100644
--- a/includes/Api/ApiFlow.php
+++ b/includes/Api/ApiFlow.php
@@ -14,7 +14,7 @@
/** @var ApiModuleManager $moduleManager */
private $moduleManager;
- private static $modules = array(
+ private static $alwaysEnabledModules = array(
// POST
'new-topic' => 'Flow\Api\ApiFlowNewTopic',
'edit-header' => 'Flow\Api\ApiFlowEditHeader',
@@ -38,13 +38,24 @@
'view-topic' => 'Flow\Api\ApiFlowViewTopic',
'view-header' => 'Flow\Api\ApiFlowViewHeader',
'view-topic-summary' => 'Flow\Api\ApiFlowViewTopicSummary',
-// 'search' => 'Flow\Api\ApiFlowSearch', // @todo: uncomment once
we're ready to expose search
+ );
+
+ private static $searchModules = array(
+ 'search' => 'Flow\Api\ApiFlowSearch',
);
public function __construct( $main, $action ) {
+ global $wgFlowSearchEnabled;
+
parent::__construct( $main, $action );
$this->moduleManager = new ApiModuleManager( $this );
- $this->moduleManager->addModules( self::$modules, 'submodule' );
+
+ $enabledModules = self::$alwaysEnabledModules;
+ if ( $wgFlowSearchEnabled ) {
+ $enabledModules += self::$searchModules;
+ }
+
+ $this->moduleManager->addModules( $enabledModules, 'submodule'
);
}
public function getModuleManager() {
--
To view, visit https://gerrit.wikimedia.org/r/222056
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6aad3bc5594b13149d5239661b26910653b00264
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace some MWException usage in User - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Replace some MWException usage in User
..
Replace some MWException usage in User
Change-Id: I61dbd6223354530311c497ad0f45ed49a573d0cb
---
M includes/User.php
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/User.php b/includes/User.php
index 1ee8173..f0614fe 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -369,7 +369,8 @@
Hooks::run( 'UserLoadAfterLoadFromSession',
array( $this ) );
break;
default:
- throw new MWException( "Unrecognised value for
User->mFrom: \"{$this->mFrom}\"" );
+ throw new UnexpectedValueException(
+ "Unrecognised value for User->mFrom:
\"{$this->mFrom}\"" );
}
}
@@ -943,7 +944,7 @@
* - 'usable' Valid for batch processes and login
* - 'creatable' Valid for batch processes, login and account
creation
*
-* @throws MWException
+* @throws InvalidArgumentException
* @return bool|string
*/
public static function getCanonicalName( $name, $validate = 'valid' ) {
@@ -990,7 +991,8 @@
}
break;
default:
- throw new MWException( 'Invalid parameter value
for $validate in ' . __METHOD__ );
+ throw new InvalidArgumentException(
+ 'Invalid parameter value for $validate
in ' . __METHOD__ );
}
return $name;
}
--
To view, visit https://gerrit.wikimedia.org/r/220949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I61dbd6223354530311c497ad0f45ed49a573d0cb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] resourceloader: Make minify cache keys globally shared inste... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: resourceloader: Make minify cache keys globally shared instead
of local
..
resourceloader: Make minify cache keys globally shared instead of local
The keys already contain a hash of the contents and the version of
the filter system. No need for these to be fragmented by wiki.
Previously wiki farms would minify the same module build for
every wiki. For e.g. Wikimedia this should bring down minification
runs for a new module version from ~800x to something lower.
It won't be 1 since modules may still vary by language, or config.
This should speed up load.php responses when a new module version
is deployed.
It will also reduce response time for page views of logged-in
users due to improved minification cache of embedded modules.
Change-Id: Iee884208c5c4ba40b46abd332271df698c6afb6f
(cherry picked from commit 9bd84c11d22bc593c3c6b3f18142f3203217570e)
---
M includes/resourceloader/ResourceLoader.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index 04b6fec..5d0ed3c 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -206,7 +206,7 @@
if ( !$options['cache'] ) {
$result = $this->applyFilter( $filter, $data );
} else {
- $key = wfMemcKey( 'resourceloader', 'filter', $filter,
self::$filterCacheVersion, md5( $data ) );
+ $key = wfGlobalCacheKey( 'resourceloader', 'filter',
$filter, self::$filterCacheVersion, md5( $data ) );
$cache = wfGetCache( wfIsHHVM() ? CACHE_ACCEL :
CACHE_ANYTHING );
$cacheEntry = $cache->get( $key );
if ( is_string( $cacheEntry ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/222055
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee884208c5c4ba40b46abd332271df698c6afb6f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf12
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] resourceloader: Make minify cache keys globally shared inste... - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222055
Change subject: resourceloader: Make minify cache keys globally shared instead
of local
..
resourceloader: Make minify cache keys globally shared instead of local
The keys already contain a hash of the contents and the version of
the filter system. No need for these to be fragmented by wiki.
Previously wiki farms would minify the same module build for
every wiki. For e.g. Wikimedia this should bring down minification
runs for a new module version from ~800x to something lower.
It won't be 1 since modules may still vary by language, or config.
This should speed up load.php responses when a new module version
is deployed.
It will also reduce response time for page views of logged-in
users due to improved minification cache of embedded modules.
Change-Id: Iee884208c5c4ba40b46abd332271df698c6afb6f
(cherry picked from commit 9bd84c11d22bc593c3c6b3f18142f3203217570e)
---
M includes/resourceloader/ResourceLoader.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/55/222055/1
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index 04b6fec..5d0ed3c 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -206,7 +206,7 @@
if ( !$options['cache'] ) {
$result = $this->applyFilter( $filter, $data );
} else {
- $key = wfMemcKey( 'resourceloader', 'filter', $filter,
self::$filterCacheVersion, md5( $data ) );
+ $key = wfGlobalCacheKey( 'resourceloader', 'filter',
$filter, self::$filterCacheVersion, md5( $data ) );
$cache = wfGetCache( wfIsHHVM() ? CACHE_ACCEL :
CACHE_ANYTHING );
$cacheEntry = $cache->get( $key );
if ( is_string( $cacheEntry ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/222055
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee884208c5c4ba40b46abd332271df698c6afb6f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf12
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] resourceloader: Make minify cache keys globally shared inste... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: resourceloader: Make minify cache keys globally shared instead
of local
..
resourceloader: Make minify cache keys globally shared instead of local
The keys already contain a hash of the contents and the version of
the filter system. No need for these to be fragmented by wiki.
Previously wiki farms would minify the same module build for
every wiki. For e.g. Wikimedia this should bring down minification
runs for a new module version from ~800x to something lower.
It won't be 1 since modules may still vary by language, or config.
This should speed up load.php responses when a new module version
is deployed.
It will also reduce response time for page views of logged-in
users due to improved minification cache of embedded modules.
Change-Id: Iee884208c5c4ba40b46abd332271df698c6afb6f
---
M includes/resourceloader/ResourceLoader.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index 04b6fec..5d0ed3c 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -206,7 +206,7 @@
if ( !$options['cache'] ) {
$result = $this->applyFilter( $filter, $data );
} else {
- $key = wfMemcKey( 'resourceloader', 'filter', $filter,
self::$filterCacheVersion, md5( $data ) );
+ $key = wfGlobalCacheKey( 'resourceloader', 'filter',
$filter, self::$filterCacheVersion, md5( $data ) );
$cache = wfGetCache( wfIsHHVM() ? CACHE_ACCEL :
CACHE_ANYTHING );
$cacheEntry = $cache->get( $key );
if ( is_string( $cacheEntry ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/222054
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee884208c5c4ba40b46abd332271df698c6afb6f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Legoktm
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] Avoid IDE warning about @throw docs - change (mediawiki...OAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid IDE warning about @throw docs
..
Avoid IDE warning about @throw docs
Change-Id: I7d27a9f91adf1c3899a594c5d9d5b314d442779d
---
M api/MWOAuthAPI.setup.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api/MWOAuthAPI.setup.php b/api/MWOAuthAPI.setup.php
old mode 100644
new mode 100755
index 84c19c6..8cf8b77
--- a/api/MWOAuthAPI.setup.php
+++ b/api/MWOAuthAPI.setup.php
@@ -28,7 +28,7 @@
*
* @param string $msgKey Key for the error message
* Varargs: normal message parameters.
-* @return \MWException
+* @return \UsageException|\ErrorPageError
*/
private static function makeException( $msgKey /* ... */ ) {
$params = func_get_args();
--
To view, visit https://gerrit.wikimedia.org/r/221983
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7d27a9f91adf1c3899a594c5d9d5b314d442779d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] resourceloader: Make minify cache keys global instead of wik... - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222054
Change subject: resourceloader: Make minify cache keys global instead of
wiki-local
..
resourceloader: Make minify cache keys global instead of wiki-local
These already contain a hash of the contains and a version of the
filter system. No need for these to be fragmented by wiki.
Should speed up building of load.php responses when a new module
version is deployed.
Previously wikifarms would minify the same module build for
every wiki. This won't reduce builds for a module from 800 to 1
at Wimedia as modules may still vary by language, skin
or configuration. But it should reduce minification computation
significantly and speed up load.php cache-miss response times.
It will also reduce response time for page views of logged-in
users due to minification of embedded modules.
Change-Id: Iee884208c5c4ba40b46abd332271df698c6afb6f
---
M includes/resourceloader/ResourceLoader.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/54/222054/1
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index 04b6fec..5d0ed3c 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -206,7 +206,7 @@
if ( !$options['cache'] ) {
$result = $this->applyFilter( $filter, $data );
} else {
- $key = wfMemcKey( 'resourceloader', 'filter', $filter,
self::$filterCacheVersion, md5( $data ) );
+ $key = wfGlobalCacheKey( 'resourceloader', 'filter',
$filter, self::$filterCacheVersion, md5( $data ) );
$cache = wfGetCache( wfIsHHVM() ? CACHE_ACCEL :
CACHE_ANYTHING );
$cacheEntry = $cache->get( $key );
if ( is_string( $cacheEntry ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/222054
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee884208c5c4ba40b46abd332271df698c6afb6f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] access: grant niedzielski access to stat1002 - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: access: grant niedzielski access to stat1002 .. access: grant niedzielski access to stat1002 bug: T103871 Change-Id: I71132beef50bc23e5b4b497b902611aea24fb2e6 --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index b1cac25..a29a4f9 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -216,7 +216,7 @@ bsitzmann, dbrant, declerambaul, ellery, nettrom, leila, ezachte, mforns, reedy, west1, phuedx, ananthrk, awight, joal, jamesur, akosiaris, jhobs, lpintscher, jkatz, madhuvishy, gpaumier, - andyrussg] + andyrussg, niedzielski] analytics-admins: gid: 732 description: Admin access to analytics cluster. -- To view, visit https://gerrit.wikimedia.org/r/220989 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I71132beef50bc23e5b4b497b902611aea24fb2e6 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Matanya Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Niedzielski Gerrit-Reviewer: Ottomata Gerrit-Reviewer: RobH Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrade db1034 - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: upgrade db1034
..
upgrade db1034
Change-Id: I79c6188c47d61416f9407dc83d17d401cb759102
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 4138ca4..df7e197 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -560,7 +560,7 @@
}
}
-node /^db10(33|34|41)\.eqiad\.wmnet/ {
+node /^db10(33|41)\.eqiad\.wmnet/ {
class { 'role::coredb::s7':
innodb_file_per_table => true,
mariadb => true,
@@ -653,7 +653,7 @@
}
}
-node /^db10(28|39|62)\.eqiad\.wmnet/ {
+node /^db10(28|34|39|62)\.eqiad\.wmnet/ {
class { 'role::mariadb::core':
shard => 's7',
}
--
To view, visit https://gerrit.wikimedia.org/r/222053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I79c6188c47d61416f9407dc83d17d401cb759102
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
Gerrit-Reviewer: Springle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrade db1034 - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222053
Change subject: upgrade db1034
..
upgrade db1034
Change-Id: I79c6188c47d61416f9407dc83d17d401cb759102
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/222053/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 4138ca4..df7e197 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -560,7 +560,7 @@
}
}
-node /^db10(33|34|41)\.eqiad\.wmnet/ {
+node /^db10(33|41)\.eqiad\.wmnet/ {
class { 'role::coredb::s7':
innodb_file_per_table => true,
mariadb => true,
@@ -653,7 +653,7 @@
}
}
-node /^db10(28|39|62)\.eqiad\.wmnet/ {
+node /^db10(28|34|39|62)\.eqiad\.wmnet/ {
class { 'role::mariadb::core':
shard => 's7',
}
--
To view, visit https://gerrit.wikimedia.org/r/222053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79c6188c47d61416f9407dc83d17d401cb759102
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP square audit file import - updates for new audit file ... - change (wikimedia...crm)
Cdentinger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222052
Change subject: WIP square audit file import - updates for new audit file -
fix test - correctness adjustments - fix test again - handle refund of
existing contribution
..
WIP square audit file import
- updates for new audit file
- fix test
- correctness adjustments
- fix test again
- handle refund of existing contribution
Bug: T92582
Change-Id: Ic99612a5a5cbaf9c6dcb47f3ef97238b809cde56
handle square refund of existing contribution
Change-Id: Ie85a3e39890fc1bca351a0112862517f6125b39b
---
M sites/all/modules/offline2civicrm/ChecksFile.php
A sites/all/modules/offline2civicrm/IgnoredRowException.php
A sites/all/modules/offline2civicrm/SquareFile.php
M sites/all/modules/offline2civicrm/offline2civicrm.info
M sites/all/modules/offline2civicrm/offline2civicrm.module
A sites/all/modules/offline2civicrm/tests/SquareFileTest.php
A sites/all/modules/offline2civicrm/tests/includes/SquareFileProbe.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
9 files changed, 180 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/52/222052/1
diff --git a/sites/all/modules/offline2civicrm/ChecksFile.php
b/sites/all/modules/offline2civicrm/ChecksFile.php
index 16f9aab..b9c7d6c 100644
--- a/sites/all/modules/offline2civicrm/ChecksFile.php
+++ b/sites/all/modules/offline2civicrm/ChecksFile.php
@@ -45,6 +45,7 @@
throw new WmfException( 'INVALID_FILE_FORMAT', "This file is
missing column headers: " . implode( ", ", $failed ) );
}
+$num_ignored = 0;
$num_successful = 0;
$num_duplicates = 0;
$this->row_index = -1 + $this->numSkippedRows;
@@ -65,9 +66,15 @@
// check to see if we have already processed this check
if ( $existing =
wmf_civicrm_get_contributions_from_gateway_id( $msg['gateway'],
$msg['gateway_txn_id'] ) ){
-// if so, move on
-watchdog( 'offline2civicrm', 'Contribution matches
existing contribution (id: @id), skipping it.', array( '@id' =>
$existing[0]['id'] ), WATCHDOG_INFO );
-$num_duplicates++;
+if ( $msg['gateway'] === 'square' &&
$msg['gateway_status_raw'] === 'Refunded' ) {
+// square updates the existing row with the "Refunded"
status and resends
+wmf_civicrm_mark_refund( $existing[0]['id'], 'refund',
true );
+}
+else {
+ // otherwise, move on
+ watchdog( 'offline2civicrm', 'Contribution matches
existing contribution (id: @id), skipping it.', array( '@id' =>
$existing[0]['id'] ), WATCHDOG_INFO );
+ $num_duplicates++;
+}
continue;
}
@@ -84,14 +91,17 @@
$num_successful++;
} catch ( EmptyRowException $ex ) {
continue;
+} catch ( IgnoredRowException $ex ) {
+$num_ignored++;
+continue;
} catch ( WmfException $ex ) {
$rowNum = $this->row_index + 2;
-$errorMsg = "Import aborted due to error at row {$rowNum}:
{$ex->getMessage()}, after {$num_successful} records were stored successfully
and {$num_duplicates} duplicates encountered.";
+$errorMsg = "Import aborted due to error at row {$rowNum}:
{$ex->getMessage()}, after {$num_successful} records were stored successfully,
{$num_ignored} were ignored, and {$num_duplicates} duplicates encountered.";
throw new Exception($errorMsg);
}
}
-$message = t( "Checks import complete. @successful imported, not
including @duplicates duplicates.", array( '@successful' => $num_successful,
'@duplicates' => $num_duplicates ) );
+$message = t( "Checks import complete. @successful imported, @ignored
ignored, not including @duplicates duplicates.", array( '@successful' =>
$num_successful, '@ignored' => $num_ignored, '@duplicates' => $num_duplicates )
);
ChecksImportLog::record( $message );
watchdog( 'offline2civicrm', $message, array(), WATCHDOG_INFO );
}
@@ -117,7 +127,7 @@
}
foreach ( $this->getDatetimeFields() as $field ) {
-if ( !empty( $msg[$field] ) ) {
+if ( !empty( $msg[$field] ) && !is_numeric( $msg[$field] ) ) {
$msg[$field] = wmf_common_date_parse_string( $msg[$field] );
}
}
diff --git a/sites/all/modules/offline2civicrm/IgnoredRowException.php
b/sites/all/modules/offline2civicrm/IgnoredRowException.php
new file mode 100644
index 000..c65cc2d
--- /dev/null
+++ b/sites/all/modu
[MediaWiki-commits] [Gerrit] handle square refund with existing contribution - change (wikimedia...crm)
Cdentinger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222051
Change subject: handle square refund with existing contribution
..
handle square refund with existing contribution
Change-Id: I1ed94cc56e43d5677f2f09b7e6fc632f3624021d
---
M sites/all/modules/offline2civicrm/ChecksFile.php
1 file changed, 9 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/51/222051/1
diff --git a/sites/all/modules/offline2civicrm/ChecksFile.php
b/sites/all/modules/offline2civicrm/ChecksFile.php
index c2fc135..b9c7d6c 100644
--- a/sites/all/modules/offline2civicrm/ChecksFile.php
+++ b/sites/all/modules/offline2civicrm/ChecksFile.php
@@ -66,9 +66,15 @@
// check to see if we have already processed this check
if ( $existing =
wmf_civicrm_get_contributions_from_gateway_id( $msg['gateway'],
$msg['gateway_txn_id'] ) ){
-// if so, move on
-watchdog( 'offline2civicrm', 'Contribution matches
existing contribution (id: @id), skipping it.', array( '@id' =>
$existing[0]['id'] ), WATCHDOG_INFO );
-$num_duplicates++;
+if ( $msg['gateway'] === 'square' &&
$msg['gateway_status_raw'] === 'Refunded' ) {
+// square updates the existing row with the "Refunded"
status and resends
+wmf_civicrm_mark_refund( $existing[0]['id'], 'refund',
true );
+}
+else {
+ // otherwise, move on
+ watchdog( 'offline2civicrm', 'Contribution matches
existing contribution (id: @id), skipping it.', array( '@id' =>
$existing[0]['id'] ), WATCHDOG_INFO );
+ $num_duplicates++;
+}
continue;
}
--
To view, visit https://gerrit.wikimedia.org/r/222051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ed94cc56e43d5677f2f09b7e6fc632f3624021d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Cdentinger
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add stop logging to all top-level scripts that convert to Flow - change (mediawiki...Flow)
Mattflaschen has uploaded a new change for review. https://gerrit.wikimedia.org/r/222050 Change subject: Add stop logging to all top-level scripts that convert to Flow .. Add stop logging to all top-level scripts that convert to Flow They already had start logging. Also minor wording tweaks Change-Id: I3da0c3d5276a77be56f3acbd884c476c2a9e99f0 --- M maintenance/convertLqtPageFromRemoteApiForTesting.php M maintenance/convertLqtPageOnLocalWiki.php M maintenance/convertLqtPagesWithProp.php M maintenance/convertNamespaceFromWikitext.php 4 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/50/222050/1 diff --git a/maintenance/convertLqtPageFromRemoteApiForTesting.php b/maintenance/convertLqtPageFromRemoteApiForTesting.php index 380a531..25bdee9 100644 --- a/maintenance/convertLqtPageFromRemoteApiForTesting.php +++ b/maintenance/convertLqtPageFromRemoteApiForTesting.php @@ -80,6 +80,8 @@ $logger->info( "Starting LQT conversion of page $srcPageName" ); $importer->import( $source, $dstTitle, $sourceStore ); + + $logger->info( "Finished LQT conversion of page $srcPageName" ); } } diff --git a/maintenance/convertLqtPageOnLocalWiki.php b/maintenance/convertLqtPageOnLocalWiki.php index a1e6070..b9abd8c 100644 --- a/maintenance/convertLqtPageOnLocalWiki.php +++ b/maintenance/convertLqtPageOnLocalWiki.php @@ -75,6 +75,8 @@ $converter->convertAll( array( $srcTitle, ) ); + + $logger->info( "Finished LQT conversion of page $srcPageName" ); } } diff --git a/maintenance/convertLqtPagesWithProp.php b/maintenance/convertLqtPagesWithProp.php index 9b57a2d..89682f9 100644 --- a/maintenance/convertLqtPagesWithProp.php +++ b/maintenance/convertLqtPagesWithProp.php @@ -58,9 +58,10 @@ $startId = $this->getOption( 'startId' ); $stopId = $this->getOption( 'stopId' ); - $logger->info( "Starting full wiki LQT conversion" ); + $logger->info( "Starting full wiki LQT conversion of all pages with use-liquid-threads property" ); $titles = new PagesWithPropertyIterator( $dbw, 'use-liquid-threads', $startId, $stopId ); $converter->convertAll( $titles ); + $logger->info( "Finished conversion" ); } } diff --git a/maintenance/convertNamespaceFromWikitext.php b/maintenance/convertNamespaceFromWikitext.php index 998b848..a8d6d72 100644 --- a/maintenance/convertNamespaceFromWikitext.php +++ b/maintenance/convertNamespaceFromWikitext.php @@ -92,6 +92,8 @@ $it = $it->getIterator(); $converter->convertAll( $it ); + + $logger->info( "Finished conversion of $namespaceName namespace" ); } } -- To view, visit https://gerrit.wikimedia.org/r/222050 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3da0c3d5276a77be56f3acbd884c476c2a9e99f0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Mattflaschen ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix wrong URL structure for https_only wikis - change (operations...wikistats)
jenkins-bot has submitted this change and it was merged.
Change subject: fix wrong URL structure for https_only wikis
..
fix wrong URL structure for https_only wikis
follow-up to Change-Id: Idb7f4687fba44ae8
caused:
Bug:T104411
Change-Id: Idfe123b744b2453079cf5c32fcd0613846547329
---
M usr/lib/wikistats/update.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/usr/lib/wikistats/update.php b/usr/lib/wikistats/update.php
index f4907ec..6fd4205 100644
--- a/usr/lib/wikistats/update.php
+++ b/usr/lib/wikistats/update.php
@@ -331,7 +331,7 @@
$url="http://${domain}/".$row['prefix']."/wiki/api.php${api_query_stat}";
} elseif (in_array($table, $tables_https_only)) {
$prefix=$row['prefix'];
-
$url="https://${domain}/".$row['prefix']."/wiki/api.php${api_query_stat}";
+$url="https://${prefix}.${domain}/w/api.php${api_query_stat}";;
} else {
$prefix=$row['prefix'];
$url="http://${prefix}.${domain}/w/api.php${api_query_stat}";;
--
To view, visit https://gerrit.wikimedia.org/r/222049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idfe123b744b2453079cf5c32fcd0613846547329
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix wrong URL structure for https_only wikis - change (operations...wikistats)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222049
Change subject: fix wrong URL structure for https_only wikis
..
fix wrong URL structure for https_only wikis
follow-up to Change-Id: Idb7f4687fba44ae8
caused:
Bug:T104411
Change-Id: Idfe123b744b2453079cf5c32fcd0613846547329
---
M usr/lib/wikistats/update.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/wikistats
refs/changes/49/222049/1
diff --git a/usr/lib/wikistats/update.php b/usr/lib/wikistats/update.php
index f4907ec..6fd4205 100644
--- a/usr/lib/wikistats/update.php
+++ b/usr/lib/wikistats/update.php
@@ -331,7 +331,7 @@
$url="http://${domain}/".$row['prefix']."/wiki/api.php${api_query_stat}";
} elseif (in_array($table, $tables_https_only)) {
$prefix=$row['prefix'];
-
$url="https://${domain}/".$row['prefix']."/wiki/api.php${api_query_stat}";
+$url="https://${prefix}.${domain}/w/api.php${api_query_stat}";;
} else {
$prefix=$row['prefix'];
$url="http://${prefix}.${domain}/w/api.php${api_query_stat}";;
--
To view, visit https://gerrit.wikimedia.org/r/222049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfe123b744b2453079cf5c32fcd0613846547329
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add config option to use https-only for certain projects - change (operations...wikistats)
jenkins-bot has submitted this change and it was merged.
Change subject: add config option to use https-only for certain projects
..
add config option to use https-only for certain projects
Add a config option to only use https for certain projects to fetch
stats. Now that WMF projects are https-only we need that or updates failed.
We can remove the hack for just ru.wp then.
Bug:T104367
Change-Id: Idb7f4687fba44ae8d495a3832c205aa554a77272
---
M etc/wikistats/config.php
M usr/lib/wikistats/update.php
2 files changed, 6 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/etc/wikistats/config.php b/etc/wikistats/config.php
index b6fcefd..068c590 100644
--- a/etc/wikistats/config.php
+++ b/etc/wikistats/config.php
@@ -87,6 +87,9 @@
# list tables for which we save a full statistics URL in db
$tables_with_statsurl=array('mediawikis','uncyclomedia','metapedias','wmspecials',
'wikifur');
+# list tables for which we should use only https URLs
+$tables_https_only=array('wikipedias','wikiquotes','wikibooks','wiktionaries','wikinews','wikisources','wmspecials','wikiversity','wikivoyage');
+
# cut off wiki name after X characters when showing it in HTML tables
$name_max_len="42";
diff --git a/usr/lib/wikistats/update.php b/usr/lib/wikistats/update.php
index 5e1beba..f4907ec 100644
--- a/usr/lib/wikistats/update.php
+++ b/usr/lib/wikistats/update.php
@@ -329,6 +329,9 @@
} elseif (in_array($table, $tables_with_suffix_wiki_last)) {
$prefix=$row['prefix'];
$url="http://${domain}/".$row['prefix']."/wiki/api.php${api_query_stat}";
+} elseif (in_array($table, $tables_https_only)) {
+$prefix=$row['prefix'];
+
$url="https://${domain}/".$row['prefix']."/wiki/api.php${api_query_stat}";
} else {
$prefix=$row['prefix'];
$url="http://${prefix}.${domain}/w/api.php${api_query_stat}";;
--
To view, visit https://gerrit.wikimedia.org/r/222048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb7f4687fba44ae8d495a3832c205aa554a77272
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add config option to use https-only for certain projects - change (operations...wikistats)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222048
Change subject: add config option to use https-only for certain projects
..
add config option to use https-only for certain projects
Add a config option to only use https for certain projects to fetch
stats. Now that WMF projects are https-only we need that or updates failed.
We can remove the hack for just ru.wp then.
Bug:T104367
Change-Id: Idb7f4687fba44ae8d495a3832c205aa554a77272
---
M etc/wikistats/config.php
M usr/lib/wikistats/update.php
2 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/wikistats
refs/changes/48/222048/1
diff --git a/etc/wikistats/config.php b/etc/wikistats/config.php
index b6fcefd..068c590 100644
--- a/etc/wikistats/config.php
+++ b/etc/wikistats/config.php
@@ -87,6 +87,9 @@
# list tables for which we save a full statistics URL in db
$tables_with_statsurl=array('mediawikis','uncyclomedia','metapedias','wmspecials',
'wikifur');
+# list tables for which we should use only https URLs
+$tables_https_only=array('wikipedias','wikiquotes','wikibooks','wiktionaries','wikinews','wikisources','wmspecials','wikiversity','wikivoyage');
+
# cut off wiki name after X characters when showing it in HTML tables
$name_max_len="42";
diff --git a/usr/lib/wikistats/update.php b/usr/lib/wikistats/update.php
index 5e1beba..f4907ec 100644
--- a/usr/lib/wikistats/update.php
+++ b/usr/lib/wikistats/update.php
@@ -329,6 +329,9 @@
} elseif (in_array($table, $tables_with_suffix_wiki_last)) {
$prefix=$row['prefix'];
$url="http://${domain}/".$row['prefix']."/wiki/api.php${api_query_stat}";
+} elseif (in_array($table, $tables_https_only)) {
+$prefix=$row['prefix'];
+
$url="https://${domain}/".$row['prefix']."/wiki/api.php${api_query_stat}";
} else {
$prefix=$row['prefix'];
$url="http://${prefix}.${domain}/w/api.php${api_query_stat}";;
--
To view, visit https://gerrit.wikimedia.org/r/222048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb7f4687fba44ae8d495a3832c205aa554a77272
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Theme: Add missing doc comments - change (oojs/ui)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222047
Change subject: Theme: Add missing doc comments
..
Theme: Add missing doc comments
Change-Id: Ia5dd2f2888a68a408c5a23123a8cdbf203e9dbff
---
M php/Theme.php
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/47/222047/1
diff --git a/php/Theme.php b/php/Theme.php
index 1801db4..3aa7781 100644
--- a/php/Theme.php
+++ b/php/Theme.php
@@ -15,10 +15,17 @@
/* Static Methods */
+ /**
+* @param Theme|null $theme
+*/
public static function setSingleton( Theme $theme = null ) {
self::$singleton = $theme;
}
+ /**
+* @return Theme
+* @throws Exception
+*/
public static function singleton() {
if ( !self::$singleton ) {
throw new Exception( __METHOD__ . ' was called with no
singleton theme set.' );
--
To view, visit https://gerrit.wikimedia.org/r/222047
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5dd2f2888a68a408c5a23123a8cdbf203e9dbff
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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] Actually make OOUI\Theme abstract in PHP - change (oojs/ui)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222046
Change subject: Actually make OOUI\Theme abstract in PHP
..
Actually make OOUI\Theme abstract in PHP
Change-Id: Ia963903d525bc2f62d02d771819dde106d057564
---
M php/Theme.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/46/222046/1
diff --git a/php/Theme.php b/php/Theme.php
index 458b197..1801db4 100644
--- a/php/Theme.php
+++ b/php/Theme.php
@@ -7,7 +7,7 @@
*
* @abstract
*/
-class Theme {
+abstract class Theme {
/* Members */
--
To view, visit https://gerrit.wikimedia.org/r/222046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia963903d525bc2f62d02d771819dde106d057564
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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] use https link to fetch stats for wmf projects - change (operations...wikistats)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222045
Change subject: use https link to fetch stats for wmf projects
..
use https link to fetch stats for wmf projects
Bug:T104367
Change-Id: I4bfb10953d88125debd18b656005d70c89ab0232
---
M usr/lib/wikistats/update.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/wikistats
refs/changes/45/222045/1
diff --git a/usr/lib/wikistats/update.php b/usr/lib/wikistats/update.php
index 5e1beba..4f9deee 100644
--- a/usr/lib/wikistats/update.php
+++ b/usr/lib/wikistats/update.php
@@ -331,7 +331,7 @@
$url="http://${domain}/".$row['prefix']."/wiki/api.php${api_query_stat}";
} else {
$prefix=$row['prefix'];
-$url="http://${prefix}.${domain}/w/api.php${api_query_stat}";;
+$url="https://${prefix}.${domain}/w/api.php${api_query_stat}";;
}
print "A(${mycount}/${totalcount}) - ${prefix}.${domain} - calling
API: ${url}\n";
--
To view, visit https://gerrit.wikimedia.org/r/222045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4bfb10953d88125debd18b656005d70c89ab0232
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Double $wgMaxShellMemory on HHVM scalers (512 Mb => 1024 Mb) - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Double $wgMaxShellMemory on HHVM scalers (512 Mb => 1024 Mb)
..
Double $wgMaxShellMemory on HHVM scalers (512 Mb => 1024 Mb)
I want to see if `convert` is leaking uncontrollably, or if there is simply
some additional (but relatively constant) memory overhead to running it under
Trusty / HHVM.
Change-Id: I9a801898188a363554af109d6b2d03b20346a577
---
M wmf-config/CommonSettings.php
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 04cda5a..39809b1 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1380,6 +1380,9 @@
if ( file_exists( '/etc/wikimedia-image-scaler' ) ) {
$wgMaxShellMemory = 512 * 1024;
$wgMaxShellFileSize = 512 * 1024;
+ if ( defined( 'HHVM_VERSION' ) ) {
+ $wgMaxShellMemory *= 2;
+ }
}
$wgMaxShellTime = 50; // so it times out before PHP and curl and squid
--
To view, visit https://gerrit.wikimedia.org/r/222044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a801898188a363554af109d6b2d03b20346a577
Gerrit-PatchSet: 1
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] Double $wgMaxShellMemory on HHVM scalers (512 Mb => 1024 Mb) - change (operations/mediawiki-config)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222044
Change subject: Double $wgMaxShellMemory on HHVM scalers (512 Mb => 1024 Mb)
..
Double $wgMaxShellMemory on HHVM scalers (512 Mb => 1024 Mb)
I want to see if `convert` is leaking uncontrollably, or if there is simply
some additional (but relatively constant) memory overhead to running it under
Trusty / HHVM.
Change-Id: I9a801898188a363554af109d6b2d03b20346a577
---
M wmf-config/CommonSettings.php
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/44/222044/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 04cda5a..39809b1 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1380,6 +1380,9 @@
if ( file_exists( '/etc/wikimedia-image-scaler' ) ) {
$wgMaxShellMemory = 512 * 1024;
$wgMaxShellFileSize = 512 * 1024;
+ if ( defined( 'HHVM_VERSION' ) ) {
+ $wgMaxShellMemory *= 2;
+ }
}
$wgMaxShellTime = 50; // so it times out before PHP and curl and squid
--
To view, visit https://gerrit.wikimedia.org/r/222044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a801898188a363554af109d6b2d03b20346a577
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] Set rev_content_model for old revisions when changing conten... - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222043
Change subject: Set rev_content_model for old revisions when changing content
model
..
Set rev_content_model for old revisions when changing content model
Due to storage issues, we do not store the content model and format for
revisions if it is the default. When changing the content model for a
page, NULL will now refer to the new content model, and fail to
unserialize. By setting an explicit value for rev_content_model,
accessing old revisions will use the content model at that time rather
than the current.
Change-Id: I7011812b6b131170b3c593917ad263bcba83898d
---
M includes/page/WikiPage.php
1 file changed, 17 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/43/222043/1
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index f7f2528..37970f4 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1737,6 +1737,8 @@
$bot = $flags & EDIT_FORCE_BOT;
$old_content = $this->getContent( Revision::RAW ); // current
revision's content
+ $oldModel = $old_content->getModel();
+ $changingContentModel = $oldModel !== $content->getModel();
$oldsize = $old_content ? $old_content->getSize() : 0;
$oldid = $this->getLatest();
@@ -1825,6 +1827,21 @@
return $status;
}
+ if ( $changingContentModel
+ && (
ContentHandler::getDefaultModelFor( $this->getTitle() ) === $oldModel )
+ ) {
+ // T73163: When changing the content
model of a page, we need to make sure
+ // rev_content_model is not null so the
old revisions are still accessible.
+ // If the old content model was not the
default, we don't need to worry
+ // about this.
+ $dbw->update(
+ 'revision',
+ array( 'rev_content_model' =>
$old_content->getModel() ),
+ array( 'rev_page' =>
$this->getId(), 'rev_content_model' => null ),
+ __METHOD__
+ );
+ }
+
Hooks::run( 'NewRevisionFromEditComplete',
array( $this, $revision, $baseRevId, $user ) );
// Update recentchanges
--
To view, visit https://gerrit.wikimedia.org/r/222043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7011812b6b131170b3c593917ad263bcba83898d
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] Check campaign content model - change (mediawiki...UploadWizard)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222042
Change subject: Check campaign content model
..
Check campaign content model
Not super nice but an exception is still better than a fatal.
Bug: T104395
Change-Id: If76b8704781f8d0d23c343c9ff7530da61a54076
---
M includes/UploadWizardCampaign.php
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/42/222042/1
diff --git a/includes/UploadWizardCampaign.php
b/includes/UploadWizardCampaign.php
index bee496f..d30b45b 100755
--- a/includes/UploadWizardCampaign.php
+++ b/includes/UploadWizardCampaign.php
@@ -73,7 +73,11 @@
function __construct( $title, $config = null, $context = null ) {
$this->title = $title;
if ( $config === null ) {
- $this->config = WikiPage::factory( $title
)->getContent()->getJsonData();
+ $content = WikiPage::factory( $title )->getContent();
+ if ( $content->getModel() !== 'Campaign' ) {
+ throw new MWException( 'Wrong content model' );
+ }
+ $this->config = $content->getJsonData();
} else {
$this->config = $config;
}
--
To view, visit https://gerrit.wikimedia.org/r/222042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If76b8704781f8d0d23c343c9ff7530da61a54076
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix sitenotice config variable check - change (mediawiki...MobileFrontend)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222041
Change subject: Fix sitenotice config variable check
..
Fix sitenotice config variable check
Bug: T104401
Change-Id: I7a367abd55c515ec52ee48d413adb6bf838d58d9
(cherry picked from commit 3490bc5d50eb0ef188f755c21ee12a1ae2baa61a)
---
M includes/skins/SkinMinerva.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/41/222041/1
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index b036d54..3eb2a6f 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -746,7 +746,7 @@
protected function prepareBanners( BaseTemplate $tpl ) {
// Make sure Zero banner are always on top
$banners = array( '' );
- if ( $this->getMFConfig( 'MFEnableSiteNotice' ) ) {
+ if ( $this->getMFConfig()->get( 'MFEnableSiteNotice' ) ) {
$siteNotice = $this->getSiteNotice();
if ( $siteNotice ) {
$banners[] = $siteNotice;
--
To view, visit https://gerrit.wikimedia.org/r/222041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a367abd55c515ec52ee48d413adb6bf838d58d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.26wmf12
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove use of module group 'other' from special page modules - change (mediawiki...MobileFrontend)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/222040 Change subject: Remove use of module group 'other' from special page modules .. Remove use of module group 'other' from special page modules Follows-up 58339381. Change-Id: Ic102ca535784518bb84991b60440c1d82a975587 --- M MobileFrontend.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/40/222040/1 diff --git a/MobileFrontend.php b/MobileFrontend.php index 00e1623..dde7cc2 100644 --- a/MobileFrontend.php +++ b/MobileFrontend.php @@ -206,7 +206,6 @@ */ $wgMFMobileSpecialPageResourceBoilerplate = $wgMFResourceBoilerplate + array( 'targets' => 'mobile', - 'group' => 'other', ); /** -- To view, visit https://gerrit.wikimedia.org/r/222040 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic102ca535784518bb84991b60440c1d82a975587 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend 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] WIP: No whitespace to right of menu - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222039
Change subject: WIP: No whitespace to right of menu
..
WIP: No whitespace to right of menu
I took a stab at this as it looked easy but it wasn't :)
TODO:
Opening left menu is extremely jarring with this change
Content padding is not right
Bug: T101044
Change-Id: Ibf1c4e636136678b99b9edb7305ef5175c52f5a0
---
M includes/skins/SkinMinervaBeta.php
M resources/mobile.mainMenu/MainMenu.js
M resources/skins.minerva.tablet.beta.styles/common.less
3 files changed, 27 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/39/222039/1
diff --git a/includes/skins/SkinMinervaBeta.php
b/includes/skins/SkinMinervaBeta.php
index ed53b15..86e0bcc 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -12,6 +12,14 @@
/** @var string $mode Describes 'stability' of the skin - alpha, beta,
stable */
protected $mode = 'beta';
+ /**
+* FIXME: This can be removed when moving max-width styles to stable.
+* @inheritdoc
+*/
+ public function getPageClasses( $title ) {
+ return parent::getPageClasses( $title ) . '
navigation-disabled';
+ }
+
/** @inheritdoc **/
protected function getHeaderHtml() {
$html = parent::getHeaderHtml();
diff --git a/resources/mobile.mainMenu/MainMenu.js
b/resources/mobile.mainMenu/MainMenu.js
index 666977c..ceae1dc 100644
--- a/resources/mobile.mainMenu/MainMenu.js
+++ b/resources/mobile.mainMenu/MainMenu.js
@@ -117,6 +117,7 @@
// FIXME: We should be moving away from applying
classes to the body
$( 'body' ).removeClass( 'navigation-enabled' )
.removeClass( 'secondary-navigation-enabled' )
+ .addClass( 'navigation-disabled' )
.removeClass( 'primary-navigation-enabled' );
},
@@ -131,6 +132,7 @@
drawerType = drawerType || 'primary';
// FIXME: We should be moving away from applying
classes to the body
$( 'body' ).toggleClass( 'navigation-enabled' )
+ .toggleClass( 'navigation-disabled' )
.toggleClass( drawerType +
'-navigation-enabled' );
}
} );
diff --git a/resources/skins.minerva.tablet.beta.styles/common.less
b/resources/skins.minerva.tablet.beta.styles/common.less
index 544cb86..690985c 100644
--- a/resources/skins.minerva.tablet.beta.styles/common.less
+++ b/resources/skins.minerva.tablet.beta.styles/common.less
@@ -5,8 +5,8 @@
@media all and (min-width: @wgMFDeviceWidthTablet) {
// When pushing to stable remember to think about cache implications
- .alpha,
- .beta {
+ .alpha.navigation-disabled,
+ .beta.navigation-disabled {
// FIXME: Zero should use banner-container class or better -
append to banner-container
#mw-mf-page-center .mw-mf-banner,
.banner-container,
@@ -34,19 +34,12 @@
.pre-content,
.post-content,
.content-unstyled,
+ .content,
.content-header,
.overlay-header,
.overlay-content {
padding-left: @contentPaddingTablet;
padding-right: @contentPaddingTablet;
- }
- }
-
- .alpha,
- .beta {
- // #mw-mf-page-center is needed because there is a .header
inside the main menu in alpha
- #mw-mf-page-center .header {
- margin-top: -1px;
}
// stable and beta hamburger icon
@@ -59,6 +52,20 @@
// so that the icon image is aligned with the content
right: -@iconGutterWidth;
}
+ }
+
+ .alpha,
+ .beta {
+
+ // Resets rule in skins.minerva.tablet.styles, new rule only
applies when navigation-disabled class exists
+ .content {
+ padding: 0;
+ }
+
+ // #mw-mf-page-center is needed because there is a .header
inside the main menu in alpha
+ #mw-mf-page-center .header {
+ margin-top: -1px;
+ }
.pre-content {
--
To view, visit https://gerrit.wikimedia.org/r/222039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf1c4e636136678b99b9edb7305ef5175c52f5a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
_
[MediaWiki-commits] [Gerrit] Fix sitenotice config variable check - change (mediawiki...MobileFrontend)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222038
Change subject: Fix sitenotice config variable check
..
Fix sitenotice config variable check
Bug: T104401
Change-Id: I7a367abd55c515ec52ee48d413adb6bf838d58d9
(cherry picked from commit 3490bc5d50eb0ef188f755c21ee12a1ae2baa61a)
---
M includes/skins/SkinMinerva.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/38/222038/1
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index e04e52c..191da99 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -746,7 +746,7 @@
protected function prepareBanners( BaseTemplate $tpl ) {
// Make sure Zero banner are always on top
$banners = array( '' );
- if ( $this->getMFConfig( 'MFEnableSiteNotice' ) ) {
+ if ( $this->getMFConfig()->get( 'MFEnableSiteNotice' ) ) {
$siteNotice = $this->getSiteNotice();
if ( $siteNotice ) {
$banners[] = $siteNotice;
--
To view, visit https://gerrit.wikimedia.org/r/222038
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a367abd55c515ec52ee48d413adb6bf838d58d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.26wmf11
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix sitenotice config variable check - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix sitenotice config variable check
..
Fix sitenotice config variable check
Bug: T104401
Change-Id: I7a367abd55c515ec52ee48d413adb6bf838d58d9
---
M includes/skins/SkinMinerva.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index b036d54..3eb2a6f 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -746,7 +746,7 @@
protected function prepareBanners( BaseTemplate $tpl ) {
// Make sure Zero banner are always on top
$banners = array( '' );
- if ( $this->getMFConfig( 'MFEnableSiteNotice' ) ) {
+ if ( $this->getMFConfig()->get( 'MFEnableSiteNotice' ) ) {
$siteNotice = $this->getSiteNotice();
if ( $siteNotice ) {
$banners[] = $siteNotice;
--
To view, visit https://gerrit.wikimedia.org/r/222036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a367abd55c515ec52ee48d413adb6bf838d58d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move Cassandra to g1gc collector and increase heap size - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: Move Cassandra to g1gc collector and increase heap size
..
Move Cassandra to g1gc collector and increase heap size
The g1gc collector handles larger heaps better out of the box, and will be the
new default in Cassandra 3.0. We have tested it for a couple of hours in
production with the settings below, and it seems to have improved latencies
and reduced timeouts. It lets us increase the heap size slightly from 8g to
12g, which provides a bit of headroom for heavy compaction and write activity
on large instances.
Additionally, this patch slightly tweaks the number of concurrent writes
upwards from 32 to 48. This makes better use of the available SSD throughput,
and reduces the tendency to back up on the write stage.
Bug: T103161
Change-Id: I0ea1a46065f388cb42442b73d96ba239d3d07866
---
M hieradata/role/common/cassandra.yaml
M modules/cassandra/templates/cassandra-env.sh.erb
2 files changed, 19 insertions(+), 12 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/cassandra.yaml
b/hieradata/role/common/cassandra.yaml
index 21609dd..72bdb1d 100644
--- a/hieradata/role/common/cassandra.yaml
+++ b/hieradata/role/common/cassandra.yaml
@@ -11,11 +11,12 @@
- restbase1004.eqiad.wmnet
- restbase1005.eqiad.wmnet
- restbase1006.eqiad.wmnet
-cassandra::max_heap_size: 8g
+cassandra::max_heap_size: 12g
# 1/4 heap size, no more than 100m/thread
cassandra::heap_newsize: 2048m
cassandra::compaction_throughput_mb_per_sec: 160
cassandra::concurrent_compactors: 10
+cassandra::concurrent_writes: 48
cassandra::dc: "%{::site}"
cassandra::cluster_name: "%{::site}"
diff --git a/modules/cassandra/templates/cassandra-env.sh.erb
b/modules/cassandra/templates/cassandra-env.sh.erb
index d78659d..d1720fa 100644
--- a/modules/cassandra/templates/cassandra-env.sh.erb
+++ b/modules/cassandra/templates/cassandra-env.sh.erb
@@ -196,7 +196,7 @@
# out.
JVM_OPTS="$JVM_OPTS -Xms${MAX_HEAP_SIZE}"
JVM_OPTS="$JVM_OPTS -Xmx${MAX_HEAP_SIZE}"
-JVM_OPTS="$JVM_OPTS -Xmn${HEAP_NEWSIZE}"
+#JVM_OPTS="$JVM_OPTS -Xmn${HEAP_NEWSIZE}"
JVM_OPTS="$JVM_OPTS -XX:+HeapDumpOnOutOfMemoryError"
# set jvm HeapDumpPath with CASSANDRA_HEAPDUMP_DIR
@@ -214,16 +214,22 @@
JVM_OPTS="$JVM_OPTS -XX:StringTableSize=103"
# GC tuning options
-JVM_OPTS="$JVM_OPTS -XX:+UseParNewGC"
-JVM_OPTS="$JVM_OPTS -XX:+UseConcMarkSweepGC"
-JVM_OPTS="$JVM_OPTS -XX:+CMSParallelRemarkEnabled"
-JVM_OPTS="$JVM_OPTS -XX:SurvivorRatio=8"
-JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=5"
-JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=78"
-JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly"
-JVM_OPTS="$JVM_OPTS -XX:+UseTLAB"
-JVM_OPTS="$JVM_OPTS -XX:CompileCommandFile=$CASSANDRA_CONF/hotspot_compiler"
-JVM_OPTS="$JVM_OPTS -XX:CMSWaitDuration=1"
+#JVM_OPTS="$JVM_OPTS -XX:+UseParNewGC"
+#JVM_OPTS="$JVM_OPTS -XX:+UseConcMarkSweepGC"
+#JVM_OPTS="$JVM_OPTS -XX:+CMSParallelRemarkEnabled"
+#JVM_OPTS="$JVM_OPTS -XX:SurvivorRatio=8"
+#JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=5"
+#JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=78"
+#JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly"
+#JVM_OPTS="$JVM_OPTS -XX:+UseTLAB"
+#JVM_OPTS="$JVM_OPTS -XX:CompileCommandFile=$CASSANDRA_CONF/hotspot_compiler"
+#JVM_OPTS="$JVM_OPTS -XX:CMSWaitDuration=1"
+
+# GC tuning options for g1gc
+# See https://phabricator.wikimedia.org/T103161
+JVM_OPTS="$JVM_OPTS -XX:+UseG1GC"
+JVM_OPTS="$JVM_OPTS -XX:G1RSetUpdatingPauseTimePercent=5"
+JVM_OPTS="$JVM_OPTS -XX:MaxGCPauseMillis=300"
# note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check
if [ "$JVM_ARCH" = "64-Bit" ] ; then
--
To view, visit https://gerrit.wikimedia.org/r/221993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ea1a46065f388cb42442b73d96ba239d3d07866
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke
Gerrit-Reviewer: Eevans
Gerrit-Reviewer: Filippo Giunchedi
Gerrit-Reviewer: GWicke
Gerrit-Reviewer: Mobrovac
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Require openjdk-8-jdk - change (operations/puppet)
GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222037
Change subject: Require openjdk-8-jdk
..
Require openjdk-8-jdk
Change-Id: I12223b65f99855913a2792361490523a5209e28a
---
M modules/cassandra/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/222037/1
diff --git a/modules/cassandra/manifests/init.pp
b/modules/cassandra/manifests/init.pp
index 6758339..5a2b2ef 100644
--- a/modules/cassandra/manifests/init.pp
+++ b/modules/cassandra/manifests/init.pp
@@ -287,7 +287,7 @@
default => $authorizor,
}
-package { ['cassandra', 'openjdk-7-jdk']:
+package { ['cassandra', 'openjdk-8-jdk']:
ensure => 'installed',
}
--
To view, visit https://gerrit.wikimedia.org/r/222037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12223b65f99855913a2792361490523a5209e28a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix sitenotice config variable check - change (mediawiki...MobileFrontend)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222036
Change subject: Fix sitenotice config variable check
..
Fix sitenotice config variable check
Bug: T104401
Change-Id: I7a367abd55c515ec52ee48d413adb6bf838d58d9
---
M includes/skins/SkinMinerva.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/36/222036/1
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index b036d54..3eb2a6f 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -746,7 +746,7 @@
protected function prepareBanners( BaseTemplate $tpl ) {
// Make sure Zero banner are always on top
$banners = array( '' );
- if ( $this->getMFConfig( 'MFEnableSiteNotice' ) ) {
+ if ( $this->getMFConfig()->get( 'MFEnableSiteNotice' ) ) {
$siteNotice = $this->getSiteNotice();
if ( $siteNotice ) {
$banners[] = $siteNotice;
--
To view, visit https://gerrit.wikimedia.org/r/222036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a367abd55c515ec52ee48d413adb6bf838d58d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cassandra: remove restbase100[89] from cassandra seeds - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: cassandra: remove restbase100[89] from cassandra seeds .. cassandra: remove restbase100[89] from cassandra seeds still not ready to be bootstrapped, remove them while debugging cassandra 2.1.7 more Change-Id: Ic040f6b47dabbe2b598f0d65e189219842592111 --- M hieradata/role/common/cassandra.yaml 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved GWicke: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/hieradata/role/common/cassandra.yaml b/hieradata/role/common/cassandra.yaml index 8c699f9..21609dd 100644 --- a/hieradata/role/common/cassandra.yaml +++ b/hieradata/role/common/cassandra.yaml @@ -11,8 +11,6 @@ - restbase1004.eqiad.wmnet - restbase1005.eqiad.wmnet - restbase1006.eqiad.wmnet -- restbase1008.eqiad.wmnet -- restbase1009.eqiad.wmnet cassandra::max_heap_size: 8g # 1/4 heap size, no more than 100m/thread cassandra::heap_newsize: 2048m -- To view, visit https://gerrit.wikimedia.org/r/222034 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic040f6b47dabbe2b598f0d65e189219842592111 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi Gerrit-Reviewer: Filippo Giunchedi 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] confd: track per template run error state files - change (operations/puppet)
Rush has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222035
Change subject: confd: track per template run error state files
..
confd: track per template run error state files
Change-Id: I9fd8f0df98e8067db1f215e2ca16fc1d8dea7c40
---
M modules/confd/files/check_confd_lint.sh
M modules/confd/files/confd-lint-wrap.py
2 files changed, 20 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/35/222035/1
diff --git a/modules/confd/files/check_confd_lint.sh
b/modules/confd/files/check_confd_lint.sh
index 2c230ea..facb66a 100644
--- a/modules/confd/files/check_confd_lint.sh
+++ b/modules/confd/files/check_confd_lint.sh
@@ -1,18 +1,19 @@
#!/bin/bash
-# Check for existence of confd template
-# linting err state file and report
-# last modtime which should equate to
-# last error. This file _does not exist_
-# without errant state
+# Check for existence of confd template linting err state
+# files and report last modtime which should equate to
+# last error. Files _do not exist_ without errant state
#
# If confd is reporting a bad lint for a template
# the best way to narrow it down is to run 'confd'
# with the appropriate options for srv and
# '-onetime=true' which will output the individual
# template health
+#
+# * A global linting error is surfaced and not per template
-target='/var/run/confd_template_lint.err'
-if [ -e "$target" ]; then
+/bin/ls /var/run/confd-template/*.err &>/dev/null
+if [ $? -eq 0 ]; then
+target=$(/bin/ls -t /var/run/confd-template/*.err | head -1)
mtime=$(/usr/bin/stat -c "%n last %y" $target)
echo "CRITICAL - ${mtime}"
exit 2
diff --git a/modules/confd/files/confd-lint-wrap.py
b/modules/confd/files/confd-lint-wrap.py
index 8d692ab..fa4d992 100644
--- a/modules/confd/files/confd-lint-wrap.py
+++ b/modules/confd/files/confd-lint-wrap.py
@@ -2,28 +2,24 @@
#
# Confd attempts to replace each file atomically and
# can abort for safety reasons if a specified check script
-# exits > 0. This lint passes silently without running
+# exits > 0. This lint also passes silently without running
# Confd in the console. This wrapper runs the lint itself
-# logging error output as appropriate and manages state for
-# a runtime error file for monitoring. Output to stderr from
+# logging error output as appropriate and managing the state of
+# a runtime error file for alerting. Output to stderror from
# the check script will be logged and the exit code passed up.
#
# * Confd is typically deployed with the watch keyword and as such
# will only seek to lint and modify files irregularly. This does
# not lend itself well to nsca.
#
-# * A global linting error is surfaced and not per template
-#
-
import sys
import subprocess
import time
import os
from os import path
-from datetime import datetime
from syslog import syslog
-error_file = '/var/run/confd_template_lint.err'
+error_dir = '/var/run/confd-template'
def touch(fname, times=None):
@@ -39,7 +35,13 @@
def main():
+if not os.path.exists(error_dir):
+os.makedirs(error_dir)
+
target = sys.argv[1:]
+error_file = path.join(error_dir,
+ path.basename(sys.argv[-1]) + '.err')
+
start = time.time()
p = subprocess.Popen(target,
shell=False,
@@ -53,8 +55,8 @@
retcode = 3
msg = "linting '%s' with %s (%ss)" % (' '.join(target),
- retcode,
- duration)
+ retcode,
+ duration)
if retcode:
error = 'failed %s %s' % (msg, err)
--
To view, visit https://gerrit.wikimedia.org/r/222035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fd8f0df98e8067db1f215e2ca16fc1d8dea7c40
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cassandra: remove restbase100[89] from cassandra seeds - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/222034 Change subject: cassandra: remove restbase100[89] from cassandra seeds .. cassandra: remove restbase100[89] from cassandra seeds still not ready to be bootstrapped, remove them while debugging cassandra 2.1.7 more Change-Id: Ic040f6b47dabbe2b598f0d65e189219842592111 --- M hieradata/role/common/cassandra.yaml 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/34/222034/1 diff --git a/hieradata/role/common/cassandra.yaml b/hieradata/role/common/cassandra.yaml index 8c699f9..21609dd 100644 --- a/hieradata/role/common/cassandra.yaml +++ b/hieradata/role/common/cassandra.yaml @@ -11,8 +11,6 @@ - restbase1004.eqiad.wmnet - restbase1005.eqiad.wmnet - restbase1006.eqiad.wmnet -- restbase1008.eqiad.wmnet -- restbase1009.eqiad.wmnet cassandra::max_heap_size: 8g # 1/4 heap size, no more than 100m/thread cassandra::heap_newsize: 2048m -- To view, visit https://gerrit.wikimedia.org/r/222034 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic040f6b47dabbe2b598f0d65e189219842592111 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Make watchlist bold in first onboarding screen - change (mediawiki...Gather)
Robmoen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222033
Change subject: WIP: Make watchlist bold in first onboarding screen
..
WIP: Make watchlist bold in first onboarding screen
* Using RL class MFResourceLoaderParsedMessageModule is still a bit
problematic as the message is parsing wikitext to escaped html.
bug: T99109
i
Change-Id: I4d60dac75c2945702368d74d38a93b0d33d25291
---
M extension.json
M i18n/en.json
2 files changed, 23 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/33/222033/1
diff --git a/extension.json b/extension.json
index cfb0efa..3974584 100644
--- a/extension.json
+++ b/extension.json
@@ -308,27 +308,28 @@
"styles": [
"resources/ext.gather.collection.contentOverlay/contentOverlay.less"
],
- "messages": [
- "gather-collection-content-tutorial-heading",
- "gather-collection-content-tutorial-subheading",
- "gather-tutorial-dismiss-button-label",
- "gather-remove-from-collection-failed-toast",
- "gather-add-to-collection-failed-toast",
- "gather-new-collection-failed-toast",
- "gather-add-to-existing",
- "gather-watchlist-title",
- "gather-add-toast",
- "gather-add-failed-toast",
- "gather-add-title-invalid-toast",
- "gather-remove-toast",
- "gather-collection-member",
- "gather-create-new-button-label",
- "gather-add-to-new",
- "gather-collection-non-member",
- "gather-add-new-placeholder",
- "gather-add-to-another",
- "gather-view-collection"
- ],
+ "class": "MFResourceLoaderParsedMessageModule",
+ "messages": {
+ "gather-collection-content-tutorial-heading":
"gather-collection-content-tutorial-heading",
+
"gather-collection-content-tutorial-subheading": ["parse"],
+ "gather-tutorial-dismiss-button-label":
"gather-tutorial-dismiss-button-label",
+ "gather-remove-from-failed-collection-toast":
"gather-remove-from-failed-collection-toast",
+ "gather-add-to-collection-failed-toast":
"gather-add-to-collection-failed-toast",
+ "gather-new-collection-failed-toast":
"gather-new-collection-failed-toast",
+ "gather-add-to-existing":
"gather-add-to-existing",
+ "gather-watchlist-title":
"gather-watchlist-title",
+ "gather-add-toast": "gather-add-toast",
+ "gather-add-failed-toast":
"gather-add-failed-toast",
+ "gather-add-title-invalid-toast":
"gather-add-title-invalid-toast",
+ "gather-remove-toast": "gather-remove-toast",
+ "gather-collection-member":
"gather-collection-member",
+ "gather-create-new-button-label":
"gather-create-new-button-label",
+ "gather-add-to-new": "gather-add-to-new",
+ "gather-collection-non-member":
"gather-collection-non-member",
+ "gather-add-new-placeholder":
"gather-add-new-placeholder",
+ "gather-add-to-another":
"gather-add-to-another",
+ "gather-view-collection":
"gather-view-collection"
+ },
"templates": {
"header.hogan":
"resources/ext.gather.collection.contentOverlay/header.hogan",
"content.hogan":
"resources/ext.gather.collection.contentOverlay/content.hogan"
diff --git a/i18n/en.json b/i18n/en.json
index 3b18cda..6a33d08 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -81,7 +81,7 @@
"gather-add-failed-toast": "There was a problem adding the item to your
\"$1\" collection.",
"gather-add-title-invalid-toast": "There was an issue with the title
you entered. Please try something else",
"gather-collection-content-tutorial-heading": "Start a collection of
your favorite interests that you can bookmark for later or share with others.",
- "gather-collecti
[MediaWiki-commits] [Gerrit] Update Wikibase, fix EntityParserOutputGenerator - change (mediawiki/core)
Hoo man has submitted this change and it was merged. Change subject: Update Wikibase, fix EntityParserOutputGenerator .. Update Wikibase, fix EntityParserOutputGenerator Contains: 6c689be62b9541d81c459034c5bf09e2f38ead5b Change-Id: I2a119c5d2e78bdddeef68df7ccbda106f5b2beeb --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/Wikidata b/extensions/Wikidata index de91a1a..1db4a78 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit de91a1a984116283b4cc834e8cbdd4e4591fa7a1 +Subproject commit 1db4a78deb683858333fbd55e07ce82986497249 -- To view, visit https://gerrit.wikimedia.org/r/222032 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2a119c5d2e78bdddeef68df7ccbda106f5b2beeb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf12 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] Update Wikibase, fix EntityParserOutputGenerator - change (mediawiki/core)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/222032 Change subject: Update Wikibase, fix EntityParserOutputGenerator .. Update Wikibase, fix EntityParserOutputGenerator Contains: 6c689be62b9541d81c459034c5bf09e2f38ead5b Change-Id: I2a119c5d2e78bdddeef68df7ccbda106f5b2beeb --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/32/222032/1 diff --git a/extensions/Wikidata b/extensions/Wikidata index de91a1a..1db4a78 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit de91a1a984116283b4cc834e8cbdd4e4591fa7a1 +Subproject commit 1db4a78deb683858333fbd55e07ce82986497249 -- To view, visit https://gerrit.wikimedia.org/r/222032 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2a119c5d2e78bdddeef68df7ccbda106f5b2beeb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf12 Gerrit-Owner: Hoo man ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] More replacement of hardcoded HTML - change (mediawiki...SemanticForms)
Yaron Koren has submitted this change and it was merged.
Change subject: More replacement of hardcoded HTML
..
More replacement of hardcoded HTML
Change-Id: Icb7e979ce3e3c474aa1a499deaf3ba70bd1ac152
---
M includes/SF_FormField.php
M includes/SF_FormPrinter.php
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
diff --git a/includes/SF_FormField.php b/includes/SF_FormField.php
index 2fa0aa9..12d8114 100644
--- a/includes/SF_FormField.php
+++ b/includes/SF_FormField.php
@@ -176,13 +176,13 @@
function creationHTML( $template_num ) {
$field_form_text = $template_num . "_" . $this->mNum;
$template_field = $this->template_field;
- $text = '' . wfMessage( 'sf_createform_field' )->escaped()
. " '" . $template_field->getFieldName() . "'\n";
+ $text = Html::element( 'h3', null, wfMessage(
'sf_createform_field' )->text() . " '" . $template_field->getFieldName() ) .
"\n";
// TODO - remove this probably-unnecessary check?
if ( $template_field->getSemanticProperty() == "" ) {
// Print nothing if there's no semantic property.
} elseif ( $template_field->getPropertyType() == "" ) {
$prop_link_text = SFUtils::linkText( SMW_NS_PROPERTY,
$template_field->getSemanticProperty() );
- $text .= '' . wfMessage(
'sf_createform_fieldpropunknowntype', $prop_link_text )->parseAsBlock() .
"\n";
+ $text .= Html::element( 'p', null, wfMessage(
'sf_createform_fieldpropunknowntype', $prop_link_text )->parseAsBlock() ) .
"\n";
} else {
if ( $template_field->isList() ) {
$propDisplayMsg = 'sf_createform_fieldproplist';
diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php
index b458baa..5914c5c 100644
--- a/includes/SF_FormPrinter.php
+++ b/includes/SF_FormPrinter.php
@@ -695,7 +695,7 @@
if ( $old_template_name !=
$template_name ) {
if ( isset( $template_label ) )
{
$multipleTemplateString
.= "\n";
- $multipleTemplateString
.= "$template_label\n";
+ $multipleTemplateString
.= Html::element( 'legend', null, $template_label ) . "\n";
}
// If $curPlaceholder is set,
it means we want to insert a
// multiple template form's
HTML into the main form's HTML.
--
To view, visit https://gerrit.wikimedia.org/r/222030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb7e979ce3e3c474aa1a499deaf3ba70bd1ac152
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] Advertise the collections feature - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222031
Change subject: Advertise the collections feature
..
Advertise the collections feature
Change-Id: I52bbbf5873943b1eb55e20569f6faf2a7816256a
Dependency: I66ebc2bf987a83196f3e410aae2f86e81207a32d
Bug: T101201
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M resources/ext.gather.init/init.js
4 files changed, 28 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/31/222031/1
diff --git a/extension.json b/extension.json
index cfb0efa..2242ded 100644
--- a/extension.json
+++ b/extension.json
@@ -393,6 +393,7 @@
]
},
"ext.gather.init": {
+ "class": "MFResourceLoaderParsedMessageModule",
"targets": [
"mobile",
"desktop"
@@ -403,9 +404,10 @@
"mobile.watchstar",
"ext.gather.watchstar"
],
- "messages": [
- "gather-menu-guider"
- ],
+ "messages": {
+ "gather-main-menu-new-feature": [ "parse" ],
+ "gather-menu-guider": "gather-menu-guider"
+ },
"scripts": [
"resources/ext.gather.init/init.js"
],
diff --git a/i18n/en.json b/i18n/en.json
index d8a2b84..9f7af42 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -105,7 +105,7 @@
"gather-public": "Public",
"gather-hidden": "Hidden",
"gather-moderation-hidden": "[[$1|Your collection]] was hidden. This
means that you are the only one who can see it. Collections are hidden if they
go against our [[Project:Gather/Moderation_Criteria|moderation criteria]]. You
can [[Project:Gather/User_Feedback|contest this]].",
- "gather-moderation-hidden-email-subject":"Your collection $1 was
hidden.",
+ "gather-moderation-hidden-email-subject": "Your collection $1 was
hidden.",
"gather-moderation-hidden-email-body": "Your collection $1 was hidden.
This means that you are the only one who can see it. Collections are hidden if
they go against our moderation
criteria:\nhttps://en.wikipedia.org/wiki/Wikipedia:Gather/Moderation_Criteria\n\nYou
can contest this on the following
page:\nhttps://en.wikipedia.org/wiki/Wikipedia:Gather/User_Feedback";,
"gather-moderation-unhidden": "[[$1|Your collection]] was unhidden.
This means that it can be viewed publicly again. ",
"gather-moderation-unhidden-email-subject": "Your collection $1 was
unhidden.",
@@ -189,5 +189,6 @@
"apihelp-query+listpages-param-limit": "Limit the number of returned
pages.",
"apihelp-query+listpages-paramvalue-sort-position": "Use manual
ordering.",
"apihelp-query+listpages-paramvalue-sort-namespace": "Sort by
namespace, title.",
- "apihelp-query+lists-param-minitems": "Show only lists which have at
least this many items. (Ignored for watchlists.)"
+ "apihelp-query+lists-param-minitems": "Show only lists which have at
least this many items. (Ignored for watchlists.)",
+ "gather-main-menu-new-feature": "'''New!''' Check out the favourite
topics of {{SITENAME}} readers or create a collection of your own."
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 7124ed2..1555dbc 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -190,5 +190,6 @@
"apihelp-query+listpages-paramvalue-dir-descending":
"{{doc-apihelp-paramvalue|query+listpages|dir|descending}}{{Identical|Reversed}}",
"apihelp-query+listpages-param-limit":
"{{doc-apihelp-param|query+listpages|limit|paramvalues=1}}",
"apihelp-query+listpages-paramvalue-sort-position":
"{{doc-apihelp-paramvalue|query+listpages|sort|position}}",
- "apihelp-query+listpages-paramvalue-sort-namespace":
"{{doc-apihelp-paramvalue|query+listpages|sort|namespace}}"
+ "apihelp-query+listpages-paramvalue-sort-namespace":
"{{doc-apihelp-paramvalue|query+listpages|sort|namespace}}",
+ "gather-main-menu-new-feature": "A message that shows in an overlay
pointing to the collections item in the main menu for users that have not seen
it before."
}
diff --git a/resources/ext.gather.init/init.js
b/resources/ext.gather.init/init.js
index 1888672..8231357 100644
--- a/resources/ext.gather.init/init.js
+++ b/resources/ext.gather.init/init.js
@@ -1,7 +1,7 @@
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
( function ( M, $ ) {
- var $star, watchstar,
+ var $star, watchstar, pageActionPointer, actionOverlay,
bucket, useGatherStar,
CollectionsWatchstar = M.require(
'ext.gath
[MediaWiki-commits] [Gerrit] More replacement of hardcoded HTML - change (mediawiki...SemanticForms)
Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222030
Change subject: More replacement of hardcoded HTML
..
More replacement of hardcoded HTML
Change-Id: Icb7e979ce3e3c474aa1a499deaf3ba70bd1ac152
---
M includes/SF_FormField.php
M includes/SF_FormPrinter.php
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/30/222030/1
diff --git a/includes/SF_FormField.php b/includes/SF_FormField.php
index 2fa0aa9..12d8114 100644
--- a/includes/SF_FormField.php
+++ b/includes/SF_FormField.php
@@ -176,13 +176,13 @@
function creationHTML( $template_num ) {
$field_form_text = $template_num . "_" . $this->mNum;
$template_field = $this->template_field;
- $text = '' . wfMessage( 'sf_createform_field' )->escaped()
. " '" . $template_field->getFieldName() . "'\n";
+ $text = Html::element( 'h3', null, wfMessage(
'sf_createform_field' )->text() . " '" . $template_field->getFieldName() ) .
"\n";
// TODO - remove this probably-unnecessary check?
if ( $template_field->getSemanticProperty() == "" ) {
// Print nothing if there's no semantic property.
} elseif ( $template_field->getPropertyType() == "" ) {
$prop_link_text = SFUtils::linkText( SMW_NS_PROPERTY,
$template_field->getSemanticProperty() );
- $text .= '' . wfMessage(
'sf_createform_fieldpropunknowntype', $prop_link_text )->parseAsBlock() .
"\n";
+ $text .= Html::element( 'p', null, wfMessage(
'sf_createform_fieldpropunknowntype', $prop_link_text )->parseAsBlock() ) .
"\n";
} else {
if ( $template_field->isList() ) {
$propDisplayMsg = 'sf_createform_fieldproplist';
diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php
index b458baa..5914c5c 100644
--- a/includes/SF_FormPrinter.php
+++ b/includes/SF_FormPrinter.php
@@ -695,7 +695,7 @@
if ( $old_template_name !=
$template_name ) {
if ( isset( $template_label ) )
{
$multipleTemplateString
.= "\n";
- $multipleTemplateString
.= "$template_label\n";
+ $multipleTemplateString
.= Html::element( 'legend', null, $template_label ) . "\n";
}
// If $curPlaceholder is set,
it means we want to insert a
// multiple template form's
HTML into the main form's HTML.
--
To view, visit https://gerrit.wikimedia.org/r/222030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb7e979ce3e3c474aa1a499deaf3ba70bd1ac152
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] Update Wikibase, fix EntityParserOutputGenerator - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged.
Change subject: Update Wikibase, fix EntityParserOutputGenerator
..
Update Wikibase, fix EntityParserOutputGenerator
Contains: 6c689be62b9541d81c459034c5bf09e2f38ead5b
Change-Id: I2a119c5d2e78bdddeef68df7ccbda106f5b2beeb
---
M composer.lock
M extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
M vendor/composer/installed.json
3 files changed, 13 insertions(+), 9 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 04ee4ad..4c46b2c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1326,12 +1326,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce"
+"reference": "6c689be62b9541d81c459034c5bf09e2f38ead5b"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/34209ffd6d69f5150de9146ebe27eb700c9d06ce";,
-"reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6c689be62b9541d81c459034c5bf09e2f38ead5b";,
+"reference": "6c689be62b9541d81c459034c5bf09e2f38ead5b",
"shasum": ""
},
"require": {
@@ -1399,7 +1399,7 @@
"wikibaserepo",
"wikidata"
],
-"time": "2015-06-30 01:40:22"
+"time": "2015-06-30 22:51:05"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
b/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
index 02d5ca1..a5f2ce4 100644
--- a/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
+++ b/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
@@ -200,7 +200,11 @@
// set the display title
//$parserOutput->setTitleText( $entity>getLabel( $langCode ) );
- $this->addAlternateLinks( $parserOutput, $entity->getId() );
+ if ( $entity->getId() !== null ) {
+ $this->addAlternateLinks( $parserOutput,
$entity->getId() );
+ } else {
+ wfLogWarning( "Encountered an Entity without EntityId
in EntityParserOutputGenerator." );
+ }
return $parserOutput;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index b1386f0..154f9f4 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1420,12 +1420,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce"
+"reference": "6c689be62b9541d81c459034c5bf09e2f38ead5b"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/34209ffd6d69f5150de9146ebe27eb700c9d06ce";,
-"reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6c689be62b9541d81c459034c5bf09e2f38ead5b";,
+"reference": "6c689be62b9541d81c459034c5bf09e2f38ead5b",
"shasum": ""
},
"require": {
@@ -1455,7 +1455,7 @@
"require-dev": {
"squizlabs/php_codesniffer": "~2.1"
},
-"time": "2015-06-30 01:40:22",
+"time": "2015-06-30 22:51:05",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/222028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a119c5d2e78bdddeef68df7ccbda106f5b2beeb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.26wmf12
Gerrit-Owner: Hoo man
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Aude
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow extra args and add log configuration - change (wikidata...rdf)
Smalyshev has uploaded a new change for review. https://gerrit.wikimedia.org/r/222029 Change subject: Allow extra args and add log configuration .. Allow extra args and add log configuration Change-Id: Icd29e4a04e702fa8f2459aa09986b5827719567e --- M dist/src/script/runUpdate.sh 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf refs/changes/29/222029/1 diff --git a/dist/src/script/runUpdate.sh b/dist/src/script/runUpdate.sh index d8db294..c4689e1 100755 --- a/dist/src/script/runUpdate.sh +++ b/dist/src/script/runUpdate.sh @@ -15,6 +15,9 @@ esac done +# allow extra args +shift $((OPTIND-1)) + if [ -z "$NAMESPACE" ] then echo "Usage: $0 -n [-h ] [-c ]" @@ -31,8 +34,14 @@ ARGS="$ARGS --skipSiteLinks" fi +if [ -f updater-logs.xml]; then +$LOG="-Dlogback.configurationFile=updater-logs.xml" +else +$LOG="" +fi + CP=lib/wikidata-query-tools-*-jar-with-dependencies.jar MAIN=org.wikidata.query.rdf.tool.Update SPARQL_URL=$HOST/$CONTEXT/namespace/$NAMESPACE/sparql echo "Updating via $SPARQL_URL" -java -cp $CP $MAIN $ARGS --sparqlUrl $SPARQL_URL +java -cp $CP $LOG $MAIN $ARGS --sparqlUrl $SPARQL_URL "$@" -- To view, visit https://gerrit.wikimedia.org/r/222029 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd29e4a04e702fa8f2459aa09986b5827719567e Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: Smalyshev ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikibase, fix EntityParserOutputGenerator - change (mediawiki...Wikidata)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222028
Change subject: Update Wikibase, fix EntityParserOutputGenerator
..
Update Wikibase, fix EntityParserOutputGenerator
Contains: 6c689be62b9541d81c459034c5bf09e2f38ead5b
Change-Id: I2a119c5d2e78bdddeef68df7ccbda106f5b2beeb
---
M composer.lock
M extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
M vendor/composer/installed.json
3 files changed, 13 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/28/222028/1
diff --git a/composer.lock b/composer.lock
index 04ee4ad..4c46b2c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1326,12 +1326,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce"
+"reference": "6c689be62b9541d81c459034c5bf09e2f38ead5b"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/34209ffd6d69f5150de9146ebe27eb700c9d06ce";,
-"reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6c689be62b9541d81c459034c5bf09e2f38ead5b";,
+"reference": "6c689be62b9541d81c459034c5bf09e2f38ead5b",
"shasum": ""
},
"require": {
@@ -1399,7 +1399,7 @@
"wikibaserepo",
"wikidata"
],
-"time": "2015-06-30 01:40:22"
+"time": "2015-06-30 22:51:05"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
b/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
index 02d5ca1..a5f2ce4 100644
--- a/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
+++ b/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
@@ -200,7 +200,11 @@
// set the display title
//$parserOutput->setTitleText( $entity>getLabel( $langCode ) );
- $this->addAlternateLinks( $parserOutput, $entity->getId() );
+ if ( $entity->getId() !== null ) {
+ $this->addAlternateLinks( $parserOutput,
$entity->getId() );
+ } else {
+ wfLogWarning( "Encountered an Entity without EntityId
in EntityParserOutputGenerator." );
+ }
return $parserOutput;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index b1386f0..154f9f4 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1420,12 +1420,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce"
+"reference": "6c689be62b9541d81c459034c5bf09e2f38ead5b"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/34209ffd6d69f5150de9146ebe27eb700c9d06ce";,
-"reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6c689be62b9541d81c459034c5bf09e2f38ead5b";,
+"reference": "6c689be62b9541d81c459034c5bf09e2f38ead5b",
"shasum": ""
},
"require": {
@@ -1455,7 +1455,7 @@
"require-dev": {
"squizlabs/php_codesniffer": "~2.1"
},
-"time": "2015-06-30 01:40:22",
+"time": "2015-06-30 22:51:05",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/222028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a119c5d2e78bdddeef68df7ccbda106f5b2beeb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.26wmf12
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 Wikibase, fix EntityParserOutputGenerator - change (mediawiki...Wikidata)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222027
Change subject: Update Wikibase, fix EntityParserOutputGenerator
..
Update Wikibase, fix EntityParserOutputGenerator
Change-Id: I2a119c5d2e78bdddeef68df7ccbda106f5b2beeb
Contains: 6c689be62b9541d81c459034c5bf09e2f38ead5b
---
M composer.lock
M extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
M vendor/composer/installed.json
3 files changed, 13 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/27/222027/1
diff --git a/composer.lock b/composer.lock
index 04ee4ad..4c46b2c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1326,12 +1326,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce"
+"reference": "6c689be62b9541d81c459034c5bf09e2f38ead5b"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/34209ffd6d69f5150de9146ebe27eb700c9d06ce";,
-"reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6c689be62b9541d81c459034c5bf09e2f38ead5b";,
+"reference": "6c689be62b9541d81c459034c5bf09e2f38ead5b",
"shasum": ""
},
"require": {
@@ -1399,7 +1399,7 @@
"wikibaserepo",
"wikidata"
],
-"time": "2015-06-30 01:40:22"
+"time": "2015-06-30 22:51:05"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
b/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
index 02d5ca1..a5f2ce4 100644
--- a/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
+++ b/extensions/Wikibase/repo/includes/EntityParserOutputGenerator.php
@@ -200,7 +200,11 @@
// set the display title
//$parserOutput->setTitleText( $entity>getLabel( $langCode ) );
- $this->addAlternateLinks( $parserOutput, $entity->getId() );
+ if ( $entity->getId() !== null ) {
+ $this->addAlternateLinks( $parserOutput,
$entity->getId() );
+ } else {
+ wfLogWarning( "Encountered an Entity without EntityId
in EntityParserOutputGenerator." );
+ }
return $parserOutput;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index b1386f0..154f9f4 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1420,12 +1420,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce"
+"reference": "6c689be62b9541d81c459034c5bf09e2f38ead5b"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/34209ffd6d69f5150de9146ebe27eb700c9d06ce";,
-"reference": "34209ffd6d69f5150de9146ebe27eb700c9d06ce",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6c689be62b9541d81c459034c5bf09e2f38ead5b";,
+"reference": "6c689be62b9541d81c459034c5bf09e2f38ead5b",
"shasum": ""
},
"require": {
@@ -1455,7 +1455,7 @@
"require-dev": {
"squizlabs/php_codesniffer": "~2.1"
},
-"time": "2015-06-30 01:40:22",
+"time": "2015-06-30 22:51:05",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/222027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a119c5d2e78bdddeef68df7ccbda106f5b2beeb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: Hoo man
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Assure we have an Entity with EntityId in EntityParserOutput... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Assure we have an Entity with EntityId in
EntityParserOutputGenerator
..
Assure we have an Entity with EntityId in EntityParserOutputGenerator
Apparently that's not always the case (hit that on testwikidata).
Potentially due to screwed up content there.
Change-Id: I56f3267cbc213a455bef5dfc95d1dcb2f555626e
(cherry picked from commit 52dd6ef614b4d64727482ea2eecd68aef436ff70)
---
M repo/includes/EntityParserOutputGenerator.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/EntityParserOutputGenerator.php
b/repo/includes/EntityParserOutputGenerator.php
index 02d5ca1..a5f2ce4 100644
--- a/repo/includes/EntityParserOutputGenerator.php
+++ b/repo/includes/EntityParserOutputGenerator.php
@@ -200,7 +200,11 @@
// set the display title
//$parserOutput->setTitleText( $entity>getLabel( $langCode ) );
- $this->addAlternateLinks( $parserOutput, $entity->getId() );
+ if ( $entity->getId() !== null ) {
+ $this->addAlternateLinks( $parserOutput,
$entity->getId() );
+ } else {
+ wfLogWarning( "Encountered an Entity without EntityId
in EntityParserOutputGenerator." );
+ }
return $parserOutput;
}
--
To view, visit https://gerrit.wikimedia.org/r/222026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I56f3267cbc213a455bef5dfc95d1dcb2f555626e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.26wmf12
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] Assure we have an Entity with EntityId in EntityParserOutput... - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222026
Change subject: Assure we have an Entity with EntityId in
EntityParserOutputGenerator
..
Assure we have an Entity with EntityId in EntityParserOutputGenerator
Apparently that's not always the case (hit that on testwikidata).
Potentially due to screwed up content there.
Change-Id: I56f3267cbc213a455bef5dfc95d1dcb2f555626e
(cherry picked from commit 52dd6ef614b4d64727482ea2eecd68aef436ff70)
---
M repo/includes/EntityParserOutputGenerator.php
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/26/222026/1
diff --git a/repo/includes/EntityParserOutputGenerator.php
b/repo/includes/EntityParserOutputGenerator.php
index 02d5ca1..a5f2ce4 100644
--- a/repo/includes/EntityParserOutputGenerator.php
+++ b/repo/includes/EntityParserOutputGenerator.php
@@ -200,7 +200,11 @@
// set the display title
//$parserOutput->setTitleText( $entity>getLabel( $langCode ) );
- $this->addAlternateLinks( $parserOutput, $entity->getId() );
+ if ( $entity->getId() !== null ) {
+ $this->addAlternateLinks( $parserOutput,
$entity->getId() );
+ } else {
+ wfLogWarning( "Encountered an Entity without EntityId
in EntityParserOutputGenerator." );
+ }
return $parserOutput;
}
--
To view, visit https://gerrit.wikimedia.org/r/222026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I56f3267cbc213a455bef5dfc95d1dcb2f555626e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.26wmf12
Gerrit-Owner: Hoo man
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Log privileged users with short passwords - change (operations/mediawiki-config)
CSteipp has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222025
Change subject: Log privileged users with short passwords
..
Log privileged users with short passwords
To estimate the impact of requiring an 8-byte minimum password length
for privileged accounts, log users who would be affected.
Bug: T94774
Change-Id: Idc3c1fde32c249d7192877e8e1afd722a0fa744b
---
M wmf-config/CommonSettings.php
1 file changed, 28 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/25/222025/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 04cda5a..b456790 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1341,6 +1341,34 @@
return true;
};
+// Estimate users effected if we increase the minimum
+// password length to 8 for privileged groups.
+$wgHooks['LoginAuthenticateAudit'][] = function( $user, $pass, $retval ) {
+ if ( $retval == LoginForm::SUCCESS
+ && strlen( $pass ) < 8
+ ) {
+ $central = CentralAuthUser::getInstance( $user );
+ if ( $central->exists() && array_intersect(
+ array( 'staff', 'steward', 'ombudsman', 'checkuser',
'sysop' ),
+ array_merge( $central->getGlobalGroups(),
$central->getGlobalGroups() )
+ ) ) {
+ if ( strlen( $pass ) >= 4 ) {
+ $bucket = '4-7';
+ } else {
+ $bucket = '< 4';
+ }
+ $groups = implode( ', ', array_intersect(
+ array( 'staff', 'steward', 'ombudsman',
'checkuser', 'sysop' ),
+ array_merge( $central->getGlobalGroups(),
$central->getGlobalGroups() )
+ ) );
+
+ $logger = LoggerFactory::getInstance( 'badpass' );
+ $logger->info( "Login by user in $groups with password
length: $bucket" );
+ }
+ }
+ return true;
+};
+
$wgHooks['PrefsEmailAudit'][] = function( $user, $old, $new ) {
if ( $user->isAllowed( 'delete' ) ) {
global $wgRequest;
--
To view, visit https://gerrit.wikimedia.org/r/222025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc3c1fde32c249d7192877e8e1afd722a0fa744b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: CSteipp
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix so SFUtils::getCategoriesForPage() works more often - change (mediawiki...SemanticForms)
Yaron Koren has submitted this change and it was merged.
Change subject: Fix so SFUtils::getCategoriesForPage() works more often
..
Fix so SFUtils::getCategoriesForPage() works more often
Patch by noahm.
Change-Id: I75b48e300ac24d293384e2caefb9a68b7d4cf36b
---
M includes/SF_Utils.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index 9e3c231..1dc171c 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -148,7 +148,7 @@
);
if ( $db->numRows( $res ) > 0 ) {
while ( $row = $db->fetchRow( $res ) ) {
- $categories[] = $row[0];
+ $categories[] = $row['cl_to'];
}
}
$db->freeResult( $res );
--
To view, visit https://gerrit.wikimedia.org/r/222024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75b48e300ac24d293384e2caefb9a68b7d4cf36b
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] Fix so SFUtils::getCategoriesForPage() works more often - change (mediawiki...SemanticForms)
Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222024
Change subject: Fix so SFUtils::getCategoriesForPage() works more often
..
Fix so SFUtils::getCategoriesForPage() works more often
Patch by noahm.
Change-Id: I75b48e300ac24d293384e2caefb9a68b7d4cf36b
---
M includes/SF_Utils.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/24/222024/1
diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index 9e3c231..1dc171c 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -148,7 +148,7 @@
);
if ( $db->numRows( $res ) > 0 ) {
while ( $row = $db->fetchRow( $res ) ) {
- $categories[] = $row[0];
+ $categories[] = $row['cl_to'];
}
}
$db->freeResult( $res );
--
To view, visit https://gerrit.wikimedia.org/r/222024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I75b48e300ac24d293384e2caefb9a68b7d4cf36b
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] tlsproxy: enable DHE-2048 FS for Android 2.x, etc. - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222023
Change subject: tlsproxy: enable DHE-2048 FS for Android 2.x, etc.
..
tlsproxy: enable DHE-2048 FS for Android 2.x, etc.
Bug: T104281
Change-Id: I648aaf21e35a6f9fe54e96f85fade0b269a8f7aa
---
M modules/tlsproxy/manifests/instance.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/222023/1
diff --git a/modules/tlsproxy/manifests/instance.pp
b/modules/tlsproxy/manifests/instance.pp
index 22d9167..32aa63f 100644
--- a/modules/tlsproxy/manifests/instance.pp
+++ b/modules/tlsproxy/manifests/instance.pp
@@ -4,7 +4,7 @@
include webserver::sysctl_settings
$nginx_worker_connections = '32768'
-$nginx_ssl_conf = ssl_ciphersuite('nginx', 'compat')
+$nginx_ssl_conf = ssl_ciphersuite('nginx', 'compat-dhe')
class { 'nginx': managed => false, }
--
To view, visit https://gerrit.wikimedia.org/r/222023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I648aaf21e35a6f9fe54e96f85fade0b269a8f7aa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Assure we have an Entity with EntityId in EntityParserOutput... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Assure we have an Entity with EntityId in
EntityParserOutputGenerator
..
Assure we have an Entity with EntityId in EntityParserOutputGenerator
Apparently that's not always the case (hit that on testwikidata).
Potentially due to screwed up content there.
Change-Id: I56f3267cbc213a455bef5dfc95d1dcb2f555626e
---
M repo/includes/EntityParserOutputGenerator.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Bene: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/EntityParserOutputGenerator.php
b/repo/includes/EntityParserOutputGenerator.php
index 02d5ca1..a5f2ce4 100644
--- a/repo/includes/EntityParserOutputGenerator.php
+++ b/repo/includes/EntityParserOutputGenerator.php
@@ -200,7 +200,11 @@
// set the display title
//$parserOutput->setTitleText( $entity>getLabel( $langCode ) );
- $this->addAlternateLinks( $parserOutput, $entity->getId() );
+ if ( $entity->getId() !== null ) {
+ $this->addAlternateLinks( $parserOutput,
$entity->getId() );
+ } else {
+ wfLogWarning( "Encountered an Entity without EntityId
in EntityParserOutputGenerator." );
+ }
return $parserOutput;
}
--
To view, visit https://gerrit.wikimedia.org/r/222017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I56f3267cbc213a455bef5dfc95d1dcb2f555626e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man
Gerrit-Reviewer: Bene
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pybal: remove eqiad applictaion for osm - change (operations/puppet)
Rush has submitted this change and it was merged. Change subject: pybal: remove eqiad applictaion for osm .. pybal: remove eqiad applictaion for osm Right now no backend exists here and pybal will try to fetch from config-master along with the rest of the lvs services. It also fails for Confd which does cause template population errors. It seems like eqiad won't be the first site to get osm and it can be readded when ready. Change-Id: Id8f1dabb0ab7712aab4817cc758b40f18b5fdc68 --- M hieradata/common/lvs/configuration.yaml 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Rush: Looks good to me, approved BBlack: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/hieradata/common/lvs/configuration.yaml b/hieradata/common/lvs/configuration.yaml index c02d18e..91c3677 100644 --- a/hieradata/common/lvs/configuration.yaml +++ b/hieradata/common/lvs/configuration.yaml @@ -370,8 +370,7 @@ osm: description: OpenStreetMap tiles class: high-traffic2 -sites: -- eqiad +sites: [] ip: *osm bgp: 'yes' depool-threshold: ".5" -- To view, visit https://gerrit.wikimedia.org/r/222021 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8f1dabb0ab7712aab4817cc758b40f18b5fdc68 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Rush Gerrit-Reviewer: BBlack Gerrit-Reviewer: Rush 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 some API doc problems - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix some API doc problems
..
Fix some API doc problems
Change-Id: Ibdd33fbd1fe1f0d050ba94822e299b6190dd89c3
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 57 insertions(+), 57 deletions(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 3b18cda..d8a2b84 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -141,10 +141,10 @@
"apihelp-editlist-paramvalue-mode-update": "Add pages to a list (and
create it if the list ID was not specified).",
"apihelp-editlist-paramvalue-mode-remove": "Delete pages from a list.",
"apihelp-editlist-paramvalue-mode-deletelist": "Delete the whole list.",
- "apihelp-editlist-paramvalue-mode-hidelist": "Make the list private.
Requires the gather-hidelist user right (and cannot be undone
without that right).",
+ "apihelp-editlist-paramvalue-mode-hidelist": "Make the list private.
Requires the gather-hidelist user right (and cannot be undone
without that right).",
"apihelp-editlist-paramvalue-mode-showlist": "Undo a previous hidelist
operation.",
"apihelp-editlist-paramvalue-mode-flag": "Flag list as offensive.",
- "apihelp-editlist-paramvalue-mode-approve": "Mark list as acceptable,
despite any flags. Requires the gather-hidelist userright.",
+ "apihelp-editlist-paramvalue-mode-approve": "Mark list as acceptable,
despite any flags. Requires the gather-hidelist userright.",
"apihelp-query+lists-description": "List collections of a given user.",
"apihelp-query+lists-param-mode": "Show all lists matching certain
criteria (cannot be used with owner/id parameters; if neither those nor mode is
provided, only the lists of the current user are shown).",
"apihelp-query+lists-param-prop": "Extra information to display.",
@@ -153,11 +153,11 @@
"apihelp-query+lists-param-owner": "Owner of the collections to search
for. If omitted, defaults to current user.",
"apihelp-query+lists-param-limit": "Limit the number of returned
lists.",
"apihelp-query+lists-paramvalue-mode-allpublic": "Show all (public)
lists",
- "apihelp-query+lists-paramvalue-mode-allhidden": "Show all hidden lists
(requires the gather-hidelist user right; does not show private
lists)",
- "apihelp-query+lists-paramvalue-mode-review": "Show all lists that need
review (requires the gather-hidelist userright)",
+ "apihelp-query+lists-paramvalue-mode-allhidden": "Show all hidden lists
(requires the gather-hidelist user right; does not show private
lists)",
+ "apihelp-query+lists-paramvalue-mode-review": "Show all lists that need
review (requires the gather-hidelist userright)",
"apihelp-query+lists-paramvalue-prop-label": "Title of the list",
"apihelp-query+lists-paramvalue-prop-description": "Description of the
list",
- "apihelp-query+lists-paramvalue-prop-public": "Several
visibility-related properties: perm - public or private
(set by owner), private is only visible to owner; perm_override -
hidden or approved (or not present), can be set by a
moderator; flagged - the list got enough flags to qualify for moderator
attention, hidden - the list is hidden and only visible to the owenr and
moderators (due to flags or explicit moderator choice)",
+ "apihelp-query+lists-paramvalue-prop-public": "Several
visibility-related properties: permpublic or
private (set by owner), private is only visible to
ownerperm_overridehidden or
approved (or not present), can be set by a
moderatorflaggedthe list got enough flags to qualify for
moderator attentionhiddenthe list is hidden and only visible
to the owenr and moderators (due to flags or explicit moderator
choice)",
"apihelp-query+lists-paramvalue-prop-review": "Is the list temporarily
hidden and waiting for moderator review?",
"apihelp-query+lists-paramvalue-prop-image": "Lead image",
"apihelp-query+lists-paramvalue-prop-count": "Number of items in the
list",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 11239af..7124ed2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -130,41 +130,42 @@
"gather-overlay-search-tutorial-heading": "Heading for tutorial
pointing at search icon with instructions on how to add a second page page to
their collection.",
"gather-overlay-search-tutorial-text": "Text explaining to a user that
they may also add suggested search pages to a collection.",
"right-gather-hidelist": "With gather, users can create lists and make
them public. This right gives admins a way to hide or restore a list that
violates WP policy.\n\n{{Doc-right|gather-hidelist}}",
- "apihelp-editlist-description":
"{{doc-apihelp-description||editlist|editlist}}",
- "apihelp-editlist-param-id":
"{{doc-apihelp-param||id|editlist|
[MediaWiki-commits] [Gerrit] ciphersuites: refactor further, add compat-dhe option - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222022
Change subject: ciphersuites: refactor further, add compat-dhe option
..
ciphersuites: refactor further, add compat-dhe option
Change-Id: Ia0f74cf6cf3d96f13c9c5c8b7c845e826e2da888
---
M modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
1 file changed, 43 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/22/222022/1
diff --git a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
index 75e616c..67b883a 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
@@ -12,7 +12,12 @@
# are supported.
# - The compatibility mode,indicating the degree of compatibility we
# want to retain with older browsers (basically, IE6, IE7 and
-# Android prior to 3.0)
+# Android prior to 3.0). Current options are:
+# - 'strong': PFS required, ECDHE+AES suites only, TLSv1.1+ only
+# - 'compat': Supports most legacy devices (not IE6), TLSv1.0+
+# - 'compat-dhe': Upgrades 'compat' to use DHE for PFS with certain older
+# clients - breaks some Java6 clients, and requires the use of good DH
+# parameters elsewhere in the server config.
# - An optional argument, that if non-nil will set HSTS to max-age of
# N days
#
@@ -46,31 +51,14 @@
require 'puppet/util/package'
module Puppet::Parser::Functions
- ciphersuites = {
-'compat' => [
- '-ALL',
- 'ECDHE-ECDSA-AES128-GCM-SHA256',
- 'ECDHE-RSA-AES128-GCM-SHA256',
- 'ECDHE-ECDSA-AES256-GCM-SHA384',
- 'ECDHE-RSA-AES256-GCM-SHA384',
- 'ECDHE-ECDSA-AES128-SHA256',
- 'ECDHE-RSA-AES128-SHA256',
- 'ECDHE-ECDSA-AES128-SHA',
- 'ECDHE-RSA-AES128-SHA',
- 'ECDHE-ECDSA-AES256-SHA384',
- 'ECDHE-RSA-AES256-SHA384',
- 'ECDHE-ECDSA-AES256-SHA',
- 'ECDHE-RSA-AES256-SHA',
- 'AES128-GCM-SHA256',
- 'AES256-GCM-SHA384',
- 'AES128-SHA256',
- 'AES128-SHA',
- 'AES256-SHA256',
- 'AES256-SHA',
- 'CAMELLIA128-SHA',
- 'CAMELLIA256-SHA',
- 'DES-CBC3-SHA',
-],
+ # Basic list chunks, used to construct bigger lists
+ basic = {
+# Only modern reasonably-secure browsers have these.
+# They're all forward-secret, and our preference ordering is:
+# 1) ECDSA > RSA (but both exist for all cases)
+# 2) GCM > CBC
+# 2) AES128 > AES256
+# 4) SHA-2 > SHA-1
'strong' => [
'-ALL',
'ECDHE-ECDSA-AES128-GCM-SHA256',
@@ -86,7 +74,34 @@
'ECDHE-ECDSA-AES256-SHA',
'ECDHE-RSA-AES256-SHA',
],
+# DHE-based forward-secret option to help e.g. Android 2 and OpenSSL 0.9.8
+# Do not use on a server unless you're *sure* it's not using defaulted
+# and/or weak DH parameters!
+'compat-dhe' => [
+ 'DHE-RSA-AES128-SHA',
+],
+# not-forward-secret compat for ancient stuff
+# pref rules same as 'strong' where applicable
+'compat' => [
+ 'AES128-GCM-SHA256',
+ 'AES256-GCM-SHA384',
+ 'AES128-SHA256',
+ 'AES128-SHA',
+ 'AES256-SHA256',
+ 'AES256-SHA',
+ 'CAMELLIA128-SHA',
+ 'CAMELLIA256-SHA',
+ 'DES-CBC3-SHA', # Only for IE8/XP at this point, I think
+],
}
+
+ # Final lists exposed to callers
+ ciphersuites = {
+'strong' => basic['strong'],
+'compat' => basic['strong'] + basic['compat'],
+'compat-dhe' => basic['strong'] + basic['compat-dhe'] + basic['compat'],
+ }
+
newfunction(
:ssl_ciphersuite,
:type => :rvalue,
@@ -147,7 +162,7 @@
case ciphersuite
when 'strong' then
output.push('SSLProtocol all -SSLv2 -SSLv3 -TLSv1')
- when 'compat' then
+ else
output.push('SSLProtocol all -SSLv2 -SSLv3')
end
output.push("SSLCipherSuite #{cipherlist}")
@@ -161,7 +176,7 @@
case ciphersuite
when 'strong' then
output.push('ssl_protocols TLSv1.1 TLSv1.2;')
- when 'compat' then
+ else
output.push('ssl_protocols TLSv1 TLSv1.1 TLSv1.2;')
end
output.push("ssl_ciphers #{cipherlist};")
--
To view, visit https://gerrit.wikimedia.org/r/222022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0f74cf6cf3d96f13c9c5c8b7c845e826e2da888
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Accept ids as list, not only as range - change (wikidata...rdf)
jenkins-bot has submitted this change and it was merged.
Change subject: Accept ids as list, not only as range
..
Accept ids as list, not only as range
Change-Id: I993ef8126f2507a7bc1079fa2c21c807d04f92f7
---
M tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
A tools/src/main/java/org/wikidata/query/rdf/tool/change/IdListChangeSource.java
R
tools/src/main/java/org/wikidata/query/rdf/tool/change/IdRangeChangeSource.java
M
tools/src/test/java/org/wikidata/query/rdf/tool/AbstractUpdateIntegrationTestBase.java
A
tools/src/test/java/org/wikidata/query/rdf/tool/change/IdListChangeSourceUnitTest.java
R
tools/src/test/java/org/wikidata/query/rdf/tool/change/IdRangeChangeSourceUnitTest.java
6 files changed, 162 insertions(+), 19 deletions(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
index 3c5bab0..9e72129 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
@@ -30,7 +30,8 @@
import org.wikidata.query.rdf.tool.OptionsUtils.WikibaseOptions;
import org.wikidata.query.rdf.tool.change.Change;
import org.wikidata.query.rdf.tool.change.Change.Batch;
-import org.wikidata.query.rdf.tool.change.IdChangeSource;
+import org.wikidata.query.rdf.tool.change.IdListChangeSource;
+import org.wikidata.query.rdf.tool.change.IdRangeChangeSource;
import org.wikidata.query.rdf.tool.change.RecentChangesPoller;
import org.wikidata.query.rdf.tool.exception.ContainedException;
import org.wikidata.query.rdf.tool.exception.RetryableException;
@@ -117,14 +118,23 @@
* @return null if non can be built - its ok to just exit - errors have
been
* logged to the user
*/
+@SuppressWarnings("checkstyle:cyclomaticcomplexity")
private static Change.Source buildChangeSource(Options
options, RdfRepository rdfRepository,
WikibaseRepository wikibaseRepository) {
if (options.ids() != null) {
+if (options.ids().contains(",")) {
+// Id list
+return new IdListChangeSource(options.ids().split(","),
options.batchSize());
+}
String[] ids = options.ids().split("-");
long start;
long end;
switch (ids.length) {
case 1:
+if (!Character.isDigit(ids[0].charAt(0))) {
+// Not a digit - probably just single ID
+return new IdListChangeSource(ids, options.batchSize());
+}
start = Long.parseLong(ids[0]);
end = start;
break;
@@ -136,7 +146,7 @@
log.error("Invalid format for --ids. Need -.");
return null;
}
-return IdChangeSource.forItems(start, end, options.batchSize());
+return IdRangeChangeSource.forItems(start, end,
options.batchSize());
}
long startTime;
if (options.start() != null) {
diff --git
a/tools/src/main/java/org/wikidata/query/rdf/tool/change/IdListChangeSource.java
b/tools/src/main/java/org/wikidata/query/rdf/tool/change/IdListChangeSource.java
new file mode 100644
index 000..55f0622
--- /dev/null
+++
b/tools/src/main/java/org/wikidata/query/rdf/tool/change/IdListChangeSource.java
@@ -0,0 +1,88 @@
+package org.wikidata.query.rdf.tool.change;
+
+import static java.lang.Math.min;
+
+import java.util.Date;
+
+import org.wikidata.query.rdf.tool.exception.RetryableException;
+
+import com.google.common.collect.ImmutableList;
+
+/**
+ * Creates a change source out of the list of IDs.
+ */
+public class IdListChangeSource implements
Change.Source {
+/**
+ * Build and IdChangeSource for items as opposed to properties.
+ */
+public static IdListChangeSource forItems(String [] ids, int batchSize) {
+return new IdListChangeSource(ids, batchSize);
+}
+
+/**
+ * Last id to return.
+ */
+private final int batchSize;
+
+/**
+ * List of changed entity IDs.
+ */
+private final String[] ids;
+
+public IdListChangeSource(String[] ids, int batchSize) {
+this.batchSize = batchSize;
+this.ids = ids;
+}
+
+@Override
+public Batch firstBatch() throws RetryableException {
+return batch(0);
+}
+
+@Override
+public Batch nextBatch(Batch lastBatch) throws RetryableException {
+return batch(lastBatch.nextStart);
+}
+
+/**
+ * Batch implementation for this change source.
+ */
+public final class Batch extends
Change.Batch.AbstractDefaultImplementation {
+/**
+ * Next id to start polling.
+ */
+private final int nextStart;
+
+private Batch(ImmutableList changes, lon
[MediaWiki-commits] [Gerrit] pybal: remove eqiad applictaion for osm - change (operations/puppet)
Rush has uploaded a new change for review. https://gerrit.wikimedia.org/r/222021 Change subject: pybal: remove eqiad applictaion for osm .. pybal: remove eqiad applictaion for osm Right now no backend exists here and pybal will try to fetch from config-master along with the rest of the lvs services. It also fails for Confd which does cause template population errors. It seems like eqiad won't be the first site to get osm and it can be readded when ready. Change-Id: Id8f1dabb0ab7712aab4817cc758b40f18b5fdc68 --- M hieradata/common/lvs/configuration.yaml 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/21/222021/1 diff --git a/hieradata/common/lvs/configuration.yaml b/hieradata/common/lvs/configuration.yaml index c02d18e..91c3677 100644 --- a/hieradata/common/lvs/configuration.yaml +++ b/hieradata/common/lvs/configuration.yaml @@ -370,8 +370,7 @@ osm: description: OpenStreetMap tiles class: high-traffic2 -sites: -- eqiad +sites: [] ip: *osm bgp: 'yes' depool-threshold: ".5" -- To view, visit https://gerrit.wikimedia.org/r/222021 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8f1dabb0ab7712aab4817cc758b40f18b5fdc68 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Rush ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make Coal's whisper files accessible to Graphite front-ends. - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222020
Change subject: Make Coal's whisper files accessible to Graphite front-ends.
..
Make Coal's whisper files accessible to Graphite front-ends.
Coal exists because I wanted more control over how client-side performance
numbers were aggregated than I could get from Graphite and StatSite. There is
no reason, though, to limit the visualization of the data to coal-web. So add
a symlink.
Change-Id: Ic0f17d9889622a96980d747fa924a8562e4fbe91
---
M manifests/role/performance.pp
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/222020/1
diff --git a/manifests/role/performance.pp b/manifests/role/performance.pp
index c8e5e6e..61f73e2 100644
--- a/manifests/role/performance.pp
+++ b/manifests/role/performance.pp
@@ -26,4 +26,10 @@
content => template('apache/sites/performance.wikimedia.org.erb'),
require => Git::Clone['performance/docroot'],
}
+
+# Make Coal's whisper files accessible to Graphite front-ends.
+file { '/var/lib/carbon/whisper/coal':
+ensure => link,
+target => '/var/lib/coal',
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/222020
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0f17d9889622a96980d747fa924a8562e4fbe91
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Wikitech: rebuff requests to beacon/(.*) with an HTTP 204 - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: Wikitech: rebuff requests to beacon/(.*) with an HTTP 204
..
Wikitech: rebuff requests to beacon/(.*) with an HTTP 204
For all other wikis, these requests are handled by Varnish (which does the same
thing -- i.e., respond with an HTTP 204). We don't need these requests hooked
up to our analytics infrastructure or anything, but neither should they should
up as angry, red 404s in the JavaScript console.
Change-Id: I7bfdac7bdcf6ac7985c524b568076ab1f2384978
---
M modules/openstack/manifests/openstack-manager.pp
M templates/apache/sites/wikitech.wikimedia.org.erb
2 files changed, 7 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
BBlack: Looks good to me, but someone else must approve
diff --git a/modules/openstack/manifests/openstack-manager.pp
b/modules/openstack/manifests/openstack-manager.pp
index 259c1ed..e671c1d 100644
--- a/modules/openstack/manifests/openstack-manager.pp
+++ b/modules/openstack/manifests/openstack-manager.pp
@@ -50,6 +50,8 @@
default => "www.${controller_hostname}",
}
+include ::apache::mod::alias
+
apache::site { $webserver_hostname:
content => template("apache/sites/${webserver_hostname}.erb"),
}
diff --git a/templates/apache/sites/wikitech.wikimedia.org.erb
b/templates/apache/sites/wikitech.wikimedia.org.erb
index 4519235..f934cd8 100644
--- a/templates/apache/sites/wikitech.wikimedia.org.erb
+++ b/templates/apache/sites/wikitech.wikimedia.org.erb
@@ -30,6 +30,11 @@
RewriteCond %{SERVER_PORT} !^443$
RewriteRule ^/(.*)$ https://<%= @webserver_hostname %>/$1 [L,R]
+# Beacon requests that are normally handled by Varnish. We don't need these
+# requests to do anything, but they shouldn't show up in the JavaScript
+# error console as errors.
+RedirectMatch 204 beacon/(.*)$
+
ErrorLog /var/log/apache2/error.log
# Possible values include: debug, info, notice, warn, error, crit,
--
To view, visit https://gerrit.wikimedia.org/r/221969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7bfdac7bdcf6ac7985c524b568076ab1f2384978
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: BBlack
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 existing purely for caching reasons - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222019
Change subject: Remove function existing purely for caching reasons
..
Remove function existing purely for caching reasons
Cache has cleared
Change-Id: I6740f9cff8802317484468336f2e61d15f5f647c
---
M resources/mobile.mainMenu/MainMenu.js
1 file changed, 3 insertions(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/19/222019/1
diff --git a/resources/mobile.mainMenu/MainMenu.js
b/resources/mobile.mainMenu/MainMenu.js
index 8889430..32f97f4 100644
--- a/resources/mobile.mainMenu/MainMenu.js
+++ b/resources/mobile.mainMenu/MainMenu.js
@@ -19,19 +19,14 @@
* @cfg {Object} defaults Default options hash.
* @cfg {String} defaults.activator selector for element that
when clicked can open or close the menu
*/
- defaults: {
+ defaults: $.extend( mw.config.get( 'wgMFMenuData' ), {
activator: undefined,
hasNewExcitingThings: true
- },
+ } ),
/** @inheritdoc **/
initialize: function ( options ) {
- var self = this,
- // FIXME: move to MainMenu.prototype.defaults
when we no longer care about cached data.
- defaults = this._handleCachedMenuData(
- mw.config.get( 'wgMFMenuData' ) || {}
- );
- $.extend( this.defaults, defaults );
+ var self = this;
this.activator = options.activator;
View.prototype.initialize.call( this, options );
@@ -58,40 +53,6 @@
} );
} );
}
- },
-
- // FIXME: [CACHE] Remove when cache clears.
- /**
-* Translates the old, but cached, format of `wgMFMenuData` to
the new
-* new format.
-*
-* @param {Object[]} menu The value of the `wgMFMenuData`
config variable
-* @private
-*/
- _handleCachedMenuData: function ( menu ) {
- var result = {};
-
- $.each( menu, function ( key, entries ) {
-
- // New format?
- if ( entries[0].components ) {
- result = menu;
-
- return false;
- }
-
- result[key] = $.map( entries, function ( entry
) {
- // We don't have to address T98759 here
as this bug only
- // affects logged out users who are
seeing a cached version
- // of the page.
- return {
- name: entry.name,
- components: [ entry ]
- };
- } );
- } );
-
- return result;
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/222019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6740f9cff8802317484468336f2e61d15f5f647c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change label from cancel to dismiss for PointerOverlay - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222018
Change subject: Change label from cancel to dismiss for PointerOverlay
..
Change label from cancel to dismiss for PointerOverlay
As requested by Kaity.
Change-Id: Ia571251ba670a5b7b1b7da13037e8412fce40e08
---
M includes/Resources.php
M resources/mobile.contentOverlays/PointerOverlay.js
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/18/222018/1
diff --git a/includes/Resources.php b/includes/Resources.php
index 4f305b0..15f5d0b 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -1020,7 +1020,7 @@
),
'messages' => array(
// PageActionOverlay.js
- 'cancel',
+ 'mobile-frontend-pointer-dismiss',
),
'styles' => array(
'resources/mobile.contentOverlays/tutorials.less',
diff --git a/resources/mobile.contentOverlays/PointerOverlay.js
b/resources/mobile.contentOverlays/PointerOverlay.js
index 2e9513f..902e606 100644
--- a/resources/mobile.contentOverlays/PointerOverlay.js
+++ b/resources/mobile.contentOverlays/PointerOverlay.js
@@ -31,7 +31,7 @@
defaults: {
skin: undefined,
summary: undefined,
- cancelMsg: mw.msg( 'cancel' ),
+ cancelMsg: mw.msg( 'mobile-frontend-pointer-dismiss' ),
appendToElement: undefined,
target: undefined,
confirmMsg: undefined
--
To view, visit https://gerrit.wikimedia.org/r/222018
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia571251ba670a5b7b1b7da13037e8412fce40e08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Automatically infuse any infusable OOUI widgets present on t... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Automatically infuse any infusable OOUI widgets present on the
page
..
Automatically infuse any infusable OOUI widgets present on the page
Change-Id: I931df032c3d8dc5807c7590a763b8d9060c5ee87
---
M includes/htmlform/OOUIHTMLForm.php
M resources/Resources.php
M resources/src/mediawiki.page/mediawiki.page.ready.js
D resources/src/mediawiki/mediawiki.htmlform.ooui.js
4 files changed, 12 insertions(+), 14 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/htmlform/OOUIHTMLForm.php
b/includes/htmlform/OOUIHTMLForm.php
index 1ac7956..80e91f7 100644
--- a/includes/htmlform/OOUIHTMLForm.php
+++ b/includes/htmlform/OOUIHTMLForm.php
@@ -34,7 +34,6 @@
public function __construct( $descriptor, $context = null,
$messagePrefix = '' ) {
parent::__construct( $descriptor, $context, $messagePrefix );
$this->getOutput()->enableOOUI();
- $this->getOutput()->addModules( 'mediawiki.htmlform.ooui' );
$this->getOutput()->addModuleStyles(
'mediawiki.htmlform.ooui.styles' );
}
diff --git a/resources/Resources.php b/resources/Resources.php
index f7a0531..bd9788e 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -963,10 +963,6 @@
'colon-separator',
),
),
- 'mediawiki.htmlform.ooui' => array(
- 'scripts' =>
'resources/src/mediawiki/mediawiki.htmlform.ooui.js',
- 'dependencies' => 'oojs-ui',
- ),
'mediawiki.htmlform.ooui.styles' => array(
'styles' =>
'resources/src/mediawiki/mediawiki.htmlform.ooui.css',
'position' => 'top',
diff --git a/resources/src/mediawiki.page/mediawiki.page.ready.js
b/resources/src/mediawiki.page/mediawiki.page.ready.js
index 36eb9d4..3a8e0e7 100644
--- a/resources/src/mediawiki.page/mediawiki.page.ready.js
+++ b/resources/src/mediawiki.page/mediawiki.page.ready.js
@@ -59,6 +59,18 @@
}
$nodes.updateTooltipAccessKeys();
+ // Infuse OOUI widgets, if any are present
+ $nodes = $( '[data-ooui]' );
+ if ( $nodes.length ) {
+ mw.loader.using( 'mediawiki.widgets' ).done( function
() {
+ // HACK: OO.ui.infuse assumes all widgets are
in the OO.ui. namespace
+ $.extend( OO.ui, mw.widgets );
+ $nodes.each( function () {
+ OO.ui.infuse( this );
+ } );
+ } );
+ }
+
} );
}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki/mediawiki.htmlform.ooui.js
b/resources/src/mediawiki/mediawiki.htmlform.ooui.js
deleted file mode 100644
index 48b8a87..000
--- a/resources/src/mediawiki/mediawiki.htmlform.ooui.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*global OO */
-jQuery( function ( $ ) {
-
- // Infuse everything with JavaScript widgets
- $( '.mw-htmlform-ooui [data-ooui]' ).each( function () {
- OO.ui.infuse( this.id );
- } );
-
-} );
--
To view, visit https://gerrit.wikimedia.org/r/213505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I931df032c3d8dc5807c7590a763b8d9060c5ee87
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Daniel Friesen
Gerrit-Reviewer: Edokter
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make project talk namespace on cawiki Flow-occupied - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Make project talk namespace on cawiki Flow-occupied .. Make project talk namespace on cawiki Flow-occupied Bug: T99117 Change-Id: Id3b2874327bdf7fd634beab451a2c0744ec38b21 --- M wmf-config/InitialiseSettings.php 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 308903a..71ed2b5 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14541,6 +14541,9 @@ 113, // Archive_talk 829, // Module_talk from Scribunto ), + 'cawiki' => array( + NS_PROJECT_TALK, // T99117 + ), ), 'wmgFlowOccupyPages' => array( 'default' => array(), -- To view, visit https://gerrit.wikimedia.org/r/221999 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id3b2874327bdf7fd634beab451a2c0744ec38b21 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Catrope Gerrit-Reviewer: Catrope Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Assure we have an Entity with EntityId in EntityParserOutput... - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222017
Change subject: Assure we have an Entity with EntityId in
EntityParserOutputGenerator
..
Assure we have an Entity with EntityId in EntityParserOutputGenerator
Apparently that's not always the case (hit that on testwikidata).
Potentially due to screwed up content there.
Change-Id: I56f3267cbc213a455bef5dfc95d1dcb2f555626e
---
M repo/includes/EntityParserOutputGenerator.php
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/17/222017/1
diff --git a/repo/includes/EntityParserOutputGenerator.php
b/repo/includes/EntityParserOutputGenerator.php
index 02d5ca1..6923b65 100644
--- a/repo/includes/EntityParserOutputGenerator.php
+++ b/repo/includes/EntityParserOutputGenerator.php
@@ -149,6 +149,10 @@
$entity = $entityRevision->getEntity();
+ if ( $entity->getId() === null ) {
+ throw new InvalidArgumentException( '$entityRevision
must contain an Entity with a EntityId' );
+ }
+
if ( $entity instanceof StatementListProvider ) {
$snaks = $entity->getStatements()->getAllSnaks();
}
--
To view, visit https://gerrit.wikimedia.org/r/222017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I56f3267cbc213a455bef5dfc95d1dcb2f555626e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] access: Grant Ellery Wulczyn @ellery access to terbium via t... - change (operations/puppet)
RobH has submitted this change and it was merged. Change subject: access: Grant Ellery Wulczyn @ellery access to terbium via the restricted group .. access: Grant Ellery Wulczyn @ellery access to terbium via the restricted group bug: T103782 Change-Id: I3c31e5d6c79bfb5edde8c43799cf9bfd5a82c266 --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: RobH: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index d916da0..b1cac25 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -58,7 +58,7 @@ gid: 706 description: access to terbium, fluorine (private data) and bastion hosts restricted folks use sudo to access apache / www-data resources -members: [daniel, dartar, +members: [daniel, dartar, ellery, ezachte, hoo, jamesur, jdlrobson, khorn, tparscal, tnegrin, ssastry, ironholds, nuria, leila, santhosh, amire80, legoktm, jsahleen] privileges: ['ALL = (www-data,apache) NOPASSWD: ALL'] -- To view, visit https://gerrit.wikimedia.org/r/221006 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3c31e5d6c79bfb5edde8c43799cf9bfd5a82c266 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Matanya Gerrit-Reviewer: Ellery Gerrit-Reviewer: Matanya Gerrit-Reviewer: Ottomata Gerrit-Reviewer: RobH Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Generate PHP docs with Composer - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Generate PHP docs with Composer
..
Generate PHP docs with Composer
Running `composer test` failed because of the PHPDocumentor fixtures
included by the grunt-phpdocumentor npm package... Since Composer is now
responsible for running PHP-specific commands, use it to generate PHP
docs as well.
Since there's no longer any PHP in the node_modules directory, it no
longer has to be special-cased the PHP-specific tooling.
Also, update phpdoc.xml to reflect the PHPDocumentor defaults [0] and
include those PHP extensions included in the 'test' Composer script.
[0] http://phpdoc.org/docs/latest/references/configuration.html
Change-Id: I12ca5c2d32a0d0accd095adfc135ec18e2ebd7ab
---
M Makefile
M composer.json
M package.json
M phpdoc.xml
4 files changed, 15 insertions(+), 12 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Makefile b/Makefile
index 4ccda99..b7affaf 100644
--- a/Makefile
+++ b/Makefile
@@ -27,11 +27,11 @@
jsduck: nodecheck gems ## Build the JavaScript documentation
@npm run -s doc
-phpdoc: nodecheck ## Build the PHP documentation
+phpdoc:## Build the PHP documentation
mkdir -p docs
rm -rf docs/php
mkdir -p docs/php/log
- @php node_modules/grunt-phpdocumentor/bin/phpDocumentor.phar -c
phpdoc.xml
+ @composer doc
docs: jsduck phpdoc## Build the styleguide, JavaScript,
and PHP documentation
diff --git a/composer.json b/composer.json
index 321fabf..49a03cf 100644
--- a/composer.json
+++ b/composer.json
@@ -1,12 +1,16 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9",
- "mediawiki/mediawiki-codesniffer": "0.3.0"
+ "mediawiki/mediawiki-codesniffer": "0.3.0",
+ "phpdocumentor/phpdocumentor": "^2.8"
},
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
- "phpcs
--standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki
--extensions=php,php5,inc --ignore=vendor,node_modules -p ."
+ "phpcs
--standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki
--extensions=php,php5,inc --ignore=vendor -p ."
+ ],
+ "doc": [
+ "phpdoc"
]
}
}
diff --git a/package.json b/package.json
index 0771023..4e10c60 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,6 @@
},
"dependencies": {
"grunt": "0.4.5",
- "grunt-phpdocumentor": "~0.4.1",
"jsdoc": "<=3.3.0",
"kss": ">=0.3.6",
"svgo": ">=0.4.4"
diff --git a/phpdoc.xml b/phpdoc.xml
index 6d98b9a..2463147 100644
--- a/phpdoc.xml
+++ b/phpdoc.xml
@@ -3,13 +3,14 @@
Extension:MobileFrontend
docs/php
-
- TODO
- FIXME
-
+
+ php
+ php5
+ inc
+
- docs/php
+ docs/php/
debug
@@ -19,9 +20,8 @@
- ./
+ .
vendor/*
tests/*
- node_modules/*
--
To view, visit https://gerrit.wikimedia.org/r/214324
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I12ca5c2d32a0d0accd095adfc135ec18e2ebd7ab
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx
Gerrit-Reviewer: BarryTheBrowserTestBot
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Phuedx
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tlsproxy: add 2048-bit dhparam file to nginx - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222016
Change subject: tlsproxy: add 2048-bit dhparam file to nginx
..
tlsproxy: add 2048-bit dhparam file to nginx
This was uniquely, securely generated with openssl on production
hardware by me. Note that this won't actually get used until we
enable a DHE-based cipher.
Change-Id: I697c60b18b085c472f3c630bf611f5bf1325005c
---
A modules/tlsproxy/files/dhparam.pem
M modules/tlsproxy/manifests/instance.pp
M modules/tlsproxy/templates/nginx.conf.erb
3 files changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/222016/1
diff --git a/modules/tlsproxy/files/dhparam.pem
b/modules/tlsproxy/files/dhparam.pem
new file mode 100644
index 000..ac3a2ba
--- /dev/null
+++ b/modules/tlsproxy/files/dhparam.pem
@@ -0,0 +1,8 @@
+-BEGIN DH PARAMETERS-
+MIIBCAKCAQEA4QzjJ3MnKeoDtQZoPVf3V068Aqnpxo9FilTx1XQvr+uGb0IRlacI
+JhlnEXFA61FDudKWF54mHxr3dmCBzXf3lnLhkhTwzn2Pc1Ag9EXdoBam5igpS2bD
+5CmAInAvKBmW1YBGaprOAFbUb5J9vcGbfJj+DfLL58udApuKJmE4c4z8EFAmoa49
+tpW7QqDnttw2SKP+8CWs3b4sJGU6j6h9YDKqtrhztB2vrnhiJ2fv89nYBVvyHsNY
+dt3IpYluAaJBfmtrduMiG6KbGz+CgNCY5gvxGV29wy/uE2cT5ZEo2CreKKVCV7RN
+zBUrcHG8RZ4c+YJsbMKqCwkHImhDCBHSiwIBAg==
+-END DH PARAMETERS-
diff --git a/modules/tlsproxy/manifests/instance.pp
b/modules/tlsproxy/manifests/instance.pp
index b3089a6..22d9167 100644
--- a/modules/tlsproxy/manifests/instance.pp
+++ b/modules/tlsproxy/manifests/instance.pp
@@ -17,5 +17,10 @@
source => 'puppet:///modules/tlsproxy/logrotate',
tag=> 'nginx', # workaround PUP-2689, can remove w/ puppetmaster
3.6.2+
}
+
+file { '/etc/nginx/dhparam.pem':
+source => 'puppet:///modules/tlsproxy/dhparam.pem',
+tag=> 'nginx', # workaround PUP-2689, can remove w/ puppetmaster
3.6.2+
+}
}
diff --git a/modules/tlsproxy/templates/nginx.conf.erb
b/modules/tlsproxy/templates/nginx.conf.erb
index e5aef68..cb27d87 100644
--- a/modules/tlsproxy/templates/nginx.conf.erb
+++ b/modules/tlsproxy/templates/nginx.conf.erb
@@ -115,6 +115,7 @@
}
<%= @nginx_ssl_conf.join("\n") %>
+ssl_dhparam /etc/nginx/dhparam.pem;
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/sites-enabled/*;
--
To view, visit https://gerrit.wikimedia.org/r/222016
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I697c60b18b085c472f3c630bf611f5bf1325005c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Extend API so frames can be manually specified - change (mediawiki...DebugTemplates)
Clump has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222015
Change subject: Extend API so frames can be manually specified
..
Extend API so frames can be manually specified
This will be used to help properly evaluate parameters when a parameter name is
either constructed or indirectly referenced. It is similar to the
expandtemplates
api call, but simplified and accepting a JSON-encoded frame.
Change-Id: I6ff1a1c8e4639372b2db70636958480a1aafda93
---
A ApiDebugTemplates.php
M DebugTemplates.php
M SpecialDebugTemplates.php
M i18n/en.json
M i18n/qqq.json
5 files changed, 97 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DebugTemplates
refs/changes/15/222015/1
diff --git a/ApiDebugTemplates.php b/ApiDebugTemplates.php
new file mode 100644
index 000..b847898
--- /dev/null
+++ b/ApiDebugTemplates.php
@@ -0,0 +1,75 @@
+extractRequestParams();
+
+ $title_obj = Title::newFromText( $params[ 'title' ] );
+
+ if ( !$title_obj || $title_obj->isExternal() ) {
+ $this->dieUsageMsg( array( 'invalidtitle', $params[
'title' ] ) );
+ }
+
+ // The frame field is a JSON-encoded object
+ $frame = FormatJson::parse( $params[ 'frame' ],
FormatJson::FORCE_ASSOC );
+
+ $result = $this->getResult();
+
+ if ( $frame->isGood() ) {
+ $options = ParserOptions::newFromContext(
$this->getContext() );
+ $parsed = $wgParser->preprocess( $params[ 'text' ],
+ $title_obj,
+ $options,
+ null,
+ $frame->getValue() );
+ $this->getResult()->addValue( null,
$this->getModuleName(),
+ array ( 'result' => $parsed ) );
+ } else {
+ $this->getErrorFormatter()->addMessagesFromStatus(
$this->getModuleName(), $frame );
+ }
+ return true;
+ }
+
+ /**
+* Force the existence of our parameters.
+*
+* @return object Array of parameter to arrays
+*/
+ public function getAllowedParams() {
+ return array_merge( parent::getAllowedParams(), array(
+ 'text' => array (
+ ApiBase::PARAM_TYPE => 'string',
+ ApiBase::PARAM_REQUIRED => true
+ ),
+ 'frame' => array (
+ ApiBase::PARAM_TYPE => 'string',
+ ApiBase::PARAM_DFLT => '{}'
+ //
ApiBase::PARAM_REQUIRED => true
+ ),
+ 'title' => array (
+ ApiBase::PARAM_DFLT => 'API'
+ ),
+ ) );
+ }
+
+ /**
+* Provide an example of usage
+*
+* @return object Array showing an example use and its result
+*/
+ public function getExamplesMessages() {
+ return array(
+
'action=expandframe&text={{{a}}}&frame={"a":"b"}&format=json'
+ => 'apihelp-expandframe-example-1'
+ );
+ }
+}
\ No newline at end of file
diff --git a/DebugTemplates.php b/DebugTemplates.php
index 07aa8ad..d14e142 100644
--- a/DebugTemplates.php
+++ b/DebugTemplates.php
@@ -12,16 +12,20 @@
'path' => __FILE__,
'name' => 'DebugTemplates',
'author' => 'Clark Verbrugge',
-'license-name' => 'CC BY-SA 3.0',
+ 'license-name' => 'CC BY-SA 3.0',
'url' => '',
'descriptionmsg' => 'debugtemplates-desc',
'version' => '0.5',
);
$wgAutoloadClasses['SpecialDebugTemplates'] = __DIR__ .
'/SpecialDebugTemplates.php';
+$wgAutoloadClasses['ApiDebugTemplates'] = __DIR__ . '/ApiDebugTemplates.php';
+
$wgMessagesDirs['DebugTemplates'] = __DIR__ . "/i18n";
$wgExtensionMessagesFiles['DebugTemplatesAlias'] = __DIR__ .
'/DebugTemplates.alias.php';
+
$wgSpecialPages['DebugTemplates'] = 'SpecialDebugTemplates';
+$wgAPIModules['expandframe'] = 'ApiDebugTemplates';
$wgResourceModules['ext.debugTemplates'] = array(
'scripts' => array( 'ext.debugTemplates.js' ),
diff --git a/SpecialDebugTemplates.php b/SpecialDebugTemplates.php
index 63a9d52..b0f2836 100644
--- a/SpecialDebugTemplates.php
+++ b/SpecialDebugTemplates.php
@@ -27,8 +27,8 @@
$this->setHeaders();
- if ($subpage!='') {
-
[MediaWiki-commits] [Gerrit] Bump versionCode - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Bump versionCode
..
Bump versionCode
Change-Id: I77131ea8f2fd55fb3020a3bfe07abf551f83c8ee
---
M wikipedia/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Sniedzielski: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index 6ca19c1..5334535 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -20,7 +20,7 @@
applicationId 'org.wikipedia'
minSdkVersion 10
targetSdkVersion 22
-versionCode 104
+versionCode 105
testApplicationId 'org.wikipedia.test'
}
signingConfigs {
--
To view, visit https://gerrit.wikimedia.org/r/222014
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77131ea8f2fd55fb3020a3bfe07abf551f83c8ee
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Sniedzielski
Gerrit-Reviewer: Sniedzielski
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump versionCode - change (apps...wikipedia)
Sniedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222014
Change subject: Bump versionCode
..
Bump versionCode
Change-Id: I77131ea8f2fd55fb3020a3bfe07abf551f83c8ee
---
M wikipedia/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/14/222014/1
diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index 6ca19c1..5334535 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -20,7 +20,7 @@
applicationId 'org.wikipedia'
minSdkVersion 10
targetSdkVersion 22
-versionCode 104
+versionCode 105
testApplicationId 'org.wikipedia.test'
}
signingConfigs {
--
To view, visit https://gerrit.wikimedia.org/r/222014
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I77131ea8f2fd55fb3020a3bfe07abf551f83c8ee
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Sniedzielski
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add rawcontinue to FetchUserContribsTask - change (apps...wikipedia)
Sniedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222013
Change subject: Add rawcontinue to FetchUserContribsTask
..
Add rawcontinue to FetchUserContribsTask
Change-Id: I963496a11dd2613eec2f5d4e29f703b2af24d13b
---
M
wikipedia/src/main/java/org/wikipedia/pagehistory/usercontributions/FetchUserContribsTask.java
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/13/222013/1
diff --git
a/wikipedia/src/main/java/org/wikipedia/pagehistory/usercontributions/FetchUserContribsTask.java
b/wikipedia/src/main/java/org/wikipedia/pagehistory/usercontributions/FetchUserContribsTask.java
index 61c6541..e45b6cf 100644
---
a/wikipedia/src/main/java/org/wikipedia/pagehistory/usercontributions/FetchUserContribsTask.java
+++
b/wikipedia/src/main/java/org/wikipedia/pagehistory/usercontributions/FetchUserContribsTask.java
@@ -38,6 +38,7 @@
.param("list", "usercontribs")
.param("uclimit", String.valueOf(numberToFetch))
.param("ucuser", username)
+.param("rawcontinue", "1")
.param("ucprop", "title|timestamp|comment|sizediff");
if (queryContinue != null) {
builder.param("ucstart", queryContinue);
--
To view, visit https://gerrit.wikimedia.org/r/222013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I963496a11dd2613eec2f5d4e29f703b2af24d13b
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Sniedzielski
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tlsproxy: gut esams cases from beta-only template - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222008
Change subject: tlsproxy: gut esams cases from beta-only template
..
tlsproxy: gut esams cases from beta-only template
Change-Id: Ia0e12512a3bffe7aa148e59ab7f737e4b6ba4b0e
---
M modules/tlsproxy/templates/betassl.erb
1 file changed, 0 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/08/222008/1
diff --git a/modules/tlsproxy/templates/betassl.erb
b/modules/tlsproxy/templates/betassl.erb
index c6d1bcc..606f785 100644
--- a/modules/tlsproxy/templates/betassl.erb
+++ b/modules/tlsproxy/templates/betassl.erb
@@ -2,23 +2,12 @@
# This file is managed by Puppet!
upstream <%= name %> {
-<% if @site == "esams" then -%>
- # TODO: find a way to properly support proxy_port
- server <%= @proxy_backend["esams"]["primary"] %>;
-<% end -%>
<% if @site == "eqiad" then -%>
# max fails is ignored when using one host, so we use the same host
twice
server <%= @proxy_backend["eqiad"]["primary"] %>:<%= @proxy_port %>;
server <%= @proxy_backend["eqiad"]["primary"] %>:<%= @proxy_port %>;
<% end -%>
}
-
-<% if @site == "esams" then -%>
-upstream <%= @name %>_fallback {
- # fallback always uses 443
- server <%= @proxy_backend["esams"]["secondary"] %>:443;
-}
-<% end -%>
# SSL proxying
server {
@@ -50,10 +39,6 @@
<% else %>
proxy_pass http://<%= @name %>;
<% end %>
- <% if @site == "esams" then -%>
-proxy_intercept_errors on;
- error_page 502 503 504 = @fallback;
- <% end -%>
# this should be in sync with Varnish's first_byte_timeout
# and PHP's max_execution_time
@@ -68,19 +53,4 @@
proxy_redirect off;
proxy_buffering off;
}
- <% if @site == "esams" then -%>
-location @fallback {
- proxy_pass https://<%= @name %>_fallback;
-
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
- proxy_set_header X-Forwarded-Proto https;
-
- proxy_redirect off;
- proxy_buffering off;
- }
- <% end -%>
-
}
--
To view, visit https://gerrit.wikimedia.org/r/222008
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0e12512a3bffe7aa148e59ab7f737e4b6ba4b0e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tlsproxy: remove dead udplog comments - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/222012 Change subject: tlsproxy: remove dead udplog comments .. tlsproxy: remove dead udplog comments Change-Id: Ie0e720856da03a670c3947950bee9e677e0d42b4 --- M modules/tlsproxy/templates/nginx.conf.erb 1 file changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/12/222012/1 diff --git a/modules/tlsproxy/templates/nginx.conf.erb b/modules/tlsproxy/templates/nginx.conf.erb index 34f4bd9..e5aef68 100644 --- a/modules/tlsproxy/templates/nginx.conf.erb +++ b/modules/tlsproxy/templates/nginx.conf.erb @@ -57,14 +57,10 @@ include /etc/nginx/mime.types; access_log /var/log/nginx/access.log; -## -- udplog disabled, to be removed later assuming no issues, cf T86656 -## log_format squid_combined '$hostname$udplog_sequence $udplog_time$request_time $remote_addr-/$status $bytes_sent $request_method $scheme://$host$request_uri NONE/$proxy_host $content_type $http_referer $http_x_forwarded_for $http_user_agent $http_accept_language $sent_http_x_analytics'; -## access_udplog 208.80.154.73:8419 squid_combined; -## -- end of udplog stuff + client_max_body_size 100m; large_client_header_buffers 4 16k; client_body_buffer_size 64k; - sendfileon; #tcp_nopush on; -- To view, visit https://gerrit.wikimedia.org/r/222012 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0e720856da03a670c3947950bee9e677e0d42b4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tlsproxy: rename beta-only things to betassl for clarity - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222006
Change subject: tlsproxy: rename beta-only things to betassl for clarity
..
tlsproxy: rename beta-only things to betassl for clarity
Change-Id: I8d3d5c18229723d116a031c18295f112b726ac89
---
M manifests/role/tlsproxy.pp
R modules/tlsproxy/manifests/betassl.pp
R modules/tlsproxy/templates/betassl.erb
3 files changed, 7 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/222006/1
diff --git a/manifests/role/tlsproxy.pp b/manifests/role/tlsproxy.pp
index dc615e4..05b414b 100644
--- a/manifests/role/tlsproxy.pp
+++ b/manifests/role/tlsproxy.pp
@@ -54,5 +54,5 @@
'wiktionary' => { proxy_server_name =>
'*.wiktionary.beta.wmflabs.org' },
}
-create_resources( tlsproxy, $instances, $defaults )
+create_resources( tlsproxy::betassl, $instances, $defaults )
}
diff --git a/modules/tlsproxy/manifests/init.pp
b/modules/tlsproxy/manifests/betassl.pp
similarity index 87%
rename from modules/tlsproxy/manifests/init.pp
rename to modules/tlsproxy/manifests/betassl.pp
index 2a2c283..8eae3ab 100644
--- a/modules/tlsproxy/manifests/init.pp
+++ b/modules/tlsproxy/manifests/betassl.pp
@@ -1,6 +1,9 @@
# vim:sw=4:ts=4:et:
-# == Definition: tlsproxy
+# NOTE - this is only used by betalabs at this point, and due for further
+# refactor/integration with prod's tlsproxy::localssl
+
+# == Definition: tlsproxy::betassl
#
# This definition creates a nginx site. The parameters are merely expanded in
# the templates which has all of the logic.
@@ -52,7 +55,7 @@
#ipv6_enabled => true,
# }
#
-define tlsproxy(
+define tlsproxy::betassl(
$proxy_server_name,
$proxy_server_cert_name,
$proxy_backend,
@@ -64,6 +67,6 @@
) {
require tlsproxy::instance
nginx::site { $name:
-content => template('tlsproxy/proxy.erb')
+content => template('tlsproxy/betassl.erb')
}
}
diff --git a/modules/tlsproxy/templates/proxy.erb
b/modules/tlsproxy/templates/betassl.erb
similarity index 100%
rename from modules/tlsproxy/templates/proxy.erb
rename to modules/tlsproxy/templates/betassl.erb
--
To view, visit https://gerrit.wikimedia.org/r/222006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d3d5c18229723d116a031c18295f112b726ac89
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tlsproxy: move template into module (only user) - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222009
Change subject: tlsproxy: move template into module (only user)
..
tlsproxy: move template into module (only user)
Change-Id: Iea35610a75697b42ce0bc93325f40c7fb0ecd1e4
---
M modules/dynamicproxy/templates/domainproxy.conf
M modules/dynamicproxy/templates/redundanturlproxy.conf
M modules/dynamicproxy/templates/urlproxy.conf
M modules/tlsproxy/manifests/instance.pp
R modules/tlsproxy/templates/nginx.conf.erb
M modules/toollabs/templates/static-server.conf.erb
6 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/09/222009/1
diff --git a/modules/dynamicproxy/templates/domainproxy.conf
b/modules/dynamicproxy/templates/domainproxy.conf
index b2d8adf..6b8c040 100644
--- a/modules/dynamicproxy/templates/domainproxy.conf
+++ b/modules/dynamicproxy/templates/domainproxy.conf
@@ -39,7 +39,7 @@
ssl_certificate /etc/ssl/localcerts/<%= @ssl_certificate_name
%>.chained.crt;
ssl_certificate_key /etc/ssl/private/<%= @ssl_certificate_name %>.key;
-# Copied from templates/nginx/nginx.conf.erb. Eugh
+# Copied from modules/tlsproxy/templates/nginx.conf.erb. Eugh
# Enable a shared cache, since it is defined at this level
# it will be used for all virtual hosts. 1m = 4000 active sessions,
# so we are allowing 200,000 active sessions.
diff --git a/modules/dynamicproxy/templates/redundanturlproxy.conf
b/modules/dynamicproxy/templates/redundanturlproxy.conf
index 6498e02..f8764e1 100644
--- a/modules/dynamicproxy/templates/redundanturlproxy.conf
+++ b/modules/dynamicproxy/templates/redundanturlproxy.conf
@@ -31,7 +31,7 @@
ssl_certificate /etc/ssl/localcerts/<%= @ssl_certificate_name
%>.chained.crt;
ssl_certificate_key /etc/ssl/private/<%= @ssl_certificate_name %>.key;
-# Copied from templates/nginx/nginx.conf.erb. Eugh
+# Copied from modules/tlsproxy/templates/nginx.conf.erb. Eugh
# Enable a shared cache, since it is defined at this level
# it will be used for all virtual hosts. 1m = 4000 active sessions,
# so we are allowing 200,000 active sessions.
diff --git a/modules/dynamicproxy/templates/urlproxy.conf
b/modules/dynamicproxy/templates/urlproxy.conf
index 9591890..0012c60 100644
--- a/modules/dynamicproxy/templates/urlproxy.conf
+++ b/modules/dynamicproxy/templates/urlproxy.conf
@@ -39,7 +39,7 @@
ssl_certificate /etc/ssl/localcerts/<%= @ssl_certificate_name
%>.chained.crt;
ssl_certificate_key /etc/ssl/private/<%= @ssl_certificate_name %>.key;
-# Copied from templates/nginx/nginx.conf.erb. Eugh
+# Copied from modules/tlsproxy/templates/nginx.conf.erb. Eugh
# Enable a shared cache, since it is defined at this level
# it will be used for all virtual hosts. 1m = 4000 active sessions,
# so we are allowing 200,000 active sessions.
diff --git a/modules/tlsproxy/manifests/instance.pp
b/modules/tlsproxy/manifests/instance.pp
index 1a90122..a3ca876 100644
--- a/modules/tlsproxy/manifests/instance.pp
+++ b/modules/tlsproxy/manifests/instance.pp
@@ -10,7 +10,7 @@
class { 'nginx': managed => false, }
file { '/etc/nginx/nginx.conf':
-content => template('nginx/nginx.conf.erb'),
+content => template('tlsproxy/nginx.conf.erb'),
tag => 'nginx', # workaround PUP-2689, can remove w/ puppetmaster
3.6.2+
}
diff --git a/templates/nginx/nginx.conf.erb
b/modules/tlsproxy/templates/nginx.conf.erb
similarity index 100%
rename from templates/nginx/nginx.conf.erb
rename to modules/tlsproxy/templates/nginx.conf.erb
diff --git a/modules/toollabs/templates/static-server.conf.erb
b/modules/toollabs/templates/static-server.conf.erb
index 142328c..dce45db 100644
--- a/modules/toollabs/templates/static-server.conf.erb
+++ b/modules/toollabs/templates/static-server.conf.erb
@@ -24,7 +24,7 @@
ssl_certificate /etc/ssl/localcerts/<%= @ssl_certificate_name
%>.chained.crt;
ssl_certificate_key /etc/ssl/private/<%= @ssl_certificate_name %>.key;
-# Copied from templates/nginx/nginx.conf.erb. Eugh
+# Copied from modules/tlsproxy/templates/nginx.conf.erb. Eugh
# Enable a shared cache, since it is defined at this level
# it will be used for all virtual hosts. 1m = 4000 active sessions,
# so we are allowing 200,000 active sessions.
--
To view, visit https://gerrit.wikimedia.org/r/222009
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea35610a75697b42ce0bc93325f40c7fb0ecd1e4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tlsproxy: rename protoproxy to tlsproxy globally - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222001
Change subject: tlsproxy: rename protoproxy to tlsproxy globally
..
tlsproxy: rename protoproxy to tlsproxy globally
Change-Id: I9c5e9a063d825873ce28ac701b6ea78a46b75fa4
---
R manifests/role/tlsproxy.pp
M modules/role/manifests/cache/ssl/local.pp
M modules/role/manifests/cache/ssl/misc.pp
M modules/role/manifests/cache/ssl/parsoid.pp
M modules/role/manifests/cache/ssl/sni.pp
M modules/role/manifests/cache/ssl/unified.pp
R modules/tlsproxy/files/update-ocsp-all
R modules/tlsproxy/manifests/ganglia.pp
R modules/tlsproxy/manifests/init.pp
R modules/tlsproxy/manifests/localssl.pp
R modules/tlsproxy/manifests/ocsp_updater.pp
R modules/tlsproxy/manifests/params.pp
R modules/tlsproxy/templates/localhost.erb
R modules/tlsproxy/templates/localssl.erb
R modules/tlsproxy/templates/proxy.erb
M nodes/labs/staging.yaml
16 files changed, 37 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/222001/1
diff --git a/manifests/role/protoproxy.pp b/manifests/role/tlsproxy.pp
similarity index 85%
rename from manifests/role/protoproxy.pp
rename to manifests/role/tlsproxy.pp
index 8ff7e10..0f114a6 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/tlsproxy.pp
@@ -15,7 +15,7 @@
#
# Requires:
# - nginx package
-class role::protoproxy::ssl::common {
+class role::tlsproxy::ssl::common {
# Tune kernel settings
include webserver::sysctl_settings
@@ -37,10 +37,10 @@
}
}
-class role::protoproxy::ssl::beta::common {
+class role::tlsproxy::ssl::beta::common {
include standard
-include role::protoproxy::ssl::common
+include role::tlsproxy::ssl::common
sslcert::certificate { 'star.wmflabs.org':
source => 'puppet:///files/ssl/star.wmflabs.org.crt',
@@ -52,17 +52,17 @@
# made to port 443, we have to setup a nginx proxy on each of the caches.
# Nginx will listen on the real instance IP, proxy_addresses are not needed.
#
-class role::protoproxy::ssl::beta {
+class role::tlsproxy::ssl::beta {
# Don't run an ipv6 proxy on beta
-class {'protoproxy::params': enable_ipv6_proxy => false}
+class {'tlsproxy::params': enable_ipv6_proxy => false}
-system::role { 'role::protoproxy::ssl:beta': description => 'SSL proxy on
beta' }
+system::role { 'role::tlsproxy::ssl:beta': description => 'SSL proxy on
beta' }
-include role::protoproxy::ssl::beta::common
+include role::tlsproxy::ssl::beta::common
-# protoproxy::instance parameters common to any beta instance
+# tlsproxy::instance parameters common to any beta instance
$defaults = {
proxy_server_cert_name => 'star.wmflabs.org',
proxy_backend => {
@@ -87,6 +87,6 @@
'wiktionary' => { proxy_server_name =>
'*.wiktionary.beta.wmflabs.org' },
}
-create_resources( protoproxy, $instances, $defaults )
+create_resources( tlsproxy, $instances, $defaults )
}
diff --git a/modules/role/manifests/cache/ssl/local.pp
b/modules/role/manifests/cache/ssl/local.pp
index 93dfefd..e7a9cad 100644
--- a/modules/role/manifests/cache/ssl/local.pp
+++ b/modules/role/manifests/cache/ssl/local.pp
@@ -1,4 +1,4 @@
-# Helper for install_certificate + protoproxy::localssl
+# Helper for install_certificate + tlsproxy::localssl
define role::cache::ssl::local($certname, $do_ocsp=false,
$server_name=$::fqdn, $server_aliases=[], $default_server=false) {
# Assumes that LVS service IPs are setup elsewhere
@@ -6,7 +6,7 @@
before => Protoproxy::Localssl[$name],
}
-protoproxy::localssl { $name:
+tlsproxy::localssl { $name:
proxy_server_cert_name => $certname,
upstream_port => '80',
default_server => $default_server,
diff --git a/modules/role/manifests/cache/ssl/misc.pp
b/modules/role/manifests/cache/ssl/misc.pp
index cba2b3f..bd7c383 100644
--- a/modules/role/manifests/cache/ssl/misc.pp
+++ b/modules/role/manifests/cache/ssl/misc.pp
@@ -1,6 +1,6 @@
# As above, but for misc instead of generic prod
class role::cache::ssl::misc {
-include role::protoproxy::ssl::common
+include role::tlsproxy::ssl::common
role::cache::ssl::local { 'wikimedia.org':
do_ocsp=> true,
diff --git a/modules/role/manifests/cache/ssl/parsoid.pp
b/modules/role/manifests/cache/ssl/parsoid.pp
index b3b05a5..b765279 100644
--- a/modules/role/manifests/cache/ssl/parsoid.pp
+++ b/modules/role/manifests/cache/ssl/parsoid.pp
@@ -1,6 +1,6 @@
class role::cache::ssl::parsoid {
# Explicitly not adding wmf CA since it is not needed for now
-include role::protoproxy::ssl::common
+include role::tlsproxy::ssl::common
role::cache::ssl::local { 'unified':
certname => 'uni.wikimedia.org',
diff --git a/modules/role/manifests/cache/ssl/sni.pp
b/modules/role/manifests/cache
[MediaWiki-commits] [Gerrit] tlsproxy: remove pointless use_ssl + jessie conditionals - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222011
Change subject: tlsproxy: remove pointless use_ssl + jessie conditionals
..
tlsproxy: remove pointless use_ssl + jessie conditionals
Change-Id: I666265a015d0377ed1003a4c6177f916b608ea75
---
M modules/tlsproxy/manifests/instance.pp
M modules/tlsproxy/templates/nginx.conf.erb
2 files changed, 25 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/11/222011/1
diff --git a/modules/tlsproxy/manifests/instance.pp
b/modules/tlsproxy/manifests/instance.pp
index 2a5e730..b3089a6 100644
--- a/modules/tlsproxy/manifests/instance.pp
+++ b/modules/tlsproxy/manifests/instance.pp
@@ -4,7 +4,6 @@
include webserver::sysctl_settings
$nginx_worker_connections = '32768'
-$nginx_use_ssl = true
$nginx_ssl_conf = ssl_ciphersuite('nginx', 'compat')
class { 'nginx': managed => false, }
diff --git a/modules/tlsproxy/templates/nginx.conf.erb
b/modules/tlsproxy/templates/nginx.conf.erb
index 111fe16..34f4bd9 100644
--- a/modules/tlsproxy/templates/nginx.conf.erb
+++ b/modules/tlsproxy/templates/nginx.conf.erb
@@ -7,35 +7,31 @@
# Thumbs server configuration file
user www-data www-data;
-<% if has_variable?("nginx_use_ssl") then %>
-# Adapted from
https://github.com/priestjim/chef-openresty/blob/master/recipes/commons_conf.rb
-# Hyperthread siblings assumed to be enumerated as 0+16, 1+17, 2+18, etc,
and
-# if HT is detected, we map 2 process per physical core onto both siblings
-worker_processes <%= @processorcount %>;
-<%
-ht_mode = false
-if @processorcount.to_i == (2 * @physicalcorecount.to_i)
-ht_mode = true
+# Adapted from
https://github.com/priestjim/chef-openresty/blob/master/recipes/commons_conf.rb
+# Hyperthread siblings assumed to be enumerated as 0+16, 1+17, 2+18, etc, and
+# if HT is detected, we map 2 process per physical core onto both siblings
+worker_processes <%= @processorcount %>;
+<%
+ht_mode = false
+if @processorcount.to_i == (2 * @physicalcorecount.to_i)
+ht_mode = true
+end
+affinity_mask = Array.new
+cpupos = 0
+ncpus = @physicalcorecount.to_i
+(0...ncpus).each do |worker|
+bitmask = (1 << cpupos).to_s(2)
+bitstring = '0' * (ncpus - bitmask.size) + bitmask.to_s
+if ht_mode
+affinity_mask << (bitstring + bitstring)
+affinity_mask << (bitstring + bitstring)
+else
+affinity_mask << bitstring
end
-affinity_mask = Array.new
-cpupos = 0
-ncpus = @physicalcorecount.to_i
-(0...ncpus).each do |worker|
-bitmask = (1 << cpupos).to_s(2)
-bitstring = '0' * (ncpus - bitmask.size) + bitmask.to_s
-if ht_mode
-affinity_mask << (bitstring + bitstring)
-affinity_mask << (bitstring + bitstring)
-else
-affinity_mask << bitstring
-end
-cpupos += 1
-end
--%>
-worker_cpu_affinity <%= affinity_mask.join(" ") %>;
-<% else %>
-worker_processes <%= @processorcount.to_i * 8 %>;
-<% end %>
+cpupos += 1
+end
+-%>
+worker_cpu_affinity <%= affinity_mask.join(" ") %>;
worker_rlimit_nofile 3;
@@ -44,12 +40,10 @@
events {
worker_connections <%= @nginx_worker_connections %>;
-<% if has_variable?("nginx_use_ssl") then %>
# Setting multi_accept makes it much less likely that
# the SSL server will throw SSL connection errors
multi_accept on;
accept_mutex off; # better latencies at high connection rates
-<% end %>
}
http {
@@ -63,7 +57,6 @@
include /etc/nginx/mime.types;
access_log /var/log/nginx/access.log;
-<% if has_variable?("nginx_use_ssl") then %>
## -- udplog disabled, to be removed later assuming no issues, cf T86656
## log_format squid_combined '$hostname$udplog_sequence
$udplog_time$request_time $remote_addr-/$status $bytes_sent
$request_method $scheme://$host$request_uri NONE/$proxy_host
$content_type $http_referer $http_x_forwarded_for $http_user_agent
$http_accept_language $sent_http_x_analytics';
## access_udplog 208.80.154.73:8419 squid_combined;
@@ -71,7 +64,6 @@
client_max_body_size 100m;
large_client_header_buffers 4 16k;
client_body_buffer_size 64k;
-<% end %>
sendfileon;
@@ -84,13 +76,12 @@
gzip off;
gzip_disable "MSIE [1-6]\.(?!.*SV1)";
-<% if has_variable?("nginx_use_ssl") then %>
# Enable a shared cache, since it is defined at this level
# it will be used for all virtual hosts. 1m = 4000 active sessions,
# so we are allowing 200,000 active sessions.
ssl_session_cache shared:SSL:50m;
ssl_session_timeout 15m;
-<% if s
[MediaWiki-commits] [Gerrit] tlsproxy: move logrotate into module (only user) - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222010
Change subject: tlsproxy: move logrotate into module (only user)
..
tlsproxy: move logrotate into module (only user)
Change-Id: Iaa730289b5f35489fa406a050f927cf56d6d9cd6
---
R modules/tlsproxy/files/logrotate
M modules/tlsproxy/manifests/instance.pp
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/222010/1
diff --git a/templates/nginx/logrotate b/modules/tlsproxy/files/logrotate
similarity index 100%
rename from templates/nginx/logrotate
rename to modules/tlsproxy/files/logrotate
diff --git a/modules/tlsproxy/manifests/instance.pp
b/modules/tlsproxy/manifests/instance.pp
index a3ca876..2a5e730 100644
--- a/modules/tlsproxy/manifests/instance.pp
+++ b/modules/tlsproxy/manifests/instance.pp
@@ -15,8 +15,8 @@
}
file { '/etc/logrotate.d/nginx':
-content => template('nginx/logrotate'),
-tag => 'nginx', # workaround PUP-2689, can remove w/ puppetmaster
3.6.2+
+source => 'puppet:///modules/tlsproxy/logrotate',
+tag=> 'nginx', # workaround PUP-2689, can remove w/ puppetmaster
3.6.2+
}
}
--
To view, visit https://gerrit.wikimedia.org/r/222010
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa730289b5f35489fa406a050f927cf56d6d9cd6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tlsproxy: remove remaining ipv6 hacks from beta - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222007
Change subject: tlsproxy: remove remaining ipv6 hacks from beta
..
tlsproxy: remove remaining ipv6 hacks from beta
Change-Id: If409c33f5fb74ffa1ed8bfedaa357eca9ef0a283
---
M manifests/role/tlsproxy.pp
M modules/tlsproxy/manifests/betassl.pp
D modules/tlsproxy/manifests/params.pp
M modules/tlsproxy/templates/betassl.erb
4 files changed, 0 insertions(+), 56 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/07/222007/1
diff --git a/manifests/role/tlsproxy.pp b/manifests/role/tlsproxy.pp
index 05b414b..7486f15 100644
--- a/manifests/role/tlsproxy.pp
+++ b/manifests/role/tlsproxy.pp
@@ -17,10 +17,6 @@
#
class role::tlsproxy::ssl::beta {
-# Don't run an ipv6 proxy on beta
-class {'tlsproxy::params': enable_ipv6_proxy => false}
-
-
system::role { 'role::tlsproxy::ssl:beta': description => 'SSL proxy on
beta' }
include standard
@@ -36,7 +32,6 @@
# send all traffic to the local cache
'eqiad' => { 'primary' => '127.0.0.1' }
},
-ipv6_enabled => false,
}
$instances = {
diff --git a/modules/tlsproxy/manifests/betassl.pp
b/modules/tlsproxy/manifests/betassl.pp
index 8eae3ab..ba4f2f6 100644
--- a/modules/tlsproxy/manifests/betassl.pp
+++ b/modules/tlsproxy/manifests/betassl.pp
@@ -32,10 +32,6 @@
# The TCP port to listen on.
# Defaults to '80'
#
-# [*ipV6_enabled*]
-# Whether to have the site listen on IPv6 addresses set via *proxy_addresses*
-# Defaults to false
-#
# [*ssl_backend*]
# Defaults to {}
#
@@ -52,7 +48,6 @@
# 'eqiad' => { 'primary' => '10.2.2.23' },
# 'esams' => { 'primary' => '10.2.3.23', 'secondary' => '208.80.154.234'
},
#},
-#ipv6_enabled => true,
# }
#
define tlsproxy::betassl(
@@ -62,7 +57,6 @@
$proxy_addresses={},
$proxy_listen_flags='',
$proxy_port='80',
-$ipv6_enabled=false,
$ssl_backend={},
) {
require tlsproxy::instance
diff --git a/modules/tlsproxy/manifests/params.pp
b/modules/tlsproxy/manifests/params.pp
deleted file mode 100644
index cda91f6..000
--- a/modules/tlsproxy/manifests/params.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class tlsproxy::params (
-$enable_ipv6_proxy = true
-){
-#noop class used to define a global behavior
-}
diff --git a/modules/tlsproxy/templates/betassl.erb
b/modules/tlsproxy/templates/betassl.erb
index 8e27ee8..c6d1bcc 100644
--- a/modules/tlsproxy/templates/betassl.erb
+++ b/modules/tlsproxy/templates/betassl.erb
@@ -26,12 +26,6 @@
# proxy_addresses is optional or migth be empty for the current site
if @proxy_addresses.has_key?(@site) then
@proxy_addresses[@site].each do |proxy_address|
- if proxy_address.start_with?('[') and
-!(scope.lookupvar('tlsproxy::params::enable_ipv6_proxy') and
@ipv6_enabled)
-then
- # Skip IPv6 address if ipv6 is not enabled.
- next
- end
-%>
listen <%= proxy_address %>:443<% if proxy_address ==
@proxy_addresses[@site][0] -%> <%= @proxy_listen_flags %><% end -%>;
<%
@@ -90,37 +84,3 @@
<% end -%>
}
-<% if @ipv6_enabled == true and
scope.lookupvar('tlsproxy::params::enable_ipv6_proxy') == true then -%>
-
-# IPv6 proxying
-server {
-<% @proxy_addresses[@site].each do |proxy_address| -%>
- <% if proxy_address[0].chr != '[' then next end %>
- listen <%= proxy_address %>:80;
-<% end -%>
- listen <%= @ipaddress %>:80;
- server_name <%= @proxy_server_name %>;
-
- error_log /var/log/nginx/<%= @name %>-ipv6.error.log;
- access_log off;
-
- keepalive_timeout 60;
-
- location / {
- proxy_pass http://<%= @name %>;
- proxy_next_upstream error timeout invalid_header http_500
http_502 http_503;
-
- # this should be in sync with Varnish's first_byte_timeout
- # and PHP's max_execution_time
- proxy_read_timeout 180s;
-
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
- proxy_redirect off;
- proxy_buffering off;
- }
-
-}
-<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/222007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If409c33f5fb74ffa1ed8bfedaa357eca9ef0a283
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tlsproxy: remove unused ganglia/localhost stuff - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222005
Change subject: tlsproxy: remove unused ganglia/localhost stuff
..
tlsproxy: remove unused ganglia/localhost stuff
Change-Id: Iac7add375260eb81d81ce7f97fc9a1ba0a81532f
---
D modules/tlsproxy/manifests/ganglia.pp
D modules/tlsproxy/templates/localhost.erb
2 files changed, 0 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/222005/1
diff --git a/modules/tlsproxy/manifests/ganglia.pp
b/modules/tlsproxy/manifests/ganglia.pp
deleted file mode 100644
index 0c8255b..000
--- a/modules/tlsproxy/manifests/ganglia.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# vim:sw=4:ts=4:et:
-
-# Ganglia monitoring
-class tlsproxy::ganglia {
-# Dummy site to provide a status to Ganglia
-nginx::site { 'localhost':
-content => template('tlsproxy/localhost.erb'),
-}
-
-}
diff --git a/modules/tlsproxy/templates/localhost.erb
b/modules/tlsproxy/templates/localhost.erb
deleted file mode 100644
index e8484d1..000
--- a/modules/tlsproxy/templates/localhost.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-# localhost stats conf for ganglia monitoring
-# This file is managed by Puppet!
-
-server {
- listen 127.0.0.1:80;
- location /nginx_status {
- stub_status on;
- access_log off;
- allow 127.0.0.1;
- deny all;
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/222005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac7add375260eb81d81ce7f97fc9a1ba0a81532f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix test compilation - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix test compilation
..
Fix test compilation
FullSearchTask signature was changed but not updated in tests.
Change-Id: I1a4ff426cb06b058a59d761af3667a49ccbbc5bf
---
M wikipedia/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Sniedzielski: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/wikipedia/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
b/wikipedia/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
index a6228b3..3b983dd 100644
--- a/wikipedia/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
+++ b/wikipedia/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
@@ -32,7 +32,7 @@
@Override
public void run() {
final WikipediaApp app = (WikipediaApp)
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(EN_SITE),
EN_SITE, "test", BATCH_SIZE, null) {
+new FullSearchArticlesTask(app.getAPIForSite(EN_SITE),
EN_SITE, "test", BATCH_SIZE, null, false) {
@Override
public void onFinish(SearchResults results) {
assertNotNull(results);
@@ -82,7 +82,7 @@
@Override
public void run() {
final WikipediaApp app = (WikipediaApp)
getInstrumentation().getTargetContext().getApplicationContext();
-new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE,
"jkfsdfpefdsfwoirpoik", BATCH_SIZE, null) { // total gibberish, should not
exist on testwiki
+new FullSearchArticlesTask(app.getAPIForSite(SITE), SITE,
"jkfsdfpefdsfwoirpoik", BATCH_SIZE, null, false) { // total gibberish, should
not exist on testwiki
@Override
public void onFinish(SearchResults results) {
assertNotNull(results);
--
To view, visit https://gerrit.wikimedia.org/r/221996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a4ff426cb06b058a59d761af3667a49ccbbc5bf
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: Dbrant
Gerrit-Reviewer: Mholloway
Gerrit-Reviewer: Niedzielski
Gerrit-Reviewer: Sniedzielski
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] OptionWidget: Explicitly set aria-selected to 'false' on init - change (oojs/ui)
jenkins-bot has submitted this change and it was merged. Change subject: OptionWidget: Explicitly set aria-selected to 'false' on init .. OptionWidget: Explicitly set aria-selected to 'false' on init It would be set to 'true' or 'false' only when #setSelected was called. Change-Id: Ie773bfd447e24f408c667c314842cf1b50847b21 --- M src/widgets/OptionWidget.js 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/src/widgets/OptionWidget.js b/src/widgets/OptionWidget.js index f85aaa1..b8f8488 100644 --- a/src/widgets/OptionWidget.js +++ b/src/widgets/OptionWidget.js @@ -35,6 +35,7 @@ this.$element .data( 'oo-ui-optionWidget', this ) .attr( 'role', 'option' ) + .attr( 'aria-selected', 'false' ) .addClass( 'oo-ui-optionWidget' ) .append( this.$label ); }; -- To view, visit https://gerrit.wikimedia.org/r/221372 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie773bfd447e24f408c667c314842cf1b50847b21 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński Gerrit-Reviewer: Jforrester Gerrit-Reviewer: TheDJ Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tlsproxy: fold ssl::beta::common into ssl::beta - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222002
Change subject: tlsproxy: fold ssl::beta::common into ssl::beta
..
tlsproxy: fold ssl::beta::common into ssl::beta
Change-Id: I2eb4a598f946cac51c66d254a055f89933d76eb8
---
M manifests/role/tlsproxy.pp
1 file changed, 6 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/02/222002/1
diff --git a/manifests/role/tlsproxy.pp b/manifests/role/tlsproxy.pp
index 0f114a6..af7c9f5 100644
--- a/manifests/role/tlsproxy.pp
+++ b/manifests/role/tlsproxy.pp
@@ -37,17 +37,6 @@
}
}
-class role::tlsproxy::ssl::beta::common {
-
-include standard
-include role::tlsproxy::ssl::common
-
-sslcert::certificate { 'star.wmflabs.org':
-source => 'puppet:///files/ssl/star.wmflabs.org.crt',
-}
-
-}
-
# Because beta does not have a frontend LVS to redirect the requests
# made to port 443, we have to setup a nginx proxy on each of the caches.
# Nginx will listen on the real instance IP, proxy_addresses are not needed.
@@ -60,7 +49,12 @@
system::role { 'role::tlsproxy::ssl:beta': description => 'SSL proxy on
beta' }
-include role::tlsproxy::ssl::beta::common
+include standard
+include role::tlsproxy::ssl::common
+
+sslcert::certificate { 'star.wmflabs.org':
+source => 'puppet:///files/ssl/star.wmflabs.org.crt',
+}
# tlsproxy::instance parameters common to any beta instance
$defaults = {
--
To view, visit https://gerrit.wikimedia.org/r/222002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2eb4a598f946cac51c66d254a055f89933d76eb8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tlsproxy: move sslcert stuff inside of tlsproxy::localssl - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222004
Change subject: tlsproxy: move sslcert stuff inside of tlsproxy::localssl
..
tlsproxy: move sslcert stuff inside of tlsproxy::localssl
Change-Id: Iee27474336bf57fcc823965b9900d880b93a16db
---
M modules/role/manifests/cache/ssl/local.pp
M modules/tlsproxy/manifests/localssl.pp
2 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/222004/1
diff --git a/modules/role/manifests/cache/ssl/local.pp
b/modules/role/manifests/cache/ssl/local.pp
index e7a9cad..ba4cac9 100644
--- a/modules/role/manifests/cache/ssl/local.pp
+++ b/modules/role/manifests/cache/ssl/local.pp
@@ -1,10 +1,6 @@
-# Helper for install_certificate + tlsproxy::localssl
+# Helper for standard prod clusters' use of tlsproxy::localssl
define role::cache::ssl::local($certname, $do_ocsp=false,
$server_name=$::fqdn, $server_aliases=[], $default_server=false) {
# Assumes that LVS service IPs are setup elsewhere
-
-install_certificate { $certname:
-before => Protoproxy::Localssl[$name],
-}
tlsproxy::localssl { $name:
proxy_server_cert_name => $certname,
diff --git a/modules/tlsproxy/manifests/localssl.pp
b/modules/tlsproxy/manifests/localssl.pp
index 3d9a73b..ec1ef24 100644
--- a/modules/tlsproxy/manifests/localssl.pp
+++ b/modules/tlsproxy/manifests/localssl.pp
@@ -32,9 +32,13 @@
$upstream_port = '80',
$do_ocsp= false
) {
-require ::sslcert
require tlsproxy::instance
+sslcert::certificate { $proxy_server_cert_name:
+source => "puppet:///files/ssl/${proxy_server_cert_name}.crt",
+private => "puppet:///private/ssl/${proxy_server_cert_name}.key",
+}
+
# Ensure that exactly one definition exists with default_server = true
# if multiple defines have default_server set to true, this
# resource will conflict.
--
To view, visit https://gerrit.wikimedia.org/r/222004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee27474336bf57fcc823965b9900d880b93a16db
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tlsproxy: move role::tlsproxy::ssl::common to auto-required ... - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222003
Change subject: tlsproxy: move role::tlsproxy::ssl::common to auto-required
tlsproxy::instance
..
tlsproxy: move role::tlsproxy::ssl::common to auto-required tlsproxy::instance
Change-Id: I055801ed5309544feced311e61862783d1e3125c
---
M manifests/role/tlsproxy.pp
M modules/role/manifests/cache/ssl/misc.pp
M modules/role/manifests/cache/ssl/parsoid.pp
M modules/role/manifests/cache/ssl/sni.pp
M modules/role/manifests/cache/ssl/unified.pp
M modules/tlsproxy/manifests/init.pp
A modules/tlsproxy/manifests/instance.pp
M modules/tlsproxy/manifests/localssl.pp
8 files changed, 24 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/03/222003/1
diff --git a/manifests/role/tlsproxy.pp b/manifests/role/tlsproxy.pp
index af7c9f5..dc615e4 100644
--- a/manifests/role/tlsproxy.pp
+++ b/manifests/role/tlsproxy.pp
@@ -11,32 +11,6 @@
# handled on each of the caches which have a local nginx proxy terminating
# the SSL connection and reinject the request on the instance IP address.
-# Basic nginx and server setup. Shared by both production and labs.
-#
-# Requires:
-# - nginx package
-class role::tlsproxy::ssl::common {
-
-# Tune kernel settings
-include webserver::sysctl_settings
-
-$nginx_worker_connections = '32768'
-$nginx_use_ssl = true
-$nginx_ssl_conf = ssl_ciphersuite('nginx', 'compat')
-
-class { 'nginx': managed => false, }
-
-file { '/etc/nginx/nginx.conf':
-content => template('nginx/nginx.conf.erb'),
-tag => 'nginx', # workaround PUP-2689, can remove w/ puppetmaster
3.6.2+
-}
-
-file { '/etc/logrotate.d/nginx':
-content => template('nginx/logrotate'),
-tag => 'nginx', # workaround PUP-2689, can remove w/ puppetmaster
3.6.2+
-}
-}
-
# Because beta does not have a frontend LVS to redirect the requests
# made to port 443, we have to setup a nginx proxy on each of the caches.
# Nginx will listen on the real instance IP, proxy_addresses are not needed.
@@ -50,7 +24,6 @@
system::role { 'role::tlsproxy::ssl:beta': description => 'SSL proxy on
beta' }
include standard
-include role::tlsproxy::ssl::common
sslcert::certificate { 'star.wmflabs.org':
source => 'puppet:///files/ssl/star.wmflabs.org.crt',
@@ -82,5 +55,4 @@
}
create_resources( tlsproxy, $instances, $defaults )
-
}
diff --git a/modules/role/manifests/cache/ssl/misc.pp
b/modules/role/manifests/cache/ssl/misc.pp
index bd7c383..4a5ade8 100644
--- a/modules/role/manifests/cache/ssl/misc.pp
+++ b/modules/role/manifests/cache/ssl/misc.pp
@@ -1,7 +1,5 @@
# As above, but for misc instead of generic prod
class role::cache::ssl::misc {
-include role::tlsproxy::ssl::common
-
role::cache::ssl::local { 'wikimedia.org':
do_ocsp=> true,
certname => 'sni.wikimedia.org',
diff --git a/modules/role/manifests/cache/ssl/parsoid.pp
b/modules/role/manifests/cache/ssl/parsoid.pp
index b765279..b2300e9 100644
--- a/modules/role/manifests/cache/ssl/parsoid.pp
+++ b/modules/role/manifests/cache/ssl/parsoid.pp
@@ -1,7 +1,4 @@
class role::cache::ssl::parsoid {
-# Explicitly not adding wmf CA since it is not needed for now
-include role::tlsproxy::ssl::common
-
role::cache::ssl::local { 'unified':
certname => 'uni.wikimedia.org',
default_server => true,
diff --git a/modules/role/manifests/cache/ssl/sni.pp
b/modules/role/manifests/cache/ssl/sni.pp
index b166257..c8a1481 100644
--- a/modules/role/manifests/cache/ssl/sni.pp
+++ b/modules/role/manifests/cache/ssl/sni.pp
@@ -1,6 +1,4 @@
class role::cache::ssl::sni {
-include role::tlsproxy::ssl::common
-
role::cache::ssl::local { 'unified':
certname => 'uni.wikimedia.org',
default_server => true,
diff --git a/modules/role/manifests/cache/ssl/unified.pp
b/modules/role/manifests/cache/ssl/unified.pp
index 096788c..dfbe7fa 100644
--- a/modules/role/manifests/cache/ssl/unified.pp
+++ b/modules/role/manifests/cache/ssl/unified.pp
@@ -1,6 +1,4 @@
class role::cache::ssl::unified {
-include role::tlsproxy::ssl::common
-
role::cache::ssl::local { 'unified':
certname => 'uni.wikimedia.org',
default_server => true,
diff --git a/modules/tlsproxy/manifests/init.pp
b/modules/tlsproxy/manifests/init.pp
index 9d7688f..2a2c283 100644
--- a/modules/tlsproxy/manifests/init.pp
+++ b/modules/tlsproxy/manifests/init.pp
@@ -62,6 +62,7 @@
$ipv6_enabled=false,
$ssl_backend={},
) {
+require tlsproxy::instance
nginx::site { $name:
content => template('tlsproxy/proxy.erb')
}
diff --git a/modules/tlsproxy/manifests/instance.pp
b/modules/tlsproxy/manifests/instance.pp
new file mode 100644
index 000..1a90122
--- /dev/null
+++ b/modules/tlsproxy/mani
[MediaWiki-commits] [Gerrit] Strip all namespaces from infused PHP widgets - change (oojs/ui)
jenkins-bot has submitted this change and it was merged. Change subject: Strip all namespaces from infused PHP widgets .. Strip all namespaces from infused PHP widgets This will allow us to put custom MediaWiki specific widgets in their own namespace, but still be able to infuse them. Change-Id: I5d3735e33efc75ad79c75817149868849e2b78dc --- M php/Element.php M tests/phpunit/ElementTest.php 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/php/Element.php b/php/Element.php index 7c87cdd..14d2159 100644 --- a/php/Element.php +++ b/php/Element.php @@ -247,7 +247,8 @@ }; array_walk_recursive( $config, $replaceElements ); // Set '_' last to ensure that subclasses can't accidentally step on it. - $config['_'] = preg_replace( '/^OOUI/', '', get_class( $this ) ); + // Strip all namespaces from the class name + $config['_'] = end( explode( '\\', get_class( $this ) ) ); return $config; } diff --git a/tests/phpunit/ElementTest.php b/tests/phpunit/ElementTest.php index a7a0ebb..37746b2 100644 --- a/tests/phpunit/ElementTest.php +++ b/tests/phpunit/ElementTest.php @@ -14,7 +14,7 @@ ), array( new \FooBarBaz\MockWidget( array( 'infusable' => true ) ), - '"_":"FooBarBazMockWidget"' + '"_":"MockWidget"' ), ); } -- To view, visit https://gerrit.wikimedia.org/r/221883 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5d3735e33efc75ad79c75817149868849e2b78dc Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Scrub whitespace at the start of paragraphs - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222000
Change subject: Scrub whitespace at the start of paragraphs
..
Scrub whitespace at the start of paragraphs
*
https://www.mediawiki.org/wiki/Talk:Parsoid/Normalizations#Whitespace_at_the_start_of_a_paragraph
Change-Id: If065ed577ea2903decead722362c5dde3fff5978
---
M lib/mediawiki.WikitextSerializer.js
M tests/parserTests.txt
2 files changed, 26 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/00/222000/1
diff --git a/lib/mediawiki.WikitextSerializer.js
b/lib/mediawiki.WikitextSerializer.js
index aad3069..cc4e1f4 100644
--- a/lib/mediawiki.WikitextSerializer.js
+++ b/lib/mediawiki.WikitextSerializer.js
@@ -1242,8 +1242,10 @@
}
}
- if ( !reqd ) {
+ if (!reqd) {
nowiki = nowiki.replace(/^(\s+)<\/nowiki>/,
'$1');
+ } else if (env.scrubWikitext) {
+ nowiki = nowiki.replace(/^(\s+)<\/nowiki>/, '');
}
out = out + nowiki + rest + pieces[i + 3];
}
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 4ec7fce..d5d9524 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -24681,6 +24681,29 @@
''
!! end
+!! test
+1. Indent Pre Nowiki: suppress whitespace at the start of new paragraph
+!! options
+parsoid={
+ "modes": ["html2wt"],
+ "scrubWikitext": true
+}
+!! html
+ hi
+!! wikitext
+hi
+!! end
+
+!! test
+2. Indent Pre Nowiki: don't suppress whitespace at the start of new paragraph
if scrubWikitext is false
+!! options
+parsoid=html2wt
+!! html
+ hi
+!! wikitext
+ hi
+!! end
+
# ---
# End of tests spec'ing wikitext serialization norms |
# ---
--
To view, visit https://gerrit.wikimedia.org/r/222000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If065ed577ea2903decead722362c5dde3fff5978
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add test case to verify class name in infused widgets - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Add test case to verify class name in infused widgets
..
Add test case to verify class name in infused widgets
Change-Id: I443bfcbfa833b46b6df4ac3bb3ee2cc884a44047
---
M composer.json
M php/Theme.php
A tests/phpunit/DummyWidget.php
A tests/phpunit/ElementTest.php
A tests/phpunit/TestCase.php
5 files changed, 72 insertions(+), 1 deletion(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 47a601a..c53c6fa 100644
--- a/composer.json
+++ b/composer.json
@@ -16,6 +16,12 @@
"php/"
]
},
+ "autoload-dev": {
+ "classmap": [
+ "tests/phpunit/TestCase.php",
+ "tests/phpunit/DummyWidget.php"
+ ]
+ },
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
diff --git a/php/Theme.php b/php/Theme.php
index d36b6d8..458b197 100644
--- a/php/Theme.php
+++ b/php/Theme.php
@@ -15,7 +15,7 @@
/* Static Methods */
- public static function setSingleton( Theme $theme ) {
+ public static function setSingleton( Theme $theme = null ) {
self::$singleton = $theme;
}
diff --git a/tests/phpunit/DummyWidget.php b/tests/phpunit/DummyWidget.php
new file mode 100644
index 000..3da9939
--- /dev/null
+++ b/tests/phpunit/DummyWidget.php
@@ -0,0 +1,8 @@
+ true ) ),
+ '"_":"Widget"'
+ ),
+ array(
+ new \FooBarBaz\MockWidget( array( 'infusable'
=> true ) ),
+ '"_":"FooBarBazMockWidget"'
+ ),
+ );
+ }
+
+ /**
+* @covers Element::getSerializedConfig
+* @dataProvider provideGetSerializedConfig
+*/
+ public function testGetSerializedConfig( $widget, $expected ) {
+ $this->assertContains( $expected, (string)$widget );
+ }
+}
+
diff --git a/tests/phpunit/TestCase.php b/tests/phpunit/TestCase.php
new file mode 100644
index 000..cea0fe5
--- /dev/null
+++ b/tests/phpunit/TestCase.php
@@ -0,0 +1,27 @@
+getTheme() );
+ }
+
+ public function tearDown() {
+ Theme::setSingleton( null );
+ parent::tearDown();
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/221882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I443bfcbfa833b46b6df4ac3bb3ee2cc884a44047
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Bartosz Dziewoński
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 project talk namespace on cawiki Flow-occupied - change (operations/mediawiki-config)
Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/221999 Change subject: Make project talk namespace on cawiki Flow-occupied .. Make project talk namespace on cawiki Flow-occupied Bug: T99117 Change-Id: Id3b2874327bdf7fd634beab451a2c0744ec38b21 --- M wmf-config/InitialiseSettings.php 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/99/221999/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 308903a..71ed2b5 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14541,6 +14541,9 @@ 113, // Archive_talk 829, // Module_talk from Scribunto ), + 'cawiki' => array( + NS_PROJECT_TALK, // T99117 + ), ), 'wmgFlowOccupyPages' => array( 'default' => array(), -- To view, visit https://gerrit.wikimedia.org/r/221999 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3b2874327bdf7fd634beab451a2c0744ec38b21 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config 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] Change "userright" to "user right" - change (mediawiki...Gather)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/221998 Change subject: Change "userright" to "user right" .. Change "userright" to "user right" That's how it is usually spelled in api help. Change-Id: I97ec2cf6632c9076e96dfc93160f4bf26dab7677 --- M i18n/en.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/98/221998/1 diff --git a/i18n/en.json b/i18n/en.json index 3b18cda..0ed86ed 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -144,7 +144,7 @@ "apihelp-editlist-paramvalue-mode-hidelist": "Make the list private. Requires the gather-hidelist user right (and cannot be undone without that right).", "apihelp-editlist-paramvalue-mode-showlist": "Undo a previous hidelist operation.", "apihelp-editlist-paramvalue-mode-flag": "Flag list as offensive.", - "apihelp-editlist-paramvalue-mode-approve": "Mark list as acceptable, despite any flags. Requires the gather-hidelist userright.", + "apihelp-editlist-paramvalue-mode-approve": "Mark list as acceptable, despite any flags. Requires the gather-hidelist user right.", "apihelp-query+lists-description": "List collections of a given user.", "apihelp-query+lists-param-mode": "Show all lists matching certain criteria (cannot be used with owner/id parameters; if neither those nor mode is provided, only the lists of the current user are shown).", "apihelp-query+lists-param-prop": "Extra information to display.", @@ -154,7 +154,7 @@ "apihelp-query+lists-param-limit": "Limit the number of returned lists.", "apihelp-query+lists-paramvalue-mode-allpublic": "Show all (public) lists", "apihelp-query+lists-paramvalue-mode-allhidden": "Show all hidden lists (requires the gather-hidelist user right; does not show private lists)", - "apihelp-query+lists-paramvalue-mode-review": "Show all lists that need review (requires the gather-hidelist userright)", + "apihelp-query+lists-paramvalue-mode-review": "Show all lists that need review (requires the gather-hidelist user right)", "apihelp-query+lists-paramvalue-prop-label": "Title of the list", "apihelp-query+lists-paramvalue-prop-description": "Description of the list", "apihelp-query+lists-paramvalue-prop-public": "Several visibility-related properties: perm - public or private (set by owner), private is only visible to owner; perm_override - hidden or approved (or not present), can be set by a moderator; flagged - the list got enough flags to qualify for moderator attention, hidden - the list is hidden and only visible to the owenr and moderators (due to flags or explicit moderator choice)", -- To view, visit https://gerrit.wikimedia.org/r/221998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I97ec2cf6632c9076e96dfc93160f4bf26dab7677 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather 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] Revert "Temporarily make subpages in occupied namespaces non... - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Temporarily make subpages in occupied namespaces
non-Flow again"
..
Revert "Temporarily make subpages in occupied namespaces non-Flow again"
Once the maintenance script populating page_content_model has
run for all Flow-occupied namespaces in WMF production, we
can merge this.
This reverts commit 1f99880d9e1be0937578f4b240010641a3b88820.
Bug: T104279
Change-Id: I646696a1c7dcccbcb1a3ac361c141c4f6665cedb
(cherry picked from commit 286f38b70d7897f862217a7f07f59bf57b5ded32)
---
M includes/TalkpageManager.php
M tests/phpunit/TalkpageManagerTest.php
2 files changed, 1 insertion(+), 5 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/TalkpageManager.php b/includes/TalkpageManager.php
index d399024..7a93e5c 100644
--- a/includes/TalkpageManager.php
+++ b/includes/TalkpageManager.php
@@ -106,7 +106,7 @@
if ( in_array( $title->getPrefixedText(),
$this->occupiedPages ) ) {
return true;
}
- if ( !$title->isSubpage() && in_array(
$title->getNamespace(), $this->occupiedNamespaces ) ) {
+ if ( in_array( $title->getNamespace(),
$this->occupiedNamespaces ) ) {
return true;
}
}
diff --git a/tests/phpunit/TalkpageManagerTest.php
b/tests/phpunit/TalkpageManagerTest.php
index c8c3bf9..61b6817 100644
--- a/tests/phpunit/TalkpageManagerTest.php
+++ b/tests/phpunit/TalkpageManagerTest.php
@@ -48,9 +48,6 @@
false,
true
),
- /*
- Temporarily disabled for T103776
-
array(
array(),
array( NS_USER_TALK ),
@@ -58,7 +55,6 @@
false,
true
),
- */
array(
array(),
array( NS_USER_TALK ),
--
To view, visit https://gerrit.wikimedia.org/r/221997
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I646696a1c7dcccbcb1a3ac361c141c4f6665cedb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.26wmf12
Gerrit-Owner: Catrope
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Temporarily make subpages in occupied namespaces non... - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Temporarily make subpages in occupied namespaces
non-Flow again"
..
Revert "Temporarily make subpages in occupied namespaces non-Flow again"
Once the maintenance script populating page_content_model has
run for all Flow-occupied namespaces in WMF production, we
can merge this.
This reverts commit 1f99880d9e1be0937578f4b240010641a3b88820.
Bug: T104279
Change-Id: I646696a1c7dcccbcb1a3ac361c141c4f6665cedb
(cherry picked from commit 286f38b70d7897f862217a7f07f59bf57b5ded32)
---
M includes/TalkpageManager.php
M tests/phpunit/TalkpageManagerTest.php
2 files changed, 1 insertion(+), 5 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/TalkpageManager.php b/includes/TalkpageManager.php
index d399024..7a93e5c 100644
--- a/includes/TalkpageManager.php
+++ b/includes/TalkpageManager.php
@@ -106,7 +106,7 @@
if ( in_array( $title->getPrefixedText(),
$this->occupiedPages ) ) {
return true;
}
- if ( !$title->isSubpage() && in_array(
$title->getNamespace(), $this->occupiedNamespaces ) ) {
+ if ( in_array( $title->getNamespace(),
$this->occupiedNamespaces ) ) {
return true;
}
}
diff --git a/tests/phpunit/TalkpageManagerTest.php
b/tests/phpunit/TalkpageManagerTest.php
index c8c3bf9..61b6817 100644
--- a/tests/phpunit/TalkpageManagerTest.php
+++ b/tests/phpunit/TalkpageManagerTest.php
@@ -48,9 +48,6 @@
false,
true
),
- /*
- Temporarily disabled for T103776
-
array(
array(),
array( NS_USER_TALK ),
@@ -58,7 +55,6 @@
false,
true
),
- */
array(
array(),
array( NS_USER_TALK ),
--
To view, visit https://gerrit.wikimedia.org/r/221995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I646696a1c7dcccbcb1a3ac361c141c4f6665cedb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.26wmf11
Gerrit-Owner: Catrope
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
