[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Add ability to get exact Form from Lexeme
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378409 )
Change subject: Add ability to get exact Form from Lexeme
..
Add ability to get exact Form from Lexeme
Change-Id: I0bfbcd4cf0692ce61670c18bb75b6c30e5d1dd84
---
M src/DataModel/FormSet.php
M src/DataModel/Lexeme.php
M tests/phpunit/composer/DataModel/LexemeTest.php
3 files changed, 51 insertions(+), 0 deletions(-)
Approvals:
WMDE-leszek: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/DataModel/FormSet.php b/src/DataModel/FormSet.php
index 6933dbc..eec9ea5 100644
--- a/src/DataModel/FormSet.php
+++ b/src/DataModel/FormSet.php
@@ -68,4 +68,15 @@
unset( $this->forms[$formId->getSerialization()] );
}
+ /**
+* @param FormId $formId
+*
+* @return Form|null
+*/
+ public function getById( FormId $formId ) {
+ return isset( $this->forms[$formId->getSerialization()] ) ?
+ $this->forms[$formId->getSerialization()]
+ : null;
+ }
+
}
diff --git a/src/DataModel/Lexeme.php b/src/DataModel/Lexeme.php
index 7c92c22..37c54af 100644
--- a/src/DataModel/Lexeme.php
+++ b/src/DataModel/Lexeme.php
@@ -281,6 +281,21 @@
return $this->nextFormId;
}
+ public function hasForm( FormId $formId ) {
+ return (bool)$this->forms->getById( $formId );
+ }
+
+ public function getForm( FormId $formId ) {
+ if ( !$this->hasForm( $formId ) ) {
+ throw new \OutOfRangeException(
+ "Lexeme {$this->id->getSerialization()} doesn't
have Form " .
+ "{$formId->getSerialization()}. Use hasForm()
to check first"
+ );
+ }
+
+ return $this->forms->getById( $formId );
+ }
+
/**
* @param TermList $representations
* @param ItemId[] $grammaticalFeatures
diff --git a/tests/phpunit/composer/DataModel/LexemeTest.php
b/tests/phpunit/composer/DataModel/LexemeTest.php
index 788f61d..e307407 100644
--- a/tests/phpunit/composer/DataModel/LexemeTest.php
+++ b/tests/phpunit/composer/DataModel/LexemeTest.php
@@ -481,6 +481,31 @@
$this->assertEquals( [], $lexeme->getForms() );
}
+ public function testHasForm_LexemeDoesnHaveForms_ReturnsFalse() {
+ $lexeme = NewLexeme::create()->build();
+
+ $this->assertFalse( $lexeme->hasForm( new FormId( 'F1' ) ) );
+ }
+
+ public function testHasForm_LexemeHaveFormWithThatId_ReturnsTrue() {
+ $lexeme = NewLexeme::havingForm( NewForm::havingId( 'F1' )
)->build();
+
+ $this->assertTrue( $lexeme->hasForm( new FormId( 'F1' ) ) );
+ }
+
+ public function testGetForm_LexemeHaveFormWithThatId_ReturnsThatForm() {
+ $lexeme = NewLexeme::havingForm( NewForm::havingId( 'F1' )
)->build();
+
+ $this->assertInstanceOf( Form::class, $lexeme->getForm( new
FormId( 'F1' ) ) );
+ }
+
+ public function
testGetForm_LexemeDoesntHaveFormWithThatId_ThrowsAnException() {
+ $lexeme = NewLexeme::havingId( 'L1' )->build();
+
+ $this->setExpectedException( \OutOfRangeException::class );
+ $lexeme->getForm( new FormId( 'F1' ) );
+ }
+
public function
testPatch_IncreaseNextFormIdTo_GivenLexemWithGreaterId_Increases() {
$lexemeWithoutForm = NewLexeme::create()->build();
$this->assertEquals( 1, $lexemeWithoutForm->getNextFormId() );
--
To view, visit https://gerrit.wikimedia.org/r/378409
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0bfbcd4cf0692ce61670c18bb75b6c30e5d1dd84
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Aleksey Bekh-Ivanov (WMDE)
Gerrit-Reviewer: WMDE-leszek
Gerrit-Reviewer: Zoranzoki21
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: family.py: Simplify category_redirects method
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378654 )
Change subject: family.py: Simplify category_redirects method
..
family.py: Simplify category_redirects method
_get_cr_templates always sets a value for _catredirtemplates[code], therefore
checking for `if code in self._catredirtemplates` is not necessary and the
KeyError will never be raised.
Change-Id: Id94bf466063a58bf6311e6a84128f854d09c19d1
---
M pywikibot/family.py
1 file changed, 1 insertion(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/pywikibot/family.py b/pywikibot/family.py
index 4f3bd43..b708069 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -1005,11 +1005,7 @@
if not hasattr(self, "_catredirtemplates") or \
code not in self._catredirtemplates:
self._get_cr_templates(code, fallback)
-if code in self._catredirtemplates:
-return self._catredirtemplates[code]
-else:
-raise KeyError("ERROR: title for category redirect template in "
- "language '%s' unknown" % code)
+return self._catredirtemplates[code]
def _get_cr_templates(self, code, fallback):
"""Build list of category redirect templates."""
--
To view, visit https://gerrit.wikimedia.org/r/378654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id94bf466063a58bf6311e6a84128f854d09c19d1
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Magul
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] operations/mediawiki-config[master]: Re-enable EtcdConfig in beta cluster
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375108 )
Change subject: Re-enable EtcdConfig in beta cluster
..
Re-enable EtcdConfig in beta cluster
Use a single EtcdConfig object, with slashes in key names
This reverts commit b729a21a710dfb82befc364cfaa2ee3b79a398af.
Bug: T156924
Depends-On: Ica0914e61baba9c0462481925be15d79b66dc342
Change-Id: I36d43b534c6c872566fa2a6aa06508b7d6a0b077
---
M wmf-config/CommonSettings.php
A wmf-config/etcd.php
2 files changed, 42 insertions(+), 3 deletions(-)
Approvals:
Tim Starling: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f497107..2eefae1 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -107,9 +107,13 @@
# Shorthand when we have no master-slave situation to keep into account
$wmfLocalServices = $wmfAllServices[$wmfDatacenter];
-# Master datacenter
-# The datacenter from which we serve traffic.
-$wmfMasterDatacenter = 'eqiad';
+# Labs-only for testing, eventually etcd.php will be used in production as well
+if ( $wmfRealm === 'labs' ) {
+ # Get configuration from etcd. This gives us the correct
$wmfMasterDatacenter
+ require "$wmfConfigDir/etcd.php";
+} else {
+ $wmfMasterDatacenter = 'eqiad';
+}
$wmfMasterServices = $wmfAllServices[$wmfMasterDatacenter];
diff --git a/wmf-config/etcd.php b/wmf-config/etcd.php
new file mode 100644
index 000..5a9e136
--- /dev/null
+++ b/wmf-config/etcd.php
@@ -0,0 +1,35 @@
+ $wmfLocalServices['etcd'],
+ 'protocol' => 'https',
+ 'directory' => "conftool/v1/mediawiki-config",
+ 'cache' => $localCache,
+ ] );
+
+ # Read only mode
+ $wgReadOnly = $etcdConfig->get( "$wmfDatacenter/ReadOnly" );
+
+ # Master datacenter
+ # The datacenter from which we serve traffic.
+ $wmfMasterDatacenter = $etcdConfig->get( 'common/WMFMasterDatacenter' );
+}
+
+wmfSetupEtcd();
--
To view, visit https://gerrit.wikimedia.org/r/375108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I36d43b534c6c872566fa2a6aa06508b7d6a0b077
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Tim Starling
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Tim Starling
Gerrit-Reviewer: Urbanecm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: family.py: Simplify category_redirects method
Dalba has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378654 )
Change subject: family.py: Simplify category_redirects method
..
family.py: Simplify category_redirects method
_get_cr_templates always sets a value for _catredirtemplates[code], therefore
checking for `if code in self._catredirtemplates` is not necessary and the
KeyError will never be raised.
Change-Id: Id94bf466063a58bf6311e6a84128f854d09c19d1
---
M pywikibot/family.py
1 file changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/54/378654/1
diff --git a/pywikibot/family.py b/pywikibot/family.py
index 4f3bd43..b708069 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -1005,11 +1005,7 @@
if not hasattr(self, "_catredirtemplates") or \
code not in self._catredirtemplates:
self._get_cr_templates(code, fallback)
-if code in self._catredirtemplates:
-return self._catredirtemplates[code]
-else:
-raise KeyError("ERROR: title for category redirect template in "
- "language '%s' unknown" % code)
+return self._catredirtemplates[code]
def _get_cr_templates(self, code, fallback):
"""Build list of category redirect templates."""
--
To view, visit https://gerrit.wikimedia.org/r/378654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id94bf466063a58bf6311e6a84128f854d09c19d1
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix] rewrite family._get_cr_templates()
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/373849 )
Change subject: [bugfix] rewrite family._get_cr_templates()
..
[bugfix] rewrite family._get_cr_templates()
- category_redirect_templates is a tuple, not a list
- retrieve backlinks of all category redirect templates not for the first
item only
- use fallback if fallback is given and key found in template tuple
- keep list order for the given tuple and append the backlinks
Bug: T174041
Change-Id: I596aee7b8934c8aa022cca56679c336c098f5b5b
---
M pywikibot/family.py
1 file changed, 15 insertions(+), 13 deletions(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/family.py b/pywikibot/family.py
index 9c94c1b..4f3bd43 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -1016,23 +1016,25 @@
if not hasattr(self, "_catredirtemplates"):
self._catredirtemplates = {}
if code in self.category_redirect_templates:
-cr_template_list = self.category_redirect_templates[code]
-cr_list = list(self.category_redirect_templates[code])
+cr_template_tuple = self.category_redirect_templates[code]
+elif fallback and fallback in self.category_redirect_templates:
+cr_template_tuple = self.category_redirect_templates[fallback]
else:
-cr_template_list = self.category_redirect_templates[fallback]
-cr_list = []
-if cr_template_list:
-cr_template = cr_template_list[0]
-# start with list of category redirect templates from family file
-cr_page = pywikibot.Page(pywikibot.Site(code, self),
- "Template:" + cr_template)
+self._catredirtemplates[code] = []
+return
+cr_set = set()
+site = pywikibot.Site(code, self)
+tpl_ns = site.namespaces.TEMPLATE
+for cr_template in cr_template_tuple:
+cr_page = pywikibot.Page(site, cr_template, ns=tpl_ns)
# retrieve all redirects to primary template from API,
# add any that are not already on the list
-for t in cr_page.backlinks(filterRedirects=True, namespaces=10):
+for t in cr_page.backlinks(filterRedirects=True,
+ namespaces=tpl_ns):
newtitle = t.title(withNamespace=False)
-if newtitle not in cr_list:
-cr_list.append(newtitle)
-self._catredirtemplates[code] = cr_list
+if newtitle not in cr_template_tuple:
+cr_set.add(newtitle)
+self._catredirtemplates[code] = list(cr_template_tuple) + list(cr_set)
@deprecated('site.category_redirects()')
def get_cr_templates(self, code, fallback):
--
To view, visit https://gerrit.wikimedia.org/r/373849
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I596aee7b8934c8aa022cca56679c336c098f5b5b
Gerrit-PatchSet: 5
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt
Gerrit-Reviewer: Dalba
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Magul
Gerrit-Reviewer: Russell Blau
Gerrit-Reviewer: Strainu
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] operations/puppet[production]: firstboot: Fix force puppet run after ensure NFS mounts avai...
Madhuvishy has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378653 )
Change subject: firstboot: Fix force puppet run after ensure NFS mounts
available
..
firstboot: Fix force puppet run after ensure NFS mounts available
Successful puppet runs don't exit with code 0 so my previous
`&& puppet agent -tv && break` logic doesn't work. Changing to
just run puppet outside the until block
Bug: T171508
Change-Id: Ie2f88d5c315aa73f09c9ba1cfd91c8be2dd6527e
---
M modules/labs_bootstrapvz/files/firstboot.sh
M modules/labs_vmbuilder/files/firstboot.sh
2 files changed, 12 insertions(+), 2 deletions(-)
Approvals:
Madhuvishy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/labs_bootstrapvz/files/firstboot.sh
b/modules/labs_bootstrapvz/files/firstboot.sh
index c6585ad..a7991e9 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -198,10 +198,15 @@
echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >>
/etc/nologin
((mount_attempts++))
-/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && puppet
agent -t && break
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
# Sleep for 10s before next attempt
sleep 10
done
+# Run puppet again post mounting NFS mounts (if all the mounts hadn't been
mounted
+# before, the puppet code that ensures the symlinks are created, etc may not
+# have run)
+puppet agent -t
+
# Remove the non-root login restriction
rm /etc/nologin
diff --git a/modules/labs_vmbuilder/files/firstboot.sh
b/modules/labs_vmbuilder/files/firstboot.sh
index 8ba4619..3bfa32f 100644
--- a/modules/labs_vmbuilder/files/firstboot.sh
+++ b/modules/labs_vmbuilder/files/firstboot.sh
@@ -131,10 +131,15 @@
echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >>
/etc/nologin
((mount_attempts++))
-/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && puppet
agent -t && break
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
# Sleep for 10s before next attempt
sleep 10
done
+# Run puppet again post mounting NFS mounts (if all the mounts hadn't been
mounted
+# before, the puppet code that ensures the symlinks are created, etc may not
+# have run)
+puppet agent -t
+
# Remove the non-root login restriction
rm /etc/nologin
--
To view, visit https://gerrit.wikimedia.org/r/378653
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2f88d5c315aa73f09c9ba1cfd91c8be2dd6527e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy
Gerrit-Reviewer: Madhuvishy
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]: firstboot: Fix force puppet run after ensure NFS mounts avai...
Madhuvishy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378653 )
Change subject: firstboot: Fix force puppet run after ensure NFS mounts
available
..
firstboot: Fix force puppet run after ensure NFS mounts available
Successful puppet runs don't exit with code 0 so my previous
`&& puppet agent -tv && break` logic doesn't work. Changing to
just run puppet outside the while block
Bug: T171508
Change-Id: Ie2f88d5c315aa73f09c9ba1cfd91c8be2dd6527e
---
M modules/labs_bootstrapvz/files/firstboot.sh
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/378653/1
diff --git a/modules/labs_bootstrapvz/files/firstboot.sh
b/modules/labs_bootstrapvz/files/firstboot.sh
index c6585ad..a7991e9 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -198,10 +198,15 @@
echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >>
/etc/nologin
((mount_attempts++))
-/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && puppet
agent -t && break
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
# Sleep for 10s before next attempt
sleep 10
done
+# Run puppet again post mounting NFS mounts (if all the mounts hadn't been
mounted
+# before, the puppet code that ensures the symlinks are created, etc may not
+# have run)
+puppet agent -t
+
# Remove the non-root login restriction
rm /etc/nologin
--
To view, visit https://gerrit.wikimedia.org/r/378653
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2f88d5c315aa73f09c9ba1cfd91c8be2dd6527e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [WIP] Do not merge
Huji has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378652 ) Change subject: [WIP] Do not merge .. [WIP] Do not merge PaswordResetTest::testExecute_email should pass a mock user as the target of password reset. Bug: T176102 Change-Id: Id7403f57cc9d751ada85b611193c1d8f3503e713 --- M tests/phpunit/includes/user/PasswordResetTest.php 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/52/378652/1 diff --git a/tests/phpunit/includes/user/PasswordResetTest.php b/tests/phpunit/includes/user/PasswordResetTest.php index 53f02df..fb01aa6 100644 --- a/tests/phpunit/includes/user/PasswordResetTest.php +++ b/tests/phpunit/includes/user/PasswordResetTest.php @@ -180,7 +180,10 @@ $status = $passwordReset->isAllowed( $performingUser ); $this->assertTrue( $status->isGood() ); - $status = $passwordReset->execute( $performingUser, null, 'f...@bar.baz' ); + $status = $passwordReset->execute( + $performingUser, + $targetUser2->getName(), + 'f...@bar.baz' ); $this->assertTrue( $status->isGood() ); } } -- To view, visit https://gerrit.wikimedia.org/r/378652 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id7403f57cc9d751ada85b611193c1d8f3503e713 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Huji ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Return description fields for unprefixed image cache rows
Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378651 )
Change subject: Return description fields for unprefixed image cache rows
..
Return description fields for unprefixed image cache rows
Bug: T175444
Change-Id: I5560187d3850253095b695dc7a3cfc954fba9318
---
M includes/filerepo/file/LocalFile.php
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/51/378651/1
diff --git a/includes/filerepo/file/LocalFile.php
b/includes/filerepo/file/LocalFile.php
index 96e7a7e..ef4e019 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -351,9 +351,8 @@
static $results = [];
if ( $prefix == '' ) {
- return $fields;
+ return $fields + CommentStore::newKey( "description"
)->getFields();
}
-
if ( !isset( $results[$prefix] ) ) {
$prefixedFields = [];
foreach ( $fields as $field ) {
--
To view, visit https://gerrit.wikimedia.org/r/378651
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5560187d3850253095b695dc7a3cfc954fba9318
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[master]: Only intercept users who can potentially create articles oth...
Kaldari has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378650 )
Change subject: Only intercept users who can potentially create articles
otherwise
..
Only intercept users who can potentially create articles otherwise
Bug: T176100
Change-Id: I917b47531fb0cfdf6f55bccaec762b8362be56a1
---
M includes/Hooks.php
M includes/Workflow.php
2 files changed, 6 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleCreationWorkflow
refs/changes/50/378650/1
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 22d131f..d9f79fa 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -56,9 +56,7 @@
->makeConfig( 'ArticleCreationWorkflow' );
$workflow = new Workflow( $config );
$user = $article->getContext()->getUser();
- if ( $workflow->shouldInterceptEditPage( $article, $user ) &&
- !$user->isAnon()
- ) {
+ if ( $workflow->shouldInterceptEditPage( $article, $user ) ) {
$title = $article->getTitle();
// If the landing page didn't exist, we wouldn't have
intercepted.
$redirTo = $workflow->getLandingPageTitle();
diff --git a/includes/Workflow.php b/includes/Workflow.php
index 8246486..b5b458f 100644
--- a/includes/Workflow.php
+++ b/includes/Workflow.php
@@ -49,6 +49,11 @@
return false;
}
+ // Only intercept users who can potentially create articles
otherwise
+ if ( !$user->isAllowed( 'createpage' ) ) {
+ return false;
+ }
+
// Don't intercept if the landing page is not configured
$landingPage = $this->getLandingPageTitle();
if ( $landingPage === null || !$landingPage->exists() ) {
--
To view, visit https://gerrit.wikimedia.org/r/378650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I917b47531fb0cfdf6f55bccaec762b8362be56a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
Gerrit-Branch: master
Gerrit-Owner: Kaldari
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: WikimediaUI theme: Remove duplicated variable
VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378649 ) Change subject: WikimediaUI theme: Remove duplicated variable .. WikimediaUI theme: Remove duplicated variable Change-Id: I6c0a3cf9df0c949d43045b3880e7333821d351f7 --- M src/themes/wikimediaui/common.less 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/49/378649/1 diff --git a/src/themes/wikimediaui/common.less b/src/themes/wikimediaui/common.less index baba4bb..61fe16f 100644 --- a/src/themes/wikimediaui/common.less +++ b/src/themes/wikimediaui/common.less @@ -120,7 +120,6 @@ @padding-horizontal-base: 12 / @oo-ui-font-size-browser / @oo-ui-font-size-base; // equals `0.9375em`≈`12px` @padding-horizontal-frameless: 4 / @oo-ui-font-size-browser / @oo-ui-font-size-base; // equals `0.3125em`≈`4px` @padding-horizontal-input-text: 8 / @oo-ui-font-size-browser / @oo-ui-font-size-base; -@padding-horizontal-frameless: 4 / @oo-ui-font-size-browser / @oo-ui-font-size-base; @padding-horizontal-taboption: 13 / @oo-ui-font-size-browser / @oo-ui-font-size-base; // equals `0.9375em`≈`13px`; @padding-horizontal-base = @border-width-base @padding-horizontal-tagitem: 4 / @oo-ui-font-size-browser / @oo-ui-font-size-base; @padding-vertical-label: 4 / @oo-ui-font-size-browser / @oo-ui-font-size-base; -- To view, visit https://gerrit.wikimedia.org/r/378649 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c0a3cf9df0c949d43045b3880e7333821d351f7 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerE ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] marvin[master]: Chore: upgrade development dependencies
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378648 )
Change subject: Chore: upgrade development dependencies
..
Chore: upgrade development dependencies
- Mocha v3.5.3 and definitions to v2.2.43:
https://github.com/mochajs/mocha/blob/4727367/CHANGELOG.md#351--2017-09-09
https://github.com/mochajs/mocha/blob/4727367/CHANGELOG.md#352--2017-09-10
https://github.com/mochajs/mocha/blob/4727367/CHANGELOG.md#353--2017-09-11
- Nodemon v1.12.1
- npm-run-all v4.1.1
New `--aggregate-output` option.
https://github.com/mysticatea/npm-run-all/releases/tag/v4.1.0
https://github.com/mysticatea/npm-run-all/releases/tag/v4.1.1
Change-Id: Ia57eeb87dba7e88f8e6a960944cb323fbaf67dc5
---
M package-lock.json
M package.json
2 files changed, 358 insertions(+), 188 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/48/378648/1
diff --git a/package-lock.json b/package-lock.json
index 46e8921..56fd3a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -54,9 +54,9 @@
"dev": true
},
"@types/mocha": {
- "version": "2.2.41",
- "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.41.tgz";,
- "integrity": "sha1-4nzwgXFT658nE7LT9saPHhw8pgg=",
+ "version": "2.2.43",
+ "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.43.tgz";,
+ "integrity":
"sha512-xNlAmH+lRJdUMXClMTI9Y0pRqIojdxfm7DHsIxoB2iTzu3fnPmSMEN8SsSx0cdwV36d02PWCWaDUoZPDSln+xw==",
"dev": true
},
"@types/node": {
@@ -205,6 +205,15 @@
"resolved":
"https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz";,
"integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
"dev": true
+},
+"ansi-align": {
+ "version": "2.0.0",
+ "resolved":
"https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz";,
+ "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
+ "dev": true,
+ "requires": {
+"string-width": "2.1.1"
+ }
},
"ansi-escapes": {
"version": "2.0.0",
@@ -466,6 +475,64 @@
}
}
},
+"boxen": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.2.1.tgz";,
+ "integrity": "sha1-DxHn/jRO25OXl3/BPt5/ZNlWSB0=",
+ "dev": true,
+ "requires": {
+"ansi-align": "2.0.0",
+"camelcase": "4.1.0",
+"chalk": "2.1.0",
+"cli-boxes": "1.0.0",
+"string-width": "2.1.1",
+"term-size": "1.2.0",
+"widest-line": "1.0.0"
+ },
+ "dependencies": {
+"ansi-styles": {
+ "version": "3.2.0",
+ "resolved":
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz";,
+ "integrity":
"sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+ "dev": true,
+ "requires": {
+"color-convert": "1.9.0"
+ }
+},
+"camelcase": {
+ "version": "4.1.0",
+ "resolved":
"https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";,
+ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+ "dev": true
+},
+"chalk": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz";,
+ "integrity":
"sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+ "dev": true,
+ "requires": {
+"ansi-styles": "3.2.0",
+"escape-string-regexp": "1.0.5",
+"supports-color": "4.4.0"
+ }
+},
+"has-flag": {
+ "version": "2.0.0",
+ "resolved":
"https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz";,
+ "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+ "dev": true
+},
+"supports-color": {
+ "version": "4.4.0",
+ "resolved":
"https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz";,
+ "integrity":
"sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+ "dev": true,
+ "requires": {
+"has-flag": "2.0.0"
+ }
+}
+ }
+},
"brace-expansion": {
"version": "1.1.8",
"resolved":
"https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz";,
@@ -667,6 +734,12 @@
"integrity": "sha1-3bPIheiMr3eccIDuCWU/uF0b0ks=",
"dev": true
},
+"capture-stack-trace": {
+ "version": "1.0.0",
+ "resolved":
"https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz";,
+ "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=",
+ "dev": true
+},
"center-align": {
"version": "0.1.3",
"resolved":
"https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
[MediaWiki-commits] [Gerrit] marvin[master]: Chore: upgrade Webpack and dependencies
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378645 )
Change subject: Chore: upgrade Webpack and dependencies
..
Chore: upgrade Webpack and dependencies
- Webpack v3.6.0
Folder entry names are now understood (with corresponding update to
Marvin's configuration).
https://github.com/webpack/webpack/releases/tag/v3.5.6
https://github.com/webpack/webpack/releases/tag/v3.6.0
- TypeScript Loader for Webpack v2.3.7
The `configFile` option replaces `configFileName` but this doesn't
seem applicable to Marvin.
https://github.com/TypeStrong/ts-loader/releases/tag/v2.3.3
https://github.com/TypeStrong/ts-loader/releases/tag/v2.3.4
https://github.com/TypeStrong/ts-loader/releases/tag/v2.3.5
https://github.com/TypeStrong/ts-loader/releases/tag/v2.3.6
https://github.com/TypeStrong/ts-loader/releases/tag/v2.3.7
- CSS Loader v0.28.7
https://github.com/webpack-contrib/css-loader/releases/tag/v0.28.6
https://github.com/webpack-contrib/css-loader/releases/tag/v0.28.7
- webpack-dev-server v2.8.2
Print Webpack progress to browser console (added to Marvin's verbose
configuration although it's too quick to see at the moment).
https://github.com/webpack/webpack-dev-server/releases/tag/v2.8.0
https://github.com/webpack/webpack-dev-server/releases/tag/v2.8.1
https://github.com/webpack/webpack-dev-server/releases/tag/v2.8.2
Change-Id: I553ee30d5cdd115af2539736afc0a94236e35361
---
M package-lock.json
M package.json
M webpack.config.ts
3 files changed, 269 insertions(+), 359 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/45/378645/1
diff --git a/package-lock.json b/package-lock.json
index 8bb9aa1..3ef44f5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -281,16 +281,20 @@
"integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw=",
"dev": true
},
-"array-find-index": {
- "version": "1.0.2",
- "resolved":
"https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz";,
- "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
- "dev": true
-},
"array-flatten": {
"version": "1.1.1",
"resolved":
"https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz";,
"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+},
+"array-includes": {
+ "version": "3.0.3",
+ "resolved":
"https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz";,
+ "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
+ "dev": true,
+ "requires": {
+"define-properties": "1.1.2",
+"es-abstract": "1.8.0"
+ }
},
"array-map": {
"version": "0.0.0",
@@ -386,7 +390,7 @@
"dev": true,
"requires": {
"browserslist": "1.7.7",
-"caniuse-db": "1.0.3715",
+"caniuse-db": "1.0.3732",
"normalize-range": "0.1.2",
"num2fraction": "1.2.2",
"postcss": "5.2.17",
@@ -504,16 +508,17 @@
"dev": true
},
"browserify-aes": {
- "version": "1.0.6",
- "resolved":
"https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz";,
- "integrity": "sha1-Xncl297x/Vkw1OurSFZ85FHEigo=",
+ "version": "1.0.8",
+ "resolved":
"https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.8.tgz";,
+ "integrity":
"sha512-WYCMOT/PtGTlpOKFht0YJFYcPy6pLCR98CtWfzK13zoynLlBMvAdEMSRGmgnJCw2M2j/5qxBkinZQFobieM8dQ==",
"dev": true,
"requires": {
"buffer-xor": "1.0.3",
"cipher-base": "1.0.4",
"create-hash": "1.1.3",
-"evp_bytestokey": "1.0.0",
-"inherits": "2.0.3"
+"evp_bytestokey": "1.0.3",
+"inherits": "2.0.3",
+"safe-buffer": "5.1.1"
}
},
"browserify-cipher": {
@@ -522,9 +527,9 @@
"integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
"dev": true,
"requires": {
-"browserify-aes": "1.0.6",
+"browserify-aes": "1.0.8",
"browserify-des": "1.0.0",
-"evp_bytestokey": "1.0.0"
+"evp_bytestokey": "1.0.3"
}
},
"browserify-des": {
@@ -578,8 +583,8 @@
"integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
"dev": true,
"requires": {
-"caniuse-db": "1.0.3715",
-"electron-to-chromium": "1.3.18"
+"caniuse-db": "1.0.3732",
+"electron-to-chromium": "1.3.21"
}
},
"buffer": {
@@ -594,9 +599,9 @@
}
},
"buffer-indexof": {
- "version": "1.1.0",
- "resolved":
"https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.0.tgz";,
- "integrity": "sha1-9U9kfE9OJSKLqmVqLlfkPV8nCYI=",
+ "version": "1.1.1",
+ "resolved":
"https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz";,
+ "integrity":
"sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8W
[MediaWiki-commits] [Gerrit] marvin[master]: PoC: Chore: enable Preact debug mode and DevTools integration
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378647 )
Change subject: PoC: Chore: enable Preact debug mode and DevTools integration
..
PoC: Chore: enable Preact debug mode and DevTools integration
For development builds, enable Preact debug mode, Chrome DevTools
integration, and runtime error checking.
https://github.com/developit/preact#debug-mode
https://github.com/facebook/react-devtools
Change-Id: I47c735a943a2c09fd7d61bb344253bcfa2acc8f5
---
M webpack.config.ts
1 file changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/47/378647/1
diff --git a/webpack.config.ts b/webpack.config.ts
index cba8a68..305c042 100644
--- a/webpack.config.ts
+++ b/webpack.config.ts
@@ -33,6 +33,8 @@
warnings: true
};
+const PREACT = PRODUCTION ? "preact" : "preact/debug";
+
const configuration: webpack.Configuration = {
// Bundled outputs and their source inputs. For each entry, the source input
// and any dependencies are compiled together into one chunk file output
@@ -60,7 +62,7 @@
// Client package dependencies (these should be a subset of package.json's
// `dependencies`). This chunk changes when one of the specified
// dependencies changes.
-vendor: ["history", "isomorphic-unfetch", "path-to-regexp", "preact"]
+vendor: ["history", "isomorphic-unfetch", "path-to-regexp", PREACT]
},
stats: STATS,
@@ -181,6 +183,12 @@
// See also
//
https://medium.com/webpack/predictable-long-term-caching-with-webpack-d3eee1d3fa31.
configuration.plugins = [
+ new webpack.DefinePlugin({
+"process.env": {
+ NODE_ENV: JSON.stringify(PRODUCTION ? "production" : "development")
+}
+ }),
+
// Reference modules by name instead of by chunk ID so hashes don't change
// when new files are added. For example,
// `"./node_modules/preact/dist/preact.esm.js"` instead of `18`.
--
To view, visit https://gerrit.wikimedia.org/r/378647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I47c735a943a2c09fd7d61bb344253bcfa2acc8f5
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski
Gerrit-Reviewer: Sniedzielski
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] marvin[master]: Chore: upgrade TypeScript to v2.5.2
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378643 )
Change subject: Chore: upgrade TypeScript to v2.5.2
..
Chore: upgrade TypeScript to v2.5.2
- Optional catch clause variables.
- Type assertion / cast syntax in checkJs / @ts-check mode:
"TypeScript 2.5 introduces the ability to assert the type of
expressions when using plain JavaScript in your projects. The syntax
is an /** @type {...} */ annotation comment followed by a
parenthesized expression whose type needs to be re-evaluated. For
example:
var x = /** @type {SomeType} */ (AnyParenthesizedExpression);
https://github.com/Microsoft/TypeScript/wiki/What's-new-in-TypeScript#typescript-25
Change-Id: I3327027113d936d4c7cc4ab924e4d2b6a71df61f
---
M package-lock.json
M package.json
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/43/378643/1
diff --git a/package-lock.json b/package-lock.json
index e2e3390..d76959c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6243,9 +6243,9 @@
"dev": true
},
"typescript": {
- "version": "2.4.2",
- "resolved":
"https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz";,
- "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=",
+ "version": "2.5.2",
+ "resolved":
"https://registry.npmjs.org/typescript/-/typescript-2.5.2.tgz";,
+ "integrity": "sha1-A4qV99m7tCCxvzW6MdTFwd0//jQ=",
"dev": true
},
"typescript-eslint-parser": {
diff --git a/package.json b/package.json
index 7823624..67876e5 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
"touch": "^3.1.0",
"ts-loader": "^2.3.2",
"ts-node": "^3.3.0",
-"typescript": "^2.4.2",
+"typescript": "^2.5.2",
"typescript-eslint-parser": "^5.0.1",
"webpack": "^3.4.1",
"webpack-dev-server": "^2.7.1",
--
To view, visit https://gerrit.wikimedia.org/r/378643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3327027113d936d4c7cc4ab924e4d2b6a71df61f
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski
Gerrit-Reviewer: Sniedzielski
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] marvin[master]: Chore: upgrade lint and styling dependencies for TypeScript ...
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378644 )
Change subject: Chore: upgrade lint and styling dependencies for TypeScript
v2.5.0
..
Chore: upgrade lint and styling dependencies for TypeScript v2.5.0
- typescript-eslint-parser v8.0.0
Support TypeScript v2.5.0.
https://github.com/eslint/typescript-eslint-parser/releases/tag/v6.0.0
https://github.com/eslint/typescript-eslint-parser/releases/tag/v6.0.1
https://github.com/eslint/typescript-eslint-parser/releases/tag/v7.0.0
https://github.com/eslint/typescript-eslint-parser/releases/tag/v8.0.0
- ESLint v4.7.0
(Many improvements as usual.)
https://github.com/eslint/eslint/releases/tag/v4.5.0
https://github.com/eslint/eslint/releases/tag/v4.6.0
https://github.com/eslint/eslint/releases/tag/v4.6.1
https://github.com/eslint/eslint/releases/tag/v4.7.0
- eslint-config-prettier v2.5.0
https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md#version-240-2017-09-02
https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md#version-250-2017-09-16
- eslint-config-wikimedia v0.5.0
Note: `ecmaVersion` is already specified by Marvin.
https://github.com/wikimedia/eslint-config-wikimedia/blob/master/CHANGELOG.md#050--2017-08-15
Change-Id: I0775ee4eaf00700eea36819a99a239ffcd74
---
M package-lock.json
M package.json
2 files changed, 101 insertions(+), 49 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/44/378644/1
diff --git a/package-lock.json b/package-lock.json
index d76959c..8bb9aa1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1621,20 +1621,20 @@
}
},
"eslint": {
- "version": "4.4.1",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.4.1.tgz";,
- "integrity": "sha1-mc1+r8/8ov+Zpcj18qR01jZLS9M=",
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.7.0.tgz";,
+ "integrity": "sha1-01/AfEclIL496Fs9oR6ZxXav1RU=",
"dev": true,
"requires": {
"ajv": "5.2.2",
"babel-code-frame": "6.26.0",
-"chalk": "1.1.3",
+"chalk": "2.1.0",
"concat-stream": "1.6.0",
"cross-spawn": "5.1.0",
-"debug": "2.6.8",
+"debug": "3.0.1",
"doctrine": "2.0.0",
"eslint-scope": "3.7.1",
-"espree": "3.5.0",
+"espree": "3.5.1",
"esquery": "1.0.0",
"estraverse": "4.2.0",
"esutils": "2.0.2",
@@ -1646,7 +1646,7 @@
"imurmurhash": "0.1.4",
"inquirer": "3.2.2",
"is-resolvable": "1.0.0",
-"js-yaml": "3.9.1",
+"js-yaml": "3.10.0",
"json-stable-stringify": "1.0.1",
"levn": "0.3.0",
"lodash": "4.17.4",
@@ -1655,29 +1655,105 @@
"natural-compare": "1.4.0",
"optionator": "0.8.2",
"path-is-inside": "1.0.2",
-"pluralize": "4.0.0",
+"pluralize": "7.0.0",
"progress": "2.0.0",
"require-uncached": "1.0.3",
"semver": "5.4.1",
+"strip-ansi": "4.0.0",
"strip-json-comments": "2.0.1",
"table": "4.0.1",
"text-table": "0.2.0"
},
"dependencies": {
+"ansi-regex": {
+ "version": "3.0.0",
+ "resolved":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz";,
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
+},
+"ansi-styles": {
+ "version": "3.2.0",
+ "resolved":
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz";,
+ "integrity":
"sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+ "dev": true,
+ "requires": {
+"color-convert": "1.9.0"
+ }
+},
+"chalk": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz";,
+ "integrity":
"sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+ "dev": true,
+ "requires": {
+"ansi-styles": "3.2.0",
+"escape-string-regexp": "1.0.5",
+"supports-color": "4.4.0"
+ }
+},
+"debug": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.0.1.tgz";,
+ "integrity":
"sha512-6nVc6S36qbt/mutyt+UGMnawAMrPDZUPQjRZI3FS9tCtDRhvxJbK79unYBLPi+z5SLXQ3ftoVBFCblQtNSls8w==",
+ "dev": true,
+ "requires": {
+"ms": "2.0.0"
+ }
+},
+"espree": {
+ "version": "3.5.1",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz";,
+ "integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=",
+ "dev": true,
+ "requires": {
+
[MediaWiki-commits] [Gerrit] marvin[master]: Chore: upgrade Preact and runtime type definitions
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378646 )
Change subject: Chore: upgrade Preact and runtime type definitions
..
Chore: upgrade Preact and runtime type definitions
Upgrade Preact to v8.2.5 and runtime dependency TypeScript type
definitions for Express and Node.js.
https://github.com/developit/preact/releases/tag/8.2.2
https://github.com/developit/preact/releases/tag/8.2.3
https://github.com/developit/preact/releases/tag/8.2.4
https://github.com/developit/preact/releases/tag/8.2.5
Change-Id: Ic20055b33619c34c0140ceb2f94673fd312a5c8b
---
M package-lock.json
M package.json
2 files changed, 24 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/46/378646/1
diff --git a/package-lock.json b/package-lock.json
index 3ef44f5..46e8921 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,22 +14,22 @@
}
},
"@types/express": {
- "version": "4.0.36",
- "resolved":
"https://registry.npmjs.org/@types/express/-/express-4.0.36.tgz";,
- "integrity":
"sha512-bT9q2eqH/E72AGBQKT50dh6AXzheTqigGZ1GwDiwmx7vfHff0bZOrvUWjvGpNWPNkRmX1vDF6wonG6rlpBHb1A==",
+ "version": "4.0.37",
+ "resolved":
"https://registry.npmjs.org/@types/express/-/express-4.0.37.tgz";,
+ "integrity":
"sha512-tIULTLzQpFFs5/PKnFIAFOsXQxss76glppbVKR3/jddPK26SBsD5HF5grn5G2jOGtpRWSBvYmDYoduVv+3wOXg==",
"dev": true,
"requires": {
-"@types/express-serve-static-core": "4.0.49",
-"@types/serve-static": "1.7.31"
+"@types/express-serve-static-core": "4.0.52",
+"@types/serve-static": "1.7.32"
}
},
"@types/express-serve-static-core": {
- "version": "4.0.49",
- "resolved":
"https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.0.49.tgz";,
- "integrity":
"sha512-b7mVHoURu1xaP/V6xw1sYwyv9V0EZ7euyi+sdnbnTZxEkAh4/hzPsI6Eflq+ZzHQ/Tgl7l16Jz+0oz8F46MLnA==",
+ "version": "4.0.52",
+ "resolved":
"https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.0.52.tgz";,
+ "integrity":
"sha512-UpN389YLcQEIn1t4Kxc8TlCrg43r6o8IcF57LvmbCGNhWzz0dEg4AaUsN6IHrrSjPzPmmJ1FLYXGPP/expXOWg==",
"dev": true,
"requires": {
-"@types/node": "8.0.24"
+"@types/node": "8.0.28"
}
},
"@types/extract-text-webpack-plugin": {
@@ -60,18 +60,18 @@
"dev": true
},
"@types/node": {
- "version": "8.0.24",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.24.tgz";,
- "integrity":
"sha512-c3Npme+2JGqxW8+B+aXdN5SPIlCf1C8WxQC6Ea39rO/ASPosnMkWVR16mDJtRE+2dr2xwOQ7DiLxb+wO/TWuPg==",
+ "version": "8.0.28",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.28.tgz";,
+ "integrity":
"sha512-HupkFXEv3O3KSzcr3Ylfajg0kaerBg1DyaZzRBBQfrU3NN1mTBRE7sCveqHwXLS5Yrjvww8qFzkzYQQakG9FuQ==",
"dev": true
},
"@types/serve-static": {
- "version": "1.7.31",
- "resolved":
"https://registry.npmjs.org/@types/serve-static/-/serve-static-1.7.31.tgz";,
- "integrity": "sha1-FUVt6NmNa0z/Mb5savdJKuY/Uho=",
+ "version": "1.7.32",
+ "resolved":
"https://registry.npmjs.org/@types/serve-static/-/serve-static-1.7.32.tgz";,
+ "integrity":
"sha512-WpI0g7M1FiOmJ/a97Qrjafq2I938tjAZ3hZr9O7sXyA6oUhH3bqUNZIt7r1KZg8TQAKxcvxt6JjQ5XuLfIBFvg==",
"dev": true,
"requires": {
-"@types/express-serve-static-core": "4.0.49",
+"@types/express-serve-static-core": "4.0.52",
"@types/mime": "1.3.1"
}
},
@@ -93,7 +93,7 @@
"integrity":
"sha512-Bskfd5wztYbQ/mvU4rgHUB3fKcjW2hA6o/F0JN8O+jRPJQDN/2pPV6SmdIiFm2vLyyN/XQzoCULTE05ZOpnNbQ==",
"dev": true,
"requires": {
-"@types/node": "8.0.24"
+"@types/node": "8.0.28"
}
},
"@types/uglify-js": {
@@ -111,7 +111,7 @@
"integrity":
"sha512-xXqusBBKbYb8fA1jtE3iO75uRW1ejqGuH93V+6fhbfNY59ndKjfhftJVxcSaYAMDjmFTRBHy82d+513JKuHD5g==",
"dev": true,
"requires": {
-"@types/node": "8.0.24",
+"@types/node": "8.0.28",
"@types/tapable": "0.2.3",
"@types/uglify-js": "2.6.29"
}
@@ -4929,9 +4929,9 @@
}
},
"preact": {
- "version": "8.2.1",
- "resolved": "https://registry.npmjs.org/preact/-/preact-8.2.1.tgz";,
- "integrity": "sha1-Z0JD3wyEeITQGYNARKovzTEecu0="
+ "version": "8.2.5",
+ "resolved": "https://registry.npmjs.org/preact/-/preact-8.2.5.tgz";,
+ "integrity": "sha1-y/o5YqgBJ2gVn20B1G+cHrMhPAo="
},
"preact-render-to-string": {
"version": "3.6.3",
diff --git a/package.json b/package.json
index 042f9fd..c338547 100644
--- a/package.json
+++ b/package.json
@@ -47,16 +47,16 @@
"express": "^4.15.3",
"isomorphic-unfetch": "^2.0.0",
"path-to-regexp": "^2.0.0",
-
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Run strval() over the File description
Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378642 )
Change subject: Run strval() over the File description
..
Run strval() over the File description
Bug: T176090
Change-Id: I8488666c221a1bd4e4e063291e74819a07a4a20f
---
M includes/export/XmlDumpWriter.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/42/378642/1
diff --git a/includes/export/XmlDumpWriter.php
b/includes/export/XmlDumpWriter.php
index 990f16d..c46eb61 100644
--- a/includes/export/XmlDumpWriter.php
+++ b/includes/export/XmlDumpWriter.php
@@ -403,7 +403,7 @@
if ( $file->isDeleted( File::DELETED_COMMENT ) ) {
$comment = Xml::element( 'comment', [ 'deleted' =>
'deleted' ] );
} else {
- $comment = Xml::elementClean( 'comment', null,
$file->getDescription() );
+ $comment = Xml::elementClean( 'comment', null, strval(
$file->getDescription() ) );
}
return "\n" .
$this->writeTimestamp( $file->getTimestamp() ) .
--
To view, visit https://gerrit.wikimedia.org/r/378642
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8488666c221a1bd4e4e063291e74819a07a4a20f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...heritage[master]: [WIP] Ensure skipped image categorizations are mentioned in ...
Lokal Profil has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378641 )
Change subject: [WIP] Ensure skipped image categorizations are mentioned in
stats
..
[WIP] Ensure skipped image categorizations are mentioned in stats
This is a follow-up to b3c3ab031cc669e2747c110b0f9efc00493b86a9 which
blacklisted some countries from image categorization.
Also restructures how results are passed around, getting rid of some
previous hacks.
WIP because:
* Need to check that this works
Bug: T174871
Change-Id: I9a3cfebcf640da007088554e1de09828b9e76aa1
---
M erfgoedbot/categorize_images.py
1 file changed, 86 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage
refs/changes/41/378641/1
diff --git a/erfgoedbot/categorize_images.py b/erfgoedbot/categorize_images.py
index 1705d56..5ff1768 100644
--- a/erfgoedbot/categorize_images.py
+++ b/erfgoedbot/categorize_images.py
@@ -402,16 +402,20 @@
raise NoCommonsCatFromWikidataItemException(page)
-def processCountry(countrycode, lang, countryconfig, commonsCatTemplates,
conn, cursor, overridecat=None):
-'''
-Work on a single country.
-'''
+def processCountry(countrycode, lang, countryconfig, commonsCatTemplates,
+ conn, cursor, overridecat=None):
+"""Work on a single country."""
if not countryconfig.get('commonsTemplate'):
# No template found, just skip silently.
-basecat = u''
+basecat = None
if countryconfig.get('commonsCategoryBase'):
basecat = countryconfig.get('commonsCategoryBase')
-return (countrycode, lang, basecat, 0, 0, 0)
+return {
+'code': countrycode,
+'lang': lang,
+'cat': basecat,
+'cmt': 'skipped: no template'
+}
if (not commonsCatTemplates):
# No commonsCatTemplates found, just skip.
@@ -427,10 +431,9 @@
commonsTemplate = countryconfig.get('commonsTemplate')
harvest_type = countryconfig.get('type')
-if overridecat:
-commonsCategoryBase = pywikibot.Category(site, "%s:%s" %
(site.namespace(14), overridecat))
-else:
-commonsCategoryBase = pywikibot.Category(site, "%s:%s" %
(site.namespace(14), countryconfig.get('commonsCategoryBase')))
+category_name = overridecat or countryconfig.get('commonsCategoryBase')
+commonsCategoryBase = pywikibot.Category(
+site, "%s:%s" % (site.namespace(14), category_name))
generator = pagegenerators.CategorizedPageGenerator(commonsCategoryBase)
@@ -447,39 +450,76 @@
if success:
categorizedImages += 1
-return (countrycode, lang, commonsCategoryBase.title(withNamespace=False),
commonsTemplate, totalImages, categorizedImages)
+return {
+'code': countrycode,
+'lang': lang,
+'cat': commonsCategoryBase.title(withNamespace=False),
+'template': commonsTemplate,
+'total_images': totalImages,
+'cat_images': categorizedImages
+}
def outputStatistics(statistics):
-'''
-Output the results of the bot as a nice wikitable
-'''
-output = u'{| class="wikitable sortable"\n'
-output += \
-u'! country !! [[:en:List of ISO 639-1 codes|lang]] !! Base category
!! Template !! data-sort-type="number"|Total images !!
data-sort-type="number"|Categorized images !! data-sort-type="number"|Images
left !! data-sort-type="number"|Current image count\n'
+"""Output the results of the bot as a nice wikitable."""
+output = (
+u'{| class="wikitable sortable"\n'
+u'! country '
+u'!! [[:en:List of ISO 639-1 codes|lang]] '
+u'!! Base category '
+u'!! Template '
+u'!! data-sort-type="number"|Total images '
+u'!! data-sort-type="number"|Categorized images '
+u'!! data-sort-type="number"|Images left '
+u'!! data-sort-type="number"|Current image count'
+u'\n')
+
+output_row = (
+u'|-\n'
+u'|| {code} \n'
+u'|| {lang} \n'
+u'|| {cat} \n'
+u'|| {template} \n'
+u'|| {total_images} \n'
+u'|| {cat_images} \n'
+u'|| {leftover} \n'
+u'|| {pages_in_cat} \n')
totalImages = 0
categorizedImages = 0
leftoverImages = 0
for row in statistics:
-output += u'|-\n'
-output += u'|| %s \n' % (row[0],)
-output += u'|| %s \n' % (row[1],)
-output += u'|| [[:Category:%s]] \n' % (row[2],)
-output += u'|| {{tl|%s}} \n' % (row[3],)
-totalImages += row[4]
-output += u'|| %s \n' % (row[4],)
+leftover = '---'
+cat_link = '---'
+pages_in_cat = '---'
+template_link = '---'
+total_images = row.get('total_images') or '---'
+cat_images_or_cmt = row.get('cat_images') or row.get('cmt')
-categorizedImages += row[5
[MediaWiki-commits] [Gerrit] mediawiki...GlobalUserPage[master]: Use MediaWikiServices to get DBLoadBalancerFactory instead o...
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378640 )
Change subject: Use MediaWikiServices to get DBLoadBalancerFactory instead of
wfGetLB
..
Use MediaWikiServices to get DBLoadBalancerFactory instead of wfGetLB
wfGetLB has been deprecated since 1.27.
Change-Id: I8ef50e410520c2f08252c17e067d1b88146460d1
---
M GlobalUserPage.body.php
M extension.json
2 files changed, 7 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUserPage
refs/changes/40/378640/1
diff --git a/GlobalUserPage.body.php b/GlobalUserPage.body.php
index 18778b0..c491342 100644
--- a/GlobalUserPage.body.php
+++ b/GlobalUserPage.body.php
@@ -1,5 +1,7 @@
getConnectionRef( DB_REPLICA, [],
$wgGlobalUserPageDBname );
+ $factory =
MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+ $mainLB = $factory->getMainLB( $wgGlobalUserPageDBname );
+
+ $dbr = $mainLB->getConnectionRef( DB_REPLICA, [],
$wgGlobalUserPageDBname );
$row = $dbr->selectRow(
[ 'page', 'page_props' ],
[ 'page_touched', 'pp_propname' ],
diff --git a/extension.json b/extension.json
index 8e55626..627f8ac 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "GlobalUserPage",
- "version": "0.11.0",
+ "version": "0.11.1",
"author": [
"Kunal Mehta",
"Jack Phoenix"
--
To view, visit https://gerrit.wikimedia.org/r/378640
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ef50e410520c2f08252c17e067d1b88146460d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalUserPage
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: firstboot: Force puppet run after ensure NFS mounts available
Madhuvishy has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378639 )
Change subject: firstboot: Force puppet run after ensure NFS mounts available
..
firstboot: Force puppet run after ensure NFS mounts available
Bug: T171508
Change-Id: I98914cfb79ede672649c3d2cc7b692a87ccc7d52
---
M modules/labs_bootstrapvz/files/firstboot.sh
M modules/labs_vmbuilder/files/firstboot.sh
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Madhuvishy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/labs_bootstrapvz/files/firstboot.sh
b/modules/labs_bootstrapvz/files/firstboot.sh
index 0388041..c6585ad 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -198,7 +198,7 @@
echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >>
/etc/nologin
((mount_attempts++))
-/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && puppet
agent -t && break
# Sleep for 10s before next attempt
sleep 10
done
diff --git a/modules/labs_vmbuilder/files/firstboot.sh
b/modules/labs_vmbuilder/files/firstboot.sh
index dcd1784..8ba4619 100644
--- a/modules/labs_vmbuilder/files/firstboot.sh
+++ b/modules/labs_vmbuilder/files/firstboot.sh
@@ -131,7 +131,7 @@
echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >>
/etc/nologin
((mount_attempts++))
-/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && puppet
agent -t && break
# Sleep for 10s before next attempt
sleep 10
done
--
To view, visit https://gerrit.wikimedia.org/r/378639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I98914cfb79ede672649c3d2cc7b692a87ccc7d52
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy
Gerrit-Reviewer: Madhuvishy
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]: firstboot: Force puppet run after ensure NFS mounts available
Madhuvishy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378639 )
Change subject: firstboot: Force puppet run after ensure NFS mounts available
..
firstboot: Force puppet run after ensure NFS mounts available
Bug: T171508
Change-Id: I98914cfb79ede672649c3d2cc7b692a87ccc7d52
---
M modules/labs_bootstrapvz/files/firstboot.sh
M modules/labs_vmbuilder/files/firstboot.sh
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/39/378639/1
diff --git a/modules/labs_bootstrapvz/files/firstboot.sh
b/modules/labs_bootstrapvz/files/firstboot.sh
index 0388041..c6585ad 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -198,7 +198,7 @@
echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >>
/etc/nologin
((mount_attempts++))
-/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && puppet
agent -t && break
# Sleep for 10s before next attempt
sleep 10
done
diff --git a/modules/labs_vmbuilder/files/firstboot.sh
b/modules/labs_vmbuilder/files/firstboot.sh
index dcd1784..8ba4619 100644
--- a/modules/labs_vmbuilder/files/firstboot.sh
+++ b/modules/labs_vmbuilder/files/firstboot.sh
@@ -131,7 +131,7 @@
echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}"
echo "Ensuring all NFS mounts are mounted, attempt ${mount_attempts}" >>
/etc/nologin
((mount_attempts++))
-/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && break
+/usr/bin/timeout --preserve-status -k 10s 20s /bin/mount -a && puppet
agent -t && break
# Sleep for 10s before next attempt
sleep 10
done
--
To view, visit https://gerrit.wikimedia.org/r/378639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I98914cfb79ede672649c3d2cc7b692a87ccc7d52
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Don't unconditionally run patch-editsummary-length.sql
Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378638 )
Change subject: Don't unconditionally run patch-editsummary-length.sql
..
Don't unconditionally run patch-editsummary-length.sql
Bug: T176041
Change-Id: I165ee4fa1c0cfadf5f8f400a0ea9db220ed7dbbb
---
M includes/installer/MysqlUpdater.php
M includes/libs/rdbms/field/MySQLField.php
M maintenance/archives/patch-editsummary-length.sql
3 files changed, 33 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/38/378638/1
diff --git a/includes/installer/MysqlUpdater.php
b/includes/installer/MysqlUpdater.php
index 2abc6b6..c74e53a 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -267,7 +267,7 @@
// 1.25
// note this patch covers other _comment and
_description fields too
- [ 'modifyField', 'recentchanges', 'rc_comment',
'patch-editsummary-length.sql' ],
+ [ 'doExtendCommentLengths' ],
// 1.26
[ 'dropTable', 'hitcounter' ],
@@ -1181,6 +1181,24 @@
);
}
+ protected function doExtendCommentLengths() {
+ /**
+* @var MysqlField $info
+*/
+ $info = $this->db->fieldInfo( 'recentchanges', 'rc_comment' );
+ if ( $info === false ) {
+ return false;
+ }
+ if ( $info->maxLength() == 767 ) {
+ $this->output( "...recentchanges.rc_comment is already
the correct length.\n" );
+ }
+ return $this->applyPatch(
+ 'patch-editsummary-length.sql',
+ false,
+ 'Extending edit summary lengths'
+ );
+ }
+
public function getSchemaVars() {
global $wgDBTableOptions;
diff --git a/includes/libs/rdbms/field/MySQLField.php
b/includes/libs/rdbms/field/MySQLField.php
index 709c61e..bb8f520 100644
--- a/includes/libs/rdbms/field/MySQLField.php
+++ b/includes/libs/rdbms/field/MySQLField.php
@@ -58,6 +58,13 @@
}
/**
+* @return int
+*/
+ function maxLength() {
+ return $this->max_length;
+ }
+
+ /**
* @return bool
*/
function isKey() {
diff --git a/maintenance/archives/patch-editsummary-length.sql
b/maintenance/archives/patch-editsummary-length.sql
index c8ac1ad..996d562 100644
--- a/maintenance/archives/patch-editsummary-length.sql
+++ b/maintenance/archives/patch-editsummary-length.sql
@@ -1,11 +1,11 @@
-ALTER TABLE /*_*/revision MODIFY rev_comment varbinary(767) NOT NULL;
-ALTER TABLE /*_*/archive MODIFY ar_comment varbinary(767) NOT NULL;
-ALTER TABLE /*_*/image MODIFY img_description varbinary(767) NOT NULL;
-ALTER TABLE /*_*/oldimage MODIFY oi_description varbinary(767) NOT NULL;
-ALTER TABLE /*_*/filearchive MODIFY fa_description varbinary(767);
+ALTER TABLE /*_*/revision MODIFY rev_comment varbinary(767) NOT NULL default
'';
+ALTER TABLE /*_*/archive MODIFY ar_comment varbinary(767) NOT NULL default '';
+ALTER TABLE /*_*/image MODIFY img_description varbinary(767) NOT NULL default
'';
+ALTER TABLE /*_*/oldimage MODIFY oi_description varbinary(767) NOT NULL
default '';
+ALTER TABLE /*_*/filearchive MODIFY fa_description varbinary(767) default '';
ALTER TABLE /*_*/filearchive MODIFY fa_deleted_reason varbinary(767) default
'';
ALTER TABLE /*_*/recentchanges MODIFY rc_comment varbinary(767) NOT NULL
default '';
ALTER TABLE /*_*/logging MODIFY log_comment varbinary(767) NOT NULL default '';
-ALTER TABLE /*_*/ipblocks MODIFY ipb_reason varbinary(767) NOT NULL;
-ALTER TABLE /*_*/protected_titles MODIFY pt_reason varbinary(767);
+ALTER TABLE /*_*/ipblocks MODIFY ipb_reason varbinary(767) NOT NULL default '';
+ALTER TABLE /*_*/protected_titles MODIFY pt_reason varbinary(767) default '';
--
To view, visit https://gerrit.wikimedia.org/r/378638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I165ee4fa1c0cfadf5f8f400a0ea9db220ed7dbbb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Remove CustomUserSignup
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378541 ) Change subject: Remove CustomUserSignup .. Remove CustomUserSignup Bug: T176083 Change-Id: I45a8e1fe56624a2ea6552f5f2c8ec34e165ec458 --- M .gitmodules D CustomUserSignup 2 files changed, 0 insertions(+), 5 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules index d6f3a93..ed5cd51 100644 --- a/.gitmodules +++ b/.gitmodules @@ -554,10 +554,6 @@ path = CustomPage url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CustomPage branch = . -[submodule "CustomUserSignup"] - path = CustomUserSignup - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CustomUserSignup - branch = . [submodule "D3Loader"] path = D3Loader url = https://gerrit.wikimedia.org/r/mediawiki/extensions/D3Loader diff --git a/CustomUserSignup b/CustomUserSignup deleted file mode 16 index 65ec472..000 --- a/CustomUserSignup +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 65ec47236b40649b25cf03c1fbee71bb81b0ea9a -- To view, visit https://gerrit.wikimedia.org/r/378541 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I45a8e1fe56624a2ea6552f5f2c8ec34e165ec458 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...GlobalBlocking[master]: Fix issues when an ip was already added into GlobalBlockWhit...
Melos has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378555 )
Change subject: Fix issues when an ip was already added into
GlobalBlockWhitelist
..
Fix issues when an ip was already added into GlobalBlockWhitelist
Bug: T148670
Change-Id: Ibde2d56b1be0dcf01b958f481b922c9f35fdf5fc
---
M includes/specials/SpecialGlobalBlockStatus.php
1 file changed, 22 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalBlocking
refs/changes/55/378555/1
diff --git a/includes/specials/SpecialGlobalBlockStatus.php
b/includes/specials/SpecialGlobalBlockStatus.php
index 9e3667d..dcbe95b 100644
--- a/includes/specials/SpecialGlobalBlockStatus.php
+++ b/includes/specials/SpecialGlobalBlockStatus.php
@@ -33,9 +33,10 @@
$ip = trim( $request->getText( 'address' ) );
$this->mAddress = ( $ip !== '' || $request->wasPosted() ) ?
IP::sanitizeRange( $ip ) : '';
$this->mWhitelistStatus = $request->getCheck(
'wpWhitelistStatus' );
+ $id = GlobalBlocking::getGlobalBlockId( $ip );
if ( $this->mAddress ) {
- $this->mCurrentStatus = (
GlobalBlocking::getWhitelistInfoByIP( $this->mAddress ) !== false );
+ $this->mCurrentStatus = (
GlobalBlocking::getWhitelistInfo( $id, $this->mAddress ) !== false );
if ( !$request->wasPosted() ) {
$this->mWhitelistStatus = $this->mCurrentStatus;
}
@@ -86,6 +87,8 @@
}
$dbw = wfGetDB( DB_MASTER );
+ self::purgeWhitelist();
+
if ( $this->mWhitelistStatus == true ) {
// Add to whitelist
@@ -102,7 +105,13 @@
'gbw_expiry' => $expiry,
'gbw_id' => $id
];
- $dbw->replace( 'global_block_whitelist', [ 'gbw_id' ],
$row, __METHOD__ );
+ if (GlobalBlocking::getWhitelistInfoByIP(
$this->mAddress ) !== false){
+ // Check if there is already an entry with the
same ip (and another id)
+ $dbw->delete( 'global_block_whitelist', [
'gbw_address' => $ip ], __METHOD__ );
+ $dbw->replace( 'global_block_whitelist', [
'gbw_id' ], $row, __METHOD__ );
+ }else{
+ $dbw->replace( 'global_block_whitelist', [
'gbw_id' ], $row, __METHOD__ );
+ }
$this->addLogEntry( 'whitelist', $ip, $data['Reason'] );
$successMsg = 'globalblocking-whitelist-whitelisted';
@@ -152,4 +161,15 @@
protected function getGroupName() {
return 'users';
}
+
+ protected function purgeWhitelist() {
+ // Delete expired entries from global_block_whitelist.
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw->delete(
+ 'global_block_whitelist',
+ [ 'gbw_expiry<' . $dbw->addQuotes( $dbw->timestamp() )
+ ],
+ __METHOD__
+ );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/378555
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibde2d56b1be0dcf01b958f481b922c9f35fdf5fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalBlocking
Gerrit-Branch: master
Gerrit-Owner: Melos
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...NumberOfComments[master]: Archive NumberOfComments extension
SamanthaNguyen has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378554 )
Change subject: Archive NumberOfComments extension
..
Archive NumberOfComments extension
The NumberOfComments functionality was merged into the Comments
extension a while ago.
Bug: T146431
Change-Id: I614aaac366f248f6b093e5f59444e36169ce89e8
---
D CODE_OF_CONDUCT.md
D NumberOfComments.body.php
D NumberOfComments.i18n.magic.php
D NumberOfComments.i18n.php
D NumberOfComments.php
A OBSOLETE
D README.md
7 files changed, 1 insertion(+), 132 deletions(-)
Approvals:
SamanthaNguyen: Verified; Looks good to me, approved
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index d8e5d08..000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1 +0,0 @@
-The development of this software is covered by a [Code of
Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).
diff --git a/NumberOfComments.body.php b/NumberOfComments.body.php
deleted file mode 100644
index 5ade0a7..000
--- a/NumberOfComments.body.php
+++ /dev/null
@@ -1,61 +0,0 @@
-setFunctionHook( 'NoC',
'NumberOfComments::getNumberOfCommentsParser', Parser::SFH_NO_HASH );
- return true;
- }
-
- static function getNumberOfCommentsMagic( &$parser, &$cache,
&$magicWordId, &$ret ) {
- $id = $parser->getTitle()->getArticleID();
- $ret = NumberOfComments::getNumberOfComments( $id );
-
- return true;
- }
-
- static function getNumberOfCommentsParser( $parser, $page = 'default',
$param2 = '', $param3 = '' ) {
- $page = Title::newFromText( $page );
-
- if ( $page instanceof Title ) {
- $id = $page->getArticleID();
- } else {
- $id = $parser->getTitle()->getArticleID();
- }
-
- return NumberOfComments::getNumberOfComments( $id );
- }
-
- static function getNumberOfComments( $pageId ) {
- global $wgMemc;
-
- $key = wfMemcKey( 'numberofcomments', $pageId );
- $cache = $wgMemc->get( $key );
-
- if ( $cache ) {
- $val = intval( $cache );
- } else {
- $dbr = wfGetDB( DB_SLAVE );
-
- $res = $dbr->selectField(
- 'Comments',
- 'COUNT(*)',
- array( 'Comment_Page_ID' => $pageId ),
- __METHOD__
- );
-
- if ( !$res ) {
- $val = 0;
- } else {
- $val = intval( $res );
- }
- $wgMemc->set( $key, $val, 60 * 60 * 24 ); // cache for
24 hours
- }
- return $val;
- }
-}
\ No newline at end of file
diff --git a/NumberOfComments.i18n.magic.php b/NumberOfComments.i18n.magic.php
deleted file mode 100644
index 80a0288..000
--- a/NumberOfComments.i18n.magic.php
+++ /dev/null
@@ -1,7 +0,0 @@
- array( 0, 'numberofcomments' ), // case-insensetive
-);
\ No newline at end of file
diff --git a/NumberOfComments.i18n.php b/NumberOfComments.i18n.php
deleted file mode 100644
index f0fc377..000
--- a/NumberOfComments.i18n.php
+++ /dev/null
@@ -1,36 +0,0 @@
- 'Provides a {{NoC}} magic
word, for use with the Comments extension.',
-);
-
-/** German (Deutsch)
- * @author ToaMeiko
- */
-$messages['de'] = array(
- 'numberofcomments-desc' => 'Bietet ein Zauberwort für die Verwendung
mit der Kommentare Verlängerung.'
-);
-
-/** Message documentation (Message documentation)
- * @author UltrasonicNXT
- */
-$messages['qqq'] = array(
- 'numberofcomments-desc' => '{{desc}}',
-);
-
-/** Vietnamese (Việt)
- * @author Codyn329
- */
-$messages['vi'] = array (
- 'numberofcomments-desc' => 'Cung cấp một từ kỳ diệu được sử dụng với ý
kiến việc mở rộng.',
-);
diff --git a/NumberOfComments.php b/NumberOfComments.php
deleted file mode 100644
index fbadb8e..000
--- a/NumberOfComments.php
+++ /dev/null
@@ -1,23 +0,0 @@
- __FILE__,
- 'name' => 'NumberOfComments',
- 'version' => 1.0,
- 'author' => 'UltrasonicNXT/Adam Carter',
- 'url' => 'https://github.com/Brickimedia/NumberOfComments',
- 'description-msg' => 'numberofcomments-desc',
-);
-
-$wgExtensionMessagesFiles['NumberOfComments'] = __DIR__ .
'/NumberOfComments.i18n.php';
-$wgExtensionMessagesFiles['NumberOfCommentsMagic'] = __DIR__ .
'/NumberOfComments.i18n.magic.php';
-
-$wgHooks['ParserGetVariableValueSwitch'][] =
'NumberOfComments::getNumberOfCommentsMagic';
-$wgHooks['MagicWordwgVariableIDs'][] =
'NumberOfComments::declareNumberOfCommentsMagic';
-$wgHooks['ParserFirstCallInit'][] =
'NumberOfComments::setupNumberOfCommentsParser';
-
-$wgAutoload
[MediaWiki-commits] [Gerrit] mediawiki...NumberOfComments[master]: Archive NumberOfComments extension
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378554 )
Change subject: Archive NumberOfComments extension
..
Archive NumberOfComments extension
The NumberOfComments functionality was merged into the Comments
extension a while ago.
Bug: T146431
Change-Id: I614aaac366f248f6b093e5f59444e36169ce89e8
---
D CODE_OF_CONDUCT.md
D NumberOfComments.body.php
D NumberOfComments.i18n.magic.php
D NumberOfComments.i18n.php
D NumberOfComments.php
A OBSOLETE
D README.md
7 files changed, 1 insertion(+), 132 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NumberOfComments
refs/changes/54/378554/1
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index d8e5d08..000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1 +0,0 @@
-The development of this software is covered by a [Code of
Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).
diff --git a/NumberOfComments.body.php b/NumberOfComments.body.php
deleted file mode 100644
index 5ade0a7..000
--- a/NumberOfComments.body.php
+++ /dev/null
@@ -1,61 +0,0 @@
-setFunctionHook( 'NoC',
'NumberOfComments::getNumberOfCommentsParser', Parser::SFH_NO_HASH );
- return true;
- }
-
- static function getNumberOfCommentsMagic( &$parser, &$cache,
&$magicWordId, &$ret ) {
- $id = $parser->getTitle()->getArticleID();
- $ret = NumberOfComments::getNumberOfComments( $id );
-
- return true;
- }
-
- static function getNumberOfCommentsParser( $parser, $page = 'default',
$param2 = '', $param3 = '' ) {
- $page = Title::newFromText( $page );
-
- if ( $page instanceof Title ) {
- $id = $page->getArticleID();
- } else {
- $id = $parser->getTitle()->getArticleID();
- }
-
- return NumberOfComments::getNumberOfComments( $id );
- }
-
- static function getNumberOfComments( $pageId ) {
- global $wgMemc;
-
- $key = wfMemcKey( 'numberofcomments', $pageId );
- $cache = $wgMemc->get( $key );
-
- if ( $cache ) {
- $val = intval( $cache );
- } else {
- $dbr = wfGetDB( DB_SLAVE );
-
- $res = $dbr->selectField(
- 'Comments',
- 'COUNT(*)',
- array( 'Comment_Page_ID' => $pageId ),
- __METHOD__
- );
-
- if ( !$res ) {
- $val = 0;
- } else {
- $val = intval( $res );
- }
- $wgMemc->set( $key, $val, 60 * 60 * 24 ); // cache for
24 hours
- }
- return $val;
- }
-}
\ No newline at end of file
diff --git a/NumberOfComments.i18n.magic.php b/NumberOfComments.i18n.magic.php
deleted file mode 100644
index 80a0288..000
--- a/NumberOfComments.i18n.magic.php
+++ /dev/null
@@ -1,7 +0,0 @@
- array( 0, 'numberofcomments' ), // case-insensetive
-);
\ No newline at end of file
diff --git a/NumberOfComments.i18n.php b/NumberOfComments.i18n.php
deleted file mode 100644
index f0fc377..000
--- a/NumberOfComments.i18n.php
+++ /dev/null
@@ -1,36 +0,0 @@
- 'Provides a {{NoC}} magic
word, for use with the Comments extension.',
-);
-
-/** German (Deutsch)
- * @author ToaMeiko
- */
-$messages['de'] = array(
- 'numberofcomments-desc' => 'Bietet ein Zauberwort für die Verwendung
mit der Kommentare Verlängerung.'
-);
-
-/** Message documentation (Message documentation)
- * @author UltrasonicNXT
- */
-$messages['qqq'] = array(
- 'numberofcomments-desc' => '{{desc}}',
-);
-
-/** Vietnamese (Việt)
- * @author Codyn329
- */
-$messages['vi'] = array (
- 'numberofcomments-desc' => 'Cung cấp một từ kỳ diệu được sử dụng với ý
kiến việc mở rộng.',
-);
diff --git a/NumberOfComments.php b/NumberOfComments.php
deleted file mode 100644
index fbadb8e..000
--- a/NumberOfComments.php
+++ /dev/null
@@ -1,23 +0,0 @@
- __FILE__,
- 'name' => 'NumberOfComments',
- 'version' => 1.0,
- 'author' => 'UltrasonicNXT/Adam Carter',
- 'url' => 'https://github.com/Brickimedia/NumberOfComments',
- 'description-msg' => 'numberofcomments-desc',
-);
-
-$wgExtensionMessagesFiles['NumberOfComments'] = __DIR__ .
'/NumberOfComments.i18n.php';
-$wgExtensionMessagesFiles['NumberOfCommentsMagic'] = __DIR__ .
'/NumberOfComments.i18n.magic.php';
-
-$wgHooks['ParserGetVariableValueSwitch'][] =
'NumberOfComments::getNumberOfCommentsMagic';
-$wgHooks['MagicWordwgVariableIDs'][] =
'NumberOfComments::declareNumberOfCommentsMagic';
-$wgHooks['ParserFirstCallInit'][] =
'NumberOfComments::setupNumbe
[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Remove RelationLinks
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378537 ) Change subject: Remove RelationLinks .. Remove RelationLinks Bug: T176084 Change-Id: I2560ac91b06552073347ec20dea7965cfcfc386a --- M .gitmodules D RelationLinks 2 files changed, 0 insertions(+), 5 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules index a020ec7..d6f3a93 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2122,10 +2122,6 @@ path = RelatedSites url = https://gerrit.wikimedia.org/r/mediawiki/extensions/RelatedSites branch = . -[submodule "RelationLinks"] - path = RelationLinks - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/RelationLinks - branch = . [submodule "Renameuser"] path = Renameuser url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Renameuser diff --git a/RelationLinks b/RelationLinks deleted file mode 16 index e8381fc..000 --- a/RelationLinks +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e8381fca813aefa6d5fb824dab98dd0048c31e4e -- To view, visit https://gerrit.wikimedia.org/r/378537 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2560ac91b06552073347ec20dea7965cfcfc386a Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Better distinguish "one space before brace" and "brace on sa...
Florianschmidtwelzow has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378553 )
Change subject: Better distinguish "one space before brace" and "brace on same
line" for class keyword
..
Better distinguish "one space before brace" and "brace on same line" for class
keyword
Having the same error message for both checks can result in a warning like:
Expected 1 space before class open brace and should
be same line.find 1
That's confusing, as the "find" part is the same as the first part of the
expected result.
This change creates separate warnings and messages for both checks to better
distinguish the two checks. It also changes the error message from "..same
line.find 1" to a something that looks better: "..same line. Found 1".
Change-Id: I8dda39454389ab01f6c5e84071ba4065674eed06
---
M MediaWiki/Sniffs/WhiteSpace/SpaceBeforeClassBraceSniff.php
M MediaWiki/Tests/files/WhiteSpace/space_before_class_brace.php.expect
2 files changed, 25 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer
refs/changes/53/378553/1
diff --git a/MediaWiki/Sniffs/WhiteSpace/SpaceBeforeClassBraceSniff.php
b/MediaWiki/Sniffs/WhiteSpace/SpaceBeforeClassBraceSniff.php
index 52dd3dc..9be6613 100644
--- a/MediaWiki/Sniffs/WhiteSpace/SpaceBeforeClassBraceSniff.php
+++ b/MediaWiki/Sniffs/WhiteSpace/SpaceBeforeClassBraceSniff.php
@@ -53,7 +53,8 @@
}
return;
}
- $warning = 'Expected 1 space before class open brace and should
be same line.find %s';
+ $warningSpace = 'Expected 1 space before class open brace.
Found %s.';
+ $warningLine = 'Expected class open brace to be on the same
line as class keyword.';
$spaceCount = 0;
for ( $start = $pre + 1; $start < $openBrace; $start++ ) {
$content = $tokens[$start]['content'];
@@ -61,11 +62,9 @@
$spaceCount += $contentSize;
}
- if ( $spaceCount !== 1 ||
- $tokens[$openBrace]['line'] !== $tokens[$pre]['line']
- ) {
+ if ( $spaceCount !== 1 ) {
$fix = $phpcsFile->addFixableWarning(
- $warning,
+ $warningSpace,
$openBrace,
'NoSpaceBeforeBrace',
[ $spaceCount ]
@@ -74,6 +73,18 @@
$phpcsFile->fixer->beginChangeset();
$phpcsFile->fixer->replaceToken( $openBrace, ''
);
$phpcsFile->fixer->addContent( $pre, ' {' );
+ $phpcsFile->fixer->endChangeset();
+ }
+ }
+
+ if ( $tokens[$openBrace]['line'] !== $tokens[$pre]['line'] ) {
+ $fix = $phpcsFile->addFixableWarning(
+ $warningLine,
+ $openBrace,
+ 'BraceNotOnSameLine'
+ );
+ if ( $fix === true ) {
+ $phpcsFile->fixer->beginChangeset();
for ( $i = ( $pre + 1 ); $i < $openBrace; $i++
) {
$phpcsFile->fixer->replaceToken( $i, ''
);
}
diff --git
a/MediaWiki/Tests/files/WhiteSpace/space_before_class_brace.php.expect
b/MediaWiki/Tests/files/WhiteSpace/space_before_class_brace.php.expect
index e25b41f..38fd0d3 100644
--- a/MediaWiki/Tests/files/WhiteSpace/space_before_class_brace.php.expect
+++ b/MediaWiki/Tests/files/WhiteSpace/space_before_class_brace.php.expect
@@ -1,22 +1,22 @@
- 6 | WARNING | [x] Expected 1 space before class open brace and should
-| | be same line.find 0
+ 6 | WARNING | [x] Expected 1 space before class open brace. Found
+| | 0.
| |
(MediaWiki.WhiteSpace.SpaceBeforeClassBrace.NoSpaceBeforeBrace)
13 | ERROR | [ ] Only one class is allowed in a file
| | (MediaWiki.Files.OneClassPerFile.MultipleFound)
- 13 | WARNING | [x] Expected 1 space before class open brace and should
-| | be same line.find 2
+ 13 | WARNING | [x] Expected 1 space before class open brace. Found
+| | 2.
| |
(MediaWiki.WhiteSpace.SpaceBeforeClassBrace.NoSpaceBeforeBrace)
20 | ERROR | [ ] Only one class is allowed in a file
| | (MediaWiki.Files.OneClassPerFile.MultipleFound)
- 21 | WARNING | [x] Expected 1 space before class open brace and should
-| | be same line.find 1
-| |
(MediaWiki.WhiteSpace.SpaceBeforeClassBrace.NoSpaceBeforeBrace)
+ 21 | WAR
[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: MWApiRequest: Make GET requests work correctly
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378358 )
Change subject: MWApiRequest: Make GET requests work correctly
..
MWApiRequest: Make GET requests work correctly
Doing GET requests crashed because:
* config.*.yaml explicitly set method:'post' in the request template
* If method='get', MWApiRequest doesn't overwrite this
* The template also sets body={}, but no content-type
* Using a non-string body without a special content-type causes an error
Work around this by explictly setting request.method, and by
deleting request.body for GET.
Change-Id: I1cb72fadba80216ae7cb002b4c8bae9c34d78f5c
---
M lib/mw/ApiRequest.js
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Nikerabbit: Looks good to me, approved
diff --git a/lib/mw/ApiRequest.js b/lib/mw/ApiRequest.js
index d540cad..be97281 100644
--- a/lib/mw/ApiRequest.js
+++ b/lib/mw/ApiRequest.js
@@ -48,8 +48,11 @@
}
} );
if ( method === 'get' ) {
+ request.method = 'get';
request.query = query;
+ delete request.body;
} else if ( method === 'post' ) {
+ request.method = 'post';
request.body = query;
request.headers[ 'content-type' ] =
'application/x-www-form-urlencoded';
}
--
To view, visit https://gerrit.wikimedia.org/r/378358
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1cb72fadba80216ae7cb002b4c8bae9c34d78f5c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Catrope
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Santhosh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: DumpFilter is autoloaded. No need to require in maintenance ...
Reedy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378543 ) Change subject: DumpFilter is autoloaded. No need to require in maintenance script .. DumpFilter is autoloaded. No need to require in maintenance script Change-Id: Ib5c5e9a5144eb5454d1e498bf6f18d9e5829a52f --- M maintenance/backup.inc 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/43/378543/1 diff --git a/maintenance/backup.inc b/maintenance/backup.inc index 60b8a7a..f1cd2b9 100644 --- a/maintenance/backup.inc +++ b/maintenance/backup.inc @@ -25,7 +25,6 @@ */ require_once __DIR__ . '/Maintenance.php'; -require_once __DIR__ . '/../includes/export/DumpFilter.php'; use Wikimedia\Rdbms\LoadBalancer; use Wikimedia\Rdbms\IDatabase; -- To view, visit https://gerrit.wikimedia.org/r/378543 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib5c5e9a5144eb5454d1e498bf6f18d9e5829a52f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Reedy ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Archive RelationLinks extension
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378538 ) Change subject: Archive RelationLinks extension .. Archive RelationLinks extension Bug: T176084 Change-Id: I5bd85a7c1daf6903d5a513252c16076e3a99c71c --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 1f4c96e..58d0d17 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -5212,8 +5212,7 @@ - name: mediawiki/extensions/RelationLinks template: - - name: extension-unittests-generic - - name: mwgate-npm + - name: archived - name: mediawiki/extensions/RestBaseUpdateJobs template: -- To view, visit https://gerrit.wikimedia.org/r/378538 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5bd85a7c1daf6903d5a513252c16076e3a99c71c Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow Gerrit-Reviewer: Addshore Gerrit-Reviewer: Hashar Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Archive CustomUserSignup
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378540 ) Change subject: Archive CustomUserSignup .. Archive CustomUserSignup Bug: T176083 Change-Id: Ia7289d62aa705a75ddb684f58fadb08fe2339c09 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index ca6caf9..1f4c96e 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2988,8 +2988,7 @@ - name: mediawiki/extensions/CustomUserSignup template: - - name: extension-unittests-generic - - name: mwgate-npm + - name: archived - name: mediawiki/extensions/D3Loader template: -- To view, visit https://gerrit.wikimedia.org/r/378540 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia7289d62aa705a75ddb684f58fadb08fe2339c09 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow Gerrit-Reviewer: Addshore Gerrit-Reviewer: Hashar Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Change archived reason for CustomUserSignup
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378539 ) Change subject: Change archived reason for CustomUserSignup .. Change archived reason for CustomUserSignup Bug: T176083 Change-Id: Ib80c94eca0a637d511f041e7cdd7886f96d871e3 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 5171671..e02fe37 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -799,8 +799,7 @@ Custom Page -# Unused on WMF since 8/2012 and seems unmaintened. https://gerrit.wikimedia.org/r/#/c/18201/ -#Custom User Signup +# Custom User Signup // archived with T176083 D3 Loader -- To view, visit https://gerrit.wikimedia.org/r/378539 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib80c94eca0a637d511f041e7cdd7886f96d871e3 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow Gerrit-Reviewer: Raimond Spekking 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...CustomUserSignup[master]: Archive extension
Florianschmidtwelzow has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378542 )
Change subject: Archive extension
..
Archive extension
Bug: T176083
Change-Id: I6026078f6decb4a86496fd6392e22d29ce3439fa
---
D .gitignore
D .jshintignore
D .jshintrc
D CODE_OF_CONDUCT.md
D CustomUserSignup.hooks.php
D CustomUserSignup.i18n.php
D CustomUserSignup.php
D CustomUserTemplate.php
D Gruntfile.js
A OBSOLETE
D README
D i18n/af.json
D i18n/ar.json
D i18n/ast.json
D i18n/be-tarask.json
D i18n/br.json
D i18n/bs.json
D i18n/cs.json
D i18n/de.json
D i18n/dsb.json
D i18n/el.json
D i18n/en.json
D i18n/eo.json
D i18n/es.json
D i18n/fa.json
D i18n/fi.json
D i18n/fr.json
D i18n/frp.json
D i18n/gl.json
D i18n/gsw.json
D i18n/he.json
D i18n/hi.json
D i18n/hsb.json
D i18n/ia.json
D i18n/id.json
D i18n/it.json
D i18n/ja.json
D i18n/ko.json
D i18n/ksh.json
D i18n/lb.json
D i18n/map-bms.json
D i18n/mk.json
D i18n/ml.json
D i18n/ms.json
D i18n/nb.json
D i18n/nl.json
D i18n/pl.json
D i18n/pms.json
D i18n/pt-br.json
D i18n/pt.json
D i18n/qqq.json
D i18n/ro.json
D i18n/roa-tara.json
D i18n/ru.json
D i18n/rue.json
D i18n/sk.json
D i18n/sl.json
D i18n/sr-ec.json
D i18n/tl.json
D i18n/uk.json
D i18n/vi.json
D i18n/zh-hans.json
D i18n/zh-hant.json
D modules/AccountCreationUserBucket.js
D package.json
65 files changed, 2 insertions(+), 952 deletions(-)
Approvals:
Florianschmidtwelzow: Verified; Looks good to me, approved
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index a30a7d4..000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/node_modules/
-.svn
-*~
-*.kate-swp
-.*.swp
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 3c3629e..000
--- a/.jshintignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 04c3a97..000
--- a/.jshintrc
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- // Enforcing
- "bitwise": true,
- "eqeqeq": true,
- "freeze": true,
- "latedef": "nofunc",
- "noarg": true,
- "nonew": true,
- "undef": true,
- "unused": true,
- "strict": false,
-
- // Relaxing
- "es5": false,
-
- // Environment
- "browser": true,
- "jquery": true,
-
- "globals": {
- "mediaWiki": false
- }
-}
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index d8e5d08..000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1 +0,0 @@
-The development of this software is covered by a [Code of
Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).
diff --git a/CustomUserSignup.hooks.php b/CustomUserSignup.hooks.php
deleted file mode 100644
index 0da2a00..000
--- a/CustomUserSignup.hooks.php
+++ /dev/null
@@ -1,151 +0,0 @@
-getVal( 'campaign' ) ) {
- preg_match( '/[A-Za-z0-9]+/', $wgRequest->getVal(
'campaign' ), $matches );
- $campaign = $matches[0];
- }
- return $campaign;
- }
-
-
- public static function userCreateForm( &$template ) {
- global $wgRequest, $wgCustomUserSignupVersion,
$wgCustomUserSignupSetBuckets;
- $titleObj = SpecialPage::getTitleFor( 'Userlogin' );
-
- $newTemplate;
- $linkmsg;
-
- $campaign = CustomUserSignupHooks::getCampaign();
- if( $campaign != "" ) {
-
- if( $template instanceof UserloginTemplate ) {
- $newTemplate = new CustomUserloginTemplate();
- $linkmsg = 'nologin';
- $template->data['action'] =
"{$template->data['action']}&campaign=$campaign";
- $template->data['link'] =
- preg_replace(
- '/type\=signup/',
-
"campaign=$campaign&type=signup",
- $template->data['link']
- );
- } elseif( $template instanceof UsercreateTemplate ) {
- $newTemplate = new CustomUsercreateTemplate();
- $linkmsg = 'gotaccount';
- $template->data['action'] =
"{$template->data['action']}&campaign=$campaign";
- $template->data['link'] =
- preg_replace(
- '/type\=login\&/',
-
"type=login&campaign=$campaign&",
- $template->data['link']
- );
- } else {
-
[MediaWiki-commits] [Gerrit] mediawiki...CustomUserSignup[master]: Archive extension
Florianschmidtwelzow has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378542 )
Change subject: Archive extension
..
Archive extension
Bug: T176083
Change-Id: I6026078f6decb4a86496fd6392e22d29ce3439fa
---
D .gitignore
D .jshintignore
D .jshintrc
D CODE_OF_CONDUCT.md
D CustomUserSignup.hooks.php
D CustomUserSignup.i18n.php
D CustomUserSignup.php
D CustomUserTemplate.php
D Gruntfile.js
A OBSOLETE
D README
D i18n/af.json
D i18n/ar.json
D i18n/ast.json
D i18n/be-tarask.json
D i18n/br.json
D i18n/bs.json
D i18n/cs.json
D i18n/de.json
D i18n/dsb.json
D i18n/el.json
D i18n/en.json
D i18n/eo.json
D i18n/es.json
D i18n/fa.json
D i18n/fi.json
D i18n/fr.json
D i18n/frp.json
D i18n/gl.json
D i18n/gsw.json
D i18n/he.json
D i18n/hi.json
D i18n/hsb.json
D i18n/ia.json
D i18n/id.json
D i18n/it.json
D i18n/ja.json
D i18n/ko.json
D i18n/ksh.json
D i18n/lb.json
D i18n/map-bms.json
D i18n/mk.json
D i18n/ml.json
D i18n/ms.json
D i18n/nb.json
D i18n/nl.json
D i18n/pl.json
D i18n/pms.json
D i18n/pt-br.json
D i18n/pt.json
D i18n/qqq.json
D i18n/ro.json
D i18n/roa-tara.json
D i18n/ru.json
D i18n/rue.json
D i18n/sk.json
D i18n/sl.json
D i18n/sr-ec.json
D i18n/tl.json
D i18n/uk.json
D i18n/vi.json
D i18n/zh-hans.json
D i18n/zh-hant.json
D modules/AccountCreationUserBucket.js
D package.json
65 files changed, 2 insertions(+), 952 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CustomUserSignup
refs/changes/42/378542/1
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index a30a7d4..000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/node_modules/
-.svn
-*~
-*.kate-swp
-.*.swp
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 3c3629e..000
--- a/.jshintignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 04c3a97..000
--- a/.jshintrc
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- // Enforcing
- "bitwise": true,
- "eqeqeq": true,
- "freeze": true,
- "latedef": "nofunc",
- "noarg": true,
- "nonew": true,
- "undef": true,
- "unused": true,
- "strict": false,
-
- // Relaxing
- "es5": false,
-
- // Environment
- "browser": true,
- "jquery": true,
-
- "globals": {
- "mediaWiki": false
- }
-}
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index d8e5d08..000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1 +0,0 @@
-The development of this software is covered by a [Code of
Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).
diff --git a/CustomUserSignup.hooks.php b/CustomUserSignup.hooks.php
deleted file mode 100644
index 0da2a00..000
--- a/CustomUserSignup.hooks.php
+++ /dev/null
@@ -1,151 +0,0 @@
-getVal( 'campaign' ) ) {
- preg_match( '/[A-Za-z0-9]+/', $wgRequest->getVal(
'campaign' ), $matches );
- $campaign = $matches[0];
- }
- return $campaign;
- }
-
-
- public static function userCreateForm( &$template ) {
- global $wgRequest, $wgCustomUserSignupVersion,
$wgCustomUserSignupSetBuckets;
- $titleObj = SpecialPage::getTitleFor( 'Userlogin' );
-
- $newTemplate;
- $linkmsg;
-
- $campaign = CustomUserSignupHooks::getCampaign();
- if( $campaign != "" ) {
-
- if( $template instanceof UserloginTemplate ) {
- $newTemplate = new CustomUserloginTemplate();
- $linkmsg = 'nologin';
- $template->data['action'] =
"{$template->data['action']}&campaign=$campaign";
- $template->data['link'] =
- preg_replace(
- '/type\=signup/',
-
"campaign=$campaign&type=signup",
- $template->data['link']
- );
- } elseif( $template instanceof UsercreateTemplate ) {
- $newTemplate = new CustomUsercreateTemplate();
- $linkmsg = 'gotaccount';
- $template->data['action'] =
"{$template->data['action']}&campaign=$campaign";
- $template->data['link'] =
- preg_replace(
- '/type\=login\&/',
-
"type=login&campaign=$campaign&",
- $template->data['link']
- );
-
[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Remove CustomUSerSignup
Florianschmidtwelzow has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378541 ) Change subject: Remove CustomUSerSignup .. Remove CustomUSerSignup Bug: T176083 Change-Id: I45a8e1fe56624a2ea6552f5f2c8ec34e165ec458 --- M .gitmodules D CustomUserSignup 2 files changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/41/378541/1 diff --git a/.gitmodules b/.gitmodules index a020ec7..996b1f9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -554,10 +554,6 @@ path = CustomPage url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CustomPage branch = . -[submodule "CustomUserSignup"] - path = CustomUserSignup - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CustomUserSignup - branch = . [submodule "D3Loader"] path = D3Loader url = https://gerrit.wikimedia.org/r/mediawiki/extensions/D3Loader diff --git a/CustomUserSignup b/CustomUserSignup deleted file mode 16 index 6bd41af..000 --- a/CustomUserSignup +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6bd41af7ac2c8d12aa863355bf66df9c2baad5aa -- To view, visit https://gerrit.wikimedia.org/r/378541 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I45a8e1fe56624a2ea6552f5f2c8ec34e165ec458 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Archive CustomUserSignup
Florianschmidtwelzow has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378540 ) Change subject: Archive CustomUserSignup .. Archive CustomUserSignup Bug: T176083 Change-Id: Ia7289d62aa705a75ddb684f58fadb08fe2339c09 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/40/378540/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index ca6caf9..1f4c96e 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2988,8 +2988,7 @@ - name: mediawiki/extensions/CustomUserSignup template: - - name: extension-unittests-generic - - name: mwgate-npm + - name: archived - name: mediawiki/extensions/D3Loader template: -- To view, visit https://gerrit.wikimedia.org/r/378540 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia7289d62aa705a75ddb684f58fadb08fe2339c09 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Change archived reason for CustomUserSignup
Florianschmidtwelzow has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378539 ) Change subject: Change archived reason for CustomUserSignup .. Change archived reason for CustomUserSignup Bug: T176083 Change-Id: Ib80c94eca0a637d511f041e7cdd7886f96d871e3 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/39/378539/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 5171671..e02fe37 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -799,8 +799,7 @@ Custom Page -# Unused on WMF since 8/2012 and seems unmaintened. https://gerrit.wikimedia.org/r/#/c/18201/ -#Custom User Signup +# Custom User Signup // archived with T176083 D3 Loader -- To view, visit https://gerrit.wikimedia.org/r/378539 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib80c94eca0a637d511f041e7cdd7886f96d871e3 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Archive RelationLinks extension
Florianschmidtwelzow has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378538 ) Change subject: Archive RelationLinks extension .. Archive RelationLinks extension Bug: T176084 Change-Id: I5bd85a7c1daf6903d5a513252c16076e3a99c71c --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/38/378538/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index ca6caf9..58f0262 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -5213,8 +5213,7 @@ - name: mediawiki/extensions/RelationLinks template: - - name: extension-unittests-generic - - name: mwgate-npm + - name: archived - name: mediawiki/extensions/RestBaseUpdateJobs template: -- To view, visit https://gerrit.wikimedia.org/r/378538 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5bd85a7c1daf6903d5a513252c16076e3a99c71c Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Remove RelationLinks
Florianschmidtwelzow has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378537 ) Change subject: Remove RelationLinks .. Remove RelationLinks Bug: T176084 Change-Id: I2560ac91b06552073347ec20dea7965cfcfc386a --- M .gitmodules D RelationLinks 2 files changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/37/378537/1 diff --git a/.gitmodules b/.gitmodules index a020ec7..d6f3a93 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2122,10 +2122,6 @@ path = RelatedSites url = https://gerrit.wikimedia.org/r/mediawiki/extensions/RelatedSites branch = . -[submodule "RelationLinks"] - path = RelationLinks - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/RelationLinks - branch = . [submodule "Renameuser"] path = Renameuser url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Renameuser diff --git a/RelationLinks b/RelationLinks deleted file mode 16 index e8381fc..000 --- a/RelationLinks +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e8381fca813aefa6d5fb824dab98dd0048c31e4e -- To view, visit https://gerrit.wikimedia.org/r/378537 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2560ac91b06552073347ec20dea7965cfcfc386a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...RelationLinks[master]: Remove contents of extension except MOVED file
Florianschmidtwelzow has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378536 )
Change subject: Remove contents of extension except MOVED file
..
Remove contents of extension except MOVED file
Bug: T176084
Change-Id: I4e247e39a44fbdaa3823bd9802f1844c86ba26b1
---
D .gitignore
D CODE_OF_CONDUCT.md
D Gruntfile.js
D README
D RelationLinks.hooks.php
D RelationLinks.i18n.php
D RelationLinks.php
D i18n/ast.json
D i18n/be-tarask.json
D i18n/de.json
D i18n/dsb.json
D i18n/en.json
D i18n/es.json
D i18n/fr.json
D i18n/gl.json
D i18n/he.json
D i18n/hsb.json
D i18n/ia.json
D i18n/it.json
D i18n/ja.json
D i18n/ko.json
D i18n/ksh.json
D i18n/lb.json
D i18n/mk.json
D i18n/nl.json
D i18n/pl.json
D i18n/pms.json
D i18n/qqq.json
D i18n/tl.json
D package.json
30 files changed, 0 insertions(+), 344 deletions(-)
Approvals:
Florianschmidtwelzow: Verified; Looks good to me, approved
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e62fc28..000
--- a/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-node_modules/
-vendor/
-
-.svn
-*~
-*.kate-swp
-.*.swp
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index d8e5d08..000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1 +0,0 @@
-The development of this software is covered by a [Code of
Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).
diff --git a/Gruntfile.js b/Gruntfile.js
deleted file mode 100644
index 2db815f..000
--- a/Gruntfile.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*jshint node:true */
-module.exports = function ( grunt ) {
- grunt.loadNpmTasks( 'grunt-jsonlint' );
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- grunt.loadNpmTasks( 'grunt-banana-checker' );
-
- grunt.initConfig( {
- banana: {
- all: 'i18n/'
- },
- jshint: {
- all: [
- '**/*.js',
- '!node_modules/**',
- '!vendor/**'
- ]
- },
- jsonlint: {
- all: [
- '**/*.json',
- '!node_modules/**',
- '!vendor/**'
- ]
- }
- } );
-
- grunt.registerTask( 'test', [ 'jsonlint', 'banana', 'jshint' ] );
- grunt.registerTask( 'default', 'test' );
-};
diff --git a/README b/README
deleted file mode 100644
index 86e71f1..000
--- a/README
+++ /dev/null
@@ -1,8 +0,0 @@
-'''RelationLinks''' adds to header to
improve navigation and SEO.
-
-== Installation ==
-Download the files from [https://github.com/DaSchTour/RelationLinks/tags
github]. But them in /extensions/RelationLinks and but the following to your
[[LocalSettings.php]]
-require_once(
"$IP/extensions/RelationLinks/RelationLinks.php" );
-
-== Configuration ==
-No configuration needed!
\ No newline at end of file
diff --git a/RelationLinks.hooks.php b/RelationLinks.hooks.php
deleted file mode 100644
index 9880edf..000
--- a/RelationLinks.hooks.php
+++ /dev/null
@@ -1,45 +0,0 @@
-msg('Mainpage')->plain());
- $out->addLink( array(
- 'rel' => 'start',
- 'type' => 'text/html',
- 'title' => $out->msg('Mainpage')->text(),
- 'href' => $rlMainpage->getLocalURL(),
- ) );
- $rlHelppage =
Title::newFromText($out->msg('Helppage')->plain());
- $out->addLink( array(
- 'rel' => 'help',
- 'type' => 'text/html',
- 'title' => $out->msg('Helppage')->text(),
- 'href' => $rlHelppage->getLocalURL(),
- ) );
- $rlAllpages =
Title::newFromText($out->msg('Allpages')->plain());
- $out->addLink( array(
- 'rel' => 'index',
- 'type' => 'text/html',
- 'title' => $out->msg('Allpages')->text(),
- 'href' => $rlAllpages->getLocalURL(),
- ) );
- $rlSearch = Title::newFromText($out->msg('Search')->plain());
- $out->addLink( array(
- 'rel' => 'search',
- 'type' => 'text/html',
- 'title' => $out->msg('Search')->text(),
- 'href' => $rlSearch->getLocalURL(),
- ) );
- $rlNamespace = $out->getTitle()->getNsText();
- if ( strlen($rlNamespace) > 1 ) {
- $rlNamespace = $rlNamespace . ':';
- }
- $rlSupPage =
Title::newFromText($rlNamespace.$out->getTitle()->getBaseText());
- $out->addLink( array(
- 'rel' => 'up',
- 'type' => 'text/html',
- 'title' => $rlNamespace . $out->getTitle()->getBaseText(),
-
[MediaWiki-commits] [Gerrit] mediawiki...RelationLinks[master]: Remove contents of extension except MOVED file
Florianschmidtwelzow has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378536 )
Change subject: Remove contents of extension except MOVED file
..
Remove contents of extension except MOVED file
Change-Id: I4e247e39a44fbdaa3823bd9802f1844c86ba26b1
---
D .gitignore
D CODE_OF_CONDUCT.md
D Gruntfile.js
D README
D RelationLinks.hooks.php
D RelationLinks.i18n.php
D RelationLinks.php
D i18n/ast.json
D i18n/be-tarask.json
D i18n/de.json
D i18n/dsb.json
D i18n/en.json
D i18n/es.json
D i18n/fr.json
D i18n/gl.json
D i18n/he.json
D i18n/hsb.json
D i18n/ia.json
D i18n/it.json
D i18n/ja.json
D i18n/ko.json
D i18n/ksh.json
D i18n/lb.json
D i18n/mk.json
D i18n/nl.json
D i18n/pl.json
D i18n/pms.json
D i18n/qqq.json
D i18n/tl.json
D package.json
30 files changed, 0 insertions(+), 344 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelationLinks
refs/changes/36/378536/1
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e62fc28..000
--- a/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-node_modules/
-vendor/
-
-.svn
-*~
-*.kate-swp
-.*.swp
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index d8e5d08..000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1 +0,0 @@
-The development of this software is covered by a [Code of
Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).
diff --git a/Gruntfile.js b/Gruntfile.js
deleted file mode 100644
index 2db815f..000
--- a/Gruntfile.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*jshint node:true */
-module.exports = function ( grunt ) {
- grunt.loadNpmTasks( 'grunt-jsonlint' );
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- grunt.loadNpmTasks( 'grunt-banana-checker' );
-
- grunt.initConfig( {
- banana: {
- all: 'i18n/'
- },
- jshint: {
- all: [
- '**/*.js',
- '!node_modules/**',
- '!vendor/**'
- ]
- },
- jsonlint: {
- all: [
- '**/*.json',
- '!node_modules/**',
- '!vendor/**'
- ]
- }
- } );
-
- grunt.registerTask( 'test', [ 'jsonlint', 'banana', 'jshint' ] );
- grunt.registerTask( 'default', 'test' );
-};
diff --git a/README b/README
deleted file mode 100644
index 86e71f1..000
--- a/README
+++ /dev/null
@@ -1,8 +0,0 @@
-'''RelationLinks''' adds to header to
improve navigation and SEO.
-
-== Installation ==
-Download the files from [https://github.com/DaSchTour/RelationLinks/tags
github]. But them in /extensions/RelationLinks and but the following to your
[[LocalSettings.php]]
-require_once(
"$IP/extensions/RelationLinks/RelationLinks.php" );
-
-== Configuration ==
-No configuration needed!
\ No newline at end of file
diff --git a/RelationLinks.hooks.php b/RelationLinks.hooks.php
deleted file mode 100644
index 9880edf..000
--- a/RelationLinks.hooks.php
+++ /dev/null
@@ -1,45 +0,0 @@
-msg('Mainpage')->plain());
- $out->addLink( array(
- 'rel' => 'start',
- 'type' => 'text/html',
- 'title' => $out->msg('Mainpage')->text(),
- 'href' => $rlMainpage->getLocalURL(),
- ) );
- $rlHelppage =
Title::newFromText($out->msg('Helppage')->plain());
- $out->addLink( array(
- 'rel' => 'help',
- 'type' => 'text/html',
- 'title' => $out->msg('Helppage')->text(),
- 'href' => $rlHelppage->getLocalURL(),
- ) );
- $rlAllpages =
Title::newFromText($out->msg('Allpages')->plain());
- $out->addLink( array(
- 'rel' => 'index',
- 'type' => 'text/html',
- 'title' => $out->msg('Allpages')->text(),
- 'href' => $rlAllpages->getLocalURL(),
- ) );
- $rlSearch = Title::newFromText($out->msg('Search')->plain());
- $out->addLink( array(
- 'rel' => 'search',
- 'type' => 'text/html',
- 'title' => $out->msg('Search')->text(),
- 'href' => $rlSearch->getLocalURL(),
- ) );
- $rlNamespace = $out->getTitle()->getNsText();
- if ( strlen($rlNamespace) > 1 ) {
- $rlNamespace = $rlNamespace . ':';
- }
- $rlSupPage =
Title::newFromText($rlNamespace.$out->getTitle()->getBaseText());
- $out->addLink( array(
- 'rel' => 'up',
- 'type' => 'text/html',
- 'title' => $rlNamespace . $out->getTitle()->getBaseText()
[MediaWiki-commits] [Gerrit] integration/config[master]: docker: git
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378534 ) Change subject: docker: git .. docker: git Change-Id: I089affa8a128b5d668a479771cf047bbb75c9a45 --- A dockerfiles/git/Dockerfile 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/34/378534/1 diff --git a/dockerfiles/git/Dockerfile b/dockerfiles/git/Dockerfile new file mode 100644 index 000..4f38db5 --- /dev/null +++ b/dockerfiles/git/Dockerfile @@ -0,0 +1,13 @@ +FROM docker-registry.wikimedia.org/wikimedia-jessie:latest + +RUN apt-get update && \ +apt-get install --yes --no-install-recommends \ +git && \ +apt-get autoremove --yes && apt-get clean && rm -rf /var/lib/apt/lists/* + +RUN groupadd -r git && useradd --no-log-init -r -g git git + +USER git + +ENTRYPOINT ["git"] +CMD ["--help"] \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/378534 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I089affa8a128b5d668a479771cf047bbb75c9a45 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: WIP DNM docker: alternate docker based phan job..
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378535 ) Change subject: WIP DNM docker: alternate docker based phan job.. .. WIP DNM docker: alternate docker based phan job.. Change-Id: I08be2d7a21f3b5c544b399b665a84bccd74749fc --- A jjb/docker-aliases.bash M jjb/mediawiki-extensions.yaml 2 files changed, 55 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/35/378535/1 diff --git a/jjb/docker-aliases.bash b/jjb/docker-aliases.bash new file mode 100644 index 000..2596a91 --- /dev/null +++ b/jjb/docker-aliases.bash @@ -0,0 +1,4 @@ +alias git='docker run --rm -it -v "/$PWD://src" wmfreleng/git:latest' +alias composer='docker run --rm -it -v "/$PWD://src" wmfreleng/composer:latest' +alias mw-phan='docker run --rm -it -v "/$PWD://src" wmfreleng/mediawiki-phan:latest' +alias zuul-cloner='docker run --rm -it -v "/$PWD://src" wmfreleng/zuul-cloner:latest' \ No newline at end of file diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index 1e35b8b..8b57bbb 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -60,6 +60,27 @@ git submodule update --init --recursive git submodule status ' \; +# TODO finish this builder +- builder: +name: ext-skins-submodules-update-docker +builders: + - shell: | + find src/extensions src/skins -maxdepth 2 \ +-name .gitmodules \ +-execdir bash -xe -c ' +docker run \ +--rm --tty \ +wmfreleng/git:latest \ +submodule foreach git clean -xdff -q +docker run \ +--rm --tty \ +wmfreleng/git:latest \ +submodule update --init --recursive +docker run \ +--rm --tty \ +wmfreleng/git:latest \ +submodule status +' \; - builder: name: prepare-mediawiki-zuul-project @@ -123,6 +144,31 @@ $(cat deps_skins.txt) - ext-skins-submodules-update - shell: "mv deps.txt src/extensions_load.txt" + - composer-validate: + dir: 'src' + - composer-local-create: + deps: 'extensions_load.txt' + - composer-update: + dir: 'src' + +- builder: +name: prepare-mediawiki-zuul-project-no-vendor-no-sql-docker +builders: + - shell: "echo $ZUUL_PROJECT > deps.txt" + - shell: "echo -e $EXT_DEPENDENCIES >> deps.txt" + - shell: "echo -e $SKIN_DEPENDENCIES > deps_skins.txt" + # Use composer to install dependencies instead cloning mediawiki/vendor, + # Clone both extensions and skins, but only extensions get listed for the + # extensions autoloader in integration/jenkins.git, skins are + # automatically injected by MediaWiki upon installation. + - zuul-cloner-docker: + projects: > + mediawiki/core + $(cat deps.txt) + $(cat deps_skins.txt) + - ext-skins-submodules-update-docker + - shell: "mv deps.txt src/extensions_load.txt" + # TODO do the composer builders... - composer-validate: dir: 'src' - composer-local-create: @@ -415,7 +461,8 @@ triggers: - zuul builders: - - prepare-mediawiki-zuul-project-no-vendor-no-sql + - docker-aliases + - prepare-mediawiki-zuul-project-no-vendor-no-sql-docker - shell: | #!/bin/bash -eu @@ -423,23 +470,13 @@ rm -rf log rm -rf .env - -cat < .env -ZUUL_URL=$ZUUL_URL -ZUUL_PROJECT=$ZUUL_PROJECT -ZUUL_COMMIT=$ZUUL_COMMIT -ZUUL_REF=$ZUUL_REF -EXT_DEPENDENCIES=$EXT_DEPENDENCIES -HOME=/var/lib/jenkins -ZUUL - mkdir -p "log" docker run \ --rm --tty \ ---env-file .env \ ---volume "$(pwd)"/log:/var/lib/jenkins/log \ -wmfreleng/mediawiki-extensions-phan:v2017.09.11.19.08 +--volume "$(pwd)"/mediawiki:/mediawiki \ +--volume "$(pwd)"/log:/mediawiki/tests/phan/issues \ +wmfreleng/mediawiki-phan:latest publishers: - checkstyle: pattern: 'log/phan-issues' -- To view, visit https://gerrit.wikimedia.org/r/378535 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I08be2d7a21f3b5c544b399b665a84bccd74749fc Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: docker: mediawiki-phan
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378533 ) Change subject: docker: mediawiki-phan .. docker: mediawiki-phan Change-Id: I46b908662d88d1e215c130f225c52fdd79c88f64 --- A dockerfiles/mediawiki-phan/Dockerfile A dockerfiles/mediawiki-phan/README.md 2 files changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/33/378533/1 diff --git a/dockerfiles/mediawiki-phan/Dockerfile b/dockerfiles/mediawiki-phan/Dockerfile new file mode 100644 index 000..37dba32 --- /dev/null +++ b/dockerfiles/mediawiki-phan/Dockerfile @@ -0,0 +1,20 @@ +FROM wmfreleng/composer:latest as composer + +FROM wmfreleng/php-mediawiki:latest + +USER root + +COPY --from=composer /srv/composer /srv/composer + +RUN mkdir /srv/phan && \ +cd /srv/phan && \ +/srv/composer/vendor/bin/composer require etsy/phan:0.8 && \ +rm -rf ~/.composer + +RUN groupadd -r phan && useradd --no-log-init -r -g phan phan + +ENV PHAN /srv/phan/vendor/bin/phan + +USER phan + +ENTRYPOINT ["/mediawiki/tests/phan/bin/phan"] \ No newline at end of file diff --git a/dockerfiles/mediawiki-phan/README.md b/dockerfiles/mediawiki-phan/README.md new file mode 100644 index 000..66c0588 --- /dev/null +++ b/dockerfiles/mediawiki-phan/README.md @@ -0,0 +1,17 @@ +##Volumes + +**/mediawiki** + +This should be a copy of mediawiki. + + +## Example + +To run phan for the ElectronPdfService extension: + +``` +docker run --rm \ +-v /dev/git/gerrit/mediawiki:/mediawiki \ +wmfreleng/mediawiki-phan:latest \ +/mediawiki/extensions/ElectronPdfService -m checkstyle +``` \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/378533 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I46b908662d88d1e215c130f225c52fdd79c88f64 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: docker: composer image
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378531 ) Change subject: docker: composer image .. docker: composer image Change-Id: I4e95b1533453f105650e1833d0731120d637a860 --- A dockerfiles/composer/Dockerfile A dockerfiles/composer/prebuild.sh 2 files changed, 48 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/31/378531/1 diff --git a/dockerfiles/composer/Dockerfile b/dockerfiles/composer/Dockerfile new file mode 100644 index 000..4127011 --- /dev/null +++ b/dockerfiles/composer/Dockerfile @@ -0,0 +1,38 @@ +FROM wmfreleng/php:latest + +RUN apt-get update && \ +apt-get install --yes --no-install-recommends \ +# For the add-apt-repository command +software-properties-common \ +# For using a https repo +apt-transport-https && \ +# This repo means we can install php7.0 +add-apt-repository http://packages.sury.org/php/ && \ +apt-get update && \ +# TODO Instead of --force-yes actually get the pub key from puppet?!! +apt-get install --yes --force-yes --no-install-recommends \ +# Needed for phan +php7.0-cli && \ +apt-get remove --yes software-properties-common && \ +apt-get autoremove --yes && apt-get clean && rm -rf /var/lib/apt/lists/* + +COPY .cache-buster-composer /.cache-buster-composer + +RUN apt-get update && \ +apt-get install --yes --no-install-recommends \ +git \ +ca-certificates && \ +git clone --depth 1 https://gerrit.wikimedia.org/r/p/integration/composer.git /srv/composer && \ +rm -rf /srv/composer/.git && \ +apt-get remove --yes \ + git \ + ca-certificates \ + apt-transport-https && \ +apt-get autoremove --yes && apt-get clean && rm -rf /var/lib/apt/lists/* + +RUN groupadd -r composer && useradd --no-log-init -r -g composer composer + +USER composer + +ENTRYPOINT ["/srv/composer/vendor/bin/composer"] +CMD ["help"] \ No newline at end of file diff --git a/dockerfiles/composer/prebuild.sh b/dockerfiles/composer/prebuild.sh new file mode 100644 index 000..15e1d66 --- /dev/null +++ b/dockerfiles/composer/prebuild.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# This is copied in Dockerfile to ensure that a build step grabs a fresh +# copy of the git repo when it is updated rather than using a layer from +# the local Docker cache. + +git ls-remote https://gerrit.wikimedia.org/r/p/integration/composer.git | \ + grep refs/heads/master | \ + cut -f 1 \ +> .cache-buster-composer \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/378531 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e95b1533453f105650e1833d0731120d637a860 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: docker: mediawiki specific php image
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378532 ) Change subject: docker: mediawiki specific php image .. docker: mediawiki specific php image Change-Id: I6c1f3813c98e887aa5e067446fc04243c310 --- A dockerfiles/php-mediawiki/Dockerfile 1 file changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/32/378532/1 diff --git a/dockerfiles/php-mediawiki/Dockerfile b/dockerfiles/php-mediawiki/Dockerfile new file mode 100644 index 000..fc0b96f --- /dev/null +++ b/dockerfiles/php-mediawiki/Dockerfile @@ -0,0 +1,25 @@ +FROM wmfreleng/php:latest + +USER root + +RUN apt-get update && \ +apt-get install --yes --no-install-recommends \ +# Cloning of repos +git \ +# For the add-apt-repository command +software-properties-common \ +# For using a https repo +apt-transport-https && \ +# This repo means we can install php7.0 +add-apt-repository http://packages.sury.org/php/ && \ +apt-get update && \ +# TODO Instead of --force-yes actually get the pub key from puppet?!! +apt-get install --yes --force-yes --no-install-recommends \ +# Needed for composer to install things from dist +php7.0-zip \ +# Needed for mediawiki +php-ast php7.0-mbstring php7.0-xml && \ +apt-get remove --yes software-properties-common apt-transport-https && \ +apt-get autoremove --yes && apt-get clean && rm -rf /var/lib/apt/lists/* + +USER php \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/378532 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c1f3813c98e887aa5e067446fc04243c310 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: docker: php7 base image
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378530 ) Change subject: docker: php7 base image .. docker: php7 base image Change-Id: If44aea9b71f3d8f54bdce8f8ec66582281ada5b0 --- A dockerfiles/php/Dockerfile 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/30/378530/1 diff --git a/dockerfiles/php/Dockerfile b/dockerfiles/php/Dockerfile new file mode 100644 index 000..08626e3 --- /dev/null +++ b/dockerfiles/php/Dockerfile @@ -0,0 +1,23 @@ +FROM docker-registry.wikimedia.org/wikimedia-jessie:latest + +RUN apt-get update && \ +apt-get install --yes --no-install-recommends \ +# For the add-apt-repository command +software-properties-common \ +# For using a https repo +apt-transport-https && \ +# This repo means we can install php7.0 +add-apt-repository http://packages.sury.org/php/ && \ +apt-get update && \ +# TODO Instead of --force-yes actually get the pub key from puppet?!! +apt-get install --yes --force-yes --no-install-recommends \ +php7.0-cli && \ +apt-get remove --yes software-properties-common && \ +apt-get autoremove --yes && apt-get clean && rm -rf /var/lib/apt/lists/* + +RUN groupadd -r php && useradd --no-log-init -r -g php php + +USER php + +ENTRYPOINT ["php"] +CMD ["--help"] \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/378530 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If44aea9b71f3d8f54bdce8f8ec66582281ada5b0 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Do not run CollationFaTest if 'intl' is not loaded
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378420 )
Change subject: Do not run CollationFaTest if 'intl' is not loaded
..
Do not run CollationFaTest if 'intl' is not loaded
Bug: T176040
Change-Id: I6b19bf1123d4dca5a1c8e002c0de65bab2138180
---
M tests/phpunit/includes/collation/CollationFaTest.php
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/collation/CollationFaTest.php
b/tests/phpunit/includes/collation/CollationFaTest.php
index f230197..53a4f7b 100644
--- a/tests/phpunit/includes/collation/CollationFaTest.php
+++ b/tests/phpunit/includes/collation/CollationFaTest.php
@@ -7,6 +7,13 @@
* against a random version of libicu
*/
+ public function setUp() {
+ parent::setUp();
+ if ( !extension_loaded( 'intl' ) ) {
+ $this->markTestSkipped( "PHP extension 'intl' is not
loaded, skipping." );
+ }
+ }
+
/**
* @dataProvider provideGetFirstLetter
*/
--
To view, visit https://gerrit.wikimedia.org/r/378420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b19bf1123d4dca5a1c8e002c0de65bab2138180
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Huji
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Brian Wolff
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]: Revert "Xml: Fix Xml::fieldset() when $content is not given"
Hello Ladsgroup, jenkins-bot,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/378528
to review the following change.
Change subject: Revert "Xml: Fix Xml::fieldset() when $content is not given"
..
Revert "Xml: Fix Xml::fieldset() when $content is not given"
Apparently that is intentional and documented. Huh. Whoops.
This reverts commit 0f1cc3bb6e7c3be9b86d2c8736f7458cd40588f2.
Change-Id: I0311f7c85cd575f2a66d50589ec364072be486fb
---
M includes/Xml.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/28/378528/1
diff --git a/includes/Xml.php b/includes/Xml.php
index eadc7d1..0091513 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -615,9 +615,9 @@
if ( $content !== false ) {
$s .= $content . "\n";
+ $s .= self::closeElement( 'fieldset' ) . "\n";
}
- $s .= self::closeElement( 'fieldset' ) . "\n";
return $s;
}
--
To view, visit https://gerrit.wikimedia.org/r/378528
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0311f7c85cd575f2a66d50589ec364072be486fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Ladsgroup
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...TitleKey[master]: Coding style cleanup and whatnot
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378510 )
Change subject: Coding style cleanup and whatnot
..
Coding style cleanup and whatnot
Changed long array syntax to short and DB_SLAVE to DB_REPLICA
Change-Id: Iee5ee01df40f36a074de3dcdfc956d508e144dfc
---
M TitleKey_body.php
1 file changed, 52 insertions(+), 44 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TitleKey_body.php b/TitleKey_body.php
index 44f223c..5c50089 100644
--- a/TitleKey_body.php
+++ b/TitleKey_body.php
@@ -20,35 +20,39 @@
*/
class TitleKey {
- static $deleteIds = array();
+ static $deleteIds = [];
// Active functions...
static function deleteKey( $id ) {
- $db = wfGetDB( DB_MASTER );
- $db->delete( 'titlekey',
- array( 'tk_page' => $id ),
- __METHOD__ );
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw->delete(
+ 'titlekey',
+ [ 'tk_page' => $id ],
+ __METHOD__
+ );
}
static function setKey( $id, $title ) {
- self::setBatchKeys( array( $id => $title ) );
+ self::setBatchKeys( [ $id => $title ] );
}
static function setBatchKeys( $titles ) {
- $rows = array();
- foreach( $titles as $id => $title ) {
- $rows[] = array(
+ $rows = [];
+ foreach ( $titles as $id => $title ) {
+ $rows[] = [
'tk_page' => $id,
'tk_namespace' => $title->getNamespace(),
'tk_key' => self::normalize( $title->getText()
),
- );
+ ];
}
- $db = wfGetDB( DB_MASTER );
- $db->replace( 'titlekey', array( 'tk_page' ),
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw->replace(
+ 'titlekey',
+ [ 'tk_page' ],
$rows,
- __METHOD__ );
+ __METHOD__
+ );
}
-
// Normalization...
static function normalize( $text ) {
@@ -66,7 +70,7 @@
public static function setup() {
global $wgHooks;
$wgHooks['PrefixSearchBackend'][] =
'TitleKey::prefixSearchBackend';
- $wgHooks['SearchGetNearMatch' ][] =
'TitleKey::searchGetNearMatch';
+ $wgHooks['SearchGetNearMatch'][] =
'TitleKey::searchGetNearMatch';
}
static function updateDeleteSetup( $article, $user, $reason ) {
@@ -77,7 +81,7 @@
static function updateDelete( $article, $user, $reason ) {
$title = $article->mTitle->getPrefixedText();
- if( isset( self::$deleteIds[$title] ) ) {
+ if ( isset( self::$deleteIds[$title] ) ) {
self::deleteKey( self::$deleteIds[$title] );
}
return true;
@@ -114,7 +118,7 @@
}
static function updateUndelete( $title, $isnewid ) {
- $article = new Article($title);
+ $article = new Article( $title );
$id = $article->getID();
self::setKey( $id, $title );
return true;
@@ -128,7 +132,7 @@
* Status info is sent to stdout.
*/
public static function schemaUpdates( $updater = null ) {
- $updater->addExtensionUpdate( array( array( __CLASS__,
'runUpdates' ) ) );
+ $updater->addExtensionUpdate( [ [ __CLASS__, 'runUpdates' ] ] );
require_once __DIR__ . '/rebuildTitleKeys.php';
$updater->addPostDatabaseUpdateMaintenance( 'RebuildTitleKeys'
);
return true;
@@ -136,13 +140,13 @@
public static function runUpdates( $updater ) {
$db = $updater->getDB();
- if( $db->tableExists( 'titlekey' ) ) {
+ if ( $db->tableExists( 'titlekey' ) ) {
$updater->output( "...titlekey table already exists.\n"
);
} else {
- $updater->output( "Creating titlekey table..." );
- $sourcefile = $db->getType() == 'postgres' ?
'/titlekey.pg.sql' : '/titlekey.sql';
- $err = $db->sourceFile( dirname( __FILE__ ) .
$sourcefile );
- if( $err !== true ) {
+ $updater->output( 'Creating titlekey table...' );
+ $sourceFile = $db->getType() == 'postgres' ?
'/titlekey.pg.sql' : '/titlekey.sql';
+ $err = $db->sourceFile( __DIR__ . $sourceFile );
+
[MediaWiki-commits] [Gerrit] mediawiki...WikiForum[master]: Remove obsolete smilies functionality
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378527 )
Change subject: Remove obsolete smilies functionality
..
Remove obsolete smilies functionality
This smilies functionality was never fully complete nor worked
properly. The future for emojis and smilies are planned to be in
a separate MediaWiki extension, and then have other extensions
provide support for this (MediaWikiChat and WikiForum here).
Change-Id: Ie7931ef108c002666e2ad7d20df80faec8097602
---
M extension.json
M includes/WikiForum.class.php
2 files changed, 2 insertions(+), 50 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index ca40e49..eec1e7f 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "WikiForum",
- "version": "2.3.1",
+ "version": "2.4.0",
"author": [
"Michael Chlebek",
"Jack Phoenix",
@@ -78,7 +78,6 @@
},
"config": {
"WikiForumAllowAnonymous": true,
- "WikiForumSmilies": [],
"WikiForumLogInRC": true,
"CaptchaTriggers": {
"wikiforum": true
diff --git a/includes/WikiForum.class.php b/includes/WikiForum.class.php
index 2da164f..898b75a 100644
--- a/includes/WikiForum.class.php
+++ b/includes/WikiForum.class.php
@@ -1,6 +1,6 @@
.
-*
-* @param $text String: text to search for smilies
-* @return $text String: input text with smilies wrapped inside
-*/
- static function prepareSmilies( $text ) {
- global $wgWikiForumSmilies;
-
- if ( is_array( $wgWikiForumSmilies ) ) {
- foreach ( $wgWikiForumSmilies as $key => $icon ) {
- $text = str_replace( $key,
"$key", $text );
- }
- }
- return $text;
- }
-
- static function getSmilies( $text ) {
- global $wgExtensionAssetsPath;
- global $wgWikiForumSmilies;
-
- // damn unclear code => need a better preg_replace patter to
simplify
- if ( is_array( $wgWikiForumSmilies ) && !empty(
$wgWikiForumSmilies ) ) {
- $path = $wgExtensionAssetsPath . '/WikiForum';
- foreach ( $wgWikiForumSmilies as $key => $icon ) {
- $text = str_replace(
- $key,
- '',
- $text
- );
- $text = str_replace(
- '(.+)\<\/nowiki\>/iUs',
- '\1',
- $text
- );
- }
- }
- return $text;
- }
-
static function parseIt( $text ) {
global $wgOut;
- $text = WikiForumClass::prepareSmilies( $text ); // add smilies
for reply text
$text = $wgOut->parse( $text );
$text = WikiForumClass::parseLinks( $text );
$text = WikiForumClass::parseQuotes( $text );
- $text = WikiForumClass::getSmilies( $text );
return $text;
}
--
To view, visit https://gerrit.wikimedia.org/r/378527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7931ef108c002666e2ad7d20df80faec8097602
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiForum
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: UltrasonicNXT
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Babel[master]: Some design issues: fix toxic color of level-5 lang box, fix...
Iniquity has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378507 )
Change subject: Some design issues: fix toxic color of level-5 lang box, fix
width for babel-wrapper, fix wrong and overqualified rules, change font-size
for footer, add new authors and update the version
..
Some design issues: fix toxic color of level-5 lang box, fix width
for babel-wrapper, fix wrong and overqualified rules, change font-size
for footer, add new authors and update the version
Bug: T176086
Change-Id: I9e832392d7af08f3dde981450983271a6cfa49a2
---
M extension.json
M resources/ext.babel.css
2 files changed, 44 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Babel
refs/changes/07/378507/3
diff --git a/extension.json b/extension.json
index 315d686..ed3de79 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
{
"name": "Babel",
- "version": "1.10.0",
- "author": "Robert Leverington",
+ "version": "1.10.1",
+ "author": "Robert Leverington, Thiemo Mättig, Legoktm",
"url": "https://www.mediawiki.org/wiki/Extension:Babel";,
"descriptionmsg": "babel-desc",
"license-name": "GPL-2.0+",
diff --git a/resources/ext.babel.css b/resources/ext.babel.css
index 7e2a17f..78b59d1 100644
--- a/resources/ext.babel.css
+++ b/resources/ext.babel.css
@@ -9,150 +9,155 @@
*/
/* Babel wrapper layout. */
-/* @noflip */table.mw-babel-wrapper {
+.mw-babel-wrapper {
width: 238px;
float: right;
clear: right;
- margin: 0;
+ margin: 1px;
background-color: #fff;
border: 1px solid #99b3ff;
}
-/* @noflip */.mw-content-ltr table.mw-babel-wrapper {
+.mw-content-ltr .mw-babel-wrapper {
float: right;
clear: right;
}
-/* @noflip */.mw-content-rtl table.mw-babel-wrapper {
+
+.mw-content-rtl .mw-babel-wrapper {
float: left;
clear: left;
}
/* Babel box layout */
-/* @noflip */div.mw-babel-box {
+.mw-babel-box {
float: left;
clear: left;
margin: 1px;
}
-/* @noflip */.mw-content-ltr table.mw-babel-box {
+.mw-content-ltr .mw-babel-box {
float: left;
clear: left;
}
-/* @noflip */.mw-content-rtl table.mw-babel-box {
+.mw-content-rtl .mw-babel-box {
float: right;
clear: right;
}
-div.mw-babel-box table {
+.mw-babel-box table {
width: 238px;
}
-div.mw-babel-box table th {
+.mw-babel-wrapper .mw-babel-box table {
+ width: 232px;
+}
+
+.mw-babel-box table th {
width: 45px;
height: 45px;
font-size: 14pt;
- font-family: monospace;
}
-div.mw-babel-box table td {
+.mw-babel-box table td {
font-size: 8pt;
padding: 4pt;
line-height: 1.25em;
}
/* Babel box colours. */
-div.mw-babel-box-0 {
+.mw-babel-box-0 {
border: 1px solid #fbb;
}
-div.mw-babel-box-1 {
+.mw-babel-box-1 {
border: 1px solid #e0c0e0;
}
-div.mw-babel-box-2 {
+.mw-babel-box-2 {
border: 1px solid #bcb9ef;
}
-div.mw-babel-box-3 {
+.mw-babel-box-3 {
border: 1px solid #99b3ff;
}
-div.mw-babel-box-4 {
+.mw-babel-box-4 {
border: 1px solid #77e0e8;
}
-div.mw-babel-box-5 {
- border: 1px solid #cc0;
+.mw-babel-box-5 {
+ border: 1px solid #ffcf4d;
}
-div.mw-babel-box-N {
+.mw-babel-box-N {
border: 1px solid #6ef7a7;
}
-div.mw-babel-box-0 table th {
+.mw-babel-box-0 table th {
background-color: #fbb;
}
-div.mw-babel-box-1 table th {
+.mw-babel-box-1 table th {
background-color: #e0c0e0;
}
-div.mw-babel-box-2 table th {
+.mw-babel-box-2 table th {
background-color: #bcb9ef;
}
-div.mw-babel-box-3 table th {
+.mw-babel-box-3 table th {
background-color: #99b3ff;
}
-div.mw-babel-box-4 table th {
+.mw-babel-box-4 table th {
background-color: #77e0e8;
}
-div.mw-babel-box-5 table th {
- background-color: #cc0;
+.mw-babel-box-5 table th {
+ background-color: #ffcf4d;
}
-div.mw-babel-box-N table th {
+.mw-babel-box-N table th {
background-color: #6ef7a7;
}
-div.mw-babel-box-0 table {
+.mw-babel-box-0 table {
background-color: #fee;
}
-div.mw-babel-box-1 table {
+.mw-babel-box-1 table {
background-color: #f3e0f3;
}
-div.mw-babel-box-2 table {
+.mw-babel-box-2 table {
background-color: #e9e5f9;
}
-div.mw-babel-box-3 table {
+.mw-babel-box-3 table {
background-color: #e0e8ff;
}
-div.mw-babel-box-4 table {
+.mw-babel-box-4 table {
background-color: #d0f8ff;
}
-div.mw-babel-box-5 table {
- background-color: #ff9;
+.mw-babel-box-5 table {
+ background-color: #ffefa6;
}
-div.mw-babel-box-N table {
+.mw-babel-box-N table {
background-color: #c5fcdc;
}
/* header and footer */
-.mw.babel-box th.mw-babel-header {
+.mw-babel-header {
text-align: center;
[MediaWiki-commits] [Gerrit] mediawiki...WikiForum[master]: Remove obsolete smilies functionality
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378527 )
Change subject: Remove obsolete smilies functionality
..
Remove obsolete smilies functionality
This smilies functionality was never fully complete nor worked
properly. The future for emojis and smilies are planned to be in
a separate MediaWiki extension, and then have other extensions
provide support for this (MediaWikiChat and WikiForum here).
Change-Id: Ie7931ef108c002666e2ad7d20df80faec8097602
---
M extension.json
M includes/WikiForum.class.php
2 files changed, 2 insertions(+), 50 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiForum
refs/changes/27/378527/1
diff --git a/extension.json b/extension.json
index ca40e49..eec1e7f 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "WikiForum",
- "version": "2.3.1",
+ "version": "2.4.0",
"author": [
"Michael Chlebek",
"Jack Phoenix",
@@ -78,7 +78,6 @@
},
"config": {
"WikiForumAllowAnonymous": true,
- "WikiForumSmilies": [],
"WikiForumLogInRC": true,
"CaptchaTriggers": {
"wikiforum": true
diff --git a/includes/WikiForum.class.php b/includes/WikiForum.class.php
index 2da164f..898b75a 100644
--- a/includes/WikiForum.class.php
+++ b/includes/WikiForum.class.php
@@ -1,6 +1,6 @@
.
-*
-* @param $text String: text to search for smilies
-* @return $text String: input text with smilies wrapped inside
-*/
- static function prepareSmilies( $text ) {
- global $wgWikiForumSmilies;
-
- if ( is_array( $wgWikiForumSmilies ) ) {
- foreach ( $wgWikiForumSmilies as $key => $icon ) {
- $text = str_replace( $key,
"$key", $text );
- }
- }
- return $text;
- }
-
- static function getSmilies( $text ) {
- global $wgExtensionAssetsPath;
- global $wgWikiForumSmilies;
-
- // damn unclear code => need a better preg_replace patter to
simplify
- if ( is_array( $wgWikiForumSmilies ) && !empty(
$wgWikiForumSmilies ) ) {
- $path = $wgExtensionAssetsPath . '/WikiForum';
- foreach ( $wgWikiForumSmilies as $key => $icon ) {
- $text = str_replace(
- $key,
- '',
- $text
- );
- $text = str_replace(
- '(.+)\<\/nowiki\>/iUs',
- '\1',
- $text
- );
- }
- }
- return $text;
- }
-
static function parseIt( $text ) {
global $wgOut;
- $text = WikiForumClass::prepareSmilies( $text ); // add smilies
for reply text
$text = $wgOut->parse( $text );
$text = WikiForumClass::parseLinks( $text );
$text = WikiForumClass::parseQuotes( $text );
- $text = WikiForumClass::getSmilies( $text );
return $text;
}
--
To view, visit https://gerrit.wikimedia.org/r/378527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7931ef108c002666e2ad7d20df80faec8097602
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiForum
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...FanBoxes[master]: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378526 )
Change subject: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
..
Replace deprecated wfSuppressWarnings + wfRestoreWarnings
Change-Id: I959865aa184be30d2a2416b87bcd5dd45cb61ae1
---
M extension.json
M includes/api/ApiFanBoxes.php
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index fa8601e..7ec6ade 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "FanBoxes",
- "version": "3.3.1",
+ "version": "3.3.2",
"author": [
"Aaron Wright",
"David Pean",
diff --git a/includes/api/ApiFanBoxes.php b/includes/api/ApiFanBoxes.php
index 13dcde6..4dd8ec5 100644
--- a/includes/api/ApiFanBoxes.php
+++ b/includes/api/ApiFanBoxes.php
@@ -15,7 +15,7 @@
// Get the request parameters
$params = $this->extractRequestParams();
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$what = $params['what'];
$pageName = $params['page_name'];
$addRemove = $params['addRemove'];
@@ -23,7 +23,7 @@
$individualFantagId = $params['fantagId'];
$id = $params['id'];
$style = $params['style'];
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
// Ensure that we know what to do...
if ( !$what || $what === null ) {
--
To view, visit https://gerrit.wikimedia.org/r/378526
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I959865aa184be30d2a2416b87bcd5dd45cb61ae1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VoteNY[master]: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378525 )
Change subject: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
..
Replace deprecated wfSuppressWarnings + wfRestoreWarnings
Change-Id: Ia03e8717e34268dfb6522a499129f2a36768e6a1
---
M extension.json
M includes/Vote.class.php
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 1efc9e4..eb3b560 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "VoteNY",
- "version": "2.9.1",
+ "version": "2.9.2",
"author": [
"Aaron Wright",
"David Pean",
diff --git a/includes/Vote.class.php b/includes/Vote.class.php
index a581e93..ef144fd 100644
--- a/includes/Vote.class.php
+++ b/includes/Vote.class.php
@@ -147,9 +147,9 @@
function insert( $voteValue ) {
global $wgRequest;
$dbw = wfGetDB( DB_MASTER );
- wfSuppressWarnings(); // E_STRICT whining
+ MediaWiki\suppressWarnings(); // E_STRICT whining
$voteDate = date( 'Y-m-d H:i:s' );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
if ( $this->UserAlreadyVoted() == false ) {
$dbw->insert(
'Vote',
--
To view, visit https://gerrit.wikimedia.org/r/378525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia03e8717e34268dfb6522a499129f2a36768e6a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VoteNY
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...FanBoxes[master]: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378526 )
Change subject: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
..
Replace deprecated wfSuppressWarnings + wfRestoreWarnings
Change-Id: I959865aa184be30d2a2416b87bcd5dd45cb61ae1
---
M extension.json
M includes/api/ApiFanBoxes.php
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FanBoxes
refs/changes/26/378526/1
diff --git a/extension.json b/extension.json
index fa8601e..7ec6ade 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "FanBoxes",
- "version": "3.3.1",
+ "version": "3.3.2",
"author": [
"Aaron Wright",
"David Pean",
diff --git a/includes/api/ApiFanBoxes.php b/includes/api/ApiFanBoxes.php
index 13dcde6..4dd8ec5 100644
--- a/includes/api/ApiFanBoxes.php
+++ b/includes/api/ApiFanBoxes.php
@@ -15,7 +15,7 @@
// Get the request parameters
$params = $this->extractRequestParams();
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$what = $params['what'];
$pageName = $params['page_name'];
$addRemove = $params['addRemove'];
@@ -23,7 +23,7 @@
$individualFantagId = $params['fantagId'];
$id = $params['id'];
$style = $params['style'];
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
// Ensure that we know what to do...
if ( !$what || $what === null ) {
--
To view, visit https://gerrit.wikimedia.org/r/378526
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I959865aa184be30d2a2416b87bcd5dd45cb61ae1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UserStatus[master]: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378524 )
Change subject: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
..
Replace deprecated wfSuppressWarnings + wfRestoreWarnings
Change-Id: I94a699244db4c71d5c89647d2e6ea6899234ab76
---
M extension.json
M includes/api/ApiUserStatus.php
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 03d65b7..e10e586 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "UserStatus",
- "version": "3.4.0",
+ "version": "3.4.1",
"author": [
"Aaron Wright",
"David Pean",
diff --git a/includes/api/ApiUserStatus.php b/includes/api/ApiUserStatus.php
index aceab0b..34dd65c 100644
--- a/includes/api/ApiUserStatus.php
+++ b/includes/api/ApiUserStatus.php
@@ -30,7 +30,7 @@
// Sanity checks for these variables and their types is
performed below,
// in the switch() loop
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$sportId = $params['sportId'];
$teamId = $params['teamId'];
$text = $params['text'];
@@ -38,7 +38,7 @@
$userId = $params['userId'];
$us_id = $params['us_id'];
$vote = $params['vote'];
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
// Hmm, what do we want to do?
switch ( $params['what'] ) {
--
To view, visit https://gerrit.wikimedia.org/r/378524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94a699244db4c71d5c89647d2e6ea6899234ab76
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserStatus
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VoteNY[master]: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378525 )
Change subject: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
..
Replace deprecated wfSuppressWarnings + wfRestoreWarnings
Change-Id: Ia03e8717e34268dfb6522a499129f2a36768e6a1
---
M extension.json
M includes/Vote.class.php
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VoteNY
refs/changes/25/378525/1
diff --git a/extension.json b/extension.json
index 1efc9e4..eb3b560 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "VoteNY",
- "version": "2.9.1",
+ "version": "2.9.2",
"author": [
"Aaron Wright",
"David Pean",
diff --git a/includes/Vote.class.php b/includes/Vote.class.php
index a581e93..ef144fd 100644
--- a/includes/Vote.class.php
+++ b/includes/Vote.class.php
@@ -147,9 +147,9 @@
function insert( $voteValue ) {
global $wgRequest;
$dbw = wfGetDB( DB_MASTER );
- wfSuppressWarnings(); // E_STRICT whining
+ MediaWiki\suppressWarnings(); // E_STRICT whining
$voteDate = date( 'Y-m-d H:i:s' );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
if ( $this->UserAlreadyVoted() == false ) {
$dbw->insert(
'Vote',
--
To view, visit https://gerrit.wikimedia.org/r/378525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia03e8717e34268dfb6522a499129f2a36768e6a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VoteNY
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UserStatus[master]: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378524 )
Change subject: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
..
Replace deprecated wfSuppressWarnings + wfRestoreWarnings
Change-Id: I94a699244db4c71d5c89647d2e6ea6899234ab76
---
M extension.json
M includes/api/ApiUserStatus.php
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserStatus
refs/changes/24/378524/1
diff --git a/extension.json b/extension.json
index 03d65b7..e10e586 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "UserStatus",
- "version": "3.4.0",
+ "version": "3.4.1",
"author": [
"Aaron Wright",
"David Pean",
diff --git a/includes/api/ApiUserStatus.php b/includes/api/ApiUserStatus.php
index aceab0b..34dd65c 100644
--- a/includes/api/ApiUserStatus.php
+++ b/includes/api/ApiUserStatus.php
@@ -30,7 +30,7 @@
// Sanity checks for these variables and their types is
performed below,
// in the switch() loop
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$sportId = $params['sportId'];
$teamId = $params['teamId'];
$text = $params['text'];
@@ -38,7 +38,7 @@
$userId = $params['userId'];
$us_id = $params['us_id'];
$vote = $params['vote'];
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
// Hmm, what do we want to do?
switch ( $params['what'] ) {
--
To view, visit https://gerrit.wikimedia.org/r/378524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94a699244db4c71d5c89647d2e6ea6899234ab76
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserStatus
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: [WIP] Use the CustomEditor hook for preventing the editing o...
Jack Phoenix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378523 )
Change subject: [WIP] Use the CustomEditor hook for preventing the editing of
social profile pages
..
[WIP] Use the CustomEditor hook for preventing the editing of social profile
pages
Whereas previously attempting to ?action=edit a social profile page would
redirect you back to the profile page, now where you are redirected
depends on what page you're trying to edit and what user rights you have:
* if you're trying to edit your own profile -> Special:UpdateProfile
* if you're trying to edit someone else's profile and have the
'editothersprofiles' user right -> Special:EditProfile/
* otherwise -> the user page you came from (=old behavior)
Needs more testing, hence the WIP flag.
Change-Id: I92c82b583f37fbb0aecac5202aab2e803302bea8
---
M UserProfile/UserProfile.php
M UserProfile/UserProfileHooks.php
2 files changed, 74 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile
refs/changes/23/378523/1
diff --git a/UserProfile/UserProfile.php b/UserProfile/UserProfile.php
index 1420d1e..c3fca4d 100644
--- a/UserProfile/UserProfile.php
+++ b/UserProfile/UserProfile.php
@@ -116,6 +116,7 @@
$wgLogActions['avatar/avatar'] = 'avatarlogentry';
$wgHooks['ArticleFromTitle'][] = 'UserProfileHooks::onArticleFromTitle';
+$wgHooks['CustomEditor'][] = 'UserProfileHooks::onCustomEditor';
$wgHooks['OutputPageBodyAttributes'][] =
'UserProfileHooks::onOutputPageBodyAttributes';
$wgHooks['DifferenceEngineShowDiff'][] =
'UserProfileHooks::onDifferenceEngineShowDiff';
$wgHooks['DifferenceEngineShowDiffPage'][] =
'UserProfileHooks::onDifferenceEngineShowDiffPage';
diff --git a/UserProfile/UserProfileHooks.php b/UserProfile/UserProfileHooks.php
index 2d02eb4..081a8fe 100644
--- a/UserProfile/UserProfileHooks.php
+++ b/UserProfile/UserProfileHooks.php
@@ -37,7 +37,9 @@
/**
* Called by ArticleFromTitle hook
-* Calls UserProfilePage instead of standard article
+* Calls UserProfilePage instead of standard article on User: and
+* User_profile: pages for users who have opted into using a social
profile
+* page instead of the regular wikitext user page.
*
* @param Title &$title
* @param WikiPage|Article &$article
@@ -61,12 +63,7 @@
}
}
- if ( !$show_user_page ) {
- // Prevents editing of userpage
- if ( $wgRequest->getVal( 'action' ) == 'edit' )
{
- $wgOut->redirect( $title->getFullURL()
);
- }
- } else {
+ if ( $show_user_page ) {
$wgOut->enableClientCache( false );
$wgHooks['ParserLimitReport'][] =
'UserProfileHooks::markPageUncacheable';
}
@@ -83,6 +80,75 @@
}
/**
+* Redirect action=edit attempts on a social profile page to a
meaningful
+* URL, which is either:
+* -Special:UpdateProfile (if user is attempting to edit their own
profile)
+* -Special:EditProfile (if user is privileged and attempting to edit
someone
+* else's profile)
+* -the profile page (if user is attempting to edit someone else's
profile
+* without being allowed to do that)
+*
+* @param UserProfilePage|WikiPage $article
+* @param User $user
+* @return bool
+*/
+ public static function onCustomEditor( $article, $user ) {
+ global $wgOut, $wgRequest, $wgUserPageChoice;
+
+ $title = $article->getTitle();
+ $pageName = $title->getText();
+ // We only care about pages which can be social profile pages
here, so
+ // ignore all other pages.
+ if ( !$title->inNamespaces( [ NS_USER, NS_USER_PROFILE ] ) ) {
+ return true;
+ }
+
+ $userOwnsThisProfile = (
+ $title->equals( $user->getUserPage() ) ||
+ $title->equals( Title::makeTitle( NS_USER_PROFILE,
$user->getName() ) )
+ );
+ if ( !$title->isSubpage() ) {
+ $show_user_page = false;
+ if ( $wgUserPageChoice ) {
+ $profile = new UserProfile( $pageName );
+ $profile_data = $profile->getProfile();
+
+ // If they want regular page, ignore this hook
+ if (
+ isset( $profile_data['user_id'] ) &&
+ $profile_data['user_id'] &&
[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378519 )
Change subject: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
..
Replace deprecated wfSuppressWarnings + wfRestoreWarnings
Change-Id: I6ff99b4408e88e8ba4bcd6f9476eb987ef2e68eb
---
M SystemGifts/SpecialSystemGiftManagerLogo.php
M UserGifts/SpecialGiftManagerLogo.php
M UserProfile/SpecialRemoveAvatar.php
3 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SystemGifts/SpecialSystemGiftManagerLogo.php
b/SystemGifts/SpecialSystemGiftManagerLogo.php
index ada78ba..2031d5f 100644
--- a/SystemGifts/SpecialSystemGiftManagerLogo.php
+++ b/SystemGifts/SpecialSystemGiftManagerLogo.php
@@ -478,9 +478,9 @@
* @access private
*/
function unsaveUploadedFile() {
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$success = unlink( $this->mUploadTempName );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
if ( !$success ) {
throw new FatalError( $this->msg( 'filedeleteerror',
$this->mUploadTempName )->escaped() );
}
diff --git a/UserGifts/SpecialGiftManagerLogo.php
b/UserGifts/SpecialGiftManagerLogo.php
index 595bec9..9f05bb0 100644
--- a/UserGifts/SpecialGiftManagerLogo.php
+++ b/UserGifts/SpecialGiftManagerLogo.php
@@ -492,9 +492,9 @@
* @access private
*/
function unsaveUploadedFile() {
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$success = unlink( $this->mUploadTempName );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
if ( !$success ) {
throw new FatalError( $this->msg( 'filedeleteerror',
$this->mUploadTempName )->escaped() );
}
diff --git a/UserProfile/SpecialRemoveAvatar.php
b/UserProfile/SpecialRemoveAvatar.php
index 0910215..7768e8c 100644
--- a/UserProfile/SpecialRemoveAvatar.php
+++ b/UserProfile/SpecialRemoveAvatar.php
@@ -214,9 +214,9 @@
$avatar = new wAvatar( $id, $size );
$files = glob( $wgUploadDirectory . '/avatars/' . $wgAvatarKey
. '_' . $id . '_' . $size . "*" );
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$img = basename( $files[0] );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
if ( $img && $img[0] ) {
unlink( $wgUploadDirectory . '/avatars/' . $img );
}
--
To view, visit https://gerrit.wikimedia.org/r/378519
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ff99b4408e88e8ba4bcd6f9476eb987ef2e68eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Lewis Cawte
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...SportsTeams[master]: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378520 )
Change subject: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
..
Replace deprecated wfSuppressWarnings + wfRestoreWarnings
Change-Id: I20c8e07404dcb909b95060f4f702abe30975b1fd
---
M extension.json
M includes/api/ApiSportsTeams.php
M includes/specials/SpecialSportsManagerLogo.php
M includes/specials/SpecialSportsTeamsManagerLogo.php
4 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index a5343e8..adab339 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "SportsTeams",
- "version": "3.5.1",
+ "version": "3.5.2",
"author": [
"Aaron Wright",
"Ashish Datta",
diff --git a/includes/api/ApiSportsTeams.php b/includes/api/ApiSportsTeams.php
index 0e92e19..508eb04 100644
--- a/includes/api/ApiSportsTeams.php
+++ b/includes/api/ApiSportsTeams.php
@@ -22,9 +22,9 @@
// Get the request parameters
$params = $this->extractRequestParams();
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$sportId = $params['sportId'];
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
// You only had one job...
if ( !$sportId || $sportId === null || !is_numeric( $sportId )
) {
diff --git a/includes/specials/SpecialSportsManagerLogo.php
b/includes/specials/SpecialSportsManagerLogo.php
index fcff4cb..6247438 100644
--- a/includes/specials/SpecialSportsManagerLogo.php
+++ b/includes/specials/SpecialSportsManagerLogo.php
@@ -452,9 +452,9 @@
* @access private
*/
function unsaveUploadedFile() {
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$success = unlink( $this->mUploadTempName );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
if ( !$success ) {
throw new FatalError( $this->msg( 'filedeleteerror',
$this->mUploadTempName )->escaped() );
}
diff --git a/includes/specials/SpecialSportsTeamsManagerLogo.php
b/includes/specials/SpecialSportsTeamsManagerLogo.php
index d2cba8f..c609fb3 100644
--- a/includes/specials/SpecialSportsTeamsManagerLogo.php
+++ b/includes/specials/SpecialSportsTeamsManagerLogo.php
@@ -451,9 +451,9 @@
* @access private
*/
function unsaveUploadedFile() {
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$success = unlink( $this->mUploadTempName );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
if ( !$success ) {
throw new FatalError( $this->msg( 'filedeleteerror',
$this->mUploadTempName )->escaped() );
}
--
To view, visit https://gerrit.wikimedia.org/r/378520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I20c8e07404dcb909b95060f4f702abe30975b1fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SportsTeams
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ChangeAuthor[master]: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378515 )
Change subject: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
..
Replace deprecated wfSuppressWarnings + wfRestoreWarnings
Change-Id: Ie0c384621dd400e1763e3b8f979158d0185857ef
---
M ChangeAuthor.body.php
M extension.json
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ChangeAuthor.body.php b/ChangeAuthor.body.php
index 5a1de1d..f15a210 100644
--- a/ChangeAuthor.body.php
+++ b/ChangeAuthor.body.php
@@ -377,10 +377,10 @@
$logId = $logEntry->insert();
$logEntry->publish( $logId );
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$editcounts[$users[1]->getId()]++;
$editcounts[$users[0]->getId()]--;
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
}
foreach ( $editcounts as $userId => $mutation ) {
diff --git a/extension.json b/extension.json
index f583173..7434cd9 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "ChangeAuthor",
- "version": "1.2.2",
+ "version": "1.2.3",
"author": [
"Roan Kattouw"
],
--
To view, visit https://gerrit.wikimedia.org/r/378515
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0c384621dd400e1763e3b8f979158d0185857ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ChangeAuthor
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Kartographer: Capture geohack variant
TheDJ has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378522 )
Change subject: Kartographer: Capture geohack variant
..
Kartographer: Capture geohack variant
Bug: T173049
Change-Id: Idcfb01ebc2274820c975de5891e51ed120490f4a
---
M modules/ext.wikimediaEvents.kartographer.js
1 file changed, 6 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/22/378522/1
diff --git a/modules/ext.wikimediaEvents.kartographer.js
b/modules/ext.wikimediaEvents.kartographer.js
index 2971a94..16cf309 100644
--- a/modules/ext.wikimediaEvents.kartographer.js
+++ b/modules/ext.wikimediaEvents.kartographer.js
@@ -228,6 +228,12 @@
if ( data.options && data.options.extra &&
data.action.endsWith( 'layer' ) ) {
options.extra.layer = data.options.extra.layer;
}
+ if ( data.options && data.options.extra &&
data.options.extra.variant ) {
+ options.extra.variant =
data.options.extra.variant;
+ if ( data.options.extra.open_trigger ) {
+ options.extra.open_trigger =
data.options.extra.open_trigger;
+ }
+ }
logEvent( data.feature.featureType, data.action,
data.isFullScreen, isFirstInteraction( isInteraction ), options );
} );
--
To view, visit https://gerrit.wikimedia.org/r/378522
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idcfb01ebc2274820c975de5891e51ed120490f4a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: TheDJ
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Remove archived Article Comments
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378521 ) Change subject: Remove archived Article Comments .. Remove archived Article Comments https://www.mediawiki.org/wiki/Extension:ArticleComments Change-Id: I46ebeb75aa1f0eb0816c33c7d42382f3596c5aca --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 642f9ba..5171671 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -89,11 +89,6 @@ Arrays -Article Comments -aliasfile = ArticleComments/ArticleComments.alias.php -descmsg = article-comments-desc -ignored = article-comments-prefilled-comment-text, article-comments-new-comment-heading, article-comments-comment-contents - Article Creation Workflow descmsg = acw-desc -- To view, visit https://gerrit.wikimedia.org/r/378521 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I46ebeb75aa1f0eb0816c33c7d42382f3596c5aca Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Raimond Spekking 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...SportsTeams[master]: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378520 )
Change subject: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
..
Replace deprecated wfSuppressWarnings + wfRestoreWarnings
Change-Id: I20c8e07404dcb909b95060f4f702abe30975b1fd
---
M extension.json
M includes/api/ApiSportsTeams.php
M includes/specials/SpecialSportsManagerLogo.php
M includes/specials/SpecialSportsTeamsManagerLogo.php
4 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SportsTeams
refs/changes/20/378520/1
diff --git a/extension.json b/extension.json
index a5343e8..adab339 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "SportsTeams",
- "version": "3.5.1",
+ "version": "3.5.2",
"author": [
"Aaron Wright",
"Ashish Datta",
diff --git a/includes/api/ApiSportsTeams.php b/includes/api/ApiSportsTeams.php
index 0e92e19..508eb04 100644
--- a/includes/api/ApiSportsTeams.php
+++ b/includes/api/ApiSportsTeams.php
@@ -22,9 +22,9 @@
// Get the request parameters
$params = $this->extractRequestParams();
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$sportId = $params['sportId'];
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
// You only had one job...
if ( !$sportId || $sportId === null || !is_numeric( $sportId )
) {
diff --git a/includes/specials/SpecialSportsManagerLogo.php
b/includes/specials/SpecialSportsManagerLogo.php
index fcff4cb..6247438 100644
--- a/includes/specials/SpecialSportsManagerLogo.php
+++ b/includes/specials/SpecialSportsManagerLogo.php
@@ -452,9 +452,9 @@
* @access private
*/
function unsaveUploadedFile() {
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$success = unlink( $this->mUploadTempName );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
if ( !$success ) {
throw new FatalError( $this->msg( 'filedeleteerror',
$this->mUploadTempName )->escaped() );
}
diff --git a/includes/specials/SpecialSportsTeamsManagerLogo.php
b/includes/specials/SpecialSportsTeamsManagerLogo.php
index d2cba8f..c609fb3 100644
--- a/includes/specials/SpecialSportsTeamsManagerLogo.php
+++ b/includes/specials/SpecialSportsTeamsManagerLogo.php
@@ -451,9 +451,9 @@
* @access private
*/
function unsaveUploadedFile() {
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$success = unlink( $this->mUploadTempName );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
if ( !$success ) {
throw new FatalError( $this->msg( 'filedeleteerror',
$this->mUploadTempName )->escaped() );
}
--
To view, visit https://gerrit.wikimedia.org/r/378520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I20c8e07404dcb909b95060f4f702abe30975b1fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SportsTeams
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Remove archived Article Comments
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378521 ) Change subject: Remove archived Article Comments .. Remove archived Article Comments https://www.mediawiki.org/wiki/Extension:ArticleComments Change-Id: I46ebeb75aa1f0eb0816c33c7d42382f3596c5aca --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/21/378521/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 642f9ba..5171671 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -89,11 +89,6 @@ Arrays -Article Comments -aliasfile = ArticleComments/ArticleComments.alias.php -descmsg = article-comments-desc -ignored = article-comments-prefilled-comment-text, article-comments-new-comment-heading, article-comments-comment-contents - Article Creation Workflow descmsg = acw-desc -- To view, visit https://gerrit.wikimedia.org/r/378521 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I46ebeb75aa1f0eb0816c33c7d42382f3596c5aca Gerrit-PatchSet: 1 Gerrit-Project: translatewiki 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...SocialProfile[master]: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378519 )
Change subject: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
..
Replace deprecated wfSuppressWarnings + wfRestoreWarnings
Change-Id: I6ff99b4408e88e8ba4bcd6f9476eb987ef2e68eb
---
M SystemGifts/SpecialSystemGiftManagerLogo.php
M UserGifts/SpecialGiftManagerLogo.php
M UserProfile/SpecialRemoveAvatar.php
3 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile
refs/changes/19/378519/1
diff --git a/SystemGifts/SpecialSystemGiftManagerLogo.php
b/SystemGifts/SpecialSystemGiftManagerLogo.php
index ada78ba..2031d5f 100644
--- a/SystemGifts/SpecialSystemGiftManagerLogo.php
+++ b/SystemGifts/SpecialSystemGiftManagerLogo.php
@@ -478,9 +478,9 @@
* @access private
*/
function unsaveUploadedFile() {
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$success = unlink( $this->mUploadTempName );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
if ( !$success ) {
throw new FatalError( $this->msg( 'filedeleteerror',
$this->mUploadTempName )->escaped() );
}
diff --git a/UserGifts/SpecialGiftManagerLogo.php
b/UserGifts/SpecialGiftManagerLogo.php
index 595bec9..9f05bb0 100644
--- a/UserGifts/SpecialGiftManagerLogo.php
+++ b/UserGifts/SpecialGiftManagerLogo.php
@@ -492,9 +492,9 @@
* @access private
*/
function unsaveUploadedFile() {
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$success = unlink( $this->mUploadTempName );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
if ( !$success ) {
throw new FatalError( $this->msg( 'filedeleteerror',
$this->mUploadTempName )->escaped() );
}
diff --git a/UserProfile/SpecialRemoveAvatar.php
b/UserProfile/SpecialRemoveAvatar.php
index 0910215..7768e8c 100644
--- a/UserProfile/SpecialRemoveAvatar.php
+++ b/UserProfile/SpecialRemoveAvatar.php
@@ -214,9 +214,9 @@
$avatar = new wAvatar( $id, $size );
$files = glob( $wgUploadDirectory . '/avatars/' . $wgAvatarKey
. '_' . $id . '_' . $size . "*" );
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$img = basename( $files[0] );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
if ( $img && $img[0] ) {
unlink( $wgUploadDirectory . '/avatars/' . $img );
}
--
To view, visit https://gerrit.wikimedia.org/r/378519
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ff99b4408e88e8ba4bcd6f9476eb987ef2e68eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Remove some archived extensions
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378518 ) Change subject: Remove some archived extensions .. Remove some archived extensions Snippet: Archived - T154220 NumberOfComments: Archived - T146431 USERNAME: Archived - T146243 WikiLabels: Archived - Ied7f30964e345dc643df29937ae960314dc79f56 WikiPinger: Readonly - https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/WikiPinger ArticleComments: Archived - https://www.mediawiki.org/wiki/Extension:ArticleComments GoogleMaps: Archived - https://www.mediawiki.org/wiki/Extension:Google_Maps InterwikiMagic: Archived - https://www.mediawiki.org/wiki/Extension:ShoutWiki_Interwiki_Magic MWSearch: Archived - https://www.mediawiki.org/wiki/Extension:MWSearch StrategyWiki: Read-only - https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/StrategyWiki WebCache: Readonly - https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/WebCache Bootstrap: Moved to github - https://github.com/DaSchTour/Bootstrap/ CreditTab: Moved to github - https://github.com/DaSchTour/CreditTab/ Bug: T154220 Bug: T146431 Bug: T146243 Change-Id: Ifc38e3ed23a716ceb74b08a6c63a62fd88e25c88 --- M zuul/layout.yaml 1 file changed, 13 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/18/378518/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index ca6caf9..8414d02 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3702,8 +3702,7 @@ - name: mediawiki/extensions/MWSearch template: - - name: extension-unittests-generic - - name: mwgate-npm + - name: archived - name: mediawiki/extensions/MWVersionInfo template: @@ -3767,7 +3766,7 @@ - name: mediawiki/extensions/NumberOfComments template: - - name: extension-unittests-generic + - name: archived - name: mediawiki/extensions/OATHAuth template: @@ -4135,8 +4134,7 @@ - name: mediawiki/extensions/Bootstrap template: - - name: extension-unittests-composer - - name: mwgate-npm + - name: archived - name: mediawiki/extensions/BreadCrumbs template: @@ -4256,8 +4254,7 @@ - name: mediawiki/extensions/CreditTab template: - - name: extension-unittests-generic - - name: mwgate-npm + - name: archived - name: mediawiki/extensions/CryoKey template: @@ -4478,8 +4475,7 @@ - name: mediawiki/extensions/GoogleMaps template: - - name: extension-unittests-generic - - name: mwgate-npm + - name: archived - name: mediawiki/extensions/GooglePlusOne template: @@ -4588,8 +4584,7 @@ - name: mediawiki/extensions/InterwikiMagic template: - - name: extension-unittests-generic - - name: mwgate-npm + - name: archived - name: mediawiki/extensions/InviteSignup template: @@ -5423,8 +5418,7 @@ - name: mediawiki/extensions/Snippet template: - - name: extension-unittests-generic - - name: mwgate-npm + - name: archived - name: mediawiki/extensions/SocialLogin template: @@ -5720,7 +5714,7 @@ - name: mediawiki/extensions/USERNAME template: - - name: extension-unittests-generic + - name: archived - name: mediawiki/extensions/UserPageEditProtection template: @@ -5887,8 +5881,7 @@ - name: mediawiki/extensions/WikiLabels template: - - name: extension-unittests-generic - - name: mwgate-npm + - name: archived - name: mediawiki/extensions/WikiLovesMonuments template: @@ -5902,8 +5895,7 @@ - name: mediawiki/extensions/WikiPinger template: - - name: mwgate-npm - - name: extension-unittests-generic + - name: archived - name: mediawiki/extensions/WikiShare template: @@ -5952,7 +5944,7 @@ - name: mediawiki/extensions/ArticleComments template: - - name: extension-unittests-generic + - name: archived - name: mediawiki/extensions/AzharAuth template: @@ -6218,7 +6210,7 @@ - name: mediawiki/extensions/WebCache template: - - name: extension-unittests-generic + - name: archived - name: mediawiki/extensions/WhosOnline template: @@ -6655,7 +6647,7 @@ - name: mediawiki/extensions/StrategyWiki template: - - name: extension-unittests-generic + - name: archived - name: mediawiki/extensions/SubPageList3 template: -- To view, visit https://gerrit.wikimedia.org/r/378518 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc38e3ed23a716ceb74b08a6c63a62fd88e25c88 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/me
[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Remove WDEntitySuggester, NumberOfComments, WikiLabels, Vect...
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378517 ) Change subject: Remove WDEntitySuggester, NumberOfComments, WikiLabels, Vector, USERNAME .. Remove WDEntitySuggester, NumberOfComments, WikiLabels, Vector, USERNAME WikidataEntitySuggester: Read only https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/WikidataEntitySuggester NumberOfComments: Archived T146431 WikiLabels: Read-Only https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/WikiLabels Vector: Archived https://www.mediawiki.org/wiki/Extension:Vector USERNAME: Archived T146243 Bug: T146243 Bug: T146431 Change-Id: Ie0655684d2677c490e0d71dc844ed2a3f233caf1 --- M .gitmodules D NumberOfComments D USERNAME D Vector D WikiLabels D WikidataEntitySuggester 6 files changed, 0 insertions(+), 25 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/17/378517/2 diff --git a/.gitmodules b/.gitmodules index 4e5e65e..a020ec7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1650,10 +1650,6 @@ path = NumberFormat url = https://gerrit.wikimedia.org/r/mediawiki/extensions/NumberFormat branch = . -[submodule "NumberOfComments"] - path = NumberOfComments - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/NumberOfComments - branch = . [submodule "NumberOfWikis"] path = NumberOfWikis url = https://gerrit.wikimedia.org/r/mediawiki/extensions/NumberOfWikis @@ -2734,10 +2730,6 @@ path = URNames url = https://gerrit.wikimedia.org/r/mediawiki/extensions/URNames branch = . -[submodule "USERNAME"] - path = USERNAME - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/USERNAME - branch = . [submodule "UnCaptcha"] path = UnCaptcha url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UnCaptcha @@ -2833,10 +2825,6 @@ [submodule "Variables"] path = Variables url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Variables - branch = . -[submodule "Vector"] - path = Vector - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Vector branch = . [submodule "VectorBeta"] path = VectorBeta @@ -2946,10 +2934,6 @@ path = WikiForum url = https://gerrit.wikimedia.org/r/mediawiki/extensions/WikiForum branch = . -[submodule "WikiLabels"] - path = WikiLabels - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/WikiLabels - branch = . [submodule "WikiLexicalData"] path = WikiLexicalData url = https://gerrit.wikimedia.org/r/mediawiki/extensions/WikiLexicalData @@ -3013,10 +2997,6 @@ [submodule "Wikidata.org"] path = Wikidata.org url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikidata.org - branch = . -[submodule "WikidataEntitySuggester"] - path = WikidataEntitySuggester - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataEntitySuggester branch = . [submodule "WikidataPageBanner"] path = WikidataPageBanner diff --git a/NumberOfComments b/NumberOfComments deleted file mode 16 index 2dbed59..000 --- a/NumberOfComments +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2dbed593f8303c29a514182fdaf7283ff7d5452b diff --git a/USERNAME b/USERNAME deleted file mode 16 index 4f2ec06..000 --- a/USERNAME +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4f2ec064cac9f7fcc8feb87816806ab924a1da3e diff --git a/Vector b/Vector deleted file mode 16 index c7ce834..000 --- a/Vector +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c7ce834022e0b562248f8d1c040d00440b60189c diff --git a/WikiLabels b/WikiLabels deleted file mode 16 index c02fb3c..000 --- a/WikiLabels +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c02fb3c38cc38103b0ad412dac88859fd5a0da9f diff --git a/WikidataEntitySuggester b/WikidataEntitySuggester deleted file mode 16 index ee76702..000 --- a/WikidataEntitySuggester +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ee767024a5933ffaf13d91731d77cb951c7f06ba -- To view, visit https://gerrit.wikimedia.org/r/378517 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0655684d2677c490e0d71dc844ed2a3f233caf1 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions 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/extensions[master]: Remove WDEntitySuggester, NumberOfComments, WikiLabels, Vect...
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378517 ) Change subject: Remove WDEntitySuggester, NumberOfComments, WikiLabels, Vector, USERNAME .. Remove WDEntitySuggester, NumberOfComments, WikiLabels, Vector, USERNAME WikidataEntitySuggester: Read only https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/WikidataEntitySuggester NumberOfComments: Archived T146431 WikiLabels: Read-Only https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/WikiLabels Vector: Archived https://www.mediawiki.org/wiki/Extension:Vector USERNAME: Archived T146243 Bug: T146243 Bug: T146431 Change-Id: Ie0655684d2677c490e0d71dc844ed2a3f233caf1 --- M .gitmodules D NumberOfComments D USERNAME D Vector D WikiLabels D WikidataEntitySuggester 6 files changed, 0 insertions(+), 25 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules index 4e5e65e..a020ec7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1650,10 +1650,6 @@ path = NumberFormat url = https://gerrit.wikimedia.org/r/mediawiki/extensions/NumberFormat branch = . -[submodule "NumberOfComments"] - path = NumberOfComments - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/NumberOfComments - branch = . [submodule "NumberOfWikis"] path = NumberOfWikis url = https://gerrit.wikimedia.org/r/mediawiki/extensions/NumberOfWikis @@ -2734,10 +2730,6 @@ path = URNames url = https://gerrit.wikimedia.org/r/mediawiki/extensions/URNames branch = . -[submodule "USERNAME"] - path = USERNAME - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/USERNAME - branch = . [submodule "UnCaptcha"] path = UnCaptcha url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UnCaptcha @@ -2833,10 +2825,6 @@ [submodule "Variables"] path = Variables url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Variables - branch = . -[submodule "Vector"] - path = Vector - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Vector branch = . [submodule "VectorBeta"] path = VectorBeta @@ -2946,10 +2934,6 @@ path = WikiForum url = https://gerrit.wikimedia.org/r/mediawiki/extensions/WikiForum branch = . -[submodule "WikiLabels"] - path = WikiLabels - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/WikiLabels - branch = . [submodule "WikiLexicalData"] path = WikiLexicalData url = https://gerrit.wikimedia.org/r/mediawiki/extensions/WikiLexicalData @@ -3013,10 +2997,6 @@ [submodule "Wikidata.org"] path = Wikidata.org url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikidata.org - branch = . -[submodule "WikidataEntitySuggester"] - path = WikidataEntitySuggester - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/WikidataEntitySuggester branch = . [submodule "WikidataPageBanner"] path = WikidataPageBanner diff --git a/NumberOfComments b/NumberOfComments deleted file mode 16 index 2dbed59..000 --- a/NumberOfComments +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2dbed593f8303c29a514182fdaf7283ff7d5452b diff --git a/USERNAME b/USERNAME deleted file mode 16 index 4f2ec06..000 --- a/USERNAME +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4f2ec064cac9f7fcc8feb87816806ab924a1da3e diff --git a/Vector b/Vector deleted file mode 16 index c7ce834..000 --- a/Vector +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c7ce834022e0b562248f8d1c040d00440b60189c diff --git a/WikiLabels b/WikiLabels deleted file mode 16 index c02fb3c..000 --- a/WikiLabels +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c02fb3c38cc38103b0ad412dac88859fd5a0da9f diff --git a/WikidataEntitySuggester b/WikidataEntitySuggester deleted file mode 16 index ee76702..000 --- a/WikidataEntitySuggester +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ee767024a5933ffaf13d91731d77cb951c7f06ba -- To view, visit https://gerrit.wikimedia.org/r/378517 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie0655684d2677c490e0d71dc844ed2a3f233caf1 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Kartographer: Protect against undefined data.options
TheDJ has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378516 )
Change subject: Kartographer: Protect against undefined data.options
..
Kartographer: Protect against undefined data.options
Bug: T174249
Change-Id: I5b0623452a017a2f23ddeb57aaa118da7af564ea
---
M modules/ext.wikimediaEvents.kartographer.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/16/378516/1
diff --git a/modules/ext.wikimediaEvents.kartographer.js
b/modules/ext.wikimediaEvents.kartographer.js
index 9996062..8042130 100644
--- a/modules/ext.wikimediaEvents.kartographer.js
+++ b/modules/ext.wikimediaEvents.kartographer.js
@@ -225,7 +225,7 @@
break;
}
- if ( data.action.endsWith( 'layer' ) ) {
+ if ( data.options && data.action.endsWith( 'layer' ) ) {
options.extra.layer = data.options.extra.layer;
}
--
To view, visit https://gerrit.wikimedia.org/r/378516
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b0623452a017a2f23ddeb57aaa118da7af564ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: TheDJ
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ChangeAuthor[master]: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378515 )
Change subject: Replace deprecated wfSuppressWarnings + wfRestoreWarnings
..
Replace deprecated wfSuppressWarnings + wfRestoreWarnings
Change-Id: Ie0c384621dd400e1763e3b8f979158d0185857ef
---
M ChangeAuthor.body.php
M extension.json
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ChangeAuthor
refs/changes/15/378515/1
diff --git a/ChangeAuthor.body.php b/ChangeAuthor.body.php
index 5a1de1d..f15a210 100644
--- a/ChangeAuthor.body.php
+++ b/ChangeAuthor.body.php
@@ -377,10 +377,10 @@
$logId = $logEntry->insert();
$logEntry->publish( $logId );
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$editcounts[$users[1]->getId()]++;
$editcounts[$users[0]->getId()]--;
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
}
foreach ( $editcounts as $userId => $mutation ) {
diff --git a/extension.json b/extension.json
index f583173..7434cd9 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "ChangeAuthor",
- "version": "1.2.2",
+ "version": "1.2.3",
"author": [
"Roan Kattouw"
],
--
To view, visit https://gerrit.wikimedia.org/r/378515
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0c384621dd400e1763e3b8f979158d0185857ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ChangeAuthor
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Refreshed[master]: Remove extra cruft from composer.json package
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378513 )
Change subject: Remove extra cruft from composer.json package
..
Remove extra cruft from composer.json package
Back then I thought this would be a good idea, but this skin
isn't meant to be installed as a composer package, so let's just
remove it.
Change-Id: I0411c535dd25abac6429367ce917ee805ac00ad5
---
M composer.json
1 file changed, 0 insertions(+), 27 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 54e7cb4..91f9bb4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,31 +1,4 @@
{
- "name": "mediawiki/refreshed-skin",
- "type": "mediawiki-skin",
- "description": "A modern, refreshed interface for MediaWiki as used on
Brickimedia",
- "keywords": [
- "wiki",
- "MediaWiki",
- "skin"
- ],
- "homepage": "https://www.mediawiki.org/wiki/Skin:Refreshed";,
- "license": "GPL-2.0+",
- "authors": [
- {
- "name": "Brickimedia",
- "homepage": "http://brickimedia.org";
- }
- ],
- "support": {
- "wiki": "https://www.mediawiki.org/wiki/Skin:Refreshed";,
- "forum": "https://www.mediawiki.org/wiki/Skin_talk:Refreshed";,
- "source":
"https://github.com/wikimedia/mediawiki-skins-Refreshed.git";,
- "issues":
"https://phabricator.wikimedia.org/maniphest/task/edit/form/1/?projects=brickimedia,refreshed";,
- "irc": "irc://irc.freenode.org/brickimedia"
- },
- "require": {
- "php": ">=5.3.0",
- "param-processor/param-processor": "~1.0.0"
- },
"config": {
"optimize-autoloader": true,
"prepend-autoloader": false
--
To view, visit https://gerrit.wikimedia.org/r/378513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0411c535dd25abac6429367ce917ee805ac00ad5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Refreshed
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Wrap fieldset in SpecialNewpages using HTMLForm
Ladsgroup has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378514 ) Change subject: Wrap fieldset in SpecialNewpages using HTMLForm .. Wrap fieldset in SpecialNewpages using HTMLForm That's cleaner and fixes Ie119c92aa4936e2f8982163d4b00d08949f49264 Change-Id: I8721ae5db79d287a49c2ab8070f8838174a8d687 --- M includes/specials/SpecialNewpages.php 1 file changed, 7 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/14/378514/1 diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php index edfaa7c..671ab6f 100644 --- a/includes/specials/SpecialNewpages.php +++ b/includes/specials/SpecialNewpages.php @@ -278,19 +278,14 @@ } ); $htmlForm->setMethod( 'get' ); - - $out->addHTML( Xml::fieldset( $this->msg( 'newpages' )->text() ) ); - + $htmlForm->setWrapperLegend( true ); + $htmlForm->setWrapperLegendMsg( 'newpages' ); + $htmlForm->addFooterText( Html::rawElement( + 'div', + null, + $this->filterLinks() + ) ); $htmlForm->show(); - - $out->addHTML( - Html::rawElement( - 'div', - null, - $this->filterLinks() - ) . - Xml::closeElement( 'fieldset' ) - ); } /** -- To view, visit https://gerrit.wikimedia.org/r/378514 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8721ae5db79d287a49c2ab8070f8838174a8d687 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Refreshed[master]: Remove extra cruft from composer.json package
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378513 )
Change subject: Remove extra cruft from composer.json package
..
Remove extra cruft from composer.json package
Back then I thought this would be a good idea, but SocialProfile
isn't meant to be installed as a composer package, so let's just
remove it.
Change-Id: I0411c535dd25abac6429367ce917ee805ac00ad5
---
M composer.json
1 file changed, 0 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Refreshed
refs/changes/13/378513/1
diff --git a/composer.json b/composer.json
index 54e7cb4..91f9bb4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,31 +1,4 @@
{
- "name": "mediawiki/refreshed-skin",
- "type": "mediawiki-skin",
- "description": "A modern, refreshed interface for MediaWiki as used on
Brickimedia",
- "keywords": [
- "wiki",
- "MediaWiki",
- "skin"
- ],
- "homepage": "https://www.mediawiki.org/wiki/Skin:Refreshed";,
- "license": "GPL-2.0+",
- "authors": [
- {
- "name": "Brickimedia",
- "homepage": "http://brickimedia.org";
- }
- ],
- "support": {
- "wiki": "https://www.mediawiki.org/wiki/Skin:Refreshed";,
- "forum": "https://www.mediawiki.org/wiki/Skin_talk:Refreshed";,
- "source":
"https://github.com/wikimedia/mediawiki-skins-Refreshed.git";,
- "issues":
"https://phabricator.wikimedia.org/maniphest/task/edit/form/1/?projects=brickimedia,refreshed";,
- "irc": "irc://irc.freenode.org/brickimedia"
- },
- "require": {
- "php": ">=5.3.0",
- "param-processor/param-processor": "~1.0.0"
- },
"config": {
"optimize-autoloader": true,
"prepend-autoloader": false
--
To view, visit https://gerrit.wikimedia.org/r/378513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0411c535dd25abac6429367ce917ee805ac00ad5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Refreshed
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Fix typo in word "duplicate"
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378501 )
Change subject: Fix typo in word "duplicate"
..
Fix typo in word "duplicate"
Bug: T175944
Change-Id: I2b92c648d4f186cc68872df2fa7822bdc2fd6e5a
---
M i18n/upload/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Raimond Spekking: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/upload/en.json b/i18n/upload/en.json
index aee848c..3488b9a 100755
--- a/i18n/upload/en.json
+++ b/i18n/upload/en.json
@@ -24,6 +24,6 @@
"bs-upload-uploadwarningdialog-intro": "The following warnings occured
while trying to upload the file",
"bs-upload-uploadwarningdialog-outro": "Click \"{{int:bs-extjs-ok}}\"
to ignore warnings and upload file, click \"{{int:bs-extjs-cancel}}\" to return
to the upload form",
"bs-upload-uploadwarningdialog-warning-exists": "A file with name
\"$1\" already exists",
- "bs-upload-uploadwarningdialog-warning-duplicate": "There
{{PLURAL:$1|is a duplictae|are duplicates}} of this file",
+ "bs-upload-uploadwarningdialog-warning-duplicate": "There
{{PLURAL:$1|is a duplicate|are duplicates}} of this file",
"bs-upload-uploadwarningdialog-warning-unknown": "Unknown warning with
code \"$1\""
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/378501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b92c648d4f186cc68872df2fa7822bdc2fd6e5a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Raimond Spekking
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Remove extra cruft from composer.json package
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378512 )
Change subject: Remove extra cruft from composer.json package
..
Remove extra cruft from composer.json package
Back then I thought this would be a good idea, but SocialProfile
isn't meant to be installed as a composer package, so let's just
remove it.
Change-Id: I93afa30069de9d7ca4158225042f5c6ffac7e079
---
M composer.json
1 file changed, 0 insertions(+), 43 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 9f648f0..8b11209 100644
--- a/composer.json
+++ b/composer.json
@@ -1,47 +1,4 @@
{
- "name": "mediawiki/socialprofile",
- "type": "mediawiki-extension",
- "description": "A set of social tools for MediaWiki",
- "license": "GPL-2.0+",
- "keywords": [
- "Wiki",
- "MediaWiki",
- "Social tools",
- "SocialProfile"
- ],
- "homepage": "https://www.mediawiki.org/wiki/Extension:SocialProfile";,
- "authors": [
- {
- "name": "Aaron Wright",
- "homepage":
"https://www.mediawiki.org/wiki/Special:Contributions/Awrigh01~mediawikiwiki";,
- "role": "Developer"
- },
- {
- "name": "Adam Carter (UltrasonicNXT)",
- "homepage":
"https://www.mediawiki.org/wiki/User:UltrasonicNXT";,
- "role": "Developer"
- },
- {
- "name": "David Pean",
- "role": "Developer"
- },
- {
- "name": "Jack Phoenix",
- "email": "j...@countervandalism.net",
- "homepage":
"https://mediawiki.org/wiki/User:Jack_Phoenix";,
- "role": "Developer"
- }
- ],
- "support": {
- "wiki":
"https://www.mediawiki.org/wiki/Extension:SocialProfile";,
- "forum":
"https://www.mediawiki.org/wiki/Extension_talk:SocialProfile";,
- "source": "https://phabricator.wikimedia.org/diffusion/ESPR/";,
- "issues":
"https://phabricator.wikimedia.org/maniphest/task/edit/form/1/?projects=social-tools,socialprofile";
- },
- "require": {
- "php": ">=5.5.9",
- "mediawiki/core": ">= 1.28.0"
- },
"minimum-stability": "dev",
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
--
To view, visit https://gerrit.wikimedia.org/r/378512
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I93afa30069de9d7ca4158225042f5c6ffac7e079
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Lewis Cawte
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Remove extra cruft from composer.json package
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378512 )
Change subject: Remove extra cruft from composer.json package
..
Remove extra cruft from composer.json package
Back then I thought this would be a good idea, but SocialProfile
isn't meant to be installed as a composer package, so let's just
remove it.
Change-Id: I93afa30069de9d7ca4158225042f5c6ffac7e079
---
M composer.json
1 file changed, 0 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile
refs/changes/12/378512/1
diff --git a/composer.json b/composer.json
index 9f648f0..8b11209 100644
--- a/composer.json
+++ b/composer.json
@@ -1,47 +1,4 @@
{
- "name": "mediawiki/socialprofile",
- "type": "mediawiki-extension",
- "description": "A set of social tools for MediaWiki",
- "license": "GPL-2.0+",
- "keywords": [
- "Wiki",
- "MediaWiki",
- "Social tools",
- "SocialProfile"
- ],
- "homepage": "https://www.mediawiki.org/wiki/Extension:SocialProfile";,
- "authors": [
- {
- "name": "Aaron Wright",
- "homepage":
"https://www.mediawiki.org/wiki/Special:Contributions/Awrigh01~mediawikiwiki";,
- "role": "Developer"
- },
- {
- "name": "Adam Carter (UltrasonicNXT)",
- "homepage":
"https://www.mediawiki.org/wiki/User:UltrasonicNXT";,
- "role": "Developer"
- },
- {
- "name": "David Pean",
- "role": "Developer"
- },
- {
- "name": "Jack Phoenix",
- "email": "j...@countervandalism.net",
- "homepage":
"https://mediawiki.org/wiki/User:Jack_Phoenix";,
- "role": "Developer"
- }
- ],
- "support": {
- "wiki":
"https://www.mediawiki.org/wiki/Extension:SocialProfile";,
- "forum":
"https://www.mediawiki.org/wiki/Extension_talk:SocialProfile";,
- "source": "https://phabricator.wikimedia.org/diffusion/ESPR/";,
- "issues":
"https://phabricator.wikimedia.org/maniphest/task/edit/form/1/?projects=social-tools,socialprofile";
- },
- "require": {
- "php": ">=5.5.9",
- "mediawiki/core": ">= 1.28.0"
- },
"minimum-stability": "dev",
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
--
To view, visit https://gerrit.wikimedia.org/r/378512
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I93afa30069de9d7ca4158225042f5c6ffac7e079
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update documentation in Xml::fieldset()
Ladsgroup has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378511 ) Change subject: Update documentation in Xml::fieldset() .. Update documentation in Xml::fieldset() Fllow up to Ie119c92aa4936e2f8982163d4b00d08949f49264 Change-Id: I9d856d8433b7615d636d1918147a534e89a4bf31 --- M includes/Xml.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/11/378511/1 diff --git a/includes/Xml.php b/includes/Xml.php index eadc7d1..ea2be08 100644 --- a/includes/Xml.php +++ b/includes/Xml.php @@ -601,7 +601,7 @@ * @param string|bool $legend Legend of the fieldset. If evaluates to false, * legend is not added. * @param string $content Pre-escaped content for the fieldset. If false, -* only open fieldset is returned. +* only an empty fieldset is returned. * @param array $attribs Any attributes to fieldset-element. * * @return string -- To view, visit https://gerrit.wikimedia.org/r/378511 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d856d8433b7615d636d1918147a534e89a4bf31 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TitleKey[master]: Coding style cleanup and whatnot
Jack Phoenix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378510 )
Change subject: Coding style cleanup and whatnot
..
Coding style cleanup and whatnot
Changed long array syntax to short and DB_SLAVE to DB_REPLICA
Change-Id: Iee5ee01df40f36a074de3dcdfc956d508e144dfc
---
M TitleKey_body.php
1 file changed, 52 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TitleKey
refs/changes/10/378510/1
diff --git a/TitleKey_body.php b/TitleKey_body.php
index 44f223c..5c50089 100644
--- a/TitleKey_body.php
+++ b/TitleKey_body.php
@@ -20,35 +20,39 @@
*/
class TitleKey {
- static $deleteIds = array();
+ static $deleteIds = [];
// Active functions...
static function deleteKey( $id ) {
- $db = wfGetDB( DB_MASTER );
- $db->delete( 'titlekey',
- array( 'tk_page' => $id ),
- __METHOD__ );
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw->delete(
+ 'titlekey',
+ [ 'tk_page' => $id ],
+ __METHOD__
+ );
}
static function setKey( $id, $title ) {
- self::setBatchKeys( array( $id => $title ) );
+ self::setBatchKeys( [ $id => $title ] );
}
static function setBatchKeys( $titles ) {
- $rows = array();
- foreach( $titles as $id => $title ) {
- $rows[] = array(
+ $rows = [];
+ foreach ( $titles as $id => $title ) {
+ $rows[] = [
'tk_page' => $id,
'tk_namespace' => $title->getNamespace(),
'tk_key' => self::normalize( $title->getText()
),
- );
+ ];
}
- $db = wfGetDB( DB_MASTER );
- $db->replace( 'titlekey', array( 'tk_page' ),
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw->replace(
+ 'titlekey',
+ [ 'tk_page' ],
$rows,
- __METHOD__ );
+ __METHOD__
+ );
}
-
// Normalization...
static function normalize( $text ) {
@@ -66,7 +70,7 @@
public static function setup() {
global $wgHooks;
$wgHooks['PrefixSearchBackend'][] =
'TitleKey::prefixSearchBackend';
- $wgHooks['SearchGetNearMatch' ][] =
'TitleKey::searchGetNearMatch';
+ $wgHooks['SearchGetNearMatch'][] =
'TitleKey::searchGetNearMatch';
}
static function updateDeleteSetup( $article, $user, $reason ) {
@@ -77,7 +81,7 @@
static function updateDelete( $article, $user, $reason ) {
$title = $article->mTitle->getPrefixedText();
- if( isset( self::$deleteIds[$title] ) ) {
+ if ( isset( self::$deleteIds[$title] ) ) {
self::deleteKey( self::$deleteIds[$title] );
}
return true;
@@ -114,7 +118,7 @@
}
static function updateUndelete( $title, $isnewid ) {
- $article = new Article($title);
+ $article = new Article( $title );
$id = $article->getID();
self::setKey( $id, $title );
return true;
@@ -128,7 +132,7 @@
* Status info is sent to stdout.
*/
public static function schemaUpdates( $updater = null ) {
- $updater->addExtensionUpdate( array( array( __CLASS__,
'runUpdates' ) ) );
+ $updater->addExtensionUpdate( [ [ __CLASS__, 'runUpdates' ] ] );
require_once __DIR__ . '/rebuildTitleKeys.php';
$updater->addPostDatabaseUpdateMaintenance( 'RebuildTitleKeys'
);
return true;
@@ -136,13 +140,13 @@
public static function runUpdates( $updater ) {
$db = $updater->getDB();
- if( $db->tableExists( 'titlekey' ) ) {
+ if ( $db->tableExists( 'titlekey' ) ) {
$updater->output( "...titlekey table already exists.\n"
);
} else {
- $updater->output( "Creating titlekey table..." );
- $sourcefile = $db->getType() == 'postgres' ?
'/titlekey.pg.sql' : '/titlekey.sql';
- $err = $db->sourceFile( dirname( __FILE__ ) .
$sourcefile );
- if( $err !== true ) {
+ $updater->output( 'Creating titlekey table...' );
+ $sourceFile = $db->getType() == 'postgres' ?
'/titlekey.pg.sql' : '/titlekey.sql';
+ $err = $db->sourceFile( __DIR__ . $sourceFile );
[MediaWiki-commits] [Gerrit] mediawiki...XMLContentExtension[master]: Archive Extension:XMLContentExtension
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378498 ) Change subject: Archive Extension:XMLContentExtension .. Archive Extension:XMLContentExtension Bug: T148825 Change-Id: I1aeebca07f56d4ffee8814831933ee341d00da37 --- D .jshintignore D CODE_OF_CONDUCT.md D Gruntfile.js A OBSOLETE D XMLContentExtension.body.php D XMLContentExtension.hooks.php D XMLContentExtension.php D XMLContentExtension.resources.php D XMLContentExtension.routes.php D assets/css/XMLContentExtension.css D assets/js/XMLContentExtension.js D assets/js/ace/ace-builds-master/ChangeLog.txt D assets/js/ace/ace-builds-master/LICENSE D assets/js/ace/ace-builds-master/README.md D assets/js/ace/ace-builds-master/demo/kitchen-sink/logo.png D assets/js/ace/ace-builds-master/demo/kitchen-sink/styles.css D assets/js/ace/ace-builds-master/editor.html D assets/js/ace/ace-builds-master/kitchen-sink-req.html D assets/js/ace/ace-builds-master/kitchen-sink.html D assets/js/ace/ace-builds-master/kitchen-sink/demo.js D assets/js/ace/ace-builds-master/kitchen-sink/docs/AsciiDoc.asciidoc D assets/js/ace/ace-builds-master/kitchen-sink/docs/AsciiDoc.html D assets/js/ace/ace-builds-master/kitchen-sink/docs/Haxe.hx D assets/js/ace/ace-builds-master/kitchen-sink/docs/Makefile D assets/js/ace/ace-builds-master/kitchen-sink/docs/OpenSCAD.scad D assets/js/ace/ace-builds-master/kitchen-sink/docs/abap.abap D assets/js/ace/ace-builds-master/kitchen-sink/docs/actionscript.as D assets/js/ace/ace-builds-master/kitchen-sink/docs/assembly_x86.asm D assets/js/ace/ace-builds-master/kitchen-sink/docs/autohotkey.ahk D assets/js/ace/ace-builds-master/kitchen-sink/docs/batchfile.bat D assets/js/ace/ace-builds-master/kitchen-sink/docs/c9search.c9search_results D assets/js/ace/ace-builds-master/kitchen-sink/docs/clojure.clj D assets/js/ace/ace-builds-master/kitchen-sink/docs/coffeescript.coffee D assets/js/ace/ace-builds-master/kitchen-sink/docs/coldfusion.cfm D assets/js/ace/ace-builds-master/kitchen-sink/docs/cpp.cpp D assets/js/ace/ace-builds-master/kitchen-sink/docs/csharp.cs D assets/js/ace/ace-builds-master/kitchen-sink/docs/css.css D assets/js/ace/ace-builds-master/kitchen-sink/docs/curly.curly D assets/js/ace/ace-builds-master/kitchen-sink/docs/dart.dart D assets/js/ace/ace-builds-master/kitchen-sink/docs/diff.diff D assets/js/ace/ace-builds-master/kitchen-sink/docs/dot.dot D assets/js/ace/ace-builds-master/kitchen-sink/docs/erlang.erl D assets/js/ace/ace-builds-master/kitchen-sink/docs/forth.frt D assets/js/ace/ace-builds-master/kitchen-sink/docs/freemarker.ftl D assets/js/ace/ace-builds-master/kitchen-sink/docs/glsl.glsl D assets/js/ace/ace-builds-master/kitchen-sink/docs/golang.go D assets/js/ace/ace-builds-master/kitchen-sink/docs/groovy.groovy D assets/js/ace/ace-builds-master/kitchen-sink/docs/haml.haml D assets/js/ace/ace-builds-master/kitchen-sink/docs/haskell.hs D assets/js/ace/ace-builds-master/kitchen-sink/docs/html.html D assets/js/ace/ace-builds-master/kitchen-sink/docs/html_ruby.erb D assets/js/ace/ace-builds-master/kitchen-sink/docs/jade.jade D assets/js/ace/ace-builds-master/kitchen-sink/docs/java.java D assets/js/ace/ace-builds-master/kitchen-sink/docs/javascript.js D assets/js/ace/ace-builds-master/kitchen-sink/docs/json.json D assets/js/ace/ace-builds-master/kitchen-sink/docs/jsp.jsp D assets/js/ace/ace-builds-master/kitchen-sink/docs/jsx.jsx D assets/js/ace/ace-builds-master/kitchen-sink/docs/julia.jl D assets/js/ace/ace-builds-master/kitchen-sink/docs/latex.tex D assets/js/ace/ace-builds-master/kitchen-sink/docs/less.less D assets/js/ace/ace-builds-master/kitchen-sink/docs/liquid.liquid D assets/js/ace/ace-builds-master/kitchen-sink/docs/lisp.lisp D assets/js/ace/ace-builds-master/kitchen-sink/docs/livescript.ls D assets/js/ace/ace-builds-master/kitchen-sink/docs/logiql.logic D assets/js/ace/ace-builds-master/kitchen-sink/docs/lsl.lsl D assets/js/ace/ace-builds-master/kitchen-sink/docs/lua.lua D assets/js/ace/ace-builds-master/kitchen-sink/docs/luapage.lp D assets/js/ace/ace-builds-master/kitchen-sink/docs/lucene.lucene D assets/js/ace/ace-builds-master/kitchen-sink/docs/markdown.md D assets/js/ace/ace-builds-master/kitchen-sink/docs/mushcode.mc D assets/js/ace/ace-builds-master/kitchen-sink/docs/objectivec.m D assets/js/ace/ace-builds-master/kitchen-sink/docs/ocaml.ml D assets/js/ace/ace-builds-master/kitchen-sink/docs/pascal.pas D assets/js/ace/ace-builds-master/kitchen-sink/docs/perl.pl D assets/js/ace/ace-builds-master/kitchen-sink/docs/pgsql.pgsql D assets/js/ace/ace-builds-master/kitchen-sink/docs/php.php D assets/js/ace/ace-builds-master/kitchen-sink/docs/plaintext.txt D assets/js/ace/ace-builds-master/kitchen-sink/docs/powershell.ps1 D assets/js/ace/ace-builds-master/kitchen-sink/docs/prolog.plg D assets/js/ace/ace-builds-master/kitchen-sink/docs/properties.properties D assets/js/ace/ace-builds-master/kitchen-sink/docs/python.py D
[MediaWiki-commits] [Gerrit] mediawiki...FormatDates[master]: Rename LICENCE to LICENSE
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378509 ) Change subject: Rename LICENCE to LICENSE .. Rename LICENCE to LICENSE Only LICENSE is displayed by Special:Version Change-Id: Ib0621ce6828b1d992fbba60fa803039932085cbc --- R LICENSE 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FormatDates refs/changes/09/378509/1 diff --git a/LICENCE b/LICENSE similarity index 100% rename from LICENCE rename to LICENSE -- To view, visit https://gerrit.wikimedia.org/r/378509 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0621ce6828b1d992fbba60fa803039932085cbc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/FormatDates 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/core[master]: Cleanup form for history
Ladsgroup has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378508 ) Change subject: Cleanup form for history .. Cleanup form for history Also fixing regression caused by Ie119c92aa4936e2f8982163d4b00d08949f49264 Change-Id: I59f623d2dc43f83cfca3ff31ef79fed0230f68af --- M includes/actions/HistoryAction.php 1 file changed, 14 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/08/378508/1 diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php index 7460340..a94951f 100644 --- a/includes/actions/HistoryAction.php +++ b/includes/actions/HistoryAction.php @@ -192,27 +192,26 @@ // Add the general form $action = htmlspecialchars( wfScript() ); + $content = Html::hidden( 'title', $this->getTitle()->getPrefixedDBkey() ) . "\n"; + $content .= Html::hidden( 'action', 'history' ) . "\n"; + $content .= Xml::dateMenu( + ( $year == null ? MWTimestamp::getLocalInstance()->format( 'Y' ) : $year ), + $month + ) . ' '; + $content .= ( $tagSelector ? ( implode( ' ', $tagSelector ) . ' ' ) : '' ); + $content .= $checkDeleted . Html::submitButton( + $this->msg( 'historyaction-submit' )->text(), + [], + [ 'mw-ui-progressive' ] + ); $out->addHTML( "" . Xml::fieldset( $this->msg( 'history-fieldset-title' )->text(), - false, + $content, [ 'id' => 'mw-history-search' ] ) . - Html::hidden( 'title', $this->getTitle()->getPrefixedDBkey() ) . "\n" . - Html::hidden( 'action', 'history' ) . "\n" . - Xml::dateMenu( - ( $year == null ? MWTimestamp::getLocalInstance()->format( 'Y' ) : $year ), - $month - ) . ' ' . - ( $tagSelector ? ( implode( ' ', $tagSelector ) . ' ' ) : '' ) . - $checkDeleted . - Html::submitButton( - $this->msg( 'historyaction-submit' )->text(), - [], - [ 'mw-ui-progressive' ] - ) . "\n" . - '' + '' ); Hooks::run( 'PageHistoryBeforeList', [ &$this->page, $this->getContext() ] ); -- To view, visit https://gerrit.wikimedia.org/r/378508 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59f623d2dc43f83cfca3ff31ef79fed0230f68af Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Remove Vine, UnitTest, SimpleSurvey, PrefSwitch, BlameMaps, ...
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378504 ) Change subject: Remove Vine, UnitTest, SimpleSurvey, PrefSwitch, BlameMaps, WikimediaShopLink .. Remove Vine, UnitTest, SimpleSurvey, PrefSwitch, BlameMaps, WikimediaShopLink All are archived on mw.org Vine: https://www.mediawiki.org/wiki/Extension:Vine UnitTest: https://www.mediawiki.org/wiki/Extension:UnitTest SimpleSurvey: https://www.mediawiki.org/wiki/Extension:SimpleSurvey PrefSwitch: https://www.mediawiki.org/wiki/Extension:PrefSwitch BlameMaps: https://www.mediawiki.org/wiki/Extension:BlameMaps WikimediaShopLink: https://www.mediawiki.org/wiki/Extension:WikimediaShopLink Test config already set to "archived" Change-Id: I0efa02966d875b90013342dc28fd5038fe42f327 --- M .gitmodules D BlameMaps D PrefSwitch D SimpleSurvey D UnitTest D Vine D WikimediaShopLink 7 files changed, 0 insertions(+), 30 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/04/378504/2 diff --git a/.gitmodules b/.gitmodules index a1c19b9..4e5e65e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -190,10 +190,6 @@ path = Blackout url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Blackout branch = . -[submodule "BlameMaps"] - path = BlameMaps - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlameMaps - branch = . [submodule "BlockAndNuke"] path = BlockAndNuke url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlockAndNuke @@ -1966,10 +1962,6 @@ path = PostEdit url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PostEdit branch = . -[submodule "PrefSwitch"] - path = PrefSwitch - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PrefSwitch - branch = . [submodule "Premoderation"] path = Premoderation url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Premoderation @@ -2394,10 +2386,6 @@ path = SimpleSort url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SimpleSort branch = . -[submodule "SimpleSurvey"] - path = SimpleSurvey - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SimpleSurvey - branch = . [submodule "SiteMatrix"] path = SiteMatrix url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SiteMatrix @@ -2758,10 +2746,6 @@ path = UnicodeConverter url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UnicodeConverter branch = . -[submodule "UnitTest"] - path = UnitTest - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UnitTest - branch = . [submodule "UniversalLanguageSelector"] path = UniversalLanguageSelector url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UniversalLanguageSelector @@ -2877,10 +2861,6 @@ [submodule "VikiTitleIcon"] path = VikiTitleIcon url = https://gerrit.wikimedia.org/r/mediawiki/extensions/VikiTitleIcon - branch = . -[submodule "Vine"] - path = Vine - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Vine branch = . [submodule "VipsScaler"] path = VipsScaler @@ -3061,10 +3041,6 @@ [submodule "WikimediaMessages"] path = WikimediaMessages url = https://gerrit.wikimedia.org/r/mediawiki/extensions/WikimediaMessages - branch = . -[submodule "WikimediaShopLink"] - path = WikimediaShopLink - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/WikimediaShopLink branch = . [submodule "WikipediaExtracts"] path = WikipediaExtracts diff --git a/BlameMaps b/BlameMaps deleted file mode 16 index 8c83aa0..000 --- a/BlameMaps +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8c83aa0fee1a7554b84d7d08dfb277564b5135d6 diff --git a/PrefSwitch b/PrefSwitch deleted file mode 16 index 7ba30ff..000 --- a/PrefSwitch +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7ba30ffc3b439b9d5e25c1a26ff554b97fd15df5 diff --git a/SimpleSurvey b/SimpleSurvey deleted file mode 16 index fcfdf7c..000 --- a/SimpleSurvey +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fcfdf7ca4188c2707f9a5868e52434670f8aa5b7 diff --git a/UnitTest b/UnitTest deleted file mode 16 index c168bed..000 --- a/UnitTest +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c168bed75515414c790db6c8c3567de8a3815ea1 diff --git a/Vine b/Vine deleted file mode 16 index be831b9..000 --- a/Vine +++ /dev/null @@ -1 +0,0 @@ -Subproject commit be831b9945feccfeec5ec0db09df6099b854ce07 diff --git a/WikimediaShopLink b/WikimediaShopLink deleted file mode 16 index dc90a0b..000 --- a/WikimediaShopLink +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dc90a0bdedc10ae22cbd8ce8ff2fdf8aa2eb81c0 -- To view, visit https://gerrit.wikimedia.org/r/378504 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit
[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Remove Vine, UnitTest, SimpleSurvey, PrefSwitch, BlameMaps, ...
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378504 ) Change subject: Remove Vine, UnitTest, SimpleSurvey, PrefSwitch, BlameMaps, WikimediaShopLink .. Remove Vine, UnitTest, SimpleSurvey, PrefSwitch, BlameMaps, WikimediaShopLink All are archived on mw.org Vine: https://www.mediawiki.org/wiki/Extension:Vine UnitTest: https://www.mediawiki.org/wiki/Extension:UnitTest SimpleSurvey: https://www.mediawiki.org/wiki/Extension:SimpleSurvey PrefSwitch: https://www.mediawiki.org/wiki/Extension:PrefSwitch BlameMaps: https://www.mediawiki.org/wiki/Extension:BlameMaps WikimediaShopLink: https://www.mediawiki.org/wiki/Extension:WikimediaShopLink Test config already set to "archived" Change-Id: I0efa02966d875b90013342dc28fd5038fe42f327 --- M .gitmodules D BlameMaps D PrefSwitch D SimpleSurvey D UnitTest D Vine D WikimediaShopLink 7 files changed, 0 insertions(+), 30 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules index a1c19b9..4e5e65e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -190,10 +190,6 @@ path = Blackout url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Blackout branch = . -[submodule "BlameMaps"] - path = BlameMaps - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlameMaps - branch = . [submodule "BlockAndNuke"] path = BlockAndNuke url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlockAndNuke @@ -1966,10 +1962,6 @@ path = PostEdit url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PostEdit branch = . -[submodule "PrefSwitch"] - path = PrefSwitch - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PrefSwitch - branch = . [submodule "Premoderation"] path = Premoderation url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Premoderation @@ -2394,10 +2386,6 @@ path = SimpleSort url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SimpleSort branch = . -[submodule "SimpleSurvey"] - path = SimpleSurvey - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SimpleSurvey - branch = . [submodule "SiteMatrix"] path = SiteMatrix url = https://gerrit.wikimedia.org/r/mediawiki/extensions/SiteMatrix @@ -2758,10 +2746,6 @@ path = UnicodeConverter url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UnicodeConverter branch = . -[submodule "UnitTest"] - path = UnitTest - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UnitTest - branch = . [submodule "UniversalLanguageSelector"] path = UniversalLanguageSelector url = https://gerrit.wikimedia.org/r/mediawiki/extensions/UniversalLanguageSelector @@ -2877,10 +2861,6 @@ [submodule "VikiTitleIcon"] path = VikiTitleIcon url = https://gerrit.wikimedia.org/r/mediawiki/extensions/VikiTitleIcon - branch = . -[submodule "Vine"] - path = Vine - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Vine branch = . [submodule "VipsScaler"] path = VipsScaler @@ -3061,10 +3041,6 @@ [submodule "WikimediaMessages"] path = WikimediaMessages url = https://gerrit.wikimedia.org/r/mediawiki/extensions/WikimediaMessages - branch = . -[submodule "WikimediaShopLink"] - path = WikimediaShopLink - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/WikimediaShopLink branch = . [submodule "WikipediaExtracts"] path = WikipediaExtracts diff --git a/BlameMaps b/BlameMaps deleted file mode 16 index 8c83aa0..000 --- a/BlameMaps +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8c83aa0fee1a7554b84d7d08dfb277564b5135d6 diff --git a/PrefSwitch b/PrefSwitch deleted file mode 16 index 7ba30ff..000 --- a/PrefSwitch +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7ba30ffc3b439b9d5e25c1a26ff554b97fd15df5 diff --git a/SimpleSurvey b/SimpleSurvey deleted file mode 16 index fcfdf7c..000 --- a/SimpleSurvey +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fcfdf7ca4188c2707f9a5868e52434670f8aa5b7 diff --git a/UnitTest b/UnitTest deleted file mode 16 index c168bed..000 --- a/UnitTest +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c168bed75515414c790db6c8c3567de8a3815ea1 diff --git a/Vine b/Vine deleted file mode 16 index be831b9..000 --- a/Vine +++ /dev/null @@ -1 +0,0 @@ -Subproject commit be831b9945feccfeec5ec0db09df6099b854ce07 diff --git a/WikimediaShopLink b/WikimediaShopLink deleted file mode 16 index dc90a0b..000 --- a/WikimediaShopLink +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dc90a0bdedc10ae22cbd8ce8ff2fdf8aa2eb81c0 -- To view, visit https://gerrit.wikimedia.org/r/378504 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: mer
[MediaWiki-commits] [Gerrit] mediawiki...FlickrAPI[master]: [WiP] Remove dependency on phpflickr
Samwilson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378506 )
Change subject: [WiP] Remove dependency on phpflickr
..
[WiP] Remove dependency on phpflickr
This moves the small parts of phpflickr that this extension was
using, into a new Flickr class. This is because that library is
now rather out of date, and was throwing lots of errors from parts
of it that have nothing to do with the simple usage here.
Change-Id: I63352c905c2491200e62c1f6810f0604bb7e8baf
---
M FlickrAPI.hooks.php
D FlickrAPICache.php
M composer.json
M extension.json
A includes/Flickr.php
5 files changed, 143 insertions(+), 83 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlickrAPI
refs/changes/06/378506/1
diff --git a/FlickrAPI.hooks.php b/FlickrAPI.hooks.php
index c2f7332..694dccd 100644
--- a/FlickrAPI.hooks.php
+++ b/FlickrAPI.hooks.php
@@ -1,5 +1,7 @@
getConfig();
+ $apiKey = $config->get( 'FlickrAPIKey' );
+ $apiSecret = $config->get( 'FlickrAPISecret' );
$options = self::extractOptions( $optionsString );
/** @todo i18n these errors? */
- if ( $wgFlickrAPIKey == '' ) {
+ if ( $apiKey == '' ) {
throw new MWException(
'Flickr Error ( No API key ): You must set
$wgFlickrAPIKey!' );
}
@@ -155,18 +157,10 @@
throw new MWException( 'Flickr Error ( Not a valid ID
): PhotoID not numeric' );
}
- $phpFlickr = new phpFlickr( $wgFlickrAPIKey, $wgFlickrAPISecret
);
+ $flickr = new Flickr( $apiKey, $apiSecret );
- // Decide which cache to use
- if ( $wgUseFileCache ) {
- $phpFlickr->enableCache( 'fs', $wgFileCacheDirectory );
- } else {
- $phpFlickr->enableCache( 'custom',
- [ 'FlickrAPICache::getCache',
'FlickrAPICache::setCache' ] );
- }
-
- $info = $phpFlickr->photos_getInfo( $options['id'] );
- $flickrSizes = $phpFlickr->photos_getSizes( $options['id'] );
+ $info = $flickr->photosGetInfo( $options['id'] );
+ $flickrSizes = $flickr->photosGetSizes( $options['id'] );
if ( !$info || !$flickrSizes ) {
throw new MWException( 'Flickr Error ( Photo not found
): PhotoID ' . $options['id'] );
}
@@ -191,7 +185,7 @@
$validSizes = self::getValidSizes();
$handlerParams = [];
- foreach ( $flickrSizes as $flickrSize ) {
+ foreach ( $flickrSizes['size'] as $flickrSize ) {
if ( $flickrSize['label'] ===
$validSizes[$options['size']] ) {
$handlerParams['width'] = $flickrSize['width'];
$url = $flickrSize['source'];
@@ -206,7 +200,6 @@
$imageLink = FlickrAPIUtils::makeImageLink( $parser, $url,
$frameParams, $handlerParams );
- wfProfileOut( __METHOD__ );
return Html::rawElement( 'div', [ 'class' => 'flickrapi' ],
$imageLink );
}
}
diff --git a/FlickrAPICache.php b/FlickrAPICache.php
deleted file mode 100644
index d376edd..000
--- a/FlickrAPICache.php
+++ /dev/null
@@ -1,41 +0,0 @@
-get( $key );
- wfDebugLog( "FlickrAPI", __METHOD__ . ": got " . var_export(
$cached, true ) .
- " from cache." );
- return $cached;
- }
-
- /**
-* Store this call in cache.
-*
-* @param string $reqhash The cache key.
-* @param string $response The response to cache.
-* @param int $cache_expire Either an interval in seconds or a unix
timestamp for expiry.
-* @return bool
-*/
- public static function setCache( $reqhash, $response, $cache_expire ) {
- $cache = wfGetCache( CACHE_ANYTHING );
- $key = wfMemcKey( 'flickrapi', $reqhash );
- wfDebugLog( "FlickrAPI",
- __METHOD__ . ": caching " . var_export( $response, true
) .
- " from Flickr." );
- return $cache->set( $key, $response, $cache_expire );
- }
-}
diff --git a/composer.json b/composer.json
index 32c9312..9dc2960 100755
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,4 @@
{
- "require": {
- "dan-coulter/phpflickr": "dev-master"
- },
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.12.0",
@@ -15,24 +12,5 @@
"fix": [
"phpcbf"
]
- },
- "repositories": [
- {
- "type": "package"
[MediaWiki-commits] [Gerrit] mediawiki...MiniInvite[master]: Prevent the "Subject" and "Email body" fields from overflowi...
Jack Phoenix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378505 )
Change subject: Prevent the "Subject" and "Email body" fields from overflowing
on mobile
..
Prevent the "Subject" and "Email body" fields from overflowing on mobile
Bug: T156481
Change-Id: I53d275e6e5ad4ef950a170cd9480c7309f99b451
---
M resources/css/invite.css
1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MiniInvite
refs/changes/05/378505/1
diff --git a/resources/css/invite.css b/resources/css/invite.css
index 81f3918..e37ec82 100644
--- a/resources/css/invite.css
+++ b/resources/css/invite.css
@@ -199,4 +199,16 @@
.invite-email-text {
border: 1px solid #DCDCDC;
background-color: #F2F2F2;
+}
+
+/**
+ * Prevent the "Subject" and "Email body" fields from overflowing on mobile
+ * @see https://phabricator.wikimedia.org/T156481
+ */
+.email-field #subject {
+ max-width: 91%;
+}
+
+.email-field #body {
+ max-width: 93%;
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/378505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I53d275e6e5ad4ef950a170cd9480c7309f99b451
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MiniInvite
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] mediawiki/extensions[master]: Remove Vine extension
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378503 ) Change subject: Remove Vine extension .. Remove Vine extension Bug: T157224 Change-Id: Ifdc0ba2917803a6f7ff98cfb502f1c8a84e32213 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/378503 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifdc0ba2917803a6f7ff98cfb502f1c8a84e32213 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Remove Vine extension
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378503 ) Change subject: Remove Vine extension .. Remove Vine extension Bug: T157224 Change-Id: Ifdc0ba2917803a6f7ff98cfb502f1c8a84e32213 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/03/378503/1 -- To view, visit https://gerrit.wikimedia.org/r/378503 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifdc0ba2917803a6f7ff98cfb502f1c8a84e32213 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions 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/extensions[master]: Remove Parsoid, MoveToCommons, MoveToCommonsClient extensions
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378502 ) Change subject: Remove Parsoid, MoveToCommons, MoveToCommonsClient extensions .. Remove Parsoid, MoveToCommons, MoveToCommonsClient extensions Parsoid has an UNUSED file MoveToCommons has OBSOLETE file MoveToCommonsClient has OBSOLETE file Change-Id: I1d929aba59968c2fe5eba6d715230279d0393671 --- M .gitmodules D MoveToCommons D MoveToCommonsClient D Parsoid 4 files changed, 0 insertions(+), 15 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules index c5179ab..a1c19b9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1498,14 +1498,6 @@ path = Moodle url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Moodle branch = . -[submodule "MoveToCommons"] - path = MoveToCommons - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/MoveToCommons - branch = . -[submodule "MoveToCommonsClient"] - path = MoveToCommonsClient - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/MoveToCommonsClient - branch = . [submodule "Mpdf"] path = Mpdf url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Mpdf @@ -1857,10 +1849,6 @@ [submodule "ParserMigration"] path = ParserMigration url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ParserMigration - branch = . -[submodule "Parsoid"] - path = Parsoid - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Parsoid branch = . [submodule "ParsoidBatchAPI"] path = ParsoidBatchAPI diff --git a/MoveToCommons b/MoveToCommons deleted file mode 16 index 8f84074..000 --- a/MoveToCommons +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8f84074ee74411a5bbad7c041ac97aab603f07ce diff --git a/MoveToCommonsClient b/MoveToCommonsClient deleted file mode 16 index 1d897db..000 --- a/MoveToCommonsClient +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1d897db259097d2d4d9c575a6357793df2cae109 diff --git a/Parsoid b/Parsoid deleted file mode 16 index a9d4d58..000 --- a/Parsoid +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a9d4d58326c8cca6388cd4867d6f801747ca1482 -- To view, visit https://gerrit.wikimedia.org/r/378502 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d929aba59968c2fe5eba6d715230279d0393671 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Remove Parsoid, MoveToCommons, MoveToCommonsClient extensions
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378502 ) Change subject: Remove Parsoid, MoveToCommons, MoveToCommonsClient extensions .. Remove Parsoid, MoveToCommons, MoveToCommonsClient extensions Parsoid has an UNUSED file MoveToCommons has OBSOLETE file MoveToCommonsClient has OBSOLETE file Change-Id: I1d929aba59968c2fe5eba6d715230279d0393671 --- M .gitmodules D MoveToCommons D MoveToCommonsClient D Parsoid 4 files changed, 0 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/02/378502/2 diff --git a/.gitmodules b/.gitmodules index c5179ab..a1c19b9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1498,14 +1498,6 @@ path = Moodle url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Moodle branch = . -[submodule "MoveToCommons"] - path = MoveToCommons - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/MoveToCommons - branch = . -[submodule "MoveToCommonsClient"] - path = MoveToCommonsClient - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/MoveToCommonsClient - branch = . [submodule "Mpdf"] path = Mpdf url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Mpdf @@ -1857,10 +1849,6 @@ [submodule "ParserMigration"] path = ParserMigration url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ParserMigration - branch = . -[submodule "Parsoid"] - path = Parsoid - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Parsoid branch = . [submodule "ParsoidBatchAPI"] path = ParsoidBatchAPI diff --git a/MoveToCommons b/MoveToCommons deleted file mode 16 index 8f84074..000 --- a/MoveToCommons +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8f84074ee74411a5bbad7c041ac97aab603f07ce diff --git a/MoveToCommonsClient b/MoveToCommonsClient deleted file mode 16 index 1d897db..000 --- a/MoveToCommonsClient +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1d897db259097d2d4d9c575a6357793df2cae109 diff --git a/Parsoid b/Parsoid deleted file mode 16 index a9d4d58..000 --- a/Parsoid +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a9d4d58326c8cca6388cd4867d6f801747ca1482 -- To view, visit https://gerrit.wikimedia.org/r/378502 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d929aba59968c2fe5eba6d715230279d0393671 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions 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/extensions[master]: Archive Extension:XMLContentExtension
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378494 ) Change subject: Archive Extension:XMLContentExtension .. Archive Extension:XMLContentExtension Bug: T148825 Change-Id: I4819d5c0660ab3549e179fbd0c130fc66ccb211a --- M .gitmodules D XMLContentExtension 2 files changed, 0 insertions(+), 5 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules index 6243f60..c5179ab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3102,10 +3102,6 @@ path = XAnalytics url = https://gerrit.wikimedia.org/r/mediawiki/extensions/XAnalytics branch = . -[submodule "XMLContentExtension"] - path = XMLContentExtension - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/XMLContentExtension - branch = . [submodule "XenForoAuth"] path = XenForoAuth url = https://gerrit.wikimedia.org/r/mediawiki/extensions/XenForoAuth diff --git a/XMLContentExtension b/XMLContentExtension deleted file mode 16 index a113783..000 --- a/XMLContentExtension +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a113783129f38c77fbab012cb00c380455209fe1 -- To view, visit https://gerrit.wikimedia.org/r/378494 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4819d5c0660ab3549e179fbd0c130fc66ccb211a Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: MarcoAurelio Gerrit-Reviewer: SamanthaNguyen Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Fix typo in word "duplicate"
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378501 )
Change subject: Fix typo in word "duplicate"
..
Fix typo in word "duplicate"
Bug: T175944
Change-Id: I2b92c648d4f186cc68872df2fa7822bdc2fd6e5a
---
M i18n/upload/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/01/378501/1
diff --git a/i18n/upload/en.json b/i18n/upload/en.json
index aee848c..3488b9a 100755
--- a/i18n/upload/en.json
+++ b/i18n/upload/en.json
@@ -24,6 +24,6 @@
"bs-upload-uploadwarningdialog-intro": "The following warnings occured
while trying to upload the file",
"bs-upload-uploadwarningdialog-outro": "Click \"{{int:bs-extjs-ok}}\"
to ignore warnings and upload file, click \"{{int:bs-extjs-cancel}}\" to return
to the upload form",
"bs-upload-uploadwarningdialog-warning-exists": "A file with name
\"$1\" already exists",
- "bs-upload-uploadwarningdialog-warning-duplicate": "There
{{PLURAL:$1|is a duplictae|are duplicates}} of this file",
+ "bs-upload-uploadwarningdialog-warning-duplicate": "There
{{PLURAL:$1|is a duplicate|are duplicates}} of this file",
"bs-upload-uploadwarningdialog-warning-unknown": "Unknown warning with
code \"$1\""
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/378501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b92c648d4f186cc68872df2fa7822bdc2fd6e5a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
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...Comments[master]: Organize and cleanup registry for parser stuff
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378489 )
Change subject: Organize and cleanup registry for parser stuff
..
Organize and cleanup registry for parser stuff
This helps slightly organize and cleanup stuff in this extension.
- All tags and magic words are now registered in the same place,
instead of 3 different files.
- The parser handlers have been renamed to be the same for consistency.
- The hook names have been renamed for consistency.
- All parser related things have been moved into includes/parser.
- CommentsHooks class now really only contains hooks.
Change-Id: I0eecc07a2a0e039f92d24ec0f7f8673a57528ad7
---
M extension.json
M includes/Comments.hooks.php
R includes/parser/CommentsOfTheDay.class.php
A includes/parser/DisplayComments.class.php
R includes/parser/NumberOfComments.class.php
5 files changed, 138 insertions(+), 158 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index fb61bd6..143c8dc 100644
--- a/extension.json
+++ b/extension.json
@@ -1,11 +1,12 @@
{
"name": "Comments",
- "version": "4.3.1",
+ "version": "4.3.2",
"author": [
"David Pean",
"Misza",
"Jack Phoenix",
- "Adam Carter/UltrasonicNXT"
+ "Adam Carter/UltrasonicNXT",
+ "Samantha Nguyen"
],
"license-name": "GPL-2.0+",
"url": "https://www.mediawiki.org/wiki/Extension:Comments";,
@@ -61,12 +62,13 @@
"AutoloadClasses": {
"Comment": "includes/Comment.class.php",
"CommentsPage": "includes/CommentsPage.class.php",
- "CommentsOfTheDay": "includes/CommentsOfTheDay.class.php",
+ "CommentsOfTheDay":
"includes/parser/CommentsOfTheDay.class.php",
+ "NumberOfComments":
"includes/parser/NumberOfComments.class.php",
+ "DisplayComments": "includes/parser/DisplayComments.class.php",
"CommentFunctions": "/includes/CommentFunctions.class.php",
"CommentIgnoreList":
"includes/specials/SpecialCommentIgnoreList.php",
"CommentsLogFormatter":
"includes/CommentsLogFormatter.class.php",
"CommentsHooks": "includes/Comments.hooks.php",
- "NumberOfComments": "includes/NumberOfComments.class.php",
"CommentBlockAPI": "includes/api/CommentBlock.api.php",
"CommentDeleteAPI": "includes/api/CommentDelete.api.php",
"CommentLatestIdAPI": "includes/api/CommentLatestID.api.php",
@@ -100,23 +102,11 @@
"remoteExtPath": "Comments"
},
"Hooks": {
- "ParserFirstCallInit": [
- "CommentsHooks::onParserFirstCallInit",
- "NumberOfComments::setupNumberOfCommentsPageParser",
- "CommentsOfTheDay::registerTag"
- ],
- "LoadExtensionSchemaUpdates": [
- "CommentsHooks::onLoadExtensionSchemaUpdates"
- ],
- "RenameUserSQL": [
- "CommentsHooks::onRenameUserSQL"
- ],
- "MagicWordwgVariableIDs": [
- "NumberOfComments::registerNumberOfCommentsMagicWord"
- ],
- "ParserGetVariableValueSwitch": [
- "NumberOfComments::getNumberOfCommentsMagic"
- ]
+ "ParserFirstCallInit": "CommentsHooks::onParserFirstCallInit",
+ "LoadExtensionSchemaUpdates":
"CommentsHooks::onLoadExtensionSchemaUpdates",
+ "RenameUserSQL": "CommentsHooks::onRenameUserSQL",
+ "MagicWordwgVariableIDs":
"NumberOfComments::onMagicWordwgVariableIDs",
+ "ParserGetVariableValueSwitch":
"NumberOfComments::onParserGetVariableValueSwitch"
},
"config": {
"CommentsDefaultAvatar":
"http://www.shoutwiki.com/w/extensions/SocialProfile/avatars/default_ml.gif";,
diff --git a/includes/Comments.hooks.php b/includes/Comments.hooks.php
index 3b81f1a..39949d0 100644
--- a/includes/Comments.hooks.php
+++ b/includes/Comments.hooks.php
@@ -14,122 +14,20 @@
class CommentsHooks {
/**
-* Registers the tag with the Parser.
+* Registers the following tags and magic words:
+* -
+* -
+* - NUMBEROFCOMMENTSPAGE
*
* @param Parser $parser
-* @return bool
+* @return bool true
*/
public static function onParserFirstCallInit( Parser &$parser ) {
- $parser->setHook( 'comments', array( 'CommentsHooks',
'displayComments' ) );
+ $parser->setHook( 'comments', [ 'DisplayComments',
'getParserHandler' ] );
+ $parser->setHook( 'comm
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [L10N] Update languages_by_size
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378497 ) Change subject: [L10N] Update languages_by_size .. [L10N] Update languages_by_size Change-Id: I5b2e86bea4770506cf9b1f3347e000f6592f6daf --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wikiversity_family.py M pywikibot/families/wiktionary_family.py 6 files changed, 39 insertions(+), 39 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index 440d5bc..aa434a6 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -38,11 +38,11 @@ """Constructor.""" self.languages_by_size = [ 'en', 'hu', 'de', 'fr', 'ja', 'it', 'es', 'pt', 'nl', 'pl', 'he', -'vi', 'th', 'ca', 'fi', 'id', 'sq', 'fa', 'zh', 'ru', 'az', 'cs', -'sv', 'da', 'hr', 'sr', 'tr', 'ko', 'ar', 'no', 'gl', 'ro', 'ta', -'ba', 'tl', 'mk', 'is', 'uk', 'sa', 'hi', 'ka', 'lt', 'tt', 'eo', -'sk', 'el', 'bg', 'li', 'bn', 'hy', 'si', 'ms', 'sl', 'ur', 'la', -'ml', 'km', 'ia', 'et', 'cv', 'mr', 'oc', 'eu', 'kk', 'be', 'pa', +'th', 'vi', 'ca', 'fi', 'id', 'sq', 'fa', 'zh', 'ru', 'az', 'cs', +'sv', 'da', 'hr', 'sr', 'tr', 'ko', 'ar', 'no', 'gl', 'ro', 'ba', +'ta', 'tl', 'mk', 'is', 'uk', 'sa', 'hi', 'ka', 'lt', 'sk', 'tt', +'eo', 'el', 'bg', 'li', 'bn', 'hy', 'si', 'ms', 'sl', 'ur', 'la', +'ml', 'km', 'ia', 'et', 'cv', 'mr', 'eu', 'kk', 'oc', 'be', 'pa', 'ne', 'fy', 'tg', 'te', 'af', 'ku', 'ky', 'bs', 'mg', 'cy', ] diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 9639860..7c8bc78 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -39,33 +39,33 @@ 'en', 'ceb', 'sv', 'de', 'nl', 'fr', 'ru', 'it', 'es', 'war', 'pl', 'vi', 'ja', 'pt', 'zh', 'uk', 'fa', 'ca', 'ar', 'no', 'sh', 'fi', 'hu', 'id', 'ko', 'cs', 'ro', 'sr', 'ms', 'tr', 'eu', 'eo', 'bg', -'da', 'hy', 'min', 'zh-min-nan', 'kk', 'sk', 'he', 'lt', 'hr', +'da', 'hy', 'sk', 'min', 'zh-min-nan', 'kk', 'he', 'lt', 'hr', 'ce', 'et', 'sl', 'be', 'gl', 'el', 'nn', 'uz', 'simple', 'la', -'az', 'ur', 'hi', 'vo', 'th', 'ka', 'ta', 'cy', 'mk', 'oc', 'mg', -'tl', 'lv', 'ky', 'bs', 'tt', 'new', 'tg', 'sq', 'te', 'pms', 'br', -'be-tarask', 'zh-yue', 'bn', 'ml', 'ht', 'jv', 'ast', 'lb', 'mr', -'af', 'sco', 'pnb', 'is', 'ga', 'cv', 'ba', 'azb', 'fy', 'su', +'az', 'ur', 'hi', 'vo', 'th', 'ka', 'ta', 'cy', 'mk', 'mg', 'oc', +'tl', 'lv', 'ky', 'bs', 'tt', 'new', 'sq', 'tg', 'te', 'pms', 'br', +'be-tarask', 'zh-yue', 'bn', 'ml', 'ht', 'ast', 'jv', 'lb', 'mr', +'azb', 'af', 'sco', 'pnb', 'ga', 'is', 'cv', 'ba', 'fy', 'su', 'sw', 'my', 'lmo', 'an', 'yo', 'ne', 'gu', 'io', 'pa', 'nds', 'scn', 'bpy', 'als', 'bar', 'ku', 'kn', 'ia', 'qu', 'ckb', 'mn', 'arz', 'bat-smg', 'wa', 'gd', 'nap', 'bug', 'yi', 'am', 'si', -'cdo', 'map-bms', 'or', 'fo', 'mzn', 'xmf', 'hsb', 'li', 'mai', -'sah', 'sa', 'vec', 'ilo', 'os', 'mrj', 'hif', 'mhr', 'roa-tara', -'bh', 'eml', 'diq', 'pam', 'ps', 'sd', 'hak', 'nso', 'se', 'ace', -'bcl', 'mi', 'nah', 'zh-classical', 'nds-nl', 'gan', 'szl', 'vls', -'rue', 'wuu', 'bo', 'glk', 'vep', 'sc', 'fiu-vro', 'co', 'crh', -'km', 'lrc', 'tk', 'kv', 'csb', 'frr', 'gv', 'as', 'so', 'lad', -'zea', 'ay', 'udm', 'lez', 'myv', 'kw', 'stq', 'ie', 'nrm', 'mwl', -'pcd', 'nv', 'koi', 'rm', 'gom', 'ug', 'lij', 'mt', 'gn', 'fur', -'dsb', 'ab', 'dv', 'cbk-zam', 'ang', 'ln', 'ext', 'kab', 'sn', -'ksh', 'gag', 'lo', 'frp', 'pag', 'pi', 'av', 'olo', 'pfl', 'xal', -'dty', 'krc', 'haw', 'bxr', 'kaa', 'pap', 'rw', 'pdc', 'bjn', 'to', -'nov', 'kl', 'arc', 'jam', 'kbd', 'ha', 'tpi', 'tet', 'tyv', 'ig', -'ki', 'na', 'lbe', 'roa-rup', 'jbo', 'ty', 'kg', 'mdf', 'za', 'wo', -'lg', 'bi', 'srn', 'zu', 'tcy', 'ltg', 'chr', 'sm', 'om', 'xh', -'tn', 'pih', 'chy', 'rmy', 'tw', 'cu', 'tum', 'st', 'ts', 'rn', -'got', 'pnt', 'ss', 'bm', 'fj', 'kbp', 'ch', 'ady', 'iu', 'ny', -'ee', 'ks', 'ak', 've', 'ik', 'sg', 'dz', 'ff', 'ti', 'cr', 'atj', -'din', +'cdo', 'map-bms', 'or', 'fo', 'mzn', 'hsb', 'xmf', 'li', 'mai', +'sah', 'sa', 'vec', 'ilo', 'os', 'mrj', 'hif', 'mhr'
[MediaWiki-commits] [Gerrit] translatewiki[master]: [ExtJSBase] Register extension
Raimond Spekking has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378500 ) Change subject: [ExtJSBase] Register extension .. [ExtJSBase] Register extension Change-Id: I8b7b03fd6b4d5ef21ee55c0460aa2d7f07c15eda --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 2627e48..642f9ba 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1014,6 +1014,8 @@ aliasfile = ExternalData/ExternalData.i18n.alias.php magicfile = ExternalData/ExternalData.i18n.magic.php +ExtJS Base + Extra Language Link #Fan Boxes / Missing message documentation, inconsistently prefixed - 2014-01-28 RS -- To view, visit https://gerrit.wikimedia.org/r/378500 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8b7b03fd6b4d5ef21ee55c0460aa2d7f07c15eda Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [ExtJSBase] Register extension
Raimond Spekking has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378500 ) Change subject: [ExtJSBase] Register extension .. [ExtJSBase] Register extension Change-Id: I8b7b03fd6b4d5ef21ee55c0460aa2d7f07c15eda --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/00/378500/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 2627e48..642f9ba 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1014,6 +1014,8 @@ aliasfile = ExternalData/ExternalData.i18n.alias.php magicfile = ExternalData/ExternalData.i18n.magic.php +ExtJS Base + Extra Language Link #Fan Boxes / Missing message documentation, inconsistently prefixed - 2014-01-28 RS -- To view, visit https://gerrit.wikimedia.org/r/378500 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b7b03fd6b4d5ef21ee55c0460aa2d7f07c15eda Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
