[MediaWiki-commits] [Gerrit] Use strict array search for linker options. - change (mediawiki...PureWikiDeletion)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/268905 Change subject: Use strict array search for linker options. .. Use strict array search for linker options. This is in anticipation of gerrit change I16b9d6c3044ae60d5a7fd340569c019ffc4b2a55 (and a good practice anyway). Change-Id: I0da6534954cec3c6754402fe82f85235d3233db5 --- M PureWikiDeletion.hooks.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PureWikiDeletion refs/changes/05/268905/1 diff --git a/PureWikiDeletion.hooks.php b/PureWikiDeletion.hooks.php index fba528e..95ef45f 100644 --- a/PureWikiDeletion.hooks.php +++ b/PureWikiDeletion.hooks.php @@ -114,7 +114,7 @@ public static function PureWikiDeletionLink( $skin, $target, &$text, &$customAttribs, &$query, &$options, &$ret ) { global $wgPureWikiDeletionBlankLinkStyle; // If it's on the local wiki, then see if it's blanked - if ( in_array( 'known', $options ) ) { + if ( in_array( 'known', $options, true ) ) { $dbr = wfGetDB( DB_SLAVE ); $blank_page_id = $target->getArticleID(); if ( $target->getNamespace() == NS_SPECIAL -- To view, visit https://gerrit.wikimedia.org/r/268905 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0da6534954cec3c6754402fe82f85235d3233db5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PureWikiDeletion Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Apply global overlay z-index to ve-ui-overlay-global - change (mediawiki...Vector)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/268914 Change subject: Apply global overlay z-index to ve-ui-overlay-global .. Apply global overlay z-index to ve-ui-overlay-global VE keeps the global windowmanager inside a global overlay div, which has a default z-index of 1. Ensure this is overriden in Vector. Requires extra specificity due to stylesheet load order. Change-Id: I5ebb4e59e3714dfaa3d755ecf6285009efe7b62a --- M skinStyles/ooui.less 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector refs/changes/14/268914/1 diff --git a/skinStyles/ooui.less b/skinStyles/ooui.less index e33c208..60fcec2 100644 --- a/skinStyles/ooui.less +++ b/skinStyles/ooui.less @@ -1,4 +1,5 @@ -.oo-ui-windowManager-modal { +.oo-ui-windowManager-modal, +.skin-vector .ve-ui-overlay-global { z-index: 101; position: relative; } -- To view, visit https://gerrit.wikimedia.org/r/268914 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ebb4e59e3714dfaa3d755ecf6285009efe7b62a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Vector 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] Get file from WikiFilePage, instead of ImagePage - change (mediawiki/core)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/268915 Change subject: Get file from WikiFilePage, instead of ImagePage .. Get file from WikiFilePage, instead of ImagePage Change-Id: Ib28354fde2dc084ae9aff8cfa960785bb2012933 --- M includes/page/ImageHistoryList.php M includes/page/ImageHistoryPseudoPager.php 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/15/268915/1 diff --git a/includes/page/ImageHistoryList.php b/includes/page/ImageHistoryList.php index 32638a5..4c36729 100644 --- a/includes/page/ImageHistoryList.php +++ b/includes/page/ImageHistoryList.php @@ -53,7 +53,7 @@ */ public function __construct( $imagePage ) { global $wgShowArchiveThumbnails; - $this->current = $imagePage->getFile(); + $this->current = $imagePage->getPage()->getFile(); $this->img = $imagePage->getDisplayedFile(); $this->title = $imagePage->getTitle(); $this->imagePage = $imagePage; diff --git a/includes/page/ImageHistoryPseudoPager.php b/includes/page/ImageHistoryPseudoPager.php index e421d23..f541387 100644 --- a/includes/page/ImageHistoryPseudoPager.php +++ b/includes/page/ImageHistoryPseudoPager.php @@ -111,7 +111,7 @@ if ( $this->mQueryDone ) { return; } - $this->mImg = $this->mImagePage->getFile(); // ensure loading + $this->mImg = $this->mImagePage->getPage()->getFile(); // ensure loading if ( !$this->mImg->exists() ) { return; } -- To view, visit https://gerrit.wikimedia.org/r/268915 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib28354fde2dc084ae9aff8cfa960785bb2012933 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Expand documentation of User::isSafeToLoad - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Expand documentation of User::isSafeToLoad .. Expand documentation of User::isSafeToLoad Change-Id: I7f018b7f7219e7a17a3059b3ec9cbdf1c2c1e043 --- M includes/user/User.php 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/user/User.php b/includes/user/User.php index 01afd97..dccfd77 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -310,7 +310,14 @@ } /** -* Test if it's safe to load this User object +* Test if it's safe to load this User object. You should typically check this before using +* $wgUser or RequestContext::getUser in a method that might be called before the system has +* been fully initialized. If the object is unsafe, you should use an anonymous user: +* \code +* $user = $wgUser->isSafeToLoad() ? $wgUser : new User; +* \endcode +* +* @since 1.27 * @return bool */ public function isSafeToLoad() { -- To view, visit https://gerrit.wikimedia.org/r/268912 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7f018b7f7219e7a17a3059b3ec9cbdf1c2c1e043 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Gergő TiszaGerrit-Reviewer: Anomie Gerrit-Reviewer: BryanDavis Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move generic VE desktop styles into a separate module - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/268922 Change subject: Move generic VE desktop styles into a separate module .. Move generic VE desktop styles into a separate module Here they can be re-used by other VE desktop targets, e.g. Flow. Change-Id: I18431ff73fc1c6ab5639a579e85b0f0cc48cb9ce --- M extension.json M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css A modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-monobook.css A modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-vector.css 5 files changed, 50 insertions(+), 23 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/22/268922/1 diff --git a/extension.json b/extension.json index adb016e..dc94409 100644 --- a/extension.json +++ b/extension.json @@ -315,6 +315,16 @@ "mobile" ] }, + "ext.visualEditor.desktopTarget": { + "skinStyles": { + "vector": [ + "modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-vector.css" + ], + "monobook": [ + "modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-monobook.css" + ] + } + }, "ext.visualEditor.desktopArticleTarget": { "scripts": [ "modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js" @@ -337,6 +347,7 @@ "ext.visualEditor.base", "ext.visualEditor.mediawiki", "ext.visualEditor.core.desktop", + "ext.visualEditor.desktopTarget", "jquery.cookie", "mediawiki.jqueryMsg", "mediawiki.util" diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css index 9de0d03..219c837 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css @@ -50,10 +50,3 @@ /* Placeholder doesn't need a border as well */ border: 0; } - -.mw-body a.external.ve-ce-linkAnnotation-active { - /* Reset -2px from VE-core */ - margin-right: 0; - /* Monobook sets a background:url(); rule which overrides the colour. TODO: Fix upstream */ - background-color: #E6F1FF; -} diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css index 96370cc..4535a2c 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css @@ -35,8 +35,7 @@ border: 0; } -.ve-init-mw-desktopArticleTarget, -.ve-ui-overlay-global { +.ve-init-mw-desktopArticleTarget { /* Enforce different font-size for all UI elements of VisualEditor */ font-size: 0.8em; } @@ -85,20 +84,6 @@ margin: 0; } /*csslint ids:true */ - -/* Slug animation needs more specific rules and skin-specific target margins */ -.mw-body p.ve-ce-branchNode-newSlug { - margin: -0.3em 0 -0.1em 0; -} - -.mw-body p.ve-ce-branchNode-newSlug-open { - margin: 0.5em 0; -} - -.mw-body .external.ve-ce-linkAnnotation-active { - /* Reset -2px from VE-core */ - margin-right: 0; -} /* High-definition-specific styles (because Vector adds 1em to the leftNav if width is 982px+ */ @media screen and (min-width: 982px) { diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-monobook.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-monobook.css new file mode 100644 index 000..c3cb905 --- /dev/null +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-monobook.css @@ -0,0 +1,13 @@ +/*! + * VisualEditor MediaWiki Initialization desktop target Monobook skin styles. + * + * @copyright 2011-2016 VisualEditor Team and others; see AUTHORS.txt + * @license The MIT License (MIT); see LICENSE.txt + */ + +.mw-body a.external.ve-ce-linkAnnotation-active { + /* Reset -2px from VE-core */ + margin-right: 0; + /* Monobook sets a background:url(); rule which overrides the colour. TODO: Fix upstream */ + background-color: #E6F1FF; +} diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-vector.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-vector.css new file mode 100644 index 000..d471c07 --- /dev/null
[MediaWiki-commits] [Gerrit] Use strict array search for linker options. - change (mediawiki...RPED)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/268904 Change subject: Use strict array search for linker options. .. Use strict array search for linker options. This is in anticipation of gerrit change I16b9d6c3044ae60d5a7fd340569c019ffc4b2a55 (and a good practice anyway). Change-Id: I26ec595de1efdca7f207f1fedcfa4853c6b4e00b --- M RPED.hooks.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RPED refs/changes/04/268904/1 diff --git a/RPED.hooks.php b/RPED.hooks.php index 402cc15..2565a22 100644 --- a/RPED.hooks.php +++ b/RPED.hooks.php @@ -70,7 +70,7 @@ return true; } // Return immediately if we know it's existent on the local wiki - if ( in_array( 'known', $options ) ) { + if ( in_array( 'known', $options, true ) ) { if ( !isset( $query['action'] ) && !isset( $query['curid'] ) ) { $customAttribs['style'] = $wgLocalStyle; } @@ -98,7 +98,7 @@ // If it doesn't exist on the local wiki, then see if it exists on the // remote wiki (Wikipedia) - if ( in_array( 'broken', $options ) || $itIsBlank == true ) { + if ( in_array( 'broken', $options, true ) || $itIsBlank == true ) { $title = $target->getPrefixedText (); $fragment = htmlentities($target->getFragmentForURL()); -- To view, visit https://gerrit.wikimedia.org/r/268904 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I26ec595de1efdca7f207f1fedcfa4853c6b4e00b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RPED Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use strict array search for linker options. - change (mediawiki...IndexFunction)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/268907 Change subject: Use strict array search for linker options. .. Use strict array search for linker options. This is in anticipation of gerrit change I16b9d6c3044ae60d5a7fd340569c019ffc4b2a55 (and a good practice anyway). Change-Id: Ie5854d25fef6db9356a4305074bb790ee917a5b6 --- M IndexFunction_body.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/IndexFunction refs/changes/07/268907/1 diff --git a/IndexFunction_body.php b/IndexFunction_body.php index 9ec9be0..b9ef039 100644 --- a/IndexFunction_body.php +++ b/IndexFunction_body.php @@ -163,7 +163,7 @@ // Turn links to indexes into blue links static function blueLinkIndexes( $skin, $target, $options, &$text, &$attribs, &$ret ) { - if ( in_array( 'known', $options ) ) { + if ( in_array( 'known', $options, true ) ) { return true; } -- To view, visit https://gerrit.wikimedia.org/r/268907 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie5854d25fef6db9356a4305074bb790ee917a5b6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/IndexFunction Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use strict array search for linker options. - change (mediawiki...SemanticForms)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/268908 Change subject: Use strict array search for linker options. .. Use strict array search for linker options. This is in anticipation of gerrit change I16b9d6c3044ae60d5a7fd340569c019ffc4b2a55 (and a good practice anyway). Change-Id: Idd8de9b7c187f3e50c976ab8db2b5dffe1e54ede --- M includes/SF_FormLinker.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms refs/changes/08/268908/1 diff --git a/includes/SF_FormLinker.php b/includes/SF_FormLinker.php index 6abe511..38d6e5c 100644 --- a/includes/SF_FormLinker.php +++ b/includes/SF_FormLinker.php @@ -323,7 +323,7 @@ */ static function setBrokenLink( $linker, $target, $options, $text, &$attribs, &$ret ) { // If it's not a broken (red) link, exit. - if ( !in_array( 'broken', $options ) ) { + if ( !in_array( 'broken', $options, true ) ) { return true; } // If the link is to a special page, exit. -- To view, visit https://gerrit.wikimedia.org/r/268908 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd8de9b7c187f3e50c976ab8db2b5dffe1e54ede Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticForms Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add legacy ldap-based files for handline project information. - change (mediawiki...OpenStackManager)
jenkins-bot has submitted this change and it was merged. Change subject: Add legacy ldap-based files for handline project information. .. Add legacy ldap-based files for handline project information. Soon the normal OpenStackNovaProject.php and OpenStackNovaRole.php will be modified to work with keystone instead of ldap. At that point we'll want these old ldap-compatible classes around to use when migrating things into the keystone db. Bug: T115029 Change-Id: I99e3bd8924974bed9acf1ff2e71a2c20dbbc28eb --- M OpenStackManager.php A nova/OpenStackNovaProjectLdap.php A nova/OpenStackNovaRoleLdap.php 3 files changed, 1,059 insertions(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/OpenStackManager.php b/OpenStackManager.php index d70a86d..b51d780 100644 --- a/OpenStackManager.php +++ b/OpenStackManager.php @@ -200,6 +200,8 @@ $wgAutoloadClasses['OpenStackNovaPuppetGroup'] = $dir . 'nova/OpenStackNovaPuppetGroup.php'; $wgAutoloadClasses['OpenStackNovaLdapConnection'] = $dir . 'nova/OpenStackNovaLdapConnection.php'; $wgAutoloadClasses['OpenStackNovaProject'] = $dir . 'nova/OpenStackNovaProject.php'; +$wgAutoloadClasses['OpenStackNovaProjectLdap'] = $dir . 'nova/OpenStackNovaProjectLdap.php'; +$wgAutoloadClasses['OpenStackNovaRoleLdap'] = $dir . 'nova/OpenStackNovaRoleLdap.php'; $wgAutoloadClasses['OpenStackNovaProjectLimits'] = $dir . 'nova/OpenStackNovaProjectLimits.php'; $wgAutoloadClasses['OpenStackNovaProjectGroup'] = $dir . 'nova/OpenStackNovaProjectGroup.php'; $wgAutoloadClasses['SpecialNovaInstance'] = $dir . 'special/SpecialNovaInstance.php'; diff --git a/nova/OpenStackNovaProjectLdap.php b/nova/OpenStackNovaProjectLdap.php new file mode 100644 index 000..c343c04 --- /dev/null +++ b/nova/OpenStackNovaProjectLdap.php @@ -0,0 +1,823 @@ +projectname = $projectname; + if ( $load ) { + OpenStackNovaLdapConnection::connect(); + $this->fetchProjectInfo(); + } else { + $this->loaded = false; + } + } + + public function getName() { + return $this->projectname; + } + + /** +* Fetch the project from LDAP and initialize the object +* @return void +*/ + function fetchProjectInfo( $refresh=true ) { + global $wgAuth; + global $wgOpenStackManagerLDAPProjectBaseDN; + + if ( $this->loaded and !$refresh ) { + return; + } + $result = LdapAuthenticationPlugin::ldap_search( $wgAuth->ldapconn, $wgOpenStackManagerLDAPProjectBaseDN, + '(&(cn=' . $this->projectname . ')(objectclass=groupofnames))' ); + $this->projectInfo = LdapAuthenticationPlugin::ldap_get_entries( $wgAuth->ldapconn, $result ); + if ( $this->projectInfo['count'] === 0 ) { + return; + } + $this->projectDN = $this->projectInfo[0]['dn']; + $this->roles = array(); + foreach ( self::$rolenames as $rolename ) { + $this->roles[] = OpenStackNovaRoleLdap::getProjectRoleByName( $rolename, $this ); + } + // fetch the associated posix project group (project-$projectname) + $this->fetchProjectGroup(); + + $this->fetchServiceGroups(); + + $this->loaded = true; + } + + function fetchServiceGroups() { + global $wgAuth; + global $wgOpenStackManagerLDAPServiceGroupBaseDN; + + $result = LdapAuthenticationPlugin::ldap_search( $wgAuth->ldapconn, + $wgOpenStackManagerLDAPServiceGroupBaseDN, + '(objectclass=groupofnames)' ); + + if ( $result ) { + $this->serviceGroups = array(); + $groupList = LdapAuthenticationPlugin::ldap_get_entries( $wgAuth->ldapconn, $result ); + if ( isset( $groupList ) ) { + array_shift( $groupList ); + foreach ( $groupList as $groupEntry ) { + # Now we have every group. Check if this one belongs to us. + $matchstring = $this->projectname . "."; + if ( strpos($groupEntry['cn'][0], $matchstring) === 0 ) { + $this->serviceGroups[] = new OpenStackNovaServiceGroup( $groupEntry['cn'][0], $this ); + } + } + } + } else { + $this->serviceGroups = array(); +
[MediaWiki-commits] [Gerrit] Expand documentation of User::isSafeToLoad - change (mediawiki/core)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/268912 Change subject: Expand documentation of User::isSafeToLoad .. Expand documentation of User::isSafeToLoad Change-Id: I7f018b7f7219e7a17a3059b3ec9cbdf1c2c1e043 --- M includes/user/User.php 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/12/268912/1 diff --git a/includes/user/User.php b/includes/user/User.php index 01afd97..140c271 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -310,7 +310,13 @@ } /** -* Test if it's safe to load this User object +* Test if it's safe to load this User object. You should typically check this before using +* $wgUser or RequestContext::getUser in a method that might be called before the system has +* been fully initialized. If the object is unsafe, you should use an anonymous user: +* \code +* $user = $wgUser->isSafeToLoad() ? $wgUser : new User; +* \endcode +* * @return bool */ public function isSafeToLoad() { -- To view, visit https://gerrit.wikimedia.org/r/268912 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f018b7f7219e7a17a3059b3ec9cbdf1c2c1e043 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add block log flags in the same order as SpecialBlock::block... - change (mediawiki...CheckUser)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/268909 Change subject: Add block log flags in the same order as SpecialBlock::blockLogFlags .. Add block log flags in the same order as SpecialBlock::blockLogFlags Bug: T126130 Change-Id: I3fddcd35daf0c09c778715e12e076692c31f2550 --- M specials/SpecialCheckUser.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CheckUser refs/changes/09/268909/1 diff --git a/specials/SpecialCheckUser.php b/specials/SpecialCheckUser.php index 80fc6ff..0692f0c 100644 --- a/specials/SpecialCheckUser.php +++ b/specials/SpecialCheckUser.php @@ -260,15 +260,15 @@ $flags[] = 'anononly'; } - if ( $wgBlockAllowsUTEdit && $blockParams['talk'] ) { - $flags[] = 'nousertalk'; - } + $flags[] = 'nocreate'; if ( $blockParams['email'] ) { $flags[] = 'noemail'; } - $flags[] = 'nocreate'; + if ( $wgBlockAllowsUTEdit && $blockParams['talk'] ) { + $flags[] = 'nousertalk'; + } return implode( ',', $flags ); } -- To view, visit https://gerrit.wikimedia.org/r/268909 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3fddcd35daf0c09c778715e12e076692c31f2550 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CheckUser Gerrit-Branch: master Gerrit-Owner: Alex Monk___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow auto suggestion for subpages of Special:BotPasswords - change (mediawiki/core)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/268913 Change subject: Allow auto suggestion for subpages of Special:BotPasswords .. Allow auto suggestion for subpages of Special:BotPasswords The autocomplete search allows special pages to define the list of subpages to be excepted. Fill up the function to show auto suggestion for subpages of Special:BotPasswords Change-Id: I8e4037f058ac2f65b12c4bcad81b4847c408bcce --- M includes/specials/SpecialBotPasswords.php 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/13/268913/1 diff --git a/includes/specials/SpecialBotPasswords.php b/includes/specials/SpecialBotPasswords.php index 93c36ab..22f0d01 100644 --- a/includes/specials/SpecialBotPasswords.php +++ b/includes/specials/SpecialBotPasswords.php @@ -347,6 +347,24 @@ $out->addReturnTo( $this->getPageTitle() ); } + /** +* Return an array of subpages beginning with $search that this special page will accept. +* +* @param string $search Prefix to search for +* @param int $limit Maximum number of results to return (usually 10) +* @param int $offset Number of results to skip (usually 0) +* @return string[] Matching subpages +*/ + public function prefixSearchSubpages( $search, $limit, $offset ) { + $user = User::newFromName( $search ); + if ( !$user ) { + // No prefix suggestion for invalid user + return array(); + } + // Autocomplete subpage as user list - public to allow caching + return UserNamePrefixSearch::search( 'public', $search, $limit, $offset ); + } + protected function getGroupName() { return 'users'; } -- To view, visit https://gerrit.wikimedia.org/r/268913 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e4037f058ac2f65b12c4bcad81b4847c408bcce Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VE: Move Vector-specific styles to a separate stylesheet - change (mediawiki...Flow)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/268923 Change subject: VE: Move Vector-specific styles to a separate stylesheet .. VE: Move Vector-specific styles to a separate stylesheet Also create an equivalent stylesheet for Monobook. Change-Id: I8ef570e91ec5d4c80fd46158be6ab5976a788a05 --- M Resources.php A modules/editor/editors/visualeditor/mw.flow.ve.Target-monobook.less A modules/editor/editors/visualeditor/mw.flow.ve.Target-vector.less M modules/editor/editors/visualeditor/mw.flow.ve.Target.less M modules/styles/editors-common.less M modules/styles/flow/widgets/editor/mw.flow.ui.EditorSwitcherWidget.less 6 files changed, 118 insertions(+), 31 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/23/268923/1 diff --git a/Resources.php b/Resources.php index b5cc3f4..c3092be 100644 --- a/Resources.php +++ b/Resources.php @@ -552,6 +552,14 @@ 'editor/editors/visualeditor/mw.flow.ve.Target.less', 'editor/editors/visualeditor/ui/mw.flow.ve.ui.Icons.less', ), + 'skinStyles' => array( + 'vector' => array( + 'editor/editors/visualeditor/mw.flow.ve.Target-vector.less', + ), + 'monobook' => array( + 'editor/editors/visualeditor/mw.flow.ve.Target-monobook.less', + ), + ), 'dependencies' => array( 'es5-shim', 'ext.visualEditor.core', diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target-monobook.less b/modules/editor/editors/visualeditor/mw.flow.ve.Target-monobook.less new file mode 100644 index 000..5455334 --- /dev/null +++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target-monobook.less @@ -0,0 +1,51 @@ +@import 'mediawiki.mixins'; +@import 'mediawiki.ui/variables'; +@import 'flow.variables'; +@import 'flow.colors'; + +.flow-component { + .ve-init-target { + &.flow-ui-focused { + outline: none; + border-color: #a7dcff; + box-shadow: 0 0 0.3em #a7dcff, 0 0 0 white; + } + } + + .oo-ui-toolbar { + // Undo .mw-body-content font-size (0.875em) and apply font-size matching OOUI theme (0.8em) + // TODO: Make this theme specific + font-size: 0.8em/0.625/1.27; /* 0.8em / x-small / 127% */ + .oo-ui-toolbar { + // But don't let these rules double-apply for nested toolbars + font-size: 1em; + } + } + + .oo-ui-toolbar-bar { + // The default border is only appropriate in the default ve, with + // the toolbar above the editing surface. + border: none; + // When we apply a pending texture to the editor, we don't want the toolbar to display + // in solid white on top of that. + background: transparent; + } +} + +.flow-editor { + // Undo border & box-shadow on textarea and re-apply it on the + // div that contains textarea + legal text + switch button + &.flow-ui-focused { + outline: none; + border-color: #a7dcff; + box-shadow: 0 0 0.3em #a7dcff, 0 0 0 white; + } +} + +.flow-ui-editorSwitcherWidget { + &-focused { + outline: none; + border-color: #a7dcff; + box-shadow: 0 0 0.3em #a7dcff, 0 0 0 white; + } +} diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target-vector.less b/modules/editor/editors/visualeditor/mw.flow.ve.Target-vector.less new file mode 100644 index 000..b9181ed --- /dev/null +++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target-vector.less @@ -0,0 +1,57 @@ +@import 'mediawiki.mixins'; +@import 'mediawiki.ui/variables'; +@import 'flow.variables'; +@import 'flow.colors'; + +.flow-component { + .ve-init-target { + &.flow-ui-focused { + border-color: @colorProgressive; + box-shadow: inset 0 0 0 2px @colorProgressive; + } + } + + .oo-ui-toolbar { + // The 2px of positive margin gives room for the blue border of the + // documentNode (via .mw-ui-input) + margin: (-@editorToolbarHeight - 2px) 2px 2px 2px; + + // Undo .mw-body-content font-size (0.875em) and apply font-size matching OOUI theme (0.8em) + // TODO: Make this theme specific + font-size: 0.8/0.875em; + .oo-ui-toolbar { + // But don't let these rules
[MediaWiki-commits] [Gerrit] Get timestamp from WikiPage, instead of Article - change (mediawiki/core)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/268910 Change subject: Get timestamp from WikiPage, instead of Article .. Get timestamp from WikiPage, instead of Article Change-Id: I5009695e5cde669c6bac0d0e116ab5e66a07813f --- M includes/page/Article.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/10/268910/1 diff --git a/includes/page/Article.php b/includes/page/Article.php index e81fd96..f8e114a 100644 --- a/includes/page/Article.php +++ b/includes/page/Article.php @@ -636,7 +636,7 @@ # the correct version information. $outputPage->setRevisionId( $this->getRevIdFetched() ); # Preload timestamp to avoid a DB hit - $outputPage->setRevisionTimestamp( $this->getTimestamp() ); + $outputPage->setRevisionTimestamp( $this->mPage->getTimestamp() ); # Pages containing custom CSS or JavaScript get special treatment if ( $this->getTitle()->isCssOrJsPage() || $this->getTitle()->isCssJsSubpage() ) { -- To view, visit https://gerrit.wikimedia.org/r/268910 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5009695e5cde669c6bac0d0e116ab5e66a07813f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VE: Fix styling of global overlay - change (mediawiki...Flow)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/268919 Change subject: VE: Fix styling of global overlay .. VE: Fix styling of global overlay Change-Id: I8c10f5af408f1fa71ab6eefb87054175cb6ea179 --- M modules/editor/editors/visualeditor/mw.flow.ve.Target.less 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/19/268919/1 diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less index 0227bc2..90307d9 100644 --- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less +++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less @@ -47,3 +47,8 @@ line-height: normal; } } + +.ve-ui-overlay-global { + font-size: 0.8em; + z-index: 101; /* #p-personal is z-index 100 in vector :( */ +} -- To view, visit https://gerrit.wikimedia.org/r/268919 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8c10f5af408f1fa71ab6eefb87054175cb6ea179 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow 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] DesktopArticleTarget: Cleanup styles - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/268916 Change subject: DesktopArticleTarget: Cleanup styles .. DesktopArticleTarget: Cleanup styles * Use more specific ve-init-mw-desktopArticleTarget class * Add comments and reorder in places Change-Id: Ic9291d3e50304fe3a0efa7ace1ce93c7fba91d98 --- M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css 2 files changed, 21 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/16/268916/1 diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css index a238e90..5a3d0f9 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css @@ -10,13 +10,13 @@ font-size: 1.28em; /* 0.8em / x-small */ } -.ve-init-target { +.ve-init-mw-desktopArticleTarget { /* Enforce different font-size for all UI elements of VisualEditor. The difference is tiny, but enough to make the icon containers 23.813px rather than 24px and thus the icons blurry */ font-size: 1.00787401575em; /* 0.8em / x-small / 127% */ } -.ve-init-target .mw-body-content, +.ve-init-mw-desktopArticleTarget .mw-body-content, .ve-ui-overlay-global .mw-body-content { /* Match skin's font-size for the surface content */ font-size: 0.99218748em; /* 1/1.00787401575 */ @@ -31,8 +31,12 @@ top: -3px; } -.ve-init-target > .ve-ui-debugBar { +/* Main document debug bar */ +.ve-init-mw-desktopArticleTarget > .ve-ui-debugBar { border-top: 1px solid #ccc; + /* 0.8/0.8 */ + padding: 1em; + margin: 1em -1em -1em -1em; } .ve-init-mw-target-surface .ve-ce-documentNode, @@ -48,15 +52,10 @@ } .mw-body a.external.ve-ce-linkAnnotation-active { + /* Reset -2px from VE-core */ margin-right: 0; /* Monobook sets a background:url(); rule which overrides the colour. TODO: Fix upstream */ background-color: #E6F1FF; -} - -.ve-init-target > .ve-ui-debugBar { - /* 0.8/0.8 */ - padding: 1em; - margin: 1em -1em -1em -1em; } .ve-ui-overlay-global { diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css index de8e4d7..58cae0b 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css @@ -35,18 +35,22 @@ border: 0; } -.ve-init-target, +.ve-init-mw-desktopArticleTarget, .ve-ui-overlay-global { /* Enforce different font-size for all UI elements of VisualEditor */ font-size: 0.8em; } -.ve-init-target .firstHeading { +.ve-ui-overlay-global { + z-index: 101; /* #p-personal is z-index 100 in vector :( */ +} + +.ve-init-mw-desktopArticleTarget .firstHeading { /* Restore 1.8em font size of page title */ font-size: 2.25em; /* 1.8/0.8 */ } -.ve-init-target .mw-body-content, +.ve-init-mw-desktopArticleTarget .mw-body-content, .ve-ui-overlay-global .mw-body-content { /* Match skin's font-size for the surface content */ font-size: 1.09375em; /* 0.875/0.8 */ @@ -58,12 +62,14 @@ position: relative; } -.ve-init-target > .ve-ui-debugBar { +/* Main document debug bar */ +.ve-init-mw-desktopArticleTarget > .ve-ui-debugBar { /* 1/0.8 */ padding: 1.25em; margin: 1.25em -1.25em -1.25em -1.25em; } +/* All debug bars (includes target widgets) */ .ve-ui-debugBar { border-top: 1px solid #ccc; box-shadow: 0 10px 10px -10px rgba( 0, 0, 0, 0.15 ) inset; @@ -71,10 +77,6 @@ .ve-ui-debugBar ol { margin-left: 0; -} - -.ve-ui-overlay-global { - z-index: 101; /* #p-personal is z-index 100 in vector :( */ } .oo-ui-actionWidget a:hover { @@ -98,6 +100,7 @@ } .mw-body .external.ve-ce-linkAnnotation-active { + /* Reset -2px from VE-core */ margin-right: 0; } @@ -118,7 +121,8 @@ margin: -1.5625em -1.875em 1.875em -1.875em; } - .ve-init-target > .ve-ui-debugBar { + /* Main document debug bar */ + .ve-init-mw-desktopArticleTarget > .ve-ui-debugBar { /* 1/0.8, 1.5/0.8 */ padding: 1.875em; margin: 1.25em -1.875em -1.875em -1.875em; -- To view, visit https://gerrit.wikimedia.org/r/268916 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9291d3e50304fe3a0efa7ace1ce93c7fba91d98 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch:
[MediaWiki-commits] [Gerrit] Follow-up I7e1edcf05c: Remove monobook z-index hack - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/268918 Change subject: Follow-up I7e1edcf05c: Remove monobook z-index hack .. Follow-up I7e1edcf05c: Remove monobook z-index hack The cited reasons were that the the logo and search bar have a z-index of 3, but that doesn't matter as they are nested in other elements with z-indexes. Change-Id: I7ff279efe7c01ba1ffb1fa0d460d59a493ccc47a --- M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/18/268918/1 diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css index 5a3d0f9..9de0d03 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css @@ -57,8 +57,3 @@ /* Monobook sets a background:url(); rule which overrides the colour. TODO: Fix upstream */ background-color: #E6F1FF; } - -.ve-ui-overlay-global { - /* So that the overlay always appears over the site logo, search box and personal tools */ - z-index: 4; -} -- To view, visit https://gerrit.wikimedia.org/r/268918 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ff279efe7c01ba1ffb1fa0d460d59a493ccc47a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove global overlay hack now fixed in Vector - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/268917 Change subject: Remove global overlay hack now fixed in Vector .. Remove global overlay hack now fixed in Vector Change-Id: Ic5cfb7ae4d244799be56e12b4b0a44b6ddd00303 Depends-On: I5ebb4e59e3714dfaa3d755ecf6285009efe7b62a --- M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/17/268917/1 diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css index 58cae0b..96370cc 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css @@ -41,10 +41,6 @@ font-size: 0.8em; } -.ve-ui-overlay-global { - z-index: 101; /* #p-personal is z-index 100 in vector :( */ -} - .ve-init-mw-desktopArticleTarget .firstHeading { /* Restore 1.8em font size of page title */ font-size: 2.25em; /* 1.8/0.8 */ -- To view, visit https://gerrit.wikimedia.org/r/268917 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic5cfb7ae4d244799be56e12b4b0a44b6ddd00303 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use class for toggle links on Special:Log - change (mediawiki/core)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/268911 Change subject: Use class for toggle links on Special:Log .. Use class for toggle links on Special:Log The toogle links All, None, Invert on Special:Log are shown at top and at bottom, but using the same id, which make the page invalid and the second link not working. Change to class. Follow up: I92141a7079fc7fcd7152ef418d82f4f7969b163b Change-Id: I1107b320efe5d3b63ea091ea986e35158d24c098 --- M includes/specials/SpecialLog.php M resources/src/mediawiki/mediawiki.checkboxtoggle.js 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/11/268911/1 diff --git a/includes/specials/SpecialLog.php b/includes/specials/SpecialLog.php index 28ff1c7..a164c1e 100644 --- a/includes/specials/SpecialLog.php +++ b/includes/specials/SpecialLog.php @@ -262,15 +262,15 @@ // Select: All, None, Invert $links = array(); $links[] = Html::element( - 'a', array( 'href' => '#', 'id' => 'checkbox-all' ), + 'a', array( 'href' => '#', 'class' => 'mw-checkbox-all' ), $this->msg( 'checkbox-all' )->text() ); $links[] = Html::element( - 'a', array( 'href' => '#', 'id' => 'checkbox-none' ), + 'a', array( 'href' => '#', 'class' => 'mw-checkbox-none' ), $this->msg( 'checkbox-none' )->text() ); $links[] = Html::element( - 'a', array( 'href' => '#', 'id' => 'checkbox-invert' ), + 'a', array( 'href' => '#', 'class' => 'mw-checkbox-invert' ), $this->msg( 'checkbox-invert' )->text() ); diff --git a/resources/src/mediawiki/mediawiki.checkboxtoggle.js b/resources/src/mediawiki/mediawiki.checkboxtoggle.js index 4be4a8d..a2386b3 100644 --- a/resources/src/mediawiki/mediawiki.checkboxtoggle.js +++ b/resources/src/mediawiki/mediawiki.checkboxtoggle.js @@ -18,15 +18,15 @@ $checkboxes.prop( 'checked', check ); } - $( '#checkbox-all' ).click( function ( e ) { + $( '.mw-checkbox-all' ).click( function ( e ) { selectAll( true ); e.preventDefault(); } ); - $( '#checkbox-none' ).click( function ( e ) { + $( '.mw-checkbox-none' ).click( function ( e ) { selectAll( false ); e.preventDefault(); } ); - $( '#checkbox-invert' ).click( function ( e ) { + $( '.mw-checkbox-invert' ).click( function ( e ) { $checkboxes.each( function () { $( this ).prop( 'checked', !$( this ).is( ':checked' ) ); } ); -- To view, visit https://gerrit.wikimedia.org/r/268911 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1107b320efe5d3b63ea091ea986e35158d24c098 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dotfiles(ori): add smarter cd - change (operations/puppet)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/268920 Change subject: dotfiles(ori): add smarter cd .. dotfiles(ori): add smarter cd If argument to cd is a file name (and not a directory name), change directory to the directory where the file is located, instead of exiting with the error message "Not a directory". Change-Id: Idb244411c5b080e303eaab73ab784b5bd5e14432 --- M modules/admin/files/home/ori/.bash_profile 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/20/268920/1 diff --git a/modules/admin/files/home/ori/.bash_profile b/modules/admin/files/home/ori/.bash_profile index f7e2d09..ec71d8a 100644 --- a/modules/admin/files/home/ori/.bash_profile +++ b/modules/admin/files/home/ori/.bash_profile @@ -75,6 +75,10 @@ sudo() { command sudo -E "$@"; } hbnt() { /usr/bin/comm -23 "$1" "$2"; } # Here but not there (lines in $1 that are not in $2) bhat() { /usr/bin/comm -12 "$1" "$2"; } # Both here and there (lines common to both $1 and $2) + +# DWIM: If cd argument is a file, cd to the file's directory. +cd() { if [ ! -d "$1" ]; then builtin cd "$(dirname "$1")"; else builtin cd "$1"; fi; } + cleanup(){ mkdir -p ~/old find ~ -type f \( ! -iname ".*" \) -maxdepth 1 -exec mv {} ~/old \; -- To view, visit https://gerrit.wikimedia.org/r/268920 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb244411c5b080e303eaab73ab784b5bd5e14432 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: labs dnsrecursor: work on all projects, not just some a... - change (operations/puppet)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/268921 Change subject: WIP: labs dnsrecursor: work on all projects, not just some arbitrary ones .. WIP: labs dnsrecursor: work on all projects, not just some arbitrary ones Ideally this would use python-keystoneclient, however that doesn't seem to work. Change-Id: Icbb352a8c3b4b9a860f3d31ed68b4478c1056f62 --- M modules/dnsrecursor/files/labs-ip-alias-dump.py M modules/dnsrecursor/manifests/labsaliaser.pp M modules/role/manifests/labs/dnsrecursor.pp 3 files changed, 30 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/21/268921/1 diff --git a/modules/dnsrecursor/files/labs-ip-alias-dump.py b/modules/dnsrecursor/files/labs-ip-alias-dump.py index 6de379e..8bb911b 100644 --- a/modules/dnsrecursor/files/labs-ip-alias-dump.py +++ b/modules/dnsrecursor/files/labs-ip-alias-dump.py @@ -4,6 +4,8 @@ import yaml import argparse import itertools +import json +import requests from novaclient import client as novaclient @@ -25,8 +27,29 @@ args = argparser.parse_args() config = yaml.safe_load(args.config_file) +projects = [] + +tokenResp = requests.post( +config['nova_api_url'] + '/tokens', +data = json.dumps({ +'auth': { +'passwordCredentials': { +'username': config['username'], +'password': config['password'] +}, +'tenantId': config['admin_project_id'] +} +}), +headers = {'accept': 'application/json', 'content-type': 'application/json'} +) +token = tokenResp.json()['access']['token']['id'] + +tenantResp = requests.get(config['nova_api_url'] + '/tenants', headers = {'x-auth-token': token}) +for tenant in tenantResp.json()['tenants']: +projects.append(tenant['name']) + aliases = {} -for project in config['projects']: +for project in projects: client = novaclient.Client( "1.1", config['username'], diff --git a/modules/dnsrecursor/manifests/labsaliaser.pp b/modules/dnsrecursor/manifests/labsaliaser.pp index 447948c..316bcea 100644 --- a/modules/dnsrecursor/manifests/labsaliaser.pp +++ b/modules/dnsrecursor/manifests/labsaliaser.pp @@ -9,11 +9,11 @@ require_package('python-novaclient') $config = { -'username' => $username, -'password' => $password, -'projects' => $projects, -'output_path' => $alias_file, -'nova_api_url' => $nova_api_url, +'username' => $username, +'password' => $password, +'output_path' => $alias_file, +'nova_api_url' => $nova_api_url, +'admin_project_id' => $admin_project_id, } file { '/etc/labs-dns-alias.yaml': diff --git a/modules/role/manifests/labs/dnsrecursor.pp b/modules/role/manifests/labs/dnsrecursor.pp index afd218f..bb1671a 100644 --- a/modules/role/manifests/labs/dnsrecursor.pp +++ b/modules/role/manifests/labs/dnsrecursor.pp @@ -61,14 +61,9 @@ class { '::dnsrecursor::labsaliaser': username => 'novaadmin', password => $wikitech_nova_ldap_user_pass, -projects => [ -'tools', -'deployment-prep', -'toolserver-legacy', -'project-proxy', -], nova_api_url => "http://${nova_controller_hostname}:35357/v2.0;, alias_file => $alias_file, +admin_project_id => 'a47092cf44a045a4af87e1502c2cb74e' # TODO: this is for labtest, will it be the same in labs? } require dnsrecursor::metalresolver -- To view, visit https://gerrit.wikimedia.org/r/268921 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icbb352a8c3b4b9a860f3d31ed68b4478c1056f62 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alex Monk___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Special:UserLogin/signup to search suggestions - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add Special:UserLogin/signup to search suggestions .. Add Special:UserLogin/signup to search suggestions Change-Id: I8aa1c7526f5c8d4c80b2cc649b39a30c1da3946a --- M includes/specials/SpecialUserlogin.php 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php index d9a5e4f..05e5229 100644 --- a/includes/specials/SpecialUserlogin.php +++ b/includes/specials/SpecialUserlogin.php @@ -1758,4 +1758,7 @@ return $expired; } + protected function getSubpagesForPrefixSearch() { + return array( 'signup' ); + } } -- To view, visit https://gerrit.wikimedia.org/r/268679 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8aa1c7526f5c8d4c80b2cc649b39a30c1da3946a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Alex MonkGerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [Cite] Register VE module - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [Cite] Register VE module .. [Cite] Register VE module https://gerrit.wikimedia.org/r/#/c/254041/11/modules/ve-cite/i18n/en.json,unified Change-Id: I39c304f4e7d4aced797cd9f6dd538b148a381f7e --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 43efce4..9ebfa34 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -571,6 +571,10 @@ ignored = cite_references_prefix, cite_references_suffix, cite_references_no_link ignored = cite_error_refs_without_references_category +Cite - VisualEditor +id = ext-cite-visualeditor +file = modules/ve-cite/i18n/%CODE%.json + Cite This Page aliasfile = CiteThisPage/CiteThisPage.alias.php ignored = citethispage-summary, accesskey-citethispage -- To view, visit https://gerrit.wikimedia.org/r/268862 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I39c304f4e7d4aced797cd9f6dd538b148a381f7e Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond SpekkingGerrit-Reviewer: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [Cite] Register VE module - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/268862 Change subject: [Cite] Register VE module .. [Cite] Register VE module https://gerrit.wikimedia.org/r/#/c/254041/11/modules/ve-cite/i18n/en.json,unified Change-Id: I39c304f4e7d4aced797cd9f6dd538b148a381f7e --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/62/268862/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 43efce4..9ebfa34 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -571,6 +571,10 @@ ignored = cite_references_prefix, cite_references_suffix, cite_references_no_link ignored = cite_error_refs_without_references_category +Cite - VisualEditor +id = ext-cite-visualeditor +file = modules/ve-cite/i18n/%CODE%.json + Cite This Page aliasfile = CiteThisPage/CiteThisPage.alias.php ignored = citethispage-summary, accesskey-citethispage -- To view, visit https://gerrit.wikimedia.org/r/268862 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I39c304f4e7d4aced797cd9f6dd538b148a381f7e Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/268865 Change subject: Test .. Test Change-Id: Idfec547fbd795db5cb9809ec714027820494cfaa --- M package.json 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/65/268865/1 diff --git a/package.json b/package.json index c00dbed..872ca78 100644 --- a/package.json +++ b/package.json @@ -15,11 +15,11 @@ "grunt-contrib-watch": "0.6.1", "grunt-jscs": "2.1.0", "grunt-jsonlint": "1.0.4", -"grunt-karma": "0.11.0", -"karma": "0.12.36", -"karma-chrome-launcher": "0.1.12", -"karma-firefox-launcher": "0.1.6", -"karma-qunit": "0.1.4", +"grunt-karma": "0.12.1", +"karma": "0.13.19", +"karma-chrome-launcher": "0.2.2", +"karma-firefox-launcher": "0.1.7", +"karma-qunit": "0.1.5", "qunitjs": "1.18.0" } } -- To view, visit https://gerrit.wikimedia.org/r/268865 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idfec547fbd795db5cb9809ec714027820494cfaa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_26 Gerrit-Owner: Paladox___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Special:Version: Use addModuleStyles to load mediawiki.speci... - change (mediawiki/core)
Glaisher has uploaded a new change for review. https://gerrit.wikimedia.org/r/268871 Change subject: Special:Version: Use addModuleStyles to load mediawiki.special.version .. Special:Version: Use addModuleStyles to load mediawiki.special.version Currently, there is a brief delay before the stylesheet is loaded so use addModuleStyles as this is a stylesheet only module. Change-Id: I6adfeae88dddeab427928ef800152a4e1353cbe5 --- M includes/specials/SpecialVersion.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/71/268871/1 diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php index a628902..17442be 100644 --- a/includes/specials/SpecialVersion.php +++ b/includes/specials/SpecialVersion.php @@ -126,7 +126,7 @@ break; default: - $out->addModules( 'mediawiki.special.version' ); + $out->addModuleStyles( 'mediawiki.special.version' ); $out->addWikiText( $this->getMediaWikiCredits() . $this->softwareInformation() . -- To view, visit https://gerrit.wikimedia.org/r/268871 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6adfeae88dddeab427928ef800152a4e1353cbe5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Glaisher___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable CategoryMembershipChanges on fr.wiktionary - change (operations/mediawiki-config)
Dereckson has uploaded a new change for review. https://gerrit.wikimedia.org/r/268879 Change subject: Enable CategoryMembershipChanges on fr.wiktionary .. Enable CategoryMembershipChanges on fr.wiktionary Bug: T126051 Change-Id: Icfb0c307cdb69c5e17df779801f67ce7c87fb56a --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/79/268879/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ed93063..a13aecc 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -15405,6 +15405,7 @@ 'zerowiki' => true, 'wikipedia' => true, 'commonswiki' => true, + 'frwiktionary' => true, // T126051 ), 'wmgRelatedSitesPrefixes' => array( -- To view, visit https://gerrit.wikimedia.org/r/268879 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icfb0c307cdb69c5e17df779801f67ce7c87fb56a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VE: Disable interaction with CE nodes - change (mediawiki...Kartographer)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/268891 Change subject: VE: Disable interaction with CE nodes .. VE: Disable interaction with CE nodes This is mostly prevented by the focus shield, but events sometimes get through, like when scrolling fast. Change-Id: I265531becb0678ce7a16f72a40757c575f07247a --- M modules/ve-maps/ve.ce.MWMapsNode.js 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer refs/changes/91/268891/1 diff --git a/modules/ve-maps/ve.ce.MWMapsNode.js b/modules/ve-maps/ve.ce.MWMapsNode.js index 6f1003f..112bdcd 100644 --- a/modules/ve-maps/ve.ce.MWMapsNode.js +++ b/modules/ve-maps/ve.ce.MWMapsNode.js @@ -137,6 +137,13 @@ // TODO: Support style editing geoJson: geoJson } ); + + // Disable interaction + this.map.dragging.disable(); + this.map.touchZoom.disable(); + this.map.doubleClickZoom.disable(); + this.map.scrollWheelZoom.disable(); + this.map.keyboard.disable(); }; /** -- To view, visit https://gerrit.wikimedia.org/r/268891 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I265531becb0678ce7a16f72a40757c575f07247a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Kartographer 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] Make SFI work again with gerrit - change (mediawiki...SemanticFormsInputs)
jenkins-bot has submitted this change and it was merged. Change subject: Make SFI work again with gerrit .. Make SFI work again with gerrit Change-Id: If984ade61184037663bbc90315328b81a1659ac1 --- A .jshintignore 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Foxtrott: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/.jshintignore b/.jshintignore new file mode 100644 index 000..1d70118 --- /dev/null +++ b/.jshintignore @@ -0,0 +1,4 @@ +libs/jquery.form-validator.js +libs/jquery.multi-select.js +libs/menuselect.js +libs/datepicker.js -- To view, visit https://gerrit.wikimedia.org/r/268895 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If984ade61184037663bbc90315328b81a1659ac1 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/SemanticFormsInputs Gerrit-Branch: master Gerrit-Owner: FoxtrottGerrit-Reviewer: Foxtrott Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove input type regexp - change (mediawiki...SemanticFormsInputs)
Foxtrott has submitted this change and it was merged. Change subject: Remove input type regexp .. Remove input type regexp Input type regexp is now available directly from SemanticForms Change-Id: I4db5c6dfbc6daa1baa9d13eaeea18a98a5da0948 --- M SemanticFormsInputs.php M i18n/af.json D i18n/ar.json D i18n/arc.json M i18n/ast.json D i18n/az.json M i18n/be-tarask.json D i18n/bg.json D i18n/bn.json M i18n/br.json M i18n/bs.json M i18n/ca.json D i18n/ce.json D i18n/cs.json D i18n/cu.json D i18n/cv.json M i18n/de.json D i18n/diq.json M i18n/dsb.json M i18n/el.json M i18n/en.json M i18n/es.json D i18n/et.json M i18n/fa.json M i18n/fi.json M i18n/fr.json D i18n/frp.json D i18n/fy.json D i18n/ga.json M i18n/gl.json M i18n/gsw.json M i18n/he.json M i18n/hsb.json D i18n/hu.json M i18n/ia.json M i18n/id.json M i18n/it.json M i18n/ja.json D i18n/ka.json D i18n/km.json M i18n/ko.json M i18n/ksh.json D i18n/ku-latn.json M i18n/lb.json M i18n/mk.json D i18n/ml.json M i18n/ms.json M i18n/nb.json M i18n/nl.json M i18n/oc.json D i18n/pdc.json D i18n/pfl.json M i18n/pl.json M i18n/pms.json D i18n/ps.json M i18n/pt-br.json M i18n/pt.json M i18n/qqq.json D i18n/ro.json M i18n/roa-tara.json M i18n/ru.json M i18n/si.json D i18n/sr-ec.json D i18n/sr-el.json M i18n/sv.json D i18n/ta.json D i18n/te.json M i18n/tl.json D i18n/tr.json M i18n/uk.json D i18n/vi.json D i18n/yi.json M i18n/zh-hans.json M i18n/zh-hant.json D includes/SFI_RegExp.php D libs/regexp.js 76 files changed, 13 insertions(+), 753 deletions(-) Approvals: Foxtrott: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/SemanticFormsInputs.php b/SemanticFormsInputs.php index 870679f..b4722fe 100644 --- a/SemanticFormsInputs.php +++ b/SemanticFormsInputs.php @@ -55,7 +55,6 @@ $wgAutoloadClasses['SFITimePicker'] = $dir . '/includes/SFI_TimePicker.php'; $wgAutoloadClasses['SFIDateTimePicker'] = $dir . '/includes/SFI_DateTimePicker.php'; $wgAutoloadClasses['SFIMenuSelect'] = $dir . '/includes/SFI_MenuSelect.php'; -$wgAutoloadClasses['SFIRegExp'] = $dir . '/includes/SFI_RegExp.php'; $wgAutoloadClasses['SFITwoListBoxes'] = $dir . '/includes/SFI_TwoListBoxes.php'; $wgAutoloadClasses['SFIDateCheck'] = $dir . '/includes/SFI_DateCheck.php'; @@ -84,15 +83,6 @@ 'remoteExtPath' => 'SemanticFormsInputs', 'scripts' => 'libs/menuselect.js', 'styles' => 'skins/SFI_Menuselect.css', - 'dependencies' => array( - 'ext.semanticforms.main' - ), -); - -$wgResourceModules['ext.semanticformsinputs.regexp'] = array( - 'localBasePath' => $dir, - 'remoteExtPath' => 'SemanticFormsInputs', - 'scripts' => 'libs/regexp.js', 'dependencies' => array( 'ext.semanticforms.main' ), @@ -141,7 +131,6 @@ $sfgFormPrinter->registerInputType( 'SFITimePicker' ); $sfgFormPrinter->registerInputType( 'SFIDateTimePicker' ); $sfgFormPrinter->registerInputType( 'SFIMenuSelect' ); - $sfgFormPrinter->registerInputType( 'SFIRegExp' ); $sfgFormPrinter->registerInputType( 'SFITwoListBoxes' ); $sfgFormPrinter->registerInputType( 'SFIDateCheck' ); diff --git a/i18n/af.json b/i18n/af.json index 7a0fc62..797dd6d 100644 --- a/i18n/af.json +++ b/i18n/af.json @@ -4,6 +4,5 @@ "Naudefj" ] }, - "semanticformsinputs-desc": "Ekstra invoertipes vir [https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:Semantic_Forms Semantic Forms]", - "semanticformsinputs-wrongformat": "Verkeerde formaat." + "semanticformsinputs-desc": "Ekstra invoertipes vir [https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:Semantic_Forms Semantic Forms]" } diff --git a/i18n/ar.json b/i18n/ar.json deleted file mode 100644 index 265d877..000 --- a/i18n/ar.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "@metadata": { - "authors": [ - "OsamaK" - ] - } -} diff --git a/i18n/arc.json b/i18n/arc.json deleted file mode 100644 index de5b7af..000 --- a/i18n/arc.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Basharh" - ] - } -} diff --git a/i18n/ast.json b/i18n/ast.json index 3178caa..a12f50e 100644 --- a/i18n/ast.json +++ b/i18n/ast.json @@ -5,19 +5,11 @@ ] }, "semanticformsinputs-desc": "Más tribes d'entrada pa los [https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:Semantic_Forms Formularios Semánticos]", - "semanticformsinputs-wrongformat": "Formatu incorreutu.", - "semanticformsinputs-malformedregexp": "Espresión regular mal formada ($1).", "semanticformsinputs-timepicker-mintime": "La primera hora a amosar. Formatu: hh:mm", "semanticformsinputs-timepicker-maxtime": "La última hora a amosar. Formatu: hh:mm",
[MediaWiki-commits] [Gerrit] MWImageMode: Use clearDefaultDimensions - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/268900 Change subject: MWImageMode: Use clearDefaultDimensions .. MWImageMode: Use clearDefaultDimensions setDefaultDimensions( {} ) is a no-op. Bug: T126078 Change-Id: I1ef7cae04574e2561d21d4071d19a0067d81b263 --- M modules/ve-mw/dm/models/ve.dm.MWImageModel.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/00/268900/1 diff --git a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js index 4667972..4ce711d 100644 --- a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js +++ b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js @@ -998,7 +998,7 @@ this.scalable.setDefaultDimensions( originalDimensions ); } } else { - this.scalable.setDefaultDimensions( {} ); + this.scalable.clearDefaultDimensions(); } }; -- To view, visit https://gerrit.wikimedia.org/r/268900 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ef7cae04574e2561d21d4071d19a0067d81b263 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use strict array search for linker options. - change (mediawiki...Wikilog)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/268903 Change subject: Use strict array search for linker options. .. Use strict array search for linker options. This is in anticipation of gerrit change I16b9d6c3044ae60d5a7fd340569c019ffc4b2a55 (and a good practice anyway). Change-Id: Iaa5fa495299eaf30cee349c967a149f32072abf7 --- M Wikilog.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikilog refs/changes/03/268903/1 diff --git a/Wikilog.php b/Wikilog.php index a57be21..7826a66 100644 --- a/Wikilog.php +++ b/Wikilog.php @@ -318,10 +318,10 @@ static function LinkBegin( $skin, $target, &$text, &$attribs, &$query, &$options, &$ret ) { - if ( $target->isTalkPage() && !in_array( 'known', $options ) ) { + if ( $target->isTalkPage() && !in_array( 'known', $options, true ) ) { $wi = self::getWikilogInfo( $target ); if ( $wi && $wi->isItem() && !$wi->getTrailing() && $wi->getItemTitle()->exists() ) { - if ( ( $i = array_search( 'broken', $options ) ) !== false ) { + if ( ( $i = array_search( 'broken', $options, true ) ) !== false ) { array_splice( $options, $i, 1 ); } $options[] = 'known'; -- To view, visit https://gerrit.wikimedia.org/r/268903 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa5fa495299eaf30cee349c967a149f32072abf7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikilog Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove manual ignoring list - change (pywikibot...xqbot)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/268882 Change subject: remove manual ignoring list .. remove manual ignoring list Change-Id: I6160c327482723947353b8c3674553199d1d9daf --- M afd-notice.py 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/xqbot refs/changes/82/268882/1 diff --git a/afd-notice.py b/afd-notice.py index 14d1916..3843fca 100644 --- a/afd-notice.py +++ b/afd-notice.py @@ -81,8 +81,6 @@ if page.namespace() in (2, 3): self.ignoreUser.add(page.title(withNamespace=False, withSection=False).split('/')[0]) -# ignore some other people -self.ignoreUser.add('Liesel') pywikibot.output(u'%d users found to opt-out' % len(self.ignoreUser)) cat1 = pywikibot.Category(self.site, -- To view, visit https://gerrit.wikimedia.org/r/268882 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6160c327482723947353b8c3674553199d1d9daf Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/bots/xqbot Gerrit-Branch: master Gerrit-Owner: Xqt___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove manual ignoring list - change (pywikibot...xqbot)
Xqt has submitted this change and it was merged. Change subject: remove manual ignoring list .. remove manual ignoring list Change-Id: I6160c327482723947353b8c3674553199d1d9daf --- M afd-notice.py 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/afd-notice.py b/afd-notice.py index 14d1916..3843fca 100644 --- a/afd-notice.py +++ b/afd-notice.py @@ -81,8 +81,6 @@ if page.namespace() in (2, 3): self.ignoreUser.add(page.title(withNamespace=False, withSection=False).split('/')[0]) -# ignore some other people -self.ignoreUser.add('Liesel') pywikibot.output(u'%d users found to opt-out' % len(self.ignoreUser)) cat1 = pywikibot.Category(self.site, -- To view, visit https://gerrit.wikimedia.org/r/268882 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6160c327482723947353b8c3674553199d1d9daf Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/bots/xqbot Gerrit-Branch: master Gerrit-Owner: XqtGerrit-Reviewer: Xqt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SPDY support toggle, off for cp1008 canary - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/268892 Change subject: SPDY support toggle, off for cp1008 canary .. SPDY support toggle, off for cp1008 canary Bug: T125979 Change-Id: Ieb8dd08349d655ad32bdb905374dff6634acddac --- M hieradata/hosts/cp1008.yaml M modules/tlsproxy/manifests/localssl.pp M modules/tlsproxy/templates/localssl.erb 3 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/92/268892/1 diff --git a/hieradata/hosts/cp1008.yaml b/hieradata/hosts/cp1008.yaml index 0898300..83fc5db 100644 --- a/hieradata/hosts/cp1008.yaml +++ b/hieradata/hosts/cp1008.yaml @@ -1,3 +1,4 @@ debdeploy::grains: debdeploy-cp: value: canary +tlsproxy::localssl::do_spdy: false diff --git a/modules/tlsproxy/manifests/localssl.pp b/modules/tlsproxy/manifests/localssl.pp index 09b03fe..ed0c79b 100644 --- a/modules/tlsproxy/manifests/localssl.pp +++ b/modules/tlsproxy/manifests/localssl.pp @@ -27,6 +27,10 @@ # correct configuration directives in the site's nginx config file as well # as creates the OCSP data file itself and ensures a cron is running to # keep it up to date. +# +# [*do_spdy*] +# Boolean, default true. Enables SPDY/3.1 protocol support +# define tlsproxy::localssl( $certs, @@ -35,6 +39,7 @@ $default_server = false, $upstream_port = '80', $do_ocsp= false, +$do_spdy= true, $skip_private = false, ) { require tlsproxy::instance diff --git a/modules/tlsproxy/templates/localssl.erb b/modules/tlsproxy/templates/localssl.erb index ef39f6b..465522c 100644 --- a/modules/tlsproxy/templates/localssl.erb +++ b/modules/tlsproxy/templates/localssl.erb @@ -3,8 +3,8 @@ # SSL proxying server { - listen [::]:443 <%= @default_server ? "default_server deferred backlog=4096 reuseport ipv6only=on " : "" %>ssl spdy; - listen 443 <%= @default_server ? "default_server deferred backlog=4096 reuseport " : "" %>ssl spdy; + listen [::]:443 <%= @default_server ? "default_server deferred backlog=4096 reuseport ipv6only=on " : "" %>ssl <% if @do_spdy %>spdy<% end %>; + listen 443 <%= @default_server ? "default_server deferred backlog=4096 reuseport " : "" %>ssl <% if @do_spdy %>spdy<% end %>; ssl on; server_name <%= ([@server_name] + @server_aliases).join(" ") %>; -- To view, visit https://gerrit.wikimedia.org/r/268892 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb8dd08349d655ad32bdb905374dff6634acddac Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VE: Disable interaction with CE nodes - change (mediawiki...Kartographer)
jenkins-bot has submitted this change and it was merged. Change subject: VE: Disable interaction with CE nodes .. VE: Disable interaction with CE nodes This is mostly prevented by the focus shield, but events sometimes get through, like when scrolling fast. Change-Id: I265531becb0678ce7a16f72a40757c575f07247a --- M modules/ve-maps/ve.ce.MWMapsNode.js 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Yurik: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-maps/ve.ce.MWMapsNode.js b/modules/ve-maps/ve.ce.MWMapsNode.js index 6f1003f..112bdcd 100644 --- a/modules/ve-maps/ve.ce.MWMapsNode.js +++ b/modules/ve-maps/ve.ce.MWMapsNode.js @@ -137,6 +137,13 @@ // TODO: Support style editing geoJson: geoJson } ); + + // Disable interaction + this.map.dragging.disable(); + this.map.touchZoom.disable(); + this.map.doubleClickZoom.disable(); + this.map.scrollWheelZoom.disable(); + this.map.keyboard.disable(); }; /** -- To view, visit https://gerrit.wikimedia.org/r/268891 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I265531becb0678ce7a16f72a40757c575f07247a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Kartographer Gerrit-Branch: master Gerrit-Owner: EsandersGerrit-Reviewer: Yurik Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] disable SPDY for all cache_text - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/268893 Change subject: disable SPDY for all cache_text .. disable SPDY for all cache_text Bug: T125979 Change-Id: Id3d656db3b57fdad95ff6a7c196e18e2cffe0e23 --- M hieradata/hosts/cp1008.yaml M hieradata/role/common/cache/text.yaml 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/93/268893/1 diff --git a/hieradata/hosts/cp1008.yaml b/hieradata/hosts/cp1008.yaml index 83fc5db..0898300 100644 --- a/hieradata/hosts/cp1008.yaml +++ b/hieradata/hosts/cp1008.yaml @@ -1,4 +1,3 @@ debdeploy::grains: debdeploy-cp: value: canary -tlsproxy::localssl::do_spdy: false diff --git a/hieradata/role/common/cache/text.yaml b/hieradata/role/common/cache/text.yaml index a2b5d1f..b29a14a 100644 --- a/hieradata/role/common/cache/text.yaml +++ b/hieradata/role/common/cache/text.yaml @@ -1,3 +1,4 @@ cluster: cache_text admin::groups: - perf-roots +tlsproxy::localssl::do_spdy: false -- To view, visit https://gerrit.wikimedia.org/r/268893 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3d656db3b57fdad95ff6a7c196e18e2cffe0e23 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add some unit-tests for Utils class - change (mediawiki...GWToolset)
Jean-Frédéric has uploaded a new change for review. https://gerrit.wikimedia.org/r/268894 Change subject: Add some unit-tests for Utils class .. Add some unit-tests for Utils class Not extensive but a start. Change-Id: Iee54fe7a3a1c8a84a42a0fb8067a3bc02be86cea --- A GWToolset.hooks.php A tests/phpunit/UtilsTest.php 2 files changed, 117 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GWToolset refs/changes/94/268894/1 diff --git a/GWToolset.hooks.php b/GWToolset.hooks.php new file mode 100644 index 000..19e43f3 --- /dev/null +++ b/GWToolset.hooks.php @@ -0,0 +1,20 @@ +utils = new Utils(); + } + + protected function tearDown() { + parent::tearDown(); + } + +/** + * @covers Utils::getArraySecondLevelValues + */ + public function test_getArraySecondLevelValues_empty() { + $input = [[]]; + $expected = []; + $this->assertEquals( $this->utils->getArraySecondLevelValues($input), $expected); + } + +/** + * @covers Utils::getArraySecondLevelValues + */ + public function test_getArraySecondLevelValues() { + $input = [[1],[2],[3,4,5]]; + $expected = [1,2,3,4,5]; + $this->assertEquals( $this->utils->getArraySecondLevelValues($input), $expected); + } + +/** + * @covers Utils::getBytes + */ + public function test_getBytes_passthrough() { + $this->assertEquals( $this->utils->getBytes('1'), 1 ); + } + +/** + * @covers Utils::getBytes + */ + public function test_getBytes_M() { + $this->assertEquals( $this->utils->getBytes("1M"), 1048576 ); + } + +/** + * @covers Utils::getBytes + */ + public function test_getBytes_K() {; + $this->assertEquals( $this->utils->getBytes("1K"), 1024 ); + } + +/** + * @covers Utils::getBytes + */ + public function test_getBytes_G() { + $this->assertEquals( $this->utils->getBytes("1G"), 1073741824 ); + } + +/** + * @covers Utils::getNamespaceName + */ + public function test_getNamespaceName_empty() { + $this->assertEquals( $this->utils->getNamespaceName(), ':' ); + } + +/** + * @covers Utils::getNamespaceName + */ + public function test_getNamespaceName_6() { + $this->assertEquals( $this->utils->getNamespaceName(6), 'File:' ); + } + +/** + * @covers Utils::getNamespaceName + */ + public function test_getNamespaceName_not_string() { + $this->assertEquals( $this->utils->getNamespaceName("Something"), null); + } + +/** + * @covers Utils::normalizeSpace + */ + public function test_normalizeSpace() { + $this->assertEquals( $this->utils->normalizeSpace("a b cd"), "a_b_cd"); + } + +} -- To view, visit https://gerrit.wikimedia.org/r/268894 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee54fe7a3a1c8a84a42a0fb8067a3bc02be86cea Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GWToolset Gerrit-Branch: master Gerrit-Owner: Jean-Frédéric___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert GWToolset to extension registration - change (mediawiki...GWToolset)
Jean-Frédéric has uploaded a new change for review. https://gerrit.wikimedia.org/r/268897 Change subject: Convert GWToolset to extension registration .. Convert GWToolset to extension registration Created with convertExtensionToRegistration.php Change-Id: I7cc4a8697fb998111efca66a71c3b63a463ccede Task: T87928 --- M GWToolset.php A extension.json 2 files changed, 160 insertions(+), 145 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GWToolset refs/changes/97/268897/1 diff --git a/GWToolset.php b/GWToolset.php index 478aef0..6a76935 100644 --- a/GWToolset.php +++ b/GWToolset.php @@ -1,147 +1,14 @@ http://www.gnu.org/licenses/gpl.html - */ - -namespace GWToolset; -use GWToolset\Constants; - -if ( !defined( 'MEDIAWIKI' ) ) { - echo 'This file is part of a MediaWiki extension; it is not a valid entry point. To install this extension, follow the instructions in the INSTALL file.'; - exit(); +if ( function_exists( 'wfLoadExtension' ) ) { + wfLoadExtension( 'GWToolset' ); + // Keep i18n globals so mergeMessageFileList.php doesn't break + $wgMessagesDirs['GWToolset'] = __DIR__ . '/i18n'; + $wgExtensionMessagesFiles['GWToolsetAlias'] = __DIR__ . '/GWToolset.alias.php'; + wfWarn( + 'Deprecated PHP entry point used for GWToolset extension. Please use wfLoadExtension instead, ' . + 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' + ); + return; +} else { + die( 'This version of the GWToolset extension requires MediaWiki 1.25+' ); } - -// set extension directory reference to this directory -$wgGWToolsetDir = realpath( __DIR__ ); - -// load extension constants -require_once $wgGWToolsetDir . '/includes/Constants.php'; - -// register extension metadata with MediaWiki -$wgExtensionCredits['media'][] = array( - 'author' => array( 'dan entous' ), - 'descriptionmsg' => 'gwtoolset-desc', - 'name' => 'GWToolset', - 'path' => __FILE__, - 'url' => 'https://www.mediawiki.org/wiki/Extension:GWToolset', - 'version' => Constants::EXTENSION_VERSION -); - -// define namespaces -// @see http://www.mediawiki.org/wiki/Manual:Using_custom_namespaces -// @see https://www.mediawiki.org/wiki/Extension_default_namespaces#GWToolset -if ( !defined( 'NS_GWTOOLSET' ) ) { - define( 'NS_GWTOOLSET', 490 ); - define( 'NS_GWTOOLSET_TALK', NS_GWTOOLSET + 1 ); -} - -$wgExtraNamespaces[NS_GWTOOLSET] = 'GWToolset'; -$wgExtraNamespaces[NS_GWTOOLSET_TALK] = 'GWToolset_talk'; -$wgNamespaceProtection[NS_GWTOOLSET] = array( 'gwtoolset' ); -$wgNamespacesWithSubpages[NS_GWTOOLSET] = true; -$wgNamespacesWithSubpages[NS_GWTOOLSET_TALK] = true; - -// add user permissions -$wgAvailableRights[] = 'gwtoolset'; -$wgGroupPermissions["gwtoolset"]["gwtoolset"] = true; -$wgGroupPermissions["gwtoolset"]["upload_by_url"] = true; - -// add autoloader classes -$wgAutoloadClasses = $wgAutoloadClasses + array( - 'GWToolset\Config' => $wgGWToolsetDir . '/includes/Config.php', - 'GWToolset\GWTException' => $wgGWToolsetDir . '/includes/GWTException.php', - 'GWToolset\Utils' => $wgGWToolsetDir . '/includes/Utils.php', - 'GWToolset\Adapters\DataAdapterInterface' => $wgGWToolsetDir . '/includes/Adapters/DataAdapterInterface.php', - 'GWToolset\Adapters\Php\MappingPhpAdapter' => $wgGWToolsetDir . '/includes/Adapters/Php/MappingPhpAdapter.php', - 'GWToolset\Adapters\Php\MediawikiTemplatePhpAdapter' => $wgGWToolsetDir . '/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php', - 'GWToolset\Adapters\Php\MetadataPhpAdapter' => $wgGWToolsetDir . '/includes/Adapters/Php/MetadataPhpAdapter.php', - 'GWToolset\Forms\MetadataDetectForm' => $wgGWToolsetDir . '/includes/Forms/MetadataDetectForm.php', - 'GWToolset\Forms\MetadataMappingForm' => $wgGWToolsetDir . '/includes/Forms/MetadataMappingForm.php', - 'GWToolset\Forms\PreviewForm' => $wgGWToolsetDir . '/includes/Forms/PreviewForm.php', - 'GWToolset\Handlers\Forms\FormHandler' => $wgGWToolsetDir . '/includes/Handlers/Forms/FormHandler.php', - 'GWToolset\Handlers\Forms\MetadataDetectHandler' => $wgGWToolsetDir . '/includes/Handlers/Forms/MetadataDetectHandler.php', - 'GWToolset\Handlers\Forms\MetadataMappingHandler' => $wgGWToolsetDir . '/includes/Handlers/Forms/MetadataMappingHandler.php', - 'GWToolset\Handlers\UploadHandler' => $wgGWToolsetDir . '/includes/Handlers/UploadHandler.php', - 'GWToolset\Handlers\Xml\XmlDetectHandler' => $wgGWToolsetDir . '/includes/Handlers/Xml/XmlDetectHandler.php', - 'GWToolset\Handlers\Xml\XmlHandler' => $wgGWToolsetDir . '/includes/Handlers/Xml/XmlHandler.php', - 'GWToolset\Handlers\Xml\XmlMappingHandler' => $wgGWToolsetDir . '/includes/Handlers/Xml/XmlMappingHandler.php', - 'GWToolset\Helpers\FileChecks' =>
[MediaWiki-commits] [Gerrit] Add missing abstract function getFormFields in MediaWiki 1.26 - change (mediawiki...DeletePagesForGood)
jenkins-bot has submitted this change and it was merged. Change subject: Add missing abstract function getFormFields in MediaWiki 1.26 .. Add missing abstract function getFormFields in MediaWiki 1.26 Change-Id: I85349f65fb23eb548232e28c1479458e1075de98 --- M ActionDeletePagePermanently.php 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Paladox: Looks good to me, approved jenkins-bot: Verified diff --git a/ActionDeletePagePermanently.php b/ActionDeletePagePermanently.php index 01c086b..9dbd14c 100644 --- a/ActionDeletePagePermanently.php +++ b/ActionDeletePagePermanently.php @@ -22,6 +22,9 @@ return true; } + protected function getFormFields() { + } + public function getName() { return 'delete_page_permanently'; } -- To view, visit https://gerrit.wikimedia.org/r/268902 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I85349f65fb23eb548232e28c1479458e1075de98 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/DeletePagesForGood Gerrit-Branch: REL1_26 Gerrit-Owner: PaladoxGerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 04259b7..b7f710b - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 04259b7..b7f710b .. Syncronize VisualEditor: 04259b7..b7f710b Change-Id: I31c930418a58cbdff4184fb7918555e61f9c9922 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 04259b7..b7f710b 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 04259b793a53403f71c4e974e32f77f232f0fadd +Subproject commit b7f710baa07cea039c805985761342e1fbe8d034 -- To view, visit https://gerrit.wikimedia.org/r/268878 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I31c930418a58cbdff4184fb7918555e61f9c9922 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-syncGerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set page title when we take over action=edit - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Set page title when we take over action=edit .. Set page title when we take over action=edit Bug: T125670 Change-Id: If2ac6457ba82fbd046649afb1e24eab3232c5d85 --- M VisualEditor.hooks.php 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, but someone else must approve Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php index cbdbb0c..268771b 100644 --- a/VisualEditor.hooks.php +++ b/VisualEditor.hooks.php @@ -154,12 +154,17 @@ // Known-good parameters: edit, veaction, section, vesection, veswitched if ( !$ret ) { + $out = $article->getContext()->getOutput(); + $params['venoscript'] = '1'; $url = htmlspecialchars( wfScript() . '?' . wfArrayToCgi( $params ) ); - $article->getContext()->getOutput()->addHeadItem( + $out->addHeadItem( 've-noscript-fallback', "" ); + + $titleMsg = $title->exists() ? 'editing' : 'creating'; + $out->setPageTitle( wfMessage( $titleMsg, $title->getPrefixedText() ) ); } return $ret; } -- To view, visit https://gerrit.wikimedia.org/r/268610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2ac6457ba82fbd046649afb1e24eab3232c5d85 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Alex MonkGerrit-Reviewer: Esanders Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 04259b7..b7f710b - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/268878 Change subject: Syncronize VisualEditor: 04259b7..b7f710b .. Syncronize VisualEditor: 04259b7..b7f710b Change-Id: I31c930418a58cbdff4184fb7918555e61f9c9922 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/78/268878/1 diff --git a/VisualEditor b/VisualEditor index 04259b7..b7f710b 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 04259b793a53403f71c4e974e32f77f232f0fadd +Subproject commit b7f710baa07cea039c805985761342e1fbe8d034 -- To view, visit https://gerrit.wikimedia.org/r/268878 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I31c930418a58cbdff4184fb7918555e61f9c9922 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add input type regexp to SemanticForms - change (mediawiki...SemanticForms)
Foxtrott has uploaded a new change for review. https://gerrit.wikimedia.org/r/26 Change subject: Add input type regexp to SemanticForms .. Add input type regexp to SemanticForms This will collide with the datepicker in SFI < 0.10.0, i.e. SFI has to be upgraded to the latest version. Change-Id: Ife940f2dbbe88b79c8f286ae5900e8da5f474db2 --- M SemanticForms.php M extension.json M i18n/af.json M i18n/ast.json M i18n/be-tarask.json M i18n/bg.json M i18n/bn.json M i18n/br.json M i18n/bs.json M i18n/ca.json M i18n/cs.json M i18n/de.json M i18n/dsb.json M i18n/el.json M i18n/en.json M i18n/es.json M i18n/fa.json M i18n/fi.json M i18n/fr.json M i18n/frp.json M i18n/gl.json M i18n/gsw.json M i18n/he.json M i18n/hsb.json M i18n/hu.json M i18n/ia.json M i18n/id.json M i18n/it.json M i18n/ja.json M i18n/ka.json M i18n/ko.json M i18n/ksh.json M i18n/lb.json M i18n/mk.json M i18n/ms.json M i18n/nb.json M i18n/nl.json M i18n/oc.json M i18n/pl.json M i18n/pms.json M i18n/pt-br.json M i18n/pt.json M i18n/qqq.json M i18n/roa-tara.json M i18n/ru.json M i18n/si.json M i18n/sv.json M i18n/tl.json M i18n/uk.json M i18n/vi.json M i18n/zh-hans.json M i18n/zh-hant.json M includes/SF_FormPrinter.php A includes/forminputs/SF_RegExp.php A libs/SF_regexp.js 55 files changed, 549 insertions(+), 51 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms refs/changes/88/26/1 diff --git a/SemanticForms.php b/SemanticForms.php index 2a841b4..56d6014 100644 --- a/SemanticForms.php +++ b/SemanticForms.php @@ -229,6 +229,8 @@ $GLOBALS['wgAutoloadClasses']['SFTokensInput'] = __DIR__ . '/includes/forminputs/SF_TokensInput.php'; $GLOBALS['wgAutoloadClasses']['SFGoogleMapsInput'] = __DIR__ . '/includes/forminputs/SF_GoogleMapsInput.php'; $GLOBALS['wgAutoloadClasses']['SFOpenLayersInput'] = __DIR__ . '/includes/forminputs/SF_OpenLayersInput.php'; +$GLOBALS['wgAutoloadClasses']['SFRegExp'] = $dir . '/includes/SF_RegExp.php'; + $GLOBALS['wgAutoloadClasses']['SFWikiPage'] = __DIR__ . '/includes/wikipage/SF_WikiPage.php'; $GLOBALS['wgAutoloadClasses']['SFWikiPageTemplate'] = __DIR__ . '/includes/wikipage/SF_WikiPageTemplate.php'; $GLOBALS['wgAutoloadClasses']['SFWikiPageTemplateParam'] = __DIR__ . '/includes/wikipage/SF_WikiPageTemplateParam.php'; @@ -349,6 +351,12 @@ 'ext.semanticforms.main' ), ), + 'ext.semanticforms.regexp' => $sfgResourceTemplate + array( + 'scripts' => 'libs/SF_regexp.js', + 'dependencies' => array( + 'ext.semanticforms.main' + ), + ), 'ext.semanticforms.select2' => $sfgResourceTemplate + array( 'scripts' => array( 'libs/select2.js', diff --git a/extension.json b/extension.json index f4f7eff..80c1c3f 100644 --- a/extension.json +++ b/extension.json @@ -121,6 +121,7 @@ "SFTokensInput": "includes/forminputs/SF_TokensInput.php", "SFGoogleMapsInput": "includes/forminputs/SF_GoogleMapsInput.php", "SFOpenLayersInput": "includes/forminputs/SF_OpenLayersInput.php", + "SFRegExp": "includes/forminputs/SF_RegExp.php", "SFWikiPage": "includes/wikipage/SF_WikiPage.php", "SFWikiPageTemplate": "includes/wikipage/SF_WikiPageTemplate.php", "SFWikiPageTemplateParam": "includes/wikipage/SF_WikiPageTemplateParam.php", @@ -251,6 +252,12 @@ "ext.semanticforms.main" ] }, + "ext.semanticforms.regexp": { + "scripts": "libs/SF_regexp.js", + "dependencies": [ + "ext.semanticforms.main" + ] + }, "ext.semanticforms.select2": { "scripts": [ "libs/select2.js", diff --git a/i18n/af.json b/i18n/af.json index d23dee4..fddf840 100644 --- a/i18n/af.json +++ b/i18n/af.json @@ -26,5 +26,6 @@ "semanticformsinputs-close": "Sluit", "semanticformsinputs-prev": "Vorige", "semanticformsinputs-next": "Volgende", - "semanticformsinputs-today": "Vandag" + "semanticformsinputs-today": "Vandag", + "semanticformsinputs-wrongformat": "Verkeerde formaat." } diff --git a/i18n/ast.json b/i18n/ast.json index acb8ab7..0717adf 100644 --- a/i18n/ast.json +++ b/i18n/ast.json @@ -248,5 +248,12 @@ "semanticformsinputs-datepicker-highlightdates": "La llista, separada por comes, de dates o rangos de data qu'apaecerán destacaos (datas en formatu /mm/dd, rangos en formatu /mm/dd-/mm/dd).", "semanticformsinputs-datepicker-showweeknumbers": "¿Tienen d'apaecer a la izquierda los númberos de selmana?",
[MediaWiki-commits] [Gerrit] Special:Newsletters: Make the filter form smaller - change (mediawiki...Newsletter)
jenkins-bot has submitted this change and it was merged. Change subject: Special:Newsletters: Make the filter form smaller .. Special:Newsletters: Make the filter form smaller * Remove fieldset/legend wrapper * Decrease the width of the dropdown Bug: T120519 Change-Id: I695fc3c394ca5586b60727f674f7f376a0689b3f --- M i18n/en.json M i18n/qqq.json M includes/specials/SpecialNewsletters.php M modules/ext.newsletter.newsletters.styles.css 4 files changed, 7 insertions(+), 3 deletions(-) Approvals: 01tonythomas: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index f2b5bee..d2c8b77 100755 --- a/i18n/en.json +++ b/i18n/en.json @@ -122,7 +122,6 @@ "notification-header-newsletter-announce": "$1 {{GENDER:$2|has announced}} a new issue of $3.", "notification-body-newsletter-announce": "$1", "newsletter-list-table": "Filter by: ", - "newsletter-list-section": "Search for newsletters", "newsletter-list-option-all": "All newsletters", "newsletter-list-option-subscribed": "Newsletters I am subscribed to", "newsletter-list-option-unsubscribed": "Newsletters I am not subscribed to", diff --git a/i18n/qqq.json b/i18n/qqq.json index 2b738ad..9f6b146 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -126,7 +126,6 @@ "notification-header-newsletter-announce": "Header text for a notification when a new issue of a newsletter is announced. Parameters:\n* $1 is that user's name (not suitable for GENDER).\n* $2 is the user's name for use in GENDER.\n* $3 is the title of the newsletter.", "notification-body-newsletter-announce": "Body text for a notification when a new issue of a newsletter is announced. Parameters:\n* $1 is the summary of the new newsletter issue.", "newsletter-list-table": "Label of the drop down menu in [[Special:Newsletters]], the options of which can be used to customize the search of newsletters", - "newsletter-list-section": "Section header of HTML form in [[Special:Newsletters]] used to search for newsletters", "newsletter-list-option-all": "Option of the drop down menu in [[Special:Newsletters]] to display all newsletters", "newsletter-list-option-subscribed": "Option of the drop down menu in [[Special:Newsletters]] to display those newsletters to which the logged in user is subscribed to", "newsletter-list-option-unsubscribed": "Option of the drop down menu in [[Special:Newsletters]] to display those newsletters to which the logged in user is not subscribed to", diff --git a/includes/specials/SpecialNewsletters.php b/includes/specials/SpecialNewsletters.php index 6f36ba4..963b80f 100644 --- a/includes/specials/SpecialNewsletters.php +++ b/includes/specials/SpecialNewsletters.php @@ -45,7 +45,6 @@ $filterTableForm->setMethod( 'get' ); $filterTableForm->setSubmitProgressive(); $filterTableForm->setSubmitTextMsg( 'newsletter-list-go-button' ); - $filterTableForm->setWrapperLegendMsg( 'newsletter-list-section' ); $pager = new NewsletterTablePager(); $pager->setUserOption( $this->option ); diff --git a/modules/ext.newsletter.newsletters.styles.css b/modules/ext.newsletter.newsletters.styles.css index d7edf94..0e697b2 100644 --- a/modules/ext.newsletter.newsletters.styles.css +++ b/modules/ext.newsletter.newsletters.styles.css @@ -11,6 +11,13 @@ display: none; } +/** + * The default dropdown is rather wide so we'll make it a bit small to make it look nicer. + */ +#mw-newsletter-filter-options { + width: 40%; +} + /* Styling for "Subscribe/Unsubscribe" links */ .newsletter-subscribed, .newsletter-subscribed:link, .newsletter-subscribed:visited { -- To view, visit https://gerrit.wikimedia.org/r/268880 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I695fc3c394ca5586b60727f674f7f376a0689b3f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: GlaisherGerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com> Gerrit-Reviewer: Addshore Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix rights in oauth role - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged. Change subject: Fix rights in oauth role .. Fix rights in oauth role WMF production does not give anyone the mwoauthviewprivate right; make vagrant match that. Bug: T125939 Change-Id: I8c97831097b41c0554a0c12792bc3543c80e77f2 --- M puppet/modules/role/manifests/oauth.pp 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/role/manifests/oauth.pp b/puppet/modules/role/manifests/oauth.pp index 8c64d63..434662f 100644 --- a/puppet/modules/role/manifests/oauth.pp +++ b/puppet/modules/role/manifests/oauth.pp @@ -19,7 +19,6 @@ '$wgMWOAuthSecureTokenTransfer = false', "\$wgOAuthSecretKey = '${secret_key}'", '$wgGroupPermissions["sysop"]["mwoauthmanageconsumer"] = true', -'$wgGroupPermissions["sysop"]["mwoauthviewprivate"] = true', '$wgGroupPermissions["user"]["mwoauthproposeconsumer"] = true', '$wgGroupPermissions["user"]["mwoauthupdateownconsumer"] = true', ] -- To view, visit https://gerrit.wikimedia.org/r/268860 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8c97831097b41c0554a0c12792bc3543c80e77f2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Gergő TiszaGerrit-Reviewer: BryanDavis Gerrit-Reviewer: Dduvall Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Handle error message in SpecialMWOAuthManageConsumers - change (mediawiki...OAuth)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/268859 Change subject: Handle error message in SpecialMWOAuthManageConsumers .. Handle error message in SpecialMWOAuthManageConsumers DAO objects, when wrapped in MWOAuthDAOAccessControl, can return a Message explaining that the user lacks permissions, instead of the real value. SpecialMWOAuthManageConsumers expected the 'restrictions' field of MWOAuthConsumer to always be an MWRestrictions object, which caused problems when trying to manage another user's consumer without the mwoauthviewprivate right. Bug: T125939 Change-Id: I0212234d10243cc39a2cb18eb8d1e0f620e3123b --- M frontend/specialpages/SpecialMWOAuthManageConsumers.php 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth refs/changes/59/268859/1 diff --git a/frontend/specialpages/SpecialMWOAuthManageConsumers.php b/frontend/specialpages/SpecialMWOAuthManageConsumers.php index a074d78..da75e68 100755 --- a/frontend/specialpages/SpecialMWOAuthManageConsumers.php +++ b/frontend/specialpages/SpecialMWOAuthManageConsumers.php @@ -259,6 +259,7 @@ $dbw = MWOAuthUtils::getCentralDB( DB_MASTER ); // @TODO: lazy handle $control = new MWOAuthConsumerSubmitControl( $this->getContext(), array(), $dbw ); + $restrictions = $cmr->get( 'restrictions' ); $form = new \HTMLForm( $control->registerValidators( array( 'consumerKeyShown' => array( @@ -334,7 +335,8 @@ 'restrictions' => array( 'type' => 'info', 'label-message' => 'mwoauth-consumer-restrictions-json', - 'default' => $cmr->get( 'restrictions' )->toJson( true ), + 'default' => $restrictions instanceof \MWRestrictions ? + $restrictions->toJson( true ) : $restrictions, 'rows' => 5 ), 'rsaKey' => array( -- To view, visit https://gerrit.wikimedia.org/r/268859 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0212234d10243cc39a2cb18eb8d1e0f620e3123b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OAuth Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/268890 Change subject: Test .. Test Change-Id: I87f962e98a4b6ae8db8a37e3695cbdbbf9003924 --- M resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/90/268890/1 diff --git a/resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js b/resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js index 59f1d50..847cb4b 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js +++ b/resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js @@ -66,6 +66,8 @@ } /* Setup */ + + /* global OO.ui.mixin.PendingElement */ OO.inheritClass( CategorySelector, OO.ui.CapsuleMultiSelectWidget ); OO.mixinClass( CategorySelector, OO.ui.mixin.PendingElement ); -- To view, visit https://gerrit.wikimedia.org/r/268890 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I87f962e98a4b6ae8db8a37e3695cbdbbf9003924 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_26 Gerrit-Owner: Paladox___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] KeyDownHandlers: Make Tab behave the same in table cells as ... - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/268898 Change subject: KeyDownHandlers: Make Tab behave the same in table cells as in table selections .. KeyDownHandlers: Make Tab behave the same in table cells as in table selections Bug: T125378 Change-Id: Ib042c7c255458a39ec54651bb304bafcd7366eb0 --- M src/ce/keydownhandlers/ve.ce.LinearTabKeyDownHandler.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/98/268898/1 diff --git a/src/ce/keydownhandlers/ve.ce.LinearTabKeyDownHandler.js b/src/ce/keydownhandlers/ve.ce.LinearTabKeyDownHandler.js index 0ebc135..3347253 100644 --- a/src/ce/keydownhandlers/ve.ce.LinearTabKeyDownHandler.js +++ b/src/ce/keydownhandlers/ve.ce.LinearTabKeyDownHandler.js @@ -49,7 +49,7 @@ surface, 0, // rows e.shiftKey ? -1 : 1, // columns - true, // respect rtl/ltr + false, // logical direction, not visual false // don't expand the current selection ); return true; -- To view, visit https://gerrit.wikimedia.org/r/268898 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib042c7c255458a39ec54651bb304bafcd7366eb0 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] Add missing abstract function getFormFields in MediaWiki 1.26 - change (mediawiki...DeletePagesForGood)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/268902 Change subject: Add missing abstract function getFormFields in MediaWiki 1.26 .. Add missing abstract function getFormFields in MediaWiki 1.26 Change-Id: I85349f65fb23eb548232e28c1479458e1075de98 --- M ActionDeletePagePermanently.php 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DeletePagesForGood refs/changes/02/268902/1 diff --git a/ActionDeletePagePermanently.php b/ActionDeletePagePermanently.php index 01c086b..9dbd14c 100644 --- a/ActionDeletePagePermanently.php +++ b/ActionDeletePagePermanently.php @@ -22,6 +22,9 @@ return true; } + protected function getFormFields() { + } + public function getName() { return 'delete_page_permanently'; } -- To view, visit https://gerrit.wikimedia.org/r/268902 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85349f65fb23eb548232e28c1479458e1075de98 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DeletePagesForGood Gerrit-Branch: REL1_26 Gerrit-Owner: Paladox___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use semver for wgVersion alpha versions - change (mediawiki/core)
Florianschmidtwelzow has uploaded a new change for review. https://gerrit.wikimedia.org/r/268887 Change subject: Use semver for wgVersion alpha versions .. Use semver for wgVersion alpha versions Currently, the "alpha version" of MediaWiki is the only version, that doesn't follow semantic versioning (1.27alpha), wmf branches are named according to the sember convention (e.g. 1.27.0-wmf.1) and releases, too (e.g. 1.26.0). Change the alpha version naming to follow semver, too: 1.27alpha -> 1.27.0-alpha Change-Id: I026825c688e2eaed104ed2d0ec206b5a897a3527 --- M includes/DefaultSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/87/268887/1 diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 9c7106f..6a41152 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -75,7 +75,7 @@ * MediaWiki version number * @since 1.2 */ -$wgVersion = '1.27alpha'; +$wgVersion = '1.27.0-alpha'; /** * Name of the site. It must be changed in LocalSettings.php -- To view, visit https://gerrit.wikimedia.org/r/268887 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I026825c688e2eaed104ed2d0ec206b5a897a3527 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Special:Version: Use addModuleStyles to load mediawiki.speci... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Special:Version: Use addModuleStyles to load mediawiki.special.version .. Special:Version: Use addModuleStyles to load mediawiki.special.version Currently, there is a brief delay before the stylesheet is loaded so use addModuleStyles as this is a stylesheet only module. Change-Id: I6adfeae88dddeab427928ef800152a4e1353cbe5 --- M includes/specials/SpecialVersion.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Fomafix: Looks good to me, but someone else must approve Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php index a628902..17442be 100644 --- a/includes/specials/SpecialVersion.php +++ b/includes/specials/SpecialVersion.php @@ -126,7 +126,7 @@ break; default: - $out->addModules( 'mediawiki.special.version' ); + $out->addModuleStyles( 'mediawiki.special.version' ); $out->addWikiText( $this->getMediaWikiCredits() . $this->softwareInformation() . -- To view, visit https://gerrit.wikimedia.org/r/268871 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6adfeae88dddeab427928ef800152a4e1353cbe5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: GlaisherGerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Fomafix Gerrit-Reviewer: Glaisher Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make SFI work again with gerrit - change (mediawiki...SemanticFormsInputs)
Foxtrott has uploaded a new change for review. https://gerrit.wikimedia.org/r/268895 Change subject: Make SFI work again with gerrit .. Make SFI work again with gerrit Change-Id: If984ade61184037663bbc90315328b81a1659ac1 --- A .jshintignore 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticFormsInputs refs/changes/95/268895/1 diff --git a/.jshintignore b/.jshintignore new file mode 100644 index 000..316082c --- /dev/null +++ b/.jshintignore @@ -0,0 +1,3 @@ +libs/jquery.form-validator.js +libs/jquery.multi-select.js +libs/menuselect.js -- To view, visit https://gerrit.wikimedia.org/r/268895 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If984ade61184037663bbc90315328b81a1659ac1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticFormsInputs Gerrit-Branch: master Gerrit-Owner: Foxtrott___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update pear/mail 1.2.0 -> 1.3.0 - change (mediawiki/vendor)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/268899 Change subject: Update pear/mail 1.2.0 -> 1.3.0 .. Update pear/mail 1.2.0 -> 1.3.0 https://github.com/pear/Mail/compare/1.2.0...1.3.0 Drops PHP4 support. Improves PHP 7 support Change-Id: Iabeda04aa1194aca5e797dcf90b0ad9b480d3402 --- M composer.json M composer.lock M composer/installed.json A pear/mail/.gitignore A pear/mail/.travis.yml M pear/mail/Mail.php M pear/mail/Mail/RFC822.php M pear/mail/Mail/mail.php M pear/mail/Mail/mock.php M pear/mail/Mail/null.php M pear/mail/Mail/sendmail.php M pear/mail/Mail/smtp.php M pear/mail/Mail/smtpmx.php A pear/mail/README.rst M pear/mail/composer.json M pear/mail/package.xml M pear/mail/tests/13659.phpt A pear/mail/tests/Makefile A pear/mail/tests/bug17178.phpt A pear/mail/tests/bug17317.phpt M pear/mail/tests/rfc822.phpt M pear/mail/tests/smtp_error.phpt 22 files changed, 303 insertions(+), 214 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor refs/changes/99/268899/1 diff --git a/composer.json b/composer.json index 65e50f3..c984cc0 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "oojs/oojs-ui": "0.15.2", "oyejorge/less.php": "1.7.0.10", "pear/console_getopt": "1.4.1", - "pear/mail": "1.2.0", + "pear/mail": "1.3.0", "pear/mail_mime": "1.10.0", "pear/mail_mime-decode": "1.5.5.2", "pear/net_smtp": "1.7.1", diff --git a/composer.lock b/composer.lock index 625a84d..10dc64f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;, "This file is @generated automatically" ], -"hash": "7f3f211f67f5a592871ced813284a0a8", -"content-hash": "7f19115f07b3948409e6c52f3f391760", +"hash": "830da33b9ff9b8b8d25d87c1a4db2095", +"content-hash": "8ffb92c59764cadc68596ebe14e7a8e1", "packages": [ { "name": "composer/semver", @@ -551,20 +551,21 @@ }, { "name": "pear/mail", -"version": "1.2.0", +"version": "1.3.0", "source": { "type": "git", "url": "https://github.com/pear/Mail.git;, -"reference": "19c4c78e39027374c012f32e489bbd3c6c47fb5e" +"reference": "8a7305cb507b460e03e55e0ac84c67c8358c9b44" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/pear/Mail/zipball/19c4c78e39027374c012f32e489bbd3c6c47fb5e;, -"reference": "19c4c78e39027374c012f32e489bbd3c6c47fb5e", +"url": "https://api.github.com/repos/pear/Mail/zipball/8a7305cb507b460e03e55e0ac84c67c8358c9b44;, +"reference": "8a7305cb507b460e03e55e0ac84c67c8358c9b44", "shasum": "" }, "require": { -"pear/pear-core-minimal": "*" +"pear/pear-core-minimal": "*", +"php": ">=5.2.1" }, "require-dev": { "pear/pear": "*" @@ -604,7 +605,7 @@ ], "description": "Class that provides multiple interfaces for sending emails.", "homepage": "http://pear.php.net/package/Mail;, -"time": "2016-01-09 07:14:03" +"time": "2016-01-31 21:32:18" }, { "name": "pear/mail_mime", diff --git a/composer/installed.json b/composer/installed.json index 3303b5c..4788e2c 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -1459,65 +1459,6 @@ "description": "More info available on: http://pear.php.net/package/Net_Socket; }, { -"name": "pear/mail", -"version": "1.2.0", -"version_normalized": "1.2.0.0", -"source": { -"type": "git", -"url": "https://github.com/pear/Mail.git;, -"reference": "19c4c78e39027374c012f32e489bbd3c6c47fb5e" -}, -"dist": { -"type": "zip", -"url": "https://api.github.com/repos/pear/Mail/zipball/19c4c78e39027374c012f32e489bbd3c6c47fb5e;, -"reference": "19c4c78e39027374c012f32e489bbd3c6c47fb5e", -"shasum": "" -}, -"require": { -"pear/pear-core-minimal": "*" -}, -"require-dev": { -"pear/pear": "*" -}, -"suggest": { -"pear/net_smtp": "Install optionally via your project's composer.json" -}, -"time": "2016-01-09 07:14:03", -"type": "library", -"installation-source": "dist", -"autoload": { -"psr-0": { -"Mail": "./" -} -}, -"notification-url":
[MediaWiki-commits] [Gerrit] OutputPage.php: Remove misleading comment - change (mediawiki/core)
Gerrit Patch Uploader has uploaded a new change for review. https://gerrit.wikimedia.org/r/268883 Change subject: OutputPage.php: Remove misleading comment .. OutputPage.php: Remove misleading comment The whole comment was added in fc359e16f1 together with a strtolower(). In dcd44cdf7d the strtolower() and a part of the comment was removed. The rest of the comment makes no sense without a strtolower(). Change-Id: Ifa0d88a618e31f4a558bc93a098aabad35761569 --- M includes/OutputPage.php 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/83/268883/1 diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 3adef5b..244b713 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -3613,8 +3613,6 @@ */ public function addStyle( $style, $media = '', $condition = '', $dir = '' ) { $options = array(); - // Even though we expect the media type to be lowercase, but here we - // force it to lowercase to be safe. if ( $media ) { $options['media'] = $media; } -- To view, visit https://gerrit.wikimedia.org/r/268883 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa0d88a618e31f4a558bc93a098aabad35761569 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Gerrit Patch Uploader___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add namespace aliases for mzn - change (mediawiki...Scribunto)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/268884 Change subject: Add namespace aliases for mzn .. Add namespace aliases for mzn Change-Id: I871fd627e7d3d492daae3f608453cf0df2330695 (cherry picked from commit 7ab1348e9485ba23a93b6eae2de9009e06f27516) --- M Scribunto.namespaces.php M tests/engines/LuaCommon/LuaInterpreterTest.php 2 files changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto refs/changes/84/268884/1 diff --git a/Scribunto.namespaces.php b/Scribunto.namespaces.php index 8a50ad0..b050de0 100644 --- a/Scribunto.namespaces.php +++ b/Scribunto.namespaces.php @@ -226,6 +226,11 @@ 828 => 'Modul', ); +$namespaceNames['mzn'] = array( + 828 => 'ماژول', + 829 => 'ماژول_گپ', +); + $namespaceNames['nb'] = array( 828 => 'Modul', 829 => 'Moduldiskusjon', diff --git a/tests/engines/LuaCommon/LuaInterpreterTest.php b/tests/engines/LuaCommon/LuaInterpreterTest.php index 7b4bf20..05519e7 100644 --- a/tests/engines/LuaCommon/LuaInterpreterTest.php +++ b/tests/engines/LuaCommon/LuaInterpreterTest.php @@ -116,7 +116,7 @@ $this->markTestSkipped( "Darwin is lacking POSIX timer, skipping CPU time limiting test." ); } - $interpreter = $this->newInterpreter( array( 'cpuLimit' => 1 ) ); + $interpreter = $this->newInterpreter( array( 'cpuLimit' => 2 ) ); $chunk = $this->getBusyLoop( $interpreter ); try { $interpreter->callFunction( $chunk, 1e9 ); -- To view, visit https://gerrit.wikimedia.org/r/268884 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I871fd627e7d3d492daae3f608453cf0df2330695 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Scribunto Gerrit-Branch: REL1_25 Gerrit-Owner: PaladoxGerrit-Reviewer: Mjbmr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove input type regexp - change (mediawiki...SemanticFormsInputs)
Foxtrott has uploaded a new change for review. https://gerrit.wikimedia.org/r/268889 Change subject: Remove input type regexp .. Remove input type regexp Input type regexp is now available directly from SemanticForms Change-Id: I4db5c6dfbc6daa1baa9d13eaeea18a98a5da0948 --- M SemanticFormsInputs.php M i18n/af.json D i18n/ar.json D i18n/arc.json M i18n/ast.json D i18n/az.json M i18n/be-tarask.json D i18n/bg.json D i18n/bn.json M i18n/br.json M i18n/bs.json M i18n/ca.json D i18n/ce.json D i18n/cs.json D i18n/cu.json D i18n/cv.json M i18n/de.json D i18n/diq.json M i18n/dsb.json M i18n/el.json M i18n/en.json M i18n/es.json D i18n/et.json M i18n/fa.json M i18n/fi.json M i18n/fr.json D i18n/frp.json D i18n/fy.json D i18n/ga.json M i18n/gl.json M i18n/gsw.json M i18n/he.json M i18n/hsb.json D i18n/hu.json M i18n/ia.json M i18n/id.json M i18n/it.json M i18n/ja.json D i18n/ka.json D i18n/km.json M i18n/ko.json M i18n/ksh.json D i18n/ku-latn.json M i18n/lb.json M i18n/mk.json D i18n/ml.json M i18n/ms.json M i18n/nb.json M i18n/nl.json M i18n/oc.json D i18n/pdc.json D i18n/pfl.json M i18n/pl.json M i18n/pms.json D i18n/ps.json M i18n/pt-br.json M i18n/pt.json M i18n/qqq.json D i18n/ro.json M i18n/roa-tara.json M i18n/ru.json M i18n/si.json D i18n/sr-ec.json D i18n/sr-el.json M i18n/sv.json D i18n/ta.json D i18n/te.json M i18n/tl.json D i18n/tr.json M i18n/uk.json D i18n/vi.json D i18n/yi.json M i18n/zh-hans.json M i18n/zh-hant.json D includes/SFI_RegExp.php D libs/regexp.js 76 files changed, 13 insertions(+), 753 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticFormsInputs refs/changes/89/268889/1 diff --git a/SemanticFormsInputs.php b/SemanticFormsInputs.php index 870679f..b4722fe 100644 --- a/SemanticFormsInputs.php +++ b/SemanticFormsInputs.php @@ -55,7 +55,6 @@ $wgAutoloadClasses['SFITimePicker'] = $dir . '/includes/SFI_TimePicker.php'; $wgAutoloadClasses['SFIDateTimePicker'] = $dir . '/includes/SFI_DateTimePicker.php'; $wgAutoloadClasses['SFIMenuSelect'] = $dir . '/includes/SFI_MenuSelect.php'; -$wgAutoloadClasses['SFIRegExp'] = $dir . '/includes/SFI_RegExp.php'; $wgAutoloadClasses['SFITwoListBoxes'] = $dir . '/includes/SFI_TwoListBoxes.php'; $wgAutoloadClasses['SFIDateCheck'] = $dir . '/includes/SFI_DateCheck.php'; @@ -84,15 +83,6 @@ 'remoteExtPath' => 'SemanticFormsInputs', 'scripts' => 'libs/menuselect.js', 'styles' => 'skins/SFI_Menuselect.css', - 'dependencies' => array( - 'ext.semanticforms.main' - ), -); - -$wgResourceModules['ext.semanticformsinputs.regexp'] = array( - 'localBasePath' => $dir, - 'remoteExtPath' => 'SemanticFormsInputs', - 'scripts' => 'libs/regexp.js', 'dependencies' => array( 'ext.semanticforms.main' ), @@ -141,7 +131,6 @@ $sfgFormPrinter->registerInputType( 'SFITimePicker' ); $sfgFormPrinter->registerInputType( 'SFIDateTimePicker' ); $sfgFormPrinter->registerInputType( 'SFIMenuSelect' ); - $sfgFormPrinter->registerInputType( 'SFIRegExp' ); $sfgFormPrinter->registerInputType( 'SFITwoListBoxes' ); $sfgFormPrinter->registerInputType( 'SFIDateCheck' ); diff --git a/i18n/af.json b/i18n/af.json index 7a0fc62..797dd6d 100644 --- a/i18n/af.json +++ b/i18n/af.json @@ -4,6 +4,5 @@ "Naudefj" ] }, - "semanticformsinputs-desc": "Ekstra invoertipes vir [https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:Semantic_Forms Semantic Forms]", - "semanticformsinputs-wrongformat": "Verkeerde formaat." + "semanticformsinputs-desc": "Ekstra invoertipes vir [https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:Semantic_Forms Semantic Forms]" } diff --git a/i18n/ar.json b/i18n/ar.json deleted file mode 100644 index 265d877..000 --- a/i18n/ar.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "@metadata": { - "authors": [ - "OsamaK" - ] - } -} diff --git a/i18n/arc.json b/i18n/arc.json deleted file mode 100644 index de5b7af..000 --- a/i18n/arc.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Basharh" - ] - } -} diff --git a/i18n/ast.json b/i18n/ast.json index 3178caa..a12f50e 100644 --- a/i18n/ast.json +++ b/i18n/ast.json @@ -5,19 +5,11 @@ ] }, "semanticformsinputs-desc": "Más tribes d'entrada pa los [https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:Semantic_Forms Formularios Semánticos]", - "semanticformsinputs-wrongformat": "Formatu incorreutu.", - "semanticformsinputs-malformedregexp": "Espresión regular mal formada ($1).", "semanticformsinputs-timepicker-mintime": "La primera hora a amosar. Formatu: hh:mm",
[MediaWiki-commits] [Gerrit] Update oyejorge/less.php to 1.7.0.10 - change (mediawiki/vendor)
jenkins-bot has submitted this change and it was merged. Change subject: Update oyejorge/less.php to 1.7.0.10 .. Update oyejorge/less.php to 1.7.0.10 Changelog https://github.com/oyejorge/less.php/blob/v1.7.0.10/CHANGES.md https://github.com/oyejorge/less.php/compare/v1.7.0.9...v1.7.0.10 Change-Id: Ifeec0870df1e0504be795dfb32be5ecd795325d5 --- M composer.json M composer.lock M composer/installed.json M oyejorge/less.php/CHANGES.md M oyejorge/less.php/README.md M oyejorge/less.php/bin/lessc M oyejorge/less.php/composer.json M oyejorge/less.php/lessc.inc.php M oyejorge/less.php/lib/Less/Cache.php M oyejorge/less.php/lib/Less/Exception/Chunk.php M oyejorge/less.php/lib/Less/Functions.php M oyejorge/less.php/lib/Less/Parser.php M oyejorge/less.php/lib/Less/Tree.php M oyejorge/less.php/lib/Less/Tree/Dimension.php M oyejorge/less.php/lib/Less/Tree/Import.php M oyejorge/less.php/lib/Less/Tree/Mixin/Call.php M oyejorge/less.php/lib/Less/Tree/NameValue.php M oyejorge/less.php/lib/Less/Tree/Ruleset.php M oyejorge/less.php/lib/Less/Version.php M oyejorge/less.php/lib/Less/Visitor/processExtends.php 20 files changed, 240 insertions(+), 194 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 2787cb4..65e50f3 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "monolog/monolog": "1.17.2", "nmred/kafka-php": "0.1.5", "oojs/oojs-ui": "0.15.2", - "oyejorge/less.php": "1.7.0.9", + "oyejorge/less.php": "1.7.0.10", "pear/console_getopt": "1.4.1", "pear/mail": "1.2.0", "pear/mail_mime": "1.10.0", diff --git a/composer.lock b/composer.lock index c00c463..625a84d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;, "This file is @generated automatically" ], -"hash": "7720ca220d324a1d4faedabbaa4667bd", -"content-hash": "270d312f323f4ad12254dca0c9cd3f72", +"hash": "7f3f211f67f5a592871ced813284a0a8", +"content-hash": "7f19115f07b3948409e6c52f3f391760", "packages": [ { "name": "composer/semver", @@ -442,20 +442,23 @@ }, { "name": "oyejorge/less.php", -"version": "v1.7.0.9", +"version": "v1.7.0.10", "source": { "type": "git", "url": "https://github.com/oyejorge/less.php.git;, -"reference": "fb64e2f6ef647a229c50e9fa0f2076240a3484c6" +"reference": "a1e2d3c20794b37ac4d0baeb24613e579584033b" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/oyejorge/less.php/zipball/fb64e2f6ef647a229c50e9fa0f2076240a3484c6;, -"reference": "fb64e2f6ef647a229c50e9fa0f2076240a3484c6", +"url": "https://api.github.com/repos/oyejorge/less.php/zipball/a1e2d3c20794b37ac4d0baeb24613e579584033b;, +"reference": "a1e2d3c20794b37ac4d0baeb24613e579584033b", "shasum": "" }, "require": { "php": ">=5.3" +}, +"require-dev": { +"phpunit/phpunit": "~4.8.18" }, "bin": [ "bin/lessc" @@ -497,7 +500,7 @@ "php", "stylesheet" ], -"time": "2015-09-28 01:11:47" +"time": "2015-12-30 05:47:36" }, { "name": "pear/console_getopt", diff --git a/composer/installed.json b/composer/installed.json index 7a9098e..3303b5c 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -439,67 +439,6 @@ "homepage": "https://www.mediawiki.org/wiki/CLDRPluralRuleParser; }, { -"name": "oyejorge/less.php", -"version": "v1.7.0.9", -"version_normalized": "1.7.0.9", -"source": { -"type": "git", -"url": "https://github.com/oyejorge/less.php.git;, -"reference": "fb64e2f6ef647a229c50e9fa0f2076240a3484c6" -}, -"dist": { -"type": "zip", -"url": "https://api.github.com/repos/oyejorge/less.php/zipball/fb64e2f6ef647a229c50e9fa0f2076240a3484c6;, -"reference": "fb64e2f6ef647a229c50e9fa0f2076240a3484c6", -"shasum": "" -}, -"require": { -"php": ">=5.3" -}, -"time": "2015-09-28 01:11:47", -"bin": [ -"bin/lessc" -], -"type": "library", -"installation-source": "dist", -"autoload": { -"psr-0": { -"Less": "lib/" -}, -"classmap": [ -
[MediaWiki-commits] [Gerrit] Update oyejorge/less.php to 1.7.0.10 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update oyejorge/less.php to 1.7.0.10 .. Update oyejorge/less.php to 1.7.0.10 Depends-On: Ifeec0870df1e0504be795dfb32be5ecd795325d5 Change-Id: Ibf17232bb51563360ff47b42d4c0f9cb0d5f8b18 --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 17edfbf..f326dcb 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "liuggio/statsd-php-client": "1.0.18", "mediawiki/at-ease": "1.1.0", "oojs/oojs-ui": "0.15.2", - "oyejorge/less.php": "1.7.0.9", + "oyejorge/less.php": "1.7.0.10", "php": ">=5.3.3", "psr/log": "1.0.0", "wikimedia/assert": "0.2.2", -- To view, visit https://gerrit.wikimedia.org/r/266084 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibf17232bb51563360ff47b42d4c0f9cb0d5f8b18 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: Paladox 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] Special:Newsletters: Make the filter form smaller - change (mediawiki...Newsletter)
Glaisher has uploaded a new change for review. https://gerrit.wikimedia.org/r/268880 Change subject: Special:Newsletters: Make the filter form smaller .. Special:Newsletters: Make the filter form smaller * Remove fieldset/legend wrapper * Decrease the width of the dropdown Bug: T120519 Change-Id: I695fc3c394ca5586b60727f674f7f376a0689b3f --- M i18n/en.json M i18n/qqq.json M includes/specials/SpecialNewsletters.php M modules/ext.newsletter.newsletters.styles.css 4 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter refs/changes/80/268880/1 diff --git a/i18n/en.json b/i18n/en.json index f2b5bee..d2c8b77 100755 --- a/i18n/en.json +++ b/i18n/en.json @@ -122,7 +122,6 @@ "notification-header-newsletter-announce": "$1 {{GENDER:$2|has announced}} a new issue of $3.", "notification-body-newsletter-announce": "$1", "newsletter-list-table": "Filter by: ", - "newsletter-list-section": "Search for newsletters", "newsletter-list-option-all": "All newsletters", "newsletter-list-option-subscribed": "Newsletters I am subscribed to", "newsletter-list-option-unsubscribed": "Newsletters I am not subscribed to", diff --git a/i18n/qqq.json b/i18n/qqq.json index 2b738ad..9f6b146 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -126,7 +126,6 @@ "notification-header-newsletter-announce": "Header text for a notification when a new issue of a newsletter is announced. Parameters:\n* $1 is that user's name (not suitable for GENDER).\n* $2 is the user's name for use in GENDER.\n* $3 is the title of the newsletter.", "notification-body-newsletter-announce": "Body text for a notification when a new issue of a newsletter is announced. Parameters:\n* $1 is the summary of the new newsletter issue.", "newsletter-list-table": "Label of the drop down menu in [[Special:Newsletters]], the options of which can be used to customize the search of newsletters", - "newsletter-list-section": "Section header of HTML form in [[Special:Newsletters]] used to search for newsletters", "newsletter-list-option-all": "Option of the drop down menu in [[Special:Newsletters]] to display all newsletters", "newsletter-list-option-subscribed": "Option of the drop down menu in [[Special:Newsletters]] to display those newsletters to which the logged in user is subscribed to", "newsletter-list-option-unsubscribed": "Option of the drop down menu in [[Special:Newsletters]] to display those newsletters to which the logged in user is not subscribed to", diff --git a/includes/specials/SpecialNewsletters.php b/includes/specials/SpecialNewsletters.php index 6f36ba4..963b80f 100644 --- a/includes/specials/SpecialNewsletters.php +++ b/includes/specials/SpecialNewsletters.php @@ -45,7 +45,6 @@ $filterTableForm->setMethod( 'get' ); $filterTableForm->setSubmitProgressive(); $filterTableForm->setSubmitTextMsg( 'newsletter-list-go-button' ); - $filterTableForm->setWrapperLegendMsg( 'newsletter-list-section' ); $pager = new NewsletterTablePager(); $pager->setUserOption( $this->option ); diff --git a/modules/ext.newsletter.newsletters.styles.css b/modules/ext.newsletter.newsletters.styles.css index d7edf94..0e697b2 100644 --- a/modules/ext.newsletter.newsletters.styles.css +++ b/modules/ext.newsletter.newsletters.styles.css @@ -11,6 +11,13 @@ display: none; } +/** + * The default dropdown is rather wide so we'll make it a bit small to make it look nicer. + */ +#mw-newsletter-filter-options { + width: 40%; +} + /* Styling for "Subscribe/Unsubscribe" links */ .newsletter-subscribed, .newsletter-subscribed:link, .newsletter-subscribed:visited { -- To view, visit https://gerrit.wikimedia.org/r/268880 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I695fc3c394ca5586b60727f674f7f376a0689b3f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: Glaisher___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [bugfix] use target title property instead of deprecated new... - change (pywikibot...xqbot)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/268881 Change subject: [bugfix] use target title property instead of deprecated new_title method .. [bugfix] use target title property instead of deprecated new_title method lastmove.target_title gives the title of the moved target whereas new_title() gives a Page object and could not compared with the new page titles. Change-Id: I38e00eeceebd2e7c06f08230e39830ea2e41d041 --- M afd-notice.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/xqbot refs/changes/81/268881/1 diff --git a/afd-notice.py b/afd-notice.py index d8d7265..14d1916 100644 --- a/afd-notice.py +++ b/afd-notice.py @@ -57,9 +57,9 @@ try: lastmove = next(gen) except StopIteration: -return +pass else: -return lastmove.new_title() +return lastmove.target_title def run(self): """Run the bot.""" -- To view, visit https://gerrit.wikimedia.org/r/268881 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I38e00eeceebd2e7c06f08230e39830ea2e41d041 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/bots/xqbot Gerrit-Branch: master Gerrit-Owner: Xqt___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [bugfix] use target title property instead of deprecated new... - change (pywikibot...xqbot)
Xqt has submitted this change and it was merged. Change subject: [bugfix] use target title property instead of deprecated new_title method .. [bugfix] use target title property instead of deprecated new_title method lastmove.target_title gives the title of the moved target whereas new_title() gives a Page object and could not compared with the new page titles. Change-Id: I38e00eeceebd2e7c06f08230e39830ea2e41d041 --- M afd-notice.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/afd-notice.py b/afd-notice.py index d8d7265..14d1916 100644 --- a/afd-notice.py +++ b/afd-notice.py @@ -57,9 +57,9 @@ try: lastmove = next(gen) except StopIteration: -return +pass else: -return lastmove.new_title() +return lastmove.target_title def run(self): """Run the bot.""" -- To view, visit https://gerrit.wikimedia.org/r/268881 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38e00eeceebd2e7c06f08230e39830ea2e41d041 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/bots/xqbot Gerrit-Branch: master Gerrit-Owner: XqtGerrit-Reviewer: Xqt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add namespace aliases for mzn - change (mediawiki...Scribunto)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/268886 Change subject: Add namespace aliases for mzn .. Add namespace aliases for mzn Change-Id: I871fd627e7d3d492daae3f608453cf0df2330695 (cherry picked from commit 7ab1348e9485ba23a93b6eae2de9009e06f27516) --- M Scribunto.namespaces.php 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto refs/changes/86/268886/1 diff --git a/Scribunto.namespaces.php b/Scribunto.namespaces.php index 0816c55..7ae4a14 100644 --- a/Scribunto.namespaces.php +++ b/Scribunto.namespaces.php @@ -271,6 +271,11 @@ 829 => 'ماژول_گپ', ); +$namespaceNames['mzn'] = array( + 828 => 'ماژول', + 829 => 'ماژول_گپ', +); + $namespaceNames['nb'] = array( 828 => 'Modul', 829 => 'Moduldiskusjon', -- To view, visit https://gerrit.wikimedia.org/r/268886 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I871fd627e7d3d492daae3f608453cf0df2330695 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Scribunto Gerrit-Branch: REL1_26 Gerrit-Owner: PaladoxGerrit-Reviewer: Mjbmr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [IMPR] remove unused save method - change (pywikibot...xqbot)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/268885 Change subject: [IMPR] remove unused save method .. [IMPR] remove unused save method Change-Id: I24b6aad7761be1bb2ca65a492ee705cf13da0765 --- M afd-notice.py 1 file changed, 0 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/xqbot refs/changes/85/268885/1 diff --git a/afd-notice.py b/afd-notice.py index 3843fca..96fb718 100644 --- a/afd-notice.py +++ b/afd-notice.py @@ -226,22 +226,6 @@ pywikibot.output(u'WARNING: Page %s not saved.' % talk.title(asLink=True)) -def load(self, page): -""" -Loads the given page, does some changes, and saves it. -""" -try: -# Load the page -text = page.text -except pywikibot.NoPage: -pywikibot.output(u"Page %s does not exist; skipping." - % page.title(asLink=True)) -except pywikibot.IsRedirectPage: -pywikibot.output(u"Page %s is a redirect; skipping." - % page.title(asLink=True)) -else: -return text - def save(self, text, page, comment=None, minorEdit=True, botflag=True): old = u'' -- To view, visit https://gerrit.wikimedia.org/r/268885 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24b6aad7761be1bb2ca65a492ee705cf13da0765 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/bots/xqbot Gerrit-Branch: master Gerrit-Owner: Xqt___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [Scribunto] Add template extension-gate to Scribunto - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: [Scribunto] Add template extension-gate to Scribunto .. [Scribunto] Add template extension-gate to Scribunto Bug: T125050 Change-Id: I6fde00181da3b78a044baa056ae98a558b2f3a53 --- M jjb/mediawiki.yaml M zuul/layout.yaml 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: JanZerebecki: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml index 72901c3..af3737a 100644 --- a/jjb/mediawiki.yaml +++ b/jjb/mediawiki.yaml @@ -398,6 +398,7 @@ ParserFunctions PdfHandler SandboxLink + Scribunto SpamBlacklist Thanks TimedMediaHandler diff --git a/zuul/layout.yaml b/zuul/layout.yaml index ff5bcad..65a7a72 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6774,6 +6774,7 @@ - name: mediawiki/extensions/Scribunto template: - name: jshint + - name: extension-gate - name: extension-unittests-generic - name: npm check: -- To view, visit https://gerrit.wikimedia.org/r/267458 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6fde00181da3b78a044baa056ae98a558b2f3a53 Gerrit-PatchSet: 4 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: PaladoxGerrit-Reviewer: Hashar Gerrit-Reviewer: JanZerebecki Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use strict array search for linker options. - change (mediawiki...BlueSpiceExtensions)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/268901 Change subject: Use strict array search for linker options. .. Use strict array search for linker options. This is in anticipation of gerrit change I16b9d6c3044ae60d5a7fd340569c019ffc4b2a55 (and a good practice anyway). Change-Id: Id7b88de437176be2b4d6ad54cc53807a028b0b9a --- M PageTemplates/PageTemplates.class.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/01/268901/1 diff --git a/PageTemplates/PageTemplates.class.php b/PageTemplates/PageTemplates.class.php index 8855c21..cd91c46 100644 --- a/PageTemplates/PageTemplates.class.php +++ b/PageTemplates/PageTemplates.class.php @@ -367,8 +367,8 @@ * @return boolean Always true to keep hook running */ public function onLinkBegin( $oLinker, $oTarget, &$sHtml, &$aCustomAttribs, &$aQuery, &$aOptions, &$sRet ) { - if ( in_array( 'known', $aOptions ) ) return true; - if ( !in_array( 'broken', $aOptions ) ){ //It's not marked as "known" and not as "broken" so we have to check + if ( in_array( 'known', $aOptions, true ) ) return true; + if ( !in_array( 'broken', $aOptions, true ) ){ //It's not marked as "known" and not as "broken" so we have to check if ( $oTarget->isKnown() ) return true; } -- To view, visit https://gerrit.wikimedia.org/r/268901 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id7b88de437176be2b4d6ad54cc53807a028b0b9a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use strict array search for linker options. - change (mediawiki...HelpCommons)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/268906 Change subject: Use strict array search for linker options. .. Use strict array search for linker options. This is in anticipation of gerrit change I16b9d6c3044ae60d5a7fd340569c019ffc4b2a55 (and a good practice anyway). Change-Id: I797ba989b041d22f18e5acb5d21f869e2b5d10b7 --- M HelpCommons.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/HelpCommons refs/changes/06/268906/1 diff --git a/HelpCommons.php b/HelpCommons.php index a2169e4..8463f15 100644 --- a/HelpCommons.php +++ b/HelpCommons.php @@ -610,7 +610,7 @@ if ( !isset( $pageData['missing'] ) ) { // remove "broken" assumption/override - $brokenKey = array_search( 'broken', $options ); + $brokenKey = array_search( 'broken', $options, true ); if ( $brokenKey !== false ) { unset( $options[$brokenKey] ); } -- To view, visit https://gerrit.wikimedia.org/r/268906 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I797ba989b041d22f18e5acb5d21f869e2b5d10b7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/HelpCommons Gerrit-Branch: master Gerrit-Owner: Gergő Tisza___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Bump devDependencies to latest - change (mediawiki/core)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/268925 Change subject: build: Bump devDependencies to latest .. build: Bump devDependencies to latest * grunt-contrib-copy: 0.8.1 -> 0.8.2 * grunt-jscs: 2.6.0 -> 2.7.0 * karma-qunit: 0.1.5 -> 0.1.9 Leaving grunt-contrib-jshint for a follow-up patch. Avoiding upgrading qunitjs again due to incompatibility of recent versions. Change-Id: Ie4d2f63c3ec247f1bad26ca5d954362210394618 --- M package.json 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/25/268925/1 diff --git a/package.json b/package.json index 5a8257c..0a45e9a 100644 --- a/package.json +++ b/package.json @@ -9,16 +9,16 @@ "grunt": "0.4.5", "grunt-cli": "0.1.13", "grunt-banana-checker": "0.4.0", -"grunt-contrib-copy": "0.8.1", +"grunt-contrib-copy": "0.8.2", "grunt-contrib-jshint": "0.11.3", "grunt-contrib-watch": "0.6.1", -"grunt-jscs": "2.6.0", +"grunt-jscs": "2.7.0", "grunt-jsonlint": "1.0.7", "grunt-karma": "0.12.1", "karma": "0.13.19", "karma-chrome-launcher": "0.2.2", "karma-firefox-launcher": "0.1.7", -"karma-qunit": "0.1.5", +"karma-qunit": "0.1.9", "qunitjs": "1.18.0" } } -- To view, visit https://gerrit.wikimedia.org/r/268925 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4d2f63c3ec247f1bad26ca5d954362210394618 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Bump grunt-contrib-jshint from 0.11.3 to 0.12.0 - change (mediawiki/core)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/268926 Change subject: build: Bump grunt-contrib-jshint from 0.11.3 to 0.12.0 .. build: Bump grunt-contrib-jshint from 0.11.3 to 0.12.0 Taking the opportunity to modernise our .jshintrc file, I have made the following changes there and adjusted the repo to pass: * Replaced the deprecated `"es3": true` with `"esversion": 3`; nil change. * Adjusted `"latedef": true` to `"latedef": "nofunc"`, a new setting for this option that lets us retain previous behaviour. One call needed to be adjusted for the update with this change; without it, several dozen were needed. * Added `"futurehostile": true`, to make bumping `esversion` easier in future. I have reviewed the rest of the options and chosen not to apply them: * No need to over-ride the runtime option `maxerr`. * No need to add the additional 'enforcing' options: `forin`, `nocomma`, `nonbsp`, `notypeof`, `predef`, `shadow`, `singleGroups`, `varstmt`. * No need to add the additional 'relaxing' options, as ideally we should use none: `asi`, `boss`, `debug`, `elision`, `eqnull`, `evil`, `expr`, `lastsemic`, `loopfunc`, `moz`, `noyield`, `plusplus`, `proto`, `scripturl`, `supernew`, `validthis`, `withstmt` * Definitely no need to add any of the deprecated coding style-related items: `camelcase`, `curly`, `immed`, `indent`, `laxcomma`, `maxlen`, `maxcomplexity`, `maxdepth`, `maxparams`, `maxstatements`, `newcap`, `noempty`, `quotmark`, `sub` Note that we retain two deprecated options, `laxbreak` and `multistr` which are set to be removed in the next major version of jshint but are as-yet required for the repo so that it passes. Change-Id: I2a780f655010f2231ab2ab93c40b34943828b4df --- M .jshintrc M package.json M resources/src/mediawiki.special/mediawiki.special.apisandbox.js M resources/src/mediawiki/mediawiki.feedback.js 4 files changed, 10 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/26/268926/1 diff --git a/.jshintrc b/.jshintrc index b776e8f..62b9d82 100644 --- a/.jshintrc +++ b/.jshintrc @@ -2,14 +2,15 @@ // Enforcing "bitwise": true, "eqeqeq": true, - "es3": true, + "esversion": 3, "freeze": true, - "latedef": true, + "futurehostile": true, + "latedef": "nofunc", "noarg": true, "nonew": true, + "strict": false, "undef": true, "unused": true, - "strict": false, // Relaxing "laxbreak": true, diff --git a/package.json b/package.json index 0a45e9a..33a2039 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "grunt-cli": "0.1.13", "grunt-banana-checker": "0.4.0", "grunt-contrib-copy": "0.8.2", -"grunt-contrib-jshint": "0.11.3", +"grunt-contrib-jshint": "0.12.0", "grunt-contrib-watch": "0.6.1", "grunt-jscs": "2.7.0", "grunt-jsonlint": "1.0.7", diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js index 32ccdcd..10664fa 100644 --- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js +++ b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js @@ -1058,6 +1058,10 @@ ApiSandbox.PageLayout.prototype.loadParamInfo = function () { var dynamicFieldset, dynamicParamNameWidget, that = this, + removeDynamicParamWidget = function ( name, layout ) { + dynamicFieldset.removeItems( [ layout ] ); + delete that.widgets[ name ]; + }, addDynamicParamWidget = function () { var name, layout, widget, button; @@ -1109,10 +1113,6 @@ widget.focus(); dynamicParamNameWidget.setValue( '' ); - }, - removeDynamicParamWidget = function ( name, layout ) { - dynamicFieldset.removeItems( [ layout ] ); - delete that.widgets[ name ]; }; this.$element.empty() diff --git a/resources/src/mediawiki/mediawiki.feedback.js b/resources/src/mediawiki/mediawiki.feedback.js index 97a94b8..8a3784c 100644 --- a/resources/src/mediawiki/mediawiki.feedback.js +++ b/resources/src/mediawiki/mediawiki.feedback.js @@ -6,7 +6,7 @@ * @author Moriel Schottlender, 2015 * @since 1.19 */ -/*jshint es3:false */ +/*jshint esversion:5 */ /*global OO*/ ( function ( mw, $ ) { /** -- To view, visit https://gerrit.wikimedia.org/r/268926 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2a780f655010f2231ab2ab93c40b34943828b4df
[MediaWiki-commits] [Gerrit] jsduck: Add `Text` type to external known styles - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: jsduck: Add `Text` type to external known styles .. jsduck: Add `Text` type to external known styles Used in VE-core since Ib7beda39; not entirely sure how the pull-through merged without this. Change-Id: Ib4b91d1cf7ed63550d47ac90d8972eff023950b6 --- M jsduck.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/jsduck.json b/jsduck.json index cb0ae96..005c600 100644 --- a/jsduck.json +++ b/jsduck.json @@ -7,7 +7,7 @@ "--processes": "0", "--warnings-exit-nonzero": true, "--builtin-classes": true, - "--external": "HTMLDocument,Window,Node,Set,Range,Selection,ClientRect,File,Blob,DataTransfer,DataTransferItem,KeyboardEvent,MouseEvent", + "--external": "HTMLDocument,Window,Node,Text,Set,Range,Selection,ClientRect,File,Blob,DataTransfer,DataTransferItem,KeyboardEvent,MouseEvent", "--warnings": ["-nodoc(class,public)"], "--": [ ".jsduck/external.js", -- To view, visit https://gerrit.wikimedia.org/r/268929 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib4b91d1cf7ed63550d47ac90d8972eff023950b6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-Reviewer: Alex Monk 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] Syncronize VisualEditor: b7f710b..bed5988 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: b7f710b..bed5988 .. Syncronize VisualEditor: b7f710b..bed5988 Change-Id: Ic3fdf9acb9052cd16f692578e0fce8847f3fce2b --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index b7f710b..bed5988 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit b7f710baa07cea039c805985761342e1fbe8d034 +Subproject commit bed5988be23d0879ff3453294237cbfb5521da5d -- To view, visit https://gerrit.wikimedia.org/r/268932 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic3fdf9acb9052cd16f692578e0fce8847f3fce2b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-syncGerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: b7f710b..bed5988 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/268932 Change subject: Syncronize VisualEditor: b7f710b..bed5988 .. Syncronize VisualEditor: b7f710b..bed5988 Change-Id: Ic3fdf9acb9052cd16f692578e0fce8847f3fce2b --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/32/268932/1 diff --git a/VisualEditor b/VisualEditor index b7f710b..bed5988 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit b7f710baa07cea039c805985761342e1fbe8d034 +Subproject commit bed5988be23d0879ff3453294237cbfb5521da5d -- To view, visit https://gerrit.wikimedia.org/r/268932 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic3fdf9acb9052cd16f692578e0fce8847f3fce2b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Apply global overlay z-index to ve-ui-overlay-global - change (mediawiki...Vector)
jenkins-bot has submitted this change and it was merged. Change subject: Apply global overlay z-index to ve-ui-overlay-global .. Apply global overlay z-index to ve-ui-overlay-global VE keeps the global windowmanager inside a global overlay div, which has a default z-index of 1. Ensure this is overriden in Vector. Requires extra specificity due to stylesheet load order. Bug: T126135 Change-Id: I5ebb4e59e3714dfaa3d755ecf6285009efe7b62a --- M skinStyles/ooui.less 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/skinStyles/ooui.less b/skinStyles/ooui.less index e33c208..60fcec2 100644 --- a/skinStyles/ooui.less +++ b/skinStyles/ooui.less @@ -1,4 +1,5 @@ -.oo-ui-windowManager-modal { +.oo-ui-windowManager-modal, +.skin-vector .ve-ui-overlay-global { z-index: 101; position: relative; } -- To view, visit https://gerrit.wikimedia.org/r/268914 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5ebb4e59e3714dfaa3d755ecf6285009efe7b62a Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/skins/Vector Gerrit-Branch: master Gerrit-Owner: EsandersGerrit-Reviewer: Edokter Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Collect redirects multiple degrees away from document - change (mediawiki...CirrusSearch)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/268928 Change subject: Collect redirects multiple degrees away from document .. Collect redirects multiple degrees away from document Currently we only collect redirects one link away, but there are plenty of redirects that follow a chain. Collect redirects to redirects until we run out or hit the max redirect count. Change-Id: I6118a4efef98b7b6b88ee95a0d498c167b4c0f60 --- M includes/BuildDocument/RedirectsAndIncomingLinks.php 1 file changed, 28 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/28/268928/1 diff --git a/includes/BuildDocument/RedirectsAndIncomingLinks.php b/includes/BuildDocument/RedirectsAndIncomingLinks.php index fb51505..f41bf13 100644 --- a/includes/BuildDocument/RedirectsAndIncomingLinks.php +++ b/includes/BuildDocument/RedirectsAndIncomingLinks.php @@ -73,19 +73,36 @@ $outgoingLinksToCount = array( $title->getPrefixedDBKey() ); - // Gather redirects to this page - $redirectTitles = $title->getBacklinkCache() - ->getLinks( 'redirect', false, false, $wgCirrusSearchIndexedRedirects ); + $remainingRedirects = $wgCirrusSearchIndexedRedirects; + $sourceTitles = array( $title ); $redirects = array(); - foreach ( $redirectTitles as $redirect ) { - // If the redirect is in main OR the same namespace as the article the index it - if ( $redirect->getNamespace() === NS_MAIN || $redirect->getNamespace() === $title->getNamespace()) { - $redirects[] = array( - 'namespace' => $redirect->getNamespace(), - 'title' => $redirect->getText() - ); - $outgoingLinksToCount[] = $redirect->getPrefixedDBKey(); + $visited = array(); + while ( $sourceTitles && $remainingRedirects > 0 ) { + $nextSourceTitles = array(); + foreach ( $sourceTitles as $redirectSource ) { + // Don't get stuck in a redirect loop + if ( isset( $visited[$redirectSource->getArticleID()] ) ) { + continue; + } + $visited[$redirectSource->getArticleID()] = true; + + // Gather redirects to this page + $redirectTitles = $redirectSource->getBacklinkCache() + ->getLinks( 'redirect', false, false, $remainingRedirects ); + foreach ( $redirectTitles as $redirect ) { + // If the redirect is in main OR the same namespace as the article the index it + if ( $redirect->getNamespace() === NS_MAIN || $redirect->getNamespace() === $title->getNamespace()) { + $redirects[] = array( + 'namespace' => $redirect->getNamespace(), + 'title' => $redirect->getText() + ); + $outgoingLinksToCount[] = $redirect->getPrefixedDBKey(); + $nextSourceTitles[] = $redirect; + $remainingRedirects--; + } + } } + $sourceTitles = $nextSourceTitles; } $doc->add( 'redirect', $redirects ); -- To view, visit https://gerrit.wikimedia.org/r/268928 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6118a4efef98b7b6b88ee95a0d498c167b4c0f60 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: EBernhardson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BREAKING CHANGE] Drop MW pre-1.25 PHP API documentation com... - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/268924 Change subject: [BREAKING CHANGE] Drop MW pre-1.25 PHP API documentation compatibility .. [BREAKING CHANGE] Drop MW pre-1.25 PHP API documentation compatibility getDescription() and getParamDescription() have been replaced by a proper i18n-based API documentation system since MediaWiki 1.25. Retaining these does not help us with backwards-compatibility given that the repo already requires MediaWiki 1.27.0-alpha, so just drop them before they become out of date. Change-Id: Ic8b87235aeb7e1bcd7b24d5609c7d002658a66ba --- M ApiVisualEditor.php M ApiVisualEditorEdit.php 2 files changed, 0 insertions(+), 54 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/24/268924/1 diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php index ad07615..7952106 100644 --- a/ApiVisualEditor.php +++ b/ApiVisualEditor.php @@ -698,27 +698,4 @@ public function isWriteMode() { return true; } - - /** -* @deprecated since MediaWiki core 1.25 -*/ - public function getParamDescription() { - return array( - 'page' => 'The page to perform actions on.', - 'paction' => 'Action to perform', - 'oldid' => 'The revision number to use (defaults to latest version).', - 'html' => 'HTML to send to Parsoid to convert to wikitext', - 'wikitext' => 'Wikitext to send to Parsoid to convert to HTML (paction=parsefragment)', - 'pst' => 'Pre-save transform wikitext before sending it to Parsoid (paction=parsefragment)', - 'cachekey' => 'For serialize or diff, use the result of a previous serializeforcache' - . ' request with this key. Overrides html.', - ); - } - - /** -* @deprecated since MediaWiki core 1.25 -*/ - public function getDescription() { - return 'Returns HTML5 for a page from RESTBase or the Parsoid service.'; - } } diff --git a/ApiVisualEditorEdit.php b/ApiVisualEditorEdit.php index 0f8e318..dc4eb10 100644 --- a/ApiVisualEditorEdit.php +++ b/ApiVisualEditorEdit.php @@ -276,35 +276,4 @@ public function isWriteMode() { return true; } - - /** -* @deprecated since MediaWiki core 1.25 -*/ - public function getParamDescription() { - return array( - 'page' => 'The page to perform actions on.', - 'oldid' => 'The revision number to use. Defaults to latest revision. Use 0 for new page.', - 'minor' => 'Flag for minor edit.', - 'html' => 'HTML to send to Parsoid in exchange for wikitext', - 'etag' => 'ETag to send', - 'summary' => 'Edit summary', - 'basetimestamp' => 'When saving, set this to the timestamp of the revision that was' - . ' edited. Used to detect edit conflicts.', - 'starttimestamp' => 'When saving, set this to the timestamp of when the page was loaded.' - . ' Used to detect edit conflicts.', - 'token' => 'Edit token', - 'captchaid' => 'Captcha ID (when saving with a captcha response).', - 'captchaword' => 'Answer to the captcha (when saving with a captcha response).', - 'cachekey' => 'Use the result of a previous serializeforcache request with this key.' - . 'Overrides html.', - ); - } - - /** -* @deprecated since MediaWiki core 1.25 -*/ - public function getDescription() { - return 'Save an HTML5 page to MediaWiki (converted to wikitext via RESTBase or the ' . - 'Parsoid service).'; - } } -- To view, visit https://gerrit.wikimedia.org/r/268924 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8b87235aeb7e1bcd7b24d5609c7d002658a66ba Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API: Clarify cutimecond behaviour in docs/errors - change (mediawiki...CheckUser)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/268930 Change subject: API: Clarify cutimecond behaviour in docs/errors .. API: Clarify cutimecond behaviour in docs/errors Bug: T94745 Change-Id: I897ad988de8cc2111f28c5619d26ab8d83283943 --- M api/ApiQueryCheckUser.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CheckUser refs/changes/30/268930/1 diff --git a/api/ApiQueryCheckUser.php b/api/ApiQueryCheckUser.php index 8d08a40..89fa4b8 100644 --- a/api/ApiQueryCheckUser.php +++ b/api/ApiQueryCheckUser.php @@ -29,7 +29,7 @@ $reason = $this->msg( 'checkuser-reason-api', $reason )->inContentLanguage()->text(); $timeCutoff = strtotime( $timecond ); // absolute time if ( !$timeCutoff ) { - $this->dieUsage( 'You need use correct time limit (like "2 weeks")', 'invalidtime' ); + $this->dieUsage( 'You need use correct time limit (like "-2 weeks" or "2 weeks ago")', 'invalidtime' ); } $this->addTables( 'cu_changes' ); @@ -270,7 +270,7 @@ 'target' => "Username or IP-address/range to perform check", 'reason' => 'Reason to check', 'limit'=> 'Limit of rows', - 'timecond' => 'Time limit of user data (like "2 weeks")', + 'timecond' => 'Time limit of user data (like "-2 weeks" or "2 weeks ago")', 'xff' => 'Use xff data instead of IP', ); } -- To view, visit https://gerrit.wikimedia.org/r/268930 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I897ad988de8cc2111f28c5619d26ab8d83283943 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CheckUser Gerrit-Branch: master Gerrit-Owner: Alex Monk___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Let take fail if recursion failed - change (labs/toollabs)
Tim Landscheidt has uploaded a new change for review. https://gerrit.wikimedia.org/r/268931 Change subject: Let take fail if recursion failed .. Let take fail if recursion failed Currently, calling take on a directory succeeds if the directory itself could be assumed ownership of regardless of its children. While the logic to sum up the results of the recursion was in the source code, its result was ignored. This change implements the common behaviour for a program to only succeed if there were no errors at all. Change-Id: I3415bf8ee0643a1f16191426b804684680878a20 --- M src/take.cc 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/31/268931/1 diff --git a/src/take.cc b/src/take.cc index 81128c8..96e3e98 100755 --- a/src/take.cc +++ b/src/take.cc @@ -157,6 +157,8 @@ ok &= takeover(d->d_name, true); } closedir(df); + + return ok; } else return error(path); } -- To view, visit https://gerrit.wikimedia.org/r/268931 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3415bf8ee0643a1f16191426b804684680878a20 Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Tim Landscheidt___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: bed5988..efd41fb - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: bed5988..efd41fb .. Syncronize VisualEditor: bed5988..efd41fb Change-Id: Ief1f757dbcb65665d082635d5f9193a325daedd4 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index bed5988..efd41fb 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit bed5988be23d0879ff3453294237cbfb5521da5d +Subproject commit efd41fbc74dd24874a79dbe0c29443bc03dc83c4 -- To view, visit https://gerrit.wikimedia.org/r/268933 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ief1f757dbcb65665d082635d5f9193a325daedd4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-syncGerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] DesktopArticleTarget: Cleanup styles - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: DesktopArticleTarget: Cleanup styles .. DesktopArticleTarget: Cleanup styles * Use more specific ve-init-mw-desktopArticleTarget class * Add comments and reorder in places Change-Id: Ic9291d3e50304fe3a0efa7ace1ce93c7fba91d98 --- M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css 2 files changed, 21 insertions(+), 18 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css index a238e90..5a3d0f9 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-monobook.css @@ -10,13 +10,13 @@ font-size: 1.28em; /* 0.8em / x-small */ } -.ve-init-target { +.ve-init-mw-desktopArticleTarget { /* Enforce different font-size for all UI elements of VisualEditor. The difference is tiny, but enough to make the icon containers 23.813px rather than 24px and thus the icons blurry */ font-size: 1.00787401575em; /* 0.8em / x-small / 127% */ } -.ve-init-target .mw-body-content, +.ve-init-mw-desktopArticleTarget .mw-body-content, .ve-ui-overlay-global .mw-body-content { /* Match skin's font-size for the surface content */ font-size: 0.99218748em; /* 1/1.00787401575 */ @@ -31,8 +31,12 @@ top: -3px; } -.ve-init-target > .ve-ui-debugBar { +/* Main document debug bar */ +.ve-init-mw-desktopArticleTarget > .ve-ui-debugBar { border-top: 1px solid #ccc; + /* 0.8/0.8 */ + padding: 1em; + margin: 1em -1em -1em -1em; } .ve-init-mw-target-surface .ve-ce-documentNode, @@ -48,15 +52,10 @@ } .mw-body a.external.ve-ce-linkAnnotation-active { + /* Reset -2px from VE-core */ margin-right: 0; /* Monobook sets a background:url(); rule which overrides the colour. TODO: Fix upstream */ background-color: #E6F1FF; -} - -.ve-init-target > .ve-ui-debugBar { - /* 0.8/0.8 */ - padding: 1em; - margin: 1em -1em -1em -1em; } .ve-ui-overlay-global { diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css index de8e4d7..58cae0b 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css @@ -35,18 +35,22 @@ border: 0; } -.ve-init-target, +.ve-init-mw-desktopArticleTarget, .ve-ui-overlay-global { /* Enforce different font-size for all UI elements of VisualEditor */ font-size: 0.8em; } -.ve-init-target .firstHeading { +.ve-ui-overlay-global { + z-index: 101; /* #p-personal is z-index 100 in vector :( */ +} + +.ve-init-mw-desktopArticleTarget .firstHeading { /* Restore 1.8em font size of page title */ font-size: 2.25em; /* 1.8/0.8 */ } -.ve-init-target .mw-body-content, +.ve-init-mw-desktopArticleTarget .mw-body-content, .ve-ui-overlay-global .mw-body-content { /* Match skin's font-size for the surface content */ font-size: 1.09375em; /* 0.875/0.8 */ @@ -58,12 +62,14 @@ position: relative; } -.ve-init-target > .ve-ui-debugBar { +/* Main document debug bar */ +.ve-init-mw-desktopArticleTarget > .ve-ui-debugBar { /* 1/0.8 */ padding: 1.25em; margin: 1.25em -1.25em -1.25em -1.25em; } +/* All debug bars (includes target widgets) */ .ve-ui-debugBar { border-top: 1px solid #ccc; box-shadow: 0 10px 10px -10px rgba( 0, 0, 0, 0.15 ) inset; @@ -71,10 +77,6 @@ .ve-ui-debugBar ol { margin-left: 0; -} - -.ve-ui-overlay-global { - z-index: 101; /* #p-personal is z-index 100 in vector :( */ } .oo-ui-actionWidget a:hover { @@ -98,6 +100,7 @@ } .mw-body .external.ve-ce-linkAnnotation-active { + /* Reset -2px from VE-core */ margin-right: 0; } @@ -118,7 +121,8 @@ margin: -1.5625em -1.875em 1.875em -1.875em; } - .ve-init-target > .ve-ui-debugBar { + /* Main document debug bar */ + .ve-init-mw-desktopArticleTarget > .ve-ui-debugBar { /* 1/0.8, 1.5/0.8 */ padding: 1.875em; margin: 1.25em -1.875em -1.875em -1.875em; -- To view, visit https://gerrit.wikimedia.org/r/268916 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic9291d3e50304fe3a0efa7ace1ce93c7fba91d98 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: bed5988..efd41fb - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/268933 Change subject: Syncronize VisualEditor: bed5988..efd41fb .. Syncronize VisualEditor: bed5988..efd41fb Change-Id: Ief1f757dbcb65665d082635d5f9193a325daedd4 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/33/268933/1 diff --git a/VisualEditor b/VisualEditor index bed5988..efd41fb 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit bed5988be23d0879ff3453294237cbfb5521da5d +Subproject commit efd41fbc74dd24874a79dbe0c29443bc03dc83c4 -- To view, visit https://gerrit.wikimedia.org/r/268933 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ief1f757dbcb65665d082635d5f9193a325daedd4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove global overlay hack now fixed in Vector - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Remove global overlay hack now fixed in Vector .. Remove global overlay hack now fixed in Vector Change-Id: Ic5cfb7ae4d244799be56e12b4b0a44b6ddd00303 Depends-On: I5ebb4e59e3714dfaa3d755ecf6285009efe7b62a --- M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css index 58cae0b..96370cc 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css +++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css @@ -41,10 +41,6 @@ font-size: 0.8em; } -.ve-ui-overlay-global { - z-index: 101; /* #p-personal is z-index 100 in vector :( */ -} - .ve-init-mw-desktopArticleTarget .firstHeading { /* Restore 1.8em font size of page title */ font-size: 2.25em; /* 1.8/0.8 */ -- To view, visit https://gerrit.wikimedia.org/r/268917 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic5cfb7ae4d244799be56e12b4b0a44b6ddd00303 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: EsandersGerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make take's FD constructor explicit - change (labs/toollabs)
Tim Landscheidt has uploaded a new change for review. https://gerrit.wikimedia.org/r/268934 Change subject: Make take's FD constructor explicit .. Make take's FD constructor explicit cppcheck complained: | [src/take.cc:41]: (style) Struct 'FD' has a constructor with 1 | argument that is not explicit. Such constructors should in general | be explicit for type safety reasons. Using the explicit keyword in | the constructor means some mistakes when using the class can be | avoided. This change makes the constructor explicit. Change-Id: I72d27544833e778385ea1872c855bd73993c3983 --- M debian/changelog M src/take.cc 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/34/268934/1 diff --git a/debian/changelog b/debian/changelog index b54d86f..df78ef6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ toollabs (1.9~dev) unstable; urgency=medium + * Make take's FD constructor explicit. [Tim Landscheidt] * Add options --help and --version to take. [Platonides] * Don't call log-command-invocation when testing jsub. [Bryan Davis] * Set versions and dates in man pages from debian/changelog. [Tim diff --git a/src/take.cc b/src/take.cc index 96e3e98..89b51e2 100755 --- a/src/take.cc +++ b/src/take.cc @@ -38,7 +38,7 @@ struct FD { int fd; - FD(int f): fd(f){ }; + explicit FD(int f): fd(f) { }; ~FD() { if(fd >= 0) close(fd); }; operator int (void) const { return fd; }; }; @@ -51,7 +51,7 @@ { // We open the files and use the file descriptors exclusively // to avoid trickery and race conditions - FD file = open(path, O_RDONLY|O_NOFOLLOW); + FD file = FD(open(path, O_RDONLY|O_NOFOLLOW)); if(file < 0) { if(errno == ELOOP) -- To view, visit https://gerrit.wikimedia.org/r/268934 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I72d27544833e778385ea1872c855bd73993c3983 Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Tim Landscheidt___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Empty special character page before adding more characters t... - change (mediawiki...WikiEditor)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/268935 Change subject: Empty special character page before adding more characters to it .. Empty special character page before adding more characters to it Bug: T126138 Change-Id: I28bf8ea723e234f24a8f8c8c6d32d304f60f5c66 --- M modules/jquery.wikiEditor.toolbar.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor refs/changes/35/268935/1 diff --git a/modules/jquery.wikiEditor.toolbar.js b/modules/jquery.wikiEditor.toolbar.js index 4227bc5..58eac34 100644 --- a/modules/jquery.wikiEditor.toolbar.js +++ b/modules/jquery.wikiEditor.toolbar.js @@ -513,7 +513,7 @@ return false; } ); } - $page.append( $characters ); + $page.empty().append( $characters ); break; } }, -- To view, visit https://gerrit.wikimedia.org/r/268935 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I28bf8ea723e234f24a8f8c8c6d32d304f60f5c66 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiEditor Gerrit-Branch: master Gerrit-Owner: Alex Monk___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Specify wgOpenStackManagerProjectId in WikitechPrivateSettin... - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged. Change subject: Specify wgOpenStackManagerProjectId in WikitechPrivateSettings.php .. Specify wgOpenStackManagerProjectId in WikitechPrivateSettings.php Also adjust both wgOpenStackManagerProjectId and wgOpenStackManagerProjectName so they can be specified in heira. These settings are needed for OpenStackManager to make keystone queries. Bug: T115029 Change-Id: Ic8e9456be2170885fa6d7fa435b691a2ef47a981 --- M hieradata/codfw/labtest.yaml M hieradata/eqiad.yaml M modules/openstack/manifests/wikitechprivatesettings.pp M modules/openstack/templates/wikitech_private.php.erb 4 files changed, 11 insertions(+), 2 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved Alex Monk: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/hieradata/codfw/labtest.yaml b/hieradata/codfw/labtest.yaml index 5dc21af..971338f 100644 --- a/hieradata/codfw/labtest.yaml +++ b/hieradata/codfw/labtest.yaml @@ -89,6 +89,9 @@ auth_port: '35357' auth_protocol: 'http' auth_host: 208.80.153.47 + admin_project_name: 'admin' + admin_project_id: 'a47092cf44a045a4af87e1502c2cb74e' + designateconfig: db_host: 'labtestcontrol2001.wikimedia.org' diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml index 6176e11..c109925 100644 --- a/hieradata/eqiad.yaml +++ b/hieradata/eqiad.yaml @@ -116,6 +116,8 @@ auth_port: '35357' auth_protocol: 'http' auth_host: 208.80.154.92 + admin_project_id: 'testlabs' + admin_project_name: 'testlabs' designateconfig: db_host: 'm5-master.eqiad.wmnet' diff --git a/modules/openstack/manifests/wikitechprivatesettings.pp b/modules/openstack/manifests/wikitechprivatesettings.pp index c455181..d25fed1 100644 --- a/modules/openstack/manifests/wikitechprivatesettings.pp +++ b/modules/openstack/manifests/wikitechprivatesettings.pp @@ -6,6 +6,9 @@ $wikitech_nova_ldap_proxyagent_pass = $keystoneconfig['ldap_proxyagent_pass'] $wikitech_nova_ldap_user_pass = $keystoneconfig['ldap_user_pass'] +$wikitech_nova_admin_project_id = $keystoneconfig['admin_project_id'] +$wikitech_nova_admin_project_name = $keystoneconfig['admin_project_name'] + file { '/etc/mediawiki': ensure => directory, owner => 'root', diff --git a/modules/openstack/templates/wikitech_private.php.erb b/modules/openstack/templates/wikitech_private.php.erb index 47ff146..a65b89b 100644 --- a/modules/openstack/templates/wikitech_private.php.erb +++ b/modules/openstack/templates/wikitech_private.php.erb @@ -13,5 +13,6 @@ $wgOpenStackManagerLDAPUser = 'uid=novaadmin,ou=people,dc=wikimedia,dc=org'; $wgOpenStackManagerLDAPUsername = 'novaadmin'; $wgOpenStackManagerLDAPUserPassword = "<%= @wikitech_nova_ldap_user_pass %>"; -$wgOpenStackManagerLDAPUserPassword = "<%= @wikitech_nova_ldap_user_pass %>"; -$wgOpenStackManagerProject = 'testlabs'; +$wgOpenStackManagerProject = "<%= @wikitech_nova_admin_project_name %>"; +# This is the ID for the project named above: +$wgOpenStackManagerProjectId= "<%= @wikitech_nova_admin_project_id %>"; -- To view, visit https://gerrit.wikimedia.org/r/268927 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic8e9456be2170885fa6d7fa435b691a2ef47a981 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew BogottGerrit-Reviewer: Alex Monk Gerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use strict array search for linker options. - change (mediawiki...SemanticForms)
Yaron Koren has submitted this change and it was merged. Change subject: Use strict array search for linker options. .. Use strict array search for linker options. This is in anticipation of gerrit change I16b9d6c3044ae60d5a7fd340569c019ffc4b2a55 (and a good practice anyway). Change-Id: Idd8de9b7c187f3e50c976ab8db2b5dffe1e54ede --- M includes/SF_FormLinker.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Yaron Koren: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/SF_FormLinker.php b/includes/SF_FormLinker.php index 6abe511..38d6e5c 100644 --- a/includes/SF_FormLinker.php +++ b/includes/SF_FormLinker.php @@ -323,7 +323,7 @@ */ static function setBrokenLink( $linker, $target, $options, $text, &$attribs, &$ret ) { // If it's not a broken (red) link, exit. - if ( !in_array( 'broken', $options ) ) { + if ( !in_array( 'broken', $options, true ) ) { return true; } // If the link is to a special page, exit. -- To view, visit https://gerrit.wikimedia.org/r/268908 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idd8de9b7c187f3e50c976ab8db2b5dffe1e54ede Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticForms Gerrit-Branch: master Gerrit-Owner: Gergő TiszaGerrit-Reviewer: Anomie Gerrit-Reviewer: BryanDavis Gerrit-Reviewer: Yaron Koren Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Specify wgOpenStackManagerProjectId in WikitechPrivateSettin... - change (operations/puppet)
Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/268927 Change subject: Specify wgOpenStackManagerProjectId in WikitechPrivateSettings.php .. Specify wgOpenStackManagerProjectId in WikitechPrivateSettings.php Also adjust both wgOpenStackManagerProjectId and wgOpenStackManagerProjectName so they can be specified in heira. These settings are needed for OpenStackManager to make keystone queries. Bug: T115029 Change-Id: Ic8e9456be2170885fa6d7fa435b691a2ef47a981 --- M hieradata/codfw/labtest.yaml M hieradata/eqiad.yaml M modules/openstack/manifests/wikitechprivatesettings.pp M modules/openstack/templates/wikitech_private.php.erb 4 files changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/27/268927/1 diff --git a/hieradata/codfw/labtest.yaml b/hieradata/codfw/labtest.yaml index 5dc21af..971338f 100644 --- a/hieradata/codfw/labtest.yaml +++ b/hieradata/codfw/labtest.yaml @@ -89,6 +89,9 @@ auth_port: '35357' auth_protocol: 'http' auth_host: 208.80.153.47 + admin_project_name: 'admin' + admin_project_id: 'a47092cf44a045a4af87e1502c2cb74e' + designateconfig: db_host: 'labtestcontrol2001.wikimedia.org' diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml index 6176e11..c109925 100644 --- a/hieradata/eqiad.yaml +++ b/hieradata/eqiad.yaml @@ -116,6 +116,8 @@ auth_port: '35357' auth_protocol: 'http' auth_host: 208.80.154.92 + admin_project_id: 'testlabs' + admin_project_name: 'testlabs' designateconfig: db_host: 'm5-master.eqiad.wmnet' diff --git a/modules/openstack/manifests/wikitechprivatesettings.pp b/modules/openstack/manifests/wikitechprivatesettings.pp index c455181..d25fed1 100644 --- a/modules/openstack/manifests/wikitechprivatesettings.pp +++ b/modules/openstack/manifests/wikitechprivatesettings.pp @@ -6,6 +6,9 @@ $wikitech_nova_ldap_proxyagent_pass = $keystoneconfig['ldap_proxyagent_pass'] $wikitech_nova_ldap_user_pass = $keystoneconfig['ldap_user_pass'] +$wikitech_nova_admin_project_id = $keystoneconfig['admin_project_id'] +$wikitech_nova_admin_project_name = $keystoneconfig['admin_project_name'] + file { '/etc/mediawiki': ensure => directory, owner => 'root', diff --git a/modules/openstack/templates/wikitech_private.php.erb b/modules/openstack/templates/wikitech_private.php.erb index 47ff146..a65b89b 100644 --- a/modules/openstack/templates/wikitech_private.php.erb +++ b/modules/openstack/templates/wikitech_private.php.erb @@ -13,5 +13,6 @@ $wgOpenStackManagerLDAPUser = 'uid=novaadmin,ou=people,dc=wikimedia,dc=org'; $wgOpenStackManagerLDAPUsername = 'novaadmin'; $wgOpenStackManagerLDAPUserPassword = "<%= @wikitech_nova_ldap_user_pass %>"; -$wgOpenStackManagerLDAPUserPassword = "<%= @wikitech_nova_ldap_user_pass %>"; -$wgOpenStackManagerProject = 'testlabs'; +$wgOpenStackManagerProject = "<%= @wikitech_nova_admin_project_name %>"; +# This is the ID for the project named above: +$wgOpenStackManagerProjectId= "<%= @wikitech_nova_admin_project_id %>"; -- To view, visit https://gerrit.wikimedia.org/r/268927 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8e9456be2170885fa6d7fa435b691a2ef47a981 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jsduck: Add `Text` type to external known styles - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/268929 Change subject: jsduck: Add `Text` type to external known styles .. jsduck: Add `Text` type to external known styles Used in VE-core since Ib7beda39; not entirely sure how the pull-through merged without this. Change-Id: Ib4b91d1cf7ed63550d47ac90d8972eff023950b6 --- M jsduck.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/29/268929/1 diff --git a/jsduck.json b/jsduck.json index cb0ae96..005c600 100644 --- a/jsduck.json +++ b/jsduck.json @@ -7,7 +7,7 @@ "--processes": "0", "--warnings-exit-nonzero": true, "--builtin-classes": true, - "--external": "HTMLDocument,Window,Node,Set,Range,Selection,ClientRect,File,Blob,DataTransfer,DataTransferItem,KeyboardEvent,MouseEvent", + "--external": "HTMLDocument,Window,Node,Text,Set,Range,Selection,ClientRect,File,Blob,DataTransfer,DataTransferItem,KeyboardEvent,MouseEvent", "--warnings": ["-nodoc(class,public)"], "--": [ ".jsduck/external.js", -- To view, visit https://gerrit.wikimedia.org/r/268929 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4b91d1cf7ed63550d47ac90d8972eff023950b6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/268864 Change subject: Test .. Test Change-Id: Ie99127e03495f48bb88979c1b39d9872e3e0edf2 --- M package.json 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/64/268864/1 diff --git a/package.json b/package.json index c00dbed..872ca78 100644 --- a/package.json +++ b/package.json @@ -15,11 +15,11 @@ "grunt-contrib-watch": "0.6.1", "grunt-jscs": "2.1.0", "grunt-jsonlint": "1.0.4", -"grunt-karma": "0.11.0", -"karma": "0.12.36", -"karma-chrome-launcher": "0.1.12", -"karma-firefox-launcher": "0.1.6", -"karma-qunit": "0.1.4", +"grunt-karma": "0.12.1", +"karma": "0.13.19", +"karma-chrome-launcher": "0.2.2", +"karma-firefox-launcher": "0.1.7", +"karma-qunit": "0.1.5", "qunitjs": "1.18.0" } } -- To view, visit https://gerrit.wikimedia.org/r/268864 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie99127e03495f48bb88979c1b39d9872e3e0edf2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_25 Gerrit-Owner: Paladox___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] setting redirect to disambig as disambig - change (mediawiki...Disambiguator)
Eranroz has uploaded a new change for review. https://gerrit.wikimedia.org/r/268703 Change subject: setting redirect to disambig as disambig .. setting redirect to disambig as disambig Change-Id: I6ddd0471d1d0041eb73dd63e1a3fa0eeb2da3b2f --- M Disambiguator.hooks.php 1 file changed, 31 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Disambiguator refs/changes/03/268703/1 diff --git a/Disambiguator.hooks.php b/Disambiguator.hooks.php index 7f0e75f..76489fe 100644 --- a/Disambiguator.hooks.php +++ b/Disambiguator.hooks.php @@ -99,15 +99,39 @@ $output = array(); if ( $pageIds ) { $dbr = wfGetDB( DB_SLAVE ); + + // resolve redirects + $res = $dbr->select( + array ('page', 'redirect'), + array( 'page_id', 'rd_from' ), + array( 'rd_from' => $pageIds ), + __METHOD__, + array(), + array( 'page' => array( 'INNER JOIN', array( + 'rd_namespace=page_namespace', + 'rd_title=page_title' + ) ) ) + ); + $redirects = array(); + foreach ( $res as $row ) { + $redirects[$row->page_id] = $row->rd_from; + } + + $pageIdsWithRedirects = array_keys( $redirects ) + array_diff( $pageIds, array_values( $redirects ) ); $res = $dbr->select( 'page_props', 'pp_page', - array( 'pp_page' => $pageIds, 'pp_propname' => 'disambiguation' ), + array( 'pp_page' => $pageIdsWithRedirects, 'pp_propname' => 'disambiguation' ), __METHOD__ ); foreach ( $res as $row ) { - $output[] = $row->pp_page; + if ( array_key_exists( $row->pp_page, $redirects ) ) { + $output[] = $redirects[$row->pp_page]; + } + if ( in_array( $row->pp_page, $pageIds ) ){ + $output[] = $row->pp_page; + } } } @@ -128,7 +152,11 @@ $pageIds = static::filterDisambiguationPageIds( array_keys( $pageIdToDbKey ) ); foreach ( $pageIds as $pageId ) { - $colours[ $pageIdToDbKey[$pageId] ] = 'mw-disambig'; + if ( $colours[ $pageIdToDbKey[$pageId] ] ) { + $colours[ $pageIdToDbKey[$pageId] ] .= " mw-disambig"; + } else { + $colours[ $pageIdToDbKey[$pageId] ] = 'mw-disambig'; + } } return true; } -- To view, visit https://gerrit.wikimedia.org/r/268703 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ddd0471d1d0041eb73dd63e1a3fa0eeb2da3b2f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Disambiguator Gerrit-Branch: master Gerrit-Owner: Eranroz___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] In section preview, add preview of references to its own sec... - change (mediawiki...Cite)
Cenarium has uploaded a new change for review. https://gerrit.wikimedia.org/r/268870 Change subject: In section preview, add preview of references to its own section .. In section preview, add preview of references to its own section This is to make it apparent that this isn't part of the preview of the section itself. Bug: T125981 Change-Id: I62c8dca8ee42e79c6b7cd7f837f4e7ee65f0 --- M Cite_body.php M i18n/en.json M i18n/qqq.json 3 files changed, 22 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite refs/changes/70/268870/1 diff --git a/Cite_body.php b/Cite_body.php index 79a8176..04ea6f1 100644 --- a/Cite_body.php +++ b/Cite_body.php @@ -1105,13 +1105,30 @@ return true; } - $isSectionPreview = $parser->getOptions()->getIsSectionPreview(); + if ( $parser->getOptions()->getIsSectionPreview() ) { + $s = ''; + foreach ( $this->mRefs as $group => $refs ) { + if ( !$refs ) { + continue; + } + $s .= $this->referencesFormat( $group ); + } + if ( $s === '' ) { + return true; + } + // add preview of references in its own section + // to make it apparent that this isn't part of the preview of the section itself + $text .= "\n" . '' + . "" . wfMessage( 'cite_section_preview_refs' )->parse() . "" . $s . ''; + return true; + } + foreach ( $this->mRefs as $group => $refs ) { if ( !$refs ) { continue; } - if ( $group === self::DEFAULT_GROUP || $isSectionPreview ) { - $text .= $this->referencesFormat( $group, '', '' ); + if ( $group === self::DEFAULT_GROUP ) { + $text .= $this->referencesFormat( $group ); } else { $text .= "\n" . $this->error( 'cite_error_group_refs_without_references', htmlspecialchars( $group ) ); diff --git a/i18n/en.json b/i18n/en.json index 2731396..e735b40 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -53,6 +53,7 @@ "cite_references_link_many_accessibility_label": "Jump up to:", "cite_references_prefix": "", "cite_references_suffix": "", + "cite_section_preview_refs": "Preview of references", "cite_warning": "Cite warning: $1", "cite_warning_sectionpreview_no_text": "ref tag with name $1 cannot be previewed because it is defined outside the current section or not defined at all." } diff --git a/i18n/qqq.json b/i18n/qqq.json index 8c430ca..25629ba 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -53,6 +53,7 @@ "cite_references_link_many_accessibility_label": "Text for screen readers to describe the jump to citation links (a b c ...) for citations which are used in multiple places.\n\nThis is going to be prepended to the first link, the following ones will just be read by screen readers as they are visible.\n\nSee also:\n* {{msg-mw|Cite references link accessibility label}} - if the citation is used one time", "cite_references_prefix": "{{notranslate}}", "cite_references_suffix": "{{notranslate}}", + "cite_section_preview_refs": "Header for the section providing a preview of references in section preview", "cite_warning": "Cite extension.\n\nUsed when there are warnings about ref or references tags (less severe than errors).\n\nParameters:\n* $1 - a warning message", "cite_warning_sectionpreview_no_text": "Cite extension. This warning occurs when the tag is used with the name-option specified but the definition for this named ref is outside of the currently being previewed section, or not defined at all.\n\nParameters:\n* $1 - key of the ref" } -- To view, visit https://gerrit.wikimedia.org/r/268870 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I62c8dca8ee42e79c6b7cd7f837f4e7ee65f0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cite Gerrit-Branch: master Gerrit-Owner: Cenarium___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: e0de4c4..04259b7 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: e0de4c4..04259b7 .. Syncronize VisualEditor: e0de4c4..04259b7 Change-Id: I23ab9e97c522dde900b808d29c5968877fec1298 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index e0de4c4..04259b7 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit e0de4c4447b7bceb863a3627f0c1f0d1e4eeb9de +Subproject commit 04259b793a53403f71c4e974e32f77f232f0fadd -- To view, visit https://gerrit.wikimedia.org/r/268873 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I23ab9e97c522dde900b808d29c5968877fec1298 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-syncGerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (f170d48) - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (f170d48) .. Update VE core submodule to master (f170d48) New changes: 7d6d45c update-oojs-ui: Don't copy across oojs-ui.js, we don't use that 9ff6c85 Utility function for "index of node in its parentNode's childNode list" fe6bb82 Remove uses of plain .contentEditable 890a9d7 VE demo: allow saving some markup to localStorage for testing 2504758 Localisation updates from https://translatewiki.net. 7e9f2de Localisation updates from https://translatewiki.net. 35664d6 Convert a bunch of HACK:/XXX:/FIXME: tags to a task reference f170d48 Localisation updates from https://translatewiki.net. Change-Id: I91af16e9de4ff60eb1bc4ca2585b5fe79121d095 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index 7c7aa59..f170d48 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 7c7aa599eaa9e737df153377e46cc3b5c61ef793 +Subproject commit f170d48801901162aa5bd1e5834cca20f904e925 -- To view, visit https://gerrit.wikimedia.org/r/268844 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I91af16e9de4ff60eb1bc4ca2585b5fe79121d095 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: JforresterGerrit-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] Syncronize VisualEditor: e0de4c4..04259b7 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/268873 Change subject: Syncronize VisualEditor: e0de4c4..04259b7 .. Syncronize VisualEditor: e0de4c4..04259b7 Change-Id: I23ab9e97c522dde900b808d29c5968877fec1298 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/73/268873/1 diff --git a/VisualEditor b/VisualEditor index e0de4c4..04259b7 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit e0de4c4447b7bceb863a3627f0c1f0d1e4eeb9de +Subproject commit 04259b793a53403f71c4e974e32f77f232f0fadd -- To view, visit https://gerrit.wikimedia.org/r/268873 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23ab9e97c522dde900b808d29c5968877fec1298 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] solve_disambiguation.py: EditOption._start is an int, do not... - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: solve_disambiguation.py: EditOption._start is an int, do not call it .. solve_disambiguation.py: EditOption._start is an int, do not call it Bug: T126095 Change-Id: I3aa191d2fbe6c402f038d545d698b65356e9c888 --- M scripts/solve_disambiguation.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index 2d92b05..5a87738 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -487,7 +487,7 @@ def result(self, value): """Open a text editor and let the user change it.""" editor = editarticle.TextEditor() -self.new_text = editor.edit(self._text, jumpIndex=self._start(), +self.new_text = editor.edit(self._text, jumpIndex=self._start, highlight=self._title) return super(EditOption, self).result(value) -- To view, visit https://gerrit.wikimedia.org/r/268843 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3aa191d2fbe6c402f038d545d698b65356e9c888 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: DalbaGerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: mhchem error fix - change (mediawiki...mathoid)
Physikerwelt has uploaded a new change for review. https://gerrit.wikimedia.org/r/268869 Change subject: WIP: mhchem error fix .. WIP: mhchem error fix Change-Id: I73802b2be2d10e8395c1751eb31930d634be00fa --- M package.json M test/features/math/simple.js 2 files changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid refs/changes/69/268869/1 diff --git a/package.json b/package.json index 3d2a5c1..806607c 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "preq": "^0.4.8", "service-runner": "^0.3.8", "mathoid-mathjax-node": "^0.5.0", -"texvcinfo": "^0.4.1" +"texvcinfo": "git+https://github.com/physikerwelt/texvcinfo#mhchem; }, "devDependencies": { "extend": "^3.0.0", diff --git a/test/features/math/simple.js b/test/features/math/simple.js index ea0cf31..47c269e 100644 --- a/test/features/math/simple.js +++ b/test/features/math/simple.js @@ -249,6 +249,20 @@ assert.deepEqual(res.body.detail.error.location.end.column, 12); }); }); +it("reject use of \\ce commands without chemistry mode enabled", function () { +return preq.post({ +uri: baseURL, +body: {q: "\\ce{H2O}"} +}).then(function (res) { +// if we are here, no error was thrown, not good +throw new Error('Expected an error to be thrown, got status: ' + res.status); +}, function (res) { +assert.status(res, 400); +assert.deepEqual(res.body.success, false); +assert.deepEqual(res.body.detail.error.found, "\\ce"); +assert.deepEqual(res.body.error, "SyntaxError: Attempting to use the $\\ce$ command outside of a chemistry environment."); +}); +}); it("reject invalid input type", function () { return preq.post({ uri: baseURL, -- To view, visit https://gerrit.wikimedia.org/r/268869 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73802b2be2d10e8395c1751eb31930d634be00fa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mathoid Gerrit-Branch: master Gerrit-Owner: Physikerwelt___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix edit conflicts after calls to save_claim() - change (pywikibot/core)
Gallaecio has uploaded a new change for review. https://gerrit.wikimedia.org/r/268877 Change subject: Fix edit conflicts after calls to save_claim() .. Fix edit conflicts after calls to save_claim() Unlike DataSite.addClaim(), DataSite.save_claim() was not updating the latest revision ID of the item of the saved claim. As a result, any submission to Wikidata after modifying a claim, such as Claim.changeRank(), would result in an edit conflict. Now DataSite.save_claim() updates the latest revision ID of the item of the saved claim. Change-Id: I2079228b50abca2e171bbc63e6bdd581532cd703 --- M pywikibot/site.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/77/268877/1 diff --git a/pywikibot/site.py b/pywikibot/site.py index fb92abe..39ac5cb 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -7071,6 +7071,7 @@ req = self._simple_request(**params) data = req.submit() +claim.on_item.latest_revision_id = data['pageinfo']['lastrevid'] return data @must_be(group='user') -- To view, visit https://gerrit.wikimedia.org/r/268877 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2079228b50abca2e171bbc63e6bdd581532cd703 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Gallaecio___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2016-02-06T10:00:01+0000 - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged. Change subject: New Wikidata Build - 2016-02-06T10:00:01+ .. New Wikidata Build - 2016-02-06T10:00:01+ Change-Id: I87921fb6cefc0ed822a5a93d2887491f74d4e7ef --- M composer.lock M extensions/ArticlePlaceholder/Specials/SpecialAboutTopic.php M extensions/ArticlePlaceholder/i18n/en.json M extensions/Wikibase/client/i18n/jam.json M extensions/Wikibase/client/i18n/ka.json M extensions/Wikibase/client/i18n/ps.json M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php M extensions/Wikibase/client/includes/Hooks/DeletePageNoticeCreator.php M extensions/Wikibase/client/includes/Hooks/InfoActionHookHandler.php M extensions/Wikibase/client/includes/Hooks/MovePageNotice.php M extensions/Wikibase/client/includes/Hooks/OtherProjectsSidebarGenerator.php M extensions/Wikibase/client/includes/LangLinkHandler.php M extensions/Wikibase/client/includes/ParserOutput/ClientParserOutputDataUpdater.php M extensions/Wikibase/client/includes/SiteLinkCommentCreator.php M extensions/Wikibase/client/includes/UpdateRepo/UpdateRepo.php M extensions/Wikibase/client/includes/specials/SpecialPagesWithBadges.php M extensions/Wikibase/client/includes/specials/SpecialUnconnectedPages.php M extensions/Wikibase/client/includes/store/AddUsagesForPageJob.php M extensions/Wikibase/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php M extensions/Wikibase/client/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php M extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php M extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageTrackingIntegrationTest.php M extensions/Wikibase/client/tests/phpunit/includes/recentchanges/RecentChangeFactoryTest.php M extensions/Wikibase/docs/ontology.owl M extensions/Wikibase/lib/i18n/hu.json M extensions/Wikibase/lib/i18n/ps.json M extensions/Wikibase/lib/includes/MediaWikiContentLanguages.php M extensions/Wikibase/lib/includes/StaticContentLanguages.php M extensions/Wikibase/lib/includes/UnionContentLanguages.php M extensions/Wikibase/phpcs.xml M extensions/Wikibase/repo/i18n/cs.json M extensions/Wikibase/repo/i18n/de.json M extensions/Wikibase/repo/i18n/gl.json M extensions/Wikibase/repo/i18n/hu.json M extensions/Wikibase/repo/i18n/ja.json M extensions/Wikibase/repo/i18n/ka.json M extensions/Wikibase/repo/i18n/ps.json M extensions/Wikibase/repo/includes/api/EditEntity.php M extensions/Wikibase/repo/includes/api/GetClaims.php M extensions/Wikibase/repo/includes/api/ResultBuilder.php M extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php M extensions/Wikibase/repo/tests/phpunit/includes/api/SetClaimValueTest.php M extensions/Wikibase/view/resources.php M extensions/Wikibase/view/resources.test.php M extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.js M extensions/Wikibase/view/resources/resources.php M extensions/Wikibase/view/resources/wikibase/entityChangers/resources.php M extensions/Wikibase/view/resources/wikibase/entityIdFormatter/resources.php M extensions/Wikibase/view/resources/wikibase/view/resources.php M extensions/Wikibase/view/src/EmptyEditSectionGenerator.php M extensions/Wikibase/view/src/EntityIdFormatterFactory.php M extensions/Wikibase/view/src/HtmlSnakFormatterFactory.php M extensions/Wikibase/view/src/SpecialPageLinker.php M extensions/Wikibase/view/src/Template/TemplateFactory.php M extensions/Wikibase/view/tests/qunit/jquery/resources.php M extensions/Wikibase/view/tests/qunit/resources.php M extensions/Wikibase/view/tests/qunit/wikibase/entityChangers/resources.php M extensions/Wikibase/view/tests/qunit/wikibase/entityIdFormatter/resources.php M extensions/Wikibase/view/tests/qunit/wikibase/utilities/resources.php M extensions/Wikibase/view/tests/qunit/wikibase/view/resources.php M vendor/composer/installed.json 61 files changed, 190 insertions(+), 107 deletions(-) Approvals: JanZerebecki: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.lock b/composer.lock index e9687ca..20ef94b 100644 --- a/composer.lock +++ b/composer.lock @@ -777,12 +777,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git;, -"reference": "a704bce577caff9b6a62a20f8ae2be0ea6b48b8e" +"reference": "922c260fd2fb74bbfedbcef2001b0745cb32859f" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/a704bce577caff9b6a62a20f8ae2be0ea6b48b8e;, -"reference": "a704bce577caff9b6a62a20f8ae2be0ea6b48b8e", +"url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/922c260fd2fb74bbfedbcef2001b0745cb32859f;, +
[MediaWiki-commits] [Gerrit] Fix path - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: Fix path .. Fix path Change-Id: I838c31c5da7125e0880ddac6e763d109636e1911 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 9ebfa34..617b9dc 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -573,7 +573,7 @@ Cite - VisualEditor id = ext-cite-visualeditor -file = modules/ve-cite/i18n/%CODE%.json +file = Cite/modules/ve-cite/i18n/%CODE%.json Cite This Page aliasfile = CiteThisPage/CiteThisPage.alias.php -- To view, visit https://gerrit.wikimedia.org/r/268863 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I838c31c5da7125e0880ddac6e763d109636e1911 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond SpekkingGerrit-Reviewer: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix path - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/268863 Change subject: Fix path .. Fix path Change-Id: I838c31c5da7125e0880ddac6e763d109636e1911 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/63/268863/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 9ebfa34..617b9dc 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -573,7 +573,7 @@ Cite - VisualEditor id = ext-cite-visualeditor -file = modules/ve-cite/i18n/%CODE%.json +file = Cite/modules/ve-cite/i18n/%CODE%.json Cite This Page aliasfile = CiteThisPage/CiteThisPage.alias.php -- To view, visit https://gerrit.wikimedia.org/r/268863 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I838c31c5da7125e0880ddac6e763d109636e1911 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove references to Entity from EntityInfo related tests - change (mediawiki...Wikibase)
Bene has uploaded a new change for review. https://gerrit.wikimedia.org/r/268868 Change subject: Remove references to Entity from EntityInfo related tests .. Remove references to Entity from EntityInfo related tests Change-Id: I7120f70b7b05c1a58785c124887e6df782db83b4 --- M lib/tests/phpunit/store/EntityInfoBuilderTest.php M lib/tests/phpunit/store/EntityInfoTest.php 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/68/268868/1 diff --git a/lib/tests/phpunit/store/EntityInfoBuilderTest.php b/lib/tests/phpunit/store/EntityInfoBuilderTest.php index dc26929..9e1c776 100644 --- a/lib/tests/phpunit/store/EntityInfoBuilderTest.php +++ b/lib/tests/phpunit/store/EntityInfoBuilderTest.php @@ -2,7 +2,7 @@ namespace Wikibase\Test; -use Wikibase\DataModel\Entity\Entity; +use Wikibase\DataModel\Entity\EntityDocument; use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\ItemId; @@ -31,7 +31,7 @@ } /** -* @return Entity[] +* @return EntityDocument[] */ protected function getKnownEntities() { $q1 = new Item( new ItemId( 'Q1' ) ); diff --git a/lib/tests/phpunit/store/EntityInfoTest.php b/lib/tests/phpunit/store/EntityInfoTest.php index 6196c35..d486117 100644 --- a/lib/tests/phpunit/store/EntityInfoTest.php +++ b/lib/tests/phpunit/store/EntityInfoTest.php @@ -3,7 +3,7 @@ namespace Wikibase\Test; use PHPUnit_Framework_TestCase; -use Wikibase\DataModel\Entity\Entity; +use Wikibase\DataModel\Entity\EntityDocument; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Entity\BasicEntityIdParser; @@ -23,7 +23,7 @@ class EntityInfoTest extends PHPUnit_Framework_TestCase { /** -* @param Entity[] $entities +* @param EntityDocument[] $entities * * @return EntityInfo */ -- To view, visit https://gerrit.wikimedia.org/r/268868 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7120f70b7b05c1a58785c124887e6df782db83b4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Bene___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits