[MediaWiki-commits] [Gerrit] New testing wrapper to circumvent object access - change (mediawiki/core)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201133
Change subject: New testing wrapper to circumvent object access
..
New testing wrapper to circumvent object access
The new TestingAccessWrapper class provides a convenient way to make
all of an object's methods and properties public.
TODO: We should organize test helpers into a source directory. Note that the
helper and its test are in the same directory.
Change-Id: I958d55df18c74e9d2b25d98cd0316989a0fbbe6f
---
M tests/TestsAutoLoader.php
A tests/phpunit/data/helpers/WellProtectedClass.php
A tests/phpunit/includes/TestingAccessWrapper.php
A tests/phpunit/includes/TestingAccessWrapperTest.php
4 files changed, 98 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/33/201133/1
diff --git a/tests/TestsAutoLoader.php b/tests/TestsAutoLoader.php
index 29c3269..6587be8 100644
--- a/tests/TestsAutoLoader.php
+++ b/tests/TestsAutoLoader.php
@@ -49,6 +49,7 @@
# tests/phpunit/includes
'BlockTest' = $testDir/phpunit/includes/BlockTest.php,
'RevisionStorageTest' =
$testDir/phpunit/includes/RevisionStorageTest.php,
+ 'TestingAccessWrapper' =
$testDir/phpunit/includes/TestingAccessWrapper.php,
'WikiPageTest' = $testDir/phpunit/includes/WikiPageTest.php,
# tests/phpunit/includes/api
diff --git a/tests/phpunit/data/helpers/WellProtectedClass.php
b/tests/phpunit/data/helpers/WellProtectedClass.php
new file mode 100644
index 000..7114cc9
--- /dev/null
+++ b/tests/phpunit/data/helpers/WellProtectedClass.php
@@ -0,0 +1,17 @@
+?php
+
+class WellProtectedClass {
+ protected $property;
+
+ public function __construct() {
+ $this-property = 1;
+ }
+
+ protected function incrementPropertyValue() {
+ $this-property++;
+ }
+
+ public function getProperty() {
+ return $this-property;
+ }
+}
diff --git a/tests/phpunit/includes/TestingAccessWrapper.php
b/tests/phpunit/includes/TestingAccessWrapper.php
new file mode 100644
index 000..d4ad363
--- /dev/null
+++ b/tests/phpunit/includes/TestingAccessWrapper.php
@@ -0,0 +1,50 @@
+?php
+/**
+ * Circumvent access restrictions on object internals
+ *
+ * This can be helpful for writing tests that can probe object internals,
+ * without having to modify the class under test to accomodate.
+ *
+ * Wrap an object with private methods as follows:
+ *$title = TestingAccessWrapper::newFromObject( Title::newFromDBkey( $key
) );
+ *
+ * You can access private and protected instance methods and variables:
+ *$formatter = $title-getTitleFormatter();
+ *
+ * TODO:
+ * - Provide access to static methods and properties.
+ * - Organize other helper classes in tests/testHelpers.inc into a directory.
+ */
+class TestingAccessWrapper {
+ public $object;
+
+ /**
+* Return the same object, without access restrictions.
+*/
+ public static function newFromObject( $object ) {
+ $wrapper = new TestingAccessWrapper();
+ $wrapper-object = $object;
+ return $wrapper;
+ }
+
+ public function __call( $method, $args ) {
+ $classReflection = new ReflectionClass( $this-object );
+ $methodReflection = $classReflection-getMethod( $method );
+ $methodReflection-setAccessible( true );
+ return $methodReflection-invoke( $this-object, $args );
+ }
+
+ public function __set( $name, $value ) {
+ $classReflection = new ReflectionClass( $this-object );
+ $propertyReflection = $classReflection-getProperty( $name );
+ $propertyReflection-setAccessible( true );
+ $propertyReflection-setValue( $this-object, $value );
+ }
+
+ public function __get( $name ) {
+ $classReflection = new ReflectionClass( $this-object );
+ $propertyReflection = $classReflection-getProperty( $name );
+ $propertyReflection-setAccessible( true );
+ return $propertyReflection-getValue( $this-object );
+ }
+}
diff --git a/tests/phpunit/includes/TestingAccessWrapperTest.php
b/tests/phpunit/includes/TestingAccessWrapperTest.php
new file mode 100644
index 000..8da8e42
--- /dev/null
+++ b/tests/phpunit/includes/TestingAccessWrapperTest.php
@@ -0,0 +1,30 @@
+?php
+
+class TestingAccessWrapperTest extends MediaWikiTestCase {
+ protected $raw;
+ protected $wrapped;
+
+ function setUp() {
+ parent::setUp();
+
+ require_once __DIR__ .
'/../data/helpers/WellProtectedClass.php';
+ $this-raw = new WellProtectedClass();
+ $this-wrapped = TestingAccessWrapper::newFromObject(
$this-raw );
+ }
+
+ function testGetProperty() {
+
[MediaWiki-commits] [Gerrit] Fix TestingAccessWrapper::__call - change (mediawiki/core)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201134
Change subject: Fix TestingAccessWrapper::__call
..
Fix TestingAccessWrapper::__call
We were only passing the first parameter to the wrapped object's methods.
Change-Id: I27a69d1cc1b2d048e44514af8b4ac79d7ee1fb85
---
M tests/phpunit/data/helpers/WellProtectedClass.php
M tests/phpunit/includes/TestingAccessWrapper.php
M tests/phpunit/includes/TestingAccessWrapperTest.php
3 files changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/34/201134/1
diff --git a/tests/phpunit/data/helpers/WellProtectedClass.php
b/tests/phpunit/data/helpers/WellProtectedClass.php
index 7114cc9..99c7f64 100644
--- a/tests/phpunit/data/helpers/WellProtectedClass.php
+++ b/tests/phpunit/data/helpers/WellProtectedClass.php
@@ -14,4 +14,8 @@
public function getProperty() {
return $this-property;
}
+
+ protected function whatSecondArg( $a, $b = false ) {
+ return $b;
+ }
}
diff --git a/tests/phpunit/includes/TestingAccessWrapper.php
b/tests/phpunit/includes/TestingAccessWrapper.php
index d4ad363..84c0f9b 100644
--- a/tests/phpunit/includes/TestingAccessWrapper.php
+++ b/tests/phpunit/includes/TestingAccessWrapper.php
@@ -31,7 +31,7 @@
$classReflection = new ReflectionClass( $this-object );
$methodReflection = $classReflection-getMethod( $method );
$methodReflection-setAccessible( true );
- return $methodReflection-invoke( $this-object, $args );
+ return $methodReflection-invokeArgs( $this-object, $args );
}
public function __set( $name, $value ) {
diff --git a/tests/phpunit/includes/TestingAccessWrapperTest.php
b/tests/phpunit/includes/TestingAccessWrapperTest.php
index 8da8e42..7e5b91a 100644
--- a/tests/phpunit/includes/TestingAccessWrapperTest.php
+++ b/tests/phpunit/includes/TestingAccessWrapperTest.php
@@ -27,4 +27,8 @@
$this-assertSame( 2, $this-wrapped-property );
$this-assertSame( 2, $this-raw-getProperty() );
}
+
+ function testCallMethodTwoArgs() {
+ $this-assertSame( 'two', $this-wrapped-whatSecondArg( 'one',
'two' ) );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/201134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27a69d1cc1b2d048e44514af8b4ac79d7ee1fb85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_23
Gerrit-Owner: Awight awi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] PageAccess: I18N fixes from translatewiki - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201136
Change subject: PageAccess: I18N fixes from translatewiki
..
PageAccess: I18N fixes from translatewiki
This is a follow up commit of I51bfa9c6c1cda0382fe60379712e4a7996e00c1d [1]
It applies the changes from legacy .i18n.php file to the json i18n file
and creates shim.
[1] https://gerrit.wikimedia.org/r/#/c/199254/1
Change-Id: I6805551d9b9b851d8e0b5d20b17a4b1950ce13e3
---
M PageAccess/PageAccess.i18n.php
M PageAccess/i18n/en.json
2 files changed, 29 insertions(+), 44 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/36/201136/1
diff --git a/PageAccess/PageAccess.i18n.php b/PageAccess/PageAccess.i18n.php
index e9cf848..5836d12 100644
--- a/PageAccess/PageAccess.i18n.php
+++ b/PageAccess/PageAccess.i18n.php
@@ -1,50 +1,35 @@
?php
/**
- * Internationalisation file for PageAccess
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
*
- * Part of BlueSpice for MediaWiki
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
*
- * @author Marc Reymann reym...@hallowelt.biz
- * @author Stephan Muggli mug...@hallowelt.biz
- * @packageBlueSpice_Extensions
- * @subpackage CountThings
- * @copyright Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
- * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
- * @filesource
+ * This shim maintains compatibility back to MediaWiki 1.17.
*/
-
$messages = array();
+if ( !function_exists( 'wfJsonI18nShimb8d8bcdc73ff1bd7' ) ) {
+ function wfJsonI18nShimb8d8bcdc73ff1bd7( $cache, $code, $cachedData ) {
+ $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
+ foreach ( $codeSequence as $csCode ) {
+ $fileName = dirname( __FILE__ ) . /i18n//$csCode.json;
+ if ( is_readable( $fileName ) ) {
+ $data = FormatJson::decode( file_get_contents(
$fileName ), true );
+ foreach ( array_keys( $data ) as $key ) {
+ if ( $key === '' || $key[0] === '@' ) {
+ unset( $data[$key] );
+ }
+ }
+ $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
+ }
-$messages['de'] = array(
- 'bs-pageaccess-desc' = 'Regelt den Zugriff auf Seitenebene.',
- 'bs-pageaccess-error-no-groups-given' = 'Es wurden keine Gruppen
angegeben.',
- 'bs-pageaccess-error-not-member-of-given-groups' = 'Du bist nicht
Mitglied der angegebenen Gruppen. Um zu verhindern, dass Du dich aus der Seite
aussperrst, wurde das Speichern deaktiviert.',
- 'bs-pageaccess-error-included-forbidden-template' = 'Du hast das
Template $1 eingebunden, auf das du keine Leseberechtigung hast. Um zu
verhindern, dass Du dich aus der Seite aussperrst, wurde das Speichern
deaktiviert.',
- 'bs-pageaccess-tag-groups-desc' = 'Gib die Gruppen an, die exklusiven
Zugriff auf die Seite erhalten sollen. Mehrere Gruppen können durch Kommata
getrennt werden.',
- 'pageaccess' = 'Durch Page Access geschützte Seiten'
-);
+ $cachedData['deps'][] = new FileDependency( $fileName );
+ }
+ return true;
+ }
-$messages['de-formal'] = array(
- 'bs-pageaccess-error-not-member-of-given-groups' = 'Sie sind nicht
Mitglied der angegebenen Gruppen. Um zu verhindern, dass Sie sich aus der Seite
aussperren, wurde das Speichern deaktiviert.',
- 'bs-pageaccess-error-included-forbidden-template' = 'Sie haben das
Template $1 eingebunden, auf das Sie keine Leseberechtigung haben. Um zu
verhindern, dass Sie sich aus der Seite aussperren, wurde das Speichern
deaktiviert.',
- 'bs-pageaccess-tag-groups-desc' = 'Geben Sie die Gruppen an, die
exklusiven Zugriff auf die Seite erhalten sollen. Mehrere Gruppen können durch
Kommata getrennt werden.',
- 'pageaccess' = 'Durch PageAccess geschützte Seiten'
-);
-
-$messages['en'] = array(
- 'bs-pageaccess-desc' = 'Controls access on page level.',
- 'bs-pageaccess-error-no-groups-given' = 'No groups were specified.',
- 'bs-pageaccess-error-not-member-of-given-groups' = 'You are not a
member of the given groups. In order to prevent you from locking yourself out,
[MediaWiki-commits] [Gerrit] ganglia: set a default ganglia_class for labs in general as ... - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: ganglia: set a default ganglia_class for labs in general as well .. ganglia: set a default ganglia_class for labs in general as well Follows-up 65859708eb. Bug: T94669 Change-Id: I133d80cdd3d8702d6ffddf2a62b669e8a7fbf616 --- M hieradata/labs.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, but someone else must approve Giuseppe Lavagetto: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml index 5c856b0..e04cab3 100644 --- a/hieradata/labs.yaml +++ b/hieradata/labs.yaml @@ -4,3 +4,4 @@ elasticsearch::heap_memory: '2G' elasticsearch::expected_nodes: 1 elasticsearch::recover_after_nodes: 1 +ganglia_class: old -- To view, visit https://gerrit.wikimedia.org/r/201139 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I133d80cdd3d8702d6ffddf2a62b669e8a7fbf616 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] content: Fix scorecards for DMCA - change (wikimedia/TransparencyReport-private)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201125
Change subject: content: Fix scorecards for DMCA
..
content: Fix scorecards for DMCA
Change-Id: Ic41c6f15f9a87501c0d90b1c421b703463aeb327
---
M source/localizable/content.html.erb
1 file changed, 4 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private
refs/changes/25/201125/1
diff --git a/source/localizable/content.html.erb
b/source/localizable/content.html.erb
index 3821d40..734aac4 100644
--- a/source/localizable/content.html.erb
+++ b/source/localizable/content.html.erb
@@ -147,18 +147,18 @@
div class=col-md-3
section class=scorecard
-h2%= t('dates.jul') % 2012 – %= t('dates.jun') % 2014/h2
+h2%= t('dates.jul') % 2014 – %= t('dates.dec') % 2014/h2
dl
dt%= t('content.total_number_of_dmca_requests') %/dt
- dd58/dd
+ dd11/dd
/dl
/section
section class=scorecard scorecard_bottom
-h2%= t('dates.jul') % 2012 – %= t('dates.jun') % 2014/h2
+h2%= t('dates.jul') % 2014 – %= t('dates.dec') % 2014/h2
dl
dt%= t('content.percentage_of_requests_granted') %/dt
- dd41small%/small/dd
+ dd9.1small%/small/dd
/dl
/section
/div
--
To view, visit https://gerrit.wikimedia.org/r/201125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic41c6f15f9a87501c0d90b1c421b703463aeb327
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport-private
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Amiri fonts - change (mediawiki...UniversalLanguageSelector)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/201124 Change subject: Update Amiri fonts .. Update Amiri fonts Version: 0.107 URL: www.amirifont.org Change-Id: I8421c85d590ad271ca40302b17325cafd5e5caeb --- M data/fontrepo/fonts/amiri/amiri-bold.eot M data/fontrepo/fonts/amiri/amiri-bold.ttf M data/fontrepo/fonts/amiri/amiri-bold.woff M data/fontrepo/fonts/amiri/amiri-boldslanted.eot M data/fontrepo/fonts/amiri/amiri-boldslanted.ttf M data/fontrepo/fonts/amiri/amiri-boldslanted.woff M data/fontrepo/fonts/amiri/amiri-regular.eot M data/fontrepo/fonts/amiri/amiri-regular.ttf M data/fontrepo/fonts/amiri/amiri-regular.woff M data/fontrepo/fonts/amiri/amiri-slanted.eot M data/fontrepo/fonts/amiri/amiri-slanted.ttf M data/fontrepo/fonts/amiri/amiri-slanted.woff M data/fontrepo/fonts/amiri/font.ini 13 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/24/201124/1 diff --git a/data/fontrepo/fonts/amiri/amiri-bold.eot b/data/fontrepo/fonts/amiri/amiri-bold.eot index c4a31c3..198162e 100644 --- a/data/fontrepo/fonts/amiri/amiri-bold.eot +++ b/data/fontrepo/fonts/amiri/amiri-bold.eot Binary files differ diff --git a/data/fontrepo/fonts/amiri/amiri-bold.ttf b/data/fontrepo/fonts/amiri/amiri-bold.ttf index 9d6b98f..a97bf9c 100644 --- a/data/fontrepo/fonts/amiri/amiri-bold.ttf +++ b/data/fontrepo/fonts/amiri/amiri-bold.ttf Binary files differ diff --git a/data/fontrepo/fonts/amiri/amiri-bold.woff b/data/fontrepo/fonts/amiri/amiri-bold.woff index c0547da..8688b15 100644 --- a/data/fontrepo/fonts/amiri/amiri-bold.woff +++ b/data/fontrepo/fonts/amiri/amiri-bold.woff Binary files differ diff --git a/data/fontrepo/fonts/amiri/amiri-boldslanted.eot b/data/fontrepo/fonts/amiri/amiri-boldslanted.eot index 203bfeb..434c9fe 100644 --- a/data/fontrepo/fonts/amiri/amiri-boldslanted.eot +++ b/data/fontrepo/fonts/amiri/amiri-boldslanted.eot Binary files differ diff --git a/data/fontrepo/fonts/amiri/amiri-boldslanted.ttf b/data/fontrepo/fonts/amiri/amiri-boldslanted.ttf index 79ea126..d3e6cdc 100644 --- a/data/fontrepo/fonts/amiri/amiri-boldslanted.ttf +++ b/data/fontrepo/fonts/amiri/amiri-boldslanted.ttf Binary files differ diff --git a/data/fontrepo/fonts/amiri/amiri-boldslanted.woff b/data/fontrepo/fonts/amiri/amiri-boldslanted.woff index a7ea9a9..aee5582 100644 --- a/data/fontrepo/fonts/amiri/amiri-boldslanted.woff +++ b/data/fontrepo/fonts/amiri/amiri-boldslanted.woff Binary files differ diff --git a/data/fontrepo/fonts/amiri/amiri-regular.eot b/data/fontrepo/fonts/amiri/amiri-regular.eot index 3c77551..5f2f6dc 100644 --- a/data/fontrepo/fonts/amiri/amiri-regular.eot +++ b/data/fontrepo/fonts/amiri/amiri-regular.eot Binary files differ diff --git a/data/fontrepo/fonts/amiri/amiri-regular.ttf b/data/fontrepo/fonts/amiri/amiri-regular.ttf index 0fa885b..a6df428 100644 --- a/data/fontrepo/fonts/amiri/amiri-regular.ttf +++ b/data/fontrepo/fonts/amiri/amiri-regular.ttf Binary files differ diff --git a/data/fontrepo/fonts/amiri/amiri-regular.woff b/data/fontrepo/fonts/amiri/amiri-regular.woff index ab4046f..6f72f64 100644 --- a/data/fontrepo/fonts/amiri/amiri-regular.woff +++ b/data/fontrepo/fonts/amiri/amiri-regular.woff Binary files differ diff --git a/data/fontrepo/fonts/amiri/amiri-slanted.eot b/data/fontrepo/fonts/amiri/amiri-slanted.eot index 762d642..be20fc5 100644 --- a/data/fontrepo/fonts/amiri/amiri-slanted.eot +++ b/data/fontrepo/fonts/amiri/amiri-slanted.eot Binary files differ diff --git a/data/fontrepo/fonts/amiri/amiri-slanted.ttf b/data/fontrepo/fonts/amiri/amiri-slanted.ttf index a2f2c0c..c86e2a7 100644 --- a/data/fontrepo/fonts/amiri/amiri-slanted.ttf +++ b/data/fontrepo/fonts/amiri/amiri-slanted.ttf Binary files differ diff --git a/data/fontrepo/fonts/amiri/amiri-slanted.woff b/data/fontrepo/fonts/amiri/amiri-slanted.woff index 13e66a8..9a30353 100644 --- a/data/fontrepo/fonts/amiri/amiri-slanted.woff +++ b/data/fontrepo/fonts/amiri/amiri-slanted.woff Binary files differ diff --git a/data/fontrepo/fonts/amiri/font.ini b/data/fontrepo/fonts/amiri/font.ini index 201bc06..d8824ff 100644 --- a/data/fontrepo/fonts/amiri/font.ini +++ b/data/fontrepo/fonts/amiri/font.ini @@ -1,6 +1,6 @@ [Amiri] languages=ar, arb, ckb -version=1.0.2 +version=0.107 license=OFL-1.1 licensefile=OFL.txt request-url=https://phabricator.wikimedia.org/T43359, https://phabricator.wikimedia.org/T59767 -- To view, visit https://gerrit.wikimedia.org/r/201124 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8421c85d590ad271ca40302b17325cafd5e5caeb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___
[MediaWiki-commits] [Gerrit] BlueSiceExtensions: minor message text enhancement - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged. Change subject: BlueSiceExtensions: minor message text enhancement .. BlueSiceExtensions: minor message text enhancement See: https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Bs-pageaccess-error-included-forbidden-template/en https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Wikigrok-dialog-error-message-heading/en Change-Id: I51bfa9c6c1cda0382fe60379712e4a7996e00c1d --- M PageAccess/PageAccess.i18n.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Robert Vogel: Verified; Looks good to me, approved diff --git a/PageAccess/PageAccess.i18n.php b/PageAccess/PageAccess.i18n.php index a56555b..e9cf848 100644 --- a/PageAccess/PageAccess.i18n.php +++ b/PageAccess/PageAccess.i18n.php @@ -34,8 +34,8 @@ $messages['en'] = array( 'bs-pageaccess-desc' = 'Controls access on page level.', 'bs-pageaccess-error-no-groups-given' = 'No groups were specified.', - 'bs-pageaccess-error-not-member-of-given-groups' = 'You\'re not a member of the given groups. In order to prevent you from locking yourself out, saving was disabled.', - 'bs-pageaccess-error-included-forbidden-template' = 'You\'ve tried to use the template $1 to which you don\'t have read access. In order to prevent you from locking yourself out, saving was disabled.', + 'bs-pageaccess-error-not-member-of-given-groups' = 'You are not a member of the given groups. In order to prevent you from locking yourself out, saving was disabled.', + 'bs-pageaccess-error-included-forbidden-template' = 'You have tried to use the template $1 to which you do not have read access. In order to prevent you from locking yourself out, saving was disabled.', 'bs-pageaccess-tag-groups-desc' = 'Specify the groups that should have exclusive access to this page. Multiple groups can be separated by commas.', 'pageaccess' = 'Pages secured by PageAccess' ); -- To view, visit https://gerrit.wikimedia.org/r/199254 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I51bfa9c6c1cda0382fe60379712e4a7996e00c1d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Purodha puro...@blissenbach.org Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP Cleanup, notes, explicit fields, rename, attempt AccessW... - change (mediawiki...DonationInterface)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201140
Change subject: WIP Cleanup, notes, explicit fields, rename, attempt
AccessWrapper
..
WIP Cleanup, notes, explicit fields, rename, attempt AccessWrapper
Change-Id: Ibce3143fe7ff0ab6e5e55c613452913d61355751
---
M gateway_common/DonationData.php
M gateway_common/gateway.adapter.php
M globalcollect_gateway/globalcollect.adapter.php
M globalcollect_gateway/scripts/orphan_adapter.php
M tests/Adapter/GatewayAdapterTest.php
M tests/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
M tests/Adapter/GlobalCollect/GlobalCollectTest.php
M tests/Adapter/WorldPay/WorldPayTest.php
M tests/DonationInterfaceTestCase.php
M tests/includes/test_gateway/TestingGlobalCollectOrphanAdapter.php
10 files changed, 28 insertions(+), 13 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/40/201140/1
diff --git a/gateway_common/DonationData.php b/gateway_common/DonationData.php
index c200e26..a3bd39b 100644
--- a/gateway_common/DonationData.php
+++ b/gateway_common/DonationData.php
@@ -316,6 +316,7 @@
// This condition should actually be did data come from
anywhere?
if ( !empty( $this-normalized ) ) {
$updateCtRequired =
$this-handleContributionTrackingID(); // Before Order ID
+error_log(var_export($updateCtRequired, true) . ' ' .
$this-getVal('contribution_tracking_id'));
$this-setNormalizedOrderIDs();
$this-setReferrer();
$this-setIPAddresses();
@@ -838,12 +839,15 @@
if ( !$db ) {
// TODO: This might be a critical failure; do we want
to throw an exception instead?
$this-logger-error( 'Failed to create a connect to
contribution_tracking database' );
+error_log(Fock);
return false;
}
if ( $ctid ) {
// We're updating a record, but only if we actually
have data to update
+error_log(maybe update);
if ( count( $tracking_data ) ) {
+error_log(update: . json_encode($tracking_data));
$db-update(
'contribution_tracking',
$tracking_data,
@@ -859,8 +863,10 @@
// Store the contribution data
if ( $db-insert( 'contribution_tracking',
$tracking_data ) ) {
+error_log(inserted.);
$ctid = $db-insertId();
} else {
+error_log(error!!);
$this-logger-error( 'Failed to create a new
contribution_tracking record' );
return false;
}
diff --git a/gateway_common/gateway.adapter.php
b/gateway_common/gateway.adapter.php
index 5ab6582..25971fc 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -211,6 +211,13 @@
*/
protected $var_map = array();
+ /**
+* Defines all the places we might find the Order ID, and their
precedence.
+*
+* @var array $order_id_meta
+*/
+ protected $order_id_meta;
+
protected $account_name;
protected $account_config;
protected $accountInfo;
@@ -347,9 +354,9 @@
'api_request' = false,
);
$options = array_merge( $defaults, $options );
- if ( array_key_exists( 'batch_mode', $options ) ) {
- $this-batch = $options['batch_mode'];
- unset( $options['batch_mode'] );
+ if ( array_key_exists( 'batch', $options ) ) {
+ $this-batch = $options['batch'];
+ unset( $options['batch'] );
}
$this-logger = DonationLoggerFactory::getLogger( $this );
diff --git a/globalcollect_gateway/globalcollect.adapter.php
b/globalcollect_gateway/globalcollect.adapter.php
index 74a8776..d69c854 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -1933,7 +1933,6 @@
protected function stage_language() {
$language = strtolower( $this-getData_Unstaged_Escaped(
'language' ) );
-
if ( !in_array( $language, $this-getAvailableLanguages() ) ) {
$fallbacks = Language::getFallbacksFor( $language );
foreach ( $fallbacks as $fallback ) {
diff --git a/globalcollect_gateway/scripts/orphan_adapter.php
b/globalcollect_gateway/scripts/orphan_adapter.php
index 435bc93..3c25fcd 100644
--- a/globalcollect_gateway/scripts/orphan_adapter.php
+++
[MediaWiki-commits] [Gerrit] ganglia: set a default ganglia_class for labs in general as ... - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/201139 Change subject: ganglia: set a default ganglia_class for labs in general as well .. ganglia: set a default ganglia_class for labs in general as well Change-Id: I133d80cdd3d8702d6ffddf2a62b669e8a7fbf616 --- M hieradata/labs.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/39/201139/1 diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml index 5c856b0..e04cab3 100644 --- a/hieradata/labs.yaml +++ b/hieradata/labs.yaml @@ -4,3 +4,4 @@ elasticsearch::heap_memory: '2G' elasticsearch::expected_nodes: 1 elasticsearch::recover_after_nodes: 1 +ganglia_class: old -- To view, visit https://gerrit.wikimedia.org/r/201139 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I133d80cdd3d8702d6ffddf2a62b669e8a7fbf616 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Drop .coveralls.yml - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/201145 Change subject: Drop .coveralls.yml .. Drop .coveralls.yml I think this service is not used any more and this file is an unused, possibly outdated (look how it references the lib directory and nothing else) fragment now. I may be wrong. If you think I am, please show me the place where Coveralls is used and abandone this patch. Change-Id: I3e1a1428b7f4b138ae9f5371215917c39bc6b15e --- D .coveralls.yml 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/45/201145/1 diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index 8892d62..000 --- a/.coveralls.yml +++ /dev/null @@ -1,4 +0,0 @@ -# for php-coveralls -service_name: travis-ci -src_dir: lib -coverage_clover: build/logs/clover.xml \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/201145 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e1a1428b7f4b138ae9f5371215917c39bc6b15e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Log promote to global renames in the global rename log - change (mediawiki...CentralAuth)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201144
Change subject: Log promote to global renames in the global rename log
..
Log promote to global renames in the global rename log
Bug: T93235
Change-Id: I472842bdca2c2490f2a1376819d8f422b63991ea
---
M CentralAuth.php
M i18n/en.json
M i18n/qqq.json
M includes/GlobalRename/GlobalRenameLogFormatter.php
M includes/GlobalRename/GlobalRenameUserLogger.php
M includes/specials/SpecialGlobalRenameQueue.php
6 files changed, 71 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/44/201144/1
diff --git a/CentralAuth.php b/CentralAuth.php
index a5e9b1e..3518eec 100644
--- a/CentralAuth.php
+++ b/CentralAuth.php
@@ -477,6 +477,7 @@
$wgLogActions['gblrights/groupprms3'] =
'centralauth-rightslog-entry-groupperms3';
$wgLogActionsHandlers['gblrights/grouprename'] = 'efHandleGrouprenameLogEntry';
$wgLogActionsHandlers['gblrename/rename'] = 'GlobalRenameLogFormatter';
+$wgLogActionsHandlers['gblrename/promote'] = 'GlobalRenameLogFormatter';
$wgLogActionsHandlers['gblrename/merge'] = 'GlobalUserMergeLogFormatter';
foreach ( array( 'newset', 'setrename', 'setnewtype', 'setchange', 'deleteset'
) as $type ) {
diff --git a/i18n/en.json b/i18n/en.json
index 54af761..d18b772 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -396,6 +396,7 @@
log-name-gblrename: Global rename log,
log-description-gblrename: This log tracks the global renaming of
users.,
logentry-gblrename-rename : $1 globally {{GENDER:$2|renamed}} $4 to
$5,
+ logentry-gblrename-promote : $1 globally {{GENDER:$2|renamed}} $4 to
$5,
globalusermerge: Merge global user,
globalusermerge-legend: Merge global user,
centralauth-usermerge-form-newuser: Final username,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ffc6e86..6e37699 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -409,6 +409,7 @@
log-name-gblrename: Log page title,
log-description-gblrename: Log page description,
logentry-gblrename-rename: {{Logentry}}\nAdditional parameters:\n*
$4 - old username\n* $5 - new username\nSee also:\n*
{{msg-mw|Logentry-gblrename-merge}},
+ logentry-gblrename-promote: {{Logentry}}\nAdditional parameters:\n*
$4 - old username\n* $5 - new username\nSee also:\n*
{{msg-mw|Logentry-gblrename-merge}},
globalusermerge: Name of special page,
globalusermerge-legend: Legend of fieldset surrounding the form,
centralauth-usermerge-form-newuser: Label for form field,
diff --git a/includes/GlobalRename/GlobalRenameLogFormatter.php
b/includes/GlobalRename/GlobalRenameLogFormatter.php
index d93771d..bf14164 100644
--- a/includes/GlobalRename/GlobalRenameLogFormatter.php
+++ b/includes/GlobalRename/GlobalRenameLogFormatter.php
@@ -1,14 +1,20 @@
?php
/**
- * Make the gblrename/rename log entry look pretty
+ * Handles the following log types:
+ * - gblrename/rename
+ * - gblrename/promote
*/
class GlobalRenameLogFormatter extends LogFormatter {
protected function getMessageParameters() {
parent::getMessageParameters();
$params = $this-extractParameters();
- $this-parsedParameters[3] = $this-getCentralAuthLink(
$params[3] );
+ if ( $this-entry-getSubtype() === 'promote' ) {
+ $this-parsedParameters[3] = $this-getLocalWikiLink(
$params[3], $params[5] );
+ } else { // rename
+ $this-parsedParameters[3] = $this-getCentralAuthLink(
$params[3] );
+ }
$this-parsedParameters[4] = $this-getCentralAuthLink(
$params[4] );
ksort( $this-parsedParameters );
@@ -27,4 +33,13 @@
return Message::rawParam( Linker::link( $title,
htmlspecialchars( $name ) ) );
}
+
+ protected function getLocalWikiLink( $name, $wiki ) {
+ $text = User:$name@$wiki;
+ if ( $this-plaintext ) {
+ return [[$text]];
+ }
+
+ return Message::rawParam( WikiMap::foreignUserLink( $wiki,
$name, $text ) );
+ }
}
diff --git a/includes/GlobalRename/GlobalRenameUserLogger.php
b/includes/GlobalRename/GlobalRenameUserLogger.php
index 9c854d7..a1d1a3d 100644
--- a/includes/GlobalRename/GlobalRenameUserLogger.php
+++ b/includes/GlobalRename/GlobalRenameUserLogger.php
@@ -46,4 +46,35 @@
$logid = $logEntry-insert();
$logEntry-publish( $logid );
}
+
+ /**
+* Log the promotion of a local unattached to a global
+*
+* @param string $oldName
+* @param string $wiki
+* @param string $newName
+* @param string $reason
+*/
+ public function logPromotion( $oldName, $wiki, $newName, $reason ) {
+
[MediaWiki-commits] [Gerrit] Revert Update inputs to use mw-ui styles - change (mediawiki...UniversalLanguageSelector)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201122
Change subject: Revert Update inputs to use mw-ui styles
..
Revert Update inputs to use mw-ui styles
This reverts commit 30d26a4fd2a239f8874f1983972a266246b79548.
Some issues in this patch were identified, see T52599.
Reverting so that MLEB can be released and issues fixed and
tested properly after the release.
Change-Id: I35c1eb2db5ead8ca75dc2724997d789c83c69b6d
---
M Resources.php
M resources/css/ext.uls.inputsettings.css
M resources/js/ext.uls.displaysettings.js
M resources/js/ext.uls.inputsettings.js
M resources/js/ext.uls.languagesettings.js
5 files changed, 32 insertions(+), 33 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/22/201122/1
diff --git a/Resources.php b/Resources.php
index a2298a5..4e0a8cf 100644
--- a/Resources.php
+++ b/Resources.php
@@ -34,7 +34,6 @@
'ext.uls.mediawiki',
'ext.uls.webfonts',
'mediawiki.api.parse',
- 'mediawiki.ui.checkbox',
),
) + $resourcePaths;
@@ -102,7 +101,6 @@
'ext.uls.languagesettings',
'ext.uls.mediawiki',
'jquery.ime',
- 'mediawiki.ui.radio',
),
) + $resourcePaths;
@@ -131,6 +129,7 @@
'scripts' = 'resources/js/ext.uls.languagesettings.js',
'styles' = 'resources/css/ext.uls.languagesettings.css',
'dependencies' = array(
+ 'ext.uls.buttons',
'ext.uls.messages',
'ext.uls.preferences',
// The grid styles are used here,
@@ -255,7 +254,6 @@
'jquery.i18n',
'jquery.uls.data',
'jquery.uls.grid',
- 'mediawiki.ui.input',
),
) + $resourcePaths;
diff --git a/resources/css/ext.uls.inputsettings.css
b/resources/css/ext.uls.inputsettings.css
index bb9484c..1065807 100644
--- a/resources/css/ext.uls.inputsettings.css
+++ b/resources/css/ext.uls.inputsettings.css
@@ -12,7 +12,7 @@
}
.imelabel {
- display: inline;
+ display: block;
padding-bottom: 10px;
font-size: 10pt;
line-height: 16pt;
@@ -22,6 +22,10 @@
padding-left: 5px;
}
+.imelabel input {
+ float: left;
+}
+
.uls-ime-menu-settings-item {
background-color: #f0f0f0;
border-radius: 0 0 5px 5px;
diff --git a/resources/js/ext.uls.displaysettings.js
b/resources/js/ext.uls.displaysettings.js
index 4a06124..3d90e05 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -23,9 +23,9 @@
+ 'div class=row' // Tab switcher buttons
+ 'div class=twelve columns
uls-display-settings-tab-switcher'
- + 'div class=uls-button-group mw-ui-button-group'
- + 'button id=uls-display-settings-language-tab
class=mw-ui-button mw-ui-checked
data-i18n=ext-uls-display-settings-language-tab/button'
- + 'button id=uls-display-settings-fonts-tab
class=mw-ui-button data-i18n=ext-uls-display-settings-fonts-tab/button'
+ + 'div class=uls-button-group'
+ + 'button id=uls-display-settings-language-tab class=button
down data-i18n=ext-uls-display-settings-language-tab/button'
+ + 'button id=uls-display-settings-fonts-tab class=button
data-i18n=ext-uls-display-settings-fonts-tab/button'
+ '/div'
+ '/div'
+ '/div'
@@ -79,9 +79,9 @@
// Webfonts enabling checkbox with label
+ 'div class=row'
- + 'div class=eleven columns mw-ui-checkbox'
+ + 'div class=eleven columns'
+ + 'label class=checkbox'
+ 'input type=checkbox id=webfonts-enable-checkbox /'
- + 'label class=checkbox for=webfonts-enable-checkbox'
+ 'strong
data-i18n=ext-uls-webfonts-settings-title/strong '
+ 'span data-i18n=ext-uls-webfonts-settings-info/span '
+ 'a target=_blank
href=https://www.mediawiki.org/wiki/Universal_Language_Selector/WebFonts;
data-i18n=ext-uls-webfonts-settings-info-link/a'
@@ -242,8 +242,8 @@
return function () {
displaySettings.markDirty();
displaySettings.uiLanguage =
button.data( 'language' ) || displaySettings.uiLanguage;
- $( 'div.uls-ui-languages
button.mw-ui-button' ).removeClass( 'mw-ui-checked' );
- button.addClass( 'mw-ui-checked' );
+ $( 'div.uls-ui-languages button.button'
).removeClass( 'down' );
+ button.addClass( 'down' );
[MediaWiki-commits] [Gerrit] faq: Fix link in counter_notices questions - change (wikimedia/TransparencyReport-private)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/201130 Change subject: faq: Fix link in counter_notices questions .. faq: Fix link in counter_notices questions Change-Id: I3284e644de89247a9f92dc4e84904d882f6ae651 --- M locales/en.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private refs/changes/30/201130/1 diff --git a/locales/en.yml b/locales/en.yml index ebf50d2..3c55938 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -184,7 +184,7 @@ a_dmca_valid_proper: pThe DMCA has several a href='//en.wikipedia.org/wiki/Online_Copyright_Infringement_Liability_Limitation_Act#Notice_from_copyright_owner'formal requirements/a for notices. However, our evaluation isn’t over when we receive a notice that meets all of these requirements. We will also analyze the copyright eligibility of the work being infringed, whether the allegedly infringing material actually infringes, and whether the allegedly infringing material is a a href='//en.wikipedia.org/wiki/Fair_use'fair use/a of the requester’s work. For more information, see our a href='//wikimediafoundation.org/wiki/DMCA_Policy'DMCA Policy/a./p q_transparent_dmca: How are you transparent about particular DMCA removals besides in this transparency report? a_transparent_dmca: pWe record every DMCA takedown request that results in removal of content on a href='//wikimediafoundation.org/wiki/Category:DMCA'our website/a. In addition, every DMCA removal is submitted to the a href='//www.chillingeffects.org/'Chilling Effects Clearinghouse/a (Chilling Effects), a web archive managed by the a href='https://www.eff.org/'Electronic Frontier Foundation/a and several law school clinics. By collecting takedown notices from a variety of sources, Chilling Effects provides a large set of data for analysis and allows recipients and senders of takedown notices to learn more about how the DMCA operates in the current online environment./p -q_counter_notices: Did you receive any a href='//www.chillingeffects.org/question.cgi?QuestionID=132'DMCA counter-notices/a? +q_counter_notices: Did you receive any a href='//wikimediafoundation.org/wiki/DMCA_Policy#If_you_are_an_uploader_of_content.E2.80.A6'DMCA counter-notices/a? a_counter_notices: pNo, we did not receive any DMCA counter-notices between July 2012 - December 2014/p q_six_month: Why is the information from July 2012 - June 2013 not available in six-month increments like the information from July 2013 - December 2014? a_six_month: pDuring the July 2012 - June 2013 period, we recorded totals only for the entire period, rather than breaking the totals into six-month terms. In order to provide a better comparison with other reporting organizations, we changed the date ranges for our charts to line up with those used by those organizations starting in July 2013./p -- To view, visit https://gerrit.wikimedia.org/r/201130 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3284e644de89247a9f92dc4e84904d882f6ae651 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/TransparencyReport-private Gerrit-Branch: master Gerrit-Owner: Prtksxna psax...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't overwrite donor language with fallback value - change (mediawiki...DonationInterface)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201132
Change subject: Don't overwrite donor language with fallback value
..
Don't overwrite donor language with fallback value
When a lossy conversion happens during staging, the blunted value
could be unstaged back into the normalized data, overwriting the
donor's first-choice locale. This is fixed by removing the
unstaging function--unstaging language is unsafe in any context.
Bug: T94506
Change-Id: I89b7c2549b707416cd10a893ac2f1da5349d4e7c
---
M globalcollect_gateway/globalcollect.adapter.php
1 file changed, 0 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/32/201132/1
diff --git a/globalcollect_gateway/globalcollect.adapter.php
b/globalcollect_gateway/globalcollect.adapter.php
index 65cd188..74a8776 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -1955,16 +1955,6 @@
$this-staged_data['language'] = $language;
}
- protected function unstage_language() {
- $language = strtolower( $this-staged_data['language'] );
-
- if ( $language === 'sc' ){
- $language = 'zh';
- }
-
- $this-unstaged_data['language'] = $language;
- }
-
/**
* OUR language codes which are available to use in GlobalCollect.
* @return string
--
To view, visit https://gerrit.wikimedia.org/r/201132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I89b7c2549b707416cd10a893ac2f1da5349d4e7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebe... - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: cherry pick from REL1_22 Change-Id:
I6759c48b91afb9ac74edebed2c1e42989fa89052
..
cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebed2c1e42989fa89052
PatchSet 2: Fixed whitespace error
Change-Id: I31ab69f0959d48878862b8ccad609bf4c5b91dc8
---
M Flexiskin/Flexiskin.class.php
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index 54c3167..404f8b7 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -294,7 +294,7 @@
$oStatus = BsFileSystemHelper::uploadFile(self::getVal('name'),
flexiskin . DS . self::getVal('id') . DS . images);
if (!$oStatus-isGood())
- $aResult = json_encode(array('success' = false, 'msg'
= err_cd: . $aStatus['status']));
+ $aResult = json_encode(array('success' = false, 'msg'
= err_cd: . $oStatus-getMessage()));
else
$aResult = json_encode(array('success' = true, 'name'
= $oStatus-getValue()));
$oAjaxResponse = new AjaxResponse( $aResult );
@@ -313,7 +313,8 @@
$aConfigs = json_decode($aConfigs);
foreach ($aConfigs as $aConfig) {
$func = Flexiskin::format_ . $aConfig-id;
- if (is_callable($func))
+ $bReturn = wfRunHooks(BSFlexiskinGenerateStyleFile,
array($func, $aConfig));
+ if ( $bReturn === true is_callable($func))
$aFile[] = call_user_func($func, $aConfig);
}
return implode( \n, $aFile);
--
To view, visit https://gerrit.wikimedia.org/r/200815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I31ab69f0959d48878862b8ccad609bf4c5b91dc8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] faq: Fix markup in national_security_request answer - change (wikimedia/TransparencyReport-private)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201127
Change subject: faq: Fix markup in national_security_request answer
..
faq: Fix markup in national_security_request answer
Change-Id: I277280c4a646e072c677f87f1421d70c66b4d28e
---
M locales/en.yml
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private
refs/changes/27/201127/1
diff --git a/locales/en.yml b/locales/en.yml
index 15794a3..69a2b44 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -158,7 +158,7 @@
q_court_order: What do you mean by 'court order'?
a_court_order: pWhen we say 'court order', we mean an order issued by a
U.S. court of competent jurisdiction directed at the Wikimedia Foundation.
Court orders for user data may be issued under various U.S. federal and state
laws, such as section 2703(d) of the a
href='//en.wikipedia.org/wiki/ECPA'Electronic Communications Privacy Act/a
('ECPA'), a federal privacy law. /ppFor the avoidance of doubt, we believe
a warrant is required by the a
href='http://www.law.cornell.edu/constitution/fourth_amendment'4th
Amendment/a to the a
href='http://www.archives.gov/exhibits/charters/constitution_transcript.html'United
States Constitution/a, which prohibits unreasonable search and seizure and
overrides conflicting provisions in the ECPA. We believe that the ECPA needs to
be updated so that equivalent protections are granted to electronic
communications and documents that have already been granted to the physical
documents one keeps at home or in their office. To that end, we are a member of
the a
href='http://digitaldueprocess.org/index.cfm?objectid=37940370-2551-11DF-8E02000C296BA163'Digital
Due Process Coalition/a to help in that effort./p
q_national_security_request: What do you mean by 'national security
request'?
-a_national_security_request: 'National security requests' include a
href='//en.wikipedia.org/wiki/National_security_letter'national security
letters/a and orders issued under the a
href='//en.wikipedia.org/wiki/Foreign_Intelligence_Surveillance_Act'Foreign
Intelligence Surveillance Act/a.
+a_national_security_request: 'National security requests' include a
href='//en.wikipedia.org/wiki/National_security_letter'national security
letters/a and orders issued under the a
href='//en.wikipedia.org/wiki/Foreign_Intelligence_Surveillance_Act'Foreign
Intelligence Surveillance Act/a.
q_potentially_affected: What do you mean by user accounts potentially
affected?
a_potentially_affected: pThis number represents the number of unique
user accounts implicated by requests for user data and whose data would have
been disclosed if we have granted every request we received. This number may
not reflect the number of unique individuals implicated by requests for user
data; if an individual has multiple accounts across all Wikimedia projects, and
we receive requests for more than one of these accounts, we record each user
account separately. As a result, this number might overestimate the number of
individuals implicated by user data requests./p
q_actually_affected: What do you mean by user accounts actually affected?
--
To view, visit https://gerrit.wikimedia.org/r/201127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I277280c4a646e072c677f87f1421d70c66b4d28e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport-private
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] installer: Reduce some code duplication in LocalSettingsGene... - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201137
Change subject: installer: Reduce some code duplication in
LocalSettingsGenerator
..
installer: Reduce some code duplication in LocalSettingsGenerator
Change-Id: Ie3c2e56ac4d20d6d547e89a4d6c6331f4222409b
---
M includes/installer/LocalSettingsGenerator.php
1 file changed, 12 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/37/201137/1
diff --git a/includes/installer/LocalSettingsGenerator.php
b/includes/installer/LocalSettingsGenerator.php
index 8724e0d..3ba5e37 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -143,8 +143,7 @@
# The following skins were automatically enabled:\n;
foreach ( $this-skins as $skinName ) {
- $encSkinName = self::escapePhpString( $skinName
);
- $localSettings .= require_once
\\$IP/skins/$encSkinName/$encSkinName.php\;\n;
+ $localSettings .=
$this-generateRequireOnceLine( 'skins', $skinName );
}
$localSettings .= \n;
@@ -157,8 +156,7 @@
# The following extensions were automatically enabled:\n;
foreach ( $this-extensions as $extName ) {
- $encExtName = self::escapePhpString( $extName );
- $localSettings .= require_once
\\$IP/extensions/$encExtName/$encExtName.php\;\n;
+ $localSettings .=
$this-generateRequireOnceLine( 'extensions', $extName );
}
$localSettings .= \n;
@@ -172,6 +170,16 @@
}
/**
+* @param string $dir Either extensions or skins
+* @param string $name Name of extension/skin
+* @return string
+*/
+ private function generateRequireOnceLine( $dir, $name ) {
+ $encName = self::escapePhpString( $name );
+ return require_once \\$IP/$dir/$encName/$encName.php\;\n;
+ }
+
+ /**
* Write the generated LocalSettings to a file
*
* @param string $fileName Full path to filename to write to
--
To view, visit https://gerrit.wikimedia.org/r/201137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3c2e56ac4d20d6d547e89a4d6c6331f4222409b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] installer: Use wfLoadExtension/Skin in LocalSettingsGenerator - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201138
Change subject: installer: Use wfLoadExtension/Skin in LocalSettingsGenerator
..
installer: Use wfLoadExtension/Skin in LocalSettingsGenerator
Bug: T87791
Change-Id: I37cede7396d9677466ec68289702a3a73f1a1f8a
---
M includes/installer/Installer.php
M includes/installer/LocalSettingsGenerator.php
2 files changed, 28 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/38/201138/1
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 4c31387..b40b3f1 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -1436,13 +1436,16 @@
return array();
}
+ // extensions - extension.json, skins - skin.json
+ $jsonFile = substr( $directory, 0, strlen( $directory ) -1 ) .
'.json';
+
$dh = opendir( $extDir );
$exts = array();
while ( ( $file = readdir( $dh ) ) !== false ) {
if ( !is_dir( $extDir/$file ) ) {
continue;
}
- if ( file_exists( $extDir/$file/$file.php ) ) {
+ if ( file_exists( $extDir/$file/$jsonFile ) ||
file_exists( $extDir/$file/$file.php ) ) {
$exts[] = $file;
}
}
diff --git a/includes/installer/LocalSettingsGenerator.php
b/includes/installer/LocalSettingsGenerator.php
index 3ba5e37..0f6a1fb 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -34,6 +34,7 @@
protected $groupPermissions = array();
protected $dbSettings = '';
protected $safeMode = false;
+ protected $IP;
/**
* @var Installer
@@ -50,6 +51,7 @@
$this-extensions = $installer-getVar( '_Extensions' );
$this-skins = $installer-getVar( '_Skins' );
+ $this-IP = $installer-getVar( 'IP' );
$db = $installer-getDBInstaller( $installer-getVar(
'wgDBtype' ) );
@@ -143,7 +145,7 @@
# The following skins were automatically enabled:\n;
foreach ( $this-skins as $skinName ) {
- $localSettings .=
$this-generateRequireOnceLine( 'skins', $skinName );
+ $localSettings .= $this-generateExtEnableLine(
'skins', $skinName );
}
$localSettings .= \n;
@@ -156,7 +158,7 @@
# The following extensions were automatically enabled:\n;
foreach ( $this-extensions as $extName ) {
- $localSettings .=
$this-generateRequireOnceLine( 'extensions', $extName );
+ $localSettings .= $this-generateExtEnableLine(
'extensions', $extName );
}
$localSettings .= \n;
@@ -170,13 +172,31 @@
}
/**
+* Generate the appropriate line to enable the given extension or skin
+*
* @param string $dir Either extensions or skins
* @param string $name Name of extension/skin
* @return string
*/
- private function generateRequireOnceLine( $dir, $name ) {
+ private function generateExtEnableLine( $dir, $name ) {
$encName = self::escapePhpString( $name );
- return require_once \\$IP/$dir/$encName/$encName.php\;\n;
+
+ // extensions - extension.json, skins - skin.json
+ if ( $dir === 'extensions' ) {
+ $jsonFile = 'extension.json';
+ $function = 'wfLoadExtension';
+ } elseif ( $dir === 'skins' ) {
+ $jsonFile = 'skin.json';
+ $function = 'wfLoadSkin';
+ } else {
+ throw new InvalidArgumentException( '$dir was not
extensions or skins' );
+ }
+
+ if ( file_exists( {$this-IP}/$dir/$encName/$jsonFile ) ) {
+ return $function( '$encName' );\n;
+ } else {
+ return require_once
\\$IP/$dir/$encName/$encName.php\;\n;
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/201138
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37cede7396d9677466ec68289702a3a73f1a1f8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] Add Hindi and Indonesian to the language screenshots job - change (integration/config)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/201141 Change subject: Add Hindi and Indonesian to the language screenshots job .. Add Hindi and Indonesian to the language screenshots job Change-Id: Ie4b54712b6402170727bcb9935533021e8949c5b --- M jjb/job-templates-browsertests.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/41/201141/1 diff --git a/jjb/job-templates-browsertests.yaml b/jjb/job-templates-browsertests.yaml index c69f19c..0922af3 100644 --- a/jjb/job-templates-browsertests.yaml +++ b/jjb/job-templates-browsertests.yaml @@ -27,7 +27,7 @@ description: Upload API URL for uploading screenshots - string: name: lang_list -default: ar ast cs de el en es et fa fi fr gl he hr ilo it ja kn ko krc lb mk ms nb nl om pl pt ro ru sl sr sv tr uk vi yue zh-hans zh-hant +default: ar ast cs de el en es et fa fi fr gl he hi hr id ilo it ja kn ko krc lb mk ms nb nl om pl pt ro ru sl sr sv tr uk vi yue zh-hans zh-hant description: Languages (space separated) execution-strategy: sequential: true -- To view, visit https://gerrit.wikimedia.org/r/201141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4b54712b6402170727bcb9935533021e8949c5b Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] content: Update attribution on Neil Gaiman quote - change (wikimedia/TransparencyReport-private)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/201126 Change subject: content: Update attribution on Neil Gaiman quote .. content: Update attribution on Neil Gaiman quote Change-Id: I2ec7ac18b8e8c68ee4157b2dd429efce16721272 --- M locales/en.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private refs/changes/26/201126/1 diff --git a/locales/en.yml b/locales/en.yml index 68eebb1..15794a3 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -112,7 +112,7 @@ forgotten_title: Right To Be Forgotten Requests forgotten_intro: pLast year, a European court decision, a href='//en.wikipedia.org/wiki/Google_Spain_v_AEPD_and_Mario_Costeja_Gonz%C3%A1lez'Google Spain v. AEPD and Mario Costeja González/a, granted individuals the ability to request that search engines “de-index” content about them under the so-called “a href='//en.wikipedia.org/wiki/Right_to_be_forgotten'right to be forgotten/a” doctrine. We believe that denying people access to relevant and neutral information is antagonistic to the values of the Wikimedia movement and have made a a href='//blog.wikimedia.org/2014/08/06/european-court-decision-punches-holes-in-free-knowledge/'statement/a opposing the decision./ppHowever, under the theory of the 'right to be forgotten', we have started receiving direct requests to remove content from Wikimedia projects.*/ppsmall* Please note that this information only reflects requests made directly to us. Wikimedia project pages continue to disappear from search engine results without any notice, much less, request to us. We have a dedicated page where we post the notices about attempts to remove links to Wikimedia projects that we have received from the search engines who provide such notices as part of their own commitments to transparency. But we suspect that many search engines are not even giving notice, which we find contrary to core principles of free expression, due process, and transparency./small/p forgotten_quote: Because if you don’t stand up for the stuff you don’t like, when they come for the stuff you do like, you’ve already lost. -forgotten_cite: a href='//en.wikipedia.org/wiki/Neil_Gaiman'Neil Gaiman/a +forgotten_cite: a href='//en.wikipedia.org/wiki/Neil_Gaiman'Neil Gaiman/asmallAuthor (a href='//en.wikiquote.org/wiki/Neil_Gaiman'2008/a)/small total_number_of_forgotten_requests: Total number of requests number_of_forgotten_requests_granted: Number of requests granted dmca_title: DMCA Takedown Notices -- To view, visit https://gerrit.wikimedia.org/r/201126 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ec7ac18b8e8c68ee4157b2dd429efce16721272 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/TransparencyReport-private Gerrit-Branch: master Gerrit-Owner: Prtksxna psax...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] T93890: Allow intention flags for non-buttons - change (oojs/ui)
Werdna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201147
Change subject: T93890: Allow intention flags for non-buttons
..
T93890: Allow intention flags for non-buttons
Change-Id: I12f0a07b827692ce3c3fb4bec6a82e207b359255
---
M src/themes/mediawiki/MediaWikiTheme.js
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/47/201147/1
diff --git a/src/themes/mediawiki/MediaWikiTheme.js
b/src/themes/mediawiki/MediaWikiTheme.js
index e5b15b1..be2371b 100644
--- a/src/themes/mediawiki/MediaWikiTheme.js
+++ b/src/themes/mediawiki/MediaWikiTheme.js
@@ -29,10 +29,12 @@
destructive: false
},
// Parent method
- classes =
OO.ui.MediaWikiTheme.super.prototype.getElementClasses.call( this, element );
+ classes =
OO.ui.MediaWikiTheme.super.prototype.getElementClasses.call( this, element ),
+ isFramed;
- if ( element.supports( [ 'isFramed', 'isDisabled', 'hasFlag' ] ) ) {
- if ( element.isFramed() ( element.isDisabled() ||
element.hasFlag( 'primary' ) ) ) {
+ if ( element.supports( [ 'hasFlag' ] ) ) {
+ isFramed = element.supports( [ 'isFramed' ] )
element.isFramed();
+ if ( isFramed ( element.isDisabled() || element.hasFlag(
'primary' ) ) ) {
variants.invert = true;
} else {
variants.progressive = element.hasFlag( 'progressive' );
--
To view, visit https://gerrit.wikimedia.org/r/201147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12f0a07b827692ce3c3fb4bec6a82e207b359255
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Werdna agarr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Restore Leli Forte's mt translations - change (mediawiki...VisualEditor)
Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201149
Change subject: Restore Leli Forte's mt translations
..
Restore Leli Forte's mt translations
Follow up to 23b5f323: I pasted the removed translations, sorted and
removed duplicates.
Change-Id: Id59b5fcc1651abe9c1f6170de8c39ff6d62ec4e9
---
M modules/ve-mw/i18n/mt.json
1 file changed, 81 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/49/201149/1
diff --git a/modules/ve-mw/i18n/mt.json b/modules/ve-mw/i18n/mt.json
index 158..8b73c15 100644
--- a/modules/ve-mw/i18n/mt.json
+++ b/modules/ve-mw/i18n/mt.json
@@ -6,22 +6,97 @@
Leli Forte
]
},
+ tooltip-ca-ve-edit: Immodifika din il-paġna bil-VisualEditor,
+ visualeditor-advancedsettings-tool: Konfigurazzjonijiet avvanzati,
+ visualeditor-annotationbutton-linknode-tooltip: Ħolqa sempliċi,
visualeditor-beta-appendix: beta,
visualeditor-beta-label: beta,
- visualeditor-beta-warning: Il-VisualEditor qiegħed f' 'beta'. Tista'
tiltaqa' ma' xi problemi tas-software, u ma tkunx tista' timmodifika xi
partijiet tal-paġna. Sabiex taqleb għall-editjar tas-sors f'kwalunkwe ħin
mingħajr ma titlef xejn, iftaħ il-kexxa li tinżel
\{{int:visualeditor-toolbar-savedialog}}\ u agħżel \{{int:
visualeditor-mweditmodesource-title}}\.,
- visualeditor-ca-editsource: Editja s-sors,
- visualeditor-ca-editsource-section: editja s-sors,
+ visualeditor-beta-warning: Il-VisualEditor qiegħed fuq 'beta'.
Għalhekk tista' tiltaqa' ma' problemi ta' software u ma tkunx tista'
timmodifika xi partijiet tal-paġna. Biex taqleb lura għall-modifika mis-sors
mingħajr ma titlef il-bidliet li għamilt, iftaħ il-kexxun li jinżel maġenb
\{{int:visualeditor-toolbar-savedialog}}\ u agħżel
\{{int:visualeditor-mweditmodesource-tool}}\.,
+ visualeditor-browserwarning: Qiegħed tuża navigatur li mhuwiex
uffiċjalemnt kompatibbli mal-VisualEditor.,
+ visualeditor-ca-createlocaldescriptionsource: Agħti s-sors
tad-deskrizzjoni lokali,
+ visualeditor-ca-createsource: Oħloq sors,
+ visualeditor-ca-editlocaldescriptionsource: Immodifika s-sors
tad-deskrizzjoni lokali,
+ visualeditor-ca-editsource: Immodifika s-sors,
+ visualeditor-ca-editsource-section: immodifika s-sors,
+ visualeditor-ca-ve-create: VisualEditor,
+ visualeditor-ca-ve-edit: VisualEditor,
+ visualeditor-ca-ve-edit-section: VisualEditor,
visualeditor-categories-tool: Kategoriji,
+ visualeditor-cite-tool-name-book: Ktieb,
+ visualeditor-cite-tool-name-journal: Rivista,
+ visualeditor-cite-tool-name-news: Aħbarijiet,
+ visualeditor-cite-tool-name-web: Sit tal-web,
+ visualeditor-descriptionpagelink: Proġett:VisualEditor,
visualeditor-dialog-beta-welcome-action-continue: Kompli,
visualeditor-dialog-beta-welcome-content: Dan huwa l-mod ġdid u
eħfef kif teditja. Għadu xorta' f'verżjoni beta, li jfisser li mat-triq tista'
ssib xi partijiet fil-paġna li ma tistax tirranġa, jew issib quddiemek
kwistjonijiet li jkunu meħtieġa li jittranġaw. Inħeġġuk li tirrevedi l-bidliet
tiegħek, u nilqgħu senjalazzjonijiet ta' kwalunkwe problema li ssibu fl-użu
tal-VisualEditor (agħfas il-buttuna \{{int:visualeditor-help-tool}}\ sabiex
tibgħat il-messaġġ tiegħek). Tista' tibqa' tuża l-editur tat-test wiki billi
tagħfas fuq \$1\ minflok – bidliet li mhumiex issjejvjati jintilfu.,
- visualeditor-dialog-beta-welcome-title: Merħba fil-VisualEditor,
- visualeditor-dialog-media-change-image: Agħżel stampa differenti,
+ visualeditor-dialog-beta-welcome-title: Merħba fuq VisualEditor,
+ visualeditor-dialog-generalreference-intro: Agħżel tip ta' sors,
+ visualeditor-dialog-generalreference-title: Żid referenza,
+ visualeditor-dialog-media-alttext-section: Test alternattiv,
+ visualeditor-dialog-media-change-image: Ibdel l-istampa,
+ visualeditor-dialog-media-content-filename: isem tal-fajl,
+ visualeditor-dialog-media-content-section: Didaskalja,
+ visualeditor-dialog-media-dimensionseparator: x,
+ visualeditor-dialog-media-goback: Mur lura,
+ visualeditor-dialog-media-info-artist: Tella' permezz ta' $1,
+ visualeditor-dialog-media-info-audiofile: Fajl bl-awdjo,
+ visualeditor-dialog-media-info-created: Inħalqet: $1,
+ visualeditor-dialog-media-info-credit: Krediti,
+ visualeditor-dialog-media-info-dateformat: $2 ta' $1, tal-$3,
+ visualeditor-dialog-media-info-ellipsis: ...,
+ visualeditor-dialog-media-info-imagedescription: Deskrizzjoni sħiħa,
+ visualeditor-dialog-media-info-licenseshortname: Liċenzja,
+ visualeditor-dialog-media-info-meta-artist: Artista: $1,
+
[MediaWiki-commits] [Gerrit] content: Remove the content after below in the Right to be... - change (wikimedia/TransparencyReport-private)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/201121 Change subject: content: Remove the content after below in the Right to be forgotten intro .. content: Remove the content after below in the Right to be forgotten intro Change-Id: I8d2818a8da1c7e055aa74e9eca0272de8d0de156 --- M locales/en.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private refs/changes/21/201121/1 diff --git a/locales/en.yml b/locales/en.yml index db09e31..b32ec6c 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -110,7 +110,7 @@ story_studio_body: A public relations company demanded that we remove an image of a rapper. However, the photo had been freely licensed under a href='//commons.wikimedia.org/wiki/Main_Page'Wikimedia Commons/a policy apparently by the artist and claimed holder of the copyright. Therefore, we declined to remove it. The PR company initially alleged that the portrayed musician was someone different from the rapper. They later appeared to suggest that the rapper had never intended to give his permission. As the story seemed to change, the community examined, and then re-examined, the original permission. In the end the community found that the image should be kept. forgotten_title: Right To Be Forgotten Requests -forgotten_intro: pLast year, a European court decision, a href='//en.wikipedia.org/wiki/Google_Spain_v_AEPD_and_Mario_Costeja_Gonz%C3%A1lez'Google Spain v. AEPD and Mario Costeja González/a, granted individuals the ability to request that search engines “de-index” content about them under the so-called “a href='//en.wikipedia.org/wiki/Right_to_be_forgotten'right to be forgotten/a” doctrine. We believe that denying people access to relevant and neutral information is antagonistic to the values of the Wikimedia movement and have made a a href='//blog.wikimedia.org/2014/08/06/european-court-decision-punches-holes-in-free-knowledge/'statement/a opposing the decision./ppHowever, under the theory of the 'right to be forgotten', we have started receiving direct requests to remove content from Wikimedia projects. Below, you will find more information about the requests we have received.*/ppsmall* Please note that the information below only reflects requests made directly to us. Wikimedia project pages continue to disappear from search engine results without any notice, much less, request to us. We have a dedicated page where we post the notices about attempts to remove links to Wikimedia projects that we have received from the search engines who provide such notices as part of their own commitments to transparency. But we suspect that many search engines are not even giving notice, which we find contrary to core principles of free expression, due process, and transparency./small/p +forgotten_intro: pLast year, a European court decision, a href='//en.wikipedia.org/wiki/Google_Spain_v_AEPD_and_Mario_Costeja_Gonz%C3%A1lez'Google Spain v. AEPD and Mario Costeja González/a, granted individuals the ability to request that search engines “de-index” content about them under the so-called “a href='//en.wikipedia.org/wiki/Right_to_be_forgotten'right to be forgotten/a” doctrine. We believe that denying people access to relevant and neutral information is antagonistic to the values of the Wikimedia movement and have made a a href='//blog.wikimedia.org/2014/08/06/european-court-decision-punches-holes-in-free-knowledge/'statement/a opposing the decision./ppHowever, under the theory of the 'right to be forgotten', we have started receiving direct requests to remove content from Wikimedia projects./p forgotten_quote: Because if you don’t stand up for the stuff you don’t like, when they come for the stuff you do like, you’ve already lost. forgotten_cite: a href='//en.wikipedia.org/wiki/Neil_Gaiman'Neil Gaiman/a total_number_of_forgotten_requests: Total number of requests -- To view, visit https://gerrit.wikimedia.org/r/201121 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d2818a8da1c7e055aa74e9eca0272de8d0de156 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/TransparencyReport-private Gerrit-Branch: master Gerrit-Owner: Prtksxna psax...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] content: Fix space in remove_content answer - change (wikimedia/TransparencyReport-private)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/201129 Change subject: content: Fix space in remove_content answer .. content: Fix space in remove_content answer Change-Id: Iee3992583e112e3db83ca2b7fd85638af5e02916 --- M locales/en.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private refs/changes/29/201129/1 diff --git a/locales/en.yml b/locales/en.yml index 9559ba7..ebf50d2 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -179,7 +179,7 @@ q_im_being_sued: Help! I'm being sued because of something I did on the Wikimedia projects. What should I do? a_im_being_sued: pLawsuits against Wikimedia users are exceedingly uncommon—most disputes about content are resolved by working with the user community through community-driven processes. In fact, individuals and organizations that sue over content they wish to remove from the public's eye often end up causing that content to receive greater public attention as a result of the lawsuit, a phenomenon known as the a href='//en.wikipedia.org/wiki/Streisand_effect'Streisand Effect/a./ppIn the unlikely event that you are the subject of a lawsuit, it is highly recommended that you consult your own lawyer. There are a number of organizations that fight on a user's behalf, like the a href='http://www.casp.net/'California Anti-SLAPP Project/a or the a href='https://www.eff.org/'Electronic Frontier Foundation/a (EFF). If you need help finding an attorney, WMF may be able to put you in touch with some of these organizations or help you secure an attorney at reduced or pro-bono rates. Additionally, in rare cases, assistance may also be available under our a href='//meta.wikimedia.org/wiki/Legal_and_Community_Advocacy/Legal_Fees_Assistance_Program'Legal Fees Assistance Program/a or a href='//meta.wikimedia.org/wiki/Legal_and_Community_Advocacy/Legal_Policies#Defense_of_Contributors'Defense of Contributors Program/a./p q_remove_content: Does WMF ever remove content? -a_remove_content: pAbsent the receipt of a legally valid a href='//www.chillingeffects.org/dmca512/faq.cgi#QID130'DMCA notice/a, the Wikimedia Foundation will generally only remove content in exceptional circumstances.For example, we once removed a blogger’s unredacted travel visa after somebody else posted the image with his private information exposed./p +a_remove_content: pAbsent the receipt of a legally valid a href='//www.chillingeffects.org/dmca512/faq.cgi#QID130'DMCA notice/a, the Wikimedia Foundation will generally only remove content in exceptional circumstances. For example, we once removed a blogger’s unredacted travel visa after somebody else posted the image with his private information exposed./p q_dmca_valid_proper: What makes a DMCA takedown notice 'valid' or 'proper'? a_dmca_valid_proper: pThe DMCA has several a href='//en.wikipedia.org/wiki/Online_Copyright_Infringement_Liability_Limitation_Act#Notice_from_copyright_owner'formal requirements/a for notices. However, our evaluation isn’t over when we receive a notice that meets all of these requirements. We will also analyze the copyright eligibility of the work being infringed, whether the allegedly infringing material actually infringes, and whether the allegedly infringing material is a a href='//en.wikipedia.org/wiki/Fair_use'fair use/a of the requester’s work. For more information, see our a href='//wikimediafoundation.org/wiki/DMCA_Policy'DMCA Policy/a./p q_transparent_dmca: How are you transparent about particular DMCA removals besides in this transparency report? -- To view, visit https://gerrit.wikimedia.org/r/201129 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee3992583e112e3db83ca2b7fd85638af5e02916 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/TransparencyReport-private Gerrit-Branch: master Gerrit-Owner: Prtksxna psax...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] faq: Fix links in right_forgotten answer - change (wikimedia/TransparencyReport-private)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/201128 Change subject: faq: Fix links in right_forgotten answer .. faq: Fix links in right_forgotten answer Change-Id: Ib24ea66f448cd17a2d36b21cb12f9ecffd618c33 --- M locales/en.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private refs/changes/28/201128/1 diff --git a/locales/en.yml b/locales/en.yml index 69a2b44..9559ba7 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -166,7 +166,7 @@ q_voluntary_disclosure: What do you mean by 'voluntary disclosure'? a_voluntary_disclosure: When we say ‘voluntary disclosure’, we mean just that: times where we voluntarily—and on our own initiative—disclose personal information to a law enforcement agency. Such disclosures are rare, and we typically make them in emergency situations, such as when we receive a credible suicide threat or threat of physical violence. We only make these disclosures in accordance with the exceptions outlined in our a href='//wikimediafoundation.org/wiki/Privacy_policy#sharing'Privacy Policy/a, such as to protect you, ourselves, and others from imminent and serious bodily harm or death. q_right_forgotten: What do you mean by 'Right to be Forgotten'? -a_right_forgotten: The so-called a href='//en.wikipedia.org/wiki/European_Union'Right to be Forgotten (RTBF) is a legal principle in the European Union and Argentina/a. The term reached the mainstream in 2014 when a European court decision, Google Spain v. AEPD and Mario Costeja González, granted EU individuals the ability to request that search engines “de-index” content about them. +a_right_forgotten: The so-called a href='//en.wikipedia.org/wiki/Right_to_be_forgotten'Right to be Forgotten (RTBF)/a is a legal principle in the a href='//en.wikipedia.org/wiki/European_Union'European Union/a and Argentina. The term reached the mainstream in 2014 when a European court decision, Google Spain v. AEPD and Mario Costeja González, granted EU individuals the ability to request that search engines “de-index” content about them. While Wikimedia’s projects are not search engines, we occasionally receive requests to remove content based on the RTBF. We began documenting such requests in July, 2014. To learn more about the problems with RTBF and other kinds of censorship, please check out our a href='//blog.wikimedia.org/2014/08/06/european-court-decision-punches-holes-in-free-knowledge/'statement/a. q_different_compare: Why are requests for user data calculated differently by WMF as compared to other organizations? a_different_compare: In this transparency report, WMF has included all types of requests for user information it receives, including governmental and non-governmental requests as well as informal and formal requests. Other organizations, particularly those appearing in the 'Compared to other companies' graph in our report, only disclose requests originating from governments. Please visit the transparency reports of a href='https://govtrequests.facebook.com/'Facebook/a, a href='//www.google.com/transparencyreport/'Google/a, a href='https://transparency.twitter.com/'Twitter/a, and a href='//www.linkedin.com/legal/transparency'LinkedIn/a for more detail about the types of requests they receive. -- To view, visit https://gerrit.wikimedia.org/r/201128 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib24ea66f448cd17a2d36b21cb12f9ecffd618c33 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/TransparencyReport-private Gerrit-Branch: master Gerrit-Owner: Prtksxna psax...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Made user preferences load from the master by default - change (mediawiki/core)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201131
Change subject: Made user preferences load from the master by default
..
Made user preferences load from the master by default
* Warn when saving slave-loaded data in saveSettings()
* Respect the loading $flags for preferences/groups
* Fixed use of flags in addToDatabase()
* Made loadFromCache() protected to make this mess easier
to reason about (no callers found)
* Added some doc comments
Bug: T92232
Change-Id: Ic1dd66063cc2f98fc03861df1c523981f846a0be
(cherry picked from commit 7e27652a76c1b5a26ae1de0906d1980942ece1fa)
---
M includes/User.php
1 file changed, 42 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/31/201131/1
diff --git a/includes/User.php b/includes/User.php
index 5c3079b..0ae3fc1 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -295,6 +295,9 @@
/** @var array */
private $mWatchedItems = array();
+ /** @var integer User::READ_* constant bitfield used to load data */
+ protected $queryFlagsUsed = self::READ_NORMAL;
+
public static $idCacheByName = array();
/**
@@ -330,6 +333,7 @@
// Set it now to avoid infinite recursion in accessors
$this-mLoadedItems = true;
+ $this-queryFlagsUsed = $flags;
switch ( $this-mFrom ) {
case 'defaults':
@@ -390,6 +394,7 @@
}
$this-mLoadedItems = true;
+ $this-queryFlagsUsed = $flags;
return true;
}
@@ -400,7 +405,7 @@
* @return bool false if the ID does not exist or data is invalid, true
otherwise
* @since 1.25
*/
- public function loadFromCache() {
+ protected function loadFromCache() {
global $wgMemc;
if ( $this-mId == 0 ) {
@@ -427,22 +432,35 @@
/**
* Save user data to the shared cache
+*
+* This method should not be called outside the User class
*/
public function saveToCache() {
+ global $wgMemc;
+
$this-load();
$this-loadGroups();
$this-loadOptions();
+
if ( $this-isAnon() ) {
// Anonymous users are uncached
return;
}
+
+ // The cache needs good consistency due to its high TTL, so the
user
+ // should have been loaded from the master to avoid lag
amplification.
+ if ( !( $this-queryFlagsUsed self::READ_LATEST ) ) {
+ wfWarn( Cannot save slave-loaded User object data to
cache. );
+ return;
+ }
+
$data = array();
foreach ( self::$mCacheVars as $name ) {
$data[$name] = $this-$name;
}
$data['mVersion'] = self::VERSION;
$key = wfMemcKey( 'user', 'id', $this-mId );
- global $wgMemc;
+
$wgMemc-set( $key, $data );
}
@@ -1057,7 +1075,6 @@
$this-mGroups = array();
Hooks::run( 'UserLoadDefaults', array( $this, $name ) );
-
}
/**
@@ -1201,6 +1218,7 @@
: array()
);
+ $this-queryFlagsUsed = $flags;
Hooks::run( 'UserLoadFromDatabase', array( $this, $s ) );
if ( $s !== false ) {
@@ -1338,7 +1356,9 @@
*/
private function loadGroups() {
if ( is_null( $this-mGroups ) ) {
- $dbr = wfGetDB( DB_MASTER );
+ $dbr = ( $this-queryFlagsUsed self::READ_LATEST )
+ ? wfGetDB( DB_MASTER )
+ : wfGetDB( DB_SLAVE );
$res = $dbr-select( 'user_groups',
array( 'ug_group' ),
array( 'ug_user' = $this-mId ),
@@ -1362,11 +1382,11 @@
private function loadPasswords() {
if ( $this-getId() !== 0 ( $this-mPassword === null ||
$this-mNewpassword === null ) ) {
$this-loadFromRow( wfGetDB( DB_MASTER )-selectRow(
- 'user',
- array( 'user_password',
'user_newpassword', 'user_newpass_time', 'user_password_expires' ),
- array( 'user_id' = $this-getId() ),
- __METHOD__
- ) );
+ 'user',
+ array( 'user_password', 'user_newpassword',
'user_newpass_time', 'user_password_expires' ),
+
[MediaWiki-commits] [Gerrit] IPsec: improved cipher selection - change (operations/puppet)
Gage has uploaded a new change for review. https://gerrit.wikimedia.org/r/201135 Change subject: IPsec: improved cipher selection .. IPsec: improved cipher selection * For clarity, specify GCM in bytes instead of bits to match proposal output * For clarity, explictly specify null integrity algorithm * Select pseudorandom function (PRF): SHA2_384 * ECDH: select Brainpool curve with 384-bit key * ESP: Enable 64-bit extended sequence numbers (ESN) * https://wikitech.wikimedia.org/wiki/IPsec#Cipher_selection * https://wikitech.wikimedia.org/wiki/IPsec#Cipher_proposals Change-Id: If2ac2b1def677dbcbf8cc95c849c4b6283e3c2dc --- M modules/strongswan/templates/ipsec.conf.erb 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/35/201135/1 diff --git a/modules/strongswan/templates/ipsec.conf.erb b/modules/strongswan/templates/ipsec.conf.erb index f7c857a..3adc3f9 100644 --- a/modules/strongswan/templates/ipsec.conf.erb +++ b/modules/strongswan/templates/ipsec.conf.erb @@ -38,11 +38,10 @@ conn %default # https://wiki.strongswan.org/projects/strongswan/wiki/IKEv2CipherSuites - # https://wiki.strongswan.org/projects/strongswan/wiki/CipherSuiteExamples - # http://www.strongswan.org/uml/testresults/ikev2/alg-aes-gcm/ - # modp2048 = DH group 14 - ike=aes128gcm128-aesxcbc-modp2048! - esp=aes128gcm128-modp2048! + # https://wikitech.wikimedia.org/wiki/IPsec#Cipher_selection + # https://wikitech.wikimedia.org/wiki/IPsec#Cipher_proposals + ike=aes128gcm16-null-prfsha384-ecp384bp! + esp=aes128gcm16-null-ecp384bp-esn! type=transport auto=start -- To view, visit https://gerrit.wikimedia.org/r/201135 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If2ac2b1def677dbcbf8cc95c849c4b6283e3c2dc Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gage jger...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add @group Database tags to tests that need it - change (mediawiki/core)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201142
Change subject: Add @group Database tags to tests that need it
..
Add @group Database tags to tests that need it
These tests all involve database access in some way,
and thus need @group Database tags.
These failed when setting a bogus database password
and then running the tests.
Change-Id: I7f113a79ac44d09d88ec607f76b8ec22bc1ebcf1
---
M tests/phpunit/includes/ExtraParserTest.php
M tests/phpunit/includes/TitleTest.php
M tests/phpunit/includes/libs/CSSMinTest.php
M tests/phpunit/includes/parser/MagicVariableTest.php
M tests/phpunit/includes/parser/ParserMethodsTest.php
M tests/phpunit/includes/parser/TagHooksTest.php
M tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php
M tests/phpunit/includes/specials/SpecialPreferencesTest.php
8 files changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/42/201142/1
diff --git a/tests/phpunit/includes/ExtraParserTest.php
b/tests/phpunit/includes/ExtraParserTest.php
index 4a4130e..77b26b3 100644
--- a/tests/phpunit/includes/ExtraParserTest.php
+++ b/tests/phpunit/includes/ExtraParserTest.php
@@ -2,6 +2,8 @@
/**
* Parser-related tests that don't suit for parserTests.txt
+ *
+ * @group Database
*/
class ExtraParserTest extends MediaWikiTestCase {
diff --git a/tests/phpunit/includes/TitleTest.php
b/tests/phpunit/includes/TitleTest.php
index d55f958..00c29ee 100644
--- a/tests/phpunit/includes/TitleTest.php
+++ b/tests/phpunit/includes/TitleTest.php
@@ -1,6 +1,7 @@
?php
/**
+ * @group Database
* @group Title
*/
class TitleTest extends MediaWikiTestCase {
diff --git a/tests/phpunit/includes/libs/CSSMinTest.php
b/tests/phpunit/includes/libs/CSSMinTest.php
index 6142f96..3ae1350 100644
--- a/tests/phpunit/includes/libs/CSSMinTest.php
+++ b/tests/phpunit/includes/libs/CSSMinTest.php
@@ -2,6 +2,8 @@
/**
* This file test the CSSMin library shipped with Mediawiki.
*
+ * @group Database
+ *
* @author Timo Tijhof
*/
diff --git a/tests/phpunit/includes/parser/MagicVariableTest.php
b/tests/phpunit/includes/parser/MagicVariableTest.php
index 1722611..cd54a9e 100644
--- a/tests/phpunit/includes/parser/MagicVariableTest.php
+++ b/tests/phpunit/includes/parser/MagicVariableTest.php
@@ -10,6 +10,8 @@
* @copyright Copyright © 2011, Antoine Musso
* @file
* @todo covers tags
+ *
+ * @group Database
*/
class MagicVariableTest extends MediaWikiTestCase {
diff --git a/tests/phpunit/includes/parser/ParserMethodsTest.php
b/tests/phpunit/includes/parser/ParserMethodsTest.php
index 1790086..af143ca 100644
--- a/tests/phpunit/includes/parser/ParserMethodsTest.php
+++ b/tests/phpunit/includes/parser/ParserMethodsTest.php
@@ -1,5 +1,9 @@
?php
+/**
+ * @group Database
+ */
+
class ParserMethodsTest extends MediaWikiLangTestCase {
public static function providePreSaveTransform() {
diff --git a/tests/phpunit/includes/parser/TagHooksTest.php
b/tests/phpunit/includes/parser/TagHooksTest.php
index 251da47..3605e50 100644
--- a/tests/phpunit/includes/parser/TagHooksTest.php
+++ b/tests/phpunit/includes/parser/TagHooksTest.php
@@ -1,6 +1,7 @@
?php
/**
+ * @group Database
* @group Parser
*/
class TagHookTest extends MediaWikiTestCase {
diff --git
a/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php
b/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php
index 122995a..e1197df 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php
@@ -1,6 +1,7 @@
?php
/**
+ * @group Database
* @group ResourceLoader
*/
class ResourceLoaderFileModuleTest extends ResourceLoaderTestCase {
diff --git a/tests/phpunit/includes/specials/SpecialPreferencesTest.php
b/tests/phpunit/includes/specials/SpecialPreferencesTest.php
index 4f6c411..1545d7e 100644
--- a/tests/phpunit/includes/specials/SpecialPreferencesTest.php
+++ b/tests/phpunit/includes/specials/SpecialPreferencesTest.php
@@ -4,10 +4,11 @@
*
* Copyright © 2013, Antoine Musso
* Copyright © 2013, Wikimedia Foundation Inc.
- *
*/
/**
+ * @group Database
+ *
* @covers SpecialPreferences
*/
class SpecialPreferencesTest extends MediaWikiTestCase {
--
To view, visit https://gerrit.wikimedia.org/r/201142
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f113a79ac44d09d88ec607f76b8ec22bc1ebcf1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimania_scholarships: don't manage open/close dates - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201143
Change subject: wikimania_scholarships: don't manage open/close dates
..
wikimania_scholarships: don't manage open/close dates
open/close dates are now controlled in the database
Bug: T92358
Change-Id: I38cc9f819990400f076e733b1f6a2e3fa8dc1c0a
---
M manifests/role/wikimania_scholarships.pp
M modules/wikimania_scholarships/manifests/init.pp
M modules/wikimania_scholarships/templates/env.erb
3 files changed, 0 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/201143/1
diff --git a/manifests/role/wikimania_scholarships.pp
b/manifests/role/wikimania_scholarships.pp
index 4139a68..7a55526 100644
--- a/manifests/role/wikimania_scholarships.pp
+++ b/manifests/role/wikimania_scholarships.pp
@@ -5,10 +5,6 @@
class role::wikimania_scholarships {
class { '::wikimania_scholarships':
-# Opening date for 2014 application cycle
-open_date= '2014-01-06T00:00:00Z',
-# Closing date for 2014 application cycle
-close_date = '2014-02-17T23:59:59Z',
hostname = 'scholarships.wikimedia.org',
deploy_dir = '/srv/deployment/scholarships/scholarships',
cache_dir= '/var/cache/scholarships',
diff --git a/modules/wikimania_scholarships/manifests/init.pp
b/modules/wikimania_scholarships/manifests/init.pp
index df231f0..183cdd9 100644
--- a/modules/wikimania_scholarships/manifests/init.pp
+++ b/modules/wikimania_scholarships/manifests/init.pp
@@ -4,8 +4,6 @@
# application.
#
# == Parameters:
-# - $open_date: date/time that applications will first be accepted
-# - $close_date: date/time after which applications will no longer be accepted
# - $hostname: hostname for apache vhost
# - $deploy_dir: directory application is deployed to
# - $cache_dir: directory for caching twig templates
@@ -18,13 +16,9 @@
# == Sample usage:
#
# class { 'wikimania_scholarships':
-# open_date = '2014-01-01T00:00:00Z',
-# close_date = '2014-02-28T23:59:59Z'
# }
#
class wikimania_scholarships(
-$open_date= 'UNSET',
-$close_date = 'UNSET',
$hostname = 'scholarships.wikimedia.org',
$deploy_dir = '/srv/deployment/scholarships/scholarships',
$cache_dir= '/var/cache/scholarships',
@@ -43,14 +37,6 @@
$mysql_user = $passwords::mysql::wikimania_scholarships::app_user
$mysql_pass = $passwords::mysql::wikimania_scholarships::app_password
$log_file = udp://${udp2log_dest}/scholarships
-
-# Check arguments
-if $open_date == 'UNSET' {
-fail('$open_date must be a date parsable by PHP\'s strtotime()')
-}
-if $close_date == 'UNSET' {
-fail('$close_date must be a date parsable by PHP\'s strtotime()')
-}
system::role { 'wikimania_scholarships':
description = 'Wikimania Scholarships server'
diff --git a/modules/wikimania_scholarships/templates/env.erb
b/modules/wikimania_scholarships/templates/env.erb
index 2784acc..24c31cc 100644
--- a/modules/wikimania_scholarships/templates/env.erb
+++ b/modules/wikimania_scholarships/templates/env.erb
@@ -20,11 +20,3 @@
; Directory for apache to write twig template cache files
CACHE_DIR=%= @cache_dir %
-
-; Date/time that applications will first be accepted
-; Value should be compatible with PHP's strtotime() function
-APPLICATION_OPEN=%= @open_date %
-
-; Date/time after which applications will no longer be accepted
-; Value should be compatible with PHP's strtotime() function
-APPLICATION_CLOSE=%= @close_date %
--
To view, visit https://gerrit.wikimedia.org/r/201143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38cc9f819990400f076e733b1f6a2e3fa8dc1c0a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix rubocop error - change (mediawiki...PoolCounter)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201148
Change subject: Fix rubocop error
..
Fix rubocop error
and - . That makes the code rubocop compliant and will let us add a
Jenkins job to enforce it.
Change-Id: I083701599fa57e6f89c409b448dc0c03d11273b8
---
M daemon/tests/features/step_definitions/client_steps.rb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PoolCounter
refs/changes/48/201148/1
diff --git a/daemon/tests/features/step_definitions/client_steps.rb
b/daemon/tests/features/step_definitions/client_steps.rb
index 5f6ee96..532904d 100644
--- a/daemon/tests/features/step_definitions/client_steps.rb
+++ b/daemon/tests/features/step_definitions/client_steps.rb
@@ -14,7 +14,7 @@
if text == 'no response'
# Raise an error if you get a response. Raise an error if you don't
timeout.
expect(- { expect(@clients[name].receive).to eq(nil) }).to
raise_error(Timeout::Error)
- elsif text.start_with?('/') and text.end_with?('/')
+ elsif text.start_with?('/') text.end_with?('/')
text = text[1..-2]
expect(@clients[name].receive).to match(text)
else
--
To view, visit https://gerrit.wikimedia.org/r/201148
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I083701599fa57e6f89c409b448dc0c03d11273b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PoolCounter
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Hindi and Indonesian to the language screenshots job - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Add Hindi and Indonesian to the language screenshots job .. Add Hindi and Indonesian to the language screenshots job These languages passed the 80% translation threshold. Change-Id: Ie4b54712b6402170727bcb9935533021e8949c5b --- M jjb/job-templates-browsertests.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, but someone else must approve Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/job-templates-browsertests.yaml b/jjb/job-templates-browsertests.yaml index c69f19c..0922af3 100644 --- a/jjb/job-templates-browsertests.yaml +++ b/jjb/job-templates-browsertests.yaml @@ -27,7 +27,7 @@ description: Upload API URL for uploading screenshots - string: name: lang_list -default: ar ast cs de el en es et fa fi fr gl he hr ilo it ja kn ko krc lb mk ms nb nl om pl pt ro ru sl sr sv tr uk vi yue zh-hans zh-hant +default: ar ast cs de el en es et fa fi fr gl he hi hr id ilo it ja kn ko krc lb mk ms nb nl om pl pt ro ru sl sr sv tr uk vi yue zh-hans zh-hant description: Languages (space separated) execution-strategy: sequential: true -- To view, visit https://gerrit.wikimedia.org/r/201141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie4b54712b6402170727bcb9935533021e8949c5b Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Restore Leli Forte's mt translations - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Restore Leli Forte's mt translations
..
Restore Leli Forte's mt translations
Follow up to 23b5f323: I pasted the removed translations, sorted and
removed duplicates.
Change-Id: Id59b5fcc1651abe9c1f6170de8c39ff6d62ec4e9
---
M modules/ve-mw/i18n/mt.json
1 file changed, 81 insertions(+), 5 deletions(-)
Approvals:
Nikerabbit: Looks good to me, but someone else must approve
Raimond Spekking: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/i18n/mt.json b/modules/ve-mw/i18n/mt.json
index 158..8b73c15 100644
--- a/modules/ve-mw/i18n/mt.json
+++ b/modules/ve-mw/i18n/mt.json
@@ -6,22 +6,97 @@
Leli Forte
]
},
+ tooltip-ca-ve-edit: Immodifika din il-paġna bil-VisualEditor,
+ visualeditor-advancedsettings-tool: Konfigurazzjonijiet avvanzati,
+ visualeditor-annotationbutton-linknode-tooltip: Ħolqa sempliċi,
visualeditor-beta-appendix: beta,
visualeditor-beta-label: beta,
- visualeditor-beta-warning: Il-VisualEditor qiegħed f' 'beta'. Tista'
tiltaqa' ma' xi problemi tas-software, u ma tkunx tista' timmodifika xi
partijiet tal-paġna. Sabiex taqleb għall-editjar tas-sors f'kwalunkwe ħin
mingħajr ma titlef xejn, iftaħ il-kexxa li tinżel
\{{int:visualeditor-toolbar-savedialog}}\ u agħżel \{{int:
visualeditor-mweditmodesource-title}}\.,
- visualeditor-ca-editsource: Editja s-sors,
- visualeditor-ca-editsource-section: editja s-sors,
+ visualeditor-beta-warning: Il-VisualEditor qiegħed fuq 'beta'.
Għalhekk tista' tiltaqa' ma' problemi ta' software u ma tkunx tista'
timmodifika xi partijiet tal-paġna. Biex taqleb lura għall-modifika mis-sors
mingħajr ma titlef il-bidliet li għamilt, iftaħ il-kexxun li jinżel maġenb
\{{int:visualeditor-toolbar-savedialog}}\ u agħżel
\{{int:visualeditor-mweditmodesource-tool}}\.,
+ visualeditor-browserwarning: Qiegħed tuża navigatur li mhuwiex
uffiċjalemnt kompatibbli mal-VisualEditor.,
+ visualeditor-ca-createlocaldescriptionsource: Agħti s-sors
tad-deskrizzjoni lokali,
+ visualeditor-ca-createsource: Oħloq sors,
+ visualeditor-ca-editlocaldescriptionsource: Immodifika s-sors
tad-deskrizzjoni lokali,
+ visualeditor-ca-editsource: Immodifika s-sors,
+ visualeditor-ca-editsource-section: immodifika s-sors,
+ visualeditor-ca-ve-create: VisualEditor,
+ visualeditor-ca-ve-edit: VisualEditor,
+ visualeditor-ca-ve-edit-section: VisualEditor,
visualeditor-categories-tool: Kategoriji,
+ visualeditor-cite-tool-name-book: Ktieb,
+ visualeditor-cite-tool-name-journal: Rivista,
+ visualeditor-cite-tool-name-news: Aħbarijiet,
+ visualeditor-cite-tool-name-web: Sit tal-web,
+ visualeditor-descriptionpagelink: Proġett:VisualEditor,
visualeditor-dialog-beta-welcome-action-continue: Kompli,
visualeditor-dialog-beta-welcome-content: Dan huwa l-mod ġdid u
eħfef kif teditja. Għadu xorta' f'verżjoni beta, li jfisser li mat-triq tista'
ssib xi partijiet fil-paġna li ma tistax tirranġa, jew issib quddiemek
kwistjonijiet li jkunu meħtieġa li jittranġaw. Inħeġġuk li tirrevedi l-bidliet
tiegħek, u nilqgħu senjalazzjonijiet ta' kwalunkwe problema li ssibu fl-użu
tal-VisualEditor (agħfas il-buttuna \{{int:visualeditor-help-tool}}\ sabiex
tibgħat il-messaġġ tiegħek). Tista' tibqa' tuża l-editur tat-test wiki billi
tagħfas fuq \$1\ minflok – bidliet li mhumiex issjejvjati jintilfu.,
- visualeditor-dialog-beta-welcome-title: Merħba fil-VisualEditor,
- visualeditor-dialog-media-change-image: Agħżel stampa differenti,
+ visualeditor-dialog-beta-welcome-title: Merħba fuq VisualEditor,
+ visualeditor-dialog-generalreference-intro: Agħżel tip ta' sors,
+ visualeditor-dialog-generalreference-title: Żid referenza,
+ visualeditor-dialog-media-alttext-section: Test alternattiv,
+ visualeditor-dialog-media-change-image: Ibdel l-istampa,
+ visualeditor-dialog-media-content-filename: isem tal-fajl,
+ visualeditor-dialog-media-content-section: Didaskalja,
+ visualeditor-dialog-media-dimensionseparator: x,
+ visualeditor-dialog-media-goback: Mur lura,
+ visualeditor-dialog-media-info-artist: Tella' permezz ta' $1,
+ visualeditor-dialog-media-info-audiofile: Fajl bl-awdjo,
+ visualeditor-dialog-media-info-created: Inħalqet: $1,
+ visualeditor-dialog-media-info-credit: Krediti,
+ visualeditor-dialog-media-info-dateformat: $2 ta' $1, tal-$3,
+ visualeditor-dialog-media-info-ellipsis: ...,
+ visualeditor-dialog-media-info-imagedescription: Deskrizzjoni sħiħa,
+ visualeditor-dialog-media-info-licenseshortname: Liċenzja,
+ visualeditor-dialog-media-info-meta-artist: Artista: $1,
+
[MediaWiki-commits] [Gerrit] [FIX] Remove _imageinfo usage - change (pywikibot/core)
XZise has uploaded a new change for review. https://gerrit.wikimedia.org/r/201157 Change subject: [FIX] Remove _imageinfo usage .. [FIX] Remove _imageinfo usage With d298facc _imageinfo has been replaced by _file_revisions. This is now remove all usage of it. Change-Id: I01cadfc4f3c4bbd66f953c9527e85d0d0c2aa9a4 --- M pywikibot/data/api.py M pywikibot/page.py M pywikibot/site.py M tests/site_tests.py 4 files changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/57/201157/1 diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 70e512b..d67f1e0 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -2389,8 +2389,6 @@ Convert page dict entry from api to Page object. p = PageGenerator.result(self, pagedata) filepage = pywikibot.FilePage(p) -if 'imageinfo' in pagedata: -filepage._imageinfo = pagedata['imageinfo'][0] return filepage @@ -2583,9 +2581,7 @@ if 'imageinfo' in pagedict: assert(isinstance(page, pywikibot.FilePage)) -for file_rev in pagedict['imageinfo']: -file_revision = pywikibot.page.FileInfo(file_rev) -page._file_revisions[file_revision.timestamp] = file_revision +page._load_file_revisions(pagedict['imageinfo']) if categoryinfo in pagedict: page._catinfo = pagedict[categoryinfo] diff --git a/pywikibot/page.py b/pywikibot/page.py index 6da7532..0cdcbc8 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2012,6 +2012,11 @@ if self.namespace() != 6: raise ValueError(u'%s' is not in the file namespace! % title) +def _load_file_revisions(self, imageinfo): +for file_rev in imageinfo: +file_revision = FileInfo(file_rev) +self._file_revisions[file_revision.timestamp] = file_revision + @property def latest_file_info(self): Retrieve and store information of latest Image rev. of FilePage. diff --git a/pywikibot/site.py b/pywikibot/site.py index fe0c4ac..fc4cd5f 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -4982,7 +4982,7 @@ # If we receive a nochange, that would mean we're in simulation # mode, don't attempt to access imageinfo if nochange not in result: -filepage._imageinfo = result[imageinfo] +filepage._load_file_revisions(result[imageinfo]) return @deprecated_args(number=step, diff --git a/tests/site_tests.py b/tests/site_tests.py index 322f1ef..6b03fde 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -595,11 +595,11 @@ for impage in mysite.allimages(minsize=100, total=5): self.assertIsInstance(impage, pywikibot.FilePage) self.assertTrue(mysite.page_exists(impage)) -self.assertGreaterEqual(impage._imageinfo[size], 100) +self.assertGreaterEqual(impage.latest_file_info[size], 100) for impage in mysite.allimages(maxsize=2000, total=5): self.assertIsInstance(impage, pywikibot.FilePage) self.assertTrue(mysite.page_exists(impage)) -self.assertLessEqual(impage._imageinfo[size], 2000) +self.assertLessEqual(impage.latest_file_info[size], 2000) def test_newfiles(self): Test the site.newfiles() method. -- To view, visit https://gerrit.wikimedia.org/r/201157 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01cadfc4f3c4bbd66f953c9527e85d0d0c2aa9a4 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use string|false as @return instead of string|bool where... - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201151
Change subject: Use string|false as @return instead of string|bool where
appropiate
..
Use string|false as @return instead of string|bool where appropiate
This makes sure static analyzers don't warn for supposedly unsafe
code accessing variables as strings when they could be boolean after
having only checked against false.
https://github.com/scrutinizer-ci/php-analyzer/issues/605
Change-Id: Idb676de7587f1eccb46c12de0131bea4489a0785
---
M includes/exception/MWExceptionHandler.php
M includes/json/FormatJson.php
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/51/201151/1
diff --git a/includes/exception/MWExceptionHandler.php
b/includes/exception/MWExceptionHandler.php
index 7110361..ed0f3c2 100644
--- a/includes/exception/MWExceptionHandler.php
+++ b/includes/exception/MWExceptionHandler.php
@@ -349,7 +349,7 @@
* returns the requested URL. Otherwise, returns false.
*
* @since 1.23
-* @return string|bool
+* @return string|false
*/
public static function getURL() {
global $wgRequest;
@@ -428,7 +428,7 @@
* @param Exception $e
* @param bool $pretty Add non-significant whitespace to improve
readability (default: false).
* @param int $escaping Bitfield consisting of FormatJson::.*_OK class
constants.
-* @return string|bool JSON string if successful; false upon failure
+* @return string|false JSON string if successful; false upon failure
*/
public static function jsonSerializeException( Exception $e, $pretty =
false, $escaping = 0 ) {
global $wgLogExceptionBacktrace;
diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index f27194a..095811f 100644
--- a/includes/json/FormatJson.php
+++ b/includes/json/FormatJson.php
@@ -122,7 +122,7 @@
* readability, using that string for indentation. If true, use the
default indent
* string (four spaces).
* @param int $escaping Bitfield consisting of _OK class constants
-* @return string|bool: String if successful; false upon failure
+* @return string|false String if successful; false upon failure
*/
public static function encode( $value, $pretty = false, $escaping = 0 )
{
if ( !is_string( $pretty ) ) {
@@ -232,7 +232,7 @@
* @param mixed $value
* @param string|bool $pretty
* @param int $escaping
-* @return string|bool
+* @return string|false
*/
private static function encode54( $value, $pretty, $escaping ) {
static $bug66021;
@@ -284,7 +284,7 @@
* @param mixed $value
* @param string|bool $pretty
* @param int $escaping
-* @return string|bool
+* @return string|false
*/
private static function encode53( $value, $pretty, $escaping ) {
$options = ( $escaping self::XMLMETA_OK ) ? 0 : (
JSON_HEX_TAG | JSON_HEX_AMP );
--
To view, visit https://gerrit.wikimedia.org/r/201151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb676de7587f1eccb46c12de0131bea4489a0785
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move Wikibase\Template to Wikibase\View\Template - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Move Wikibase\Template to Wikibase\View\Template
..
Move Wikibase\Template to Wikibase\View\Template
Change-Id: Id694b9f530fb66bcea16ea4679a216456d246e85
---
M composer.json
M repo/Wikibase.hooks.php
M repo/includes/EntityParserOutputGenerator.php
M repo/includes/EntityParserOutputGeneratorFactory.php
M repo/includes/WikibaseRepo.php
M repo/includes/modules/TemplateModule.php
M repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
M view/src/ClaimHtmlGenerator.php
M view/src/EntityTermsView.php
M view/src/EntityView.php
M view/src/EntityViewFactory.php
M view/src/EntityViewPlaceholderExpander.php
M view/src/ItemView.php
M view/src/PropertyView.php
M view/src/SiteLinksView.php
M view/src/SnakHtmlGenerator.php
M view/src/StatementGroupListView.php
M view/src/Template/Template.php
M view/src/Template/TemplateFactory.php
M view/src/Template/TemplateRegistry.php
M view/src/ToolbarEditSectionGenerator.php
M view/tests/phpunit/ClaimHtmlGeneratorTest.php
M view/tests/phpunit/ClaimsViewTest.php
M view/tests/phpunit/EntityTermsViewTest.php
M view/tests/phpunit/EntityViewFactoryTest.php
M view/tests/phpunit/EntityViewPlaceholderExpanderTest.php
M view/tests/phpunit/ItemViewTest.php
M view/tests/phpunit/PropertyViewTest.php
M view/tests/phpunit/SiteLinksViewTest.php
M view/tests/phpunit/SnakHtmlGeneratorTest.php
M view/tests/phpunit/Template/TemplateRegistryTest.php
M view/tests/phpunit/Template/TemplateTest.php
M view/tests/phpunit/ToolbarEditSectionGeneratorTest.php
33 files changed, 81 insertions(+), 81 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 956233c..5ac311c 100644
--- a/composer.json
+++ b/composer.json
@@ -67,7 +67,6 @@
],
psr-4: {
Wikibase\\View\\: view/src,
- Wikibase\\Template\\: view/src/Template,
Wikimedia\\Purtle\\: purtle/src,
Wikimedia\\Purtle\\Tests\\: purtle/tests/phpunit
}
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index 58505d6..419a5e4 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -31,9 +31,9 @@
use Wikibase\Repo\Content\EntityHandler;
use Wikibase\Repo\Hooks\OutputPageJsConfigHookHandler;
use Wikibase\Repo\WikibaseRepo;
-use Wikibase\Template\TemplateFactory;
-use Wikibase\Template\TemplateRegistry;
use Wikibase\View\EntityViewPlaceholderExpander;
+use Wikibase\View\Template\TemplateFactory;
+use Wikibase\View\Template\TemplateRegistry;
use Wikibase\View\TextInjector;
use WikiPage;
diff --git a/repo/includes/EntityParserOutputGenerator.php
b/repo/includes/EntityParserOutputGenerator.php
index e39bc4f..28a07f3 100644
--- a/repo/includes/EntityParserOutputGenerator.php
+++ b/repo/includes/EntityParserOutputGenerator.php
@@ -21,9 +21,9 @@
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Lib\Store\LanguageFallbackLabelLookup;
use Wikibase\Repo\View\RepoSpecialPageLinker;
-use Wikibase\Template\TemplateFactory;
use Wikibase\View\EmptyEditSectionGenerator;
use Wikibase\View\EntityViewFactory;
+use Wikibase\View\Template\TemplateFactory;
use Wikibase\View\ToolbarEditSectionGenerator;
/**
diff --git a/repo/includes/EntityParserOutputGeneratorFactory.php
b/repo/includes/EntityParserOutputGeneratorFactory.php
index 7a3a926..adc1ab2 100644
--- a/repo/includes/EntityParserOutputGeneratorFactory.php
+++ b/repo/includes/EntityParserOutputGeneratorFactory.php
@@ -7,8 +7,8 @@
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\Template\TemplateFactory;
use Wikibase\View\EntityViewFactory;
+use Wikibase\View\Template\TemplateFactory;
/**
* @since 0.5
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 8f21ff0..d495d0a 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -80,14 +80,14 @@
use Wikibase\Store\TermBuffer;
use Wikibase\StringNormalizer;
use Wikibase\SummaryFormatter;
-use Wikibase\Template\TemplateFactory;
-use Wikibase\Template\TemplateRegistry;
use Wikibase\Validators\EntityConstraintProvider;
use Wikibase\Validators\SnakValidator;
use Wikibase\Validators\TermValidatorFactory;
use Wikibase\Validators\ValidatorErrorLocalizer;
use Wikibase\ValuesFinder;
use Wikibase\View\EntityViewFactory;
+use Wikibase\View\Template\TemplateFactory;
+use Wikibase\View\Template\TemplateRegistry;
/**
* Top level factory for the WikibaseRepo extension.
diff --git a/repo/includes/modules/TemplateModule.php
b/repo/includes/modules/TemplateModule.php
index eba92d5..8c89d8a 100644
--- a/repo/includes/modules/TemplateModule.php
+++ b/repo/includes/modules/TemplateModule.php
@@ -5,7 +5,7
[MediaWiki-commits] [Gerrit] Move Wikibase\Template to view/src/Template/ - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Move Wikibase\Template to view/src/Template/
..
Move Wikibase\Template to view/src/Template/
Change-Id: I193fdd0f9e648bd343db090b669dd2da53be5e63
---
M composer.json
R view/resources/templates.php
R view/src/Template/Template.php
R view/src/Template/TemplateFactory.php
R view/src/Template/TemplateRegistry.php
R view/tests/phpunit/Template/TemplateRegistryTest.php
R view/tests/phpunit/Template/TemplateTest.php
7 files changed, 1 insertion(+), 0 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 5ac311c..956233c 100644
--- a/composer.json
+++ b/composer.json
@@ -67,6 +67,7 @@
],
psr-4: {
Wikibase\\View\\: view/src,
+ Wikibase\\Template\\: view/src/Template,
Wikimedia\\Purtle\\: purtle/src,
Wikimedia\\Purtle\\Tests\\: purtle/tests/phpunit
}
diff --git a/repo/resources/templates.php b/view/resources/templates.php
similarity index 100%
rename from repo/resources/templates.php
rename to view/resources/templates.php
diff --git a/repo/includes/Template/Template.php
b/view/src/Template/Template.php
similarity index 100%
rename from repo/includes/Template/Template.php
rename to view/src/Template/Template.php
diff --git a/repo/includes/Template/TemplateFactory.php
b/view/src/Template/TemplateFactory.php
similarity index 100%
rename from repo/includes/Template/TemplateFactory.php
rename to view/src/Template/TemplateFactory.php
diff --git a/repo/includes/Template/TemplateRegistry.php
b/view/src/Template/TemplateRegistry.php
similarity index 100%
rename from repo/includes/Template/TemplateRegistry.php
rename to view/src/Template/TemplateRegistry.php
diff --git a/repo/tests/phpunit/includes/Template/TemplateRegistryTest.php
b/view/tests/phpunit/Template/TemplateRegistryTest.php
similarity index 100%
rename from repo/tests/phpunit/includes/Template/TemplateRegistryTest.php
rename to view/tests/phpunit/Template/TemplateRegistryTest.php
diff --git a/repo/tests/phpunit/includes/Template/TemplateTest.php
b/view/tests/phpunit/Template/TemplateTest.php
similarity index 100%
rename from repo/tests/phpunit/includes/Template/TemplateTest.php
rename to view/tests/phpunit/Template/TemplateTest.php
--
To view, visit https://gerrit.wikimedia.org/r/200831
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I193fdd0f9e648bd343db090b669dd2da53be5e63
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.he...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.he...@wikimedia.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Explain why vagrant gem comes from git - change (mediawiki/vagrant)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/201150 Change subject: Explain why vagrant gem comes from git .. Explain why vagrant gem comes from git The last version of vagrant gem published on rubygems.org is version 1.5.0 https://rubygems.org/gems/vagrant . We need a later version hence why we point the gem to the upstream source repo on github. I have filled a bug for them to update rubygems.org again: https://github.com/mitchellh/vagrant/issues/5546 Add a note to Gemfile pointing to the upstream issue. Change-Id: Ibd173340f89b4468cfb250d376a222501b9bbe85 --- M Gemfile 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/50/201150/1 diff --git a/Gemfile b/Gemfile index a3c2fb5..35ea164 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,10 @@ source 'https://rubygems.org' group :development do + # Upstream no more updates rubygems.org and we need a more recent version + # https://github.com/mitchellh/vagrant/issues/5546 gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.7.2' + gem 'rubocop', require: false end -- To view, visit https://gerrit.wikimedia.org/r/201150 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd173340f89b4468cfb250d376a222501b9bbe85 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Conditionally add switch buttons - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201153
Change subject: Conditionally add switch buttons
..
Conditionally add switch buttons
There should be no switch button if the other editor isn't supported.
Since the switch-button under wikitext textarea may not be added, I
also had to change how that border is added. I've added it on the
parent div, where textarea switcher are both children of. With or
without the switcher, there'll be a complete border.
Meanwhile also slightly cleaned up some jsdoc
Bug: T94676
Change-Id: Ia4a0d4e2b10564afe68a567fd5fa93b20324b7dd
---
M Resources.php
M modules/editor/editors/ext.flow.editors.none.js
M modules/editor/editors/visualeditor/mw.flow.ve.Target.js
M modules/editor/ext.flow.editor.js
M modules/engine/components/board/features/flow-board-switcheditor.js
M modules/styles/board/editor-switcher.less
6 files changed, 31 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/53/201153/1
diff --git a/Resources.php b/Resources.php
index 1e39a70..e79c054 100644
--- a/Resources.php
+++ b/Resources.php
@@ -439,6 +439,10 @@
'scripts' = array(
'editor/editors/ext.flow.editors.none.js',
),
+ 'dependencies' = array(
+ 'ext.flow.editors.visualeditor', // needed to figure
out if that editor is supported, for switch button
+ // @todo this should be refactored - I'd prefer editors
to not have to know about each other
+ ),
'messages' = array(
'flow-wikitext-switch-editor-tooltip',
),
@@ -478,6 +482,7 @@
'site',
'user',
'mediawiki.api',
+ 'ext.flow.editors.none', // needed to figure out if
that editor is supported, for switch button
),
'messages' = array(
'flow-ve-mention-context-item-label',
diff --git a/modules/editor/editors/ext.flow.editors.none.js
b/modules/editor/editors/ext.flow.editors.none.js
index 06c33de..5e66339 100644
--- a/modules/editor/editors/ext.flow.editors.none.js
+++ b/modules/editor/editors/ext.flow.editors.none.js
@@ -121,6 +121,11 @@
};
mw.flow.editors.none.prototype.attachSwitcher = function() {
+ if ( !mw.flow.editors.visualeditor.static.isSupported() ) {
+ // don't attach switcher is VE isn't supported
+ return;
+ }
+
var board = mw.flow.getPrototypeMethod( 'board',
'getInstanceByElement' )( this.$node ),
$preview = $( 'a' ).attr( {
href: '#',
diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
b/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
index 8e8dc15..2925164 100644
--- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
+++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
@@ -37,9 +37,11 @@
{ include: [ 'flowMention' ] }
];
- mw.flow.ve.Target.static.actionGroups = [
- { include: [ 'flowSwitchEditor' ] }
- ];
+ if ( mw.flow.editors.none.static.isSupported() ) {
+ mw.flow.ve.Target.static.actionGroups = [
+ { include: [ 'flowSwitchEditor' ] }
+ ];
+ }
// Methods
diff --git a/modules/editor/ext.flow.editor.js
b/modules/editor/ext.flow.editor.js
index 351fc7c..95af71d 100644
--- a/modules/editor/ext.flow.editor.js
+++ b/modules/editor/ext.flow.editor.js
@@ -192,6 +192,7 @@
* and call switchEditor for each iteration.
*
* @param {jQuery} $node
+* @param {string} desiredEditor
* @return {jQuery.Promise} Will resolve once editor instance
is loaded
*/
switchEditor: function ( $node, desiredEditor ) {
diff --git
a/modules/engine/components/board/features/flow-board-switcheditor.js
b/modules/engine/components/board/features/flow-board-switcheditor.js
index b68de6f..fc3682d 100644
--- a/modules/engine/components/board/features/flow-board-switcheditor.js
+++ b/modules/engine/components/board/features/flow-board-switcheditor.js
@@ -30,8 +30,8 @@
* code for switching, so this is only run by clicking the switch
button from 'none'.
* If we add more editors later this will have to be revisited.
*
-* @param {Event}
-* @returns {$.Promise}
+* @param {Event} event
+* @returns {jQuery.Promise}
*/
FlowBoardComponentSwitchEditorFeatureMixin.UI.events.interactiveHandlers.switchEditor
= function ( event ) {
var $this = $(
[MediaWiki-commits] [Gerrit] ganglia: fix bits caches in ulsfo - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: ganglia: fix bits caches in ulsfo .. ganglia: fix bits caches in ulsfo Change-Id: I968b08acbbd002f3dc542d9280f0c036581dacc2 --- M hieradata/common.yaml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 820b4ba..2bc04b0 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -89,8 +89,8 @@ - cp1057.eqiad.wmnet esams: [] ulsfo: -- cp4008.ulsfo.wmnet -- cp4016.ulsfo.wmnet +- cp4001.ulsfo.wmnet +- cp4003.ulsfo.wmnet cache_upload: name: Upload caches id: 22 -- To view, visit https://gerrit.wikimedia.org/r/201154 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I968b08acbbd002f3dc542d9280f0c036581dacc2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 15e214f..68e137a - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/201155 Change subject: Syncronize VisualEditor: 15e214f..68e137a .. Syncronize VisualEditor: 15e214f..68e137a Change-Id: I4dcf6e3f312cf0888466077e3ea95748ea4ea510 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/55/201155/1 diff --git a/VisualEditor b/VisualEditor index 15e214f..68e137a 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 15e214f76473263a32edd4e4e02e8f6862698388 +Subproject commit 68e137afdeb43f99a1f18a609fa2f2cdc9435215 -- To view, visit https://gerrit.wikimedia.org/r/201155 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4dcf6e3f312cf0888466077e3ea95748ea4ea510 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 15e214f..68e137a - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 15e214f..68e137a .. Syncronize VisualEditor: 15e214f..68e137a Change-Id: I4dcf6e3f312cf0888466077e3ea95748ea4ea510 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 15e214f..68e137a 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 15e214f76473263a32edd4e4e02e8f6862698388 +Subproject commit 68e137afdeb43f99a1f18a609fa2f2cdc9435215 -- To view, visit https://gerrit.wikimedia.org/r/201155 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4dcf6e3f312cf0888466077e3ea95748ea4ea510 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add pagination on Special:Gather for list of collections - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Add pagination on Special:Gather for list of collections
..
Add pagination on Special:Gather for list of collections
* Extract the pagination button to its own view.
Bug: T94515
Change-Id: Ibbe2e557b07cabb60e03fec568785fdaea66ca10
---
M Gather.php
M i18n/en.json
M i18n/qqq.json
M includes/models/CollectionsList.php
M includes/specials/SpecialGather.php
M includes/specials/SpecialGatherLists.php
M includes/views/CollectionsList.php
A includes/views/Pagination.php
M resources/ext.gather.styles/collections.less
9 files changed, 106 insertions(+), 17 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gather.php b/Gather.php
index 3803be9..43868c5 100644
--- a/Gather.php
+++ b/Gather.php
@@ -51,6 +51,7 @@
'Gather\views\Image' = 'views/Image',
'Gather\views\CollectionsList' = 'views/CollectionsList',
'Gather\views\CollectionsListItemCard' =
'views/CollectionsListItemCard',
+ 'Gather\views\Pagination' = 'views/Pagination',
'Gather\views\helpers\CSS' = 'views/helpers/CSS',
diff --git a/i18n/en.json b/i18n/en.json
index b9f00a9..8d213ce 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -77,5 +77,6 @@
apihelp-gather-param-gather: Action to perform on collections.,
apihelp-gather-param-owner: Owner of the collections to search for.
If omitted, defaults to current user.,
apihelp-gather-example-1: List the collections for user
kbdjohn/kbd.,
- gather-lists-collection-more-link-label: View more public
collections.
+ gather-lists-collection-more-link-label: View more public
collections.,
+ gather-lists-more: View more collections from this user.
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index d0d452e..a8f07a4 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -80,5 +80,6 @@
apihelp-gather-param-gather: {{doc-apihelp-param|gather|gather}},
apihelp-gather-param-owner: {{doc-apihelp-param|gather|owner}},
apihelp-gather-example-1: {{doc-apihelp-example|gather}},
- gather-lists-collection-more-link-label: Link label for a more type
link on the Special:GatherLists page.
+ gather-lists-collection-more-link-label: Link label for a more type
link on the Special:GatherLists page.,
+ gather-lists-more: Link label for more link at the bottom of a list
of users existing collections.
}
diff --git a/includes/models/CollectionsList.php
b/includes/models/CollectionsList.php
index 4f736a4..3f5a56b 100644
--- a/includes/models/CollectionsList.php
+++ b/includes/models/CollectionsList.php
@@ -11,6 +11,7 @@
use \ArrayIterator;
use \ApiMain;
use \FauxRequest;
+use \SpecialPage;
class CollectionsList implements \IteratorAggregate, ArraySerializable {
@@ -18,13 +19,17 @@
* @var CollectionInfo[] list of collection items
*/
protected $collections = array();
-
+ /**
+* @var array query string parameters
+*/
+ protected $continue = array();
/**
* @var bool if the list can show private collections or not
*/
protected $includePrivate;
- public function __construct( $includePrivate = false ) {
+ public function __construct( $user, $includePrivate = false ) {
+ $this-user = $user;
$this-includePrivate = $includePrivate;
}
@@ -79,23 +84,62 @@
}
/**
+* Return user who owns this collection.
+* @return User
+*/
+ public function getOwner() {
+ return $this-user;
+ }
+
+ /**
+* Return local url for list of collections
+* Example: /wiki/Special:Gather/by/user
+*
+* @param array $query string parameters for url
+* @return string localized url for collection
+*/
+ public function getUrl( $query = array() ) {
+ return SpecialPage::getTitleFor( 'Gather' )
+ -getSubpage( 'by' )
+ -getSubpage( $this-getOwner() )
+ -getLocalURL( $query );
+ }
+
+ /**
+* Return a URL that allows you to retreive the rest of the list of
collections
+* @return string|null
+*/
+ public function getContinueUrl() {
+ return $this-continue ? $this-getUrl( $this-continue ) :
false;
+ }
+
+ /**
+* @param array $continue information to obtain further lists
+*/
+ public function setContinueQueryString( $continue ) {
+ $this-continue = $continue;
+ }
+
+ /**
* Generate UserPageCollectionsList from api result
* FIXME: $user parameter currently ignored
* @param User $user collection list owner (currently ignored)
-* @param boolean $includePrivate if the list
[MediaWiki-commits] [Gerrit] Pagination of collection itself - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Pagination of collection itself
..
Pagination of collection itself
Bug: T94515
Change-Id: I9d1342df0dbef07fa4870c46a4da5fce60969d85
---
M i18n/en.json
M i18n/qqq.json
M includes/models/Collection.php
M includes/models/CollectionBase.php
M includes/specials/SpecialGather.php
M includes/views/Collection.php
6 files changed, 41 insertions(+), 14 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 8d213ce..2784fae 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -78,5 +78,6 @@
apihelp-gather-param-owner: Owner of the collections to search for.
If omitted, defaults to current user.,
apihelp-gather-example-1: List the collections for user
kbdjohn/kbd.,
gather-lists-collection-more-link-label: View more public
collections.,
- gather-lists-more: View more collections from this user.
+ gather-lists-more: View more collections from this user.,
+ gather-collection-more: View more pages in this collection
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a8f07a4..9ad9b7a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -81,5 +81,6 @@
apihelp-gather-param-owner: {{doc-apihelp-param|gather|owner}},
apihelp-gather-example-1: {{doc-apihelp-example|gather}},
gather-lists-collection-more-link-label: Link label for a more type
link on the Special:GatherLists page.,
- gather-lists-more: Link label for more link at the bottom of a list
of users existing collections.
+ gather-lists-more: Link label for more link at the bottom of a list
of users existing collections.,
+ gather-collection-more: Label for link at bottom of Gather
collection when there are more than 50 items.
}
diff --git a/includes/models/Collection.php b/includes/models/Collection.php
index 7f36a3e..0a38d59 100644
--- a/includes/models/Collection.php
+++ b/includes/models/Collection.php
@@ -13,6 +13,7 @@
use \FauxRequest;
use \Title;
use \Exception;
+use \SpecialPage;
/**
* A collection with a list of items, which are represented by the
CollectionItem class.
@@ -118,16 +119,33 @@
}
/**
+* Return a URL that allows you to retreive the rest of the items of the
+* collection
+* @return string|null
+*/
+ public function getContinueUrl() {
+ return $this-continue ? $this-getUrl( $this-continue ) :
false;
+ }
+
+ /**
+* @param array $continue information to obtain further items
+*/
+ public function setContinueQueryString( $continue ) {
+ $this-continue = $continue;
+ }
+
+ /**
* Generate a Collection from api result
* @param Integer $id the id of the collection
-* @param User $user optional collection list owner (if present will be
+* @param User [$user] optional collection list owner (if present will
be
* included in the query and validated)
+* @param array [$continue] optional parameters to append to the query.
* @return models\Collections a collection
*/
- public static function newFromApi( $id, User $user = null ) {
-
+ public static function newFromApi( $id, User $user = null, $continue =
array() ) {
+ $limit = 50;
$collection = null;
- $params = array(
+ $params = array_merge( $continue, array(
'action' = 'query',
'list' = 'lists',
'lstids' = $id,
@@ -138,12 +156,11 @@
'explaintext' = true,
'exintro' = true,
'exchars' = self::EXTRACTS_CHAR_LIMIT,
- 'glsplimit' = 50,
- 'exlimit' = 50,
- 'pilimit' = 50,
- // TODO: Pagination
+ 'glsplimit' = $limit,
+ 'exlimit' = $limit,
+ 'pilimit' = $limit,
'continue' = '',
- );
+ ) );
// If user is present, include it in the request. Api will
return not found
// if the specified owner doesn't match the actual collection
owner.
if ( $user ) {
@@ -184,6 +201,9 @@
$collection-add( new CollectionItem(
$title, $pi, $extract ) );
}
}
+ if ( isset( $data['continue'] ) ) {
+ $collection-setContinueQueryString(
$data['continue'] );
+ }
} catch ( Exception $e ) {
// just return collection
}
diff --git
[MediaWiki-commits] [Gerrit] Tiny tweak to jQuery.ready inline script - change (mediawiki/core)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201152
Change subject: Tiny tweak to jQuery.ready inline script
..
Tiny tweak to jQuery.ready inline script
Changing 'window.jQuery jQuery.ready()' to 'if ( window.jQuery )
jQuery.ready()' means no *![CDATA[*/ /*]]* is required (because we
got rid of the ampersands. It's also more readable and more consistent
with if(window.mw).
Change-Id: I28262efb978c085e732b40f9dc5ddb1bda5c4376
---
M includes/OutputPage.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/52/201152/1
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index edeae0d..1a4f5b7 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3106,7 +3106,7 @@
// This also enforces $.isReady to be true at /body which
fixes the
// mw.loader bug in Firefox with using document.write between
/body
// and the DOMContentReady event (bug 47457).
- $html = Html::inlineScript( 'window.jQuery jQuery.ready();'
);
+ $html = Html::inlineScript( 'if(window.jQuery)jQuery.ready();'
);
if ( !$this-getConfig()-get(
'ResourceLoaderExperimentalAsyncLoading' ) ) {
$html .= $this-getScriptsForBottomQueue( false );
--
To view, visit https://gerrit.wikimedia.org/r/201152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28262efb978c085e732b40f9dc5ddb1bda5c4376
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use wgPageName to construct a mw.Title in linkItem init - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Use wgPageName to construct a mw.Title in linkItem init
..
Use wgPageName to construct a mw.Title in linkItem init
Right now we use wgTitle (which strips of the namespace) and pass
a default namespace to use to mw.Title.
That works, unless wgTitle starts with a string that is a valid
namespace itself, as that overrides the default (such as Wikipedia:…
on the page Kategorie:Wikipedia:…).
Bug: T94119
Change-Id: I5af216fb606f2671cb98bfaf7b6e94c29161c9be
---
M client/resources/wikibase.client.linkitem.init.js
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/resources/wikibase.client.linkitem.init.js
b/client/resources/wikibase.client.linkitem.init.js
index 04a6102..abf3dfc 100644
--- a/client/resources/wikibase.client.linkitem.init.js
+++ b/client/resources/wikibase.client.linkitem.init.js
@@ -33,8 +33,7 @@
.linkitem( {
mwApiForRepo:
wikibase.client.getMwApiForRepo(),
pageTitle: ( new mw.Title(
- mw.config.get( 'wgTitle' ),
- mw.config.get(
'wgNamespaceNumber' )
+ mw.config.get( 'wgPageName' )
) ).getPrefixedText(),
globalSiteId: mw.config.get(
'wbCurrentSite' ).globalSiteId,
namespaceNumber: mw.config.get(
'wgNamespaceNumber' ),
--
To view, visit https://gerrit.wikimedia.org/r/200882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5af216fb606f2671cb98bfaf7b6e94c29161c9be
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Adrian Lang adrian.he...@wikimedia.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ganglia: fix bits caches in ulsfo - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/201154 Change subject: ganglia: fix bits caches in ulsfo .. ganglia: fix bits caches in ulsfo Change-Id: I968b08acbbd002f3dc542d9280f0c036581dacc2 --- M hieradata/common.yaml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/54/201154/1 diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 820b4ba..2bc04b0 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -89,8 +89,8 @@ - cp1057.eqiad.wmnet esams: [] ulsfo: -- cp4008.ulsfo.wmnet -- cp4016.ulsfo.wmnet +- cp4001.ulsfo.wmnet +- cp4003.ulsfo.wmnet cache_upload: name: Upload caches id: 22 -- To view, visit https://gerrit.wikimedia.org/r/201154 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I968b08acbbd002f3dc542d9280f0c036581dacc2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add pagination to Special:GatherList - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Add pagination to Special:GatherList
..
Add pagination to Special:GatherList
Infinite scroll and pagination for other things will come in a later
patch.
Bug: T94515
Change-Id: I87ff376afc20f5779a6fe5205bf66d8b4f60d9ad
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialGatherLists.php
M resources/ext.gather.styles/lists.less
4 files changed, 35 insertions(+), 12 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index a9b9a06..b9f00a9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -76,5 +76,6 @@
apihelp-gather-description: List and edit gather collections.,
apihelp-gather-param-gather: Action to perform on collections.,
apihelp-gather-param-owner: Owner of the collections to search for.
If omitted, defaults to current user.,
- apihelp-gather-example-1: List the collections for user
kbdjohn/kbd.
+ apihelp-gather-example-1: List the collections for user
kbdjohn/kbd.,
+ gather-lists-collection-more-link-label: View more public
collections.
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a38cbb7..d0d452e 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -79,5 +79,6 @@
apihelp-gather-description: {{doc-apihelp-description|gather}},
apihelp-gather-param-gather: {{doc-apihelp-param|gather|gather}},
apihelp-gather-param-owner: {{doc-apihelp-param|gather|owner}},
- apihelp-gather-example-1: {{doc-apihelp-example|gather}}
+ apihelp-gather-example-1: {{doc-apihelp-example|gather}},
+ gather-lists-collection-more-link-label: Link label for a more type
link on the Special:GatherLists page.
}
diff --git a/includes/specials/SpecialGatherLists.php
b/includes/specials/SpecialGatherLists.php
index bb7769e..c3a346b 100644
--- a/includes/specials/SpecialGatherLists.php
+++ b/includes/specials/SpecialGatherLists.php
@@ -13,6 +13,7 @@
use Linker;
use Gather\views\helpers\CSS;
use MWTimestamp;
+use Exception;
/**
* Render a collection of articles.
@@ -57,21 +58,32 @@
} elseif ( $this-canHideLists() ) {
$out-addSubtitle( $this-getSubTitle( true ) );
}
+ $req = $this-getRequest();
+ $limit = 100;
+
// FIXME: Make method on CollectionsList
- $api = new ApiMain( new FauxRequest( array(
+ $api = new ApiMain( new FauxRequest( array_merge( array(
'action' = 'query',
'list' = 'lists',
'lstmode' = $subPage === 'hidden' ? 'allhidden' :
'allpublic',
+ 'lstlimit' = $limit,
// FIXME: Need owner to link to collection
'lstprop' =
'label|description|image|count|updated|owner',
- // TODO: Pagination
'continue' = '',
- ) ) );
- $api-execute();
- $data = $api-getResultData();
- if ( isset( $data['query']['lists'] ) ) {
- $lists = $data['query']['lists'];
- $this-render( $lists, $subPage === 'hidden' ? 'show' :
'hide' );
+ ), $req-getValues() ) ) );
+ try {
+ $api-execute();
+ $data = $api-getResultData();
+ if ( isset( $data['query']['lists'] ) ) {
+ $lists = $data['query']['lists'];
+ if ( isset( $data['continue'] ) ) {
+ $nextPageUrl =
$this-getTitle()-getLocalUrl( $data['continue'] );
+ } else {
+ $nextPageUrl = '';
+ }
+ $this-render( $lists, $subPage === 'hidden' ?
'show' : 'hide', $nextPageUrl );
+ }
+ } catch ( Exception $e ) {
}
}
@@ -91,9 +103,10 @@
* Render the special page
*
* @param array $lists
-* @param string [$action] hide or show - action to associate with the
row.
+* @param string $action hide or show - action to associate with the
row.
+* @param string $nextPageUrl url to access the next page of results.
*/
- public function render( $lists, $action ) {
+ public function render( $lists, $action, $nextPageUrl = '' ) {
$out = $this-getOutput();
$this-setHeaders();
$out-setProperty( 'unstyledContent', true );
@@ -117,6 +130,12 @@
$html .= $this-row( $list, $action );
}
$html .= Html::closeElement( 'ul' );
+ if (
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-04-01T10:00:01+0000 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review. https://gerrit.wikimedia.org/r/201156 Change subject: New Wikidata Build - 2015-04-01T10:00:01+ .. New Wikidata Build - 2015-04-01T10:00:01+ Change-Id: I635bf5bde48204e5903ad7710a0d4bf22deff846 --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M composer.lock M extensions/PropertySuggester/build/travis/after_script.sh M extensions/PropertySuggester/build/travis/before_script.sh M extensions/PropertySuggester/build/travis/script.sh M extensions/ValueView/README.md M extensions/ValueView/ValueView.php M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.inputextender.tests.js M extensions/ValueView/tests/lib/jquery/jquery.focusAt.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.CalendarHint.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.Container.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.LanguageSelector.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.Listrotator.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.Preview.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.Toggler.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.tests.js M extensions/ValueView/tests/src/jquery.valueview.valueview.tests.js M extensions/ValueView/tests/src/resources.php M extensions/Wikibase/.jscsrc M extensions/Wikibase/README.md M extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh M extensions/Wikibase/build/travis/install.sh M extensions/Wikibase/build/travis/mw-apply-wb-settings.sh M extensions/Wikibase/build/travis/script.sh M extensions/Wikibase/build/travis/update-db.sh M extensions/Wikibase/client/WikibaseClient.hooks.php M extensions/Wikibase/client/WikibaseClient.php M extensions/Wikibase/client/config/WikibaseClient.default.php A extensions/Wikibase/client/i18n/ang.json M extensions/Wikibase/client/i18n/arq.json M extensions/Wikibase/client/i18n/as.json A extensions/Wikibase/client/i18n/awa.json M extensions/Wikibase/client/i18n/az.json M extensions/Wikibase/client/i18n/be-tarask.json A extensions/Wikibase/client/i18n/bho.json M extensions/Wikibase/client/i18n/br.json M extensions/Wikibase/client/i18n/da.json M extensions/Wikibase/client/i18n/de.json M extensions/Wikibase/client/i18n/fi.json A extensions/Wikibase/client/i18n/gom-deva.json M extensions/Wikibase/client/i18n/ka.json M extensions/Wikibase/client/i18n/kk-cyrl.json M extensions/Wikibase/client/i18n/krc.json M extensions/Wikibase/client/i18n/lt.json M extensions/Wikibase/client/i18n/lzh.json M extensions/Wikibase/client/i18n/ne.json M extensions/Wikibase/client/i18n/oc.json M extensions/Wikibase/client/i18n/ps.json M extensions/Wikibase/client/i18n/qqq.json M extensions/Wikibase/client/i18n/ru.json M extensions/Wikibase/client/i18n/sr-el.json A extensions/Wikibase/client/i18n/tcy.json M extensions/Wikibase/client/i18n/tt-cyrl.json M extensions/Wikibase/client/i18n/uk.json M extensions/Wikibase/client/i18n/zh-hant.json M extensions/Wikibase/client/includes/Changes/ChangeHandler.php M extensions/Wikibase/client/includes/DataAccess/StatementTransclusionInteractor.php M extensions/Wikibase/client/includes/Hooks/BeforePageDisplayHandler.php M extensions/Wikibase/client/includes/Hooks/OtherProjectsSidebarGenerator.php M extensions/Wikibase/client/includes/Hooks/UpdateRepoHookHandlers.php M extensions/Wikibase/client/includes/RepoItemLinkGenerator.php M extensions/Wikibase/client/includes/UpdateRepo/UpdateRepo.php M extensions/Wikibase/client/includes/Usage/HashUsageAccumulator.php M extensions/Wikibase/client/includes/Usage/ParserOutputUsageAccumulator.php M extensions/Wikibase/client/includes/Usage/Sql/EntityUsageTableBuilder.php M extensions/Wikibase/client/includes/Usage/Sql/SqlUsageTrackerSchemaUpdater.php M extensions/Wikibase/client/includes/Usage/Sql/UsageTableUpdater.php M extensions/Wikibase/client/includes/Usage/UsageAccumulator.php M extensions/Wikibase/client/includes/scribunto/EntityAccessor.php M extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php M extensions/Wikibase/client/includes/scribunto/SnakSerializationRenderer.php M extensions/Wikibase/client/includes/scribunto/mw.wikibase.lua A extensions/Wikibase/client/includes/store/sql/BulkSubscriptionUpdater.php A extensions/Wikibase/client/maintenance/updateSubscriptions.php M extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js A extensions/Wikibase/client/sql/entity_usage-add-touched.sql A extensions/Wikibase/client/sql/entity_usage-alter-aspect-varbinary-37.sql A extensions/Wikibase/client/sql/entity_usage-drop-entity_type.sql M extensions/Wikibase/client/sql/entity_usage.sql M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php M
[MediaWiki-commits] [Gerrit] Move Wikibase\Repo\View to Wikibase\View - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Move Wikibase\Repo\View to Wikibase\View
..
Move Wikibase\Repo\View to Wikibase\View
Change-Id: Ie0bd5ce523608d1e8dc4ed7ad5199764982b8ae7
---
M composer.json
M repo/Wikibase.hooks.php
M repo/includes/EntityParserOutputGenerator.php
M repo/includes/EntityParserOutputGeneratorFactory.php
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
M view/src/ClaimHtmlGenerator.php
M view/src/EditSectionGenerator.php
M view/src/EmptyEditSectionGenerator.php
M view/src/EntityTermsView.php
M view/src/EntityView.php
M view/src/EntityViewFactory.php
M view/src/EntityViewPlaceholderExpander.php
M view/src/ItemView.php
M view/src/PropertyView.php
M view/src/SiteLinksView.php
M view/src/SnakHtmlGenerator.php
M view/src/StatementGroupListView.php
M view/src/TextInjector.php
M view/src/ToolbarEditSectionGenerator.php
M view/tests/phpunit/ClaimHtmlGeneratorTest.php
M view/tests/phpunit/ClaimsViewTest.php
M view/tests/phpunit/EmptyEditSectionGeneratorTest.php
M view/tests/phpunit/EntityTermsViewTest.php
M view/tests/phpunit/EntityViewFactoryTest.php
M view/tests/phpunit/EntityViewPlaceholderExpanderTest.php
M view/tests/phpunit/EntityViewTest.php
M view/tests/phpunit/ItemViewTest.php
M view/tests/phpunit/PropertyViewTest.php
M view/tests/phpunit/SiteLinksViewTest.php
M view/tests/phpunit/SnakHtmlGeneratorTest.php
M view/tests/phpunit/TextInjectorTest.php
M view/tests/phpunit/ToolbarEditSectionGeneratorTest.php
33 files changed, 99 insertions(+), 118 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 5aaae3f..5ac311c 100644
--- a/composer.json
+++ b/composer.json
@@ -66,7 +66,6 @@
repo/Wikibase.hooks.php
],
psr-4: {
- Wikibase\\Repo\\View\\: view/src,
Wikibase\\View\\: view/src,
Wikimedia\\Purtle\\: purtle/src,
Wikimedia\\Purtle\\Tests\\: purtle/tests/phpunit
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index 1ef35f7..58505d6 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -30,11 +30,11 @@
use Wikibase\Repo\BabelUserLanguageLookup;
use Wikibase\Repo\Content\EntityHandler;
use Wikibase\Repo\Hooks\OutputPageJsConfigHookHandler;
-use Wikibase\Repo\View\EntityViewPlaceholderExpander;
-use Wikibase\Repo\View\TextInjector;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Template\TemplateFactory;
use Wikibase\Template\TemplateRegistry;
+use Wikibase\View\EntityViewPlaceholderExpander;
+use Wikibase\View\TextInjector;
use WikiPage;
/**
diff --git a/repo/includes/EntityParserOutputGenerator.php
b/repo/includes/EntityParserOutputGenerator.php
index 17e318f..e39bc4f 100644
--- a/repo/includes/EntityParserOutputGenerator.php
+++ b/repo/includes/EntityParserOutputGenerator.php
@@ -20,11 +20,11 @@
use Wikibase\Lib\Store\EntityInfoTermLookup;
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Lib\Store\LanguageFallbackLabelLookup;
-use Wikibase\Repo\View\EmptyEditSectionGenerator;
-use Wikibase\Repo\View\EntityViewFactory;
use Wikibase\Repo\View\RepoSpecialPageLinker;
-use Wikibase\Repo\View\ToolbarEditSectionGenerator;
use Wikibase\Template\TemplateFactory;
+use Wikibase\View\EmptyEditSectionGenerator;
+use Wikibase\View\EntityViewFactory;
+use Wikibase\View\ToolbarEditSectionGenerator;
/**
* Creates the parser output for an entity.
diff --git a/repo/includes/EntityParserOutputGeneratorFactory.php
b/repo/includes/EntityParserOutputGeneratorFactory.php
index a023a8c..7a3a926 100644
--- a/repo/includes/EntityParserOutputGeneratorFactory.php
+++ b/repo/includes/EntityParserOutputGeneratorFactory.php
@@ -7,8 +7,8 @@
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\Repo\View\EntityViewFactory;
use Wikibase\Template\TemplateFactory;
+use Wikibase\View\EntityViewFactory;
/**
* @since 0.5
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index f7bf1f1..8f21ff0 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -70,7 +70,6 @@
use Wikibase\Repo\Notifications\DatabaseChangeTransmitter;
use Wikibase\Repo\Notifications\DummyChangeTransmitter;
use Wikibase\Repo\Store\EntityPermissionChecker;
-use Wikibase\Repo\View\EntityViewFactory;
use Wikibase\Settings;
use Wikibase\SettingsArray;
use Wikibase\SnakFactory;
@@ -88,6 +87,7 @@
use Wikibase\Validators\TermValidatorFactory;
use Wikibase\Validators\ValidatorErrorLocalizer;
use Wikibase\ValuesFinder;
+use Wikibase\View\EntityViewFactory;
/**
* Top level factory for the WikibaseRepo extension.
diff --git
[MediaWiki-commits] [Gerrit] Move Wikibase\Repo\View files to view/src - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Move Wikibase\Repo\View files to view/src
..
Move Wikibase\Repo\View files to view/src
Change-Id: I93dcd16611b13609d7a7703810c005804230fc65
---
M composer.json
R view/src/ClaimHtmlGenerator.php
R view/src/EditSectionGenerator.php
R view/src/EmptyEditSectionGenerator.php
R view/src/EntityTermsView.php
R view/src/EntityView.php
R view/src/EntityViewFactory.php
R view/src/EntityViewPlaceholderExpander.php
R view/src/ItemView.php
R view/src/PropertyView.php
R view/src/SiteLinksView.php
R view/src/SnakHtmlGenerator.php
R view/src/StatementGroupListView.php
R view/src/TextInjector.php
R view/src/ToolbarEditSectionGenerator.php
R view/tests/phpunit/ClaimHtmlGeneratorTest.php
R view/tests/phpunit/ClaimsViewTest.php
R view/tests/phpunit/EmptyEditSectionGeneratorTest.php
R view/tests/phpunit/EntityTermsViewTest.php
R view/tests/phpunit/EntityViewFactoryTest.php
R view/tests/phpunit/EntityViewPlaceholderExpanderTest.php
R view/tests/phpunit/EntityViewTest.php
R view/tests/phpunit/ItemViewTest.php
R view/tests/phpunit/PropertyViewTest.php
R view/tests/phpunit/SiteLinksViewTest.php
R view/tests/phpunit/SnakHtmlGeneratorTest.php
R view/tests/phpunit/TextInjectorTest.php
R view/tests/phpunit/ToolbarEditSectionGeneratorTest.php
28 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 4a96217..5aaae3f 100644
--- a/composer.json
+++ b/composer.json
@@ -66,10 +66,10 @@
repo/Wikibase.hooks.php
],
psr-4: {
- Wikibase\\Repo\\View\\: repo/includes/View,
+ Wikibase\\Repo\\View\\: view/src,
Wikibase\\View\\: view/src,
- Wikimedia\\Purtle\\: purtle/src,
- Wikimedia\\Purtle\\Tests\\: purtle/tests/phpunit
+ Wikimedia\\Purtle\\: purtle/src,
+ Wikimedia\\Purtle\\Tests\\: purtle/tests/phpunit
}
}
}
diff --git a/repo/includes/View/ClaimHtmlGenerator.php
b/view/src/ClaimHtmlGenerator.php
similarity index 100%
rename from repo/includes/View/ClaimHtmlGenerator.php
rename to view/src/ClaimHtmlGenerator.php
diff --git a/repo/includes/View/EditSectionGenerator.php
b/view/src/EditSectionGenerator.php
similarity index 100%
rename from repo/includes/View/EditSectionGenerator.php
rename to view/src/EditSectionGenerator.php
diff --git a/repo/includes/View/EmptyEditSectionGenerator.php
b/view/src/EmptyEditSectionGenerator.php
similarity index 100%
rename from repo/includes/View/EmptyEditSectionGenerator.php
rename to view/src/EmptyEditSectionGenerator.php
diff --git a/repo/includes/View/EntityTermsView.php
b/view/src/EntityTermsView.php
similarity index 100%
rename from repo/includes/View/EntityTermsView.php
rename to view/src/EntityTermsView.php
diff --git a/repo/includes/View/EntityView.php b/view/src/EntityView.php
similarity index 100%
rename from repo/includes/View/EntityView.php
rename to view/src/EntityView.php
diff --git a/repo/includes/View/EntityViewFactory.php
b/view/src/EntityViewFactory.php
similarity index 100%
rename from repo/includes/View/EntityViewFactory.php
rename to view/src/EntityViewFactory.php
diff --git a/repo/includes/View/EntityViewPlaceholderExpander.php
b/view/src/EntityViewPlaceholderExpander.php
similarity index 100%
rename from repo/includes/View/EntityViewPlaceholderExpander.php
rename to view/src/EntityViewPlaceholderExpander.php
diff --git a/repo/includes/View/ItemView.php b/view/src/ItemView.php
similarity index 100%
rename from repo/includes/View/ItemView.php
rename to view/src/ItemView.php
diff --git a/repo/includes/View/PropertyView.php b/view/src/PropertyView.php
similarity index 100%
rename from repo/includes/View/PropertyView.php
rename to view/src/PropertyView.php
diff --git a/repo/includes/View/SiteLinksView.php b/view/src/SiteLinksView.php
similarity index 100%
rename from repo/includes/View/SiteLinksView.php
rename to view/src/SiteLinksView.php
diff --git a/repo/includes/View/SnakHtmlGenerator.php
b/view/src/SnakHtmlGenerator.php
similarity index 100%
rename from repo/includes/View/SnakHtmlGenerator.php
rename to view/src/SnakHtmlGenerator.php
diff --git a/repo/includes/View/StatementGroupListView.php
b/view/src/StatementGroupListView.php
similarity index 100%
rename from repo/includes/View/StatementGroupListView.php
rename to view/src/StatementGroupListView.php
diff --git a/repo/includes/View/TextInjector.php b/view/src/TextInjector.php
similarity index 100%
rename from repo/includes/View/TextInjector.php
rename to view/src/TextInjector.php
diff --git a/repo/includes/View/ToolbarEditSectionGenerator.php
b/view/src/ToolbarEditSectionGenerator.php
similarity index 100%
rename from
[MediaWiki-commits] [Gerrit] Revert Drain esams of all traffic (scheduled maintenance) - change (operations/dns)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/201173 Change subject: Revert Drain esams of all traffic (scheduled maintenance) .. Revert Drain esams of all traffic (scheduled maintenance) This reverts commit 2c188a24915efbbe4f4db7903e2560bc0cefd0e9. Change-Id: I95d2f03c418868e1a382372157ac0e0810504e03 --- M admin_state 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/73/201173/1 diff --git a/admin_state b/admin_state index 5393605..6ce67fb 100644 --- a/admin_state +++ b/admin_state @@ -69,5 +69,3 @@ # geoip/bits-*/ulsfo = UP # ... this overrides the line above completely # ## - -geoip/generic-map/esams = DOWN -- To view, visit https://gerrit.wikimedia.org/r/201173 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95d2f03c418868e1a382372157ac0e0810504e03 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Drain esams of all traffic (scheduled maintenance) - change (operations/dns)
Faidon Liambotis has submitted this change and it was merged. Change subject: Drain esams of all traffic (scheduled maintenance) .. Drain esams of all traffic (scheduled maintenance) Change-Id: Id8d9133eeb13a56dd610a6606c9d68a8e73df18c --- M admin_state 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved BBlack: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/admin_state b/admin_state index 6ce67fb..5393605 100644 --- a/admin_state +++ b/admin_state @@ -69,3 +69,5 @@ # geoip/bits-*/ulsfo = UP # ... this overrides the line above completely # ## + +geoip/generic-map/esams = DOWN -- To view, visit https://gerrit.wikimedia.org/r/201172 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8d9133eeb13a56dd610a6606c9d68a8e73df18c Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename jquery.wikibase-shared to jquery.wikibase - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201175
Change subject: Rename jquery.wikibase-shared to jquery.wikibase
..
Rename jquery.wikibase-shared to jquery.wikibase
Change-Id: Ic2e4ce8068526756296ffc22fbd7eba6464418d4
---
M lib/resources/Resources.php
R lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js
R lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
R lib/resources/jquery.wikibase/resources.php
R lib/resources/jquery.wikibase/themes/default/images/tipsy-error.png
R lib/resources/jquery.wikibase/themes/default/images/tipsy.png
R lib/resources/jquery.wikibase/themes/default/jquery.wikibase.wbtooltip.css
R lib/tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js
R lib/tests/qunit/jquery.wikibase/jquery.wikibase.wbtooltip.tests.js
R lib/tests/qunit/jquery.wikibase/resources.php
M lib/tests/qunit/resources.php
11 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/75/201175/1
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index ce24339..0662add 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -78,7 +78,7 @@
$modules = array_merge(
$modules,
include( __DIR__ . '/deprecated/resources.php' ),
- include( __DIR__ . '/jquery.wikibase-shared/resources.php' )
+ include( __DIR__ . '/jquery.wikibase/resources.php' )
);
if ( defined( 'ULS_VERSION' ) ) {
diff --git
a/lib/resources/jquery.wikibase-shared/jquery.wikibase.siteselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js
similarity index 100%
rename from lib/resources/jquery.wikibase-shared/jquery.wikibase.siteselector.js
rename to lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js
diff --git a/lib/resources/jquery.wikibase-shared/jquery.wikibase.wbtooltip.js
b/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
similarity index 100%
rename from lib/resources/jquery.wikibase-shared/jquery.wikibase.wbtooltip.js
rename to lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
diff --git a/lib/resources/jquery.wikibase-shared/resources.php
b/lib/resources/jquery.wikibase/resources.php
similarity index 100%
rename from lib/resources/jquery.wikibase-shared/resources.php
rename to lib/resources/jquery.wikibase/resources.php
diff --git
a/lib/resources/jquery.wikibase-shared/themes/default/images/tipsy-error.png
b/lib/resources/jquery.wikibase/themes/default/images/tipsy-error.png
similarity index 100%
rename from
lib/resources/jquery.wikibase-shared/themes/default/images/tipsy-error.png
rename to lib/resources/jquery.wikibase/themes/default/images/tipsy-error.png
Binary files differ
diff --git
a/lib/resources/jquery.wikibase-shared/themes/default/images/tipsy.png
b/lib/resources/jquery.wikibase/themes/default/images/tipsy.png
similarity index 100%
rename from lib/resources/jquery.wikibase-shared/themes/default/images/tipsy.png
rename to lib/resources/jquery.wikibase/themes/default/images/tipsy.png
Binary files differ
diff --git
a/lib/resources/jquery.wikibase-shared/themes/default/jquery.wikibase.wbtooltip.css
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.wbtooltip.css
similarity index 100%
rename from
lib/resources/jquery.wikibase-shared/themes/default/jquery.wikibase.wbtooltip.css
rename to
lib/resources/jquery.wikibase/themes/default/jquery.wikibase.wbtooltip.css
diff --git
a/lib/tests/qunit/jquery.wikibase-shared/jquery.wikibase.siteselector.tests.js
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js
similarity index 100%
rename from
lib/tests/qunit/jquery.wikibase-shared/jquery.wikibase.siteselector.tests.js
rename to lib/tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js
diff --git
a/lib/tests/qunit/jquery.wikibase-shared/jquery.wikibase.wbtooltip.tests.js
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.wbtooltip.tests.js
similarity index 100%
rename from
lib/tests/qunit/jquery.wikibase-shared/jquery.wikibase.wbtooltip.tests.js
rename to lib/tests/qunit/jquery.wikibase/jquery.wikibase.wbtooltip.tests.js
diff --git a/lib/tests/qunit/jquery.wikibase-shared/resources.php
b/lib/tests/qunit/jquery.wikibase/resources.php
similarity index 100%
rename from lib/tests/qunit/jquery.wikibase-shared/resources.php
rename to lib/tests/qunit/jquery.wikibase/resources.php
diff --git a/lib/tests/qunit/resources.php b/lib/tests/qunit/resources.php
index 7e93cc9..5437c21 100644
--- a/lib/tests/qunit/resources.php
+++ b/lib/tests/qunit/resources.php
@@ -59,7 +59,7 @@
return array_merge(
$modules,
- include( __DIR__ . '/jquery.wikibase-shared/resources.php' )
+ include( __DIR__ . '/jquery.wikibase/resources.php' )
);
} );
--
To view,
[MediaWiki-commits] [Gerrit] Adds average AbuseFilter run time to display table - change (mediawiki...AbuseFilter)
Dragons flight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201177
Change subject: Adds average AbuseFilter run time to display table
..
Adds average AbuseFilter run time to display table
Adds recent mean per filter run time, as determined by the internal stats
collection, to the filter list view. Potentially useful for quickly
identifying slow filters.
Depends on stats overhaul in Ib12e072a245fcad93c6c6bd452041f3441f68bb7
Bug: T87862
Change-Id: I16be819633c89f031de58e685308bc2d699f7835
---
M Views/AbuseFilterViewList.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 19 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/77/201177/1
diff --git a/Views/AbuseFilterViewList.php b/Views/AbuseFilterViewList.php
index 73d2a34..8da3302 100644
--- a/Views/AbuseFilterViewList.php
+++ b/Views/AbuseFilterViewList.php
@@ -248,6 +248,7 @@
'af_timestamp' = 'abusefilter-list-lastmodified',
'af_hidden' = 'abusefilter-list-visibility',
'af_hit_count' = 'abusefilter-list-hitcount',
+ 'af_runtime' = 'abusefilter-list-mean-runtime',
);
global $wgAbuseFilterValidGroups;
@@ -334,6 +335,13 @@
)-parse();
case 'af_group':
return AbuseFilter::nameGroup( $value );
+ break;
+ case 'af_runtime':
+ list( , , $avgTime ) =
+ AbuseFilter::getFilterProfile(
$row-af_id );
+
+ $avgTime = $lang-formatNum( $avgTime );
+ return $this-msg( 'abusefilter-runtime'
)-numParams( $avgTime )-parse();
break;
default:
throw new MWException( Unknown row type
$name! );
@@ -430,6 +438,13 @@
// If this is global, local name probably
doesn't exist, but try
return AbuseFilter::nameGroup( $value );
break;
+ case 'af_runtime':
+ list( , , $avgTime ) =
+ AbuseFilter::getFilterProfile(
'global-' . $row-af_id );
+
+ $avgTime = $lang-formatNum( $avgTime );
+ return $this-msg( 'abusefilter-runtime'
)-numParams( $avgTime )-parse();
+ break;
default:
throw new MWException( Unknown row type
$name! );
}
diff --git a/i18n/en.json b/i18n/en.json
index 83a8a48..0668fd1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -86,6 +86,7 @@
abusefilter-list-consequences: Consequences,
abusefilter-list-visibility: Visibility,
abusefilter-list-hitcount: Hit count,
+ abusefilter-list-mean-runtime: Mean time,
abusefilter-list-edit: Edit,
abusefilter-list-details: Details,
abusefilter-list-limit: Number per page:,
@@ -97,6 +98,7 @@
abusefilter-deleted: Deleted,
abusefilter-disabled: Disabled,
abusefilter-hitcount: $1 {{PLURAL:$1|hit|hits}},
+ abusefilter-runtime: $1 ms,
abusefilter-new: Create a new filter,
abusefilter-return: Return to filter management,
abusefilter-status-global: Global,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 51b9a7a..686c3ed 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -114,6 +114,7 @@
abusefilter-list-consequences: Column header in abuse filter
overview for the filter consequences.,
abusefilter-list-visibility: Column header in abuse filter overview
for the public filter visibility.\n{{Identical|Visibility}},
abusefilter-list-hitcount: Column header in abuse filter overview
for the number of times the filter was triggered.,
+ abusefilter-list-mean-runtime: Column header in abuse filter
overview for the mean run time.,
abusefilter-list-edit: Probably the verb \to edit\ (instead of the
noun \an edit\).\n{{Identical|Edit}},
abusefilter-list-details: {{Identical|Detail}},
abusefilter-list-limit: Used as label for the Limit selector in the
form.,
@@ -125,6 +126,7 @@
abusefilter-deleted: Abuse filter status.\n{{Identical|Deleted}},
abusefilter-disabled: Abuse filter status.\n{{Identical|Disabled}},
abusefilter-hitcount: Indicates number of times an abuse filter was
triggered. Parameters:\n* $1 is the number of hits.,
+ abusefilter-runtime: Indicates an abuse filter's average run time.
Parameters:\n* $1 is the runtime in milliseconds.,
abusefilter-new: Link
[MediaWiki-commits] [Gerrit] Add logging to investigate null $hash issue - change (mediawiki/core)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201176
Change subject: Add logging to investigate null $hash issue
..
Add logging to investigate null $hash issue
Bug: T94562
Change-Id: I579a5dd3c0f2551d0b700fb21804e52f1356f63e
---
M includes/upload/UploadBase.php
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/76/201176/1
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index a79526e..5f81a0e 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -253,6 +253,8 @@
* @return string
*/
public function getTempFileSha1Base36() {
+ // Debugging for T94562
+ wfDebugLog( 'upload', __METHOD__ . : mTempPath:
{$this-mTempPath} );
return FSFile::getSha1Base36FromPath( $this-mTempPath );
}
@@ -677,6 +679,9 @@
$warnings['duplicate'] = $dupes;
}
+ // Debugging for T94562
+ wfDebugLog( 'upload', __METHOD__ . : Hash: $hash . gettype(
$hash ) );
+
// Check dupes against archives
$archivedFile = new ArchivedFile( null, 0, '', $hash );
if ( $archivedFile-getID() 0 ) {
--
To view, visit https://gerrit.wikimedia.org/r/201176
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I579a5dd3c0f2551d0b700fb21804e52f1356f63e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move jquery.ui from repo/ to view/ - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Move jquery.ui from repo/ to view/ .. Move jquery.ui from repo/ to view/ jQuery.ui.TemplatedWidget depends on wikibase.templates, which currently is in repo but will be moved, too. Change-Id: Iafe73684975a9641692bc09ac169e9b40900df29 --- M repo/resources/Resources.php M repo/tests/qunit/resources.php R view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js R view/resources/jquery/ui/jquery.ui.TemplatedWidget.js R view/resources/jquery/ui/jquery.ui.closeable.css R view/resources/jquery/ui/jquery.ui.closeable.js R view/resources/jquery/ui/jquery.ui.tagadata.LICENSE R view/resources/jquery/ui/jquery.ui.tagadata.css R view/resources/jquery/ui/jquery.ui.tagadata.js A view/resources/jquery/ui/resources.php M view/resources/resources.php R view/tests/qunit/jquery/ui/jquery.ui.EditableTemplatedWidget.tests.js R view/tests/qunit/jquery/ui/jquery.ui.TemplatedWidget.tests.js R view/tests/qunit/jquery/ui/jquery.ui.closeable.tests.js R view/tests/qunit/jquery/ui/jquery.ui.tagadata.tests.js A view/tests/qunit/jquery/ui/resources.php M view/tests/qunit/resources.php 17 files changed, 133 insertions(+), 87 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php index a4dcd53..e056861 100644 --- a/repo/resources/Resources.php +++ b/repo/resources/Resources.php @@ -25,55 +25,6 @@ $modules = array( - 'jquery.ui.closeable' = $moduleTemplate + array( - 'scripts' = array( - 'jquery.ui/jquery.ui.closeable.js', - ), - 'styles' = array( - 'jquery.ui/jquery.ui.closeable.css', - ), - 'dependencies' = array( - 'jquery.ui.TemplatedWidget', - ), - ), - - 'jquery.ui.tagadata' = $moduleTemplate + array( - 'scripts' = array( - 'jquery.ui/jquery.ui.tagadata.js', - ), - 'styles' = array( - 'jquery.ui/jquery.ui.tagadata.css', - ), - 'dependencies' = array( - 'jquery.event.special.eachchange', - 'jquery.effects.blind', - 'jquery.inputautoexpand', - 'jquery.ui.widget', - ), - ), - - 'jquery.ui.EditableTemplatedWidget' = $moduleTemplate + array( - 'scripts' = array( - 'jquery.ui/jquery.ui.EditableTemplatedWidget.js', - ), - 'dependencies' = array( - 'jquery.ui.closeable', - 'jquery.ui.TemplatedWidget', - 'util.inherit', - ), - ), - - 'jquery.ui.TemplatedWidget' = $moduleTemplate + array( - 'scripts' = array( - 'jquery.ui/jquery.ui.TemplatedWidget.js', - ), - 'dependencies' = array( - 'wikibase.templates', - 'jquery.ui.widget', - 'util.inherit', - ), - ), - 'jquery.wikibase.entitysearch' = $moduleTemplate + array( 'scripts' = array( 'jquery.wikibase/jquery.wikibase.entitysearch.js', diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php index aa60b8b..f1f47dc 100644 --- a/repo/tests/qunit/resources.php +++ b/repo/tests/qunit/resources.php @@ -17,44 +17,6 @@ $modules = array( - 'jquery.ui.closeable.tests' = $moduleBase + array( - 'scripts' = array( - 'jquery.ui/jquery.ui.closeable.tests.js', - ), - 'dependencies' = array( - 'jquery.ui.closeable', - ), - ), - - 'jquery.ui.tagadata.tests' = $moduleBase + array( - 'scripts' = array( - 'jquery.ui/jquery.ui.tagadata.tests.js', - ), - 'dependencies' = array( - 'jquery.ui.tagadata', - ), - ), - - 'jquery.ui.EditableTemplatedWidget.tests' = $moduleBase + array( - 'scripts' = array( -
[MediaWiki-commits] [Gerrit] Move wikibase.store from repo/ to view/ - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Move wikibase.store from repo/ to view/ .. Move wikibase.store from repo/ to view/ Change-Id: If6a12f87fbd61bda3400c481f79cd18020f11b73 --- M repo/resources/Resources.php M repo/tests/qunit/resources.php M view/resources/resources.php R view/resources/wikibase/store/resources.php R view/resources/wikibase/store/store.ApiEntityStore.js R view/resources/wikibase/store/store.CachingEntityStore.js R view/resources/wikibase/store/store.CombiningEntityStore.js R view/resources/wikibase/store/store.EntityStore.js R view/resources/wikibase/store/store.FetchedContent.js R view/resources/wikibase/store/store.FetchedContentUnserializer.js R view/resources/wikibase/store/store.js M view/tests/qunit/resources.php R view/tests/qunit/wikibase/store/resources.php R view/tests/qunit/wikibase/store/store.CachingEntityStore.tests.js R view/tests/qunit/wikibase/store/store.CombiningEntityStore.tests.js 15 files changed, 3 insertions(+), 3 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php index e056861..7e853b6 100644 --- a/repo/resources/Resources.php +++ b/repo/resources/Resources.php @@ -236,7 +236,6 @@ $modules, include( __DIR__ . '/experts/resources.php' ), include( __DIR__ . '/formatters/resources.php' ), - include( __DIR__ . '/parsers/resources.php' ), - include( __DIR__ . '/store/resources.php' ) + include( __DIR__ . '/parsers/resources.php' ) ); } ); diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php index f1f47dc..62b8e17 100644 --- a/repo/tests/qunit/resources.php +++ b/repo/tests/qunit/resources.php @@ -88,7 +88,6 @@ return array_merge( $modules, - include __DIR__ . '/store/resources.php', include __DIR__ . '/utilities/resources.php' ); diff --git a/view/resources/resources.php b/view/resources/resources.php index 89e3234..4b346e4 100644 --- a/view/resources/resources.php +++ b/view/resources/resources.php @@ -9,6 +9,7 @@ include( __DIR__ . '/jquery/resources.php' ), include( __DIR__ . '/jquery/ui/resources.php' ), include( __DIR__ . '/wikibase/entityChangers/resources.php' ), + include( __DIR__ . '/wikibase/store/resources.php' ), include( __DIR__ . '/wikibase/view/resources.php' ) ); } ); diff --git a/repo/resources/store/resources.php b/view/resources/wikibase/store/resources.php similarity index 100% rename from repo/resources/store/resources.php rename to view/resources/wikibase/store/resources.php diff --git a/repo/resources/store/store.ApiEntityStore.js b/view/resources/wikibase/store/store.ApiEntityStore.js similarity index 100% rename from repo/resources/store/store.ApiEntityStore.js rename to view/resources/wikibase/store/store.ApiEntityStore.js diff --git a/repo/resources/store/store.CachingEntityStore.js b/view/resources/wikibase/store/store.CachingEntityStore.js similarity index 100% rename from repo/resources/store/store.CachingEntityStore.js rename to view/resources/wikibase/store/store.CachingEntityStore.js diff --git a/repo/resources/store/store.CombiningEntityStore.js b/view/resources/wikibase/store/store.CombiningEntityStore.js similarity index 100% rename from repo/resources/store/store.CombiningEntityStore.js rename to view/resources/wikibase/store/store.CombiningEntityStore.js diff --git a/repo/resources/store/store.EntityStore.js b/view/resources/wikibase/store/store.EntityStore.js similarity index 100% rename from repo/resources/store/store.EntityStore.js rename to view/resources/wikibase/store/store.EntityStore.js diff --git a/repo/resources/store/store.FetchedContent.js b/view/resources/wikibase/store/store.FetchedContent.js similarity index 100% rename from repo/resources/store/store.FetchedContent.js rename to view/resources/wikibase/store/store.FetchedContent.js diff --git a/repo/resources/store/store.FetchedContentUnserializer.js b/view/resources/wikibase/store/store.FetchedContentUnserializer.js similarity index 100% rename from repo/resources/store/store.FetchedContentUnserializer.js rename to view/resources/wikibase/store/store.FetchedContentUnserializer.js diff --git a/repo/resources/store/store.js b/view/resources/wikibase/store/store.js similarity index 100% rename from repo/resources/store/store.js rename to view/resources/wikibase/store/store.js diff --git a/view/tests/qunit/resources.php b/view/tests/qunit/resources.php index ed48c91..4ae3125 100644 --- a/view/tests/qunit/resources.php +++ b/view/tests/qunit/resources.php @@ -8,5 +8,6 @@ include( __DIR__ . '/jquery/resources.php' ), include( __DIR__ .
[MediaWiki-commits] [Gerrit] Move wikibase.ValueViewBuilder from repo/ to view/ - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Move wikibase.ValueViewBuilder from repo/ to view/
..
Move wikibase.ValueViewBuilder from repo/ to view/
Change-Id: Ie2f657c5be266f9d3c06bf5fdc91217286ac6304
---
M repo/resources/Resources.php
M repo/tests/qunit/resources.php
M view/resources/resources.php
A view/resources/wikibase/resources.php
R view/resources/wikibase/wikibase.ValueViewBuilder.js
M view/tests/qunit/resources.php
A view/tests/qunit/wikibase/resources.php
R view/tests/qunit/wikibase/wikibase.ValueViewBuilder.tests.js
8 files changed, 66 insertions(+), 20 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index 7e853b6..d9baf39 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -82,16 +82,6 @@
'scripts' = 'templates.js',
),
- 'wikibase.ValueViewBuilder' = $moduleTemplate + array(
- 'scripts' = array(
- 'wikibase.ValueViewBuilder.js',
- ),
- 'dependencies' = array(
- 'wikibase',
- 'jquery.valueview',
- ),
- ),
-
'wikibase.ui.entityViewInit' = $moduleTemplate + array(
'scripts' = array(
'wikibase.ui.entityViewInit.js' // should
probably be adjusted for more modularity
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index 62b8e17..df5caa1 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -74,16 +74,6 @@
)
),
- 'wikibase.ValueViewBuilder.tests' = $moduleBase + array(
- 'scripts' = array(
- 'wikibase.ValueViewBuilder.tests.js'
- ),
- 'dependencies' = array(
- 'test.sinonjs',
- 'wikibase.ValueViewBuilder'
- )
- ),
-
);
return array_merge(
diff --git a/view/resources/resources.php b/view/resources/resources.php
index 4b346e4..e9305e0 100644
--- a/view/resources/resources.php
+++ b/view/resources/resources.php
@@ -8,6 +8,7 @@
return array_merge(
include( __DIR__ . '/jquery/resources.php' ),
include( __DIR__ . '/jquery/ui/resources.php' ),
+ include( __DIR__ . '/wikibase/resources.php' ),
include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
include( __DIR__ . '/wikibase/store/resources.php' ),
include( __DIR__ . '/wikibase/view/resources.php' )
diff --git a/view/resources/wikibase/resources.php
b/view/resources/wikibase/resources.php
new file mode 100644
index 000..30bf149
--- /dev/null
+++ b/view/resources/wikibase/resources.php
@@ -0,0 +1,32 @@
+?php
+
+/**
+ * @licence GNU GPL v2+
+ * @author Daniel Werner
+ * @author H. Snater mediaw...@snater.com
+ */
+return call_user_func( function() {
+ preg_match( '+' . preg_quote( DIRECTORY_SEPARATOR ) .
'(?:vendor|extensions)'
+ . preg_quote( DIRECTORY_SEPARATOR ) . '.*+', __DIR__,
$remoteExtPath );
+
+ $moduleTemplate = array(
+ 'localBasePath' = __DIR__,
+ 'remoteExtPath' = '..' . $remoteExtPath[0],
+ );
+
+ $modules = array(
+
+ 'wikibase.ValueViewBuilder' = $moduleTemplate + array(
+ 'scripts' = array(
+ 'wikibase.ValueViewBuilder.js',
+ ),
+ 'dependencies' = array(
+ 'wikibase',
+ 'jquery.valueview',
+ ),
+ ),
+
+ );
+
+ return $modules;
+} );
diff --git a/repo/resources/wikibase.ValueViewBuilder.js
b/view/resources/wikibase/wikibase.ValueViewBuilder.js
similarity index 100%
rename from repo/resources/wikibase.ValueViewBuilder.js
rename to view/resources/wikibase/wikibase.ValueViewBuilder.js
diff --git a/view/tests/qunit/resources.php b/view/tests/qunit/resources.php
index 4ae3125..febbfdb 100644
--- a/view/tests/qunit/resources.php
+++ b/view/tests/qunit/resources.php
@@ -7,6 +7,7 @@
return array_merge(
include( __DIR__ . '/jquery/resources.php' ),
include( __DIR__ . '/jquery/ui/resources.php' ),
+ include( __DIR__ . '/wikibase/resources.php' ),
include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
include( __DIR__ . '/wikibase/store/resources.php' ),
include( __DIR__ . '/wikibase/view/resources.php' )
diff --git
[MediaWiki-commits] [Gerrit] Move wikibase.getLanguageNameByCode from repo/ to view/ - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Move wikibase.getLanguageNameByCode from repo/ to view/
..
Move wikibase.getLanguageNameByCode from repo/ to view/
Change-Id: I2659cc1a49c32df85026f18a67bab7cc63b6329c
---
M repo/resources/Resources.php
M repo/tests/qunit/resources.php
M view/resources/wikibase/resources.php
R view/resources/wikibase/wikibase.getLanguageNameByCode.js
M view/tests/qunit/wikibase/resources.php
R view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
6 files changed, 22 insertions(+), 19 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index a9fd256..ea77e26 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -59,15 +59,6 @@
),
),
- 'wikibase.getLanguageNameByCode' = $moduleTemplate + array(
- 'scripts' = array(
- 'wikibase.getLanguageNameByCode.js'
- ),
- 'dependencies' = array(
- 'wikibase'
- )
- ),
-
'wikibase.templates' = $moduleTemplate + array(
'class' = 'Wikibase\TemplateModule',
'scripts' = 'templates.js',
@@ -207,7 +198,6 @@
);
if ( defined( 'ULS_VERSION' ) ) {
- $modules['wikibase.getLanguageNameByCode']['dependencies'][] =
'ext.uls.mediawiki';
$modules['wikibase.special.itemDisambiguation']['dependencies'][] =
'ext.uls.mediawiki';
$modules['wikibase.special.entitiesWithout']['dependencies'][]
= 'ext.uls.mediawiki';
$modules['wikibase.WikibaseContentLanguages']['dependencies'][]
= 'ext.uls.languagenames';
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index df5caa1..8f46b44 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -65,15 +65,6 @@
),
),
- 'wikibase.getLanguageNameByCode.tests' = $moduleBase + array(
- 'scripts' = array(
- 'wikibase.getLanguageNameByCode.tests.js'
- ),
- 'dependencies' = array(
- 'wikibase.getLanguageNameByCode'
- )
- ),
-
);
return array_merge(
diff --git a/view/resources/wikibase/resources.php
b/view/resources/wikibase/resources.php
index d0eacc6..408f52e 100644
--- a/view/resources/wikibase/resources.php
+++ b/view/resources/wikibase/resources.php
@@ -16,6 +16,15 @@
$modules = array(
+ 'wikibase.getLanguageNameByCode' = $moduleTemplate + array(
+ 'scripts' = array(
+ 'wikibase.getLanguageNameByCode.js'
+ ),
+ 'dependencies' = array(
+ 'wikibase'
+ )
+ ),
+
'wikibase.RevisionStore' = $moduleTemplate + array(
'scripts' = array(
'wikibase.RevisionStore.js',
@@ -37,5 +46,9 @@
);
+ if ( defined( 'ULS_VERSION' ) ) {
+ $modules['wikibase.getLanguageNameByCode']['dependencies'][] =
'ext.uls.mediawiki';
+ }
+
return $modules;
} );
diff --git a/repo/resources/wikibase.getLanguageNameByCode.js
b/view/resources/wikibase/wikibase.getLanguageNameByCode.js
similarity index 100%
rename from repo/resources/wikibase.getLanguageNameByCode.js
rename to view/resources/wikibase/wikibase.getLanguageNameByCode.js
diff --git a/view/tests/qunit/wikibase/resources.php
b/view/tests/qunit/wikibase/resources.php
index fe0bea8..0897832 100644
--- a/view/tests/qunit/wikibase/resources.php
+++ b/view/tests/qunit/wikibase/resources.php
@@ -15,6 +15,15 @@
$modules = array(
+ 'wikibase.getLanguageNameByCode.tests' = $moduleBase + array(
+ 'scripts' = array(
+ 'wikibase.getLanguageNameByCode.tests.js'
+ ),
+ 'dependencies' = array(
+ 'wikibase.getLanguageNameByCode'
+ )
+ ),
+
'wikibase.ValueViewBuilder.tests' = $moduleBase + array(
'scripts' = array(
'wikibase.ValueViewBuilder.tests.js'
diff --git a/repo/tests/qunit/wikibase.getLanguageNameByCode.tests.js
b/view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
similarity index 100%
rename from repo/tests/qunit/wikibase.getLanguageNameByCode.tests.js
[MediaWiki-commits] [Gerrit] Drain esams of all traffic (scheduled maintenance) - change (operations/dns)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/201172 Change subject: Drain esams of all traffic (scheduled maintenance) .. Drain esams of all traffic (scheduled maintenance) Change-Id: Id8d9133eeb13a56dd610a6606c9d68a8e73df18c --- M admin_state 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/72/201172/1 diff --git a/admin_state b/admin_state index 6ce67fb..5393605 100644 --- a/admin_state +++ b/admin_state @@ -69,3 +69,5 @@ # geoip/bits-*/ulsfo = UP # ... this overrides the line above completely # ## + +geoip/generic-map/esams = DOWN -- To view, visit https://gerrit.wikimedia.org/r/201172 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8d9133eeb13a56dd610a6606c9d68a8e73df18c Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Special:LinkSearch: display links to pages in content language - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Special:LinkSearch: display links to pages in content language
..
Special:LinkSearch: display links to pages in content language
Bug: T66064
Change-Id: Ib2af28bec7b9c6ec01c5628be07e1280cbbd2f83
---
M includes/specials/SpecialLinkSearch.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialLinkSearch.php
b/includes/specials/SpecialLinkSearch.php
index 20aac18..75ff8f3 100644
--- a/includes/specials/SpecialLinkSearch.php
+++ b/includes/specials/SpecialLinkSearch.php
@@ -68,8 +68,9 @@
* This allows for dependency injection even though we don't control
object creation.
*/
private function initServices() {
+ global $wgLanguageCode;
if ( !$this-linkRenderer ) {
- $lang = $this-getContext()-getLanguage();
+ $lang = Language::factory( $wgLanguageCode );
$titleFormatter = new MediaWikiTitleCodec( $lang,
GenderCache::singleton() );
$this-linkRenderer = new MediaWikiPageLinkRenderer(
$titleFormatter );
}
--
To view, visit https://gerrit.wikimedia.org/r/200843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2af28bec7b9c6ec01c5628be07e1280cbbd2f83
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: AYUSH GARG ayush.c...@iitp.ac.in
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Martineznovo martinezn...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move wikibase.view JS tests into subdirectory - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Move wikibase.view JS tests into subdirectory
..
Move wikibase.view JS tests into subdirectory
Most JavaScript modules that will reside in WikibaseView are not under
`wikibase.view`. They are not even all under `wikibase`.
This is a prerequisite for T93745.
Change-Id: I8c83837e77c4e803699688f2fb6ff1399e776209
---
M view/tests/qunit/resources.php
R view/tests/qunit/wikibase/view/ViewFactory.tests.js
A view/tests/qunit/wikibase/view/resources.php
3 files changed, 34 insertions(+), 25 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/view/tests/qunit/resources.php b/view/tests/qunit/resources.php
index 5e0bc17..b9d0010 100644
--- a/view/tests/qunit/resources.php
+++ b/view/tests/qunit/resources.php
@@ -4,28 +4,6 @@
* @license GNU GPL v2+
* @author Adrian Heine adrian.he...@wikimedia.de
*/
-return call_user_func( function() {
- preg_match( '+' . preg_quote( DIRECTORY_SEPARATOR ) .
'(?:vendor|extensions)'
- . preg_quote( DIRECTORY_SEPARATOR ) . '.*+', __DIR__,
$remoteExtPath );
-
- $moduleTemplate = array(
- 'localBasePath' = __DIR__,
- 'remoteExtPath' = '..' . $remoteExtPath[0]
- );
-
- $modules = array(
-
- 'wikibase.view.ViewFactory.tests' = $moduleTemplate + array(
- 'scripts' = array(
- 'ViewFactory.tests.js',
- ),
- 'dependencies' = array(
- 'wikibase.view.ViewFactory',
- 'wikibase.ValueViewBuilder'
- ),
- ),
-
- );
-
- return $modules;
-} );
+return array_merge(
+ include( __DIR__ . '/wikibase/view/resources.php' )
+);
diff --git a/view/tests/qunit/ViewFactory.tests.js
b/view/tests/qunit/wikibase/view/ViewFactory.tests.js
similarity index 100%
rename from view/tests/qunit/ViewFactory.tests.js
rename to view/tests/qunit/wikibase/view/ViewFactory.tests.js
diff --git a/view/tests/qunit/wikibase/view/resources.php
b/view/tests/qunit/wikibase/view/resources.php
new file mode 100644
index 000..5e0bc17
--- /dev/null
+++ b/view/tests/qunit/wikibase/view/resources.php
@@ -0,0 +1,31 @@
+?php
+
+/**
+ * @license GNU GPL v2+
+ * @author Adrian Heine adrian.he...@wikimedia.de
+ */
+return call_user_func( function() {
+ preg_match( '+' . preg_quote( DIRECTORY_SEPARATOR ) .
'(?:vendor|extensions)'
+ . preg_quote( DIRECTORY_SEPARATOR ) . '.*+', __DIR__,
$remoteExtPath );
+
+ $moduleTemplate = array(
+ 'localBasePath' = __DIR__,
+ 'remoteExtPath' = '..' . $remoteExtPath[0]
+ );
+
+ $modules = array(
+
+ 'wikibase.view.ViewFactory.tests' = $moduleTemplate + array(
+ 'scripts' = array(
+ 'ViewFactory.tests.js',
+ ),
+ 'dependencies' = array(
+ 'wikibase.view.ViewFactory',
+ 'wikibase.ValueViewBuilder'
+ ),
+ ),
+
+ );
+
+ return $modules;
+} );
--
To view, visit https://gerrit.wikimedia.org/r/201160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8c83837e77c4e803699688f2fb6ff1399e776209
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.he...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow lonelypages to fail - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/201178 Change subject: Allow lonelypages to fail .. Allow lonelypages to fail Also note Phabricator task for misspelling test problem. Change-Id: I7ecd8e37241e0426ab4516a76ad9f031806994c8 --- M tests/script_tests.py 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/78/201178/1 diff --git a/tests/script_tests.py b/tests/script_tests.py index 7d7f430..a85088b 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -329,15 +329,14 @@ if script_name in ['catall', # stdout user interaction 'checkimages', # bug 68613 'flickrripper',# Requires a flickr api key - 'lonelypages', # uses exit code 1 'script_wui', # Error on any user except DrTrigonBot 'upload', # raises custom ValueError ] + failed_dep_script_list or ( -(config.family != 'wikipedia' and script_name == 'lonelypages') or (config.family == 'wikipedia' and script_name == 'disambredir') or -(config.family == 'wikipedia' and config.mylang != 'en' and script_name == 'misspelling')): +(config.family == 'wikipedia' and config.mylang != 'en' and script_name == 'misspelling')): # T94681 dct[test_name] = unittest.expectedFailure(dct[test_name]) elif script_name in ['watchlist', # T77965 + 'lonelypages', # uses exit code 1; T94680 ]: dct[test_name] = allowed_failure(dct[test_name]) dct[test_name].__doc__ = \ -- To view, visit https://gerrit.wikimedia.org/r/201178 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ecd8e37241e0426ab4516a76ad9f031806994c8 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move wikibase.RevisionStore from repo/ to view/ - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Move wikibase.RevisionStore from repo/ to view/ .. Move wikibase.RevisionStore from repo/ to view/ Change-Id: I530120fc3e66f870f29e31d52326e64ebace7af1 --- M repo/resources/Resources.php M view/resources/wikibase/resources.php R view/resources/wikibase/wikibase.RevisionStore.js 3 files changed, 9 insertions(+), 9 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php index d9baf39..a9fd256 100644 --- a/repo/resources/Resources.php +++ b/repo/resources/Resources.php @@ -68,15 +68,6 @@ ) ), - 'wikibase.RevisionStore' = $moduleTemplate + array( - 'scripts' = array( - 'wikibase.RevisionStore.js', - ), - 'dependencies' = array( - 'wikibase' - ) - ), - 'wikibase.templates' = $moduleTemplate + array( 'class' = 'Wikibase\TemplateModule', 'scripts' = 'templates.js', diff --git a/view/resources/wikibase/resources.php b/view/resources/wikibase/resources.php index 30bf149..d0eacc6 100644 --- a/view/resources/wikibase/resources.php +++ b/view/resources/wikibase/resources.php @@ -16,6 +16,15 @@ $modules = array( + 'wikibase.RevisionStore' = $moduleTemplate + array( + 'scripts' = array( + 'wikibase.RevisionStore.js', + ), + 'dependencies' = array( + 'wikibase' + ) + ), + 'wikibase.ValueViewBuilder' = $moduleTemplate + array( 'scripts' = array( 'wikibase.ValueViewBuilder.js', diff --git a/repo/resources/wikibase.RevisionStore.js b/view/resources/wikibase/wikibase.RevisionStore.js similarity index 100% rename from repo/resources/wikibase.RevisionStore.js rename to view/resources/wikibase/wikibase.RevisionStore.js -- To view, visit https://gerrit.wikimedia.org/r/201167 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I530120fc3e66f870f29e31d52326e64ebace7af1 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Adrian Lang adrian.he...@wikimedia.de Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] content: Fix intro text for Right to be forgotten - change (wikimedia/TransparencyReport-private)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/201123 Change subject: content: Fix intro text for Right to be forgotten .. content: Fix intro text for Right to be forgotten Change-Id: I73f353380dd7f5e1a8eae66a0e32e69f28716ee5 --- M locales/en.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private refs/changes/23/201123/1 diff --git a/locales/en.yml b/locales/en.yml index db09e31..68eebb1 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -110,7 +110,7 @@ story_studio_body: A public relations company demanded that we remove an image of a rapper. However, the photo had been freely licensed under a href='//commons.wikimedia.org/wiki/Main_Page'Wikimedia Commons/a policy apparently by the artist and claimed holder of the copyright. Therefore, we declined to remove it. The PR company initially alleged that the portrayed musician was someone different from the rapper. They later appeared to suggest that the rapper had never intended to give his permission. As the story seemed to change, the community examined, and then re-examined, the original permission. In the end the community found that the image should be kept. forgotten_title: Right To Be Forgotten Requests -forgotten_intro: pLast year, a European court decision, a href='//en.wikipedia.org/wiki/Google_Spain_v_AEPD_and_Mario_Costeja_Gonz%C3%A1lez'Google Spain v. AEPD and Mario Costeja González/a, granted individuals the ability to request that search engines “de-index” content about them under the so-called “a href='//en.wikipedia.org/wiki/Right_to_be_forgotten'right to be forgotten/a” doctrine. We believe that denying people access to relevant and neutral information is antagonistic to the values of the Wikimedia movement and have made a a href='//blog.wikimedia.org/2014/08/06/european-court-decision-punches-holes-in-free-knowledge/'statement/a opposing the decision./ppHowever, under the theory of the 'right to be forgotten', we have started receiving direct requests to remove content from Wikimedia projects. Below, you will find more information about the requests we have received.*/ppsmall* Please note that the information below only reflects requests made directly to us. Wikimedia project pages continue to disappear from search engine results without any notice, much less, request to us. We have a dedicated page where we post the notices about attempts to remove links to Wikimedia projects that we have received from the search engines who provide such notices as part of their own commitments to transparency. But we suspect that many search engines are not even giving notice, which we find contrary to core principles of free expression, due process, and transparency./small/p +forgotten_intro: pLast year, a European court decision, a href='//en.wikipedia.org/wiki/Google_Spain_v_AEPD_and_Mario_Costeja_Gonz%C3%A1lez'Google Spain v. AEPD and Mario Costeja González/a, granted individuals the ability to request that search engines “de-index” content about them under the so-called “a href='//en.wikipedia.org/wiki/Right_to_be_forgotten'right to be forgotten/a” doctrine. We believe that denying people access to relevant and neutral information is antagonistic to the values of the Wikimedia movement and have made a a href='//blog.wikimedia.org/2014/08/06/european-court-decision-punches-holes-in-free-knowledge/'statement/a opposing the decision./ppHowever, under the theory of the 'right to be forgotten', we have started receiving direct requests to remove content from Wikimedia projects.*/ppsmall* Please note that this information only reflects requests made directly to us. Wikimedia project pages continue to disappear from search engine results without any notice, much less, request to us. We have a dedicated page where we post the notices about attempts to remove links to Wikimedia projects that we have received from the search engines who provide such notices as part of their own commitments to transparency. But we suspect that many search engines are not even giving notice, which we find contrary to core principles of free expression, due process, and transparency./small/p forgotten_quote: Because if you don’t stand up for the stuff you don’t like, when they come for the stuff you do like, you’ve already lost. forgotten_cite: a href='//en.wikipedia.org/wiki/Neil_Gaiman'Neil Gaiman/a total_number_of_forgotten_requests: Total number of requests -- To view, visit https://gerrit.wikimedia.org/r/201123 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73f353380dd7f5e1a8eae66a0e32e69f28716ee5 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/TransparencyReport-private Gerrit-Branch: master Gerrit-Owner: Prtksxna psax...@wikimedia.org
[MediaWiki-commits] [Gerrit] Remove redundant NS_MAIN from translations - change (mediawiki/core)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/201146 Change subject: Remove redundant NS_MAIN from translations .. Remove redundant NS_MAIN from translations Change-Id: Ia01549310909281e48260950f97a8f6fa12ae230 --- M languages/messages/MessagesArc.php M languages/messages/MessagesAz.php M languages/messages/MessagesAzb.php M languages/messages/MessagesCkb.php M languages/messages/MessagesDv.php M languages/messages/MessagesFa.php M languages/messages/MessagesHe.php M languages/messages/MessagesKhw.php M languages/messages/MessagesKk_arab.php M languages/messages/MessagesKs_arab.php M languages/messages/MessagesMzn.php M languages/messages/MessagesNds.php M languages/messages/MessagesUr.php 13 files changed, 0 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/46/201146/1 diff --git a/languages/messages/MessagesArc.php b/languages/messages/MessagesArc.php index 2247b36..f88650b 100644 --- a/languages/messages/MessagesArc.php +++ b/languages/messages/MessagesArc.php @@ -13,7 +13,6 @@ $namespaceNames = array( NS_MEDIA= 'ܡܝܕܝܐ', NS_SPECIAL = 'ܕܝܠܢܝܐ', - NS_MAIN = '', NS_TALK = 'ܡܡܠܠܐ', NS_USER = 'ܡܦܠܚܢܐ', NS_USER_TALK= 'ܡܡܠܠܐ_ܕܡܦܠܚܢܐ', diff --git a/languages/messages/MessagesAz.php b/languages/messages/MessagesAz.php index b218e3c..23da7a3 100644 --- a/languages/messages/MessagesAz.php +++ b/languages/messages/MessagesAz.php @@ -10,7 +10,6 @@ $namespaceNames = array( NS_SPECIAL = 'Xüsusi', - NS_MAIN = '', NS_TALK = 'Müzakirə', NS_USER = 'İstifadəçi', NS_USER_TALK= 'İstifadəçi_müzakirəsi', diff --git a/languages/messages/MessagesAzb.php b/languages/messages/MessagesAzb.php index 63c88a8..74d3bb9 100644 --- a/languages/messages/MessagesAzb.php +++ b/languages/messages/MessagesAzb.php @@ -14,7 +14,6 @@ $namespaceNames = array( NS_MEDIA= 'مئدیا', NS_SPECIAL = 'اؤزل', - NS_MAIN = '', NS_TALK = 'دانیشیق', NS_USER = 'ایستیفادهچی', NS_USER_TALK= 'ایستیفادهچی_دانیشیغی', diff --git a/languages/messages/MessagesCkb.php b/languages/messages/MessagesCkb.php index 393c6e5..027161f 100644 --- a/languages/messages/MessagesCkb.php +++ b/languages/messages/MessagesCkb.php @@ -14,7 +14,6 @@ $namespaceNames = array( NS_MEDIA= 'میدیا', NS_SPECIAL = 'تایبەت', - NS_MAIN = '', NS_TALK = 'وتووێژ', NS_USER = 'بەکارھێنەر', NS_USER_TALK= 'لێدوانی_بەکارھێنەر', diff --git a/languages/messages/MessagesDv.php b/languages/messages/MessagesDv.php index 1f49212..72d645e 100644 --- a/languages/messages/MessagesDv.php +++ b/languages/messages/MessagesDv.php @@ -13,7 +13,6 @@ $namespaceNames = array( NS_MEDIA= 'މީޑިއާ', NS_SPECIAL = 'ޚާއްސަ', - NS_MAIN = '', NS_TALK = 'ޚިޔާލު', NS_USER = 'މެމްބަރު', NS_USER_TALK= 'މެމްބަރުގެ_ވާހަކަ', diff --git a/languages/messages/MessagesFa.php b/languages/messages/MessagesFa.php index 6c03f1d..4d964fb 100644 --- a/languages/messages/MessagesFa.php +++ b/languages/messages/MessagesFa.php @@ -14,7 +14,6 @@ $namespaceNames = array( NS_MEDIA= 'مدیا', NS_SPECIAL = 'ویژه', - NS_MAIN = '', NS_TALK = 'بحث', NS_USER = 'کاربر', NS_USER_TALK= 'بحث_کاربر', diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php index 1f578a3..3d7fc43 100644 --- a/languages/messages/MessagesHe.php +++ b/languages/messages/MessagesHe.php @@ -16,7 +16,6 @@ $namespaceNames = array( NS_MEDIA= 'מדיה', NS_SPECIAL = 'מיוחד', - NS_MAIN = '', NS_TALK = 'שיחה', NS_USER = 'משתמש', NS_USER_TALK= 'שיחת_משתמש', diff --git a/languages/messages/MessagesKhw.php b/languages/messages/MessagesKhw.php index 4cd2495..bcc8328 100644 --- a/languages/messages/MessagesKhw.php +++ b/languages/messages/MessagesKhw.php @@ -12,7 +12,6 @@ $rtl = true; $namespaceNames = array( - NS_MAIN = '', NS_MEDIA= 'میڈیا', NS_SPECIAL = 'خاص', NS_TALK = 'مشقولگی', diff --git a/languages/messages/MessagesKk_arab.php b/languages/messages/MessagesKk_arab.php index a33efef..8749ccb 100644 --- a/languages/messages/MessagesKk_arab.php +++ b/languages/messages/MessagesKk_arab.php @@ -50,7 +50,6 @@ $namespaceNames = array( NS_MEDIA= 'تاسپا',
[MediaWiki-commits] [Gerrit] Move jquery/ from repo to view - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Move jquery/ from repo to view
..
Move jquery/ from repo to view
Change-Id: If5fe2a197e7018acc33490a5b7991e2e9148490c
---
M repo/resources/Resources.php
M repo/tests/qunit/resources.php
R view/resources/jquery/jquery.removeClassByRegex.js
R view/resources/jquery/jquery.sticknode.js
R view/resources/jquery/jquery.util.EventSingletonManager.js
R view/resources/jquery/jquery.util.getDirectionality.js
R view/resources/jquery/resources.php
M view/resources/resources.php
R view/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
R view/tests/qunit/jquery/jquery.sticknode.tests.js
R view/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
R view/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
R view/tests/qunit/jquery/resources.php
M view/tests/qunit/resources.php
14 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index 302282e..a4dcd53 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -286,7 +286,6 @@
include( __DIR__ . '/experts/resources.php' ),
include( __DIR__ . '/formatters/resources.php' ),
include( __DIR__ . '/parsers/resources.php' ),
- include( __DIR__ . '/jquery/resources.php' ),
include( __DIR__ . '/store/resources.php' )
);
} );
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index ed7a020..aa60b8b 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -126,7 +126,6 @@
return array_merge(
$modules,
- include( __DIR__ . '/jquery/resources.php' ),
include __DIR__ . '/store/resources.php',
include __DIR__ . '/utilities/resources.php'
);
diff --git a/repo/resources/jquery/jquery.removeClassByRegex.js
b/view/resources/jquery/jquery.removeClassByRegex.js
similarity index 100%
rename from repo/resources/jquery/jquery.removeClassByRegex.js
rename to view/resources/jquery/jquery.removeClassByRegex.js
diff --git a/repo/resources/jquery/jquery.sticknode.js
b/view/resources/jquery/jquery.sticknode.js
similarity index 100%
rename from repo/resources/jquery/jquery.sticknode.js
rename to view/resources/jquery/jquery.sticknode.js
diff --git a/repo/resources/jquery/jquery.util.EventSingletonManager.js
b/view/resources/jquery/jquery.util.EventSingletonManager.js
similarity index 100%
rename from repo/resources/jquery/jquery.util.EventSingletonManager.js
rename to view/resources/jquery/jquery.util.EventSingletonManager.js
diff --git a/repo/resources/jquery/jquery.util.getDirectionality.js
b/view/resources/jquery/jquery.util.getDirectionality.js
similarity index 100%
rename from repo/resources/jquery/jquery.util.getDirectionality.js
rename to view/resources/jquery/jquery.util.getDirectionality.js
diff --git a/repo/resources/jquery/resources.php
b/view/resources/jquery/resources.php
similarity index 100%
rename from repo/resources/jquery/resources.php
rename to view/resources/jquery/resources.php
diff --git a/view/resources/resources.php b/view/resources/resources.php
index 1f3644f..ae40f73 100644
--- a/view/resources/resources.php
+++ b/view/resources/resources.php
@@ -6,6 +6,7 @@
*/
return call_user_func( function() {
return array_merge(
+ include( __DIR__ . '/jquery/resources.php' ),
include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
include( __DIR__ . '/wikibase/view/resources.php' )
);
diff --git a/repo/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
b/view/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
similarity index 100%
rename from repo/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
rename to view/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
diff --git a/repo/tests/qunit/jquery/jquery.sticknode.tests.js
b/view/tests/qunit/jquery/jquery.sticknode.tests.js
similarity index 100%
rename from repo/tests/qunit/jquery/jquery.sticknode.tests.js
rename to view/tests/qunit/jquery/jquery.sticknode.tests.js
diff --git a/repo/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
b/view/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
similarity index 100%
rename from repo/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
rename to view/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
diff --git a/repo/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
b/view/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
similarity index 100%
rename from repo/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
rename to view/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
diff --git
[MediaWiki-commits] [Gerrit] Move entityChangers from repo/ to view/ - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Move entityChangers from repo/ to view/
..
Move entityChangers from repo/ to view/
Change-Id: I218dbad62881fa0bb623e15d7244bc2f7f162ebc
---
M repo/resources/Resources.php
M repo/tests/qunit/resources.php
M view/resources/resources.php
R view/resources/wikibase/entityChangers/AliasesChanger.js
R view/resources/wikibase/entityChangers/ClaimsChanger.js
R view/resources/wikibase/entityChangers/DescriptionsChanger.js
R view/resources/wikibase/entityChangers/EntityChangersFactory.js
R view/resources/wikibase/entityChangers/LabelsChanger.js
R view/resources/wikibase/entityChangers/ReferencesChanger.js
R view/resources/wikibase/entityChangers/SiteLinksChanger.js
R view/resources/wikibase/entityChangers/namespace.js
R view/resources/wikibase/entityChangers/resources.php
M view/tests/qunit/resources.php
R view/tests/qunit/wikibase/entityChangers/AliasesChanger.tests.js
R view/tests/qunit/wikibase/entityChangers/ClaimsChanger.tests.js
R view/tests/qunit/wikibase/entityChangers/DescriptionsChanger.tests.js
R view/tests/qunit/wikibase/entityChangers/LabelsChanger.tests.js
R view/tests/qunit/wikibase/entityChangers/ReferencesChanger.tests.js
R view/tests/qunit/wikibase/entityChangers/SiteLinksChanger.tests.js
R view/tests/qunit/wikibase/entityChangers/resources.php
20 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index aed6848..302282e 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -283,7 +283,6 @@
return array_merge(
$modules,
- include( __DIR__ . '/entityChangers/resources.php' ),
include( __DIR__ . '/experts/resources.php' ),
include( __DIR__ . '/formatters/resources.php' ),
include( __DIR__ . '/parsers/resources.php' ),
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index 45f5e85..ed7a020 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -126,7 +126,6 @@
return array_merge(
$modules,
- include( __DIR__ . '/entityChangers/resources.php' ),
include( __DIR__ . '/jquery/resources.php' ),
include __DIR__ . '/store/resources.php',
include __DIR__ . '/utilities/resources.php'
diff --git a/view/resources/resources.php b/view/resources/resources.php
index a86806c..1f3644f 100644
--- a/view/resources/resources.php
+++ b/view/resources/resources.php
@@ -6,6 +6,7 @@
*/
return call_user_func( function() {
return array_merge(
- include ( __DIR__ . '/wikibase/view/resources.php' )
+ include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
+ include( __DIR__ . '/wikibase/view/resources.php' )
);
} );
diff --git a/repo/resources/entityChangers/AliasesChanger.js
b/view/resources/wikibase/entityChangers/AliasesChanger.js
similarity index 100%
rename from repo/resources/entityChangers/AliasesChanger.js
rename to view/resources/wikibase/entityChangers/AliasesChanger.js
diff --git a/repo/resources/entityChangers/ClaimsChanger.js
b/view/resources/wikibase/entityChangers/ClaimsChanger.js
similarity index 100%
rename from repo/resources/entityChangers/ClaimsChanger.js
rename to view/resources/wikibase/entityChangers/ClaimsChanger.js
diff --git a/repo/resources/entityChangers/DescriptionsChanger.js
b/view/resources/wikibase/entityChangers/DescriptionsChanger.js
similarity index 100%
rename from repo/resources/entityChangers/DescriptionsChanger.js
rename to view/resources/wikibase/entityChangers/DescriptionsChanger.js
diff --git a/repo/resources/entityChangers/EntityChangersFactory.js
b/view/resources/wikibase/entityChangers/EntityChangersFactory.js
similarity index 100%
rename from repo/resources/entityChangers/EntityChangersFactory.js
rename to view/resources/wikibase/entityChangers/EntityChangersFactory.js
diff --git a/repo/resources/entityChangers/LabelsChanger.js
b/view/resources/wikibase/entityChangers/LabelsChanger.js
similarity index 100%
rename from repo/resources/entityChangers/LabelsChanger.js
rename to view/resources/wikibase/entityChangers/LabelsChanger.js
diff --git a/repo/resources/entityChangers/ReferencesChanger.js
b/view/resources/wikibase/entityChangers/ReferencesChanger.js
similarity index 100%
rename from repo/resources/entityChangers/ReferencesChanger.js
rename to view/resources/wikibase/entityChangers/ReferencesChanger.js
diff --git a/repo/resources/entityChangers/SiteLinksChanger.js
b/view/resources/wikibase/entityChangers/SiteLinksChanger.js
similarity index 100%
rename from repo/resources/entityChangers/SiteLinksChanger.js
rename to
[MediaWiki-commits] [Gerrit] Move wikibase.utilities from lib/ to view/ - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201174
Change subject: Move wikibase.utilities from lib/ to view/
..
Move wikibase.utilities from lib/ to view/
Tests were in repo/.
Change-Id: Ia97dc94b461a318c891910f183881a54546853af
---
M lib/resources/Resources.php
M repo/tests/qunit/resources.php
M view/resources/resources.php
R view/resources/wikibase/utilities/resources.php
R view/resources/wikibase/utilities/wikibase.utilities.ClaimGuidGenerator.js
R view/resources/wikibase/utilities/wikibase.utilities.GuidGenerator.js
R view/resources/wikibase/utilities/wikibase.utilities.js
R view/resources/wikibase/utilities/wikibase.utilities.ui.css
R view/resources/wikibase/utilities/wikibase.utilities.ui.js
M view/tests/qunit/resources.php
R view/tests/qunit/wikibase/utilities/ClaimGuidGenerator.tests.js
R view/tests/qunit/wikibase/utilities/GuidGenerator.tests.js
R view/tests/qunit/wikibase/utilities/resources.php
13 files changed, 4 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/74/201174/1
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 9f3d893..ce24339 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -78,8 +78,7 @@
$modules = array_merge(
$modules,
include( __DIR__ . '/deprecated/resources.php' ),
- include( __DIR__ . '/jquery.wikibase-shared/resources.php' ),
- include( __DIR__ . '/utilities/resources.php' )
+ include( __DIR__ . '/jquery.wikibase-shared/resources.php' )
);
if ( defined( 'ULS_VERSION' ) ) {
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index bed600c..f63ef54 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -58,9 +58,6 @@
);
- return array_merge(
- $modules,
- include __DIR__ . '/utilities/resources.php'
- );
+ return $modules;
} );
diff --git a/view/resources/resources.php b/view/resources/resources.php
index 928d2cf..e4a0c75 100644
--- a/view/resources/resources.php
+++ b/view/resources/resources.php
@@ -12,6 +12,7 @@
include( __DIR__ . '/wikibase/resources.php' ),
include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
include( __DIR__ . '/wikibase/store/resources.php' ),
+ include( __DIR__ . '/wikibase/utilities/resources.php' ),
include( __DIR__ . '/wikibase/view/resources.php' )
);
} );
diff --git a/lib/resources/utilities/resources.php
b/view/resources/wikibase/utilities/resources.php
similarity index 100%
rename from lib/resources/utilities/resources.php
rename to view/resources/wikibase/utilities/resources.php
diff --git a/lib/resources/utilities/wikibase.utilities.ClaimGuidGenerator.js
b/view/resources/wikibase/utilities/wikibase.utilities.ClaimGuidGenerator.js
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.ClaimGuidGenerator.js
rename to
view/resources/wikibase/utilities/wikibase.utilities.ClaimGuidGenerator.js
diff --git a/lib/resources/utilities/wikibase.utilities.GuidGenerator.js
b/view/resources/wikibase/utilities/wikibase.utilities.GuidGenerator.js
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.GuidGenerator.js
rename to view/resources/wikibase/utilities/wikibase.utilities.GuidGenerator.js
diff --git a/lib/resources/utilities/wikibase.utilities.js
b/view/resources/wikibase/utilities/wikibase.utilities.js
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.js
rename to view/resources/wikibase/utilities/wikibase.utilities.js
diff --git a/lib/resources/utilities/wikibase.utilities.ui.css
b/view/resources/wikibase/utilities/wikibase.utilities.ui.css
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.ui.css
rename to view/resources/wikibase/utilities/wikibase.utilities.ui.css
diff --git a/lib/resources/utilities/wikibase.utilities.ui.js
b/view/resources/wikibase/utilities/wikibase.utilities.ui.js
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.ui.js
rename to view/resources/wikibase/utilities/wikibase.utilities.ui.js
diff --git a/view/tests/qunit/resources.php b/view/tests/qunit/resources.php
index e896484..5d09c1d 100644
--- a/view/tests/qunit/resources.php
+++ b/view/tests/qunit/resources.php
@@ -11,5 +11,6 @@
include( __DIR__ . '/wikibase/resources.php' ),
include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
include( __DIR__ . '/wikibase/store/resources.php' ),
+ include( __DIR__ . '/wikibase/utilities/resources.php' ),
include( __DIR__ . '/wikibase/view/resources.php' )
);
diff --git
[MediaWiki-commits] [Gerrit] Move wikibase.templates from repo/ to view/ - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Move wikibase.templates from repo/ to view/ .. Move wikibase.templates from repo/ to view/ Change-Id: Id79e6ec9f6a05797cfcb3f6db05d6a8a81bb3f93 --- M repo/resources/Resources.php M repo/tests/qunit/resources.php M view/resources/wikibase/resources.php R view/resources/wikibase/templates.js R view/src/Module/TemplateModule.php M view/tests/qunit/wikibase/resources.php R view/tests/qunit/wikibase/templates.tests.js 7 files changed, 15 insertions(+), 15 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php index ea77e26..8408ee0 100644 --- a/repo/resources/Resources.php +++ b/repo/resources/Resources.php @@ -59,11 +59,6 @@ ), ), - 'wikibase.templates' = $moduleTemplate + array( - 'class' = 'Wikibase\TemplateModule', - 'scripts' = 'templates.js', - ), - 'wikibase.ui.entityViewInit' = $moduleTemplate + array( 'scripts' = array( 'wikibase.ui.entityViewInit.js' // should probably be adjusted for more modularity diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php index 8f46b44..bed600c 100644 --- a/repo/tests/qunit/resources.php +++ b/repo/tests/qunit/resources.php @@ -26,15 +26,6 @@ ), ), - 'templates.tests' = $moduleBase + array( - 'scripts' = array( - 'templates.tests.js', - ), - 'dependencies' = array( - 'wikibase.templates', - ), - ), - 'wikibase.dataTypeStore.tests' = $moduleBase + array( 'scripts' = array( 'dataTypes/wikibase.dataTypeStore.tests.js', diff --git a/view/resources/wikibase/resources.php b/view/resources/wikibase/resources.php index 408f52e..0551c9e 100644 --- a/view/resources/wikibase/resources.php +++ b/view/resources/wikibase/resources.php @@ -34,6 +34,11 @@ ) ), + 'wikibase.templates' = $moduleTemplate + array( + 'class' = 'Wikibase\View\Module\TemplateModule', + 'scripts' = 'templates.js', + ), + 'wikibase.ValueViewBuilder' = $moduleTemplate + array( 'scripts' = array( 'wikibase.ValueViewBuilder.js', diff --git a/repo/resources/templates.js b/view/resources/wikibase/templates.js similarity index 100% rename from repo/resources/templates.js rename to view/resources/wikibase/templates.js diff --git a/repo/includes/modules/TemplateModule.php b/view/src/Module/TemplateModule.php similarity index 96% rename from repo/includes/modules/TemplateModule.php rename to view/src/Module/TemplateModule.php index 8c89d8a..585296e 100644 --- a/repo/includes/modules/TemplateModule.php +++ b/view/src/Module/TemplateModule.php @@ -1,6 +1,6 @@ ?php -namespace Wikibase; +namespace Wikibase\View\Module; use FormatJson; use ResourceLoaderContext; diff --git a/view/tests/qunit/wikibase/resources.php b/view/tests/qunit/wikibase/resources.php index 0897832..58e72fa 100644 --- a/view/tests/qunit/wikibase/resources.php +++ b/view/tests/qunit/wikibase/resources.php @@ -24,6 +24,15 @@ ) ), + 'wikibase.templates.tests' = $moduleBase + array( + 'scripts' = array( + 'templates.tests.js', + ), + 'dependencies' = array( + 'wikibase.templates', + ), + ), + 'wikibase.ValueViewBuilder.tests' = $moduleBase + array( 'scripts' = array( 'wikibase.ValueViewBuilder.tests.js' diff --git a/repo/tests/qunit/templates.tests.js b/view/tests/qunit/wikibase/templates.tests.js similarity index 100% rename from repo/tests/qunit/templates.tests.js rename to view/tests/qunit/wikibase/templates.tests.js -- To view, visit https://gerrit.wikimedia.org/r/201169 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id79e6ec9f6a05797cfcb3f6db05d6a8a81bb3f93 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Adrian Lang adrian.he...@wikimedia.de Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list
[MediaWiki-commits] [Gerrit] Move jquery.wikibase from lib/ to view/ - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Move jquery.wikibase from lib/ to view/ .. Move jquery.wikibase from lib/ to view/ Change-Id: I014cf01b56e48009bbfc555cb7a20d7ad810252b --- M lib/resources/Resources.php M lib/tests/qunit/resources.php R view/resources/jquery/wikibase/jquery.wikibase.aliasesview.js R view/resources/jquery/wikibase/jquery.wikibase.badgeselector.js R view/resources/jquery/wikibase/jquery.wikibase.descriptionview.js R view/resources/jquery/wikibase/jquery.wikibase.entityselector.js R view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js R view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.js R view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js R view/resources/jquery/wikibase/jquery.wikibase.entityview.js R view/resources/jquery/wikibase/jquery.wikibase.itemview.js R view/resources/jquery/wikibase/jquery.wikibase.labelview.js R view/resources/jquery/wikibase/jquery.wikibase.listview.ListItemAdapter.js R view/resources/jquery/wikibase/jquery.wikibase.listview.js R view/resources/jquery/wikibase/jquery.wikibase.pagesuggester.js R view/resources/jquery/wikibase/jquery.wikibase.propertyview.js R view/resources/jquery/wikibase/jquery.wikibase.referenceview.js R view/resources/jquery/wikibase/jquery.wikibase.sitelinkgrouplistview.js R view/resources/jquery/wikibase/jquery.wikibase.sitelinkgroupview.js R view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js R view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js R view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js R view/resources/jquery/wikibase/jquery.wikibase.statementgrouplabelscroll.js R view/resources/jquery/wikibase/jquery.wikibase.statementgrouplistview.js R view/resources/jquery/wikibase/jquery.wikibase.statementgroupview.js R view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js R view/resources/jquery/wikibase/jquery.wikibase.statementview.RankSelector.js R view/resources/jquery/wikibase/jquery.wikibase.statementview.js R view/resources/jquery/wikibase/resources.php R view/resources/jquery/wikibase/snakview/resources.php R view/resources/jquery/wikibase/snakview/snakview.SnakTypeSelector.js R view/resources/jquery/wikibase/snakview/snakview.ViewState.js R view/resources/jquery/wikibase/snakview/snakview.js R view/resources/jquery/wikibase/snakview/snakview.variations.NoValue.js R view/resources/jquery/wikibase/snakview/snakview.variations.SomeValue.js R view/resources/jquery/wikibase/snakview/snakview.variations.Value.js R view/resources/jquery/wikibase/snakview/snakview.variations.Variation.js R view/resources/jquery/wikibase/snakview/snakview.variations.js R view/resources/jquery/wikibase/snakview/themes/default/images/ui-icon_snaktypeselector_2694e8.png R view/resources/jquery/wikibase/snakview/themes/default/images/ui-icon_snaktypeselector_3d80b3.png R view/resources/jquery/wikibase/snakview/themes/default/images/ui-icon_snaktypeselector_66.png R view/resources/jquery/wikibase/snakview/themes/default/snakview.SnakTypeSelector.css R view/resources/jquery/wikibase/themes/default/images/rankselector.png R view/resources/jquery/wikibase/themes/default/images/wb-badges-default.png R view/resources/jquery/wikibase/themes/default/images/wb-badges-default.svg R view/resources/jquery/wikibase/themes/default/images/wb-badges-empty.png R view/resources/jquery/wikibase/themes/default/images/wb-badges-empty.svg R view/resources/jquery/wikibase/themes/default/jquery.wikibase.aliasesview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.badgeselector.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.descriptionview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.entityselector.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.entitytermsforlanguagelistview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.entitytermsforlanguageview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.entitytermsview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.entityview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.labelview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkgrouplistview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkgroupview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinklistview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.statementgroupview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.statementview.RankSelector.css R view/resources/jquery/wikibase/toolbar/controller/definitions/addtoolbar/referenceview-snakview.js R
[MediaWiki-commits] [Gerrit] Fix JS error happening when navigating away while on file step - change (mediawiki...UploadWizard)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201179
Change subject: Fix JS error happening when navigating away while on file step
..
Fix JS error happening when navigating away while on file step
Bug: T94550
Change-Id: Ib7ab048d6e93c8cfac95bb68830a6438021d193e
---
M resources/controller/uw.controller.Step.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/79/201179/1
diff --git a/resources/controller/uw.controller.Step.js
b/resources/controller/uw.controller.Step.js
index 7b76c5d..7c24c03 100644
--- a/resources/controller/uw.controller.Step.js
+++ b/resources/controller/uw.controller.Step.js
@@ -287,7 +287,7 @@
* @return {boolean}
*/
SP.isComplete = function () {
- return this.uploads.length === 0 || this.movedFrom;
+ return this.uploads === undefined || this.uploads.length === 0
|| this.movedFrom;
};
uw.controller.Step = Step;
--
To view, visit https://gerrit.wikimedia.org/r/201179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7ab048d6e93c8cfac95bb68830a6438021d193e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move wikibase.utilities from lib/ to view/ - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Move wikibase.utilities from lib/ to view/
..
Move wikibase.utilities from lib/ to view/
Tests were in repo/.
Change-Id: Ia97dc94b461a318c891910f183881a54546853af
---
M lib/resources/Resources.php
M repo/tests/qunit/resources.php
M view/resources/resources.php
R view/resources/wikibase/utilities/resources.php
R view/resources/wikibase/utilities/wikibase.utilities.ClaimGuidGenerator.js
R view/resources/wikibase/utilities/wikibase.utilities.GuidGenerator.js
R view/resources/wikibase/utilities/wikibase.utilities.js
R view/resources/wikibase/utilities/wikibase.utilities.ui.css
R view/resources/wikibase/utilities/wikibase.utilities.ui.js
M view/tests/qunit/resources.php
R view/tests/qunit/wikibase/utilities/ClaimGuidGenerator.tests.js
R view/tests/qunit/wikibase/utilities/GuidGenerator.tests.js
R view/tests/qunit/wikibase/utilities/resources.php
13 files changed, 4 insertions(+), 6 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 9f3d893..ce24339 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -78,8 +78,7 @@
$modules = array_merge(
$modules,
include( __DIR__ . '/deprecated/resources.php' ),
- include( __DIR__ . '/jquery.wikibase-shared/resources.php' ),
- include( __DIR__ . '/utilities/resources.php' )
+ include( __DIR__ . '/jquery.wikibase-shared/resources.php' )
);
if ( defined( 'ULS_VERSION' ) ) {
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index bed600c..f63ef54 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -58,9 +58,6 @@
);
- return array_merge(
- $modules,
- include __DIR__ . '/utilities/resources.php'
- );
+ return $modules;
} );
diff --git a/view/resources/resources.php b/view/resources/resources.php
index 928d2cf..e4a0c75 100644
--- a/view/resources/resources.php
+++ b/view/resources/resources.php
@@ -12,6 +12,7 @@
include( __DIR__ . '/wikibase/resources.php' ),
include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
include( __DIR__ . '/wikibase/store/resources.php' ),
+ include( __DIR__ . '/wikibase/utilities/resources.php' ),
include( __DIR__ . '/wikibase/view/resources.php' )
);
} );
diff --git a/lib/resources/utilities/resources.php
b/view/resources/wikibase/utilities/resources.php
similarity index 100%
rename from lib/resources/utilities/resources.php
rename to view/resources/wikibase/utilities/resources.php
diff --git a/lib/resources/utilities/wikibase.utilities.ClaimGuidGenerator.js
b/view/resources/wikibase/utilities/wikibase.utilities.ClaimGuidGenerator.js
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.ClaimGuidGenerator.js
rename to
view/resources/wikibase/utilities/wikibase.utilities.ClaimGuidGenerator.js
diff --git a/lib/resources/utilities/wikibase.utilities.GuidGenerator.js
b/view/resources/wikibase/utilities/wikibase.utilities.GuidGenerator.js
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.GuidGenerator.js
rename to view/resources/wikibase/utilities/wikibase.utilities.GuidGenerator.js
diff --git a/lib/resources/utilities/wikibase.utilities.js
b/view/resources/wikibase/utilities/wikibase.utilities.js
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.js
rename to view/resources/wikibase/utilities/wikibase.utilities.js
diff --git a/lib/resources/utilities/wikibase.utilities.ui.css
b/view/resources/wikibase/utilities/wikibase.utilities.ui.css
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.ui.css
rename to view/resources/wikibase/utilities/wikibase.utilities.ui.css
diff --git a/lib/resources/utilities/wikibase.utilities.ui.js
b/view/resources/wikibase/utilities/wikibase.utilities.ui.js
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.ui.js
rename to view/resources/wikibase/utilities/wikibase.utilities.ui.js
diff --git a/view/tests/qunit/resources.php b/view/tests/qunit/resources.php
index e896484..5d09c1d 100644
--- a/view/tests/qunit/resources.php
+++ b/view/tests/qunit/resources.php
@@ -11,5 +11,6 @@
include( __DIR__ . '/wikibase/resources.php' ),
include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
include( __DIR__ . '/wikibase/store/resources.php' ),
+ include( __DIR__ . '/wikibase/utilities/resources.php' ),
include( __DIR__ . '/wikibase/view/resources.php' )
);
diff --git a/repo/tests/qunit/utilities/ClaimGuidGenerator.tests.js
[MediaWiki-commits] [Gerrit] New Wikidata build - 01/04/2015 - change (mediawiki...Wikidata)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/201180 Change subject: New Wikidata build - 01/04/2015 .. New Wikidata build - 01/04/2015 Change-Id: I73dcae7e44d40c6cb763ff7e2952cfa63b9b2863 --- M WikibaseClient.settings.php M WikibaseRepo.settings.php M composer.lock M extensions/ValueView/README.md M extensions/ValueView/ValueView.php M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.inputextender.tests.js M extensions/ValueView/tests/lib/jquery/jquery.focusAt.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.CalendarHint.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.Container.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.LanguageSelector.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.Listrotator.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.Preview.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.Toggler.tests.js M extensions/ValueView/tests/src/ExpertExtender/ExpertExtender.tests.js M extensions/ValueView/tests/src/jquery.valueview.valueview.tests.js M extensions/ValueView/tests/src/resources.php M extensions/Wikibase/.jscsrc M extensions/Wikibase/README.md M extensions/Wikibase/build/jenkins/mw-apply-wb-settings.sh M extensions/Wikibase/build/travis/install.sh M extensions/Wikibase/build/travis/script.sh M extensions/Wikibase/client/WikibaseClient.hooks.php M extensions/Wikibase/client/WikibaseClient.php M extensions/Wikibase/client/config/WikibaseClient.default.php A extensions/Wikibase/client/i18n/ang.json M extensions/Wikibase/client/i18n/arq.json M extensions/Wikibase/client/i18n/as.json A extensions/Wikibase/client/i18n/awa.json M extensions/Wikibase/client/i18n/az.json M extensions/Wikibase/client/i18n/be-tarask.json A extensions/Wikibase/client/i18n/bho.json M extensions/Wikibase/client/i18n/br.json M extensions/Wikibase/client/i18n/da.json M extensions/Wikibase/client/i18n/de.json M extensions/Wikibase/client/i18n/fi.json A extensions/Wikibase/client/i18n/gom-deva.json M extensions/Wikibase/client/i18n/ka.json M extensions/Wikibase/client/i18n/kk-cyrl.json M extensions/Wikibase/client/i18n/krc.json M extensions/Wikibase/client/i18n/lt.json M extensions/Wikibase/client/i18n/lzh.json M extensions/Wikibase/client/i18n/ne.json M extensions/Wikibase/client/i18n/oc.json M extensions/Wikibase/client/i18n/ps.json M extensions/Wikibase/client/i18n/qqq.json M extensions/Wikibase/client/i18n/ru.json M extensions/Wikibase/client/i18n/sr-el.json A extensions/Wikibase/client/i18n/tcy.json M extensions/Wikibase/client/i18n/tt-cyrl.json M extensions/Wikibase/client/i18n/uk.json M extensions/Wikibase/client/i18n/zh-hant.json M extensions/Wikibase/client/includes/Changes/ChangeHandler.php M extensions/Wikibase/client/includes/DataAccess/StatementTransclusionInteractor.php M extensions/Wikibase/client/includes/Hooks/BeforePageDisplayHandler.php M extensions/Wikibase/client/includes/Hooks/OtherProjectsSidebarGenerator.php M extensions/Wikibase/client/includes/Hooks/UpdateRepoHookHandlers.php M extensions/Wikibase/client/includes/RepoItemLinkGenerator.php M extensions/Wikibase/client/includes/UpdateRepo/UpdateRepo.php M extensions/Wikibase/client/includes/Usage/HashUsageAccumulator.php M extensions/Wikibase/client/includes/Usage/ParserOutputUsageAccumulator.php M extensions/Wikibase/client/includes/Usage/Sql/EntityUsageTableBuilder.php M extensions/Wikibase/client/includes/Usage/Sql/SqlUsageTrackerSchemaUpdater.php M extensions/Wikibase/client/includes/Usage/Sql/UsageTableUpdater.php M extensions/Wikibase/client/includes/Usage/UsageAccumulator.php M extensions/Wikibase/client/includes/scribunto/EntityAccessor.php M extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php M extensions/Wikibase/client/includes/scribunto/SnakSerializationRenderer.php M extensions/Wikibase/client/includes/scribunto/mw.wikibase.lua A extensions/Wikibase/client/includes/store/sql/BulkSubscriptionUpdater.php M extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php A extensions/Wikibase/client/maintenance/updateSubscriptions.php M extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js A extensions/Wikibase/client/sql/entity_usage-add-touched.sql A extensions/Wikibase/client/sql/entity_usage-alter-aspect-varbinary-37.sql A extensions/Wikibase/client/sql/entity_usage-drop-entity_type.sql M extensions/Wikibase/client/sql/entity_usage.sql M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/StatementTransclusionInteractorTest.php M extensions/Wikibase/client/tests/phpunit/includes/Hooks/DataUpdateHookHandlersTest.php M extensions/Wikibase/client/tests/phpunit/includes/Usage/HashUsageAccumulatorTest.php M
[MediaWiki-commits] [Gerrit] Drop .coveralls.yml - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Drop .coveralls.yml .. Drop .coveralls.yml I think this service is not used any more and this file is an unused, possibly outdated (look how it references the lib directory and nothing else) fragment now. I may be wrong. If you think I am, please show me the place where Coveralls is used and abandone this patch. Change-Id: I3e1a1428b7f4b138ae9f5371215917c39bc6b15e --- D .coveralls.yml 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Adrian Lang: Looks good to me, but someone else must approve JanZerebecki: Looks good to me, approved jenkins-bot: Verified diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index 8892d62..000 --- a/.coveralls.yml +++ /dev/null @@ -1,4 +0,0 @@ -# for php-coveralls -service_name: travis-ci -src_dir: lib -coverage_clover: build/logs/clover.xml \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/201145 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e1a1428b7f4b138ae9f5371215917c39bc6b15e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de Gerrit-Reviewer: Adrian Lang adrian.he...@wikimedia.de Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move jquery/ from repo to view - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201162
Change subject: Move jquery/ from repo to view
..
Move jquery/ from repo to view
Change-Id: If5fe2a197e7018acc33490a5b7991e2e9148490c
---
M repo/resources/Resources.php
M repo/tests/qunit/resources.php
R view/resources/jquery/jquery.removeClassByRegex.js
R view/resources/jquery/jquery.sticknode.js
R view/resources/jquery/jquery.util.EventSingletonManager.js
R view/resources/jquery/jquery.util.getDirectionality.js
R view/resources/jquery/resources.php
M view/resources/resources.php
R view/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
R view/tests/qunit/jquery/jquery.sticknode.tests.js
R view/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
R view/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
R view/tests/qunit/jquery/resources.php
M view/tests/qunit/resources.php
14 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/62/201162/1
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index 3f08eca..817754d 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -286,7 +286,6 @@
include( __DIR__ . '/experts/resources.php' ),
include( __DIR__ . '/formatters/resources.php' ),
include( __DIR__ . '/parsers/resources.php' ),
- include( __DIR__ . '/jquery/resources.php' ),
include( __DIR__ . '/store/resources.php' )
);
} );
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index ed7a020..aa60b8b 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -126,7 +126,6 @@
return array_merge(
$modules,
- include( __DIR__ . '/jquery/resources.php' ),
include __DIR__ . '/store/resources.php',
include __DIR__ . '/utilities/resources.php'
);
diff --git a/repo/resources/jquery/jquery.removeClassByRegex.js
b/view/resources/jquery/jquery.removeClassByRegex.js
similarity index 100%
rename from repo/resources/jquery/jquery.removeClassByRegex.js
rename to view/resources/jquery/jquery.removeClassByRegex.js
diff --git a/repo/resources/jquery/jquery.sticknode.js
b/view/resources/jquery/jquery.sticknode.js
similarity index 100%
rename from repo/resources/jquery/jquery.sticknode.js
rename to view/resources/jquery/jquery.sticknode.js
diff --git a/repo/resources/jquery/jquery.util.EventSingletonManager.js
b/view/resources/jquery/jquery.util.EventSingletonManager.js
similarity index 100%
rename from repo/resources/jquery/jquery.util.EventSingletonManager.js
rename to view/resources/jquery/jquery.util.EventSingletonManager.js
diff --git a/repo/resources/jquery/jquery.util.getDirectionality.js
b/view/resources/jquery/jquery.util.getDirectionality.js
similarity index 100%
rename from repo/resources/jquery/jquery.util.getDirectionality.js
rename to view/resources/jquery/jquery.util.getDirectionality.js
diff --git a/repo/resources/jquery/resources.php
b/view/resources/jquery/resources.php
similarity index 100%
rename from repo/resources/jquery/resources.php
rename to view/resources/jquery/resources.php
diff --git a/view/resources/resources.php b/view/resources/resources.php
index 1f3644f..ae40f73 100644
--- a/view/resources/resources.php
+++ b/view/resources/resources.php
@@ -6,6 +6,7 @@
*/
return call_user_func( function() {
return array_merge(
+ include( __DIR__ . '/jquery/resources.php' ),
include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
include( __DIR__ . '/wikibase/view/resources.php' )
);
diff --git a/repo/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
b/view/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
similarity index 100%
rename from repo/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
rename to view/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
diff --git a/repo/tests/qunit/jquery/jquery.sticknode.tests.js
b/view/tests/qunit/jquery/jquery.sticknode.tests.js
similarity index 100%
rename from repo/tests/qunit/jquery/jquery.sticknode.tests.js
rename to view/tests/qunit/jquery/jquery.sticknode.tests.js
diff --git a/repo/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
b/view/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
similarity index 100%
rename from repo/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
rename to view/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
diff --git a/repo/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
b/view/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
similarity index 100%
rename from repo/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
rename to
[MediaWiki-commits] [Gerrit] Move jquery.ui from repo/ to view/ - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review. https://gerrit.wikimedia.org/r/201163 Change subject: Move jquery.ui from repo/ to view/ .. Move jquery.ui from repo/ to view/ jQuery.ui.TemplatedWidget depends on wikibase.templates, which currently is in repo but will be moved, too. Change-Id: Iafe73684975a9641692bc09ac169e9b40900df29 --- M repo/resources/Resources.php M repo/tests/qunit/resources.php R view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js R view/resources/jquery/ui/jquery.ui.TemplatedWidget.js R view/resources/jquery/ui/jquery.ui.closeable.css R view/resources/jquery/ui/jquery.ui.closeable.js R view/resources/jquery/ui/jquery.ui.tagadata.LICENSE R view/resources/jquery/ui/jquery.ui.tagadata.css R view/resources/jquery/ui/jquery.ui.tagadata.js A view/resources/jquery/ui/resources.php M view/resources/resources.php R view/tests/qunit/jquery/ui/jquery.ui.EditableTemplatedWidget.tests.js R view/tests/qunit/jquery/ui/jquery.ui.TemplatedWidget.tests.js R view/tests/qunit/jquery/ui/jquery.ui.closeable.tests.js R view/tests/qunit/jquery/ui/jquery.ui.tagadata.tests.js A view/tests/qunit/jquery/ui/resources.php M view/tests/qunit/resources.php 17 files changed, 133 insertions(+), 87 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/63/201163/1 diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php index 817754d..0193c91 100644 --- a/repo/resources/Resources.php +++ b/repo/resources/Resources.php @@ -25,55 +25,6 @@ $modules = array( - 'jquery.ui.closeable' = $moduleTemplate + array( - 'scripts' = array( - 'jquery.ui/jquery.ui.closeable.js', - ), - 'styles' = array( - 'jquery.ui/jquery.ui.closeable.css', - ), - 'dependencies' = array( - 'jquery.ui.TemplatedWidget', - ), - ), - - 'jquery.ui.tagadata' = $moduleTemplate + array( - 'scripts' = array( - 'jquery.ui/jquery.ui.tagadata.js', - ), - 'styles' = array( - 'jquery.ui/jquery.ui.tagadata.css', - ), - 'dependencies' = array( - 'jquery.event.special.eachchange', - 'jquery.effects.blind', - 'jquery.inputautoexpand', - 'jquery.ui.widget', - ), - ), - - 'jquery.ui.EditableTemplatedWidget' = $moduleTemplate + array( - 'scripts' = array( - 'jquery.ui/jquery.ui.EditableTemplatedWidget.js', - ), - 'dependencies' = array( - 'jquery.ui.closeable', - 'jquery.ui.TemplatedWidget', - 'util.inherit', - ), - ), - - 'jquery.ui.TemplatedWidget' = $moduleTemplate + array( - 'scripts' = array( - 'jquery.ui/jquery.ui.TemplatedWidget.js', - ), - 'dependencies' = array( - 'wikibase.templates', - 'jquery.ui.widget', - 'util.inherit', - ), - ), - 'jquery.wikibase.entitysearch' = $moduleTemplate + array( 'scripts' = array( 'jquery.wikibase/jquery.wikibase.entitysearch.js', diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php index aa60b8b..f1f47dc 100644 --- a/repo/tests/qunit/resources.php +++ b/repo/tests/qunit/resources.php @@ -17,44 +17,6 @@ $modules = array( - 'jquery.ui.closeable.tests' = $moduleBase + array( - 'scripts' = array( - 'jquery.ui/jquery.ui.closeable.tests.js', - ), - 'dependencies' = array( - 'jquery.ui.closeable', - ), - ), - - 'jquery.ui.tagadata.tests' = $moduleBase + array( - 'scripts' = array( - 'jquery.ui/jquery.ui.tagadata.tests.js', - ), - 'dependencies' = array( - 'jquery.ui.tagadata', - ), - ), - - 'jquery.ui.EditableTemplatedWidget.tests' = $moduleBase + array( -
[MediaWiki-commits] [Gerrit] MenuLayout: Correct documentation - change (oojs/ui)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201166
Change subject: MenuLayout: Correct documentation
..
MenuLayout: Correct documentation
* 'position' is actually 'menuPosition'.
* 'collapse' doesn't exist.
Change-Id: Ieb6bef8a2b365e54e4cafcce97b55a89b931a4cf
---
M src/layouts/MenuLayout.js
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/66/201166/1
diff --git a/src/layouts/MenuLayout.js b/src/layouts/MenuLayout.js
index d5bce45..306eebe 100644
--- a/src/layouts/MenuLayout.js
+++ b/src/layouts/MenuLayout.js
@@ -11,8 +11,7 @@
* @param {Object} [config] Configuration options
* @cfg {number|string} [menuSize='18em'] Size of menu in pixels or any CSS
unit
* @cfg {boolean} [showMenu=true] Show menu
- * @cfg {string} [position='before'] Position of menu, either `top`, `after`,
`bottom` or `before`
- * @cfg {boolean} [collapse] Collapse the menu out of view
+ * @cfg {string} [menuPosition='before'] Position of menu: `top`, `after`,
`bottom` or `before`
*/
OO.ui.MenuLayout = function OoUiMenuLayout( config ) {
var positions = this.constructor.static.menuPositions;
--
To view, visit https://gerrit.wikimedia.org/r/201166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb6bef8a2b365e54e4cafcce97b55a89b931a4cf
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move wikibase.ValueViewBuilder from repo/ to view/ - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201165
Change subject: Move wikibase.ValueViewBuilder from repo/ to view/
..
Move wikibase.ValueViewBuilder from repo/ to view/
Change-Id: Ie2f657c5be266f9d3c06bf5fdc91217286ac6304
---
M repo/resources/Resources.php
M repo/tests/qunit/resources.php
M view/resources/resources.php
A view/resources/wikibase/resources.php
R view/resources/wikibase/wikibase.ValueViewBuilder.js
M view/tests/qunit/resources.php
A view/tests/qunit/wikibase/resources.php
R view/tests/qunit/wikibase/wikibase.ValueViewBuilder.tests.js
8 files changed, 66 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/65/201165/1
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index f663345..b8caa9a 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -82,16 +82,6 @@
'scripts' = 'templates.js',
),
- 'wikibase.ValueViewBuilder' = $moduleTemplate + array(
- 'scripts' = array(
- 'wikibase.ValueViewBuilder.js',
- ),
- 'dependencies' = array(
- 'wikibase',
- 'jquery.valueview',
- ),
- ),
-
'wikibase.ui.entityViewInit' = $moduleTemplate + array(
'scripts' = array(
'wikibase.ui.entityViewInit.js' // should
probably be adjusted for more modularity
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index 62b8e17..df5caa1 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -74,16 +74,6 @@
)
),
- 'wikibase.ValueViewBuilder.tests' = $moduleBase + array(
- 'scripts' = array(
- 'wikibase.ValueViewBuilder.tests.js'
- ),
- 'dependencies' = array(
- 'test.sinonjs',
- 'wikibase.ValueViewBuilder'
- )
- ),
-
);
return array_merge(
diff --git a/view/resources/resources.php b/view/resources/resources.php
index 4b346e4..e9305e0 100644
--- a/view/resources/resources.php
+++ b/view/resources/resources.php
@@ -8,6 +8,7 @@
return array_merge(
include( __DIR__ . '/jquery/resources.php' ),
include( __DIR__ . '/jquery/ui/resources.php' ),
+ include( __DIR__ . '/wikibase/resources.php' ),
include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
include( __DIR__ . '/wikibase/store/resources.php' ),
include( __DIR__ . '/wikibase/view/resources.php' )
diff --git a/view/resources/wikibase/resources.php
b/view/resources/wikibase/resources.php
new file mode 100644
index 000..30bf149
--- /dev/null
+++ b/view/resources/wikibase/resources.php
@@ -0,0 +1,32 @@
+?php
+
+/**
+ * @licence GNU GPL v2+
+ * @author Daniel Werner
+ * @author H. Snater mediaw...@snater.com
+ */
+return call_user_func( function() {
+ preg_match( '+' . preg_quote( DIRECTORY_SEPARATOR ) .
'(?:vendor|extensions)'
+ . preg_quote( DIRECTORY_SEPARATOR ) . '.*+', __DIR__,
$remoteExtPath );
+
+ $moduleTemplate = array(
+ 'localBasePath' = __DIR__,
+ 'remoteExtPath' = '..' . $remoteExtPath[0],
+ );
+
+ $modules = array(
+
+ 'wikibase.ValueViewBuilder' = $moduleTemplate + array(
+ 'scripts' = array(
+ 'wikibase.ValueViewBuilder.js',
+ ),
+ 'dependencies' = array(
+ 'wikibase',
+ 'jquery.valueview',
+ ),
+ ),
+
+ );
+
+ return $modules;
+} );
diff --git a/repo/resources/wikibase.ValueViewBuilder.js
b/view/resources/wikibase/wikibase.ValueViewBuilder.js
similarity index 100%
rename from repo/resources/wikibase.ValueViewBuilder.js
rename to view/resources/wikibase/wikibase.ValueViewBuilder.js
diff --git a/view/tests/qunit/resources.php b/view/tests/qunit/resources.php
index 4ae3125..febbfdb 100644
--- a/view/tests/qunit/resources.php
+++ b/view/tests/qunit/resources.php
@@ -7,6 +7,7 @@
return array_merge(
include( __DIR__ . '/jquery/resources.php' ),
include( __DIR__ . '/jquery/ui/resources.php' ),
+ include( __DIR__ . '/wikibase/resources.php' ),
include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
include( __DIR__ . '/wikibase/store/resources.php' ),
include( __DIR__
[MediaWiki-commits] [Gerrit] [FIX] Remove _imageinfo usage - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: [FIX] Remove _imageinfo usage .. [FIX] Remove _imageinfo usage With d298facc _imageinfo has been replaced by _file_revisions. This is now remove all usage of it. Change-Id: I01cadfc4f3c4bbd66f953c9527e85d0d0c2aa9a4 --- M pywikibot/data/api.py M pywikibot/page.py M pywikibot/site.py M tests/site_tests.py 4 files changed, 11 insertions(+), 17 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 70e512b..b57a61d 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -2374,10 +2374,7 @@ Like PageGenerator, but yields Category objects instead of Pages. -def result(self, pagedata): -Convert page dict entry from api to Page object. -p = PageGenerator.result(self, pagedata) -return pywikibot.Category(p) +pass @deprecated(PageGenerator) @@ -2385,13 +2382,7 @@ Like PageGenerator, but yields FilePage objects instead of Pages. -def result(self, pagedata): -Convert page dict entry from api to Page object. -p = PageGenerator.result(self, pagedata) -filepage = pywikibot.FilePage(p) -if 'imageinfo' in pagedata: -filepage._imageinfo = pagedata['imageinfo'][0] -return filepage +pass class PropertyGenerator(QueryGenerator): @@ -2583,9 +2574,7 @@ if 'imageinfo' in pagedict: assert(isinstance(page, pywikibot.FilePage)) -for file_rev in pagedict['imageinfo']: -file_revision = pywikibot.page.FileInfo(file_rev) -page._file_revisions[file_revision.timestamp] = file_revision +page._load_file_revisions(pagedict['imageinfo']) if categoryinfo in pagedict: page._catinfo = pagedict[categoryinfo] diff --git a/pywikibot/page.py b/pywikibot/page.py index 6da7532..0cdcbc8 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2012,6 +2012,11 @@ if self.namespace() != 6: raise ValueError(u'%s' is not in the file namespace! % title) +def _load_file_revisions(self, imageinfo): +for file_rev in imageinfo: +file_revision = FileInfo(file_rev) +self._file_revisions[file_revision.timestamp] = file_revision + @property def latest_file_info(self): Retrieve and store information of latest Image rev. of FilePage. diff --git a/pywikibot/site.py b/pywikibot/site.py index fe0c4ac..fc4cd5f 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -4982,7 +4982,7 @@ # If we receive a nochange, that would mean we're in simulation # mode, don't attempt to access imageinfo if nochange not in result: -filepage._imageinfo = result[imageinfo] +filepage._load_file_revisions(result[imageinfo]) return @deprecated_args(number=step, diff --git a/tests/site_tests.py b/tests/site_tests.py index 322f1ef..6b03fde 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -595,11 +595,11 @@ for impage in mysite.allimages(minsize=100, total=5): self.assertIsInstance(impage, pywikibot.FilePage) self.assertTrue(mysite.page_exists(impage)) -self.assertGreaterEqual(impage._imageinfo[size], 100) +self.assertGreaterEqual(impage.latest_file_info[size], 100) for impage in mysite.allimages(maxsize=2000, total=5): self.assertIsInstance(impage, pywikibot.FilePage) self.assertTrue(mysite.page_exists(impage)) -self.assertLessEqual(impage._imageinfo[size], 2000) +self.assertLessEqual(impage.latest_file_info[size], 2000) def test_newfiles(self): Test the site.newfiles() method. -- To view, visit https://gerrit.wikimedia.org/r/201157 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I01cadfc4f3c4bbd66f953c9527e85d0d0c2aa9a4 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: XZise commodorefabia...@gmx.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move wikibase.view JS into subdirectory - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Move wikibase.view JS into subdirectory
..
Move wikibase.view JS into subdirectory
Most JavaScript modules that will reside in WikibaseView are not under
`wikibase.view`. They are not even all under `wikibase`.
This is a prerequisite for T93745.
Change-Id: I5983ef30da93d33759da9efbb07b2de6ea8cc2e8
---
M view/resources/resources.php
R view/resources/wikibase/view/ViewFactory.js
R view/resources/wikibase/view/namespace.js
A view/resources/wikibase/view/resources.php
4 files changed, 38 insertions(+), 27 deletions(-)
Approvals:
Hoo man: Looks good to me, but someone else must approve
Aude: Looks good to me, approved
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/view/resources/resources.php b/view/resources/resources.php
index edd593d..a86806c 100644
--- a/view/resources/resources.php
+++ b/view/resources/resources.php
@@ -5,32 +5,7 @@
* @author Adrian Heine adrian.he...@wikimedia.de
*/
return call_user_func( function() {
- preg_match( '+' . preg_quote( DIRECTORY_SEPARATOR ) .
'(?:vendor|extensions)'
- . preg_quote( DIRECTORY_SEPARATOR ) . '.*+', __DIR__,
$remoteExtPath );
-
- $moduleTemplate = array(
- 'localBasePath' = __DIR__,
- 'remoteExtPath' = '..' . $remoteExtPath[0]
+ return array_merge(
+ include ( __DIR__ . '/wikibase/view/resources.php' )
);
-
- $modules = array(
- 'wikibase.view.__namespace' = $moduleTemplate + array(
- 'scripts' = array(
- 'namespace.js'
- ),
- ),
- 'wikibase.view.ViewFactory' = $moduleTemplate + array(
- 'scripts' = array(
- 'ViewFactory.js'
- ),
- 'dependencies' = array(
- 'jquery.wikibase.itemview',
- 'jquery.wikibase.propertyview',
- 'wikibase.view.__namespace',
- 'wikibase.ValueViewBuilder'
- )
- ),
- );
-
- return $modules;
} );
diff --git a/view/resources/ViewFactory.js
b/view/resources/wikibase/view/ViewFactory.js
similarity index 100%
rename from view/resources/ViewFactory.js
rename to view/resources/wikibase/view/ViewFactory.js
diff --git a/view/resources/namespace.js
b/view/resources/wikibase/view/namespace.js
similarity index 100%
rename from view/resources/namespace.js
rename to view/resources/wikibase/view/namespace.js
diff --git a/view/resources/wikibase/view/resources.php
b/view/resources/wikibase/view/resources.php
new file mode 100644
index 000..edd593d
--- /dev/null
+++ b/view/resources/wikibase/view/resources.php
@@ -0,0 +1,36 @@
+?php
+
+/**
+ * @license GNU GPL v2+
+ * @author Adrian Heine adrian.he...@wikimedia.de
+ */
+return call_user_func( function() {
+ preg_match( '+' . preg_quote( DIRECTORY_SEPARATOR ) .
'(?:vendor|extensions)'
+ . preg_quote( DIRECTORY_SEPARATOR ) . '.*+', __DIR__,
$remoteExtPath );
+
+ $moduleTemplate = array(
+ 'localBasePath' = __DIR__,
+ 'remoteExtPath' = '..' . $remoteExtPath[0]
+ );
+
+ $modules = array(
+ 'wikibase.view.__namespace' = $moduleTemplate + array(
+ 'scripts' = array(
+ 'namespace.js'
+ ),
+ ),
+ 'wikibase.view.ViewFactory' = $moduleTemplate + array(
+ 'scripts' = array(
+ 'ViewFactory.js'
+ ),
+ 'dependencies' = array(
+ 'jquery.wikibase.itemview',
+ 'jquery.wikibase.propertyview',
+ 'wikibase.view.__namespace',
+ 'wikibase.ValueViewBuilder'
+ )
+ ),
+ );
+
+ return $modules;
+} );
--
To view, visit https://gerrit.wikimedia.org/r/200860
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5983ef30da93d33759da9efbb07b2de6ea8cc2e8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.he...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.he...@wikimedia.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move jquery.wikibase from lib/ to view/ - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review. https://gerrit.wikimedia.org/r/201170 Change subject: Move jquery.wikibase from lib/ to view/ .. Move jquery.wikibase from lib/ to view/ Change-Id: I014cf01b56e48009bbfc555cb7a20d7ad810252b --- M lib/resources/Resources.php M lib/tests/qunit/resources.php R view/resources/jquery/wikibase/jquery.wikibase.aliasesview.js R view/resources/jquery/wikibase/jquery.wikibase.badgeselector.js R view/resources/jquery/wikibase/jquery.wikibase.descriptionview.js R view/resources/jquery/wikibase/jquery.wikibase.entityselector.js R view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js R view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.js R view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js R view/resources/jquery/wikibase/jquery.wikibase.entityview.js R view/resources/jquery/wikibase/jquery.wikibase.itemview.js R view/resources/jquery/wikibase/jquery.wikibase.labelview.js R view/resources/jquery/wikibase/jquery.wikibase.listview.ListItemAdapter.js R view/resources/jquery/wikibase/jquery.wikibase.listview.js R view/resources/jquery/wikibase/jquery.wikibase.pagesuggester.js R view/resources/jquery/wikibase/jquery.wikibase.propertyview.js R view/resources/jquery/wikibase/jquery.wikibase.referenceview.js R view/resources/jquery/wikibase/jquery.wikibase.sitelinkgrouplistview.js R view/resources/jquery/wikibase/jquery.wikibase.sitelinkgroupview.js R view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js R view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js R view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js R view/resources/jquery/wikibase/jquery.wikibase.statementgrouplabelscroll.js R view/resources/jquery/wikibase/jquery.wikibase.statementgrouplistview.js R view/resources/jquery/wikibase/jquery.wikibase.statementgroupview.js R view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js R view/resources/jquery/wikibase/jquery.wikibase.statementview.RankSelector.js R view/resources/jquery/wikibase/jquery.wikibase.statementview.js R view/resources/jquery/wikibase/resources.php R view/resources/jquery/wikibase/snakview/resources.php R view/resources/jquery/wikibase/snakview/snakview.SnakTypeSelector.js R view/resources/jquery/wikibase/snakview/snakview.ViewState.js R view/resources/jquery/wikibase/snakview/snakview.js R view/resources/jquery/wikibase/snakview/snakview.variations.NoValue.js R view/resources/jquery/wikibase/snakview/snakview.variations.SomeValue.js R view/resources/jquery/wikibase/snakview/snakview.variations.Value.js R view/resources/jquery/wikibase/snakview/snakview.variations.Variation.js R view/resources/jquery/wikibase/snakview/snakview.variations.js R view/resources/jquery/wikibase/snakview/themes/default/images/ui-icon_snaktypeselector_2694e8.png R view/resources/jquery/wikibase/snakview/themes/default/images/ui-icon_snaktypeselector_3d80b3.png R view/resources/jquery/wikibase/snakview/themes/default/images/ui-icon_snaktypeselector_66.png R view/resources/jquery/wikibase/snakview/themes/default/snakview.SnakTypeSelector.css R view/resources/jquery/wikibase/themes/default/images/rankselector.png R view/resources/jquery/wikibase/themes/default/images/wb-badges-default.png R view/resources/jquery/wikibase/themes/default/images/wb-badges-default.svg R view/resources/jquery/wikibase/themes/default/images/wb-badges-empty.png R view/resources/jquery/wikibase/themes/default/images/wb-badges-empty.svg R view/resources/jquery/wikibase/themes/default/jquery.wikibase.aliasesview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.badgeselector.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.descriptionview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.entityselector.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.entitytermsforlanguagelistview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.entitytermsforlanguageview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.entitytermsview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.entityview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.labelview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkgrouplistview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkgroupview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinklistview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.statementgroupview.css R view/resources/jquery/wikibase/themes/default/jquery.wikibase.statementview.RankSelector.css R view/resources/jquery/wikibase/toolbar/controller/definitions/addtoolbar/referenceview-snakview.js
[MediaWiki-commits] [Gerrit] Remove ContentFixers from Parsoid API - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201158
Change subject: Remove ContentFixers from Parsoid API
..
Remove ContentFixers from Parsoid API
Those ContentFixers are very Flow-specific. They're workarounds
for the fact that we store static HTML that can't reflect
changes in links (redlinks, bad images), or for the location
we serve them at (we can't wrap base href in head)
None of those fixers apply to VE (which actually is Parsoid's
main consumer, so bare Parsoid should likely work best)
Preview also used to use this API (and that one needed the
content fixes), but that's being removed as we use VE.
Bug: T93814
Change-Id: I915634ca51f330cd80bac749658ba9b19109c68f
---
M includes/Api/ApiParsoidUtilsFlow.php
1 file changed, 0 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/58/201158/1
diff --git a/includes/Api/ApiParsoidUtilsFlow.php
b/includes/Api/ApiParsoidUtilsFlow.php
index d24dcc4..d16ccc5 100644
--- a/includes/Api/ApiParsoidUtilsFlow.php
+++ b/includes/Api/ApiParsoidUtilsFlow.php
@@ -23,12 +23,6 @@
return; // helps static analysis know execution does
not continue past self::dieUsage
}
- if ( $params['to'] === 'html' ) {
- /** @var ContentFixer $contentFixer */
- $contentFixer = Container::get( 'content_fixer' );
- $content = $contentFixer-apply( $content,
$page-getTitle() );
- }
-
$result = array(
'format' = $params['to'],
'content' = $content,
--
To view, visit https://gerrit.wikimedia.org/r/201158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I915634ca51f330cd80bac749658ba9b19109c68f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move wikibase.RevisionStore from repo/ to view/ - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review. https://gerrit.wikimedia.org/r/201167 Change subject: Move wikibase.RevisionStore from repo/ to view/ .. Move wikibase.RevisionStore from repo/ to view/ Change-Id: I530120fc3e66f870f29e31d52326e64ebace7af1 --- M repo/resources/Resources.php M view/resources/wikibase/resources.php R view/resources/wikibase/wikibase.RevisionStore.js 3 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/67/201167/1 diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php index d9baf39..a9fd256 100644 --- a/repo/resources/Resources.php +++ b/repo/resources/Resources.php @@ -68,15 +68,6 @@ ) ), - 'wikibase.RevisionStore' = $moduleTemplate + array( - 'scripts' = array( - 'wikibase.RevisionStore.js', - ), - 'dependencies' = array( - 'wikibase' - ) - ), - 'wikibase.templates' = $moduleTemplate + array( 'class' = 'Wikibase\TemplateModule', 'scripts' = 'templates.js', diff --git a/view/resources/wikibase/resources.php b/view/resources/wikibase/resources.php index 30bf149..d0eacc6 100644 --- a/view/resources/wikibase/resources.php +++ b/view/resources/wikibase/resources.php @@ -16,6 +16,15 @@ $modules = array( + 'wikibase.RevisionStore' = $moduleTemplate + array( + 'scripts' = array( + 'wikibase.RevisionStore.js', + ), + 'dependencies' = array( + 'wikibase' + ) + ), + 'wikibase.ValueViewBuilder' = $moduleTemplate + array( 'scripts' = array( 'wikibase.ValueViewBuilder.js', diff --git a/repo/resources/wikibase.RevisionStore.js b/view/resources/wikibase/wikibase.RevisionStore.js similarity index 100% rename from repo/resources/wikibase.RevisionStore.js rename to view/resources/wikibase/wikibase.RevisionStore.js -- To view, visit https://gerrit.wikimedia.org/r/201167 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I530120fc3e66f870f29e31d52326e64ebace7af1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Adrian Lang adrian.he...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Better handling of bidi content on entity terms table - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Better handling of bidi content on entity terms table
..
Better handling of bidi content on entity terms table
Change-Id: Ie8b89613e83b7ad5589e2edab27088c6bc48b8eb
---
M lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
M lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
M lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
M
lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entitytermsforlanguagelistview.css
M repo/resources/jquery.ui/jquery.ui.tagadata.css
M view/resources/templates.php
6 files changed, 40 insertions(+), 7 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
index e694790..5e33cba 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
@@ -60,9 +60,10 @@
if( this.$list.children( 'li' ).length !==
this.options.value.getTexts().length ) {
this.draw();
} else {
+ var languageCode = this.options.value.getLanguageCode();
this.$list
- .prop( 'lang', this.options.value.getLanguageCode() )
- .prop( 'dir', $.util.getDirectionality(
this.options.value.getLanguageCode() ) );
+ .prop( 'lang', languageCode )
+ .prop( 'dir', $.util.getDirectionality( languageCode )
);
}
this.$list.addClass( this.widgetFullName + '-input' );
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
index e993e23..2e73581 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
@@ -120,8 +120,23 @@
this.element[descriptionText ? 'removeClass' : 'addClass'](
'wb-empty' );
+ if( !this._isInEditMode !descriptionText ) {
+ this.$text.text( mw.msg( 'wikibase-description-empty' )
);
+ // Apply lang and dir of UI language
+ // instead language of that row
+ var userLanguage = mw.config.get( 'wgUserLanguage' );
+ this.element
+ .attr( 'lang', userLanguage )
+ .attr( 'dir', $.util.getDirectionality( userLanguage )
);
+ return;
+ }
+
+ this.element
+ .attr( 'lang', languageCode )
+ .attr( 'dir', $.util.getDirectionality( languageCode ) );
+
if( !this._isInEditMode ) {
- this.$text.text( descriptionText || mw.msg(
'wikibase-description-empty' ) );
+ this.$text.text( descriptionText );
return;
}
@@ -135,6 +150,7 @@
wb.getLanguageNameByCode( languageCode )
)
)
+ .attr( 'lang', languageCode )
.attr( 'dir', $.util.getDirectionality( languageCode ) )
.on( 'keydown.' + this.widgetName, function( event ) {
if( event.keyCode === $.ui.keyCode.ENTER ) {
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
index 6d8721f..0715d96 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
@@ -122,8 +122,23 @@
this.element[labelText ? 'removeClass' : 'addClass'](
'wb-empty' );
+ if( !this.isInEditMode() !labelText ) {
+ this.$text.text( mw.msg( 'wikibase-label-empty' ) );
+ // Apply lang and dir of UI language
+ // instead language of that row
+ var userLanguage = mw.config.get( 'wgUserLanguage' );
+ this.element
+ .attr( 'lang', userLanguage )
+ .attr( 'dir', $.util.getDirectionality( userLanguage )
);
+ return deferred.resolve().promise();
+ }
+
+ this.element
+ .attr( 'lang', languageCode )
+ .attr( 'dir', $.util.getDirectionality( languageCode ) );
+
if( !this.isInEditMode() ) {
- this.$text.text( labelText || mw.msg(
'wikibase-label-empty' ) );
+ this.$text.text( labelText );
return
[MediaWiki-commits] [Gerrit] Expands stat tracking in AbuseFilter - change (mediawiki...AbuseFilter)
Dragons flight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201171
Change subject: Expands stat tracking in AbuseFilter
..
Expands stat tracking in AbuseFilter
* Adds per filter max time / max condition tracking (Bug: T90754)
* Adds the new per filter max time / max condition information to the
statistics shown on the filter edit screen.
* Provides a more detailed total stats report on the filter list page,
which adds total run time across all filters (both average and max) and
total conditions used across all filters (both average and max).
* Relocates the statistics summary below the intro (seems a more reasonable
location given expanded size).
These changes should make the internal stats in AbuseFilter more useful by
providing information on extreme behavior in addition to averages, and
also conveying aggregate behavior across all filters.
The best approach for formatting the stats summary is somewhat unclear, and
I'm open to hearing alternative suggestions on how to approach it.
These changes depends on the stats overhaul in r201104.
Change-Id: Iace6e2ea0c73ef723a99e073ba1b932a129c1dfc
---
M AbuseFilter.class.php
M Views/AbuseFilterViewEdit.php
M Views/AbuseFilterViewList.php
M i18n/en.json
M i18n/qqq.json
5 files changed, 71 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/71/201171/1
diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index 93cc29e..3e33e30 100644
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -586,6 +586,8 @@
}
$profile['total-time'] += $time; // Total time spent
on this filter from all observed executions (seconds)
$profile['total-cond'] += $conds; // Total number of
conditions for this filter from all executions
+ $profile['max-time'] = max( $profile['max-time'], $time
); // Maximum time for this filter on a single action (seconds)
+ $profile['max-cond'] = max( $profile['max-cond'],
$conds ); // Maximum number of executions of this filter on a single action
} else {
$profile['count'] = 1;
if ( $matched ) {
@@ -595,6 +597,8 @@
}
$profile['total-time'] = $time;
$profile['total-cond'] = $conds;
+ $profile['max-time'] = $time;
+ $profile['max-cond'] = $conds;
}
// Note: It is important that all key information by stored
together in a single memcache entry to avoid
@@ -619,12 +623,14 @@
$matches = $profile['matches'];
$curTotalTime = $profile['total-time'];
$curTotalConds = $profile['total-cond'];
+ $curMaxTime = $profile['max-time'];
+ $curMaxConds = $profile['max-cond'];
} else {
$curCount = 0;
}
if ( !$curCount ) {
- return array( 0, 0, 0, 0 );
+ return array( 0, 0, 0, 0, 0, 0 );
}
$avgTime = ( $curTotalTime / $curCount ) * 1000; // 1000 ms in
a sec
@@ -633,7 +639,9 @@
$avgCond = ( $curTotalConds / $curCount );
$avgCond = round( $avgCond, 1 );
- return array( $curCount, $matches, $avgTime, $avgCond );
+ $curMaxTime = round( $curMaxTime * 1000, 2 );
+
+ return array( $curCount, $matches, $avgTime, $avgCond,
$curMaxTime, $curMaxConds );
}
/**
@@ -1599,7 +1607,9 @@
$profile['total'] = 0; // Total number of actions
observed
$profile['overflow'] = 0;// Number of actions
ending by exceeding condition limit
$profile['total-time'] = 0; // Total time of execution
of all observed actions (seconds)
+ $profile['max-time'] = 0;// Maximum time of
execution for a single action (seconds)
$profile['total-cond'] = 0; // Total number of
conditions from all observed actions
+ $profile['max-cond'] = 0;// Maximum number of
conditions from a single action
$profile['matches'] = 0; // Total number of filters
matched
$wgMemc-set( $profileKey, $profile, $storagePeriod );
@@ -1612,7 +1622,9 @@
// Increment total
$profile['total'] += 1;
$profile['total-time'] += $totalTime;
+ $profile['max-time'] = max( $profile['max-time'], $totalTime );
$profile['total-cond'] += self::$condCount;
+ $profile['max-cond'] = max(
[MediaWiki-commits] [Gerrit] Factor database access out of WikiPageEntityRevisionLookup - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Factor database access out of WikiPageEntityRevisionLookup
..
Factor database access out of WikiPageEntityRevisionLookup
Introduces WikiPageEntityMetaDataLookup which is able to retrieve
the meta data that WikiPageEntityRevisionLookup needs for both accessing
entities and to verify that an entity revision from cache is still
the latest version.
WikiPageEntityMetaDataLookup also supports getting meta data for
multiple entities at once, but we're not yet making use of that.
That will be used for implementing T87238.
Change-Id: Ie7f76921e1d1ffd2e67c33c597e9116f2148ed3d
---
M client/includes/store/sql/DirectSqlStore.php
A lib/includes/store/sql/WikiPageEntityMetaDataLookup.php
M lib/includes/store/sql/WikiPageEntityRevisionLookup.php
M repo/includes/store/sql/SqlStore.php
M repo/tests/phpunit/includes/store/WikiPageEntityRevisionLookupTest.php
A repo/tests/phpunit/includes/store/sql/WikiPageEntityMetaDataLookupTest.php
M repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
7 files changed, 432 insertions(+), 194 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/store/sql/DirectSqlStore.php
b/client/includes/store/sql/DirectSqlStore.php
index 514e3f9..8085351 100644
--- a/client/includes/store/sql/DirectSqlStore.php
+++ b/client/includes/store/sql/DirectSqlStore.php
@@ -25,6 +25,7 @@
use Wikibase\Lib\Store\RevisionBasedEntityLookup;
use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\Lib\Store\SiteLinkTable;
+use Wikibase\Lib\Store\WikiPageEntityMetaDataLookup;
use Wikibase\Lib\Store\WikiPageEntityRevisionLookup;
use Wikibase\Store\EntityIdLookup;
@@ -311,7 +312,7 @@
$rawLookup = new WikiPageEntityRevisionLookup(
$this-contentCodec,
- $this-entityIdParser,
+ new WikiPageEntityMetaDataLookup(
$this-entityIdParser, $this-repoWiki ),
$this-repoWiki
);
diff --git a/lib/includes/store/sql/WikiPageEntityMetaDataLookup.php
b/lib/includes/store/sql/WikiPageEntityMetaDataLookup.php
new file mode 100644
index 000..246566a
--- /dev/null
+++ b/lib/includes/store/sql/WikiPageEntityMetaDataLookup.php
@@ -0,0 +1,242 @@
+?php
+
+namespace Wikibase\Lib\Store;
+
+use DBAccessBase;
+use DatabaseBase;
+use DBQueryError;
+use ResultWrapper;
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\EntityIdParser;
+
+/**
+ * Service for looking up meta data about one or more entities as needed for
+ * loading entities from WikiPages (via Revision) or to verify an entity
against
+ * page.page_latest.
+ *
+ * @since 0.5
+ *
+ * @license GNU GPL v2+
+ * @author Daniel Kinzler
+ * @author Marius Hoch h...@online.de
+ */
+class WikiPageEntityMetaDataLookup extends DBAccessBase {
+
+ /**
+* @var EntityIdParser
+*/
+ private $entityIdParser;
+
+ /**
+* @param EntityIdParser $entityIdParser
+* @param string|bool $wiki The name of the wiki database to use (use
false for the local wiki)
+*/
+ public function __construct(
+ EntityIdParser $entityIdParser,
+ $wiki = false
+ ) {
+ parent::__construct( $wiki );
+
+ // TODO: migrate table away from using a numeric field so we no
longer need this!
+ $this-entityIdParser = $entityIdParser;
+ }
+
+ /**
+* @param EntityId[] $entityIds
+* @param string $mode (EntityRevisionLookup::LATEST_FROM_SLAVE or
EntityRevisionLookup::LATEST_FROM_MASTER)
+*
+* @throws DBQueryError
+* @return array entity id serialization - stdClass or false if no
such entity exists
+*/
+ public function loadRevisionInformation( array $entityIds, $mode ) {
+ $rows = array();
+
+ if ( $mode !== EntityRevisionLookup::LATEST_FROM_MASTER ) {
+ $rows = $this-selectRevisionInformationMultiple(
$entityIds, DB_SLAVE );
+ }
+
+ $loadFromMaster = array();
+ foreach ( $entityIds as $entityId ) {
+ if ( !isset( $rows[$entityId-getSerialization()] ) ||
!$rows[$entityId-getSerialization()] ) {
+ $loadFromMaster[] = $entityId;
+ }
+ }
+
+ if ( $loadFromMaster ) {
+ $rows = array_merge(
+ $rows,
+ $this-selectRevisionInformationMultiple(
$loadFromMaster, DB_MASTER )
+ );
+ }
+
+ return $rows;
+ }
+
+ /**
+* @param EntityId $entityId
+* @param string $mode (EntityRevisionLookup::LATEST_FROM_SLAVE or
[MediaWiki-commits] [Gerrit] Detect and add the appropriate tokens to API requests - change (pywikibot/core)
Ricordisamoa has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201159
Change subject: Detect and add the appropriate tokens to API requests
..
Detect and add the appropriate tokens to API requests
Bug: T78393
Change-Id: I9e93ca978f67eb7c2517bd32f2efeb664833dbb3
---
M pywikibot/data/api.py
M tests/api_tests.py
2 files changed, 23 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/59/201159/1
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 70e512b..669fb3f 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -1390,6 +1390,17 @@
Return internal representation.
return %s.%s%s-%r % (self.__class__.__module__,
self.__class__.__name__, self.site, str(self))
+@property
+def _tokens(self):
+return dict((param['name'], param['tokentype'])
+for param in
self.site._paraminfo[self.action]['parameters']
+if 'tokentype' in param)
+
+def _add_tokens(self):
+for name, tokentype in self._tokens.items():
+if name not in self._params:
+self[name] = self.site.tokens[tokentype]
+
def _simulate(self, action):
Simualte action.
if action and config.simulate and (self.write or action in
config.actions_to_block):
@@ -1501,6 +1512,8 @@
self._add_defaults()
+if self.write:
+self._add_tokens()
if (not config.enable_GET_without_SSL and
self.site.protocol() != 'https'):
use_get = False
diff --git a/tests/api_tests.py b/tests/api_tests.py
index d827f9c..9acea4b 100644
--- a/tests/api_tests.py
+++ b/tests/api_tests.py
@@ -57,6 +57,16 @@
for item in req.items():
self.assertEqual(len(item), 2, item)
+def test_token_detection(self):
+Test the Request._add_tokens() method.
+mysite = self.get_site()
+req = api.Request(site=mysite, action='edit')
+self.assertIn('action', req)
+self.assertNotIn('token', req)
+req._add_tokens()
+self.assertIn('action', req)
+self.assertIn('token', req)
+
class TestParamInfo(DefaultSiteTestCase):
--
To view, visit https://gerrit.wikimedia.org/r/201159
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e93ca978f67eb7c2517bd32f2efeb664833dbb3
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa ricordisa...@openmailbox.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move wikibase.view JS tests into subdirectory - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201160
Change subject: Move wikibase.view JS tests into subdirectory
..
Move wikibase.view JS tests into subdirectory
Most JavaScript modules that will reside in WikibaseView are not under
`wikibase.view`. They are not even all under `wikibase`.
This is a prerequisite for T93745.
Change-Id: I8c83837e77c4e803699688f2fb6ff1399e776209
---
M view/tests/qunit/resources.php
R view/tests/qunit/wikibase/view/ViewFactory.tests.js
A view/tests/qunit/wikibase/view/resources.php
3 files changed, 34 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/60/201160/1
diff --git a/view/tests/qunit/resources.php b/view/tests/qunit/resources.php
index 5e0bc17..b9d0010 100644
--- a/view/tests/qunit/resources.php
+++ b/view/tests/qunit/resources.php
@@ -4,28 +4,6 @@
* @license GNU GPL v2+
* @author Adrian Heine adrian.he...@wikimedia.de
*/
-return call_user_func( function() {
- preg_match( '+' . preg_quote( DIRECTORY_SEPARATOR ) .
'(?:vendor|extensions)'
- . preg_quote( DIRECTORY_SEPARATOR ) . '.*+', __DIR__,
$remoteExtPath );
-
- $moduleTemplate = array(
- 'localBasePath' = __DIR__,
- 'remoteExtPath' = '..' . $remoteExtPath[0]
- );
-
- $modules = array(
-
- 'wikibase.view.ViewFactory.tests' = $moduleTemplate + array(
- 'scripts' = array(
- 'ViewFactory.tests.js',
- ),
- 'dependencies' = array(
- 'wikibase.view.ViewFactory',
- 'wikibase.ValueViewBuilder'
- ),
- ),
-
- );
-
- return $modules;
-} );
+return array_merge(
+ include( __DIR__ . '/wikibase/view/resources.php' )
+);
diff --git a/view/tests/qunit/ViewFactory.tests.js
b/view/tests/qunit/wikibase/view/ViewFactory.tests.js
similarity index 100%
rename from view/tests/qunit/ViewFactory.tests.js
rename to view/tests/qunit/wikibase/view/ViewFactory.tests.js
diff --git a/view/tests/qunit/wikibase/view/resources.php
b/view/tests/qunit/wikibase/view/resources.php
new file mode 100644
index 000..5e0bc17
--- /dev/null
+++ b/view/tests/qunit/wikibase/view/resources.php
@@ -0,0 +1,31 @@
+?php
+
+/**
+ * @license GNU GPL v2+
+ * @author Adrian Heine adrian.he...@wikimedia.de
+ */
+return call_user_func( function() {
+ preg_match( '+' . preg_quote( DIRECTORY_SEPARATOR ) .
'(?:vendor|extensions)'
+ . preg_quote( DIRECTORY_SEPARATOR ) . '.*+', __DIR__,
$remoteExtPath );
+
+ $moduleTemplate = array(
+ 'localBasePath' = __DIR__,
+ 'remoteExtPath' = '..' . $remoteExtPath[0]
+ );
+
+ $modules = array(
+
+ 'wikibase.view.ViewFactory.tests' = $moduleTemplate + array(
+ 'scripts' = array(
+ 'ViewFactory.tests.js',
+ ),
+ 'dependencies' = array(
+ 'wikibase.view.ViewFactory',
+ 'wikibase.ValueViewBuilder'
+ ),
+ ),
+
+ );
+
+ return $modules;
+} );
--
To view, visit https://gerrit.wikimedia.org/r/201160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c83837e77c4e803699688f2fb6ff1399e776209
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.he...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move entityChangers from repo/ to view/ - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201161
Change subject: Move entityChangers from repo/ to view/
..
Move entityChangers from repo/ to view/
Change-Id: I218dbad62881fa0bb623e15d7244bc2f7f162ebc
---
M repo/resources/Resources.php
M repo/tests/qunit/resources.php
M view/resources/resources.php
R view/resources/wikibase/entityChangers/AliasesChanger.js
R view/resources/wikibase/entityChangers/ClaimsChanger.js
R view/resources/wikibase/entityChangers/DescriptionsChanger.js
R view/resources/wikibase/entityChangers/EntityChangersFactory.js
R view/resources/wikibase/entityChangers/LabelsChanger.js
R view/resources/wikibase/entityChangers/ReferencesChanger.js
R view/resources/wikibase/entityChangers/SiteLinksChanger.js
R view/resources/wikibase/entityChangers/namespace.js
R view/resources/wikibase/entityChangers/resources.php
M view/tests/qunit/resources.php
R view/tests/qunit/wikibase/entityChangers/AliasesChanger.tests.js
R view/tests/qunit/wikibase/entityChangers/ClaimsChanger.tests.js
R view/tests/qunit/wikibase/entityChangers/DescriptionsChanger.tests.js
R view/tests/qunit/wikibase/entityChangers/LabelsChanger.tests.js
R view/tests/qunit/wikibase/entityChangers/ReferencesChanger.tests.js
R view/tests/qunit/wikibase/entityChangers/SiteLinksChanger.tests.js
R view/tests/qunit/wikibase/entityChangers/resources.php
20 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/61/201161/1
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index 8988e45..3f08eca 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -283,7 +283,6 @@
return array_merge(
$modules,
- include( __DIR__ . '/entityChangers/resources.php' ),
include( __DIR__ . '/experts/resources.php' ),
include( __DIR__ . '/formatters/resources.php' ),
include( __DIR__ . '/parsers/resources.php' ),
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index 45f5e85..ed7a020 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -126,7 +126,6 @@
return array_merge(
$modules,
- include( __DIR__ . '/entityChangers/resources.php' ),
include( __DIR__ . '/jquery/resources.php' ),
include __DIR__ . '/store/resources.php',
include __DIR__ . '/utilities/resources.php'
diff --git a/view/resources/resources.php b/view/resources/resources.php
index a86806c..1f3644f 100644
--- a/view/resources/resources.php
+++ b/view/resources/resources.php
@@ -6,6 +6,7 @@
*/
return call_user_func( function() {
return array_merge(
- include ( __DIR__ . '/wikibase/view/resources.php' )
+ include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
+ include( __DIR__ . '/wikibase/view/resources.php' )
);
} );
diff --git a/repo/resources/entityChangers/AliasesChanger.js
b/view/resources/wikibase/entityChangers/AliasesChanger.js
similarity index 100%
rename from repo/resources/entityChangers/AliasesChanger.js
rename to view/resources/wikibase/entityChangers/AliasesChanger.js
diff --git a/repo/resources/entityChangers/ClaimsChanger.js
b/view/resources/wikibase/entityChangers/ClaimsChanger.js
similarity index 100%
rename from repo/resources/entityChangers/ClaimsChanger.js
rename to view/resources/wikibase/entityChangers/ClaimsChanger.js
diff --git a/repo/resources/entityChangers/DescriptionsChanger.js
b/view/resources/wikibase/entityChangers/DescriptionsChanger.js
similarity index 100%
rename from repo/resources/entityChangers/DescriptionsChanger.js
rename to view/resources/wikibase/entityChangers/DescriptionsChanger.js
diff --git a/repo/resources/entityChangers/EntityChangersFactory.js
b/view/resources/wikibase/entityChangers/EntityChangersFactory.js
similarity index 100%
rename from repo/resources/entityChangers/EntityChangersFactory.js
rename to view/resources/wikibase/entityChangers/EntityChangersFactory.js
diff --git a/repo/resources/entityChangers/LabelsChanger.js
b/view/resources/wikibase/entityChangers/LabelsChanger.js
similarity index 100%
rename from repo/resources/entityChangers/LabelsChanger.js
rename to view/resources/wikibase/entityChangers/LabelsChanger.js
diff --git a/repo/resources/entityChangers/ReferencesChanger.js
b/view/resources/wikibase/entityChangers/ReferencesChanger.js
similarity index 100%
rename from repo/resources/entityChangers/ReferencesChanger.js
rename to view/resources/wikibase/entityChangers/ReferencesChanger.js
diff --git a/repo/resources/entityChangers/SiteLinksChanger.js
b/view/resources/wikibase/entityChangers/SiteLinksChanger.js
similarity index 100%
rename from repo/resources/entityChangers/SiteLinksChanger.js
[MediaWiki-commits] [Gerrit] Stop WikiPageEntityStoreTest from leaking into the real DB - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Stop WikiPageEntityStoreTest from leaking into the real DB
..
Stop WikiPageEntityStoreTest from leaking into the real DB
Change-Id: Ifa1bba7a919dc69bc6bf115cdd7272d676ff3c59
---
M repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
b/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
index e704d98..a1445ab 100644
--- a/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
+++ b/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
@@ -2,7 +2,7 @@
namespace Wikibase\Test;
-use PHPUnit_Framework_TestCase;
+use MediaWikiTestCase;
use Revision;
use Status;
use User;
@@ -34,7 +34,7 @@
* @licence GNU GPL v2+
* @author Daniel Kinzler
*/
-class WikiPageEntityStoreTest extends PHPUnit_Framework_TestCase {
+class WikiPageEntityStoreTest extends MediaWikiTestCase {
/**
* @var EntityIdParser
--
To view, visit https://gerrit.wikimedia.org/r/201063
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa1bba7a919dc69bc6bf115cdd7272d676ff3c59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move wikibase.store from repo/ to view/ - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review. https://gerrit.wikimedia.org/r/201164 Change subject: Move wikibase.store from repo/ to view/ .. Move wikibase.store from repo/ to view/ Change-Id: If6a12f87fbd61bda3400c481f79cd18020f11b73 --- M repo/resources/Resources.php M repo/tests/qunit/resources.php M view/resources/resources.php R view/resources/wikibase/store/resources.php R view/resources/wikibase/store/store.ApiEntityStore.js R view/resources/wikibase/store/store.CombiningEntityStore.js R view/resources/wikibase/store/store.EntityStore.js R view/resources/wikibase/store/store.FetchedContent.js R view/resources/wikibase/store/store.FetchedContentUnserializer.js R view/resources/wikibase/store/store.MwConfigEntityStore.js R view/resources/wikibase/store/store.js M view/tests/qunit/resources.php R view/tests/qunit/wikibase/store/resources.php R view/tests/qunit/wikibase/store/store.CombiningEntityStore.tests.js R view/tests/qunit/wikibase/store/store.MwConfigEntityStore.tests.js 15 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/64/201164/1 diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php index 0193c91..f663345 100644 --- a/repo/resources/Resources.php +++ b/repo/resources/Resources.php @@ -236,7 +236,6 @@ $modules, include( __DIR__ . '/experts/resources.php' ), include( __DIR__ . '/formatters/resources.php' ), - include( __DIR__ . '/parsers/resources.php' ), - include( __DIR__ . '/store/resources.php' ) + include( __DIR__ . '/parsers/resources.php' ) ); } ); diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php index f1f47dc..62b8e17 100644 --- a/repo/tests/qunit/resources.php +++ b/repo/tests/qunit/resources.php @@ -88,7 +88,6 @@ return array_merge( $modules, - include __DIR__ . '/store/resources.php', include __DIR__ . '/utilities/resources.php' ); diff --git a/view/resources/resources.php b/view/resources/resources.php index 89e3234..4b346e4 100644 --- a/view/resources/resources.php +++ b/view/resources/resources.php @@ -9,6 +9,7 @@ include( __DIR__ . '/jquery/resources.php' ), include( __DIR__ . '/jquery/ui/resources.php' ), include( __DIR__ . '/wikibase/entityChangers/resources.php' ), + include( __DIR__ . '/wikibase/store/resources.php' ), include( __DIR__ . '/wikibase/view/resources.php' ) ); } ); diff --git a/repo/resources/store/resources.php b/view/resources/wikibase/store/resources.php similarity index 100% rename from repo/resources/store/resources.php rename to view/resources/wikibase/store/resources.php diff --git a/repo/resources/store/store.ApiEntityStore.js b/view/resources/wikibase/store/store.ApiEntityStore.js similarity index 100% rename from repo/resources/store/store.ApiEntityStore.js rename to view/resources/wikibase/store/store.ApiEntityStore.js diff --git a/repo/resources/store/store.CombiningEntityStore.js b/view/resources/wikibase/store/store.CombiningEntityStore.js similarity index 100% rename from repo/resources/store/store.CombiningEntityStore.js rename to view/resources/wikibase/store/store.CombiningEntityStore.js diff --git a/repo/resources/store/store.EntityStore.js b/view/resources/wikibase/store/store.EntityStore.js similarity index 100% rename from repo/resources/store/store.EntityStore.js rename to view/resources/wikibase/store/store.EntityStore.js diff --git a/repo/resources/store/store.FetchedContent.js b/view/resources/wikibase/store/store.FetchedContent.js similarity index 100% rename from repo/resources/store/store.FetchedContent.js rename to view/resources/wikibase/store/store.FetchedContent.js diff --git a/repo/resources/store/store.FetchedContentUnserializer.js b/view/resources/wikibase/store/store.FetchedContentUnserializer.js similarity index 100% rename from repo/resources/store/store.FetchedContentUnserializer.js rename to view/resources/wikibase/store/store.FetchedContentUnserializer.js diff --git a/repo/resources/store/store.MwConfigEntityStore.js b/view/resources/wikibase/store/store.MwConfigEntityStore.js similarity index 100% rename from repo/resources/store/store.MwConfigEntityStore.js rename to view/resources/wikibase/store/store.MwConfigEntityStore.js diff --git a/repo/resources/store/store.js b/view/resources/wikibase/store/store.js similarity index 100% rename from repo/resources/store/store.js rename to view/resources/wikibase/store/store.js diff --git a/view/tests/qunit/resources.php b/view/tests/qunit/resources.php index ed48c91..4ae3125 100644 --- a/view/tests/qunit/resources.php +++ b/view/tests/qunit/resources.php @@ -8,5 +8,6 @@ include( __DIR__ .
[MediaWiki-commits] [Gerrit] Prevent tutorial from showing if user clicks watchstar prior... - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Prevent tutorial from showing if user clicks watchstar prior to
load
..
Prevent tutorial from showing if user clicks watchstar prior to load
* Don't show tutorial if collections content overlay is open
* Removed setTimeout because T91047 is fixed
bug: T94113
Change-Id: I28564e2a2f47ea85509fa146483cf34a4cc25bcb
---
M resources/ext.gather.watchstar/init.js
1 file changed, 3 insertions(+), 5 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.gather.watchstar/init.js
b/resources/ext.gather.watchstar/init.js
index 327e373..828ba0d 100644
--- a/resources/ext.gather.watchstar/init.js
+++ b/resources/ext.gather.watchstar/init.js
@@ -20,6 +20,8 @@
mw.config.get( 'wgNamespaceNumber' ) === 0
// Don't show this when mobile is showing edit tutorial
mw.util.getParamValue( 'article_action' ) !==
'signup-edit'
+ // Don't show if the overlay is open as user could have
clicked watchstar
+ !$( 'html' ).hasClass( 'gather-overlay-enabled' )
// Tutorial has never been dismissed
!settings.get( settingOverlayWasDismissed )
// Feature flag is enabled
@@ -86,12 +88,8 @@
isNewlyAuthenticatedUser:
mw.util.getParamValue( 'article_action' ) === 'add_to_collection'
} );
- // Determine if we should show the collection tutorial
if ( $star.length 0 shouldShow ) {
- // FIXME: Timeout shouldn't be necessary but T91047
exists.
- setTimeout( function () {
- showPointer( watchstar, $star );
- }, 2000 );
+ showPointer( watchstar, $star );
}
}
// Only init when current page is an article
--
To view, visit https://gerrit.wikimedia.org/r/200077
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28564e2a2f47ea85509fa146483cf34a4cc25bcb
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Robmoen rm...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Jhernandez jhernan...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move wikibase.templates from repo/ to view/ - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review. https://gerrit.wikimedia.org/r/201169 Change subject: Move wikibase.templates from repo/ to view/ .. Move wikibase.templates from repo/ to view/ Change-Id: Id79e6ec9f6a05797cfcb3f6db05d6a8a81bb3f93 --- M repo/resources/Resources.php M repo/tests/qunit/resources.php M view/resources/wikibase/resources.php R view/resources/wikibase/templates.js R view/src/Module/TemplateModule.php M view/tests/qunit/wikibase/resources.php R view/tests/qunit/wikibase/templates.tests.js 7 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/69/201169/1 diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php index ea77e26..8408ee0 100644 --- a/repo/resources/Resources.php +++ b/repo/resources/Resources.php @@ -59,11 +59,6 @@ ), ), - 'wikibase.templates' = $moduleTemplate + array( - 'class' = 'Wikibase\TemplateModule', - 'scripts' = 'templates.js', - ), - 'wikibase.ui.entityViewInit' = $moduleTemplate + array( 'scripts' = array( 'wikibase.ui.entityViewInit.js' // should probably be adjusted for more modularity diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php index 8f46b44..bed600c 100644 --- a/repo/tests/qunit/resources.php +++ b/repo/tests/qunit/resources.php @@ -26,15 +26,6 @@ ), ), - 'templates.tests' = $moduleBase + array( - 'scripts' = array( - 'templates.tests.js', - ), - 'dependencies' = array( - 'wikibase.templates', - ), - ), - 'wikibase.dataTypeStore.tests' = $moduleBase + array( 'scripts' = array( 'dataTypes/wikibase.dataTypeStore.tests.js', diff --git a/view/resources/wikibase/resources.php b/view/resources/wikibase/resources.php index 408f52e..0551c9e 100644 --- a/view/resources/wikibase/resources.php +++ b/view/resources/wikibase/resources.php @@ -34,6 +34,11 @@ ) ), + 'wikibase.templates' = $moduleTemplate + array( + 'class' = 'Wikibase\View\Module\TemplateModule', + 'scripts' = 'templates.js', + ), + 'wikibase.ValueViewBuilder' = $moduleTemplate + array( 'scripts' = array( 'wikibase.ValueViewBuilder.js', diff --git a/repo/resources/templates.js b/view/resources/wikibase/templates.js similarity index 100% rename from repo/resources/templates.js rename to view/resources/wikibase/templates.js diff --git a/repo/includes/modules/TemplateModule.php b/view/src/Module/TemplateModule.php similarity index 96% rename from repo/includes/modules/TemplateModule.php rename to view/src/Module/TemplateModule.php index 8c89d8a..585296e 100644 --- a/repo/includes/modules/TemplateModule.php +++ b/view/src/Module/TemplateModule.php @@ -1,6 +1,6 @@ ?php -namespace Wikibase; +namespace Wikibase\View\Module; use FormatJson; use ResourceLoaderContext; diff --git a/view/tests/qunit/wikibase/resources.php b/view/tests/qunit/wikibase/resources.php index 0897832..58e72fa 100644 --- a/view/tests/qunit/wikibase/resources.php +++ b/view/tests/qunit/wikibase/resources.php @@ -24,6 +24,15 @@ ) ), + 'wikibase.templates.tests' = $moduleBase + array( + 'scripts' = array( + 'templates.tests.js', + ), + 'dependencies' = array( + 'wikibase.templates', + ), + ), + 'wikibase.ValueViewBuilder.tests' = $moduleBase + array( 'scripts' = array( 'wikibase.ValueViewBuilder.tests.js' diff --git a/repo/tests/qunit/templates.tests.js b/view/tests/qunit/wikibase/templates.tests.js similarity index 100% rename from repo/tests/qunit/templates.tests.js rename to view/tests/qunit/wikibase/templates.tests.js -- To view, visit https://gerrit.wikimedia.org/r/201169 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id79e6ec9f6a05797cfcb3f6db05d6a8a81bb3f93 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Adrian Lang adrian.he...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] Move wikibase.getLanguageNameByCode from repo/ to view/ - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201168
Change subject: Move wikibase.getLanguageNameByCode from repo/ to view/
..
Move wikibase.getLanguageNameByCode from repo/ to view/
Change-Id: I2659cc1a49c32df85026f18a67bab7cc63b6329c
---
M repo/resources/Resources.php
M repo/tests/qunit/resources.php
M view/resources/wikibase/resources.php
R view/resources/wikibase/wikibase.getLanguageNameByCode.js
M view/tests/qunit/wikibase/resources.php
R view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
6 files changed, 22 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/68/201168/1
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index a9fd256..ea77e26 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -59,15 +59,6 @@
),
),
- 'wikibase.getLanguageNameByCode' = $moduleTemplate + array(
- 'scripts' = array(
- 'wikibase.getLanguageNameByCode.js'
- ),
- 'dependencies' = array(
- 'wikibase'
- )
- ),
-
'wikibase.templates' = $moduleTemplate + array(
'class' = 'Wikibase\TemplateModule',
'scripts' = 'templates.js',
@@ -207,7 +198,6 @@
);
if ( defined( 'ULS_VERSION' ) ) {
- $modules['wikibase.getLanguageNameByCode']['dependencies'][] =
'ext.uls.mediawiki';
$modules['wikibase.special.itemDisambiguation']['dependencies'][] =
'ext.uls.mediawiki';
$modules['wikibase.special.entitiesWithout']['dependencies'][]
= 'ext.uls.mediawiki';
$modules['wikibase.WikibaseContentLanguages']['dependencies'][]
= 'ext.uls.languagenames';
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index df5caa1..8f46b44 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -65,15 +65,6 @@
),
),
- 'wikibase.getLanguageNameByCode.tests' = $moduleBase + array(
- 'scripts' = array(
- 'wikibase.getLanguageNameByCode.tests.js'
- ),
- 'dependencies' = array(
- 'wikibase.getLanguageNameByCode'
- )
- ),
-
);
return array_merge(
diff --git a/view/resources/wikibase/resources.php
b/view/resources/wikibase/resources.php
index d0eacc6..408f52e 100644
--- a/view/resources/wikibase/resources.php
+++ b/view/resources/wikibase/resources.php
@@ -16,6 +16,15 @@
$modules = array(
+ 'wikibase.getLanguageNameByCode' = $moduleTemplate + array(
+ 'scripts' = array(
+ 'wikibase.getLanguageNameByCode.js'
+ ),
+ 'dependencies' = array(
+ 'wikibase'
+ )
+ ),
+
'wikibase.RevisionStore' = $moduleTemplate + array(
'scripts' = array(
'wikibase.RevisionStore.js',
@@ -37,5 +46,9 @@
);
+ if ( defined( 'ULS_VERSION' ) ) {
+ $modules['wikibase.getLanguageNameByCode']['dependencies'][] =
'ext.uls.mediawiki';
+ }
+
return $modules;
} );
diff --git a/repo/resources/wikibase.getLanguageNameByCode.js
b/view/resources/wikibase/wikibase.getLanguageNameByCode.js
similarity index 100%
rename from repo/resources/wikibase.getLanguageNameByCode.js
rename to view/resources/wikibase/wikibase.getLanguageNameByCode.js
diff --git a/view/tests/qunit/wikibase/resources.php
b/view/tests/qunit/wikibase/resources.php
index fe0bea8..0897832 100644
--- a/view/tests/qunit/wikibase/resources.php
+++ b/view/tests/qunit/wikibase/resources.php
@@ -15,6 +15,15 @@
$modules = array(
+ 'wikibase.getLanguageNameByCode.tests' = $moduleBase + array(
+ 'scripts' = array(
+ 'wikibase.getLanguageNameByCode.tests.js'
+ ),
+ 'dependencies' = array(
+ 'wikibase.getLanguageNameByCode'
+ )
+ ),
+
'wikibase.ValueViewBuilder.tests' = $moduleBase + array(
'scripts' = array(
'wikibase.ValueViewBuilder.tests.js'
diff --git a/repo/tests/qunit/wikibase.getLanguageNameByCode.tests.js
b/view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
similarity index 100%
rename from
[MediaWiki-commits] [Gerrit] installer: Reduce some code duplication in LocalSettingsGene... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: installer: Reduce some code duplication in
LocalSettingsGenerator
..
installer: Reduce some code duplication in LocalSettingsGenerator
Change-Id: Ie3c2e56ac4d20d6d547e89a4d6c6331f4222409b
---
M includes/installer/LocalSettingsGenerator.php
1 file changed, 12 insertions(+), 4 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/installer/LocalSettingsGenerator.php
b/includes/installer/LocalSettingsGenerator.php
index 8724e0d..3ba5e37 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -143,8 +143,7 @@
# The following skins were automatically enabled:\n;
foreach ( $this-skins as $skinName ) {
- $encSkinName = self::escapePhpString( $skinName
);
- $localSettings .= require_once
\\$IP/skins/$encSkinName/$encSkinName.php\;\n;
+ $localSettings .=
$this-generateRequireOnceLine( 'skins', $skinName );
}
$localSettings .= \n;
@@ -157,8 +156,7 @@
# The following extensions were automatically enabled:\n;
foreach ( $this-extensions as $extName ) {
- $encExtName = self::escapePhpString( $extName );
- $localSettings .= require_once
\\$IP/extensions/$encExtName/$encExtName.php\;\n;
+ $localSettings .=
$this-generateRequireOnceLine( 'extensions', $extName );
}
$localSettings .= \n;
@@ -172,6 +170,16 @@
}
/**
+* @param string $dir Either extensions or skins
+* @param string $name Name of extension/skin
+* @return string
+*/
+ private function generateRequireOnceLine( $dir, $name ) {
+ $encName = self::escapePhpString( $name );
+ return require_once \\$IP/$dir/$encName/$encName.php\;\n;
+ }
+
+ /**
* Write the generated LocalSettings to a file
*
* @param string $fileName Full path to filename to write to
--
To view, visit https://gerrit.wikimedia.org/r/201137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3c2e56ac4d20d6d547e89a4d6c6331f4222409b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Waldir wal...@email.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce EntityIdPlainLinkFormatter for SummaryFormatter - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Introduce EntityIdPlainLinkFormatter for SummaryFormatter
..
Introduce EntityIdPlainLinkFormatter for SummaryFormatter
The wikitext links that SummaryFormatter outputs must not
include a display title, as that will stop the onLinkBegin
hook handler from altering the link (as it shouldn't magically
add display titles to links that already have one).
In order to fix this, I created a new EntityIdPlainLinkFormatter
which is basically the pre fb60de9acf5ffa5347fc0f57656073154e170c97
EntityIdLinkFormatter for use in case we don't want a display title.
Bug: T93804
Change-Id: Ib362ae7be39f94bd084665a58524c3c40bce99b8
---
M lib/includes/formatters/EntityIdLinkFormatter.php
A lib/includes/formatters/EntityIdPlainLinkFormatter.php
A lib/tests/phpunit/formatters/EntityIdPlainLinkFormatterTest.php
M repo/includes/SummaryFormatter.php
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/api/SetClaimValueTest.php
6 files changed, 114 insertions(+), 5 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/formatters/EntityIdLinkFormatter.php
b/lib/includes/formatters/EntityIdLinkFormatter.php
index 9a520aa..d5a182d 100644
--- a/lib/includes/formatters/EntityIdLinkFormatter.php
+++ b/lib/includes/formatters/EntityIdLinkFormatter.php
@@ -5,7 +5,8 @@
use Wikibase\DataModel\Entity\EntityId;
/**
- * Formats entity IDs by generating a wiki link to the corresponding page
title.
+ * Formats entity IDs by generating a wiki link to the corresponding page title
+ * with the id serialization as text.
*
* @since 0.5
*
diff --git a/lib/includes/formatters/EntityIdPlainLinkFormatter.php
b/lib/includes/formatters/EntityIdPlainLinkFormatter.php
new file mode 100644
index 000..b718c93
--- /dev/null
+++ b/lib/includes/formatters/EntityIdPlainLinkFormatter.php
@@ -0,0 +1,32 @@
+?php
+
+namespace Wikibase\Lib;
+
+use Wikibase\DataModel\Entity\EntityId;
+
+/**
+ * Formats entity IDs by generating a wiki link to the corresponding page title
+ * without display text. This link can contain a namespace like
[[Property:P42]].
+ * LinkBeginHookHandler requires this exact format.
+ *
+ * @since 0.5
+ *
+ * @license GNU GPL v2+
+ * @author Marius Hoch h...@online.de
+ */
+class EntityIdPlainLinkFormatter extends EntityIdTitleFormatter {
+
+ /**
+* @see EntityIdFormatter::formatEntityId
+*
+* @param EntityId $entityId
+*
+* @return string
+*/
+ public function formatEntityId( EntityId $entityId ) {
+ $title = parent::formatEntityId( $entityId );
+
+ return [[$title]];
+ }
+
+}
diff --git a/lib/tests/phpunit/formatters/EntityIdPlainLinkFormatterTest.php
b/lib/tests/phpunit/formatters/EntityIdPlainLinkFormatterTest.php
new file mode 100644
index 000..04bc730
--- /dev/null
+++ b/lib/tests/phpunit/formatters/EntityIdPlainLinkFormatterTest.php
@@ -0,0 +1,71 @@
+?php
+
+namespace Wikibase\Test;
+
+use LogicException;
+use PHPUnit_Framework_TestCase;
+use Title;
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\Item;
+use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\Entity\Property;
+use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\Lib\EntityIdPlainLinkFormatter;
+
+/**
+ * @covers Wikibase\Lib\EntityIdPlainLinkFormatter
+ *
+ * @group Wikibase
+ * @group WikibaseLib
+ * @group EntityIdFormatterTest
+ *
+ * @licence GNU GPL v2+
+ * @author Daniel Kinzler
+ * @author Marius Hoch h...@online.de
+ */
+class EntityIdPlainLinkFormatterTest extends PHPUnit_Framework_TestCase {
+
+ public function formatEntityIdProvider() {
+ return array(
+ 'ItemId' = array(
+ new ItemId( 'Q23' ),
+ '[[ITEM-TEST--Q23]]'
+ ),
+ 'PropertyId' = array(
+ new PropertyId( 'P23' ),
+ '[[PROPERTY-TEST--P23]]'
+ ),
+ );
+ }
+
+ /**
+* @dataProvider formatEntityIdProvider
+*/
+ public function testFormatEntityId( EntityId $id, $expected ) {
+ $formatter = $this-newEntityIdLinkFormatter();
+
+ $actual = $formatter-formatEntityId( $id );
+ $this-assertEquals( $expected, $actual );
+ }
+
+ public function getTitleForId( EntityId $entityId ) {
+ switch ( $entityId-getEntityType() ) {
+ case Item::ENTITY_TYPE:
+ return Title::makeTitle( NS_MAIN, 'ITEM-TEST--'
. $entityId-getSerialization() );
+ case Property::ENTITY_TYPE:
+ return Title::makeTitle( NS_MAIN,
'PROPERTY-TEST--'
[MediaWiki-commits] [Gerrit] Fix notices on bogus language codes - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix notices on bogus language codes
..
Fix notices on bogus language codes
Bug: T93500
Change-Id: I1f6ef994b898e1eb133cc3fbbea7839adb9c57d6
---
M includes/specials/SpecialMobileLanguages.php
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialMobileLanguages.php
b/includes/specials/SpecialMobileLanguages.php
index 45d1995..f5d3e28 100644
--- a/includes/specials/SpecialMobileLanguages.php
+++ b/includes/specials/SpecialMobileLanguages.php
@@ -57,9 +57,15 @@
// Set the name of each lanugage based on the system
list of language names
$languageMap = Language::fetchLanguageNames();
$languages = $page['langlinks'];
- foreach ( $languages as $langObject ) {
+ foreach ( $page['langlinks'] as $code = $langObject ) {
+ if ( !isset( $languageMap[$langObject['lang']]
) ) {
+ // Bug T93500: DB might still have
preantiquated rows with bogus languages
+ unset( $languages[$code] );
+ continue;
+ }
$langObject['langname'] =
$languageMap[$langObject['lang']];
$langObject['url'] =
MobileContext::singleton()-getMobileUrl( $langObject['url'] );
+ $languages[$code] = $langObject;
}
return $languages;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/199177
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1f6ef994b898e1eb133cc3fbbea7839adb9c57d6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Consolidate duplicate code in UsageAccumulator classes - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Consolidate duplicate code in UsageAccumulator classes
..
Consolidate duplicate code in UsageAccumulator classes
An other possibility is to keep the interface as it is and add a
base class with the shared methods. But this means the base class
can have *more* methods than the interface and I think this is not
a good idea. Therefor I'm proposing this solution.
Change-Id: I3902dfc8e493066fcc9a0337247885884d25d909
---
M client/includes/Usage/HashUsageAccumulator.php
M client/includes/Usage/ParserOutputUsageAccumulator.php
M client/includes/Usage/UsageAccumulator.php
M client/tests/phpunit/includes/Hooks/DataUpdateHookHandlersTest.php
4 files changed, 65 insertions(+), 161 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
Objections:
Adrian Lang: There's a problem with this change, please improve
diff --git a/client/includes/Usage/HashUsageAccumulator.php
b/client/includes/Usage/HashUsageAccumulator.php
index e819b92..d328a2d 100644
--- a/client/includes/Usage/HashUsageAccumulator.php
+++ b/client/includes/Usage/HashUsageAccumulator.php
@@ -2,11 +2,6 @@
namespace Wikibase\Client\Usage;
-use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\EntityIdValue;
-use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\DataModel\Snak\Snak;
-
/**
* This implementation of the UsageAccumulator interface simply wraps
* an array containing the usage information.
@@ -14,7 +9,7 @@
* @license GPL 2+
* @author Daniel Kinzler
*/
-class HashUsageAccumulator implements UsageAccumulator {
+class HashUsageAccumulator extends UsageAccumulator {
/**
* @var EntityUsage[]
@@ -22,87 +17,22 @@
private $usages = array();
/**
-* Registers usage of the given aspect of the given entity.
+* @see UsageAccumulator::addUsage
*
-* @param EntityId $id
-* @param string $aspect Use the EntityUsage::XXX_USAGE constants.
+* @param EntityUsage $usage
*/
- public function addUsage( EntityId $id, $aspect ) {
- $usage = new EntityUsage( $id, $aspect );
-
+ public function addUsage( EntityUsage $usage ) {
$key = $usage-getIdentityString();
$this-usages[$key] = $usage;
}
/**
-* @see UsageAccumulator::getUsage()
+* @see UsageAccumulator::getUsage
*
* @return EntityUsage[]
*/
public function getUsages() {
return $this-usages;
- }
-
- /**
-* @see UsageAccumulator::addLabelUsageForSnaks
-*
-* @param Snak[] $snaks
-*/
- public function addLabelUsageForSnaks( array $snaks ) {
- foreach ( $snaks as $snak ) {
- if ( $snak instanceof PropertyValueSnak ) {
- $value = $snak-getDataValue();
-
- if ( $value instanceof EntityIdValue ) {
- $this-addLabelUsage(
$value-getEntityId() );
- }
- }
- }
- }
-
- /**
-* @see UsageAccumulator::addLabelUsage
-*
-* @param EntityId $id
-*/
- public function addLabelUsage( EntityId $id ) {
- $this-addUsage( $id, EntityUsage::LABEL_USAGE );
- }
-
- /**
-* @see UsageAccumulator::addTitleUsage
-*
-* @param EntityId $id
-*/
- public function addTitleUsage( EntityId $id ) {
- $this-addUsage( $id, EntityUsage::TITLE_USAGE );
- }
-
- /**
-* @see UsageAccumulator::addSitelinksUsage
-*
-* @param EntityId $id
-*/
- public function addSiteLinksUsage( EntityId $id ) {
- $this-addUsage( $id, EntityUsage::SITELINK_USAGE );
- }
-
- /**
-* @see UsageAccumulator::addOtherUsage
-*
-* @param EntityId $id
-*/
- public function addOtherUsage( EntityId $id ) {
- $this-addUsage( $id, EntityUsage::OTHER_USAGE );
- }
-
- /**
-* @see UsageAccumulator::addAllUsage
-*
-* @param EntityId $id
-*/
- public function addAllUsage( EntityId $id ) {
- $this-addUsage( $id, EntityUsage::ALL_USAGE );
}
}
diff --git a/client/includes/Usage/ParserOutputUsageAccumulator.php
b/client/includes/Usage/ParserOutputUsageAccumulator.php
index d89a57f..33c1b7a 100644
--- a/client/includes/Usage/ParserOutputUsageAccumulator.php
+++ b/client/includes/Usage/ParserOutputUsageAccumulator.php
@@ -3,10 +3,6 @@
namespace Wikibase\Client\Usage;
use ParserOutput;
-use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\EntityIdValue;
-use
[MediaWiki-commits] [Gerrit] Invalidate cache on changes in BLOG_TALK - change (mediawiki...BlueSpiceExtensions)
Pigpen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201183
Change subject: Invalidate cache on changes in BLOG_TALK
..
Invalidate cache on changes in BLOG_TALK
Change-Id: Iac4c4b0f8a7645f20ea0daaa5ba77374eccd1897
---
M Blog/Blog.class.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/83/201183/1
diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index 746ac84..d2c4975 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -211,7 +211,8 @@
*/
public function onPageContentSaveComplete( $article, $user, $content,
$summary,
$isMinor, $isWatch, $section, $flags, $revision,
$status, $baseRevId ) {
- if ( $article-getTitle()-getNamespace() !== NS_BLOG ) return
true;
+ # TODO: Cache must also be invalidated on other occasions like
blog tags for subpages or categories.
+ if ( !in_array( $article-getTitle()-getNamespace(), array(
NS_BLOG, NS_BLOG_TALK) ) ) return true;
$sTagsKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'Blog',
'Tags' );
$aTagsData = BsCacheHelper::get( $sTagsKey );
--
To view, visit https://gerrit.wikimedia.org/r/201183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac4c4b0f8a7645f20ea0daaa5ba77374eccd1897
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pigpen reym...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
