[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Don't allow underscore in filter or group names
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342789 )
Change subject: RCFilters: Don't allow underscore in filter or group names
..
RCFilters: Don't allow underscore in filter or group names
This is reserved for the client-side which joins 'someGroup'
and 'somefilter' to make 'someGroup__somefilter' as an internal
ID.
Change-Id: I1b6ca9f337dd48e10705c46ef5027c3156254e01
---
M includes/changes/ChangesListFilter.php
M includes/changes/ChangesListFilterGroup.php
M tests/phpunit/includes/changes/ChangesListFilterGroupTest.php
M tests/phpunit/includes/changes/ChangesListFilterTest.php
4 files changed, 54 insertions(+), 2 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/changes/ChangesListFilter.php
b/includes/changes/ChangesListFilter.php
index 4ac6387..cd74154 100644
--- a/includes/changes/ChangesListFilter.php
+++ b/includes/changes/ChangesListFilter.php
@@ -110,6 +110,8 @@
*/
protected $priority;
+ const RESERVED_NAME_CHAR = '_';
+
/**
* Create a new filter with the specified configuration.
*
@@ -122,7 +124,8 @@
*
* @param array $filterDefinition ChangesListFilter definition
*
-* $filterDefinition['name'] string Name of filter
+* $filterDefinition['name'] string Name of filter; use lowercase with
no
+* punctuation
* $filterDefinition['cssClassSuffix'] string CSS class suffix, used to
mark
* that a particular row belongs to this filter (when a row is
included by the
* filter) (optional)
@@ -151,6 +154,13 @@
'ChangesListFilterGroup this filter belongs to'
);
}
+ if ( strpos( $filterDefinition['name'],
self::RESERVED_NAME_CHAR ) !== false ) {
+ throw new MWException( 'Filter names may not contain
\'' .
+ self::RESERVED_NAME_CHAR .
+ '\'. Use the naming convention: \'lowercase\''
+ );
+ }
+
$this->name = $filterDefinition['name'];
if ( isset( $filterDefinition['cssClassSuffix'] ) ) {
diff --git a/includes/changes/ChangesListFilterGroup.php
b/includes/changes/ChangesListFilterGroup.php
index a4cc287..30ab552 100644
--- a/includes/changes/ChangesListFilterGroup.php
+++ b/includes/changes/ChangesListFilterGroup.php
@@ -123,11 +123,13 @@
const DEFAULT_PRIORITY = -100;
+ const RESERVED_NAME_CHAR = '_';
+
/**
* Create a new filter group with the specified configuration
*
* @param array $groupDefinition Configuration of group
-* * $groupDefinition['name'] string Group name
+* * $groupDefinition['name'] string Group name; use camelCase with no
punctuation
* * $groupDefinition['title'] string i18n key for title (optional, can
be omitted
* * only if none of the filters in the group display in the
structured UI)
* * $groupDefinition['type'] string A type constant from a subclass of
this one
@@ -142,6 +144,13 @@
* * changes list entries are filtered out.
*/
public function __construct( array $groupDefinition ) {
+ if ( strpos( $groupDefinition['name'], self::RESERVED_NAME_CHAR
) !== false ) {
+ throw new MWException( 'Group names may not contain \''
.
+ self::RESERVED_NAME_CHAR .
+ '\'. Use the naming convention: \'camelCase\''
+ );
+ }
+
$this->name = $groupDefinition['name'];
if ( isset( $groupDefinition['title'] ) ) {
diff --git a/tests/phpunit/includes/changes/ChangesListFilterGroupTest.php
b/tests/phpunit/includes/changes/ChangesListFilterGroupTest.php
index 718d4b3..f712a2f 100644
--- a/tests/phpunit/includes/changes/ChangesListFilterGroupTest.php
+++ b/tests/phpunit/includes/changes/ChangesListFilterGroupTest.php
@@ -4,6 +4,23 @@
* @covers ChangesListFilterGroup
*/
class ChangesListFilterGroupTest extends MediaWikiTestCase {
+ // @codingStandardsIgnoreStart
+ /**
+* @expectedException MWException
+* @expectedExceptionMessage Group names may not contain '_'. Use the
naming convention: 'camelCase'
+*/
+ // @codingStandardsIgnoreEnd
+ public function testReservedCharacter() {
+ new MockChangesListFilterGroup(
+ [
+ 'type' => 'some_type',
+ 'name' => 'group_name',
+ 'priority' => 1,
+ 'filters' => [],
+ ]
+ );
+ }
+
public function testAutoPrio
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Test abstract class func directly, not in subclas...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342975 )
Change subject: RCFilters: Test abstract class func directly, not in subclass
tests
..
RCFilters: Test abstract class func directly, not in subclass tests
Change-Id: I8f526975bbf0a5392b69d239bc9db9771c99cdd9
---
M tests/common/TestsAutoLoader.php
M tests/phpunit/includes/changes/ChangesListBooleanFilterGroupTest.php
M tests/phpunit/includes/changes/ChangesListBooleanFilterTest.php
A tests/phpunit/includes/changes/ChangesListFilterGroupTest.php
A tests/phpunit/includes/changes/ChangesListFilterTest.php
A tests/phpunit/mocks/MockChangesListFilter.php
A tests/phpunit/mocks/MockChangesListFilterGroup.php
7 files changed, 146 insertions(+), 79 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php
index ebd3c53..2a4c43ff 100644
--- a/tests/common/TestsAutoLoader.php
+++ b/tests/common/TestsAutoLoader.php
@@ -160,6 +160,8 @@
'MockDjVuHandler' => "$testDir/phpunit/mocks/media/MockDjVuHandler.php",
'MockOggHandler' => "$testDir/phpunit/mocks/media/MockOggHandler.php",
'MockMediaHandlerFactory' =>
"$testDir/phpunit/mocks/media/MockMediaHandlerFactory.php",
+ 'MockChangesListFilter' =>
"$testDir/phpunit/mocks/MockChangesListFilter.php",
+ 'MockChangesListFilterGroup' =>
"$testDir/phpunit/mocks/MockChangesListFilterGroup.php",
'MockWebRequest' => "$testDir/phpunit/mocks/MockWebRequest.php",
'MediaWiki\\Session\\DummySessionBackend'
=> "$testDir/phpunit/mocks/session/DummySessionBackend.php",
diff --git
a/tests/phpunit/includes/changes/ChangesListBooleanFilterGroupTest.php
b/tests/phpunit/includes/changes/ChangesListBooleanFilterGroupTest.php
index 0db3a49..d98311f 100644
--- a/tests/phpunit/includes/changes/ChangesListBooleanFilterGroupTest.php
+++ b/tests/phpunit/includes/changes/ChangesListBooleanFilterGroupTest.php
@@ -19,33 +19,6 @@
);
}
- public function testAutoPriorities() {
- $group = new ChangesListBooleanFilterGroup( [
- 'name' => 'groupName',
- 'priority' => 1,
- 'filters' => [
- [ 'name' => 'hidefoo', 'default' => false, ],
- [ 'name' => 'hidebar', 'default' => false, ],
- [ 'name' => 'hidebaz', 'default' => false, ],
- ],
- ] );
-
- $filters = $group->getFilters();
- $this->assertEquals(
- [
- -2,
- -3,
- -4,
- ],
- array_map(
- function ( $f ) {
- return $f->getPriority();
- },
- array_values( $filters )
- )
- );
- }
-
public function testGetJsData() {
$definition = [
'name' => 'some-group',
diff --git a/tests/phpunit/includes/changes/ChangesListBooleanFilterTest.php
b/tests/phpunit/includes/changes/ChangesListBooleanFilterTest.php
index c715988..2c0c22d 100644
--- a/tests/phpunit/includes/changes/ChangesListBooleanFilterTest.php
+++ b/tests/phpunit/includes/changes/ChangesListBooleanFilterTest.php
@@ -107,58 +107,6 @@
);
}
- /**
-* @expectedException MWException
-* @expectedExceptionMessage Supersets can only be defined for filters
in the same group
-*/
- public function testSetAsSupersetOf() {
- $groupA = new ChangesListBooleanFilterGroup( [
- 'name' => 'groupA',
- 'priority' => 2,
- 'filters' => [
- [
- 'name' => 'foo',
- 'default' => false,
- ],
- [
- 'name' => 'bar',
- 'default' => false,
- ]
- ],
- ] );
-
- $groupB = new ChangesListBooleanFilterGroup( [
- 'name' => 'groupB',
- 'priority' => 3,
- 'filters' => [
- [
- 'name' => 'baz',
- 'default' => true,
- ],
- ],
- ] );
-
- $foo = TestingAccessWrapper::newFromO
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Revert "Temporarily disable template, category related tests...
Hello Hashar, jenkins-bot, Nikerabbit, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/342981 to review the following change. Change subject: Revert "Temporarily disable template, category related tests (3rd time)" .. Revert "Temporarily disable template, category related tests (3rd time)" This reverts commit 31a8caa945147c7d3b13286da20711003911acfd. Change-Id: Ic9c73af07a2c9ef09ca3989228d9f11893292f2f --- M ContentTranslation.hooks.php 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/81/342981/1 diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php index 96da8fb..c349729 100644 --- a/ContentTranslation.hooks.php +++ b/ContentTranslation.hooks.php @@ -375,10 +375,9 @@ $modules['qunit']['ext.cx.tools.tests'] = [ 'scripts' => [ - // TODO: Following commented tests need to better rewritten using mockdata. - // 'tests/qunit/tools/ext.cx.tools.template.test.js', + 'tests/qunit/tools/ext.cx.tools.template.test.js', 'tests/qunit/tools/ext.cx.tools.mtabuse.test.js', - // 'tests/qunit/tools/ext.cx.tools.categories.test.js', + 'tests/qunit/tools/ext.cx.tools.categories.test.js', ], 'dependencies' => [ 'ext.cx.model', -- To view, visit https://gerrit.wikimedia.org/r/342981 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9c73af07a2c9ef09ca3989228d9f11893292f2f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: KartikMistry Gerrit-Reviewer: Hashar Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Don't load VE or NWE on lint-targetted pages (until that works)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342915 ) Change subject: Don't load VE or NWE on lint-targetted pages (until that works) .. Don't load VE or NWE on lint-targetted pages (until that works) Bug: T160102 Change-Id: Ibb364ff2d89975d5907fa887cca666eee6e78d37 --- M VisualEditor.hooks.php M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php index 1e8a206..a535d34 100644 --- a/VisualEditor.hooks.php +++ b/VisualEditor.hooks.php @@ -156,6 +156,7 @@ isset( $params['preload'] ) || isset( $params['preloadtitle'] ) || isset( $params['preloadparams'] ) || + isset( $params['lintid'] ) || isset( $params['veswitched'] ); // Known-good parameters: edit, veaction, section diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js index ff49d26..95fcf74 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js +++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js @@ -865,6 +865,7 @@ uri.query.preload === undefined && uri.query.preloadtitle === undefined && uri.query.preloadparams === undefined && + uri.query.lintid === undefined && uri.query.veswitched === undefined // Known-good parameters: edit, veaction, section // TODO: other params too? See identical list in VisualEditor.hooks.php) -- To view, visit https://gerrit.wikimedia.org/r/342915 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb364ff2d89975d5907fa887cca666eee6e78d37 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester 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] mediawiki...Flow[master]: Change Special:Version description to 'Discussion system'
Mattflaschen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342980 )
Change subject: Change Special:Version description to 'Discussion system'
..
Change Special:Version description to 'Discussion system'
Change-Id: Id5a4522ea019c3a20094e7101108a2b5846d0699
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/80/342980/1
diff --git a/i18n/en.json b/i18n/en.json
index 1c51acb..ead84e5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -20,7 +20,7 @@
"notification-dynamic-actions-flow-topic-unwatch": "{{GENDER:$3|Stop}}
watching this topic",
"notification-dynamic-actions-flow-topic-unwatch-confirmation":
"{{GENDER:$3|You}} are no longer watching \"$1\"",
"notification-dynamic-actions-flow-topic-unwatch-confirmation-description":
"{{GENDER:$3|You}} can watch [$2 this topic] anytime.",
- "flow-desc": "Workflow management system",
+ "flow-desc": "Discussion system",
"flow-talk-taken-over-comment": "/* This page has been converted into a
Flow discussion board */",
"log-name-flow": "Flow activity log",
"logentry-delete-flow-delete-post": "$1 {{GENDER:$2|deleted}} a [$4
post] on \"[[$3|$5]]\" on [[$6]]",
--
To view, visit https://gerrit.wikimedia.org/r/342980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5a4522ea019c3a20094e7101108a2b5846d0699
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] mediawiki/core[master]: Prevents duplicate filter names
Mattflaschen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342979 )
Change subject: Prevents duplicate filter names
..
Prevents duplicate filter names
Explicitly block two filters in the same group from having the same
name.
Before, it would be left to registerFilter, which would just cause
the second one to win.
Also, avoid a getFilter warning when the filter does not exist.
Finally, a minor related doc fix.
Change-Id: I6b3880a5c7cc381c169bbd969cd4814559b49c91
---
M docs/hooks.txt
M includes/changes/ChangesListFilter.php
M includes/changes/ChangesListFilterGroup.php
M tests/phpunit/includes/changes/ChangesListFilterGroupTest.php
M tests/phpunit/includes/changes/ChangesListFilterTest.php
5 files changed, 58 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/79/342979/1
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 149ee4b..1be9a03 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1015,10 +1015,11 @@
'ChangesListSpecialPageStructuredFilters': Called to allow extensions to
register
filters for pages inheriting from ChangesListSpecialPage (in core:
RecentChanges,
RecentChangesLinked, and Watchlist). Generally, you will want to construct
-new ChangesListBooleanFilter or ChangesListStringOptionsFilter objects. You
can
-then either add them to existing ChangesListFilterGroup objects (accessed
through
-$special->getFilterGroup), or create your own. If you create new groups, you
-must register them with $special->registerFilterGroup.
+new ChangesListBooleanFilter or ChangesListStringOptionsFilter objects.
+
+When constructing them, you specify which group they belong to. You can reuse
+existing groups (accessed through $special->getFilterGroup), or create your
own.
+If you create new groups, you must register them with
$special->registerFilterGroup.
$special: ChangesListSpecialPage instance
'ChangeTagAfterDelete': Called after a change tag has been deleted (that is,
diff --git a/includes/changes/ChangesListFilter.php
b/includes/changes/ChangesListFilter.php
index cd74154..847bb95 100644
--- a/includes/changes/ChangesListFilter.php
+++ b/includes/changes/ChangesListFilter.php
@@ -113,7 +113,8 @@
const RESERVED_NAME_CHAR = '_';
/**
-* Create a new filter with the specified configuration.
+* Creates a new filter with the specified configuration, and registers
it to the
+* specified group.
*
* It infers which UI (it can be either or both) to display the filter
on based on
* which messages are provided.
@@ -161,6 +162,11 @@
);
}
+ if ( $this->group->getFilter( $filterDefinition['name'] ) ) {
+ throw new MWException( 'Two filters in a group can not
have the ' .
+ "same name: '{$filterDefinition['name']}'" );
+ }
+
$this->name = $filterDefinition['name'];
if ( isset( $filterDefinition['cssClassSuffix'] ) ) {
diff --git a/includes/changes/ChangesListFilterGroup.php
b/includes/changes/ChangesListFilterGroup.php
index 30ab552..d2ad204 100644
--- a/includes/changes/ChangesListFilterGroup.php
+++ b/includes/changes/ChangesListFilterGroup.php
@@ -315,10 +315,10 @@
* Get filter by name
*
* @param string $name Filter name
-* @return ChangesListFilter Specified filter
+* @return ChangesListFilter|null Specified filter, or null if it is
not registered
*/
public function getFilter( $name ) {
- return $this->filters[$name];
+ return isset( $this->filters[$name] ) ? $this->filters[$name] :
null;
}
/**
diff --git a/tests/phpunit/includes/changes/ChangesListFilterGroupTest.php
b/tests/phpunit/includes/changes/ChangesListFilterGroupTest.php
index f712a2f..220c00d9 100644
--- a/tests/phpunit/includes/changes/ChangesListFilterGroupTest.php
+++ b/tests/phpunit/includes/changes/ChangesListFilterGroupTest.php
@@ -51,4 +51,24 @@
)
);
}
+
+ // Get without warnings
+ public function testGetFilter() {
+ $group = new MockChangesListFilterGroup(
+ [
+ 'type' => 'some_type',
+ 'name' => 'groupName',
+ 'isFullCoverage' => true,
+ 'priority' => 1,
+ 'filters' => [
+ [ 'name' => 'foo' ],
+ ],
+ ]
+ );
+
+ $this->assertEquals(
+ 'foo',
+ $group->getFilter( 'foo' )->getName()
+ );
+ }
}
diff --git a/tests/phpunit/includes/
[MediaWiki-commits] [Gerrit] mediawiki...CodeEditor[master]: Align colors to WikimediaUI color palette
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342978 )
Change subject: Align colors to WikimediaUI color palette
..
Align colors to WikimediaUI color palette
Aligning colors to overhauled color palette, ensuring WCAG level AA
conformance. Also removing unnecessary `xmlns:xlink` where applicable.
Bug: T160602
Change-Id: I958d1868cd5ff80226af566dfe34885f1932b16e
---
M images/code-progressive.svg
M images/gotoLine.svg
M images/pilcrow-progressive.svg
M images/wrapping-progressive.svg
M modules/jquery.codeEditor.less
5 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/images/code-progressive.svg b/images/code-progressive.svg
index f3b0cdc..b769486 100644
--- a/images/code-progressive.svg
+++ b/images/code-progressive.svg
@@ -1,6 +1,6 @@
http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; width="24" height="24" viewBox="0 0
24 24">
-
+
diff --git a/images/gotoLine.svg b/images/gotoLine.svg
index cb1a91f..3b15b86 100644
--- a/images/gotoLine.svg
+++ b/images/gotoLine.svg
@@ -1,4 +1,4 @@
-http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; width="24" height="24" viewBox="0 0
24 24">
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
diff --git a/images/pilcrow-progressive.svg b/images/pilcrow-progressive.svg
index d878111..2b2e5b2 100644
--- a/images/pilcrow-progressive.svg
+++ b/images/pilcrow-progressive.svg
@@ -1,4 +1,4 @@
-http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; width="24" height="24" viewBox="0 0
24 24">
-
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+
diff --git a/images/wrapping-progressive.svg b/images/wrapping-progressive.svg
index ea1bce0..5281698 100644
--- a/images/wrapping-progressive.svg
+++ b/images/wrapping-progressive.svg
@@ -1,6 +1,6 @@
-http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; width="24" height="24" viewBox="0 0
24 24">
-
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+
diff --git a/modules/jquery.codeEditor.less b/modules/jquery.codeEditor.less
index 2cba077..66fcf0e 100644
--- a/modules/jquery.codeEditor.less
+++ b/modules/jquery.codeEditor.less
@@ -82,8 +82,8 @@
.codeEditor-status {
clear: both;
width: 100%;
- background-color: #f0f0f0;
- border-top: 1px solid #c0c0c0;
+ background-color: #f8f9fa;
+ border-top: 1px solid #c8ccd1;
display: table;
}
@@ -99,8 +99,8 @@
}
.codeEditor-status-message {
- border-left: 1px solid #c0c0c0;
- border-right: 1px solid #c0c0c0;
+ border-left: 1px solid #c8ccd1;
+ border-right: 1px solid #c8ccd1;
padding: 0 0.3em;
width: 100%;
display: table-cell;
--
To view, visit https://gerrit.wikimedia.org/r/342978
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I958d1868cd5ff80226af566dfe34885f1932b16e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: VolkerE
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: TheDJ
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...NavigationTiming[master]: build: Enable ESLint for tests/ and fix violations
Krinkle has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342670 )
Change subject: build: Enable ESLint for tests/ and fix violations
..
build: Enable ESLint for tests/ and fix violations
Change-Id: I7dad93e07fcb5ebcc5cf900294443d45556b5ca5
---
M Gruntfile.js
M tests/ext.navigationTiming.test.js
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/Gruntfile.js b/Gruntfile.js
index 8d16173..fa15b69 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -15,7 +15,7 @@
all: 'i18n/'
},
eslint: {
- all: [ '*.js', 'modules/**/*.js' ]
+ all: [ '*.js', '{modules,tests}/**/*.js' ]
}
} );
diff --git a/tests/ext.navigationTiming.test.js
b/tests/ext.navigationTiming.test.js
index adc5c7b..1891b6d 100644
--- a/tests/ext.navigationTiming.test.js
+++ b/tests/ext.navigationTiming.test.js
@@ -1,5 +1,5 @@
/* global mw */
-// eslint-env qunit
+/* eslint-env qunit */
QUnit.module( 'ext.navigationTiming' );
// Basic test will ensure no exceptions are thrown and various
--
To view, visit https://gerrit.wikimedia.org/r/342670
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7dad93e07fcb5ebcc5cf900294443d45556b5ca5
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/NavigationTiming
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeEditor[master]: Align colors to WikimediaUI color palette
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342978 )
Change subject: Align colors to WikimediaUI color palette
..
Align colors to WikimediaUI color palette
Aligning colors to overhauled color palette, ensuring WCAG level AA
conformance. Also removing unnecessary `xmlns:xlink` where applicable.
Bug: T160602
Change-Id: I958d1868cd5ff80226af566dfe34885f1932b16e
---
M images/code-progressive.svg
M images/gotoLine.svg
M images/pilcrow-progressive.svg
M images/wrapping-progressive.svg
M modules/jquery.codeEditor.less
5 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor
refs/changes/78/342978/1
diff --git a/images/code-progressive.svg b/images/code-progressive.svg
index f3b0cdc..b769486 100644
--- a/images/code-progressive.svg
+++ b/images/code-progressive.svg
@@ -1,6 +1,6 @@
http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; width="24" height="24" viewBox="0 0
24 24">
-
+
diff --git a/images/gotoLine.svg b/images/gotoLine.svg
index cb1a91f..3b15b86 100644
--- a/images/gotoLine.svg
+++ b/images/gotoLine.svg
@@ -1,4 +1,4 @@
-http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; width="24" height="24" viewBox="0 0
24 24">
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
diff --git a/images/pilcrow-progressive.svg b/images/pilcrow-progressive.svg
index d878111..2b2e5b2 100644
--- a/images/pilcrow-progressive.svg
+++ b/images/pilcrow-progressive.svg
@@ -1,4 +1,4 @@
-http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; width="24" height="24" viewBox="0 0
24 24">
-
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+
diff --git a/images/wrapping-progressive.svg b/images/wrapping-progressive.svg
index ea1bce0..5281698 100644
--- a/images/wrapping-progressive.svg
+++ b/images/wrapping-progressive.svg
@@ -1,6 +1,6 @@
-http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; width="24" height="24" viewBox="0 0
24 24">
-
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+
diff --git a/modules/jquery.codeEditor.less b/modules/jquery.codeEditor.less
index 2cba077..66fcf0e 100644
--- a/modules/jquery.codeEditor.less
+++ b/modules/jquery.codeEditor.less
@@ -82,8 +82,8 @@
.codeEditor-status {
clear: both;
width: 100%;
- background-color: #f0f0f0;
- border-top: 1px solid #c0c0c0;
+ background-color: #f8f9fa;
+ border-top: 1px solid #c8ccd1;
display: table;
}
@@ -99,8 +99,8 @@
}
.codeEditor-status-message {
- border-left: 1px solid #c0c0c0;
- border-right: 1px solid #c0c0c0;
+ border-left: 1px solid #c8ccd1;
+ border-right: 1px solid #c8ccd1;
padding: 0 0.3em;
width: 100%;
display: table-cell;
--
To view, visit https://gerrit.wikimedia.org/r/342978
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I958d1868cd5ff80226af566dfe34885f1932b16e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Follow-up I9f72ce29: Better RC Filters screenshot
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/341029 ) Change subject: Follow-up I9f72ce29: Better RC Filters screenshot .. Follow-up I9f72ce29: Better RC Filters screenshot Change-Id: Ia5f6ab742b69acf30fd05337b14c2d62cd36c7e0 --- M WikimediaMessages.hooks.php A modules/images/betafeatures-icon-RCFilters-ltr.svg A modules/images/betafeatures-icon-RCFilters-rtl.svg D modules/images/rc-filters-beta-ltr.svg D modules/images/rc-filters-beta-rtl.svg 5 files changed, 156 insertions(+), 138 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php index 35ad301..cc65e41 100644 --- a/WikimediaMessages.hooks.php +++ b/WikimediaMessages.hooks.php @@ -1304,8 +1304,8 @@ 'label-message' => 'eri-rcfilters-beta-label', 'desc-message' => $ores ? 'eri-rcfilters-beta-description-ores' : 'eri-rcfilters-beta-description', 'screenshot' => [ - 'rtl' => "$wgExtensionAssetsPath/WikimediaMessages/modules/images/rc-filters-beta-rtl.svg", - 'ltr' => "$wgExtensionAssetsPath/WikimediaMessages/modules/images/rc-filters-beta-ltr.svg", + 'rtl' => "$wgExtensionAssetsPath/WikimediaMessages/modules/images/betafeatures-icon-RCFilters-rtl.svg", + 'ltr' => "$wgExtensionAssetsPath/WikimediaMessages/modules/images/betafeatures-icon-RCFilters-ltr.svg", ], 'info-link' => 'https://www.mediawiki.org/wiki/Special:MyLanguage/Edit_Review_Improvements/Filters_for_Special:Recent_Changes', 'discussion-link' => 'https://www.mediawiki.org/wiki/Talk:Edit_Review_Improvements/Filters_for_Special:Recent_Changes', diff --git a/modules/images/betafeatures-icon-RCFilters-ltr.svg b/modules/images/betafeatures-icon-RCFilters-ltr.svg new file mode 100644 index 000..d1d0e30 --- /dev/null +++ b/modules/images/betafeatures-icon-RCFilters-ltr.svg @@ -0,0 +1,76 @@ + +http://www.w3.org/2000/svg"; width="264" height="162" viewBox="0 0 264 162"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/images/betafeatures-icon-RCFilters-rtl.svg b/modules/images/betafeatures-icon-RCFilters-rtl.svg new file mode 100644 index 000..755f6c7 --- /dev/null +++ b/modules/images/betafeatures-icon-RCFilters-rtl.svg @@ -0,0 +1,78 @@ + +http://www.w3.org/2000/svg"; width="264" height="162" viewBox="0 0 264 162"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/images/rc-filters-beta-ltr.svg b/modules/images/rc-filters-beta-ltr.svg deleted file mode 100644 index 0f0bb5a..000 --- a/modules/images/rc-filters-beta-ltr.svg +++ /dev/null @@ -1,68 +0,0 @@ - -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> - - - - - - - - - - - - - -
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: RC Filters: guided tour for beta feature
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/341860 )
Change subject: RC Filters: guided tour for beta feature
..
RC Filters: guided tour for beta feature
Bug: T159010
Change-Id: I9908eecc8033cc324601077d8072875c1e4ae1d8
---
M WikimediaMessages.hooks.php
M extension.json
M i18n/wikimedia/en.json
M i18n/wikimedia/qqq.json
A modules/images/rc-beta-tour-welcome-ltr.gif
A modules/images/rc-beta-tour-welcome-rtl.gif
A modules/rcfilters-beta-tour.js
A modules/rcfilters-beta-tour.less
8 files changed, 120 insertions(+), 0 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php
index d78e55d..81d0228 100644
--- a/WikimediaMessages.hooks.php
+++ b/WikimediaMessages.hooks.php
@@ -1327,4 +1327,57 @@
}
return ORES\Hooks::isModelEnabled( 'damaging' ) ||
ORES\Hooks::isModelEnabled( 'goodfaith' );
}
+
+ public static function onBeforePageDisplay( OutputPage &$out, Skin
&$skin ) {
+ if ( !class_exists( 'GuidedTourHooks' ) ) {
+ return;
+ }
+ $title = $skin->getTitle();
+ $user = $out->getUser();
+
+ if (
+ $title->isSpecial( 'Recentchanges' ) &&
+ $user->isLoggedIn() &&
+ !!$user->getOption( 'rcenhancedfilters' ) &&
+ !$user->getOption( 'rcenhancedfilters-seen-tour' )
+ ) {
+ GuidedTourLauncher::launchTourByCookie(
'RcFiltersBeta', 'Welcome' );
+ }
+ }
+
+ public static function onResourceLoaderRegisterModules( ResourceLoader
&$resourceLoader ) {
+ if ( class_exists( 'GuidedTourHooks' ) ) {
+ $resourceLoader->register(
'ext.guidedTour.tour.RcFiltersBeta', [
+ 'localBasePath' => __DIR__ . '/modules',
+ 'remoteExtPath' => 'WikimediaMessages/modules',
+ 'scripts' => 'rcfilters-beta-tour.js',
+ 'styles' => 'rcfilters-beta-tour.less',
+ 'messages' => [
+ 'eri-rcfilters-tour-welcome-title',
+
'eri-rcfilters-tour-welcome-description',
+ 'eri-rcfilters-tour-welcome-button',
+ ],
+ 'dependencies' => [
+ 'ext.guidedTour'
+ ],
+ ] );
+ }
+
+ return true;
+ }
+
+ /**
+* Register 'rcenhancedfilters-seen-tour' preference
+*
+* @param $user User object
+* @param &$preferences array Preferences object
+* @return bool
+*/
+ public static function onGetPreferences( $user, &$preferences ) {
+ $preferences[ 'rcenhancedfilters-seen-tour' ] = [
+ 'type' => 'api',
+ ];
+
+ return true;
+ }
}
diff --git a/extension.json b/extension.json
index 731d18d..67ddba7 100644
--- a/extension.json
+++ b/extension.json
@@ -89,6 +89,15 @@
],
"GetBetaFeaturePreferences": [
"WikimediaMessagesHooks::getBetaFeaturePreferences"
+ ],
+ "BeforePageDisplay": [
+ "WikimediaMessagesHooks::onBeforePageDisplay"
+ ],
+ "ResourceLoaderRegisterModules": [
+
"WikimediaMessagesHooks::onResourceLoaderRegisterModules"
+ ],
+ "GetPreferences": [
+ "WikimediaMessagesHooks::onGetPreferences"
]
},
"config": {
diff --git a/i18n/wikimedia/en.json b/i18n/wikimedia/en.json
index c35b528..fba2956 100644
--- a/i18n/wikimedia/en.json
+++ b/i18n/wikimedia/en.json
@@ -275,6 +275,9 @@
"eri-rcfilters-beta-label": "New filters for edit review",
"eri-rcfilters-beta-description": "Review edits on Recent Changes using
an easier and more powerful interface. Includes new filters, user-defined
highlighting and other improvements.",
"eri-rcfilters-beta-description-ores": "Review edits on Recent Changes
using an easier and more powerful interface and many new tools, including
predictive filters powered by [[m:Objective Revision Evaluation Service|ORES]],
a machine-learning program.",
+ "eri-rcfilters-tour-welcome-title": "Introducing: New Filters for Edit
Review (beta)",
+ "eri-rcfilters-tour-welcome-description": "Combine improved tools, a
new interface and the power of machine learning to fight vandalism and hel
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Add grammatical cases for "Wikimedia Commons" (Bosnian)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/341323 ) Change subject: Add grammatical cases for "Wikimedia Commons" (Bosnian) .. Add grammatical cases for "Wikimedia Commons" (Bosnian) Bug: T159535 Change-Id: Iefd2f3c58409ceda008672c7aba760c7740a36db --- M WikimediaMessages.hooks.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php index 35ad301..7793150 100644 --- a/WikimediaMessages.hooks.php +++ b/WikimediaMessages.hooks.php @@ -436,6 +436,7 @@ 'Wikiknjige' => 'Wikiknjiga', 'Wikipedia' => 'Wikipedije', 'Wikipodaci' => 'Wikipodataka', + 'Wikimedia Commons' => 'Wikimedia Commonsa', ), # dative 'dativ' => array( @@ -446,6 +447,7 @@ 'Wikipedia' => 'Wikipediji', 'Wikipodaci' => 'Wikipodacima', 'Wikivijesti' => 'Wikivijestima', + 'Wikimedia Commons' => 'Wikimedia Commonsu', ), # accusative 'akuzativ' => array( @@ -460,6 +462,7 @@ 'Vikirječnik' => 'Vikirječniče', 'Wikiizvor' => 'Wikizivoru', 'Wikipedia' => 'Wikipedijo', + 'Wikimedia Commons' => 'Wikimedia Commonse', ), # instrumental 'instrumental' => array( @@ -470,6 +473,7 @@ 'Wikipedia' => 's Wikipedijom', // T130141 'Wikipodaci' => 's Wikipodacima', 'Wikivijesti' => 's Wikivijestima', + 'Wikimedia Commons' => 's Wikimedia Commonsom', ), # locative 'lokativ' => array( @@ -480,6 +484,7 @@ 'Wikipedia' => 'o Wikipediji', 'Wikipodaci' => 'o Wikipodacima', 'Wikivijesti' => 'o Wikivijestima', + 'Wikimedia Commons' => 'o Wikimedia Commonsu', ), ); # bs -- To view, visit https://gerrit.wikimedia.org/r/341323 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iefd2f3c58409ceda008672c7aba760c7740a36db Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaMessages Gerrit-Branch: master Gerrit-Owner: Urbanecm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Update grammatical cases for "Wiktionary" (Bosnian)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/341206 ) Change subject: Update grammatical cases for "Wiktionary" (Bosnian) .. Update grammatical cases for "Wiktionary" (Bosnian) Bug: T159541 Change-Id: Iee0f9ab96c8c7907e86867cfbce170258724fb07 --- M WikimediaMessages.hooks.php 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php index 35ad301..3e819d8 100644 --- a/WikimediaMessages.hooks.php +++ b/WikimediaMessages.hooks.php @@ -430,7 +430,7 @@ $wgGrammarForms['bs'] = array( # genitive 'genitiv' => array( - 'Vikirječnik' => 'Vikirječnika', + 'Vikirječnik' => 'Wikirječnika', 'Wikicitati' => 'Wikicitata', 'Wikiizvor' => 'Wikiizvora', 'Wikiknjige' => 'Wikiknjiga', @@ -439,7 +439,7 @@ ), # dative 'dativ' => array( - 'Vikirječnik' => 'Vikirječniku', + 'Vikirječnik' => 'Wikirječniku', 'Wikicitati' => 'Wikicitatima', 'Wikiizvor' => 'Wikiizvoru', 'Wikiknjige' => 'Wikiknjigama', @@ -449,7 +449,7 @@ ), # accusative 'akuzativ' => array( - 'Vikirječnik' => 'Vikirječnika', + 'Vikirječnik' => 'Wikirječnik', 'Wikicitati' => 'Wikicitate', 'Wikiizvor' => 'Wikiizvora', 'Wikipedia' => 'Wikipediju', @@ -457,13 +457,13 @@ ), # vocative 'vokativ' => array( - 'Vikirječnik' => 'Vikirječniče', + 'Vikirječnik' => 'Wikirječniče', 'Wikiizvor' => 'Wikizivoru', 'Wikipedia' => 'Wikipedijo', ), # instrumental 'instrumental' => array( - 'Vikirječnik' => 's Vikirječnikom', + 'Vikirječnik' => 's Wikirječnikom', 'Wikicitati' => 's Wikicitatima', 'Wikiizvor' => 's Wikiizvorom', 'Wikiknjige' => 's Wikiknjigama', @@ -473,7 +473,7 @@ ), # locative 'lokativ' => array( - 'Vikirječnik' => 'o Vikirječniku', + 'Vikirječnik' => 'o Wikirječniku', 'Wikicitati' => 'o Wikicitatima', 'Wikiizvor' => 'o Wikiizvoru', 'Wikiknjige' => 'o Wikiknjigama', -- To view, visit https://gerrit.wikimedia.org/r/341206 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee0f9ab96c8c7907e86867cfbce170258724fb07 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaMessages Gerrit-Branch: master Gerrit-Owner: Urbanecm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Follow-ups to 980fb74d7: move classic highlights to watchlis...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342964 )
Change subject: Follow-ups to 980fb74d7: move classic highlights to watchlist
in 'on' mode
..
Follow-ups to 980fb74d7: move classic highlights to watchlist in 'on' mode
* Don't add preference for classic highlights in 'beta' mode
* Don't show classic highlights on RC page
* Move ORES prefs from RC section to watchlist section
* Fix CSS specificity for shaded highlights
Bug: T159763
Bug: T160475
Change-Id: If9765fe32d805a61f98b37ea35d3f49c6fe7aee3
---
M includes/Hooks.php
M modules/ext.ores.highlighter.css
2 files changed, 30 insertions(+), 16 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 3f6260f..14149ce 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -25,6 +25,7 @@
use SpecialContributions;
use SpecialRecentChanges;
use SpecialWatchlist;
+use Title;
use User;
use Xml;
@@ -329,7 +330,7 @@
}
/**
-* Hook for formatting recent changes linkes
+* Hook for formatting recent changes links
* @see
https://www.mediawiki.org/wiki/Manual:Hooks/OldChangesListRecentChangesLine
*
* @param ChangesList $changesList
@@ -355,7 +356,7 @@
}
$classes[] = 'damaging';
- if ( $changesList->getUser()->getBoolOption(
'oresHighlight' ) ) {
+ if ( self::isHighlightEnabled( $changesList ) ) {
$classes[] = 'ores-highlight';
}
$parts = explode( $separator, $s );
@@ -490,9 +491,6 @@
$damaging = self::getScoreRecentChangesList( $rcObj, $context );
if ( $damaging ) {
$classes[] = 'damaging';
- if ( $context->getUser()->getBoolOption(
'oresHighlight' ) ) {
- $classes[] = 'ores-highlight';
- }
$data['recentChangesFlags']['damaging'] = true;
}
}
@@ -551,7 +549,7 @@
* @param string[] $preferences
*/
public static function onGetPreferences( User $user, array
&$preferences ) {
- global $wgOresDamagingThresholds;
+ global $wgOresDamagingThresholds, $wgOresExtensionStatus;
if ( !self::oresEnabled( $user ) || !self::isModelEnabled(
'damaging' ) ) {
return;
@@ -562,20 +560,23 @@
$text = \wfMessage( 'ores-damaging-' . $case )->parse();
$options[$text] = $case;
}
+ $oresSection = $wgOresExtensionStatus === 'beta' ? 'rc/ores' :
'watchlist/ores';
$preferences['oresDamagingPref'] = [
'type' => 'select',
'label-message' => 'ores-pref-damaging',
- 'section' => 'rc/ores',
+ 'section' => $oresSection,
'options' => $options,
'help-message' => 'ores-help-damaging-pref',
];
// highlight damaging edits based on configured sensitivity
- $preferences['oresHighlight'] = [
- 'type' => 'toggle',
- 'section' => 'rc/ores',
- 'label-message' => 'ores-pref-highlight',
- ];
+ if ( $wgOresExtensionStatus !== 'beta' ) {
+ $preferences['oresHighlight'] = [
+ 'type' => 'toggle',
+ 'section' => $oresSection,
+ 'label-message' => 'ores-pref-highlight',
+ ];
+ }
// Make hidenondamaging default
$preferences['oresWatchlistHideNonDamaging'] = [
@@ -611,7 +612,7 @@
[ 'damaging' => $wgOresDamagingThresholds ]
);
$out->addModuleStyles( 'ext.ores.styles' );
- if ( $out->getUser()->getBoolOption( 'oresHighlight' )
) {
+ if ( self::isHighlightEnabled( $out ) ) {
$out->addModules( 'ext.ores.highlighter' );
}
}
@@ -666,6 +667,19 @@
}
/**
+* @param Title $title
+* @return boolean Whether highlights should be shown
+*/
+ private static function isHighlightEnabled( IContextSource $context ) {
+ global $wgOresExtensionStatus;
+ return $wgOresExtensionStatus === 'beta' || (
+ $context->getUser()->getBoolOption( 'oresHighlight' ) &&
+ !$con
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix "-1 recent contributors" by setting a default of 1 instead
MZMcBride has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/342977 ) Change subject: Fix "-1 recent contributors" by setting a default of 1 instead .. Fix "-1 recent contributors" by setting a default of 1 instead Bug: T56888 Change-Id: I06bd0e5959d1ff561d71163bd5ce26f28f73981c --- M maintenance/tables.sql 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/77/342977/1 diff --git a/maintenance/tables.sql b/maintenance/tables.sql index 8f59690..38fef45 100644 --- a/maintenance/tables.sql +++ b/maintenance/tables.sql @@ -758,7 +758,7 @@ ss_users bigint default '-1', -- Number of users that still edit - ss_active_users bigint default '-1', + ss_active_users bigint default '1', -- Number of images, equivalent to SELECT COUNT(*) FROM image ss_images int default 0 -- To view, visit https://gerrit.wikimedia.org/r/342977 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06bd0e5959d1ff561d71163bd5ce26f28f73981c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: MZMcBride ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...php-queue[master]: Remove unused key-value dead-end
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340157 )
Change subject: Remove unused key-value dead-end
..
Remove unused key-value dead-end
At one point, I had introduced a hybrid FIFO and key-value interface for
backwards compatiblity with some Wikimedia Fundraising code. Now we've
decided to use pure FIFO queues and can remove this nastiness.
Change-Id: I6f38b1528c1ec33c8d248ef700d444637677be51
---
M src/PHPQueue/Backend/Beanstalkd.php
M src/PHPQueue/Backend/IronMQ.php
M src/PHPQueue/Backend/Memcache.php
M src/PHPQueue/Backend/MongoDB.php
M src/PHPQueue/Backend/PDO.php
M src/PHPQueue/Backend/Predis.php
M src/PHPQueue/Backend/Stomp.php
D src/PHPQueue/Interfaces/IndexedFifoQueueStore.php
D src/PHPQueue/Interfaces/KeyValueStore.php
M test/PHPQueue/Backend/PredisTest.php
D test/PHPQueue/Backend/PredisZsetTest.php
11 files changed, 29 insertions(+), 387 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/src/PHPQueue/Backend/Beanstalkd.php
b/src/PHPQueue/Backend/Beanstalkd.php
index 2d9210f..fc0d6b7 100644
--- a/src/PHPQueue/Backend/Beanstalkd.php
+++ b/src/PHPQueue/Backend/Beanstalkd.php
@@ -3,11 +3,11 @@
use PHPQueue\Exception\BackendException;
use PHPQueue\Exception\JobNotFoundException;
-use PHPQueue\Interfaces\IndexedFifoQueueStore;
+use PHPQueue\Interfaces\FifoQueueStore;
class Beanstalkd
extends Base
-implements IndexedFifoQueueStore
+implements FifoQueueStore
{
public $server_uri;
public $tube;
diff --git a/src/PHPQueue/Backend/IronMQ.php b/src/PHPQueue/Backend/IronMQ.php
index eb195fd..0cbefd9 100644
--- a/src/PHPQueue/Backend/IronMQ.php
+++ b/src/PHPQueue/Backend/IronMQ.php
@@ -2,11 +2,11 @@
namespace PHPQueue\Backend;
use PHPQueue\Exception\BackendException;
-use PHPQueue\Interfaces\IndexedFifoQueueStore;
+use PHPQueue\Interfaces\FifoQueueStore;
class IronMQ
extends Base
-implements IndexedFifoQueueStore
+implements FifoQueueStore
{
public $token = null;
public $project_id = null;
diff --git a/src/PHPQueue/Backend/Memcache.php
b/src/PHPQueue/Backend/Memcache.php
index a210972..b7c03f1 100644
--- a/src/PHPQueue/Backend/Memcache.php
+++ b/src/PHPQueue/Backend/Memcache.php
@@ -2,11 +2,9 @@
namespace PHPQueue\Backend;
use PHPQueue\Exception\BackendException;
-use PHPQueue\Interfaces\KeyValueStore;
class Memcache
extends Base
-implements KeyValueStore
{
public $servers;
public $is_persistent = false;
diff --git a/src/PHPQueue/Backend/MongoDB.php b/src/PHPQueue/Backend/MongoDB.php
index 86fc6c1..6a4440f 100644
--- a/src/PHPQueue/Backend/MongoDB.php
+++ b/src/PHPQueue/Backend/MongoDB.php
@@ -5,11 +5,9 @@
use PHPQueue\Exception\BackendException;
use PHPQueue\Exception\JobNotFoundException;
-use PHPQueue\Interfaces\KeyValueStore;
class MongoDB
extends Base
-implements KeyValueStore
{
public $server_uri;
public $db_name;
diff --git a/src/PHPQueue/Backend/PDO.php b/src/PHPQueue/Backend/PDO.php
index fe41689..86593b0 100644
--- a/src/PHPQueue/Backend/PDO.php
+++ b/src/PHPQueue/Backend/PDO.php
@@ -4,15 +4,11 @@
use PHPQueue\Exception\BackendException;
use PHPQueue\Interfaces\AtomicReadBuffer;
use PHPQueue\Interfaces\FifoQueueStore;
-use PHPQueue\Interfaces\IndexedFifoQueueStore;
-use PHPQueue\Interfaces\KeyValueStore;
class PDO
extends Base
implements AtomicReadBuffer,
-FifoQueueStore,
-IndexedFifoQueueStore,
-KeyValueStore
+FifoQueueStore
{
private $connection_string;
private $db_user;
diff --git a/src/PHPQueue/Backend/Predis.php b/src/PHPQueue/Backend/Predis.php
index aaeb9bd..26e1306 100644
--- a/src/PHPQueue/Backend/Predis.php
+++ b/src/PHPQueue/Backend/Predis.php
@@ -6,34 +6,20 @@
use PHPQueue\Exception\BackendException;
use PHPQueue\Interfaces\AtomicReadBuffer;
-use PHPQueue\Interfaces\KeyValueStore;
use PHPQueue\Interfaces\FifoQueueStore;
use PHPQueue\Json;
/**
- * Wraps several styles of redis use:
- * - If constructed with a "order_key" option, the data will be accessible
- * as a key-value store, and will also provide pop and push using
- * $data[$order_key] as the FIFO ordering. If the ordering value is a
- * timestamp, for example, then the queue will have real-world FIFO
- * behavior over time, and even if the data comes in out of order, we
will
- * always pop the true oldest record.
- * If you wish to push to this type of store, you'll also need to provide
- * the "correlation_key" option so the random-access key can be
- * extracted from data.
+ * Wraps redis use:
* - Pushing scalar data will store it as a queue under queue_name.
* - Setting scalar data will store it under the key.
* - If data is an array, setting will store it as a hash, under the key.
- *
- * TODO: The differe
[MediaWiki-commits] [Gerrit] wikimedia/portals[master]: Replace diversity of sizes with predictable rem-based sizes
JGirault has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342976 )
Change subject: Replace diversity of sizes with predictable rem-based sizes
..
Replace diversity of sizes with predictable rem-based sizes
Bug: T160474
Change-Id: Ic5dee6484347d9875add6dfe60e5ba6eb25a3e54
---
M dev/wikipedia.org/assets/postcss/_app-badge.css
M dev/wikipedia.org/assets/postcss/_base-portal.css
M dev/wikipedia.org/assets/postcss/_base.css
M dev/wikipedia.org/assets/postcss/_buttons.css
M dev/wikipedia.org/assets/postcss/_central-featured.css
M dev/wikipedia.org/assets/postcss/_central-textlogo.css
M dev/wikipedia.org/assets/postcss/_footer.css
M dev/wikipedia.org/assets/postcss/_forms.css
M dev/wikipedia.org/assets/postcss/_ie.css
M dev/wikipedia.org/assets/postcss/_other-languages-bookshelf.css
M dev/wikipedia.org/assets/postcss/_other-languages.css
M dev/wikipedia.org/assets/postcss/_other-projects.css
M dev/wikipedia.org/assets/postcss/_search-language-picker.css
M dev/wikipedia.org/assets/postcss/_search-suggestions.css
M dev/wikipedia.org/assets/postcss/_search.css
M dev/wikipedia.org/assets/postcss/_vars.css
M dev/wikipedia.org/assets/postcss/_wm-portal.css
17 files changed, 154 insertions(+), 146 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/portals
refs/changes/76/342976/1
diff --git a/dev/wikipedia.org/assets/postcss/_app-badge.css
b/dev/wikipedia.org/assets/postcss/_app-badge.css
index 1a39e0e..b106504 100644
--- a/dev/wikipedia.org/assets/postcss/_app-badge.css
+++ b/dev/wikipedia.org/assets/postcss/_app-badge.css
@@ -53,7 +53,6 @@
.app-badge-fulllist {
width: 100%;
- /* FIXME replace em with rem? */
-margin: 1.5em 0 0.5em 0;
+margin: 1.2rem 0 0.4rem 0;
}
}
diff --git a/dev/wikipedia.org/assets/postcss/_base-portal.css
b/dev/wikipedia.org/assets/postcss/_base-portal.css
index 6516e20..b718360 100644
--- a/dev/wikipedia.org/assets/postcss/_base-portal.css
+++ b/dev/wikipedia.org/assets/postcss/_base-portal.css
@@ -2,8 +2,10 @@
body {
background-color: var( --background-color-base );
- font: 13px/1.5 sans-serif;
- margin: 0.3em 0;
+ font-family: sans-serif;
+ font-size: 0.8125rem;
+ line-height: 1.5;
+ margin: 0.24375rem 0;
}
a,
@@ -33,5 +35,5 @@
height: 0;
border: 0;
border-bottom: 1px solid var( --border-color-heading );
- margin: 0.2em 1em;
+ margin: 0.1625rem 0.8125rem;
}
diff --git a/dev/wikipedia.org/assets/postcss/_base.css
b/dev/wikipedia.org/assets/postcss/_base.css
index 9382350..e98cf68 100644
--- a/dev/wikipedia.org/assets/postcss/_base.css
+++ b/dev/wikipedia.org/assets/postcss/_base.css
@@ -144,8 +144,8 @@
*/
h1 {
- font-size: 2em;
- margin: 0.67em 0;
+ font-size: 2rem;
+ margin: 0.67rem 0;
}
/**
@@ -212,7 +212,7 @@
*/
figure {
- margin: 1em 40px;
+ margin: 1rem 2.5rem;
}
/**
@@ -241,7 +241,7 @@
pre,
samp {
font-family: monospace, monospace;
- font-size: 1em;
+ font-size: 1rem;
}
/* Forms
@@ -395,8 +395,8 @@
fieldset {
border: 1px solid #c0c0c0;
- margin: 0 2px;
- padding: 0.35em 0.625em 0.75em;
+ margin: 0 0.125rem;
+ padding: 0.35rem 0.625rem 0.75rem;
}
/**
diff --git a/dev/wikipedia.org/assets/postcss/_buttons.css
b/dev/wikipedia.org/assets/postcss/_buttons.css
index 5741adc..2d09aa2 100644
--- a/dev/wikipedia.org/assets/postcss/_buttons.css
+++ b/dev/wikipedia.org/assets/postcss/_buttons.css
@@ -25,12 +25,12 @@
background-color: var( --background-color-framed );
color: var( --color-base );
position: relative;
-min-height: 1.2em;
-min-width: 1em;
-margin: 0.1em 0;
+min-height: 1.2rem;
+min-width: 1rem;
+margin: 0.1rem 0;
border: var( --border-base );
border-radius: var( --border-radius-base );
-padding: 0.5em 1em;
+padding: 0.5rem 1rem;
font-family: inherit;
font-size: inherit;
font-weight: bold;
diff --git a/dev/wikipedia.org/assets/postcss/_central-featured.css
b/dev/wikipedia.org/assets/postcss/_central-featured.css
index 8efe3ad..c102b8b 100644
--- a/dev/wikipedia.org/assets/postcss/_central-featured.css
+++ b/dev/wikipedia.org/assets/postcss/_central-featured.css
@@ -4,9 +4,8 @@
.central-featured {
position: relative;
- /* FIXME replace em with rem? */
- height: 25em;
- width: 42em;
+ height: 20.3125rem;
+ width: 34.125rem;
max-width: 100%;
margin: 0 auto;
text-align: center;
@@ -14,15 +13,13 @@
}
.central-featured-logo-wrapper {
- /* FIXME replace with rem */
- line-height: 24em;
+ line-height: 19.5rem;
vertical-align: middle;
}
.central-featured-lang {
position: absolute;
- /* FIXME replace em with rem? */
- width: 12em;
+ width: 9.75rem;
}
/* Make entire block clickable, surpress hover un
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Test abstract class func directly, not in subclas...
Mattflaschen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342975 )
Change subject: RCFilters: Test abstract class func directly, not in subclass
tests
..
RCFilters: Test abstract class func directly, not in subclass tests
Change-Id: I8f526975bbf0a5392b69d239bc9db9771c99cdd9
---
M tests/common/TestsAutoLoader.php
M tests/phpunit/includes/changes/ChangesListBooleanFilterGroupTest.php
M tests/phpunit/includes/changes/ChangesListBooleanFilterTest.php
A tests/phpunit/includes/changes/ChangesListFilterGroupTest.php
A tests/phpunit/includes/changes/ChangesListFilterTest.php
5 files changed, 118 insertions(+), 79 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/75/342975/1
diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php
index ebd3c53..2a4c43ff 100644
--- a/tests/common/TestsAutoLoader.php
+++ b/tests/common/TestsAutoLoader.php
@@ -160,6 +160,8 @@
'MockDjVuHandler' => "$testDir/phpunit/mocks/media/MockDjVuHandler.php",
'MockOggHandler' => "$testDir/phpunit/mocks/media/MockOggHandler.php",
'MockMediaHandlerFactory' =>
"$testDir/phpunit/mocks/media/MockMediaHandlerFactory.php",
+ 'MockChangesListFilter' =>
"$testDir/phpunit/mocks/MockChangesListFilter.php",
+ 'MockChangesListFilterGroup' =>
"$testDir/phpunit/mocks/MockChangesListFilterGroup.php",
'MockWebRequest' => "$testDir/phpunit/mocks/MockWebRequest.php",
'MediaWiki\\Session\\DummySessionBackend'
=> "$testDir/phpunit/mocks/session/DummySessionBackend.php",
diff --git
a/tests/phpunit/includes/changes/ChangesListBooleanFilterGroupTest.php
b/tests/phpunit/includes/changes/ChangesListBooleanFilterGroupTest.php
index 0db3a49..d98311f 100644
--- a/tests/phpunit/includes/changes/ChangesListBooleanFilterGroupTest.php
+++ b/tests/phpunit/includes/changes/ChangesListBooleanFilterGroupTest.php
@@ -19,33 +19,6 @@
);
}
- public function testAutoPriorities() {
- $group = new ChangesListBooleanFilterGroup( [
- 'name' => 'groupName',
- 'priority' => 1,
- 'filters' => [
- [ 'name' => 'hidefoo', 'default' => false, ],
- [ 'name' => 'hidebar', 'default' => false, ],
- [ 'name' => 'hidebaz', 'default' => false, ],
- ],
- ] );
-
- $filters = $group->getFilters();
- $this->assertEquals(
- [
- -2,
- -3,
- -4,
- ],
- array_map(
- function ( $f ) {
- return $f->getPriority();
- },
- array_values( $filters )
- )
- );
- }
-
public function testGetJsData() {
$definition = [
'name' => 'some-group',
diff --git a/tests/phpunit/includes/changes/ChangesListBooleanFilterTest.php
b/tests/phpunit/includes/changes/ChangesListBooleanFilterTest.php
index c715988..2c0c22d 100644
--- a/tests/phpunit/includes/changes/ChangesListBooleanFilterTest.php
+++ b/tests/phpunit/includes/changes/ChangesListBooleanFilterTest.php
@@ -107,58 +107,6 @@
);
}
- /**
-* @expectedException MWException
-* @expectedExceptionMessage Supersets can only be defined for filters
in the same group
-*/
- public function testSetAsSupersetOf() {
- $groupA = new ChangesListBooleanFilterGroup( [
- 'name' => 'groupA',
- 'priority' => 2,
- 'filters' => [
- [
- 'name' => 'foo',
- 'default' => false,
- ],
- [
- 'name' => 'bar',
- 'default' => false,
- ]
- ],
- ] );
-
- $groupB = new ChangesListBooleanFilterGroup( [
- 'name' => 'groupB',
- 'priority' => 3,
- 'filters' => [
- [
- 'name' => 'baz',
- 'default' => true,
- ],
- ],
- ] );
-
- $foo = TestingAccessWrapper::newFromObject( $groupA->getFilter(
'foo' ) );
-
- $bar = $groupA->getFilter( 'bar' );
-
-
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Use OO.ui.confirm for edit abandon message
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338535 )
Change subject: Use OO.ui.confirm for edit abandon message
..
Use OO.ui.confirm for edit abandon message
Could potentially be upstreamed to mw.confirmCloseWindow but would
make #trigger an async method.
Change-Id: I986dee021b7881c7f27cff80ca50011c47742a70
---
M resources/mobile.editor.common/EditorOverlayBase.js
1 file changed, 11 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, but someone else must approve
Jforrester: Looks good to me, approved
diff --git a/resources/mobile.editor.common/EditorOverlayBase.js
b/resources/mobile.editor.common/EditorOverlayBase.js
index cb94bef..64d2044 100644
--- a/resources/mobile.editor.common/EditorOverlayBase.js
+++ b/resources/mobile.editor.common/EditorOverlayBase.js
@@ -335,12 +335,18 @@
* @inheritdoc
*/
hide: function () {
- // trigger the customEvent for mw.confirmCloseWindow
- if ( !this.allowCloseWindow.trigger() ) {
- return;
+ var self = this;
+ if ( this.hasChanged() ) {
+ OO.ui.confirm( mw.msg(
'mobile-frontend-editor-cancel-confirm' ) ).done( function ( confirmed ) {
+ if ( confirmed ) {
+ self.allowCloseWindow.release();
+ Overlay.prototype.hide.call(
self );
+ }
+ } );
+ } else {
+ this.allowCloseWindow.release();
+ Overlay.prototype.hide.call( this );
}
- this.allowCloseWindow.release();
- return Overlay.prototype.hide.apply( this, arguments );
},
/**
* Check, if the user should be asked if they really want to
leave the page.
--
To view, visit https://gerrit.wikimedia.org/r/338535
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I986dee021b7881c7f27cff80ca50011c47742a70
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Esanders
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ve.ui.MWLinkAction: Improve ISBN and RFC/PMID autolinking
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/341291 )
Change subject: ve.ui.MWLinkAction: Improve ISBN and RFC/PMID autolinking
..
ve.ui.MWLinkAction: Improve ISBN and RFC/PMID autolinking
These changes allow us to be more aggressive in autolinking ISBNs (no
need anymore to wait for the user to type a space or move their
selection) and more correct in autolinking RFCs and PMIDs (stray
spaces and dashes no longer mess them up).
* ISBN numbers can only be 10 or 13 digits long. We don't need to
handle arbitrary lengths.
* If a number does not begin with 978 or 979, it's the ISBN-10 variant
and we can autolink it as soon as the user types 10 digits.
* If a number begins with 978 or 979, it can be either.
* But if we already have 13 digits typed, autolink immediately.
* Otherwise, use a delayed sequence to see if it ends at 10 digits.
* RFC and PMID numbers can consist only of digits, no optional spaces
or dashes are allowed. Typing a space or dash will immediately
autolink the number.
Bug: T117165
Change-Id: I6a085cd78d910661245a351f3ceb3fabe2f093cf
---
M modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js
1 file changed, 12 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js
b/modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js
index 9046518..cbd3521 100644
--- a/modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js
+++ b/modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js
@@ -166,8 +166,17 @@
)
);
+// The regexps don't have to be precise; we'll validate the magic
+// link in #autolinkMagicLink above.
ve.ui.sequenceRegistry.register(
- // This regexp doesn't have to be precise; we'll validate the magic
- // link in #autolinkMagicLink above.
- new ve.ui.Sequence( 'autolinkMagicLink', 'autolinkMagicLink',
/\b(RFC|PMID|ISBN)\s+[0-9]([- 0-9]*)[0-9Xx][- ]?$/, 0, true, true )
+ new ve.ui.Sequence( 'autolinkMagicLinkIsbn10', 'autolinkMagicLink',
/\bISBN\s+(?!97[89])([0-9][ -]?){9}[0-9Xx]$/, 0, true )
+);
+ve.ui.sequenceRegistry.register(
+ new ve.ui.Sequence( 'autolinkMagicLinkIsbn13', 'autolinkMagicLink',
/\bISBN\s+(97[89])[ -]?([0-9][ -]?){9}[0-9Xx]$/, 0, true )
+);
+ve.ui.sequenceRegistry.register(
+ new ve.ui.Sequence( 'autolinkMagicLinkIsbn', 'autolinkMagicLink',
/\bISBN\s+(97[89][ -]?)?([0-9][ -]?){9}[0-9Xx]$/, 0, true, true )
+);
+ve.ui.sequenceRegistry.register(
+ new ve.ui.Sequence( 'autolinkMagicLinkRfcPmid', 'autolinkMagicLink',
/\b(RFC|PMID)\s+[0-9]+$/, 0, true, true )
);
--
To view, visit https://gerrit.wikimedia.org/r/341291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a085cd78d910661245a351f3ceb3fabe2f093cf
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (da310202f)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342945 ) Change subject: Update VE core submodule to master (da310202f) .. Update VE core submodule to master (da310202f) New changes: d091c2e5c Refactor rect-from-element computation in FocusableNode into static method 9184a8e8c Update OOjs UI to v0.20.0 a48bac967 ve.ce.Surface: Check delayed sequences when deactivating surface Change-Id: I7ad4b17c6e4ea3fdf4f0fc72e244f875fddc766b --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index 41134af..da31020 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 41134af2b6aa511b56459f05cc6d4c0e512d7afe +Subproject commit da310202f73af8b512de47f0686a7e85b5c54054 -- To view, visit https://gerrit.wikimedia.org/r/342945 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ad4b17c6e4ea3fdf4f0fc72e244f875fddc766b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: DLynch Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: ve.ui.MWLinkAction: Use delayed sequence
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/341288 )
Change subject: ve.ui.MWLinkAction: Use delayed sequence
..
ve.ui.MWLinkAction: Use delayed sequence
The trailing space at the end of the regexp is no longer required to
prevent matching (and executing) too soon. We also don't need to know
about trailing punctuation.
However, to prevent the match from ending in the middle of typing, we
have to allow for ' ' and '-' at the end of the match.
Tweaked tests to better match the intent now that a trailing space is
not included, but they pass without changes too, the command is quite
permissive.
Bug: T117165
Depends-On: Ie36046fa43ce49f8a25c99f2de577eb296d68a51
Depends-On: I2af0a738afa43295bf6d7d612cac4349bc6cd20d
Change-Id: I7c28d5c93b1a441387ad05a75846af83d2b21b6a
---
M modules/ve-mw/tests/ui/actions/ve.ui.MWLinkAction.test.js
M modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js
2 files changed, 16 insertions(+), 18 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/ve-mw/tests/ui/actions/ve.ui.MWLinkAction.test.js
b/modules/ve-mw/tests/ui/actions/ve.ui.MWLinkAction.test.js
index 8b75887..6dc9c5f 100644
--- a/modules/ve-mw/tests/ui/actions/ve.ui.MWLinkAction.test.js
+++ b/modules/ve-mw/tests/ui/actions/ve.ui.MWLinkAction.test.js
@@ -29,10 +29,10 @@
{
msg: 'Autolink valid RFC',
html: 'RFC 1234 xyz',
- rangeOrSelection: new ve.Range( 1, 10 ),
+ rangeOrSelection: new ve.Range( 1, 9 ),
method: 'autolinkMagicLink',
- expectedRangeOrSelection: new ve.Range( 4 ),
- expectedOriginalRangeOrSelection: new ve.Range(
10 ),
+ expectedRangeOrSelection: new ve.Range( 3 ),
+ expectedOriginalRangeOrSelection: new ve.Range(
9 ),
expectedData: function ( data ) {
data.splice( 1, 8, {
type: 'link/mwMagic',
@@ -50,9 +50,9 @@
{
msg: 'Don\'t autolink invalid RFC',
html: 'RFC 123x xyz',
- rangeOrSelection: new ve.Range( 1, 10 ),
+ rangeOrSelection: new ve.Range( 1, 9 ),
method: 'autolinkMagicLink',
- expectedRangeOrSelection: new ve.Range( 1, 10 ),
+ expectedRangeOrSelection: new ve.Range( 1, 9 ),
expectedData: function () {
/* no change, no link */
}
@@ -60,10 +60,10 @@
{
msg: 'Autolink valid PMID',
html: 'PMID 1234 xyz',
- rangeOrSelection: new ve.Range( 1, 11 ),
+ rangeOrSelection: new ve.Range( 1, 10 ),
method: 'autolinkMagicLink',
- expectedRangeOrSelection: new ve.Range( 4 ),
- expectedOriginalRangeOrSelection: new ve.Range(
11 ),
+ expectedRangeOrSelection: new ve.Range( 3 ),
+ expectedOriginalRangeOrSelection: new ve.Range(
10 ),
expectedData: function ( data ) {
data.splice( 1, 9, {
type: 'link/mwMagic',
@@ -81,9 +81,9 @@
{
msg: 'Don\'t autolink invalid PMID',
html: 'PMID 123x xyz',
- rangeOrSelection: new ve.Range( 1, 11 ),
+ rangeOrSelection: new ve.Range( 1, 10 ),
method: 'autolinkMagicLink',
- expectedRangeOrSelection: new ve.Range( 1, 11 ),
+ expectedRangeOrSelection: new ve.Range( 1, 10 ),
expectedData: function () {
/* no change, no link */
}
@@ -91,10 +91,10 @@
{
msg: 'Autolink valid ISBN',
html: 'ISBN 978-0596517748 xyz',
- rangeOrSelection: new ve.Range( 1, 21 ),
+ rangeOrSelection: new ve.Range( 1, 20 ),
method: 'autolinkMagicLink',
-
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Mark WikiRevision methods as public
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342837 )
Change subject: Mark WikiRevision methods as public
..
Mark WikiRevision methods as public
Change-Id: If252103d4850d9c9f0607a225b7d345736658cc7
---
M includes/import/WikiRevision.php
1 file changed, 46 insertions(+), 46 deletions(-)
Approvals:
TTO: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/import/WikiRevision.php b/includes/import/WikiRevision.php
index 23db3e2..edc3548 100644
--- a/includes/import/WikiRevision.php
+++ b/includes/import/WikiRevision.php
@@ -124,7 +124,7 @@
* @param Title $title
* @throws MWException
*/
- function setTitle( $title ) {
+ public function setTitle( $title ) {
if ( is_object( $title ) ) {
$this->title = $title;
} elseif ( is_null( $title ) ) {
@@ -138,14 +138,14 @@
/**
* @param int $id
*/
- function setID( $id ) {
+ public function setID( $id ) {
$this->id = $id;
}
/**
* @param string $ts
*/
- function setTimestamp( $ts ) {
+ public function setTimestamp( $ts ) {
# 2003-08-05T18:30:02Z
$this->timestamp = wfTimestamp( TS_MW, $ts );
}
@@ -153,63 +153,63 @@
/**
* @param string $user
*/
- function setUsername( $user ) {
+ public function setUsername( $user ) {
$this->user_text = $user;
}
/**
* @param User $user
*/
- function setUserObj( $user ) {
+ public function setUserObj( $user ) {
$this->userObj = $user;
}
/**
* @param string $ip
*/
- function setUserIP( $ip ) {
+ public function setUserIP( $ip ) {
$this->user_text = $ip;
}
/**
* @param string $model
*/
- function setModel( $model ) {
+ public function setModel( $model ) {
$this->model = $model;
}
/**
* @param string $format
*/
- function setFormat( $format ) {
+ public function setFormat( $format ) {
$this->format = $format;
}
/**
* @param string $text
*/
- function setText( $text ) {
+ public function setText( $text ) {
$this->text = $text;
}
/**
* @param string $text
*/
- function setComment( $text ) {
+ public function setComment( $text ) {
$this->comment = $text;
}
/**
* @param bool $minor
*/
- function setMinor( $minor ) {
+ public function setMinor( $minor ) {
$this->minor = (bool)$minor;
}
/**
* @param mixed $src
*/
- function setSrc( $src ) {
+ public function setSrc( $src ) {
$this->src = $src;
}
@@ -217,7 +217,7 @@
* @param string $src
* @param bool $isTemp
*/
- function setFileSrc( $src, $isTemp ) {
+ public function setFileSrc( $src, $isTemp ) {
$this->fileSrc = $src;
$this->fileIsTemp = $isTemp;
}
@@ -225,49 +225,49 @@
/**
* @param string $sha1base36
*/
- function setSha1Base36( $sha1base36 ) {
+ public function setSha1Base36( $sha1base36 ) {
$this->sha1base36 = $sha1base36;
}
/**
* @param string $filename
*/
- function setFilename( $filename ) {
+ public function setFilename( $filename ) {
$this->filename = $filename;
}
/**
* @param string $archiveName
*/
- function setArchiveName( $archiveName ) {
+ public function setArchiveName( $archiveName ) {
$this->archiveName = $archiveName;
}
/**
* @param int $size
*/
- function setSize( $size ) {
+ public function setSize( $size ) {
$this->size = intval( $size );
}
/**
* @param string $type
*/
- function setType( $type ) {
+ public function setType( $type ) {
$this->type = $type;
}
/**
* @param string $action
*/
- function setAction( $action ) {
+ public function setAction( $action ) {
$this->action = $action;
}
/**
* @param array $params
*/
- function setParams( $params ) {
+ public function setParams( $params ) {
$this->params = $params;
}
@@ -281,49 +281,49 @@
/**
* @return Title
*/
- function getTitle() {
+ p
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Remove header-v2 and header-v1 code
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342974 )
Change subject: Hygiene: Remove header-v2 and header-v1 code
..
Hygiene: Remove header-v2 and header-v1 code
Bug: T160471
Change-Id: Ica17a5af5476ed7e75b2cbd1176143aec9bf33b9
---
M includes/skins/minerva.mustache
M resources/mobile.languages.structured/LanguageOverlay.less
M resources/mobile.search/SearchOverlay.less
M resources/skins.minerva.base.styles/ui.less
M resources/skins.minerva.tablet.styles/common.less
5 files changed, 11 insertions(+), 55 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/74/342974/1
diff --git a/includes/skins/minerva.mustache b/includes/skins/minerva.mustache
index 2d71ea5..061ee46 100644
--- a/includes/skins/minerva.mustache
+++ b/includes/skins/minerva.mustache
@@ -1,7 +1,5 @@
{{{headelement}}}
-{{! FIXME: The feature-header-v2 classes are temporary and help with
transition from cached HTML}}
-
+
{{>ie8Html5Support}}
{{{mainmenuhtml}}}
diff --git a/resources/mobile.languages.structured/LanguageOverlay.less
b/resources/mobile.languages.structured/LanguageOverlay.less
index 390a87b..641f8cd 100644
--- a/resources/mobile.languages.structured/LanguageOverlay.less
+++ b/resources/mobile.languages.structured/LanguageOverlay.less
@@ -16,6 +16,11 @@
padding: 0.5em;
}
+ .search-box {
+ // Always show the language search input
+ display: block;
+ }
+
.search {
box-shadow: none;
}
diff --git a/resources/mobile.search/SearchOverlay.less
b/resources/mobile.search/SearchOverlay.less
index d92cbc1..86aa4b7 100644
--- a/resources/mobile.search/SearchOverlay.less
+++ b/resources/mobile.search/SearchOverlay.less
@@ -207,7 +207,7 @@
}
@media all and ( min-width: @deviceWidthTablet ) {
- .feature-header-v2 .search-overlay {
+ .search-overlay {
.search-box {
display: table-cell;
}
diff --git a/resources/skins.minerva.base.styles/ui.less
b/resources/skins.minerva.base.styles/ui.less
index b48a718..42c87f8 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -145,28 +145,6 @@
}
}
-// FIXME: Fold into .header css rules when cache has cleared
-.feature-header-v2 {
- .search-box {
- display: none;
- width: auto;
- }
-}
-
-// FIXME: Fold into .header css rules when cache has cleared
-.feature-header-v2,
-.feature-header-v1 {
- .header .search-box .search {
- margin-top: 0;
- }
-}
-
-// Always show the language search input
-// FIXME: Clean up header v2 .search-box styles
-.feature-header-v2 .language-overlay .search-box {
- display: block;
-}
-
.header > form,
.overlay-header .overlay-title {
padding: 0.15em 0;
@@ -198,6 +176,8 @@
.search-box {
// FIXME: remove when micro.tap in stable and rule from common-js.less
too
-webkit-tap-highlight-color: rgba( 255, 255, 255, 0 );
+ display: none;
+ width: auto;
.search {
@searchIconSize: 20px;
@@ -218,9 +198,7 @@
background-size: @searchIconSize @searchIconSize;
border-radius: @borderRadius;
box-shadow: 0 1px 1px rgba( 0, 0, 0, 0.05 );
- // FIXME: Necessary to support rendering of cached HTML. Move
when new header in production
- // and cache has cleared.
- margin-top: 0.4em;
+ margin-top: 0;
}
}
@@ -294,35 +272,10 @@
}
}
-// FIXME: Remove block when feature-header-v1 no longer supported
-.client-js {
- .feature-header-v1 .search-box {
- padding-right: 1em;
- }
- .is-authenticated {
- .feature-header-v1 .search-box {
- padding-right: 0;
- }
- }
-}
-
-// FIXME: Remove block when feature-header-v1 no longer supported
-.feature-header-v1 {
- #searchIcon {
- // This is overriden for non-JS clients (see fixme block below)
- display: none;
- }
-}
-
// Toggling indicators are unusable without JavaScript
.client-nojs {
.section-heading .indicator {
display: none;
- }
-
- // FIXME: Remove when feature-header-v1 no longer supported
- .feature-header-v1 #searchIcon {
- display: block;
}
}
diff --git a/resources/skins.minerva.tablet.styles/common.less
b/resources/skins.minerva.tablet.styles/common.less
index 5c86038..4a6db6e 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -13,7 +13,7 @@
}
}
- .feature-header-v2 .header {
+
[MediaWiki-commits] [Gerrit] mediawiki...NavigationTiming[master]: ext.navigationTiming: Only load eventlogging when needed
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342669 )
Change subject: ext.navigationTiming: Only load eventlogging when needed
..
ext.navigationTiming: Only load eventlogging when needed
Previously the schema modules (and their eventlogging client dependency)
were unconditionally loaded on all page views. This is an anti-pattern
because most metrics happen on user interaction, not on all page views.
In case of Navigation Timing, the metric is the page load itself,
however we still have sampling, so we should lazy-load here as well.
Fix by removing the dependencies and instead using the standard pattern
of mw.loader.using() and then calling mw.eventLog.logEvent().
As optimization, check inSample() early and preload the required
modules.
Bug: T159911
Change-Id: I00495ab8cacc2b9cc67ff8376bc1e047e561818b
---
M NavigationTiming.hooks.php
M extension.json
M modules/ext.navigationTiming.js
3 files changed, 23 insertions(+), 10 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/NavigationTiming.hooks.php b/NavigationTiming.hooks.php
index afd5bc1..7535ac9 100644
--- a/NavigationTiming.hooks.php
+++ b/NavigationTiming.hooks.php
@@ -13,7 +13,11 @@
public static function onResourceLoaderTestModules( array &$modules,
ResourceLoader &$rl ) {
$modules['qunit']['ext.navigationTiming.test'] = [
'scripts' => [ 'tests/ext.navigationTiming.test.js' ],
- 'dependencies' => [ 'ext.navigationTiming' ],
+ 'dependencies' => [
+ 'ext.navigationTiming',
+ 'schema.NavigationTiming',
+ 'schema.SaveTiming',
+ ],
'localBasePath' => __DIR__ ,
'remoteExtPath' => 'NavigationTiming',
];
diff --git a/extension.json b/extension.json
index fd259ed..aaa48c2 100644
--- a/extension.json
+++ b/extension.json
@@ -25,8 +25,6 @@
"ext.navigationTiming.js"
],
"dependencies": [
- "schema.NavigationTiming",
- "schema.SaveTiming",
"jquery.cookie"
],
"targets": [
diff --git a/modules/ext.navigationTiming.js b/modules/ext.navigationTiming.js
index c817f9d..64dcfbd 100644
--- a/modules/ext.navigationTiming.js
+++ b/modules/ext.navigationTiming.js
@@ -9,6 +9,7 @@
'use strict';
var timing, navigation, mediaWikiLoadEnd, hiddenProp, visibilityEvent,
+ loadEL,
visibilityChanged = false,
TYPE_NAVIGATE = 0;
@@ -258,13 +259,23 @@
}
}
- // Ensure we run after loadEventEnd.
- onLoadComplete( function () {
- if ( inSample() && !visibilityChanged ) {
- emitNavigationTiming();
- }
- mw.hook( 'postEdit' ).add( emitSaveTiming );
- } );
+ // Only perform actual instrumentation when page load is in the sampling
+ // Use a conditional block instead of early return since module.exports
+ // must happen unconditionally for unit tests.
+ if ( inSample() ) {
+ // Preload EventLogging and schema modules
+ loadEL = mw.loader.using( [ 'schema.NavigationTiming',
'schema.SaveTiming' ] );
+
+ // Ensure we run after loadEventEnd.
+ onLoadComplete( function () {
+ if ( !visibilityChanged ) {
+ loadEL.done( emitNavigationTiming );
+ }
+ mw.hook( 'postEdit' ).add( function () {
+ loadEL.done( emitSaveTiming );
+ } );
+ } );
+ }
if ( typeof QUnit !== 'undefined' ) {
/**
--
To view, visit https://gerrit.wikimedia.org/r/342669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I00495ab8cacc2b9cc67ff8376bc1e047e561818b
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/NavigationTiming
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342972 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
37a79fc Benevity loosening, handle multiple contact use in the past.
Change-Id: I8c901e31156d47236fa395fa61008cd2b2379285
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
1 file changed, 0 insertions(+), 627 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index e0a74d5..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,627 +0,0 @@
-<<< HEAD (f1a3d6 Merge branch 'master' of
https://gerrit.wikimedia.org/r/wiki)
-===
-https://phabricator.wikimedia.org/T115044#3012232
- */
-class BenevityTest extends BaseChecksFileTest {
- protected $epochtime;
-
- function setUp() {
-parent::setUp();
-
-$this->epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contribution
- WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contact
- WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy
Inc', 'Uncle Scrooge Inc')
- OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc',
'Uncle Scrooge Inc')
- OR first_name = 'Minnie' AND last_name = 'Mouse'
- OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' =>
array_keys($countries['values'])));
-
- }
-
- /**
- * Make sure we have the anonymous contact - like the live DB.
- */
- protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
- 'first_name' => 'Anonymous',
- 'last_name' => 'Anonymous',
- 'email' => 'fakeem...@wikimedia.org',
- 'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
- $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
- }
-
- /**
- * Test that all imports fail if the organization has multiple matches.
- */
- function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that all imports fail if the organization does not pre-exist.
- */
- function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the contact if a single match is found.
- */
- function testImportSucceedOrganizationSingleContactExists() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the Individual contact if a single match is
found.
- */
- function testImportSucceedIndividualSingleContactExists() {
-$thaMouseMeister = $this->callAPISuccess('Contact', 'create',
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' =>
'Organization'));
-$minnie = $this->callAPISuccess('Contact', 'create', array(
- 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@mouse.org',
-));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$mess
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: HeaderV2 is the default and not configurable
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342973 )
Change subject: HeaderV2 is the default and not configurable
..
HeaderV2 is the default and not configurable
This removes the config variable after making header v2
the default everywhere and cleans up no longer needed code.
The feature-header-v1 and feature-header-v2 class remains
to avoid issues with cached pages. A task will be created
upon merging this to remove the need for these classes.
Bug: T160471
Change-Id: I2ec07791e62fdffef696ce184c46fdbdb86340b1
---
M README.md
M extension.json
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMinerva.php
M includes/skins/minerva.mustache
5 files changed, 1 insertion(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/73/342973/1
diff --git a/README.md b/README.md
index e05d7b7..1a283d1 100644
--- a/README.md
+++ b/README.md
@@ -339,22 +339,6 @@
* Type: `Boolean`
* Default: `false`
- $wgMinervaUseHeaderV2
-
-A temporary configuration variable to control display of a new header which
converts the search input
-to an icon and shows the site logo.
-
-The config variable currently controls whether the styles and template for new
header should be invoked.
-
-* Type: `Array`
-* Default:
-```php
- [
-'beta' => true,
-'base' => false,
- ]
-```
-
$wgMinervaPageActions
Controls which page actions, if any, are displayed. Allowed: `edit`, `watch`,
`talk`, and
diff --git a/extension.json b/extension.json
index fdd708a..4ed51ff 100644
--- a/extension.json
+++ b/extension.json
@@ -1835,10 +1835,6 @@
"base": false,
"beta": true
},
- "MinervaUseHeaderV2": {
- "beta": true,
- "base": false
- },
"MFStripResponsiveImages": true,
"MFResponsiveImageWhitelist": [
"image/svg+xml"
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 967b113..2465e63 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -283,7 +283,6 @@
'mainmenuhtml' => $this->getMainMenuHtml( $data ),
'contenthtml' => $this->getContentWrapperHtml( $data ),
'footer' => $this->getFooterTemplateData( $data ),
- 'isHeaderV2' => $data['headerV2'],
];
// begin rendering
echo $templateParser->processTemplate( 'minerva', $templateData
);
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 850710a..c778a23 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -79,9 +79,6 @@
// Set the links for page secondary actions
$tpl->set( 'secondary_actions', $this->getSecondaryActions(
$tpl ) );
- // FIXME: Remove when header v2 is in stable.
- $tpl->set( 'headerV2', $this->mobileContext->getConfigVariable(
'MinervaUseHeaderV2' ) );
-
// Construct various Minerva-specific interface elements
$this->preparePageContent( $tpl );
$this->prepareHeaderAndFooter( $tpl );
diff --git a/includes/skins/minerva.mustache b/includes/skins/minerva.mustache
index d610362..2d71ea5 100644
--- a/includes/skins/minerva.mustache
+++ b/includes/skins/minerva.mustache
@@ -1,7 +1,7 @@
{{{headelement}}}
{{! FIXME: The feature-header-v2 classes are temporary and help with
transition from cached HTML}}
+ class="feature-header-v2">
{{>ie8Html5Support}}
{{{mainmenuhtml}}}
@@ -13,14 +13,12 @@
{{{menuButton}}}
- {{#isHeaderV2}}
{{{headinghtml}}}
β
- {{/isHeaderV2}}
https://gerrit.wikimedia.org/r/342973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ec07791e62fdffef696ce184c46fdbdb86340b1
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] mediawiki/core[master]: jquery.ui: Add previously undocumented changes in PATCHES
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342965 )
Change subject: jquery.ui: Add previously undocumented changes in PATCHES
..
jquery.ui: Add previously undocumented changes in PATCHES
Change-Id: I8d9561916820212842f87fa2306ff7474b268173
---
A resources/lib/jquery.ui/PATCHES
D resources/lib/jquery.ui/themes/smoothness/PATCHES
2 files changed, 26 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/resources/lib/jquery.ui/PATCHES b/resources/lib/jquery.ui/PATCHES
new file mode 100644
index 000..a8eba94
--- /dev/null
+++ b/resources/lib/jquery.ui/PATCHES
@@ -0,0 +1,26 @@
+jquery.ui.draggable.js
+* 71e11de2a3 Fix positioning error with draggable, revert and grid.
+ https://phabricator.wikimedia.org/T140965#2944610
+
+ https://bugs.jqueryui.com/ticket/4696
+
+
+jquery.ui.datepicker
+* 19531f3c23 Add translations in de-AT and de-CH
+
+
+themes/smoothness/jquery.ui.theme.css
+* 5e772e39dd Remove dark color from links inside dialogs
+ https://phabricator.wikimedia.org/T85857
+
+ Removed ".ui-widget-content a { color: #22; }"
+ and ".ui-widget-header a { color: #22; }"
+
+
+themes/smoothness/jquery.ui.core.css:
+* dc1c29f204 Collapse border in ui-helper-clearfix
+ https://phabricator.wikimedia.org/T73601
+
+ Backport of upstream change released in jQuery UI v1.10.1
+ - http://bugs.jqueryui.com/ticket/8442
+ - https://github.com/jquery/jquery-ui/commit/cb42ee7ccd
diff --git a/resources/lib/jquery.ui/themes/smoothness/PATCHES
b/resources/lib/jquery.ui/themes/smoothness/PATCHES
deleted file mode 100644
index 53fbe1f..000
--- a/resources/lib/jquery.ui/themes/smoothness/PATCHES
+++ /dev/null
@@ -1,3 +0,0 @@
-jquery.ui.theme.css
-* Removed ".ui-widget-content a { color: #22; }" and
- ".ui-widget-header a { color: #22; }" due to bug T85857.
--
To view, visit https://gerrit.wikimedia.org/r/342965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8d9561916820212842f87fa2306ff7474b268173
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342972 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
37a79fc Benevity loosening, handle multiple contact use in the past.
Change-Id: I8c901e31156d47236fa395fa61008cd2b2379285
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
1 file changed, 0 insertions(+), 627 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/72/342972/1
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index e0a74d5..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,627 +0,0 @@
-<<< HEAD (f1a3d6 Merge branch 'master' of
https://gerrit.wikimedia.org/r/wiki)
-===
-https://phabricator.wikimedia.org/T115044#3012232
- */
-class BenevityTest extends BaseChecksFileTest {
- protected $epochtime;
-
- function setUp() {
-parent::setUp();
-
-$this->epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contribution
- WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contact
- WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy
Inc', 'Uncle Scrooge Inc')
- OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc',
'Uncle Scrooge Inc')
- OR first_name = 'Minnie' AND last_name = 'Mouse'
- OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' =>
array_keys($countries['values'])));
-
- }
-
- /**
- * Make sure we have the anonymous contact - like the live DB.
- */
- protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
- 'first_name' => 'Anonymous',
- 'last_name' => 'Anonymous',
- 'email' => 'fakeem...@wikimedia.org',
- 'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
- $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
- }
-
- /**
- * Test that all imports fail if the organization has multiple matches.
- */
- function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that all imports fail if the organization does not pre-exist.
- */
- function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the contact if a single match is found.
- */
- function testImportSucceedOrganizationSingleContactExists() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the Individual contact if a single match is
found.
- */
- function testImportSucceedIndividualSingleContactExists() {
-$thaMouseMeister = $this->callAPISuccess('Contact', 'create',
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' =>
'Organization'));
-$minnie = $this->callAPISuccess('Contact', 'create', array(
- 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@mouse.org',
-));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add role for 'Timeless' skin
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342955 )
Change subject: Add role for 'Timeless' skin
..
Add role for 'Timeless' skin
Change-Id: I380f7f9e78d3da60230ba97539b95ba2e0dc728e
---
A puppet/modules/role/manifests/timeless.pp
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/role/manifests/timeless.pp
b/puppet/modules/role/manifests/timeless.pp
new file mode 100644
index 000..7906f7c
--- /dev/null
+++ b/puppet/modules/role/manifests/timeless.pp
@@ -0,0 +1,6 @@
+# == Class: role::timeless
+# Configures Timeless, a MediaWiki skin, as an option.
+# https://www.mediawiki.org/wiki/Skin:Timeless
+class role::timeless {
+mediawiki::skin { 'Timeless': }
+}
--
To view, visit https://gerrit.wikimedia.org/r/342955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I380f7f9e78d3da60230ba97539b95ba2e0dc728e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Dduvall
Gerrit-Reviewer: Isarra
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Correct failopen test
Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342970 )
Change subject: Correct failopen test
..
Correct failopen test
Change-Id: I2316941b63079c8a7845cf957091c72ddfdda8d1
---
M tests/test_lock.py
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control
refs/changes/70/342970/1
diff --git a/tests/test_lock.py b/tests/test_lock.py
index 469d019..cd9e35a 100644
--- a/tests/test_lock.py
+++ b/tests/test_lock.py
@@ -48,7 +48,7 @@
@nose.tools.raises(lock.LockError)
def test_stale_lock_failopen():
tag = "stale-open"
-lock.begin(job_tag=tag, failopen=True)
+lock.begin(job_tag=tag)
# Make the lockfile stale by changing the process ID.
assert lock.lockfile
@@ -56,7 +56,7 @@
f.write("-1")
f.close()
-lock.begin(job_tag=tag)
+lock.begin(job_tag=tag, failopen=True)
def test_invalid_lock():
--
To view, visit https://gerrit.wikimedia.org/r/342970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2316941b63079c8a7845cf957091c72ddfdda8d1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: test failopen; py3
Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342969 )
Change subject: test failopen; py3
..
test failopen; py3
Change-Id: Id33866f7887aa404f453cf5ced6307fd83e2c2fd
---
M lock.py
M tests/test_lock.py
2 files changed, 15 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control
refs/changes/69/342969/1
diff --git a/lock.py b/lock.py
index 7efd9d7..67e2cdd 100644
--- a/lock.py
+++ b/lock.py
@@ -3,6 +3,7 @@
Self-corrects stale locks unless "failopen" is True.
'''
+from __future__ import print_function
import os
import os.path
import sys
diff --git a/tests/test_lock.py b/tests/test_lock.py
index c06e4dd..469d019 100644
--- a/tests/test_lock.py
+++ b/tests/test_lock.py
@@ -45,6 +45,20 @@
lock.end()
+@nose.tools.raises(lock.LockError)
+def test_stale_lock_failopen():
+tag = "stale-open"
+lock.begin(job_tag=tag, failopen=True)
+
+# Make the lockfile stale by changing the process ID.
+assert lock.lockfile
+f = open(lock.lockfile, "w")
+f.write("-1")
+f.close()
+
+lock.begin(job_tag=tag)
+
+
def test_invalid_lock():
tag = "stale"
lock.begin(job_tag=tag)
--
To view, visit https://gerrit.wikimedia.org/r/342969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id33866f7887aa404f453cf5ced6307fd83e2c2fd
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Tests for the lock module
Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342968 )
Change subject: Tests for the lock module
..
Tests for the lock module
Change-Id: I242a42518e1eaab5c8b039af2ac75615db9d01cc
---
M lock.py
M tests/data/timeout.yaml
M tests/test_job_wrapper.py
A tests/test_lock.py
M tox.ini
5 files changed, 93 insertions(+), 21 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control
refs/changes/68/342968/1
diff --git a/lock.py b/lock.py
index 523b56c..7efd9d7 100644
--- a/lock.py
+++ b/lock.py
@@ -17,7 +17,7 @@
filename = "/tmp/{name}.lock".format(name=job_tag)
if os.path.exists(filename):
-log.warn("Lockfile found!")
+print("Lockfile found!", file=sys.stderr)
f = open(filename, "r")
pid = None
try:
@@ -26,18 +26,16 @@
pass
f.close()
if not pid:
-log.error("Invalid lockfile contents.")
+print("Invalid lockfile contents.", file=sys.stderr)
else:
try:
os.getpgid(pid)
-log.error("Aborting! Previous process ({pid}) is still alive.
Remove lockfile manually if in error: {path}".format(pid=pid, path=filename))
-sys.exit(1)
+raise LockError("Aborting! Previous process ({pid}) is still
alive. Remove lockfile manually if in error: {path}".format(pid=pid,
path=filename))
except OSError:
if failopen:
-log.fatal("Aborting until stale lockfile is investigated:
{path}".format(path=filename))
-sys.exit(1)
-log.error("Lockfile is stale.")
-log.info("Removing old lockfile.")
+raise LockError("Aborting until stale lockfile is
investigated: {path}".format(path=filename))
+print("Lockfile is stale.", file=sys.stderr)
+print("Removing old lockfile.", file=sys.stderr)
os.unlink(filename)
f = open(filename, "w")
@@ -50,7 +48,11 @@
def end():
global lockfile
-if lockfile:
+if lockfile and os.path.exists(lockfile):
os.unlink(lockfile)
else:
-raise RuntimeError("Already unlocked!")
+raise LockError("Already unlocked!")
+
+
+class LockError(RuntimeError):
+pass
diff --git a/tests/data/timeout.yaml b/tests/data/timeout.yaml
index 5dfe4ee..9e01920 100644
--- a/tests/data/timeout.yaml
+++ b/tests/data/timeout.yaml
@@ -1,3 +1,3 @@
name: Timing out job
-command: /bin/sleep 2
+command: /bin/sleep 10
timeout: 0.1
diff --git a/tests/test_job_wrapper.py b/tests/test_job_wrapper.py
index 463edbd..cea8ef6 100644
--- a/tests/test_job_wrapper.py
+++ b/tests/test_job_wrapper.py
@@ -1,5 +1,6 @@
import datetime
import iocapture
+import nose
import os
import job_wrapper
@@ -31,9 +32,9 @@
assert captured.stderr == "Job False job failed with code 1\n"
+# Must finish in less than two seconds, i.e. must have timed out.
+@nose.tools.timed(2)
def test_timeout():
-start_time = datetime.datetime.utcnow()
-
with iocapture.capture() as captured:
run_job("timeout.yaml")
@@ -42,11 +43,6 @@
"Job Timing out job timed out after 0.1 seconds\n"
"Job Timing out job failed with code -9\n"
)
-
-end_time = datetime.datetime.utcnow()
-delta = end_time - start_time
-
-assert delta.total_seconds() < 2
def test_stderr():
diff --git a/tests/test_lock.py b/tests/test_lock.py
new file mode 100644
index 000..c06e4dd
--- /dev/null
+++ b/tests/test_lock.py
@@ -0,0 +1,77 @@
+import nose
+import os.path
+
+import lock
+
+
+def test_success():
+tag = "success"
+lock.begin(job_tag=tag)
+assert lock.lockfile
+assert os.path.exists(lock.lockfile)
+
+lock.end()
+assert not os.path.exists(lock.lockfile)
+
+
+@nose.tools.raises(lock.LockError)
+def test_live_lock():
+tag = "live"
+lock.begin(job_tag=tag)
+
+# Will die because the process (this one) is still running.
+lock.begin(job_tag=tag)
+
+
+def test_stale_lock():
+tag = "stale"
+lock.begin(job_tag=tag)
+
+# Make the lockfile stale by changing the process ID.
+assert lock.lockfile
+f = open(lock.lockfile, "w")
+f.write("-1")
+f.close()
+
+lock.begin(job_tag=tag)
+
+# Check that we overwrote the contents with the current PID.
+assert lock.lockfile
+f = open(lock.lockfile, "r")
+pid = int(f.read())
+f.close()
+assert pid == os.getpid()
+
+lock.end()
+
+
+def test_invalid_lock():
+tag = "stale"
+lock.begin(job_tag=tag)
+
+# Make the lockfile invalid by changing the process ID to non-numeric.
+assert lock.lockfile
+f = open(lock.lockfile, "w")
+f.write("ABC")
+f.close()
+
+lock.begin(job_tag=tag)
+
+# Check that we overwrote the contents with the current PID.
+assert lock
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: Add .gitreview
Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/342967 ) Change subject: Add .gitreview .. Add .gitreview Change-Id: I027ec8c2450799814e2929d6681d15ea1c8ddb8d --- A .gitreview 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control refs/changes/67/342967/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..c8e2bce --- /dev/null +++ b/.gitreview @@ -0,0 +1,6 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=wikimedia/fundraising/process-control.git +defaultbranch=master +defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/342967 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I027ec8c2450799814e2929d6681d15ea1c8ddb8d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/process-control Gerrit-Branch: master Gerrit-Owner: Awight ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...process-control[master]: 100% test coverage
Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342971 )
Change subject: 100% test coverage
..
100% test coverage
Change-Id: I80fc8f0abf20ec0d0f971f4da3762e4f7a41b448
---
M .gitignore
D tests/data/boot.yaml
A tests/data/which-out.yaml
M tests/test_job_wrapper.py
4 files changed, 22 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control
refs/changes/71/342971/1
diff --git a/.gitignore b/.gitignore
index 1a0929d..d503969 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
*.pyc
.cache
+cover
+.coverage
.tox
diff --git a/tests/data/boot.yaml b/tests/data/boot.yaml
deleted file mode 100644
index 8ae5294..000
--- a/tests/data/boot.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-name: Boots
-command: ls
-timeout: 100
-stdout_destination: "/tmp/a"
diff --git a/tests/data/which-out.yaml b/tests/data/which-out.yaml
new file mode 100644
index 000..e29d0d8
--- /dev/null
+++ b/tests/data/which-out.yaml
@@ -0,0 +1,3 @@
+name: Which job
+command: /bin/which bash
+stdout_destination: /tmp/which-out.log
diff --git a/tests/test_job_wrapper.py b/tests/test_job_wrapper.py
index cea8ef6..bd020d9 100644
--- a/tests/test_job_wrapper.py
+++ b/tests/test_job_wrapper.py
@@ -55,3 +55,20 @@
"grep: Invalid regular expression\n\n"
"Job Bad grep job failed with code 2\n"
)
+
+
+def test_store_output():
+path = "/tmp/which-out.log"
+
+if os.path.exists(path):
+os.unlink(path)
+
+run_job("which-out.yaml")
+
+contents = open(path, "r").read()
+lines = contents.split("\n")
+
+assert len(lines) == 6
+assert lines[4] == "/bin/bash"
+
+os.unlink(path)
--
To view, visit https://gerrit.wikimedia.org/r/342971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80fc8f0abf20ec0d0f971f4da3762e4f7a41b448
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Properly detect if CACHE_ACCEL is available in the installer
Brian Wolff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/342966 ) Change subject: Properly detect if CACHE_ACCEL is available in the installer .. Properly detect if CACHE_ACCEL is available in the installer The variable was getting mangled. Follow up 1fec847c6b366a Bug: T160519 Change-Id: I7f7e1530725737020c98747730f2bd363616258c --- M includes/installer/LocalSettingsGenerator.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/66/342966/1 diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php index dde4daa..c64c250 100644 --- a/includes/installer/LocalSettingsGenerator.php +++ b/includes/installer/LocalSettingsGenerator.php @@ -70,7 +70,7 @@ $db->getGlobalNames() ); - $unescaped = [ 'wgRightsIcon', 'wgLogo' ]; + $unescaped = [ 'wgRightsIcon', 'wgLogo', '_Caches' ]; $boolItems = [ 'wgEnableEmail', 'wgEnableUserEmail', 'wgEnotifUserTalk', 'wgEnotifWatchlist', 'wgEmailAuthentication', 'wgEnableUploads', 'wgUseInstantCommons', -- To view, visit https://gerrit.wikimedia.org/r/342966 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f7e1530725737020c98747730f2bd363616258c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Brian Wolff ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: jquery.ui: Add previously undocumented changes in PATCHES
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342965 )
Change subject: jquery.ui: Add previously undocumented changes in PATCHES
..
jquery.ui: Add previously undocumented changes in PATCHES
Change-Id: I8d9561916820212842f87fa2306ff7474b268173
---
A resources/lib/jquery.ui/PATCHES
D resources/lib/jquery.ui/themes/smoothness/PATCHES
2 files changed, 26 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/65/342965/1
diff --git a/resources/lib/jquery.ui/PATCHES b/resources/lib/jquery.ui/PATCHES
new file mode 100644
index 000..a8eba94
--- /dev/null
+++ b/resources/lib/jquery.ui/PATCHES
@@ -0,0 +1,26 @@
+jquery.ui.draggable.js
+* 71e11de2a3 Fix positioning error with draggable, revert and grid.
+ https://phabricator.wikimedia.org/T140965#2944610
+
+ https://bugs.jqueryui.com/ticket/4696
+
+
+jquery.ui.datepicker
+* 19531f3c23 Add translations in de-AT and de-CH
+
+
+themes/smoothness/jquery.ui.theme.css
+* 5e772e39dd Remove dark color from links inside dialogs
+ https://phabricator.wikimedia.org/T85857
+
+ Removed ".ui-widget-content a { color: #22; }"
+ and ".ui-widget-header a { color: #22; }"
+
+
+themes/smoothness/jquery.ui.core.css:
+* dc1c29f204 Collapse border in ui-helper-clearfix
+ https://phabricator.wikimedia.org/T73601
+
+ Backport of upstream change released in jQuery UI v1.10.1
+ - http://bugs.jqueryui.com/ticket/8442
+ - https://github.com/jquery/jquery-ui/commit/cb42ee7ccd
diff --git a/resources/lib/jquery.ui/themes/smoothness/PATCHES
b/resources/lib/jquery.ui/themes/smoothness/PATCHES
deleted file mode 100644
index 53fbe1f..000
--- a/resources/lib/jquery.ui/themes/smoothness/PATCHES
+++ /dev/null
@@ -1,3 +0,0 @@
-jquery.ui.theme.css
-* Removed ".ui-widget-content a { color: #22; }" and
- ".ui-widget-header a { color: #22; }" due to bug T85857.
--
To view, visit https://gerrit.wikimedia.org/r/342965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d9561916820212842f87fa2306ff7474b268173
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] wikimedia...crm[master]: Benevity loosening, handle multiple contact use in the past.
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342776 )
Change subject: Benevity loosening, handle multiple contact use in the past.
..
Benevity loosening, handle multiple contact use in the past.
Our last situation (hopefully) seems to be a scenario where previous Benevity
enterers have
spread their love over a range of similar contact records. In this case we
can't choose the
'right' one, because probably they should just be merged.
Major Gifts were not very keen on doing any manual tidy up on them so
alternative
solution is to create a new one, but after the first new contribution under the
new
system we should be able to differentiate & prioritise this new one as it
should be
the only one with a relationship. So, do that.
If more than one has a relationship then, give up, propagate new ones each time
forever.
Hopefully that won't happy, but that seems to be preferred to manual
intervention as
an overall philosophy.
Bug: T115044
Change-Id: I4e49774d0944ad16667f159b676aa191fad1a381
---
M sites/all/modules/offline2civicrm/BenevityFile.php
M sites/all/modules/offline2civicrm/tests/BenevityTest.php
2 files changed, 91 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/sites/all/modules/offline2civicrm/BenevityFile.php
b/sites/all/modules/offline2civicrm/BenevityFile.php
index bfc4bb7..b42eec2 100644
--- a/sites/all/modules/offline2civicrm/BenevityFile.php
+++ b/sites/all/modules/offline2civicrm/BenevityFile.php
@@ -272,17 +272,24 @@
return false;
}
elseif ($contacts['count'] > 1) {
+$possibleContacts = array();
$contactID = NULL;
foreach ($contacts['values'] as $contact) {
if
($this->isContactEmployedByOrganization($msg['matching_organization_name'],
$contact)) {
-if ($contactID) {
- throw new WmfException('IMPORT_CONTRIB', 'Ambiguous contact');
+$possibleContacts[] = $contact['id'];
+ }
+ if (count($possibleContacts) > 1) {
+foreach ($possibleContacts as $index => $possibleContactID) {
+ if (
+$contacts['values'][$possibleContactID]['current_employer']
+!==
$this->getOrganizationResolvedName($msg['matching_organization_name'])
+ ) {
+unset($possibleContacts[$index]);
+ }
}
-$contactID = $contact['id'];
}
}
-
-return $contactID ? $contactID : FALSE;
+return (count($possibleContacts) == 1) ? reset($possibleContacts) :
FALSE;
}
return FALSE;
}
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
index d8e0221..d3fb4f6 100644
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
@@ -298,6 +298,85 @@
}
/**
+ * Test that import creates new if there are multiple choices based on
previous soft credit history.
+ *
+ * If we try to disambiguate our contact using soft credit history and there
is more than
+ * one match, we give up & create a new one. In future this one should get
used
+ * as it will have an employee relationship.
+ */
+ function testImportSucceedIndividualCreateIfAmbiguousPreviousSoftCredit() {
+$organization = $this->callAPISuccess('Contact', 'create',
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' =>
'Organization'));
+$minnie = $this->callAPISuccess('Contact', 'create', array(
+ 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@mouse.org',
+));
+$betterMinnie = $this->callAPISuccess('Contact', 'create', array(
+ 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@mouse.org',
+));
+foreach (array($minnie, $betterMinnie) as $mouse) {
+ // Create a contribution on the organisation, soft credited to each
mouse..
+ $this->callAPISuccess('Contribution', 'create', array(
+'total_amount' => 4,
+'financial_type_id' => 'Donation',
+'soft_credit_to' => $mouse['id'],
+'contact_id' => $organization['id'],
+ ));
+}
+
+$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
+$importer->import();
+$messages = $importer->getMessages();
+$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
+$contributions = $this->callAPISuccess('Contribution', 'get',
array('contact_id' => array('IN' => array($minnie['id'],
$betterMinnie['id'];
+$this->assertEquals(0, $contributions['count']);
+
+$newestMouse = $this->callAPISuccessGetSingle('Contact', array(
+ 'id' => array('NOT IN' => array($minnie['id'],
[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Follow-ups to 980fb74d7: move classic highlights to watchlist
Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342964 )
Change subject: Follow-ups to 980fb74d7: move classic highlights to watchlist
..
Follow-ups to 980fb74d7: move classic highlights to watchlist
* Don't show classic highlights on RC page
* Move ORES prefs from RC section to watchlist section
* Fix CSS specificity for shaded highlights
Bug: T160475
Change-Id: If9765fe32d805a61f98b37ea35d3f49c6fe7aee3
---
M includes/Hooks.php
M modules/ext.ores.highlighter.css
2 files changed, 23 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES
refs/changes/64/342964/1
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 3f6260f..9cd9a12 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -25,6 +25,7 @@
use SpecialContributions;
use SpecialRecentChanges;
use SpecialWatchlist;
+use Title;
use User;
use Xml;
@@ -329,7 +330,7 @@
}
/**
-* Hook for formatting recent changes linkes
+* Hook for formatting recent changes links
* @see
https://www.mediawiki.org/wiki/Manual:Hooks/OldChangesListRecentChangesLine
*
* @param ChangesList $changesList
@@ -355,7 +356,10 @@
}
$classes[] = 'damaging';
- if ( $changesList->getUser()->getBoolOption(
'oresHighlight' ) ) {
+ if (
+ $changesList->getUser()->getBoolOption(
'oresHighlight' ) &&
+ !self::isRcPage( $changesList->getTitle() )
+ ) {
$classes[] = 'ores-highlight';
}
$parts = explode( $separator, $s );
@@ -490,9 +494,6 @@
$damaging = self::getScoreRecentChangesList( $rcObj, $context );
if ( $damaging ) {
$classes[] = 'damaging';
- if ( $context->getUser()->getBoolOption(
'oresHighlight' ) ) {
- $classes[] = 'ores-highlight';
- }
$data['recentChangesFlags']['damaging'] = true;
}
}
@@ -565,7 +566,7 @@
$preferences['oresDamagingPref'] = [
'type' => 'select',
'label-message' => 'ores-pref-damaging',
- 'section' => 'rc/ores',
+ 'section' => 'watchlist/ores',
'options' => $options,
'help-message' => 'ores-help-damaging-pref',
];
@@ -573,7 +574,7 @@
// highlight damaging edits based on configured sensitivity
$preferences['oresHighlight'] = [
'type' => 'toggle',
- 'section' => 'rc/ores',
+ 'section' => 'watchlist/ores',
'label-message' => 'ores-pref-highlight',
];
@@ -611,7 +612,10 @@
[ 'damaging' => $wgOresDamagingThresholds ]
);
$out->addModuleStyles( 'ext.ores.styles' );
- if ( $out->getUser()->getBoolOption( 'oresHighlight' )
) {
+ if (
+ $out->getUser()->getBoolOption( 'oresHighlight'
) &&
+ !self::isRcPage( $out->getTitle() )
+ ) {
$out->addModules( 'ext.ores.highlighter' );
}
}
@@ -666,6 +670,14 @@
}
/**
+* @param Title $title
+* @return boolean Whether $title is a Recentchanges page
+*/
+ private static function isRcPage( Title $title ) {
+ return $title->isSpecial( 'Recentchanges' ) ||
$title->isSpecial( 'Recentchangeslinked' );
+ }
+
+ /**
* Check whether a given model is enabled in the config
* @param string $model
* @return bool
diff --git a/modules/ext.ores.highlighter.css b/modules/ext.ores.highlighter.css
index 67f67ff..fbc0f54 100644
--- a/modules/ext.ores.highlighter.css
+++ b/modules/ext.ores.highlighter.css
@@ -2,14 +2,14 @@
* Make the whole rows yellow
*/
-.damaging[data-ores-damaging='softest'] {
+.damaging.ores-highlight[data-ores-damaging='softest'] {
background-color: #fc3;
}
-.damaging[data-ores-damaging='soft'] {
+.damaging.ores-highlight[data-ores-damaging='soft'] {
background-color: #ffe79e;
}
-.damaging[data-ores-damaging='hard'] {
+.damaging.ores-highlight[data-ores-damaging='hard'] {
background-color: #fef6e7;
}
--
To view, visit https://gerrit.wikimedia.org/r/342964
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (8817821b6)
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/342963 ) Change subject: Update VE core submodule to master (8817821b6) .. Update VE core submodule to master (8817821b6) New changes: ae944e7fd VisualDiff: Show attribute changes in a sidebar 1a3b7ec90 VisualDiff: Add custom messages for change descriptions Bug: T151404 Bug: T156189 Change-Id: I218bf2eee6606cedc21f1e542fba62c1b98ca43f --- M .jsduck/eg-iframe.html M lib/ve 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/63/342963/1 diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html index 63a6179..70ea011 100644 --- a/.jsduck/eg-iframe.html +++ b/.jsduck/eg-iframe.html @@ -481,6 +481,7 @@ + diff --git a/lib/ve b/lib/ve index da31020..8817821 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit da310202f73af8b512de47f0686a7e85b5c54054 +Subproject commit 8817821b6c54793b44b45997cbbb725a2a7ebc66 -- To view, visit https://gerrit.wikimedia.org/r/342963 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I218bf2eee6606cedc21f1e542fba62c1b98ca43f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Style adjustments for the FilterCapsuleMultise...
Mooeypoo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342962 )
Change subject: RCFilters UI: Style adjustments for the
FilterCapsuleMultiselectWidget
..
RCFilters UI: Style adjustments for the FilterCapsuleMultiselectWidget
Bug: T159966
Change-Id: I6864e22d7c628297d8cdf435b48e48fbab1a3f55
---
M
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.less
M
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.less
M
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
3 files changed, 10 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/62/342962/1
diff --git
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.less
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.less
index b16e84c..59aab14 100644
---
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.less
+++
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.less
@@ -3,6 +3,7 @@
.mw-rcfilters-ui-capsuleItemWidget {
background-color: #fff;
border-color: #979797;
+ margin:0 0.6em 0 0;
color: #222;
// Background and color of the capsule widget need a bit
diff --git
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.less
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.less
index a0ef293..0cb7ab2 100644
---
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.less
+++
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.less
@@ -3,12 +3,16 @@
&.oo-ui-widget-enabled .oo-ui-capsuleMultiselectWidget-handle {
background-color: #f8f9fa;
- border: 1px solid #a2a9b1;
- min-height: 5.5em;
- padding: 0.75em;
-
+ border-radius: 2px 2px 0 0;
+ padding: 0.3em 0.6em 0.6em 0.6em;
+ margin-top: 1.6em;
}
+ .mw-rcfilters-ui-table {
+ margin-top:0.3em;
+ }
+
+
&-content-title {
font-weight: bold;
color: #54595d;
diff --git
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
index 5111a17..ca19c22 100644
---
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
+++
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
@@ -22,7 +22,7 @@
&-search {
max-width: none;
- margin-top: -0.5em;
+ margin-top: -1px;
input {
// We need to reiterate the directionality
--
To view, visit https://gerrit.wikimedia.org/r/342962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6864e22d7c628297d8cdf435b48e48fbab1a3f55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Restrict page images to lead section on cawiki
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342696 ) Change subject: Restrict page images to lead section on cawiki .. Restrict page images to lead section on cawiki Bug: T152115 Change-Id: I04a1a0afc9c0180fd466885532819128e10c0259 --- M wmf-config/InitialiseSettings.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Thcipriani: Looks good to me, approved Bmansurov: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 04fe226..254f4cb 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -17176,6 +17176,11 @@ 'loginwiki' => false, 'votewiki' => false, ], +// T152115 +'wgPageImagesLeadSectionOnly' => [ + 'default' => false, + 'cawiki' => true, +], 'wmgPageImagesExpandOpenSearchXml' => [ 'default' => true, ], -- To view, visit https://gerrit.wikimedia.org/r/342696 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I04a1a0afc9c0180fd466885532819128e10c0259 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jdlrobson Gerrit-Reviewer: Bmansurov Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Thcipriani Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Replace readOnlyPage() which has been deprecated since 1.25
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342960 )
Change subject: Replace readOnlyPage() which has been deprecated since 1.25
..
Replace readOnlyPage() which has been deprecated since 1.25
Bug: T160582
Change-Id: I2ee5d13351facdaad37bb0bd077b1d033b0b904c
---
M SystemGifts/SpecialPopulateAwards.php
M SystemGifts/SpecialRemoveMasterSystemGift.php
M SystemGifts/SpecialSystemGiftManager.php
M SystemGifts/SpecialSystemGiftManagerLogo.php
M UserBoard/SpecialSendBoardBlast.php
M UserGifts/SpecialGiftManager.php
M UserGifts/SpecialGiftManagerLogo.php
M UserProfile/SpecialEditProfile.php
M UserProfile/SpecialPopulateExistingUsersProfiles.php
M UserProfile/SpecialRemoveAvatar.php
M UserProfile/SpecialToggleUserPageType.php
M UserProfile/SpecialUpdateProfile.php
M UserStats/GenerateTopUsersReport.php
M UserStats/SpecialUpdateEditCounts.php
14 files changed, 14 insertions(+), 56 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SystemGifts/SpecialPopulateAwards.php
b/SystemGifts/SpecialPopulateAwards.php
index 286b9bc..27a3399 100644
--- a/SystemGifts/SpecialPopulateAwards.php
+++ b/SystemGifts/SpecialPopulateAwards.php
@@ -33,10 +33,7 @@
}
// Show a message if the database is in read-only mode
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// If user is blocked, s/he doesn't need to access this page
if ( $user->isBlocked() ) {
diff --git a/SystemGifts/SpecialRemoveMasterSystemGift.php
b/SystemGifts/SpecialRemoveMasterSystemGift.php
index 96ef3d2..a05734d 100644
--- a/SystemGifts/SpecialRemoveMasterSystemGift.php
+++ b/SystemGifts/SpecialRemoveMasterSystemGift.php
@@ -47,10 +47,7 @@
}
// Show a message if the database is in read-only mode
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// If user is blocked, s/he doesn't need to access this page
if ( $user->isBlocked() ) {
diff --git a/SystemGifts/SpecialSystemGiftManager.php
b/SystemGifts/SpecialSystemGiftManager.php
index 0f2d2ff..e12b113 100644
--- a/SystemGifts/SpecialSystemGiftManager.php
+++ b/SystemGifts/SpecialSystemGiftManager.php
@@ -39,10 +39,7 @@
}
// Show a message if the database is in read-only mode
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// If user is blocked, s/he doesn't need to access this page
if ( $user->isBlocked() ) {
diff --git a/SystemGifts/SpecialSystemGiftManagerLogo.php
b/SystemGifts/SpecialSystemGiftManagerLogo.php
index 183758c..0ebb7d5 100644
--- a/SystemGifts/SpecialSystemGiftManagerLogo.php
+++ b/SystemGifts/SpecialSystemGiftManagerLogo.php
@@ -45,10 +45,7 @@
}
// Show a message if the database is in read-only mode
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// If user is blocked, s/he doesn't need to access this page
if ( $user->isBlocked() ) {
diff --git a/UserBoard/SpecialSendBoardBlast.php
b/UserBoard/SpecialSendBoardBlast.php
index c7a27e1..3bc307d 100644
--- a/UserBoard/SpecialSendBoardBlast.php
+++ b/UserBoard/SpecialSendBoardBlast.php
@@ -40,10 +40,7 @@
}
// Is the database locked?
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return false;
- }
+ $this->checkReadOnly();
// Blocked through Special:Block? No access for you!
if ( $user->isBlocked() ) {
diff --git a/UserGifts/SpecialGiftManager.php b/UserGifts/SpecialGiftManager.php
index e0a57e2..c0d55c9 100644
--- a/UserGifts/SpecialGiftManager.php
+++ b/UserGifts/SpecialGiftManager.php
@@ -48,10 +48,7 @@
}
// Show a message if the database is in read-only mode
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// Add CSS
$out->addModuleStyles( 'ext.socialprofile.usergifts.css' );
diff --git a/UserGifts/SpecialGiftManagerLogo.php
b/UserGifts/SpecialGiftManagerLogo.php
index 5e06d17..595bec9 100644
--- a/UserGifts/SpecialGiftManagerLogo.php
+++ b/UserGifts/SpecialGiftManagerLogo.php
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Set $wgOresExtension for I63b11eff3a4
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342947 ) Change subject: Set $wgOresExtension for I63b11eff3a4 .. Set $wgOresExtension for I63b11eff3a4 Set it to 'beta' in production to keep things working the same, but set it to 'on' in labs on cawiki for testing. Bug: T159763 Change-Id: Ia1e24651542237a98951f465b320bbd3d76ebe43 --- M wmf-config/InitialiseSettings-labs.php M wmf-config/InitialiseSettings.php 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Thcipriani: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 8e2868c..0102c09 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -428,6 +428,9 @@ 'default' => false, 'wikipedia' => true, // T127661 ], + 'wgOresExtensionStatus' => [ + 'cawiki' => 'on', + ], 'wgOresModels' => [ 'default' => [ 'damaging' => true, diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 03b8dc3..04fe226 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -17965,6 +17965,9 @@ 'enwiki' => true, // T140003 'cswiki' => true, // T151611 ], +'wgOresExtensionStatus' => [ + 'default' => 'beta' +], 'wgOresModels' => [ 'default' => [ 'damaging' => true, -- To view, visit https://gerrit.wikimedia.org/r/342947 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia1e24651542237a98951f465b320bbd3d76ebe43 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Catrope Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Thcipriani Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ApiFeatureUsage[wmf/1.29.0-wmf.16]: Update ApiFeatureUsage for elasticsearch 5.x
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342961 )
Change subject: Update ApiFeatureUsage for elasticsearch 5.x
..
Update ApiFeatureUsage for elasticsearch 5.x
Elasticsearch 5 removed count specific features. Instead you make
a request that returns 0 results and look at the total_hits number
that is returned. Elasticsearch does internal optimizations where
appropriate instead of having the special type of request.
I used phan to check for other code that was removed in the 5.x
upgrade of Elastica extension, doesn't seem like there is anything
else.
Bug: T160578
Change-Id: I2d8603cef61723ddcc8c1d37566c334333422248
(cherry picked from commit 9f9eb415b258d2ea2621d0b2400f082c8240fc37)
---
M ApiFeatureUsageQueryEngineElastica.php
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ApiFeatureUsageQueryEngineElastica.php
b/ApiFeatureUsageQueryEngineElastica.php
index 424d3e0..a2fabd0 100644
--- a/ApiFeatureUsageQueryEngineElastica.php
+++ b/ApiFeatureUsageQueryEngineElastica.php
@@ -32,7 +32,7 @@
protected function getClient() {
if ( !$this->client ) {
$connection = new
ApiFeatureUsageQueryEngineElasticaConnection( $this->options );
- $this->client = $connection->getClient2();
+ $this->client = $connection->getClient();
}
return $this->client;
}
@@ -84,9 +84,7 @@
$query->addAggregation( $termsAgg );
$search = new Elastica\Search( $this->getClient() );
- $search->setOption(
- Elastica\Search::OPTION_SEARCH_TYPE,
Elastica\Search::OPTION_SEARCH_TYPE_COUNT
- );
+ $search->setOption( Elastica\Search::OPTION_SIZE, 0 );
$allIndexes = $this->getIndexNames();
$indexes = [];
--
To view, visit https://gerrit.wikimedia.org/r/342961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2d8603cef61723ddcc8c1d37566c334333422248
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApiFeatureUsage
Gerrit-Branch: wmf/1.29.0-wmf.16
Gerrit-Owner: 20after4
Gerrit-Reviewer: 20after4
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Deploy PageViewInfo to group1
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342684 ) Change subject: Deploy PageViewInfo to group1 .. Deploy PageViewInfo to group1 Bug: T125917 Change-Id: Idbef14b49b3b41d0c91c8cc656ba6db246b8edfa --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Thcipriani: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 9c4c813..03b8dc3 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -18334,6 +18334,7 @@ 'wmgUsePageViewInfo' => [ 'default' => false, 'group0' => true, + 'group1' => true, ], ]; -- To view, visit https://gerrit.wikimedia.org/r/342684 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idbef14b49b3b41d0c91c8cc656ba6db246b8edfa Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Gergő Tisza Gerrit-Reviewer: 20after4 Gerrit-Reviewer: Anomie Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Reedy Gerrit-Reviewer: Thcipriani Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ApiFeatureUsage[wmf/1.29.0-wmf.16]: Update ApiFeatureUsage for elasticsearch 5.x
20after4 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342961 )
Change subject: Update ApiFeatureUsage for elasticsearch 5.x
..
Update ApiFeatureUsage for elasticsearch 5.x
Elasticsearch 5 removed count specific features. Instead you make
a request that returns 0 results and look at the total_hits number
that is returned. Elasticsearch does internal optimizations where
appropriate instead of having the special type of request.
I used phan to check for other code that was removed in the 5.x
upgrade of Elastica extension, doesn't seem like there is anything
else.
Bug: T160578
Change-Id: I2d8603cef61723ddcc8c1d37566c334333422248
(cherry picked from commit 9f9eb415b258d2ea2621d0b2400f082c8240fc37)
---
M ApiFeatureUsageQueryEngineElastica.php
1 file changed, 2 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ApiFeatureUsage
refs/changes/61/342961/1
diff --git a/ApiFeatureUsageQueryEngineElastica.php
b/ApiFeatureUsageQueryEngineElastica.php
index 424d3e0..a2fabd0 100644
--- a/ApiFeatureUsageQueryEngineElastica.php
+++ b/ApiFeatureUsageQueryEngineElastica.php
@@ -32,7 +32,7 @@
protected function getClient() {
if ( !$this->client ) {
$connection = new
ApiFeatureUsageQueryEngineElasticaConnection( $this->options );
- $this->client = $connection->getClient2();
+ $this->client = $connection->getClient();
}
return $this->client;
}
@@ -84,9 +84,7 @@
$query->addAggregation( $termsAgg );
$search = new Elastica\Search( $this->getClient() );
- $search->setOption(
- Elastica\Search::OPTION_SEARCH_TYPE,
Elastica\Search::OPTION_SEARCH_TYPE_COUNT
- );
+ $search->setOption( Elastica\Search::OPTION_SIZE, 0 );
$allIndexes = $this->getIndexNames();
$indexes = [];
--
To view, visit https://gerrit.wikimedia.org/r/342961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d8603cef61723ddcc8c1d37566c334333422248
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApiFeatureUsage
Gerrit-Branch: wmf/1.29.0-wmf.16
Gerrit-Owner: 20after4
Gerrit-Reviewer: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Replace readOnlyPage() which has been deprecated since 1.25
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342960 )
Change subject: Replace readOnlyPage() which has been deprecated since 1.25
..
Replace readOnlyPage() which has been deprecated since 1.25
Change-Id: I2ee5d13351facdaad37bb0bd077b1d033b0b904c
---
M SystemGifts/SpecialPopulateAwards.php
M SystemGifts/SpecialRemoveMasterSystemGift.php
M SystemGifts/SpecialSystemGiftManager.php
M SystemGifts/SpecialSystemGiftManagerLogo.php
M UserBoard/SpecialSendBoardBlast.php
M UserGifts/SpecialGiftManager.php
M UserGifts/SpecialGiftManagerLogo.php
M UserProfile/SpecialEditProfile.php
M UserProfile/SpecialPopulateExistingUsersProfiles.php
M UserProfile/SpecialRemoveAvatar.php
M UserProfile/SpecialToggleUserPageType.php
M UserProfile/SpecialUpdateProfile.php
M UserStats/GenerateTopUsersReport.php
M UserStats/SpecialUpdateEditCounts.php
14 files changed, 14 insertions(+), 56 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile
refs/changes/60/342960/1
diff --git a/SystemGifts/SpecialPopulateAwards.php
b/SystemGifts/SpecialPopulateAwards.php
index 286b9bc..27a3399 100644
--- a/SystemGifts/SpecialPopulateAwards.php
+++ b/SystemGifts/SpecialPopulateAwards.php
@@ -33,10 +33,7 @@
}
// Show a message if the database is in read-only mode
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// If user is blocked, s/he doesn't need to access this page
if ( $user->isBlocked() ) {
diff --git a/SystemGifts/SpecialRemoveMasterSystemGift.php
b/SystemGifts/SpecialRemoveMasterSystemGift.php
index 96ef3d2..a05734d 100644
--- a/SystemGifts/SpecialRemoveMasterSystemGift.php
+++ b/SystemGifts/SpecialRemoveMasterSystemGift.php
@@ -47,10 +47,7 @@
}
// Show a message if the database is in read-only mode
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// If user is blocked, s/he doesn't need to access this page
if ( $user->isBlocked() ) {
diff --git a/SystemGifts/SpecialSystemGiftManager.php
b/SystemGifts/SpecialSystemGiftManager.php
index 0f2d2ff..e12b113 100644
--- a/SystemGifts/SpecialSystemGiftManager.php
+++ b/SystemGifts/SpecialSystemGiftManager.php
@@ -39,10 +39,7 @@
}
// Show a message if the database is in read-only mode
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// If user is blocked, s/he doesn't need to access this page
if ( $user->isBlocked() ) {
diff --git a/SystemGifts/SpecialSystemGiftManagerLogo.php
b/SystemGifts/SpecialSystemGiftManagerLogo.php
index 183758c..0ebb7d5 100644
--- a/SystemGifts/SpecialSystemGiftManagerLogo.php
+++ b/SystemGifts/SpecialSystemGiftManagerLogo.php
@@ -45,10 +45,7 @@
}
// Show a message if the database is in read-only mode
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// If user is blocked, s/he doesn't need to access this page
if ( $user->isBlocked() ) {
diff --git a/UserBoard/SpecialSendBoardBlast.php
b/UserBoard/SpecialSendBoardBlast.php
index c7a27e1..3bc307d 100644
--- a/UserBoard/SpecialSendBoardBlast.php
+++ b/UserBoard/SpecialSendBoardBlast.php
@@ -40,10 +40,7 @@
}
// Is the database locked?
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return false;
- }
+ $this->checkReadOnly();
// Blocked through Special:Block? No access for you!
if ( $user->isBlocked() ) {
diff --git a/UserGifts/SpecialGiftManager.php b/UserGifts/SpecialGiftManager.php
index e0a57e2..c0d55c9 100644
--- a/UserGifts/SpecialGiftManager.php
+++ b/UserGifts/SpecialGiftManager.php
@@ -48,10 +48,7 @@
}
// Show a message if the database is in read-only mode
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// Add CSS
$out->addModuleStyles( 'ext.socialprofile.usergifts.css' );
diff --git a/UserGifts/SpecialGiftManagerLogo.php
b/UserGifts/SpecialGiftManagerLogo.php
index 5e06d17..595bec9 100644
--- a/UserGifts/SpecialGiftManagerLogo.php
+++ b/UserGifts/SpecialGiftManager
[MediaWiki-commits] [Gerrit] mediawiki...PollNY[master]: Replace readOnlyPage() which has been deprecated since 1.25
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342956 )
Change subject: Replace readOnlyPage() which has been deprecated since 1.25
..
Replace readOnlyPage() which has been deprecated since 1.25
Bug: T160582
Change-Id: I13290764b036ea844c312c1866ab5391a6b3ac1c
---
M SpecialAdminPoll.php
M SpecialCreatePoll.php
M SpecialUpdatePoll.php
M extension.json
4 files changed, 4 insertions(+), 13 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialAdminPoll.php b/SpecialAdminPoll.php
index e5ab874..2aef7a7 100644
--- a/SpecialAdminPoll.php
+++ b/SpecialAdminPoll.php
@@ -42,10 +42,7 @@
}
// Show a message if the database is in read-only mode
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// If user is blocked, s/he doesn't need to access this page
if ( $user->isBlocked() ) {
diff --git a/SpecialCreatePoll.php b/SpecialCreatePoll.php
index 8cc94d9..b21ed0e 100644
--- a/SpecialCreatePoll.php
+++ b/SpecialCreatePoll.php
@@ -41,10 +41,7 @@
}
// Check that the DB isn't locked
- if( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
/**
* Redirect anonymous users to login page
diff --git a/SpecialUpdatePoll.php b/SpecialUpdatePoll.php
index 5f7ee29..fe88c1d 100644
--- a/SpecialUpdatePoll.php
+++ b/SpecialUpdatePoll.php
@@ -26,10 +26,7 @@
}
// Show a message if the database is in read-only mode
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// If user is blocked, s/he doesn't need to access this page
if ( $user->isBlocked() ) {
diff --git a/extension.json b/extension.json
index 87c7df3..cd116a0 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "PollNY",
- "version": "3.3.5",
+ "version": "3.3.6",
"author": [
"Aaron Wright",
"David Pean",
--
To view, visit https://gerrit.wikimedia.org/r/342956
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I13290764b036ea844c312c1866ab5391a6b3ac1c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PollNY
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: VisualDiff: Add custom messages for change descriptions
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342834 )
Change subject: VisualDiff: Add custom messages for change descriptions
..
VisualDiff: Add custom messages for change descriptions
Change-Id: Id17d25db37f00dd9d3312731c802c10c36c2b736
---
M i18n/en.json
M i18n/qqq.json
M src/dm/annotations/ve.dm.LanguageAnnotation.js
M src/dm/annotations/ve.dm.LinkAnnotation.js
M src/dm/nodes/ve.dm.HeadingNode.js
M src/dm/nodes/ve.dm.ImageNode.js
M src/dm/nodes/ve.dm.ListNode.js
M src/dm/nodes/ve.dm.TableCellNode.js
8 files changed, 113 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/i18n/en.json b/i18n/en.json
index 0d14fff..aaef04d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -34,7 +34,12 @@
"visualeditor-annotationbutton-subscript-tooltip": "Subscript",
"visualeditor-annotationbutton-superscript-tooltip": "Superscript",
"visualeditor-annotationbutton-underline-tooltip": "Underline",
+ "visualeditor-changedesc-align": "Alignment changed from $1 to $2",
"visualeditor-changedesc-changed": "$1 changed from $2 to $3",
+ "visualeditor-changedesc-image-size": "Size changed from $1 to $2",
+ "visualeditor-changedesc-language": "Language changed from $1 to $2",
+ "visualeditor-changedesc-link-href": "Link target changed from $1 to
$2",
+ "visualeditor-changedesc-no-key": "$1 changed to $2",
"visualeditor-changedesc-set": "$1 set to $2",
"visualeditor-changedesc-unknown": "$1 changed",
"visualeditor-changedesc-unset": "$1 unset from $2",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index f05b8dc..f693ab6 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -42,7 +42,12 @@
"visualeditor-annotationbutton-subscript-tooltip": "Tooltip text for
subscript button.\n{{Related|Visualeditor-annotationbutton}}",
"visualeditor-annotationbutton-superscript-tooltip": "Tooltip text for
superscript
button.\n{{Related|Visualeditor-annotationbutton}}\n{{Identical|Superscript}}",
"visualeditor-annotationbutton-underline-tooltip": "Tooltip text for
underline
button.\n{{Related|Visualeditor-annotationbutton}}\n{{Identical|Underline}}",
+ "visualeditor-changedesc-align": "Description of an alignment change",
"visualeditor-changedesc-changed": "Fallback description of an
attribute value change for visual diffing, if no specific i18n exists for that
kind of change.\n\nValues:\n* $1 – Attribute name, like 'lang' or 'dir'\n* $2 –
Previous attribute value, like 'ar' or 'rtl'\n* $3 – New attribute value, like
'fa' or 'auto'",
+ "visualeditor-changedesc-image-size": "Description of an image size
change",
+ "visualeditor-changedesc-language": "Description of a language
annotation change",
+ "visualeditor-changedesc-link-href": "Description of a link href
change",
+ "visualeditor-changedesc-no-key": "Description of an attribute value
change without reference to the key",
"visualeditor-changedesc-set": "Fallback description of an attribute
value being set for visual diffing, if no specific i18n exists for that kind of
change.\n\nValues:\n* $1 – Attribute name, like 'lang' or 'dir'\n* $2 – New
attribute value, like 'fa' or 'auto'",
"visualeditor-changedesc-unknown": "Fallback description of an
attribute value change for visual diffing which can't be otherwise described,
if no specific i18n exists for that kind of change.\n\nValues:\n* $1 –
Attribute name, like 'lang' or 'dir'",
"visualeditor-changedesc-unset": "Fallback description of an attribute
value being unset for visual diffing, if no specific i18n exists for that kind
of change.\n\nValues:\n* $1 – Attribute name, like 'lang' or 'dir'\n* $2 –
Previous attribute value, like 'ar' or 'rtl'",
diff --git a/src/dm/annotations/ve.dm.LanguageAnnotation.js
b/src/dm/annotations/ve.dm.LanguageAnnotation.js
index 2facf07..126db5c 100644
--- a/src/dm/annotations/ve.dm.LanguageAnnotation.js
+++ b/src/dm/annotations/ve.dm.LanguageAnnotation.js
@@ -59,6 +59,17 @@
return [ domElement ];
};
+ve.dm.LanguageAnnotation.static.describeChange = function ( key, change ) {
+ if ( key === 'lang' ) {
+ return ve.msg( 'visualeditor-changedesc-language',
+ ve.init.platform.getLanguageName(
change.from.toLowerCase() ),
+ ve.init.platform.getLanguageName(
change.to.toLowerCase() )
+ );
+ }
+ // Parent method
+ return ve.dm.LanguageAnnotation.parent.static.describeChange.apply(
this, arguments );
+};
+
/* Methods */
/**
diff --git a/src/dm/annotations/ve.dm.LinkAnnotation.js
b/src/dm/annotations/ve.dm.LinkAnnotation.js
index ee23b60..111a3f0 100644
--- a/src/dm/annotations/ve.dm.LinkAnnotation.js
+++ b/src/dm/annotations/ve.dm.LinkAnnotation.
[MediaWiki-commits] [Gerrit] mediawiki...QuizGame[master]: Replace readOnlyPage() which has been deprecated since 1.25
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342957 )
Change subject: Replace readOnlyPage() which has been deprecated since 1.25
..
Replace readOnlyPage() which has been deprecated since 1.25
Bug: T160582
Change-Id: I00582621dc0eb594978f54f1a38b79bf5e666ece
---
M QuestionGameHome.body.php
M RecalculateStats.php
M extension.json
3 files changed, 4 insertions(+), 10 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/QuestionGameHome.body.php b/QuestionGameHome.body.php
index faa12a3..8e0d474 100644
--- a/QuestionGameHome.body.php
+++ b/QuestionGameHome.body.php
@@ -45,10 +45,7 @@
// Is the database locked? If so, we can't do much since
answering a
// question changes database state...and so does creating a new
// question
- if( wfReadOnly() ) {
- $out->readOnlyPage();
- return false;
- }
+ $this->checkReadOnly();
// https://phabricator.wikimedia.org/T155405
// Throws error message when SocialProfile extension is not
installed
diff --git a/RecalculateStats.php b/RecalculateStats.php
index e18aed3..5ca329b 100644
--- a/RecalculateStats.php
+++ b/RecalculateStats.php
@@ -25,10 +25,7 @@
}
// Show a message if the database is in read-only mode
- if( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// If user is blocked, s/he doesn't need to access this page
if( $user->isBlocked() ) {
@@ -125,4 +122,4 @@
}
$out->addHTML( "Updated {$count} users" );
}
-}
\ No newline at end of file
+}
diff --git a/extension.json b/extension.json
index bc25524..fad595f 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "QuizGame",
- "version": "3.7",
+ "version": "3.7.1",
"author": [
"Aaron Wright",
"Ashish Datta",
--
To view, visit https://gerrit.wikimedia.org/r/342957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I00582621dc0eb594978f54f1a38b79bf5e666ece
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuizGame
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ApiFeatureUsage[master]: Update ApiFeatureUsage for elasticsearch 5.x
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342953 )
Change subject: Update ApiFeatureUsage for elasticsearch 5.x
..
Update ApiFeatureUsage for elasticsearch 5.x
Elasticsearch 5 removed count specific features. Instead you make
a request that returns 0 results and look at the total_hits number
that is returned. Elasticsearch does internal optimizations where
appropriate instead of having the special type of request.
I used phan to check for other code that was removed in the 5.x
upgrade of Elastica extension, doesn't seem like there is anything
else.
Bug: T160578
Change-Id: I2d8603cef61723ddcc8c1d37566c334333422248
---
M ApiFeatureUsageQueryEngineElastica.php
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ApiFeatureUsageQueryEngineElastica.php
b/ApiFeatureUsageQueryEngineElastica.php
index 424d3e0..a2fabd0 100644
--- a/ApiFeatureUsageQueryEngineElastica.php
+++ b/ApiFeatureUsageQueryEngineElastica.php
@@ -32,7 +32,7 @@
protected function getClient() {
if ( !$this->client ) {
$connection = new
ApiFeatureUsageQueryEngineElasticaConnection( $this->options );
- $this->client = $connection->getClient2();
+ $this->client = $connection->getClient();
}
return $this->client;
}
@@ -84,9 +84,7 @@
$query->addAggregation( $termsAgg );
$search = new Elastica\Search( $this->getClient() );
- $search->setOption(
- Elastica\Search::OPTION_SEARCH_TYPE,
Elastica\Search::OPTION_SEARCH_TYPE_COUNT
- );
+ $search->setOption( Elastica\Search::OPTION_SIZE, 0 );
$allIndexes = $this->getIndexNames();
$indexes = [];
--
To view, visit https://gerrit.wikimedia.org/r/342953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2d8603cef61723ddcc8c1d37566c334333422248
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApiFeatureUsage
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: 20after4
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: DCausse
Gerrit-Reviewer: Smalyshev
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Never use CACHE_NONE for CACHE_ANYTHING
Brian Wolff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342959 )
Change subject: Never use CACHE_NONE for CACHE_ANYTHING
..
Never use CACHE_NONE for CACHE_ANYTHING
If $wgMainCacheType = CACHE_ACCEL, but there is no APC, then its
possible that CACHE_ANYTHING will default to CACHE_NONE because
that's what CACHE_ACCEL would do.
Possibly also T147161
Bug: T160519
Change-Id: I9ac2d071437b35a0f9cd3678e2279628f7b1931e
---
M includes/objectcache/ObjectCache.php
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/59/342959/1
diff --git a/includes/objectcache/ObjectCache.php
b/includes/objectcache/ObjectCache.php
index cf9033b..7d8a151 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -247,7 +247,11 @@
$candidates = [ $wgMainCacheType, $wgMessageCacheType,
$wgParserCacheType ];
foreach ( $candidates as $candidate ) {
if ( $candidate !== CACHE_NONE && $candidate !==
CACHE_ANYTHING ) {
- return self::getInstance( $candidate );
+ $cache = self::getInstance( $candidate );
+ }
+ // CACHE_ACCEL might default to nothing if no APCu
+ if ( !( $cache instanceof EmptyBagOStuff ) ) {
+ return $cache;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/342959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ac2d071437b35a0f9cd3678e2279628f7b1931e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: ButtonElement: Simplify selectors
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342958 )
Change subject: ButtonElement: Simplify selectors
..
ButtonElement: Simplify selectors
Let's simplify selectors, as there is no need to complicate things.
Change-Id: I9efe46329175b04e4ba71ec14ad801415816ee6f
---
M src/styles/elements/ButtonElement.less
1 file changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/58/342958/1
diff --git a/src/styles/elements/ButtonElement.less
b/src/styles/elements/ButtonElement.less
index db2e2ea..dca99b4 100644
--- a/src/styles/elements/ButtonElement.less
+++ b/src/styles/elements/ButtonElement.less
@@ -14,20 +14,20 @@
font-size: inherit;
white-space: nowrap;
.oo-ui-unselectable();
-
- > .oo-ui-iconElement-icon,
- > .oo-ui-indicatorElement-indicator {
- display: none;
- }
}
&.oo-ui-widget-disabled > .oo-ui-buttonElement-button {
cursor: default;
}
- &.oo-ui-indicatorElement > .oo-ui-buttonElement-button >
.oo-ui-indicatorElement-indicator,
- &.oo-ui-labelElement > .oo-ui-buttonElement-button >
.oo-ui-labelElement-label,
- &-frameless.oo-ui-iconElement > .oo-ui-buttonElement-button >
.oo-ui-iconElement-icon {
+ .oo-ui-iconElement-icon,
+ .oo-ui-indicatorElement-indicator {
+ display: none;
+ }
+
+ &.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator,
+ &.oo-ui-labelElement .oo-ui-labelElement-label,
+ &-frameless.oo-ui-iconElement .oo-ui-iconElement-icon {
// Vertical align text
display: inline-block;
vertical-align: middle;
--
To view, visit https://gerrit.wikimedia.org/r/342958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9efe46329175b04e4ba71ec14ad801415816ee6f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PictureGame[master]: Replace readOnlyPage() which has been deprecated since 1.25
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342954 )
Change subject: Replace readOnlyPage() which has been deprecated since 1.25
..
Replace readOnlyPage() which has been deprecated since 1.25
Bug: T160582
Change-Id: I2afb49b5f27c39f8eadda2f5ad24d655bcf96c50
---
M PictureGameHome.body.php
M extension.json
2 files changed, 2 insertions(+), 5 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PictureGameHome.body.php b/PictureGameHome.body.php
index 9cdd4a2..400590b 100644
--- a/PictureGameHome.body.php
+++ b/PictureGameHome.body.php
@@ -41,10 +41,7 @@
$user = $this->getUser();
// Is the database locked?
- if( wfReadOnly() ) {
- $out->readOnlyPage();
- return false;
- }
+ $this->checkReadOnly();
// https://phabricator.wikimedia.org/T155405
// Throws error message when SocialProfile extension is not
installed
diff --git a/extension.json b/extension.json
index 50148eb..d722fec 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "PictureGame",
- "version": "3.9",
+ "version": "3.9.1",
"author": [
"Aaron Wright",
"Ashish Datta",
--
To view, visit https://gerrit.wikimedia.org/r/342954
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2afb49b5f27c39f8eadda2f5ad24d655bcf96c50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PictureGame
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...QuizGame[master]: Replace readOnlyPage() which has been deprecated since 1.25
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342957 )
Change subject: Replace readOnlyPage() which has been deprecated since 1.25
..
Replace readOnlyPage() which has been deprecated since 1.25
Bug: T160582
Change-Id: I00582621dc0eb594978f54f1a38b79bf5e666ece
---
M QuestionGameHome.body.php
M RecalculateStats.php
M extension.json
3 files changed, 4 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuizGame
refs/changes/57/342957/1
diff --git a/QuestionGameHome.body.php b/QuestionGameHome.body.php
index faa12a3..8e0d474 100644
--- a/QuestionGameHome.body.php
+++ b/QuestionGameHome.body.php
@@ -45,10 +45,7 @@
// Is the database locked? If so, we can't do much since
answering a
// question changes database state...and so does creating a new
// question
- if( wfReadOnly() ) {
- $out->readOnlyPage();
- return false;
- }
+ $this->checkReadOnly();
// https://phabricator.wikimedia.org/T155405
// Throws error message when SocialProfile extension is not
installed
diff --git a/RecalculateStats.php b/RecalculateStats.php
index e18aed3..5ca329b 100644
--- a/RecalculateStats.php
+++ b/RecalculateStats.php
@@ -25,10 +25,7 @@
}
// Show a message if the database is in read-only mode
- if( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// If user is blocked, s/he doesn't need to access this page
if( $user->isBlocked() ) {
@@ -125,4 +122,4 @@
}
$out->addHTML( "Updated {$count} users" );
}
-}
\ No newline at end of file
+}
diff --git a/extension.json b/extension.json
index bc25524..fad595f 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "QuizGame",
- "version": "3.7",
+ "version": "3.7.1",
"author": [
"Aaron Wright",
"Ashish Datta",
--
To view, visit https://gerrit.wikimedia.org/r/342957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I00582621dc0eb594978f54f1a38b79bf5e666ece
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuizGame
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PollNY[master]: Replace readOnlyPage() which has been deprecated since 1.25
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342956 )
Change subject: Replace readOnlyPage() which has been deprecated since 1.25
..
Replace readOnlyPage() which has been deprecated since 1.25
Bug: T160582
Change-Id: I13290764b036ea844c312c1866ab5391a6b3ac1c
---
M SpecialAdminPoll.php
M SpecialCreatePoll.php
M SpecialUpdatePoll.php
M extension.json
4 files changed, 4 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PollNY
refs/changes/56/342956/1
diff --git a/SpecialAdminPoll.php b/SpecialAdminPoll.php
index e5ab874..2aef7a7 100644
--- a/SpecialAdminPoll.php
+++ b/SpecialAdminPoll.php
@@ -42,10 +42,7 @@
}
// Show a message if the database is in read-only mode
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// If user is blocked, s/he doesn't need to access this page
if ( $user->isBlocked() ) {
diff --git a/SpecialCreatePoll.php b/SpecialCreatePoll.php
index 8cc94d9..b21ed0e 100644
--- a/SpecialCreatePoll.php
+++ b/SpecialCreatePoll.php
@@ -41,10 +41,7 @@
}
// Check that the DB isn't locked
- if( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
/**
* Redirect anonymous users to login page
diff --git a/SpecialUpdatePoll.php b/SpecialUpdatePoll.php
index 5f7ee29..fe88c1d 100644
--- a/SpecialUpdatePoll.php
+++ b/SpecialUpdatePoll.php
@@ -26,10 +26,7 @@
}
// Show a message if the database is in read-only mode
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// If user is blocked, s/he doesn't need to access this page
if ( $user->isBlocked() ) {
diff --git a/extension.json b/extension.json
index 87c7df3..cd116a0 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "PollNY",
- "version": "3.3.5",
+ "version": "3.3.6",
"author": [
"Aaron Wright",
"David Pean",
--
To view, visit https://gerrit.wikimedia.org/r/342956
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I13290764b036ea844c312c1866ab5391a6b3ac1c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PollNY
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add role for 'Timeless' skin
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342955 )
Change subject: Add role for 'Timeless' skin
..
Add role for 'Timeless' skin
Change-Id: I380f7f9e78d3da60230ba97539b95ba2e0dc728e
---
A puppet/modules/role/manifests/timeless.pp
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/55/342955/1
diff --git a/puppet/modules/role/manifests/timeless.pp
b/puppet/modules/role/manifests/timeless.pp
new file mode 100644
index 000..7906f7c
--- /dev/null
+++ b/puppet/modules/role/manifests/timeless.pp
@@ -0,0 +1,6 @@
+# == Class: role::timeless
+# Configures Timeless, a MediaWiki skin, as an option.
+# https://www.mediawiki.org/wiki/Skin:Timeless
+class role::timeless {
+mediawiki::skin { 'Timeless': }
+}
--
To view, visit https://gerrit.wikimedia.org/r/342955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I380f7f9e78d3da60230ba97539b95ba2e0dc728e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Jforrester
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PictureGame[master]: Replace readOnlyPage() which has been deprecated since 1.25
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342954 )
Change subject: Replace readOnlyPage() which has been deprecated since 1.25
..
Replace readOnlyPage() which has been deprecated since 1.25
Bug: T160582
Change-Id: I2afb49b5f27c39f8eadda2f5ad24d655bcf96c50
---
M PictureGameHome.body.php
M extension.json
2 files changed, 2 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PictureGame
refs/changes/54/342954/1
diff --git a/PictureGameHome.body.php b/PictureGameHome.body.php
index 9cdd4a2..400590b 100644
--- a/PictureGameHome.body.php
+++ b/PictureGameHome.body.php
@@ -41,10 +41,7 @@
$user = $this->getUser();
// Is the database locked?
- if( wfReadOnly() ) {
- $out->readOnlyPage();
- return false;
- }
+ $this->checkReadOnly();
// https://phabricator.wikimedia.org/T155405
// Throws error message when SocialProfile extension is not
installed
diff --git a/extension.json b/extension.json
index 50148eb..d722fec 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "PictureGame",
- "version": "3.9",
+ "version": "3.9.1",
"author": [
"Aaron Wright",
"Ashish Datta",
--
To view, visit https://gerrit.wikimedia.org/r/342954
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2afb49b5f27c39f8eadda2f5ad24d655bcf96c50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PictureGame
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LinkFilter[master]: Replace readOnlyPage() which has been deprecated since 1.25
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342952 )
Change subject: Replace readOnlyPage() which has been deprecated since 1.25
..
Replace readOnlyPage() which has been deprecated since 1.25
Bug: T160582
Change-Id: I92d85c70a9382dd57f851e0b39d29c7683377c2d
---
M SpecialLinkApprove.php
M SpecialLinkEdit.php
M SpecialLinkSubmit.php
M extension.json
4 files changed, 5 insertions(+), 14 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialLinkApprove.php b/SpecialLinkApprove.php
index ec4ee6e..d5a32d2 100644
--- a/SpecialLinkApprove.php
+++ b/SpecialLinkApprove.php
@@ -108,10 +108,7 @@
}
// Is the database locked or not?
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return false;
- }
+ $this->checkReadOnly();
// Set the page title
$out->setPageTitle( $this->msg( 'linkfilter-approve-title'
)->plain() );
diff --git a/SpecialLinkEdit.php b/SpecialLinkEdit.php
index 389a4c7..a7bbf66 100644
--- a/SpecialLinkEdit.php
+++ b/SpecialLinkEdit.php
@@ -26,10 +26,7 @@
}
// Is the database locked or not?
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return false;
- }
+ $this->checkReadOnly();
// No access for blocked users
if ( $user->isBlocked() ) {
@@ -151,4 +148,4 @@
return $output;
}
-}
\ No newline at end of file
+}
diff --git a/SpecialLinkSubmit.php b/SpecialLinkSubmit.php
index ab72af0..6853c5d 100644
--- a/SpecialLinkSubmit.php
+++ b/SpecialLinkSubmit.php
@@ -30,10 +30,7 @@
}
// Is the database locked or not?
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return false;
- }
+ $this->checkReadOnly();
// Blocked through Special:Block? No access for you either
if ( $user->isBlocked() ) {
diff --git a/extension.json b/extension.json
index f78b2b0..3781179 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "LinkFilter",
- "version": "3.4",
+ "version": "3.4.1",
"author": [
"Aaron Wright",
"David Pean",
--
To view, visit https://gerrit.wikimedia.org/r/342952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I92d85c70a9382dd57f851e0b39d29c7683377c2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LinkFilter
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Undefined globals from CirrusSearch
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342948 ) Change subject: Undefined globals from CirrusSearch .. Undefined globals from CirrusSearch Bug: T160569 Change-Id: I4980daf73d5a98afedfae4a254a88ea078912296 --- M wmf-config/CirrusSearch-common.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: 20after4: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CirrusSearch-common.php b/wmf-config/CirrusSearch-common.php index 9236397..9d5ca32 100644 --- a/wmf-config/CirrusSearch-common.php +++ b/wmf-config/CirrusSearch-common.php @@ -257,6 +257,8 @@ $wgCirrusSearchCompletionGeoContextSettings = []; $wgCirrusSearchCacheWarmers = []; $wgCirrusSearchCompletionGeoContextProfiles = []; + $wgCirrusSearchMainPageCacheWarmer = false; + $wgCirrusSearchCompletionSuggesterGeoContext = []; } # Load per realm specific configuration, either: -- To view, visit https://gerrit.wikimedia.org/r/342948 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4980daf73d5a98afedfae4a254a88ea078912296 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: EBernhardson Gerrit-Reviewer: 20after4 Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...FanBoxes[master]: Replace readOnlyPage() which has been deprecated since 1.25
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342951 )
Change subject: Replace readOnlyPage() which has been deprecated since 1.25
..
Replace readOnlyPage() which has been deprecated since 1.25
Bug: T160582
Change-Id: I96c75224568b87ea1687bf2a8e8b4f5ba8085b8f
---
M SpecialFanBoxes.php
M extension.json
2 files changed, 2 insertions(+), 5 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialFanBoxes.php b/SpecialFanBoxes.php
index 8a793e1..b4d58a5 100644
--- a/SpecialFanBoxes.php
+++ b/SpecialFanBoxes.php
@@ -50,10 +50,7 @@
$this->checkPermissions();
// If the database is in read-only mode, bail out
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return true;
- }
+ $this->checkReadOnly();
// Don't allow blocked users (RT #12589)
if ( $user->isBlocked() ) {
diff --git a/extension.json b/extension.json
index c193b0c..30031b3 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "FanBoxes",
- "version": "3.2.6",
+ "version": "3.2.7",
"author": [
"Aaron Wright",
"David Pean",
--
To view, visit https://gerrit.wikimedia.org/r/342951
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I96c75224568b87ea1687bf2a8e8b4f5ba8085b8f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ApiFeatureUsage[master]: Update ApiFeatureUsage for elasticsearch 5.x
EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342953 )
Change subject: Update ApiFeatureUsage for elasticsearch 5.x
..
Update ApiFeatureUsage for elasticsearch 5.x
Elasticsearch 5 removed count specific features. Instead you make
a request that returns 0 results and look at the total_hits number
that is returned. Elasticsearch does internal optimizations where
appropriate instead of having the special type of request.
I used phan to check for other code that was removed in the 5.x
upgrade of Elastica extension, doesn't seem like there is anything
else.
Bug: T160578
Change-Id: I2d8603cef61723ddcc8c1d37566c334333422248
---
M ApiFeatureUsageQueryEngineElastica.php
1 file changed, 2 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ApiFeatureUsage
refs/changes/53/342953/1
diff --git a/ApiFeatureUsageQueryEngineElastica.php
b/ApiFeatureUsageQueryEngineElastica.php
index 424d3e0..a2fabd0 100644
--- a/ApiFeatureUsageQueryEngineElastica.php
+++ b/ApiFeatureUsageQueryEngineElastica.php
@@ -32,7 +32,7 @@
protected function getClient() {
if ( !$this->client ) {
$connection = new
ApiFeatureUsageQueryEngineElasticaConnection( $this->options );
- $this->client = $connection->getClient2();
+ $this->client = $connection->getClient();
}
return $this->client;
}
@@ -84,9 +84,7 @@
$query->addAggregation( $termsAgg );
$search = new Elastica\Search( $this->getClient() );
- $search->setOption(
- Elastica\Search::OPTION_SEARCH_TYPE,
Elastica\Search::OPTION_SEARCH_TYPE_COUNT
- );
+ $search->setOption( Elastica\Search::OPTION_SIZE, 0 );
$allIndexes = $this->getIndexNames();
$indexes = [];
--
To view, visit https://gerrit.wikimedia.org/r/342953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d8603cef61723ddcc8c1d37566c334333422248
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApiFeatureUsage
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LinkFilter[master]: Replace readOnlyPage() which has been deprecated since 1.25
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342952 )
Change subject: Replace readOnlyPage() which has been deprecated since 1.25
..
Replace readOnlyPage() which has been deprecated since 1.25
Bug: T160582
Change-Id: I92d85c70a9382dd57f851e0b39d29c7683377c2d
---
M SpecialLinkApprove.php
M SpecialLinkEdit.php
M SpecialLinkSubmit.php
M extension.json
4 files changed, 5 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LinkFilter
refs/changes/52/342952/1
diff --git a/SpecialLinkApprove.php b/SpecialLinkApprove.php
index ec4ee6e..d5a32d2 100644
--- a/SpecialLinkApprove.php
+++ b/SpecialLinkApprove.php
@@ -108,10 +108,7 @@
}
// Is the database locked or not?
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return false;
- }
+ $this->checkReadOnly();
// Set the page title
$out->setPageTitle( $this->msg( 'linkfilter-approve-title'
)->plain() );
diff --git a/SpecialLinkEdit.php b/SpecialLinkEdit.php
index 389a4c7..a7bbf66 100644
--- a/SpecialLinkEdit.php
+++ b/SpecialLinkEdit.php
@@ -26,10 +26,7 @@
}
// Is the database locked or not?
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return false;
- }
+ $this->checkReadOnly();
// No access for blocked users
if ( $user->isBlocked() ) {
@@ -151,4 +148,4 @@
return $output;
}
-}
\ No newline at end of file
+}
diff --git a/SpecialLinkSubmit.php b/SpecialLinkSubmit.php
index ab72af0..6853c5d 100644
--- a/SpecialLinkSubmit.php
+++ b/SpecialLinkSubmit.php
@@ -30,10 +30,7 @@
}
// Is the database locked or not?
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return false;
- }
+ $this->checkReadOnly();
// Blocked through Special:Block? No access for you either
if ( $user->isBlocked() ) {
diff --git a/extension.json b/extension.json
index f78b2b0..3781179 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "LinkFilter",
- "version": "3.4",
+ "version": "3.4.1",
"author": [
"Aaron Wright",
"David Pean",
--
To view, visit https://gerrit.wikimedia.org/r/342952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I92d85c70a9382dd57f851e0b39d29c7683377c2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LinkFilter
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlogPage[master]: Replace readOnlyPage() which has been deprecated since 1.25
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342950 )
Change subject: Replace readOnlyPage() which has been deprecated since 1.25
..
Replace readOnlyPage() which has been deprecated since 1.25
Bug: T160582
Change-Id: I2584074df87e413f26cea030a8aa9e051385d9fe
---
M SpecialCreateBlogPost.php
M extension.json
2 files changed, 2 insertions(+), 5 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialCreateBlogPost.php b/SpecialCreateBlogPost.php
index 7f53905..14d2837 100644
--- a/SpecialCreateBlogPost.php
+++ b/SpecialCreateBlogPost.php
@@ -40,10 +40,7 @@
}
// Show a message if the database is in read-only mode
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// If user is blocked, s/he doesn't need to access this page
if ( $user->isBlocked() ) {
diff --git a/extension.json b/extension.json
index 73ac81b..297e7c7 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "BlogPage",
- "version": "2.4.7",
+ "version": "2.4.8",
"author": [
"David Pean",
"Jack Phoenix"
--
To view, visit https://gerrit.wikimedia.org/r/342950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2584074df87e413f26cea030a8aa9e051385d9fe
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Lewis Cawte
Gerrit-Reviewer: UltrasonicNXT
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: VisualDiff: Show attribute changes in a sidebar
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340160 )
Change subject: VisualDiff: Show attribute changes in a sidebar
..
VisualDiff: Show attribute changes in a sidebar
Bug: T151404
Bug: T156189
Change-Id: I846bfaa42c855c4d206aaa1ec64edf279581eafd
---
M build/modules.json
M demos/ve/desktop.html
M demos/ve/mobile.html
M i18n/en.json
M i18n/qqq.json
M src/dm/ve.dm.Model.js
M src/dm/ve.dm.VisualDiff.js
M src/ui/dialogs/ve.ui.DiffDialog.js
M src/ui/elements/ve.ui.DiffElement.js
M src/ui/styles/elements/ve.ui.DiffElement.css
A src/ui/widgets/ve.ui.ChangeDescriptionsSelectWidget.js
M tests/index.html
M tests/ui/ve.ui.DiffElement.test.js
13 files changed, 450 insertions(+), 38 deletions(-)
Approvals:
Tchanders: Looks good to me, approved
jenkins-bot: Verified
Jforrester: Looks good to me, but someone else must approve
diff --git a/build/modules.json b/build/modules.json
index 243a87d..4eca486 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -608,7 +608,8 @@
"src/ve.DiffTreeNode.js",
"src/ve.DiffMatchPatch.js",
"src/dm/ve.dm.VisualDiff.js",
- "src/ui/elements/ve.ui.DiffElement.js"
+ "src/ui/elements/ve.ui.DiffElement.js",
+ "src/ui/widgets/ve.ui.ChangeDescriptionsSelectWidget.js"
],
"styles": [
"src/ui/styles/elements/ve.ui.DiffElement.css"
diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html
index 7f1c718..f90c840 100644
--- a/demos/ve/desktop.html
+++ b/demos/ve/desktop.html
@@ -504,6 +504,7 @@
+
diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html
index 0836650..116eaab 100644
--- a/demos/ve/mobile.html
+++ b/demos/ve/mobile.html
@@ -505,6 +505,7 @@
+
diff --git a/i18n/en.json b/i18n/en.json
index f709f40..0d14fff 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -34,6 +34,10 @@
"visualeditor-annotationbutton-subscript-tooltip": "Subscript",
"visualeditor-annotationbutton-superscript-tooltip": "Superscript",
"visualeditor-annotationbutton-underline-tooltip": "Underline",
+ "visualeditor-changedesc-changed": "$1 changed from $2 to $3",
+ "visualeditor-changedesc-set": "$1 set to $2",
+ "visualeditor-changedesc-unknown": "$1 changed",
+ "visualeditor-changedesc-unset": "$1 unset from $2",
"visualeditor-clearbutton-tooltip": "Clear styling",
"visualeditor-clipboard-copy": "Copy",
"visualeditor-clipboard-cut": "Cut",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 7303ff6..f05b8dc 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -42,6 +42,10 @@
"visualeditor-annotationbutton-subscript-tooltip": "Tooltip text for
subscript button.\n{{Related|Visualeditor-annotationbutton}}",
"visualeditor-annotationbutton-superscript-tooltip": "Tooltip text for
superscript
button.\n{{Related|Visualeditor-annotationbutton}}\n{{Identical|Superscript}}",
"visualeditor-annotationbutton-underline-tooltip": "Tooltip text for
underline
button.\n{{Related|Visualeditor-annotationbutton}}\n{{Identical|Underline}}",
+ "visualeditor-changedesc-changed": "Fallback description of an
attribute value change for visual diffing, if no specific i18n exists for that
kind of change.\n\nValues:\n* $1 – Attribute name, like 'lang' or 'dir'\n* $2 –
Previous attribute value, like 'ar' or 'rtl'\n* $3 – New attribute value, like
'fa' or 'auto'",
+ "visualeditor-changedesc-set": "Fallback description of an attribute
value being set for visual diffing, if no specific i18n exists for that kind of
change.\n\nValues:\n* $1 – Attribute name, like 'lang' or 'dir'\n* $2 – New
attribute value, like 'fa' or 'auto'",
+ "visualeditor-changedesc-unknown": "Fallback description of an
attribute value change for visual diffing which can't be otherwise described,
if no specific i18n exists for that kind of change.\n\nValues:\n* $1 –
Attribute name, like 'lang' or 'dir'",
+ "visualeditor-changedesc-unset": "Fallback description of an attribute
value being unset for visual diffing, if no specific i18n exists for that kind
of change.\n\nValues:\n* $1 – Attribute name, like 'lang' or 'dir'\n* $2 –
Previous attribute value, like 'ar' or 'rtl'",
"visualeditor-clearbutton-tooltip": "Tooltip text for the clear styling
button. This clears \"styling\" like bold or italics from the current
selection, but not \"formatting\" like being a list, a heading or a table.",
"visualeditor-clipboard-copy": "Label for copy
command.\n{{Identical|Copy}}",
"visualeditor-clipboard-cut": "Label for cut
[MediaWiki-commits] [Gerrit] mediawiki...FanBoxes[master]: Replace readOnlyPage() which has been deprecated since 1.25
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342951 )
Change subject: Replace readOnlyPage() which has been deprecated since 1.25
..
Replace readOnlyPage() which has been deprecated since 1.25
Bug: T160582
Change-Id: I96c75224568b87ea1687bf2a8e8b4f5ba8085b8f
---
M SpecialFanBoxes.php
M extension.json
2 files changed, 2 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FanBoxes
refs/changes/51/342951/1
diff --git a/SpecialFanBoxes.php b/SpecialFanBoxes.php
index 8a793e1..b4d58a5 100644
--- a/SpecialFanBoxes.php
+++ b/SpecialFanBoxes.php
@@ -50,10 +50,7 @@
$this->checkPermissions();
// If the database is in read-only mode, bail out
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return true;
- }
+ $this->checkReadOnly();
// Don't allow blocked users (RT #12589)
if ( $user->isBlocked() ) {
diff --git a/extension.json b/extension.json
index c193b0c..30031b3 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "FanBoxes",
- "version": "3.2.6",
+ "version": "3.2.7",
"author": [
"Aaron Wright",
"David Pean",
--
To view, visit https://gerrit.wikimedia.org/r/342951
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I96c75224568b87ea1687bf2a8e8b4f5ba8085b8f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rm manifests/microsites/peopleweb/migration.pp
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342897 )
Change subject: rm manifests/microsites/peopleweb/migration.pp
..
rm manifests/microsites/peopleweb/migration.pp
This class was just used temporarily for a migration.
Similar to lists::migration (Change-Id: I65ff7731977e0),
do not keep it around just in case it might be used again
in the future.
Change-Id: I886598bab913e6e83a410b4c6b4d652469de521a
---
D modules/role/manifests/microsites/peopleweb/migration.pp
1 file changed, 0 insertions(+), 22 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/role/manifests/microsites/peopleweb/migration.pp
b/modules/role/manifests/microsites/peopleweb/migration.pp
deleted file mode 100644
index 5ded8b6..000
--- a/modules/role/manifests/microsites/peopleweb/migration.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-# sets up an rsyncd to copy people's home dirs
-# during a server upgrade/migration
-class role::microsites::peopleweb::migration {
-
-$sourceip='10.64.32.13'
-
-ferm::service { 'peopleweb-migration-rsync':
-proto => 'tcp',
-port => '873',
-srange => "${sourceip}/32",
-}
-
-include rsync::server
-
-rsync::server::module { 'people-homes':
-path=> '/home',
-read_only => 'no',
-hosts_allow => $sourceip,
-}
-
-}
-
--
To view, visit https://gerrit.wikimedia.org/r/342897
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I886598bab913e6e83a410b4c6b4d652469de521a
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Change 'history-show-deleted' message to 'Revision deleted o...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340831 )
Change subject: Change 'history-show-deleted' message to 'Revision deleted
only' for clarity
..
Change 'history-show-deleted' message to 'Revision deleted only' for clarity
Bug: T159483
Change-Id: I1cde02e34e3dba042e566d77490e76223b6c2bb1
---
M languages/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Umherirrender: Looks good to me, but someone else must approve
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 098adb6..a19b6f2 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -838,7 +838,7 @@
"page_last": "last",
"histlegend": "Diff selection: Mark the radio boxes of the revisions to
compare and hit enter or the button at the bottom.\nLegend:
({{int:cur}}) = difference with latest revision,
({{int:last}}) = difference with preceding revision,
{{int:minoreditletter}} = minor edit.",
"history-fieldset-title": "Browse history",
- "history-show-deleted": "Deleted only",
+ "history-show-deleted": "Revision deleted only",
"history_copyright": "-",
"histfirst": "oldest",
"histlast": "newest",
--
To view, visit https://gerrit.wikimedia.org/r/340831
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1cde02e34e3dba042e566d77490e76223b6c2bb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MusikAnimal
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: MusikAnimal
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Raimond Spekking
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: Umherirrender
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Use empty 'ca' directive, not 'cert'
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342912 ) Change subject: Use empty 'ca' directive, not 'cert' .. Use empty 'ca' directive, not 'cert' Bug: T13 Change-Id: I4305a26fb484fd55ed69f48720219feabcf9c410 --- M hieradata/regex.yaml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Eevans: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml index 59ebd70..8ff515d 100644 --- a/hieradata/regex.yaml +++ b/hieradata/regex.yaml @@ -203,7 +203,7 @@ cassandra::target_version: '2.2' cassandra::client_encryption_enabled: true restbase::cassandra_tls: -cert: /dev/null +ca: /dev/null cassandra_test_codfw: __regex: !ruby/regexp /^restbase-test200[1-3]\.codfw\.wmnet$/ @@ -292,7 +292,7 @@ cassandra::target_version: '2.2' cassandra::client_encryption_enabled: true restbase::cassandra_tls: -cert: /dev/null +ca: /dev/null restbase_dev_eqiad: __regex: !ruby/regexp /^restbase-dev100[1-3]\.eqiad\.wmnet$/ -- To view, visit https://gerrit.wikimedia.org/r/342912 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4305a26fb484fd55ed69f48720219feabcf9c410 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Eevans Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Eevans Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Mobrovac Gerrit-Reviewer: Ottomata Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Visual diff attribute changes
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342949 )
Change subject: Visual diff attribute changes
..
Visual diff attribute changes
Change-Id: I469a3c7897f2417c1850364f65da51c0deca2386
---
M extension.json
M modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js
M modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
4 files changed, 86 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/49/342949/1
diff --git a/extension.json b/extension.json
index 7131ea9..1da9fea 100644
--- a/extension.json
+++ b/extension.json
@@ -1767,7 +1767,8 @@
"lib/ve/src/ve.DiffTreeNode.js",
"lib/ve/src/ve.DiffMatchPatch.js",
"lib/ve/src/dm/ve.dm.VisualDiff.js",
- "lib/ve/src/ui/elements/ve.ui.DiffElement.js"
+ "lib/ve/src/ui/elements/ve.ui.DiffElement.js",
+
"lib/ve/src/ui/widgets/ve.ui.ChangeDescriptionsSelectWidget.js"
],
"styles": [
"lib/ve/src/ui/styles/elements/ve.ui.DiffElement.css"
@@ -1778,6 +1779,14 @@
"diffMatchPatch"
],
"messages": [
+ "visualeditor-changedesc-changed",
+ "visualeditor-changedesc-image-size",
+ "visualeditor-changedesc-language",
+ "visualeditor-changedesc-link-href",
+ "visualeditor-changedesc-no-key",
+ "visualeditor-changedesc-set",
+ "visualeditor-changedesc-unknown",
+ "visualeditor-changedesc-unset",
"visualeditor-diff-no-changes"
],
"targets": [
diff --git a/modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js
b/modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js
index 5790ea2..d77ed55 100644
--- a/modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js
+++ b/modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js
@@ -64,6 +64,14 @@
return domElements;
};
+ve.dm.MWExternalLinkAnnotation.static.describeChange = function ( key ) {
+ if ( key === 'rel' ) {
+ return null;
+ }
+ // Parent method
+ return
ve.dm.MWExternalLinkAnnotation.parent.static.describeChange.apply( this,
arguments );
+};
+
/* Methods */
/**
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
index 31fc0a2..80f7472 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
@@ -61,6 +61,58 @@
};
/**
+ * @inheritdoc
+ */
+ve.dm.MWImageNode.static.describeChanges = function ( attributeChanges,
attributes ) {
+ var key, sizeFrom, sizeTo, change,
+ customKeys = [ 'width', 'height', 'defaultSize', 'src', 'href'
],
+ descriptions = [];
+
+ function describeSize( width, height ) {
+ return width + ve.msg( 'visualeditor-dimensionswidget-times' )
+ height + ve.msg( 'visualeditor-dimensionswidget-px' );
+ }
+
+ if ( 'width' in attributeChanges || 'height' in attributeChanges ) {
+ if ( attributeChanges.defaultSize &&
attributeChanges.defaultSize.from === true ) {
+ sizeFrom = ve.msg(
'visualeditor-mediasizewidget-sizeoptions-default' );
+ } else {
+ sizeFrom = describeSize(
+ 'width' in attributeChanges ?
attributeChanges.width.from : attributes.width,
+ 'height' in attributeChanges ?
attributeChanges.height.from : attributes.height
+ );
+ }
+ if ( attributeChanges.defaultSize &&
attributeChanges.defaultSize.to === true ) {
+ sizeTo = ve.msg(
'visualeditor-mediasizewidget-sizeoptions-default' );
+ } else {
+ sizeTo = describeSize(
+ 'width' in attributeChanges ?
attributeChanges.width.to : attributes.width,
+ 'height' in attributeChanges ?
attributeChanges.height.to : attributes.height
+ );
+ }
+
+ descriptions.push( ve.msg(
'visualeditor-changedesc-image-size', sizeFrom, sizeTo ) );
+ }
+ for ( key in attributeChanges ) {
+ if ( customKeys.indexOf( key ) === -1 ) {
+ change = this.describeChange( key,
[MediaWiki-commits] [Gerrit] mediawiki...BlogPage[master]: Replace readOnlyPage() which has been deprecated since 1.25
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342950 )
Change subject: Replace readOnlyPage() which has been deprecated since 1.25
..
Replace readOnlyPage() which has been deprecated since 1.25
Bug: T160582
Change-Id: I2584074df87e413f26cea030a8aa9e051385d9fe
---
M SpecialCreateBlogPost.php
M extension.json
2 files changed, 2 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlogPage
refs/changes/50/342950/1
diff --git a/SpecialCreateBlogPost.php b/SpecialCreateBlogPost.php
index 7f53905..14d2837 100644
--- a/SpecialCreateBlogPost.php
+++ b/SpecialCreateBlogPost.php
@@ -40,10 +40,7 @@
}
// Show a message if the database is in read-only mode
- if ( wfReadOnly() ) {
- $out->readOnlyPage();
- return;
- }
+ $this->checkReadOnly();
// If user is blocked, s/he doesn't need to access this page
if ( $user->isBlocked() ) {
diff --git a/extension.json b/extension.json
index b383a5b..d4deee6 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "BlogPage",
- "version": "2.4.6",
+ "version": "2.4.7",
"author": [
"David Pean",
"Jack Phoenix"
--
To view, visit https://gerrit.wikimedia.org/r/342950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2584074df87e413f26cea030a8aa9e051385d9fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Undefined globals from CirrusSearch
EBernhardson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/342948 ) Change subject: Undefined globals from CirrusSearch .. Undefined globals from CirrusSearch Bug: T160569 Change-Id: I4980daf73d5a98afedfae4a254a88ea078912296 --- M wmf-config/CirrusSearch-common.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/48/342948/1 diff --git a/wmf-config/CirrusSearch-common.php b/wmf-config/CirrusSearch-common.php index 9236397..9d5ca32 100644 --- a/wmf-config/CirrusSearch-common.php +++ b/wmf-config/CirrusSearch-common.php @@ -257,6 +257,8 @@ $wgCirrusSearchCompletionGeoContextSettings = []; $wgCirrusSearchCacheWarmers = []; $wgCirrusSearchCompletionGeoContextProfiles = []; + $wgCirrusSearchMainPageCacheWarmer = false; + $wgCirrusSearchCompletionSuggesterGeoContext = []; } # Load per realm specific configuration, either: -- To view, visit https://gerrit.wikimedia.org/r/342948 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4980daf73d5a98afedfae4a254a88ea078912296 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: EBernhardson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Set $wgOresExtension for I63b11eff3a4
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/342947 ) Change subject: Set $wgOresExtension for I63b11eff3a4 .. Set $wgOresExtension for I63b11eff3a4 Set it to 'beta' in production to keep things working the same, but set it to 'on' in labs on cawiki for testing. Bug: T159763 Change-Id: Ia1e24651542237a98951f465b320bbd3d76ebe43 --- M wmf-config/InitialiseSettings-labs.php M wmf-config/InitialiseSettings.php 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/47/342947/1 diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 8e2868c..0102c09 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -428,6 +428,9 @@ 'default' => false, 'wikipedia' => true, // T127661 ], + 'wgOresExtensionStatus' => [ + 'cawiki' => 'on', + ], 'wgOresModels' => [ 'default' => [ 'damaging' => true, diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 9c4c813..0b0bc80 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -17965,6 +17965,9 @@ 'enwiki' => true, // T140003 'cswiki' => true, // T151611 ], +'wgOresExtensionStatus' => [ + 'default' => 'beta' +], 'wgOresModels' => [ 'default' => [ 'damaging' => true, -- To view, visit https://gerrit.wikimedia.org/r/342947 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia1e24651542237a98951f465b320bbd3d76ebe43 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] operations...cumin[debian]: Upgrade to version 0.0.2
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342892 ) Change subject: Upgrade to version 0.0.2 .. Upgrade to version 0.0.2 Change-Id: Id2e2099d6b7fe1ec93e46220d013db4ead56a01a --- M debian/changelog 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Volans: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 4096c4c..2bff63f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +cumin (0.0.2-1) jessie-wikimedia; urgency=medium + + * Upgrade to version 0.0.2. + * Add support for batch processing. + * Minor fixes and improvements. + + -- Riccardo Coccioli Wed, 15 Mar 2017 18:12:24 +0100 + cumin (0.0.1-1) jessie-wikimedia; urgency=medium * Initial packaging. -- To view, visit https://gerrit.wikimedia.org/r/342892 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id2e2099d6b7fe1ec93e46220d013db4ead56a01a Gerrit-PatchSet: 1 Gerrit-Project: operations/software/cumin Gerrit-Branch: debian Gerrit-Owner: Volans Gerrit-Reviewer: Volans Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics/limn-ee-data[master]: Add beta feature graph for RCFilters
Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342946 )
Change subject: Add beta feature graph for RCFilters
..
Add beta feature graph for RCFilters
Change-Id: I7c280510aad428e72c8b9d01113d693bcedd0dcc
---
M ee-beta-features/config.yaml
R ee-beta-features/crosswiki_dbs.txt
A ee-beta-features/rcfilters_beta.sql
A ee-beta-features/rcfilters_dbs.txt
4 files changed, 21 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-ee-data
refs/changes/46/342946/1
diff --git a/ee-beta-features/config.yaml b/ee-beta-features/config.yaml
index d3c504f..f1b906c 100644
--- a/ee-beta-features/config.yaml
+++ b/ee-beta-features/config.yaml
@@ -13,4 +13,9 @@
granularity: days
starts: 2016-02-18
explode_by:
-wiki_db: wiki_dbs.txt
+wiki_db: crosswiki_dbs.txt
+rcfilters_beta:
+granularity: days
+starts: 2017-03-15
+explode_by:
+wiki_db: rcfilters_dbs.txt
diff --git a/ee-beta-features/wiki_dbs.txt b/ee-beta-features/crosswiki_dbs.txt
similarity index 100%
rename from ee-beta-features/wiki_dbs.txt
rename to ee-beta-features/crosswiki_dbs.txt
diff --git a/ee-beta-features/rcfilters_beta.sql
b/ee-beta-features/rcfilters_beta.sql
new file mode 100644
index 000..99596be
--- /dev/null
+++ b/ee-beta-features/rcfilters_beta.sql
@@ -0,0 +1,6 @@
+ select date('{from_timestamp}') as date,
+count(*) as {wiki_db}
+ from {wiki_db}.user_properties
+ where up_property='rcenhancedfilters'
+and up_value=1
+;
diff --git a/ee-beta-features/rcfilters_dbs.txt
b/ee-beta-features/rcfilters_dbs.txt
new file mode 100644
index 000..35ea5ad
--- /dev/null
+++ b/ee-beta-features/rcfilters_dbs.txt
@@ -0,0 +1,9 @@
+plwiki
+ptwiki
+fawiki
+nlwiki
+ruwiki
+trwiki
+wikidatawiki
+cswiki
+enwiki
--
To view, visit https://gerrit.wikimedia.org/r/342946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c280510aad428e72c8b9d01113d693bcedd0dcc
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-ee-data
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] mediawiki...VisualEditor[master]: Update VE core submodule to master (da310202f)
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/342945 ) Change subject: Update VE core submodule to master (da310202f) .. Update VE core submodule to master (da310202f) New changes: d091c2e5c Refactor rect-from-element computation in FocusableNode into static method 9184a8e8c Update OOjs UI to v0.20.0 a48bac967 ve.ce.Surface: Check delayed sequences when deactivating surface Change-Id: I7ad4b17c6e4ea3fdf4f0fc72e244f875fddc766b --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/45/342945/1 diff --git a/lib/ve b/lib/ve index 41134af..da31020 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 41134af2b6aa511b56459f05cc6d4c0e512d7afe +Subproject commit da310202f73af8b512de47f0686a7e85b5c54054 -- To view, visit https://gerrit.wikimedia.org/r/342945 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ad4b17c6e4ea3fdf4f0fc72e244f875fddc766b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Allow the ORES extension features to be 'on' by default
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342643 )
Change subject: Allow the ORES extension features to be 'on' by default
..
Allow the ORES extension features to be 'on' by default
Introducing $wgOresExtensionStatus, it takes the following values
'on': all ORES extension features are turned on
'beta': (same as current behavior) it adds the beta feature which
can be enabled by individual users
: means it is turned off
Rephrased 'hide probably good edits from rc|watchlist' preferenced
as per the ticket.
Added new preference to control highlighting of potentially damaging edits.
Moved 'oresWatchlistHideNonDamaging' preference to
'watchlist/advancedwatchlist' section.
Bug: T159763
Change-Id: I63b11eff3a4a2f41e38b1a5ea8daaeb4db60a51c
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/Hooks.php
M modules/ext.ores.styles.css
M tests/phpunit/includes/HooksTest.php
6 files changed, 71 insertions(+), 36 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 16c0db0..f22a55a 100644
--- a/extension.json
+++ b/extension.json
@@ -100,6 +100,7 @@
"ORESFetchScoreJob": "ORES\\FetchScoreJob"
},
"config": {
+ "OresExtensionStatus": "on",
"OresBaseUrl": "https://ores.wikimedia.org/";,
"OresExcludeBots": true,
"OresModels": {
diff --git a/i18n/en.json b/i18n/en.json
index 5912924..8cdf211 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -15,8 +15,6 @@
"ores-help-damaging-pref": "This threshold determines how sensitive
ORES is when flagging edits needing review",
"ores-hide-nondamaging-filter": "Hide probably good edits",
"ores-pref-damaging": "ORES sensitivity",
- "ores-pref-rc-hidenondamaging": "Hide probably good edits from recent
changes",
- "ores-pref-watchlist-hidenondamaging": "Hide probably good edits from
the watchlist",
"ores-rcfilters-damaging-title": "Contribution quality predictions",
"ores-rcfilters-damaging-likelygood-label": "Very likely good",
"ores-rcfilters-damaging-likelygood-desc": "Highly accurate at finding
almost all problem-free edits.",
@@ -33,6 +31,9 @@
"ores-rcfilters-goodfaith-maybebad-desc": "Finds most bad-faith edits
but with a lower accuracy.",
"ores-rcfilters-goodfaith-bad-label": "Likely bad faith",
"ores-rcfilters-goodfaith-bad-desc": "With medium accuracy, finds the
most obvious 25% of bad-faith edits.",
+ "ores-pref-highlight": "Highlight probably damaging edits",
+ "ores-pref-rc-hidenondamaging": "Show only edits that may have problems
(and hide probably good edits)",
+ "ores-pref-watchlist-hidenondamaging": "Show only edits that may have
problems (and hide probably good edits)",
"prefs-ores" : "Revision scoring",
"apihelp-query+ores-description": "Return ORES configuration and model
data for this wiki.",
"apihelp-query+ores-example-simple": "Fetch ORES data:",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1a58bfd..5615b1a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -19,6 +19,7 @@
"ores-help-damaging-pref": "Help text for \"ORES sensitivity\" in
preferences",
"ores-hide-nondamaging-filter": "Label for Contributions filter, 'only
show'",
"ores-pref-damaging": "Part asking for damaging threshold",
+ "ores-pref-highlight": "Display message for user preference to enable
highlighting of damaging edits.",
"ores-pref-rc-hidenondamaging": "Display message for user preferences
to make hidenondamaging default in recent changes",
"ores-pref-watchlist-hidenondamaging": "Display message for user
preferences to make hidenondamaging default in the watchlist",
"ores-rcfilters-damaging-title": "Title for the filter group for ORES
damaging score.",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 576d899..3f6260f 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -355,6 +355,9 @@
}
$classes[] = 'damaging';
+ if ( $changesList->getUser()->getBoolOption(
'oresHighlight' ) ) {
+ $classes[] = 'ores-highlight';
+ }
$parts = explode( $separator, $s );
$parts[1] = ChangesList::flag( 'damaging' ) . $parts[1];
$s = implode( $separator, $parts );
@@ -437,6 +440,9 @@
if ( $row->ores_damaging_score > $row->ores_damaging_threshold
) {
// Add the damaging class
$classes[] = 'damaging';
+ if ( $pager->getUser()->getBoolOption( 'oresHighlight'
) ) {
+ $classes[] = 'or
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Undefined global wgCirrusSearchCompletionGeoContextProfiles
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342944 )
Change subject: Undefined global wgCirrusSearchCompletionGeoContextProfiles
..
Undefined global wgCirrusSearchCompletionGeoContextProfiles
Bug: T160569
Change-Id: I67d71217d16cd75a2646cf658cead2c5fd740cd9
---
M wmf-config/CirrusSearch-common.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CirrusSearch-common.php
b/wmf-config/CirrusSearch-common.php
index ed5aa24..9236397 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -256,6 +256,7 @@
if ( !isset( $wgCirrusSearchCompletionGeoContextSettings ) ) {
$wgCirrusSearchCompletionGeoContextSettings = [];
$wgCirrusSearchCacheWarmers = [];
+ $wgCirrusSearchCompletionGeoContextProfiles = [];
}
# Load per realm specific configuration, either:
--
To view, visit https://gerrit.wikimedia.org/r/342944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I67d71217d16cd75a2646cf658cead2c5fd740cd9
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4
Gerrit-Reviewer: 20after4
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Undefined global wgCirrusSearchCompletionGeoContextProfiles
20after4 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342944 )
Change subject: Undefined global wgCirrusSearchCompletionGeoContextProfiles
..
Undefined global wgCirrusSearchCompletionGeoContextProfiles
Bug: T160569
Change-Id: I67d71217d16cd75a2646cf658cead2c5fd740cd9
---
M wmf-config/CirrusSearch-common.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/44/342944/1
diff --git a/wmf-config/CirrusSearch-common.php
b/wmf-config/CirrusSearch-common.php
index ed5aa24..9236397 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -256,6 +256,7 @@
if ( !isset( $wgCirrusSearchCompletionGeoContextSettings ) ) {
$wgCirrusSearchCompletionGeoContextSettings = [];
$wgCirrusSearchCacheWarmers = [];
+ $wgCirrusSearchCompletionGeoContextProfiles = [];
}
# Load per realm specific configuration, either:
--
To view, visit https://gerrit.wikimedia.org/r/342944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I67d71217d16cd75a2646cf658cead2c5fd740cd9
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342943 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
62ce3ad Restore blanked addresses overwritten on merge.
Change-Id: Id9da9e1e2ebd9ac5d3f6af5da04333628e623b53
---
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
1 file changed, 0 insertions(+), 1,375 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
deleted file mode 100644
index 641fc83..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
+++ /dev/null
@@ -1,1375 +0,0 @@
-<<< HEAD (639eb6 Merge branch 'master' of
https://gerrit.wikimedia.org/r/wiki)
-===
-imitateAdminUser();
-$this->doDuckHunt();
-// Run through the merge first to make sure there aren't pre-existing
contacts in the DB
-// that will ruin the tests.
-$this->callAPISuccess('Job', 'process_batch_merge', array('mode' =>
'safe'));
-
-$this->contactID =
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') =>
0));
-$this->contactID2 =
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') =>
1));
- }
-
- public function tearDown() {
-$this->callAPISuccess('Contribution', 'get', array(
- 'contact_id' => array('IN' => array($this->contactID,
$this->contactID2)),
- 'api.Contribution.delete' => 1,
-));
-$this->callAPISuccess('Contact', 'delete', array('id' =>
$this->contactID));
-$this->callAPISuccess('Contact', 'delete', array('id' =>
$this->contactID2));
-parent::tearDown();
- }
-
- /**
- * Test that the merge hook causes our custom fields to not be treated as
conflicts.
- *
- * We also need to check the custom data fields afterwards.
- */
- public function testMergeHook() {
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 10,
- 'currency' => 'USD',
- // Should cause 'is_2014 to be true.
- 'receive_date' => '2014-08-04',
- wmf_civicrm_get_custom_field_name('original_currency') => 'NZD',
- wmf_civicrm_get_custom_field_name('original_amount') => 8,
-));
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID2,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 5,
- 'currency' => 'USD',
- // Should cause 'is_2012_donor to be true.
- 'receive_date' => '2013-01-04',
-));
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID2,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 9,
- 'currency' => 'NZD',
- // Should cause 'is_2015_donor to be true.
- 'receive_date' => '2016-04-04',
-));
-$contact = $this->callAPISuccess('Contact', 'get', array(
- 'id' => $this->contactID,
- 'sequential' => 1,
- 'return' =>
array(wmf_civicrm_get_custom_field_name('lifetime_usd_total'),
wmf_civicrm_get_custom_field_name('do_not_solicit')),
-));
-$this->assertEquals(10,
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
-$result = $this->callAPISuccess('Job', 'process_batch_merge', array(
- 'criteria' => array('contact' => array('id' => array('IN' =>
array($this->contactID, $this->contactID2,
-));
-$this->assertEquals(1, count($result['values']['merged']));
-$contact = $this->callAPISuccess('Contact', 'get', array(
- 'id' => $this->contactID,
- 'sequential' => 1,
- 'return' => array(
-wmf_civicrm_get_custom_field_name('lifetime_usd_total'),
-wmf_civicrm_get_custom_field_name('do_not_solicit'),
-wmf_civicrm_get_custom_field_name('last_donation_amount'),
-wmf_civicrm_get_custom_field_name('last_donation_currency'),
-wmf_civicrm_get_custom_field_name('last_donation_usd'),
-wmf_civicrm_get_custom_field_name('last_donation_date'),
-wmf_civicrm_get_custom_field_name('is_2011_donor'),
-wmf_civicrm_get_custom_field_name('is_2012_donor'),
-wmf_civicrm_get_custom_field_name('is_2013_donor'),
-wmf_civicrm_get_custom_field_name('is_2014_donor'),
-wmf_civicrm_get_custom_field_name('is_2015_donor'),
-wmf_civicrm_get_custom_field_name('is_2016_donor'),
- ),
-));
-$this->assertEquals(24,
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
-$this->assertEquals(1,
$contact['values'][0][wmf_civicrm_get_custom_field_name('do_not_solicit')]);
-$this->as
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Attempted fix for OpenLayers/WikiEditor loading problem
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342895 )
Change subject: Attempted fix for OpenLayers/WikiEditor loading problem
..
Attempted fix for OpenLayers/WikiEditor loading problem
Change-Id: Ic0149ce47c0c1eff244b9a17b0cc65b388d9e8cf
---
M includes/PF_Hooks.php
1 file changed, 13 insertions(+), 7 deletions(-)
Approvals:
Yaron Koren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/PF_Hooks.php b/includes/PF_Hooks.php
index f2859da..b3219e5 100644
--- a/includes/PF_Hooks.php
+++ b/includes/PF_Hooks.php
@@ -65,13 +65,19 @@
* @return bool Always true
*/
public static function registerModules( ResourceLoader &$resourceLoader
) {
+ // These used to use a value of __DIR__ for 'localBasePath',
+ // but apparently in some installations that had a value of
+ // /PageForms/libs and in others just /PageForms, so we'll set
+ // the value here instead.
+ $pageFormsDir = __DIR__ . '/..';
+
if ( class_exists( 'WikiEditorHooks' ) ) {
$resourceLoader->register( array(
'ext.pageforms.wikieditor' => array(
- 'localBasePath' => __DIR__,
+ 'localBasePath' => $pageFormsDir,
'remoteExtPath' => 'PageForms',
- 'scripts' =>
'/../libs/PF_wikieditor.js',
- 'styles' =>
'/../skins/PF_wikieditor.css',
+ 'scripts' => '/libs/PF_wikieditor.js',
+ 'styles' => '/skins/PF_wikieditor.css',
'dependencies' => array(
'ext.pageforms.main',
'jquery.wikiEditor'
@@ -83,9 +89,9 @@
if ( version_compare( $GLOBALS['wgVersion'], '1.26c', '>' ) &&
ExtensionRegistry::getInstance()->isLoaded( 'OpenLayers' ) ) {
$resourceLoader->register( array(
'ext.pageforms.maps' => array(
- 'localBasePath' => __DIR__,
+ 'localBasePath' => $pageFormsDir,
'remoteExtPath' => 'PageForms',
- 'scripts' =>
'/../libs/PF_maps.offline.js',
+ 'scripts' => '/libs/PF_maps.offline.js',
'dependencies' => array(
'ext.openlayers.main',
),
@@ -94,9 +100,9 @@
} else {
$resourceLoader->register( array(
'ext.pageforms.maps' => array(
- 'localBasePath' => __DIR__,
+ 'localBasePath' => $pageFormsDir,
'remoteExtPath' => 'PageForms',
- 'scripts' => '/../libs/PF_maps.js',
+ 'scripts' => '/libs/PF_maps.js',
),
) );
}
--
To view, visit https://gerrit.wikimedia.org/r/342895
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0149ce47c0c1eff244b9a17b0cc65b388d9e8cf
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/PageForms
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] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342943 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
62ce3ad Restore blanked addresses overwritten on merge.
Change-Id: Id9da9e1e2ebd9ac5d3f6af5da04333628e623b53
---
D sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
1 file changed, 0 insertions(+), 1,375 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/43/342943/1
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
deleted file mode 100644
index 641fc83..000
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
+++ /dev/null
@@ -1,1375 +0,0 @@
-<<< HEAD (639eb6 Merge branch 'master' of
https://gerrit.wikimedia.org/r/wiki)
-===
-imitateAdminUser();
-$this->doDuckHunt();
-// Run through the merge first to make sure there aren't pre-existing
contacts in the DB
-// that will ruin the tests.
-$this->callAPISuccess('Job', 'process_batch_merge', array('mode' =>
'safe'));
-
-$this->contactID =
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') =>
0));
-$this->contactID2 =
$this->breedDuck(array(wmf_civicrm_get_custom_field_name('do_not_solicit') =>
1));
- }
-
- public function tearDown() {
-$this->callAPISuccess('Contribution', 'get', array(
- 'contact_id' => array('IN' => array($this->contactID,
$this->contactID2)),
- 'api.Contribution.delete' => 1,
-));
-$this->callAPISuccess('Contact', 'delete', array('id' =>
$this->contactID));
-$this->callAPISuccess('Contact', 'delete', array('id' =>
$this->contactID2));
-parent::tearDown();
- }
-
- /**
- * Test that the merge hook causes our custom fields to not be treated as
conflicts.
- *
- * We also need to check the custom data fields afterwards.
- */
- public function testMergeHook() {
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 10,
- 'currency' => 'USD',
- // Should cause 'is_2014 to be true.
- 'receive_date' => '2014-08-04',
- wmf_civicrm_get_custom_field_name('original_currency') => 'NZD',
- wmf_civicrm_get_custom_field_name('original_amount') => 8,
-));
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID2,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 5,
- 'currency' => 'USD',
- // Should cause 'is_2012_donor to be true.
- 'receive_date' => '2013-01-04',
-));
-$this->callAPISuccess('Contribution', 'create', array(
- 'contact_id' => $this->contactID2,
- 'financial_type_id' => 'Cash',
- 'total_amount' => 9,
- 'currency' => 'NZD',
- // Should cause 'is_2015_donor to be true.
- 'receive_date' => '2016-04-04',
-));
-$contact = $this->callAPISuccess('Contact', 'get', array(
- 'id' => $this->contactID,
- 'sequential' => 1,
- 'return' =>
array(wmf_civicrm_get_custom_field_name('lifetime_usd_total'),
wmf_civicrm_get_custom_field_name('do_not_solicit')),
-));
-$this->assertEquals(10,
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
-$result = $this->callAPISuccess('Job', 'process_batch_merge', array(
- 'criteria' => array('contact' => array('id' => array('IN' =>
array($this->contactID, $this->contactID2,
-));
-$this->assertEquals(1, count($result['values']['merged']));
-$contact = $this->callAPISuccess('Contact', 'get', array(
- 'id' => $this->contactID,
- 'sequential' => 1,
- 'return' => array(
-wmf_civicrm_get_custom_field_name('lifetime_usd_total'),
-wmf_civicrm_get_custom_field_name('do_not_solicit'),
-wmf_civicrm_get_custom_field_name('last_donation_amount'),
-wmf_civicrm_get_custom_field_name('last_donation_currency'),
-wmf_civicrm_get_custom_field_name('last_donation_usd'),
-wmf_civicrm_get_custom_field_name('last_donation_date'),
-wmf_civicrm_get_custom_field_name('is_2011_donor'),
-wmf_civicrm_get_custom_field_name('is_2012_donor'),
-wmf_civicrm_get_custom_field_name('is_2013_donor'),
-wmf_civicrm_get_custom_field_name('is_2014_donor'),
-wmf_civicrm_get_custom_field_name('is_2015_donor'),
-wmf_civicrm_get_custom_field_name('is_2016_donor'),
- ),
-));
-$this->assertEquals(24,
$contact['values'][0][wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
-$this->assertEquals(1,
$contact['values'][0][wmf_civicrm_get_custom_field_name('do_not_solicit')]);
-
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Fire 'wikipedia.content' hook when updating th...
Mooeypoo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/342930 ) Change subject: RCFilters UI: Fire 'wikipedia.content' hook when updating the fieldset .. RCFilters UI: Fire 'wikipedia.content' hook when updating the fieldset Bug: T157594 Change-Id: I12946be6ed6cd7ef60e87fa3576fda42f7005fb6 --- M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/30/342930/1 diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js index d786025..73816ed 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js @@ -101,6 +101,8 @@ // Replace the entire fieldset this.$element.empty().append( $fieldset.contents() ); + // Make sure enhanced RC re-initializes correctly + mw.hook( 'wikipage.content' ).fire( this.$element ); this.cleanUpFieldset(); -- To view, visit https://gerrit.wikimedia.org/r/342930 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12946be6ed6cd7ef60e87fa3576fda42f7005fb6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Mooeypoo ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: ve.ce.Surface: Check delayed sequences when deactivating sur...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342875 )
Change subject: ve.ce.Surface: Check delayed sequences when deactivating surface
..
ve.ce.Surface: Check delayed sequences when deactivating surface
This allows complete delayed sequences to be executed also when the user
opens a dialog. Follow-up to 32759ae861bb92783315ff89a41d9cdfe4ce4f34.
Bug: T117165
Change-Id: I2af0a738afa43295bf6d7d612cac4349bc6cd20d
---
M src/ce/ve.ce.Surface.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index d17aa32..e3fabf0 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -591,6 +591,7 @@
// until the surface is activated
this.surfaceObserver.disable();
this.deactivated = true;
+ this.checkDelayedSequences();
// Remove ranges so the user can't accidentally type into the
document
this.nativeSelection.removeAllRanges();
this.updateDeactivatedSelection();
@@ -2956,7 +2957,7 @@
model = this.getModel(),
selection = this.getSelection();
- if ( !selection.isNativeCursor() ) {
+ if ( this.deactivated || !selection.isNativeCursor() ) {
matchingSequences = [];
} else {
matchingSequences =
this.getSurface().sequenceRegistry.findMatching( model.getDocument().data,
selection.getModel().getCoveringRange().end );
--
To view, visit https://gerrit.wikimedia.org/r/342875
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2af0a738afa43295bf6d7d612cac4349bc6cd20d
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Restore blanked addresses overwritten on merge.
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342554 )
Change subject: Restore blanked addresses overwritten on merge.
..
Restore blanked addresses overwritten on merge.
I feel like this is a pretty cautious approach to restoring the simplest cases
where
blank addresses overwrote real addresses.
As this took a long time at low load I put it in a drush script for scheduling,
rather
than an upgrade script
drush civicrm-repair-address
Bug: T159408
Change-Id: Ia10d5095073afb652b552d9af5c36b8f204d1d90
---
A sites/all/modules/wmf_civicrm/scripts/civicrm_repair_blank_addresses.drush.inc
M sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
A sites/all/modules/wmf_civicrm/update_restore_addresses.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
4 files changed, 410 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git
a/sites/all/modules/wmf_civicrm/scripts/civicrm_repair_blank_addresses.drush.inc
b/sites/all/modules/wmf_civicrm/scripts/civicrm_repair_blank_addresses.drush.inc
new file mode 100644
index 000..6591ab9
--- /dev/null
+++
b/sites/all/modules/wmf_civicrm/scripts/civicrm_repair_blank_addresses.drush.inc
@@ -0,0 +1,80 @@
+ 'Repair address lost on blank merging over a valid
address',
+'options' => array(
+ 'batch' => "Batch size",
+ 'threshold' => 'Threshold for aborting. If there are more than this
number of contributions in the threshold period then abort.',
+ 'threshold_period' => 'Number of minutes in the threshold period',
+),
+ );
+
+ return $items;
+}
+
+/**
+ * Implementation of hook_drush_help().
+ */
+function civicrm_repair_blank_addresses_drush_help($section) {
+ switch ( $section ) {
+ case 'drush:civicrm-repair-address':
+return dt('Repair addresses where blank emails have merged over real
emails');
+ }
+}
+
+/**
+ * Repair addresses on a bunch of contacts.
+ *
+ * We are rolling back a situation where a contact with a blank address was
merged into
+ * a contact with valid address data, and overwrote the valid data. Blank
address data
+ * was common until early 2017.
+ *
+ * On staging this script took a very long time so moving to drush so it can
run in batches.
+ *
+ * @throws \CiviCRM_API3_Exception
+ */
+function drush_civicrm_repair_blank_addresses_civicrm_repair_address() {
+ module_invoke('civicrm', 'initialize');
+
+ // This threshold stuff is a bit cheaty since I'm leveraging another drush
file function.
+ // OTOH this should be a temporary script & maybe no-one will spot it
+ require_once 'civicrm_merge.drush.inc';
+ $threshold = (int) drush_get_option('threshold');
+ if ($threshold) {
+$thresholdNumberOfMinutes = (int) drush_get_option('threshold_period', 5);
+if (_drush_civicrm_queue_is_backed_up($threshold,
$thresholdNumberOfMinutes)) {
+ return;
+}
+ }
+
+ $startVariableName = 'civicrm_repair_address_last_processed_id';
+ $start = variable_get($startVariableName, 1);
+ $batch_size = (integer) drush_get_option('batch', 5000);
+ $maxAffectedID = CRM_Core_DAO::singleValueQuery("
+SELECT max(id) FROM civicrm_address
+WHERE street_address IS NULL
+ AND city IS NULL
+ AND postal_code IS NULL
+ AND state_province_id IS NULL
+ AND country_id IS NULL
+ AND id > $start
+ ");
+
+ if (empty($maxAffectedID)) {
+watchdog('civicrm_repair_address', 'No more addresses to process');
+return;
+ }
+
+ watchdog('civicrm_repair_address', 'Repairing up to %batch addresses from
address id %start', array('%start' => $start, '%batch' => $batch_size),
WATCHDOG_INFO);
+ require_once __DIR__ . '/../update_restore_addresses.php';
+ $highestRepairedID = repair_lost_addresses_batch($batch_size, $start);
+
+ variable_set($startVariableName, $highestRepairedID);
+ watchdog('civicrm_repair_address', 'Repaired address range: %start to %end',
array('%start' => $start, '%end' => $highestRepairedID), WATCHDOG_INFO);
+ drush_print("Processed id range $start to " . $highestRepairedID);
+}
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
index 5263d4f..7e449c1 100644
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
@@ -1226,4 +1226,147 @@
return $contact['id'];
}
+ /**
+ * Test recovery where a blank email has overwritten a non-blank email on
merge.
+ *
+ * In this case an email existed during merge that held no data. It was used
+ * on the merge, but now we want the lost data.
+ */
+ public function testRepairBlankedAddressOnMerge() {
+$this->prepareForBlankAddressTests();
+$this->replicateBlankedAddress();
+
+$address = $this->callAPISuccessGetSingle('Address', array('contact_id' =>
$this->contactID));
+
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Temp fix for wmf.16: define wgCirrusSearchCacheWarmers
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342914 )
Change subject: Temp fix for wmf.16: define wgCirrusSearchCacheWarmers
..
Temp fix for wmf.16: define wgCirrusSearchCacheWarmers
This variable was also removed, apparently.
Followup to I489c4aa1b862f053b0cb385d509f9ac5f8c6deca
Bug: T160569
Change-Id: Iad984924671b499aea19ef536ec6367e73a84a7c
---
M wmf-config/CirrusSearch-common.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CirrusSearch-common.php
b/wmf-config/CirrusSearch-common.php
index 05dd056..ed5aa24 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -255,6 +255,7 @@
// lang detection asking for this variable from wmf.15 to wmf.16 wikis.
if ( !isset( $wgCirrusSearchCompletionGeoContextSettings ) ) {
$wgCirrusSearchCompletionGeoContextSettings = [];
+ $wgCirrusSearchCacheWarmers = [];
}
# Load per realm specific configuration, either:
--
To view, visit https://gerrit.wikimedia.org/r/342914
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad984924671b499aea19ef536ec6367e73a84a7c
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4
Gerrit-Reviewer: 20after4
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Don't load VE or NWE on lint-targetted pages (until that works)
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/342915 ) Change subject: Don't load VE or NWE on lint-targetted pages (until that works) .. Don't load VE or NWE on lint-targetted pages (until that works) Bug: T160102 Change-Id: Ibb364ff2d89975d5907fa887cca666eee6e78d37 --- M VisualEditor.hooks.php M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/15/342915/1 diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php index 1e8a206..a535d34 100644 --- a/VisualEditor.hooks.php +++ b/VisualEditor.hooks.php @@ -156,6 +156,7 @@ isset( $params['preload'] ) || isset( $params['preloadtitle'] ) || isset( $params['preloadparams'] ) || + isset( $params['lintid'] ) || isset( $params['veswitched'] ); // Known-good parameters: edit, veaction, section diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js index ff49d26..95fcf74 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js +++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js @@ -865,6 +865,7 @@ uri.query.preload === undefined && uri.query.preloadtitle === undefined && uri.query.preloadparams === undefined && + uri.query.lintid === undefined && uri.query.veswitched === undefined // Known-good parameters: edit, veaction, section // TODO: other params too? See identical list in VisualEditor.hooks.php) -- To view, visit https://gerrit.wikimedia.org/r/342915 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb364ff2d89975d5907fa887cca666eee6e78d37 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Temp fix for wmf.16: define wgCirrusSearchCacheWarmers
20after4 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342914 )
Change subject: Temp fix for wmf.16: define wgCirrusSearchCacheWarmers
..
Temp fix for wmf.16: define wgCirrusSearchCacheWarmers
This variable was also removed, apparently.
Followup to I489c4aa1b862f053b0cb385d509f9ac5f8c6deca
Bug: T160569
Change-Id: Iad984924671b499aea19ef536ec6367e73a84a7c
---
M wmf-config/CirrusSearch-common.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/14/342914/1
diff --git a/wmf-config/CirrusSearch-common.php
b/wmf-config/CirrusSearch-common.php
index 05dd056..32cf1d2 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -255,6 +255,7 @@
// lang detection asking for this variable from wmf.15 to wmf.16 wikis.
if ( !isset( $wgCirrusSearchCompletionGeoContextSettings ) ) {
$wgCirrusSearchCompletionGeoContextSettings = [];
+$wgCirrusSearchCacheWarmers = [];
}
# Load per realm specific configuration, either:
--
To view, visit https://gerrit.wikimedia.org/r/342914
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad984924671b499aea19ef536ec6367e73a84a7c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Allow everyone to remove their own avatar via Special:Remove...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339926 )
Change subject: Allow everyone to remove their own avatar via
Special:RemoveAvatar
..
Allow everyone to remove their own avatar via Special:RemoveAvatar
Previously users without the 'avatarremove' user right couldn't remove
their own avatar cleanly and their only option (besides asking a
privileged user to remove the avatar) was to save a copy of the default
avatar and upload it to the wiki via Special:UploadAvatar. Obviously this
was far from ideal as the workflow was unnecessarily complex *and* it
resulted in lots of duplicated files on the server.
Bug: T158713
Change-Id: I4e16ab42b6101b7301d04a896d98e99bd91e306a
---
M UserProfile/SpecialRemoveAvatar.php
M UserProfile/i18n/en.json
M UserProfile/i18n/fi.json
3 files changed, 106 insertions(+), 38 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UserProfile/SpecialRemoveAvatar.php
b/UserProfile/SpecialRemoveAvatar.php
index 474f289..8fff99e 100644
--- a/UserProfile/SpecialRemoveAvatar.php
+++ b/UserProfile/SpecialRemoveAvatar.php
@@ -1,6 +1,8 @@
getUser()->isAllowed( 'avatarremove' ) ) {
+ return $this->msg( 'removeavatar' )->plain();
+ } else {
+ return $this->msg( 'removeavatar-remove-my-avatar'
)->plain();
+ }
+ }
+
+ /**
* Show the special page
*
* @param $user Mixed: parameter passed to the page or null
*/
public function execute( $par ) {
- global $wgUploadAvatarInRecentChanges;
-
$out = $this->getOutput();
$request = $this->getRequest();
$user = $this->getUser();
+ $userIsPrivileged = $user->isAllowed( 'avatarremove' );
+
// If the user isn't logged in, display an error
if ( !$user->isLoggedIn() ) {
- $this->displayRestrictionError();
- return;
- }
-
- // If the user doesn't have 'avatarremove' permission, display
an error
- if ( !$user->isAllowed( 'avatarremove' ) ) {
$this->displayRestrictionError();
return;
}
@@ -64,42 +74,40 @@
// Set the page title, robot policies, etc.
$this->setHeaders();
- $out->setPageTitle( $this->msg( 'avatarupload-removeavatar'
)->plain() );
+ if ( $userIsPrivileged ) {
+ $pageTitle = $this->msg( 'avatarupload-removeavatar'
)->plain();
+ } else {
+ $pageTitle = $this->msg(
'removeavatar-remove-your-avatar' )->plain();
+ }
+ $out->setPageTitle( $pageTitle );
- if ( $request->getVal( 'user' ) != '' ) {
+ if ( $userIsPrivileged && $request->getVal( 'user' ) != '' ) {
$out->redirect( $this->getPageTitle()->getFullURL() .
'/' . $request->getVal( 'user' ) );
+ }
+
+ // If the user isn't allowed to delete everyone's avatars, only
let
+ // them remove their own avatar
+ if ( !$userIsPrivileged ) {
+ $par = $user->getName();
}
// If the request was POSTed, then delete the avatar
if ( $request->wasPosted() ) {
- $user_id = $request->getInt( 'user_id' );
- $user_deleted = User::newFromId( $user_id );
-
- $this->deleteImage( $user_id, 's' );
- $this->deleteImage( $user_id, 'm' );
- $this->deleteImage( $user_id, 'l' );
- $this->deleteImage( $user_id, 'ml' );
-
- $log = new LogPage( 'avatar' );
- if ( !$wgUploadAvatarInRecentChanges ) {
- $log->updateRecentChanges = false;
- }
- $log->addEntry(
- 'avatar',
- $user->getUserPage(),
- $this->msg(
'user-profile-picture-log-delete-entry', $user_deleted->getName() )
- ->inContentLanguage()->text()
- );
+ $this->onSubmit();
$out->addHTML(
'' .
$this->msg( 'avatarupload-removesuccess'
)->plain() .
''
);
- $out->addHTML(
- '' .
- $this->msg(
'avatarupload-removeanother' )->plain() .
-
[MediaWiki-commits] [Gerrit] mediawiki...SpamBlacklist[master]: Fix improper index access in event logging code
Milimetric has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/342913 ) Change subject: Fix improper index access in event logging code .. Fix improper index access in event logging code Bug: T115119 Change-Id: I8ebfb7dc9e513aa949cfc287d1a68b23f69d2784 --- M SpamBlacklist_body.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SpamBlacklist refs/changes/13/342913/1 diff --git a/SpamBlacklist_body.php b/SpamBlacklist_body.php index a72970c..5dc807d 100644 --- a/SpamBlacklist_body.php +++ b/SpamBlacklist_body.php @@ -252,9 +252,9 @@ 'action' => $action, 'protocol' => $parsed['scheme'], 'domain' => $parsed['host'], - 'path' => $parsed['path'] !== null ? $parsed['path'] : '', - 'query' => $parsed['query'] !== null ? $parsed['query'] : '', - 'fragment' => $parsed['fragment'] !== null ? $parsed['fragment'] : '', + 'path' => isset( $parsed['path'] ) ? $parsed['path'] : '', + 'query' => isset( $parsed['query'] ) ? $parsed['query'] : '', + 'fragment' => isset( $parsed['fragment'] ) ? $parsed['fragment'] : '', ); $this->urlChangeLog[] = $info; -- To view, visit https://gerrit.wikimedia.org/r/342913 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8ebfb7dc9e513aa949cfc287d1a68b23f69d2784 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SpamBlacklist Gerrit-Branch: master Gerrit-Owner: Milimetric ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Use empty 'ca' directive, not 'cert'
Eevans has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/342912 ) Change subject: Use empty 'ca' directive, not 'cert' .. Use empty 'ca' directive, not 'cert' Bug: T13 Change-Id: I4305a26fb484fd55ed69f48720219feabcf9c410 --- M hieradata/regex.yaml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/12/342912/1 diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml index 59ebd70..8ff515d 100644 --- a/hieradata/regex.yaml +++ b/hieradata/regex.yaml @@ -203,7 +203,7 @@ cassandra::target_version: '2.2' cassandra::client_encryption_enabled: true restbase::cassandra_tls: -cert: /dev/null +ca: /dev/null cassandra_test_codfw: __regex: !ruby/regexp /^restbase-test200[1-3]\.codfw\.wmnet$/ @@ -292,7 +292,7 @@ cassandra::target_version: '2.2' cassandra::client_encryption_enabled: true restbase::cassandra_tls: -cert: /dev/null +ca: /dev/null restbase_dev_eqiad: __regex: !ruby/regexp /^restbase-dev100[1-3]\.eqiad\.wmnet$/ -- To view, visit https://gerrit.wikimedia.org/r/342912 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4305a26fb484fd55ed69f48720219feabcf9c410 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Eevans ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...InterwikiSorting[master]: Use ExtensionFunctions instead of BeforeInitialize hook
Addshore has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342911 )
Change subject: Use ExtensionFunctions instead of BeforeInitialize hook
..
Use ExtensionFunctions instead of BeforeInitialize hook
Bug: T160465
Change-Id: Ib47938781b1b6ee8c73ac57aacf1daea8a112f7f
---
M extension.json
M src/InterwikiSortingHooks.php
M tests/phpunit/InterwikiSortingHooksTest.php
3 files changed, 7 insertions(+), 19 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/InterwikiSorting
refs/changes/11/342911/1
diff --git a/extension.json b/extension.json
index 2df926e..d9a3600 100644
--- a/extension.json
+++ b/extension.json
@@ -24,11 +24,9 @@
"InterwikiSorting\\InterwikiSortingHooks":
"src/InterwikiSortingHooks.php",
"InterwikiSorting\\InterwikiSortingHookHandlers":
"src/InterwikiSortingHookHandlers.php"
},
- "Hooks": {
- "BeforeInitialize": [
-
"InterwikiSorting\\InterwikiSortingHooks::onBeforeInitialize"
- ]
- },
+ "ExtensionFunctions": [
+ "InterwikiSorting\\InterwikiSortingHooks::registerHook"
+ ],
"MessagesDirs": {
"InterwikiSorting": [
"i18n"
diff --git a/src/InterwikiSortingHooks.php b/src/InterwikiSortingHooks.php
index 5db5e21..671d43e 100644
--- a/src/InterwikiSortingHooks.php
+++ b/src/InterwikiSortingHooks.php
@@ -28,9 +28,7 @@
$handler->doContentAlterParserOutput( $title, $parserOutput );
}
- public static function onBeforeInitialize(
- /* Deliberately ignore all params ( We dont need them ) */
- ) {
+ public static function registerHook() {
global $wgHooks;
/**
diff --git a/tests/phpunit/InterwikiSortingHooksTest.php
b/tests/phpunit/InterwikiSortingHooksTest.php
index 2c06d3f..1f36891 100644
--- a/tests/phpunit/InterwikiSortingHooksTest.php
+++ b/tests/phpunit/InterwikiSortingHooksTest.php
@@ -16,21 +16,13 @@
class InterwikiSortingHooksTest extends MediaWikiTestCase {
public function testHooksAreCorrectlyRegistered() {
- $initHook = InterwikiSortingHooks::class .
'::onBeforeInitialize';
- $finalHook = InterwikiSortingHooks::class.
'::onContentAlterParserOutput';
-
- // Make sure the first hook has been registered
- $this->assertContains( $initHook, Hooks::getHandlers(
'BeforeInitialize' ) );
-
- // Fire the init hook which should register the second hook.
- // In PHP7 we could just do $initHook();
- InterwikiSortingHooks::onBeforeInitialize();
+ $expectedHook = InterwikiSortingHooks::class.
'::onContentAlterParserOutput';
// Make sure that the hook has been registered and is at the
end of the list.
$onContentAlterParserOutputHooks = Hooks::getHandlers(
'ContentAlterParserOutput' );
- $this->assertContains( $finalHook,
$onContentAlterParserOutputHooks );
+ $this->assertContains( $expectedHook,
$onContentAlterParserOutputHooks );
$this->assertEquals(
- $finalHook,
+ $expectedHook,
end( $onContentAlterParserOutputHooks ),
'Hook should be the last to be fired'
);
--
To view, visit https://gerrit.wikimedia.org/r/342911
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib47938781b1b6ee8c73ac57aacf1daea8a112f7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InterwikiSorting
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Keep variable around that was removed in wmf.16
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342907 )
Change subject: Keep variable around that was removed in wmf.16
..
Keep variable around that was removed in wmf.16
This variable was removed in wmf.16, but wmf.15 wikis can still ask for
it from wmf.16 wikis when interwiki search based on language detection
decides we should ask for more results from a wmf.15 wiki.
Default it to empty to prevent errors from occuring.
Bug: T160569
Change-Id: I489c4aa1b862f053b0cb385d509f9ac5f8c6deca
---
M wmf-config/CirrusSearch-common.php
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
20after4: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CirrusSearch-common.php
b/wmf-config/CirrusSearch-common.php
index c242703..05dd056 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -251,6 +251,12 @@
'merge.scheduler.max_thread_count' => 1,
];
+// Temp hax for variable that was removed, due to interwiki search based on
+// lang detection asking for this variable from wmf.15 to wmf.16 wikis.
+if ( !isset( $wgCirrusSearchCompletionGeoContextSettings ) ) {
+ $wgCirrusSearchCompletionGeoContextSettings = [];
+}
+
# Load per realm specific configuration, either:
# - CirrusSearch-labs.php
# - CirrusSearch-production.php
--
To view, visit https://gerrit.wikimedia.org/r/342907
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I489c4aa1b862f053b0cb385d509f9ac5f8c6deca
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: 20after4
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Upgrade mediawiki_selenium in bundle
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/342908 ) Change subject: Upgrade mediawiki_selenium in bundle .. Upgrade mediawiki_selenium in bundle Change-Id: I976f1e765ded9575fe7c95a9faa548e29f57f9fd --- M Gemfile M Gemfile.lock 2 files changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups refs/changes/08/342908/1 diff --git a/Gemfile b/Gemfile index f5ffd86..620d463 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,6 @@ gem 'chunky_png', '~> 1.3.4' gem 'jsduck', '~> 5.3.4' -gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' +gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.2' gem 'rake', '~> 10.4', '>= 10.4.2' gem 'rubocop', '~> 0.29.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 5703a5d..932bbc3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,9 +116,6 @@ DEPENDENCIES chunky_png (~> 1.3.4) jsduck (~> 5.3.4) - mediawiki_selenium (~> 1.7, >= 1.7.1) + mediawiki_selenium (~> 1.7, >= 1.7.2) rake (~> 10.4, >= 10.4.2) rubocop (~> 0.29.1) - -BUNDLED WITH - 1.12.5 -- To view, visit https://gerrit.wikimedia.org/r/342908 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I976f1e765ded9575fe7c95a9faa548e29f57f9fd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Popups 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] wikimedia...SmashPig[master]: PayPal subscription message normalization
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/341595 )
Change subject: PayPal subscription message normalization
..
PayPal subscription message normalization
Normalize subscr_ messages in SmashPig instead of the consumer.
Bug: T107372
Change-Id: I03c0124b05988370f66ce2464a7fe77864c0f16d
---
M PaymentProviders/PayPal/SubscriptionMessage.php
M PaymentProviders/PayPal/Tests/Data/subscr_payment.json
M PaymentProviders/PayPal/Tests/Data/subscr_payment_transformed.json
M PaymentProviders/PayPal/Tests/Data/subscr_signup.json
M PaymentProviders/PayPal/Tests/Data/subscr_signup_transformed.json
5 files changed, 153 insertions(+), 80 deletions(-)
Approvals:
jenkins-bot: Verified
Awight: Looks good to me, approved
diff --git a/PaymentProviders/PayPal/SubscriptionMessage.php
b/PaymentProviders/PayPal/SubscriptionMessage.php
index c825baf..33dadde 100644
--- a/PaymentProviders/PayPal/SubscriptionMessage.php
+++ b/PaymentProviders/PayPal/SubscriptionMessage.php
@@ -5,7 +5,112 @@
class SubscriptionMessage extends Message {
public static function normalizeMessage( &$message, $ipnMessage ) {
- // Preserve existing logic for now
- $message = $ipnMessage;
+
+ $message['recurring'] = "1";
+
+ if ( isset( $ipnMessage['payment_date'] ) ) {
+ $message['date'] = strtotime(
$ipnMessage['payment_date'] );
+ }
+
+ // the subscription id
+ $message['subscr_id'] = $ipnMessage['subscr_id'];
+ $message['txn_type'] = $ipnMessage['txn_type'];
+ $message['email'] = $ipnMessage['payer_email'];
+
+ // Contact info
+ if ( $ipnMessage['txn_type'] === 'subscr_signup' ||
$ipnMessage['txn_type'] === 'subscr_payment' || $ipnMessage['txn_type'] ===
'subscr_modify' ) {
+ $message['first_name'] = $ipnMessage['first_name'];
+ $message['middle_name'] = '';
+ $message['last_name'] = $ipnMessage['last_name'];
+
+ if ( isset( $ipnMessage['address_street'] ) ) {
+ $split = explode("\n", str_replace("\r", '',
$ipnMessage['address_street']));
+ $message['street_address'] = $split[0];
+ if ( count( $split ) > 1 ) {
+ $message['supplemental_address_1'] =
$split[1];
+ }
+ $message['city'] = $ipnMessage['address_city'];
+ $message['state_province'] =
$ipnMessage['address_state'];
+ $message['country'] =
$ipnMessage['address_country_code'];
+ $message['postal_code'] =
$ipnMessage['address_zip'];
+
+ } elseif ( isset( $ipnMessage['residence_country'] ) ) {
+ $message['country'] =
$ipnMessage['residence_country'];
+ }
+ }
+
+ // payment-specific message handling
+ if ( $ipnMessage['txn_type'] == 'subscr_payment' ) {
+
+ $message['gateway_txn_id'] = $ipnMessage['txn_id'];
+ $message['currency'] = $ipnMessage['mc_currency'];
+ $message['gross'] = $ipnMessage['mc_gross'];
+ $message['fee'] = $ipnMessage['mc_fee'];
+ } else {
+
+ // break the period out for civicrm
+ if( isset( $ipnMessage['period3'] ) ) {
+ // map paypal period unit to civicrm period
units
+ $period_map = array(
+ 'm' => 'month',
+ 'd' => 'day',
+ 'w' => 'week',
+ 'y' => 'year',
+ );
+
+ $period = explode( " ", $ipnMessage['period3']
);
+ $message['frequency_interval'] = $period[0];
+ $message['frequency_unit'] =
$period_map[strtolower( $period[1] )];
+ }
+
+ if ( isset( $ipnMessage['recur_times'] ) ) {
+ $message['installments'] =
$ipnMessage['recur_times'];
+ } else {
+ // forever
+ $message['installments'] = 0;
+ }
+
+ if ( isset( $ipnMessage['amount3'] ) ) {
+ $message['gross'] = $ipnMessage['amount3'];
+ } elseif ( isset( $ipnMessage['mc_amount3'] ) ) {
+ $me
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Keep variable around that was removed in wmf.16
EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342907 )
Change subject: Keep variable around that was removed in wmf.16
..
Keep variable around that was removed in wmf.16
This variable was removed in wmf.16, but wmf.15 wikis can still ask for
it from wmf.16 wikis when interwiki search based on language detection
decides we should ask for more results from a wmf.15 wiki.
Default it to empty to prevent errors from occuring.
Bug: T160569
Change-Id: I489c4aa1b862f053b0cb385d509f9ac5f8c6deca
---
M wmf-config/CirrusSearch-common.php
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/07/342907/1
diff --git a/wmf-config/CirrusSearch-common.php
b/wmf-config/CirrusSearch-common.php
index 5e860d7..d6a3902 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -241,6 +241,12 @@
'merge.scheduler.max_thread_count' => 1,
];
+// Temp hax for variable that was removed, due to interwiki search based on
+// lang detection asking for this variable from wmf.15 to wmf.16 wikis.
+if ( !isset( $wgCirrusSearchCompletionGeoContextSettings ) ) {
+ $wgCirrusSearchCompletionGeoContextSettings = [];
+}
+
# Load per realm specific configuration, either:
# - CirrusSearch-labs.php
# - CirrusSearch-production.php
--
To view, visit https://gerrit.wikimedia.org/r/342907
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I489c4aa1b862f053b0cb385d509f9ac5f8c6deca
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Move db1067 from s2 to s1 as a db1057 replacement
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342906 ) Change subject: Move db1067 from s2 to s1 as a db1057 replacement .. Move db1067 from s2 to s1 as a db1057 replacement Bug: T160435 Change-Id: I9042dbadaf8deedf6bab560f6c7ec2420a881bb9 --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Jcrespo: Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 0a6a582..9ab7b6f 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -94,7 +94,8 @@ 'sectionLoads' => [ 's1' => [ 'db1052' => 0, # B3 2.8TB 96GB, master -# 'db1057' => 0, # C2 2.8TB 96GB, old master +# 'db1067' => 0, # D1 2.8TB 160GB, old master +# 'db1057' => 0, # C2 2.8TB 96GB, down, T160435 'db1051' => 50, # B3 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1055' => 50, # C2 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1065' => 0, # D1 2.8TB 160GB, vslow, dump, master for sanitarium @@ -113,7 +114,6 @@ 'db1054' => 1, # A3 2.8TB 96GB, api 'db1060' => 1, # C2 2.8TB 96GB, api # 'db1063' => 0, # D1 2.8TB 128GB -# 'db1067' => 0, # D1 2.8TB 160GB 'db1074' => 500, # A2 3.6TB 512GB 'db1076' => 500, # B1 3.6TB 512GB 'db1090' => 500, # C3 3.6TB 512GB -- To view, visit https://gerrit.wikimedia.org/r/342906 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9042dbadaf8deedf6bab560f6c7ec2420a881bb9 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit: rm role class gerrit::migration
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342902 )
Change subject: gerrit: rm role class gerrit::migration
..
gerrit: rm role class gerrit::migration
This class was just used temporarily for a migration.
Similar to lists::migration (Change-Id: I65ff7731977e0),
do not keep it around just in case it might be used again in the future.
Change-Id: I974460e29577292babaa087d90d2daac11c2dacf
---
D modules/role/manifests/gerrit/migration.pp
1 file changed, 0 insertions(+), 19 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/role/manifests/gerrit/migration.pp
b/modules/role/manifests/gerrit/migration.pp
deleted file mode 100644
index b328218..000
--- a/modules/role/manifests/gerrit/migration.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-class role::gerrit::migration {
-
-$sourceip='208.80.154.82'
-
-ferm::service { 'gerrit-migration-rsync':
-proto => 'tcp',
-port => '873',
-srange => "${sourceip}/32",
-}
-
-include rsync::server
-
-rsync::server::module { 'srv-gerrit':
-path=> '/srv/gerrit',
-read_only => 'no',
-hosts_allow => $sourceip,
-}
-
-}
--
To view, visit https://gerrit.wikimedia.org/r/342902
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I974460e29577292babaa087d90d2daac11c2dacf
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move db1067 from s2 to s1 as a db1057 replacement
Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342905 )
Change subject: Move db1067 from s2 to s1 as a db1057 replacement
..
Move db1067 from s2 to s1 as a db1057 replacement
Bug: T160435
Change-Id: I84aaf055b729ae23bde4fcf156a8121a3496513d
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 2daf809..84e67bf 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -383,7 +383,7 @@
}
}
-node /^db10(51|55|57|66|72|73|80|83|89)\.eqiad\.wmnet/ {
+node /^db10(51|55|57|66|67|72|73|80|83|89)\.eqiad\.wmnet/ {
class { '::role::mariadb::core':
shard => 's1',
}
@@ -424,7 +424,7 @@
}
}
-node /^db10(21|24|36|54|60|63|67|74|76|90)\.eqiad\.wmnet/ {
+node /^db10(21|24|36|54|60|63|74|76|90)\.eqiad\.wmnet/ {
class { '::role::mariadb::core':
shard => 's2',
}
--
To view, visit https://gerrit.wikimedia.org/r/342905
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I84aaf055b729ae23bde4fcf156a8121a3496513d
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Jcrespo
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
