[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceConfigManager[master]: Fix dependency to "WikiAdmin" class
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405843 ) Change subject: Fix dependency to "WikiAdmin" class .. Fix dependency to "WikiAdmin" class WikiAdmin extension is no longer part of BlueSpice distribution. Dependencies must be removed. T184583 Change-Id: Ib974d5e434f84ab3bbcfc7ed8bfc117f44a62edc --- M Preferences.class.php M extension.json A src/AdminTool.php 3 files changed, 64 insertions(+), 26 deletions(-) Approvals: Pwirth: Looks good to me, approved jenkins-bot: Verified diff --git a/Preferences.class.php b/Preferences.class.php index 87bce6b..31b68dd 100644 --- a/Preferences.class.php +++ b/Preferences.class.php @@ -30,31 +30,12 @@ * @filesource */ -// Last review MRG (01.07.11 13:56) - /** * the Preferences class * @package BlueSpice_Extensions * @subpackage Preferences */ class BsPreferences extends BsExtensionMW { - - public function __construct() { - wfProfileIn( 'BS::' . __METHOD__ ); - // Base settings - $this->mExtensionFile = __FILE__; - $this->mExtensionType = EXTTYPE::SPECIALPAGE; - - WikiAdmin::registerModule( 'BlueSpicePreferences', [ - 'image' => '/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_einstellungen_v1.png', - 'level' => 'wikiadmin', - 'message' => 'bs-bluespicepreferences-label', - 'iconCls' => 'bs-icon-wrench', - 'permissions' => [ 'bluespicepreferences-viewspecialpage' ], - ]); - - wfProfileOut( 'BS::' . __METHOD__ ); - } protected function initExt() { $this->mCore->registerPermission( 'bluespicepreferences-viewspecialpage', array( 'sysop' ), array( 'type' => 'global' ) ); diff --git a/extension.json b/extension.json index da38667..2c25937 100644 --- a/extension.json +++ b/extension.json @@ -7,22 +7,38 @@ "Stephan Muggli" ], "descriptionmsg": "bs-preferences-desc", - "license-name": "GPL-2.0-or-later", + "license-name": "GPL-3.0-only", "type": "bluespice", - "bsgExtensions": { - "BlueSpiceConfigManager": { - "className": "BsPreferences", - "extPath": "/BlueSpiceConfigManager" + "attributes": { + "BlueSpiceFoundation": { + "Extensions": { + "BlueSpiceConfigManager": { + "className": "BsPreferences", + "extPath": "/BlueSpiceConfigManager" + } + }, + "AdminToolRegistry": { + "bs-config-manager": "BlueSpice\\ConfigManager\\AdminTool" + } + } + }, + "requires": { + "MediaWiki": ">= 1.31.0", + "extensions": { + "BlueSpiceFoundation": "*" } }, "MessagesDirs": { - "Preferences": [ + "BlueSpiceConfigManager": [ "i18n" ] }, "AutoloadClasses": { "BsPreferences": "Preferences.class.php", "SpecialBlueSpicePreferences": "includes/specials/SpecialBlueSpicePreferences.php" + }, + "AutoloadNamespaces": { + "BlueSpice\\ConfigManager\\" : "src/" }, "ExtensionMessagesFiles": { "BlueSpicePreferencesAlias": "includes/specials/SpecialBlueSpicePreferences.alias.php" @@ -45,6 +61,6 @@ "Hooks": { "BeforePageDisplay": "BsPreferences::onBeforePageDisplay" }, - "manifest_version": 1, + "manifest_version": 2, "load_composer_autoloader" : true } diff --git a/src/AdminTool.php b/src/AdminTool.php new file mode 100644 index 000..13c74c1 --- /dev/null +++ b/src/AdminTool.php @@ -0,0 +1,41 @@ +getLocalURL(); + } + + public function getDescription() { + return wfMessage( 'bs-bluespicepreferences-desc' ); + } + + public function getName() { + return wfMessage( 'bs-bluespicepreferences-label' ); + } + + public function getClasses() { + $classes = array( + 'bs-icon-wrench' + ); + + return $classes; + } + + public function getDataAttributes() { + return []; + } + + public function getPermissions() { + $permissions = array( + 'bluespicepreferences-viewspecialpage' + ); + return $permissions; + } + +} \ No newline at end of file -- To view, visit https://ger
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceUserManager[master]: Fix IAdminTool return value
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405852 ) Change subject: Fix IAdminTool return value .. Fix IAdminTool return value Change-Id: I0600c4cd341377ac576ff79034d7a5820dc5bdff --- M src/AdminTool.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceUserManager refs/changes/52/405852/1 diff --git a/src/AdminTool.php b/src/AdminTool.php index eea1cbd..8057229 100644 --- a/src/AdminTool.php +++ b/src/AdminTool.php @@ -28,6 +28,7 @@ } public function getDataAttributes() { + return []; } public function getPermissions() { -- To view, visit https://gerrit.wikimedia.org/r/405852 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0600c4cd341377ac576ff79034d7a5820dc5bdff Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceUserManager Gerrit-Branch: master Gerrit-Owner: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePermissionManager[master]: Fix IAdminTool return value
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405851 ) Change subject: Fix IAdminTool return value .. Fix IAdminTool return value Change-Id: I6830e35cbf4de1847ad0c3334d44d8a9e899aab5 --- M src/AdminTool.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpicePermissionManager refs/changes/51/405851/1 diff --git a/src/AdminTool.php b/src/AdminTool.php index 73e8899..f9e452f 100644 --- a/src/AdminTool.php +++ b/src/AdminTool.php @@ -28,6 +28,7 @@ } public function getDataAttributes() { + return []; } public function getPermissions() { -- To view, visit https://gerrit.wikimedia.org/r/405851 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6830e35cbf4de1847ad0c3334d44d8a9e899aab5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpicePermissionManager Gerrit-Branch: master Gerrit-Owner: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceGroupManager[master]: Fix IAdminTool return value
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405850 ) Change subject: Fix IAdminTool return value .. Fix IAdminTool return value Change-Id: I98669162490deb9c54efd9453ed49d144eb4f585 --- M src/AdminTool.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceGroupManager refs/changes/50/405850/1 diff --git a/src/AdminTool.php b/src/AdminTool.php index 4b5c9d0..438ac41 100644 --- a/src/AdminTool.php +++ b/src/AdminTool.php @@ -28,6 +28,7 @@ } public function getDataAttributes() { + return []; } public function getPermissions() { -- To view, visit https://gerrit.wikimedia.org/r/405850 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I98669162490deb9c54efd9453ed49d144eb4f585 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceGroupManager Gerrit-Branch: master Gerrit-Owner: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePageTemplates[master]: Fix IAdminTool return value
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405849 ) Change subject: Fix IAdminTool return value .. Fix IAdminTool return value Change-Id: Ibdd5231603371630d647d4512a82343d9063cfc0 --- M src/AdminTool.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpicePageTemplates refs/changes/49/405849/1 diff --git a/src/AdminTool.php b/src/AdminTool.php index eb099e4..f734020 100644 --- a/src/AdminTool.php +++ b/src/AdminTool.php @@ -28,6 +28,7 @@ } public function getDataAttributes() { + return []; } public function getPermissions() { -- To view, visit https://gerrit.wikimedia.org/r/405849 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibdd5231603371630d647d4512a82343d9063cfc0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpicePageTemplates Gerrit-Branch: master Gerrit-Owner: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePageAssignments[master]: Fix IAdminTool return value
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405848 ) Change subject: Fix IAdminTool return value .. Fix IAdminTool return value Change-Id: I10fce59d937e0a400fa529f3aae8c1700d7a4ce3 --- M src/AdminTool.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpicePageAssignments refs/changes/48/405848/1 diff --git a/src/AdminTool.php b/src/AdminTool.php index d302116..3631d2d 100644 --- a/src/AdminTool.php +++ b/src/AdminTool.php @@ -28,6 +28,7 @@ } public function getDataAttributes() { + return []; } public function getPermissions() { -- To view, visit https://gerrit.wikimedia.org/r/405848 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I10fce59d937e0a400fa529f3aae8c1700d7a4ce3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpicePageAssignments Gerrit-Branch: master Gerrit-Owner: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceNamespaceManager[master]: Fix IAdminTool return value
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405847 ) Change subject: Fix IAdminTool return value .. Fix IAdminTool return value Change-Id: I198d62274204d03d2d41b462a625d9334ea927c5 --- M src/AdminTool.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceNamespaceManager refs/changes/47/405847/1 diff --git a/src/AdminTool.php b/src/AdminTool.php index b92348e..f8665b1 100644 --- a/src/AdminTool.php +++ b/src/AdminTool.php @@ -28,6 +28,7 @@ } public function getDataAttributes() { + return []; } public function getPermissions() { -- To view, visit https://gerrit.wikimedia.org/r/405847 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I198d62274204d03d2d41b462a625d9334ea927c5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceNamespaceManager Gerrit-Branch: master Gerrit-Owner: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInterWikiLinks[master]: Fix IAdminTool return value
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405846 ) Change subject: Fix IAdminTool return value .. Fix IAdminTool return value Change-Id: I426ac93679b141c530267dabdddec5dba41592f6 --- M src/AdminTool.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceInterWikiLinks refs/changes/46/405846/1 diff --git a/src/AdminTool.php b/src/AdminTool.php index fd27cc0..07bc2e8 100644 --- a/src/AdminTool.php +++ b/src/AdminTool.php @@ -28,6 +28,7 @@ } public function getDataAttributes() { + return []; } public function getPermissions() { -- To view, visit https://gerrit.wikimedia.org/r/405846 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I426ac93679b141c530267dabdddec5dba41592f6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceInterWikiLinks Gerrit-Branch: master Gerrit-Owner: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtendedSearch[master]: Fix IAdminTool return value
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405845 ) Change subject: Fix IAdminTool return value .. Fix IAdminTool return value Change-Id: Idc1b6a4b74d50b2ec4fbf0d9683d19bcd69a32af --- M src/AdminTool.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtendedSearch refs/changes/45/405845/1 diff --git a/src/AdminTool.php b/src/AdminTool.php index b82f889..d6b9e3c 100644 --- a/src/AdminTool.php +++ b/src/AdminTool.php @@ -28,6 +28,7 @@ } public function getDataAttributes() { + return []; } public function getPermissions() { -- To view, visit https://gerrit.wikimedia.org/r/405845 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc1b6a4b74d50b2ec4fbf0d9683d19bcd69a32af Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtendedSearch Gerrit-Branch: master Gerrit-Owner: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceAbout[master]: Fix namespace issue and IAdminTool interface return values
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405844 ) Change subject: Fix namespace issue and IAdminTool interface return values .. Fix namespace issue and IAdminTool interface return values Change-Id: I0843bf2dd21adae50d67f983894eb7d44e995650 --- M extension.json M src/AdminTool.php 2 files changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceAbout refs/changes/44/405844/1 diff --git a/extension.json b/extension.json index fa7bbd4..69e9789 100644 --- a/extension.json +++ b/extension.json @@ -18,10 +18,10 @@ "BlueSpiceAboutAlias": "includes/specials/SpecialBlueSpiceAbout.alias.php" }, "BlueSpiceFoundationAdminToolRegistry": { - "bs-bluespiceabout": "BlueSpice\\BlueSpiceAbout\\AdminTool" + "bs-bluespiceabout": "BlueSpice\\About\\AdminTool" }, "AutoloadNamespaces": { - "BlueSpice\\BlueSpiceAbout\\" : "src/" + "BlueSpice\\About\\" : "src/" }, "AutoloadClasses": { "BlueSpiceAbout": "BlueSpiceAbout.class.php", diff --git a/src/AdminTool.php b/src/AdminTool.php index 9da1641..9d4e9b0 100644 --- a/src/AdminTool.php +++ b/src/AdminTool.php @@ -1,6 +1,6 @@ https://gerrit.wikimedia.org/r/405844 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0843bf2dd21adae50d67f983894eb7d44e995650 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceAbout Gerrit-Branch: master Gerrit-Owner: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceConfigManager[master]: Fix dependency to "WikiAdmin" class
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405843 ) Change subject: Fix dependency to "WikiAdmin" class .. Fix dependency to "WikiAdmin" class WikiAdmin extension is no longer part of BlueSpice distribution. Dependencies must be removed. T184583 Change-Id: Ib974d5e434f84ab3bbcfc7ed8bfc117f44a62edc --- M Preferences.class.php M extension.json A src/AdminTool.php 3 files changed, 64 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceConfigManager refs/changes/43/405843/1 diff --git a/Preferences.class.php b/Preferences.class.php index 87bce6b..31b68dd 100644 --- a/Preferences.class.php +++ b/Preferences.class.php @@ -30,31 +30,12 @@ * @filesource */ -// Last review MRG (01.07.11 13:56) - /** * the Preferences class * @package BlueSpice_Extensions * @subpackage Preferences */ class BsPreferences extends BsExtensionMW { - - public function __construct() { - wfProfileIn( 'BS::' . __METHOD__ ); - // Base settings - $this->mExtensionFile = __FILE__; - $this->mExtensionType = EXTTYPE::SPECIALPAGE; - - WikiAdmin::registerModule( 'BlueSpicePreferences', [ - 'image' => '/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_einstellungen_v1.png', - 'level' => 'wikiadmin', - 'message' => 'bs-bluespicepreferences-label', - 'iconCls' => 'bs-icon-wrench', - 'permissions' => [ 'bluespicepreferences-viewspecialpage' ], - ]); - - wfProfileOut( 'BS::' . __METHOD__ ); - } protected function initExt() { $this->mCore->registerPermission( 'bluespicepreferences-viewspecialpage', array( 'sysop' ), array( 'type' => 'global' ) ); diff --git a/extension.json b/extension.json index da38667..2c25937 100644 --- a/extension.json +++ b/extension.json @@ -7,22 +7,38 @@ "Stephan Muggli" ], "descriptionmsg": "bs-preferences-desc", - "license-name": "GPL-2.0-or-later", + "license-name": "GPL-3.0-only", "type": "bluespice", - "bsgExtensions": { - "BlueSpiceConfigManager": { - "className": "BsPreferences", - "extPath": "/BlueSpiceConfigManager" + "attributes": { + "BlueSpiceFoundation": { + "Extensions": { + "BlueSpiceConfigManager": { + "className": "BsPreferences", + "extPath": "/BlueSpiceConfigManager" + } + }, + "AdminToolRegistry": { + "bs-config-manager": "BlueSpice\\ConfigManager\\AdminTool" + } + } + }, + "requires": { + "MediaWiki": ">= 1.31.0", + "extensions": { + "BlueSpiceFoundation": "*" } }, "MessagesDirs": { - "Preferences": [ + "BlueSpiceConfigManager": [ "i18n" ] }, "AutoloadClasses": { "BsPreferences": "Preferences.class.php", "SpecialBlueSpicePreferences": "includes/specials/SpecialBlueSpicePreferences.php" + }, + "AutoloadNamespaces": { + "BlueSpice\\ConfigManager\\" : "src/" }, "ExtensionMessagesFiles": { "BlueSpicePreferencesAlias": "includes/specials/SpecialBlueSpicePreferences.alias.php" @@ -45,6 +61,6 @@ "Hooks": { "BeforePageDisplay": "BsPreferences::onBeforePageDisplay" }, - "manifest_version": 1, + "manifest_version": 2, "load_composer_autoloader" : true } diff --git a/src/AdminTool.php b/src/AdminTool.php new file mode 100644 index 000..13c74c1 --- /dev/null +++ b/src/AdminTool.php @@ -0,0 +1,41 @@ +getLocalURL(); + } + + public function getDescription() { + return wfMessage( 'bs-bluespicepreferences-desc' ); + } + + public function getName() { + return wfMessage( 'bs-bluespicepreferences-label' ); + } + + public function getClasses() { + $classes = array( + 'bs-icon-wrench' + ); + + return $classes; + } + + public function getDataAttributes() { + return []; + } + + public function getPermissions() { + $permissions = array( + 'bluespicepreferences-viewspecialpage' + ); + return $permissions; + } + +} \ No newline at end of f
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1089 with low weight
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405842 ) Change subject: db-eqiad.php: Repool db1089 with low weight .. db-eqiad.php: Repool db1089 with low weight Slowly repooling it after it has been out for a day Change-Id: Ib61f8d8513df6c0e2daec67b03fbee426a493e53 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 09dae4e..d1f0759 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -110,7 +110,7 @@ 'db1073' => 50, # B3 2.8TB 160GB, api 'db1080' => 300, # A2 3.6TB 512GB, api 'db1083' => 500, # B1 3.6TB 512GB - # 'db1089' => 500, # C3 3.6TB 512GB # T162807 + 'db1089' => 200, # C3 3.6TB 512GB 'db1099:3311' => 1, # B2 3.6TB 512GB # rc, log: s1 and s8 'db1105:3311' => 1, # C3 3.6TB 512GB # rc, log: s1 and s2 ], -- To view, visit https://gerrit.wikimedia.org/r/405842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib61f8d8513df6c0e2daec67b03fbee426a493e53 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1089 with low weight
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405842 ) Change subject: db-eqiad.php: Repool db1089 with low weight .. db-eqiad.php: Repool db1089 with low weight Slowly repooling it after it has been out for a day Change-Id: Ib61f8d8513df6c0e2daec67b03fbee426a493e53 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/42/405842/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 09dae4e..d1f0759 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -110,7 +110,7 @@ 'db1073' => 50, # B3 2.8TB 160GB, api 'db1080' => 300, # A2 3.6TB 512GB, api 'db1083' => 500, # B1 3.6TB 512GB - # 'db1089' => 500, # C3 3.6TB 512GB # T162807 + 'db1089' => 200, # C3 3.6TB 512GB 'db1099:3311' => 1, # B2 3.6TB 512GB # rc, log: s1 and s8 'db1105:3311' => 1, # C3 3.6TB 512GB # rc, log: s1 and s2 ], -- To view, visit https://gerrit.wikimedia.org/r/405842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib61f8d8513df6c0e2daec67b03fbee426a493e53 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix crasher from rendering self-closed html pre tags
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405823 ) Change subject: Fix crasher from rendering self-closed html pre tags .. Fix crasher from rendering self-closed html pre tags For example, http://localhost:8000/fr.wikipedia.org/v3/page/html/Utilisateur%3ADepil/125767760 Bug: T185385 Change-Id: I6c2211c0cffb9f899d4efb390649e72729e0f705 --- M lib/ext/Pre/index.js M tests/parserTests.txt 2 files changed, 12 insertions(+), 1 deletion(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ext/Pre/index.js b/lib/ext/Pre/index.js index 1e34ad8..50b8b84 100644 --- a/lib/ext/Pre/index.js +++ b/lib/ext/Pre/index.js @@ -45,7 +45,7 @@ stx: 'html', }); - var txt = argDict.body.extsrc; + var txt = argDict.body && argDict.body.extsrc || ''; // Support nowikis in pre. Do this before stripping newlines, see test, // " with inside (compatibility with 1.6 and earlier)" diff --git a/tests/parserTests.txt b/tests/parserTests.txt index c1b893c..fd05393 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -2723,6 +2723,17 @@ !! end !! test +Self-closed pre +!! wikitext + +!! html/php + + +!! html/parsoid + +!! end + +!! test Parsoid: Don't paragraph-wrap fosterable content even if table syntax is unbalanced !! options parsoid=wt2html -- To view, visit https://gerrit.wikimedia.org/r/405823 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c2211c0cffb9f899d4efb390649e72729e0f705 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra Gerrit-Reviewer: C. Scott Ananian Gerrit-Reviewer: Sbailey Gerrit-Reviewer: Subramanya Sastry Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix hiding of thumbnails in reading list detail view.
Dbrant has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405841 ) Change subject: Fix hiding of thumbnails in reading list detail view. .. Fix hiding of thumbnails in reading list detail view. Bug: T185541 Change-Id: Iae51d68e1e158789c600f00a499753ac4d258278 --- M app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java M app/src/main/res/layout/item_reading_list.xml 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/41/405841/1 diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java b/app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java index acdf7c7..e8daed8 100644 --- a/app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java +++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java @@ -52,6 +52,7 @@ @BindView(R.id.item_description) TextView descriptionView; @BindView(R.id.item_overflow_menu)View overflowButton; +@BindView(R.id.item_thumbnails_container) View thumbnailsContainer; @BindView(R.id.item_image_container) View imageContainer; @BindView(R.id.default_list_empty_image) ImageView defaultListEmptyView; @BindViews({R.id.item_image_1, R.id.item_image_2, R.id.item_image_3, R.id.item_image_4}) List imageViews; @@ -94,7 +95,7 @@ statisticalDescriptionView.setText(text); updateDetails(); -if (imageContainer.getVisibility() == VISIBLE) { +if (thumbnailsContainer.getVisibility() == VISIBLE) { updateThumbnails(); } } @@ -108,7 +109,7 @@ } public void setThumbnailVisible(boolean visible) { -imageContainer.setVisibility(visible ? VISIBLE : GONE); +thumbnailsContainer.setVisibility(visible ? VISIBLE : GONE); } public void setShowDescriptionEmptyHint(boolean show) { diff --git a/app/src/main/res/layout/item_reading_list.xml b/app/src/main/res/layout/item_reading_list.xml index 84da7bd..aa62c42 100644 --- a/app/src/main/res/layout/item_reading_list.xml +++ b/app/src/main/res/layout/item_reading_list.xml @@ -16,6 +16,7 @@ android:layout_margin="16dp"> -- To view, visit https://gerrit.wikimedia.org/r/405841 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae51d68e1e158789c600f00a499753ac4d258278 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1105:3311"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405840 ) Change subject: Revert "db-eqiad.php: Depool db1105:3311" .. Revert "db-eqiad.php: Depool db1105:3311" This reverts commit 8f0c9283c91bad69f386399573baf884f08a11a1. Change-Id: I82d991e8e39e6d7fdb138cf27bf56d06cb5ba7a2 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index c551619..09dae4e 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -112,7 +112,7 @@ 'db1083' => 500, # B1 3.6TB 512GB # 'db1089' => 500, # C3 3.6TB 512GB # T162807 'db1099:3311' => 1, # B2 3.6TB 512GB # rc, log: s1 and s8 - # 'db1105:3311' => 1, # C3 3.6TB 512GB # rc, log: s1 and s2 # T162807 + 'db1105:3311' => 1, # C3 3.6TB 512GB # rc, log: s1 and s2 ], 's2' => [ 'db1054' => 0, # A3 2.8TB 96GB, master @@ -261,23 +261,23 @@ 's1' => [ 'watchlist' => [ 'db1099:3311' => 1, - # 'db1105:3311' => 1, + 'db1105:3311' => 1, ], 'recentchanges' => [ 'db1099:3311' => 1, - # 'db1105:3311' => 1, + 'db1105:3311' => 1, ], 'recentchangeslinked' => [ 'db1099:3311' => 1, - # 'db1105:3311' => 1, + 'db1105:3311' => 1, ], 'contributions' => [ 'db1099:3311' => 1, - # 'db1105:3311' => 1, + 'db1105:3311' => 1, ], 'logpager' => [ 'db1099:3311' => 1, - # 'db1105:3311' => 1, + 'db1105:3311' => 1, ], 'dump' => [ 'db1065' => 1, -- To view, visit https://gerrit.wikimedia.org/r/405840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I82d991e8e39e6d7fdb138cf27bf56d06cb5ba7a2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1105:3311"
Hello Urbanecm, jenkins-bot, Jcrespo, Zoranzoki21, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/405840 to review the following change. Change subject: Revert "db-eqiad.php: Depool db1105:3311" .. Revert "db-eqiad.php: Depool db1105:3311" This reverts commit 8f0c9283c91bad69f386399573baf884f08a11a1. Change-Id: I82d991e8e39e6d7fdb138cf27bf56d06cb5ba7a2 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/40/405840/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index c551619..09dae4e 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -112,7 +112,7 @@ 'db1083' => 500, # B1 3.6TB 512GB # 'db1089' => 500, # C3 3.6TB 512GB # T162807 'db1099:3311' => 1, # B2 3.6TB 512GB # rc, log: s1 and s8 - # 'db1105:3311' => 1, # C3 3.6TB 512GB # rc, log: s1 and s2 # T162807 + 'db1105:3311' => 1, # C3 3.6TB 512GB # rc, log: s1 and s2 ], 's2' => [ 'db1054' => 0, # A3 2.8TB 96GB, master @@ -261,23 +261,23 @@ 's1' => [ 'watchlist' => [ 'db1099:3311' => 1, - # 'db1105:3311' => 1, + 'db1105:3311' => 1, ], 'recentchanges' => [ 'db1099:3311' => 1, - # 'db1105:3311' => 1, + 'db1105:3311' => 1, ], 'recentchangeslinked' => [ 'db1099:3311' => 1, - # 'db1105:3311' => 1, + 'db1105:3311' => 1, ], 'contributions' => [ 'db1099:3311' => 1, - # 'db1105:3311' => 1, + 'db1105:3311' => 1, ], 'logpager' => [ 'db1099:3311' => 1, - # 'db1105:3311' => 1, + 'db1105:3311' => 1, ], 'dump' => [ 'db1065' => 1, -- To view, visit https://gerrit.wikimedia.org/r/405840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82d991e8e39e6d7fdb138cf27bf56d06cb5ba7a2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix background highlight of multi-select items.
Dbrant has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405839 ) Change subject: Fix background highlight of multi-select items. .. Fix background highlight of multi-select items. Bug: T185536 Change-Id: I57e4b68644a7343ad8df46edcb292c953bb27d68 --- M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java M app/src/main/java/org/wikipedia/views/PageItemView.java 2 files changed, 11 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/39/405839/1 diff --git a/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java b/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java index f0cfba6..5d49406 100644 --- a/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java +++ b/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java @@ -71,6 +71,7 @@ List pagesToSave = ReadingListDbHelper.instance().getAllPagesToBeSaved(); List pagesToUnsave = ReadingListDbHelper.instance().getAllPagesToBeUnsaved(); List pagesToDelete = ReadingListDbHelper.instance().getAllPagesToBeDeleted(); +boolean shouldSendSyncEvent = false; try { for (ReadingListPage page : pagesToDelete) { @@ -84,13 +85,18 @@ } finally { if (!pagesToDelete.isEmpty()) { ReadingListDbHelper.instance().purgeDeletedPages(); +shouldSendSyncEvent = true; } if (!pagesToUnsave.isEmpty()) { ReadingListDbHelper.instance().resetUnsavedPageStatus(); +shouldSendSyncEvent = true; } } int itemsTotal = pagesToSave.size(); +if (itemsTotal > 0) { +shouldSendSyncEvent = true; +} int itemsSaved = 0; try { itemsSaved = savePages(pagesToSave); @@ -100,7 +106,9 @@ } else { savedPageSyncNotification.cancelNotification(getApplicationContext()); savedPageSyncNotification.setSyncCanceled(false); -sendSyncEvent(); +if (shouldSendSyncEvent) { +sendSyncEvent(); +} } } } diff --git a/app/src/main/java/org/wikipedia/views/PageItemView.java b/app/src/main/java/org/wikipedia/views/PageItemView.java index 80ac1fe..bc0936c 100644 --- a/app/src/main/java/org/wikipedia/views/PageItemView.java +++ b/app/src/main/java/org/wikipedia/views/PageItemView.java @@ -155,10 +155,7 @@ imageView.setVisibility(selected ? GONE : VISIBLE); imageSelectedView.setVisibility(selected ? VISIBLE : GONE); // TODO: animate? -if (selected) { -setBackgroundColor(getThemedColor(getContext(), R.attr.multi_select_background_color)); -} else { -setBackground(null); -} +containerView.setBackgroundColor(getThemedColor(getContext(), +selected ? R.attr.multi_select_background_color : R.attr.paper_color)); } } -- To view, visit https://gerrit.wikimedia.org/r/405839 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I57e4b68644a7343ad8df46edcb292c953bb27d68 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix infinite recursion from linting named ref cycles
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405821 ) Change subject: Fix infinite recursion from linting named ref cycles .. Fix infinite recursion from linting named ref cycles On pages like, http://localhost:8000/fr.wikipedia.org/v3/page/html/Krzysztof_Charamsa/142052535 http://localhost:8000/es.wikipedia.org/v3/page/html/Taxonom%C3%ADa/104913080 Bug: T185267 Change-Id: I156cce384873609a65b659360667323b8f0a497b --- M lib/ext/Cite/index.js M lib/utils/DOMUtils.js M tests/mocha/linter.js 3 files changed, 25 insertions(+), 0 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ext/Cite/index.js b/lib/ext/Cite/index.js index d2b27e4..25319e2 100644 --- a/lib/ext/Cite/index.js +++ b/lib/ext/Cite/index.js @@ -182,6 +182,10 @@ }; Ref.prototype.lintHandler = function(ref, env, tplInfo, domLinter) { + // Don't lint the content of ref in ref, since it can lead to cycles + // using named refs + if (DU.fromExtensionContent(ref, 'references')) { return ref.nextNode; } + var linkBackId = ref.firstChild.getAttribute('href').replace(/[^#]*#/, ''); var refNode = ref.ownerDocument.getElementById(linkBackId); if (refNode) { diff --git a/lib/utils/DOMUtils.js b/lib/utils/DOMUtils.js index abb1eb2..3b90142 100644 --- a/lib/utils/DOMUtils.js +++ b/lib/utils/DOMUtils.js @@ -2891,6 +2891,21 @@ } }; +/** + * Is the node from extension content? + */ +DOMUtils.fromExtensionContent = function(node, extType) { + var parentNode = node.parentNode; + var extReg = new RegExp('\\bmw:Extension\\/' + extType + '\\b'); + while (parentNode && !DU.atTheTop(parentNode)) { + if (extReg.test(parentNode.getAttribute('typeof'))) { + return true; + } + parentNode = parentNode.parentNode; + } + return false; +}; + if (typeof module === "object") { module.exports.DOMUtils = DOMUtils; } diff --git a/tests/mocha/linter.js b/tests/mocha/linter.js index 5b3b82f..4195f2a 100644 --- a/tests/mocha/linter.js +++ b/tests/mocha/linter.js @@ -945,5 +945,11 @@ result[1].templateInfo.should.have.a.property("name", "Template:1x"); }); }); + it('should not get into a cycle trying to lint ref in ref', function() { + return parseWT("{{#tag:ref||name='x'}}{{#tag:ref||name='y'}}") + .then(function() { + return parseWT("{{#tag:ref||name=x}}"); + }); + }); }); }); -- To view, visit https://gerrit.wikimedia.org/r/405821 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I156cce384873609a65b659360667323b8f0a497b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra Gerrit-Reviewer: C. Scott Ananian Gerrit-Reviewer: Sbailey Gerrit-Reviewer: Subramanya Sastry Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Disable undo/usurp within SurfaceSynchronizer
Divec has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405838 ) Change subject: Disable undo/usurp within SurfaceSynchronizer .. Disable undo/usurp within SurfaceSynchronizer Change-Id: Ic5dc470e444288ea41b2ed2a35fc82e078e3fe0b --- M src/dm/ve.dm.SurfaceSynchronizer.js 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/38/405838/1 diff --git a/src/dm/ve.dm.SurfaceSynchronizer.js b/src/dm/ve.dm.SurfaceSynchronizer.js index 0f51f1b..853c4b4 100644 --- a/src/dm/ve.dm.SurfaceSynchronizer.js +++ b/src/dm/ve.dm.SurfaceSynchronizer.js @@ -27,6 +27,10 @@ // Properties this.surface = surface; + // HACK disable undo/redo + this.surface.canUndo = this.surface.canRedo = function () { + return false; + }; this.doc = surface.documentModel; this.store = this.doc.getStore(); this.authorSelections = {}; @@ -45,7 +49,8 @@ this.socket.on( 'newChange', this.onNewChange.bind( this ) ); this.socket.on( 'nameChange', this.onNameChange.bind( this ) ); this.socket.on( 'authorDisconnect', this.onAuthorDisconnect.bind( this ) ); - this.tryUsurp(); + // TODO: unbreak then re-enable usurp + // this.tryUsurp(); // Events this.doc.connect( this, { -- To view, visit https://gerrit.wikimedia.org/r/405838 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic5dc470e444288ea41b2ed2a35fc82e078e3fe0b Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Divec ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update red background color when swiping to delete.
Dbrant has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405837 ) Change subject: Update red background color when swiping to delete. .. Update red background color when swiping to delete. Bug: T185539 Change-Id: Iab192bb0765fd1b076d6dc7e543e060e4cadd824 --- M app/src/main/java/org/wikipedia/views/SwipeableItemTouchHelperCallback.java 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/37/405837/1 diff --git a/app/src/main/java/org/wikipedia/views/SwipeableItemTouchHelperCallback.java b/app/src/main/java/org/wikipedia/views/SwipeableItemTouchHelperCallback.java index 4e586f5..9ddefa9 100644 --- a/app/src/main/java/org/wikipedia/views/SwipeableItemTouchHelperCallback.java +++ b/app/src/main/java/org/wikipedia/views/SwipeableItemTouchHelperCallback.java @@ -3,9 +3,9 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.Paint; import android.support.annotation.NonNull; +import android.support.v4.content.ContextCompat; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.helper.ItemTouchHelper; @@ -26,7 +26,7 @@ public SwipeableItemTouchHelperCallback(@NonNull Context context) { deleteBackgroundPaint.setStyle(Paint.Style.FILL); -deleteBackgroundPaint.setColor(Color.RED); +deleteBackgroundPaint.setColor(ContextCompat.getColor(context, R.color.red50)); itemBackgroundPaint.setStyle(Paint.Style.FILL); itemBackgroundPaint.setColor(ResourceUtil.getThemedColor(context, android.R.attr.windowBackground)); deleteIcon = ResourceUtil.bitmapFromVectorDrawable(context, R.drawable.ic_delete_white_24dp); -- To view, visit https://gerrit.wikimedia.org/r/405837 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iab192bb0765fd1b076d6dc7e543e060e4cadd824 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: rebaser: Fix sequencing of server operations
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405832 ) Change subject: rebaser: Fix sequencing of server operations .. rebaser: Fix sequencing of server operations pendingForDoc was not actually ever being populated. Fixing this sequencing resulted in the artificial delay (typically 5s) being applied to every event consecutively, which is not what we want (it's *very* slow), so make the delays run in parallel with waiting for the previous step (and its delay) to finish. Change-Id: Ia7a53600d2b0626f81f306aeb72cecbbe00fe7ac --- M rebaser/server.js 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Divec: Looks good to me, approved jenkins-bot: Verified diff --git a/rebaser/server.js b/rebaser/server.js index 1199912..2bf6280 100644 --- a/rebaser/server.js +++ b/rebaser/server.js @@ -83,7 +83,6 @@ function* onSubmitChange( context, data ) { var change, applied; - yield wait( artificialDelay ); change = ve.dm.Change.static.deserialize( data.change, null, true ); applied = yield rebaseServer.applyChange( context.docName, context.authorId, data.backtrack, change ); if ( !applied.isEmpty() ) { @@ -148,13 +147,14 @@ } function addStep( docName, generatorFunc ) { - var pending = Promise.resolve( pendingForDoc.get( docName ) ); - pending = pending + var pending = Promise.resolve( pendingForDoc.get( docName ) ), + delayPromise = wait( artificialDelay ); + pending = Promise.all( [ pending, delayPromise ] ) .then( function () { return ve.spawn( generatorFunc ); } ) .catch( logError ); - pendingForDoc.set( pending ); + pendingForDoc.set( docName, pending ); } handlers = { -- To view, visit https://gerrit.wikimedia.org/r/405832 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia7a53600d2b0626f81f306aeb72cecbbe00fe7ac Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope Gerrit-Reviewer: Divec Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix undo of list deletion.
Dbrant has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405836 ) Change subject: Fix undo of list deletion. .. Fix undo of list deletion. Bug: T185553 Change-Id: I6c9c3766591355a859325b5ebcf533511ed77afc --- M app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java 2 files changed, 12 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/36/405836/1 diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java index 9dbf0b2..56864c8 100644 --- a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java +++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java @@ -316,9 +316,13 @@ Snackbar snackbar = FeedbackUtil.makeSnackbar(getActivity(), message, FeedbackUtil.LENGTH_DEFAULT); snackbar.setAction(R.string.reading_list_item_delete_undo, v -> { -ReadingListDbHelper.instance().addPagesToList(readingList, pages, true); -readingList.pages().addAll(pages); -update(); +List newPages = new ArrayList<>(); +for (ReadingListPage page : pages) { +newPages.add(new ReadingListPage(ReadingListPage.toPageTitle(page))); +} +ReadingListDbHelper.instance().addPagesToList(readingList, newPages, true); +readingList.pages().addAll(newPages); +updateReadingListData(); }); snackbar.show(); } diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java index 77d2dcb..cb4a3e0 100644 --- a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java +++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java @@ -405,9 +405,12 @@ String.format(getString(R.string.reading_list_deleted), readingList.title()), FeedbackUtil.LENGTH_DEFAULT); snackbar.setAction(R.string.reading_list_item_delete_undo, v -> { - ReadingList newList = ReadingListDbHelper.instance().createList(readingList.title(), readingList.description()); -ReadingListDbHelper.instance().addPagesToList(newList, readingList.pages(), true); +List newPages = new ArrayList<>(); +for (ReadingListPage page : readingList.pages()) { +newPages.add(new ReadingListPage(ReadingListPage.toPageTitle(page))); +} +ReadingListDbHelper.instance().addPagesToList(newList, newPages, true); updateLists(); }); snackbar.show(); -- To view, visit https://gerrit.wikimedia.org/r/405836 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c9c3766591355a859325b5ebcf533511ed77afc Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: SurfaceSynchronizer: Also translate selections that are not ...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405833 ) Change subject: SurfaceSynchronizer: Also translate selections that are not mentioned in the change .. SurfaceSynchronizer: Also translate selections that are not mentioned in the change Otherwise, if a lot of content gets deleted, other authors' selections will become out of bounds. Change-Id: Ie1e1ac4385abf7bdf78b1f40c9394a001ae2f182 --- M src/dm/ve.dm.SurfaceSynchronizer.js 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Divec: Looks good to me, approved jenkins-bot: Verified diff --git a/src/dm/ve.dm.SurfaceSynchronizer.js b/src/dm/ve.dm.SurfaceSynchronizer.js index 651f952..0f51f1b 100644 --- a/src/dm/ve.dm.SurfaceSynchronizer.js +++ b/src/dm/ve.dm.SurfaceSynchronizer.js @@ -142,6 +142,9 @@ change.applyTo( this.surface ); // HACK: After applyTo(), the selections are wrong and applying them could crash. // The only reason this doesn't happen is because everything that tries to do that uses setTimeout(). + // Translate the selections that aren't going to be overwritten by change.selections + this.applyNewSelections( this.authorSelections, change ); + // Apply the overwrites from change.selections this.applyNewSelections( change.selections ); }; @@ -241,6 +244,7 @@ translatedSelection = newSelections[ authorId ]; } if ( !translatedSelection.equals( this.authorSelections[ authorId ] ) ) { + // This works correctly even if newSelections === this.authorSelections this.authorSelections[ authorId ] = translatedSelection; this.emit( 'authorSelect', authorId ); } -- To view, visit https://gerrit.wikimedia.org/r/405833 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie1e1ac4385abf7bdf78b1f40c9394a001ae2f182 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope Gerrit-Reviewer: Divec Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1105:3311
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405835 ) Change subject: db-eqiad.php: Depool db1105:3311 .. db-eqiad.php: Depool db1105:3311 Bug: T162807 Change-Id: I20556fb9b71743375d691f554d5166186187418d --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 09dae4e..c551619 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -112,7 +112,7 @@ 'db1083' => 500, # B1 3.6TB 512GB # 'db1089' => 500, # C3 3.6TB 512GB # T162807 'db1099:3311' => 1, # B2 3.6TB 512GB # rc, log: s1 and s8 - 'db1105:3311' => 1, # C3 3.6TB 512GB # rc, log: s1 and s2 + # 'db1105:3311' => 1, # C3 3.6TB 512GB # rc, log: s1 and s2 # T162807 ], 's2' => [ 'db1054' => 0, # A3 2.8TB 96GB, master @@ -261,23 +261,23 @@ 's1' => [ 'watchlist' => [ 'db1099:3311' => 1, - 'db1105:3311' => 1, + # 'db1105:3311' => 1, ], 'recentchanges' => [ 'db1099:3311' => 1, - 'db1105:3311' => 1, + # 'db1105:3311' => 1, ], 'recentchangeslinked' => [ 'db1099:3311' => 1, - 'db1105:3311' => 1, + # 'db1105:3311' => 1, ], 'contributions' => [ 'db1099:3311' => 1, - 'db1105:3311' => 1, + # 'db1105:3311' => 1, ], 'logpager' => [ 'db1099:3311' => 1, - 'db1105:3311' => 1, + # 'db1105:3311' => 1, ], 'dump' => [ 'db1065' => 1, -- To view, visit https://gerrit.wikimedia.org/r/405835 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I20556fb9b71743375d691f554d5166186187418d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1105:3311
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405835 ) Change subject: db-eqiad.php: Depool db1105:3311 .. db-eqiad.php: Depool db1105:3311 Bug: T162807 Change-Id: I20556fb9b71743375d691f554d5166186187418d --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/35/405835/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 09dae4e..c551619 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -112,7 +112,7 @@ 'db1083' => 500, # B1 3.6TB 512GB # 'db1089' => 500, # C3 3.6TB 512GB # T162807 'db1099:3311' => 1, # B2 3.6TB 512GB # rc, log: s1 and s8 - 'db1105:3311' => 1, # C3 3.6TB 512GB # rc, log: s1 and s2 + # 'db1105:3311' => 1, # C3 3.6TB 512GB # rc, log: s1 and s2 # T162807 ], 's2' => [ 'db1054' => 0, # A3 2.8TB 96GB, master @@ -261,23 +261,23 @@ 's1' => [ 'watchlist' => [ 'db1099:3311' => 1, - 'db1105:3311' => 1, + # 'db1105:3311' => 1, ], 'recentchanges' => [ 'db1099:3311' => 1, - 'db1105:3311' => 1, + # 'db1105:3311' => 1, ], 'recentchangeslinked' => [ 'db1099:3311' => 1, - 'db1105:3311' => 1, + # 'db1105:3311' => 1, ], 'contributions' => [ 'db1099:3311' => 1, - 'db1105:3311' => 1, + # 'db1105:3311' => 1, ], 'logpager' => [ 'db1099:3311' => 1, - 'db1105:3311' => 1, + # 'db1105:3311' => 1, ], 'dump' => [ 'db1065' => 1, -- To view, visit https://gerrit.wikimedia.org/r/405835 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I20556fb9b71743375d691f554d5166186187418d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix display of Default list title in numerous places.
Dbrant has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405834 ) Change subject: Fix display of Default list title in numerous places. .. Fix display of Default list title in numerous places. The replacement of the Default list's empty title with the "Saved" string should be done at the level of the ReadingList class itself. This will eliminate the need for any conditional logic anywhere else for determining whether to display the list title or the default "Saved" title. This also automatically fixes a number of places where we're incorrectly showing an empty string instead of the default list title. Change-Id: Ide69597f4041ded39331695d6dc6dcf5861f0e37 --- M app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java M app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java M app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java M app/src/main/java/org/wikipedia/readinglist/ReadingListTitleDialog.java M app/src/main/java/org/wikipedia/readinglist/database/ReadingList.java M app/src/main/java/org/wikipedia/readinglist/database/ReadingListTable.java M app/src/main/java/org/wikipedia/util/StringUtil.java 7 files changed, 28 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/34/405834/1 diff --git a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java index bd141da..6f891d5 100644 --- a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java +++ b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java @@ -215,7 +215,7 @@ private void addAndDismiss(final ReadingList readingList, final PageTitle title) { if (readingList.pages().size() >= Constants.MAX_READING_LIST_ARTICLE_LIMIT) { -String message = String.format(getString(R.string.reading_list_article_limit_message), readingList.isDefault() ? getString(R.string.default_reading_list_name) : readingList.title()); +String message = String.format(getString(R.string.reading_list_article_limit_message), readingList.title()); FeedbackUtil.makeSnackbar(getActivity(), message, FeedbackUtil.LENGTH_DEFAULT).show(); dismiss(); return; @@ -233,8 +233,7 @@ showViewListSnackBar(readingList, message); } else { -message = String.format(getString(R.string.reading_list_added_to_named), -readingList.isDefault() ? getString(R.string.default_reading_list_name) : readingList.title()); +message = String.format(getString(R.string.reading_list_added_to_named), readingList.title()); new ReadingListsFunnel(title.getWikiSite()).logAddToList(readingList, readingLists.size(), invokeSource); ReadingListDbHelper.instance().addPageToList(readingList, title, true); @@ -249,7 +248,7 @@ private void addAndDismiss(final ReadingList readingList, final List titles) { if ((readingList.pages().size() + titles.size()) > Constants.MAX_READING_LIST_ARTICLE_LIMIT) { -String message = String.format(getString(R.string.reading_list_article_limit_message), readingList.isDefault() ? getString(R.string.default_reading_list_name) : readingList.title()); +String message = String.format(getString(R.string.reading_list_article_limit_message), readingList.title()); FeedbackUtil.makeSnackbar(getActivity(), message, FeedbackUtil.LENGTH_DEFAULT).show(); dismiss(); return; @@ -271,7 +270,7 @@ message = getString(R.string.reading_list_already_contains_selection); } else { message = String.format(getString(R.string.reading_list_added_articles_list_titled), numAdded, -readingList.isDefault() ? getString(R.string.default_reading_list_name) : readingList.title()); +readingList.title()); new ReadingListsFunnel().logAddToList(readingList, readingLists.size(), invokeSource); } showViewListSnackBar(readingList, message); diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java index 9dbf0b2..e7a5599 100644 --- a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java +++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java @@ -234,7 +234,7 @@ ReadingList.sort(readingList, Prefs.getReadingListPageSortMode(ReadingList.SORT_BY_NAME_ASC)); setSearchQuery(currentSearchQuery); if (!articleLimitMessageShown && readingList.pages().size() >= Constants.MAX_READING_
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: SurfaceSynchronizer: Also translate selections that are not ...
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405833 ) Change subject: SurfaceSynchronizer: Also translate selections that are not mentioned in the change .. SurfaceSynchronizer: Also translate selections that are not mentioned in the change Otherwise, if a lot of content gets deleted, other authors' selections will become out of bounds. Change-Id: Ie1e1ac4385abf7bdf78b1f40c9394a001ae2f182 --- M src/dm/ve.dm.SurfaceSynchronizer.js 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/33/405833/1 diff --git a/src/dm/ve.dm.SurfaceSynchronizer.js b/src/dm/ve.dm.SurfaceSynchronizer.js index 651f952..0f51f1b 100644 --- a/src/dm/ve.dm.SurfaceSynchronizer.js +++ b/src/dm/ve.dm.SurfaceSynchronizer.js @@ -142,6 +142,9 @@ change.applyTo( this.surface ); // HACK: After applyTo(), the selections are wrong and applying them could crash. // The only reason this doesn't happen is because everything that tries to do that uses setTimeout(). + // Translate the selections that aren't going to be overwritten by change.selections + this.applyNewSelections( this.authorSelections, change ); + // Apply the overwrites from change.selections this.applyNewSelections( change.selections ); }; @@ -241,6 +244,7 @@ translatedSelection = newSelections[ authorId ]; } if ( !translatedSelection.equals( this.authorSelections[ authorId ] ) ) { + // This works correctly even if newSelections === this.authorSelections this.authorSelections[ authorId ] = translatedSelection; this.emit( 'authorSelect', authorId ); } -- To view, visit https://gerrit.wikimedia.org/r/405833 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1e1ac4385abf7bdf78b1f40c9394a001ae2f182 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: rebaser: Fix sequencing of server operations
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405832 ) Change subject: rebaser: Fix sequencing of server operations .. rebaser: Fix sequencing of server operations pendingForDoc was not actually ever being populated. Fixing this sequencing resulted in the artificial delay (typically 5s) being applied to every event consecutively, which is not what we want (it's *very* slow), so make the delays run in parallel with waiting for the previous step (and its delay) to finish. Change-Id: Ia7a53600d2b0626f81f306aeb72cecbbe00fe7ac --- M rebaser/server.js 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/32/405832/1 diff --git a/rebaser/server.js b/rebaser/server.js index 1199912..2bf6280 100644 --- a/rebaser/server.js +++ b/rebaser/server.js @@ -83,7 +83,6 @@ function* onSubmitChange( context, data ) { var change, applied; - yield wait( artificialDelay ); change = ve.dm.Change.static.deserialize( data.change, null, true ); applied = yield rebaseServer.applyChange( context.docName, context.authorId, data.backtrack, change ); if ( !applied.isEmpty() ) { @@ -148,13 +147,14 @@ } function addStep( docName, generatorFunc ) { - var pending = Promise.resolve( pendingForDoc.get( docName ) ); - pending = pending + var pending = Promise.resolve( pendingForDoc.get( docName ) ), + delayPromise = wait( artificialDelay ); + pending = Promise.all( [ pending, delayPromise ] ) .then( function () { return ve.spawn( generatorFunc ); } ) .catch( logError ); - pendingForDoc.set( pending ); + pendingForDoc.set( docName, pending ); } handlers = { -- To view, visit https://gerrit.wikimedia.org/r/405832 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia7a53600d2b0626f81f306aeb72cecbbe00fe7ac Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix searching of reading lists.
Dbrant has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405831 ) Change subject: Fix searching of reading lists. .. Fix searching of reading lists. The previous implementation of reading lists had searching implicitly built into the db query that fetched the lists. The current implementation doesn't do this, so we need to filter the lists at the UI level. This also improves searching by stripping accents, to allow compatibility matching of characters with/without accents and diacritics. Bug: T185495 Change-Id: I1f295d2c03e753fc3cf7e6dc9597d7b16d0e1d7d --- M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/31/405831/1 diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java index 77d2dcb..c59bff6 100644 --- a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java +++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java @@ -24,6 +24,7 @@ import com.squareup.otto.Subscribe; +import org.apache.commons.lang3.StringUtils; import org.wikipedia.Constants; import org.wikipedia.R; import org.wikipedia.WikipediaApp; @@ -198,7 +199,7 @@ return; } swipeRefreshLayout.setRefreshing(false); -readingLists = lists; +readingLists = applySearchQuery(searchQuery, lists); maybeShowListLimitMessage(); sortLists(); updateEmptyState(searchQuery); @@ -207,6 +208,22 @@ }); } +@NonNull +private List applySearchQuery(@Nullable String searchQuery, @NonNull List lists) { +List newList = new ArrayList<>(); +if (TextUtils.isEmpty(searchQuery)) { +newList.addAll(lists); +return newList; +} +String normalizedQuery = StringUtils.stripAccents(searchQuery).toLowerCase(); +for (ReadingList list : lists) { +if (StringUtils.stripAccents(list.title()).toLowerCase().contains(normalizedQuery)) { +newList.add(list); +} +} +return newList; +} + private void maybeShowListLimitMessage() { if (getUserVisibleHint() && readingLists.size() >= Constants.MAX_READING_LISTS_LIMIT) { String message = getString(R.string.reading_lists_limit_message); -- To view, visit https://gerrit.wikimedia.org/r/405831 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f295d2c03e753fc3cf7e6dc9597d7b16d0e1d7d Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: pywikibot.version.getversion: Display UNKNOWN status when th...
Dalba has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405750 ) Change subject: pywikibot.version.getversion: Display UNKNOWN status when there is no hash .. pywikibot.version.getversion: Display UNKNOWN status when there is no hash When the hash value is not found, it defaults to an empty string which should be differentiated from a valid hash value. This patch does not fully resolve T184692, it merely displays a more appropriate status. Bug: T184692 Change-Id: Icb0ef92dbc9e883c65510759dd0129fcf1b68b8d --- M pywikibot/version.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/version.py b/pywikibot/version.py index b76f2a6..956a2f0 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -78,7 +78,8 @@ try: hsh2 = getversion_onlinerepo() hsh1 = data['hsh'] -data['cmp_ver'] = 'OUTDATED' if hsh1 != hsh2 else 'ok' +data['cmp_ver'] = 'UNKNOWN' if not hsh1 else ( +'OUTDATED' if hsh1 != hsh2 else 'ok') except Exception: pass -- To view, visit https://gerrit.wikimedia.org/r/405750 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icb0ef92dbc9e883c65510759dd0129fcf1b68b8d Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba Gerrit-Reviewer: Dalba Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Xqt Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs/toollabs[master]: crontab: Remove -u parameter, and make uid < 500 always edit...
Zhuyifei1999 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405830 ) Change subject: crontab: Remove -u parameter, and make uid < 500 always edit local .. crontab: Remove -u parameter, and make uid < 500 always edit local Consensus seems that root should always edit local crontab, and for remotes they can always sudo first. `-u` should not be used, and, to support puppet's use of that parameter, the uid check is moved to before argparse so as not to raise an unrecognized argument error. Bug: T179386 Change-Id: Ifb19c556868416889d2856633650d24205f4a71a --- M debian/changelog M misctools/oge-crontab 2 files changed, 19 insertions(+), 25 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/30/405830/1 diff --git a/debian/changelog b/debian/changelog index e5d4707..ee0206c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +toollabs (1.29) unstable; urgency=medium + + * crontab: Remove -u parameter, and make uid < 500 always edit local + + -- YiFei Zhu Tue, 23 Jan 2018 02:10:57 + + toollabs (1.28) unstable; urgency=medium * crontab: Make the input file is binary when it is sys.stdin diff --git a/misctools/oge-crontab b/misctools/oge-crontab index b8859db..0ccbc2c 100644 --- a/misctools/oge-crontab +++ b/misctools/oge-crontab @@ -74,15 +74,12 @@ class Crontab(object): -def __init__(self, pw, cron_host): -self.pw = pw +def __init__(self, cron_host): self.cron_host = cron_host def _remote(self, *args, stdin=None): """Execute remote crontab command and return stdout.""" cmd = ['/usr/bin/ssh', self.cron_host, '/usr/bin/crontab'] + list(args) -if self.pw.pw_uid != os.getuid(): -cmd += ['-u', self.pw.pw_name] ssh = subprocess.Popen( cmd, @@ -228,8 +225,18 @@ def main(): +# This part has to come first. Puppet calls crontab with `-u` which +# would be an unrecognized parameter. T179386 +pw = pwd.getpwuid(os.getuid()) +if pw.pw_uid < 500: +# If the target user is not managed in LDAP and thus likely +# a system user, invoke the original crontab instead. +os.execv('/usr/bin/crontab', sys.argv) +elif pw.pw_uid < 4: +err('only tools are allowed crontabs') +sys.exit(1) + parser = argparse.ArgumentParser() -parser.add_argument('-u', dest='user', help=argparse.SUPPRESS) group = parser.add_mutually_exclusive_group() group.add_argument( 'file', default=sys.stdin.buffer, nargs='?', @@ -258,30 +265,11 @@ if args.i and args.operation != 'r': parser.error('argument -i: only applicable with -r') -if args.user: -if os.getuid(): -parser.error('argument -u: must be privileged') -try: -pw = pwd.getpwnam(args.user) -except KeyError: -parser.error('argument -u: unknown user "{}"'.format(args.user)) -else: -pw = pwd.getpwuid(os.getuid()) - -if pw.pw_uid < 500: -# If the target user is not managed in LDAP and thus likely -# a system user, invoke the original crontab instead. -os.execv('/usr/bin/crontab', sys.argv) - -if pw.pw_uid < 4 and os.getuid(): -err('only tools are allowed crontabs') -sys.exit(1) - with open('/etc/toollabs-cronhost', 'r') as f: cron_host = f.read().strip() try: -crontab = Crontab(pw, cron_host) +crontab = Crontab(cron_host) if args.operation is None: # Replace -- To view, visit https://gerrit.wikimedia.org/r/405830 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb19c556868416889d2856633650d24205f4a71a Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Zhuyifei1999 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Fix multiple PHP class declarations in one file in tests
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405718 ) Change subject: Fix multiple PHP class declarations in one file in tests .. Fix multiple PHP class declarations in one file in tests All files containing more than one PHP class were split into multiple files. extension.json was updated to match new class locations. phpcs `OneObjectStructurePerFile.MultipleFound` rule was re-enabled. Bug: T177809 Change-Id: I6fc2ec9cc35e6bac5a7c44d94b0f1b1b40e6dba5 --- M .phpcs.xml M extension.json M tests/phpunit/mapper/AbstractMapperTest.php A tests/phpunit/mapper/EchoAbstractMapperStub.php A tests/phpunit/mapper/EchoExecuteFirstArgumentStub.php M tests/phpunit/mapper/NotificationMapperTest.php 6 files changed, 31 insertions(+), 30 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/.phpcs.xml b/.phpcs.xml index 0df77d8..b7fd44c 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -3,7 +3,6 @@ . - diff --git a/extension.json b/extension.json index 088b764..76c3493 100644 --- a/extension.json +++ b/extension.json @@ -919,7 +919,7 @@ "ContainmentSetTest": "tests/phpunit/ContainmentSetTest.php", "EchoAbstractEntity": "includes/model/AbstractEntity.php", "EchoAbstractMapper": "includes/mapper/AbstractMapper.php", - "EchoAbstractMapperStub": "tests/phpunit/mapper/AbstractMapperTest.php", + "EchoAbstractMapperStub": "tests/phpunit/mapper/EchoAbstractMapperStub.php", "EchoAbstractMapperTest": "tests/phpunit/mapper/AbstractMapperTest.php", "EchoArrayList": "includes/EchoArrayList.php", "EchoAttributeManager": "includes/AttributeManager.php", @@ -948,7 +948,7 @@ "EchoEventMapper": "includes/mapper/EventMapper.php", "EchoEventMapperTest": "tests/phpunit/mapper/EventMapperTest.php", "EchoEventPresentationModel": "includes/formatters/EventPresentationModel.php", - "EchoExecuteFirstArgumentStub": "tests/phpunit/mapper/NotificationMapperTest.php", + "EchoExecuteFirstArgumentStub": "tests/phpunit/mapper/EchoExecuteFirstArgumentStub.php", "EchoFilteredSequentialIterator": "includes/iterator/FilteredSequentialIterator.php", "EchoFlyoutFormatter": "includes/formatters/EchoFlyoutFormatter.php", "EchoForeignNotifications": "includes/ForeignNotifications.php", diff --git a/tests/phpunit/mapper/AbstractMapperTest.php b/tests/phpunit/mapper/AbstractMapperTest.php index 5c3a582..1d97789 100644 --- a/tests/phpunit/mapper/AbstractMapperTest.php +++ b/tests/phpunit/mapper/AbstractMapperTest.php @@ -65,13 +65,3 @@ } } - -/** - * Create a stub class for testing the abstract class - */ -class EchoAbstractMapperStub extends EchoAbstractMapper { - - public function testMethod() { - } - -} diff --git a/tests/phpunit/mapper/EchoAbstractMapperStub.php b/tests/phpunit/mapper/EchoAbstractMapperStub.php new file mode 100644 index 000..359e97f --- /dev/null +++ b/tests/phpunit/mapper/EchoAbstractMapperStub.php @@ -0,0 +1,11 @@ +arguments ) { + throw new PHPUnit_Framework_Exception( 'Method call must have an argument' ); + } + + return call_user_func( reset( $invocation->arguments ) ); + } + + public function toString() { + return 'return result of call_user_func on first invocation argument'; + } +} diff --git a/tests/phpunit/mapper/NotificationMapperTest.php b/tests/phpunit/mapper/NotificationMapperTest.php index 024d817..68cca03 100644 --- a/tests/phpunit/mapper/NotificationMapperTest.php +++ b/tests/phpunit/mapper/NotificationMapperTest.php @@ -250,20 +250,3 @@ } } - -class EchoExecuteFirstArgumentStub implements PHPUnit_Framework_MockObject_Stub { - public function invoke( PHPUnit_Framework_MockObject_Invocation $invocation ) { - if ( !$invocation instanceof PHPUnit_Framework_MockObject_Invocation_Static ) { - throw new PHPUnit_Framework_Exception( 'wrong invocation type' ); - } - if ( !$invocation->arguments ) { - throw new PHPUnit_Framework_Exception( 'Method call must have an argument' ); - } - - return call_user_func( reset( $invocation->arguments ) ); - } - - public function toString() { - return 'return result of call_user_func on first invocation argument'; - } -} -- To view, visit https://gerrit.wikimedia.org/r/405718 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6fc2ec9cc35e6bac5a7c44d94b0f1b1b
[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Don't hide notification popup when scrolling
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405816 ) Change subject: Don't hide notification popup when scrolling .. Don't hide notification popup when scrolling hideWhenOutOfView is for preventing popups from appearing outside their container, but in this case the container is the document, so it is already clipped. Bug: T178384 Change-Id: Ie0cd83849446cf74b61e708f0a1fa79f2384a94a --- M modules/ui/mw.echo.ui.NotificationBadgeWidget.js 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js index ce7956d..de02adc 100644 --- a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js +++ b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js @@ -130,6 +130,7 @@ $content: this.notificationsWidget.$element, $footer: $footer, width: config.popupWidth || 500, + hideWhenOutOfView: false, autoFlip: false, autoClose: true, containerPadding: 20, -- To view, visit https://gerrit.wikimedia.org/r/405816 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie0cd83849446cf74b61e708f0a1fa79f2384a94a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Esanders Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Catrope Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Disable php55lint on ZppixBot repo
MacFan4000 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405828 ) Change subject: Disable php55lint on ZppixBot repo .. Disable php55lint on ZppixBot repo The code in that repo is no longer in php, it’s now html. (I have commit access.) Change-Id: If5b16d6d6e3122e7c7957d2ca4a4cf8825b11505 --- M zuul/layout.yaml 1 file changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/28/405828/2 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 3f56ec8..3803461 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1800,14 +1800,6 @@ - name: npm-docker - name: tox-docker - - name: labs/tools/ZppixBot -check: - - labs-tools-ZppixBot-php55lint -test: - - labs-tools-ZppixBot-php55lint -gate-and-submit: - - labs-tools-ZppixBot-php55lint - - name: labs/tools/Wikimedia-Emoji-Bot template: - name: archived -- To view, visit https://gerrit.wikimedia.org/r/405828 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If5b16d6d6e3122e7c7957d2ca4a4cf8825b11505 Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: MacFan4000 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Revert "Workaround missing child selector in OOUI for menuLa...
Hello Esanders, jenkins-bot, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/405829 to review the following change. Change subject: Revert "Workaround missing child selector in OOUI for menuLayout" .. Revert "Workaround missing child selector in OOUI for menuLayout" This reverts commit fb4e894b61acc8f55c4d1af91a77c16444d9d87c. Bug: T185544 Change-Id: If084901a4d50dedba8a6bf885d8b39cb55f89ba2 --- M src/ui/styles/ve.ui.Surface.css 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/29/405829/1 diff --git a/src/ui/styles/ve.ui.Surface.css b/src/ui/styles/ve.ui.Surface.css index 10a7129..1d2aa2d 100644 --- a/src/ui/styles/ve.ui.Surface.css +++ b/src/ui/styles/ve.ui.Surface.css @@ -42,9 +42,3 @@ word-wrap: break-word; white-space: pre-wrap; } - -/* HACK: Fix missing child selector in OOUI (T185544) */ -.oo-ui-menuLayout-expanded .oo-ui-menuLayout:not( .oo-ui-menuLayout-expanded ) .oo-ui-menuLayout-content, -.oo-ui-menuLayout-expanded .oo-ui-menuLayout:not( .oo-ui-menuLayout-expanded ) .oo-ui-menuLayout-menu { - position: static; -} -- To view, visit https://gerrit.wikimedia.org/r/405829 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If084901a4d50dedba8a6bf885d8b39cb55f89ba2 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński Gerrit-Reviewer: Esanders Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Create ve.EventEmitter with emitCatch, and use it throughout...
Divec has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405827 ) Change subject: Create ve.EventEmitter with emitCatch, and use it throughout ve.dm .. Create ve.EventEmitter with emitCatch, and use it throughout ve.dm Bug: T185546 Change-Id: I3175a9e985d4ecffa282d9078352523bfbdf4982 --- M .jsduck/categories.json M build/modules.json M demos/ve/desktop.html M demos/ve/mobile.html M src/dm/nodes/ve.dm.TableNode.js M src/dm/nodes/ve.dm.TableRowNode.js M src/dm/nodes/ve.dm.TableSectionNode.js M src/dm/ve.dm.APIResultsProvider.js M src/dm/ve.dm.APIResultsQueue.js M src/dm/ve.dm.Document.js M src/dm/ve.dm.InternalList.js M src/dm/ve.dm.MetaItem.js M src/dm/ve.dm.MetaList.js M src/dm/ve.dm.Node.js M src/dm/ve.dm.Scalable.js M src/dm/ve.dm.Surface.js M src/dm/ve.dm.SurfaceSynchronizer.js M src/dm/ve.dm.TableMatrix.js M src/ve.Document.js A src/ve.EventEmitter.js M tests/index.html 21 files changed, 126 insertions(+), 81 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/27/405827/1 diff --git a/.jsduck/categories.json b/.jsduck/categories.json index a7b1fbe..bafa206 100644 --- a/.jsduck/categories.json +++ b/.jsduck/categories.json @@ -9,6 +9,7 @@ "ve.Range", "ve.PositionStep", "ve.SelectionState", + "ve.EventEmitter", "ve.EventSequencer", "ve.Filibuster", "ve.TriggerListener", diff --git a/build/modules.json b/build/modules.json index d808fa1..7ce11c2 100644 --- a/build/modules.json +++ b/build/modules.json @@ -249,6 +249,7 @@ }, "visualEditor.core.build": { "scripts": [ + "src/ve.EventEmitter.js", "src/ve.Range.js", "src/ve.SelectionState.js", "src/ve.Node.js", diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html index f8dc64e..94cbd41 100644 --- a/demos/ve/desktop.html +++ b/demos/ve/desktop.html @@ -190,6 +190,7 @@ + diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html index b5e6346..88aa00d 100644 --- a/demos/ve/mobile.html +++ b/demos/ve/mobile.html @@ -190,6 +190,7 @@ + diff --git a/src/dm/nodes/ve.dm.TableNode.js b/src/dm/nodes/ve.dm.TableNode.js index 64caa96..8a7ce63 100644 --- a/src/dm/nodes/ve.dm.TableNode.js +++ b/src/dm/nodes/ve.dm.TableNode.js @@ -65,7 +65,7 @@ * @fires cellAttributeChange */ ve.dm.TableNode.prototype.onCellAttributeChange = function ( cell ) { - this.emit( 'cellAttributeChange', cell ); + this.emitCatch( 'cellAttributeChange', cell ); }; /** @@ -113,14 +113,14 @@ * e.g., providing consecutive row indexes. * * @class - * @mixins OO.EventEmitter + * @mixins ve.EventEmitter * * @constructor * @param {ve.dm.TableNode} tableNode Table node to iterate through */ ve.dm.TableNodeCellIterator = function VeDmTableNodeCellIterator( tableNode ) { // Mixin constructors - OO.EventEmitter.call( this ); + ve.EventEmitter.call( this ); this.table = tableNode; @@ -141,7 +141,7 @@ /* Inheritance */ -OO.mixinClass( ve.dm.TableNodeCellIterator, OO.EventEmitter ); +OO.mixinClass( ve.dm.TableNodeCellIterator, ve.EventEmitter ); /* Events */ @@ -200,7 +200,7 @@ if ( sectionNode instanceof ve.dm.TableSectionNode ) { this.sectionNode = sectionNode; this.rowCount = this.sectionNode.children.length; - this.emit( 'newSection', this.sectionNode ); + this.emitCatch( 'newSection', this.sectionNode ); } else { this.nextSection(); return; @@ -229,7 +229,7 @@ if ( rowNode instanceof ve.dm.TableRowNode ) { this.rowNode = rowNode; this.cellCount = this.rowNode.children.length; - this.emit( 'newRow', this.rowNode ); + this.emitCatch( 'newRow', this.rowNode ); } else { this.nextRow(); return; diff --git a/src/dm/nodes/ve.dm.TableRowNode.js b/src/dm/nodes/ve.dm.TableRowNode.js index 6245b3a..758f582 100644 --- a/src/dm/nodes/ve.dm.TableRowNode.js +++ b/src/dm/nodes/ve.dm.TableRowNode.js @@ -92,7 +92,7 @@ * @fires cellAttributeChange */ ve.dm.TableRowNode.prototype.onCellAttributeChange = function ( cell ) { - this.emit( 'cellAttributeChange', cell ); + this.emitCatch( 'cellAttributeChange', cell ); }; /* Registration */ diff --git a/src/dm/nodes/ve.dm.TableSectionN
[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Enable to set up starting point in the Database.
Smalyshev has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405826 ) Change subject: Enable to set up starting point in the Database. .. Enable to set up starting point in the Database. Bug: T182394 Change-Id: I0155ee8ac7cb0d1399160937d57f5fcf2fcee794 --- M tools/src/main/java/org/wikidata/query/rdf/tool/Update.java M tools/src/main/java/org/wikidata/query/rdf/tool/options/UpdateOptions.java 2 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf refs/changes/26/405826/1 diff --git a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java index 5d768ac..48ae9df 100644 --- a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java +++ b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java @@ -128,7 +128,7 @@ * @return null if non can be built - its ok to just exit - errors have been * logged to the user */ -@SuppressWarnings("checkstyle:cyclomaticcomplexity") +@SuppressWarnings({"checkstyle:cyclomaticcomplexity", "checkstyle:npathcomplexity"}) private static Change.Source buildChangeSource(UpdateOptions options, RdfRepository rdfRepository, WikibaseRepository wikibaseRepository) { if (options.idrange() != null) { @@ -176,6 +176,10 @@ throw new IllegalArgumentException("Invalid date: " + options.start(), e2); } } +if (options.init()) { +// Initialize left off time to start time +rdfRepository.updateLeftOffTime(new Date(startTime)); +} } else { log.info("Checking where we left off"); Date leftOff = rdfRepository.fetchLeftOffTime(); diff --git a/tools/src/main/java/org/wikidata/query/rdf/tool/options/UpdateOptions.java b/tools/src/main/java/org/wikidata/query/rdf/tool/options/UpdateOptions.java index 2b126f1..b667e3a 100644 --- a/tools/src/main/java/org/wikidata/query/rdf/tool/options/UpdateOptions.java +++ b/tools/src/main/java/org/wikidata/query/rdf/tool/options/UpdateOptions.java @@ -15,6 +15,9 @@ @Option(shortName = "s", defaultToNull = true, description = "Start time in 2015-02-11T17:11:08Z or 20150211170100 format.") String start(); +@Option(shortName = "I", longName = "init", description = "Initialize last update time to start time") +boolean init(); + @Option(defaultToNull = true, description = "If specified must be or list of , comma or space separated.") List ids(); -- To view, visit https://gerrit.wikimedia.org/r/405826 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0155ee8ac7cb0d1399160937d57f5fcf2fcee794 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: Smalyshev ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Prefix icons in Minerva
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/403085 ) Change subject: Prefix icons in Minerva .. Prefix icons in Minerva Changes: * MinervaUI will now prefix any icons with `minerva` * Update definitions in skin.json, retaining selectors for cached HTML for icons that are rendered via PHP. * In I9021c53c2c04bdd7ce395eed33d89986acbfea6d watch and watched and arrow are moved to MobileFrontend so are removed from the RL module skins.minerva.icons.images.scripts as they are not used directly in this repo. user and anonymous are no longer used so also removed. * Presentation of userpage now belongs to MobileFrontend. Icons are styles were moved there in depends on. They are retained in skin.json to support cached HTML as user pages are subject to cache. They can be removed in a week. * In code review we noticed the anonymous icon was badly named. We rename to login. No caching implications. * Main menu icons are now prefixed with minerva rather than mf to reflect where they come from. Depends-On: I9021c53c2c04bdd7ce395eed33d89986acbfea6d Bug: T182162 Change-Id: I93264024f4915fc910c792b1905b89cdc6b8b546 --- M includes/MinervaUI.php M includes/skins/MinervaTemplate.php M includes/skins/SkinMinerva.php M includes/skins/minerva.mustache M includes/skins/user_page_links.mustache M resources/skins.minerva.editor/init.js D resources/skins.minerva.icons.images.scripts/watch.svg D resources/skins.minerva.icons.images.scripts/watched.svg R resources/skins.minerva.mainMenu.icons/login.svg M resources/skins.minerva.notifications.badge/NotificationBadge.js M resources/skins.minerva.scripts/DownloadIcon.js M resources/skins.minerva.userpage.styles/userpage.less M skin.json 13 files changed, 52 insertions(+), 38 deletions(-) Approvals: Pmiazga: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/MinervaUI.php b/includes/MinervaUI.php index d800514..07fa2c4 100644 --- a/includes/MinervaUI.php +++ b/includes/MinervaUI.php @@ -16,13 +16,16 @@ * @param string $iconType element or before * @param string $additionalClassNames additional class names you want to associate * with the iconed element +* @param string $glyphPrefix optional prefix for icons. Defaults to minerva. * @return string class name for use with HTML element */ - public static function iconClass( $iconName, $iconType = 'element', $additionalClassNames = '' ) { + public static function iconClass( $iconName, $iconType = 'element', $additionalClassNames = '', + $glyphPrefix = 'minerva' + ) { $base = 'mw-ui-icon'; $modifiers = 'mw-ui-icon-' . $iconType; if ( $iconName ) { - $modifiers .= ' mw-ui-icon-' . $iconName; + $modifiers .= ' mw-ui-icon-' . $glyphPrefix . '-' . $iconName; } return $base . ' ' . $modifiers . ' ' . $additionalClassNames; } diff --git a/includes/skins/MinervaTemplate.php b/includes/skins/MinervaTemplate.php index 7726d05..268ae0c 100644 --- a/includes/skins/MinervaTemplate.php +++ b/includes/skins/MinervaTemplate.php @@ -110,7 +110,15 @@ $args = [ 'clockIconClass' => MinervaUI::iconClass( 'clock-gray', 'before' ), 'arrowIconClass' => MinervaUI::iconClass( - 'arrow-gray', 'element', 'mw-ui-icon-small mf-mw-ui-icon-rotate-anti-clockwise indicator' ), + 'arrow-gray', 'element', 'mw-ui-icon-small mf-mw-ui-icon-rotate-anti-clockwise indicator', + // Uses icon in MobileFrontend so must be prefixed mf. + // Without MobileFrontend it will not render. + // Rather than maintain 2 versions (and variants) of the arrow icon which can conflict + // with each othe and bloat CSS, we'll + // use the MobileFrontend one. Long term when T177432 and T160690 are resolved + // we should be able to use one icon definition and break this dependency. + 'mf' +), ] + $data['historyLink']; $templateParser = new TemplateParser( __DIR__ ); return $templateParser->processTemplate( 'history', $args ); diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index cfc9ee5..e99e5be 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -468,7 +468,7 @@ ->addComponent( $this->msg( 'mo
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Always load user styles on mobile user pages
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405824 ) Change subject: Always load user styles on mobile user pages .. Always load user styles on mobile user pages Previously the styles were only loaded if the user existed and they had no user page. While we want to do this for the content we don't want to do this for styles. Bug: T182162 Change-Id: I6e474562ba5f2c704364c9d7b49f982f7bab8a18 --- M includes/MobileFrontend.body.php 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: Pmiazga: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/MobileFrontend.body.php b/includes/MobileFrontend.body.php index 29a4549..82de6e2 100644 --- a/includes/MobileFrontend.body.php +++ b/includes/MobileFrontend.body.php @@ -66,14 +66,15 @@ // on whether the user is the owner of the page or not. if ( $title->inNamespace( NS_USER ) && !$title->isSubpage() ) { $pageUserId = User::idFromName( $title->getText() ); + + $out->addModuleStyles( [ + 'mediawiki.ui.icon', + 'mobile.userpage.styles', 'mobile.userpage.icons' + ] ); if ( $pageUserId && !$title->exists() ) { $pageUser = User::newFromId( $pageUserId ); $contentHtml = self::getUserPageContent( $out, $pageUser ); - $out->addModuleStyles( [ - 'mediawiki.ui.icon', - 'mobile.userpage.styles', 'mobile.userpage.icons' - ] ); } } -- To view, visit https://gerrit.wikimedia.org/r/405824 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6e474562ba5f2c704364c9d7b49f982f7bab8a18 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson Gerrit-Reviewer: Pmiazga Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Add timeout to Wikibase requests
Smalyshev has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405825 ) Change subject: Add timeout to Wikibase requests .. Add timeout to Wikibase requests Bug: T179239 Change-Id: Ib027a457a10a268ed365b11390cf03308bcb7b84 --- M tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java 1 file changed, 25 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf refs/changes/25/405825/1 diff --git a/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java b/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java index b7d3e16..b05dd51 100644 --- a/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java +++ b/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java @@ -30,6 +30,7 @@ import org.apache.http.NameValuePair; import org.apache.http.client.HttpRequestRetryHandler; import org.apache.http.client.ServiceUnavailableRetryStrategy; +import org.apache.http.client.config.RequestConfig; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; @@ -78,6 +79,14 @@ public class WikibaseRepository implements Closeable { private static final Logger log = LoggerFactory.getLogger(WikibaseRepository.class); +/** + * Timeout for communications to Wikidata, in ms. + */ +private static final String TIMEOUT_MILLIS = "5000"; +/** + * Request timeout property. + */ +public static final String TIMEOUT_PROPERTY = WikibaseRepository.class + ".timeout"; /** * How many retries allowed on error. */ @@ -236,8 +245,10 @@ throws RetryableException { URI uri = uris.recentChanges(nextStartTime, lastContinue, batchSize); log.debug("Polling for changes from {}", uri); +HttpGet request = new HttpGet(uri); +request.setConfig(getRequestConfig()); try { -return checkApi(getJson(new HttpGet(uri), RecentChangeResponse.class)); +return checkApi(getJson(request, RecentChangeResponse.class)); } catch (UnknownHostException | SocketException e) { // We want to bail on this, since it happens to be sticky for some reason throw new RuntimeException(e); @@ -247,6 +258,18 @@ } catch (IOException e) { throw new RetryableException("Error fetching recent changes", e); } +} + +/** + * Get request configuration. + * @return request configuration + */ +private RequestConfig getRequestConfig() { +int timeout = Integer.parseInt(System.getProperty(TIMEOUT_PROPERTY, TIMEOUT_MILLIS)); +return RequestConfig.custom() +.setSocketTimeout(timeout) +.setConnectTimeout(timeout) +.setConnectionRequestTimeout(timeout).build(); } /** @@ -264,6 +287,7 @@ StatementCollector collector = new StatementCollector(); parser.setRDFHandler(new NormalizingRdfHandler(collector)); HttpGet request = new HttpGet(uri); +request.setConfig(getRequestConfig()); try { try (CloseableHttpResponse response = client.execute(request)) { if (response.getStatusLine().getStatusCode() == 404) { -- To view, visit https://gerrit.wikimedia.org/r/405825 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib027a457a10a268ed365b11390cf03308bcb7b84 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: Smalyshev ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Use child selectors for menuLayout
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405815 ) Change subject: Use child selectors for menuLayout .. Use child selectors for menuLayout Prevents broken layouts when menus are nested. Bug: T185544 Change-Id: I1795fcefeac22d728aa7a716f7e23f87fff1bef0 --- M src/styles/layouts/IndexLayout.less M src/styles/layouts/MenuLayout.less 2 files changed, 13 insertions(+), 12 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/src/styles/layouts/IndexLayout.less b/src/styles/layouts/IndexLayout.less index d791499..9d905d0 100644 --- a/src/styles/layouts/IndexLayout.less +++ b/src/styles/layouts/IndexLayout.less @@ -1,19 +1,20 @@ @import '../common'; .oo-ui-indexLayout { - > .oo-ui-menuLayout-menu { + /* Use two classes to ensure increased specificity over menuLayout */ + &.oo-ui-menuLayout > .oo-ui-menuLayout-menu { height: auto; } &.oo-ui-menuLayout-expanded { - > .oo-ui-menuLayout-menu { + &.oo-ui-menuLayout > .oo-ui-menuLayout-menu { height: 3em; // Because the height is hardcoded, we have to disallow wrapping of the tabs, // as they would overlap the content. They'll scroll horizontally instead. white-space: nowrap; } - > .oo-ui-menuLayout-content { + &.oo-ui-menuLayout > .oo-ui-menuLayout-content { top: 3em; } } diff --git a/src/styles/layouts/MenuLayout.less b/src/styles/layouts/MenuLayout.less index 474d0d0..19270af 100644 --- a/src/styles/layouts/MenuLayout.less +++ b/src/styles/layouts/MenuLayout.less @@ -7,14 +7,14 @@ bottom: 0; &-expanded, - &-expanded .oo-ui-menuLayout-menu, - &-expanded .oo-ui-menuLayout-content { + &-expanded > .oo-ui-menuLayout-menu, + &-expanded > .oo-ui-menuLayout-content { position: absolute; } // If anything overflows out of the menu, display it on top of the content, // as it's probably some important interactive widget. - &-expanded .oo-ui-menuLayout-menu { + &-expanded > .oo-ui-menuLayout-menu { z-index: 1; } @@ -24,27 +24,27 @@ display: table; width: 100%; - .oo-ui-menuLayout-menu, - .oo-ui-menuLayout-content { + > .oo-ui-menuLayout-menu, + > .oo-ui-menuLayout-content { display: table-cell; vertical-align: top; } } } - &-menu, - &-content { + > .oo-ui-menuLayout-menu, + > .oo-ui-menuLayout-content { .oo-ui-transition( all 200ms ease ); } // These are overridden with 'auto' or '0' later - &-menu { + > .oo-ui-menuLayout-menu { height: 18em; width: 18em; } // These are overridden with 'auto' or '0' later - &-content { + > .oo-ui-menuLayout-content { top: 18em; left: 18em; right: 18em; -- To view, visit https://gerrit.wikimedia.org/r/405815 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1795fcefeac22d728aa7a716f7e23f87fff1bef0 Gerrit-PatchSet: 2 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Esanders Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Always load user styles on mobile user pages
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405824 ) Change subject: Always load user styles on mobile user pages .. Always load user styles on mobile user pages Previously the styles were only loaded if the user existed and they had no user page. While we want to do this for the content we don't want to do this for styles. Bug: T182162 Change-Id: I6e474562ba5f2c704364c9d7b49f982f7bab8a18 --- M includes/MobileFrontend.body.php 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/24/405824/1 diff --git a/includes/MobileFrontend.body.php b/includes/MobileFrontend.body.php index 29a4549..82de6e2 100644 --- a/includes/MobileFrontend.body.php +++ b/includes/MobileFrontend.body.php @@ -66,14 +66,15 @@ // on whether the user is the owner of the page or not. if ( $title->inNamespace( NS_USER ) && !$title->isSubpage() ) { $pageUserId = User::idFromName( $title->getText() ); + + $out->addModuleStyles( [ + 'mediawiki.ui.icon', + 'mobile.userpage.styles', 'mobile.userpage.icons' + ] ); if ( $pageUserId && !$title->exists() ) { $pageUser = User::newFromId( $pageUserId ); $contentHtml = self::getUserPageContent( $out, $pageUser ); - $out->addModuleStyles( [ - 'mediawiki.ui.icon', - 'mobile.userpage.styles', 'mobile.userpage.icons' - ] ); } } -- To view, visit https://gerrit.wikimedia.org/r/405824 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e474562ba5f2c704364c9d7b49f982f7bab8a18 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix crasher from rendering self-closed html pre tags
Arlolra has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405823 ) Change subject: Fix crasher from rendering self-closed html pre tags .. Fix crasher from rendering self-closed html pre tags For example, http://localhost:8000/fr.wikipedia.org/v3/page/html/Utilisateur%3ADepil/125767760 Bug: T185385 Change-Id: I6c2211c0cffb9f899d4efb390649e72729e0f705 --- M lib/ext/Pre/index.js M tests/parserTests.txt 2 files changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/23/405823/1 diff --git a/lib/ext/Pre/index.js b/lib/ext/Pre/index.js index 1e34ad8..50b8b84 100644 --- a/lib/ext/Pre/index.js +++ b/lib/ext/Pre/index.js @@ -45,7 +45,7 @@ stx: 'html', }); - var txt = argDict.body.extsrc; + var txt = argDict.body && argDict.body.extsrc || ''; // Support nowikis in pre. Do this before stripping newlines, see test, // " with inside (compatibility with 1.6 and earlier)" diff --git a/tests/parserTests.txt b/tests/parserTests.txt index c1b893c..fd05393 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -2723,6 +2723,17 @@ !! end !! test +Self-closed pre +!! wikitext + +!! html/php + + +!! html/parsoid + +!! end + +!! test Parsoid: Don't paragraph-wrap fosterable content even if table syntax is unbalanced !! options parsoid=wt2html -- To view, visit https://gerrit.wikimedia.org/r/405823 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c2211c0cffb9f899d4efb390649e72729e0f705 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Cite[master]: Remove metadata from unit tests
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405810 ) Change subject: Remove metadata from unit tests .. Remove metadata from unit tests Metadata is being removed from VE. Change-Id: Icc614ed7a9792b7d9475d7a804bb8eea48424043 --- M modules/ve-cite/tests/ve.dm.Transaction.test.js M modules/ve-cite/tests/ve.dm.citeExample.js 2 files changed, 2 insertions(+), 110 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/modules/ve-cite/tests/ve.dm.Transaction.test.js b/modules/ve-cite/tests/ve.dm.Transaction.test.js index 57032a6..18f0486 100644 --- a/modules/ve-cite/tests/ve.dm.Transaction.test.js +++ b/modules/ve-cite/tests/ve.dm.Transaction.test.js @@ -11,7 +11,6 @@ QUnit.test( 'newFromDocumentInsertion with references', function ( assert ) { var i, j, doc2, tx, actualStoreItems, expectedStoreItems, removalOps, doc, complexDoc = ve.dm.citeExample.createExampleDocument( 'complexInternalData' ), - comment = { type: 'alienMeta', originalDomElements: $( '' ).toArray() }, withReference = [ { type: 'paragraph' }, 'B', 'a', 'r', @@ -38,96 +37,6 @@ ], cases = [ { - msg: 'metadata insertion', - doc: 'complexInternalData', - offset: 0, - range: new ve.Range( 0, 7 ), - modify: function ( newDoc ) { - newDoc.commit( ve.dm.TransactionBuilder.static.newFromMetadataInsertion( - newDoc, 4, 0, [ comment ] - ) ); - }, - removalOps: [ - { - type: 'replace', - remove: complexDoc.getData( new ve.Range( 0, 7 ) ), - insert: [ - { type: 'paragraph' }, - { type: '/paragraph' } - ], - removeMetadata: complexDoc.getMetadata( new ve.Range( 0, 7 ) ), - insertMetadata: [ undefined, undefined ], - insertedDataLength: 2, - insertedDataOffset: 0 - }, - { type: 'retain', length: 26 } - ], - expectedOps: [ - { - type: 'replace', - remove: [], - insert: complexDoc.getData( new ve.Range( 0, 4 ) ) - // Reference gets (unnecessarily) renumbered from auto/0 to auto/1 - .concat( [ - ve.extendObject( true, {}, complexDoc.data.data[ 4 ], - { attributes: { listKey: 'auto/1' } } - ) - ] ) - .concat( complexDoc.getData( new ve.Range( 5, 7 ) ) ), - removeMetadata: [], - insertMetadata: complexDoc.getMetadata( new ve.Range( 0, 4 ) ) - .concat( [ [ comment ] ] ) - .concat( complexDoc.getMetadata( new ve.Range( 5, 7 ) ) ) - }, - { type: 'retain', length: 3 }, - { - type: 'replace', - remove: complexDoc.getData( new ve.Range( 8, 32 ) ), - insert: complexDoc.getData( new ve.Range( 8, 32 ) ), - removeMetadata: complexDoc.getMetadata( new ve.Range( 8, 32 ) ), - insertMetadata: complexDoc.getMetadata( new ve.Range( 8, 32 ) ) -
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix a bug linting content from templated extension tags with...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405820 ) Change subject: Fix a bug linting content from templated extension tags with lint handlers .. Fix a bug linting content from templated extension tags with lint handlers The lint handler was only called if the extension tag was the first node of the template. Change-Id: I3bac02671130ea0cf61b827247081954768181cc --- M lib/wt2html/pp/processors/linter.js M tests/mocha/linter.js 2 files changed, 3 insertions(+), 4 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/wt2html/pp/processors/linter.js b/lib/wt2html/pp/processors/linter.js index 8339b4c..7d093e4 100644 --- a/lib/wt2html/pp/processors/linter.js +++ b/lib/wt2html/pp/processors/linter.js @@ -878,12 +878,11 @@ continue; } - var nodeTypeOf = null; + var nodeTypeOf = node.getAttribute('typeof'); // !tplInfo check is to protect against templated content in // extensions which might in turn be nested in templated content. if (!tplInfo && DU.isFirstEncapsulationWrapperNode(node)) { - nodeTypeOf = node.getAttribute('typeof'); tplInfo = { first: node, last: JSUtils.lastItem(DU.getAboutSiblings(node, node.getAttribute("about"))), diff --git a/tests/mocha/linter.js b/tests/mocha/linter.js index 8889a11..5b3b82f 100644 --- a/tests/mocha/linter.js +++ b/tests/mocha/linter.js @@ -910,7 +910,7 @@ }); }); it('should attribute linter issues to the ref tag even when ref and references are both templated', function() { - return parseWT('a x b {{1x|x}} c {{1x|y}} {{1x|}}').then(function(result) { + return parseWT('a x b {{1x|x}} {{1x|c y}} {{1x|}}').then(function(result) { result.should.have.length(3); result[0].should.have.a.property("type", "missing-end-tag"); result[0].dsr.should.deep.equal([ 7, 11, 3, 0 ]); @@ -923,7 +923,7 @@ result[1].should.have.a.property("templateInfo"); result[1].templateInfo.should.have.a.property("name", "Template:1x"); result[2].should.have.a.property("type", "missing-end-tag"); - result[2].dsr.should.deep.equal([ 45, 67, null, null]); + result[2].dsr.should.deep.equal([ 43, 67, null, null]); result[2].should.have.a.property("params"); result[2].params.should.have.a.property("name", "b"); result[2].should.have.a.property("templateInfo"); -- To view, visit https://gerrit.wikimedia.org/r/405820 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3bac02671130ea0cf61b827247081954768181cc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra Gerrit-Reviewer: C. Scott Ananian Gerrit-Reviewer: Sbailey Gerrit-Reviewer: Subramanya Sastry Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[fundraising/REL1_27]: WIP merged vendor dirs for payments-wiki
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405822 ) Change subject: WIP merged vendor dirs for payments-wiki .. WIP merged vendor dirs for payments-wiki Use the composer merge plugin to put all the extension dependencies into the top-level vendor directory. TODO: make sure we can update CI to work for all the things, including dev dependencies and adding new dependencies Bug: T185547 Depends-On: I09db8170994a187b06816e88d5d01e73567b46a1 Depends-On: I8090150374e1146cebf1f62aeb92ca43c31d0f89 Depends-On: I795169577204fabea276364c966b65a321d6a7fb Change-Id: Ic3a88c5bbb73fac7dd3f9e4d55fb59f0f299a2d6 --- M composer.json M extensions/DonationInterface M extensions/FundraisingEmailUnsubscribe M vendor 4 files changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/22/405822/1 diff --git a/composer.json b/composer.json index 3880520..2c32d80 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,8 @@ "nmred/kafka-php": "0.1.5", "phpunit/phpunit": "4.8.36", "wikimedia/testing-access-wrapper": "~1.0", - "wikimedia/avro": "1.7.7" + "wikimedia/avro": "1.7.7", + "etsy/phan": "0.8" }, "suggest": { "ext-apc": "Local data and opcode cache", @@ -93,7 +94,8 @@ "extra": { "merge-plugin": { "include": [ - "composer.local.json" + "composer.local.json", + "extensions/*/composer.json" ], "merge-dev": false } diff --git a/extensions/DonationInterface b/extensions/DonationInterface index 6ddd13b..279d86c 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface @@ -1 +1 @@ -Subproject commit 6ddd13bb7b227354a5338745b587ca3d9e69497a +Subproject commit 279d86c4869d6a4284d54e01c83ac9527076c819 diff --git a/extensions/FundraisingEmailUnsubscribe b/extensions/FundraisingEmailUnsubscribe index b4f69ed..2609bae 16 --- a/extensions/FundraisingEmailUnsubscribe +++ b/extensions/FundraisingEmailUnsubscribe @@ -1 +1 @@ -Subproject commit b4f69edb163d459a48fec7599b48003fb1982023 +Subproject commit 2609bae6d88fdfadefca69dde9910c5dc6486e48 diff --git a/vendor b/vendor index ec4d316..7ad981a 16 --- a/vendor +++ b/vendor @@ -1 +1 @@ -Subproject commit ec4d3165a5e97ed273a3e518ba657a5f389f8abb +Subproject commit 7ad981a35e100a6b0a6ca0ec5743a48b83d74ac4 -- To view, visit https://gerrit.wikimedia.org/r/405822 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic3a88c5bbb73fac7dd3f9e4d55fb59f0f299a2d6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_27 Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix a bug linting content from templated extension tags with...
Arlolra has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405820 ) Change subject: Fix a bug linting content from templated extension tags with lint handlers .. Fix a bug linting content from templated extension tags with lint handlers The lint handler was only called if the extension tag was the first node of the template. Change-Id: I3bac02671130ea0cf61b827247081954768181cc --- M lib/wt2html/pp/processors/linter.js M tests/mocha/linter.js 2 files changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/20/405820/1 diff --git a/lib/wt2html/pp/processors/linter.js b/lib/wt2html/pp/processors/linter.js index 8339b4c..7d093e4 100644 --- a/lib/wt2html/pp/processors/linter.js +++ b/lib/wt2html/pp/processors/linter.js @@ -878,12 +878,11 @@ continue; } - var nodeTypeOf = null; + var nodeTypeOf = node.getAttribute('typeof'); // !tplInfo check is to protect against templated content in // extensions which might in turn be nested in templated content. if (!tplInfo && DU.isFirstEncapsulationWrapperNode(node)) { - nodeTypeOf = node.getAttribute('typeof'); tplInfo = { first: node, last: JSUtils.lastItem(DU.getAboutSiblings(node, node.getAttribute("about"))), diff --git a/tests/mocha/linter.js b/tests/mocha/linter.js index 8889a11..5b3b82f 100644 --- a/tests/mocha/linter.js +++ b/tests/mocha/linter.js @@ -910,7 +910,7 @@ }); }); it('should attribute linter issues to the ref tag even when ref and references are both templated', function() { - return parseWT('a x b {{1x|x}} c {{1x|y}} {{1x|}}').then(function(result) { + return parseWT('a x b {{1x|x}} {{1x|c y}} {{1x|}}').then(function(result) { result.should.have.length(3); result[0].should.have.a.property("type", "missing-end-tag"); result[0].dsr.should.deep.equal([ 7, 11, 3, 0 ]); @@ -923,7 +923,7 @@ result[1].should.have.a.property("templateInfo"); result[1].templateInfo.should.have.a.property("name", "Template:1x"); result[2].should.have.a.property("type", "missing-end-tag"); - result[2].dsr.should.deep.equal([ 45, 67, null, null]); + result[2].dsr.should.deep.equal([ 43, 67, null, null]); result[2].should.have.a.property("params"); result[2].params.should.have.a.property("name", "b"); result[2].should.have.a.property("templateInfo"); -- To view, visit https://gerrit.wikimedia.org/r/405820 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3bac02671130ea0cf61b827247081954768181cc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix infinite recursion from linting named ref cycles
Arlolra has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405821 ) Change subject: Fix infinite recursion from linting named ref cycles .. Fix infinite recursion from linting named ref cycles On pages like, http://localhost:8000/fr.wikipedia.org/v3/page/html/Krzysztof_Charamsa/142052535 http://localhost:8000/es.wikipedia.org/v3/page/html/Taxonom%C3%ADa/104913080 Bug: T185267 Change-Id: I156cce384873609a65b659360667323b8f0a497b --- M lib/ext/Cite/index.js M lib/utils/DOMUtils.js M tests/mocha/linter.js 3 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/21/405821/1 diff --git a/lib/ext/Cite/index.js b/lib/ext/Cite/index.js index d2b27e4..25319e2 100644 --- a/lib/ext/Cite/index.js +++ b/lib/ext/Cite/index.js @@ -182,6 +182,10 @@ }; Ref.prototype.lintHandler = function(ref, env, tplInfo, domLinter) { + // Don't lint the content of ref in ref, since it can lead to cycles + // using named refs + if (DU.fromExtensionContent(ref, 'references')) { return ref.nextNode; } + var linkBackId = ref.firstChild.getAttribute('href').replace(/[^#]*#/, ''); var refNode = ref.ownerDocument.getElementById(linkBackId); if (refNode) { diff --git a/lib/utils/DOMUtils.js b/lib/utils/DOMUtils.js index abb1eb2..3b90142 100644 --- a/lib/utils/DOMUtils.js +++ b/lib/utils/DOMUtils.js @@ -2891,6 +2891,21 @@ } }; +/** + * Is the node from extension content? + */ +DOMUtils.fromExtensionContent = function(node, extType) { + var parentNode = node.parentNode; + var extReg = new RegExp('\\bmw:Extension\\/' + extType + '\\b'); + while (parentNode && !DU.atTheTop(parentNode)) { + if (extReg.test(parentNode.getAttribute('typeof'))) { + return true; + } + parentNode = parentNode.parentNode; + } + return false; +}; + if (typeof module === "object") { module.exports.DOMUtils = DOMUtils; } diff --git a/tests/mocha/linter.js b/tests/mocha/linter.js index 5b3b82f..4195f2a 100644 --- a/tests/mocha/linter.js +++ b/tests/mocha/linter.js @@ -945,5 +945,11 @@ result[1].templateInfo.should.have.a.property("name", "Template:1x"); }); }); + it('should not get into a cycle trying to lint ref in ref', function() { + return parseWT("{{#tag:ref||name='x'}}{{#tag:ref||name='y'}}") + .then(function() { + return parseWT("{{#tag:ref||name=x}}"); + }); + }); }); }); -- To view, visit https://gerrit.wikimedia.org/r/405821 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I156cce384873609a65b659360667323b8f0a497b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Workaround missing child selector in OOUI for menuLayout
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405814 ) Change subject: Workaround missing child selector in OOUI for menuLayout .. Workaround missing child selector in OOUI for menuLayout Bug: T185544 Change-Id: Ib93ef55115465c7de77e33c57f65eb966fadec24 --- M src/ui/styles/ve.ui.Surface.css 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/src/ui/styles/ve.ui.Surface.css b/src/ui/styles/ve.ui.Surface.css index 1d2aa2d..10a7129 100644 --- a/src/ui/styles/ve.ui.Surface.css +++ b/src/ui/styles/ve.ui.Surface.css @@ -42,3 +42,9 @@ word-wrap: break-word; white-space: pre-wrap; } + +/* HACK: Fix missing child selector in OOUI (T185544) */ +.oo-ui-menuLayout-expanded .oo-ui-menuLayout:not( .oo-ui-menuLayout-expanded ) .oo-ui-menuLayout-content, +.oo-ui-menuLayout-expanded .oo-ui-menuLayout:not( .oo-ui-menuLayout-expanded ) .oo-ui-menuLayout-menu { + position: static; +} -- To view, visit https://gerrit.wikimedia.org/r/405814 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib93ef55115465c7de77e33c57f65eb966fadec24 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: MWWikitextStringTransferHandler: Perform Parsoid cleanup on ...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405759 ) Change subject: MWWikitextStringTransferHandler: Perform Parsoid cleanup on result .. MWWikitextStringTransferHandler: Perform Parsoid cleanup on result Parsoid markup delivered as a result of a paste was being handled differently. Bug: T183173 Change-Id: Ic563d2c5cd1f663f35860892b369fb7ba34b9c55 --- M modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js M modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js 2 files changed, 18 insertions(+), 0 deletions(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js b/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js index d913356..e9b9c8c 100644 --- a/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js +++ b/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js @@ -176,6 +176,21 @@ ] }, { + msg: 'Headings, parsoid fallback ids don\'t interfere with whitespace stripping', + pasteString: '== Tudnivalók ==', + pasteType: 'text/plain', + parsoidResponse: ' Tudnivalók ', + annotations: [], + assertDom: true, + expectedData: [ + { type: 'mwHeading', attributes: { level: 2 }, originalDomElements: $( ' Tudnivalók ' ).toArray() }, + 'T', 'u', 'd', 'n', 'i', 'v', 'a', 'l', 'ó', 'k', + { type: '/mwHeading' }, + { type: 'internalList' }, + { type: '/internalList' } + ] + }, + { msg: 'Magic link (RFC)', pasteString: 'RFC 1234', pasteType: 'text/plain', diff --git a/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js b/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js index 10aedba..dfe8b83 100644 --- a/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js +++ b/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js @@ -128,6 +128,9 @@ } } + // Strip legacy IDs, for example in section headings + ve.stripParsoidFallbackIds( htmlDoc.body ); + // Pass an empty object for the second argument (importRules) so that clipboard mode is used // TODO: Fix that API doc = handler.surface.getModel().getDocument().newFromHtml( htmlDoc, {} ); -- To view, visit https://gerrit.wikimedia.org/r/405759 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic563d2c5cd1f663f35860892b369fb7ba34b9c55 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: DLynch Gerrit-Reviewer: Esanders Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...FundraisingEmailUnsubscribe[master]: WIP: Remove vendor dir
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405818 ) Change subject: WIP: Remove vendor dir .. WIP: Remove vendor dir Idea is to use Composer merge plugin to de-duplicate it all into the top-level mediawiki vendor dir. Bug: T185547 Change-Id: I09db8170994a187b06816e88d5d01e73567b46a1 --- M extension.json D vendor/.htaccess D vendor/autoload.php D vendor/clio/clio/LICENSE D vendor/clio/clio/README.md D vendor/clio/clio/composer.json D vendor/clio/clio/src/Clio/Console.php D vendor/clio/clio/src/Clio/Daemon.php D vendor/coderkungfu/php-queue/.gitignore D vendor/coderkungfu/php-queue/.travis.yml D vendor/coderkungfu/php-queue/README.md D vendor/coderkungfu/php-queue/composer.json D vendor/coderkungfu/php-queue/demo/cli.php D vendor/coderkungfu/php-queue/demo/config.php D vendor/coderkungfu/php-queue/demo/htdocs/.htaccess D vendor/coderkungfu/php-queue/demo/htdocs/index.php D vendor/coderkungfu/php-queue/demo/htdocs/index_secured.php D vendor/coderkungfu/php-queue/demo/queues/BeanstalkSampleQueue.php D vendor/coderkungfu/php-queue/demo/queues/SampleQueue.php D vendor/coderkungfu/php-queue/demo/queues/logs/.htaccess D vendor/coderkungfu/php-queue/demo/runners/BeanstalkSampleDaemon.php D vendor/coderkungfu/php-queue/demo/runners/README.md D vendor/coderkungfu/php-queue/demo/runners/SampleRunner.php D vendor/coderkungfu/php-queue/demo/runners/logs/.htaccess D vendor/coderkungfu/php-queue/demo/workers/SampleWorker.php D vendor/coderkungfu/php-queue/phpunit.travis.xml D vendor/coderkungfu/php-queue/phpunit.xml.dist D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/AmazonS3.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/AmazonSQS.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/Aws/AmazonS3V1.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/Aws/AmazonS3V2.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/Aws/AmazonSQSV1.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/Aws/AmazonSQSV2.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/Base.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/Beanstalkd.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/CSV.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/FS.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/IronMQ.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/LocalFS.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/Memcache.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/MongoDB.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/PDO.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/Predis.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/Proxy.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/Stomp.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/WindowsAzureBlob.php D vendor/coderkungfu/php-queue/src/PHPQueue/Backend/WindowsAzureServiceBus.php D vendor/coderkungfu/php-queue/src/PHPQueue/Base.php D vendor/coderkungfu/php-queue/src/PHPQueue/Cli.php D vendor/coderkungfu/php-queue/src/PHPQueue/Daemon.php D vendor/coderkungfu/php-queue/src/PHPQueue/Exception/BackendException.php D vendor/coderkungfu/php-queue/src/PHPQueue/Exception/Exception.php D vendor/coderkungfu/php-queue/src/PHPQueue/Exception/JobNotFoundException.php D vendor/coderkungfu/php-queue/src/PHPQueue/Exception/JsonException.php D vendor/coderkungfu/php-queue/src/PHPQueue/Exception/QueueNotFoundException.php D vendor/coderkungfu/php-queue/src/PHPQueue/Exception/WorkerNotFoundException.php D vendor/coderkungfu/php-queue/src/PHPQueue/Helpers.php D vendor/coderkungfu/php-queue/src/PHPQueue/Interfaces/AtomicReadBuffer.php D vendor/coderkungfu/php-queue/src/PHPQueue/Interfaces/Auth.php D vendor/coderkungfu/php-queue/src/PHPQueue/Interfaces/Config.php D vendor/coderkungfu/php-queue/src/PHPQueue/Interfaces/FifoQueueStore.php D vendor/coderkungfu/php-queue/src/PHPQueue/Job.php D vendor/coderkungfu/php-queue/src/PHPQueue/JobQueue.php D vendor/coderkungfu/php-queue/src/PHPQueue/Json.php D vendor/coderkungfu/php-queue/src/PHPQueue/Logger.php D vendor/coderkungfu/php-queue/src/PHPQueue/REST.php D vendor/coderkungfu/php-queue/src/PHPQueue/Runner.php D vendor/coderkungfu/php-queue/src/PHPQueue/Worker.php D vendor/coderkungfu/php-queue/test/Demo/Workers/SampleWorkerTest.php D vendor/coderkungfu/php-queue/test/PHPQueue/Backend/AmazonS3V1Test.php D vendor/coderkungfu/php-queue/test/PHPQueue/Backend/AmazonS3V2Test.php D vendor/coderkungfu/php-queue/test/PHPQueue/Backend/AmazonSQSV1Test.php D vendor/coderkungfu/php-queue/test/PHPQueue/Backend/AmazonSQSV2Test.php D vendor/coderkungfu/php-queue/test/PHPQueue/Backend/BeanstalkdTest.php D vendor/coderkungfu/php-queue/test/PHPQueue/Backend/CSVTest.php D vendor/coderkungfu/php-queue/test/PHPQueue/Backend/IronMQTest.php D vendor/coderkungfu/php-queue/test/PHPQueue/Backend/LocalFSTest.php D vendor/coderkungfu/php-queue/test/PHPQueue/Backend/MemcacheTest.php D ve
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[deployment]: WIP remove vendor submodule
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405817 ) Change subject: WIP remove vendor submodule .. WIP remove vendor submodule Instead, use composer merge plugin to merge all libraries into the top-level mediawiki vendor dir, avoiding duplication and potential conflict. Bug: T185547 Change-Id: I795169577204fabea276364c966b65a321d6a7fb --- M .gitmodules D composer.lock D vendor 3 files changed, 0 insertions(+), 1,596 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/17/405817/1 diff --git a/.gitmodules b/.gitmodules index dc9dce9..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "vendor"] - path = vendor - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface/vendor diff --git a/composer.lock b/composer.lock deleted file mode 100644 index 5d275a2..000 --- a/composer.lock +++ /dev/null @@ -1,1592 +0,0 @@ -{ -"_readme": [ -"This file locks the dependencies of your project to a known state", -"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";, -"This file is @generated automatically" -], -"content-hash": "7f1096380f4f378b06eaccb8d71984a3", -"packages": [ -{ -"name": "addshore/psr-6-mediawiki-bagostuff-adapter", -"version": "0.1", -"source": { -"type": "git", -"url": "https://github.com/addshore/psr-6-mediawiki-bagostuff-adapter.git";, -"reference": "92f3bb69bf3e7f51b8b66ae74b6a4a291637354c" -}, -"dist": { -"type": "zip", -"url": "https://api.github.com/repos/addshore/psr-6-mediawiki-bagostuff-adapter/zipball/92f3bb69bf3e7f51b8b66ae74b6a4a291637354c";, -"reference": "92f3bb69bf3e7f51b8b66ae74b6a4a291637354c", -"shasum": "" -}, -"require": { -"psr/cache": "^1.0.0" -}, -"require-dev": { -"cache/integration-tests": "~0.9.1", -"jakub-onderka/php-parallel-lint": "^0.9.2", -"mediawiki/mediawiki-codesniffer": "^0.7.2", -"phpunit/phpunit": "~4.8.0|~5.3.0" -}, -"type": "library", -"autoload": { -"psr-4": { -"Addshore\\Psr\\Cache\\MWBagOStuffAdapter\\": "src/" -} -}, -"notification-url": "https://packagist.org/downloads/";, -"license": [ -"GPL-2.0+" -], -"authors": [ -{ -"name": "Addshore" -} -], -"description": "A MediaWiki BagOStuff PSR-6 adapter library", -"keywords": [ -"cache", -"mediawiki" -], -"time": "2017-02-16T14:33:59+00:00" -}, -{ -"name": "amzn/login-and-pay-with-amazon-sdk-php", -"version": "dev-master", -"source": { -"type": "git", -"url": "https://github.com/ejegg/login-and-pay-with-amazon-sdk-php";, -"reference": "198cc8ccab51e270909602cee38706b4d1f6bbba" -}, -"require": { -"ext-curl": "*", -"php": ">=5.3.0", -"psr/log": "^1.0" -}, -"type": "library", -"autoload": { -"psr-4": { -"PayWithAmazon\\": "PayWithAmazon/" -} -}, -"license": [ -"Apache OSL-2" -], -"authors": [ -{ -"name": "Amazon Payments", -"email": "eps-...@amazon.com" -} -], -"description": "Pay with Amazon SDK", -"homepage": "https://github.com/amzn/login-and-pay-with-amazon-sdk-php";, -"keywords": [ -"amazon", -"amazon payments", -"pay", -"pay with amazon", -"payment", -"payments" -], -"time": "2017-12-15T15:03:21+00:00" -}, -{ -"name": "clio/clio", -"version": "0.1.8", -"source": { -"type": "git", -"url": "https://github.com/nramenta/clio.git";, -"reference": "6a9f600b73fa213e817d5c1e67a4641aecd156ef" -}, -"dist": { -"type": "zip", -"url": "https://api.github.com/repos/nramenta/clio/zipball/6a9f600b73fa213e817d5c1e67a4641aecd156ef";, -"reference": "6a9f600b73fa213e817d5c1e67a4641aecd156e
[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Don't hide notification popup when scrolling
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405816 ) Change subject: Don't hide notification popup when scrolling .. Don't hide notification popup when scrolling hideWhenOutOfView is for preventing popups from appearing outside their container, but in this case the container is the document, so it is already clipped. Bug: T178384 Change-Id: Ie0cd83849446cf74b61e708f0a1fa79f2384a94a --- M modules/ui/mw.echo.ui.NotificationBadgeWidget.js 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/16/405816/1 diff --git a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js index ce7956d..de02adc 100644 --- a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js +++ b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js @@ -130,6 +130,7 @@ $content: this.notificationsWidget.$element, $footer: $footer, width: config.popupWidth || 500, + hideWhenOutOfView: false, autoFlip: false, autoClose: true, containerPadding: 20, -- To view, visit https://gerrit.wikimedia.org/r/405816 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0cd83849446cf74b61e708f0a1fa79f2384a94a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Escape autocomment message arguments
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398821 ) Change subject: Escape autocomment message arguments .. Escape autocomment message arguments As far as I can tell, none of the existing wikibase-*-summary-* messages have any wikitext parameters: - wikibase-entity-summary-wbcreateredirect, wikibase-entity-summary-wbmergeitems-from and wikibase-entity-summary-wbmergeitems-to only insert the plain page title for the mentioned page, not a link. - wikibase-entity-summary-undo and wikibase-entity-summary-restore create a link to Special:Contributions inside the message text itself, the parameter is just the plain user name. - All other message parameters appear to be language codes, wiki codes, or counts, all of which should be plain text. So none of the messages should break when we escape wikitext in the arguments. On the other hand, some messages take user name arguments, user names can contain characters like ‘*’ or ‘;’ which at the beginning of a line have special meaning in wikitext, and the English message substitutes the user names like {{GENDER:$3|$3}}, which inserts a newline before the username – with the effect that usernames like “*foo” or “;bar” render as lists or definition lists in the summary. Escaping all arguments (in AutoCommentFormatter, we don’t know which arguments are usernames) fixes this. (We can’t just use plaintextParams() instead of params(), since that only substitutes the parameters after parser functions are processed, i. e. {{COUNT}}, {{GENDER}} etc. are broken.) A few tests, which assumed that parameters are not escaped, are updated. (They also require some changes because wfEscapeWikiText() never escapes with named entities.) Bug: T182800 Change-Id: Iae6bac3bd0d487de9a5ca68e117c070105c695db Depends-On: Ic5a8fc76c28dca43ce8e334ef1874c2673433f00 --- M lib/includes/Formatters/AutoCommentFormatter.php M repo/tests/phpunit/includes/SummaryFormatterTest.php 2 files changed, 6 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Thiemo Kreuz (WMDE): Looks good to me, approved diff --git a/lib/includes/Formatters/AutoCommentFormatter.php b/lib/includes/Formatters/AutoCommentFormatter.php index 0c77d87..a8ce5a7 100644 --- a/lib/includes/Formatters/AutoCommentFormatter.php +++ b/lib/includes/Formatters/AutoCommentFormatter.php @@ -99,6 +99,9 @@ return null; } + // no message requires wikitext params and some args are user-controlled + $args = array_map( 'wfEscapeWikiText', $args ); + // render the autocomment $auto = $msg->params( $args )->parse(); return $auto; diff --git a/repo/tests/phpunit/includes/SummaryFormatterTest.php b/repo/tests/phpunit/includes/SummaryFormatterTest.php index 5b4f313..3457541 100644 --- a/repo/tests/phpunit/includes/SummaryFormatterTest.php +++ b/repo/tests/phpunit/includes/SummaryFormatterTest.php @@ -507,7 +507,7 @@ false, 'wbsetlabel-set:1|<>', false, 'Title', false, - '!.*?\[<>\].*?!' + '!.*?\[<>\].*?!' ], [ 'item', @@ -515,7 +515,7 @@ false, 'wbsetlabel-set:1|<>', false, 'Title', false, - '!.*?\[<>\].*?!' + '!.*?\[<>\].*?!' ], [ 'item', @@ -523,7 +523,7 @@ false, 'wbsetlabel-set:1|&', false, 'Title', false, - '!.*?\[&\].*?!' + '!.*?\[&\].*?!' ], [ 'item', -- To view, visit https://gerrit.wikimedia.org/r/398821 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iae6bac3bd0d487de9a5ca68e117c070105c695db Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Lucas Werkmeister (WMDE) Gerrit-Reviewer: Daniel Kinzler Gerrit-Reviewer: Lucas Werkmeister (WMDE) Gerrit-Reviewer: Thiemo Kreuz (WMDE) Gerrit-Reviewer: WMDE-leszek Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make Gender normalize usernames
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398772 ) Change subject: Make Gender normalize usernames .. Make Gender normalize usernames This ensures that if GENDER is fed wfEscapeWikitext()'d version of a username, it will normalize it. See discussion on T182800. Note, we do not need to worry about the case of a user named "Project:*foo" as such namespace prefixes are illegal in usernames. Change-Id: Ic5a8fc76c28dca43ce8e334ef1874c2673433f00 --- M includes/parser/CoreParserFunctions.php A tests/phpunit/includes/parser/CoreParserFunctionsTest.php 2 files changed, 23 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php index 07944d4..ad56afc 100644 --- a/includes/parser/CoreParserFunctions.php +++ b/includes/parser/CoreParserFunctions.php @@ -337,8 +337,8 @@ // default $gender = User::getDefaultOption( 'gender' ); - // allow prefix. - $title = Title::newFromText( $username ); + // allow prefix and normalize (e.g. "*foo" -> "*foo" ). + $title = Title::newFromText( $username, NS_USER ); if ( $title && $title->inNamespace( NS_USER ) ) { $username = $title->getText(); diff --git a/tests/phpunit/includes/parser/CoreParserFunctionsTest.php b/tests/phpunit/includes/parser/CoreParserFunctionsTest.php new file mode 100644 index 000..c630447 --- /dev/null +++ b/tests/phpunit/includes/parser/CoreParserFunctionsTest.php @@ -0,0 +1,21 @@ +setOption( 'gender', 'female' ); + $user->saveSettings(); + + $msg = ( new RawMessage( '{{GENDER:*Female|m|f|o}}' ) )->parse(); + $this->assertEquals( $msg, 'f', 'Works unescaped' ); + $escapedName = wfEscapeWikiText( '*Female' ); + $msg2 = ( new RawMessage( '{{GENDER:' . $escapedName . '|m|f|o}}' ) ) + ->parse(); + $this->assertEquals( $msg, 'f', 'Works escaped' ); + } + +} -- To view, visit https://gerrit.wikimedia.org/r/398772 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic5a8fc76c28dca43ce8e334ef1874c2673433f00 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Brian Wolff Gerrit-Reviewer: C. Scott Ananian Gerrit-Reviewer: Jackmcbarn Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Lucas Werkmeister (WMDE) Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Use child selectors for menuLayout
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405815 ) Change subject: Use child selectors for menuLayout .. Use child selectors for menuLayout Prevents broken layouts when menus are nested. Bug: T185544 Change-Id: I1795fcefeac22d728aa7a716f7e23f87fff1bef0 --- M src/styles/layouts/MenuLayout.less 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/15/405815/1 diff --git a/src/styles/layouts/MenuLayout.less b/src/styles/layouts/MenuLayout.less index 474d0d0..19270af 100644 --- a/src/styles/layouts/MenuLayout.less +++ b/src/styles/layouts/MenuLayout.less @@ -7,14 +7,14 @@ bottom: 0; &-expanded, - &-expanded .oo-ui-menuLayout-menu, - &-expanded .oo-ui-menuLayout-content { + &-expanded > .oo-ui-menuLayout-menu, + &-expanded > .oo-ui-menuLayout-content { position: absolute; } // If anything overflows out of the menu, display it on top of the content, // as it's probably some important interactive widget. - &-expanded .oo-ui-menuLayout-menu { + &-expanded > .oo-ui-menuLayout-menu { z-index: 1; } @@ -24,27 +24,27 @@ display: table; width: 100%; - .oo-ui-menuLayout-menu, - .oo-ui-menuLayout-content { + > .oo-ui-menuLayout-menu, + > .oo-ui-menuLayout-content { display: table-cell; vertical-align: top; } } } - &-menu, - &-content { + > .oo-ui-menuLayout-menu, + > .oo-ui-menuLayout-content { .oo-ui-transition( all 200ms ease ); } // These are overridden with 'auto' or '0' later - &-menu { + > .oo-ui-menuLayout-menu { height: 18em; width: 18em; } // These are overridden with 'auto' or '0' later - &-content { + > .oo-ui-menuLayout-content { top: 18em; left: 18em; right: 18em; -- To view, visit https://gerrit.wikimedia.org/r/405815 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1795fcefeac22d728aa7a716f7e23f87fff1bef0 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: install_server: don't use http to fetch bast3003 installer
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405813 ) Change subject: install_server: don't use http to fetch bast3003 installer .. install_server: don't use http to fetch bast3003 installer Bug: T182215 Bug: T184936 Change-Id: I770a1a5a3d3fcb571c5b2727a2075f386d83d9c0 --- M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 index 59b4c94..fa58c44 100644 --- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -424,6 +424,8 @@ fixed-address bast3003.wikimedia.org; next-server 208.80.154.22; # install1002 (tftp server) +option pxelinux.pathprefix "stretch-installer/"; +filename "stretch-installer/debian-installer/amd64/pxelinux.0"; } host bast4001 { -- To view, visit https://gerrit.wikimedia.org/r/405813 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I770a1a5a3d3fcb571c5b2727a2075f386d83d9c0 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn Gerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Workaround missing child selector in OOUI for menuLayout
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405814 ) Change subject: Workaround missing child selector in OOUI for menuLayout .. Workaround missing child selector in OOUI for menuLayout Bug: T185544 Change-Id: Ib93ef55115465c7de77e33c57f65eb966fadec24 --- M src/ui/styles/ve.ui.Surface.css 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/14/405814/1 diff --git a/src/ui/styles/ve.ui.Surface.css b/src/ui/styles/ve.ui.Surface.css index 1d2aa2d..10a7129 100644 --- a/src/ui/styles/ve.ui.Surface.css +++ b/src/ui/styles/ve.ui.Surface.css @@ -42,3 +42,9 @@ word-wrap: break-word; white-space: pre-wrap; } + +/* HACK: Fix missing child selector in OOUI (T185544) */ +.oo-ui-menuLayout-expanded .oo-ui-menuLayout:not( .oo-ui-menuLayout-expanded ) .oo-ui-menuLayout-content, +.oo-ui-menuLayout-expanded .oo-ui-menuLayout:not( .oo-ui-menuLayout-expanded ) .oo-ui-menuLayout-menu { + position: static; +} -- To view, visit https://gerrit.wikimedia.org/r/405814 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib93ef55115465c7de77e33c57f65eb966fadec24 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...ZppixBot[master]: Html syntax fixes
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405811 ) Change subject: Html syntax fixes .. Html syntax fixes Change-Id: I2d32043c180265e6aeed299f81de2a5f971f4861 --- M public_html/about.html M public_html/contribs.html M public_html/css/common.css M public_html/documentation.html M public_html/index.html 5 files changed, 18 insertions(+), 30 deletions(-) Approvals: MacFan4000: Looks good to me, approved jenkins-bot: Verified diff --git a/public_html/about.html b/public_html/about.html index 9a9a4c3..96c40ce 100644 --- a/public_html/about.html +++ b/public_html/about.html @@ -1,6 +1,7 @@ + + About - ZppixBot - Home @@ -8,9 +9,6 @@ Contributors About - - About ZppixBot is an IRC bot running https://sopel.chat";>Sopel 6.5.1 and Python 2.7.9. The current release of ZppixBot customizations is version 3.0. ZppixBot has lots of commands and more can be added by writing more mo$ - - + \ No newline at end of file diff --git a/public_html/contribs.html b/public_html/contribs.html index f884ee4..1a7ca23 100644 --- a/public_html/contribs.html +++ b/public_html/contribs.html @@ -1,6 +1,7 @@ + + Contributors - ZppixBot - Home @@ -8,8 +9,6 @@ Contributors About - - People whom have contributed to Zppixbot Zppix - Operator/Creator @@ -20,5 +19,4 @@ Phantom42 - Web design/developer Paladox - Operator - - + \ No newline at end of file diff --git a/public_html/css/common.css b/public_html/css/common.css index 590cc22..b758912 100644 --- a/public_html/css/common.css +++ b/public_html/css/common.css @@ -1,4 +1,4 @@ -'html { +html { font-family: 'Times New Roman'; } diff --git a/public_html/documentation.html b/public_html/documentation.html index 187e7a1..44044c7 100644 --- a/public_html/documentation.html +++ b/public_html/documentation.html @@ -1,29 +1,26 @@ - - - -Documentation - ZppixBot - + + +Documentation - ZppixBot + Home Documentation Contributors About - - Table of contents -List of commands -Module Development -Managing the bot (for maintainers) - + List of commands + Module Development + Managing the bot (for maintainers) + Restarting the bot Making changes to modules Making config changes Canceling a reminder Updateing the website for ZppixBot - + List of commands @@ -525,6 +522,4 @@ zppixbot@tools-bastion-03:~$ cd ~/ZppixBot tools.zppixbot@tools-bastion-03:~/ZppixBot$ git pull Go to tools.wmflabs.org and check to make sure your changes are present. - - diff --git a/public_html/index.html b/public_html/index.html index 7e3b9cd..873989a 100644 --- a/public_html/index.html +++ b/public_html/index.html @@ -1,7 +1,7 @@ + Home - ZppixBot - Home @@ -9,9 +9,7 @@ Contributors About - - If you would like ZppixBot in your channel, join #ZppixBot and say .addchannel The third release of ZppixBot is now here! @@ -21,5 +19,4 @@ https://github.com/Pix1234/ZppixBot-Source/releases/tag/v1";>v1 (30 July 2017) https://github.com/Pix1234/ZppixBot-Source/releases/tag/v2";>v2 (8 August 2017) - - + \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/405811 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2d32043c180265e6aeed299f81de2a5f971f4861 Gerrit-PatchSet: 3 Gerrit-Project: labs/tools/ZppixBot Gerrit-Branch: master Gerrit-Owner: MacFan4000 Gerrit-Reviewer: MacFan4000 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...ZppixBot[master]: Html syntax fixes
MacFan4000 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405811 ) Change subject: Html syntax fixes .. Html syntax fixes Change-Id: I2d32043c180265e6aeed299f81de2a5f971f4861 --- M public_html/about.html M public_html/contribs.html M public_html/css/common.css M public_html/documentation.html M public_html/index.html 5 files changed, 18 insertions(+), 30 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/ZppixBot refs/changes/11/405811/3 diff --git a/public_html/about.html b/public_html/about.html index 9a9a4c3..96c40ce 100644 --- a/public_html/about.html +++ b/public_html/about.html @@ -1,6 +1,7 @@ + + About - ZppixBot - Home @@ -8,9 +9,6 @@ Contributors About - - About ZppixBot is an IRC bot running https://sopel.chat";>Sopel 6.5.1 and Python 2.7.9. The current release of ZppixBot customizations is version 3.0. ZppixBot has lots of commands and more can be added by writing more mo$ - - + \ No newline at end of file diff --git a/public_html/contribs.html b/public_html/contribs.html index f884ee4..1a7ca23 100644 --- a/public_html/contribs.html +++ b/public_html/contribs.html @@ -1,6 +1,7 @@ + + Contributors - ZppixBot - Home @@ -8,8 +9,6 @@ Contributors About - - People whom have contributed to Zppixbot Zppix - Operator/Creator @@ -20,5 +19,4 @@ Phantom42 - Web design/developer Paladox - Operator - - + \ No newline at end of file diff --git a/public_html/css/common.css b/public_html/css/common.css index 590cc22..b758912 100644 --- a/public_html/css/common.css +++ b/public_html/css/common.css @@ -1,4 +1,4 @@ -'html { +html { font-family: 'Times New Roman'; } diff --git a/public_html/documentation.html b/public_html/documentation.html index 187e7a1..44044c7 100644 --- a/public_html/documentation.html +++ b/public_html/documentation.html @@ -1,29 +1,26 @@ - - - -Documentation - ZppixBot - + + +Documentation - ZppixBot + Home Documentation Contributors About - - Table of contents -List of commands -Module Development -Managing the bot (for maintainers) - + List of commands + Module Development + Managing the bot (for maintainers) + Restarting the bot Making changes to modules Making config changes Canceling a reminder Updateing the website for ZppixBot - + List of commands @@ -525,6 +522,4 @@ zppixbot@tools-bastion-03:~$ cd ~/ZppixBot tools.zppixbot@tools-bastion-03:~/ZppixBot$ git pull Go to tools.wmflabs.org and check to make sure your changes are present. - - diff --git a/public_html/index.html b/public_html/index.html index 7e3b9cd..873989a 100644 --- a/public_html/index.html +++ b/public_html/index.html @@ -1,7 +1,7 @@ + Home - ZppixBot - Home @@ -9,9 +9,7 @@ Contributors About - - If you would like ZppixBot in your channel, join #ZppixBot and say .addchannel The third release of ZppixBot is now here! @@ -21,5 +19,4 @@ https://github.com/Pix1234/ZppixBot-Source/releases/tag/v1";>v1 (30 July 2017) https://github.com/Pix1234/ZppixBot-Source/releases/tag/v2";>v2 (8 August 2017) - - + \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/405811 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d32043c180265e6aeed299f81de2a5f971f4861 Gerrit-PatchSet: 3 Gerrit-Project: labs/tools/ZppixBot Gerrit-Branch: master Gerrit-Owner: MacFan4000 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: install_server: don't use http to fetch bast3003 installer
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405813 ) Change subject: install_server: don't use http to fetch bast3003 installer .. install_server: don't use http to fetch bast3003 installer Bug: T182215 Bug: T184936 Change-Id: I770a1a5a3d3fcb571c5b2727a2075f386d83d9c0 --- M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/13/405813/1 diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 index 805df13..052c2c1 100644 --- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -424,6 +424,8 @@ fixed-address bast3003.wikimedia.org; next-server 208.80.154.22; # install1002 (tftp server) +option pxelinux.pathprefix "stretch-installer/"; +filename "stretch-installer/debian-installer/amd64/pxelinux.0"; } host bast4001 { -- To view, visit https://gerrit.wikimedia.org/r/405813 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I770a1a5a3d3fcb571c5b2727a2075f386d83d9c0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Other less common lead paragraph edge cases
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405812 ) Change subject: Other less common lead paragraph edge cases .. Other less common lead paragraph edge cases * Sometimes a collapsible class wraps the infobox e.g. Ardrossan_Railway and Edinburgh_and_Dalkeith_Railway Change-Id: I82c099265c11612105ad3e790e66dd3e9d44b878 --- M includes/transforms/MoveLeadParagraphTransform.php M tests/phpunit/transforms/MoveLeadParagraphTransformTest.php 2 files changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/12/405812/1 diff --git a/includes/transforms/MoveLeadParagraphTransform.php b/includes/transforms/MoveLeadParagraphTransform.php index 08ef454..28d2f85 100644 --- a/includes/transforms/MoveLeadParagraphTransform.php +++ b/includes/transforms/MoveLeadParagraphTransform.php @@ -36,7 +36,7 @@ private static function matchElement( DOMElement $node, $requiredNodeName, $requiredClass ) { $classes = explode( ' ', $node->getAttribute( 'class' ) ); return strtolower( $node->nodeName ) === $requiredNodeName - && in_array( $requiredClass, $classes ); + && !empty( preg_grep( $requiredClass, $classes ) ); } /** @@ -45,12 +45,12 @@ * @param string $wrapperClass (optional) a required classname for wrapper * @return DomElement representing an unwrapped infobox or an element that wraps the infobox */ - public static function getInfoboxContainer( $node, $wrapperClass = 'mw-stack' ) { + public static function getInfoboxContainer( $node, $wrapperClass = '/(mw-stack|collapsible)/' ) { $infobox = false; // iterate to the top. while ( $node->parentNode ) { - if ( self::matchElement( $node, 'table', 'infobox' ) || + if ( self::matchElement( $node, 'table', '/infobox/' ) || self::matchElement( $node, 'div', $wrapperClass ) ) { $infobox = $node; } diff --git a/tests/phpunit/transforms/MoveLeadParagraphTransformTest.php b/tests/phpunit/transforms/MoveLeadParagraphTransformTest.php index bfd8dc7..21b837f 100644 --- a/tests/phpunit/transforms/MoveLeadParagraphTransformTest.php +++ b/tests/phpunit/transforms/MoveLeadParagraphTransformTest.php @@ -88,9 +88,15 @@ $multiStackInfobox = "$infobox$anotherInfobox"; $paragraph = 'first paragraph'; $emptyP = ''; + $collapsibleInfobox = ''; return [ [ + "$collapsibleInfoboxone", + "one$collapsibleInfobox", + 'Collapsible infoboxes are moved.' + ], + [ 'one', 'one' ], -- To view, visit https://gerrit.wikimedia.org/r/405812 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82c099265c11612105ad3e790e66dd3e9d44b878 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Add __toString method for PaymentTransactionResponse
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/376585 ) Change subject: Add __toString method for PaymentTransactionResponse .. Add __toString method for PaymentTransactionResponse There are a lot of useless lines in the logs with PaymentTransactionResponse Object ( [errors:protected] => Array ( ) [rawResponse:protected] => [message:protected] => [gatewayTransactionId:protected] => [communicationStatus:protected] => [data:protected] => [forceCancel:protected] => [txnMessage:protected] => [redirect:protected] => ) Change-Id: I4edfe16498204f8c7ad4c631e90b122b51c61476 --- M gateway_common/PaymentTransactionResponse.php 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: Mepps: Looks good to me, approved jenkins-bot: Verified diff --git a/gateway_common/PaymentTransactionResponse.php b/gateway_common/PaymentTransactionResponse.php index 0499212..374c7c9 100644 --- a/gateway_common/PaymentTransactionResponse.php +++ b/gateway_common/PaymentTransactionResponse.php @@ -192,4 +192,24 @@ public function setRedirect( $redirect ) { $this->redirect = $redirect; } + + public function __toString() { + $stringVal = "Communication Status: '{$this->communicationStatus}', " . + "Communication Status: '{$this->communicationStatus}', " . + "Gateway Txn ID: '{$this->gatewayTransactionId}', " . + "Message: '{$this->message}', " . + "Txn Message: '{$this->txnMessage}', " . + 'Data: ' . print_r( $this->data, true ) . ', ' . + "Force cancel: '{$this->forceCancel}', " . + "Redirect: '{$this->redirect}', " . + "Raw response: '{$this->rawResponse}', Errors: "; + $errorStrings = []; + foreach ( $this->errors as $error ) { + if ( $error instanceof PaymentError ) { + $errorStrings[] .= ' code ' . $error->getErrorCode() . + ': ' . $error->getDebugMessage(); + } + } + return $stringVal . implode( ';', $errorStrings ); + } } -- To view, visit https://gerrit.wikimedia.org/r/376585 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4edfe16498204f8c7ad4c631e90b122b51c61476 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Ejegg Gerrit-Reviewer: AndyRussG Gerrit-Reviewer: Mepps Gerrit-Reviewer: XenoRyet Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Cite[master]: Remove metadata from unit tests
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405810 ) Change subject: Remove metadata from unit tests .. Remove metadata from unit tests Metadata is being removed from VE. Change-Id: Icc614ed7a9792b7d9475d7a804bb8eea48424043 --- M modules/ve-cite/tests/ve.dm.Transaction.test.js M modules/ve-cite/tests/ve.dm.citeExample.js 2 files changed, 2 insertions(+), 110 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite refs/changes/10/405810/1 diff --git a/modules/ve-cite/tests/ve.dm.Transaction.test.js b/modules/ve-cite/tests/ve.dm.Transaction.test.js index 57032a6..18f0486 100644 --- a/modules/ve-cite/tests/ve.dm.Transaction.test.js +++ b/modules/ve-cite/tests/ve.dm.Transaction.test.js @@ -11,7 +11,6 @@ QUnit.test( 'newFromDocumentInsertion with references', function ( assert ) { var i, j, doc2, tx, actualStoreItems, expectedStoreItems, removalOps, doc, complexDoc = ve.dm.citeExample.createExampleDocument( 'complexInternalData' ), - comment = { type: 'alienMeta', originalDomElements: $( '' ).toArray() }, withReference = [ { type: 'paragraph' }, 'B', 'a', 'r', @@ -38,96 +37,6 @@ ], cases = [ { - msg: 'metadata insertion', - doc: 'complexInternalData', - offset: 0, - range: new ve.Range( 0, 7 ), - modify: function ( newDoc ) { - newDoc.commit( ve.dm.TransactionBuilder.static.newFromMetadataInsertion( - newDoc, 4, 0, [ comment ] - ) ); - }, - removalOps: [ - { - type: 'replace', - remove: complexDoc.getData( new ve.Range( 0, 7 ) ), - insert: [ - { type: 'paragraph' }, - { type: '/paragraph' } - ], - removeMetadata: complexDoc.getMetadata( new ve.Range( 0, 7 ) ), - insertMetadata: [ undefined, undefined ], - insertedDataLength: 2, - insertedDataOffset: 0 - }, - { type: 'retain', length: 26 } - ], - expectedOps: [ - { - type: 'replace', - remove: [], - insert: complexDoc.getData( new ve.Range( 0, 4 ) ) - // Reference gets (unnecessarily) renumbered from auto/0 to auto/1 - .concat( [ - ve.extendObject( true, {}, complexDoc.data.data[ 4 ], - { attributes: { listKey: 'auto/1' } } - ) - ] ) - .concat( complexDoc.getData( new ve.Range( 5, 7 ) ) ), - removeMetadata: [], - insertMetadata: complexDoc.getMetadata( new ve.Range( 0, 4 ) ) - .concat( [ [ comment ] ] ) - .concat( complexDoc.getMetadata( new ve.Range( 5, 7 ) ) ) - }, - { type: 'retain', length: 3 }, - { - type: 'replace', - remove: complexDoc.getData( new ve.Range( 8, 32 ) ), - insert: complexDoc.getData( new ve.Range( 8, 32 ) ), - removeMetadata: complexDoc.getMetadata( new ve.Range( 8, 32 ) ), - insertMetadata: complexDoc.getMetadata( new ve.Range( 8, 32 ) ) -
[MediaWiki-commits] [Gerrit] mediawiki...FundraiserLandingPage[master]: Ignore invalid country codes from query string
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/324789 ) Change subject: Ignore invalid country codes from query string .. Ignore invalid country codes from query string If someone follows a link with &country=XX, ignore the code and fall back to the cookie or IP address lookup. Bug: T152026 Change-Id: Id84acd41063242815fdbc9692023a6c235de80e7 --- M FundraiserRedirector.body.php 1 file changed, 43 insertions(+), 0 deletions(-) Approvals: Mepps: Looks good to me, approved jenkins-bot: Verified diff --git a/FundraiserRedirector.body.php b/FundraiserRedirector.body.php index a1becd2..67ccc2c 100644 --- a/FundraiserRedirector.body.php +++ b/FundraiserRedirector.body.php @@ -16,6 +16,9 @@ // Country passed in the URL param gets first precedence. $country = $this->getRequest()->getVal( 'country' ); + if ( !self::isValidIsoCountryCode( $country ) ) { + $country = ''; + } // Get country from the GeoIP cookie if present. if ( !$country ) { @@ -103,4 +106,44 @@ // Redirect $this->getOutput()->redirect( $redirectURL ); } + + /** +* Checks to see if $country is a valid iso 3166-1 country code. +* DOES NOT VERIFY THAT WE FUNDRAISE THERE. Only that the code makes sense. +* @param string $country the code we want to check +* @return bool +*/ + public static function isValidIsoCountryCode( $country ) { + /** +* List of valid iso 3166 country codes, regenerated on 1380836686 +* Code generated by a happy script at +* https://gerrit.wikimedia.org/r/#/admin/projects/wikimedia/fundraising/tools,branches +*/ + $iso_3166_codes = [ + 'AF', 'AX', 'AL', 'DZ', 'AS', 'AD', 'AO', 'AI', 'AQ', 'AG', 'AR', 'AM', 'AW', 'AU', + 'AT', 'AZ', 'BS', 'BH', 'BD', 'BB', 'BY', 'BE', 'BZ', 'BJ', 'BM', 'BT', 'BO', 'BQ', + 'BA', 'BW', 'BV', 'BR', 'IO', 'BN', 'BG', 'BF', 'BI', 'KH', 'CM', 'CA', 'CV', 'KY', + 'CF', 'TD', 'CL', 'CN', 'CX', 'CC', 'CO', 'KM', 'CG', 'CD', 'CK', 'CR', 'CI', 'HR', + 'CU', 'CW', 'CY', 'CZ', 'DK', 'DJ', 'DM', 'DO', 'EC', 'EG', 'SV', 'GQ', 'ER', 'EE', + 'ET', 'FK', 'FO', 'FJ', 'FI', 'FR', 'GF', 'PF', 'TF', 'GA', 'GM', 'GE', 'DE', 'GH', + 'GI', 'GR', 'GL', 'GD', 'GP', 'GU', 'GT', 'GG', 'GN', 'GW', 'GY', 'HT', 'HM', 'VA', + 'HN', 'HK', 'HU', 'IS', 'IN', 'ID', 'IR', 'IQ', 'IE', 'IM', 'IL', 'IT', 'JM', 'JP', + 'JE', 'JO', 'KZ', 'KE', 'KI', 'KP', 'KR', 'KW', 'KG', 'LA', 'LV', 'LB', 'LS', 'LR', + 'LY', 'LI', 'LT', 'LU', 'MO', 'MK', 'MG', 'MW', 'MY', 'MV', 'ML', 'MT', 'MH', 'MQ', + 'MR', 'MU', 'YT', 'MX', 'FM', 'MD', 'MC', 'MN', 'ME', 'MS', 'MA', 'MZ', 'MM', 'NA', + 'NR', 'NP', 'NL', 'NC', 'NZ', 'NI', 'NE', 'NG', 'NU', 'NF', 'MP', 'NO', 'OM', 'PK', + 'PW', 'PS', 'PA', 'PG', 'PY', 'PE', 'PH', 'PN', 'PL', 'PT', 'PR', 'QA', 'RE', 'RO', + 'RU', 'RW', 'BL', 'SH', 'KN', 'LC', 'MF', 'PM', 'VC', 'WS', 'SM', 'ST', 'SA', 'SN', + 'RS', 'SC', 'SL', 'SG', 'SX', 'SK', 'SI', 'SB', 'SO', 'ZA', 'GS', 'SS', 'ES', 'LK', + 'SD', 'SR', 'SJ', 'SZ', 'SE', 'CH', 'SY', 'TW', 'TJ', 'TZ', 'TH', 'TL', 'TG', 'TK', + 'TO', 'TT', 'TN', 'TR', 'TM', 'TC', 'TV', 'UG', 'UA', 'AE', 'GB', 'US', 'UM', 'UY', + 'UZ', 'VU', 'VE', 'VN', 'VG', 'VI', 'WF', 'EH', 'YE', 'ZM', 'ZW', + ]; + + if ( in_array( $country, $iso_3166_codes ) ) { + return true; + } + return false; + } + } -- To view, visit https://gerrit.wikimedia.org/r/324789 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id84acd41063242815fdbc9692023a6c235de80e7 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/FundraiserLandingPage Gerrit-Branch: master Gerrit-Owner: Ejegg Gerrit-Reviewer: AndyRussG Gerrit-Reviewer: Cdentinger Gerrit-Reviewer: Eileen Gerrit-Reviewer: Katie Horn Gerrit-Reviewer: Mepps Gerrit-Reviewer: XenoRyet Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Batch look up order status for Ingenico
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/328858 ) Change subject: Batch look up order status for Ingenico .. Batch look up order status for Ingenico Change-Id: Ibc748223e3c7c2cd3d08925eb6b8853c3dc6d7af --- A globalcollect_gateway/scripts/get_orderstatus.php 1 file changed, 66 insertions(+), 0 deletions(-) Approvals: Mepps: Looks good to me, approved jenkins-bot: Verified diff --git a/globalcollect_gateway/scripts/get_orderstatus.php b/globalcollect_gateway/scripts/get_orderstatus.php new file mode 100644 index 000..c339549 --- /dev/null +++ b/globalcollect_gateway/scripts/get_orderstatus.php @@ -0,0 +1,66 @@ +addOption( 'file', 'Read order IDs in from a file', + true, true, 'f' ); + } + + public function execute() { + global $wgGlobalCollectGatewayEnableCustomFilters; + + // don't run fraud checks + $wgGlobalCollectGatewayEnableCustomFilters = false; + + $filename = $this->getOption( 'file' ); + if ( !( $file = fopen( $filename, 'r' ) ) ) { + $this->error( 'Could not find order id file: ' . $filename, true ); + } + while ( $order = fgetcsv( $file ) ) { + $effort_id = 1; + if ( count( $order ) === 2 ) { + $effort_id = $order[1]; + } elseif ( count( $order ) !== 1 ) { + $this->error( 'Input lines must have either one or two columns', true ); + } + $oid = $order[0]; + $gateway_opts = array( + 'batch_mode' => true, + 'external_data' => array( + 'order_id' => $oid, + 'effort_id' => $effort_id, + 'payment_method' => 'cc', + 'payment_submethod' => 'visa', + 'currency_code' => 'USD', + 'amount' => 500, + ), + ); + + $this->output( "Looking up transaction $oid\n" ); + $adapter = new GlobalCollectAdapter( $gateway_opts ); + // FIXME: effort_id is clobbered in setGatewayDefaults + $adapter->addRequestData( array( 'effort_id' => $effort_id ) ); + $result = $adapter->do_transaction( 'GET_ORDERSTATUS' ); + + // TODO: better formatting? + $this->output( print_r( $result->getData(), true ) ); + } + fclose( $file ); + } +} + +$maintClass = 'IngenicoGetOrderStatusMaintenance'; +require_once RUN_MAINTENANCE_IF_MAIN; -- To view, visit https://gerrit.wikimedia.org/r/328858 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibc748223e3c7c2cd3d08925eb6b8853c3dc6d7af Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Ejegg Gerrit-Reviewer: AndyRussG Gerrit-Reviewer: Cdentinger Gerrit-Reviewer: Mepps Gerrit-Reviewer: XenoRyet Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiAuth[master]: Ensure creds are always set in primary provider
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405807 ) Change subject: Ensure creds are always set in primary provider .. Ensure creds are always set in primary provider We need to explicitly set the user's pw in the primary provider on account creation, as AuthManager makes no assumptions about it, and as such users were getting set up with null credentials (preventing them from logging in). Now that this is resolved, re-enabled the secondary screen to change password as default. Change-Id: Icf549f241181976af2398051542f0140b0d62f63 --- M ExternalWikiPrimaryAuthenticationProvider.php M extension.json 2 files changed, 14 insertions(+), 2 deletions(-) Approvals: Skizzerz: Looks good to me, approved jenkins-bot: Verified diff --git a/ExternalWikiPrimaryAuthenticationProvider.php b/ExternalWikiPrimaryAuthenticationProvider.php index 4de21dd..686e5ba 100644 --- a/ExternalWikiPrimaryAuthenticationProvider.php +++ b/ExternalWikiPrimaryAuthenticationProvider.php @@ -13,6 +13,7 @@ { protected $cookieJar; private $userCache = []; + private $pwKey = 'MediaWikiAuth-userpw'; // should be private const, but that's PHP 7.1+ public function __construct( array $params = [] ) { parent::__construct( $params ); @@ -56,6 +57,10 @@ return AuthenticationResponse::newAbstain(); } + // Save the user password so we can set it in autoCreatedAccount (otherwise the user has + // null credentials unless they go through the optional password change process) + $this->manager->setAuthenticationSessionData( $this->pwKey, $req->password ); + // Grab remote MediaWiki version; our auth flow depends on what we get back $resp = $this->apiRequest( 'GET', [ 'action' => 'query', @@ -89,6 +94,7 @@ if ( $resp->login->result !== 'Success' ) { $this->logger->info( 'Authentication against legacy remote API failed for reason ' . $resp->login->result, [ 'remoteVersion' => $remoteVersion, 'caller' => __METHOD__, 'username' => $username ] ); + $this->manager->removeAuthenticationSessionData( $this->pwKey ); return AuthenticationResponse::newFail( wfMessage( 'mwa-authfail' ) ); } } else { @@ -117,6 +123,7 @@ if ( $resp->clientlogin->status !== 'PASS' ) { $this->logger->info( 'Authentication against modern remote API failed for reason ' . $resp->clientlogin->status, [ 'remoteVersion' => $remoteVersion, 'caller' => __METHOD__, 'username' => $username ] ); + $this->manager->removeAuthenticationSessionData( $this->pwKey ); return AuthenticationResponse::newFail( wfMessage( 'mwa-authfail' ) ); } } @@ -143,6 +150,11 @@ return; } + // ensure the user can log in even if we don't do secondary password reset + $password = $this->manager->getAuthenticationSessionData( $this->pwKey ); + $this->manager->removeAuthenticationSessionData( $this->pwKey ); + $user->setPassword( $password ); + // $user->saveChanges() is called automatically after this runs, // so calling it ourselves is not necessary. // This is where we fetch user preferences and watchlist to save locally. diff --git a/extension.json b/extension.json index d62130b..3a0b39e 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "MediaWikiAuth", - "version": "1.0.0", + "version": "1.1.0", "author": [ "Laurence Parry", "Jack Phoenix", @@ -12,7 +12,7 @@ "license-name": "GPL-2.0+", "type": "other", "config": { - "MediaWikiAuthAllowPasswordChange": false, + "MediaWikiAuthAllowPasswordChange": true, "MediaWikiAuthApiUrl": "", "MediaWikiAuthImportGroups": true, "MediaWikiAuthImportWatchlist": true, -- To view, visit https://gerrit.wikimedia.org/r/405807 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf549f241181976af2398051542f0140b0d62f63 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MediaWikiAuth Gerrit-Branch: master Gerrit-Owner: Skizzerz Gerrit-Reviewer: Daniel Friesen Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Skizzerz Gerrit-Reviewer: jenkins-bot <> ___
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Remove
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405809 ) Change subject: Remove
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Remove
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405809 ) Change subject: Remove
[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Replace deprecated wfSuppress- and wfRestoreWarnings functions
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405686 ) Change subject: Replace deprecated wfSuppress- and wfRestoreWarnings functions .. Replace deprecated wfSuppress- and wfRestoreWarnings functions Change-Id: I38b1cf6ada62f575ca625c69a4c4d6e7788f1067 --- M includes/specials/SpecialMergeAccount.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialMergeAccount.php b/includes/specials/SpecialMergeAccount.php index 4b87a58..513974c 100644 --- a/includes/specials/SpecialMergeAccount.php +++ b/includes/specials/SpecialMergeAccount.php @@ -146,14 +146,14 @@ * @return array|mixed */ private function getWorkingPasswords() { - wfSuppressWarnings(); + MediaWiki\suppressWarnings(); $data = RequestContext::getMain()->getRequest()->getSessionData( 'wsCentralAuthMigration' ); $passwords = unserialize( gzinflate( $this->xorString( $data[$this->mSessionToken], $this->mSessionKey ) ) ); - wfRestoreWarnings(); + MediaWiki\restoreWarnings(); if ( is_array( $passwords ) ) { return $passwords; } -- To view, visit https://gerrit.wikimedia.org/r/405686 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38b1cf6ada62f575ca625c69a4c4d6e7788f1067 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: WMDE-Fisch Gerrit-Reviewer: Hoo man Gerrit-Reviewer: Legoktm Gerrit-Reviewer: WMDE-Fisch Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetdb: add major version and package variant parameters
Herron has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405808 ) Change subject: puppetdb: add major version and package variant parameters .. puppetdb: add major version and package variant parameters Add parameters to support different versions of puppetdb. puppetdb_major_version - major version of puppetdb to configure puppetdb_package_variant - variant of package (e.g. debian, puppetlabs) to deploy and configure Near term these are meant to facilitate a parallel upgrade of puppetdb. Longer term they should be helpful in selecting between puppetdb packages from different maintainers which share the same name (e.g. puppetlabs or debian packages). Bug: T185501 Change-Id: I0e19c279e295ca097d8ecc6d9396ec931221752a --- M modules/profile/manifests/puppetdb.pp M modules/puppetdb/manifests/app.pp M modules/puppetmaster/manifests/puppetdb.pp 3 files changed, 31 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/08/405808/1 diff --git a/modules/profile/manifests/puppetdb.pp b/modules/profile/manifests/puppetdb.pp index 7c9bea8..56adfad 100644 --- a/modules/profile/manifests/puppetdb.pp +++ b/modules/profile/manifests/puppetdb.pp @@ -3,17 +3,22 @@ $puppetmasters = hiera('puppetmaster::servers'), $jvm_opts = hiera('profile::puppetdb::jvm_opts', '-Xmx4G'), $prometheus_nodes = hiera('prometheus_nodes'), +$puppetdb_major_version = hiera('puppetdb_major_version', undef), +$puppetdb_package_variant = hiera('puppetdb_package_variant', undef), ) { + # Prometheus JMX agent for the Puppetdb's JVM $jmx_exporter_config_file = '/etc/puppetdb/jvm_prometheus_puppetdb_jmx_exporter.yaml' $prometheus_jmx_exporter_port = 9400 $prometheus_java_opts = "-javaagent:/usr/share/java/prometheus/jmx_prometheus_javaagent.jar=${::ipaddress}:${prometheus_jmx_exporter_port}:${jmx_exporter_config_file}" + # The JVM heap size has been raised to 6G for T170740 class { '::puppetmaster::puppetdb': -master => $master, -jvm_opts => "${jvm_opts} ${prometheus_java_opts}", +master => $master, +jvm_opts => "${jvm_opts} ${prometheus_java_opts}", +puppetdb_major_version => $puppetdb_major_version, +puppetdb_package_variant => $puppetdb_package_variant, } - # Export JMX metrics to prometheus profile::prometheus::jmx_exporter { "puppetdb_${::hostname}": @@ -23,7 +28,6 @@ config_file => $jmx_exporter_config_file, source => 'puppet:///modules/profile/puppetmaster/puppetdb/jvm_prometheus_puppetdb_jmx_exporter.yaml', } - # Firewall rules @@ -42,4 +46,5 @@ port => 443, srange => '$CUMIN_MASTERS', } + } diff --git a/modules/puppetdb/manifests/app.pp b/modules/puppetdb/manifests/app.pp index 1b64d57..32f9d75 100644 --- a/modules/puppetdb/manifests/app.pp +++ b/modules/puppetdb/manifests/app.pp @@ -1,8 +1,18 @@ # == Class puppetdb::app # # Sets up the puppetdb clojure app. -# This assumes you're using +# This assumes you're using ...magic! # +# === Parameters +# +# [*puppetdb_major_version*] +# Major version of puppetdb to configure. +# values: 4 or undef (default) +# +# [*puppetdb_package_variant*] +# Package(er) variant. +# values: "puppetlabs" or undef (default) + class puppetdb::app( $db_rw_host, $ca_path='/etc/ssl/certs/Puppet_Internal_CA.pem', @@ -15,6 +25,8 @@ $bind_ip=undef, $ssldir=puppet_ssldir(), $command_processing_threads=16, +$puppetdb_major_version=undef, +$puppetdb_package_variant=undef, ) { requires_os('debian >= jessie') diff --git a/modules/puppetmaster/manifests/puppetdb.pp b/modules/puppetmaster/manifests/puppetdb.pp index 5f88710..a941e10 100644 --- a/modules/puppetmaster/manifests/puppetdb.pp +++ b/modules/puppetmaster/manifests/puppetdb.pp @@ -6,6 +6,8 @@ $port = 443, $jetty_port = 8080, $jvm_opts ='-Xmx4G', +$puppetdb_major_version=undef, +$puppetdb_package_variant=undef, ) { requires_os('debian >= jessie') @@ -34,10 +36,12 @@ ## PuppetDB installation class { 'puppetdb::app': -db_rw_host => $master, -db_ro_host => $::fqdn, -db_password => $puppetdb_pass, -perform_gc => ($master == $::fqdn), # only the master must perform GC -jvm_opts=> $jvm_opts, +db_rw_host => $master, +db_ro_host => $::fqdn, +db_password => $puppetdb_pass, +perform_gc => ($master == $::fqdn), # only the master must perform GC +jvm_opts => $jvm_opts, +puppetdb_major_version => $puppetdb_major_version, +puppetdb_package_variant => $puppetdb_package_variant, } } -- To view, visi
[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiAuth[master]: Ensure creds are always set in primary provider
Skizzerz has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405807 ) Change subject: Ensure creds are always set in primary provider .. Ensure creds are always set in primary provider We need to explicitly set the user's pw in the primary provider on account creation, as AuthManager makes no assumptions about it, and as such users were getting set up with null credentials (preventing them from logging in). Now that this is resolved, re-enabled the secondary screen to change password as default. Change-Id: Icf549f241181976af2398051542f0140b0d62f63 --- M ExternalWikiPrimaryAuthenticationProvider.php M extension.json 2 files changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiAuth refs/changes/07/405807/1 diff --git a/ExternalWikiPrimaryAuthenticationProvider.php b/ExternalWikiPrimaryAuthenticationProvider.php index 4de21dd..686e5ba 100644 --- a/ExternalWikiPrimaryAuthenticationProvider.php +++ b/ExternalWikiPrimaryAuthenticationProvider.php @@ -13,6 +13,7 @@ { protected $cookieJar; private $userCache = []; + private $pwKey = 'MediaWikiAuth-userpw'; // should be private const, but that's PHP 7.1+ public function __construct( array $params = [] ) { parent::__construct( $params ); @@ -56,6 +57,10 @@ return AuthenticationResponse::newAbstain(); } + // Save the user password so we can set it in autoCreatedAccount (otherwise the user has + // null credentials unless they go through the optional password change process) + $this->manager->setAuthenticationSessionData( $this->pwKey, $req->password ); + // Grab remote MediaWiki version; our auth flow depends on what we get back $resp = $this->apiRequest( 'GET', [ 'action' => 'query', @@ -89,6 +94,7 @@ if ( $resp->login->result !== 'Success' ) { $this->logger->info( 'Authentication against legacy remote API failed for reason ' . $resp->login->result, [ 'remoteVersion' => $remoteVersion, 'caller' => __METHOD__, 'username' => $username ] ); + $this->manager->removeAuthenticationSessionData( $this->pwKey ); return AuthenticationResponse::newFail( wfMessage( 'mwa-authfail' ) ); } } else { @@ -117,6 +123,7 @@ if ( $resp->clientlogin->status !== 'PASS' ) { $this->logger->info( 'Authentication against modern remote API failed for reason ' . $resp->clientlogin->status, [ 'remoteVersion' => $remoteVersion, 'caller' => __METHOD__, 'username' => $username ] ); + $this->manager->removeAuthenticationSessionData( $this->pwKey ); return AuthenticationResponse::newFail( wfMessage( 'mwa-authfail' ) ); } } @@ -143,6 +150,11 @@ return; } + // ensure the user can log in even if we don't do secondary password reset + $password = $this->manager->getAuthenticationSessionData( $this->pwKey ); + $this->manager->removeAuthenticationSessionData( $this->pwKey ); + $user->setPassword( $password ); + // $user->saveChanges() is called automatically after this runs, // so calling it ourselves is not necessary. // This is where we fetch user preferences and watchlist to save locally. diff --git a/extension.json b/extension.json index d62130b..5e4f606 100644 --- a/extension.json +++ b/extension.json @@ -12,7 +12,7 @@ "license-name": "GPL-2.0+", "type": "other", "config": { - "MediaWikiAuthAllowPasswordChange": false, + "MediaWikiAuthAllowPasswordChange": true, "MediaWikiAuthApiUrl": "", "MediaWikiAuthImportGroups": true, "MediaWikiAuthImportWatchlist": true, -- To view, visit https://gerrit.wikimedia.org/r/405807 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf549f241181976af2398051542f0140b0d62f63 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MediaWikiAuth Gerrit-Branch: master Gerrit-Owner: Skizzerz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: install_server: update MAC of bast3003
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405803 ) Change subject: install_server: update MAC of bast3003 .. install_server: update MAC of bast3003 Instead of ms-be3003, use former amslvs4 as the new bast3003. It's in OE12 and also a Dell R410 like bast3001 and bast3002. Update the MAC address for DHCP accordingly. Bug: T184936 Change-Id: If0faef3676ab2f600d8238baab0a30de137ec744 --- M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 index e31150b..59b4c94 100644 --- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -420,7 +420,7 @@ } host bast3003 { -hardware ethernet 24:B6:FD:F6:17:3A; +hardware ethernet a4:ba:db:38:e4:cb; fixed-address bast3003.wikimedia.org; next-server 208.80.154.22; # install1002 (tftp server) -- To view, visit https://gerrit.wikimedia.org/r/405803 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If0faef3676ab2f600d8238baab0a30de137ec744 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn Gerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: apache: rm helper_scripts class, mv script to deployment_server
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405806 ) Change subject: apache: rm helper_scripts class, mv script to deployment_server .. apache: rm helper_scripts class, mv script to deployment_server Remove the "helper_scripts" class from the apache module. All it does is install the apache-fast-test script but that isn't actually used in the apache module itself. Instead it is used in the deployment_server profile, so tin/naos. In I0142b229bfccd77cb9 i copied apache-fast-test from apache module to the new httpd module which will replace the apache module. Now move the file out of there as well and into profile/files/.. instead because it isn't actually for servers, it's for clients where users run tests against servers. Change-Id: If759d72e502401b835332d66e7d48f7b4489d8fe --- D modules/apache/manifests/helper_scripts.pp R modules/profile/files/mediawiki/deployment/server/apache-fast-test M modules/profile/manifests/mediawiki/deployment/server.pp 3 files changed, 8 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/06/405806/1 diff --git a/modules/apache/manifests/helper_scripts.pp b/modules/apache/manifests/helper_scripts.pp deleted file mode 100644 index e613be1..000 --- a/modules/apache/manifests/helper_scripts.pp +++ /dev/null @@ -1,11 +0,0 @@ -# helper scripts for apache changes -class apache::helper_scripts { - -file { '/usr/local/bin/apache-fast-test': -owner => 'root', -group => 'root', -mode => '0555', -source => 'puppet:///modules/apache/apache-fast-test', -} - -} diff --git a/modules/httpd/files/apache-fast-test b/modules/profile/files/mediawiki/deployment/server/apache-fast-test similarity index 100% rename from modules/httpd/files/apache-fast-test rename to modules/profile/files/mediawiki/deployment/server/apache-fast-test diff --git a/modules/profile/manifests/mediawiki/deployment/server.pp b/modules/profile/manifests/mediawiki/deployment/server.pp index 050ca4f..9150276 100644 --- a/modules/profile/manifests/mediawiki/deployment/server.pp +++ b/modules/profile/manifests/mediawiki/deployment/server.pp @@ -28,7 +28,6 @@ } class {'::apache': } -class {'::apache::helper_scripts': } class {'::mysql': } include network::constants @@ -116,4 +115,12 @@ # determining the state of git repos during deployments. require_package('percona-toolkit', 'tig') require_package('php5-readline') # bug T126262 + +# helper scripts for apache changes +file { '/usr/local/bin/apache-fast-test': +owner => 'root', +group => 'root', +mode => '0555', +source => 'puppet:///profiles/mediawiki/deployment/server/apache-fast-test', +} } -- To view, visit https://gerrit.wikimedia.org/r/405806 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If759d72e502401b835332d66e7d48f7b4489d8fe Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Empty state and minor bug fix
Sharvaniharan has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405805 ) Change subject: Empty state and minor bug fix .. Empty state and minor bug fix String correction to "No saved pages yet" when there are no articles on saved list. Fix: overflow option to display 'Remove from Saved' instead of 'Remove from ' Change-Id: Ie658c220bdd103f80a3f32d4604ca00216ea5761 --- M app/src/main/java/org/wikipedia/readinglist/ReadingListBookmarkMenu.java M app/src/main/java/org/wikipedia/readinglist/ReadingListItemActionsView.java M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java M app/src/main/res/layout/fragment_reading_lists.xml M app/src/main/res/values-af/strings.xml M app/src/main/res/values-ar/strings.xml M app/src/main/res/values-as/strings.xml M app/src/main/res/values-ast/strings.xml M app/src/main/res/values-ba/strings.xml M app/src/main/res/values-bg/strings.xml M app/src/main/res/values-bn/strings.xml M app/src/main/res/values-br/strings.xml M app/src/main/res/values-bs/strings.xml M app/src/main/res/values-ca/strings.xml M app/src/main/res/values-ckb/strings.xml M app/src/main/res/values-cs/strings.xml M app/src/main/res/values-cy/strings.xml M app/src/main/res/values-da/strings.xml M app/src/main/res/values-de/strings.xml M app/src/main/res/values-es/strings.xml M app/src/main/res/values-eu/strings.xml M app/src/main/res/values-fa/strings.xml M app/src/main/res/values-fi/strings.xml M app/src/main/res/values-fr/strings.xml M app/src/main/res/values-gl/strings.xml M app/src/main/res/values-hi/strings.xml M app/src/main/res/values-hr/strings.xml M app/src/main/res/values-hu/strings.xml M app/src/main/res/values-in/strings.xml M app/src/main/res/values-is/strings.xml M app/src/main/res/values-it/strings.xml M app/src/main/res/values-iw/strings.xml M app/src/main/res/values-ja/strings.xml M app/src/main/res/values-jv/strings.xml M app/src/main/res/values-ka/strings.xml M app/src/main/res/values-kab/strings.xml M app/src/main/res/values-ko/strings.xml M app/src/main/res/values-ksh/strings.xml M app/src/main/res/values-lb/strings.xml M app/src/main/res/values-lt/strings.xml M app/src/main/res/values-mk/strings.xml M app/src/main/res/values-mr/strings.xml M app/src/main/res/values-ms/strings.xml M app/src/main/res/values-my/strings.xml M app/src/main/res/values-nb/strings.xml M app/src/main/res/values-ne/strings.xml M app/src/main/res/values-nl/strings.xml M app/src/main/res/values-oc/strings.xml M app/src/main/res/values-pa/strings.xml M app/src/main/res/values-pt-rBR/strings.xml M app/src/main/res/values-pt/strings.xml M app/src/main/res/values-qq/strings.xml M app/src/main/res/values-ro/strings.xml M app/src/main/res/values-ru/strings.xml M app/src/main/res/values-sah/strings.xml M app/src/main/res/values-sd/strings.xml M app/src/main/res/values-shn/strings.xml M app/src/main/res/values-sk/strings.xml M app/src/main/res/values-sl/strings.xml M app/src/main/res/values-sr/strings.xml M app/src/main/res/values-su/strings.xml M app/src/main/res/values-sv/strings.xml M app/src/main/res/values-ta/strings.xml M app/src/main/res/values-tcy/strings.xml M app/src/main/res/values-th/strings.xml M app/src/main/res/values-tr/strings.xml M app/src/main/res/values-uk/strings.xml M app/src/main/res/values-ur/strings.xml M app/src/main/res/values-vi/strings.xml M app/src/main/res/values-zh-rTW/strings.xml M app/src/main/res/values-zh/strings.xml M app/src/main/res/values/strings.xml 72 files changed, 73 insertions(+), 72 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/05/405805/1 diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingListBookmarkMenu.java b/app/src/main/java/org/wikipedia/readinglist/ReadingListBookmarkMenu.java index c16211f..5e775c9 100644 --- a/app/src/main/java/org/wikipedia/readinglist/ReadingListBookmarkMenu.java +++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListBookmarkMenu.java @@ -59,7 +59,7 @@ if (listsContainingPage.size() == 1) { MenuItem removeItem = menu.getMenu().findItem(R.id.menu_remove_from_lists); removeItem.setTitle(context.getString(R.string.reading_list_remove_from_list, -listsContainingPage.get(0).title())); +listsContainingPage.get(0).isDefault() ? context.getString(R.string.default_reading_list_name) : listsContainingPage.get(0).title())); } menu.show(); } diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingListItemActionsView.java b/app/src/main/java/org/wikipedia/readinglist/ReadingListItemActionsView.java index bb9b23a..048a985 100644 --- a/app/src/main/java/org/wikipedia/readinglist/ReadingListItemActionsView.java +++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListItemActionsView.java @@ -6,6 +6,7 @@ import android.support.annotation.NonNull; import android.support.an
[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Update ogv.js to 1.5.4
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405221 ) Change subject: Update ogv.js to 1.5.4 .. Update ogv.js to 1.5.4 * fixes canPlayType, will be needed for video.js updates * compiler build chain update to emscripten 1.37.28 * minor internals cleanup * fixes playback on iOS 9 * fixes playback of short WebM files Also added 'grunt update-ogvjs' command to automate copying from the node_modules dir. Need to update package manually, then copy with the grunt command. Pinned the 'ogv' package to 1.5.4 so no surprises, update as needed. Change-Id: I0097f11baf6a0f055220a8f43133edf3007c3469 --- M Gruntfile.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-audio-opus-wasm.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-audio-opus-wasm.wasm M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-audio-opus.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-audio-vorbis-wasm.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-audio-vorbis-wasm.wasm M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-audio-vorbis.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-theora-wasm.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-theora-wasm.wasm M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-theora.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-vp8-wasm.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-vp8-wasm.wasm M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-vp8.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-vp9-wasm.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-vp9-wasm.wasm M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-video-vp9.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-demuxer-ogg-wasm.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-demuxer-ogg-wasm.wasm M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-demuxer-ogg.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-demuxer-webm-wasm.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-demuxer-webm-wasm.wasm M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-demuxer-webm.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-support.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-version.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-worker-audio.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-worker-video.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv.js M package.json 28 files changed, 1,125 insertions(+), 1,004 deletions(-) Approvals: jenkins-bot: Verified TheDJ: Looks good to me, approved Jforrester: Looks good to me, but someone else must approve -- To view, visit https://gerrit.wikimedia.org/r/405221 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0097f11baf6a0f055220a8f43133edf3007c3469 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/TimedMediaHandler Gerrit-Branch: master Gerrit-Owner: Brion VIBBER Gerrit-Reviewer: Jforrester Gerrit-Reviewer: TheDJ Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: httpd: copy apache-fast-test from apache module
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405802 ) Change subject: httpd: copy apache-fast-test from apache module .. httpd: copy apache-fast-test from apache module This script is still in use to test rewrite rule changes. Copy it from the apache module to the httpd module before we remove the apache module later and forget about it. While doing this also re-tabbed it and replaced literal tabs with 4 spaces. Change-Id: I0142b229bfccd77cb9457b974e5194686f5f1837 --- A modules/httpd/files/apache-fast-test 1 file changed, 253 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/httpd/files/apache-fast-test b/modules/httpd/files/apache-fast-test new file mode 100755 index 000..64e82e4 --- /dev/null +++ b/modules/httpd/files/apache-fast-test @@ -0,0 +1,253 @@ +#!/usr/bin/perl +# +# Copyright (c) 2014,2015 Jeff Green +# +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +# of the Software, and to permit persons to whom the Software is furnished to do +# so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +use strict; +no warnings 'threads'; +use threads; +use threads::shared; +use LWP::UserAgent; +use Net::DNS::Resolver; +use Time::HiRes; + +my $threads = 50; # how many concurrent threads? +my $timeout_limit = 3; # how many timeouts to tolerate before dropping a server +my $timeout = 10; # seconds before LWP gives up on a web request +my $pad_length = 25; # server hostname column width in report +my $default_staging_server = 'mwdebug1001.eqiad.wmnet'; + +# get a list of servers to test +my $servers; +if ($ARGV[1]) { +# explicit list of servers +for (@ARGV[1..$#ARGV]) { +chomp; +if (/^pybal$/) { +# list of production servers from pybal config (URL or local file) +$servers = get_server_list_from_pybal_config(qw( +http://config-master.eqiad.wmnet/pybal/eqiad/apaches +http://config-master.eqiad.wmnet/pybal/eqiad/api +http://config-master.eqiad.wmnet/pybal/codfw/apaches +http://config-master.eqiad.wmnet/pybal/codfw/api +)); +} elsif (/^(eqiad|codfw)$/i) { +my $dc = $1; +$servers = get_server_list_from_pybal_config(( +"http://config-master.eqiad.wmnet/pybal/$dc/apaches";, +"http://config-master.eqiad.wmnet/pybal/$dc/api"; +)); +} elsif (/^([\w\.]+)$/) { +$servers->{$1} = 1; +} +} +} else { +$servers->{$default_staging_server} = 1; +} + +# thread-shared variables used for test/result +my @queue : shared; # job_ids grouped in per-thread batches +my %result :shared; # threads return stuff here +my %timeouts :shared; # server timeout counter + +# read in the list of urls +my $urls; +if (defined $ARGV[0]) { +$urls = get_url_list($ARGV[0]); +} + +# do the server DNS lookups in advance, threading DNS lookups is fraught with peril +my $resolver = Net::DNS::Resolver->new; +for my $host (sort keys %{$servers}) { +my $answer = $resolver->search($host); +if ($answer) { +for my $r ($answer->answer) { +if ($r->type eq 'A') { +my $batch; +$servers->{$host} = $r->address; # grab the first A record +for my $url (sort keys %{$urls}) { +$batch .= "$servers->{$host}\t$url\n"; +} +push @queue, $batch if defined $batch; +last; +} +} +} +unless ($servers->{$host} > 1) { +print "[31mno IP found for $host[0m\n"; +delete $servers->{$host}; +} +} + +# informative output +if (scalar @queue) { +print "testing " . (keys %{$urls}) . ' urls on ' . (keys %{$servers}) . ' servers, totalling ' . +((keys %{$urls}) * (keys %{$servers})) . " requests\n"; +} else { +print "\n usage: $0 url_file [server spec]\n\n" . +" url_file: (web or
[MediaWiki-commits] [Gerrit] operations/dns[master]: rename amslvs4.mgmt to bast3003.mgmt
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405801 ) Change subject: rename amslvs4.mgmt to bast3003.mgmt .. rename amslvs4.mgmt to bast3003.mgmt Re-use amslvs4 as bast3003. It's in OE12 and decom'ed and shutdown. It's also a Dell R410 like bast3001 and bast3002. Bug: T184936 Change-Id: Iafe20563f1c2fd1ac6c1a38ff975d138ea142f30 --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 41575d5..e72ab38 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -168,7 +168,7 @@ 106 1H IN PTR amslvs1.mgmt.esams.wmnet. 107 1H IN PTR amslvs2.mgmt.esams.wmnet. 108 1H IN PTR amslvs3.mgmt.esams.wmnet. -109 1H IN PTR amslvs4.mgmt.esams.wmnet. +109 1H IN PTR bast3003.mgmt.esams.wmnet. 110 1H IN PTR bast3002.mgmt.esams.wmnet. 111 1H IN PTR nescio.mgmt.esams.wmnet. 112 1H IN PTR eeden.mgmt.esams.wmnet. diff --git a/templates/wmnet b/templates/wmnet index 4447c23..f0a8863 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -4375,7 +4375,7 @@ amslvs1 1H IN A10.21.0.106 amslvs2 1H IN A10.21.0.107 amslvs3 1H IN A10.21.0.108 -amslvs4 1H IN A10.21.0.109 +bast3003 1H IN A10.21.0.109 bast3001 1H IN A10.21.0.115 bast3002 1H IN A10.21.0.110 nescio1H IN A10.21.0.111 -- To view, visit https://gerrit.wikimedia.org/r/405801 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iafe20563f1c2fd1ac6c1a38ff975d138ea142f30 Gerrit-PatchSet: 3 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn Gerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CategoryTagSorter[master]: Convert CategoryTagSorter to use extension registration
MarcoAurelio has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405804 ) Change subject: Convert CategoryTagSorter to use extension registration .. Convert CategoryTagSorter to use extension registration Bug: T185528 Change-Id: I091ab3690adb2978a6f56b19ae5ca2af2eb94a74 --- R COPYING M CategoryTagSorter.php A extension.json R tests/phpunit/CategoryTagSorterTest.php 4 files changed, 38 insertions(+), 65 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CategoryTagSorter refs/changes/04/405804/1 diff --git a/LICENSE b/COPYING similarity index 100% rename from LICENSE rename to COPYING diff --git a/CategoryTagSorter.php b/CategoryTagSorter.php index 9ab9e07..5de0954 100644 --- a/CategoryTagSorter.php +++ b/CategoryTagSorter.php @@ -2,15 +2,13 @@ /** * CategoryTagSorter - Sort the category tags on every article page. * - * * @file * @ingroup Extensions * * @author Dan Barrett * @author Daniel Renfro * - * - * Copyright 2013 Vistaprint Schweiz GmbH. + * Copyright (C) 2013 Vistaprint Schweiz GmbH. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,66 +22,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - - -/** - * This is not a valid point of entry. - * - */ -if ( !defined( 'MEDIAWIKI' ) ) { - echo <<< EOT - To install my extension, put the following line in Localsettings.php: - require_once( "\$IP/extensions/CategoryTagSorter/CategoryTagSorter.php" ); -EOT; - exit( 1 ); +if ( function_exists( 'wfLoadExtension' ) ) { + wfLoadExtension( 'CategoryTagSorter' ); + // Keep i18n globals so mergeMessageFileList.php doesn't break + $wgMessagesDirs['CategoryTagSorter'] = __DIR__ . '/i18n'; + wfWarn( + 'Deprecated PHP entry point used for the CategoryTagSorter extension. ' . + 'Please use wfLoadExtension instead, ' . + 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' + ); + return; +} else { + die( 'This version of the CategoryTagSorter extension requires MediaWiki 1.29+' ); } - -/** - * Credits - * - */ -$wgExtensionCredits['other'][] = array( - 'name' => 'CategoryTagSorter', - 'author' => array( - '[https://www.mediawiki.org/wiki/User:Maiden_taiwan Dan Barrett]', - '[https://www.mediawiki.org/wiki/User:AlephNull Daniel Renfro]', - ), - 'url' => 'https://www.mediawiki.org/wiki/Extension:CategoryTagSorter', - 'descriptionmsg' => 'categorytagsorter-desc', - 'version' => '0.3.0', -); - -/** - * The body of the extension. - * - */ -$wgAutoloadClasses['CategoryTagSorter'] = __DIR__ . '/CategoryTagSorter_body.php'; - - -/** - * Internationalization/localization - * - */ -$wgMessagesDirs['CategoryTagSorter'] = __DIR__ . '/i18n'; - - - -/** - * Hooks - * - */ -$wgHooks['ParserBeforeTidy'][] = 'CategoryTagSorter::sort'; -$wgHooks['GetPreferences'][] = 'CategoryTagSorter::prefs'; -$wgHooks['UnitTestsList'][] = 'wfCategoryTagSorterUnitTests'; - - - -/** - * Add our unit-tests to the list - * - */ -function wfCategoryTagSorterUnitTests( array &$files ) { - $files[] = dirname( __FILE__ ) . '/tests/CategoryTagSorterTest.php'; - return true; -} ; diff --git a/extension.json b/extension.json new file mode 100644 index 000..38511dc --- /dev/null +++ b/extension.json @@ -0,0 +1,25 @@ +{ + "name": "CategoryTagSorter", + "version": "0.3.0", + "author": [ + "[https://www.mediawiki.org/wiki/User:Maiden_taiwan Dan Barrett]", + "[https://www.mediawiki.org/wiki/User:AlephNull Daniel Renfro]" + ], + "url": "https://www.mediawiki.org/wiki/Extension:CategoryTagSorter";, + "descriptionmsg": "categorytagsorter-desc", + "type": "other", + "MessagesDirs": { + "CategoryTagSorter": [ + "i18n" + ] + }, + "AutoloadClasses": { + "CategoryTagSorter": "CategoryTagSorter_body.php" + }, + "Hooks": { + "ParserBeforeTidy": "CategoryTagSorter::sort", + "GetPreferences": "CategoryTagSorter::prefs", + "UnitTestsList": "wfCategoryTagSorterUnitTests" + }, + "manifest_version": 2 +} diff --git a/tests/CategoryTagSorterTest.php b/tests/phpunit/CategoryTagSorterTest.php similarity index 100% rename from tests/CategoryTagSorterTest.php rename to tests/phpunit/CategoryTagSorterTest.php -- To view, visit https://gerrit.wikimedia.org/r/405804 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I091ab3690adb2978a6f56b19ae5ca2af2eb94a74 Gerrit-PatchSet: 1 Gerri
[MediaWiki-commits] [Gerrit] operations/puppet[production]: install_server: update MAC of bast3003
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405803 ) Change subject: install_server: update MAC of bast3003 .. install_server: update MAC of bast3003 Instead of ms-be3003, use former amslvs4 as the new bast3003. It's in OE12 and also a Dell R410 like bast3001 and bast3002. Update the MAC address for DHCP accordingly. Bug: T184936 Change-Id: If0faef3676ab2f600d8238baab0a30de137ec744 --- M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/03/405803/1 diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 index 805df13..08d7311 100644 --- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -420,7 +420,7 @@ } host bast3003 { -hardware ethernet 24:B6:FD:F6:17:3A; +hardware ethernet a4:ba:db:38:e4:cb; fixed-address bast3003.wikimedia.org; next-server 208.80.154.22; # install1002 (tftp server) -- To view, visit https://gerrit.wikimedia.org/r/405803 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0faef3676ab2f600d8238baab0a30de137ec744 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: httpd: copy apache-fast-test from apache module
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405802 ) Change subject: httpd: copy apache-fast-test from apache module .. httpd: copy apache-fast-test from apache module This script is still in use to test rewrite rule changes. Copy it from the apache module to the httpd module before we remove the apache module later and forget about it. Change-Id: I0142b229bfccd77cb9457b974e5194686f5f1837 --- A modules/httpd/files/apache-fast-test 1 file changed, 253 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/02/405802/1 diff --git a/modules/httpd/files/apache-fast-test b/modules/httpd/files/apache-fast-test new file mode 100755 index 000..609699e --- /dev/null +++ b/modules/httpd/files/apache-fast-test @@ -0,0 +1,253 @@ +#!/usr/bin/perl +# +# Copyright (c) 2014,2015 Jeff Green +# +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +# of the Software, and to permit persons to whom the Software is furnished to do +# so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +use strict; +no warnings 'threads'; +use threads; +use threads::shared; +use LWP::UserAgent; +use Net::DNS::Resolver; +use Time::HiRes; + +my $threads = 50; # how many concurrent threads? +my $timeout_limit = 3; # how many timeouts to tolerate before dropping a server +my $timeout = 10; # seconds before LWP gives up on a web request +my $pad_length = 25; # server hostname column width in report +my $default_staging_server = 'mwdebug1001.eqiad.wmnet'; + +# get a list of servers to test +my $servers; +if ($ARGV[1]) { + # explicit list of servers + for (@ARGV[1..$#ARGV]) { + chomp; + if (/^pybal$/) { + # list of production servers from pybal config (URL or local file) + $servers = get_server_list_from_pybal_config(qw( + http://config-master.eqiad.wmnet/pybal/eqiad/apaches + http://config-master.eqiad.wmnet/pybal/eqiad/api + http://config-master.eqiad.wmnet/pybal/codfw/apaches + http://config-master.eqiad.wmnet/pybal/codfw/api + )); + } elsif (/^(eqiad|codfw)$/i) { + my $dc = $1; + $servers = get_server_list_from_pybal_config(( + "http://config-master.eqiad.wmnet/pybal/$dc/apaches";, + "http://config-master.eqiad.wmnet/pybal/$dc/api"; + )); + } elsif (/^([\w\.]+)$/) { + $servers->{$1} = 1; + } + } +} else { + $servers->{$default_staging_server} = 1; +} + +# thread-shared variables used for test/result +my @queue : shared; # job_ids grouped in per-thread batches +my %result :shared; # threads return stuff here +my %timeouts :shared; # server timeout counter + +# read in the list of urls +my $urls; +if (defined $ARGV[0]) { + $urls = get_url_list($ARGV[0]); +} + +# do the server DNS lookups in advance, threading DNS lookups is fraught with peril +my $resolver = Net::DNS::Resolver->new; +for my $host (sort keys %{$servers}) { + my $answer = $resolver->search($host); + if ($answer) { + for my $r ($answer->answer) { + if ($r->type eq 'A') { + my $batch; + $servers->{$host} = $r->address; # grab the first A record + for my $url (sort keys %{$urls}) { + $batch .= "$servers->{$host}\t$url\n"; + } + push @queue, $batch if defined $batch; + last; + } + } + } + unless ($servers->{$host} > 1) { + print "[31mno IP found for $host[0m\n"; + delete $servers->{$host}
[MediaWiki-commits] [Gerrit] operations/dns[master]: rename amslvs4 to bast3003
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405801 ) Change subject: rename amslvs4 to bast3003 .. rename amslvs4 to bast3003 Re-use amslvs4 as bast3003. It's in OE12 and decom'ed and shutdown. Bug: T184936 Change-Id: Iafe20563f1c2fd1ac6c1a38ff975d138ea142f30 --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/01/405801/1 diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index f804e3b..f8a9f4f 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -168,7 +168,7 @@ 106 1H IN PTR amslvs1.mgmt.esams.wmnet. 107 1H IN PTR amslvs2.mgmt.esams.wmnet. 108 1H IN PTR amslvs3.mgmt.esams.wmnet. -109 1H IN PTR amslvs4.mgmt.esams.wmnet. +109 1H IN PTR bast3003.mgmt.esams.wmnet. 110 1H IN PTR bast3002.mgmt.esams.wmnet. 111 1H IN PTR nescio.mgmt.esams.wmnet. 112 1H IN PTR eeden.mgmt.esams.wmnet. diff --git a/templates/wmnet b/templates/wmnet index 9b6556d..f82e709 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -4389,7 +4389,7 @@ amslvs1 1H IN A10.21.0.106 amslvs2 1H IN A10.21.0.107 amslvs3 1H IN A10.21.0.108 -amslvs4 1H IN A10.21.0.109 +bast3003 1H IN A10.21.0.109 bast3001 1H IN A10.21.0.115 bast3002 1H IN A10.21.0.110 nescio1H IN A10.21.0.111 -- To view, visit https://gerrit.wikimedia.org/r/405801 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iafe20563f1c2fd1ac6c1a38ff975d138ea142f30 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...source[master]: [WIP] Add configurable transform function to JSONRefine
Ottomata has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405800 ) Change subject: [WIP] Add configurable transform function to JSONRefine .. [WIP] Add configurable transform function to JSONRefine Bug: T185237 Change-Id: If1272f7d354e94a0a140f71a9135389131c8a1eb --- A refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/ReflectUtils.scala M refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/SparkJsonToHive.scala A refinery-core/src/test/scala/org/wikimedia/analytics/refinery/core/TestReflectUtils.scala M refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/JsonRefine.scala 4 files changed, 145 insertions(+), 36 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source refs/changes/00/405800/1 diff --git a/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/ReflectUtils.scala b/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/ReflectUtils.scala new file mode 100644 index 000..7cfe209 --- /dev/null +++ b/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/ReflectUtils.scala @@ -0,0 +1,32 @@ +package org.wikimedia.analytics.refinery.core + +import scala.reflect.runtime.universe + +object ReflectUtils { + +/** + * Given a fully qualified String package.ObjectName and String method name, this + * Function will return a scala.reflect.runtime.universe.MethodMirror that can be + * used for calling the method on the object. Note that MethodMirror is not a direct + * reference to the actual method, and as such does not have compile time type + * and signature checking. You must ensure that you call the method with exactly the + * same arguments and types that the method expects, or you will get a runtime exception. + * + * @param moduleName Fully qualified name for an object, e.g. org.wikimedia.analytics.refinery.core.DeduplicateEventLogging + * @param methodName Name of method in the object. Default "apply". + * @return + */ +def getStaticMethodMirror(moduleName: String, methodName: String = "apply"): universe.MethodMirror = { +val mirror = universe.runtimeMirror(getClass.getClassLoader) +val module = mirror.staticModule(moduleName) +val method = module.typeSignature.member(universe.newTermName(methodName)).asMethod +val methodMirror = mirror.reflect(mirror.reflectModule(module).instance).reflectMethod(method) +if (!methodMirror.symbol.isMethod || !methodMirror.symbol.isStatic) { +throw new RuntimeException( +s"Cannot get static method for $moduleName.$methodName, it is not a static method" +) +} +methodMirror +} + +} diff --git a/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/SparkJsonToHive.scala b/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/SparkJsonToHive.scala index 8369104..dfb415c 100644 --- a/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/SparkJsonToHive.scala +++ b/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/SparkJsonToHive.scala @@ -4,9 +4,6 @@ import scala.util.control.Exception.{allCatch, ignoring} -import org.apache.hadoop.fs.Path - - import org.apache.hadoop.hive.metastore.api.AlreadyExistsException import org.apache.spark.sql.SQLContext @@ -19,7 +16,6 @@ // This allows us use these types with an extendend API // that includes schema merging and Hive DDL statement generation. import SparkSQLHiveExtensions._ - /** * Converts arbitrary JSON to Hive Parquet by 'evolving' the Hive table to @@ -66,29 +62,37 @@ * Reads inputPath as JSON data, creates or alters tableName in Hive to match the inferred * schema of the input JSON data, and then inserts the data into the table. * - * @param hiveContext Spark HiveContext + * @param hiveContext Spark HiveContext * - * @param inputPathPath to JSON data + * @param inputPath Path to JSON data * * - * @param partitionHivePartition. This helper class contains - * database and table name, as well as external location - * and partition keys and values. + * @param partition HivePartition. This helper class contains + * database and table name, as well as external location + * and partition keys and values. * - * @param isSequenceFile If true, inputPath is expected to contain JSON in - * Hadoop Sequence Files, else JSON in text files. + * @param isSequenceFileIf true, inputPath is expected to contain JSON in + * Hadoop Sequence Files, else JSON in text
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Allow euwiki bureaucrats to add/remove 'accountcreator' right
Framawiki has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405771 ) Change subject: Allow euwiki bureaucrats to add/remove 'accountcreator' right .. Allow euwiki bureaucrats to add/remove 'accountcreator' right Bug: T185531 Change-Id: If2bbbcb4059ff8d30b8cd936fa05019178d76a63 --- M wmf-config/InitialiseSettings.php 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/71/405771/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 58ddd66..12d0063 100755 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10064,6 +10064,9 @@ '+etwiki' => [ 'sysop' => [ 'autopatrolled' ], // T150852 ], + '+euwiki' => [ + 'bureaucrat' => [ 'accountcreator' ], // T185531 + ], '+fawiki' => [ 'bureaucrat' => [ 'Image-reviewer', // T66532 @@ -10806,6 +10809,9 @@ '+etwiki' => [ 'sysop' => [ 'autopatrolled' ], // T150852 ], + '+euwiki' => [ + 'bureaucrat' => [ 'accountcreator' ], // T185531 + ], '+fawiki' => [ 'bureaucrat' => [ 'Image-reviewer', // T66532 -- To view, visit https://gerrit.wikimedia.org/r/405771 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If2bbbcb4059ff8d30b8cd936fa05019178d76a63 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Framawiki ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...source[master]: Refactor json-refine and json-to-Druid for spark2
Joal has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405770 ) Change subject: Refactor json-refine and json-to-Druid for spark2 .. Refactor json-refine and json-to-Druid for spark2 Move all scala code from refinery-core to refinery-job Refactor json-refine and json-to-druid to use spark2 Change-Id: I9da1b69099a62dafa55f4dce2e2767606455c786 --- M refinery-core/pom.xml M refinery-job-spark-2.1/pom.xml R refinery-job-spark-2.1/src/main/resources/ingestion_spec_template.json R refinery-job-spark-2.1/src/main/scala/org/wikimedia/analytics/refinery/job/HivePartition.scala R refinery-job-spark-2.1/src/main/scala/org/wikimedia/analytics/refinery/job/JsonRefine.scala R refinery-job-spark-2.1/src/main/scala/org/wikimedia/analytics/refinery/job/SparkJsonToHive.scala R refinery-job-spark-2.1/src/main/scala/org/wikimedia/analytics/refinery/job/SparkSQLHiveExtensions.scala R refinery-job-spark-2.1/src/main/scala/org/wikimedia/analytics/refinery/job/connectors/TranquilityBeamFactories.scala M refinery-job-spark-2.1/src/main/scala/org/wikimedia/analytics/refinery/job/druid/BannerImpressionsStream.scala R refinery-job-spark-2.1/src/main/scala/org/wikimedia/analytics/refinery/job/druid/DataFrameToDruid.scala R refinery-job-spark-2.1/src/main/scala/org/wikimedia/analytics/refinery/job/druid/EventLoggingToDruid.scala R refinery-job-spark-2.1/src/test/scala/org/wikimedia/analytics/refinery/job/TestHivePartition.scala R refinery-job-spark-2.1/src/test/scala/org/wikimedia/analytics/refinery/job/TestJsonRefine.scala R refinery-job-spark-2.1/src/test/scala/org/wikimedia/analytics/refinery/job/TestSparkSQLHiveExtensions.scala R refinery-job-spark-2.1/src/test/scala/org/wikimedia/analytics/refinery/job/druid/TestDataFrameToDruid.scala R refinery-job-spark-2.1/src/test/scala/org/wikimedia/analytics/refinery/job/druid/TestEventLoggingToDruid.scala 16 files changed, 235 insertions(+), 363 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source refs/changes/70/405770/1 diff --git a/refinery-core/pom.xml b/refinery-core/pom.xml index 5e6d6f7..0151a02 100644 --- a/refinery-core/pom.xml +++ b/refinery-core/pom.xml @@ -74,31 +74,6 @@ guava 12.0 - - -org.scalamock -scalamock-scalatest-support_2.10 -3.2.2 -test - - - -org.scalatest -scalatest_2.10 -test - - - -com.github.nscala-time -nscala-time_2.10 - - - - -com.google.guava -guava -12.0 - org.reflections reflections @@ -106,52 +81,11 @@ -org.apache.spark -spark-sql_2.10 -${spark.version} -provided - - - -org.apache.spark -spark-hive_2.10 -${spark.version} -provided - - - - javax.mail mail 1.4.7 - -org.apache.hadoop -hadoop-common -provided - - - -javax.servlet -* - - - - - -com.holdenkarau -spark-testing-base_2.10 -1.6.0_0.4.7 -test - - - - -org.apache.httpcomponents -httpclient -4.5.3 - @@ -170,40 +104,6 @@ **/Test*.java - - - - -org.scala-tools -maven-scala-plugin -2.15.2 - - - -compile -testCompile - - - - - - - org.scalatest - scalatest-maven-plugin - 1.0 - - ${project.build.directory}/surefire-reports -. -WDF TestSuite.txt - - - - test - -test - - - diff --git a/refinery-job-spark-2.1/pom.xml b/refinery-job-spark-2.1/pom.xml index 63f0c82..e4b2f5b 100644 --- a/refinery-job-spark-2.1/pom.xml +++ b/refinery-job-spark-2.1/pom.xml @@ -56,7 +56,7 @@ org.apache.spark spark-hive_2.11 ${spark.version} -provided +test @@ -168,6 +168,21 @@ + +
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use MediaWiki\restoreWarnings in deprecated wfRestoreWarnings
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405741 ) Change subject: Use MediaWiki\restoreWarnings in deprecated wfRestoreWarnings .. Use MediaWiki\restoreWarnings in deprecated wfRestoreWarnings This will give devs a better hint on how to replace this. Change-Id: I2332b6173b7816aef11841725752745e174fa69f --- M includes/GlobalFunctions.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Fomafix: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index b181628..a06d721 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -2021,7 +2021,7 @@ * Restore error level to previous value */ function wfRestoreWarnings() { - MediaWiki\suppressWarnings( true ); + MediaWiki\restoreWarnings(); } /** -- To view, visit https://gerrit.wikimedia.org/r/405741 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2332b6173b7816aef11841725752745e174fa69f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: WMDE-Fisch Gerrit-Reviewer: Fomafix Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [cleanup] always use ¶ms; for pagegenerators options inc...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405581 ) Change subject: [cleanup] always use ¶ms; for pagegenerators options inclusion .. [cleanup] always use ¶ms; for pagegenerators options inclusion All scripts use ¶ms; token or include pagegenerators options except interwiki.py. Use the same token for all scripts. Change-Id: I6f3437c7ae31f79d8ec06c8e427dd9aafabc0686 --- M docs/conf.py M scripts/interwiki.py 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/conf.py b/docs/conf.py index 83c04f8..60cfe23 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Configuration file for Sphinx.""" # -# (C) Pywikibot team, 2015-2017 +# (C) Pywikibot team, 2015-2018 # # Distributed under the terms of the MIT license. # @@ -260,7 +260,7 @@ if os.path.sep + "scripts" + os.path.sep not in obj.__file__: return for index, line in enumerate(lines): -if line in ('¶ms;', '&pagegenerators_help;'): +if line == '¶ms;': lines[index] = ('This script supports use of ' ':py:mod:`pywikibot.pagegenerators` arguments.') elif line == '&fixes-help;': diff --git a/scripts/interwiki.py b/scripts/interwiki.py index b1bca2f..33b67e2 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -12,7 +12,7 @@ These command-line arguments can be used to specify which pages to work on: -&pagegenerators_help; +¶ms; -days: Like -years, but runs through all date pages. Stops at Dec 31. If the argument is given in the form -days:X, @@ -337,8 +337,8 @@ # (C) Rob W.W. Hooft, 2003 # (C) Daniel Herding, 2004 # (C) Yuri Astrakhan, 2005-2006 -# (C) xqt, 2009-2017 -# (C) Pywikibot team, 2007-2017 +# (C) xqt, 2009-2018 +# (C) Pywikibot team, 2007-2018 # # Distributed under the terms of the MIT license. # @@ -366,7 +366,7 @@ unicode = str docuReplacements = { -'&pagegenerators_help;': pagegenerators.parameterHelp +'¶ms;': pagegenerators.parameterHelp } -- To view, visit https://gerrit.wikimedia.org/r/405581 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6f3437c7ae31f79d8ec06c8e427dd9aafabc0686 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt Gerrit-Reviewer: Dalba Gerrit-Reviewer: Framawiki Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: FieldLayout: Fix help icon negative margin in Apex
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405758 ) Change subject: FieldLayout: Fix help icon negative margin in Apex .. FieldLayout: Fix help icon negative margin in Apex Bug: T185529 Change-Id: I30563754ea1f74e0a74caa0e52390b1a816a8406 --- M src/themes/apex/layouts.less 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/src/themes/apex/layouts.less b/src/themes/apex/layouts.less index 032c6d4..28e6572 100644 --- a/src/themes/apex/layouts.less +++ b/src/themes/apex/layouts.less @@ -38,7 +38,7 @@ // Override the default margin-right: 0; // Move into the space of `margin-right` of header - margin-left: -@size-icon; + margin-left: -( @size-icon + ( 2 * @padding-horizontal-frameless ) ); } > .oo-ui-fieldLayout-field { -- To view, visit https://gerrit.wikimedia.org/r/405758 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I30563754ea1f74e0a74caa0e52390b1a816a8406 Gerrit-PatchSet: 2 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Esanders Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Limit line length to 80 characters
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405037 ) Change subject: Limit line length to 80 characters .. Limit line length to 80 characters Enforce it with eslint. Ignore: * Comment lines with eslint disable directives * QUnit test lines as they contain long subjects (QUnit.* (only, test, module, skip, etc) * Strings, since long strings are used extensively in tests * Ignore template literals for similar reasons * Regex literals as they may be too long, but can't be easily split in several lines * Long urls See bug for more general proposal for eslint-wikimedia-config. Bug: T185295 Change-Id: I3aacaf46e61a4d96547c513073e179ef997deb09 --- M .eslintrc.json M resources/dist/index.js.json M src/actions.js M src/constants.js M src/formatter.js M src/gateway/index.js M src/gateway/rest.js M src/getUserBucket.js M src/index.js M src/instrumentation/eventLogging.js M src/preview/model.js M src/reducers/eventLogging.js M src/title.js M src/ui/renderer.js M src/ui/settingsDialog.js M src/userSettings.js M tests/node-qunit/actions.test.js M tests/node-qunit/changeListeners/render.test.js M tests/node-qunit/changeListeners/settings.test.js M tests/node-qunit/counts.test.js M tests/node-qunit/gateway/index.test.js M tests/node-qunit/gateway/mediawiki.test.js M tests/node-qunit/gateway/rest.test.js M tests/node-qunit/getUserBucket.test.js M tests/node-qunit/instrumentation/eventLogging.test.js M tests/node-qunit/integration.test.js M tests/node-qunit/preview/model.test.js M tests/node-qunit/reducers/eventLogging.test.js M tests/node-qunit/title.test.js M tests/node-qunit/ui/renderer.test.js M tests/node-qunit/userSettings.test.js 31 files changed, 395 insertions(+), 213 deletions(-) Approvals: Niedzielski: Looks good to me, but someone else must approve jenkins-bot: Verified Jdlrobson: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/405037 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3aacaf46e61a4d96547c513073e179ef997deb09 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: master Gerrit-Owner: Jhernandez Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: Jhernandez Gerrit-Reviewer: Niedzielski Gerrit-Reviewer: Phuedx Gerrit-Reviewer: Pmiazga Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: MWWikitextStringTransferHandler: Perform Parsoid cleanup on ...
DLynch has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405759 ) Change subject: MWWikitextStringTransferHandler: Perform Parsoid cleanup on result .. MWWikitextStringTransferHandler: Perform Parsoid cleanup on result Parsoid markup delivered as a result of a paste was being handled differently. Bug: T183173 Change-Id: Ic563d2c5cd1f663f35860892b369fb7ba34b9c55 --- M modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js M modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js 2 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/59/405759/1 diff --git a/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js b/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js index d913356..e9b9c8c 100644 --- a/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js +++ b/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js @@ -176,6 +176,21 @@ ] }, { + msg: 'Headings, parsoid fallback ids don\'t interfere with whitespace stripping', + pasteString: '== Tudnivalók ==', + pasteType: 'text/plain', + parsoidResponse: ' Tudnivalók ', + annotations: [], + assertDom: true, + expectedData: [ + { type: 'mwHeading', attributes: { level: 2 }, originalDomElements: $( ' Tudnivalók ' ).toArray() }, + 'T', 'u', 'd', 'n', 'i', 'v', 'a', 'l', 'ó', 'k', + { type: '/mwHeading' }, + { type: 'internalList' }, + { type: '/internalList' } + ] + }, + { msg: 'Magic link (RFC)', pasteString: 'RFC 1234', pasteType: 'text/plain', diff --git a/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js b/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js index 10aedba..2929f4d 100644 --- a/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js +++ b/modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js @@ -128,6 +128,11 @@ } } + // Strip Parsoid sections + ve.unwrapParsoidSections( htmlDoc.body ); + // Strip legacy IDs, for example in section headings + ve.stripParsoidFallbackIds( htmlDoc.body ); + // Pass an empty object for the second argument (importRules) so that clipboard mode is used // TODO: Fix that API doc = handler.surface.getModel().getDocument().newFromHtml( htmlDoc, {} ); -- To view, visit https://gerrit.wikimedia.org/r/405759 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic563d2c5cd1f663f35860892b369fb7ba34b9c55 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: DLynch ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Widgets: Allow titles with name of Object.prototypes
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/403893 ) Change subject: Widgets: Allow titles with name of Object.prototypes .. Widgets: Allow titles with name of Object.prototypes Bug: T184776 Change-Id: I1ba75e779e9c4f0ce5957d752a02da27044b9d07 --- M resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js M resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js M resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js 3 files changed, 14 insertions(+), 10 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js b/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js index 42ef1ac..17da7d8 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js @@ -6,6 +6,8 @@ */ ( function ( $, mw ) { + var hasOwn = Object.prototype.hasOwnProperty; + /** * @class mw.widgets.PageExistenceCache * @private @@ -38,10 +40,10 @@ queue = this.existenceCheckQueue; this.existenceCheckQueue = {}; titles = Object.keys( queue ).filter( function ( title ) { - if ( cache.existenceCache.hasOwnProperty( title ) ) { + if ( hasOwn.call( cache.existenceCache, title ) ) { queue[ title ].resolve( cache.existenceCache[ title ] ); } - return !cache.existenceCache.hasOwnProperty( title ); + return !hasOwn.call( cache.existenceCache, title ); } ); if ( !titles.length ) { return; @@ -63,7 +65,7 @@ } ); titles.forEach( function ( title ) { var normalizedTitle = title; - while ( normalized[ normalizedTitle ] ) { + while ( hasOwn.call( normalized, normalizedTitle ) ) { normalizedTitle = normalized[ normalizedTitle ]; } cache.existenceCache[ title ] = pages[ normalizedTitle ]; @@ -81,7 +83,7 @@ */ PageExistenceCache.prototype.checkPageExistence = function ( title ) { var key = title.getPrefixedText(); - if ( !this.existenceCheckQueue[ key ] ) { + if ( !hasOwn.call( this.existenceCheckQueue, key ) ) { this.existenceCheckQueue[ key ] = $.Deferred(); } this.processExistenceCheckQueueDebounced(); diff --git a/resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js b/resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js index d14a47a..045744c 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js @@ -5,7 +5,8 @@ * @license The MIT License (MIT); see LICENSE.txt */ ( function ( $, mw ) { - var NS_CATEGORY = mw.config.get( 'wgNamespaceIds' ).category; + var hasOwn = Object.prototype.hasOwnProperty, + NS_CATEGORY = mw.config.get( 'wgNamespaceIds' ).category; /** * Category selector widget. Displays an OO.ui.CapsuleMultiselectWidget @@ -273,7 +274,7 @@ cacheKey = input + searchType.toString(); // Check cache - if ( this.searchCache[ cacheKey ] !== undefined ) { + if ( hasOwn.call( this.searchCache, cacheKey ) ) { return this.searchCache[ cacheKey ]; } diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js index 0c6385b..190962c 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js @@ -5,6 +5,7 @@ * @license The MIT License (MIT); see LICENSE.txt */ ( function ( $, mw ) { + var hasOwn = Object.prototype.hasOwnProperty; /** * Mixin for title widgets @@ -254,7 +255,7 @@ titles.push( suggestionPage.title ); } - redirects = redirectsTo[ suggestionPage.title ] || []; + redirects = hasOwn.call( redirectsTo, suggestionPage.title ) ? redirectsTo[ suggestionPage.title ] : []; for ( i = 0, len = redirects.length; i < len; i++ ) { pageData[ redirects[ i ] ] = {
[MediaWiki-commits] [Gerrit] oojs/ui[master]: RadioSelectInputWidget, CheckboxMultiselectInputWidget: Fix ...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405756 ) Change subject: RadioSelectInputWidget, CheckboxMultiselectInputWidget: Fix spacing between options in PHP (Apex theme) .. RadioSelectInputWidget, CheckboxMultiselectInputWidget: Fix spacing between options in PHP (Apex theme) Follow-up to badb35947c222850ffe801a0b480e83c0f6f5818. Change-Id: I6c2264f6ea3cd4bfb01032d2ae2978e407f89d06 --- M src/themes/apex/widgets.less 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less index a549604..d1bee1e 100644 --- a/src/themes/apex/widgets.less +++ b/src/themes/apex/widgets.less @@ -171,7 +171,7 @@ .theme-oo-ui-checkboxMultiselectInputWidget () { .oo-ui-fieldLayout { - margin-bottom: 0; + margin-top: 0; .oo-ui-fieldLayout-body { padding: @padding-vertical-label 0; @@ -931,7 +931,7 @@ .theme-oo-ui-radioSelectInputWidget () { .oo-ui-fieldLayout { - margin-bottom: 0; + margin-top: 0; .oo-ui-fieldLayout-body { padding: @padding-vertical-label 0; -- To view, visit https://gerrit.wikimedia.org/r/405756 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c2264f6ea3cd4bfb01032d2ae2978e407f89d06 Gerrit-PatchSet: 2 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: VolkerE Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Fix help icon negative margin in Apex
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405758 ) Change subject: Fix help icon negative margin in Apex .. Fix help icon negative margin in Apex Bug: T185529 Change-Id: I30563754ea1f74e0a74caa0e52390b1a816a8406 --- M src/themes/apex/layouts.less 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/58/405758/1 diff --git a/src/themes/apex/layouts.less b/src/themes/apex/layouts.less index 032c6d4..28e6572 100644 --- a/src/themes/apex/layouts.less +++ b/src/themes/apex/layouts.less @@ -38,7 +38,7 @@ // Override the default margin-right: 0; // Move into the space of `margin-right` of header - margin-left: -@size-icon; + margin-left: -( @size-icon + ( 2 * @padding-horizontal-frameless ) ); } > .oo-ui-fieldLayout-field { -- To view, visit https://gerrit.wikimedia.org/r/405758 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I30563754ea1f74e0a74caa0e52390b1a816a8406 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.special.upload: Use ES5 .forEach() instead of jQuery
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405261 ) Change subject: mediawiki.special.upload: Use ES5 .forEach() instead of jQuery .. mediawiki.special.upload: Use ES5 .forEach() instead of jQuery Replace * $.each( array, function ( index, value ) { ... } ) by array.forEach( function ( value ) { ... } ) Change-Id: I0574f130e93b53895e2c76363285084a6df05649 --- M resources/src/mediawiki.special/mediawiki.special.upload.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/src/mediawiki.special/mediawiki.special.upload.js b/resources/src/mediawiki.special/mediawiki.special.upload.js index 5934278..3007c6a 100644 --- a/resources/src/mediawiki.special/mediawiki.special.upload.js +++ b/resources/src/mediawiki.special/mediawiki.special.upload.js @@ -194,7 +194,7 @@ } // fillDestFile setup - $.each( mw.config.get( 'wgUploadSourceIds' ), function ( index, sourceId ) { + mw.config.get( 'wgUploadSourceIds' ).forEach( function ( sourceId ) { $( '#' + sourceId ).change( function () { var path, slash, backslash, fname; if ( !mw.config.get( 'wgUploadAutoFill' ) ) { -- To view, visit https://gerrit.wikimedia.org/r/405261 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0574f130e93b53895e2c76363285084a6df05649 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Fomafix Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Remove Firefox support comment
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405753 ) Change subject: Remove Firefox support comment .. Remove Firefox support comment This line isn't solely for supporting FF52, that is the order in which it is called (move after attach, not before), but that matches all our other widgets, so not sure it needs commenting. Change-Id: I6f3cc5687f1e4b995dff700d0765d14de1927d51 --- M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: DLynch: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js index 832dadc..d9f9d40 100644 --- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js +++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js @@ -139,7 +139,6 @@ // Resize the textarea to fit content. We could do this more often (e.g. on change) // but hopefully this temporary textarea won't be visible for too long. - // Support: Firefox =< 52 tempWikitextEditor.adjustSize().moveCursorToStart(); ve.track( 'mwedit.ready', { mode: 'source' } ); } -- To view, visit https://gerrit.wikimedia.org/r/405753 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6f3cc5687f1e4b995dff700d0765d14de1927d51 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders Gerrit-Reviewer: DLynch Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: OOjs UI: Fix z-index and font size for default overlay
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404048 ) Change subject: OOjs UI: Fix z-index and font size for default overlay .. OOjs UI: Fix z-index and font size for default overlay OOUI dropdown menus should appear on top of the fixed header and their font size should match the body text. For example, on Special:MovePage: * Before: https://phabricator.wikimedia.org/F12517634 * After: https://phabricator.wikimedia.org/F12517632 Bug: T183069 Change-Id: I291d852f49507e58082ac95e59cb115170aa809a --- A resources/ooui.less M skin.json 2 files changed, 5 insertions(+), 0 deletions(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/ooui.less b/resources/ooui.less new file mode 100644 index 000..efa2c96 --- /dev/null +++ b/resources/ooui.less @@ -0,0 +1,4 @@ +.oo-ui-defaultOverlay { + z-index: 101; + font-size: 0.95em; +} diff --git a/skin.json b/skin.json index 525ee10..cb2e151 100644 --- a/skin.json +++ b/skin.json @@ -80,6 +80,7 @@ }, "ResourceModuleSkinStyles": { "timeless": { + "+oojs-ui-core.styles": "resources/ooui.less", "+ext.echo.styles.badge": "resources/extensions/Echo.less", "+ext.visualEditor.core": "resources/extensions/VisualEditor.core.less", "+ext.visualEditor.desktopArticleTarget.noscript": "resources/extensions/VisualEditor.article.less" -- To view, visit https://gerrit.wikimedia.org/r/404048 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I291d852f49507e58082ac95e59cb115170aa809a Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/skins/Timeless Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński Gerrit-Reviewer: Anomie Gerrit-Reviewer: Catrope Gerrit-Reviewer: Esanders Gerrit-Reviewer: Isarra Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[master]: Remove 'moodbar' from the createExtensionTables.php
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405596 ) Change subject: Remove 'moodbar' from the createExtensionTables.php .. Remove 'moodbar' from the createExtensionTables.php The extension was dropped from WMF wikis some time ago already and has also been archived so there's no need for this here anymore. Bug: T185525 Change-Id: I47ca70c4663a20a91af2b183fbf11aa16c3e5fe6 --- M createExtensionTables.php 1 file changed, 0 insertions(+), 8 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/createExtensionTables.php b/createExtensionTables.php index 6a8f707..a6561de 100644 --- a/createExtensionTables.php +++ b/createExtensionTables.php @@ -78,14 +78,6 @@ $path = "$IP/extensions/Linter"; break; - case 'moodbar': - $files = [ - 'MoodBar.sql', - 'moodbar_feedback_response.sql', - ]; - $path = "$IP/extensions/MoodBar/sql"; - break; - case 'newsletter': $files = [ 'nl_newsletters.sql', -- To view, visit https://gerrit.wikimedia.org/r/405596 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I47ca70c4663a20a91af2b183fbf11aa16c3e5fe6 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/WikimediaMaintenance Gerrit-Branch: master Gerrit-Owner: MarcoAurelio Gerrit-Reviewer: Chad Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: OOjs UI: Display windows on top of the fixed header
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404333 ) Change subject: OOjs UI: Display windows on top of the fixed header .. OOjs UI: Display windows on top of the fixed header Workaround copied from Vector. Bug: T183284 Change-Id: I7a4847f8d7c81e30610964762d6e591d753fa207 --- M resources/ooui.less 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/ooui.less b/resources/ooui.less index efa2c96..fe8a116 100644 --- a/resources/ooui.less +++ b/resources/ooui.less @@ -1,3 +1,8 @@ +.skin-timeless .oo-ui-windowManager-modal > .oo-ui-dialog, +.skin-timeless .ve-ui-overlay-global { + z-index: 101; +} + .oo-ui-defaultOverlay { z-index: 101; font-size: 0.95em; -- To view, visit https://gerrit.wikimedia.org/r/404333 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7a4847f8d7c81e30610964762d6e591d753fa207 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/skins/Timeless Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Catrope Gerrit-Reviewer: Esanders Gerrit-Reviewer: Framawiki Gerrit-Reviewer: Isarra Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use getSize since SearchSuggestionSet does not implement Cou...
Smalyshev has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405757 ) Change subject: Use getSize since SearchSuggestionSet does not implement Countable .. Use getSize since SearchSuggestionSet does not implement Countable Bug: T184934 Change-Id: I39459352399e2023149b715b049084826df22935 --- M includes/search/SearchEngine.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/57/405757/1 diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php index 4253193..7ac24c5 100644 --- a/includes/search/SearchEngine.php +++ b/includes/search/SearchEngine.php @@ -543,7 +543,7 @@ $this->setLimitOffset( $fallbackLimit ); $fallbackSearchResult = $this->completionSearch( $fbs ); $results->appendAll( $fallbackSearchResult ); - $fallbackLimit -= count( $fallbackSearchResult ); + $fallbackLimit -= $fallbackSearchResult->getSize(); if ( $fallbackLimit <= 0 ) { break; } -- To view, visit https://gerrit.wikimedia.org/r/405757 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I39459352399e2023149b715b049084826df22935 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Smalyshev ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits