[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Allow special character items to be marked as source mode only
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357385 )
Change subject: Allow special character items to be marked as source mode only
..
Allow special character items to be marked as source mode only
Anything with the property "source": true will only be shown in
source mode, and will be styled accordingly (smaller monospace font).
Also introduces the "string" property so that simple insertions
can be tagged as source-only.
e.g.
{
"": ""
}
->
{
"": {
"string": "",
"source": true
}
}
Bug: T154113
Change-Id: Idbd9eb30f24386fcd3de3095126259c1419413a1
---
M src/ui/dialogs/ve.ui.SpecialCharacterDialog.js
M src/ui/pages/ve.ui.SpecialCharacterPage.js
M src/ui/styles/dialogs/ve.ui.SpecialCharacterDialog.css
3 files changed, 23 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/85/357385/1
diff --git a/src/ui/dialogs/ve.ui.SpecialCharacterDialog.js
b/src/ui/dialogs/ve.ui.SpecialCharacterDialog.js
index 28daa25..85bcb2f 100644
--- a/src/ui/dialogs/ve.ui.SpecialCharacterDialog.js
+++ b/src/ui/dialogs/ve.ui.SpecialCharacterDialog.js
@@ -124,7 +124,8 @@
this.pages.push(
new ve.ui.SpecialCharacterPage( category, {
label: category,
- characters: this.characters[ category ]
+ characters: this.characters[ category ],
+ source: this.surface.getMode() === 'source'
} )
);
}
@@ -146,13 +147,12 @@
* @param {jQuery.Event} e Mouse click event
*/
ve.ui.SpecialCharacterDialog.prototype.onListClick = function ( e ) {
- var
- character = $( e.target ).data( 'character' ),
+ var character = $( e.target ).data( 'character' ),
fragment = this.surface.getModel().getFragment();
if ( character ) {
- if ( typeof character === 'string' ) {
- fragment.insertContent( character, true
).collapseToEnd().select();
+ if ( typeof character === 'string' || character.string ) {
+ fragment.insertContent( character.string || character,
true ).collapseToEnd().select();
} else if ( character.action.type === 'replace' ) {
fragment.insertContent( character.action.options.peri,
true ).collapseToEnd().select();
} else if ( character.action.type === 'encapsulate' ) {
diff --git a/src/ui/pages/ve.ui.SpecialCharacterPage.js
b/src/ui/pages/ve.ui.SpecialCharacterPage.js
index 4d38a68..a11bc0d 100644
--- a/src/ui/pages/ve.ui.SpecialCharacterPage.js
+++ b/src/ui/pages/ve.ui.SpecialCharacterPage.js
@@ -16,7 +16,8 @@
* @param {Object} [config] Configuration options
*/
ve.ui.SpecialCharacterPage = function VeUiSpecialCharacterPage( name, config )
{
- var character, characterNode, characters, $characters, charactersNode;
+ var character, characterNode, characters, $characters, charactersNode,
+ source = config.source;
// Parent constructor
ve.ui.SpecialCharacterPage.super.apply( this, arguments );
@@ -31,11 +32,17 @@
// The body of this loop is executed a few thousand times when opening
// ve.ui.SpecialCharacterDialog, avoid jQuery wrappers.
for ( character in characters ) {
+ if ( !source && characters[ character ].source ) {
+ continue;
+ }
characterNode = document.createElement( 'div' );
characterNode.className =
've-ui-specialCharacterPage-character';
if ( characters[ character ].titleMsg ) {
characterNode.setAttribute( 'title', ve.msg(
characters[ character ].titleMsg ) );
}
+ if ( characters[ character ].source ) {
+ characterNode.classList.add(
've-ui-specialCharacterPage-character-source' );
+ }
characterNode.textContent = character;
$.data( characterNode, 'character', characters[ character ] );
charactersNode.appendChild( characterNode );
diff --git a/src/ui/styles/dialogs/ve.ui.SpecialCharacterDialog.css
b/src/ui/styles/dialogs/ve.ui.SpecialCharacterDialog.css
index 4fc1531..d75e773 100644
--- a/src/ui/styles/dialogs/ve.ui.SpecialCharacterDialog.css
+++ b/src/ui/styles/dialogs/ve.ui.SpecialCharacterDialog.css
@@ -44,6 +44,7 @@
height: 1.8em;
text-align: center;
display: inline-block;
+ vertical-align: top;
margin: 0 3px 3px 0;
border: 1px solid #e6e6e6;
-webkit-transition: border-color 200ms;
@@ -54,3 +55,12 @@
.ve-ui-specialCharacterPage-character:hover {
border-color: #ccc;
}
+
+.ve-ui-specialCharact
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: svgo: Update pre-commit hook
Bmansurov has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357386 ) Change subject: svgo: Update pre-commit hook .. svgo: Update pre-commit hook Remove the --pretty option as svgo outputs a smaller file without it. The `dev-scripts/svg_check.sh` script also doesn't have this option. As a result of this change the remote `npm test` job won't fail if the job was not run locally before committing. Thanks to Jon for figuring out the issue. Bug: T142532 Change-Id: Icf6cb2bf0c97a36bff3888bffc6136c26c871ae1 --- M dev-scripts/pre-commit 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/86/357386/1 diff --git a/dev-scripts/pre-commit b/dev-scripts/pre-commit index 19aabf5..66d8854 100755 --- a/dev-scripts/pre-commit +++ b/dev-scripts/pre-commit @@ -26,9 +26,7 @@ git-staged-files \*.svg|while map file; do make nodecheck echo "Compressing $file" - # If anyone can figure out how to get the pretty option to work from the config - # file, feel free to remove it here. - node_modules/.bin/svgo --config=.svgo.yml "$file" --pretty + node_modules/.bin/svgo --config=.svgo.yml "$file" git add "$file" done } @@ -74,4 +72,4 @@ return $err } -main "$@" \ No newline at end of file +main "$@" -- To view, visit https://gerrit.wikimedia.org/r/357386 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf6cb2bf0c97a36bff3888bffc6136c26c871ae1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Bmansurov ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Update Wikidata to wmf/1.30.0-wmf.4
Aude has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357387 )
Change subject: Update Wikidata to wmf/1.30.0-wmf.4
..
Update Wikidata to wmf/1.30.0-wmf.4
Change-Id: Id2f080c8353ac5cc3c1359ab0a9f0651f3254e52
Depends-On: Ie96b7455e1fbcf0838dca61103a0d540532c4461
---
M make-wmf-branch/config.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/87/357387/1
diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json
index 1ef82ed..173acdf 100644
--- a/make-wmf-branch/config.json
+++ b/make-wmf-branch/config.json
@@ -175,6 +175,6 @@
"@": "Set a string for the specific commit, branch, or tag",
"special_extensions": {
"CentralNotice": "wmf_deploy",
- "Wikidata": "wmf/1.30.0-wmf.1"
+ "Wikidata": "wmf/1.30.0-wmf.4"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/357387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2f080c8353ac5cc3c1359ab0a9f0651f3254e52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[wmf/1.30.0-wmf.4]: New deployment build - wmf/1.30.0-wmf.4
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357382 ) Change subject: New deployment build - wmf/1.30.0-wmf.4 .. New deployment build - wmf/1.30.0-wmf.4 Change-Id: Ie96b7455e1fbcf0838dca61103a0d540532c4461 --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M Wikidata.localisation.php M build/tasks/updatecomposer.js M composer.json M composer.lock C extensions/ArticlePlaceholder/.eslintignore A extensions/ArticlePlaceholder/.eslintrc.json D extensions/ArticlePlaceholder/.jscsrc D extensions/ArticlePlaceholder/.jshintignore D extensions/ArticlePlaceholder/.jshintrc M extensions/ArticlePlaceholder/Gruntfile.js M extensions/ArticlePlaceholder/composer.json A extensions/ArticlePlaceholder/i18n/hr.json M extensions/ArticlePlaceholder/i18n/ru.json M extensions/ArticlePlaceholder/includes/Hooks.php M extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php M extensions/ArticlePlaceholder/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.js M extensions/ArticlePlaceholder/package.json M extensions/ArticlePlaceholder/tests/phpunit/includes/SearchHookHandlerTest.php A extensions/ArticlePlaceholder/tests/qunit/.eslintrc.json M extensions/ArticlePlaceholder/tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.test.js R extensions/Constraints/.eslintignore A extensions/Constraints/.eslintrc.json M extensions/Constraints/.jscsrc A extensions/Constraints/.mailmap M extensions/Constraints/Gruntfile.js M extensions/Constraints/README.md M extensions/Constraints/WikibaseQualityConstraintsHooks.php M extensions/Constraints/api/CheckConstraints.php M extensions/Constraints/composer.json M extensions/Constraints/docs/user.js M extensions/Constraints/extension.json M extensions/Constraints/i18n/ast.json M extensions/Constraints/i18n/bn.json M extensions/Constraints/i18n/cs.json M extensions/Constraints/i18n/de.json M extensions/Constraints/i18n/en.json M extensions/Constraints/i18n/es.json M extensions/Constraints/i18n/fi.json M extensions/Constraints/i18n/fr.json M extensions/Constraints/i18n/gl.json M extensions/Constraints/i18n/he.json A extensions/Constraints/i18n/hi.json M extensions/Constraints/i18n/hu.json A extensions/Constraints/i18n/hy.json M extensions/Constraints/i18n/it.json A extensions/Constraints/i18n/kn.json M extensions/Constraints/i18n/ko.json M extensions/Constraints/i18n/lb.json M extensions/Constraints/i18n/mk.json M extensions/Constraints/i18n/nl.json M extensions/Constraints/i18n/pl.json M extensions/Constraints/i18n/qqq.json A extensions/Constraints/i18n/ro.json M extensions/Constraints/i18n/sr-ec.json M extensions/Constraints/i18n/sv.json A extensions/Constraints/i18n/tl.json M extensions/Constraints/i18n/yi.json M extensions/Constraints/i18n/zh-hans.json M extensions/Constraints/includes/ConstraintCheck/Checker/CommonsLinkChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/ConflictsWithChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/InverseChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/ItemChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/MandatoryQualifiersChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/OneOfChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/QualifiersChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/RangeChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/SymmetricChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/TargetRequiredClaimChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/TypeChecker.php M extensions/Constraints/includes/ConstraintCheck/Checker/ValueTypeChecker.php M extensions/Constraints/includes/ConstraintCheck/DelegatingConstraintChecker.php M extensions/Constraints/includes/ConstraintCheck/Helper/ConnectionCheckerHelper.php M extensions/Constraints/includes/ConstraintCheck/Helper/RangeCheckerHelper.php M extensions/Constraints/includes/ConstraintCheck/Helper/TypeCheckerHelper.php M extensions/Constraints/includes/ConstraintParameterRenderer.php M extensions/Constraints/includes/ConstraintReportFactory.php M extensions/Constraints/includes/ConstraintRepository.php A extensions/Constraints/includes/UpdateConstraintsTableJob.php M extensions/Constraints/maintenance/UpdateConstraintsTable.php A extensions/Constraints/maintenance/exportEntityMapping M extensions/Constraints/package.json M extensions/Constraints/phpcs.xml M extensions/Constraints/specials/SpecialConstraintReport.php M extensions/Constraints/tests/phpunit/CachingConstraintLookupTest.php M extensions/Constraints/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php M extensions/Constr
[MediaWiki-commits] [Gerrit] operations/puppet[production]: diskspace.py: Catch stray instances that nova and filesystem...
Andrew Bogott has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357388 )
Change subject: diskspace.py: Catch stray instances that nova and filesystem
disagree about
..
diskspace.py: Catch stray instances that nova and filesystem disagree about
Change-Id: I2a49a3617b15751c351cb34117d68f4cc8e6e42a
---
M modules/openstack/files/novastats/diskspace.py
1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/357388/1
diff --git a/modules/openstack/files/novastats/diskspace.py
b/modules/openstack/files/novastats/diskspace.py
index 4792e3d..cea6740 100755
--- a/modules/openstack/files/novastats/diskspace.py
+++ b/modules/openstack/files/novastats/diskspace.py
@@ -124,6 +124,18 @@
if novaduplicates:
printstat("Instances in nova twice: %s" % novaduplicates, True)
+novaset = set(all_nova_instances)
+diskset = set(all_disk_instances.keys())
+
+diskstrays = diskset - novaset
+for stray in diskstrays:
+printstat("On disk but not in nova: %s on %s" % (stray,
all_disk_instances[stray]), True)
+
+novastrays = novaset - diskset
+if novastrays:
+printstat("These instances are in nova but can't be found on disk: %s" %
novastrays, True)
+
+
for hostname in computenodedict.keys():
hostdict = computenodedict[hostname]
--
To view, visit https://gerrit.wikimedia.org/r/357388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a49a3617b15751c351cb34117d68f4cc8e6e42a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: API: Have generator=random set a non-continuation value
Anomie has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357389 )
Change subject: API: Have generator=random set a non-continuation value
..
API: Have generator=random set a non-continuation value
When used as a generator, it needs a non-continuation value for
continuation to work properly. As a list it doesn't matter because lists
never non-continue.
Bug: T167141
Change-Id: I7b8ddaf73f918b31414e22fc3a13e6245c2d57d7
---
M includes/api/ApiQueryRandom.php
1 file changed, 13 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/89/357389/1
diff --git a/includes/api/ApiQueryRandom.php b/includes/api/ApiQueryRandom.php
index cc1fc89..ce62226 100644
--- a/includes/api/ApiQueryRandom.php
+++ b/includes/api/ApiQueryRandom.php
@@ -48,7 +48,7 @@
* @param ApiPageSet|null $resultPageSet
* @param int $limit Number of pages to fetch
* @param string|null $start Starting page_random
-* @param int|null $startId Starting page_id
+* @param int $startId Starting page_id
* @param string|null $end Ending page_random
* @return array (int, string|null) Number of pages left to query and
continuation string
*/
@@ -75,8 +75,8 @@
if ( $start !== null ) {
$start = $this->getDB()->addQuotes( $start );
- if ( $startId !== null ) {
- $startId = (int)$startId;
+ if ( $startId > 0 ) {
+ $startId = (int)$startId; // safety
$this->addWhere( "page_random = $start AND
page_id >= $startId OR page_random > $start" );
} else {
$this->addWhere( "page_random >= $start" );
@@ -144,10 +144,19 @@
} else {
$rand = wfRandom();
$start = $rand;
- $startId = null;
+ $startId = 0;
$end = null;
}
+ // Set the non-continue if this is being used as a generator
+ // (as a list it doesn't matter because lists never
non-continue)
+ if ( $resultPageSet !== null ) {
+ $endFlag = $end === null ? 0 : 1;
+
$this->getContinuationManager()->addGeneratorNonContinueParam(
+ $this, 'continue',
"$rand|$start|$startId|$endFlag"
+ );
+ }
+
list( $left, $continue ) =
$this->runQuery( $resultPageSet, $params['limit'],
$start, $startId, $end );
if ( $end === null && $continue === null ) {
--
To view, visit https://gerrit.wikimedia.org/r/357389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b8ddaf73f918b31414e22fc3a13e6245c2d57d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...service-checker[master]: Set the User-Agent header field when doing requests; v0.1.2
Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356870 )
Change subject: Set the User-Agent header field when doing requests; v0.1.2
..
Set the User-Agent header field when doing requests; v0.1.2
Change-Id: Idd18d9dd5f92b890d2b095332c5188b934bfcc73
---
M debian/changelog
M servicechecker/__init__.py
M setup.py
3 files changed, 11 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/debian/changelog b/debian/changelog
index 3f6cc5f..10f331a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+service-checker (0.1.2) UNRELEASED; urgency=low
+
+ * Include the User-Agent header field when making requests
+
+ -- Marko Obrovac Tue, 06 Jun 2017 14:02:10 +
+
service-checker (0.1.1) UNRELEASED; urgency=medium
* Fix double-inclusion of prefix
diff --git a/servicechecker/__init__.py b/servicechecker/__init__.py
index 8db701c..01564b4 100755
--- a/servicechecker/__init__.py
+++ b/servicechecker/__init__.py
@@ -69,6 +69,10 @@
del kw['method']
else:
method = 'GET'
+if 'headers' not in kw:
+kw['headers'] = {}
+if 'User-Agent' not in kw['headers']:
+kw['headers']['User-Agent'] = 'ServiceChecker-WMF/0.1.2'
try:
if method == 'GET':
return client.request(
diff --git a/setup.py b/setup.py
index 7752238..f907c3f 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
here = os.path.abspath(os.path.dirname(__file__))
README = open(os.path.join(here, 'README.rst')).read()
-version = '0.1.1'
+version = '0.1.2'
install_requires = [
'urllib3>=1.7',
--
To view, visit https://gerrit.wikimedia.org/r/356870
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd18d9dd5f92b890d2b095332c5188b934bfcc73
Gerrit-PatchSet: 2
Gerrit-Project: operations/software/service-checker
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
Gerrit-Reviewer: Giuseppe Lavagetto
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] mediawiki/vagrant[master]: Fix Thumbor role
Gilles has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357390 )
Change subject: Fix Thumbor role
..
Fix Thumbor role
A number of things broke. It doesn’t seem to like
folder permissions when running inside Sierra, despite
turning NFS off. python-swift backport dependencies
needed to be updated. Removed Sentry, which isn’t used
now that we have good logs.
Change-Id: Ic3b7f4eed871e3d66e5368f708886cbf8de8c2a9
---
M puppet/hieradata/common.yaml
M puppet/modules/role/manifests/thumbor.pp
M puppet/modules/swift/manifests/init.pp
M puppet/modules/thumbor/manifests/init.pp
M puppet/modules/thumbor/manifests/service.pp
M puppet/modules/thumbor/templates/10-thumbor.conf.erb
6 files changed, 32 insertions(+), 67 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/90/357390/1
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 4adc168..9c10af6 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -479,9 +479,8 @@
swift::container_cfg_file: /etc/swift/container-server.conf
thumbor::cfg_dir: /etc/thumbor.d
-thumbor::log_dir: /vagrant/logs/thumbor
+thumbor::log_dir: /srv/thumbor
thumbor::tmp_dir: /tmp/thumbor
thumbor::statsd_port: "%{hiera('statsd::port')}"
-thumbor::sentry_dsn_file: "%{hiera('sentry::dsn_file')}"
xhprofgui::dir: "%{hiera('mwv::vendor_dir')}/xhprof"
diff --git a/puppet/modules/role/manifests/thumbor.pp
b/puppet/modules/role/manifests/thumbor.pp
index fe9ec23..6641714 100644
--- a/puppet/modules/role/manifests/thumbor.pp
+++ b/puppet/modules/role/manifests/thumbor.pp
@@ -14,7 +14,6 @@
require ::role::multimedia
require ::role::vipsscaler
require ::role::wikimediamaintenance
-include ::role::sentry
include ::apache::mod::proxy
include ::apache::mod::proxy_http
include ::apache::mod::headers
diff --git a/puppet/modules/swift/manifests/init.pp
b/puppet/modules/swift/manifests/init.pp
index 74746ed..c652ff2 100644
--- a/puppet/modules/swift/manifests/init.pp
+++ b/puppet/modules/swift/manifests/init.pp
@@ -49,37 +49,28 @@
include ::apache::mod::proxy
include ::apache::mod::proxy_http
-apt::pin { 'python-swift-jessie-backports':
-package => 'python-swift*',
-pin => 'release n=jessie-backports',
-priority => 1000,
-}
+$packages = [
+'python-cryptography',
+'python-dnspython',
+'python-eventlet',
+'python-pkg-resources',
+'python-pyasn1',
+'python-setuptools',
+'python-swift*',
+'python-webob',
+'swift*'
+]
-apt::pin { 'python-eventlet-jessie-backports':
-package => 'python-eventlet',
-pin => 'release n=jessie-backports',
-priority => 1000,
-}
-
-apt::pin { 'python-webob-jessie-backports':
-package => 'python-webob',
-pin => 'release n=jessie-backports',
-priority => 1000,
-}
-
-apt::pin { 'swift-jessie-backports':
-package => 'swift*',
-pin => 'release n=jessie-backports',
-priority => 1000,
+apt::pin { 'swift-python-backports':
+package => join(sort($packages), ' '),
+pin => 'release a=jessie-backports',
+priority => '1000',
}
package { ['swift', 'swift-account', 'swift-container', 'swift-object',
'swift-proxy', 'python-webob']:
ensure => 'present',
require => [
-Apt::Pin['python-swift-jessie-backports'],
-Apt::Pin['python-eventlet-jessie-backports'],
-Apt::Pin['swift-jessie-backports'],
-Apt::Pin['python-webob-jessie-backports'],
+Apt::Pin['swift-python-backports'],
],
}
diff --git a/puppet/modules/thumbor/manifests/init.pp
b/puppet/modules/thumbor/manifests/init.pp
index 321b8b6..995524c 100644
--- a/puppet/modules/thumbor/manifests/init.pp
+++ b/puppet/modules/thumbor/manifests/init.pp
@@ -19,32 +19,23 @@
# [*statsd_port*]
# Port the statsd instance runs on.
#
-# [*sentry_dsn_file*]
-# Path to file containing the sentry dsn file.
-#
class thumbor (
$cfg_dir,
$log_dir,
$tmp_dir,
$statsd_port,
-$sentry_dsn_file,
) {
-apt::pin { 'gifsicle-jessie-backports':
-package => 'gifsicle',
-pin => 'release n=jessie-backports',
-priority => 1000,
-}
-apt::pin { 'python-tornado-jessie-backports':
-package => 'python-tornado',
-pin => 'release n=jessie-backports',
-priority => 1000,
-}
+$packages = [
+'gifsicle',
+'python-tornado',
+'python-pil',
+]
-apt::pin { 'python-pil-jessie-backports':
-package => 'python-pil',
-pin => 'release n=jessie-backports',
-priority => 1000,
+apt::pin { 'thumbor-python-backports':
+package => jo
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Include CSS styles from Timeline extension.
Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357391 )
Change subject: Include CSS styles from Timeline extension.
..
Include CSS styles from Timeline extension.
This seems to be something we've missed when rounding up styles to include
in our bundle. This fixes improper horizontal scrolling in articles that
have long horizontal timeline elements.
Bug: T124961
Change-Id: Id8ace9ec1e579ad6a33e0ed4b33d2f577adc5d9a
---
M app/src/main/assets/preview.css
M app/src/main/assets/styles.css
M scripts/make-css-assets.bash
3 files changed, 10 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/91/357391/1
diff --git a/app/src/main/assets/preview.css b/app/src/main/assets/preview.css
index 44c5d85..bdb46ff 100644
--- a/app/src/main/assets/preview.css
+++ b/app/src/main/assets/preview.css
@@ -682,6 +682,10 @@
.mwe-math-element {
overflow-x: auto;
max-width: 100%;
+}/* Timelines can be very long and huge, like tables, so they should be
scrollable. */
+.timeline-wrapper {
+ max-width: 100%;
+ overflow: auto;
}@media print {
li.gallerybox {
vertical-align: top;
diff --git a/app/src/main/assets/styles.css b/app/src/main/assets/styles.css
index 45400f4..597a9a9 100644
--- a/app/src/main/assets/styles.css
+++ b/app/src/main/assets/styles.css
@@ -682,6 +682,10 @@
.mwe-math-element {
overflow-x: auto;
max-width: 100%;
+}/* Timelines can be very long and huge, like tables, so they should be
scrollable. */
+.timeline-wrapper {
+ max-width: 100%;
+ overflow: auto;
}@media print {
li.gallerybox {
vertical-align: top;
diff --git a/scripts/make-css-assets.bash b/scripts/make-css-assets.bash
index 7c8bbbf..c113d6d 100755
--- a/scripts/make-css-assets.bash
+++ b/scripts/make-css-assets.bash
@@ -2,6 +2,6 @@
PREFIX="https://www.mediawiki.org/w";
BASE_PATH="`dirname $0`/.."
-wget
"$PREFIX/load.php?debug=true&lang=en&modules=skins.minerva.base.reset|skins.minerva.content.styles|ext.cite.style|ext.math.styles|mediawiki.page.gallery.styles|mobile.app.pagestyles.android|mediawiki.skinning.content.parsoid&only=styles&skin=vector&version=&*"
-O "$BASE_PATH/app/src/main/assets/styles.css"
-wget
"$PREFIX/load.php?debug=true&lang=en&modules=skins.minerva.base.reset|skins.minerva.content.styles|ext.cite.style|ext.math.styles|mediawiki.page.gallery.styles|mobile.app.preview.android|mobile.app.preview|mediawiki.skinning.content.parsoid&only=styles&skin=vector&version=&*"
-O "$BASE_PATH/app/src/main/assets/preview.css"
+wget
"$PREFIX/load.php?debug=true&lang=en&modules=skins.minerva.base.reset|skins.minerva.content.styles|ext.cite.style|ext.math.styles|ext.timeline.styles|mediawiki.page.gallery.styles|mobile.app.pagestyles.android|mediawiki.skinning.content.parsoid&only=styles&skin=vector&version=&*"
-O "$BASE_PATH/app/src/main/assets/styles.css"
+wget
"$PREFIX/load.php?debug=true&lang=en&modules=skins.minerva.base.reset|skins.minerva.content.styles|ext.cite.style|ext.math.styles|ext.timeline.styles|mediawiki.page.gallery.styles|mobile.app.preview.android|mobile.app.preview|mediawiki.skinning.content.parsoid&only=styles&skin=vector&version=&*"
-O "$BASE_PATH/app/src/main/assets/preview.css"
wget
"$PREFIX/load.php?debug=true&lang=en&modules=mobile.app.pagestyles.android.night&only=styles&skin=vector&version=&*"
-O "$BASE_PATH/app/src/main/assets/dark.css"
--
To view, visit https://gerrit.wikimedia.org/r/357391
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8ace9ec1e579ad6a33e0ed4b33d2f577adc5d9a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: diskspace.py: Catch stray instances that nova and filesystem...
Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357388 )
Change subject: diskspace.py: Catch stray instances that nova and filesystem
disagree about
..
diskspace.py: Catch stray instances that nova and filesystem disagree about
Change-Id: I2a49a3617b15751c351cb34117d68f4cc8e6e42a
---
M modules/openstack/files/novastats/diskspace.py
1 file changed, 13 insertions(+), 3 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openstack/files/novastats/diskspace.py
b/modules/openstack/files/novastats/diskspace.py
index 4792e3d..fb91bdf 100755
--- a/modules/openstack/files/novastats/diskspace.py
+++ b/modules/openstack/files/novastats/diskspace.py
@@ -115,15 +115,25 @@
all_nova_instances = [instance.id for instance in instances]
for instance in instances:
-host = all_disk_instances[instance.id][0]
-computenodedict[host]['novainstances'] += [instance]
-
+if instance.id in all_disk_instances:
+host = all_disk_instances[instance.id][0]
+computenodedict[host]['novainstances'] += [instance]
novaduplicates = [instance for instance, count in
collections.Counter(all_nova_instances).items() if count > 1]
if novaduplicates:
printstat("Instances in nova twice: %s" % novaduplicates, True)
+novaset = set(all_nova_instances)
+diskset = set(all_disk_instances.keys())
+
+diskstrays = diskset - novaset
+for stray in diskstrays:
+printstat("On disk but not in nova: %s on %s" % (stray,
all_disk_instances[stray]), True)
+
+novastrays = novaset - diskset
+if novastrays:
+printstat("These instances are in nova but can't be found on disk: %s" %
novastrays, True)
for hostname in computenodedict.keys():
hostdict = computenodedict[hostname]
--
To view, visit https://gerrit.wikimedia.org/r/357388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a49a3617b15751c351cb34117d68f4cc8e6e42a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: Giuseppe Lavagetto
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] mediawiki...CirrusSearch[master]: Make delete/archive indexing report title instead of timestamp.
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356882 ) Change subject: Make delete/archive indexing report title instead of timestamp. .. Make delete/archive indexing report title instead of timestamp. Since archive is currently lacking timestamp index (see T164975) we scan the archive by title. However, we report progress by timestamp, which makes no sense. This patch switches to reporting by title, which makes much more sense and actually allows to track progress. "Bad" characters are stripped from reported title and length is limited by 30 chars for better display. Change-Id: I7b05509cec2f36d97d956eb71cf1cc4fb82e6c4c --- M maintenance/forceSearchIndex.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Tjones: Looks good to me, but someone else must approve Cindy-the-browser-test-bot: Looks good to me, but someone else must approve jenkins-bot: Verified DCausse: Looks good to me, approved diff --git a/maintenance/forceSearchIndex.php b/maintenance/forceSearchIndex.php index c391355..166c513 100644 --- a/maintenance/forceSearchIndex.php +++ b/maintenance/forceSearchIndex.php @@ -379,8 +379,8 @@ 'titlesToDelete' => $titlesToDelete, 'docIdsToDelete' => $docIdsToDelete, 'archive' => $archive, - 'endingAt' => isset( $row ) - ? ( new MWTimestamp( $row->ar_timestamp ) )->getTimestamp( TS_ISO_8601 ) + 'endingAt' => isset( $title ) ? + substr( preg_replace( '/[^' . Title::legalChars() . ']/', '_', $title->getPrefixedDBkey() ), 0, 30 ) : 'unknown', ]; } ); -- To view, visit https://gerrit.wikimedia.org/r/356882 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7b05509cec2f36d97d956eb71cf1cc4fb82e6c4c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Smalyshev Gerrit-Reviewer: Cindy-the-browser-test-bot Gerrit-Reviewer: DCausse Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Gehel Gerrit-Reviewer: Tjones Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...GettingStarted[master]: Add phpcs and make pass
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357393 )
Change subject: Add phpcs and make pass
..
Add phpcs and make pass
Change-Id: I0c817a6613658e29a16a656e63c6ff20e6936585
---
M BasePageFilter.php
M CategoryPageFilter.php
M CategoryPageSuggester.php
M Hooks.php
M MoreLikePageSuggester.php
M PageSuggesterFactory.php
M RedisCategorySync.php
M TaskRecommendationsExperimentV1.php
M composer.json
A phpcs.xml
10 files changed, 64 insertions(+), 54 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted
refs/changes/93/357393/1
diff --git a/BasePageFilter.php b/BasePageFilter.php
index 9e3a20b..e1ac2e5 100644
--- a/BasePageFilter.php
+++ b/BasePageFilter.php
@@ -6,9 +6,9 @@
use User;
/**
- Approve or reject a given page for suitability with GettingStarted.
- Base filter shared for all task types
-*/
+ * Approve or reject a given page for suitability with GettingStarted.
+ * Base filter shared for all task types
+ */
class BasePageFilter {
/** @var User */
protected $user;
@@ -34,11 +34,11 @@
$articleID = $title->getArticleID();
$excludedCategories = self::getExcludedCategories();
$dbr = wfGetDB( DB_SLAVE );
- foreach( $excludedCategories as $cat ) {
- $res = $dbr->selectRow( 'categorylinks', '1', array(
+ foreach ( $excludedCategories as $cat ) {
+ $res = $dbr->selectRow( 'categorylinks', '1', [
'cl_from' => $articleID,
'cl_to' => $cat,
- ), __METHOD__ );
+ ], __METHOD__ );
if ( $res !== false ) {
return true;
@@ -55,8 +55,8 @@
// TODO (phuedx 2014-02-010) Create a collection class
// for categories, which could be generalised in the
// future, i.e. CategoryCollection.
- self::$excludedCategories = array();
- foreach( $wgGettingStartedExcludedCategories as
$rawCategory ) {
+ self::$excludedCategories = [];
+ foreach ( $wgGettingStartedExcludedCategories as
$rawCategory ) {
// Canonicalize the category name.
$title = Title::newFromText( $rawCategory );
if ( !$title || !$title->inNamespace(
NS_CATEGORY ) ) {
diff --git a/CategoryPageFilter.php b/CategoryPageFilter.php
index 687566b..5fa458e 100644
--- a/CategoryPageFilter.php
+++ b/CategoryPageFilter.php
@@ -5,9 +5,9 @@
use Title;
/**
- Approve or reject a given page for suitability with GettingStarted.
- For use in conjunction with CategoryPageSuggester
-*/
+ * Approve or reject a given page for suitability with GettingStarted.
+ * For use in conjunction with CategoryPageSuggester
+ */
class CategoryPageFilter extends BasePageFilter {
const MAX_PAGE_LENGTH = 1;
diff --git a/CategoryPageSuggester.php b/CategoryPageSuggester.php
index cec6bae..1835f2d 100644
--- a/CategoryPageSuggester.php
+++ b/CategoryPageSuggester.php
@@ -27,21 +27,21 @@
if ( !$this->redisConnection ) {
wfDebugLog( 'GettingStarted', "Unable to acquire redis
connection. Returning early.\n" );
- return array();
+ return [];
}
try {
$randomArticleIDs =
$this->redisConnection->sRandMember( $key, $count );
} catch ( RedisException $e ) {
wfDebugLog( 'GettingStarted', 'Redis exception: ' .
$e->getMessage() . ". Returning early.\n" );
- return array();
+ return [];
}
if ( is_array( $randomArticleIDs ) ) {
return \Title::newFromIDs( $randomArticleIDs );
} else {
wfDebugLog( 'GettingStarted', 'Redis returned a
non-array value, possibly an error.' );
- return array();
+ return [];
}
}
diff --git a/Hooks.php b/Hooks.php
index 960f355..e01c992 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -35,10 +35,10 @@
const USER_TOKEN_COOKIE_NAME = '-gettingStartedUserId';
- protected static $COOKIE_OPTIONS = array(
+ protected static $COOKIE_OPTIONS = [
'prefix' => '',
'path' => '/',
- );
+ ];
const INTRO_OPTION = 'gettingstarted-task-toolbar-show-intro';
@@ -68,7 +68,7 @@
$cookie = $request->getCookie( self::OPENTASK_COOKIE_NAME, '' );
$tasks = FormatJson::decode( $cookie, true );
[MediaWiki-commits] [Gerrit] mediawiki...GettingStarted[master]: Make phpcs pass - api / maintenance / tests
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357392 )
Change subject: Make phpcs pass - api / maintenance / tests
..
Make phpcs pass - api / maintenance / tests
Change-Id: I9608c0655d7423df162d0804a6cec0b9ef178fa1
---
M api/ApiGettingStartedGetPages.php
M maintenance/dump_redis.php
M maintenance/generate_config.php
M maintenance/populate_categories.php
M tests/phpunit/TaskRecommendationsExperimentV1Test.php
5 files changed, 47 insertions(+), 48 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted
refs/changes/92/357392/1
diff --git a/api/ApiGettingStartedGetPages.php
b/api/ApiGettingStartedGetPages.php
index edcb095..338559e 100644
--- a/api/ApiGettingStartedGetPages.php
+++ b/api/ApiGettingStartedGetPages.php
@@ -16,9 +16,9 @@
public function execute() {
$result = $this->getResult();
- $data = array(
- 'titles' => array()
- );
+ $data = [
+ 'titles' => []
+ ];
$titles = $this->getArticles();
@@ -75,13 +75,13 @@
$attempts = 0;
$offset = 0;
$isRandomized = $suggester->isRandomized();
- $filteredTitles = array();
+ $filteredTitles = [];
do {
$unfilteredTitles = $suggester->getArticles( $numWanted
- $totalResultCount, $offset );
$newFilteredTitles = array_filter( $unfilteredTitles,
- array( $pageFilter, 'isAllowedPage' )
+ [ $pageFilter, 'isAllowedPage' ]
);
$newFilteredTitles = array_udiff( $newFilteredTitles,
$filteredTitles,
function ( $t1, $t2 ) {
@@ -113,44 +113,44 @@
}
public function getDescription() {
- return array(
+ return [
'This API is for getting a list of one or more pages
related to a ' .
'particular GettingStarted task.',
- );
+ ];
}
public function getParamDescription() {
- return array(
+ return [
'taskname' => 'Task name, generally either "copyedit"
(copy-editing suggestions) or ' .
' "morelike" (pages similar to the base
page/excluded title)',
'excludedtitle' => 'Full title of a page to exclude
from the list; also used as the ' .
'base title for recommendations based on a
given page',
'count' => 'Requested count; will attempt to fetch this
exact number, but may fetch ' .
'fewer if no more are found after multiple
attempts',
- );
+ ];
}
public function getAllowedParams() {
- return array(
- 'taskname' => array(
+ return [
+ 'taskname' => [
ApiBase::PARAM_TYPE => 'string',
ApiBase::PARAM_REQUIRED => true,
- ),
- 'excludedtitle' => array(
+ ],
+ 'excludedtitle' => [
ApiBase::PARAM_TYPE => 'string',
ApiBase::PARAM_REQUIRED => false,
- ),
- 'count' => array(
+ ],
+ 'count' => [
ApiBase::PARAM_TYPE => 'integer',
ApiBase::PARAM_REQUIRED => true,
- ),
- );
+ ],
+ ];
}
public function getExamples() {
- return array(
+ return [
'api.php?action=query&list=gettingstartedgetpages&gsgptaskname=copyedit' .
'&gsgpexcludedtitle=Earth&gsgpcount=1',
- );
+ ];
}
}
diff --git a/maintenance/dump_redis.php b/maintenance/dump_redis.php
index fdbe4a9..214de53 100755
--- a/maintenance/dump_redis.php
+++ b/maintenance/dump_redis.php
@@ -16,7 +16,7 @@
*/
$IP = getenv( 'MW_INSTALL_PATH' );
-if( $IP === false ) {
+if ( $IP === false ) {
$IP = __DIR__ . '/../../..';
}
diff --git a/maintenance/generate_config.php b/maintenance/generate_config.php
index bb1cd5f..588095e 100644
--- a/maintenance/generate_config.php
+++ b/maintenance/generate_config.php
@@ -14,7 +14,7 @@
use Title;
$IP = getenv( 'MW_INSTALL_PATH' );
-if( $IP === false ) {
+if ( $IP === false ) {
$IP = __DIR__ . '/../../..'
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Add filename to gallery dialog page
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357394 )
Change subject: Add filename to gallery dialog page
..
Add filename to gallery dialog page
Also add fieldset headings consistent with media dialog.
Bug: T167049
Change-Id: I8112b70d8e3ba19079fdab0806ad343b233c9c18
---
M extension.json
M modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
M modules/ve-mw/ui/styles/dialogs/ve.ui.MWGalleryDialog.css
3 files changed, 32 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/94/357394/1
diff --git a/extension.json b/extension.json
index 54e303f..6cf9b6a 100644
--- a/extension.json
+++ b/extension.json
@@ -1956,6 +1956,8 @@
"mediawiki.page.gallery.styles"
],
"messages": [
+ "visualeditor-dialog-media-content-filename",
+ "visualeditor-dialog-media-content-section",
"visualeditor-mwgallerydialog-caption-field-label",
"visualeditor-mwgallerydialog-caption-input-placeholder",
"visualeditor-mwgallerydialog-card-images",
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
index 9d7a317..8696e56 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
@@ -119,6 +119,10 @@
} );
// Edit panel
+ this.filenameFieldset = new OO.ui.FieldsetLayout( {
+ label: ve.msg( 'visualeditor-dialog-media-content-filename' ),
+ icon: 'image'
+ } );
this.$highlightedImage = $( '' )
.addClass( 've-ui-mwGalleryDialog-highlighted-image' );
// TODO: make into a ve.ui.MWTargetWidget once Parsoid handles galleries
@@ -127,6 +131,12 @@
multiline: true,
autosize: true
} );
+ this.highlightedCaptionFieldset = new OO.ui.FieldsetLayout( {
+ label: ve.msg( 'visualeditor-dialog-media-content-section' ),
+ icon: 'parameter',
+ classes: [ 've-ui-mwGalleryDialog-caption-fieldset' ]
+ } );
+ this.highlightedCaptionFieldset.$element.append(
this.highlightedCaptionInput.$element );
this.removeButton = new OO.ui.ButtonWidget( {
label: ve.msg(
'visualeditor-mwgallerydialog-remove-button-label' ),
flags: [ 'destructive' ],
@@ -246,7 +256,8 @@
menuLayout.$content.append(
this.editPanel.$element.append(
this.$highlightedImage,
- this.highlightedCaptionInput.$element,
+ this.filenameFieldset.$element,
+ this.highlightedCaptionFieldset.$element,
this.removeButton.$element
),
this.searchPanel.$element.append(
@@ -555,6 +566,8 @@
* @param {ve.ui.MWGalleryItemWidget} item The item that was clicked on
*/
ve.ui.MWGalleryDialog.prototype.onHighlightItem = function ( item ) {
+ var title;
+
// Unhighlight previous item
if ( this.highlightedItem ) {
this.highlightedItem.toggleHighlighted( false );
@@ -572,6 +585,17 @@
OO.ui.Element.static.scrollIntoView( item.$element[ 0 ] );
// Populate edit panel
+ title = mw.Title.newFromText( item.imageTitle );
+ this.filenameFieldset.setLabel(
+ $( '' ).append(
+ document.createTextNode( title.getMainText() + ' ' ),
+ $( '' )
+ .addClass(
'visualeditor-dialog-media-content-description-link' )
+ .attr( 'href', title.getUrl() )
+ .attr( 'target', '_blank' )
+ .text( ve.msg(
'visualeditor-dialog-media-content-description-link' ) )
+ )
+ );
this.$highlightedImage
.css( 'background-image', 'url(' + item.thumbUrl + ')' );
this.highlightedCaptionInput
diff --git a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWGalleryDialog.css
b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWGalleryDialog.css
index cb9d7f8..2c2b547 100644
--- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWGalleryDialog.css
+++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWGalleryDialog.css
@@ -24,6 +24,11 @@
box-shadow: inset 0 0 0 0.1em #36c;
}
+/* HACK: Override ooui specific 2em top margin */
+.ve-ui-mwGalleryDialog-caption-fieldset.oo-ui-labelElement.oo-ui-fieldsetLayout
{
+ margin-top: 0;
+}
+
.ve-ui-mwGalleryDialog-highlighted-image {
background-color: #f9f9f9;
width: 100%;
--
To view, visit https://gerrit.wikimedia.org/r/3573
[MediaWiki-commits] [Gerrit] mediawiki...wikihiero[master]: Add phpcs and make pass
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357395 ) Change subject: Add phpcs and make pass .. Add phpcs and make pass Change-Id: I7d02e38365767853893e4df5a8f2584f2bb04d55 --- M HieroTokenizer.php M SpecialHieroglyphs.php M composer.json M generateTables.php A phpcs.xml 5 files changed, 22 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/wikihiero refs/changes/95/357395/1 diff --git a/HieroTokenizer.php b/HieroTokenizer.php index 6e97510..fd4c648 100644 --- a/HieroTokenizer.php +++ b/HieroTokenizer.php @@ -67,7 +67,7 @@ $text = preg_replace( '/\\
[MediaWiki-commits] [Gerrit] operations/puppet[production]: swift: create swift user home
Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357396 )
Change subject: swift: create swift user home
..
swift: create swift user home
In production the swift user already exists post-provisioning because of
T123918, also create/chown its home
Bug: T162609
Change-Id: I8eb1344db2e32386741d71a4f3cf0f38fbbeaebc
---
M modules/install_server/files/autoinstall/scripts/late_command.sh
M modules/swift/manifests/init.pp
2 files changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/357396/1
diff --git a/modules/install_server/files/autoinstall/scripts/late_command.sh
b/modules/install_server/files/autoinstall/scripts/late_command.sh
index 3cddfe5..47161cc 100644
--- a/modules/install_server/files/autoinstall/scripts/late_command.sh
+++ b/modules/install_server/files/autoinstall/scripts/late_command.sh
@@ -51,6 +51,7 @@
case `hostname` in \
ms-be[123]*|ms-fe[123]*)
in-target /usr/sbin/groupadd --gid 130 --system swift
- in-target /usr/sbin/useradd --gid 130 --uid 130 --system
--shell /bin/false swift
+ in-target /usr/sbin/useradd --gid 130 --uid 130 --system
--shell /bin/false \
+ --create-home --home /var/lib/swift swift
;; \
esac
diff --git a/modules/swift/manifests/init.pp b/modules/swift/manifests/init.pp
index 98c4082..943704c 100644
--- a/modules/swift/manifests/init.pp
+++ b/modules/swift/manifests/init.pp
@@ -73,6 +73,12 @@
mode=> '0755',
}
+file { '/var/lib/swift':
+ensure => directory,
+require => Package['swift'],
+mode=> '0755',
+}
+
file { '/var/log/swift':
ensure => directory,
require => Package['swift'],
--
To view, visit https://gerrit.wikimedia.org/r/357396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8eb1344db2e32386741d71a4f3cf0f38fbbeaebc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Include CSS styles from Timeline extension.
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357391 )
Change subject: Include CSS styles from Timeline extension.
..
Include CSS styles from Timeline extension.
This seems to be something we've missed when rounding up styles to include
in our bundle. This fixes improper horizontal scrolling in articles that
have long horizontal timeline elements.
Bug: T124961
Change-Id: Id8ace9ec1e579ad6a33e0ed4b33d2f577adc5d9a
---
M app/src/main/assets/preview.css
M app/src/main/assets/styles.css
M scripts/make-css-assets.bash
3 files changed, 10 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Mholloway: Looks good to me, approved
diff --git a/app/src/main/assets/preview.css b/app/src/main/assets/preview.css
index 44c5d85..bdb46ff 100644
--- a/app/src/main/assets/preview.css
+++ b/app/src/main/assets/preview.css
@@ -682,6 +682,10 @@
.mwe-math-element {
overflow-x: auto;
max-width: 100%;
+}/* Timelines can be very long and huge, like tables, so they should be
scrollable. */
+.timeline-wrapper {
+ max-width: 100%;
+ overflow: auto;
}@media print {
li.gallerybox {
vertical-align: top;
diff --git a/app/src/main/assets/styles.css b/app/src/main/assets/styles.css
index 45400f4..597a9a9 100644
--- a/app/src/main/assets/styles.css
+++ b/app/src/main/assets/styles.css
@@ -682,6 +682,10 @@
.mwe-math-element {
overflow-x: auto;
max-width: 100%;
+}/* Timelines can be very long and huge, like tables, so they should be
scrollable. */
+.timeline-wrapper {
+ max-width: 100%;
+ overflow: auto;
}@media print {
li.gallerybox {
vertical-align: top;
diff --git a/scripts/make-css-assets.bash b/scripts/make-css-assets.bash
index 7c8bbbf..c113d6d 100755
--- a/scripts/make-css-assets.bash
+++ b/scripts/make-css-assets.bash
@@ -2,6 +2,6 @@
PREFIX="https://www.mediawiki.org/w";
BASE_PATH="`dirname $0`/.."
-wget
"$PREFIX/load.php?debug=true&lang=en&modules=skins.minerva.base.reset|skins.minerva.content.styles|ext.cite.style|ext.math.styles|mediawiki.page.gallery.styles|mobile.app.pagestyles.android|mediawiki.skinning.content.parsoid&only=styles&skin=vector&version=&*"
-O "$BASE_PATH/app/src/main/assets/styles.css"
-wget
"$PREFIX/load.php?debug=true&lang=en&modules=skins.minerva.base.reset|skins.minerva.content.styles|ext.cite.style|ext.math.styles|mediawiki.page.gallery.styles|mobile.app.preview.android|mobile.app.preview|mediawiki.skinning.content.parsoid&only=styles&skin=vector&version=&*"
-O "$BASE_PATH/app/src/main/assets/preview.css"
+wget
"$PREFIX/load.php?debug=true&lang=en&modules=skins.minerva.base.reset|skins.minerva.content.styles|ext.cite.style|ext.math.styles|ext.timeline.styles|mediawiki.page.gallery.styles|mobile.app.pagestyles.android|mediawiki.skinning.content.parsoid&only=styles&skin=vector&version=&*"
-O "$BASE_PATH/app/src/main/assets/styles.css"
+wget
"$PREFIX/load.php?debug=true&lang=en&modules=skins.minerva.base.reset|skins.minerva.content.styles|ext.cite.style|ext.math.styles|ext.timeline.styles|mediawiki.page.gallery.styles|mobile.app.preview.android|mobile.app.preview|mediawiki.skinning.content.parsoid&only=styles&skin=vector&version=&*"
-O "$BASE_PATH/app/src/main/assets/preview.css"
wget
"$PREFIX/load.php?debug=true&lang=en&modules=mobile.app.pagestyles.android.night&only=styles&skin=vector&version=&*"
-O "$BASE_PATH/app/src/main/assets/dark.css"
--
To view, visit https://gerrit.wikimedia.org/r/357391
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8ace9ec1e579ad6a33e0ed4b33d2f577adc5d9a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: Mholloway
Gerrit-Reviewer: Niedzielski
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]: Add appropriate OOjs UI icon pack dependencies for OOjs UI i...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357011 ) Change subject: Add appropriate OOjs UI icon pack dependencies for OOjs UI itself .. Add appropriate OOjs UI icon pack dependencies for OOjs UI itself Ridiculous? Why yes, yes it is. See T166948. Bug: T166730 Bug: T166948 Change-Id: I6428ca0d44d8773486230445e466bd5de272e873 --- M includes/OutputPage.php M resources/Resources.php 2 files changed, 22 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, but someone else must approve Jforrester: Looks good to me, approved diff --git a/includes/OutputPage.php b/includes/OutputPage.php index df948f0..24a506c 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -3977,6 +3977,9 @@ 'oojs-ui.styles.indicators', 'oojs-ui.styles.textures', 'mediawiki.widgets.styles', + 'oojs-ui.styles.icons-content', + 'oojs-ui.styles.icons-alerts', + 'oojs-ui.styles.icons-interactions', ] ); } diff --git a/resources/Resources.php b/resources/Resources.php index c4baab7..1b607ce 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -2587,6 +2587,9 @@ 'oojs-ui.styles.indicators', 'oojs-ui.styles.textures', 'mediawiki.language', + 'oojs-ui.styles.icons-content', + 'oojs-ui.styles.icons-alerts', + 'oojs-ui.styles.icons-interactions', ], 'targets' => [ 'desktop', 'mobile' ], ], @@ -2602,7 +2605,14 @@ 'class' => 'ResourceLoaderOOUIFileModule', 'scripts' => 'resources/lib/oojs-ui/oojs-ui-widgets.js', 'themeStyles' => 'widgets', - 'dependencies' => 'oojs-ui-core', + 'dependencies' => [ + 'oojs-ui-core', + 'oojs-ui.styles.icons-interactions', + 'oojs-ui.styles.icons-content', + 'oojs-ui.styles.icons-editing-advanced', + 'oojs-ui.styles.icons-movement', + 'oojs-ui.styles.icons-moderation', + ], 'messages' => [ 'ooui-outline-control-move-down', 'ooui-outline-control-move-up', @@ -2619,7 +2629,10 @@ 'class' => 'ResourceLoaderOOUIFileModule', 'scripts' => 'resources/lib/oojs-ui/oojs-ui-toolbars.js', 'themeStyles' => 'toolbars', - 'dependencies' => 'oojs-ui-core', + 'dependencies' => [ + 'oojs-ui-core', + 'oojs-ui.styles.icons-movement', + ], 'messages' => [ 'ooui-toolbar-more', 'ooui-toolgroup-collapse', @@ -2632,7 +2645,10 @@ 'class' => 'ResourceLoaderOOUIFileModule', 'scripts' => 'resources/lib/oojs-ui/oojs-ui-windows.js', 'themeStyles' => 'windows', - 'dependencies' => 'oojs-ui-core', + 'dependencies' => [ + 'oojs-ui-core', + 'oojs-ui.styles.icons-movement', + ], 'messages' => [ 'ooui-dialog-message-accept', 'ooui-dialog-message-reject', -- To view, visit https://gerrit.wikimedia.org/r/357011 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6428ca0d44d8773486230445e466bd5de272e873 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Thiemo Mättig (WMDE) 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: Fix doc child replacement
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357397 )
Change subject: VisualDiff: Fix doc child replacement
..
VisualDiff: Fix doc child replacement
If types are not equal, mark the change as a replacement, instead
of just setting typeChange, which is never used.
Only use 'structural-(insert/remove)' if a non content node is also
a branch node (so leaf nodes like AlienBlockNode aren't structural).
Change highlightRemove/highlightInsert order to ensure the node
at the correct offset is annotated.
Bug: T166801
Change-Id: I237254096ef58fca6060ef45a29b34244410aca5
---
M src/dm/ve.dm.VisualDiff.js
M src/ui/elements/ve.ui.DiffElement.js
2 files changed, 11 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/97/357397/1
diff --git a/src/dm/ve.dm.VisualDiff.js b/src/dm/ve.dm.VisualDiff.js
index 750d112..e61330f 100644
--- a/src/dm/ve.dm.VisualDiff.js
+++ b/src/dm/ve.dm.VisualDiff.js
@@ -235,6 +235,7 @@
var i, ilen, j, jlen,
treeDiff, linearDiff,
oldNode, newNode,
+ replacement,
oldDocChildTree,
newDocChildTree,
removeLength,
@@ -277,9 +278,11 @@
if ( !oldNode.canContainContent() &&
!newNode.canContainContent() ) {
// There is no content change
+ replacement = oldNode.type !== newNode.type;
diffInfo[ i ] = {
- typeChange: oldNode.type !==
newNode.type,
- attributeChange: !ve.compare(
oldNode.getAttributes(), newNode.getAttributes() ) ?
+ linearDiff: linearDiff,
+ replacement: replacement,
+ attributeChange: !replacement &&
!ve.compare( oldNode.getAttributes(), newNode.getAttributes() ) ?
{
oldAttributes:
oldNode.getAttributes(),
newAttributes:
newNode.getAttributes()
@@ -313,10 +316,11 @@
insertLength += newNode.getLength();
}
+ replacement = oldNode.type !== newNode.type;
diffInfo[ i ] = {
linearDiff: linearDiff,
- typeChange: oldNode.type !==
newNode.type,
- attributeChange: !ve.compare(
oldNode.getAttributes(), newNode.getAttributes() ) ?
+ replacement: replacement,
+ attributeChange: !replacement &&
!ve.compare( oldNode.getAttributes(), newNode.getAttributes() ) ?
{
oldAttributes:
oldNode.getAttributes(),
newAttributes:
newNode.getAttributes()
diff --git a/src/ui/elements/ve.ui.DiffElement.js
b/src/ui/elements/ve.ui.DiffElement.js
index e4f181f..ca082cc 100644
--- a/src/ui/elements/ve.ui.DiffElement.js
+++ b/src/ui/elements/ve.ui.DiffElement.js
@@ -400,7 +400,7 @@
orderedNode = oldNodes[ nodeIndex ];
node = orderedNode.node;
- if ( !node.canContainContent() ) {
+ if ( !node.canContainContent() && node.hasChildren() ) {
// Record that the node has been removed, but don't
display it, for now
// TODO: describe the change for the attribute diff
@@ -485,7 +485,7 @@
// Add insert class
nodeData[ nodeRangeStart ] = this.addAttributesToNode(
nodeData[ nodeRangeStart ], this.newDoc, {
- 'data-diff-action': node.canContainContent() ?
'insert' : 'structural-insert'
+ 'data-diff-action': ( node.canContainContent()
|| !node.hasChildren() ) ? 'insert' : 'structural-insert'
}
);
}
@@ -552,8 +552,8 @@
if ( diffInfo[ k ].replacement ) {
// We are treating these nodes
as removed and inserted
- highlightRemovedNode.call(
this, oldIndex );
highlightInsertedNode.call(
this, newIndex );
+ highlightRemovedNode.call(
this, oldIndex );
} else {
--
To view, visit https://gerrit.wikimedia.org/r/357397
To unsubscri
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Rename all files used in ResourceLoaderImageModule tests to ...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357376 )
Change subject: Rename all files used in ResourceLoaderImageModule tests to
fake names
..
Rename all files used in ResourceLoaderImageModule tests to fake names
Using names that match real OOjs UI icons is confusing when trying to
find usages of the real icons and when debugging the tests.
Bug: T166730
Change-Id: Ibb97c0347476efc95f1a50c97822d7dab19737f2
---
R tests/phpunit/data/resourceloader/abc.gif
R tests/phpunit/data/resourceloader/def.svg
R tests/phpunit/data/resourceloader/def_variantize.svg
R tests/phpunit/data/resourceloader/ghi.svg
R tests/phpunit/data/resourceloader/ghi_massage.svg
R tests/phpunit/data/resourceloader/jkl.svg
R tests/phpunit/data/resourceloader/mno-ltr.svg
R tests/phpunit/data/resourceloader/mno-rtl.svg
M tests/phpunit/data/resourceloader/oouiimagemodule/apex/icons.json
D tests/phpunit/data/resourceloader/oouiimagemodule/apex/images/icons/search.svg
A tests/phpunit/data/resourceloader/oouiimagemodule/apex/images/icons/stu.svg
M tests/phpunit/data/resourceloader/oouiimagemodule/wikimediaui/icons.json
D
tests/phpunit/data/resourceloader/oouiimagemodule/wikimediaui/images/icons/search.svg
A
tests/phpunit/data/resourceloader/oouiimagemodule/wikimediaui/images/icons/stu.svg
R tests/phpunit/data/resourceloader/pqr-a.svg
R tests/phpunit/data/resourceloader/pqr-b.svg
R tests/phpunit/data/resourceloader/pqr-f.svg
M tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php
M tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php
M tests/phpunit/includes/resourceloader/ResourceLoaderOOUIImageModuleTest.php
20 files changed, 76 insertions(+), 76 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/tests/phpunit/data/resourceloader/add.gif
b/tests/phpunit/data/resourceloader/abc.gif
similarity index 100%
rename from tests/phpunit/data/resourceloader/add.gif
rename to tests/phpunit/data/resourceloader/abc.gif
Binary files differ
diff --git a/tests/phpunit/data/resourceloader/remove.svg
b/tests/phpunit/data/resourceloader/def.svg
similarity index 100%
rename from tests/phpunit/data/resourceloader/remove.svg
rename to tests/phpunit/data/resourceloader/def.svg
diff --git a/tests/phpunit/data/resourceloader/remove_variantize.svg
b/tests/phpunit/data/resourceloader/def_variantize.svg
similarity index 100%
rename from tests/phpunit/data/resourceloader/remove_variantize.svg
rename to tests/phpunit/data/resourceloader/def_variantize.svg
diff --git a/tests/phpunit/data/resourceloader/next.svg
b/tests/phpunit/data/resourceloader/ghi.svg
similarity index 100%
rename from tests/phpunit/data/resourceloader/next.svg
rename to tests/phpunit/data/resourceloader/ghi.svg
diff --git a/tests/phpunit/data/resourceloader/next_massage.svg
b/tests/phpunit/data/resourceloader/ghi_massage.svg
similarity index 100%
rename from tests/phpunit/data/resourceloader/next_massage.svg
rename to tests/phpunit/data/resourceloader/ghi_massage.svg
diff --git a/tests/phpunit/data/resourceloader/prev.svg
b/tests/phpunit/data/resourceloader/jkl.svg
similarity index 100%
rename from tests/phpunit/data/resourceloader/prev.svg
rename to tests/phpunit/data/resourceloader/jkl.svg
diff --git a/tests/phpunit/data/resourceloader/help-ltr.svg
b/tests/phpunit/data/resourceloader/mno-ltr.svg
similarity index 100%
rename from tests/phpunit/data/resourceloader/help-ltr.svg
rename to tests/phpunit/data/resourceloader/mno-ltr.svg
diff --git a/tests/phpunit/data/resourceloader/help-rtl.svg
b/tests/phpunit/data/resourceloader/mno-rtl.svg
similarity index 100%
rename from tests/phpunit/data/resourceloader/help-rtl.svg
rename to tests/phpunit/data/resourceloader/mno-rtl.svg
diff --git a/tests/phpunit/data/resourceloader/oouiimagemodule/apex/icons.json
b/tests/phpunit/data/resourceloader/oouiimagemodule/apex/icons.json
index 4fe3d81..fdb4d12 100644
--- a/tests/phpunit/data/resourceloader/oouiimagemodule/apex/icons.json
+++ b/tests/phpunit/data/resourceloader/oouiimagemodule/apex/icons.json
@@ -1,6 +1,6 @@
{
"prefix": "oo-ui-icon",
"images": {
- "search": { "file": "images/icons/search.svg" }
+ "stu": { "file": "images/icons/stu.svg" }
}
}
diff --git
a/tests/phpunit/data/resourceloader/oouiimagemodule/apex/images/icons/search.svg
b/tests/phpunit/data/resourceloader/oouiimagemodule/apex/images/icons/search.svg
deleted file mode 100644
index 6952997..000
---
a/tests/phpunit/data/resourceloader/oouiimagemodule/apex/images/icons/search.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
-
-
-
-
diff --git
a/tests/phpunit/data/resourceloader/oouiimagemodule/apex/images/icons/stu.svg
b/tests/phpunit/data/resourceloader/oouiimagemodule/apex/images/icons/stu.svg
new fi
[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Revert "TwoColConflictPage: Load appropriate OOjs UI icon pack"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357346 ) Change subject: Revert "TwoColConflictPage: Load appropriate OOjs UI icon pack" .. Revert "TwoColConflictPage: Load appropriate OOjs UI icon pack" The help icon is part of the oojs-ui.styles.icons-interactions pack. This reverts commit 1a5e762b0f6555eb7686ae0551ec54bd09b9d004. Depends-On: Ib2f7aa42cd00724f38d5a4cb15af168f9fbd517e Change-Id: I4c7bf6242ef553115657473d29ba9227b22ff23f --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/357346 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c7bf6242ef553115657473d29ba9227b22ff23f Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/TwoColConflict Gerrit-Branch: master Gerrit-Owner: WMDE-Fisch Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Tobias Gritschacher Gerrit-Reviewer: WMDE-Fisch 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]: swift: create swift user home
Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357396 )
Change subject: swift: create swift user home
..
swift: create swift user home
In production the swift user already exists post-provisioning because of
T123918, also create/chown its home
Bug: T162609
Change-Id: I8eb1344db2e32386741d71a4f3cf0f38fbbeaebc
---
M modules/install_server/files/autoinstall/scripts/late_command.sh
M modules/swift/manifests/init.pp
2 files changed, 10 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/install_server/files/autoinstall/scripts/late_command.sh
b/modules/install_server/files/autoinstall/scripts/late_command.sh
index 3cddfe5..47161cc 100644
--- a/modules/install_server/files/autoinstall/scripts/late_command.sh
+++ b/modules/install_server/files/autoinstall/scripts/late_command.sh
@@ -51,6 +51,7 @@
case `hostname` in \
ms-be[123]*|ms-fe[123]*)
in-target /usr/sbin/groupadd --gid 130 --system swift
- in-target /usr/sbin/useradd --gid 130 --uid 130 --system
--shell /bin/false swift
+ in-target /usr/sbin/useradd --gid 130 --uid 130 --system
--shell /bin/false \
+ --create-home --home /var/lib/swift swift
;; \
esac
diff --git a/modules/swift/manifests/init.pp b/modules/swift/manifests/init.pp
index 98c4082..22bf7ab 100644
--- a/modules/swift/manifests/init.pp
+++ b/modules/swift/manifests/init.pp
@@ -73,6 +73,14 @@
mode=> '0755',
}
+# Create swift user home. Once T123918 is resolved this should be moved as
+# part of a user resource declaration.
+file { '/var/lib/swift':
+ensure => directory,
+require => Package['swift'],
+mode=> '0755',
+}
+
file { '/var/log/swift':
ensure => directory,
require => Package['swift'],
--
To view, visit https://gerrit.wikimedia.org/r/357396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8eb1344db2e32386741d71a4f3cf0f38fbbeaebc
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi
Gerrit-Reviewer: Filippo Giunchedi
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...release[master]: Update Wikidata to wmf/1.30.0-wmf.4
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357387 )
Change subject: Update Wikidata to wmf/1.30.0-wmf.4
..
Update Wikidata to wmf/1.30.0-wmf.4
Change-Id: Id2f080c8353ac5cc3c1359ab0a9f0651f3254e52
Depends-On: Ie96b7455e1fbcf0838dca61103a0d540532c4461
---
M make-wmf-branch/config.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json
index 1ef82ed..173acdf 100644
--- a/make-wmf-branch/config.json
+++ b/make-wmf-branch/config.json
@@ -175,6 +175,6 @@
"@": "Set a string for the specific commit, branch, or tag",
"special_extensions": {
"CentralNotice": "wmf_deploy",
- "Wikidata": "wmf/1.30.0-wmf.1"
+ "Wikidata": "wmf/1.30.0-wmf.4"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/357387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2f080c8353ac5cc3c1359ab0a9f0651f3254e52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Aude
Gerrit-Reviewer: Aude
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 try to i18n-parse JSON string
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357360 )
Change subject: Don't try to i18n-parse JSON string
..
Don't try to i18n-parse JSON string
Bug: T167051
Change-Id: Idf07ba51d2681f0f5d275f2a732d77cd85e63d03
---
M modules/ve-mw/init/ve.init.mw.Platform.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/ve-mw/init/ve.init.mw.Platform.js
b/modules/ve-mw/init/ve.init.mw.Platform.js
index 737edc8..e590af8 100644
--- a/modules/ve-mw/init/ve.init.mw.Platform.js
+++ b/modules/ve-mw/init/ve.init.mw.Platform.js
@@ -197,7 +197,7 @@
return mw.loader.using( 'mediawiki.language.specialCharacters' ).then(
function () {
var characters = {},
otherGroupName = mw.msg(
'visualeditor-special-characters-group-other' ),
- otherMsg = mw.msg(
'visualeditor-quick-access-characters.json' ),
+ otherMsg = mw.message(
'visualeditor-quick-access-characters.json' ).plain(),
other, groupObject;
try {
--
To view, visit https://gerrit.wikimedia.org/r/357360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idf07ba51d2681f0f5d275f2a732d77cd85e63d03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: 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...WikiEditor[master]: WikiEditor: ->
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357129 )
Change subject: WikiEditor: ->
..
WikiEditor: ->
Bug: T150172
Change-Id: I645cd627a8f66144fdbbdecf15b24af0528746a8
---
M modules/jquery.wikiEditor.toolbar.config.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
Objections:
Fomafix: There's a problem with this change, please improve
diff --git a/modules/jquery.wikiEditor.toolbar.config.js
b/modules/jquery.wikiEditor.toolbar.config.js
index 10c8ade..51ab111 100644
--- a/modules/jquery.wikiEditor.toolbar.config.js
+++ b/modules/jquery.wikiEditor.toolbar.config.js
@@ -347,7 +347,7 @@
action: {
type: 'encapsulate',
options: {
-
pre: '\n'
+
pre: '\n'
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/357129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I645cd627a8f66144fdbbdecf15b24af0528746a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: TheDJ
Gerrit-Reviewer: Fomafix
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...wikihiero[master]: Break long lines
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356886 )
Change subject: Break long lines
..
Break long lines
Prepare to make phpcs pass
Change-Id: I8862a29d51d81e2618f41876bb4974dccffe130c
---
M SpecialHieroglyphs.php
M wikihiero.body.php
M wikihiero.php
3 files changed, 39 insertions(+), 16 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/SpecialHieroglyphs.php b/SpecialHieroglyphs.php
index 43fdc4b..d485d6e 100644
--- a/SpecialHieroglyphs.php
+++ b/SpecialHieroglyphs.php
@@ -51,7 +51,10 @@
$out = $this->getContext()->getOutput();
$out->addModules( 'ext.wikihiero.Special' );
$out->addModuleStyles( 'ext.wikihiero' ); // apply CSS during
slow load
- $out->addWikiMsg( 'wikihiero-special-page-text', wfMessage(
'wikihiero-help-link' )->text() );
+ $out->addWikiMsg(
+ 'wikihiero-special-page-text',
+ wfMessage( 'wikihiero-help-link' )->text()
+ );
$out->addHTML( '' );
@@ -151,10 +154,18 @@
}
}
if ( $columns ) {
- $html .= "$upperRow"
- . ( $columns && $rows ? ' ' : '' ) . "\n";
- $html .= "$lowerRow"
- . ( $columns && $rows ? ' ' : '' ) . "\n";
+ $html .= "$upperRow" .
+ ( $columns && $rows
+ ? ' '
+ : ''
+ ) . "\n";
+ $html .= "$lowerRow" .
+ ( $columns && $rows
+ ? ' '
+ : ''
+ ) . "\n";
}
$html .= "\n";
}
diff --git a/wikihiero.body.php b/wikihiero.body.php
index 7b206aa..33fe33b 100644
--- a/wikihiero.body.php
+++ b/wikihiero.body.php
@@ -263,18 +263,23 @@
} elseif ( strchr( $code[0], '<' ) ) { // start
cartouche
$contentHtml .= '' .
$this->renderGlyph( $code[0] ) . '';
$is_cartouche = true;
- $contentHtml .= '' .
self::TABLE_START . "" . self::TABLE_START . "";
+ $contentHtml .= '' .
+ self::TABLE_START . "" . self::TABLE_START .
+ "";
} elseif ( strchr( $code[0], '>' ) ) { // end
cartouche
- $contentHtml .=
"';
+ $contentHtml .=
"';
$is_cartouche = false;
$contentHtml .= '' .
$this->renderGlyph( $code[0] ) . '';
} elseif ( $code[0] != "" ) { // assume it's a
glyph or '..' or '.'
- $contentHtml .= '' .
$this->renderGlyph( $code[0], $this->resizeGlyph( $code[0], $is_cartouche ) ) .
'';
+ $contentHtml .= '' .
$this->renderGlyph(
+ $code[0],
+ $this->resizeGlyph( $code[0],
$is_cartouche )
+ ) . '';
}
// block contains more than 1 glyph
@@ -291,7 +296,10 @@
// test if block exists in the prefabs list
if ( in_array( $temp, self::$prefabs ) ) {
- $contentHtml .= '' .
$this->renderGlyph( $temp, $this->resizeGlyph( $temp, $is_cartouche ) ) .
'';
+ $contentHtml .= '' .
$this->renderGlyph(
+ $temp,
+ $this->resizeGlyph( $temp,
$is_cartouche )
+ ) . '';
// block must be manually computed
} else {
@@ -342,7 +350,10 @@
} else {
// resize the glyph
according to the block total height
- $temp .=
$this->renderGlyph( $t, $this->resizeGlyph( $t, $is_cartouche, $total ) );
+
[MediaWiki-commits] [Gerrit] mediawiki...wikihiero[master]: Add phpcs and make pass
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357395 ) Change subject: Add phpcs and make pass .. Add phpcs and make pass Change-Id: I7d02e38365767853893e4df5a8f2584f2bb04d55 --- M HieroTokenizer.php M SpecialHieroglyphs.php M composer.json M generateTables.php A phpcs.xml 5 files changed, 22 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/HieroTokenizer.php b/HieroTokenizer.php index 6e97510..fd4c648 100644 --- a/HieroTokenizer.php +++ b/HieroTokenizer.php @@ -67,7 +67,7 @@ $text = preg_replace( '/\\
[MediaWiki-commits] [Gerrit] mediawiki...LockDownEnglishPages[master]: Require newer extension registration
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354886 )
Change subject: Require newer extension registration
..
Require newer extension registration
Change-Id: I463d470d1b2a93f2057a169ba0fa25cb96bb2516
---
A LockDownEnglishPages.class.php
D LockDownEnglishPages.php
A extension.json
3 files changed, 60 insertions(+), 53 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/LockDownEnglishPages.class.php b/LockDownEnglishPages.class.php
new file mode 100644
index 000..9d96351
--- /dev/null
+++ b/LockDownEnglishPages.class.php
@@ -0,0 +1,38 @@
+
+ * @license http://en.wikipedia.org/wiki/Public_domain Public domain
+ */
+
+class LockDownEnglishPages {
+
+ public static function onUserCan( &$title, &$user, $action, &$result ) {
+ // We want to prevent editing of MediaWiki pages for users who
have the
+ // editinterface right but who are not staff when the action is
'edit'
+ if (
+ $title->getNamespace() == NS_MEDIAWIKI &&
+ $user->isAllowed( 'editinterface' ) &&
+ !in_array( 'staff', $user->getEffectiveGroups() ) &&
+ $action == 'edit'
+ )
+ {
+ $pageTitle = $title->getDBkey();
+ if (
+ preg_match( '/\/en/', $pageTitle ) || // page
title has /en in it
+ !preg_match( '/\//', $pageTitle ) // page title
has no / in it
+ )
+ {
+ $result = false;
+ return false;
+ }
+ }
+ return true;
+ }
+}
diff --git a/LockDownEnglishPages.php b/LockDownEnglishPages.php
deleted file mode 100644
index a25ddaa..000
--- a/LockDownEnglishPages.php
+++ /dev/null
@@ -1,53 +0,0 @@
-
- * @license http://en.wikipedia.org/wiki/Public_domain Public domain
- * @see http://bugzilla.shoutwiki.com/show_bug.cgi?id=54
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
- die();
-}
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['other'][] = array(
- 'name' => 'Lock Down English Pages',
- 'version' => '0.1',
- 'author' => 'Jack Phoenix',
- 'descriptionmsg' => 'lockdownenglishpages-desc',
- 'url' =>
'https://www.mediawiki.org/wiki/Extension:LockDownEnglishPages',
-);
-
-$wgMessagesDirs['LockDownEnglishPages'] = __DIR__ . '/i18n';
-
-$wgHooks['userCan'][] = 'wfLockDownEnglishPages';
-
-function wfLockDownEnglishPages( &$title, &$user, $action, &$result ) {
- // We want to prevent editing of MediaWiki pages for users who have the
- // editinterface right but who are not staff when the action is 'edit'
- if (
- $title->getNamespace() == NS_MEDIAWIKI &&
- $user->isAllowed( 'editinterface' ) &&
- !in_array( 'staff', $user->getEffectiveGroups() ) &&
- $action == 'edit'
- )
- {
- $pageTitle = $title->getDBkey();
- if (
- preg_match( '/\/en/', $pageTitle ) || // page title has
/en in it
- !preg_match( '/\//', $pageTitle ) // page title has no
/ in it
- )
- {
- $result = false;
- return false;
- }
- }
- return true;
-}
\ No newline at end of file
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..9843676
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,22 @@
+{
+ "name": "LockDownEnglishPages",
+ "version": "0.2.0",
+ "authors": [
+ "Jack Phoenix"
+ ],
+ "url": "https://www.mediawiki.org/wiki/Extension:LockDownEnglishPages";,
+ "descriptionmsg": "lockdownenglishpages-desc",
+ "type": "other",
+ "MessagesDirs": {
+ "LockDownEnglishPages": [
+ "i18n"
+ ]
+ },
+ "AutoloadClasses": {
+ "LockDownEnglishPages": "LockDownEnglishPages.class.php"
+ },
+ "Hooks": {
+ "userCan": "LockDownEnglishPages::onUserCan"
+ },
+ "manifest_version": 1
+}
--
To view, visit https://gerrit.wikimedia.org/r/354886
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I463d470d1b2a93f2057a169ba0fa25cb96bb2516
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LockDownEnglishPages
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://
[MediaWiki-commits] [Gerrit] mediawiki...ParserFunctions[master]: Use short array syntax in alias file
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357398 ) Change subject: Use short array syntax in alias file .. Use short array syntax in alias file Change-Id: I9924568d2114a20a233a57d19ecb3375b4e10ff7 --- M ParserFunctions.i18n.magic.php 1 file changed, 646 insertions(+), 646 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ParserFunctions refs/changes/98/357398/1 diff --git a/ParserFunctions.i18n.magic.php b/ParserFunctions.i18n.magic.php index db5a6a0..e0e0b4e 100644 --- a/ParserFunctions.i18n.magic.php +++ b/ParserFunctions.i18n.magic.php @@ -6,753 +6,753 @@ * @ingroup Extensions */ -$magicWords = array(); +$magicWords = []; /** English (English) */ -$magicWords['en'] = array( - 'expr' => array( 0, 'expr' ), - 'if' => array( 0, 'if' ), - 'ifeq' => array( 0, 'ifeq' ), - 'ifexpr' => array( 0, 'ifexpr' ), - 'iferror' => array( 0, 'iferror' ), - 'switch' => array( 0, 'switch' ), - 'default' => array( 0, '#default' ), - 'ifexist' => array( 0, 'ifexist' ), - 'time' => array( 0, 'time' ), - 'timel' => array( 0, 'timel' ), - 'rel2abs' => array( 0, 'rel2abs' ), - 'titleparts' => array( 0, 'titleparts' ), - 'len' => array( 0, 'len' ), - 'pos' => array( 0, 'pos' ), - 'rpos' => array( 0, 'rpos' ), - 'sub' => array( 0, 'sub' ), - 'count' => array( 0, 'count' ), - 'replace' => array( 0, 'replace' ), - 'explode' => array( 0, 'explode' ), - 'urldecode' => array( 0, 'urldecode' ), -); +$magicWords['en'] = [ + 'expr' => [ 0, 'expr' ], + 'if' => [ 0, 'if' ], + 'ifeq' => [ 0, 'ifeq' ], + 'ifexpr' => [ 0, 'ifexpr' ], + 'iferror' => [ 0, 'iferror' ], + 'switch' => [ 0, 'switch' ], + 'default' => [ 0, '#default' ], + 'ifexist' => [ 0, 'ifexist' ], + 'time' => [ 0, 'time' ], + 'timel' => [ 0, 'timel' ], + 'rel2abs' => [ 0, 'rel2abs' ], + 'titleparts' => [ 0, 'titleparts' ], + 'len' => [ 0, 'len' ], + 'pos' => [ 0, 'pos' ], + 'rpos' => [ 0, 'rpos' ], + 'sub' => [ 0, 'sub' ], + 'count' => [ 0, 'count' ], + 'replace' => [ 0, 'replace' ], + 'explode' => [ 0, 'explode' ], + 'urldecode' => [ 0, 'urldecode' ], +]; /** Arabic (العربية) */ -$magicWords['ar'] = array( - 'expr' => array( 0, 'تعبير' ), - 'if' => array( 0, 'لو' ), - 'ifeq' => array( 0, 'لومعادلة' ), - 'ifexpr' => array( 0, 'لوتعبير' ), - 'iferror' => array( 0, 'لوخطأ' ), - 'switch' => array( 0, 'تبديل' ), - 'default' => array( 0, '#افتراضي' ), - 'ifexist' => array( 0, 'لوموجود' ), - 'time' => array( 0, 'وقت' ), - 'timel' => array( 0, 'تيمل' ), - 'rel2abs' => array( 0, 'ريلتوآبس' ), - 'titleparts' => array( 0, 'أجزاء_العنوان' ), - 'len' => array( 0, 'لين' ), - 'pos' => array( 0, 'بوس' ), - 'rpos' => array( 0, 'آربوس' ), - 'sub' => array( 0, 'متفرع' ), - 'count' => array( 0, 'عدد' ), - 'replace' => array( 0, 'استبدال' ), - 'explode' => array( 0, 'انفجار' ), - 'urldecode' => array( 0, 'فك_مسار' ), -); +$magicWords['ar'] = [ + 'expr' => [ 0, 'تعبير' ], + 'if' => [ 0, 'لو' ], + 'ifeq' => [ 0, 'لومعادلة' ], + 'ifexpr' => [ 0, 'لوتعبير' ], + 'iferror' => [ 0, 'لوخطأ' ], + 'switch' => [ 0, 'تبديل' ], + 'default' => [ 0, '#افتراضي' ], + 'ifexist' => [ 0, 'لوموجود' ], + 'time' => [ 0, 'وقت' ], + 'timel' => [ 0, 'تيمل' ], + 'rel2abs' => [ 0, 'ريلتوآبس' ], + 'titleparts' => [ 0, 'أجزاء_العنوان' ], + 'len' => [ 0, 'لين' ], + 'pos' => [ 0, 'بوس' ], + 'rpos' => [ 0, 'آربوس' ], + 'sub' => [ 0, 'متفرع' ], + 'count' => [ 0, 'عدد' ], + 'replace' => [ 0, 'استبدال' ], + 'explode' => [ 0, 'انفجار' ], + 'urldecode' => [ 0, 'فك_مسار' ], +]; /** Egyptian Arabic (مصرى) */ -$magicWords['arz'] = array( - 'expr' => array( 0, 'تعبير' ), - 'if' => array( 0, 'لو' ), - 'ifeq' => array( 0, 'لومعادلة' ), - 'ifexpr' => array( 0, 'لوتعبير' ), - 'iferror' => array( 0, 'لوخطأ' ), - 'switch' => array( 0, 'تبديل' ), - 'default' => array( 0, '#افتراضي' ), - 'ifexist' => array( 0, 'لوموجود' ), - 'time' => array( 0, 'وقت' ), - 'timel' => array( 0, 'تيمل' ), - 'rel2abs' => array( 0, 'ريلتوآبس' ), - 'titleparts' => array( 0, 'أجزاء_العنوان' ), - 'len' => array( 0, 'لين' ), - 'pos' => array( 0, 'بوس' ), - 'rpos' => array( 0, 'آربوس' ), - 'sub' => array( 0, 'متفرع' ), - 'count' => array( 0, 'عدد' ), - 'replace' => array( 0, 'استبدال' ), - 'explode' => array( 0, 'انفجار' ), - 'urldecode' => array( 0, 'فك_مسار' ), -); +$magicWords['arz'] = [ + 'expr' => [ 0, 'تعبير' ], +
[MediaWiki-commits] [Gerrit] mediawiki...ParserFunctions[master]: Add phpcs and make pass
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357399 )
Change subject: Add phpcs and make pass
..
Add phpcs and make pass
Change-Id: I8f985ca83223f1a2fdb4365294701f3b1d9b019b
---
M Expr.php
M ParserFunctions.hooks.php
M ParserFunctions.library.php
M ParserFunctions_body.php
M composer.json
A phpcs.xml
M tests/phpunit/ExpressionTest.php
7 files changed, 130 insertions(+), 103 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ParserFunctions
refs/changes/99/357399/1
diff --git a/Expr.php b/Expr.php
index d484e09..2ef3ece 100644
--- a/Expr.php
+++ b/Expr.php
@@ -48,7 +48,7 @@
define( 'EXPR_POW', 35 );
define( 'EXPR_PI', 36 );
define( 'EXPR_FMOD', 37 );
-define( 'EXPR_SQRT' , 38 );
+define( 'EXPR_SQRT', 38 );
class ExprError extends Exception {
/**
@@ -69,7 +69,7 @@
class ExprParser {
public $maxStackSize = 100;
- public $precedence = array(
+ public $precedence = [
EXPR_NEGATIVE => 10,
EXPR_POSITIVE => 10,
EXPR_EXPONENT => 10,
@@ -106,9 +106,9 @@
EXPR_PI => 0,
EXPR_OPEN => -1,
EXPR_CLOSE => -1,
- );
+ ];
- public $names = array(
+ public $names = [
EXPR_NEGATIVE => '-',
EXPR_POSITIVE => '+',
EXPR_NOT => 'not',
@@ -143,9 +143,9 @@
EXPR_POW => '^',
EXPR_PI => 'pi',
EXPR_SQRT => 'sqrt',
- );
+ ];
- public $words = array(
+ public $words = [
'mod' => EXPR_MOD,
'fmod' => EXPR_FMOD,
'and' => EXPR_AND,
@@ -168,7 +168,7 @@
'ceil' => EXPR_CEIL,
'pi' => EXPR_PI,
'sqrt' => EXPR_SQRT,
- );
+ ];
/**
* Evaluate a mathematical expression
@@ -181,12 +181,12 @@
* @return string
*/
public function doExpression( $expr ) {
- $operands = array();
- $operators = array();
+ $operands = [];
+ $operators = [];
# Unescape inequality operators
- $expr = strtr( $expr, array( '<' => '<', '>' => '>',
- '−' => '-', '−' => '-' ) );
+ $expr = strtr( $expr, [ '<' => '<', '>' => '>',
+ '−' => '-', '−' => '-' ] );
$p = 0;
$end = strlen( $expr );
@@ -239,7 +239,7 @@
throw new ExprError(
'unrecognised_word', $word );
}
$op = $this->words[$word];
- switch( $op ) {
+ switch ( $op ) {
// constant
case EXPR_EXPONENT:
if ( $expecting !== 'expression' ) {
@@ -385,7 +385,9 @@
}
// Finish off the operator array
+ // @codingStandardsIgnoreStart
while ( $op = array_pop( $operators ) ) {
+ // @codingStandardsIgnoreEnd
if ( $op == EXPR_OPEN ) {
throw new ExprError( 'unclosed_bracket' );
}
@@ -657,9 +659,11 @@
}
$right = array_pop( $stack );
$left = array_pop( $stack );
- if ( false === ( $stack[] = pow( $left, $right
) ) ) {
+ $result = pow( $left, $right );
+ if ( $result === false ) {
throw new ExprError(
'division_by_zero', $this->names[$op] );
}
+ $stack[] = $result;
break;
case EXPR_SQRT:
if ( count( $stack ) < 1 ) {
diff --git a/ParserFunctions.hooks.php b/ParserFunctions.hooks.php
index b204333..646f8e7 100644
--- a/ParserFunctions.hooks.php
+++ b/ParserFunctions.hooks.php
@@ -37,13 +37,13 @@
// String Functions
if ( $wgPFEnableStringFunctions ) {
- $parser->setFunctionHook( 'len',
'ExtParserFunctions::runLen' );
- $parser->setFunctionHook( 'pos',
'ExtParserFunctions::runPos' );
- $parser->setFunctionHook( 'rpos',
'ExtParserFunctions::runRPos' );
- $parser->setFunctionHook( 'sub',
'ExtParserFunctions::runSub' );
- $parser->setFunctionHook( 'count',
'ExtParserFunctions::runCount' );
- $parser->setFu
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Fix mixing in of TableCellableNode to AlienTableCellNode
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357400 )
Change subject: Fix mixing in of TableCellableNode to AlienTableCellNode
..
Fix mixing in of TableCellableNode to AlienTableCellNode
Only mixin to ATCN, not all alien nodes. Also setting the static
property is unnecessary as it is copied over by the mixin.
Bug: T167150
Change-Id: I18aec691b6765c61d4473405dad9205f41541af2
---
M src/ce/nodes/ve.ce.AlienNode.js
M src/dm/nodes/ve.dm.AlienNode.js
2 files changed, 7 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/00/357400/1
diff --git a/src/ce/nodes/ve.ce.AlienNode.js b/src/ce/nodes/ve.ce.AlienNode.js
index 76ec656..e3e8215 100644
--- a/src/ce/nodes/ve.ce.AlienNode.js
+++ b/src/ce/nodes/ve.ce.AlienNode.js
@@ -11,7 +11,6 @@
* @abstract
* @extends ve.ce.LeafNode
* @mixins ve.ce.FocusableNode
- * @mixins ve.ce.TableCellableNode
*
* @constructor
* @param {ve.dm.AlienNode} model
diff --git a/src/dm/nodes/ve.dm.AlienNode.js b/src/dm/nodes/ve.dm.AlienNode.js
index 208f095..f6f6e64 100644
--- a/src/dm/nodes/ve.dm.AlienNode.js
+++ b/src/dm/nodes/ve.dm.AlienNode.js
@@ -11,7 +11,6 @@
* @abstract
* @extends ve.dm.LeafNode
* @mixins ve.dm.FocusableNode
- * @mixins ve.dm.TableCellableNode
*
* @constructor
* @param {Object} [element] Reference to element in linear model
@@ -20,9 +19,8 @@
// Parent constructor
ve.dm.AlienNode.super.apply( this, arguments );
- // Mixin constructors
+ // Mixin constructor
ve.dm.FocusableNode.call( this );
- ve.dm.TableCellableNode.call( this );
};
/* Inheritance */
@@ -30,8 +28,6 @@
OO.inheritClass( ve.dm.AlienNode, ve.dm.LeafNode );
OO.mixinClass( ve.dm.AlienNode, ve.dm.FocusableNode );
-
-OO.mixinClass( ve.dm.AlienNode, ve.dm.TableCellableNode );
/* Static members */
@@ -111,6 +107,7 @@
*
* @class
* @extends ve.dm.AlienNode
+ * @mixins ve.dm.TableCellableNode
*
* @constructor
* @param {Object} [element] Reference to element in linear model
@@ -118,13 +115,16 @@
ve.dm.AlienTableCellNode = function VeDmAlienTableCellNode() {
// Parent constructor
ve.dm.AlienTableCellNode.super.apply( this, arguments );
+
+ // Mixin constructor
+ ve.dm.TableCellableNode.call( this );
};
OO.inheritClass( ve.dm.AlienTableCellNode, ve.dm.AlienNode );
-ve.dm.AlienTableCellNode.static.name = 'alienTableCell';
+OO.mixinClass( ve.dm.AlienTableCellNode, ve.dm.TableCellableNode );
-ve.dm.AlienTableCellNode.static.isCellable = true;
+ve.dm.AlienTableCellNode.static.name = 'alienTableCell';
/* Registration */
--
To view, visit https://gerrit.wikimedia.org/r/357400
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I18aec691b6765c61d4473405dad9205f41541af2
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Fix mixing in of TableCellableNode to AlienTableCellNode
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357400 )
Change subject: Fix mixing in of TableCellableNode to AlienTableCellNode
..
Fix mixing in of TableCellableNode to AlienTableCellNode
Only mixin to ATCN, not all alien nodes. Also setting the static
property is unnecessary as it is copied over by the mixin.
Bug: T167150
Change-Id: I18aec691b6765c61d4473405dad9205f41541af2
---
M src/ce/nodes/ve.ce.AlienNode.js
M src/dm/nodes/ve.dm.AlienNode.js
2 files changed, 7 insertions(+), 8 deletions(-)
Approvals:
DLynch: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ce/nodes/ve.ce.AlienNode.js b/src/ce/nodes/ve.ce.AlienNode.js
index 76ec656..e3e8215 100644
--- a/src/ce/nodes/ve.ce.AlienNode.js
+++ b/src/ce/nodes/ve.ce.AlienNode.js
@@ -11,7 +11,6 @@
* @abstract
* @extends ve.ce.LeafNode
* @mixins ve.ce.FocusableNode
- * @mixins ve.ce.TableCellableNode
*
* @constructor
* @param {ve.dm.AlienNode} model
diff --git a/src/dm/nodes/ve.dm.AlienNode.js b/src/dm/nodes/ve.dm.AlienNode.js
index 208f095..f6f6e64 100644
--- a/src/dm/nodes/ve.dm.AlienNode.js
+++ b/src/dm/nodes/ve.dm.AlienNode.js
@@ -11,7 +11,6 @@
* @abstract
* @extends ve.dm.LeafNode
* @mixins ve.dm.FocusableNode
- * @mixins ve.dm.TableCellableNode
*
* @constructor
* @param {Object} [element] Reference to element in linear model
@@ -20,9 +19,8 @@
// Parent constructor
ve.dm.AlienNode.super.apply( this, arguments );
- // Mixin constructors
+ // Mixin constructor
ve.dm.FocusableNode.call( this );
- ve.dm.TableCellableNode.call( this );
};
/* Inheritance */
@@ -30,8 +28,6 @@
OO.inheritClass( ve.dm.AlienNode, ve.dm.LeafNode );
OO.mixinClass( ve.dm.AlienNode, ve.dm.FocusableNode );
-
-OO.mixinClass( ve.dm.AlienNode, ve.dm.TableCellableNode );
/* Static members */
@@ -111,6 +107,7 @@
*
* @class
* @extends ve.dm.AlienNode
+ * @mixins ve.dm.TableCellableNode
*
* @constructor
* @param {Object} [element] Reference to element in linear model
@@ -118,13 +115,16 @@
ve.dm.AlienTableCellNode = function VeDmAlienTableCellNode() {
// Parent constructor
ve.dm.AlienTableCellNode.super.apply( this, arguments );
+
+ // Mixin constructor
+ ve.dm.TableCellableNode.call( this );
};
OO.inheritClass( ve.dm.AlienTableCellNode, ve.dm.AlienNode );
-ve.dm.AlienTableCellNode.static.name = 'alienTableCell';
+OO.mixinClass( ve.dm.AlienTableCellNode, ve.dm.TableCellableNode );
-ve.dm.AlienTableCellNode.static.isCellable = true;
+ve.dm.AlienTableCellNode.static.name = 'alienTableCell';
/* Registration */
--
To view, visit https://gerrit.wikimedia.org/r/357400
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I18aec691b6765c61d4473405dad9205f41541af2
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
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]: dm.MWTransclusionNode: Move mixin comment, remove duplicated...
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357401 )
Change subject: dm.MWTransclusionNode: Move mixin comment, remove duplicated
static property
..
dm.MWTransclusionNode: Move mixin comment, remove duplicated static property
Change-Id: Id8f8205db92a70dde7ba22b39e90e37590efb3d1
---
M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/01/357401/1
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
index cde269c..d45c284 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
@@ -13,7 +13,6 @@
* @extends ve.dm.LeafNode
* @mixins ve.dm.GeneratedContentNode
* @mixins ve.dm.FocusableNode
- * @mixins ve.dm.TableCellableNode
*
* @constructor
* @param {Object} [element] Reference to element in linear model
@@ -450,6 +449,7 @@
*
* @class
* @extends ve.dm.MWTransclusionNode
+ * @mixins ve.dm.TableCellableNode
*
* @constructor
* @param {Object} [element] Reference to element in linear model
@@ -469,8 +469,6 @@
ve.dm.MWTransclusionTableCellNode.static.matchTagNames = [];
ve.dm.MWTransclusionTableCellNode.static.name = 'mwTransclusionTableCell';
-
-ve.dm.MWTransclusionTableCellNode.static.isCellable = true;
/* Registration */
--
To view, visit https://gerrit.wikimedia.org/r/357401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8f8205db92a70dde7ba22b39e90e37590efb3d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CommentStreams[master]: WIP: Add comment voting.
Cicalese has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357402 )
Change subject: WIP: Add comment voting.
..
WIP: Add comment voting.
Change-Id: I05924a35df4145b575a583682e09c9f51f696d57
---
M extension.json
M i18n/en.json
M i18n/qqq.json
A images/downvote-disabled.png
A images/downvote-enabled.png
A images/upvote-disabled.png
A images/upvote-enabled.png
A includes/ApiCSVote.php
M includes/Comment.php
M includes/CommentStreams.php
M includes/CommentStreamsHooks.php
M resources/CommentStreams.js
M resources/CommentStreamsQuerier.js
A sql/votes.sql
14 files changed, 422 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CommentStreams
refs/changes/02/357402/1
diff --git a/extension.json b/extension.json
index b096a11..ecaad1b 100644
--- a/extension.json
+++ b/extension.json
@@ -47,6 +47,9 @@
"commentstreams-api-error-delete-haschildren",
"commentstreams-api-error-delete-permissions",
"commentstreams-api-error-delete",
+ "commentstreams-api-error-vote-notloggedin",
+ "commentstreams-api-error-vote-novoteonreply",
+ "commentstreams-api-error-vote",
"commentstreams-validation-error-nocommenttitle",
"commentstreams-validation-error-nocommenttext",
"commentstreams-buttontext-add",
@@ -82,6 +85,7 @@
"ApiCSQueryComment": "includes/ApiCSQueryComment.php",
"ApiCSEditComment": "includes/ApiCSEditComment.php",
"ApiCSDeleteComment": "includes/ApiCSDeleteComment.php",
+ "ApiCSVote": "includes/ApiCSVote.php",
"EchoCSFormatter": "includes/EchoCSFormatter.php",
"EchoCSReplyPresentationModel":
"includes/EchoCSReplyPresentationModel.php",
"EchoCSWatchedPresentationModel":
@@ -91,7 +95,8 @@
"csPostComment": "ApiCSPostComment",
"csQueryComment": "ApiCSQueryComment",
"csEditComment": "ApiCSEditComment",
- "csDeleteComment": "ApiCSDeleteComment"
+ "csDeleteComment": "ApiCSDeleteComment",
+ "csVote": "ApiCSVote"
},
"Hooks": {
"LoadExtensionSchemaUpdates":
"CommentStreamsHooks::addCommentTableToDatabase",
@@ -113,6 +118,7 @@
"CommentStreamsEnableTalk": false,
"CommentStreamsNewestStreamsOnTop": true,
"CommentStreamsModeratorFastDelete": false,
+ "CommentStreamsEnableVoting": false,
"CommentStreamsInitiallyCollapsedNamespaces" : [],
"CommentStreamsUserRealNamePropertyName" : null,
"CommentStreamsUserAvatarPropertyName" : null
diff --git a/i18n/en.json b/i18n/en.json
index 387348a..7d7a30c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -40,6 +40,9 @@
"commentstreams-api-error-delete-haschildren": "Cannot delete a topic
that has replies. Please refresh the page to see updated comment stream.",
"commentstreams-api-error-delete-permissions": "User does not have
permission to delete the comment.",
"commentstreams-api-error-delete": "Error deleting comment.",
+ "commentstreams-api-error-vote-notloggedin": "You must be logged in to
vote.",
+ "commentstreams-api-error-vote-novoteonreply": "Voting on replies is
not allowed.",
+ "commentstreams-api-error-vote": "Error voting on comment.",
"commentstreams-validation-error-nocommenttitle": "You must enter a
comment title.",
"commentstreams-validation-error-nocommenttext": "You must enter
comment text.",
"commentstreams-buttontext-add": "ADD A COMMENT",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 9fba01d..5e7a11e 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -40,6 +40,9 @@
"commentstreams-api-error-delete-haschildren": "Error message.",
"commentstreams-api-error-delete-permissions": "Error message.",
"commentstreams-api-error-delete": "Error message.",
+ "commentstreams-api-error-vote-notloggedin": "Error message.",
+ "commentstreams-api-error-vote-novoteonreply": "Error message.",
+ "commentstreams-api-error-vote": "Error message.",
"commentstreams-validation-error-nocommenttitle": "Error message.",
"commentstreams-validation-error-nocommenttext": "Error message.",
"commentstreams-buttontext-add": "User interface button text.",
diff --git a/images/downvote-disabled.png b/images/downvote-disabled.png
new file mode 100644
index 000..dc10396
--- /dev/null
+++ b/images/downvote-disabled.png
Binary files differ
diff --git a/images/downvote-enabled.png b/images/downvote-enabled.png
new file mode
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Set profile::base::check_raid_policy to 'WriteBack' for hado...
Elukey has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357403 ) Change subject: Set profile::base::check_raid_policy to 'WriteBack' for hadoop workers .. Set profile::base::check_raid_policy to 'WriteBack' for hadoop workers Bug: T166140 Change-Id: Id47f7c50eec1b7bd9de178d54d74a5bb76c9c1c7 --- M hieradata/regex.yaml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/03/357403/1 diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml index 4f9f056..6ee8e79 100644 --- a/hieradata/regex.yaml +++ b/hieradata/regex.yaml @@ -336,3 +336,6 @@ db_like_raid_policy: __regex: !ruby/regexp /^(db|dbstore|es|pc|labsdb)[12]\d\d\d\.(eqiad|codfw)\.wmnet$/ profile::base::check_raid_policy: 'WriteBack' +analytics_workers_raid_policy: + __regex: !ruby/regexp /^(analytics)[1][23456]\d\d\.eqiad\.wmnet$/ + profile::base::check_raid_policy: 'WriteBack' -- To view, visit https://gerrit.wikimedia.org/r/357403 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id47f7c50eec1b7bd9de178d54d74a5bb76c9c1c7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix action=feedcontributions date filtering parameters
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357109 )
Change subject: Fix action=feedcontributions date filtering parameters
..
Fix action=feedcontributions date filtering parameters
* Convert year/month date filter parameters to use start/end so that
ApiFeedContributions still works as expected after b668887
* Move SpecialContributions::processDateFilter (used to convert
year/month parameters to start/end parameters) to ContribsPager
since ApiFeedContributions also uses it now
Bug: T166859
Change-Id: I34fc8388a29e4cd36474934e6266127d0e3253cd
---
M includes/api/ApiFeedContributions.php
M includes/specials/SpecialContributions.php
M includes/specials/pagers/ContribsPager.php
R tests/phpunit/includes/specials/ContribsPagerTest.php
4 files changed, 49 insertions(+), 45 deletions(-)
Approvals:
jenkins-bot: Verified
Anomie: Looks good to me, approved
diff --git a/includes/api/ApiFeedContributions.php
b/includes/api/ApiFeedContributions.php
index 97720c6..cae1e15 100644
--- a/includes/api/ApiFeedContributions.php
+++ b/includes/api/ApiFeedContributions.php
@@ -70,11 +70,16 @@
$feedUrl
);
+ // Convert year/month parameters to end parameter
+ $params['start'] = '';
+ $params['end'] = '';
+ $params = ContribsPager::processDateFilter( $params );
+
$pager = new ContribsPager( $this->getContext(), [
'target' => $target,
'namespace' => $params['namespace'],
- 'year' => $params['year'],
- 'month' => $params['month'],
+ 'start' => $params['start'],
+ 'end' => $params['end'],
'tagFilter' => $params['tagfilter'],
'deletedOnly' => $params['deletedonly'],
'topOnly' => $params['toponly'],
diff --git a/includes/specials/SpecialContributions.php
b/includes/specials/SpecialContributions.php
index cc399b6..4da1c85 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -138,7 +138,7 @@
$this->opts['start'] = $request->getVal( 'start' );
$this->opts['end'] = $request->getVal( 'end' );
- $this->opts = SpecialContributions::processDateFilter(
$this->opts );
+ $this->opts = ContribsPager::processDateFilter(
$this->opts );
}
$feedType = $request->getVal( 'feed' );
@@ -726,46 +726,6 @@
}
// Autocomplete subpage as user list - public to allow caching
return UserNamePrefixSearch::search( 'public', $search, $limit,
$offset );
- }
-
- /**
-* Set up date filter options, given request data.
-*
-* @param array $opts Options array
-* @return array Options array with processed start and end date filter
options
-*/
- public static function processDateFilter( $opts ) {
- $start = $opts['start'] ?: '';
- $end = $opts['end'] ?: '';
- $year = $opts['year'] ?: '';
- $month = $opts['month'] ?: '';
-
- if ( $start !== '' && $end !== '' &&
- $start > $end
- ) {
- $temp = $start;
- $start = $end;
- $end = $temp;
- }
-
- // If year/month legacy filtering options are set, convert them
to display the new stamp
- if ( $year !== '' || $month !== '' ) {
- // Reuse getDateCond logic, but subtract a day because
- // the endpoints of our date range appear inclusive
- // but the internal end offsets are always exclusive
- $legacyTimestamp =
ReverseChronologicalPager::getOffsetDate( $year, $month );
- $legacyDateTime = new DateTime(
$legacyTimestamp->getTimestamp( TS_ISO_8601 ) );
- $legacyDateTime = $legacyDateTime->modify( '-1 day' );
-
- // Clear the new timestamp range options if used and
- // replace with the converted legacy timestamp
- $start = '';
- $end = $legacyDateTime->format( 'Y-m-d' );
- }
-
- $opts['start'] = $start;
- $opts['end'] = $end;
- return $opts;
}
protected function getGroupName() {
diff --git a/includes/specials/pagers/ContribsPager.php
b/includes/specials/pagers/ContribsPager.php
index e690a3f..a3880ee 100644
--- a/includes/specials/pagers/ContribsPager.php
+++ b/includes/specials/pagers/ContribsPager.ph
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add exception for events tagged as coming from MW
Ottomata has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356626 )
Change subject: Add exception for events tagged as coming from MW
..
Add exception for events tagged as coming from MW
Will let events tagged as `is_mediawiki` go through to mysql
Bug: T67508
Change-Id: I11778eac51e60fcca5ab39ebe5af0e9be14a524e
---
M modules/eventlogging/files/filters.py
M modules/role/manifests/eventlogging/analytics/mysql.pp
2 files changed, 16 insertions(+), 5 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/eventlogging/files/filters.py
b/modules/eventlogging/files/filters.py
index a60a92d..f638fdf 100644
--- a/modules/eventlogging/files/filters.py
+++ b/modules/eventlogging/files/filters.py
@@ -1,8 +1,19 @@
import json
-def is_not_bot(e):
-try:
-return not json.loads(e['userAgent'])['is_bot']
-except (ValueError, KeyError):
+def should_insert_event(e):
+"""
+Given an Event dict e, returns true if this event should be inserted into
the
+EventLogging storage (MySQL), or false otherwise. This is used
+to filter out events generated by unwanted bots.
+"""
+user_agent_dict = json.loads(e['userAgent'])
+
+is_bot = user_agent_dict.get('is_bot', False)
+is_mediawiki = user_agent_dict.get('is_mediawiki', False)
+
+# Don't insert events generated by bots unless they are mediawiki bots.
+if is_bot and not is_mediawiki:
+return False
+else:
return True
diff --git a/modules/role/manifests/eventlogging/analytics/mysql.pp
b/modules/role/manifests/eventlogging/analytics/mysql.pp
index 1b410a1..c0d2a62 100644
--- a/modules/role/manifests/eventlogging/analytics/mysql.pp
+++ b/modules/role/manifests/eventlogging/analytics/mysql.pp
@@ -48,7 +48,7 @@
$statsd_host = hiera('eventlogging_statsd_host',
'statsd.eqiad.wmnet')
# Filtering function to use on events consumed by mysql
-$filter_function = '&function=is_not_bot'
+$filter_function = '&function=should_insert_event'
# Custom URI scheme to pass events through filter
$filter_scheme= 'filter://'
--
To view, visit https://gerrit.wikimedia.org/r/356626
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I11778eac51e60fcca5ab39ebe5af0e9be14a524e
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Fdans
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Nuria
Gerrit-Reviewer: Ottomata
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] mediawiki...GeoData[master]: Add phpcs and make pass
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357404 )
Change subject: Add phpcs and make pass
..
Add phpcs and make pass
Change-Id: I0248bf43403606eb9f1597e0d6d1d9d5d24843af
---
M composer.json
M includes/Search/CirrusGeoFeature.php
M includes/Search/CoordinatesIndexField.php
M includes/Searcher.php
M includes/api/ApiQueryCoordinates.php
M includes/api/ApiQueryGeoSearchDb.php
M includes/api/ApiQueryGeoSearchElastic.php
M maintenance/updateIndexGranularity.php
A phpcs.xml
M tests/phpunit/BoundingBoxTest.php
M tests/phpunit/TagTest.php
11 files changed, 62 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GeoData
refs/changes/04/357404/1
diff --git a/composer.json b/composer.json
index 686b65b..b8f68fb 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,14 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "jakub-onderka/php-console-highlighter": "0.3.2"
+ "jakub-onderka/php-console-highlighter": "0.3.2",
+ "mediawiki/mediawiki-codesniffer": "0.7.2"
},
"scripts": {
+ "fix": "phpcbf",
"test": [
- "parallel-lint . --exclude vendor"
+ "parallel-lint . --exclude vendor",
+ "phpcs -p -s"
]
}
}
diff --git a/includes/Search/CirrusGeoFeature.php
b/includes/Search/CirrusGeoFeature.php
index cb81e01..812fcd8 100644
--- a/includes/Search/CirrusGeoFeature.php
+++ b/includes/Search/CirrusGeoFeature.php
@@ -36,7 +36,7 @@
* @return string[]
*/
protected function getKeywords() {
- return ['boost-nearcoord', 'boost-neartitle', 'nearcoord',
'neartitle'];
+ return [ 'boost-nearcoord', 'boost-neartitle', 'nearcoord',
'neartitle' ];
}
/**
diff --git a/includes/Search/CoordinatesIndexField.php
b/includes/Search/CoordinatesIndexField.php
index 01ccabd..5715844 100644
--- a/includes/Search/CoordinatesIndexField.php
+++ b/includes/Search/CoordinatesIndexField.php
@@ -29,8 +29,8 @@
$nested = new self( $name, $config );
$nested->addSubfield( 'coord', new GeoPointIndexField( 'coord',
$config ) );
// Setting analyzer to keyword is similar to index =>
not_analyzed
- $keywords = ['globe', 'type', 'country', 'region'];
- foreach( $keywords as $keyword ) {
+ $keywords = [ 'globe', 'type', 'country', 'region' ];
+ foreach ( $keywords as $keyword ) {
$nested->addSubfield( $keyword,
$engine->makeSearchFieldMapping( $keyword,
SearchIndexField::INDEX_TYPE_KEYWORD )
);
}
diff --git a/includes/Searcher.php b/includes/Searcher.php
index 852feb6..f3f9d00 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -2,7 +2,6 @@
namespace GeoData;
-
use CirrusSearch\ElasticsearchIntermediary;
use CirrusSearch\SearchConfig;
use CirrusSearch\SearchRequestLog;
diff --git a/includes/api/ApiQueryCoordinates.php
b/includes/api/ApiQueryCoordinates.php
index 706882a..794da05 100644
--- a/includes/api/ApiQueryCoordinates.php
+++ b/includes/api/ApiQueryCoordinates.php
@@ -28,7 +28,7 @@
$this->addTables( 'geo_tags' );
$this->addFields( [ 'gt_id', 'gt_page_id', 'gt_lat', 'gt_lon',
'gt_primary', 'gt_globe' ] );
$mapping = Coord::getFieldMapping();
- foreach( $params['prop'] as $prop ) {
+ foreach ( $params['prop'] as $prop ) {
if ( isset( $mapping[$prop] ) ) {
$this->addFields( $mapping[$prop] );
}
@@ -52,7 +52,7 @@
} else {
$this->addOption( 'USE INDEX', 'gt_page_id' );
}
-
+
$this->addOption( 'ORDER BY', [ 'gt_page_id', 'gt_id' ] );
$this->addOption( 'LIMIT', $params['limit'] + 1 );
@@ -71,7 +71,7 @@
if ( $row->gt_primary ) {
$vals['primary'] = '';
}
- foreach( $params['prop'] as $prop ) {
+ foreach ( $params['prop'] as $prop ) {
if ( isset( $mapping[$prop] ) && isset(
$row->{$mapping[$prop]} ) ) {
$field = $mapping[$prop];
$vals[$prop] = $row->$field;
diff --git a/includes/api/ApiQueryGeoSearchDb.php
b/includes/api/ApiQueryGeoSearchDb.php
index e20446f..ea47afd 100644
--- a/includes/api/ApiQueryGeoSearchDb.php
+++ b/includes/api/ApiQueryGeoSearchDb.php
@@ -22,7 +22,7 @@
$this->addTables( 'geo_tags' )
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: dm.MWTransclusionNode: Move mixin comment, remove duplicated...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357401 )
Change subject: dm.MWTransclusionNode: Move mixin comment, remove duplicated
static property
..
dm.MWTransclusionNode: Move mixin comment, remove duplicated static property
Change-Id: Id8f8205db92a70dde7ba22b39e90e37590efb3d1
---
M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
DLynch: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
index cde269c..d45c284 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
@@ -13,7 +13,6 @@
* @extends ve.dm.LeafNode
* @mixins ve.dm.GeneratedContentNode
* @mixins ve.dm.FocusableNode
- * @mixins ve.dm.TableCellableNode
*
* @constructor
* @param {Object} [element] Reference to element in linear model
@@ -450,6 +449,7 @@
*
* @class
* @extends ve.dm.MWTransclusionNode
+ * @mixins ve.dm.TableCellableNode
*
* @constructor
* @param {Object} [element] Reference to element in linear model
@@ -469,8 +469,6 @@
ve.dm.MWTransclusionTableCellNode.static.matchTagNames = [];
ve.dm.MWTransclusionTableCellNode.static.name = 'mwTransclusionTableCell';
-
-ve.dm.MWTransclusionTableCellNode.static.isCellable = true;
/* Registration */
--
To view, visit https://gerrit.wikimedia.org/r/357401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8f8205db92a70dde7ba22b39e90e37590efb3d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
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]: Update VE core submodule to master (f4b755c4c)
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357405 ) Change subject: Update VE core submodule to master (f4b755c4c) .. Update VE core submodule to master (f4b755c4c) New changes: 7989d8c27 Rename local variables to distinguish between DM nodes and orderedNodes fde924971 Localisation updates from https://translatewiki.net. f07dede07 DiffElement: Pass through config argument f4b755c4c Fix mixing in of TableCellableNode to AlienTableCellNode Bug: T167150 Change-Id: I51911e404ca32292a9db4bd5d8b0627368177df4 --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/05/357405/1 diff --git a/lib/ve b/lib/ve index 05375f3..f4b755c 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 05375f32400ee2bff9c8d524aecb41efb9cffb50 +Subproject commit f4b755c4c8887732420f3f8075483a28d1140da9 -- To view, visit https://gerrit.wikimedia.org/r/357405 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I51911e404ca32292a9db4bd5d8b0627368177df4 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...MobileFrontend[master]: phpcs: Allow linting tools to discover rules
Bmansurov has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357406 )
Change subject: phpcs: Allow linting tools to discover rules
..
phpcs: Allow linting tools to discover rules
Explicitly stating the current directory fixes the ambiguity
of finding the ruleset referred to in the file. This allows
syntax checkers like flycheck (for GNU Emacs) to work.
Also ignore node_modules as it contains the `resource-modules` package
which has php source code that doesn't conform to our linting rules.
Change-Id: I4c54e33de16cc3523153d40e8da20f4eee942d2d
---
M composer.json
M phpcs.xml
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/06/357406/1
diff --git a/composer.json b/composer.json
index 3e676f3..738121f 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
- "phpcs -p -s"
+ "phpcs -p -s --ignore=node_modules/*"
],
"fix": [
"phpcbf"
diff --git a/phpcs.xml b/phpcs.xml
index 750e66a..149e83f 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,6 @@
-
+
.
--
To view, visit https://gerrit.wikimedia.org/r/357406
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c54e33de16cc3523153d40e8da20f4eee942d2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Make vertical preview show 7 lines
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356465 )
Change subject: Make vertical preview show 7 lines
..
Make vertical preview show 7 lines
Bug: T165978
Change-Id: I3474ab271679d290be58afca0d31c25b17b0442b
---
M resources/ext.popups/styles/ext.popups.core.less
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/resources/ext.popups/styles/ext.popups.core.less
b/resources/ext.popups/styles/ext.popups.core.less
index 9598c11..fad45c5 100644
--- a/resources/ext.popups/styles/ext.popups.core.less
+++ b/resources/ext.popups/styles/ext.popups.core.less
@@ -186,7 +186,7 @@
width: @popupWidth;
.mwe-popups-extract {
- max-height: 120px;
+ max-height: 7 * @lineHeight;
overflow: hidden;
margin-bottom: 47px;
padding-bottom: 0;
--
To view, visit https://gerrit.wikimedia.org/r/356465
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3474ab271679d290be58afca0d31c25b17b0442b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Bmansurov
Gerrit-Reviewer: Jdlrobson
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]: elasticsearch - raise logging of actions to INFO
Gehel has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357371 ) Change subject: elasticsearch - raise logging of actions to INFO .. elasticsearch - raise logging of actions to INFO There is no reason to have a logger in DEBUG in production (unless we are actively trying to debug a problem). Bug: T167091 Change-Id: Ic704ab09066841c326a222e604b48fcf08b65f67 --- M modules/elasticsearch/templates/log4j2.properties.erb 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified DCausse: Looks good to me, but someone else must approve Gehel: Looks good to me, approved diff --git a/modules/elasticsearch/templates/log4j2.properties.erb b/modules/elasticsearch/templates/log4j2.properties.erb index ea0cc4e..a0be0b7 100644 --- a/modules/elasticsearch/templates/log4j2.properties.erb +++ b/modules/elasticsearch/templates/log4j2.properties.erb @@ -5,10 +5,6 @@ rootLogger.appenderRef.ship_to_logstash.ref = ship_to_logstash <% end %> -# log action execution errors for easier debugging -logger.action.name = org.elasticsearch.action -logger.action.level = debug - # This is noisy and already filed upstream: # https://github.com/elasticsearch/elasticsearch/issues/4203 # @TODO: Still needed? -- To view, visit https://gerrit.wikimedia.org/r/357371 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic704ab09066841c326a222e604b48fcf08b65f67 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gehel Gerrit-Reviewer: DCausse Gerrit-Reviewer: Gehel 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...mathoid[master]: Update readme node version, de-mention phantomjs
Golopotw has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357408 ) Change subject: Update readme node version, de-mention phantomjs .. Update readme node version, de-mention phantomjs Change-Id: I22464cf194ffc940cb9245a21229151ab002349f --- M README.md 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid refs/changes/08/357408/1 diff --git a/README.md b/README.md index 09fb4ec..1fbc5cf 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@ [](https://nodei.co/npm/mathoid/) -Mathoid-server is a service that uses MathJax and PhantomJS to create SVGs and MathML on server side. +Mathoid-server is a service that uses MathJax to create SVGs and MathML on server side. Mathoid-server is a based on svgtex - https://github.com/agrbin/svgtex. ## Installation -Install node 4.2.3, iojs-v2.5.0 or a compatible node version and npm version 2.14.7 or similar. +Install node 6.9.0 or a compatible node version. In addition the prerequisites from [librsvg](https://www.npmjs.com/package/librsvg#installation) are needed. For Debian based systems installing the `librsvg2-dev` should be sufficient. ```bash @@ -19,7 +19,7 @@ Thereafter, install mathoid by running ```bash npm install mathoid -nodejs /node_modules/mathoid/server.js +node /node_modules/mathoid/server.js ``` To install mathoid as a unix service there is a [script](scripts/gen-init-scripts.rb). -- To view, visit https://gerrit.wikimedia.org/r/357408 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22464cf194ffc940cb9245a21229151ab002349f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mathoid Gerrit-Branch: master Gerrit-Owner: Golopotw ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...quarrybot-enwiki[master]: Add Code of Conduct.md per policy
Zppix has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357407 ) Change subject: Add Code of Conduct.md per policy .. Add Code of Conduct.md per policy Change-Id: I662bdb6da749a4ef0b5f889311f7b4cc076af764 --- A Code of Conduct.md 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/quarrybot-enwiki refs/changes/07/357407/2 diff --git a/Code of Conduct.md b/Code of Conduct.md new file mode 100644 index 000..d8e5d08 --- /dev/null +++ b/Code of Conduct.md @@ -0,0 +1 @@ +The development of this software is covered by a [Code of Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct). -- To view, visit https://gerrit.wikimedia.org/r/357407 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I662bdb6da749a4ef0b5f889311f7b4cc076af764 Gerrit-PatchSet: 2 Gerrit-Project: labs/tools/quarrybot-enwiki Gerrit-Branch: master Gerrit-Owner: Zppix ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...quarrybot-enwiki[master]: Add Code of Conduct.md per policy
Paladox has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357407 ) Change subject: Add Code of Conduct.md per policy .. Add Code of Conduct.md per policy Change-Id: I662bdb6da749a4ef0b5f889311f7b4cc076af764 --- A Code of Conduct.md 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Paladox: Verified; Looks good to me, approved diff --git a/Code of Conduct.md b/Code of Conduct.md new file mode 100644 index 000..d8e5d08 --- /dev/null +++ b/Code of Conduct.md @@ -0,0 +1 @@ +The development of this software is covered by a [Code of Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct). -- To view, visit https://gerrit.wikimedia.org/r/357407 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I662bdb6da749a4ef0b5f889311f7b4cc076af764 Gerrit-PatchSet: 2 Gerrit-Project: labs/tools/quarrybot-enwiki Gerrit-Branch: master Gerrit-Owner: Zppix Gerrit-Reviewer: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::graphite::alerts: add transformNull to some alerts
Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357409 )
Change subject: role::graphite::alerts: add transformNull to some alerts
..
role::graphite::alerts: add transformNull to some alerts
All the mediawiki session/centralauth alerts only expect data points
when there's a problem, so a null datapoint is actually good news. Use
transformNull(metric, 0) to account for this.
Change-Id: I0e678b676ff87936c972af5603674c583a502c17
---
M modules/role/manifests/graphite/alerts.pp
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/09/357409/1
diff --git a/modules/role/manifests/graphite/alerts.pp
b/modules/role/manifests/graphite/alerts.pp
index 3983b04..f32adca 100644
--- a/modules/role/manifests/graphite/alerts.pp
+++ b/modules/role/manifests/graphite/alerts.pp
@@ -60,7 +60,7 @@
# See https://grafana.wikimedia.org/dashboard/db/edit-count
monitoring::graphite_threshold { 'mediawiki_session_loss':
description => 'MediaWiki edit session loss
(https://grafana.wikimedia.org/dashboard/db/edit-count)',
-metric =>
'scale(consolidateBy(MediaWiki.edit.failures.session_loss.rate, "max"), 60)',
+metric =>
'transformNull(scale(consolidateBy(MediaWiki.edit.failures.session_loss.rate,
"max"), 60), 0)',
warning => 10,
critical=> 50,
from=> '15min',
@@ -69,7 +69,7 @@
monitoring::graphite_threshold { 'mediawiki_bad_token':
description => 'MediaWiki edit failure due to bad token
(https://grafana.wikimedia.org/dashboard/db/edit-count)',
-metric =>
'scale(consolidateBy(MediaWiki.edit.failures.bad_token.rate, "max"), 60)',
+metric =>
'transformNull(scale(consolidateBy(MediaWiki.edit.failures.bad_token.rate,
"max"), 60), 0)',
warning => 10,
critical=> 50,
from=> '15min',
@@ -79,7 +79,7 @@
# Monitor MediaWiki CentralAuth bad tokens
monitoring::graphite_threshold { 'mediawiki_centralauth_errors':
description => 'MediaWiki centralauth errors',
-metric =>
'sumSeries(MediaWiki.centralauth.centrallogin_errors.*.rate)',
+metric =>
'transformNull(sumSeries(MediaWiki.centralauth.centrallogin_errors.*.rate), 0)',
warning => 0.5,
critical=> 1,
from=> '15min',
--
To view, visit https://gerrit.wikimedia.org/r/357409
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e678b676ff87936c972af5603674c583a502c17
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Fix Thumbor role
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357390 )
Change subject: Fix Thumbor role
..
Fix Thumbor role
A number of things broke. It doesn’t seem to like
folder permissions when running inside Sierra, despite
turning NFS off. python-swift backport dependencies
needed to be updated. Removed Sentry, which isn’t used
now that we have good logs.
Change-Id: Ic3b7f4eed871e3d66e5368f708886cbf8de8c2a9
---
M puppet/hieradata/common.yaml
M puppet/modules/role/manifests/thumbor.pp
M puppet/modules/swift/manifests/init.pp
M puppet/modules/thumbor/manifests/init.pp
M puppet/modules/thumbor/manifests/service.pp
M puppet/modules/thumbor/templates/10-thumbor.conf.erb
6 files changed, 37 insertions(+), 72 deletions(-)
Approvals:
jenkins-bot: Verified
Gilles: Looks good to me, approved
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 4adc168..9c10af6 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -479,9 +479,8 @@
swift::container_cfg_file: /etc/swift/container-server.conf
thumbor::cfg_dir: /etc/thumbor.d
-thumbor::log_dir: /vagrant/logs/thumbor
+thumbor::log_dir: /srv/thumbor
thumbor::tmp_dir: /tmp/thumbor
thumbor::statsd_port: "%{hiera('statsd::port')}"
-thumbor::sentry_dsn_file: "%{hiera('sentry::dsn_file')}"
xhprofgui::dir: "%{hiera('mwv::vendor_dir')}/xhprof"
diff --git a/puppet/modules/role/manifests/thumbor.pp
b/puppet/modules/role/manifests/thumbor.pp
index fe9ec23..6641714 100644
--- a/puppet/modules/role/manifests/thumbor.pp
+++ b/puppet/modules/role/manifests/thumbor.pp
@@ -14,7 +14,6 @@
require ::role::multimedia
require ::role::vipsscaler
require ::role::wikimediamaintenance
-include ::role::sentry
include ::apache::mod::proxy
include ::apache::mod::proxy_http
include ::apache::mod::headers
diff --git a/puppet/modules/swift/manifests/init.pp
b/puppet/modules/swift/manifests/init.pp
index 74746ed..c652ff2 100644
--- a/puppet/modules/swift/manifests/init.pp
+++ b/puppet/modules/swift/manifests/init.pp
@@ -49,37 +49,28 @@
include ::apache::mod::proxy
include ::apache::mod::proxy_http
-apt::pin { 'python-swift-jessie-backports':
-package => 'python-swift*',
-pin => 'release n=jessie-backports',
-priority => 1000,
-}
+$packages = [
+'python-cryptography',
+'python-dnspython',
+'python-eventlet',
+'python-pkg-resources',
+'python-pyasn1',
+'python-setuptools',
+'python-swift*',
+'python-webob',
+'swift*'
+]
-apt::pin { 'python-eventlet-jessie-backports':
-package => 'python-eventlet',
-pin => 'release n=jessie-backports',
-priority => 1000,
-}
-
-apt::pin { 'python-webob-jessie-backports':
-package => 'python-webob',
-pin => 'release n=jessie-backports',
-priority => 1000,
-}
-
-apt::pin { 'swift-jessie-backports':
-package => 'swift*',
-pin => 'release n=jessie-backports',
-priority => 1000,
+apt::pin { 'swift-python-backports':
+package => join(sort($packages), ' '),
+pin => 'release a=jessie-backports',
+priority => '1000',
}
package { ['swift', 'swift-account', 'swift-container', 'swift-object',
'swift-proxy', 'python-webob']:
ensure => 'present',
require => [
-Apt::Pin['python-swift-jessie-backports'],
-Apt::Pin['python-eventlet-jessie-backports'],
-Apt::Pin['swift-jessie-backports'],
-Apt::Pin['python-webob-jessie-backports'],
+Apt::Pin['swift-python-backports'],
],
}
diff --git a/puppet/modules/thumbor/manifests/init.pp
b/puppet/modules/thumbor/manifests/init.pp
index 321b8b6..714a783 100644
--- a/puppet/modules/thumbor/manifests/init.pp
+++ b/puppet/modules/thumbor/manifests/init.pp
@@ -19,32 +19,23 @@
# [*statsd_port*]
# Port the statsd instance runs on.
#
-# [*sentry_dsn_file*]
-# Path to file containing the sentry dsn file.
-#
class thumbor (
$cfg_dir,
$log_dir,
$tmp_dir,
$statsd_port,
-$sentry_dsn_file,
) {
-apt::pin { 'gifsicle-jessie-backports':
-package => 'gifsicle',
-pin => 'release n=jessie-backports',
-priority => 1000,
-}
-apt::pin { 'python-tornado-jessie-backports':
-package => 'python-tornado',
-pin => 'release n=jessie-backports',
-priority => 1000,
-}
+$packages = [
+'gifsicle',
+'python-tornado',
+'python-pil',
+]
-apt::pin { 'python-pil-jessie-backports':
-package => 'python-pil',
-pin => 'release n=jessie-backports',
-priority => 1000,
+apt::pin { 'thumbor-python-backports':
+package => join
[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::graphite::alerts: add transformNull to some alerts
Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357409 )
Change subject: role::graphite::alerts: add transformNull to some alerts
..
role::graphite::alerts: add transformNull to some alerts
All the mediawiki session/centralauth alerts only expect data points
when there's a problem, so a null datapoint is actually good news. Use
transformNull(metric, 0) to account for this.
Change-Id: I0e678b676ff87936c972af5603674c583a502c17
---
M modules/role/manifests/graphite/alerts.pp
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/graphite/alerts.pp
b/modules/role/manifests/graphite/alerts.pp
index 3983b04..f32adca 100644
--- a/modules/role/manifests/graphite/alerts.pp
+++ b/modules/role/manifests/graphite/alerts.pp
@@ -60,7 +60,7 @@
# See https://grafana.wikimedia.org/dashboard/db/edit-count
monitoring::graphite_threshold { 'mediawiki_session_loss':
description => 'MediaWiki edit session loss
(https://grafana.wikimedia.org/dashboard/db/edit-count)',
-metric =>
'scale(consolidateBy(MediaWiki.edit.failures.session_loss.rate, "max"), 60)',
+metric =>
'transformNull(scale(consolidateBy(MediaWiki.edit.failures.session_loss.rate,
"max"), 60), 0)',
warning => 10,
critical=> 50,
from=> '15min',
@@ -69,7 +69,7 @@
monitoring::graphite_threshold { 'mediawiki_bad_token':
description => 'MediaWiki edit failure due to bad token
(https://grafana.wikimedia.org/dashboard/db/edit-count)',
-metric =>
'scale(consolidateBy(MediaWiki.edit.failures.bad_token.rate, "max"), 60)',
+metric =>
'transformNull(scale(consolidateBy(MediaWiki.edit.failures.bad_token.rate,
"max"), 60), 0)',
warning => 10,
critical=> 50,
from=> '15min',
@@ -79,7 +79,7 @@
# Monitor MediaWiki CentralAuth bad tokens
monitoring::graphite_threshold { 'mediawiki_centralauth_errors':
description => 'MediaWiki centralauth errors',
-metric =>
'sumSeries(MediaWiki.centralauth.centrallogin_errors.*.rate)',
+metric =>
'transformNull(sumSeries(MediaWiki.centralauth.centrallogin_errors.*.rate), 0)',
warning => 0.5,
critical=> 1,
from=> '15min',
--
To view, visit https://gerrit.wikimedia.org/r/357409
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e678b676ff87936c972af5603674c583a502c17
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
Gerrit-Reviewer: Giuseppe Lavagetto
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PagesList[master]: Prevent PagesList from failing apihelp tests
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347215 )
Change subject: Prevent PagesList from failing apihelp tests
..
Prevent PagesList from failing apihelp tests
Extension PagesList failing tests due to mising apihelp messages
Bug: T154926
Change-Id: Ia8b7ea44d002605f4a5d06ab1c5f5b5242b27aaa
---
M PagesListAPI.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 16 insertions(+), 25 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PagesListAPI.php b/PagesListAPI.php
index 28581b3..d443900 100644
--- a/PagesListAPI.php
+++ b/PagesListAPI.php
@@ -62,14 +62,6 @@
/**
*
-* @return string
-*/
- public function getDescription() {
- return 'Shows a list of pages contained in the wiki.';
- }
-
- /**
-*
* @return array
*/
public function getAllowedParams() {
@@ -90,25 +82,14 @@
}
/**
+* @see ApiBase::getExamplesMessages()
*
* @return array
*/
- public function getParamDescription() {
+ public function getExamplesMessages() {
return array(
- 'draw' => 'Value to ensure response matches this
request',
- 'start' => 'Result offset, zero-based',
- 'length' => 'Number of results to return'
- );
- }
-
- /**
-*
-* @return array
-*/
- public function getExamples() {
- return array(
- 'api.php?action=' . $this->getModuleName() .
'&draw=2&format=json&start=10&length=10'
- => 'Get results 10-19 from the PagesList'
+ 'action=' . $this->getModuleName() .
'&draw=2&format=json&start=10&length=10'
+ => 'apihelp-pageslist-example'
);
}
}
diff --git a/i18n/en.json b/i18n/en.json
index 1ab4ef4..d2c9dc3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -12,5 +12,10 @@
"pageslist-title": "Title",
"pageslist-last-modified": "Last modified",
"pageslist-last-user": "Last modified by",
- "pageslist-basepage": "Subpages of (include namespace):"
+ "pageslist-basepage": "Subpages of (include namespace):",
+ "apihelp-pageslist-description": "Shows a list of pages contained in
the wiki.",
+ "apihelp-pageslist-param-draw": "Value to ensure response matches this
request",
+ "apihelp-pageslist-param-start": "Result offset, zero-based",
+ "apihelp-pageslist-param-length": "Number of results to return",
+ "apihelp-pageslist-example": "Get results 10-19 from the PagesList"
}
\ No newline at end of file
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 95c769b..3ddd321 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -14,5 +14,10 @@
"pageslist-title": "Table header for the Page Title
column\n{{Identical|Title}}",
"pageslist-last-modified": "Table header for the Last modified column",
"pageslist-last-user": "Table header for the Last modified by column",
- "pageslist-basepage": "Label for the basepage field"
+ "pageslist-basepage": "Label for the basepage field",
+ "apihelp-pageslist-description":
"{{doc-apihelp-description|pageslist}}",
+ "apihelp-pageslist-param-draw": "{{doc-apihelp-param|pageslist|draw}}",
+ "apihelp-pageslist-param-start":
"{{doc-apihelp-param|pageslist|start}}",
+ "apihelp-pageslist-param-length":
"{{doc-apihelp-param|pageslist|length}}",
+ "apihelp-pageslist-example": "{{doc-apihelp-example|pageslist}}"
}
--
To view, visit https://gerrit.wikimedia.org/r/347215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8b7ea44d002605f4a5d06ab1c5f5b5242b27aaa
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/PagesList
Gerrit-Branch: master
Gerrit-Owner: DatGuy
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: Umherirrender
Gerrit-Reviewer: jenkins-bot <>
Gerrit-Reviewer: tosfos
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CSS[master]: v3.5.0 - Delete backward-compatibility files, require 1.25+
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357303 )
Change subject: v3.5.0 - Delete backward-compatibility files, require 1.25+
..
v3.5.0 - Delete backward-compatibility files, require 1.25+
Change-Id: I8a1f9d65c1725911508012bb20cc4393f4e244b2
Reviewed-on: https://gerrit.wikimedia.org/r/357303
Reviewed-by: Jack Phoenix
Reviewed-by: Bartosz Dziewoński
Tested-by: jenkins-bot
---
A CSS.class.php
D CSS.i18n.php
D CSS.php
A extension.json
4 files changed, 119 insertions(+), 143 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
Jack Phoenix: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/CSS.class.php b/CSS.class.php
new file mode 100644
index 000..287c136
--- /dev/null
+++ b/CSS.class.php
@@ -0,0 +1,87 @@
+https://www.mediawiki.org/wiki/Extension:CSS for installation and usage
+ * details.
+ *
+ * @file
+ * @ingroup Extensions
+ * @author Aran Dunkley [http://www.organicdesign.co.nz/nad User:Nad]
+ * @author Rusty Burchfield
+ * @copyright © 2007-2010 Aran Dunkley
+ * @copyright © 2011 Rusty Burchfield
+ * @licence GNU General Public Licence 2.0 or later
+ */
+
+class CSS {
+
+ /**
+* @param Parser $parser
+* @param string $css
+* @return string
+*/
+ public static function CSSRender( &$parser, $css ) {
+ global $wgCSSPath, $wgStylePath, $wgCSSIdentifier;
+
+ $css = trim( $css );
+ $title = Title::newFromText( $css );
+ $rawProtection = "$wgCSSIdentifier=1";
+ $headItem = '';
+
+ if ( is_object( $title ) && $title->exists() ) {
+ # Article actually in the db
+ $params = "action=raw&ctype=text/css&$rawProtection";
+ $url = $title->getLocalURL( $params );
+ $headItem .= Html::linkedStyle( $url );
+ } elseif ( $css[0] == '/' ) {
+ # Regular file
+ $base = $wgCSSPath === false ? $wgStylePath :
$wgCSSPath;
+ $url = wfAppendQuery( $base . $css, $rawProtection );
+
+ # Verify the expanded URL is still using the base URL
+ if ( strpos( wfExpandUrl( $url ), wfExpandUrl( $base )
) === 0 ) {
+ $headItem .= Html::linkedStyle( $url );
+ } else {
+ $headItem .= '';
+ }
+ } else {
+ # sanitized user CSS
+ $css = Sanitizer::checkCss( $css );
+
+ # Encode data URI and append link tag
+ $dataPrefix = 'data:text/css;charset=UTF-8;base64,';
+ $url = $dataPrefix . base64_encode( $css );
+
+ $headItem .= Html::linkedStyle( $url );
+ }
+
+ $headItem .= '';
+ $parser->getOutput()->addHeadItem( $headItem );
+ return '';
+ }
+
+ /**
+* @param Parser $parser
+* @return bool true
+*/
+ public static function onParserFirstCallInit( $parser ) {
+ $parser->setFunctionHook( 'css', 'CSS::CSSRender' );
+ return true;
+ }
+
+ /**
+* @param RawPage $rawPage
+* @param string $text
+* @return bool true
+*/
+ public static function onRawPageViewBeforeOutput( &$rawPage, &$text ) {
+ global $wgCSSIdentifier;
+
+ if ( $rawPage->getRequest()->getBool( $wgCSSIdentifier ) ) {
+ $text = Sanitizer::checkCss( $text );
+ }
+ return true;
+ }
+}
diff --git a/CSS.i18n.php b/CSS.i18n.php
deleted file mode 100644
index 57cd273..000
--- a/CSS.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim1fc70790a07163f4' ) ) {
- function wfJsonI18nShim1fc70790a07163f4( $cache, $code, &$cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
- if ( is_readable( $fileName ) ) {
-
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: fixing Alpha update notification icon for api >= 21
Yashasvi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357411 )
Change subject: fixing Alpha update notification icon for api >= 21
..
fixing Alpha update notification icon for api >= 21
Bug: T159722
Change-Id: I3a9adec63a0f2c5b47f14107b252ee244308d51c
---
M app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
A app/src/main/res/drawable/ic_launcher_transparent.xml
2 files changed, 19 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/11/357411/1
diff --git
a/app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
b/app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
index 9b98d43..9237eed 100644
--- a/app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
+++ b/app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
@@ -1,12 +1,12 @@
package org.wikipedia.alphaupdater;
-import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
+import android.os.Build;
import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
import android.support.v4.app.NotificationCompat;
@@ -72,16 +72,20 @@
Intent intent = new Intent(Intent.ACTION_VIEW,
Uri.parse(ALPHA_BUILD_APK_URL));
PendingIntent pintent = PendingIntent.getActivity(context, 0, intent,
0);
-Notification notification = new NotificationCompat.Builder(context)
-.setSmallIcon(R.mipmap.launcher)
+NotificationCompat.Builder notificationBuilder = new
NotificationCompat.Builder(context)
.setContentTitle(context.getString(R.string.alpha_update_notification_title))
.setContentText(context.getString(R.string.alpha_update_notification_text))
.setContentIntent(pintent)
-.setAutoCancel(true)
-.build();
+.setAutoCancel(true);
+
+if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+
notificationBuilder.setSmallIcon(R.drawable.ic_launcher_transparent);
+} else {
+notificationBuilder.setSmallIcon(R.mipmap.launcher);
+}
NotificationManager manager = (NotificationManager)
context.getSystemService(Context.NOTIFICATION_SERVICE);
-manager.notify(1, notification);
+manager.notify(1, notificationBuilder.build());
}
@Override
diff --git a/app/src/main/res/drawable/ic_launcher_transparent.xml
b/app/src/main/res/drawable/ic_launcher_transparent.xml
new file mode 100644
index 000..49e03cf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_transparent.xml
@@ -0,0 +1,9 @@
+http://schemas.android.com/apk/res/android";
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+
--
To view, visit https://gerrit.wikimedia.org/r/357411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a9adec63a0f2c5b47f14107b252ee244308d51c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yashasvi
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TitleBlacklist[master]: Add phpcs and make pass
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357412 )
Change subject: Add phpcs and make pass
..
Add phpcs and make pass
Change-Id: If5a2ec9700148eb842d6580945e51e1942a2e0ed
---
M TitleBlacklist.hooks.php
M TitleBlacklist.library.php
M TitleBlacklist.list.php
M api/ApiQueryTitleBlacklist.php
M composer.json
A phpcs.xml
M tests/phpunit/ApiQueryTitleBlacklistTest.php
M tests/phpunit/TitleBlacklistAuthenticationRequestTest.php
8 files changed, 92 insertions(+), 71 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TitleBlacklist
refs/changes/12/357412/1
diff --git a/TitleBlacklist.hooks.php b/TitleBlacklist.hooks.php
index 94b134a..d0495ac 100644
--- a/TitleBlacklist.hooks.php
+++ b/TitleBlacklist.hooks.php
@@ -54,10 +54,10 @@
$blacklisted = TitleBlacklist::singleton()->userCannot(
$title, $user, $action );
if ( $blacklisted instanceof TitleBlacklistEntry ) {
$errmsg = $blacklisted->getErrorMessage( 'edit'
);
- $params = array(
+ $params = [
$blacklisted->getRaw(),
$title->getFullText()
- );
+ ];
ApiResult::setIndexedTagName( $params, 'param'
);
$result = ApiMessage::create(
wfMessage(
@@ -66,18 +66,18 @@
$title->getFullText()
),
'titleblacklist-forbidden',
- array(
- 'message' => array(
+ [
+ 'message' => [
'key' => $errmsg,
'params' => $params,
- ),
+ ],
'line' =>
$blacklisted->getRaw(),
// As $errmsg usually
represents a non-default message here, and ApiBase
// uses ->inLanguage( 'en'
)->useDatabase( false ) for all messages, it will
// never result in useful
'info' text in the API. Try this, extra data seems
// to override the default.
'info' => 'TitleBlacklist
prevents this title from being created',
- )
+ ]
);
return false;
}
@@ -265,12 +265,12 @@
$errlines = '* ' .
implode( "\n* ", array_map(
'wfEscapeWikiText', $ok ) ) .
'';
- $error = Html::openElement( 'div', array( 'class' =>
'errorbox' ) ) .
+ $error = Html::openElement( 'div', [ 'class' =>
'errorbox' ] ) .
$errmsg .
"\n" .
$errlines .
Html::closeElement( 'div' ) . "\n" .
- Html::element( 'br', array( 'clear' => 'all' )
) . "\n";
+ Html::element( 'br', [ 'clear' => 'all' ] ) .
"\n";
// $error will be displayed by the edit class
}
@@ -283,8 +283,8 @@
* @param Article $article
*/
public static function clearBlacklist( &$article, &$user,
- $content, $summary, $isminor, $iswatch, $section )
- {
+ $content, $summary, $isminor, $iswatch, $section
+ ) {
$title = $article->getTitle();
if ( $title->getNamespace() == NS_MEDIAWIKI &&
$title->getDBkey() == 'Titleblacklist' ) {
TitleBlacklist::singleton()->invalidate();
@@ -311,10 +311,10 @@
*/
public static function onAPIGetAllowedParams( ApiBase &$module, array
&$params ) {
if ( $module instanceof ApiCreateAccount ) {
- $params['ignoretitleblacklist'] = array(
+ $params['ignoretitleblacklist'] = [
ApiBase::PARAM_TYPE => 'boolean',
ApiBase::PARAM_DFLT => false
- );
+ ];
}
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: [cirrus] Enable crossproject search on all wikipedias
DCausse has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357413 )
Change subject: [cirrus] Enable crossproject search on all wikipedias
..
[cirrus] Enable crossproject search on all wikipedias
Enable the new crossproject search layout on all wikipedias:
- wikinews and commons are disable on enwiki
- wikivoyage results are constrained to a strong title match (all wikipedias)
- enable the new sidebar (except multimedia search) on non wikipedias for
italian (they used to have the old have)
Cleanups:
- remove wgInterwikiPrefixDisplayTypes which is no longer used
- remove the UserTesting config
NOTE: some wikis use a hack in the the system message MediaWiki:Searchmenu-new
to display a sidebar. Wikiadmins may have to disable it as it does seem useful
since we perform the search.
Bug: T162276
Change-Id: I423e7f52db3cebddedda0010447ff47ba2dab84d
---
M wmf-config/CirrusSearch-common.php
M wmf-config/CirrusSearch-production.php
M wmf-config/InitialiseSettings.php
3 files changed, 33 insertions(+), 65 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/13/357413/1
diff --git a/wmf-config/CirrusSearch-common.php
b/wmf-config/CirrusSearch-common.php
index 050a34d..df35111 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -232,16 +232,14 @@
"svg" => "drawing"
];
-// Setup map of interwiki prefixes to sister search display type
-$wgInterwikiPrefixDisplayTypes = [
- 'wikt' => 'definition',
- 'b' => 'textbook',
- 'n' => 'news',
- 'q' => 'quotation',
- 's' => 'book',
- 'voy' => 'travel',
- 'v' => 'course',
-];
+// Activate crossproject search
+$wgCirrusSearchEnableCrossProjectSearch =
$wmgCirrusSearchEnableCrossProjectSearch;
+// Enable the new layout, FIXME: remove the old one
+$wgCirrusSearchNewCrossProjectPage = true;
+// Display X results per crossproject
+$wgCirrusSearchNumCrossProjectSearchResults = 1;
+// Order snippets by recall (wiki taht return more results first)
+$wgCirrusSearchCrossProjectOrder = 'recall';
// Override sister search profiles for specific projects
$wgCirrusSearchCrossProjectProfiles = [
diff --git a/wmf-config/CirrusSearch-production.php
b/wmf-config/CirrusSearch-production.php
index eb7d91c..e5ad326 100644
--- a/wmf-config/CirrusSearch-production.php
+++ b/wmf-config/CirrusSearch-production.php
@@ -57,23 +57,7 @@
'chunk_size' => '1g',
];
-$projectsOkForInterwiki = [
- 'itwiki' => 'w',
- 'itwiktionary' => 'wikt',
- 'itwikibooks' => 'b',
- 'itwikinews' => 'n',
- 'itwikiquote' => 'q',
- 'itwikisource' => 's',
- 'itwikivoyage' => 'voy',
- 'itwikiversity' => 'v',
-];
-
-if ( isset( $projectsOkForInterwiki[ $wgDBname ] ) ) {
- unset( $projectsOkForInterwiki[$wgDBname] );
- $interwikiSearchConf = array_flip( $projectsOkForInterwiki );
- $wgCirrusSearchInterwikiSources = $interwikiSearchConf;
- $wgCirrusSearchInterwikiCacheTime = 60;
-}
+$wgCirrusSearchInterwikiCacheTime = 60;
if ( $wgDBname == 'enwiki' ) {
$wgCirrusSearchPoolCounterKey .= '_enwiki';
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 2491076..3dcc787 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17446,6 +17446,22 @@
"nan" => "default", // e.g. zh_min_nan
],
+// Enable crossprocess search (side bar)
+'wmgCirrusSearchEnableCrossProjectSearch' => [
+ 'default' => false,
+ // Activated on all wikipedias
+ 'wikipedia' => true,
+ // italian wikis used to have the old sidebar on all sisterwikis
+ // use the one there too.
+ 'itwiktionary' => true,
+ 'itwikibooks' => true,
+ 'itwikinews' => true,
+ 'itwikiquote' => true,
+ 'itwikisource' => true,
+ 'itwikiversity' => true,
+ 'itwikivoyage' => true,
+],
+
// Define list of projects to blacklist from CrossProject search
// (only effective if SiteMatrix implementation is being used)
@@ -17460,6 +17476,14 @@
'wmgCirrusSearchCrossProjectShowMultimedia' => [
'default' => true,
'enwiki' => false, // T163463, requested during RfC
+ // Disable multimedia on italian non-wikipedias
+ 'itwiktionary' => false,
+ 'itwikibooks' => false,
+ 'itwikinews' => false,
+ 'itwikiquote' => false,
+ 'itwikisource' => false,
+ 'itwikiversity' => false,
+ 'itwikivoyage' => false,
],
'wmgCirrusSearchIgnoreOnWikiBoostTemplates' => [
@@ -17729,44 +17753,6 @@
'wmgCirrusSearchUserTesting' => [
'default' => [],
- // Specific wikis are enabled from the client
- // Enabling this on itwiki might lead to unexpected behaviors
- 'wikipedia' => [
- 'sidebar' => [
- 'sampleRate' => 0,
-
[MediaWiki-commits] [Gerrit] mediawiki...QuizGame[master]: Use OO.ui.prompt() when available
Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357415 )
Change subject: Use OO.ui.prompt() when available
..
Use OO.ui.prompt() when available
The reasonPrompt function (adapted from an older version of OO.ui.prompt())
uses deprecated OOjs UI functionality, but if the extension needs to be
compatible with older MediaWiki versions, we can't remove it. But we can
not use it if the OO.ui.prompt() function is available.
Bug: T166729
Change-Id: I156e94c394d4d5f28362919e680e2c94c7979d24
---
M js/QuizGame.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuizGame
refs/changes/15/357415/1
diff --git a/js/QuizGame.js b/js/QuizGame.js
index d703671..2edf269 100644
--- a/js/QuizGame.js
+++ b/js/QuizGame.js
@@ -11,7 +11,7 @@
* That needs to be removed, when we drop support to MW 1.28. Modified
copy pasta from OOjsUI windows.js
* @see https://gerrit.wikimedia.org/r/#/c/336008/
*/
-reasonPrompt = function ( text, options ) {
+reasonPrompt = OO.ui.prompt || function ( text, options ) {
manager = new OO.ui.WindowManager();
textInput = new OO.ui.TextInputWidget( ( options && options.textInput )
|| {} );
textField = new OO.ui.FieldLayout( textInput, {
--
To view, visit https://gerrit.wikimedia.org/r/357415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I156e94c394d4d5f28362919e680e2c94c7979d24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuizGame
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PictureGame[master]: Use OO.ui.prompt() when available
Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357414 )
Change subject: Use OO.ui.prompt() when available
..
Use OO.ui.prompt() when available
The reasonPrompt function (adapted from an older version of OO.ui.prompt())
uses deprecated OOjs UI functionality, but if the extension needs to be
compatible with older MediaWiki versions, we can't remove it. But we can
not use it if the OO.ui.prompt() function is available.
Bug: T166729
Change-Id: I8a47fdc2e43d5857ef54b0698c60e338c768b063
---
M picturegame/PictureGame.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PictureGame
refs/changes/14/357414/1
diff --git a/picturegame/PictureGame.js b/picturegame/PictureGame.js
index 65f21b1..3567bb9 100644
--- a/picturegame/PictureGame.js
+++ b/picturegame/PictureGame.js
@@ -10,7 +10,7 @@
* That needs to be removed, when we drop support to MW 1.28. Modified
copy pasta from OOjsUI windows.js
* @see https://gerrit.wikimedia.org/r/#/c/336008/
*/
-reasonPrompt = function ( text, options ) {
+reasonPrompt = OO.ui.prompt || function ( text, options ) {
manager = new OO.ui.WindowManager();
textInput = new OO.ui.TextInputWidget( ( options && options.textInput )
|| {} );
textField = new OO.ui.FieldLayout( textInput, {
--
To view, visit https://gerrit.wikimedia.org/r/357414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a47fdc2e43d5857ef54b0698c60e338c768b063
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PictureGame
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Set profile::base::check_raid_policy to 'WriteBack' for hado...
Elukey has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357403 ) Change subject: Set profile::base::check_raid_policy to 'WriteBack' for hadoop workers .. Set profile::base::check_raid_policy to 'WriteBack' for hadoop workers Bug: T166140 Change-Id: Id47f7c50eec1b7bd9de178d54d74a5bb76c9c1c7 --- M hieradata/role/common/analytics_cluster/hadoop/worker.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Elukey: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/common/analytics_cluster/hadoop/worker.yaml b/hieradata/role/common/analytics_cluster/hadoop/worker.yaml index 0add55e..83b8dc7 100644 --- a/hieradata/role/common/analytics_cluster/hadoop/worker.yaml +++ b/hieradata/role/common/analytics_cluster/hadoop/worker.yaml @@ -9,3 +9,4 @@ # Analytics worker disks are large. We will install a custom # NRPE check for them, so the base module's should ignore them. profile::base::check_disk_options: '-w 6% -c 3% -l -e -A -i "/var/lib/hadoop/data"' +profile::base::check_raid_policy: 'WriteBack' \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/357403 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id47f7c50eec1b7bd9de178d54d74a5bb76c9c1c7 Gerrit-PatchSet: 7 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey Gerrit-Reviewer: Elukey Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Jcrespo 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...SpamBlacklist[master]: Add phpcs and make pass
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357416 )
Change subject: Add phpcs and make pass
..
Add phpcs and make pass
Change-Id: I623a982fe6362daab34906a111d123f19676dc22
---
M BaseBlacklist.php
M EmailBlacklist.php
M SpamBlacklistHooks.php
M SpamBlacklistLogFormatter.php
M SpamBlacklist_body.php
M SpamRegexBatch.php
M api/ApiSpamBlacklist.php
M composer.json
M maintenance/cleanup.php
A phpcs.xml
M tests/phpunit/SpamBlacklistTest.php
11 files changed, 136 insertions(+), 115 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SpamBlacklist
refs/changes/16/357416/1
diff --git a/BaseBlacklist.php b/BaseBlacklist.php
index d025f93..77d4545 100644
--- a/BaseBlacklist.php
+++ b/BaseBlacklist.php
@@ -9,7 +9,7 @@
*
* @var array
*/
- public $files = array();
+ public $files = [];
/**
* Array containing regexes to test against
@@ -40,24 +40,24 @@
*
* @var array
*/
- private static $blacklistTypes = array(
+ private static $blacklistTypes = [
'spam' => 'SpamBlacklist',
'email' => 'EmailBlacklist',
- );
+ ];
/**
* Array of blacklist instances
*
* @var array
*/
- private static $instances = array();
+ private static $instances = [];
/**
* Constructor
*
* @param array $settings
*/
- function __construct( $settings = array() ) {
+ function __construct( $settings = [] ) {
foreach ( $settings as $name => $value ) {
$this->$name = $value;
}
@@ -107,7 +107,7 @@
// Prevent notices
if ( !isset( $wgBlacklistSettings[$type] ) ) {
- $wgBlacklistSettings[$type] = array();
+ $wgBlacklistSettings[$type] = [];
}
$class = self::$blacklistTypes[$type];
@@ -133,17 +133,17 @@
public static function isLocalSource( Title $title ) {
global $wgDBname, $wgBlacklistSettings;
- if( $title->getNamespace() == NS_MEDIAWIKI ) {
- $sources = array();
+ if ( $title->getNamespace() == NS_MEDIAWIKI ) {
+ $sources = [];
foreach ( self::$blacklistTypes as $type => $class ) {
$type = ucfirst( $type );
- $sources += array(
+ $sources += [
"$type-blacklist",
"$type-whitelist"
- );
+ ];
}
- if( in_array( $title->getDBkey(), $sources ) ) {
+ if ( in_array( $title->getDBkey(), $sources ) ) {
return true;
}
}
@@ -151,23 +151,23 @@
$thisHttp = wfExpandUrl( $title->getFullUrl( 'action=raw' ),
PROTO_HTTP );
$thisHttpRegex = '/^' . preg_quote( $thisHttp, '/' ) .
'(?:&.*)?$/';
- $files = array();
+ $files = [];
foreach ( self::$blacklistTypes as $type => $class ) {
if ( isset( $wgBlacklistSettings[$type]['files'] ) ) {
$files += $wgBlacklistSettings[$type]['files'];
}
}
- foreach( $files as $fileName ) {
- $matches = array();
+ foreach ( $files as $fileName ) {
+ $matches = [];
if ( preg_match( '/^DB: (\w*) (.*)$/', $fileName,
$matches ) ) {
if ( $wgDBname == $matches[1] ) {
- if( $matches[2] ==
$title->getPrefixedDbKey() ) {
+ if ( $matches[2] ==
$title->getPrefixedDbKey() ) {
// Local DB fetch of this
page...
return true;
}
}
- } elseif( preg_match( $thisHttpRegex, $fileName ) ) {
+ } elseif ( preg_match( $thisHttpRegex, $fileName ) ) {
// Raw view of this page
return true;
}
@@ -183,7 +183,7 @@
* @return bool|string
*/
public static function getTypeFromTitle( Title $title ) {
- $types = array_map( 'preg_quote', array_keys(
self::$blacklistTypes ), array( '/'
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: phpcs: Allow linting tools to discover rules
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357406 ) Change subject: phpcs: Allow linting tools to discover rules .. phpcs: Allow linting tools to discover rules Explicitly stating the current directory fixes the ambiguity of finding the ruleset referred to in the file. This allows syntax checkers like flycheck (for GNU Emacs) to work. Also ignore node_modules as it contains the `resource-modules` package which has php source code that doesn't conform to our linting rules. Change-Id: I4c54e33de16cc3523153d40e8da20f4eee942d2d --- M phpcs.xml 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Umherirrender: Looks good to me, approved Pmiazga: Looks good to me, approved jenkins-bot: Verified diff --git a/phpcs.xml b/phpcs.xml index 750e66a..84fd9d0 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -1,10 +1,11 @@ - + . vendor + node_modules -- To view, visit https://gerrit.wikimedia.org/r/357406 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c54e33de16cc3523153d40e8da20f4eee942d2d Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Bmansurov Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Phuedx Gerrit-Reviewer: Pmiazga 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] mediawiki...ExternalData[master]: Fix for PHP error in #display_external_table
Yaron Koren has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357410 )
Change subject: Fix for PHP error in #display_external_table
..
Fix for PHP error in #display_external_table
Change-Id: I33de1d4a656b705876be79831f4f5211fc3df1f7
---
M ED_ParserFunctions.php
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExternalData
refs/changes/10/357410/2
diff --git a/ED_ParserFunctions.php b/ED_ParserFunctions.php
index d26979d..7df6f9f 100644
--- a/ED_ParserFunctions.php
+++ b/ED_ParserFunctions.php
@@ -533,6 +533,11 @@
$num_loops = 0; // May differ when multiple '#get_'s are used
in one page
foreach ( $mappings as $template_param => $local_variable ) {
+ if ( !array_key_exists( $local_variable, $edgValues ) )
{
+ // Don't throw an error message - the source
may just
+ // not publish this variable.
+ continue;
+ }
$num_loops = max( $num_loops, count(
$edgValues[$local_variable] ) );
}
--
To view, visit https://gerrit.wikimedia.org/r/357410
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33de1d4a656b705876be79831f4f5211fc3df1f7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ExternalData
Gerrit-Branch: master
Gerrit-Owner: 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] mediawiki...ExternalData[master]: Fix for PHP error in #display_external_table
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357410 )
Change subject: Fix for PHP error in #display_external_table
..
Fix for PHP error in #display_external_table
Change-Id: I33de1d4a656b705876be79831f4f5211fc3df1f7
---
M ED_ParserFunctions.php
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Yaron Koren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ED_ParserFunctions.php b/ED_ParserFunctions.php
index d26979d..7df6f9f 100644
--- a/ED_ParserFunctions.php
+++ b/ED_ParserFunctions.php
@@ -533,6 +533,11 @@
$num_loops = 0; // May differ when multiple '#get_'s are used
in one page
foreach ( $mappings as $template_param => $local_variable ) {
+ if ( !array_key_exists( $local_variable, $edgValues ) )
{
+ // Don't throw an error message - the source
may just
+ // not publish this variable.
+ continue;
+ }
$num_loops = max( $num_loops, count(
$edgValues[$local_variable] ) );
}
--
To view, visit https://gerrit.wikimedia.org/r/357410
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I33de1d4a656b705876be79831f4f5211fc3df1f7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ExternalData
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] mediawiki...WikibaseQualityConstraints[master]: Extract ResultAssertions trait in tests
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356609 )
Change subject: Extract ResultAssertions trait in tests
..
Extract ResultAssertions trait in tests
The main methods this trait offers are assertCompliance(),
assertViolation() and assertTodo(). Their main task is to compare the
check result status to the appropriate constant, which reduces copied
code in all the checker tests.
Since slightly reduced code repetition is not very exciting, some new
features are also introduced:
- assertCompliance() includes the result message in the assertion
failure message, which should make it easier to understand test
failures.
- assertViolation() optionally also takes an expected message and
asserts that the actual result message matches the expected one. This
uncovered the message bugs fixed in change I6a5bb8d3a3.
Additionally, since the FormatChecker tests already included the
information whether a check is expected to succeed or not even though
the check is not yet implemented, two aliases for assertTodo() are also
available, assertTodoCompliance() and assertTodoViolation(). This should
make it very easy to adapt the tests once the constraint is implemented.
assertViolation(), when comparing the result message, expects each
parameter in the raw message to be replaced with a nonempty string, so
some mocks need to be updated to provide getConstraintTypeName()
(included in some messages), and the ValueFormatter mock needs to be
updated to return a nonempty string (included in the range messages).
Change-Id: Ia1b1e1515440759d2df6e2bef04b072395afe7ef
---
M tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
M tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php
M tests/phpunit/Checker/ConnectionChecker/ItemCheckerTest.php
M tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php
M tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php
M tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
M tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php
M tests/phpunit/Checker/QualifierChecker/MandatoryQualifiersCheckerTest.php
M tests/phpunit/Checker/QualifierChecker/QualifierCheckerTest.php
M tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php
M tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
M tests/phpunit/Checker/TypeChecker/TypeCheckerTest.php
M tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php
M tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php
M tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php
M tests/phpunit/Checker/ValueCountChecker/UniqueValueCheckerTest.php
M tests/phpunit/ConstraintParameters.php
A tests/phpunit/ResultAssertions.php
18 files changed, 302 insertions(+), 138 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git
a/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
b/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
index a6fbeb6..1509d7d 100644
--- a/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
+++ b/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
@@ -14,6 +14,7 @@
use WikibaseQuality\ConstraintReport\Constraint;
use
WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\CommonsLinkChecker;
use
WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConstraintParameterParser;
+use WikibaseQuality\ConstraintReport\Tests\ResultAssertions;
/**
* @covers
\WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\CommonsLinkChecker
@@ -29,6 +30,8 @@
* @license GNU GPL v2+
*/
class CommonsLinkCheckerTest extends \MediaWikiTestCase {
+
+ use ResultAssertions;
/**
* @var ConstraintParameterParser
@@ -84,7 +87,7 @@
$this->getConstraintMock( [ 'namespace' => 'File' ] ),
$this->getEntity()
);
- $this->assertEquals( 'compliance', $result->getStatus(), 'check
should comply' );
+ $this->assertCompliance( $result );
}
public function testCommonsLinkConstraintInvalid() {
@@ -100,21 +103,21 @@
$this->getConstraintMock( [ 'namespace' => 'File' ] ),
$this->getEntity()
);
- $this->assertEquals( 'violation', $result->getStatus(), 'check
should not comply' );
+ $this->assertViolation( $result,
'wbqc-violation-message-commons-link-not-well-formed' );
$result = $this->commonsLinkChecker->checkConstraint(
$statement2,
$this->getConstraintMock( [ 'namespace' => 'File' ] ),
$this->getEntity()
);
- $this->assertEquals( 'violation', $result->getStatus(), 'check
should not comply' );
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Extend account expiry date for pnorman
Muehlenhoff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357417 ) Change subject: Extend account expiry date for pnorman .. Extend account expiry date for pnorman Also change contact address, now managed by Reading. Change-Id: I3d41ac51ab53d0e87e72798b344e6a0b5838401d --- M modules/admin/data/data.yaml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/17/357417/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 8ec6af8..5e0f1e0 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -2477,8 +2477,8 @@ - ssh-rsa B3NzaC1yc2EDAQABAAACAQCy7wnX7ck41mKRzXvt5n/2UVEDkK1T9L5iyDFAWgDAbjgWqjBgnfHVq88lX1d/WOUNjNzF1WnRWn1vk6gKk3eoNlIbEcIvfLGYB+e6yGsE9KZWyvcpWcIBhhe9YH4d7nY34ScUIH42bZkXh2iGu5VpQVm8G5Wf9iqSwKFHSAy+Bl3jclaHSPfUmGxTbjC2e20Xns8BvybEW4dBjb79/eHNR1K/9f5JHeLM9ZE3wKVYC07kSnsYCGVWWr2zqyjpmBl2hQe/0C0pvx2AoTzEYK58BZZUkui3aIihSDiDMxDujNypUtePyoCq14t8dLSkIfOh0kRKAVmC/6oVwzSFbvZ7yjyU5ApsUK1DqCmFw/yz9M/nRuAs3qkXwFC1XUyjNBiVBEbWKDGxBx08TjZPKSvbtQD3DaU7RvXJUh3hsDcrgfky6ZlfV9y1bRp7heHVAShVWrsTwoQt/PF6uZ2ud71Ri51bV9qlHdT/BmF+UJ86LSPzTHSKt57GEXguVVPCGgfjFm+WugW4SOC+Bx/IEQC7+hfgXZjr6CQt+zCOExBS6IpknDBIzuvdbrNKG1auBn6nJKCAURRR3q71tCGlihjV39u5ZEmGqacsIYDA1SSTGqUGq5MuaVoVuS0rBPwFjO1enhqDT6wl9qBVuHUDlis9XQ2wOyLT3yqG0sGYxpNF0w== pnorman@pippin uid: 16082 email: penor...@mac.com -expiry_date: 2017-05-31 -expiry_contact: h...@wikimedia.org +expiry_date: 2017-08-31 +expiry_contact: tneg...@wikimedia.org ayounsi: ensure: present gid: 500 -- To view, visit https://gerrit.wikimedia.org/r/357417 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3d41ac51ab53d0e87e72798b344e6a0b5838401d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Extend account expiry date for pnorman
Muehlenhoff has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357417 ) Change subject: Extend account expiry date for pnorman .. Extend account expiry date for pnorman Also change contact address, now managed by Reading. Change-Id: I3d41ac51ab53d0e87e72798b344e6a0b5838401d --- M modules/admin/data/data.yaml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Muehlenhoff: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 8ec6af8..5e0f1e0 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -2477,8 +2477,8 @@ - ssh-rsa B3NzaC1yc2EDAQABAAACAQCy7wnX7ck41mKRzXvt5n/2UVEDkK1T9L5iyDFAWgDAbjgWqjBgnfHVq88lX1d/WOUNjNzF1WnRWn1vk6gKk3eoNlIbEcIvfLGYB+e6yGsE9KZWyvcpWcIBhhe9YH4d7nY34ScUIH42bZkXh2iGu5VpQVm8G5Wf9iqSwKFHSAy+Bl3jclaHSPfUmGxTbjC2e20Xns8BvybEW4dBjb79/eHNR1K/9f5JHeLM9ZE3wKVYC07kSnsYCGVWWr2zqyjpmBl2hQe/0C0pvx2AoTzEYK58BZZUkui3aIihSDiDMxDujNypUtePyoCq14t8dLSkIfOh0kRKAVmC/6oVwzSFbvZ7yjyU5ApsUK1DqCmFw/yz9M/nRuAs3qkXwFC1XUyjNBiVBEbWKDGxBx08TjZPKSvbtQD3DaU7RvXJUh3hsDcrgfky6ZlfV9y1bRp7heHVAShVWrsTwoQt/PF6uZ2ud71Ri51bV9qlHdT/BmF+UJ86LSPzTHSKt57GEXguVVPCGgfjFm+WugW4SOC+Bx/IEQC7+hfgXZjr6CQt+zCOExBS6IpknDBIzuvdbrNKG1auBn6nJKCAURRR3q71tCGlihjV39u5ZEmGqacsIYDA1SSTGqUGq5MuaVoVuS0rBPwFjO1enhqDT6wl9qBVuHUDlis9XQ2wOyLT3yqG0sGYxpNF0w== pnorman@pippin uid: 16082 email: penor...@mac.com -expiry_date: 2017-05-31 -expiry_contact: h...@wikimedia.org +expiry_date: 2017-08-31 +expiry_contact: tneg...@wikimedia.org ayounsi: ensure: present gid: 500 -- To view, visit https://gerrit.wikimedia.org/r/357417 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d41ac51ab53d0e87e72798b344e6a0b5838401d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Muehlenhoff 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]: Delete unused role/common/analytics/hadoop configs
Elukey has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357418 ) Change subject: Delete unused role/common/analytics/hadoop configs .. Delete unused role/common/analytics/hadoop configs Change-Id: I7a6f44e9bb9936fc563dd5439a93cd09f102be18 --- D hieradata/role/common/analytics/hadoop/master.yaml D hieradata/role/common/analytics/hadoop/standby.yaml D hieradata/role/common/analytics/hadoop/worker.yaml D hieradata/role/common/analytics/hue.yaml D hieradata/role/common/analytics/mysql/meta.yaml D hieradata/role/common/analytics/spark/standalone/worker.yaml 6 files changed, 0 insertions(+), 51 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/18/357418/1 diff --git a/hieradata/role/common/analytics/hadoop/master.yaml b/hieradata/role/common/analytics/hadoop/master.yaml deleted file mode 100644 index a8fdc0e..000 --- a/hieradata/role/common/analytics/hadoop/master.yaml +++ /dev/null @@ -1,18 +0,0 @@ -nagios_group: analytics_eqiad -cluster: analytics -admin::groups: - # Users in these groups need shell accounts on the Hadoop NameNodes - # so that HDFS file perms for these users work properly. - # These groupsshould also be added to cdh/hadoop/users.yaml as the - # groups parameter to ensure that their hdfs homedirs get created. - - analytics-users - - analytics-privatedata-users - - analytics-admins - # role::analytics_cluster::users create system users for different - # shared analytics cluster file owership. Certain user groups - # are allowed to sudo -u to these users in order to launch - # regular Hadoop jobs that don't run as real people users. - - analytics-search-users -debdeploy::grains: - debdeploy-hadoop-master: -value: standard diff --git a/hieradata/role/common/analytics/hadoop/standby.yaml b/hieradata/role/common/analytics/hadoop/standby.yaml deleted file mode 100644 index aecf358..000 --- a/hieradata/role/common/analytics/hadoop/standby.yaml +++ /dev/null @@ -1,13 +0,0 @@ -nagios_group: analytics_eqiad -cluster: analytics -admin::groups: - - analytics-users - - analytics-privatedata-users - - analytics-admins - # elasticsearch::analytics creates the analytics-search user and group - # that analytics-search-users are allowed to sudo to. This is used - # for deploying files to HDFS. - - analytics-search-users -debdeploy::grains: - debdeploy-hadoop-standby: -value: standard diff --git a/hieradata/role/common/analytics/hadoop/worker.yaml b/hieradata/role/common/analytics/hadoop/worker.yaml deleted file mode 100644 index 40ce529..000 --- a/hieradata/role/common/analytics/hadoop/worker.yaml +++ /dev/null @@ -1,11 +0,0 @@ -nagios_group: analytics_eqiad -cluster: analytics -admin::groups: - - analytics-admins -debdeploy::grains: - debdeploy-hadoop-worker: -value: standard - -# Analytics worker disks are large. We will install a custom -# NRPE check for them, so the base module's should ignore them. -profile::base::check_disk_options: -w 6% -c 3% -l -e -A -i "/var/lib/hadoop/data" diff --git a/hieradata/role/common/analytics/hue.yaml b/hieradata/role/common/analytics/hue.yaml deleted file mode 100644 index f3c3b72..000 --- a/hieradata/role/common/analytics/hue.yaml +++ /dev/null @@ -1,3 +0,0 @@ -debdeploy::grains: - debdeploy-hue: -value: standard diff --git a/hieradata/role/common/analytics/mysql/meta.yaml b/hieradata/role/common/analytics/mysql/meta.yaml deleted file mode 100644 index 1c3255a..000 --- a/hieradata/role/common/analytics/mysql/meta.yaml +++ /dev/null @@ -1,3 +0,0 @@ -debdeploy::grains: - debdeploy-mysql-analytics: -value: standard diff --git a/hieradata/role/common/analytics/spark/standalone/worker.yaml b/hieradata/role/common/analytics/spark/standalone/worker.yaml deleted file mode 100644 index 4eb118d..000 --- a/hieradata/role/common/analytics/spark/standalone/worker.yaml +++ /dev/null @@ -1,3 +0,0 @@ -debdeploy::grains: - debdeploy-spark-worker: -value: standard -- To view, visit https://gerrit.wikimedia.org/r/357418 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7a6f44e9bb9936fc563dd5439a93cd09f102be18 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...wikibugs2[master]: Add cloud-services-team to #wikimedia-cloud
BryanDavis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357419 ) Change subject: Add cloud-services-team to #wikimedia-cloud .. Add cloud-services-team to #wikimedia-cloud Change-Id: I040399852ae488f26e14b328c089c2419a4f802f --- M channels.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 refs/changes/19/357419/1 diff --git a/channels.yaml b/channels.yaml index b09576d..d5c6a51 100644 --- a/channels.yaml +++ b/channels.yaml @@ -89,6 +89,7 @@ - LabsDB-Auditor - PAWS - Striker +- cloud-services-team "#wikimedia-devtools": # teams -- To view, visit https://gerrit.wikimedia.org/r/357419 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I040399852ae488f26e14b328c089c2419a4f802f Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: BryanDavis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...ZppixBot[master]: Add Code of Conduct.md per policy
Zppix has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357420 ) Change subject: Add Code of Conduct.md per policy .. Add Code of Conduct.md per policy Bug: T167087 Bug: T165540 Change-Id: I74c611edc5557cf990f6450e45bb0e5b2e9fce15 --- A Code of Conduct.md 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/ZppixBot refs/changes/20/357420/2 diff --git a/Code of Conduct.md b/Code of Conduct.md new file mode 100644 index 000..2279c40 --- /dev/null +++ b/Code of Conduct.md @@ -0,0 +1 @@ +The development of this software is covered by a [Code of Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct). \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/357420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I74c611edc5557cf990f6450e45bb0e5b2e9fce15 Gerrit-PatchSet: 2 Gerrit-Project: labs/tools/ZppixBot Gerrit-Branch: master Gerrit-Owner: Zppix Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...ZppixBot[master]: Add Code of Conduct.md per policy
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357420 ) Change subject: Add Code of Conduct.md per policy .. Add Code of Conduct.md per policy Bug: T167087 Bug: T165540 Change-Id: I74c611edc5557cf990f6450e45bb0e5b2e9fce15 --- A Code of Conduct.md 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Zppix: Looks good to me, approved jenkins-bot: Verified diff --git a/Code of Conduct.md b/Code of Conduct.md new file mode 100644 index 000..2279c40 --- /dev/null +++ b/Code of Conduct.md @@ -0,0 +1 @@ +The development of this software is covered by a [Code of Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct). \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/357420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I74c611edc5557cf990f6450e45bb0e5b2e9fce15 Gerrit-PatchSet: 2 Gerrit-Project: labs/tools/ZppixBot Gerrit-Branch: master Gerrit-Owner: Zppix Gerrit-Reviewer: Zppix 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...ArticleRatings[master]: Try to shut up some E_NOTICEs
Jack Phoenix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357421 )
Change subject: Try to shut up some E_NOTICEs
..
Try to shut up some E_NOTICEs
Notice: No rating found for the codename C4 in
/extensions/ArticleRatings/RatingDataClass.php on line 48
Notice: Undefined index: img in
/extensions/ArticleRatings/RatingDataClass.php on line 64
Notice: Undefined index: name in
/extensions/ArticleRatings/RatingDataClass.php on line 56
Notice: Undefined index: link in
/extensions/ArticleRatings/RatingDataClass.php on line 60
Change-Id: I1edf39d0672cb7d3ebb739310797dd8ecfb5acb0
---
M RatingDataClass.php
1 file changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleRatings
refs/changes/21/357421/1
diff --git a/RatingDataClass.php b/RatingDataClass.php
index 828c3cf..18e770a 100644
--- a/RatingDataClass.php
+++ b/RatingDataClass.php
@@ -45,7 +45,7 @@
return;
}
}
- trigger_error( 'No rating found for the codename ' .
$this->codename );
+ //trigger_error( 'No rating found for the codename ' .
$this->codename );
}
public function getCodename() {
@@ -53,15 +53,15 @@
}
public function getName() {
- return $this->data['name'];
+ return isset( $this->data['name'] ) ? $this->data['name'] : '';
}
- public function getLink(){
- return $this->data['link'];
+ public function getLink() {
+ return isset( $this->data['link'] ) ? $this->data['link'] : '';
}
- public function getImg(){
- return $this->data['img'];
+ public function getImg() {
+ return isset( $this->data['img'] ) ? $this->data['img'] : '';
}
public function getImage() {
@@ -71,10 +71,10 @@
}
$image = $file->getCanonicalUrl();
$pic = Html::element( 'img', array(
- 'class' => 'mw-rating-img',
- 'src' => $image,
- 'height' => '20px',
- 'width' => '20px'
+ 'class' => 'mw-rating-img',
+ 'src' => $image,
+ 'height' => '20px',
+ 'width' => '20px'
) ) . wfMessage( 'word-separator' )->parse();
return $pic;
--
To view, visit https://gerrit.wikimedia.org/r/357421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1edf39d0672cb7d3ebb739310797dd8ecfb5acb0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleRatings
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: aptrepo: add hp-mcp-stretch
Filippo Giunchedi has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357422 ) Change subject: aptrepo: add hp-mcp-stretch .. aptrepo: add hp-mcp-stretch Bug: T162609 Change-Id: Id2511128e438f747319d165f8b6423ae2d5373f9 --- M modules/aptrepo/files/distributions-wikimedia M modules/aptrepo/files/updates 2 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/22/357422/1 diff --git a/modules/aptrepo/files/distributions-wikimedia b/modules/aptrepo/files/distributions-wikimedia index 94ee27d..d26ebe3 100644 --- a/modules/aptrepo/files/distributions-wikimedia +++ b/modules/aptrepo/files/distributions-wikimedia @@ -38,7 +38,7 @@ Architectures: source amd64 i386 Components: main backports thirdparty experimental UDebComponents: main backports thirdparty experimental -Update: hwraid +Update: hwraid hp-mcp-stretch Description: Wikimedia packages for Debian stretch SignWith: 9D392D3FFADF18FB DebOverride: deb-override diff --git a/modules/aptrepo/files/updates b/modules/aptrepo/files/updates index ef65299..e05eafb 100644 --- a/modules/aptrepo/files/updates +++ b/modules/aptrepo/files/updates @@ -56,6 +56,16 @@ VerifyRelease: FADD8D64B1275EA3|C208ADDE26C2B797 ListShellHook: grep-dctrl -e -S '^hp-health|hpssa|hpssacli|hpssaducli|hpacucli$' || [ $? -eq 1 ] +Name: hp-mcp-stretch +Method: http://downloads.linux.hpe.com/SDR/repo/mcp +Components: non-free>thirdparty +UDebComponents: +GetInRelease: no +Suite: stretch/current +Architectures: amd64 +VerifyRelease: FADD8D64B1275EA3|C208ADDE26C2B797 +ListShellHook: grep-dctrl -e -S '^hp-health|hpssa|hpssacli|hpssaducli|hpacucli$' || [ $? -eq 1 ] + Name: cassandra Method: http://www.apache.org/dist/cassandra/debian Components: main>thirdparty -- To view, visit https://gerrit.wikimedia.org/r/357422 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id2511128e438f747319d165f8b6423ae2d5373f9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Fixes OOjs-UI icon pack dependency
Tpt has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357423 )
Change subject: Fixes OOjs-UI icon pack dependency
..
Fixes OOjs-UI icon pack dependency
Change-Id: Icc83a8f836fdb4f32a56217af6970ab9101cb112
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/23/357423/1
diff --git a/extension.json b/extension.json
index 6443ac8..10bf1b8 100644
--- a/extension.json
+++ b/extension.json
@@ -147,7 +147,7 @@
"vector":
"page/ext.proofreadpage.page.navigation.vector.css"
},
"dependencies": [
- "oojs-ui.styles.icons"
+ "oojs-ui.styles.icons-movement"
]
},
"ext.proofreadpage.article": {
--
To view, visit https://gerrit.wikimedia.org/r/357423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc83a8f836fdb4f32a56217af6970ab9101cb112
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Add CODE_OF_CONDUCT.md
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357337 ) Change subject: Add CODE_OF_CONDUCT.md .. Add CODE_OF_CONDUCT.md The same text has been added to MediaWiki core in Ie8954750177a. Bug: T165540 Change-Id: Id91e3b2bd52a28d6dd9a03ae66bb4b8b186ab119 --- A CODE_OF_CONDUCT.md 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified Xqt: Looks good to me, but someone else must approve diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000..7815dda --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,2 @@ +The development of this software is covered by a [Code of Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct). + -- To view, visit https://gerrit.wikimedia.org/r/357337 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id91e3b2bd52a28d6dd9a03ae66bb4b8b186ab119 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Magul Gerrit-Reviewer: Multichill Gerrit-Reviewer: Xqt 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...ProofreadPage[master]: Fixes OOjs-UI icon pack dependency
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357423 )
Change subject: Fixes OOjs-UI icon pack dependency
..
Fixes OOjs-UI icon pack dependency
Change-Id: Icc83a8f836fdb4f32a56217af6970ab9101cb112
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Tpt: Looks good to me, approved
diff --git a/extension.json b/extension.json
index 6443ac8..10bf1b8 100644
--- a/extension.json
+++ b/extension.json
@@ -147,7 +147,7 @@
"vector":
"page/ext.proofreadpage.page.navigation.vector.css"
},
"dependencies": [
- "oojs-ui.styles.icons"
+ "oojs-ui.styles.icons-movement"
]
},
"ext.proofreadpage.article": {
--
To view, visit https://gerrit.wikimedia.org/r/357423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc83a8f836fdb4f32a56217af6970ab9101cb112
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt
Gerrit-Reviewer: Amritsreekumar
Gerrit-Reviewer: Tpt
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]: Group0 to wmf.3
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357424 ) Change subject: Group0 to wmf.3 .. Group0 to wmf.3 Change-Id: I6129b8641fefb86dbf782223c28a30c3e61475cb --- M wikiversions.json 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/24/357424/1 diff --git a/wikiversions.json b/wikiversions.json index 73096d0..87a9968 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -441,7 +441,7 @@ "kywikiquote": "php-1.30.0-wmf.2", "kywiktionary": "php-1.30.0-wmf.2", "labswiki": "php-1.30.0-wmf.2", -"labtestwiki": "php-1.30.0-wmf.2", +"labtestwiki": "php-1.30.0-wmf.3", "ladwiki": "php-1.30.0-wmf.2", "lawiki": "php-1.30.0-wmf.2", "lawikibooks": "php-1.30.0-wmf.2", @@ -482,7 +482,7 @@ "maiwiki": "php-1.30.0-wmf.2", "map_bmswiki": "php-1.30.0-wmf.2", "mdfwiki": "php-1.30.0-wmf.2", -"mediawikiwiki": "php-1.30.0-wmf.2", +"mediawikiwiki": "php-1.30.0-wmf.3", "metawiki": "php-1.30.0-wmf.2", "mgwiki": "php-1.30.0-wmf.2", "mgwikibooks": "php-1.30.0-wmf.2", @@ -754,9 +754,9 @@ "tawiktionary": "php-1.30.0-wmf.2", "tcywiki": "php-1.30.0-wmf.2", "tenwiki": "php-1.30.0-wmf.2", -"test2wiki": "php-1.30.0-wmf.2", -"testwiki": "php-1.30.0-wmf.2", -"testwikidatawiki": "php-1.30.0-wmf.2", +"test2wiki": "php-1.30.0-wmf.3", +"testwiki": "php-1.30.0-wmf.3", +"testwikidatawiki": "php-1.30.0-wmf.3", "tetwiki": "php-1.30.0-wmf.2", "tewiki": "php-1.30.0-wmf.2", "tewikibooks": "php-1.30.0-wmf.2", @@ -887,7 +887,7 @@ "zawikiquote": "php-1.30.0-wmf.2", "zawiktionary": "php-1.30.0-wmf.2", "zeawiki": "php-1.30.0-wmf.2", -"zerowiki": "php-1.30.0-wmf.2", +"zerowiki": "php-1.30.0-wmf.3", "zh_classicalwiki": "php-1.30.0-wmf.2", "zh_min_nanwiki": "php-1.30.0-wmf.2", "zh_min_nanwikibooks": "php-1.30.0-wmf.2", -- To view, visit https://gerrit.wikimedia.org/r/357424 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6129b8641fefb86dbf782223c28a30c3e61475cb Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Add API meta=linterstats module
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356055 )
Change subject: Add API meta=linterstats module
..
Add API meta=linterstats module
This module just exposes the number of lint errors in each category for
tools that want to collect statistics and stuff. It's currently under a
'totals' key to give us more flexibility if we want to add other
information in the future.
Change-Id: Iad5136a6a5989ce5bcb1a00a4f82f49a397e0170
---
M extension.json
M i18n/en.json
M i18n/qqq.json
A includes/ApiQueryLinterStats.php
4 files changed, 63 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Anomie: Looks good to me, approved
diff --git a/extension.json b/extension.json
index 5178a92..b04fcf1 100644
--- a/extension.json
+++ b/extension.json
@@ -14,6 +14,7 @@
"MediaWiki\\Linter\\LintError": "includes/LintError.php",
"MediaWiki\\Linter\\ApiRecordLint":
"includes/ApiRecordLint.php",
"MediaWiki\\Linter\\ApiQueryLintErrors":
"includes/ApiQueryLintErrors.php",
+ "MediaWiki\\Linter\\ApiQueryLinterStats":
"includes/ApiQueryLinterStats.php",
"MediaWiki\\Linter\\RecordLintJob":
"includes/RecordLintJob.php",
"MediaWiki\\Linter\\SpecialLintErrors":
"includes/SpecialLintErrors.php",
"MediaWiki\\Linter\\LintErrorsPager":
"includes/LintErrorsPager.php",
@@ -38,6 +39,9 @@
"APIListModules": {
"linterrors": "MediaWiki\\Linter\\ApiQueryLintErrors"
},
+ "APIMetaModules": {
+ "linterstats": "MediaWiki\\Linter\\ApiQueryLinterStats"
+ },
"SpecialPages": {
"LintErrors": "MediaWiki\\Linter\\SpecialLintErrors"
},
diff --git a/i18n/en.json b/i18n/en.json
index 253dafc..abb3c32 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -53,5 +53,7 @@
"apihelp-record-lint-description": "Record a lint error in the
database",
"apihelp-record-lint-param-data": "JSON encoded data about the error",
"apihelp-record-lint-param-page": "Page title",
- "apihelp-record-lint-param-revision": "Revision ID that the error was
found in"
+ "apihelp-record-lint-param-revision": "Revision ID that the error was
found in",
+ "apihelp-query+linterstats-description": "Get number of lint errors in
each category",
+ "apihelp-query+linterstats-example-1": "Get number of lint errors in
each category"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index de4b255..90bc899 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -56,5 +56,8 @@
"apihelp-record-lint-description":
"{{doc-apihelp-description|record-lint}}",
"apihelp-record-lint-param-data":
"{{doc-apihelp-param|record-lint|data}}",
"apihelp-record-lint-param-page":
"{{doc-apihelp-param|record-lint|page}}\n{{Identical|Page title}}",
- "apihelp-record-lint-param-revision":
"{{doc-apihelp-param|record-lint|revision}}"
+ "apihelp-record-lint-param-revision":
"{{doc-apihelp-param|record-lint|revision}}",
+ "apihelp-query+linterstats-description":
"{{doc-apihelp-description|query+linterstats}}",
+ "apihelp-query+linterstats-example-1":
"{{doc-apihelp-example|query+linterstats}}"
+
}
diff --git a/includes/ApiQueryLinterStats.php b/includes/ApiQueryLinterStats.php
new file mode 100644
index 000..6f716ed
--- /dev/null
+++ b/includes/ApiQueryLinterStats.php
@@ -0,0 +1,52 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+namespace MediaWiki\Linter;
+
+use ApiQuery;
+use ApiQueryBase;
+use ApiResult;
+use MediaWiki\MediaWikiServices;
+
+class ApiQueryLinterStats extends ApiQueryBase {
+ public function __construct( ApiQuery $queryModule ) {
+ parent::__construct( $queryModule, 'linterstats', 'ls' );
+ }
+
+ /**
+* Add totals to output
+*/
+ public function execute() {
+ $totalsLookup = new TotalsLookup(
+ new CategoryManager(),
+
MediaWikiServices::getInstance()->getMainWANObjectCache()
+ );
+
+ $totals = $totalsLookup->getTotals();
+ ApiResult::setArrayType( $totals, 'assoc' );
+ $this->getResult()->addValue( [ 'query', 'linterstats' ],
'totals', $totals );
+ }
+
+ public function getExamplesMessages() {
+ return [
+ 'action=query&meta=linterstats' =>
+ 'apihelp-query+linterstats-example-1',
+ ];
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/356055
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad5136a6a5989ce5bcb1a00a4f82f49a397e0170
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Rev
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Create auto-validate privilege
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357228 )
Change subject: Create auto-validate privilege
..
Create auto-validate privilege
[WiP]:To create a right that allows sysops to validate the pages they have
proofread.
Bug: T51482
Change-Id: Ibf620d99d1ea6605c0b01bbace8a12437ee3ce44
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/page/PageLevel.php
M tests/phpunit/page/PageLevelTest.php
5 files changed, 39 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Tpt: Looks good to me, approved
diff --git a/extension.json b/extension.json
index 6443ac8..9b8975a 100644
--- a/extension.json
+++ b/extension.json
@@ -8,14 +8,21 @@
"descriptionmsg": "proofreadpage_desc",
"license-name": "GPL-2.0+",
"type": "other",
- "@GroupPermissions": "Group allowed to modify pagequality",
+ "@GroupPermissions": [
+ "Group allowed to modify pagequality",
+ "Group allowed to use pagequality-admin privilege"
+ ],
"GroupPermissions": {
"user": {
"pagequality": true
+ },
+ "sysop": {
+ "pagequality-admin": true
}
},
"AvailableRights": [
- "pagequality"
+ "pagequality",
+ "pagequality-admin"
],
"SpecialPages": {
"IndexPages": "ProofreadPages",
diff --git a/i18n/en.json b/i18n/en.json
index 8118bf6..2e18adf 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -64,6 +64,7 @@
"proofreadpage_source": "Source",
"proofreadpage_source_message": "Scanned edition used to establish this
text",
"right-pagequality": "Modify page quality flag",
+ "right-pagequality-admin": "Unrestricted edits to the page quality
flag",
"proofreadpage-section-tools": "Proofread tools",
"proofreadpage-group-zoom": "Zoom",
"proofreadpage-group-other": "Other",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 2d9ca69..edf3f66 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -24,7 +24,8 @@
"Nemo bis",
"Liuxinyu970226",
"Guycn2",
- "Pikne"
+ "Pikne",
+ "Amritsreekumar"
]
},
"nstab-page": "Text on the tab of book pages in the \"Page\" namespace
on Wikisource\n{{Identical|Page}}",
@@ -89,6 +90,7 @@
"proofreadpage_source": "{{Identical|Source}}",
"proofreadpage_source_message": "Used as text of a link",
"right-pagequality": "{{doc-right|pagequality}}",
+ "right-pagequality-admin": "{{doc-right|pagequality-admin}}",
"proofreadpage-section-tools": "Used as label (javascript)",
"proofreadpage-group-zoom": "{{Identical|Zoom}}",
"proofreadpage-group-other": "This is a group header in the Proofread
Page extension preferences panel for \"miscellaneous\"
settings.\n{{Identical|Other}}",
diff --git a/includes/page/PageLevel.php b/includes/page/PageLevel.php
index f6e96c7..7c2e5d1 100644
--- a/includes/page/PageLevel.php
+++ b/includes/page/PageLevel.php
@@ -87,7 +87,7 @@
}
$fromUser = ( $this->user instanceof User ) ? $this->user :
$to->getUser();
- if ( $to->getLevel() === 4 && ( $this->level < 3 ||
$this->level === 3 && $fromUser->getName() === $to->getUser()->getName() ) ) {
+ if ( $to->getLevel() === 4 && ( $this->level < 3 ||
$this->level === 3 && $fromUser->getName() === $to->getUser()->getName() ) &&
!$to->getUser()->isAllowed( 'pagequality-admin' ) ) {
return false;
}
diff --git a/tests/phpunit/page/PageLevelTest.php
b/tests/phpunit/page/PageLevelTest.php
index a32a151..7ef85ef 100644
--- a/tests/phpunit/page/PageLevelTest.php
+++ b/tests/phpunit/page/PageLevelTest.php
@@ -16,6 +16,8 @@
$wgGroupPermissions['*']['pagequality'] = false;
$wgGroupPermissions['user']['pagequality'] = true;
+ $wgGroupPermissions['*']['pagequality-admin'] = false;
+ $wgGroupPermissions['sysop']['pagequality-admin'] = true;
}
public function testGetLevel() {
@@ -52,6 +54,9 @@
$test2User = User::newFromName( 'Test2' );
$test2User->addToDatabase();
$test2User->addGroup( 'user' );
+ $test3User = User::newFromName( 'Test3' );
+ $test3User->addToDatabase();
+ $test3User->addGroup( 'sysop' );
$ipUser = User::newFromName( '172.16.254.7', false );
return [
@@ -85,6 +90,26 @@
new PageLevel( 4, $testUser ),
false
],
+
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable page previews on wikispecies
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357425 ) Change subject: Disable page previews on wikispecies .. Disable page previews on wikispecies Bug: T166894 Change-Id: I978d50e971692830ae9b103502720872576099a5 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/25/357425/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 2491076..4874280 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -13306,6 +13306,8 @@ 'wikinews' => false, 'wikiversity' => false, 'commonswiki' => false, + //T166894 + 'specieswiki' => false, ], 'wgPopupsSchemaSamplingRate' => [ -- To view, visit https://gerrit.wikimedia.org/r/357425 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I978d50e971692830ae9b103502720872576099a5 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config 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] operations/mediawiki-config[master]: Update ContentNamespaces for Commons Wiki
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357426 ) Change subject: Update ContentNamespaces for Commons Wiki .. Update ContentNamespaces for Commons Wiki Bug: T167077 Change-Id: Ibc5950dbddc7397a523281a71f97c69844a8f91e --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/26/357426/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 2491076..d8f2cc5 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11634,6 +11634,7 @@ '+wikitech' => [ NS_HELP, 116 ], // Tools - T122865 '+zhwikisource' => [ 102, 114 ], // T66127 '+dewikivoyage' => [ 104 ], + '+commonswiki' => [ 6 ], // T167077 ], 'wgExtraSignatureNamespaces' => [ -- To view, visit https://gerrit.wikimedia.org/r/357426 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc5950dbddc7397a523281a71f97c69844a8f91e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config 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...WikibaseLexeme[master]: Remove deprecated warnings
Aleksey Bekh-Ivanov (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357427 ) Change subject: Remove deprecated warnings .. Remove deprecated warnings Apparently, `present?` method is deprecated. `exists?` should be used instead Change-Id: I50979efce589c743efacd2f2d1d8de9bc92cbbf2 --- M tests/browser/features/step_definitions/forms_steps.rb M tests/browser/features/support/pages/lexeme_page.rb 2 files changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseLexeme refs/changes/27/357427/1 diff --git a/tests/browser/features/step_definitions/forms_steps.rb b/tests/browser/features/step_definitions/forms_steps.rb index 77ce2d4..9908a84 100644 --- a/tests/browser/features/step_definitions/forms_steps.rb +++ b/tests/browser/features/step_definitions/forms_steps.rb @@ -80,7 +80,7 @@ end Then(/^I don't see the Form$/) do - expect(@form_I_am_currently_editing.present?).to be false + expect(@form_I_am_currently_editing.exists?).to be false end When(/^I click add statement on the Form$/) do diff --git a/tests/browser/features/support/pages/lexeme_page.rb b/tests/browser/features/support/pages/lexeme_page.rb index a1364c0..1be100e 100644 --- a/tests/browser/features/support/pages/lexeme_page.rb +++ b/tests/browser/features/support/pages/lexeme_page.rb @@ -20,13 +20,17 @@ end end +class GrammaticalFeatureValues + include PageObject + + a(:value, css: 'a') +end class LexemeForm include PageObject span(:representation, class: 'wikibase-lexeme-form-text') div(:grammatical_feature_list, class: 'wikibase-lexeme-form-grammatical-features') - as(:grammatical_features, css: '.wikibase-lexeme-form-grammatical-features-values > span > a') div(:statements, class: 'wikibase-statementgrouplistview') textarea(:representation_input, css: '.wikibase-lexeme-form-text > textarea') text_field(:grammatical_features_input, css: '.wikibase-lexeme-form-grammatical-features-values input') @@ -36,10 +40,11 @@ a(:grammatical_feature_selection_first_option, css: '.wikibase-lexeme-form-grammatical-features-values .oo-ui-menuOptionWidget:first-of-type a') page_section(:statement_group, StatementGroup, class: 'wikibase-statementgrouplistview') + page_sections(:grammatical_features, GrammaticalFeatureValues, css: '.wikibase-lexeme-form-grammatical-features-values > span') def grammatical_feature?(label) -self.grammatical_features_element.any? do |gf_element| - gf_element.text == label +self.grammatical_features.any? do |gf| + gf.value_element.text == label end end end -- To view, visit https://gerrit.wikimedia.org/r/357427 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I50979efce589c743efacd2f2d1d8de9bc92cbbf2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseLexeme Gerrit-Branch: master Gerrit-Owner: Aleksey Bekh-Ivanov (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Use __DIR__ instead of dirname(__FILE__)
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357428 )
Change subject: Use __DIR__ instead of dirname(__FILE__)
..
Use __DIR__ instead of dirname(__FILE__)
Change-Id: I02a99e0d1cc66806d787e6544fdc5c0325320b20
---
M maintenance/FlowAddMissingModerationLogs.php
M maintenance/FlowCreateTemplates.php
M maintenance/FlowExternalStoreMoveCluster.php
M maintenance/FlowFixEditCount.php
M maintenance/FlowFixInconsistentBoards.php
M maintenance/FlowFixLog.php
M maintenance/FlowFixUserIp.php
M maintenance/FlowFixWorkflowLastUpdateTimestamp.php
M maintenance/FlowForceSearchIndex.php
M maintenance/FlowPopulateLinksTables.php
M maintenance/FlowRemoveOldTopics.php
M maintenance/FlowRestoreLQT.php
M maintenance/FlowSearchConfig.php
M maintenance/FlowSetUserIp.php
M maintenance/FlowUpdateRecentChanges.php
M maintenance/FlowUpdateRevContentModelFromOccupyPages.php
M maintenance/FlowUpdateRevisionContentLength.php
M maintenance/FlowUpdateUserWiki.php
M maintenance/FlowUpdateWorkflowPageId.php
M maintenance/compileLightncandy.php
M maintenance/convertAllLqtPages.php
M maintenance/convertLqtPageFromRemoteApiForTesting.php
M maintenance/convertLqtPageOnLocalWiki.php
M maintenance/convertNamespaceFromWikitext.php
M maintenance/convertToText.php
M maintenance/dumpBackup.php
M maintenance/repair_missing_from_csv.php
M maintenance/repair_missing_revision_content.php
M maintenance/repair_missing_revision_content_from_parent.php
M scripts/gen-autoload.php
30 files changed, 30 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/28/357428/1
diff --git a/maintenance/FlowAddMissingModerationLogs.php
b/maintenance/FlowAddMissingModerationLogs.php
index 2f84445..cc4b94b 100644
--- a/maintenance/FlowAddMissingModerationLogs.php
+++ b/maintenance/FlowAddMissingModerationLogs.php
@@ -6,7 +6,7 @@
require_once ( getenv( 'MW_INSTALL_PATH' ) !== false
? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
- : dirname( __FILE__ ) . '/../../../maintenance/Maintenance.php' );
+ : __DIR__ . '/../../../maintenance/Maintenance.php' );
/**
* Adjusts edit counts for all existing Flow data.
diff --git a/maintenance/FlowCreateTemplates.php
b/maintenance/FlowCreateTemplates.php
index 1312390..2f61b39 100644
--- a/maintenance/FlowCreateTemplates.php
+++ b/maintenance/FlowCreateTemplates.php
@@ -2,7 +2,7 @@
require_once ( getenv( 'MW_INSTALL_PATH' ) !== false
? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
- : dirname( __FILE__ ) . '/../../../maintenance/Maintenance.php' );
+ : __DIR__ . '/../../../maintenance/Maintenance.php' );
/**
* The templates will be created with a default content, but can be customized.
diff --git a/maintenance/FlowExternalStoreMoveCluster.php
b/maintenance/FlowExternalStoreMoveCluster.php
index 9989259..061da8c 100644
--- a/maintenance/FlowExternalStoreMoveCluster.php
+++ b/maintenance/FlowExternalStoreMoveCluster.php
@@ -5,7 +5,7 @@
$IP = getenv( 'MW_INSTALL_PATH' );
if ( $IP === false ) {
- $IP = dirname( __FILE__ ) . '/../../..';
+ $IP = __DIR__ . '/../../..';
}
require_once "$IP/maintenance/Maintenance.php";
diff --git a/maintenance/FlowFixEditCount.php b/maintenance/FlowFixEditCount.php
index 068ab33..3aae3fb 100644
--- a/maintenance/FlowFixEditCount.php
+++ b/maintenance/FlowFixEditCount.php
@@ -6,7 +6,7 @@
require_once ( getenv( 'MW_INSTALL_PATH' ) !== false
? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
- : dirname( __FILE__ ) . '/../../../maintenance/Maintenance.php' );
+ : __DIR__ . '/../../../maintenance/Maintenance.php' );
/**
* Adjusts edit counts for all existing Flow data.
diff --git a/maintenance/FlowFixInconsistentBoards.php
b/maintenance/FlowFixInconsistentBoards.php
index bcf83b3..2f60439 100644
--- a/maintenance/FlowFixInconsistentBoards.php
+++ b/maintenance/FlowFixInconsistentBoards.php
@@ -6,7 +6,7 @@
require_once ( getenv( 'MW_INSTALL_PATH' ) !== false
? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
- : dirname( __FILE__ ) . '/../../../maintenance/Maintenance.php' );
+ : __DIR__ . '/../../../maintenance/Maintenance.php' );
/**
* Changes Flow boards and their topics to be associated with their current
title, based on the JSON content
diff --git a/maintenance/FlowFixLog.php b/maintenance/FlowFixLog.php
index bc6f98b..2e42db4 100644
--- a/maintenance/FlowFixLog.php
+++ b/maintenance/FlowFixLog.php
@@ -9,7 +9,7 @@
$IP = getenv( 'MW_INSTALL_PATH' );
if ( $IP === false ) {
- $IP = dirname( __FILE__ ) . '/../../..';
+ $IP = __DIR__ . '/../../..';
}
require_once( "$IP/maintenance/Maintenance.php" );
diff --git a/maintenance/FlowFixUserIp.php b/maintenance/FlowFixUserIp.php
index 8733940..7028523 100644
--- a/maintenance/FlowFixUserIp.php
[MediaWiki-commits] [Gerrit] mediawiki...LiquidThreads[master]: Use __DIR__ instead of dirname(__FILE__)
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357429 )
Change subject: Use __DIR__ instead of dirname(__FILE__)
..
Use __DIR__ instead of dirname(__FILE__)
Change-Id: I17fe7094b4b0c5c6406da00294a9446ff063db30
---
M classes/Hooks.php
M import/import-parsed-discussions.php
M migrateDatabase.php
3 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LiquidThreads
refs/changes/29/357429/1
diff --git a/classes/Hooks.php b/classes/Hooks.php
index b926022..c8b09cf 100644
--- a/classes/Hooks.php
+++ b/classes/Hooks.php
@@ -383,7 +383,7 @@
* @return bool
*/
public static function onLoadExtensionSchemaUpdates( $updater = null ) {
- $dir = realpath( dirname( __FILE__ ) . '/..' );
+ $dir = realpath( __DIR__ . '/..' );
if ( $updater instanceof PostgresUpdater ) {
$updater->addExtensionTable( 'thread',
"$dir/lqt.pg.sql" );
diff --git a/import/import-parsed-discussions.php
b/import/import-parsed-discussions.php
index ece03a7..4f269f2 100644
--- a/import/import-parsed-discussions.php
+++ b/import/import-parsed-discussions.php
@@ -1,7 +1,7 @@
$patch ) {
if ( !$db->fieldExists( 'thread', $field, 'lqt-update-script' ) ) {
- $db->sourceFile( dirname( __FILE__ ) . '/schema-changes/' .
$patch );
+ $db->sourceFile( __DIR__ . '/schema-changes/' . $patch );
}
}
foreach ( $threadIndexUpdates as $index => $patch ) {
if ( !$db->indexExists( 'thread', $index, 'lqt-update-script' ) ) {
- $db->sourceFile( dirname( __FILE__ ) . '/schema-changes/' .
$patch );
+ $db->sourceFile( __DIR__ . '/schema-changes/' . $patch );
}
}
foreach ( $newTableUpdates as $table => $patch ) {
if ( !$db->tableExists( $table, 'lqt-update-script' ) ) {
- $db->sourceFile( dirname( __FILE__ ) . '/schema-changes/' .
$patch );
+ $db->sourceFile( __DIR__ . '/schema-changes/' . $patch );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/357429
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I17fe7094b4b0c5c6406da00294a9446ff063db30
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SecurePoll[master]: Use __DIR__ instead of dirname(__FILE__)
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357430 )
Change subject: Use __DIR__ instead of dirname(__FILE__)
..
Use __DIR__ instead of dirname(__FILE__)
Change-Id: Icd03a4f7ece2527fd27d6207c7e3b856e1660d5e
---
M SecurePoll.i18n.php
M auth-api.php
M cli/cli.inc
M cli/convertVotes.php
M cli/delete.php
M cli/dump.php
M cli/dumpComments.php
M cli/dumpVoteCsv.php
M cli/import.php
M cli/purgePrivateVoteData.php
M cli/tally.php
M cli/testDebian.php
M cli/voterList.php
M cli/wm-scripts/bv2013/buildSpamTranslations.php
M cli/wm-scripts/bv2013/doSpam.php
M cli/wm-scripts/bv2013/dumpMetaTranslations.php
M cli/wm-scripts/bv2013/populateEditCount.php
M cli/wm-scripts/bv2013/sendMails.php
M cli/wm-scripts/bv2013/voterList.php
M cli/wm-scripts/bv2015/populateEditCount-fixup.php
M cli/wm-scripts/bv2015/populateEditCount.php
M cli/wm-scripts/bv2015/voterList.php
M cli/wm-scripts/bv2017/populateEditCount.php
M cli/wm-scripts/bv2017/voterList.php
M cli/wm-scripts/dumpGlobalVoterList.php
25 files changed, 30 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll
refs/changes/30/357430/1
diff --git a/SecurePoll.i18n.php b/SecurePoll.i18n.php
index b921ffe..e2af401 100644
--- a/SecurePoll.i18n.php
+++ b/SecurePoll.i18n.php
@@ -15,7 +15,7 @@
function wfJsonI18nShim310d2110c88636f7( $cache, $code, &$cachedData ) {
$codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
+ $fileName = __DIR__ . "/i18n/$csCode.json";
if ( is_readable( $fileName ) ) {
$data = FormatJson::decode( file_get_contents(
$fileName ), true );
foreach ( array_keys( $data ) as $key ) {
diff --git a/auth-api.php b/auth-api.php
index 8887793..ef06d1e 100644
--- a/auth-api.php
+++ b/auth-api.php
@@ -2,7 +2,7 @@
$IP = getenv( 'MW_INSTALL_PATH' );
if ( strval( $IP ) === '' ) {
- $IP = dirname( __FILE__ ).'/../..';
+ $IP = __DIR__.'/../..';
}
if ( !file_exists( "$IP/includes/WebStart.php" ) ) {
$IP .= '/core';
diff --git a/cli/cli.inc b/cli/cli.inc
index 759b70a..0ac96ee 100644
--- a/cli/cli.inc
+++ b/cli/cli.inc
@@ -2,7 +2,7 @@
$IP = getenv( 'MW_INSTALL_PATH' );
if ( strval( $IP ) === '' ) {
- $IP = dirname( __FILE__ ).'/../../..';
+ $IP = __DIR__.'/../../..';
}
if ( !file_exists( "$IP/includes/WebStart.php" ) ) {
$IP .= '/core';
diff --git a/cli/convertVotes.php b/cli/convertVotes.php
index bfcf7e6..764f281 100644
--- a/cli/convertVotes.php
+++ b/cli/convertVotes.php
@@ -1,6 +1,6 @@
diff --git a/cli/dumpComments.php b/cli/dumpComments.php
index cfcb483..71d5270 100644
--- a/cli/dumpComments.php
+++ b/cli/dumpComments.php
@@ -11,7 +11,7 @@
*/
$optionsWithArgs = array( 'name' );
-require( dirname(__FILE__).'/cli.inc' );
+require( __DIR__.'/cli.inc' );
$wgTitle = Title::newFromText( 'Special:SecurePoll' );
@@ -29,7 +29,7 @@
if ( isset( $options['name'] ) ) {
spFatal( "Cannot load from database when SecurePoll is not
installed" );
}
- require( dirname( __FILE__ ) . '/../SecurePoll.php' );
+ require( __DIR__ . '/../SecurePoll.php' );
}
$context = new SecurePoll_Context;
diff --git a/cli/dumpVoteCsv.php b/cli/dumpVoteCsv.php
index de18c19..14d7fe2 100644
--- a/cli/dumpVoteCsv.php
+++ b/cli/dumpVoteCsv.php
@@ -11,7 +11,7 @@
*/
$optionsWithArgs = array( 'name' );
-require( dirname(__FILE__).'/cli.inc' );
+require( __DIR__.'/cli.inc' );
$wgTitle = Title::newFromText( 'Special:SecurePoll' );
@@ -29,7 +29,7 @@
if ( isset( $options['name'] ) ) {
spFatal( "Cannot load from database when SecurePoll is not
installed" );
}
- require( dirname( __FILE__ ) . '/../SecurePoll.php' );
+ require( __DIR__ . '/../SecurePoll.php' );
}
$context = new SecurePoll_Context;
diff --git a/cli/import.php b/cli/import.php
index e5936f0..92ba7ec 100644
--- a/cli/import.php
+++ b/cli/import.php
@@ -1,6 +1,6 @@
18,
diff --git a/cli/wm-scripts/bv2013/populateEditCount.php
b/cli/wm-scripts/bv2013/populateEditCount.php
index e96f6be..8253d43 100644
--- a/cli/wm-scripts/bv2013/populateEditCount.php
+++ b/cli/wm-scripts/bv2013/populateEditCount.php
@@ -6,7 +6,7 @@
* have made at least 20 edits between 15 December 2012 and 30 April 2013.
*/
-require( dirname(__FILE__) . '/../../cli.inc' );
+require( __DIR__ . '/../../cli.inc' );
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
diff --git a/cli/wm-scripts/bv2013/sendMails.php
b/cli/wm-scripts/bv2013/sendMails.php
index 141a273..8885bb7 100644
--- a/cli/wm-scripts/bv2013/sendMails.php
+++ b/cli/wm-scripts/bv2013/
[MediaWiki-commits] [Gerrit] operations/puppet[production]: diskspace.py: Add one more special-case flavor size.
Andrew Bogott has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/357431 ) Change subject: diskspace.py: Add one more special-case flavor size. .. diskspace.py: Add one more special-case flavor size. Change-Id: I46effb8deb895b03a4ec9985ec31d2e46c91 --- M modules/openstack/files/novastats/diskspace.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/31/357431/1 diff --git a/modules/openstack/files/novastats/diskspace.py b/modules/openstack/files/novastats/diskspace.py index fb91bdf..d452ed9 100755 --- a/modules/openstack/files/novastats/diskspace.py +++ b/modules/openstack/files/novastats/diskspace.py @@ -45,6 +45,7 @@ flavordict['8af1f1cc-d95f-4380-bf10-bcfa0321b10f'] = '60' flavordict['2d59cc0d-538c-4bbd-b975-8e696a4f7207'] = '80' flavordict['cc0f1723-38d7-42da-aa2c-cef28d5f4250'] = '300' +flavordict['deea3460-069e-44c7-98ca-ae30bb0de772'] = '80' def printstat(string, alert=False): @@ -158,7 +159,7 @@ maxusage = 0 for instance in hostdict['novainstances']: if instance.flavor['id'] not in flavordict: -print "flavordict missing %s?" % instance.flavor['id'] +print "flavordict missing %s" % instance.flavor['id'] else: maxusage += int(flavordict[instance.flavor['id']]) * ONEMEG -- To view, visit https://gerrit.wikimedia.org/r/357431 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I46effb8deb895b03a4ec9985ec31d2e46c91 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Disambiguator[master]: Use short array syntax in alias file
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357003 ) Change subject: Use short array syntax in alias file .. Use short array syntax in alias file Change-Id: I39c1c6644bf5f489b83b61bf2842c7fbdf37676f --- M Disambiguator.i18n.alias.php M Disambiguator.i18n.magic.php 2 files changed, 203 insertions(+), 204 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/Disambiguator.i18n.alias.php b/Disambiguator.i18n.alias.php index c5db318..3a79b87 100644 --- a/Disambiguator.i18n.alias.php +++ b/Disambiguator.i18n.alias.php @@ -5,196 +5,195 @@ * @file * @ingroup Extensions */ -// @codingStandardsIgnoreFile -$specialPageAliases = array(); +$specialPageAliases = []; /** English (English) */ -$specialPageAliases['en'] = array( - 'DisambiguationPages' => array( 'DisambiguationPages' ), - 'DisambiguationPageLinks' => array( 'DisambiguationPageLinks' ), -); +$specialPageAliases['en'] = [ + 'DisambiguationPages' => [ 'DisambiguationPages' ], + 'DisambiguationPageLinks' => [ 'DisambiguationPageLinks' ], +]; /** Arabic (العربية) */ -$specialPageAliases['ar'] = array( - 'DisambiguationPages' => array( 'صفحات_توضيح' ), - 'DisambiguationPageLinks' => array( 'وصلات_صفحات_توضيح' ), -); +$specialPageAliases['ar'] = [ + 'DisambiguationPages' => [ 'صفحات_توضيح' ], + 'DisambiguationPageLinks' => [ 'وصلات_صفحات_توضيح' ], +]; /** Egyptian Arabic (مصرى) */ -$specialPageAliases['arz'] = array( - 'DisambiguationPages' => array( 'صفحات_توضيح' ), - 'DisambiguationPageLinks' => array( 'وصلات_صفحات_توضيح' ), -); +$specialPageAliases['arz'] = [ + 'DisambiguationPages' => [ 'صفحات_توضيح' ], + 'DisambiguationPageLinks' => [ 'وصلات_صفحات_توضيح' ], +]; /** Western Balochi (بلوچی رخشانی) */ -$specialPageAliases['bgn'] = array( - 'DisambiguationPages' => array( 'شکّ_دور_کنۆکین_وّرق_ئان' ), - 'DisambiguationPageLinks' => array( 'شکّ_دور_کنۆکین_وُرق_ئانی_لینک' ), -); +$specialPageAliases['bgn'] = [ + 'DisambiguationPages' => [ 'شکّ_دور_کنۆکین_وّرق_ئان' ], + 'DisambiguationPageLinks' => [ 'شکّ_دور_کنۆکین_وُرق_ئانی_لینک' ], +]; /** Min Dong Chinese (Mìng-dĕ̤ng-ngṳ̄) */ -$specialPageAliases['cdo'] = array( - 'DisambiguationPages' => array( '消除歧義頁面' ), - 'DisambiguationPageLinks' => array( '消除歧義頁面鏈接' ), -); +$specialPageAliases['cdo'] = [ + 'DisambiguationPages' => [ '消除歧義頁面' ], + 'DisambiguationPageLinks' => [ '消除歧義頁面鏈接' ], +]; /** Czech (Čeština) */ -$specialPageAliases['cs'] = array( - 'DisambiguationPages' => array( 'Rozcestníky' ), - 'DisambiguationPageLinks' => array( 'Odkazy_na_rozcestníky' ), -); +$specialPageAliases['cs'] = [ + 'DisambiguationPages' => [ 'Rozcestníky' ], + 'DisambiguationPageLinks' => [ 'Odkazy_na_rozcestníky' ], +]; /** German (Deutsch) */ -$specialPageAliases['de'] = array( - 'DisambiguationPages' => array( 'Begriffsklärungsseiten' ), - 'DisambiguationPageLinks' => array( 'Begriffsklärungslinks' ), -); +$specialPageAliases['de'] = [ + 'DisambiguationPages' => [ 'Begriffsklärungsseiten' ], + 'DisambiguationPageLinks' => [ 'Begriffsklärungslinks' ], +]; /** Zazaki (Zazaki) */ -$specialPageAliases['diq'] = array( - 'DisambiguationPages' => array( 'PelêManeyêBini' ), - 'DisambiguationPageLinks' => array( 'GıreyéPelanêManeyêBini' ), -); +$specialPageAliases['diq'] = [ + 'DisambiguationPages' => [ 'PelêManeyêBini' ], + 'DisambiguationPageLinks' => [ 'GıreyéPelanêManeyêBini' ], +]; /** Spanish (español) */ -$specialPageAliases['es'] = array( - 'DisambiguationPages' => array( 'Páginas_de_desambiguación' ), - 'DisambiguationPageLinks' => array( 'Páginas_que_enlazan_a_páginas_de_desambiguación' ), -); +$specialPageAliases['es'] = [ + 'DisambiguationPages' => [ 'Páginas_de_desambiguación' ], + 'DisambiguationPageLinks' => [ 'Páginas_que_enlazan_a_páginas_de_desambiguación' ], +]; /** Estonian (eesti) */ -$specialPageAliases['et'] = array( - 'DisambiguationPages' => array( 'Täpsustusleheküljed' ), - 'DisambiguationPageLinks' => array( 'Lingid_täpsustusleheküljele' ), -); +$specialPageAliases['et'] = [ + 'DisambiguationPages' => [ 'Täpsustusleheküljed' ], + 'DisambiguationPageLinks' => [ 'Lingid_täpsustusleheküljele' ], +]; /** Persian (فارسی) */ -$specialPageAliases['fa'] = array( - 'DisambiguationPages' => array( 'صفحات_ابهامزدایی' ), - 'DisambiguationPageLinks' => array( 'پیوندهای_صفحات_ابهامزدایی' ), -); +$specialPageAliases['fa'] = [ + 'DisambiguationPages' => [ 'صفحات_ابهامزدایی' ], + 'DisambiguationPageLinks' => [ 'پیوندهای_صفحات_ابهامزدایی' ], +]; /** Finnish (suomi) */ -$specialPageAliases['fi'] = array( - 'DisambiguationPages' => array( 'Täsmennyssivut'
[MediaWiki-commits] [Gerrit] mediawiki...Disambiguator[master]: Add phpcs and make pass
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356993 )
Change subject: Add phpcs and make pass
..
Add phpcs and make pass
Change-Id: I1e6330cc472d7e1f00b97f525f7fc121dd95b3e0
---
M Disambiguator.hooks.php
M composer.json
A phpcs.xml
M specials/SpecialDisambiguationPageLinks.php
M specials/SpecialDisambiguationPages.php
5 files changed, 68 insertions(+), 49 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Disambiguator.hooks.php b/Disambiguator.hooks.php
index dcb7bb6..963ddde 100644
--- a/Disambiguator.hooks.php
+++ b/Disambiguator.hooks.php
@@ -20,8 +20,8 @@
* @param array &$queryPages
*/
public static function onwgQueryPages( &$queryPages ) {
- $queryPages[] = array( 'SpecialDisambiguationPages',
'DisambiguationPages' );
- $queryPages[] = array( 'SpecialDisambiguationPageLinks',
'DisambiguationPageLinks' );
+ $queryPages[] = [ 'SpecialDisambiguationPages',
'DisambiguationPages' ];
+ $queryPages[] = [ 'SpecialDisambiguationPageLinks',
'DisambiguationPageLinks' ];
}
/**
@@ -33,9 +33,9 @@
private static function excludeDisambiguationPages( &$tables, &$conds,
&$joinConds ) {
$tables[] = 'page_props';
$conds['pp_page'] = null;
- $joinConds['page_props'] = array(
- 'LEFT JOIN', array( 'page_id = pp_page', 'pp_propname'
=> 'disambiguation' )
- );
+ $joinConds['page_props'] = [
+ 'LEFT JOIN', [ 'page_id = pp_page', 'pp_propname' =>
'disambiguation' ]
+ ];
}
/**
@@ -78,7 +78,7 @@
*/
public static function isDisambiguationPage( Title $title,
$includeRedirects = true ) {
$res = static::filterDisambiguationPageIds(
- array( $title->getArticleID() ), $includeRedirects );
+ [ $title->getArticleID() ], $includeRedirects );
return (bool)count( $res );
}
@@ -93,25 +93,30 @@
array $pageIds, $includeRedirects = true
) {
// Don't needlessly check non-existent and special pages
- $pageIds = array_filter( $pageIds, function ( $id ) { return
$id > 0; } );
+ $pageIds = array_filter(
+ $pageIds,
+ function ( $id ) {
+ return $id > 0;
+ }
+ );
- $output = array();
+ $output = [];
if ( $pageIds ) {
$dbr = wfGetDB( DB_SLAVE );
- $redirects = array();
+ $redirects = [];
if ( $includeRedirects ) {
// resolve redirects
$res = $dbr->select(
- array ( 'page', 'redirect' ),
- array( 'page_id', 'rd_from' ),
- array( 'rd_from' => $pageIds ),
+ [ 'page', 'redirect' ],
+ [ 'page_id', 'rd_from' ],
+ [ 'rd_from' => $pageIds ],
__METHOD__,
- array(),
- array( 'page' => array( 'INNER JOIN',
array(
+ [],
+ [ 'page' => [ 'INNER JOIN', [
'rd_namespace=page_namespace',
'rd_title=page_title'
- ) ) )
+ ] ] ]
);
foreach ( $res as $row ) {
@@ -124,7 +129,7 @@
$res = $dbr->select(
'page_props',
'pp_page',
- array( 'pp_page' => $pageIdsWithRedirects,
'pp_propname' => 'disambiguation' ),
+ [ 'pp_page' => $pageIdsWithRedirects,
'pp_propname' => 'disambiguation' ],
__METHOD__
);
diff --git a/composer.json b/composer.json
index 686b65b..b8f68fb 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,14 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "jakub-onderka/php-console-highlighter": "0.3.2"
+ "jakub-onderka/php-console-highlighter": "0.3.2",
+ "mediawiki/mediawiki-codesniffer": "0.7.2"
},
"scr
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable LoginNotify on testwiki
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357317 )
Change subject: Enable LoginNotify on testwiki
..
Enable LoginNotify on testwiki
Bug: T165007
Change-Id: I3140012c2f0be41e29d3b934dc33e177a9c43fe2
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
3 files changed, 12 insertions(+), 0 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
Kaldari: Looks good to me, but someone else must approve
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 6d0a11a..54c0401 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1937,6 +1937,11 @@
$wgDefaultUserOptions['uselivepreview'] = 1;
}
+if ( $wmgUseLoginNotify ) {
+ wfLoadExtension( 'LoginNotify' );
+ $wgLoginNotifyEnableOnSuccess = false;
+}
+
$wgDefaultUserOptions['thumbsize'] = $wmgThumbsizeIndex;
$wgDefaultUserOptions['showhiddencats'] = $wmgShowHiddenCats;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 2491076..e53230a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18710,6 +18710,12 @@
'foundationwiki' => true,
],
+// Enable LoginNotify on testwiki (T165007)
+'wmgUseLoginNotify' => [
+ 'default' => false,
+ 'testwiki' => true,
+],
+
'wmgUseParserMigration' => [
'default' => true,
],
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 094ee17..c4b7d86 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -76,6 +76,7 @@
$IP/extensions/LiquidThreads/extension.json
$IP/extensions/Listings/extension.json
$IP/extensions/LocalisationUpdate/extension.json
+$IP/extensions/LoginNotify/extension.json
$IP/extensions/MapSources/extension.json
$IP/extensions/MassMessage/extension.json
$IP/extensions/Math/extension.json
--
To view, visit https://gerrit.wikimedia.org/r/357317
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3140012c2f0be41e29d3b934dc33e177a9c43fe2
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: Niharika29
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...Kartographer[master]: Update for deprecation of OOjs UI openWindow/closeWindow pro...
Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357432 )
Change subject: Update for deprecation of OOjs UI openWindow/closeWindow promise
..
Update for deprecation of OOjs UI openWindow/closeWindow promise
Bug: T166729
Change-Id: If61f70171445967d5f5c040bf96d0099f6ba26b1
---
M modules/dialog/index.js
M modules/wikivoyage/wikivoyage.js
2 files changed, 48 insertions(+), 60 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer
refs/changes/32/357432/1
diff --git a/modules/dialog/index.js b/modules/dialog/index.js
index 037baa2..f91f92a 100644
--- a/modules/dialog/index.js
+++ b/modules/dialog/index.js
@@ -48,7 +48,8 @@
render: function ( map ) {
var window = getWindowManager(),
- dialog = getMapDialog();
+ dialog = getMapDialog(),
+ instance;
if ( map.useRouter && !routerEnabled ) {
router.on( 'route', closeIfNotMapRoute );
@@ -56,24 +57,18 @@
routerEnabled = true;
}
- if ( !window.opened ) {
- getWindowManager()
- .openWindow( dialog, { map: map } )
- .then( function ( opened ) {
- return opened;
- } )
- .then( function ( closing ) {
- if ( map.parentMap ) {
- map.parentMap.setView(
- map.getCenter(),
- map.getZoom()
- );
- }
- dialog.close();
- mapDialog = null;
- windowManager = null;
- return closing;
- } );
+ if ( !window.getCurrentWindow() ) {
+ instance = getWindowManager().openWindow(
dialog, { map: map } );
+ instance.closing.then( function () {
+ if ( map.parentMap ) {
+ map.parentMap.setView(
+ map.getCenter(),
+ map.getZoom()
+ );
+ }
+ mapDialog = null;
+ windowManager = null;
+ } );
} else if ( dialog.map !== map ) {
dialog.setup( { map: map } );
dialog.ready( { map: map } );
@@ -90,7 +85,7 @@
var window = getWindowManager(),
dialog = getMapDialog(),
- map;
+ map, instance;
function createAndRenderMap() {
mw.loader.using( 'ext.kartographer.box' ).then(
function () {
@@ -109,27 +104,23 @@
} );
}
- if ( window.opened ) {
+ if ( window.getCurrentWindow() ) {
createAndRenderMap();
} else {
- getWindowManager()
- .openWindow( dialog, {} )
- .then( function ( opened ) {
- createAndRenderMap();
- return opened;
- } )
- .then( function ( closing ) {
- if ( map.parentMap ) {
- map.parentMap.setView(
- map.getCenter(),
- map.getZoom()
- );
- }
- dialog.close();
- mapDialog = null;
[MediaWiki-commits] [Gerrit] mediawiki...Citoid[master]: Update for deprecation of OOjs UI openWindow/closeWindow pro...
Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357433 )
Change subject: Update for deprecation of OOjs UI openWindow/closeWindow promise
..
Update for deprecation of OOjs UI openWindow/closeWindow promise
Bug: T166729
Change-Id: I112f7b5882a976585be9b7e058dd0d5fb7794936
---
M modules/ve.ui.CiteFromIdInspector.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid
refs/changes/33/357433/1
diff --git a/modules/ve.ui.CiteFromIdInspector.js
b/modules/ve.ui.CiteFromIdInspector.js
index 78c8bf1..ec17cdc 100644
--- a/modules/ve.ui.CiteFromIdInspector.js
+++ b/modules/ve.ui.CiteFromIdInspector.js
@@ -332,7 +332,7 @@
manager = this.getManager();
// Close this dialog then open the new dialog
- this.close().then( function () {
+ this.close().closed.then( function () {
manager.getSurface().execute( 'mwcite', 'open',
data.windowName, $.extend( {
fragment: fragment
}, data.dialogData ) );
--
To view, visit https://gerrit.wikimedia.org/r/357433
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I112f7b5882a976585be9b7e058dd0d5fb7794936
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Update for deprecation of OOjs UI openWindow/closeWindow pro...
Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357434 )
Change subject: Update for deprecation of OOjs UI openWindow/closeWindow promise
..
Update for deprecation of OOjs UI openWindow/closeWindow promise
Bug: T166729
Change-Id: I59587589afebff3995ad50290e0da76ed4d08882
---
M modules/flow/ui/widgets/editor/mw.flow.ui.EditorWidget.js
1 file changed, 8 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/34/357434/1
diff --git a/modules/flow/ui/widgets/editor/mw.flow.ui.EditorWidget.js
b/modules/flow/ui/widgets/editor/mw.flow.ui.EditorWidget.js
index ba57887..7649df7 100644
--- a/modules/flow/ui/widgets/editor/mw.flow.ui.EditorWidget.js
+++ b/modules/flow/ui/widgets/editor/mw.flow.ui.EditorWidget.js
@@ -131,17 +131,14 @@
var widget = this;
if ( this.confirmCancel &&
this.editorSwitcherWidget.hasBeenChanged() ) {
- mw.flow.ui.windowManager.openWindow( 'cancelconfirm' )
- .then( function ( opened ) {
- opened.then( function ( closing, data )
{
- if ( data && data.action ===
'discard' ) {
- // Remove content
- widget.setContent( '',
'wikitext' );
-
widget.unbindBeforeUnloadHandler();
- widget.emit( 'cancel' );
- }
- } );
- } );
+ mw.flow.ui.windowManager.openWindow( 'cancelconfirm'
).closed.then( function ( data ) {
+ if ( data && data.action === 'discard' ) {
+ // Remove content
+ widget.setContent( '', 'wikitext' );
+ widget.unbindBeforeUnloadHandler();
+ widget.emit( 'cancel' );
+ }
+ } );
} else {
this.unbindBeforeUnloadHandler();
this.emit( 'cancel' );
--
To view, visit https://gerrit.wikimedia.org/r/357434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I59587589afebff3995ad50290e0da76ed4d08882
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Teahouse[master]: Update for deprecation of OOjs UI openWindow/closeWindow pro...
Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357435 )
Change subject: Update for deprecation of OOjs UI openWindow/closeWindow promise
..
Update for deprecation of OOjs UI openWindow/closeWindow promise
Also changed mw.util.teahouse.dialog.openMessageDialog() to use promises
instead of callbacks, which makes the implementation terser.
Bug: T166729
Change-Id: I722eefb5e9464deaee2c1f920a80370c2d3274e4
---
M resources/mediawiki.util.teahouse.dialog.js
M resources/ui/dialog/Question.js
2 files changed, 18 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Teahouse
refs/changes/35/357435/1
diff --git a/resources/mediawiki.util.teahouse.dialog.js
b/resources/mediawiki.util.teahouse.dialog.js
index deda258..b716f22 100644
--- a/resources/mediawiki.util.teahouse.dialog.js
+++ b/resources/mediawiki.util.teahouse.dialog.js
@@ -53,21 +53,20 @@
return false;
}
- function _openMessageDialog( data, then ) {
+ function _openMessageDialog( data ) {
- mw.loader.using( ['oojs-ui', 'mediawiki.Uri'], function(){
- if( !_messageDialog ) {
- $.getScript( _getComponentUrl(
"/ui/dialog/Message.js" ), function(){
- _setupMessageDialog();
-
mw.util.teahouse.dialog.openMessageDialog( data, then ); //re-call after
dependency is loaded
- });
- return;
- }
+ return mw.loader.using( ['oojs-ui', 'mediawiki.Uri'] )
+ .then( function(){
+ if( !_messageDialog ) {
+ return $.getScript( _getComponentUrl(
"/ui/dialog/Message.js" ) ).then(function(){
+ _setupMessageDialog();
+ });
+ }
+ })
+ .then( function(){
+ return _windowManager.openWindow(
_messageDialog, data ).closed;
+ });
- _windowManager
- .openWindow( _messageDialog, data )
- .then(then);
- });
}
var _config = {};
diff --git a/resources/ui/dialog/Question.js b/resources/ui/dialog/Question.js
index 03ccfca..c5b9c02 100644
--- a/resources/ui/dialog/Question.js
+++ b/resources/ui/dialog/Question.js
@@ -203,7 +203,7 @@
//TODO: add a parameter whether to
reset fields or not
//This parameter will be passed to
'getTeardownProcess'
me.close( { action: action } )
- .done(function( data ){
+ .closed.done(function( data ){
var anchor =
mw.html.element('a', {
href:
mw.util.getUrl( editdata.questionpage.title ),
@@ -216,14 +216,10 @@
mw.util.teahouse.dialog.openMessageDialog({
title:
mw.message('teahouse-dialog-msg-title-save').plain(),
message: msg
- }, function ( opening )
{
- opening.then(
function ( opened ) {
-
opened.then( function ( data ) {
-
if( data.action === 'yes' ) {
-
window.location.href = mw.util.getUrl( me._config.basePage );
-
}
- });
- });
+ }).then(function( data
) {
+ if( data.action
=== 'yes' ) {
+
window.location.href = mw.util.getUrl( me._config.basePage );
+ }
});
});
});
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Optimize VariantsAwareRenderer to not output broken weblink ...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356801 )
Change subject: Optimize VariantsAwareRenderer to not output broken weblink
syntax
..
Optimize VariantsAwareRenderer to not output broken weblink syntax
This fixes a user-facing issue when the {{#property:…}} or
{{#statements:…}} parser functions are used to render URLs on a
multi-variant wiki like zhwiki. The generated wikitext is
"-{zh:http://example.com;zh-hans:http://example.com;}-";. Try to preview
this wikitext snippet. What happens? The URL parser finds the first
"http://"; and eats everything behind, including the semikolons and the
closing "}-".
Instead of trying to fix this combination of the two wikitext features,
I'm skipping the "-{…}-" syntax if all values are the same anyway. I
believe this fixes all issues and is very unlikely to break again in
the future. Let's say the URL renderer changes and starts to output
"[http://example.com ]" instead. This is fine because
the URL is then guaranteed to end at the "]". The only wikitext able to
break the "-{…}-" sytnax is, as far as I can tell, a plain web link.
But the rendering of a plain URL can not change with the language, and
will always be filtered by the array_unique introduced here.
Bug: T166429
Change-Id: I030f7b375d047f66335a645c549643b59be31bcd
---
M client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
M
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
2 files changed, 73 insertions(+), 45 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
b/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
index 2ce3d19..e9a3f8a 100644
---
a/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
+++
b/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
@@ -9,6 +9,8 @@
* Handler of the {{#property}} parser function.
*
* @license GPL-2.0+
+ * @author Katie Filbert < aude.w...@gmail.com >
+ * @author Thiemo Mättig
*/
class VariantsAwareRenderer implements StatementGroupRenderer {
@@ -35,6 +37,7 @@
* @param EntityId $entityId
* @param string $propertyLabelOrId
*
+* @throws OutOfBoundsException
* @return string
*/
public function render( EntityId $entityId, $propertyLabelOrId ) {
@@ -47,10 +50,11 @@
* @param EntityId $entityId
* @param string $propertyLabelOrId
*
+* @throws OutOfBoundsException
* @return string[] key by variant codes
*/
private function buildRenderedVariantsArray( EntityId $entityId,
$propertyLabelOrId ) {
- $renderedVariantsArray = array();
+ $renderedVariantsArray = [];
foreach ( $this->variants as $variantCode ) {
$variantText = $this->getVariantText( $variantCode,
$entityId, $propertyLabelOrId );
@@ -71,19 +75,24 @@
*
* @param string[] $textArray
*
-* @return string
+* @return string Wikitext
*/
private function processRenderedArray( array $textArray ) {
- // We got arrays, so they must have already checked that
variants are being used.
+ if ( $textArray === [] ) {
+ return '';
+ }
+
+ if ( count( array_unique( $textArray ) ) === 1 ) {
+ return reset( $textArray );
+ }
+
$text = '';
+
foreach ( $textArray as $variantCode => $variantText ) {
$text .= "$variantCode:$variantText;";
}
- if ( $text !== '' ) {
- $text = '-{' . $text . '}-';
- }
- return $text;
+ return '-{' . $text . '}-';
}
/**
@@ -91,7 +100,8 @@
* @param EntityId $entityId
* @param string $propertyLabelOrId
*
-* @return string
+* @throws OutOfBoundsException
+* @return string Wikitext
*/
private function getVariantText( $variantCode, EntityId $entityId,
$propertyLabelOrId ) {
$renderer = $this->getLanguageAwareRendererFromCode(
$variantCode );
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
index 134632d..386881a 100644
---
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
+++
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
@@ -3,8 +3,8 @@
namespace Wikibas
[MediaWiki-commits] [Gerrit] mediawiki...SpamBlacklist[master]: Break long lines
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356858 )
Change subject: Break long lines
..
Break long lines
Prepare to make phpcs pass
Change-Id: I814715c63af5ed5db673786e1fdab9fc59441b67
---
M EmailBlacklist.php
M SpamBlacklist.php
M SpamBlacklistHooks.php
3 files changed, 40 insertions(+), 12 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/EmailBlacklist.php b/EmailBlacklist.php
index bc2717f..593c2f1 100644
--- a/EmailBlacklist.php
+++ b/EmailBlacklist.php
@@ -43,8 +43,8 @@
// Check for whitelisted email addresses
if ( is_array( $whitelists ) ) {
- wfDebugLog( 'SpamBlacklist', "Excluding whitelisted
email addresses from " . count( $whitelists ) .
- " regexes: " . implode( ', ', $whitelists ) .
"\n" );
+ wfDebugLog( 'SpamBlacklist', "Excluding whitelisted
email addresses from " .
+ count( $whitelists ) . " regexes: " . implode(
', ', $whitelists ) . "\n" );
foreach ( $whitelists as $regex ) {
if ( preg_match( $regex, $email ) ) {
// Whitelisted email
diff --git a/SpamBlacklist.php b/SpamBlacklist.php
index a1e4960..0b703b5 100644
--- a/SpamBlacklist.php
+++ b/SpamBlacklist.php
@@ -4,7 +4,8 @@
// Keep i18n globals so mergeMessageFileList.php doesn't break
$wgMessagesDirs['SpamBlackList'] = __DIR__ . '/i18n';
/* wfWarn(
- 'Deprecated PHP entry point used for SpamBlacklist extension.
Please use wfLoadExtension instead, ' .
+ 'Deprecated PHP entry point used for SpamBlacklist extension. '
.
+ 'Please use wfLoadExtension instead, ' .
'see https://www.mediawiki.org/wiki/Extension_registration for
more details.'
); */
return;
diff --git a/SpamBlacklistHooks.php b/SpamBlacklistHooks.php
index eb0d5dd..3518710 100644
--- a/SpamBlacklistHooks.php
+++ b/SpamBlacklistHooks.php
@@ -30,7 +30,14 @@
*
* @return bool
*/
- static function filterMergedContent( IContextSource $context, Content
$content, Status $status, $summary, User $user, $minoredit ) {
+ static function filterMergedContent(
+ IContextSource $context,
+ Content $content,
+ Status $status,
+ $summary,
+ User $user,
+ $minoredit
+ ) {
$title = $context->getTitle();
// get the link from the not-yet-saved page content.
@@ -64,7 +71,9 @@
}
public static function onParserOutputStashForEdit(
- WikiPage $page, Content $content, ParserOutput $output
+ WikiPage $page,
+ Content $content,
+ ParserOutput $output
) {
$links = array_keys( $output->getExternalLinks() );
$spamObj = BaseBlacklist::getInstance( 'spam' );
@@ -123,7 +132,9 @@
$thisPageName = $editPage->mTitle->getPrefixedDBkey();
if( !BaseBlacklist::isLocalSource( $editPage->mTitle ) ) {
- wfDebugLog( 'SpamBlacklist', "Spam blacklist validator:
[[$thisPageName]] not a local blacklist\n" );
+ wfDebugLog( 'SpamBlacklist',
+ "Spam blacklist validator: [[$thisPageName]]
not a local blacklist\n"
+ );
return true;
}
@@ -136,8 +147,10 @@
$badLines = SpamRegexBatch::getBadLines( $lines,
BaseBlacklist::getInstance( $type ) );
if( $badLines ) {
- wfDebugLog( 'SpamBlacklist', "Spam blacklist validator:
[[$thisPageName]] given invalid input lines: " .
- implode( ', ', $badLines ) . "\n" );
+ wfDebugLog( 'SpamBlacklist',
+ "Spam blacklist validator: [[$thisPageName]]
given invalid input lines: " .
+ implode( ', ', $badLines ) . "\n"
+ );
$badList = "*" .
implode( "\n*",
@@ -150,7 +163,9 @@
"\n" .
"\n";
} else {
- wfDebugLog( 'SpamBlacklist', "Spam blacklist validator:
[[$thisPageName]] ok or empty blacklist\n" );
+ wfDebugLog( 'SpamBlacklist',
+ "Spam blacklist validator: [[$thisPageName]] ok
or empty blacklist\n"
+ );
}
return true;
@@ -215,7 +230,14 @@
* @param array|ApiMessage &$error
[MediaWiki-commits] [Gerrit] mediawiki...SpamBlacklist[master]: Add phpcs and make pass
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357416 )
Change subject: Add phpcs and make pass
..
Add phpcs and make pass
Change-Id: I623a982fe6362daab34906a111d123f19676dc22
---
M BaseBlacklist.php
M EmailBlacklist.php
M SpamBlacklistHooks.php
M SpamBlacklistLogFormatter.php
M SpamBlacklist_body.php
M SpamRegexBatch.php
M api/ApiSpamBlacklist.php
M composer.json
M maintenance/cleanup.php
A phpcs.xml
M tests/phpunit/SpamBlacklistTest.php
11 files changed, 136 insertions(+), 115 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/BaseBlacklist.php b/BaseBlacklist.php
index d025f93..77d4545 100644
--- a/BaseBlacklist.php
+++ b/BaseBlacklist.php
@@ -9,7 +9,7 @@
*
* @var array
*/
- public $files = array();
+ public $files = [];
/**
* Array containing regexes to test against
@@ -40,24 +40,24 @@
*
* @var array
*/
- private static $blacklistTypes = array(
+ private static $blacklistTypes = [
'spam' => 'SpamBlacklist',
'email' => 'EmailBlacklist',
- );
+ ];
/**
* Array of blacklist instances
*
* @var array
*/
- private static $instances = array();
+ private static $instances = [];
/**
* Constructor
*
* @param array $settings
*/
- function __construct( $settings = array() ) {
+ function __construct( $settings = [] ) {
foreach ( $settings as $name => $value ) {
$this->$name = $value;
}
@@ -107,7 +107,7 @@
// Prevent notices
if ( !isset( $wgBlacklistSettings[$type] ) ) {
- $wgBlacklistSettings[$type] = array();
+ $wgBlacklistSettings[$type] = [];
}
$class = self::$blacklistTypes[$type];
@@ -133,17 +133,17 @@
public static function isLocalSource( Title $title ) {
global $wgDBname, $wgBlacklistSettings;
- if( $title->getNamespace() == NS_MEDIAWIKI ) {
- $sources = array();
+ if ( $title->getNamespace() == NS_MEDIAWIKI ) {
+ $sources = [];
foreach ( self::$blacklistTypes as $type => $class ) {
$type = ucfirst( $type );
- $sources += array(
+ $sources += [
"$type-blacklist",
"$type-whitelist"
- );
+ ];
}
- if( in_array( $title->getDBkey(), $sources ) ) {
+ if ( in_array( $title->getDBkey(), $sources ) ) {
return true;
}
}
@@ -151,23 +151,23 @@
$thisHttp = wfExpandUrl( $title->getFullUrl( 'action=raw' ),
PROTO_HTTP );
$thisHttpRegex = '/^' . preg_quote( $thisHttp, '/' ) .
'(?:&.*)?$/';
- $files = array();
+ $files = [];
foreach ( self::$blacklistTypes as $type => $class ) {
if ( isset( $wgBlacklistSettings[$type]['files'] ) ) {
$files += $wgBlacklistSettings[$type]['files'];
}
}
- foreach( $files as $fileName ) {
- $matches = array();
+ foreach ( $files as $fileName ) {
+ $matches = [];
if ( preg_match( '/^DB: (\w*) (.*)$/', $fileName,
$matches ) ) {
if ( $wgDBname == $matches[1] ) {
- if( $matches[2] ==
$title->getPrefixedDbKey() ) {
+ if ( $matches[2] ==
$title->getPrefixedDbKey() ) {
// Local DB fetch of this
page...
return true;
}
}
- } elseif( preg_match( $thisHttpRegex, $fileName ) ) {
+ } elseif ( preg_match( $thisHttpRegex, $fileName ) ) {
// Raw view of this page
return true;
}
@@ -183,7 +183,7 @@
* @return bool|string
*/
public static function getTypeFromTitle( Title $title ) {
- $types = array_map( 'preg_quote', array_keys(
self::$blacklistTypes ), array( '/' ) );
+ $ty
[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[master]: Update for deprecation of OOjs UI openWindow/closeWindow pro...
Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357436 )
Change subject: Update for deprecation of OOjs UI openWindow/closeWindow promise
..
Update for deprecation of OOjs UI openWindow/closeWindow promise
Bug: T166729
Change-Id: I2ae5c13592539dd2a7cb98e0197ed2f891855d41
---
M modules/ext.templateDataGenerator.target.js
1 file changed, 15 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData
refs/changes/36/357436/1
diff --git a/modules/ext.templateDataGenerator.target.js
b/modules/ext.templateDataGenerator.target.js
index b5cdab9..a2dcb57 100644
--- a/modules/ext.templateDataGenerator.target.js
+++ b/modules/ext.templateDataGenerator.target.js
@@ -219,20 +219,16 @@
flags: 'safe'
}
]
- } ).then( function ( opened ) {
- return opened.then( function ( closing
) {
- return closing.then( function (
data ) {
- var model;
- if ( data &&
data.action === 'accept' ) {
- // Open the
dialog with an empty model
- model =
mw.TemplateData.Model.static.newFromObject(
- {
params: {} },
-
target.sourceHandler.getTemplateSourceCodeParams()
- );
-
target.openEditDialog( model );
- }
- } );
- } );
+ } ).closed.then( function ( data ) {
+ var model;
+ if ( data && data.action === 'accept' )
{
+ // Open the dialog with an
empty model
+ model =
mw.TemplateData.Model.static.newFromObject(
+ { params: {} },
+
target.sourceHandler.getTemplateSourceCodeParams()
+ );
+ target.openEditDialog( model );
+ }
} );
}
);
@@ -312,14 +308,11 @@
label: mw.msg(
'templatedata-modal-button-apply' )
}
]
- } )
- .then( function ( opening ) { return opening; } )
- .then( function ( opened ) { return opened; } )
- .then( function ( data ) {
- if ( data && data.action === 'apply' ) {
- target.setWikitext(
target.replaceTemplateData( templateData ) );
- }
- } );
+ } ).closed.then( function ( data ) {
+ if ( data && data.action === 'apply' ) {
+ target.setWikitext( target.replaceTemplateData(
templateData ) );
+ }
+ } );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/357436
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ae5c13592539dd2a7cb98e0197ed2f891855d41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...InputBox[master]: Allow appending searchfilters to terms
Harej has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357437 )
Change subject: Allow appending searchfilters to terms
..
Allow appending searchfilters to terms
For search-style inputboxes, if you have `searchfilter=foo` as a
parameter, it will append `foo` after the search term. This is
useful for leveraging search filters in custom search boxes without
exposing it to the user.
Bug: T147951
Change-Id: Ie23ce220ff9657c38fe5b41195e297ca7cebf7f1
---
M InputBox.classes.php
M InputBox.hooks.php
2 files changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/InputBox
refs/changes/37/357437/1
diff --git a/InputBox.classes.php b/InputBox.classes.php
index e5a4290..1ee1931 100644
--- a/InputBox.classes.php
+++ b/InputBox.classes.php
@@ -36,6 +36,7 @@
private $mInline = false;
private $mPrefix = '';
private $mDir = '';
+ private $mSearchFilter = '';
/* Functions */
@@ -167,6 +168,10 @@
if ( $this->mPrefix != '' ) {
$htmlOut .= Html::hidden( 'prefix', $this->mPrefix );
+ }
+
+ if ( $this->mSearchFilter != '' ) {
+ $htmlOut .= Html::hidden( 'searchfilter',
$this->mSearchFilter );
}
$htmlOut .= $this->mBR;
@@ -599,6 +604,7 @@
'inline' => 'mInline',
'prefix' => 'mPrefix',
'dir' => 'mDir',
+ 'searchfilter' => 'mSearchFilter'
];
foreach ( $options as $name => $var ) {
if ( isset( $values[$name] ) ) {
diff --git a/InputBox.hooks.php b/InputBox.hooks.php
index 9bdae13..60c16d1 100644
--- a/InputBox.hooks.php
+++ b/InputBox.hooks.php
@@ -22,10 +22,15 @@
$request = $special->getRequest();
$prefix = $request->getText( 'prefix', '' );
$title = $request->getText( 'wpNewTitle', '' );
+ $search = $request->getText( 'search', '' );
+ $searchfilter = $request->getText( 'searchfilter', '' );
if ( $special->getName() == 'Movepage' && $prefix !== '' &&
$title !== '' ) {
$request->setVal( 'wpNewTitle', $prefix . $title );
$request->unsetVal( 'prefix' );
}
+ if ( $special->getName() == 'Search' && $searchfilter !== '' ) {
+ $request->setVal( 'search', $search . ' ' .
$searchfilter );
+ }
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/357437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie23ce220ff9657c38fe5b41195e297ca7cebf7f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InputBox
Gerrit-Branch: master
Gerrit-Owner: Harej
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: i18n for "Filter" button on Notifications page
Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357438 )
Change subject: i18n for "Filter" button on Notifications page
..
i18n for "Filter" button on Notifications page
Bug: T166860
Change-Id: I9e0285f34b79527632a2a1e79f75ced62c5f57b3
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M resources/skins.minerva.notifications/init.js
4 files changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/38/357438/1
diff --git a/extension.json b/extension.json
index 7c8f826..f8b4251 100644
--- a/extension.json
+++ b/extension.json
@@ -1452,6 +1452,9 @@
"scripts": [
"resources/skins.minerva.notifications/init.js"
],
+ "messages": [
+ "mobile-frontend-notifications-filter"
+ ],
"targets": [ "mobile", "desktop" ]
},
"skins.minerva.editor": {
diff --git a/i18n/en.json b/i18n/en.json
index 2e9da3f..52eda71 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -338,5 +338,6 @@
"mobile-frontend-panel-betaoptin-msg": "Do you want to try some new
features? By joining the beta, you will get access to experimental features, at
the risk of encountering bugs and issues.",
"mobile-frontend-search-feedback-link-text": "Give us your feedback.",
"mobile-frontend-search-feedback-prompt": "Couldn't find what you were
looking for?",
+ "mobile-frontend-notifications-filter": "Filter",
"mobile-frontend-notifications-filter-title": "Filter notifications"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b0a7c8e..06a36d4 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -339,5 +339,6 @@
"mobile-frontend-panel-betaoptin-msg": "Message in panel asking if user
wants to opt in to beta.",
"mobile-frontend-search-feedback-link-text": "Text of anchor linking to
a form for the user to give feedback on search results.",
"mobile-frontend-search-feedback-prompt": "Text shown in front of an
anchor linking to a form for the user to give feedback on search results.",
+ "mobile-frontend-notifications-filter": "Caption of the button on the
notifications page that opens the filter panel",
"mobile-frontend-notifications-filter-title": "Title shown in the
notifications filter page on click of the Filter button"
}
diff --git a/resources/skins.minerva.notifications/init.js
b/resources/skins.minerva.notifications/init.js
index db0a2a7..fe19906 100644
--- a/resources/skins.minerva.notifications/init.js
+++ b/resources/skins.minerva.notifications/init.js
@@ -32,7 +32,7 @@
href: '#/notifications-filter',
classes: [
'mw-echo-ui-notificationsInboxWidget-main-toolbar-nav-filter-placeholder' ],
icon: 'funnel',
- label: 'Filter'
+ label: mw.msg(
'mobile-frontend-notifications-filter' )
} );
$(
'.mw-echo-ui-notificationsInboxWidget-cell-placeholder' ).append(
--
To view, visit https://gerrit.wikimedia.org/r/357438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e0285f34b79527632a2a1e79f75ced62c5f57b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
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...MobileFrontend[master]: Hygiene: Remove unused icon- prefixed classes
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357439 )
Change subject: Hygiene: Remove unused icon- prefixed classes
..
Hygiene: Remove unused icon- prefixed classes
Not referenced anywhere and no longer needed since introduction
of mw-ui-icon and mw-ui-icon-small
Change-Id: I84e37cb56c68e681bf438911e28d6b7633c04c62
---
M includes/models/MobilePage.php
M includes/skins/SkinMinerva.php
M includes/specials/SpecialMobileDiff.php
M includes/specials/SpecialMobileHistory.php
4 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/39/357439/1
diff --git a/includes/models/MobilePage.php b/includes/models/MobilePage.php
index b5da7be..3303dec 100644
--- a/includes/models/MobilePage.php
+++ b/includes/models/MobilePage.php
@@ -119,10 +119,10 @@
/**
* Get a placeholder div container for thumbnails
* @param string $className
-* @param string $iconClassName controls size of thumbnail, defaults to
icon-32px
+* @param string $iconClassName controls size of thumbnail, defaults to
empty string
* @return string
*/
- public static function getPlaceHolderThumbnailHtml( $className,
$iconClassName = 'icon-32px' ) {
+ public static function getPlaceHolderThumbnailHtml( $className,
$iconClassName = '' ) {
return Html::element( 'div', [
'class' => 'list-thumb list-thumb-placeholder ' .
$iconClassName . ' ' . $className,
] );
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 3439300..db04a48 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -,7 +,7 @@
$baseResult = [
'id' => 'ca-watch',
// Use blank icon to reserve space for watchstar icon
once JS loads
- 'class' => MobileUI::iconClass( '', 'element',
'icon-32px watch-this-article' ),
+ 'class' => MobileUI::iconClass( '', 'element',
'watch-this-article' ),
'is_js_only' => true
];
$title = $this->getTitle();
diff --git a/includes/specials/SpecialMobileDiff.php
b/includes/specials/SpecialMobileDiff.php
index 50c9e33..e2c9b80 100644
--- a/includes/specials/SpecialMobileDiff.php
+++ b/includes/specials/SpecialMobileDiff.php
@@ -337,7 +337,7 @@
$user = User::newFromId( $userId );
$edits = $user->getEditCount();
$attrs = [
- 'class' => MobileUI::iconClass( 'user',
'before', 'mw-mf-user icon-16px' ),
+ 'class' => MobileUI::iconClass( 'user',
'before', 'mw-mf-user' ),
'data-revision-id' => $this->revId,
'data-user-name' => $user->getName(),
'data-user-gender' => $user->getOption(
'gender' ),
@@ -365,7 +365,7 @@
$userPage = SpecialPage::getTitleFor( 'Contributions',
$ipAddr );
$output->addHtml(
Html::element( 'div', [
- 'class' => MobileUI::iconClass(
'anonymous', 'before', 'mw-mf-user icon-16px mw-mf-anon' ),
+ 'class' => MobileUI::iconClass(
'anonymous', 'before', 'mw-mf-user mw-mf-anon' ),
], $this->msg(
'mobile-frontend-diffview-anonymous' ) ) .
'' .
$this->getLinkRenderer()->makeLink(
$userPage, $ipAddr ) .
diff --git a/includes/specials/SpecialMobileHistory.php
b/includes/specials/SpecialMobileHistory.php
index 3a300bb..b13be53 100644
--- a/includes/specials/SpecialMobileHistory.php
+++ b/includes/specials/SpecialMobileHistory.php
@@ -66,7 +66,7 @@
// manually style it as a userlink
$headerTitle = Html::element(
'span',
- [ 'class' => MobileUI::iconClass( 'user',
'before', 'mw-mf-user icon-16px' ) ],
+ [ 'class' => MobileUI::iconClass( 'user',
'before', 'mw-mf-user' ) ],
$title
);
}
--
To view, visit https://gerrit.wikimedia.org/r/357439
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I84e37cb56c68e681bf438911e28d6b7633c04c62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] operations/puppet[production]: diskspace.py: Add one more special-case flavor size.
Andrew Bogott has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357431 ) Change subject: diskspace.py: Add one more special-case flavor size. .. diskspace.py: Add one more special-case flavor size. Change-Id: I46effb8deb895b03a4ec9985ec31d2e46c91 --- M modules/openstack/files/novastats/diskspace.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/files/novastats/diskspace.py b/modules/openstack/files/novastats/diskspace.py index fb91bdf..d452ed9 100755 --- a/modules/openstack/files/novastats/diskspace.py +++ b/modules/openstack/files/novastats/diskspace.py @@ -45,6 +45,7 @@ flavordict['8af1f1cc-d95f-4380-bf10-bcfa0321b10f'] = '60' flavordict['2d59cc0d-538c-4bbd-b975-8e696a4f7207'] = '80' flavordict['cc0f1723-38d7-42da-aa2c-cef28d5f4250'] = '300' +flavordict['deea3460-069e-44c7-98ca-ae30bb0de772'] = '80' def printstat(string, alert=False): @@ -158,7 +159,7 @@ maxusage = 0 for instance in hostdict['novainstances']: if instance.flavor['id'] not in flavordict: -print "flavordict missing %s?" % instance.flavor['id'] +print "flavordict missing %s" % instance.flavor['id'] else: maxusage += int(flavordict[instance.flavor['id']]) * ONEMEG -- To view, visit https://gerrit.wikimedia.org/r/357431 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I46effb8deb895b03a4ec9985ec31d2e46c91 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: Giuseppe Lavagetto 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] wikimedia...golden[master]: Update partition info for maps tiles
Bearloga has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/357440 )
Change subject: Update partition info for maps tiles
..
Update partition info for maps tiles
Counts will need to be backfilled from 2017-06-01
Bug: T167083
Change-Id: Ibbdd76e0539cc6b514c27e633545601ddce1b93a
---
M modules/metrics/maps/tile_aggregates.R
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/golden
refs/changes/40/357440/1
diff --git a/modules/metrics/maps/tile_aggregates.R
b/modules/metrics/maps/tile_aggregates.R
index 1275945..dd4f89f 100644
--- a/modules/metrics/maps/tile_aggregates.R
+++ b/modules/metrics/maps/tile_aggregates.R
@@ -54,8 +54,9 @@
ELSE 'FALSE' END AS is_automata
FROM wmf.webrequest
WHERE
- webrequest_source = 'maps'
+ webrequest_source = 'upload'
AND ", date_clause, "
+ AND uri_host = 'maps.wikimedia.org'
AND http_status IN('200','304')
AND uri_path RLIKE
'^/([^/]+)/([0-9]{1,2})/(-?[0-9]+)/(-?[0-9]+)(@([0-9]\\.?[0-9]?)x)?\\.([a-z]+)$'
AND uri_query <> '?loadtesting'
--
To view, visit https://gerrit.wikimedia.org/r/357440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbdd76e0539cc6b514c27e633545601ddce1b93a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/golden
Gerrit-Branch: master
Gerrit-Owner: Bearloga
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: svgo: Update pre-commit hook
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357386 ) Change subject: svgo: Update pre-commit hook .. svgo: Update pre-commit hook Remove the --pretty option as svgo outputs a smaller file without it. The `dev-scripts/svg_check.sh` script also doesn't have this option. As a result of this change the remote `npm test` job won't fail if the job was not run locally before committing. Thanks to Jon for figuring out the issue. Bug: T142532 Change-Id: Icf6cb2bf0c97a36bff3888bffc6136c26c871ae1 --- M dev-scripts/pre-commit 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Jdlrobson: Looks good to me, approved diff --git a/dev-scripts/pre-commit b/dev-scripts/pre-commit index 19aabf5..66d8854 100755 --- a/dev-scripts/pre-commit +++ b/dev-scripts/pre-commit @@ -26,9 +26,7 @@ git-staged-files \*.svg|while map file; do make nodecheck echo "Compressing $file" - # If anyone can figure out how to get the pretty option to work from the config - # file, feel free to remove it here. - node_modules/.bin/svgo --config=.svgo.yml "$file" --pretty + node_modules/.bin/svgo --config=.svgo.yml "$file" git add "$file" done } @@ -74,4 +72,4 @@ return $err } -main "$@" \ No newline at end of file +main "$@" -- To view, visit https://gerrit.wikimedia.org/r/357386 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf6cb2bf0c97a36bff3888bffc6136c26c871ae1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Bmansurov Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
