[MediaWiki-commits] [Gerrit] Improve Special:EditMassMessageList - change (mediawiki...MassMessage)
Wctaiwan has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152000
Change subject: Improve Special:EditMassMessageList
..
Improve Special:EditMassMessageList
* Rewrite instructions and use separate message for when cross-wiki
delivery is enabled
* Add copyright disclaimer
* Add link back to list view
* Add some comments to the code
Change-Id: I9817ba85b0250e44c0c3b30d0552d1c7770ec5d5
---
M i18n/en.json
M i18n/qqq.json
M includes/SpecialEditMassMessageList.php
3 files changed, 58 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage
refs/changes/00/152000/1
diff --git a/i18n/en.json b/i18n/en.json
index a3f80f0..d2fee3c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -80,11 +80,13 @@
massmessage-create-nopermission: You do not have permission to
create a list at this title.,
massmessage-create-invalidsource: The specified source is not a
valid delivery list or category.,
editmassmessagelist-legend: Edit mass message delivery list,
+ massmessage-edit-pagetitle: Editing $1,
massmessage-edit-title: Title:,
massmessage-edit-description: Description:,
- massmessage-edit-content: Content:,
+ massmessage-edit-content: Target pages:,
massmessage-edit-summary: Edit summary:,
- massmessage-edit-header: List one title per line, and use
title@domain (e.g. User talk:exam...@en.wikipedia.org) to specify a page on a
different wiki, if cross-wiki delivery is enabled.,
+ massmessage-edit-header: Use the form below to modify the list
description or edit the list of target pages. For target pages, list one title
per line.,
+ massmessage-edit-headermulti: Use the form below to modify the list
description or edit the list of target pages. For target pages, list one title
per line and use title@domain (e.g. User talk:exam...@en.wikipedia.org) to
specify a page on a different wiki.,
massmessage-edit-invalidtitle: There is no valid mass message
delivery list at the title.,
massmessage-edit-invalidtargets: The following {{PLURAL:$1|page
is|pages are}} invalid:\n$2,
massmessage-edit-nopermission: You do not have permission to edit
the list.,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index abcd896..a891e35 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -81,11 +81,13 @@
massmessage-create-nopermission: Error message shown on
[[Special:CreateMassMessageList]] when the user cannot create a page with the
title,
massmessage-create-invalidsource: Error message shown on
[[Special:CreateMassMessageList]] when the source from which to import targets
is invalid,
editmassmessagelist-legend: Form legend for
[[Special:EditMassMessageList]],
+ massmessage-edit-pagetitle: Page title for
[[Special:EditMassMessageList]]\n* $1 is the title of the delivery list being
edited,
massmessage-edit-title: Label for an inputbox on
[[Special:EditMassMessageList]],
massmessage-edit-description: Label for a textarea on
[[Special:EditMassMessageList]],
massmessage-edit-content: Label for a textarea on
[[Special:EditMassMessageList]],
massmessage-edit-summary: Label for an inputbox on
[[Special:EditMassMessageList]],
massmessage-edit-header: Instructions for
[[Special:EditMassMessageList]],
+ massmessage-edit-headermulti: Instructions for
[[Special:EditMassMessageList]] if cross-wiki delivery is enabled,
massmessage-edit-invalidtitle: Error message shown on
[[Special:EditMassMessageList]] when the title is invalid,
massmessage-edit-invalidtargets: Error message shown on
[[Special:EditMassMessageList]] when one ore more targets are invalid\n* $1 is
the number of invalid targets\n* $2 is a formatted list of invalid target
strings.,
massmessage-edit-nopermission: Error message shown on
[[Special:EditMassMessageList]] when the user cannot edit the list,
diff --git a/includes/SpecialEditMassMessageList.php
b/includes/SpecialEditMassMessageList.php
index 09f9a22..a32be96 100644
--- a/includes/SpecialEditMassMessageList.php
+++ b/includes/SpecialEditMassMessageList.php
@@ -70,6 +70,30 @@
}
/**
+* Override the parent implementation to modify the page title and add
a backlink.
+*/
+ public function setHeaders() {
+ parent::setHeaders();
+ if ( $this-title ) {
+ $out = $this-getOutput();
+
+ // Page title
+ $out-setPageTitle(
+ $this-msg( 'massmessage-edit-pagetitle',
$this-title-getPrefixedText() )
+ );
+
+ // Backlink
+ $revId = $this-rev-getId();
+ $query = ( $revId !== $this-title-getLatestRevId() ) ?
+
[MediaWiki-commits] [Gerrit] HHVM: set a 5s graceful shutdown timeout - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152001
Change subject: HHVM: set a 5s graceful shutdown timeout
..
HHVM: set a 5s graceful shutdown timeout
* Set a 5s hhvm.server.graceful_shutdown_wait.
* Add / amend inline comments in Upstart job.
Change-Id: I7bf7a1d94b99864e3382c20adc2f2662853c6105
---
M modules/hhvm/files/hhvm.conf
M modules/hhvm/manifests/init.pp
2 files changed, 14 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/152001/1
diff --git a/modules/hhvm/files/hhvm.conf b/modules/hhvm/files/hhvm.conf
index c571c7c..4b54a98 100644
--- a/modules/hhvm/files/hhvm.conf
+++ b/modules/hhvm/files/hhvm.conf
@@ -13,8 +13,11 @@
mkdir -p -m0755 ${HHVM_LOG_DIR:=/var/log/hhvm}
chown -R ${HHVM_USER:=www-data}:${HHVM_GROUP:=www-data} $HHVM_RUN_DIR
chown -R ${HHVM_USER}:${HHVM_GROUP} $HHVM_LOG_DIR
- EXT_API_VERSION=$(/usr/bin/hhvm --version | grep -Po '(?=Extension API:
)\d+')
- ( cd /usr/lib/hphp/extensions; /bin/ln -Trsf $EXT_API_VERSION current; )
+
+ # Set the target of the symbolic link '/usr/lib/hphp/extensions/current'
+ # to the directory whose name matches the extension API version of HHVM:
+ API_VERSION=$(/usr/bin/hhvm --version | grep -Po '(?=API: ).+')
+ ( cd /usr/lib/hphp/extensions; ln -Trsf $API_VERSION current; )
end script
script
@@ -44,11 +47,11 @@
fi
end script
-# Impose no limit on core dump size.
+# Don't limit the size of core dumps.
limit core unlimited unlimited
-# HHVM performs a graceful stop on SIGHUP
-# https://github.com/facebook/hhvm/commit/91e8609
+# When 'hhvm.server.graceful_shutdown_wait' is set to a positive
+# integer, HHVM will perform a graceful shutdown on SIGHUP.
kill signal HUP
respawn
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index d273f57..1371aaf 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -92,8 +92,13 @@
jit = true,
jit_afrozen_size = to_bytes('100 Mb'),
repo = { central = { path =
'/run/hhvm/cache/fcgi.hhbc.sq3' } },
-server = { port = 9000, type = 'fastcgi',
gzip_compression_level = 0 },
admin_server = { port = 9001 },
+server = {
+port = 9000,
+type = 'fastcgi',
+gzip_compression_level = 0,
+graceful_shutdown_wait = 5,
+},
},
}
--
To view, visit https://gerrit.wikimedia.org/r/152001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bf7a1d94b99864e3382c20adc2f2662853c6105
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update refreshDomainRedirects with port number - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: Update refreshDomainRedirects with port number .. Update refreshDomainRedirects with port number In 7eef9f9 VirtualHost declarations has their ports defined. refreshDomainRedirects needs to be updated to reflect that Change-Id: I71c3b7aef3d6c5ee95d41f3dcd41fad54f1c874e --- M modules/mediawiki/files/apache/sites/redirects/refreshDomainRedirects 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/mediawiki/files/apache/sites/redirects/refreshDomainRedirects b/modules/mediawiki/files/apache/sites/redirects/refreshDomainRedirects index 28fd369..7932a70 100755 --- a/modules/mediawiki/files/apache/sites/redirects/refreshDomainRedirects +++ b/modules/mediawiki/files/apache/sites/redirects/refreshDomainRedirects @@ -379,7 +379,7 @@ # source file redirects.dat and managed on servers by Puppet\n. # Do not edit it manually!\n . \n . - VirtualHost *\n . + VirtualHost *:80\n . \tServerName redirector\n . \tServerAlias \\\n ); -- To view, visit https://gerrit.wikimedia.org/r/151858 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I71c3b7aef3d6c5ee95d41f3dcd41fad54f1c874e Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Refactor AutoLoader class - change (mediawiki/core)
Withoutaname has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152002
Change subject: Refactor AutoLoader class
..
Refactor AutoLoader class
* Made AutoLoader class final
* Removed $wgAutoloadAttemptLowercase configuration variable, which
was an old hack for loading class names from PHP 4.
* Removed the rest of the strtolower class name hacks.
* Declared all other functions public static.
* Used array union for $wgAutoloadLocalClasses and $wgAutoloadClasses
and combined the two if checks.
* Used array notation for the filename string instead of substr.
Change-Id: I658a98db3b2dac7d358b57c3bae766e70cd3d9b6
---
M RELEASE-NOTES-1.24
M includes/AutoLoader.php
M includes/DefaultSettings.php
D tests/phpunit/data/autoloader/TestAutoloadedCamlClass.php
D tests/phpunit/data/autoloader/TestAutoloadedSerializedClass.php
M tests/phpunit/structure/AutoLoaderTest.php
6 files changed, 15 insertions(+), 80 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/02/152002/1
diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index ec4bc0f..a6ec713 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -45,6 +45,7 @@
* The UserCryptPassword and UserComparePassword hooks are no longer called.
Any extensions
using them must be updated to use the Password Hashing API.
* $wgCompiledFiles has been removed.
+* $wgAutoloadAttemptLowercase has been removed.
=== New features in 1.24 ===
* Added a new hook, WhatLinksHereProps, to allow extensions to annotate
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 9fa0c13..2fab0f0 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -1195,17 +1195,15 @@
'MyLocalSettingsGenerator' = 'mw-config/overrides.php',
);
-class AutoLoader {
- static protected $autoloadLocalClassesLower = null;
+final class AutoLoader {
/**
* autoload - take a class name and attempt to load it
*
* @param string $className Name of class we're looking for.
*/
- static function autoload( $className ) {
- global $wgAutoloadClasses, $wgAutoloadLocalClasses,
- $wgAutoloadAttemptLowercase;
+ public static function autoload( $className ) {
+ global $wgAutoloadClasses, $wgAutoloadLocalClasses;
// Workaround for PHP bug
https://bugs.php.net/bug.php?id=49143 (5.3.2. is broken, it's
// fixed in 5.3.6). Strip leading backslashes from class names.
When namespaces are used,
@@ -1217,45 +1215,20 @@
$className = ltrim( $className, '\\' );
$filename = false;
-
- if ( isset( $wgAutoloadLocalClasses[$className] ) ) {
+ $allclasses = $wgAutoloadLocalClasses + $wgAutoloadClasses;
+ if ( isset( $allclasses[$className] ) ) {
$filename = $wgAutoloadLocalClasses[$className];
- } elseif ( isset( $wgAutoloadClasses[$className] ) ) {
- $filename = $wgAutoloadClasses[$className];
- } elseif ( $wgAutoloadAttemptLowercase ) {
- /*
-* Try a different capitalisation.
-*
-* PHP 4 objects are always serialized with the
classname coerced to lowercase,
-* and we are plagued with several legacy uses created
by MediaWiki 1.5, see
-* https://wikitech.wikimedia.org/wiki/Text_storage_data
-*/
- $lowerClass = strtolower( $className );
-
- if ( self::$autoloadLocalClassesLower === null ) {
- self::$autoloadLocalClassesLower =
array_change_key_case( $wgAutoloadLocalClasses, CASE_LOWER );
- }
-
- if ( isset(
self::$autoloadLocalClassesLower[$lowerClass] ) ) {
- if ( function_exists( 'wfDebugLog' ) ) {
- wfDebugLog( 'autoloader', Class
{$className} was loaded using incorrect case );
- }
- $filename =
self::$autoloadLocalClassesLower[$lowerClass];
- }
- }
-
- if ( !$filename ) {
- // Class not found; let the next autoloader try to find
it
- return;
}
// Make an absolute path, this improves performance by avoiding
some stat calls
- if ( substr( $filename, 0, 1 ) != '/' substr( $filename, 1,
1 ) != ':' ) {
- global $IP;
- $filename = $IP/$filename;
+ if ( $filename ) {
+ if ( $filename[0] !== '/' $filename[1] !== ':' ) {
+
[MediaWiki-commits] [Gerrit] Migrate block log to new log system - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152003
Change subject: Migrate block log to new log system
..
Migrate block log to new log system
This allows use of gender on Special:Log.
Old messages are kept for use in IRC.
A test was added to ensure an unchanged IRC message.
Change-Id: Ibc7fcaa5a952ff90d42a6477da4baa429f3de64b
---
M includes/AutoLoader.php
M includes/DefaultSettings.php
A includes/logging/BlockLogFormatter.php
M includes/logging/LogFormatter.php
M includes/logging/LogPage.php
M includes/specials/SpecialBlock.php
M includes/specials/SpecialUnblock.php
M languages/i18n/en.json
M languages/i18n/qqq.json
M tests/phpunit/includes/changes/RecentChangeTest.php
10 files changed, 220 insertions(+), 129 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/03/152003/1
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 9fa0c13..f94828b 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -697,6 +697,7 @@
# includes/logging
'DatabaseLogEntry' = 'includes/logging/LogEntry.php',
+ 'BlockLogFormatter' = 'includes/logging/BlockLogFormatter.php',
'DeleteLogFormatter' = 'includes/logging/DeleteLogFormatter.php',
'LegacyLogFormatter' = 'includes/logging/LogFormatter.php',
'LogEntry' = 'includes/logging/LogEntry.php',
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index cf6a95d..3710b98 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6603,9 +6603,6 @@
* Extensions with custom log types may add to this array.
*/
$wgLogActions = array(
- 'block/block' = 'blocklogentry',
- 'block/unblock' = 'unblocklogentry',
- 'block/reblock' = 'reblock-logentry',
'protect/protect' = 'protectedarticle',
'protect/modify' = 'modifiedarticleprotection',
'protect/unprotect' = 'unprotectedarticle',
@@ -6613,8 +6610,6 @@
'import/upload' = 'import-logentry-upload',
'import/interwiki' = 'import-logentry-interwiki',
'merge/merge' = 'pagemerge-logentry',
- 'suppress/block' = 'blocklogentry',
- 'suppress/reblock' = 'reblock-logentry',
);
/**
@@ -6639,6 +6634,11 @@
'upload/upload' = 'LogFormatter',
'upload/overwrite' = 'LogFormatter',
'upload/revert' = 'LogFormatter',
+ 'block/block' = 'BlockLogFormatter',
+ 'block/unblock' = 'BlockLogFormatter',
+ 'block/reblock' = 'BlockLogFormatter',
+ 'suppress/block' = 'BlockLogFormatter',
+ 'suppress/reblock' = 'BlockLogFormatter',
);
/**
diff --git a/includes/logging/BlockLogFormatter.php
b/includes/logging/BlockLogFormatter.php
new file mode 100644
index 000..f48cff3
--- /dev/null
+++ b/includes/logging/BlockLogFormatter.php
@@ -0,0 +1,142 @@
+?php
+/**
+ * Formatter for block log entries.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
+ * @since 1.24
+ */
+
+/**
+ * This class formats block log entries.
+ *
+ * @since 1.24
+ */
+class BlockLogFormatter extends LogFormatter {
+ protected function getMessageParameters() {
+ $params = parent::getMessageParameters();
+
+ // change title link to a link without prefix and a user tool
bar
+ $title = $this-entry-getTarget();
+ if ( substr( $title-getText(), 0, 1 ) == '#' ) {
+ $params[2] = $title-getText();
+ } else {
+ // @todo Store the user identifier in the parameters
+ // to make this faster for future log entries
+ $id = User::idFromName( $title-getText() );
+ $params[2] = Message::rawParam( Linker::userLink( $id,
$title-getText() )
+ . Linker::userToolLinks( $id,
$title-getText(), false, Linker::TOOL_LINKS_NOBLOCK ) );
+ }
+
+ $subtype = $this-entry-getSubtype();
+ if ( $subtype === 'block' || $subtype === 'reblock' ) {
+
[MediaWiki-commits] [Gerrit] Logrotate (90 days) a few more jobs - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152004
Change subject: Logrotate (90 days) a few more jobs
..
Logrotate (90 days) a few more jobs
Will eventually make it the default.
Change-Id: Ice6abba2a74cc5ea3aa5f4c406e6a212679344fc
---
M job-templates.yaml
1 file changed, 26 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/04/152004/1
diff --git a/job-templates.yaml b/job-templates.yaml
index 47df1b8..36f0f20 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -99,6 +99,8 @@
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -109,6 +111,8 @@
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -120,6 +124,8 @@
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -134,6 +140,8 @@
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -147,6 +155,8 @@
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -160,6 +170,8 @@
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -173,6 +185,8 @@
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -186,6 +200,8 @@
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -198,6 +214,8 @@
name: '{name}-phpunit'
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -221,6 +239,8 @@
name: '{name}-rubylint'
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -231,6 +251,8 @@
name: '{name}-ruby1.8lint'
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -241,6 +263,8 @@
name: '{name}-ruby1.9.3lint'
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -276,6 +300,8 @@
defaults: use-remote-zuul-no-submodules
node: hasSlaveScripts UbuntuPrecise
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
--
To view, visit https://gerrit.wikimedia.org/r/152004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice6abba2a74cc5ea3aa5f4c406e6a212679344fc
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Logrotate (90 days) a few more jobs - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Logrotate (90 days) a few more jobs
..
Logrotate (90 days) a few more jobs
Will eventually make it the default.
Change-Id: Ice6abba2a74cc5ea3aa5f4c406e6a212679344fc
---
M job-templates.yaml
1 file changed, 26 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/job-templates.yaml b/job-templates.yaml
index 47df1b8..36f0f20 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -99,6 +99,8 @@
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -109,6 +111,8 @@
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -120,6 +124,8 @@
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -134,6 +140,8 @@
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -147,6 +155,8 @@
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -160,6 +170,8 @@
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -173,6 +185,8 @@
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -186,6 +200,8 @@
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -198,6 +214,8 @@
name: '{name}-phpunit'
node: hasSlaveScripts UbuntuPrecise
defaults: use-remote-zuul
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -221,6 +239,8 @@
name: '{name}-rubylint'
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -231,6 +251,8 @@
name: '{name}-ruby1.8lint'
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -241,6 +263,8 @@
name: '{name}-ruby1.9.3lint'
defaults: use-remote-zuul-no-submodules
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
@@ -276,6 +300,8 @@
defaults: use-remote-zuul-no-submodules
node: hasSlaveScripts UbuntuPrecise
concurrent: true
+logrotate:
+daysToKeep: 90
triggers:
- zuul
builders:
--
To view, visit https://gerrit.wikimedia.org/r/152004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice6abba2a74cc5ea3aa5f4c406e6a212679344fc
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Topic namespace translation for Swedish - change (mediawiki...Flow)
Lokal Profil has uploaded a new change for review. https://gerrit.wikimedia.org/r/152005 Change subject: Topic namespace translation for Swedish .. Topic namespace translation for Swedish Based on the terminology used in https://translatewiki.net/w/i.php?title=Special:Translategroup=ext-flowlanguage=svfilter=action=translate Change-Id: I2406f070a8cfb6c7757ea99b11d7ddbd3da1408d --- M Flow.namespaces.php 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/05/152005/1 diff --git a/Flow.namespaces.php b/Flow.namespaces.php index 9682e59..6c11937 100644 --- a/Flow.namespaces.php +++ b/Flow.namespaces.php @@ -97,6 +97,11 @@ NS_TOPIC = 'Tema', ); +/** Swedish */ +$namespaceNames['sv'] = array( + NS_TOPIC = 'Ämne', +); + /** Ukrainian */ $namespaceNames['uk'] = array( NS_TOPIC = 'Тема', -- To view, visit https://gerrit.wikimedia.org/r/152005 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2406f070a8cfb6c7757ea99b11d7ddbd3da1408d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Lokal Profil lokal.pro...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: add PLURAL to bs-installer-could-not-rename - change (mediawiki...BlueSpiceFoundation)
Shirayuki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152006
Change subject: i18n: add PLURAL to bs-installer-could-not-rename
..
i18n: add PLURAL to bs-installer-could-not-rename
Spotted by Macofe
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Bs-installer-could-not-rename/es
Change-Id: I9993ce2a670dbbc21c4954bd9e498d1959d22e62
---
M i18n/installer/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/06/152006/1
diff --git a/i18n/installer/en.json b/i18n/installer/en.json
index e23e5da..4f0625b 100644
--- a/i18n/installer/en.json
+++ b/i18n/installer/en.json
@@ -6,5 +6,5 @@
},
config-install-renamefandf: Renaming template folders and files,
bs-installer-title: Installation of MediaWiki $1 and BlueSpice $2,
- bs-installer-could-not-rename: The following
{{PLURAL:$1|element|elements}} could not be renamed. Please rename them
manually. $2
+ bs-installer-could-not-rename: The following
{{PLURAL:$1|element|elements}} could not be renamed. Please rename
{{PLURAL:$1|it|them}} manually. $2
}
--
To view, visit https://gerrit.wikimedia.org/r/152006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9993ce2a670dbbc21c4954bd9e498d1959d22e62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: add PLURAL to bs-installer-could-not-rename - change (mediawiki...BlueSpiceFoundation)
Smuggli has submitted this change and it was merged.
Change subject: i18n: add PLURAL to bs-installer-could-not-rename
..
i18n: add PLURAL to bs-installer-could-not-rename
Spotted by Macofe
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Bs-installer-could-not-rename/es
Change-Id: I9993ce2a670dbbc21c4954bd9e498d1959d22e62
---
M i18n/installer/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
diff --git a/i18n/installer/en.json b/i18n/installer/en.json
index e23e5da..4f0625b 100644
--- a/i18n/installer/en.json
+++ b/i18n/installer/en.json
@@ -6,5 +6,5 @@
},
config-install-renamefandf: Renaming template folders and files,
bs-installer-title: Installation of MediaWiki $1 and BlueSpice $2,
- bs-installer-could-not-rename: The following
{{PLURAL:$1|element|elements}} could not be renamed. Please rename them
manually. $2
+ bs-installer-could-not-rename: The following
{{PLURAL:$1|element|elements}} could not be renamed. Please rename
{{PLURAL:$1|it|them}} manually. $2
}
--
To view, visit https://gerrit.wikimedia.org/r/152006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9993ce2a670dbbc21c4954bd9e498d1959d22e62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow overriding postgres datadir - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Allow overriding postgres datadir
..
Allow overriding postgres datadir
Also honour the version specified in postgresql.conf.erb
Change-Id: Ia2bbced2dccd504a30774ce846a24a74d1dd6af1
---
M modules/postgresql/manifests/master.pp
M modules/postgresql/manifests/server.pp
M modules/postgresql/manifests/slave.pp
M modules/postgresql/templates/postgresql.conf.erb
4 files changed, 15 insertions(+), 6 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/postgresql/manifests/master.pp
b/modules/postgresql/manifests/master.pp
index bfb16f2..d46b724 100644
--- a/modules/postgresql/manifests/master.pp
+++ b/modules/postgresql/manifests/master.pp
@@ -33,13 +33,15 @@
$ensure='present',
$max_wal_senders=3,
$checkpoint_segments=64,
-$wal_keep_segments=128
+$wal_keep_segments=128,
+$datadir=undef
) {
class { 'postgresql::server':
pgversion = $pgversion,
ensure= $ensure,
includes = [ $includes, 'master.conf'],
+datadir = $datadir,
}
file { /etc/postgresql/${pgversion}/main/master.conf:
diff --git a/modules/postgresql/manifests/server.pp
b/modules/postgresql/manifests/server.pp
index 242b6ed..5a5d3b5 100644
--- a/modules/postgresql/manifests/server.pp
+++ b/modules/postgresql/manifests/server.pp
@@ -24,7 +24,8 @@
$ensure='present',
$includes=[],
$listen_addresses='*',
-$port='5432'
+$port='5432',
+$datadir=undef,
) {
package { [
diff --git a/modules/postgresql/manifests/slave.pp
b/modules/postgresql/manifests/slave.pp
index d73e7bb..a249ac7 100644
--- a/modules/postgresql/manifests/slave.pp
+++ b/modules/postgresql/manifests/slave.pp
@@ -30,12 +30,14 @@
$includes=[],
$pgversion='9.1',
$ensure='present',
+$datadir=undef
) {
class { 'postgresql::server':
pgversion = $pgversion,
ensure= $ensure,
includes = [ $includes, 'slave.conf'],
+datadir = $datadir,
}
file { /etc/postgresql/${pgversion}/main/slave.conf:
diff --git a/modules/postgresql/templates/postgresql.conf.erb
b/modules/postgresql/templates/postgresql.conf.erb
index 58757f4..f25cee1 100644
--- a/modules/postgresql/templates/postgresql.conf.erb
+++ b/modules/postgresql/templates/postgresql.conf.erb
@@ -38,15 +38,19 @@
# The default values of these variables are driven from the -D command-line
# option or PGDATA environment variable, represented here as ConfigDir.
-data_directory = '/var/lib/postgresql/9.1/main'# use data in
another directory
+% if @datadir %
+data_directory = %= @datadir % # use data in another directory
+% else %
+data_directory = '/var/lib/postgresql/%= @pgversion %/main' # use
data in another directory
+% end %
# (change requires restart)
-hba_file = '/etc/postgresql/9.1/main/pg_hba.conf' # host-based
authentication file
+hba_file = '/etc/postgresql/%= @pgversion % /main/pg_hba.conf' #
host-based authentication file
# (change requires restart)
-ident_file = '/etc/postgresql/9.1/main/pg_ident.conf' # ident configuration
file
+ident_file = '/etc/postgresql/%= @pgversion %/main/pg_ident.conf'# ident
configuration file
# (change requires restart)
# If external_pid_file is not explicitly set, no extra PID file is written.
-external_pid_file = '/var/run/postgresql/9.1-main.pid' # write an
extra PID file
+external_pid_file = '/var/run/postgresql/%= @pgversion %-main.pid'
# write an extra PID file
# (change requires restart)
--
To view, visit https://gerrit.wikimedia.org/r/151864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2bbced2dccd504a30774ce846a24a74d1dd6af1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo in ebcb7cd - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/152007 Change subject: Fix typo in ebcb7cd .. Fix typo in ebcb7cd Erroneous whitespace and characters Change-Id: I3e7796affe96cd49c7bc6de2bf6111be39c1b6ec --- M modules/postgresql/templates/postgresql.conf.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/07/152007/1 diff --git a/modules/postgresql/templates/postgresql.conf.erb b/modules/postgresql/templates/postgresql.conf.erb index f25cee1..bbf11a5 100644 --- a/modules/postgresql/templates/postgresql.conf.erb +++ b/modules/postgresql/templates/postgresql.conf.erb @@ -44,7 +44,7 @@ data_directory = '/var/lib/postgresql/%= @pgversion %/main' # use data in another directory % end % # (change requires restart) -hba_file = '/etc/postgresql/%= @pgversion % /main/pg_hba.conf' # host-based authentication file +hba_file = '/etc/postgresql/%= @pgversion %/main/pg_hba.conf'# host-based authentication file # (change requires restart) ident_file = '/etc/postgresql/%= @pgversion %/main/pg_ident.conf'# ident configuration file # (change requires restart) -- To view, visit https://gerrit.wikimedia.org/r/152007 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e7796affe96cd49c7bc6de2bf6111be39c1b6ec Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo in ebcb7cd - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Fix typo in ebcb7cd .. Fix typo in ebcb7cd Erroneous whitespace and characters Change-Id: I3e7796affe96cd49c7bc6de2bf6111be39c1b6ec --- M modules/postgresql/templates/postgresql.conf.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Alexandros Kosiaris: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/modules/postgresql/templates/postgresql.conf.erb b/modules/postgresql/templates/postgresql.conf.erb index f25cee1..bbf11a5 100644 --- a/modules/postgresql/templates/postgresql.conf.erb +++ b/modules/postgresql/templates/postgresql.conf.erb @@ -44,7 +44,7 @@ data_directory = '/var/lib/postgresql/%= @pgversion %/main' # use data in another directory % end % # (change requires restart) -hba_file = '/etc/postgresql/%= @pgversion % /main/pg_hba.conf' # host-based authentication file +hba_file = '/etc/postgresql/%= @pgversion %/main/pg_hba.conf'# host-based authentication file # (change requires restart) ident_file = '/etc/postgresql/%= @pgversion %/main/pg_ident.conf'# ident configuration file # (change requires restart) -- To view, visit https://gerrit.wikimedia.org/r/152007 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e7796affe96cd49c7bc6de2bf6111be39c1b6ec Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Unset redirect param in MoveLogFormatter::getMessageParameters - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152011
Change subject: Unset redirect param in MoveLogFormatter::getMessageParameters
..
Unset redirect param in MoveLogFormatter::getMessageParameters
The redirect param is used to get a different message key, so there is
no need to pass it to the message, because the value is stable.
'logentry-move-move' always get a '0' and
'logentry-move-move-noredirect' always a '1'
The value is only visible with uselang=qqx
Change-Id: Ib6a3303e7401e29561165355b3611c3c123bfcd0
---
M includes/logging/MoveLogFormatter.php
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/11/152011/1
diff --git a/includes/logging/MoveLogFormatter.php
b/includes/logging/MoveLogFormatter.php
index 3913016..a4c4706 100644
--- a/includes/logging/MoveLogFormatter.php
+++ b/includes/logging/MoveLogFormatter.php
@@ -39,6 +39,7 @@
$key = parent::getMessageKey();
$params = $this-getMessageParameters();
if ( isset( $params[4] ) $params[4] === '1' ) {
+ // Messages: logentry-move-move-noredirect,
logentry-move-move_redir-noredirect
$key .= '-noredirect';
}
@@ -51,6 +52,10 @@
$newname = $this-makePageLink( Title::newFromText( $params[3]
) );
$params[2] = Message::rawParam( $oldname );
$params[3] = Message::rawParam( $newname );
+ if ( isset( $params[4] ) ) {
+ // handled in getMessageKey
+ unset( $params[4] );
+ }
return $params;
}
--
To view, visit https://gerrit.wikimedia.org/r/152011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6a3303e7401e29561165355b3611c3c123bfcd0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix minor documentation issues - change (mediawiki...BounceHandler)
01tonythomas has uploaded a new change for review. https://gerrit.wikimedia.org/r/152012 Change subject: Fix minor documentation issues .. Fix minor documentation issues Change-Id: I7d56450e22a5354f642749ab690b1633fe245b1e --- M BounceHandlerHooks.php 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BounceHandler refs/changes/12/152012/1 diff --git a/BounceHandlerHooks.php b/BounceHandlerHooks.php index 129b822..b43c7d9 100644 --- a/BounceHandlerHooks.php +++ b/BounceHandlerHooks.php @@ -25,7 +25,8 @@ } /** -* Generate VERP address +* Generate VERP address of the form +* * @param string recipient email * @return string ReturnPath address */ @@ -39,8 +40,9 @@ $url = wfParseUrl( $wgServer ); $email_domain = $url['host']; } - // Creating the email prefix as wikiId-base36( $UserID )-base36( $Timestamp )@domain-hash( $algorithm, - // $key, $prefix )@$domain + // Creating the VERP address prefix as wikiId-base36( $UserID )-base36( $Timestamp ) + // and the generated VERP return path is of the form : + // wikiId-base36( $UserID )-base36( $Timestamp )-hash( $algorithm, $key, $prefix )@$email_domain // We dont want repeating '-' in our WikiId $wikiId = str_replace( '-', '.', wfWikiID() ); $email_prefix = $wikiId. '-'. base_convert( $uid, 10, 36). '-'. base_convert( $timeNow, 10, 36); -- To view, visit https://gerrit.wikimedia.org/r/152012 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d56450e22a5354f642749ab690b1633fe245b1e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BounceHandler Gerrit-Branch: master Gerrit-Owner: 01tonythomas 01tonytho...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] osm: Move postgres datadir to /srv/postgres - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152013
Change subject: osm: Move postgres datadir to /srv/postgres
..
osm: Move postgres datadir to /srv/postgres
It's own mountpoint and all. Usefull in general, even more useful with
the specific SSDs in labsdb1006, labsdb1007
Change-Id: I5e112a6995926390c1339d9ec80f9ceaac6e923b
---
M manifests/role/osm.pp
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/152013/1
diff --git a/manifests/role/osm.pp b/manifests/role/osm.pp
index c2bb5eb..9a240e5 100644
--- a/manifests/role/osm.pp
+++ b/manifests/role/osm.pp
@@ -3,6 +3,8 @@
class role::osm::common {
include standard
+$datadir = '/srv/postgres'
+
file { '/etc/postgresql/9.1/main/tuning.conf':
ensure = 'present',
owner = 'root',
@@ -27,7 +29,8 @@
include passwords::osm
class { 'postgresql::master':
-includes = 'tuning.conf'
+includes = 'tuning.conf',
+datadir = $role::osm::common::datadir,
}
class { 'postgresql::ganglia':
@@ -148,6 +151,7 @@
master_server= $osm_master,
replication_pass = $passwords::osm::replication_pass,
includes = 'tuning.conf',
+datadir = $role::osm::common::datadir,
}
class { 'postgresql::ganglia':
--
To view, visit https://gerrit.wikimedia.org/r/152013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e112a6995926390c1339d9ec80f9ceaac6e923b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update the database connection settings for alembic - change (analytics/wikimetrics)
jenkins-bot has submitted this change and it was merged.
Change subject: Update the database connection settings for alembic
..
Update the database connection settings for alembic
Over time, the connection settings for the wikimetrics database in the
main code got improved, but those improvements did not make
it to alembic's connection settings. Hence, we now bring those
improvements over.
Change-Id: I0040b7ce5af8f3a12fd89662a6c76bcb30b6c8f7
---
M database_migrations/env.py
M wikimetrics/database.py
2 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
Nuria: Looks good to me, approved
jenkins-bot: Verified
diff --git a/database_migrations/env.py b/database_migrations/env.py
index 060d046..eaa1655 100644
--- a/database_migrations/env.py
+++ b/database_migrations/env.py
@@ -36,7 +36,10 @@
return create_engine(
config['WIKIMETRICS_ENGINE_URL'],
-echo=config['SQL_ECHO'])
+echo=config['SQL_ECHO'],
+connect_args={charset : utf8},
+pool_size=config['WIKIMETRICS_POOL_SIZE'],
+)
def run_migrations_offline():
diff --git a/wikimetrics/database.py b/wikimetrics/database.py
index 19fe07d..fa74b71 100644
--- a/wikimetrics/database.py
+++ b/wikimetrics/database.py
@@ -93,6 +93,9 @@
new or cached sqlalchemy engine connected to the wikimetrics
database.
if self.wikimetrics_engine is None:
+# If changing the parameters to create_engine below, be
+# sure to also reflect them in
+# database_migrations/env.py's create_engine.
self.wikimetrics_engine = create_engine(
self.config['WIKIMETRICS_ENGINE_URL'],
echo=self.config['SQL_ECHO'],
--
To view, visit https://gerrit.wikimedia.org/r/149383
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0040b7ce5af8f3a12fd89662a6c76bcb30b6c8f7
Gerrit-PatchSet: 2
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Milimetric dandree...@wikimedia.org
Gerrit-Reviewer: Nuria nu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implement basic support for transclusion. - change (mediawiki...MassMessage)
Wctaiwan has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152014
Change subject: Implement basic support for transclusion.
..
Implement basic support for transclusion.
Implement getWikitextForTransclusion so that transclusions don't show up
as raw JSON. Because there is no way to customise transclusion, only the
target list is returned (with no h2), as it's possible that one would
want to transclude the target list without the description, and including
the latter by default would make it impossible.
Change-Id: Ie87bb96becdf12f06536911f94330a399c28c42e
---
M includes/content/MassMessageListContent.php
1 file changed, 44 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage
refs/changes/14/152014/1
diff --git a/includes/content/MassMessageListContent.php
b/includes/content/MassMessageListContent.php
index 9da0b71..12293d8 100644
--- a/includes/content/MassMessageListContent.php
+++ b/includes/content/MassMessageListContent.php
@@ -199,6 +199,49 @@
}
/**
+* Return the list of targets (with no heading) in wikitext format.
+* Modified from getTargetsHtml().
+* @return string
+*/
+ public function getWikitextForTransclusion() {
+ global $wgScript;
+
+ $sites = $this-getTargetsBySite();
+
+ // If the list is empty
+ if ( count( $sites ) === 0 ) {
+ return wfMessage( 'massmessage-content-empty' )-text();
+ }
+
+ // Determine whether there are targets on external wikis.
+ $printSites = ( count( $sites ) === 1 array_key_exists(
'local', $sites ) ) ?
+ false : true;
+
+ $wikitext = '';
+ foreach ( $sites as $site = $targets ) {
+ if ( $printSites ) {
+ if ( $site === 'local' ) {
+ $wikitext .= wfMessage(
'massmessage-content-localpages' )-text() . \n;
+ } else {
+ $wikitext .= wfMessage(
'massmessage-content-pagesonsite', $site )-text()
+ . \n;
+ }
+ }
+
+ foreach ( $targets as $target ) {
+ $title = Title::newFromText( $target );
+ if ( $site === 'local' ) {
+ $wikitext .= '* [[' .
$title-getPrefixedText() . ]]\n;
+ } else {
+ $wikitext .= *
[//$site$wgScript?title= . $title-getPrefixedURL()
+ . ' ' .
$title-getPrefixedText() . ]\n;
+ }
+ }
+ }
+ return $wikitext;
+ }
+
+ /**
* Helper function for fillParserOutput; return HTML for displaying the
list of pages.
* Note that the function assumes that the contents are valid.
* @return string
@@ -279,8 +322,7 @@
}
/**
-* Helper function for getTargetsHtml; return the array of targets
sorted by site.
-* Note that the function assumes that the contents are valid.
+* Return the array of targets sorted by site.
* @return array
*/
protected function getTargetsBySite() {
--
To view, visit https://gerrit.wikimedia.org/r/152014
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie87bb96becdf12f06536911f94330a399c28c42e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: contenthandler
Gerrit-Owner: Wctaiwan wctai...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BS223: Compatibility with vector - change (mediawiki...BlueSpiceExtensions)
Tweichart has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152015
Change subject: BS223: Compatibility with vector
..
BS223: Compatibility with vector
* wikiadmin + usersidebar added to leftnavigation
* authors + shoutbox + readers added to dataaftercontent
* mvoed some styling from skin to shoutbox
* statebar icon for shoutbox now refreshes when new shout is made
Change-Id: Ib3b1830986c2b43b757c477d9dd8fc2b344825a0
---
M Authors/Authors.class.php
M Readers/Readers.class.php
M ShoutBox/ShoutBox.class.php
M ShoutBox/resources/bluespice.shoutBox.css
M ShoutBox/resources/bluespice.shoutBox.js
M UserSidebar/UserSidebar.class.php
M WikiAdmin/WikiAdmin.class.php
7 files changed, 152 insertions(+), 54 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/15/152015/1
diff --git a/Authors/Authors.class.php b/Authors/Authors.class.php
index 26af819..ba51c3d 100644
--- a/Authors/Authors.class.php
+++ b/Authors/Authors.class.php
@@ -88,6 +88,7 @@
wfProfileIn( 'BS::'.__METHOD__ );
// Hooks
$this-setHook( 'SkinTemplateOutputPageBeforeExec' );
+ $this-setHook( 'SkinAfterContent' );
$this-setHook( 'BeforePageDisplay' );
$this-setHook( 'BSInsertMagicAjaxGetData' );
$this-setHook( 'BS:UserPageSettings', 'onUserPageSettings' );
@@ -158,46 +159,71 @@
* @param BaseTemplate $tpl currently logged in user. Not used in this
context.
* @return bool always true
*/
- public function onSkinTemplateOutputPageBeforeExec( $sktemplate, $tpl
) {
- if ( $this-checkContext() === false ) {
+ public static function onSkinTemplateOutputPageBeforeExec( $skin,
$tpl ) {
+ global $wgDefaultSkin;
+ if ( $wgDefaultSkin != bluespiceskin )
+ return true;
+ $oAuthorsView = self::getAuthorsViewForAfterContent( $skin );
+ $tpl-data['bs_dataAfterContent']['bs-authors'] = array(
+ 'position' = 10,
+ 'label' = wfMessage( 'bs-authors-title' )-text(),
+ 'content' = $oAuthorsView
+ );
+ return true;
+ }
+
+ /**
+* Hook-Handler for 'SkinAfterContent'. Adds Authors view to the end of
the content.
+* @global String $wgDefaultSkin
+* @param String $data
+* @param Skin $sktemplate
+* @return boolean
+*/
+ public static function onSkinAfterContent( $data, $sktemplate ) {
+ global $wgDefaultSkin;
+ if ( $wgDefaultSkin == bluespiceskin )
+ return true;
+ $oAuthorsView = self::getAuthorsViewForAfterContent(
$sktemplate );
+ $data .= $oAuthorsView-execute();
+ return true;
+ }
+
+ private static function getAuthorsViewForAfterContent( $oSkin ) {
+ $oAuthors = new self();
+ if ( $oAuthors-checkContext() === false ) {
return true;
}
-
- $oTitle = $sktemplate-getTitle();
+ $oTitle = $oSkin-getTitle();
//Read in config variables
- $iLimit = BsConfig::get( 'MW::Authors::Limit' );
+ $iLimit = BsConfig::get( 'MW::Authors::Limit' );
$aBlacklist = BsConfig::get( 'MW::Authors::Blacklist' );
$sMoreImage = BsConfig::get( 'MW::Authors::MoreImage' );
$aParams = array();
- $aParams['width'] = BsConfig::get( 'MW::Authors::ImageWidth' );
+ $aParams['width'] = BsConfig::get( 'MW::Authors::ImageWidth' );
$aParams['height'] = BsConfig::get( 'MW::Authors::ImageHeight'
);
- $sPrintable = $this-getRequest()-getVal( 'printable', 'no' );
+ $sPrintable = $oSkin-getRequest()-getVal( 'printable', 'no' );
$iArticleId = $oTitle-getArticleID();
$sKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'Authors',
$iArticleId );
$aData = BsCacheHelper::get( $sKey );
- if( $aData !== false ) {
- wfDebugLog( 'BsMemcached', __CLASS__.': Fetched
AuthorsView from cache' );
+ if ( $aData !== false ) {
+ wfDebugLog( 'BsMemcached', __CLASS__ . ': Fetched
AuthorsView from cache' );
$oAuthorsView = $aData;
} else {
- wfDebugLog( 'BsMemcached', __CLASS__.': Fetching
AuthorsView from DB' );
+ wfDebugLog( 'BsMemcached', __CLASS__ . ': Fetching
AuthorsView from DB' );
//HINT: Maybe we want to use MW interface
Article::getContributors() to have better caching
[MediaWiki-commits] [Gerrit] Document choice of constant in connection pool test - change (analytics/wikimetrics)
jenkins-bot has submitted this change and it was merged. Change subject: Document choice of constant in connection pool test .. Document choice of constant in connection pool test Change-Id: Ie8864b48db1bb0d71e66f25bb2edadadf9d4e8a7 --- M tests/manual/connection_pool_configuration.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Nuria: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/manual/connection_pool_configuration.py b/tests/manual/connection_pool_configuration.py index c9718c7..12b2c26 100644 --- a/tests/manual/connection_pool_configuration.py +++ b/tests/manual/connection_pool_configuration.py @@ -12,6 +12,9 @@ @raises(TimeoutError) def test_pool_size_can_be_exceeded(self): +# The 11 in the following statement is 10 (default for +# max_overflow) + 1. So this is the lowest value for which we +# expect the connection to fail. pool_size = db.config['MEDIAWIKI_POOL_SIZE'] + 11 self.sessions = [ db.get_mw_session(mediawiki_project) -- To view, visit https://gerrit.wikimedia.org/r/149298 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie8864b48db1bb0d71e66f25bb2edadadf9d4e8a7 Gerrit-PatchSet: 1 Gerrit-Project: analytics/wikimetrics Gerrit-Branch: master Gerrit-Owner: QChris christ...@quelltextlich.at Gerrit-Reviewer: Milimetric dandree...@wikimedia.org Gerrit-Reviewer: Nuria nu...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Work in progress: accessibility fixes - change (apps...wikipedia)
Mhurd has submitted this change and it was merged.
Change subject: Work in progress: accessibility fixes
..
Work in progress: accessibility fixes
* adds localizable accessibility labels to wiki glyph buttons
* adds button and link traits to some places where they belong
Lots more to improve still...
Bug: 69120
Change-Id: I9ddb8b277194afc947dd04a2bf810892dfc419a1
---
M wikipedia/MenuButton/MenuButton.m
M wikipedia/MenuButton/WikiGlyphButton.m
M wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
M wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
M wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
M wikipedia/en.lproj/Localizable.strings
M wikipedia/qqq.lproj/Localizable.strings
8 files changed, 60 insertions(+), 11 deletions(-)
Approvals:
Mhurd: Verified; Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
diff --git a/wikipedia/MenuButton/MenuButton.m
b/wikipedia/MenuButton/MenuButton.m
index 4d93521..8d3bebf 100755
--- a/wikipedia/MenuButton/MenuButton.m
+++ b/wikipedia/MenuButton/MenuButton.m
@@ -57,6 +57,8 @@
[self addSubview:self.label];
self.margin = margin;
[self constrainLabel];
+self.isAccessibilityElement = YES;
+self.accessibilityTraits = UIAccessibilityTraitButton;
}
return self;
}
diff --git a/wikipedia/MenuButton/WikiGlyphButton.m
b/wikipedia/MenuButton/WikiGlyphButton.m
index 80f18a8..31709dc 100644
--- a/wikipedia/MenuButton/WikiGlyphButton.m
+++ b/wikipedia/MenuButton/WikiGlyphButton.m
@@ -30,6 +30,8 @@
self.clipsToBounds = YES;
self.label = [[WikiGlyphLabel alloc] init];
self.label.translatesAutoresizingMaskIntoConstraints = NO;
+self.isAccessibilityElement = YES;
+self.accessibilityTraits = UIAccessibilityTraitButton;
[self addSubview:self.label];
[self constrainLabel];
}
@@ -43,6 +45,11 @@
{
_enabled = enabled;
self.alpha = (enabled) ? 1.0 : 0.2;
+if (enabled) {
+self.accessibilityTraits = self.accessibilityTraits
(~UIAccessibilityTraitNotEnabled);
+} else {
+self.accessibilityTraits = self.accessibilityTraits |
UIAccessibilityTraitNotEnabled;
+}
}
-(void)constrainLabel
diff --git a/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m b/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m
index d4660d3..7113632 100644
--- a/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
@@ -63,6 +63,7 @@
color: buttonColor
size: buttonTextSize
baselineOffset: baseLineOffset];
+self.backButton.accessibilityLabel =
MWLocalizedString(@menu-back-accessibility-label, nil);
self.backButton.tag = BOTTOM_MENU_BUTTON_PREVIOUS;
[self.forwardButton.label setWikiText: isRTL ? IOS_WIKIGLYPH_BACKWARD :
IOS_WIKIGLYPH_FORWARD
@@ -70,6 +71,7 @@
size: buttonTextSize
baselineOffset: baseLineOffset
];
+self.forwardButton.accessibilityLabel =
MWLocalizedString(@menu-forward-accessibility-label, nil);
self.forwardButton.tag = BOTTOM_MENU_BUTTON_NEXT;
// self.forwardButton.label.transform = CGAffineTransformMakeScale(-1, 1);
@@ -79,6 +81,7 @@
baselineOffset: baseLineOffset + 1.0
];
self.rightButton.tag = BOTTOM_MENU_BUTTON_SHARE;
+self.rightButton.accessibilityLabel =
MWLocalizedString(@menu-share-accessibility-label, nil);
self.allButtons = @[self.backButton, self.forwardButton, self.rightButton];
diff --git a/wikipedia/View
Controllers/Navigation/Primary/PrimaryMenuViewController.m b/wikipedia/View
Controllers/Navigation/Primary/PrimaryMenuViewController.m
index fc76834..c25bcd6 100644
--- a/wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Primary/PrimaryMenuViewController.m
@@ -73,6 +73,7 @@
size: 64
baselineOffset: 2.0
];
+self.moreButton.accessibilityLabel =
MWLocalizedString(@menu-more-accessibility-label, nil);
self.moreButton.label.textAlignment = [WikipediaAppUtils rtlSafeAlignment];
diff --git a/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m b/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
index c69007e..cc4b487 100644
--- a/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
+++ b/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
@@ -309,6
[MediaWiki-commits] [Gerrit] Enable more features for fawiki AbuseFilter - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable more features for fawiki AbuseFilter .. Enable more features for fawiki AbuseFilter Bug: 69073 Change-Id: Ie0d1191962a4285934051a36e66f5d0469ec40be --- M wmf-config/abusefilter.php 1 file changed, 21 insertions(+), 0 deletions(-) Approvals: Chad: Looks good to me, approved Reza: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php index 907a1a4..99c74e6 100644 --- a/wmf-config/abusefilter.php +++ b/wmf-config/abusefilter.php @@ -150,6 +150,27 @@ $wgAbuseFilterAvailableActions[] = 'block'; $wgAbuseFilterBlockDuration = '24 hours'; break; + case 'fawiki': + $wgGroupPermissions['*']['abusefilter-log'] = false; + $wgGroupPermissions['*']['abusefilter-view'] = false; + $wgGroupPermissions['autoconfirmed']['abusefilter-log-detail'] = false; + $wgGroupPermissions['patroller']['abusefilter-log'] = true; + $wgGroupPermissions['patroller']['abusefilter-view'] = true; + $wgGroupPermissions['patroller']['abusefilter-log-detail'] = true; + $wgGroupPermissions['autopatrol']['abusefilter-log'] = true; + $wgGroupPermissions['autopatrol']['abusefilter-view'] = true; + $wgGroupPermissions['autopatrol']['abusefilter-log-detail'] = true; + $wgGroupPermissions['sysop']['abusefilter-log'] = true; + $wgGroupPermissions['sysop']['abusefilter-log-private'] = true; + $wgGroupPermissions['sysop']['abusefilter-view'] = true; + $wgGroupPermissions['sysop']['abusefilter-view-private'] = true; + $wgGroupPermissions['sysop']['abusefilter-revert'] = true; + $wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = true; + $wgAbuseFilterAvailableActions[] = array( 'flag', 'throttle', 'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'tag', 'rangeblock' ); + $wgAbuseFilterAnonBlockDuration = '3 months'; + $wgAbuseFilterBlockDuration = 'indefinite'; + $wgAbuseFilterNotifications = false; + break; case 'fiwiki': // bug 57395 $wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = true; $wgGroupPermissions['sysop']['abusefilter-revert'] = true; -- To view, visit https://gerrit.wikimedia.org/r/151421 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie0d1191962a4285934051a36e66f5d0469ec40be Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Calak calakw...@yahoo.com Gerrit-Reviewer: Calak calakw...@yahoo.com Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: Reza reza.ene...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix `ve.dm.Transaction.newFromReplacement` when `removeMetad... - change (VisualEditor/VisualEditor)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152017
Change subject: Fix `ve.dm.Transaction.newFromReplacement` when
`removeMetadata` is true.
..
Fix `ve.dm.Transaction.newFromReplacement` when `removeMetadata` is true.
The `newFromReplacement` call was inadvertently ignoring its
`removeMetadata` argument, because the optimizations in `pushReplace`
were combining a remove and insert and throwing away the `removeMetadata`
flag in the process.
Change-Id: I4f1ae7982b06200ecde62101dc2558fc02c6e8d4
---
M modules/ve/dm/ve.dm.Transaction.js
M modules/ve/tests/ce/ve.ce.Surface.test.js
M modules/ve/tests/dm/ve.dm.Transaction.test.js
3 files changed, 107 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/17/152017/1
diff --git a/modules/ve/dm/ve.dm.Transaction.js
b/modules/ve/dm/ve.dm.Transaction.js
index 03b38d7..2b091ed 100644
--- a/modules/ve/dm/ve.dm.Transaction.js
+++ b/modules/ve/dm/ve.dm.Transaction.js
@@ -1142,7 +1142,8 @@
remove = doc.getData( range ),
removeMetadata = doc.getMetadata( range ),
isRemoveEmpty = ve.compare( removeMetadata, new Array(
removeMetadata.length ) ),
- isInsertEmpty = insertMetadata ve.compare( insertMetadata,
new Array( insertMetadata.length ) );
+ isInsertEmpty = insertMetadata ve.compare( insertMetadata,
new Array( insertMetadata.length ) ),
+ wasMerged = false;
if ( !insertMetadata !isRemoveEmpty ) {
// if we are removing a range which includes metadata, we need
to
@@ -1157,6 +1158,7 @@
// pad out at end so insert metadata is the same length
as insert data
ve.batchSplice( insertMetadata, 1, 0, new Array(
insert.length - 1 ) );
}
+ isInsertEmpty = ve.compare( insertMetadata, new Array(
insertMetadata.length ) );
} else if ( isInsertEmpty isRemoveEmpty ) {
// No metadata changes, don't pollute the transaction with
[undefined, undefined, ...]
insertMetadata = undefined;
@@ -1165,20 +1167,25 @@
// simple replaces can be combined
// (but don't do this if there is metadata to be removed and the
previous
// replace had a non-zero insertion, because that would shift the
metadata
- // location.)
+ // location. also skip this if the last replace deliberately removed
+ // metadata instead of merging it.)
if (
lastOp lastOp.type === 'replaceMetadata'
lastOp.insert.length 0 lastOp.remove.length === 0
penultOp penultOp.type === 'replace'
penultOp.insert.length === 0 /* this is always true */
) {
+ wasMerged = [lastOp.insert];
this.operations.pop();
lastOp = penultOp;
/* fall through */
}
+ // merge, where extraMetadata will not be required
if (
lastOp lastOp.type === 'replace'
- !( lastOp.insert.length 0 insertMetadata !== undefined )
+ !( lastOp.insert.length 0 insertMetadata !== undefined )
+ lastOp.insertedDataOffset === undefined ( !extraMetadata )
+ !( wasMerged !( insertMetadata === undefined ||
isInsertEmpty ) )
) {
lastOp = this.operations.pop();
this.lengthDifference -= lastOp.insert.length -
lastOp.remove.length;
@@ -1186,7 +1193,37 @@
doc,
offset - lastOp.remove.length,
lastOp.remove.length + removeLength,
- lastOp.insert.concat( insert )
+ lastOp.insert.concat( insert ),
+ (
+ lastOp.insertMetadata === undefined ?
+ new Array( lastOp.insert.length ) :
+ lastOp.insertMetadata
+ ).concat(
+ wasMerged || []
+ ).concat(
+ ( insertMetadata === undefined || isInsertEmpty
) ?
+ new Array( insert.length - (wasMerged ? 1 : 0)
) :
+ insertMetadata
+ ),
+ insertedDataOffset,
+ insertedDataLength
+ );
+ return;
+ }
+ // merge a remove after remove (where extraMetadata will be required)
+ if (
+ lastOp lastOp.type === 'replace'
+ lastOp.insert.length === 0 insert.length === 0
+ ( lastOp.removeMetadata === undefined || wasMerged )
+ ( insertMetadata === undefined || extraMetadata )
+ ) {
[MediaWiki-commits] [Gerrit] Drop unneeded imports in connection pool test - change (analytics/wikimetrics)
jenkins-bot has submitted this change and it was merged. Change subject: Drop unneeded imports in connection pool test .. Drop unneeded imports in connection pool test Change-Id: I47ed6f2a6e7b33f39f60dba39f63686d382023a4 --- M tests/manual/connection_pool_configuration.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Nuria: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/manual/connection_pool_configuration.py b/tests/manual/connection_pool_configuration.py index 12b2c26..a6fe7bc 100644 --- a/tests/manual/connection_pool_configuration.py +++ b/tests/manual/connection_pool_configuration.py @@ -1,6 +1,6 @@ from unittest import TestCase from sqlalchemy.exc import TimeoutError -from nose.tools import assert_equals, assert_true, raises +from nose.tools import assert_true, raises from tests.fixtures import mediawiki_project from wikimetrics.configurables import db, parse_db_connection_string, queue -- To view, visit https://gerrit.wikimedia.org/r/149299 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I47ed6f2a6e7b33f39f60dba39f63686d382023a4 Gerrit-PatchSet: 1 Gerrit-Project: analytics/wikimetrics Gerrit-Branch: master Gerrit-Owner: QChris christ...@quelltextlich.at Gerrit-Reviewer: Milimetric dandree...@wikimedia.org Gerrit-Reviewer: Nuria nu...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 06/08/2014 10:00 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review. https://gerrit.wikimedia.org/r/152018 Change subject: New Wikidata Build - 06/08/2014 10:00 .. New Wikidata Build - 06/08/2014 10:00 Change-Id: I078fe9a9675226855950b6aea0ad58eac6c3d2a2 --- M composer.lock M extensions/ValueView/README.md M extensions/ValueView/ValueView.php M extensions/ValueView/lib/jquery.ui/jquery.ui.suggester.css M extensions/ValueView/lib/jquery.ui/jquery.ui.suggester.js M extensions/Wikibase/.travis.yml M extensions/Wikibase/client/i18n/as.json M extensions/Wikibase/client/i18n/bn.json M extensions/Wikibase/client/i18n/ce.json M extensions/Wikibase/client/i18n/cs.json M extensions/Wikibase/client/i18n/es.json M extensions/Wikibase/client/i18n/fi.json M extensions/Wikibase/client/i18n/hu.json M extensions/Wikibase/client/i18n/it.json M extensions/Wikibase/client/i18n/nb.json M extensions/Wikibase/client/i18n/pt.json M extensions/Wikibase/client/i18n/ru.json M extensions/Wikibase/client/i18n/sco.json M extensions/Wikibase/client/i18n/sl.json M extensions/Wikibase/client/i18n/sv.json M extensions/Wikibase/client/i18n/vi.json M extensions/Wikibase/client/i18n/zh-hant.json M extensions/Wikibase/client/resources/Resources.php D extensions/Wikibase/client/resources/images/wb-badge-goldstar.png D extensions/Wikibase/client/resources/images/wb-badge-silverstar.png M extensions/Wikibase/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js M extensions/Wikibase/client/resources/wikibase.client.PageConnector.js M extensions/Wikibase/client/resources/wikibase.client.css M extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js M extensions/Wikibase/lib/WikibaseLib.hooks.php M extensions/Wikibase/lib/i18n/bn.json M extensions/Wikibase/lib/i18n/ce.json M extensions/Wikibase/lib/i18n/it.json M extensions/Wikibase/lib/i18n/nb.json M extensions/Wikibase/lib/i18n/nl.json M extensions/Wikibase/lib/i18n/pt.json M extensions/Wikibase/lib/i18n/sv.json M extensions/Wikibase/lib/i18n/vi.json M extensions/Wikibase/lib/includes/Term.php M extensions/Wikibase/lib/includes/Validators/CompositeValidator.php M extensions/Wikibase/lib/includes/Validators/DataFieldValidator.php M extensions/Wikibase/lib/includes/Validators/DataValueValidator.php M extensions/Wikibase/lib/includes/Validators/MembershipValidator.php M extensions/Wikibase/lib/includes/Validators/NotEntityIdValidator.php M extensions/Wikibase/lib/includes/Validators/NumberRangeValidator.php M extensions/Wikibase/lib/includes/Validators/NumberValidator.php M extensions/Wikibase/lib/includes/Validators/RegexValidator.php M extensions/Wikibase/lib/includes/Validators/StringLengthValidator.php M extensions/Wikibase/lib/includes/Validators/TypeValidator.php M extensions/Wikibase/lib/includes/Validators/UrlValidator.php M extensions/Wikibase/lib/includes/Validators/ValidatorErrorLocalizer.php M extensions/Wikibase/lib/includes/formatters/EntityIdLabelFormatter.php M extensions/Wikibase/lib/includes/formatters/MwTimeIsoFormatter.php M extensions/Wikibase/lib/includes/modules/SitesModule.php M extensions/Wikibase/lib/includes/parsers/DateTimeParser.php M extensions/Wikibase/lib/includes/parsers/MonthNameUnlocalizer.php M extensions/Wikibase/lib/includes/serializers/EntitySerializer.php M extensions/Wikibase/lib/includes/serializers/ReferenceSerializer.php M extensions/Wikibase/lib/includes/store/sql/SqlEntityInfoBuilder.php M extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php M extensions/Wikibase/lib/resources/Resources.php M extensions/Wikibase/lib/resources/templates.php M extensions/Wikibase/lib/resources/wikibase.RepoApi/wikibase.AbstractedRepoApi.js M extensions/Wikibase/lib/resources/wikibase.Site.js M extensions/Wikibase/lib/resources/wikibase.css M extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableSiteLink.js M extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.Interface.js M extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SitePageInterface.js M extensions/Wikibase/lib/tests/phpunit/formatters/EntityIdLabelFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/parsers/MonthNameUnlocalizerTest.php M extensions/Wikibase/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php M extensions/Wikibase/lib/tests/phpunit/serializers/LegacyInternalEntitySerializerTest.php M extensions/Wikibase/lib/tests/phpunit/store/EntityContentDataCodecTest.php M extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js M extensions/Wikibase/lib/tests/qunit/jquery.wikibase/jquery.wikibase.referenceview.tests.js M extensions/Wikibase/lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js M extensions/Wikibase/lib/tests/qunit/wikibase.Site.tests.js M
[MediaWiki-commits] [Gerrit] Fix bug that's ben breaking chat - change (mediawiki...MediaWikiChat)
UltrasonicNXT has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152019
Change subject: Fix bug that's ben breaking chat
..
Fix bug that's ben breaking chat
Caused by two messages with identical timestamps.
Couple of other cleanups
Change-Id: I0927636920ec3e289a8cb4b8235591d650f35cb1
---
M MediaWikiChat.php
M MediaWikiChatClass.php
M Send.api.php
3 files changed, 17 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat
refs/changes/19/152019/1
diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index d577baf..d167b9b 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -16,7 +16,7 @@
$wgExtensionCredits['specialpage'][] = array(
'path' = __FILE__,
'name' = 'MediaWikiChat',
- 'version' = '2.12.0',
+ 'version' = '2.12.1',
'author' = 'Adam Carter/UltrasonicNXT',
'url' = 'https://www.mediawiki.org/wiki/Extension:MediaWikiChat',
'descriptionmsg' = 'chat-desc',
diff --git a/MediaWikiChatClass.php b/MediaWikiChatClass.php
index 06faa9e..7fdc1e0 100644
--- a/MediaWikiChatClass.php
+++ b/MediaWikiChatClass.php
@@ -13,10 +13,10 @@
const TYPE_KICK = 4;
/**
-* Get the current UNIX time with microseconds (i.e. 138524180871).
+* Get the current UNIX time with 100th seconds (i.e. 138524180871).
* Standard UNIX timestamp contains only 10 digits.
*
-* @return Integer: current UNIX timestamp + microseconds
+* @return Integer: current UNIX timestamp + 100th seconds
*/
static function now() {
$m = explode( ' ', microtime() );
diff --git a/Send.api.php b/Send.api.php
index 334bde5..dbc8356 100644
--- a/Send.api.php
+++ b/Send.api.php
@@ -14,6 +14,7 @@
if ( $message != '' ) {
$dbw = wfGetDB( DB_MASTER );
+ $dbr = wfGetDB( DB_SLAVE );
$id = $user-getId();
$timestamp = MediaWikiChat::now();
@@ -24,7 +25,7 @@
}
// Flood check
- $res = $dbw-selectField(
+ $res = $dbr-selectField(
'chat',
array( 'count(*)' ),
array( chat_timestamp . (
$timestamp - ( $wgChatFloodSeconds * 100 ) ), chat_user_id = . $id ),
@@ -35,6 +36,18 @@
return true;
}
+ $lastTimestamp = $dbr-selectField(
+ 'chat',
+ 'chat_timestamp',
+ array(),
+ __METHOD__,
+ array( 'ORDER BY' = 'chat_timestamp
DESC', 'LIMIT' = 1 )
+ );
+
+ if ( $timestamp == $lastTimestamp ) {
+ $timestamp += 1; // prevent two
messages with the same timestamp
+ }
+
$dbw-insert(
'chat',
array(
--
To view, visit https://gerrit.wikimedia.org/r/152019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0927636920ec3e289a8cb4b8235591d650f35cb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT adamr_car...@btinternet.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix bug that's ben breaking chat - change (mediawiki...MediaWikiChat)
UltrasonicNXT has submitted this change and it was merged.
Change subject: Fix bug that's ben breaking chat
..
Fix bug that's ben breaking chat
Caused by two messages with identical timestamps.
Couple of other cleanups
Change-Id: I0927636920ec3e289a8cb4b8235591d650f35cb1
---
M MediaWikiChat.php
M MediaWikiChatClass.php
M Send.api.php
3 files changed, 17 insertions(+), 4 deletions(-)
Approvals:
UltrasonicNXT: Verified; Looks good to me, approved
diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index d577baf..d167b9b 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -16,7 +16,7 @@
$wgExtensionCredits['specialpage'][] = array(
'path' = __FILE__,
'name' = 'MediaWikiChat',
- 'version' = '2.12.0',
+ 'version' = '2.12.1',
'author' = 'Adam Carter/UltrasonicNXT',
'url' = 'https://www.mediawiki.org/wiki/Extension:MediaWikiChat',
'descriptionmsg' = 'chat-desc',
diff --git a/MediaWikiChatClass.php b/MediaWikiChatClass.php
index 06faa9e..7fdc1e0 100644
--- a/MediaWikiChatClass.php
+++ b/MediaWikiChatClass.php
@@ -13,10 +13,10 @@
const TYPE_KICK = 4;
/**
-* Get the current UNIX time with microseconds (i.e. 138524180871).
+* Get the current UNIX time with 100th seconds (i.e. 138524180871).
* Standard UNIX timestamp contains only 10 digits.
*
-* @return Integer: current UNIX timestamp + microseconds
+* @return Integer: current UNIX timestamp + 100th seconds
*/
static function now() {
$m = explode( ' ', microtime() );
diff --git a/Send.api.php b/Send.api.php
index 334bde5..dbc8356 100644
--- a/Send.api.php
+++ b/Send.api.php
@@ -14,6 +14,7 @@
if ( $message != '' ) {
$dbw = wfGetDB( DB_MASTER );
+ $dbr = wfGetDB( DB_SLAVE );
$id = $user-getId();
$timestamp = MediaWikiChat::now();
@@ -24,7 +25,7 @@
}
// Flood check
- $res = $dbw-selectField(
+ $res = $dbr-selectField(
'chat',
array( 'count(*)' ),
array( chat_timestamp . (
$timestamp - ( $wgChatFloodSeconds * 100 ) ), chat_user_id = . $id ),
@@ -35,6 +36,18 @@
return true;
}
+ $lastTimestamp = $dbr-selectField(
+ 'chat',
+ 'chat_timestamp',
+ array(),
+ __METHOD__,
+ array( 'ORDER BY' = 'chat_timestamp
DESC', 'LIMIT' = 1 )
+ );
+
+ if ( $timestamp == $lastTimestamp ) {
+ $timestamp += 1; // prevent two
messages with the same timestamp
+ }
+
$dbw-insert(
'chat',
array(
--
To view, visit https://gerrit.wikimedia.org/r/152019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0927636920ec3e289a8cb4b8235591d650f35cb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT adamr_car...@btinternet.com
Gerrit-Reviewer: UltrasonicNXT adamr_car...@btinternet.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Be lighter on database when testing connection pools - change (analytics/wikimetrics)
jenkins-bot has submitted this change and it was merged. Change subject: Be lighter on database when testing connection pools .. Be lighter on database when testing connection pools Change-Id: Ie86ea0d8de09b136ac957a07218c1d8930357f46 --- M tests/manual/connection_pool_configuration.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Nuria: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/manual/connection_pool_configuration.py b/tests/manual/connection_pool_configuration.py index a6fe7bc..301048c 100644 --- a/tests/manual/connection_pool_configuration.py +++ b/tests/manual/connection_pool_configuration.py @@ -20,7 +20,7 @@ db.get_mw_session(mediawiki_project) for i in range(pool_size) ] -[self.sessions[i].query(Page).all() for i in range(pool_size)] +[self.sessions[i].query(Page).first() for i in range(pool_size)] def test_pool_size_is_used(self): pool_size = db.config['MEDIAWIKI_POOL_SIZE'] @@ -28,7 +28,7 @@ db.get_mw_session(mediawiki_project) for i in range(pool_size) ] -[self.sessions[i].query(Page).all() for i in range(pool_size)] +[self.sessions[i].query(Page).first() for i in range(pool_size)] assert_true(True) def tearDown(self): -- To view, visit https://gerrit.wikimedia.org/r/149300 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie86ea0d8de09b136ac957a07218c1d8930357f46 Gerrit-PatchSet: 1 Gerrit-Project: analytics/wikimetrics Gerrit-Branch: master Gerrit-Owner: QChris christ...@quelltextlich.at Gerrit-Reviewer: Milimetric dandree...@wikimedia.org Gerrit-Reviewer: Nuria nu...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable basic reference on mobile - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Disable basic reference on mobile .. Disable basic reference on mobile Use `tool` property of tools to determine if a reference node should be filtered out. We can't use the `tool` property instead of `model` in other cases for whitelisting because of GeneratedMWCitationDialogTool which is not exposed publicly. Bug: 68897 Change-Id: I5a0d3d7623cdf58b2cc7a0dc41e22eed19a84914 --- M modules/ve/ui/ve.ui.MobileContext.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve/ui/ve.ui.MobileContext.js b/modules/ve/ui/ve.ui.MobileContext.js index 51cf072..595c5ca 100644 --- a/modules/ve/ui/ve.ui.MobileContext.js +++ b/modules/ve/ui/ve.ui.MobileContext.js @@ -87,7 +87,7 @@ return ( tool.model instanceof ve.dm.MWInternalLinkAnnotation || tool.model instanceof ve.dm.MWExternalLinkAnnotation || - tool.model instanceof ve.dm.MWReferenceNode + ( tool.model instanceof ve.dm.MWReferenceNode tool.tool !== ve.ui.MWReferenceDialogTool ) ); } ); -- To view, visit https://gerrit.wikimedia.org/r/151807 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a0d3d7623cdf58b2cc7a0dc41e22eed19a84914 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: JGonera jgon...@wikimedia.org Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix `Transaction.isNoOp` test - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix `Transaction.isNoOp` test
..
Fix `Transaction.isNoOp` test
Certain operations can emit `retainMetadata` as well as `retain`, and
still be no-ops. Add a test case to prove it.
Change-Id: Ie01d917b83e9c8b486ac0539ae1b2c6dea9e18d1
---
M modules/ve/dm/ve.dm.Transaction.js
M modules/ve/tests/dm/ve.dm.Transaction.test.js
2 files changed, 77 insertions(+), 4 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/dm/ve.dm.Transaction.js
b/modules/ve/dm/ve.dm.Transaction.js
index 162fbd3..03b38d7 100644
--- a/modules/ve/dm/ve.dm.Transaction.js
+++ b/modules/ve/dm/ve.dm.Transaction.js
@@ -394,6 +394,10 @@
data = doc.metadata,
elements = data.getData( offset ) || [];
+ if ( newElements.length === 0 ) {
+ return tx; // no-op
+ }
+
// Retain up to element
tx.pushRetain( offset );
// Retain up to metadata element (second dimension)
@@ -436,6 +440,10 @@
}
selection = elements.slice( range.start, range.end );
+
+ if ( selection.length === 0 ) {
+ return tx; // no-op.
+ }
// Retain up to element
tx.pushRetain( offset );
@@ -767,10 +775,16 @@
* @returns {boolean} Transaction is no-op
*/
ve.dm.Transaction.prototype.isNoOp = function () {
- return (
- this.operations.length === 0 ||
- ( this.operations.length === 1 this.operations[0].type ===
'retain' )
- );
+ if ( this.operations.length === 0 ) {
+ return true;
+ } else if ( this.operations.length === 1 ) {
+ return this.operations[0].type === 'retain';
+ } else if ( this.operations.length === 2 ) {
+ return this.operations[0].type === 'retain'
+ this.operations[1].type === 'retainMetadata';
+ } else {
+ return false;
+ }
};
/**
diff --git a/modules/ve/tests/dm/ve.dm.Transaction.test.js
b/modules/ve/tests/dm/ve.dm.Transaction.test.js
index 2cc3496..006b944 100644
--- a/modules/ve/tests/dm/ve.dm.Transaction.test.js
+++ b/modules/ve/tests/dm/ve.dm.Transaction.test.js
@@ -2244,3 +2244,62 @@
QUnit.expect( ve.getObjectKeys( cases ).length );
runConstructorTests( assert,
ve.dm.Transaction.newFromMetadataElementReplacement, cases );
} );
+
+QUnit.test( 'isNoOp', function ( assert ) {
+ QUnit.expect( 3 * 8 - 2 );
+ var doc = ve.dm.example.createExampleDocument(),
+ metaDoc = ve.dm.example.createExampleDocument( 'withMeta' ),
+ listMetaDoc = ve.dm.example.createExampleDocument(
'listWithMeta' ),
+ tx;
+ [ doc, metaDoc, listMetaDoc ].forEach( function ( d, i ) {
+ var isDoc = ( i === 0 ),
+ isListMetaDoc = ( i === 2 );
+
+ tx = ve.dm.Transaction.newFromReplacement(
+ d, new ve.Range( 1 ), [], false
+ );
+ assert.equal( tx.isNoOp(), true );
+
+ tx = ve.dm.Transaction.newFromInsertion(
+ d, 1, []
+ );
+ assert.equal( tx.isNoOp(), true );
+
+ tx = ve.dm.Transaction.newFromRemoval(
+ d, new ve.Range(1), false
+ );
+ assert.equal( tx.isNoOp(), true );
+
+ if ( !isListMetaDoc ) {
+ tx = ve.dm.Transaction.newFromDocumentInsertion(
+ d, 1,
+ ve.dm.example.createExampleDocument(), new
ve.Range( 0 )
+ );
+ assert.equal( tx.isNoOp(), true );
+ }
+
+ tx = ve.dm.Transaction.newFromAttributeChanges(
+ d, isListMetaDoc ? 1 : 0, {}
+ );
+ assert.equal( tx.isNoOp(), true );
+
+ tx = ve.dm.Transaction.newFromAnnotation(
+ d, new ve.Range( 1 ), 'set', new
ve.dm.ItalicAnnotation()
+ );
+ assert.equal( tx.isNoOp(), true );
+
+ tx = ve.dm.Transaction.newFromMetadataInsertion(
+ d, 1, 0, []
+ );
+ assert.equal( tx.isNoOp(), true );
+
+ if ( !isDoc ) {
+ tx = ve.dm.Transaction.newFromMetadataRemoval(
+ d, 0, new ve.Range( 1 )
+ );
+ assert.equal( tx.isNoOp(), true );
+ }
+
+ // metadata replacement never creates no-op
+ } );
+} );
--
To view, visit https://gerrit.wikimedia.org/r/151776
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id:
[MediaWiki-commits] [Gerrit] Escape invalid target strings in message - change (mediawiki...MassMessage)
jenkins-bot has submitted this change and it was merged.
Change subject: Escape invalid target strings in message
..
Escape invalid target strings in message
Prevent wikitext in invalid target strings from being parsed in the
special page error message. Also add plural handling.
Change-Id: I3a59686092b247aeddc7ee21eee4d5558911827a
---
M i18n/en.json
M i18n/qqq.json
M includes/SpecialEditMassMessageList.php
3 files changed, 6 insertions(+), 5 deletions(-)
Approvals:
Legoktm: Looks good to me, but someone else must approve
Siebrand: Looks good to me, but someone else must approve
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 480e01d..a3f80f0 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -86,7 +86,7 @@
massmessage-edit-summary: Edit summary:,
massmessage-edit-header: List one title per line, and use
title@domain (e.g. User talk:exam...@en.wikipedia.org) to specify a page on a
different wiki, if cross-wiki delivery is enabled.,
massmessage-edit-invalidtitle: There is no valid mass message
delivery list at the title.,
- massmessage-edit-invalidtargets: The following pages are
invalid:\n$1,
+ massmessage-edit-invalidtargets: The following {{PLURAL:$1|page
is|pages are}} invalid:\n$2,
massmessage-edit-nopermission: You do not have permission to edit
the list.,
massmessage-summary-addremove: Added $1 {{PLURAL:$1|page|pages}} and
removed $2 {{PLURAL:$2|page|pages}},
massmessage-summary-add: Added [[:$1]],
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 4d4218b..abcd896 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -87,7 +87,7 @@
massmessage-edit-summary: Label for an inputbox on
[[Special:EditMassMessageList]],
massmessage-edit-header: Instructions for
[[Special:EditMassMessageList]],
massmessage-edit-invalidtitle: Error message shown on
[[Special:EditMassMessageList]] when the title is invalid,
- massmessage-edit-invalidtargets: Error message shown on
[[Special:EditMassMessageList]] when one ore more targets are invalid\n* $1 is
a formatted list of invalid target strings.,
+ massmessage-edit-invalidtargets: Error message shown on
[[Special:EditMassMessageList]] when one ore more targets are invalid\n* $1 is
the number of invalid targets\n* $2 is a formatted list of invalid target
strings.,
massmessage-edit-nopermission: Error message shown on
[[Special:EditMassMessageList]] when the user cannot edit the list,
massmessage-summary-addremove: Edit summary when an API request both
adds and removes target pages\n* $1 is the number of pages added\n* $2 is the
number of pages removed,
massmessage-summary-add: Edit summary for adding a target page\n* $1
is the title of the page,
diff --git a/includes/SpecialEditMassMessageList.php
b/includes/SpecialEditMassMessageList.php
index 40f8b01..09f9a22 100644
--- a/includes/SpecialEditMassMessageList.php
+++ b/includes/SpecialEditMassMessageList.php
@@ -153,10 +153,11 @@
$parseResult = self::parseInput( $data['content'] );
if ( !$parseResult-isGood() ) {
- // wikitext list of invalid target strings
- $invalidList = '* ' . implode( \n* ,
$parseResult-value );
+ // Wikitext list of escaped invalid target strings
+ $invalidList = '* ' . implode( \n* , array_map(
'wfEscapeWikiText',
+ $parseResult-value ) );
return Status::newFatal( $this-msg(
'massmessage-edit-invalidtargets',
- $invalidList ) );
+ count( $parseResult-value ), $invalidList ) );
}
$editResult = MassMessageListContentHandler::edit(
--
To view, visit https://gerrit.wikimedia.org/r/151665
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a59686092b247aeddc7ee21eee4d5558911827a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: contenthandler
Gerrit-Owner: Wctaiwan wctai...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Wctaiwan wctai...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't allow interwikis or special pages as targets - change (mediawiki...MassMessage)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't allow interwikis or special pages as targets
..
Don't allow interwikis or special pages as targets
Change-Id: I8ad8ddf15b07d2998055b42f70032809a713ce94
---
M includes/content/MassMessageListContentHandler.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/content/MassMessageListContentHandler.php
b/includes/content/MassMessageListContentHandler.php
index 2e41f55..4ecdda1 100644
--- a/includes/content/MassMessageListContentHandler.php
+++ b/includes/content/MassMessageListContentHandler.php
@@ -131,7 +131,7 @@
$result = array();
$title = Title::newFromText( $titleText );
- if ( !$title ) {
+ if ( !$title || $title-isSpecialPage() || $title-isExternal()
) {
$result['errors'] = array( 'invalidtitle' );
} else {
$result['title'] = $title-getPrefixedText(); // Use
the canonical form.
--
To view, visit https://gerrit.wikimedia.org/r/151666
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ad8ddf15b07d2998055b42f70032809a713ce94
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: contenthandler
Gerrit-Owner: Wctaiwan wctai...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Labs: switch dumps to the new server - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152022
Change subject: Revert Labs: switch dumps to the new server
..
Revert Labs: switch dumps to the new server
This reverts commit 502528c8099382ec5e64531d2203533c77470816.
Reverting cause labstore1003 is not yet ready to accept mount requests
and labs machines would end having a mount process stuck at trying to
mount /dumps. Puppet tries to ensure that mountpoint mounted and hence
gets stuck as well
Conflicts:
modules/dataset/manifests/cron/rsync/labs.pp
Change-Id: I5c64b7988e153a75bf00fc0ecd5e15ca6862fb59
---
M manifests/role/labs.pp
M modules/dataset/manifests/cron/rsync/labs.pp
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/22/152022/1
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 8a7eaa2..68d2746 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -89,7 +89,7 @@
atboot = true,
fstype = 'nfs',
options = ro,${nfs_opts},
-device = 'labstore1003.eqiad.wmnet:/dumps',
+device = ${nfs_server}:/dumps,
require = File['/public/dumps'],
}
diff --git a/modules/dataset/manifests/cron/rsync/labs.pp
b/modules/dataset/manifests/cron/rsync/labs.pp
index df71168..06ff3a6 100644
--- a/modules/dataset/manifests/cron/rsync/labs.pp
+++ b/modules/dataset/manifests/cron/rsync/labs.pp
@@ -25,6 +25,7 @@
ensure = mounted,
atboot = true,
fstype = 'nfs',
+device = 'labstore.svc.eqiad.wmnet:/dumps',
device = 'labstore1003.eqiad.wmnet:/dumps',
options =
'rw,vers=4,bg,hard,intr,sec=sys,proto=tcp,port=0,noatime,nofsc',
require = File['/mnt/dumps'],
--
To view, visit https://gerrit.wikimedia.org/r/152022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c64b7988e153a75bf00fc0ecd5e15ca6862fb59
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Labs: switch dumps to the new server - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Revert Labs: switch dumps to the new server
..
Revert Labs: switch dumps to the new server
This reverts commit 502528c8099382ec5e64531d2203533c77470816.
Reverting cause labstore1003 is not yet ready to accept mount requests
and labs machines would end having a mount process stuck at trying to
mount /dumps. Puppet tries to ensure that mountpoint mounted and hence
gets stuck as well
Conflicts:
modules/dataset/manifests/cron/rsync/labs.pp
Change-Id: I5c64b7988e153a75bf00fc0ecd5e15ca6862fb59
---
M manifests/role/labs.pp
M modules/dataset/manifests/cron/rsync/labs.pp
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, but someone else must approve
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 8a7eaa2..68d2746 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -89,7 +89,7 @@
atboot = true,
fstype = 'nfs',
options = ro,${nfs_opts},
-device = 'labstore1003.eqiad.wmnet:/dumps',
+device = ${nfs_server}:/dumps,
require = File['/public/dumps'],
}
diff --git a/modules/dataset/manifests/cron/rsync/labs.pp
b/modules/dataset/manifests/cron/rsync/labs.pp
index df71168..06ff3a6 100644
--- a/modules/dataset/manifests/cron/rsync/labs.pp
+++ b/modules/dataset/manifests/cron/rsync/labs.pp
@@ -25,6 +25,7 @@
ensure = mounted,
atboot = true,
fstype = 'nfs',
+device = 'labstore.svc.eqiad.wmnet:/dumps',
device = 'labstore1003.eqiad.wmnet:/dumps',
options =
'rw,vers=4,bg,hard,intr,sec=sys,proto=tcp,port=0,noatime,nofsc',
require = File['/mnt/dumps'],
--
To view, visit https://gerrit.wikimedia.org/r/152022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c64b7988e153a75bf00fc0ecd5e15ca6862fb59
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix FAQ for mobile - change (wikimedia/TransparencyReport)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152023
Change subject: Fix FAQ for mobile
..
Fix FAQ for mobile
Change-Id: I4bf41077fa132da1fe63f091393758053c8c1479
---
M source/stylesheets/master.css.scss
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport
refs/changes/23/152023/1
diff --git a/source/stylesheets/master.css.scss
b/source/stylesheets/master.css.scss
index a03c50f..650e56e 100644
--- a/source/stylesheets/master.css.scss
+++ b/source/stylesheets/master.css.scss
@@ -602,4 +602,14 @@
width: 100% !important;
}
+ .faq {
+ .question {
+ width: 90%;
+ font-size: 18px;
+ }
+
+ .answer {
+ width: 90%;
+ }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/152023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4bf41077fa132da1fe63f091393758053c8c1479
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make sure that $n is ever set - change (mediawiki...ProofreadPage)
Tpt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152024
Change subject: Make sure that $n is ever set
..
Make sure that $n is ever set
Change-Id: Ia24510ea0326e6f074232fee758eaac577628d62
---
M ProofreadPage.body.php
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/24/152024/1
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 79f4bbe..7cca8d3 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -507,6 +507,8 @@
$indextitle = ProofreadPageDbConnector::getIndexTitleForPageId(
$id );
if( isset( $out-is_toc ) $out-is_toc ) {
+ $n = 0;
+
if ( $indextitle ) {
$row =
ProofreadIndexDbConnector::getIndexDataFromIndexTitle( $indextitle );
if( $row ) {
--
To view, visit https://gerrit.wikimedia.org/r/152024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia24510ea0326e6f074232fee758eaac577628d62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt thoma...@hotmail.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make sure that $n is ever set - change (mediawiki...ProofreadPage)
jenkins-bot has submitted this change and it was merged.
Change subject: Make sure that $n is ever set
..
Make sure that $n is ever set
Change-Id: Ia24510ea0326e6f074232fee758eaac577628d62
---
M ProofreadPage.body.php
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Tpt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 79f4bbe..7cca8d3 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -507,6 +507,8 @@
$indextitle = ProofreadPageDbConnector::getIndexTitleForPageId(
$id );
if( isset( $out-is_toc ) $out-is_toc ) {
+ $n = 0;
+
if ( $indextitle ) {
$row =
ProofreadIndexDbConnector::getIndexDataFromIndexTitle( $indextitle );
if( $row ) {
--
To view, visit https://gerrit.wikimedia.org/r/152024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia24510ea0326e6f074232fee758eaac577628d62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt thoma...@hotmail.fr
Gerrit-Reviewer: Tpt thoma...@hotmail.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Topic namespace translation for Swedish - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Topic namespace translation for Swedish .. Topic namespace translation for Swedish Based on the terminology used in https://translatewiki.net/w/i.php?title=Special:Translategroup=ext-flowlanguage=svfilter=action=translate Change-Id: I2406f070a8cfb6c7757ea99b11d7ddbd3da1408d --- M Flow.namespaces.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/Flow.namespaces.php b/Flow.namespaces.php index 9682e59..6c11937 100644 --- a/Flow.namespaces.php +++ b/Flow.namespaces.php @@ -97,6 +97,11 @@ NS_TOPIC = 'Tema', ); +/** Swedish */ +$namespaceNames['sv'] = array( + NS_TOPIC = 'Ämne', +); + /** Ukrainian */ $namespaceNames['uk'] = array( NS_TOPIC = 'Тема', -- To view, visit https://gerrit.wikimedia.org/r/152005 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2406f070a8cfb6c7757ea99b11d7ddbd3da1408d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Lokal Profil lokal.pro...@gmail.com Gerrit-Reviewer: SG shah...@gmail.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make br warning not trigger - change (mediawiki...Popups)
jenkins-bot has submitted this change and it was merged. Change subject: Make br warning not trigger .. Make br warning not trigger Change br to br / to not trigger warning in translatewiki.net Changes: * popups-settings-option-read-quickly-description Change-Id: If988bf5060cfa6a6ccdd99ee02d6924e4b53ef2c --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 54629d8..94e7623 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -9,7 +9,7 @@ popups-settings-title: Article Preview, popups-settings-description: This tool lets you preview blue links and references, popups-settings-option-read-quickly: Read Quickly, -popups-settings-option-read-quickly-description: See the lead sentence of an article and see a preview image.brThis is recommended for readers., +popups-settings-option-read-quickly-description: See the lead sentence of an article and see a preview image.br /This is recommended for readers., popups-settings-option-monitor-or-edit: Monitor or Edit, popups-settings-option-monitor-or-edit-description: Use advanced actions to monitor and edit the content of blue links, popups-settings-option-off: Turn Previews off, -- To view, visit https://gerrit.wikimedia.org/r/151626 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If988bf5060cfa6a6ccdd99ee02d6924e4b53ef2c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: master Gerrit-Owner: Lokal Profil lokal.pro...@gmail.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Log package versions - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Log package versions
..
Log package versions
The version of major dependencies 'httplib2' and 'mwparserfromhell'
shoud be written to the log, and included in the script version.py.
In verbose mode it is helpful to see what other major packages are
being automatically loaded into the python environment, and their
versions.
Move the online startup checks after the local checks.
Change-Id: Iae9f73b23ab1eb1a4acce46a690c0b4f9f9396a8
---
M pywikibot/bot.py
M pywikibot/version.py
M scripts/version.py
3 files changed, 132 insertions(+), 7 deletions(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 78e291a..6ab690f 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -19,7 +19,6 @@
# all output goes thru python std library logging module
import os
-import os.path
import sys
import re
import json
@@ -268,22 +267,48 @@
except version.ParseError:
exception()
-if config.log_pywiki_repo_version:
-log(u'PYWIKI REPO VERSION: %s' %
unicode(version.getversion_onlinerepo()))
-
-log(u'SITE VERSION: %s' % unicode(site.live_version()))
-
# system
if hasattr(os, 'uname'):
log(u'SYSTEM: %s' % unicode(os.uname()))
+all_modules = sys.modules.keys()
+
+# These are the main dependencies of pywikibot.
+check_package_list = ['httplib2', 'mwparserfromhell']
+
+# report all imported packages
+if config.verbose_output:
+check_package_list += all_modules
+
+packages = version.package_versions(check_package_list)
+
+log(u'PACKAGES:')
+for name in sorted(packages.keys()):
+info = packages[name]
+if 'path' not in info:
+if 'type' in info:
+info['path'] = '[' + info['type'] + ']'
+else:
+info['path'] = '[path unknown]'
+if 'ver' not in info:
+info['ver'] = '??'
+if 'err' in info:
+log(u' %(name)s: %(err)s' % info)
+else:
+log(u' %(name)s (%(path)s) = %(ver)s' % info)
+
# imported modules
log(u'MODULES:')
-for item in list(sys.modules.keys()):
+for item in list(all_modules):
ver = version.getfileversion('%s.py' % item.replace('.', '/'))
if ver:
log(u' %s' % ver)
+if config.log_pywiki_repo_version:
+log(u'PYWIKI REPO VERSION: %s' %
unicode(version.getversion_onlinerepo()))
+
+log(u'SITE VERSION: %s' % unicode(site.live_version()))
+
# messages on bot discussion page?
if site.logged_in():
if site.messages():
diff --git a/pywikibot/version.py b/pywikibot/version.py
index 26bc0dc..e607c62 100644
--- a/pywikibot/version.py
+++ b/pywikibot/version.py
@@ -216,3 +216,101 @@
return u'%s %s %s' % (filename, __version__[5:-1][:7], mtime)
else:
return None
+
+
+def package_versions(modules=None, builtins=False, standard_lib=None):
+ Retrieve package version information.
+
+When builtins or standard_lib are None, they will be included only
+if a version was found in the package.
+
+@param modules: Modules to inspect
+@type modules: list of strings
+@param builtins: Include builtins
+@type builtins: Boolean, or None for automatic selection
+@param standard_lib: Include standard library packages
+@type standard_lib: Boolean, or None for automatic selection
+
+import sys
+
+if not modules:
+modules = sys.modules.keys()
+
+import distutils.sysconfig
+std_lib_dir = distutils.sysconfig.get_python_lib(standard_lib=True)
+
+root_packages = set([key.split('.')[0]
+ for key in modules])
+
+builtin_packages = set([name.split('.')[0] for name in root_packages
+if name in sys.builtin_module_names or
+'_' + name in sys.builtin_module_names])
+
+# Improve performance by removing builtins from the list if possible.
+if builtins is False:
+root_packages = list(root_packages - builtin_packages)
+
+std_lib_packages = []
+
+paths = {}
+data = {}
+
+for name in root_packages:
+try:
+package = __import__(name, level=0)
+except Exception as e:
+data[name] = {'name': name, 'err': e}
+continue
+
+info = {'package': package, 'name': name}
+
+if name in builtin_packages:
+info['type'] = 'builtins'
+
+if '__file__' in package.__dict__:
+# Determine if this file part is of the standard library.
+if os.path.normcase(package.__file__).startswith(
+os.path.normcase(std_lib_dir)):
+std_lib_packages.append(name)
+
[MediaWiki-commits] [Gerrit] FAQ: Use CSS transitions intead of jQuery.animate - change (wikimedia/TransparencyReport)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152025
Change subject: FAQ: Use CSS transitions intead of jQuery.animate
..
FAQ: Use CSS transitions intead of jQuery.animate
Change-Id: I37279b0fa12b3e5b45c9a4b2640d292aea06a36b
---
M source/javascripts/faq.js
M source/stylesheets/master.css.scss
2 files changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport
refs/changes/25/152025/1
diff --git a/source/javascripts/faq.js b/source/javascripts/faq.js
index 867cc2a..47bdd68 100644
--- a/source/javascripts/faq.js
+++ b/source/javascripts/faq.js
@@ -1,12 +1,11 @@
$( function () {
- $( '.answer').hide();
$( '.question' ).click( function () {
$( this ).toggleClass( 'open' );
- $( this ).next().slideToggle();
+ $( this ).next().toggleClass( 'open' );
} );
if ( window.location.hash !== '' ) {
var hash = window.location.hash.split( '#' )[1];
+ $( 'a[name=' + hash + ']' ).next().next().toggleClass( 'open' );
$( 'a[name=' + hash + ']' ).next().toggleClass( 'open' );
- $( 'a[name=' + hash + ']' ).next().next().slideToggle();
}
} );
diff --git a/source/stylesheets/master.css.scss
b/source/stylesheets/master.css.scss
index 650e56e..c147e62 100644
--- a/source/stylesheets/master.css.scss
+++ b/source/stylesheets/master.css.scss
@@ -455,8 +455,16 @@
}
.answer {
+ transition: all 0.25s;
+ max-height: 0;
+ overflow: hidden;
width: 610px;
margin-left: 30px;
+ display: block;
+
+ .open {
+ max-height: 1200px;
+ }
}
hr {
--
To view, visit https://gerrit.wikimedia.org/r/152025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37279b0fa12b3e5b45c9a4b2640d292aea06a36b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BS223: Compatibility with vector - change (mediawiki...BlueSpiceExtensions)
Tweichart has submitted this change and it was merged.
Change subject: BS223: Compatibility with vector
..
BS223: Compatibility with vector
* wikiadmin + usersidebar added to leftnavigation
* authors + shoutbox + readers added to dataaftercontent
* mvoed some styling from skin to shoutbox
* statebar icon for shoutbox now refreshes when new shout is made
Change-Id: Ib3b1830986c2b43b757c477d9dd8fc2b344825a0
---
M Authors/Authors.class.php
M Readers/Readers.class.php
M ShoutBox/ShoutBox.class.php
M ShoutBox/resources/bluespice.shoutBox.css
M ShoutBox/resources/bluespice.shoutBox.js
M UserSidebar/UserSidebar.class.php
M WikiAdmin/WikiAdmin.class.php
7 files changed, 148 insertions(+), 50 deletions(-)
Approvals:
Smuggli: Checked; Looks good to me, but someone else must approve
Tweichart: Verified; Looks good to me, approved
diff --git a/Authors/Authors.class.php b/Authors/Authors.class.php
index 26af819..2674318 100644
--- a/Authors/Authors.class.php
+++ b/Authors/Authors.class.php
@@ -88,6 +88,7 @@
wfProfileIn( 'BS::'.__METHOD__ );
// Hooks
$this-setHook( 'SkinTemplateOutputPageBeforeExec' );
+ $this-setHook( 'SkinAfterContent' );
$this-setHook( 'BeforePageDisplay' );
$this-setHook( 'BSInsertMagicAjaxGetData' );
$this-setHook( 'BS:UserPageSettings', 'onUserPageSettings' );
@@ -158,46 +159,71 @@
* @param BaseTemplate $tpl currently logged in user. Not used in this
context.
* @return bool always true
*/
- public function onSkinTemplateOutputPageBeforeExec( $sktemplate, $tpl
) {
+ public function onSkinTemplateOutputPageBeforeExec( $skin, $tpl ) {
+ global $wgDefaultSkin;
+ if ( $wgDefaultSkin != bluespiceskin ){
+ return true;
+ }
+ $oAuthorsView = $this-getAuthorsViewForAfterContent( $skin );
+ $tpl-data['bs_dataAfterContent']['bs-authors'] = array(
+ 'position' = 10,
+ 'label' = wfMessage( 'bs-authors-title' )-text(),
+ 'content' = $oAuthorsView
+ );
+ return true;
+ }
+
+ /**
+* Hook-Handler for 'SkinAfterContent'. Adds Authors view to the end of
the content.
+* @global String $wgDefaultSkin
+* @param String $data
+* @param Skin $sktemplate
+* @return boolean
+*/
+ public function onSkinAfterContent( $data, $sktemplate ) {
+ global $wgDefaultSkin;
+ if ( $wgDefaultSkin == bluespiceskin )
+ return true;
+ $oAuthorsView = $this-getAuthorsViewForAfterContent(
$sktemplate );
+ $data .= $oAuthorsView-execute();
+ return true;
+ }
+
+ private function getAuthorsViewForAfterContent( $oSkin ) {
if ( $this-checkContext() === false ) {
return true;
}
-
- $oTitle = $sktemplate-getTitle();
+ $oTitle = $oSkin-getTitle();
//Read in config variables
- $iLimit = BsConfig::get( 'MW::Authors::Limit' );
+ $iLimit = BsConfig::get( 'MW::Authors::Limit' );
$aBlacklist = BsConfig::get( 'MW::Authors::Blacklist' );
$sMoreImage = BsConfig::get( 'MW::Authors::MoreImage' );
$aParams = array();
- $aParams['width'] = BsConfig::get( 'MW::Authors::ImageWidth' );
+ $aParams['width'] = BsConfig::get( 'MW::Authors::ImageWidth' );
$aParams['height'] = BsConfig::get( 'MW::Authors::ImageHeight'
);
- $sPrintable = $this-getRequest()-getVal( 'printable', 'no' );
+ $sPrintable = $oSkin-getRequest()-getVal( 'printable', 'no' );
$iArticleId = $oTitle-getArticleID();
$sKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'Authors',
$iArticleId );
$aData = BsCacheHelper::get( $sKey );
- if( $aData !== false ) {
- wfDebugLog( 'BsMemcached', __CLASS__.': Fetched
AuthorsView from cache' );
+ if ( $aData !== false ) {
+ wfDebugLog( 'BsMemcached', __CLASS__ . ': Fetched
AuthorsView from cache' );
$oAuthorsView = $aData;
} else {
- wfDebugLog( 'BsMemcached', __CLASS__.': Fetching
AuthorsView from DB' );
+ wfDebugLog( 'BsMemcached', __CLASS__ . ': Fetching
AuthorsView from DB' );
//HINT: Maybe we want to use MW interface
Article::getContributors() to have better caching
//HINT2: Check if available in MW 1.17+
// SW: There is still no caching in
[MediaWiki-commits] [Gerrit] Fixed issue with untransformed message - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152026
Change subject: Fixed issue with untransformed message
..
Fixed issue with untransformed message
Change-Id: Ib0dad3a4740d4ebaa63185ce1ea7c3671c9f4845
---
M ArticleInfo/ArticleInfo.class.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/26/152026/1
diff --git a/ArticleInfo/ArticleInfo.class.php
b/ArticleInfo/ArticleInfo.class.php
index b4a7752..b5d3ae1 100644
--- a/ArticleInfo/ArticleInfo.class.php
+++ b/ArticleInfo/ArticleInfo.class.php
@@ -335,7 +335,7 @@
$oLastEditorView-setKey( 'LastEditor' );
$oLastEditorView-setIconSrc( $this-getImagePath( true
).BsConfig::get('MW::ArticleInfo::ImageLastEditor') );
- $oLastEditorView-setIconAlt(
wfMessage('bs-articleinfo-last-editor')-plain(), $this-getUser()-getName() );
+ $oLastEditorView-setIconAlt(
wfMessage('bs-articleinfo-last-editor')-text(), $this-getUser()-getName() );
$oLastEditorView-setText( $sLastEditorName );
$oLastEditorView-setTextLinkTitle( $sLastEditorName );
$oLastEditorView-setTextLink( $sLastEditorUserPageUrl );
--
To view, visit https://gerrit.wikimedia.org/r/152026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0dad3a4740d4ebaa63185ce1ea7c3671c9f4845
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed caching issue - change (mediawiki...BlueSpiceExtensions)
Swidmann has submitted this change and it was merged. Change subject: Fixed caching issue .. Fixed caching issue The page templates were cached per namepsace so if you try to create more pages in a row you always would try to create the first page again and again because the template links point to the first page which was cached Change-Id: I9f76360d15cb7214295e6aa6f1e894d478c95832 --- M PageTemplates/PageTemplates.class.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Swidmann: Verified; Looks good to me, approved diff --git a/PageTemplates/PageTemplates.class.php b/PageTemplates/PageTemplates.class.php index c5780a4..dc642cf 100644 --- a/PageTemplates/PageTemplates.class.php +++ b/PageTemplates/PageTemplates.class.php @@ -197,7 +197,7 @@ // if we are not on a wiki page, return. This is important when calling import scripts that try to create nonexistent pages, e.g. importImages if ( !is_object( $oTitle ) ) return true; - $sKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'PageTemplates', $oTitle-getNamespace() ); + $sKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'PageTemplates', $oTitle-getPrefixedText() ); $aData = BsCacheHelper::get( $sKey ); $aRes = array(); -- To view, visit https://gerrit.wikimedia.org/r/151830 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9f76360d15cb7214295e6aa6f1e894d478c95832 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Smuggli mug...@hallowelt.biz Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: Swidmann widm...@hallowelt.biz Gerrit-Reviewer: Tweichart weich...@hallowelt.biz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed call to method on non object - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152027
Change subject: Fixed call to method on non object
..
Fixed call to method on non object
In some cases like special pages no view is returned and so fatal error
occurred
Change-Id: I80aaa31efda7c4ad40f9f052fcb5260b85a9be47
---
M Authors/Authors.class.php
1 file changed, 9 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/27/152027/1
diff --git a/Authors/Authors.class.php b/Authors/Authors.class.php
index 2674318..ae5a2b0 100644
--- a/Authors/Authors.class.php
+++ b/Authors/Authors.class.php
@@ -185,10 +185,18 @@
if ( $wgDefaultSkin == bluespiceskin )
return true;
$oAuthorsView = $this-getAuthorsViewForAfterContent(
$sktemplate );
- $data .= $oAuthorsView-execute();
+ if ( $oAuthorsView instanceof ViewAuthors ) {
+ $data .= $oAuthorsView-execute();
+ }
return true;
}
+ /**
+* Returns authors view
+*
+* @param object $oSkin skin object
+* @return bool|object boolean or object of instance ViewAuthors
+*/
private function getAuthorsViewForAfterContent( $oSkin ) {
if ( $this-checkContext() === false ) {
return true;
--
To view, visit https://gerrit.wikimedia.org/r/152027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80aaa31efda7c4ad40f9f052fcb5260b85a9be47
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid dependance on a WikiEditor class that have been recent... - change (mediawiki...ProofreadPage)
Tpt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152029
Change subject: Avoid dependance on a WikiEditor class that have been recently
removed
..
Avoid dependance on a WikiEditor class that have been recently removed
Change-Id: Id6e16577646358714d9e9d42a89edef825244370
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/29/152029/1
diff --git a/modules/page/ext.proofreadpage.page.edit.js
b/modules/page/ext.proofreadpage.page.edit.js
index 28c428e..b0b3f25 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -217,7 +217,7 @@
}
mw.loader.using( 'ext.wikiEditor', function() {
$editForm.find( '.prp-page-edit-body' ).append( $(
'#wpTextbox1' ) );
- $editForm.find( '.wikiEditor-oldToolbar' ).after(
$editForm.find( '.wikiEditor-ui' ) );
+ $editForm.find( '.editOptions' ).before(
$editForm.find( '.wikiEditor-ui' ) );
$editForm.find( '.wikiEditor-ui-text' ).append(
$editForm.find( '.prp-page-container' ) );
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/152029
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6e16577646358714d9e9d42a89edef825244370
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt thoma...@hotmail.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix minor documentation issues - change (mediawiki...BounceHandler)
jenkins-bot has submitted this change and it was merged. Change subject: Fix minor documentation issues .. Fix minor documentation issues Change-Id: I7d56450e22a5354f642749ab690b1633fe245b1e --- M BounceHandlerHooks.php 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: 01tonythomas: Looks good to me, approved Addshore: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/BounceHandlerHooks.php b/BounceHandlerHooks.php index 129b822..b43c7d9 100644 --- a/BounceHandlerHooks.php +++ b/BounceHandlerHooks.php @@ -25,7 +25,8 @@ } /** -* Generate VERP address +* Generate VERP address of the form +* * @param string recipient email * @return string ReturnPath address */ @@ -39,8 +40,9 @@ $url = wfParseUrl( $wgServer ); $email_domain = $url['host']; } - // Creating the email prefix as wikiId-base36( $UserID )-base36( $Timestamp )@domain-hash( $algorithm, - // $key, $prefix )@$domain + // Creating the VERP address prefix as wikiId-base36( $UserID )-base36( $Timestamp ) + // and the generated VERP return path is of the form : + // wikiId-base36( $UserID )-base36( $Timestamp )-hash( $algorithm, $key, $prefix )@$email_domain // We dont want repeating '-' in our WikiId $wikiId = str_replace( '-', '.', wfWikiID() ); $email_prefix = $wikiId. '-'. base_convert( $uid, 10, 36). '-'. base_convert( $timeNow, 10, 36); -- To view, visit https://gerrit.wikimedia.org/r/152012 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7d56450e22a5354f642749ab690b1633fe245b1e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BounceHandler Gerrit-Branch: master Gerrit-Owner: 01tonythomas 01tonytho...@gmail.com Gerrit-Reviewer: 01tonythomas 01tonytho...@gmail.com Gerrit-Reviewer: Addshore addshorew...@gmail.com Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: Jgreen jgr...@wikimedia.org Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed superfluous char - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152030
Change subject: Removed superfluous char
..
Removed superfluous char
: is already included in message
Change-Id: Ie0093d6dff91bba838dc197847badf8d05c7a3c7
---
M ExtendedSearch/includes/SearchIndex/SearchIndex.class.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/30/152030/1
diff --git a/ExtendedSearch/includes/SearchIndex/SearchIndex.class.php
b/ExtendedSearch/includes/SearchIndex/SearchIndex.class.php
index eddb14a..7fab828 100644
--- a/ExtendedSearch/includes/SearchIndex/SearchIndex.class.php
+++ b/ExtendedSearch/includes/SearchIndex/SearchIndex.class.php
@@ -216,7 +216,7 @@
*/
public function createErrorMessageView( $sMessage ) {
$res = new ViewBaseElement();
- $res-setTemplate( 'div id=bs-es-searchterm-error' .
wfMessage( 'bs-extendedsearch-error' )-plain() . ': {message}/div' );
+ $res-setTemplate( 'div id=bs-es-searchterm-error' .
wfMessage( 'bs-extendedsearch-error' )-plain() . ' {message}/div' );
$res-addData( array( 'message' = wfMessage( $sMessage
)-plain() ) );
return $res;
}
--
To view, visit https://gerrit.wikimedia.org/r/152030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0093d6dff91bba838dc197847badf8d05c7a3c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Try to fix a minor bug - change (operations/mediawiki-config)
Calak has uploaded a new change for review. https://gerrit.wikimedia.org/r/152031 Change subject: Try to fix a minor bug .. Try to fix a minor bug Bug: 69073 Change-Id: I8f6c523deed002e9657a0bef3f42870461691363 --- M wmf-config/abusefilter.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/31/152031/1 diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php index 99c74e6..da92388 100644 --- a/wmf-config/abusefilter.php +++ b/wmf-config/abusefilter.php @@ -166,7 +166,7 @@ $wgGroupPermissions['sysop']['abusefilter-view-private'] = true; $wgGroupPermissions['sysop']['abusefilter-revert'] = true; $wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = true; - $wgAbuseFilterAvailableActions[] = array( 'flag', 'throttle', 'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'tag', 'rangeblock' ); + $wgAbuseFilterAvailableActions = array( 'flag', 'throttle', 'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'tag', 'rangeblock' ); $wgAbuseFilterAnonBlockDuration = '3 months'; $wgAbuseFilterBlockDuration = 'indefinite'; $wgAbuseFilterNotifications = false; -- To view, visit https://gerrit.wikimedia.org/r/152031 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f6c523deed002e9657a0bef3f42870461691363 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Calak calakw...@yahoo.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update hhvm dynamic extension path - change (translatewiki)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/152032 Change subject: Update hhvm dynamic extension path .. Update hhvm dynamic extension path Change-Id: I2cd984b4355bb8b7a5bf8a5d856b8fe30b6e350a --- M puppet/modules/hhvm/files/php.ini 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/32/152032/1 diff --git a/puppet/modules/hhvm/files/php.ini b/puppet/modules/hhvm/files/php.ini index be4f8f5..2b57a9a 100644 --- a/puppet/modules/hhvm/files/php.ini +++ b/puppet/modules/hhvm/files/php.ini @@ -11,7 +11,7 @@ hhvm.server.type = fastcgi hhvm.server.gzip_compression_level = 0 -hhvm.dynamic_extension_path = /usr/lib/hphp/extensions/20140702 +hhvm.dynamic_extension_path = /usr/lib/hphp/extensions/20140727 hhvm.jit = true hhvm.jit_afrozen_size = 1 -- To view, visit https://gerrit.wikimedia.org/r/152032 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2cd984b4355bb8b7a5bf8a5d856b8fe30b6e350a Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Followup fix to fawiki AbuseFilter config - change (operations/mediawiki-config)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/152033 Change subject: Followup fix to fawiki AbuseFilter config .. Followup fix to fawiki AbuseFilter config Array needs to be set, not have another array appended as an item. Bug: 69073 Change-Id: I6385f4897bd1aca33f963cc6e4ef1c82c54c7259 --- M docroot/bits/WikipediaMobileFirefoxOS M wmf-config/abusefilter.php 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/33/152033/1 diff --git a/docroot/bits/WikipediaMobileFirefoxOS b/docroot/bits/WikipediaMobileFirefoxOS index 197eb24..cf4550e 16 --- a/docroot/bits/WikipediaMobileFirefoxOS +++ b/docroot/bits/WikipediaMobileFirefoxOS -Subproject commit 197eb243543e88827401ee47f69cf98bdbfd0cf9 +Subproject commit cf4550ee40eead816c4bb0d7aae2403d016b97a4 diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php index 99c74e6..fb0f050 100644 --- a/wmf-config/abusefilter.php +++ b/wmf-config/abusefilter.php @@ -166,7 +166,7 @@ $wgGroupPermissions['sysop']['abusefilter-view-private'] = true; $wgGroupPermissions['sysop']['abusefilter-revert'] = true; $wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = true; - $wgAbuseFilterAvailableActions[] = array( 'flag', 'throttle', 'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'tag', 'rangeblock' ); + $wgAbuseFilterAvailableActions = array( 'flag', 'throttle', 'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'tag', 'rangeblock' ); $wgAbuseFilterAnonBlockDuration = '3 months'; $wgAbuseFilterBlockDuration = 'indefinite'; $wgAbuseFilterNotifications = false; -- To view, visit https://gerrit.wikimedia.org/r/152033 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6385f4897bd1aca33f963cc6e4ef1c82c54c7259 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed fatal error - change (mediawiki...BlueSpiceExtensions)
Tweichart has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152034
Change subject: Fixed fatal error
..
Fixed fatal error
* if viewed in non view mode a fatal error occured in vector skin
Change-Id: Ia72332edba70c974859d0b971aab8e843d2c0c86
---
M Authors/Authors.class.php
M Readers/Readers.class.php
M ShoutBox/ShoutBox.class.php
3 files changed, 10 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/34/152034/1
diff --git a/Authors/Authors.class.php b/Authors/Authors.class.php
index 2674318..b07db22 100644
--- a/Authors/Authors.class.php
+++ b/Authors/Authors.class.php
@@ -185,7 +185,9 @@
if ( $wgDefaultSkin == bluespiceskin )
return true;
$oAuthorsView = $this-getAuthorsViewForAfterContent(
$sktemplate );
- $data .= $oAuthorsView-execute();
+ if ( $oAuthorsView instanceof ViewAuthors ) {
+ $data .= $oAuthorsView-execute();
+ }
return true;
}
diff --git a/Readers/Readers.class.php b/Readers/Readers.class.php
index 4ac710d..5762ef6 100644
--- a/Readers/Readers.class.php
+++ b/Readers/Readers.class.php
@@ -233,7 +233,9 @@
$oViewReaders = $this-getReadersViewForAfterContent(
$sktemplate-getTitle() );
- $data .= $oViewReaders-execute();
+ if ( $oViewReaders instanceof ViewReaders ) {
+ $data .= $oViewReaders-execute();
+ }
return true;
}
diff --git a/ShoutBox/ShoutBox.class.php b/ShoutBox/ShoutBox.class.php
index 95e3d55..e424930 100644
--- a/ShoutBox/ShoutBox.class.php
+++ b/ShoutBox/ShoutBox.class.php
@@ -255,7 +255,10 @@
if ( !BsExtensionManager::isContextActive( 'MW::ShoutboxShow' )
|| $wgDefaultSkin == bluespiceskin ) {
return true;
}
- $data .= $this-getShoutboxViewForAfterContent( $sktemplate );
+ $oShoutboxView = $this-getShoutboxViewForAfterContent(
$sktemplate );
+ if ( $oShoutboxView instanceof ViewShoutBox ) {
+ $data .= $oShoutboxView-execute();
+ }
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/152034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia72332edba70c974859d0b971aab8e843d2c0c86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix up fawiki abusefilter settings - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Fix up fawiki abusefilter settings .. Fix up fawiki abusefilter settings Bug: 69073 Change-Id: I8f6c523deed002e9657a0bef3f42870461691363 --- M wmf-config/abusefilter.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Chad: Looks good to me, approved Brion VIBBER: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php index 99c74e6..da92388 100644 --- a/wmf-config/abusefilter.php +++ b/wmf-config/abusefilter.php @@ -166,7 +166,7 @@ $wgGroupPermissions['sysop']['abusefilter-view-private'] = true; $wgGroupPermissions['sysop']['abusefilter-revert'] = true; $wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = true; - $wgAbuseFilterAvailableActions[] = array( 'flag', 'throttle', 'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'tag', 'rangeblock' ); + $wgAbuseFilterAvailableActions = array( 'flag', 'throttle', 'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'tag', 'rangeblock' ); $wgAbuseFilterAnonBlockDuration = '3 months'; $wgAbuseFilterBlockDuration = 'indefinite'; $wgAbuseFilterNotifications = false; -- To view, visit https://gerrit.wikimedia.org/r/152031 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8f6c523deed002e9657a0bef3f42870461691363 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Calak calakw...@yahoo.com Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update rally for Wikimania - change (translatewiki)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152035
Change subject: Update rally for Wikimania
..
Update rally for Wikimania
Change-Id: Iafda02c22281659316cdc6a08b84d2e919f22ca4
---
M SpecialRally.php
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/35/152035/1
diff --git a/SpecialRally.php b/SpecialRally.php
index 96e0fa3..182169d 100644
--- a/SpecialRally.php
+++ b/SpecialRally.php
@@ -45,6 +45,8 @@
'tsint-0-all' // 1240
);
+ $allowedGroups = MessageGroups::expandWildcards( '*' );
+
$allGroups = MessageGroups::singleton()-getGroups();
foreach ( $allGroups as $groupId = $messageGroup ) {
if ( in_array( $groupId, $allowedGroups ) ) {
@@ -80,8 +82,8 @@
'page_latest'
);
$conds = array(
- rc_timestamp = 2012122122,
- rc_timestamp = 20121231235959,
+ rc_timestamp = 2014080610,
+ rc_timestamp = 20140810235959,
'rc_new' = 1,
'rc_bot' = 0,
'rc_namespace IN (8, 1206, 1212, 1220,
1224, 1238, 1240, 1244)',
--
To view, visit https://gerrit.wikimedia.org/r/152035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iafda02c22281659316cdc6a08b84d2e919f22ca4
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use mw.api in Special:AggregateGroups - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Use mw.api in Special:AggregateGroups
..
Use mw.api in Special:AggregateGroups
Bug: 62956
Change-Id: I28a0eb7c00b0e41fac6b4b72d96fef3ae2ec1a98
---
M resources/js/ext.translate.special.aggregategroups.js
1 file changed, 139 insertions(+), 146 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.special.aggregategroups.js
b/resources/js/ext.translate.special.aggregategroups.js
index 4409dbe..42a356c 100644
--- a/resources/js/ext.translate.special.aggregategroups.js
+++ b/resources/js/ext.translate.special.aggregategroups.js
@@ -16,23 +16,21 @@
parentId = $target.parents( '.mw-tpa-group' ).data(
'id' ),
$select = $( '#mw-tpa-groupselect-' + parentId );
- function successFunction( data ) {
- if ( data.error ) {
- window.alert( data.error.info );
- } else {
- $( 'option', { value: $target.data( 'groupid'
) } )
- .text( $target.siblings( 'a' ).text() )
- .appendTo( $select );
- $target.parent( 'li' ).remove();
- $select.trigger( 'liszt:updated' );
- }
+ function successFunction() {
+ $( 'option', { value: $target.data( 'groupid' ) } )
+ .text( $target.siblings( 'a' ).text() )
+ .appendTo( $select );
+ $target.parent( 'li' ).remove();
+ $select.trigger( 'liszt:updated' );
}
params = $.extend( getApiParams( $target ), {
'do': 'dissociate',
group: $target.data( 'groupid' )
} );
- $.post( mw.util.wikiScript( 'api' ), params, successFunction );
+ new mw.Api().post( params ).done( successFunction ).fail(
function ( code, data ) {
+ window.alert( data.error data.error.info );
+ } );
}
function associate( event ) {
@@ -44,52 +42,46 @@
subgroupId = $selected.val(),
subgroupName = $selected.text();
- successFunction = function ( data ) {
- if ( data.error ) {
- window.alert( data.error.info );
- } else {
- var aAttr, $a, spanAttr, $span, $ol;
+ successFunction = function () {
+ var aAttr, $a, spanAttr, $span, $ol;
- aAttr = {
- href: mw.util.getUrl( subgroupName ),
- title: subgroupName
- };
+ aAttr = {
+ href: mw.util.getUrl( subgroupName ),
+ title: subgroupName
+ };
- $a = $( 'a', aAttr ).text( subgroupName );
+ $a = $( 'a', aAttr ).text( subgroupName );
- spanAttr = {
- 'class': 'tp-aggregate-remove-button',
- 'data-groupid': subgroupId
- };
+ spanAttr = {
+ 'class': 'tp-aggregate-remove-button',
+ 'data-groupid': subgroupId
+ };
- $span = $( 'span', spanAttr );
+ $span = $( 'span', spanAttr );
- $ol = $( '#mw-tpa-grouplist-' + parentId );
- $ol.append( $( 'li' ).append( $a, $span ) );
+ $ol = $( '#mw-tpa-grouplist-' + parentId );
+ $ol.append( $( 'li' ).append( $a, $span ) );
- // remove this group from the select.
- $selected.remove();
- $select.trigger( 'liszt:updated' );
- $span.click( dissociate );
- }
+ // remove this group from the select.
+ $selected.remove();
+ $select.trigger( 'liszt:updated' );
+ $span.click( dissociate );
};
params = $.extend( getApiParams( $target ), {
'do': 'associate',
group: subgroupId
} );
- $.post(
[MediaWiki-commits] [Gerrit] Grant 'centralauth-rename' right to stewards - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Grant 'centralauth-rename' right to stewards .. Grant 'centralauth-rename' right to stewards This grants the 'centralauth-rename' right to the local steward group on all wikis. Change-Id: Id794f3c46872df8c0273860dbca7a46b7d4f7ac3 --- M wmf-config/CommonSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hoo man: Looks good to me, approved Vogone: Looks good to me, but someone else must approve jenkins-bot: Verified Objections: PiRSquared17: There's a problem with this change, please improve diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 5767302..d315786 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -1203,6 +1203,7 @@ $wgCentralAuthDryRun = false; # unset( $wgGroupPermissions['*']['centralauth-merge'] ); # $wgGroupPermissions['sysop']['centralauth-merge'] = true; + $wgGroupPermissions['steward']['centralauth-rename'] = true; $wgCentralAuthCookies = true; $wgDisableUnmergedEditing = $wmgDisableUnmergedEdits; -- To view, visit https://gerrit.wikimedia.org/r/139655 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id794f3c46872df8c0273860dbca7a46b7d4f7ac3 Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Gerrit Patch Uploader gerritpatchuploa...@gmail.com Gerrit-Reviewer: Deskana dga...@wikimedia.org Gerrit-Reviewer: Ebe123 beauleetien...@gmail.com Gerrit-Reviewer: Gerrit Patch Uploader gerritpatchuploa...@gmail.com Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: PiRSquared17 pirsquare...@gmail.com Gerrit-Reviewer: Vogone leon.liese...@wikipedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API change: error message is a list not a dict - change (pywikibot/core)
XZise has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152036
Change subject: API change: error message is a list not a dict
..
API change: error message is a list not a dict
Solve breaking change of gerrit 124323 and keep the old code
part for backward compatibility with older mw releases.
This is an alternative fix based on Xqt's fix in
I7dc2c03ce0d84ea2d5c36170998253b4b8fed3ae
This converts the previous dict into a list and then treats
everything like a list.
Bug: 66619
Change-Id: Ifaafa9e840edd7474aee759ca76406cc6925ac69
---
M pywikibot/data/api.py
1 file changed, 22 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/36/152036/1
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index bb5c1cb..255c0c9 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -3,7 +3,7 @@
Interface functions to Mediawiki's api.php
#
-# (C) Pywikipedia bot team, 2007-14
+# (C) Pywikibot team, 2007-2014
#
# Distributed under the terms of the MIT license.
#
@@ -235,6 +235,21 @@
% action)
return {action: {'result': 'Success', 'nochange': ''}}
+def _is_wikibase_error_retryable(self, error):
+messages = error.pop(messages, None)
+# bug 66619, after gerrit 124323 braking change we have a
+# list of messages
+if isinstance(messages, dict):
+try: # behaviour before gerrit 124323 braking change
+messages = [messages[0]]
+except KeyError: # unsure the new output is always a list
+messages = [messages]
+if isinstance(messages, list):
+for item in messages:
+if item[name] == u'edit-already-exists':
+return True
+return False
+
def submit(self):
Submit a query and parse the response.
@@ -399,16 +414,13 @@
if code.startswith(u'internal_api_error_'):
self.wait()
continue
-# bugs 46535, 62126, 64494
+# bugs 46535, 62126, 64494, 66619
# maybe removed when it 46535 is solved
-if code == failed-save and action == 'wbeditentity':
-try:
-message = result[error][messages][0][name]
-except KeyError:
-message = None
-if message == u'edit-already-exists':
-self.wait()
-continue
+if code == failed-save and \
+ action == 'wbeditentity' and \
+ self._is_wikibase_error_retryable(result[error]):
+self.wait()
+continue
# raise error
try:
pywikibot.log(uAPI Error: query=\n%s
--
To view, visit https://gerrit.wikimedia.org/r/152036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifaafa9e840edd7474aee759ca76406cc6925ac69
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: Xqt i...@gno.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed fatal error - change (mediawiki...BlueSpiceExtensions)
Smuggli has submitted this change and it was merged.
Change subject: Fixed fatal error
..
Fixed fatal error
* if viewed in non view mode a fatal error occured in vector skin
Change-Id: Ia72332edba70c974859d0b971aab8e843d2c0c86
---
M Authors/Authors.class.php
M Readers/Readers.class.php
M ShoutBox/ShoutBox.class.php
3 files changed, 10 insertions(+), 3 deletions(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
diff --git a/Authors/Authors.class.php b/Authors/Authors.class.php
index 2674318..b07db22 100644
--- a/Authors/Authors.class.php
+++ b/Authors/Authors.class.php
@@ -185,7 +185,9 @@
if ( $wgDefaultSkin == bluespiceskin )
return true;
$oAuthorsView = $this-getAuthorsViewForAfterContent(
$sktemplate );
- $data .= $oAuthorsView-execute();
+ if ( $oAuthorsView instanceof ViewAuthors ) {
+ $data .= $oAuthorsView-execute();
+ }
return true;
}
diff --git a/Readers/Readers.class.php b/Readers/Readers.class.php
index 4ac710d..5762ef6 100644
--- a/Readers/Readers.class.php
+++ b/Readers/Readers.class.php
@@ -233,7 +233,9 @@
$oViewReaders = $this-getReadersViewForAfterContent(
$sktemplate-getTitle() );
- $data .= $oViewReaders-execute();
+ if ( $oViewReaders instanceof ViewReaders ) {
+ $data .= $oViewReaders-execute();
+ }
return true;
}
diff --git a/ShoutBox/ShoutBox.class.php b/ShoutBox/ShoutBox.class.php
index 95e3d55..e424930 100644
--- a/ShoutBox/ShoutBox.class.php
+++ b/ShoutBox/ShoutBox.class.php
@@ -255,7 +255,10 @@
if ( !BsExtensionManager::isContextActive( 'MW::ShoutboxShow' )
|| $wgDefaultSkin == bluespiceskin ) {
return true;
}
- $data .= $this-getShoutboxViewForAfterContent( $sktemplate );
+ $oShoutboxView = $this-getShoutboxViewForAfterContent(
$sktemplate );
+ if ( $oShoutboxView instanceof ViewShoutBox ) {
+ $data .= $oShoutboxView-execute();
+ }
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/152034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia72332edba70c974859d0b971aab8e843d2c0c86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed undefinded property from check - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152037
Change subject: Removed undefinded property from check
..
Removed undefinded property from check
This property is removed in BS 2.23
Change-Id: I309555886e1163da42abfcba528be8db2e1ac578
---
M ExtendedSearch/includes/SearchIndex/SearchIndex.class.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/37/152037/1
diff --git a/ExtendedSearch/includes/SearchIndex/SearchIndex.class.php
b/ExtendedSearch/includes/SearchIndex/SearchIndex.class.php
index eddb14a..56b1d92 100644
--- a/ExtendedSearch/includes/SearchIndex/SearchIndex.class.php
+++ b/ExtendedSearch/includes/SearchIndex/SearchIndex.class.php
@@ -97,7 +97,7 @@
}
if ( !$this-oSearchRequest-isSearchable() ) {
- if ( $this-oSearchRequest-sOrigin != ''
$this-oSearchOptions-getOption( 'searchStringOrig' ) == '' ) {
+ if ( $this-oSearchOptions-getOption(
'searchStringOrig' ) == '' ) {
return $this-createErrorMessageView(
'bs-extendedsearch-nosearchterm' );
} else {
$vbe = new ViewBaseElement();
--
To view, visit https://gerrit.wikimedia.org/r/152037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I309555886e1163da42abfcba528be8db2e1ac578
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Last flakes - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Last flakes
..
Last flakes
Remove unused imports, globals, and make __all__ unmutable.
Change-Id: Ifc6f1baf1162855fda18fa0198fcd74515c0d2bc
---
M generate_family_file.py
M pwb.py
M pywikibot/__init__.py
M pywikibot/compat/catlib.py
M pywikibot/compat/userlib.py
M pywikibot/userinterfaces/terminal_interface.py
M scripts/disambredir.py
M scripts/maintenance/cache.py
M tests/api_tests.py
9 files changed, 17 insertions(+), 15 deletions(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/generate_family_file.py b/generate_family_file.py
index dfcdaf0..fd5aa0d 100644
--- a/generate_family_file.py
+++ b/generate_family_file.py
@@ -18,7 +18,6 @@
# system imports
import sys
import re
-import os
import codecs
from collections import defaultdict
from distutils.version import LooseVersion as V
@@ -28,11 +27,11 @@
# creating retrieving urls
if sys.version_info[0] == 2:
-from urlparse import urlparse, urljoin, ParseResult
+from urlparse import urlparse, urljoin
import urllib2
from urllib2 import HTTPError
else:
-from urllib.parse import urlparse, urljoin, ParseResult
+from urllib.parse import urlparse, urljoin
from urllib.error import HTTPError
import urllib.request as urllib2
diff --git a/pwb.py b/pwb.py
index 31a585a..0423435 100644
--- a/pwb.py
+++ b/pwb.py
@@ -20,6 +20,8 @@
import os
import sys
+pwb = None
+
def tryimport_pwb():
# See if we can import pywikibot. If so, we need to patch pwb.argvu, too.
@@ -125,9 +127,12 @@
Try running 'git submodule update --init'.)
sys.exit(1)
+del httplib2
+
if sys.version_info[0] == 2 and sys.version_info[1] == 6:
try:
import ordereddict
+del ordereddict
except ImportError as e:
print(ImportError: %s % e)
print(pywikibot depends on module ordereddict in Python 2.6.)
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index b434615..e29691f 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -53,7 +53,7 @@
from pywikibot.tools import UnicodeMixin
from pywikibot.i18n import translate
-__all__ = [
+__all__ = (
'config', 'ui', 'UnicodeMixin', 'translate',
'Page', 'ImagePage', 'Category', 'Link', 'User',
'ItemPage', 'PropertyPage', 'Claim', 'TimeStripper',
@@ -75,7 +75,7 @@
'getCategoryLinks', 'categoryFormat', 'replaceCategoryLinks',
'removeCategoryLinks', 'removeCategoryLinksAndSeparator',
'replaceCategoryInPlace', 'compileLinkR', 'extract_templates_and_params',
-]
+)
class Timestamp(datetime.datetime):
diff --git a/pywikibot/compat/catlib.py b/pywikibot/compat/catlib.py
index 27940ff..985f6af 100644
--- a/pywikibot/compat/catlib.py
+++ b/pywikibot/compat/catlib.py
@@ -21,4 +21,4 @@
inPlace=True):
return article.change_category(oldCat, newCat, comment, sortKey, inPlace)
-__all__ = ['Category', 'change_category']
+__all__ = ('Category', 'change_category',)
diff --git a/pywikibot/compat/userlib.py b/pywikibot/compat/userlib.py
index 348b059..7150992 100644
--- a/pywikibot/compat/userlib.py
+++ b/pywikibot/compat/userlib.py
@@ -16,4 +16,4 @@
from pywikibot import User
-__all__ = ['User']
+__all__ = ('User',)
diff --git a/pywikibot/userinterfaces/terminal_interface.py
b/pywikibot/userinterfaces/terminal_interface.py
index 6805138..a58b3f5 100644
--- a/pywikibot/userinterfaces/terminal_interface.py
+++ b/pywikibot/userinterfaces/terminal_interface.py
@@ -13,4 +13,4 @@
else:
from .terminal_interface_unix import UnixUI as UI
-__all__ = ['UI']
+__all__ = ('UI',)
diff --git a/scripts/disambredir.py b/scripts/disambredir.py
index a402a44..8038993 100644
--- a/scripts/disambredir.py
+++ b/scripts/disambredir.py
@@ -56,7 +56,7 @@
if m.group('title') == '' or mysite.isInterwikiLink(m.group('title')):
continue
else:
-actualLinkPage = pywikibot.Page(page.site, m.group('title'))
+actualLinkPage = pywikibot.Page(mysite, m.group('title'))
# Check whether the link found is to page.
if actualLinkPage != linkedPage:
continue
@@ -139,12 +139,11 @@
continue
text = treat(text, page2, target)
if text != page.get():
-comment = i18n.translate(mysite, msg, fallback=True)
+comment = i18n.translate(page.site, msg, fallback=True)
page.put(text, comment)
def main():
-global mysite, linktrail, page
start = []
for arg in pywikibot.handleArgs():
start.append(arg)
@@ -153,7 +152,6 @@
else:
start = !
mysite = pywikibot.Site()
-linktrail = mysite.linktrail()
try:
generator = pagegenerators.CategorizedPageGenerator(
[MediaWiki-commits] [Gerrit] Fixed issue with untransformed message - change (mediawiki...BlueSpiceExtensions)
Swidmann has submitted this change and it was merged.
Change subject: Fixed issue with untransformed message
..
Fixed issue with untransformed message
Change-Id: Ib0dad3a4740d4ebaa63185ce1ea7c3671c9f4845
---
M ArticleInfo/ArticleInfo.class.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Swidmann: Verified; Looks good to me, approved
diff --git a/ArticleInfo/ArticleInfo.class.php
b/ArticleInfo/ArticleInfo.class.php
index b4a7752..b5d3ae1 100644
--- a/ArticleInfo/ArticleInfo.class.php
+++ b/ArticleInfo/ArticleInfo.class.php
@@ -335,7 +335,7 @@
$oLastEditorView-setKey( 'LastEditor' );
$oLastEditorView-setIconSrc( $this-getImagePath( true
).BsConfig::get('MW::ArticleInfo::ImageLastEditor') );
- $oLastEditorView-setIconAlt(
wfMessage('bs-articleinfo-last-editor')-plain(), $this-getUser()-getName() );
+ $oLastEditorView-setIconAlt(
wfMessage('bs-articleinfo-last-editor')-text(), $this-getUser()-getName() );
$oLastEditorView-setText( $sLastEditorName );
$oLastEditorView-setTextLinkTitle( $sLastEditorName );
$oLastEditorView-setTextLink( $sLastEditorUserPageUrl );
--
To view, visit https://gerrit.wikimedia.org/r/152026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0dad3a4740d4ebaa63185ce1ea7c3671c9f4845
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Swidmann widm...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update rally for Wikimania - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Update rally for Wikimania
..
Update rally for Wikimania
Change-Id: Iafda02c22281659316cdc6a08b84d2e919f22ca4
---
M SpecialRally.php
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialRally.php b/SpecialRally.php
index 96e0fa3..182169d 100644
--- a/SpecialRally.php
+++ b/SpecialRally.php
@@ -45,6 +45,8 @@
'tsint-0-all' // 1240
);
+ $allowedGroups = MessageGroups::expandWildcards( '*' );
+
$allGroups = MessageGroups::singleton()-getGroups();
foreach ( $allGroups as $groupId = $messageGroup ) {
if ( in_array( $groupId, $allowedGroups ) ) {
@@ -80,8 +82,8 @@
'page_latest'
);
$conds = array(
- rc_timestamp = 2012122122,
- rc_timestamp = 20121231235959,
+ rc_timestamp = 2014080610,
+ rc_timestamp = 20140810235959,
'rc_new' = 1,
'rc_bot' = 0,
'rc_namespace IN (8, 1206, 1212, 1220,
1224, 1238, 1240, 1244)',
--
To view, visit https://gerrit.wikimedia.org/r/152035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iafda02c22281659316cdc6a08b84d2e919f22ca4
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup Entity Serializer code - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Cleanup Entity Serializer code
..
Cleanup Entity Serializer code
Rename an $Uppercase variable.
Remove some unused protected variables, just use the one from the
parent object.
Change-Id: I90b643b1812f759e4066310ad7c4669162d1bb4a
---
M lib/includes/serializers/EntitySerializer.php
M repo/includes/serializers/EntityRevisionSerializationOptions.php
M repo/includes/serializers/EntityRevisionSerializer.php
3 files changed, 24 insertions(+), 37 deletions(-)
Approvals:
WikidataJenkins: Verified
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/serializers/EntitySerializer.php
b/lib/includes/serializers/EntitySerializer.php
index f4ab8a9..f9461f0 100644
--- a/lib/includes/serializers/EntitySerializer.php
+++ b/lib/includes/serializers/EntitySerializer.php
@@ -48,26 +48,14 @@
const OPT_SORT_FIELDS = 'entitySortFields';
/**
-* @see ApiSerializerObject::$options
-*
-* @since 0.2
-*
-* @var SerializationOptions
-*/
- protected $options;
-
- /**
-* @since 0.4
-*
* @var EntityFactory
*/
- protected $entityFactory;
-
+ private $entityFactory;
/**
* @var ClaimSerializer
*/
- protected $claimSerializer;
+ private $claimSerializer;
/**
* Constructor.
diff --git a/repo/includes/serializers/EntityRevisionSerializationOptions.php
b/repo/includes/serializers/EntityRevisionSerializationOptions.php
index ad7fd21..1c58b66 100644
--- a/repo/includes/serializers/EntityRevisionSerializationOptions.php
+++ b/repo/includes/serializers/EntityRevisionSerializationOptions.php
@@ -12,16 +12,16 @@
* @author Daniel Werner daniel.a.r.wer...@gmail.com
*/
class EntityRevisionSerializationOptions extends SerializationOptions {
+
/**
-* @since 0.5
* @var SerializationOptions|null
*/
- protected $contentSerializer;
+ private $contentSerializer;
/**
* @since 0.5
*
-* @param SerializationOptions|null $SerializationOptions The
serializer options which
+* @param SerializationOptions|null $serializationOptions The
serializer options which
*will be used when serializing the Entity contained by the
EntityContent instance.
*
* NOTE: Originally a contentSerializer option has been intended
without some refactoring
@@ -30,8 +30,8 @@
* The whole serializer system is quite ugly, this just adds up
to this, the whole thing
* should be refactored in one go.
*/
- public function __construct( SerializationOptions $SerializationOptions
= null ) {
- $this-setSerializationOptions( $SerializationOptions );
+ public function __construct( SerializationOptions $serializationOptions
= null ) {
+ $this-setSerializationOptions( $serializationOptions );
}
/**
@@ -55,4 +55,5 @@
public function setSerializationOptions( SerializationOptions $options
= null ) {
$this-contentSerializer = $options;
}
+
}
diff --git a/repo/includes/serializers/EntityRevisionSerializer.php
b/repo/includes/serializers/EntityRevisionSerializer.php
index 3ce5875..54a3cd0 100644
--- a/repo/includes/serializers/EntityRevisionSerializer.php
+++ b/repo/includes/serializers/EntityRevisionSerializer.php
@@ -3,7 +3,6 @@
namespace Wikibase\Serializers;
use InvalidArgumentException;
-use Wikibase\Entity;
use Wikibase\EntityRevision;
use Wikibase\EntityTitleLookup;
use Wikibase\LanguageFallbackChain;
@@ -22,11 +21,6 @@
* @author Daniel Werner daniel.a.r.wer...@gmail.com
*/
class EntityRevisionSerializer extends SerializerObject {
- /**
-* @see SerializerObject::$options
-* @var EntityRevisionSerializationOptions
-*/
- protected $options;
/**
* @var EntityTitleLookup
@@ -34,14 +28,15 @@
protected $titleLookup;
/**
-* Constructor.
-*
* @since 0.5
*
* @param EntityTitleLookup $titleLookup
* @param EntityRevisionSerializationOptions $options
*/
- public function __construct( EntityTitleLookup $titleLookup,
EntityRevisionSerializationOptions $options = null ) {
+ public function __construct(
+ EntityTitleLookup $titleLookup,
+ EntityRevisionSerializationOptions $options = null
+ ) {
if( $options === null ) {
$options = new EntityRevisionSerializationOptions();
}
@@ -66,15 +61,14 @@
'EntityRevisionSerializer can only serialize
EntityRevision objects' );
}
- /** @var
[MediaWiki-commits] [Gerrit] Update translation page on moving translation unit - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Update translation page on moving translation unit
..
Update translation page on moving translation unit
Bug: 37297
Change-Id: If931f6df3c68215bd01abdd081782d2038a1cfe5
---
M TranslateHooks.php
M tag/PageTranslationHooks.php
M tag/TranslatablePage.php
M tag/TranslateMoveJob.php
4 files changed, 54 insertions(+), 2 deletions(-)
Approvals:
Nikerabbit: Looks good to me, but someone else must approve
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TranslateHooks.php b/TranslateHooks.php
index 6d38c85..8e3682f 100644
--- a/TranslateHooks.php
+++ b/TranslateHooks.php
@@ -161,6 +161,9 @@
// Replaced edit tab with translation tab for
translation pages
$wgHooks['SkinTemplateNavigation'][] =
'PageTranslationHooks::translateTab';
+
+ // Update translated page when translation unit is moved
+ $wgHooks['TitleMoveComplete'][] =
'PageTranslationHooks::onMoveTranslationUnits';
}
}
diff --git a/tag/PageTranslationHooks.php b/tag/PageTranslationHooks.php
index b8c6a35..7d1f7cf 100644
--- a/tag/PageTranslationHooks.php
+++ b/tag/PageTranslationHooks.php
@@ -14,8 +14,11 @@
* @ingroup PageTranslation
*/
class PageTranslationHooks {
- // Uuugly hack
+ // Uuugly hacks
public static $allowTargetEdit = false;
+
+ // Check if job queue is running
+ public static $jobQueueRunning = false;
/**
* Hook: ParserBeforeStrip
@@ -870,4 +873,41 @@
return true;
}
+
+ /**
+* Hook to update source and destination translation pages on moving
translation units
+* Hook: TitleMoveComplete
+* @since 2014.08
+*/
+ public static function onMoveTranslationUnits( Title $ot, Title $nt,
User $user,
+ $oldid, $newid, $reason
+ ) {
+ // Do the update only once. In case running by job queue, the
update is not done here
+ if ( self::$jobQueueRunning ) {
+ return;
+ }
+
+ $groupLast = null;
+ foreach ( array( $ot, $nt ) as $title ) {
+ $handle = new MessageHandle( $title );
+ if ( !$handle-isValid() ) {
+ continue;
+ }
+
+ $group = $handle-getGroup();
+ if ( !$group instanceof WikiPageMessageGroup ) {
+ continue;
+ }
+
+ $language = $handle-getCode();
+
+ // Update the page only once if source and destination
units
+ // belong to the same page
+ if ( $group !== $groupLast ) {
+ $groupLast = $group;
+ $page = TranslatablePage::newFromTitle(
$group-getTitle() );
+ self::updateTranslationPage( $page, $language,
$user, 0, $reason );
+ }
+ }
+ }
}
diff --git a/tag/TranslatablePage.php b/tag/TranslatablePage.php
index 19d422e..b76a495 100644
--- a/tag/TranslatablePage.php
+++ b/tag/TranslatablePage.php
@@ -250,7 +250,13 @@
$section = str_replace( ' ', '_', $this-displayTitle );
$page = $this-getTitle()-getPrefixedDBKey();
- return $this-getMessageGroup()-getMessage( $page/$section,
$code );
+ $group = $this-getMessageGroup();
+ // Sanity check, seems to happen during moves
+ if ( !$group instanceof WikiPageMessageGroup ) {
+ return null;
+ }
+
+ return $group-getMessage( $page/$section, $code );
}
/**
diff --git a/tag/TranslateMoveJob.php b/tag/TranslateMoveJob.php
index 9b9fc4a..59bc47c 100644
--- a/tag/TranslateMoveJob.php
+++ b/tag/TranslateMoveJob.php
@@ -57,6 +57,7 @@
$doer = User::newFromName( $this-getPerformer() );
PageTranslationHooks::$allowTargetEdit = true;
+ PageTranslationHooks::$jobQueueRunning = true;
$oldUser = $wgUser;
$wgUser = $user;
self::forceRedirects( false );
@@ -101,6 +102,8 @@
$entry-setTarget( Title::newFromText( $base ) );
$logid = $entry-insert();
$entry-publish( $logid );
+
+ PageTranslationHooks::$jobQueueRunning = false;
}
$wgUser = $oldUser;
--
To view, visit https://gerrit.wikimedia.org/r/145057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id:
[MediaWiki-commits] [Gerrit] Initialise dir property and use a getter - change (oojs/ui)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152039
Change subject: Initialise dir property and use a getter
..
Initialise dir property and use a getter
Change-Id: Ie228855430c29ac720b56e241801f318b1e979f7
---
M src/Frame.js
1 file changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/39/152039/1
diff --git a/src/Frame.js b/src/Frame.js
index 8ee589b..23a3aac 100644
--- a/src/Frame.js
+++ b/src/Frame.js
@@ -18,6 +18,7 @@
// Properties
this.loading = null;
this.config = config;
+ this.dir = null;
// Initialize
this.$element
@@ -191,7 +192,7 @@
win = this.$element.prop( 'contentWindow' );
doc = win.document;
- // Figure out directionality:
+ // Cache directionality
this.dir = OO.ui.Element.getDir( this.$element ) || 'ltr';
// Initialize contents
@@ -202,7 +203,7 @@
doc.write(
'!doctype html' +
'html' +
- 'body class=oo-ui-frame-content oo-ui-' + this.dir +
' dir=' + this.dir + '' +
+ 'body class=oo-ui-frame-content oo-ui-' +
this.getDir() + ' dir=' + this.getDir() + '' +
'/body' +
'/html'
);
@@ -234,3 +235,12 @@
this.$element.css( { width: width, height: height } );
return this;
};
+
+/**
+ * Get the directionality of the frame
+ *
+ * @return {string} Directionality, 'ltr' or 'rtl'
+ */
+OO.ui.Frame.prototype.getDir = function () {
+ return this.dir;
+};
--
To view, visit https://gerrit.wikimedia.org/r/152039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie228855430c29ac720b56e241801f318b1e979f7
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core now uses flake8 - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/152040 Change subject: pywikibot/core now uses flake8 .. pywikibot/core now uses flake8 And stop triggering the pep8/pyflakes jobs. Change-Id: Id790210c65fd1d3388a437a3cc62a1c42a37a829 --- M layout.yaml 1 file changed, 1 insertion(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/40/152040/1 diff --git a/layout.yaml b/layout.yaml index cb6dd27..7db3fc5 100644 --- a/layout.yaml +++ b/layout.yaml @@ -3362,19 +3362,12 @@ prefix: 'pywikibot-compat' - name: pywikibot/core -check: - - 'pywikibot-core-pep8' - - 'pywikibot-core-pyflakes' -test: - - 'pywikibot-core-pep8' - - 'pywikibot-core-pyflakes' +check-voter: - 'pywikibot-core-tox-flake8' - 'pywikibot-core-tox-flake8-docstrings' experimental: - 'pywikibot-core-tox-nose' gate-and-submit: - - 'pywikibot-core-pep8' - - 'pywikibot-core-pyflakes' - 'pywikibot-core-tox-flake8' - name: pywikibot/i18n -- To view, visit https://gerrit.wikimedia.org/r/152040 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id790210c65fd1d3388a437a3cc62a1c42a37a829 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Kill off two references to there being a Cancel button - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Kill off two references to there being a Cancel button
..
Kill off two references to there being a Cancel button
Change-Id: I36f13b2fffcb442c0a4b27d64d388f24c3c3766e
---
M VisualEditor.php
M modules/ve-mw/i18n/en.json
2 files changed, 2 insertions(+), 4 deletions(-)
Approvals:
Catrope: Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/VisualEditor.php b/VisualEditor.php
index d3df702..24947c1 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -756,7 +756,6 @@
'visualeditor-savedialog-warning-dirty',
'visualeditor-saveerror',
'visualeditor-serializeerror',
- 'visualeditor-toolbar-cancel',
'visualeditor-toolbar-format-tooltip',
'visualeditor-toolbar-insert',
'visualeditor-toolbar-savedialog',
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 4a1b917..071e287 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -25,7 +25,7 @@
visualeditor-annotationbutton-linknode-tooltip: Simple link,
visualeditor-beta-appendix: beta,
visualeditor-beta-label: beta,
-visualeditor-beta-warning: VisualEditor is in 'beta'. You may encounter
software issues, and you may not be able to edit parts of the page. To switch
back to source editing at any time without losing your changes, open the
dropdown next to \{{int:visualeditor-toolbar-cancel}}\ and select
\{{int:visualeditor-mweditmodesource-title}}\.,
+visualeditor-beta-warning: VisualEditor is in 'beta'. You may encounter
software issues, and you may not be able to edit parts of the page. To switch
back to source editing at any time without losing your changes, open the
dropdown next to \{{int:visualeditor-toolbar-savedialog}}\ and select
\{{int:visualeditor-mweditmodesource-title}}\.,
visualeditor-browserwarning: You are using a browser which is not
officially supported by VisualEditor.,
visualeditor-ca-createlocaldescriptionsource: Add local description
source,
visualeditor-ca-createsource: Create source,
@@ -239,7 +239,6 @@
visualeditor-serializeerror: Error loading data from server: $1.,
visualeditor-settings-tool: Page settings,
visualeditor-timeout:It looks like this editor is currently
unavailable. Would you like to edit in source mode instead?,
-visualeditor-toolbar-cancel: Cancel,
visualeditor-toolbar-cite-label: Cite,
visualeditor-toolbar-format-tooltip: Format paragraph,
visualeditor-toolbar-savedialog: Save page,
@@ -249,7 +248,7 @@
visualeditor-viewpage-savewarning-title: Are you sure?,
visualeditor-viewpage-savewarning-discard: Discard edits,
visualeditor-viewpage-savewarning-keep: Continue editing,
-visualeditor-wikitext-warning: You are using VisualEditor -
[[{{MediaWiki:visualeditor-wikitext-warning-link}}|wikitext]] does not work
here. To switch to source editing at any time without losing your changes, open
the dropdown menu next to \{{int:visualeditor-toolbar-cancel}}\ and select
\{{int:visualeditor-mweditmodesource-title}}\.,
+visualeditor-wikitext-warning: You are using VisualEditor -
[[{{MediaWiki:visualeditor-wikitext-warning-link}}|wikitext]] does not work
here. To switch to source editing at any time without losing your changes, open
the dropdown menu next to \{{int:visualeditor-toolbar-savedialog}}\ and
select \{{int:visualeditor-mweditmodesource-title}}\.,
visualeditor-wikitext-warning-link: Help:Wiki markup,
visualeditor-wikitext-warning-title: Wikitext markup detected
}
--
To view, visit https://gerrit.wikimedia.org/r/151969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I36f13b2fffcb442c0a4b27d64d388f24c3c3766e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: fce9297..48fd057 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/152041 Change subject: Syncronize VisualEditor: fce9297..48fd057 .. Syncronize VisualEditor: fce9297..48fd057 Change-Id: I59cde2f52e50eaf2b88e28904ad4c1f59a74d8c4 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/41/152041/1 diff --git a/VisualEditor b/VisualEditor index fce9297..48fd057 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit fce9297b32f7743df9a2b1ab7bf655d8c6913ad3 +Subproject commit 48fd057775b9f9588228d616e8c25417ad3f06e8 -- To view, visit https://gerrit.wikimedia.org/r/152041 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59cde2f52e50eaf2b88e28904ad4c1f59a74d8c4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: fce9297..48fd057 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: fce9297..48fd057 .. Syncronize VisualEditor: fce9297..48fd057 Change-Id: I59cde2f52e50eaf2b88e28904ad4c1f59a74d8c4 --- 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 fce9297..48fd057 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit fce9297b32f7743df9a2b1ab7bf655d8c6913ad3 +Subproject commit 48fd057775b9f9588228d616e8c25417ad3f06e8 -- To view, visit https://gerrit.wikimedia.org/r/152041 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59cde2f52e50eaf2b88e28904ad4c1f59a74d8c4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change upload settings on fa.wikipedia - change (operations/mediawiki-config)
Calak has uploaded a new change for review. https://gerrit.wikimedia.org/r/152042 Change subject: Change upload settings on fa.wikipedia .. Change upload settings on fa.wikipedia Disable local upload for autoconfirmed users Create uploder group with upload rights, able to be added and removed by sysops Set up autopromotion to uploder group Change wgAutopromoteOnceLogInRC to false Bug: 69171 Change-Id: Ia5b729afb973d24c9b49af343efb09f42b81f197 --- M commonsuploads.dblist M wmf-config/InitialiseSettings.php 2 files changed, 17 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/42/152042/1 diff --git a/commonsuploads.dblist b/commonsuploads.dblist index bd06c9c..a851abb 100644 --- a/commonsuploads.dblist +++ b/commonsuploads.dblist @@ -113,6 +113,7 @@ euwikiquote euwiktionary extwiki +fawiki fawikiquote fawikisource fawiktionary diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 06957cb..4ff5a4c 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -7013,14 +7013,15 @@ 'rollbacker' = array( 'rollback' = true ), 'autopatrolled' = array( 'autopatrol' = true ), ), - 'fawiki' = array( + '+fawiki' = array( '*' = array( 'createpage' = false ), // bug 27195 'user' = array( 'move-categorypages' = false ), // bug 65728 'bot' = array( 'move-categorypages' = true ), //bug 65728 - 'patroller' = array( 'patrol' = true, 'move-categorypages' = true ), - 'rollbacker' = array( 'rollback' = true ), - 'autopatrol' = array( 'autopatrol' = true, 'move-categorypages' = true ), // bug 29007 + 'patroller' = array( 'patrol' = true, 'move-categorypages' = true ), // bug 65728 + 'rollbacker' = array( 'rollback' = true ), // bug 23233 + 'autopatrol' = array( 'autopatrol' = true, 'move-categorypages' = true ), // bug 29007 and 65728 'Image-reviewer' = array( 'movefile' = true ), // bug 64532 + 'uploader' = array( 'upload' = true, 'reupload' = true, 'reupload-own' = true ), // bug 69171 ), 'fawikinews' = array( 'rollbacker' = array( 'rollback' = true ), @@ -7941,7 +7942,7 @@ ), '+fawiki' = array( 'bureaucrat' = array( 'patroller', 'Image-reviewer' ), // bug 64532 - 'sysop' = array( 'rollbacker', 'autopatrol' ), + 'sysop' = array( 'rollbacker', 'autopatrol', 'uploader' ), // bug 23233, 29007 and 69171 ), '+fawikinews' = array( 'sysop' = array( 'rollbacker', 'patroller' ), @@ -8450,7 +8451,7 @@ ), '+fawiki' = array( 'bureaucrat' = array( 'patroller', 'Image-reviewer' ), // bug 64532 - 'sysop' = array( 'rollbacker', 'autopatrol' ), + 'sysop' = array( 'rollbacker', 'autopatrol', 'uploader' ), // bug 23233, 29007 and 69171 ), '+fawikinews' = array( 'sysop' = array( 'rollbacker', 'patroller', ), @@ -9909,11 +9910,20 @@ array( APCOND_AGE, 14 * 86400 ), ), ), + 'fawiki' = array( + 'uploader' = array( '', + array( APCOND_EDITCOUNT, 10 ), + array( APCOND_AGE, 4 * 86400 ), + array( '!', array( APCOND_INGROUPS, array( 'sysop' ) ) ), + array( '!', array( APCOND_INGROUPS, array( 'bureaucrat' ) ) ), + ), + ), // bug 69171 ), 'wgAutopromoteOnceLogInRC' = array( 'default' = true, 'ruwiki' = false, + 'fawiki' = false, // bug 69171 ), 'wmgExtraImplicitGroups' = array( -- To view, visit https://gerrit.wikimedia.org/r/152042 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5b729afb973d24c9b49af343efb09f42b81f197 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Calak calakw...@yahoo.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correct buttons order in media advanced settings - change (mediawiki...VisualEditor)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152043
Change subject: Correct buttons order in media advanced settings
..
Correct buttons order in media advanced settings
Bug: 69165
Change-Id: I7bd1d6c89aaef09492ae07eadababd68305b245e
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
1 file changed, 24 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/43/152043/1
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index a799a59..f663d02 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -187,7 +187,8 @@
* @inheritdoc
*/
ve.ui.MWMediaDialog.prototype.initialize = function () {
- var altTextFieldset, positionFieldset, borderField, positionField;
+ var altTextFieldset, positionFieldset, borderField, positionField,
+ alignLeftButton, alignCenterButton, alignRightButton,
alignButons;
// Parent method
ve.ui.MWMediaDialog.super.prototype.initialize.call( this );
@@ -254,23 +255,28 @@
this.positionInput = new OO.ui.ButtonSelectWidget( {
'$': this.$
} );
- this.positionInput.addItems( [
- new OO.ui.ButtonOptionWidget( 'left', {
- '$': this.$,
- 'icon': 'align-float-left',
- 'label': ve.msg(
'visualeditor-dialog-media-position-left' )
- } ),
- new OO.ui.ButtonOptionWidget( 'center', {
- '$': this.$,
- 'icon': 'align-center',
- 'label': ve.msg(
'visualeditor-dialog-media-position-center' )
- } ),
- new OO.ui.ButtonOptionWidget( 'right', {
- '$': this.$,
- 'icon': 'align-float-right',
- 'label': ve.msg(
'visualeditor-dialog-media-position-right' )
- } )
- ], 0 );
+
+ alignLeftButton = new OO.ui.ButtonOptionWidget( 'left', {
+ '$': this.$,
+ 'icon': 'align-float-left',
+ 'label': ve.msg( 'visualeditor-dialog-media-position-left' )
+ } );
+ alignCenterButton = new OO.ui.ButtonOptionWidget( 'center', {
+ '$': this.$,
+ 'icon': 'align-center',
+ 'label': ve.msg( 'visualeditor-dialog-media-position-center' )
+ } );
+ alignRightButton = new OO.ui.ButtonOptionWidget( 'right', {
+ '$': this.$,
+ 'icon': 'align-float-right',
+ 'label': ve.msg( 'visualeditor-dialog-media-position-right' )
+ } );
+
+ alignButons = ( this.frame.dir === 'ltr' ) ?
+ [ alignLeftButton, alignCenterButton, alignRightButton ] :
+ [ alignRightButton, alignCenterButton, alignLeftButton ];
+
+ this.positionInput.addItems( alignButons, 0 );
this.positionCheckbox = new OO.ui.CheckboxInputWidget( {
'$': this.$
--
To view, visit https://gerrit.wikimedia.org/r/152043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bd1d6c89aaef09492ae07eadababd68305b245e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jquery.confirmable: New inline confirmation module - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: jquery.confirmable: New inline confirmation module
..
jquery.confirmable: New inline confirmation module
$().confirmable() can be applied to any inline-block element. It will
cause it to expand into Are you sure? [Yes] [No] question and
buttons when clicked, where the buttons are clones of the original
element: [Yes] will carry out the default action (or a different one,
if specified), [No] will collapse the interface back.
Possible uses include:
* Confirmable rollback links
* Confirmable unwatch links on watchlists
* Confirmable thank links (Echo extension's ones)
Added a demo with possible uses on history and watchlist pages.
Included Hebrew messages courtesy of Moriel.
Change-Id: I2f6e0bd4f6f0a84e1a0d7193cde076738f3cdd25
---
A docs/uidesign/confirmable.html
M languages/i18n/en.json
M languages/i18n/he.json
M languages/i18n/qqq.json
M maintenance/jsduck/config.json
M resources/Resources.php
A resources/src/jquery/jquery.confirmable.css
A resources/src/jquery/jquery.confirmable.js
A resources/src/jquery/jquery.confirmable.mediawiki.js
9 files changed, 379 insertions(+), 0 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/uidesign/confirmable.html b/docs/uidesign/confirmable.html
new file mode 100644
index 000..d035821
--- /dev/null
+++ b/docs/uidesign/confirmable.html
@@ -0,0 +1,147 @@
+!DOCTYPE html
+html lang=en dir=ltr
+head
+ meta charset=utf-8
+ !--
+ The jquery.confirmable module uses some additional modules and files
+ for internationalization support. These are omitted here for simplicity.
+ --
+ script type=text/javascript
src=../../resources/lib/jquery/jquery.js/script
+ link rel=stylesheet
href=../../resources/src/jquery/jquery.confirmable.css
+ script type=text/javascript
src=../../resources/src/jquery/jquery.confirmable.js/script
+ style
+ body {
+ font: small sans-serif;
+ }
+ .mw-rollback-link a,
+ .mw-unwatch-link a,
+ .mw-thanks-thank-link a {
+ background: #ccf;
+ }
+ /style
+/head
+body
+ h2Introduction/h2
+
+ pThe jquery.confirmable module provides a simple inline confirmation
script for potentially destructive or uncancellable actions./p
+
+ pPossible uses include confirmable rollback links in histories,
confirmable unwatch links on watchlists, or confirmable thanks links
(provided by the Echo extension)./p
+
+ pShown below is a demo of how each of those could work on history and
watchlist entries, in an LTR and RTL language. The enhanced links are
highlighted in blue./p
+
+ h2Examples/h2
+
+ h3LTR (English)/h3
+
+ pWatchlist:/p
+
+ ul lang=en dir=ltr
+ li class=mw-line-even mw-changeslist-line-not-watched
+ (a href=#diff/a | a href=#hist/a)
+ span class=mw-changeslist-separator. ./span
+ span class=mw-titlea href=#
class=mw-changeslist-titleExample page/a/span; span
class=mw-changeslist-date13:38/span
+ span class=mw-changeslist-separator. ./span
+ span class=mw-plusminus-neg(-130)/span
+ span class=mw-changeslist-separator. ./span
+ a href=# class=mw-userlinkExample user/a
+ span class=mw-usertoollinks(a href=#Talk/a |
a href=#contribs/a | a href=#block/a)/span
+ span class=comment(example edit)/span
+ span class=mw-rollback-link[a
href=https://www.mediawiki.org/wiki/Random_ideas_for_rollback_to_be_shelved_and_forgotten_about;rollback/a]/span
+ (span class=mw-unwatch-linka
href=#unwatch/a/span)
+ /li
+ /ul
+
+ pHistory:/p
+
+ ul lang=en dir=ltr
+ li
+ span class=mw-history-histlinks(cur | a
href=#prev/a)/span
+ input type=radio style=visibility: hidden;
/input type=radio checked /
+ a href=# class=mw-changeslist-date13:38, 28
October 2013/a
+ span class='history-user'
+ a href=# class=mw-userlinkExample user/a
+ span class=mw-usertoollinks(a
href=#Talk/a | a href=#contribs/a | a href=#block/a)/span
+ /span
+ span class=mw-changeslist-separator. ./span
+ span class=history-size(1,654 bytes)/span
+ span class=mw-plusminus-neg(-130)/span
+ span class=mw-changeslist-separator. ./span
+ span class=comment(example edit)/span
+ (span class=mw-rollback-linka
[MediaWiki-commits] [Gerrit] Push latest copy from ShoutWiki SVN with various updates and... - change (mediawiki...ShoutWikiAds)
Lewis Cawte has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152044
Change subject: Push latest copy from ShoutWiki SVN with various updates and
changes.
..
Push latest copy from ShoutWiki SVN with various updates and changes.
Change-Id: Ib556e644a33ce643f39dcf689d963157a3a9e126
---
M ShoutWikiAds.class.php
M ShoutWikiAds.php
A css/aurora-leaderboard-ad.css
A css/aurora-skyscraper-ad.css
A css/cologneblue-leaderboard-ad.css
A css/home-leaderboard-bottom-ad.css
A css/home-skyscraper-ad.css
A css/modern-button-ad.css
A css/modern-leaderboard-ad.css
M css/monobook-button-ad.css
M css/monobook-skyscraper-ad.css
A css/quartz-square-ad.css
D css/truglass-ads.css
A css/truglass-leaderboard-ad.css
A css/vector-button-ad.css
A css/vector-skyscraper-ad.css
16 files changed, 580 insertions(+), 104 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ShoutWikiAds
refs/changes/44/152044/1
diff --git a/ShoutWikiAds.class.php b/ShoutWikiAds.class.php
index aac4ae9..e2ccb33 100644
--- a/ShoutWikiAds.class.php
+++ b/ShoutWikiAds.class.php
@@ -2,6 +2,7 @@
/**
* ShoutWikiAds class -- contains the hooked functions and some other crap for
* displaying the advertisements.
+ *
* Route all requests through loadAd( $type ) to ensure correct processing.
*
* We allow wiki admins to configure some things because our sane defaults
@@ -20,9 +21,10 @@
/**
* Can we show ads on the current page?
*
-* @return bool False if ads aren't enabled or the current page is
-* Special:UserLogin (login page) or if the user is autoconfirmed and
the
-* forceads parameter is NOT in the URL, otherwise true.
+* @return Boolean: false if ads aren't enabled or the current page is
+* Special:UserLogin (login page) or if the user is
+* autoconfirmed and the forceads parameter is NOT in
the
+* URL, otherwise true
*/
public static function canShowAds() {
global $wgAdConfig, $wgTitle, $wgUser, $wgRequest;
@@ -31,9 +33,8 @@
return false;
}
- list( $alias, /*..*/ ) = SpecialPageFactory::resolveAlias(
$wgTitle-getDBkey() );
if( $wgTitle instanceof Title
- $alias === 'Userlogin' ||
+ $wgTitle-isSpecial( 'Userlogin' ) ||
in_array( 'staff', $wgUser-getEffectiveGroups() )
!$wgRequest-getVal( 'forceads' )
)
{
@@ -41,7 +42,7 @@
}
// No configuration for this skin? Bail out!
- if ( !$wgAdConfig[self::determineSkin()] ) {
+ if ( !isset( $wgAdConfig[self::determineSkin()] ) ) {
return false;
}
@@ -92,13 +93,80 @@
* @return Boolean: true if the namespace is supported, otherwise false
*/
public static function isEnabledNamespace() {
- global $wgAdConfig, $wgTitle;
- $namespace = $wgTitle-getNamespace();
+ global $wgAdConfig;
+ $title = RequestContext::getMain()-getTitle(); // @todo FIXME
filthy hack
+ $namespace = $title-getNamespace();
if( in_array( $namespace, $wgAdConfig['namespaces'] ) ) {
return true;
} else {
return false;
}
+ }
+
+ /**
+* Skin-agnostic way of getting the HTML for a Google AdSense banner ad.
+*
+* @return String: HTML code
+*/
+ public static function getBannerHTML() {
+ global $wgAdConfig;
+
+ $skinName = self::determineSkin();
+
+ $adSlot = '';
+ if ( isset( $wgAdConfig[$skinName . '-banner-ad-slot'] ) ) {
+ $adSlot = $wgAdConfig[$skinName . '-banner-ad-slot'];
+ }
+
+ $borderColorMsg = wfMessage( 'shoutwiki-' . $skinName .
'-banner-ad-color-border' )-inContentLanguage();
+ $colorBGMsg = wfMessage( 'shoutwiki-' . $skinName .
'-banner-ad-color-bg' )-inContentLanguage();
+ $colorLinkMsg = wfMessage( 'shoutwiki-' . $skinName .
'-banner-ad-color-link' )-inContentLanguage();
+ $colorTextMsg = wfMessage( 'shoutwiki-' . $skinName .
'-banner-ad-color-text' )-inContentLanguage();
+ $colorURLMsg = wfMessage( 'shoutwiki-' . $skinName .
'-banner-ad-color-url' )-inContentLanguage();
+
+ $colorBorderDefault = 'F6F4C4';
+ $colorBGDefault = 'E0';
+ $colorLinkDefault = '00';
+ $colorURLDefault = '002BB8';
+
+ // different defaults for Truglass from old Truglass ad code
+ if (
[MediaWiki-commits] [Gerrit] Move MW_LC_VERSION to class constant instead of global define - change (mediawiki/core)
Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152045
Change subject: Move MW_LC_VERSION to class constant instead of global define
..
Move MW_LC_VERSION to class constant instead of global define
Change-Id: I184ec13081a5cf60d593a1c25c091b1db7b344a9
---
M includes/cache/LocalisationCache.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/45/152045/1
diff --git a/includes/cache/LocalisationCache.php
b/includes/cache/LocalisationCache.php
index cf87129..eb6a57a 100644
--- a/includes/cache/LocalisationCache.php
+++ b/includes/cache/LocalisationCache.php
@@ -20,8 +20,6 @@
* @file
*/
-define( 'MW_LC_VERSION', 2 );
-
/**
* Class for caching the contents of localisation files, Messages*.php
* and *.i18n.php.
@@ -35,6 +33,8 @@
* as grammatical transformation, is done by the caller.
*/
class LocalisationCache {
+ const VERSION = 2;
+
/** Configuration associative array */
private $conf;
@@ -913,7 +913,7 @@
# Add cache dependencies for any referenced globals
$deps['wgExtensionMessagesFiles'] = new GlobalDependency(
'wgExtensionMessagesFiles' );
$deps['wgMessagesDirs'] = new GlobalDependency(
'wgMessagesDirs' );
- $deps['version'] = new ConstantDependency( 'MW_LC_VERSION' );
+ $deps['version'] = new ConstantDependency(
'LocalisationCache::VERSION' );
# Add dependencies to the cache entry
$allData['deps'] = $deps;
--
To view, visit https://gerrit.wikimedia.org/r/152045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I184ec13081a5cf60d593a1c25c091b1db7b344a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] postgres: Followup commit for ebcb7cd - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152046
Change subject: postgres: Followup commit for ebcb7cd
..
postgres: Followup commit for ebcb7cd
Also allow the slave to have the datadir overriden
Change-Id: I0160bd695db0665dd2b4692de41635b37a3d0ba1
---
M modules/postgresql/manifests/slave.pp
1 file changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/152046/1
diff --git a/modules/postgresql/manifests/slave.pp
b/modules/postgresql/manifests/slave.pp
index a249ac7..24335ae 100644
--- a/modules/postgresql/manifests/slave.pp
+++ b/modules/postgresql/manifests/slave.pp
@@ -49,7 +49,12 @@
require = Class['postgresql::server'],
}
-file { /var/lib/postgresql/${pgversion}/main/recovery.conf:
+if $datadir {
+$basepath = $datadir
+} else {
+$basepath = /var/lib/postgresql/${pgversion}/main:
+}
+file { ${basepath}/recovery.conf:
ensure = $ensure,
owner = 'root',
group = 'root',
@@ -62,9 +67,9 @@
if $ensure == 'present' {
exec { pg_basebackup-${master_server}:
environment = PGPASSWORD=${replication_pass},
-command = /usr/bin/pg_basebackup -D
/var/lib/postgresql/${pgversion}/main -h ${master_server} -U replication -w,
+command = /usr/bin/pg_basebackup -D ${basepath} -h
${master_server} -U replication -w,
user= 'postgres',
-unless = /usr/bin/test -f
/var/lib/postgresql/${pgversion}/main/PG_VERSION,
+unless = /usr/bin/test -f ${basepath}/PG_VERSION,
require = Class['postgresql::server'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/152046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0160bd695db0665dd2b4692de41635b37a3d0ba1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Notify Icinga about done webrequest datasets - change (analytics/refinery)
Hello Ottomata,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/152050
to review the following change.
Change subject: [WIP] Notify Icinga about done webrequest datasets
..
[WIP] Notify Icinga about done webrequest datasets
Change-Id: If01a94a91fde60277de9815bca701519292a8223
---
A oozie/webrequest/icinga/monitor_done_marker/bundle.properties
A oozie/webrequest/icinga/monitor_done_marker/bundle.xml
A oozie/webrequest/icinga/monitor_done_marker/coordinator.xml
A oozie/webrequest/icinga/monitor_done_marker/send_ok_to_icinga.sh
A oozie/webrequest/icinga/monitor_done_marker/workflow.xml
5 files changed, 219 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery
refs/changes/50/152050/1
diff --git a/oozie/webrequest/icinga/monitor_done_marker/bundle.properties
b/oozie/webrequest/icinga/monitor_done_marker/bundle.properties
new file mode 100644
index 000..c4c339a
--- /dev/null
+++ b/oozie/webrequest/icinga/monitor_done_marker/bundle.properties
@@ -0,0 +1,40 @@
+# Configures a bundle to managy notifying icinga about done webrequest
+# datasets. Any of the following properties are overidable with -D.
+#
+# Usage:
+# oozie job -submit -config
oozie/webrequest/icinga/monitor_done_marker/bundle.properties.
+#
+# NOTE: The $oozie_directory must be synced to HDFS so that all relevant
+#.xml files exist there when this job is submitted.
+
+
+name_node = hdfs://analytics-hadoop
+job_tracker = resourcemanager.analytics.eqiad.wmnet:8032
+queue_name= adhoc
+
+# Base path in HDFS to oozie files.
+# Other files will be used relative to this path.
+oozie_directory = ${name_node}/wmf/refinery/current/oozie
+
+# HDFS path to coordinator to run for each webrequest_source.
+coordinator_file =
${oozie_directory}/webrequest/icinga/monitor_done_marker/coordinator.xml
+
+# HDFS path to workflow to run.
+workflow_file =
${oozie_directory}/webrequest/icinga/monitor_done_marker/workflow.xml
+
+# HDFS path to webrequest dataset definition
+datasets_file = ${oozie_directory}/webrequest/datasets.xml
+
+# Initial import time of the webrequest dataset.
+start_time= 2014-04-01T00:00Z
+
+# Time to stop running this coordinator. Year 3000 == never!
+stop_time = 3000-01-01T00:00Z
+
+# HDFS path to directory where webrequest data is time bucketed.
+data_directory=
${name_node}/wmf/data/raw/webrequest/webrequest_${webrequest_source}/hourly
+
+# Coordintator to start.
+oozie.bundle.application.path =
${oozie_directory}/webrequest/icinga/monitor_done_marker/bundle.xml
+oozie.use.system.libpath = true
+oozie.action.external.stats.write = true
diff --git a/oozie/webrequest/icinga/monitor_done_marker/bundle.xml
b/oozie/webrequest/icinga/monitor_done_marker/bundle.xml
new file mode 100644
index 000..0a6ab32
--- /dev/null
+++ b/oozie/webrequest/icinga/monitor_done_marker/bundle.xml
@@ -0,0 +1,61 @@
+?xml version=1.0 encoding=UTF-8?
+bundle-app xmlns=uri:oozie:bundle:0.2
+name=webrequest-monitor_done_marker-bundle
+
+parameters
+property
+namequeue_name/name
+valueadhoc/value
+/property
+
+!-- Required properties. --
+propertynamecoordinator_file/name/property
+propertynamename_node/name/property
+propertynamejob_tracker/name/property
+propertynameworkflow_file/name/property
+propertynamestart_time/name/property
+propertynamestop_time/name/property
+propertynamedata_directory/name/property
+/parameters
+
+coordinator name='hive_add_partition-webrequest-bits'
+app-path${coordinator_file}/app-path
+configuration
+property
+namewebrequest_source/name
+valuebits/value
+/property
+/configuration
+/coordinator
+
+coordinator name='hive_add_partition-webrequest-mobile'
+app-path${coordinator_file}/app-path
+configuration
+property
+namewebrequest_source/name
+valuemobile/value
+/property
+/configuration
+/coordinator
+
+coordinator name='hive_add_partition-webrequest-text'
+app-path${coordinator_file}/app-path
+configuration
+property
+namewebrequest_source/name
+valuetext/value
+/property
+/configuration
+/coordinator
+
+coordinator name='hive_add_partition-webrequest-upload'
+app-path${coordinator_file}/app-path
+configuration
+property
+namewebrequest_source/name
+valueupload/value
+/property
+
[MediaWiki-commits] [Gerrit] Add Oozie webrequest dataset with done marker - change (analytics/refinery)
Hello Ottomata,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/152049
to review the following change.
Change subject: Add Oozie webrequest dataset with done marker
..
Add Oozie webrequest dataset with done marker
Those datasets will be used in follow-up commits to trigger workflows
on webrequest datasets that do not have obvious issues.
Change-Id: Ie5b70fc1f2cdd09c706a28d1619c0644cefa2678
---
M oozie/webrequest/datasets.xml
M oozie/webrequest/partition/add/coordinator.xml
2 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery
refs/changes/49/152049/1
diff --git a/oozie/webrequest/datasets.xml b/oozie/webrequest/datasets.xml
index 8c936d7..dac5046 100644
--- a/oozie/webrequest/datasets.xml
+++ b/oozie/webrequest/datasets.xml
@@ -10,11 +10,19 @@
--
datasets
-dataset name=webrequest
+dataset name=webrequest_wo_done_marker
frequency=${coord:hours(1)}
initial-instance=${start_time}
timezone=Universal
uri-template${data_directory}/${YEAR}/${MONTH}/${DAY}/${HOUR}/uri-template
done-flag/done-flag
/dataset
+
+dataset name=webrequest
+ frequency=${coord:hours(1)}
+ initial-instance=${start_time}
+ timezone=Universal
+
uri-template${data_directory}/${YEAR}/${MONTH}/${DAY}/${HOUR}/uri-template
+done-flag_SUCCESS/done-flag
+/dataset
/datasets
diff --git a/oozie/webrequest/partition/add/coordinator.xml
b/oozie/webrequest/partition/add/coordinator.xml
index 0ab8832..7f7a5f6 100644
--- a/oozie/webrequest/partition/add/coordinator.xml
+++ b/oozie/webrequest/partition/add/coordinator.xml
@@ -78,7 +78,7 @@
/datasets
input-events
-data-in name=input dataset=webrequest
+data-in name=input dataset=webrequest_wo_done_marker
instance${coord:current(0)}/instance
/data-in
!--
@@ -88,7 +88,7 @@
might get created /before/ writing for the current dataset
finishes).
--
-data-in name=ready_indicator dataset=webrequest
+data-in name=ready_indicator dataset=webrequest_wo_done_marker
instance${coord:current(2)}/instance
/data-in
/input-events
--
To view, visit https://gerrit.wikimedia.org/r/152049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5b70fc1f2cdd09c706a28d1619c0644cefa2678
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reindent oozie webrequest dataset definiton - change (analytics/refinery)
Hello Ottomata,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/152048
to review the following change.
Change subject: Reindent oozie webrequest dataset definiton
..
Reindent oozie webrequest dataset definiton
Change-Id: I691f200dd3f152ceecaf98c730c91c1e4bbd068f
---
M oozie/webrequest/datasets.xml
1 file changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery
refs/changes/48/152048/1
diff --git a/oozie/webrequest/datasets.xml b/oozie/webrequest/datasets.xml
index 0ab6cbf..8c936d7 100644
--- a/oozie/webrequest/datasets.xml
+++ b/oozie/webrequest/datasets.xml
@@ -3,18 +3,18 @@
Defines a reusable dataset for raw webrequest data.
Use this dataset in your coordinator.xml files by setting:
- ${start_time} - the initial instance of your data.
- Example: 2014-04-01T00:00Z
- ${data_directory} - Path to directory where data is time bucketed.
- Example:
/wmf/data/raw/webrequest/webrequest_mobile/hourly
+${start_time} - the initial instance of your data.
+Example: 2014-04-01T00:00Z
+${data_directory} - Path to directory where data is time bucketed.
+Example:
/wmf/data/raw/webrequest/webrequest_mobile/hourly
--
datasets
-dataset name=webrequest
-frequency=${coord:hours(1)}
-initial-instance=${start_time}
-timezone=Universal
-
uri-template${data_directory}/${YEAR}/${MONTH}/${DAY}/${HOUR}/uri-template
-done-flag/done-flag
- /dataset
+dataset name=webrequest
+ frequency=${coord:hours(1)}
+ initial-instance=${start_time}
+ timezone=Universal
+
uri-template${data_directory}/${YEAR}/${MONTH}/${DAY}/${HOUR}/uri-template
+done-flag/done-flag
+/dataset
/datasets
--
To view, visit https://gerrit.wikimedia.org/r/152048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I691f200dd3f152ceecaf98c730c91c1e4bbd068f
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initialise dir property and use a getter - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Initialise dir property and use a getter
..
Initialise dir property and use a getter
Change-Id: Ie228855430c29ac720b56e241801f318b1e979f7
---
M src/Frame.js
1 file changed, 12 insertions(+), 2 deletions(-)
Approvals:
Mooeypoo: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/Frame.js b/src/Frame.js
index 8ee589b..23a3aac 100644
--- a/src/Frame.js
+++ b/src/Frame.js
@@ -18,6 +18,7 @@
// Properties
this.loading = null;
this.config = config;
+ this.dir = null;
// Initialize
this.$element
@@ -191,7 +192,7 @@
win = this.$element.prop( 'contentWindow' );
doc = win.document;
- // Figure out directionality:
+ // Cache directionality
this.dir = OO.ui.Element.getDir( this.$element ) || 'ltr';
// Initialize contents
@@ -202,7 +203,7 @@
doc.write(
'!doctype html' +
'html' +
- 'body class=oo-ui-frame-content oo-ui-' + this.dir +
' dir=' + this.dir + '' +
+ 'body class=oo-ui-frame-content oo-ui-' +
this.getDir() + ' dir=' + this.getDir() + '' +
'/body' +
'/html'
);
@@ -234,3 +235,12 @@
this.$element.css( { width: width, height: height } );
return this;
};
+
+/**
+ * Get the directionality of the frame
+ *
+ * @return {string} Directionality, 'ltr' or 'rtl'
+ */
+OO.ui.Frame.prototype.getDir = function () {
+ return this.dir;
+};
--
To view, visit https://gerrit.wikimedia.org/r/152039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie228855430c29ac720b56e241801f318b1e979f7
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Mooeypoo mor...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update from ShoutWiki SVN. - change (mediawiki...Nimbus)
Lewis Cawte has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152051
Change subject: Update from ShoutWiki SVN.
..
Update from ShoutWiki SVN.
Change-Id: Idb141e874c605380dd8635e5f12559c04f60d5eb
---
M Nimbus.i18n.php
M Nimbus.skin.php
M nimbus/Menu.js
A nimbus/site_logo.gif
M nimbus/sw_logo.png
5 files changed, 27 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Nimbus
refs/changes/51/152051/1
diff --git a/Nimbus.i18n.php b/Nimbus.i18n.php
index 6e62b30..926b02f 100644
--- a/Nimbus.i18n.php
+++ b/Nimbus.i18n.php
@@ -27,13 +27,6 @@
'nimbus-recent-contributors' = 'Recent contributors to this page',
'nimbus-recent-contributors-info' = 'The following people recently
contributed to this page.',
'nimbus-signup' = 'Sign up',
- 'nimbus-sidebar' = '* navigation
-** mainpage|mainpage-description
-** portal-url|portal
-** currentevents-url|currentevents
-** recentchanges-url|recentchanges
-** randompage-url|randompage
-** helppage|help',
'nimbus-welcome' = 'Welcome $1',
);
@@ -320,7 +313,6 @@
'nimbus-more-actions' = 'اقدامات بیشتر',
'nimbus-more-wikis' = 'ویکیهای بیشتر',
'nimbus-profile' = 'نمایه',
- 'nimbus-recent-contributors' = 'مشارکتکنندگان اخیر در این صفحه',
'nimbus-signup' = 'ثبت نام',
'nimbus-welcome' = 'خوش آمدی $1',
);
diff --git a/Nimbus.skin.php b/Nimbus.skin.php
index d93d00c..cefeb06 100644
--- a/Nimbus.skin.php
+++ b/Nimbus.skin.php
@@ -153,18 +153,18 @@
echo \t\t\t . 'div id=login-message' .
wfMessage( 'nimbus-welcome', 'b' .
$user-getName() . '/b' )-parse() .
'/div
- a class=positive-button href=' . htmlspecialchars(
$profile_link-getFullURL() ) . ' rel=nofollowspan' . wfMessage(
'nimbus-profile' )-plain() . '/span/a
- a class=negative-button href=' . htmlspecialchars(
$logout_link-getFullURL() ) . 'span' . wfMessage( 'nimbus-logout'
)-plain() . '/span/a';
+ a class=positive-button href=' .
$profile_link-escapeFullURL() . ' rel=nofollowspan' . wfMessage(
'nimbus-profile' )-plain() . '/span/a
+ a class=negative-button href=' .
$logout_link-escapeFullURL() . 'span' . wfMessage( 'nimbus-logout'
)-plain() . '/span/a';
} else {
- echo 'a class=positive-button href=' . htmlspecialchars(
$register_link-getFullURL() ) . ' rel=nofollowspan' . wfMessage(
'nimbus-signup' )-plain() . '/span/a
- a class=positive-button href=' . htmlspecialchars(
$login_link-getFullURL() ) . ' id=nimbusLoginButtonspan' . wfMessage(
'nimbus-login' )-plain() . '/span/a';
+ echo 'a class=positive-button href=' .
$register_link-escapeFullURL() . ' rel=nofollowspan' . wfMessage(
'nimbus-signup' )-plain() . '/span/a
+ a class=positive-button href=' .
$login_link-escapeFullURL() . ' id=nimbusLoginButtonspan' . wfMessage(
'nimbus-login' )-plain() . '/span/a';
}
?
/div!-- #wiki-login --
/div!-- #header --
div id=site-header class=noprint
div id=site-logo
- a href=?php echo htmlspecialchars(
$main_page_link-getFullURL() ) ? title=?php echo Linker::titleAttrib(
'p-logo', 'withaccess' ) ? accesskey=?php echo Linker::accesskey( 'p-logo'
) ? rel=nofollow
+ a href=?php echo $main_page_link-escapeFullURL()
? title=?php echo Linker::titleAttrib( 'p-logo', 'withaccess' ) ?
accesskey=?php echo Linker::accesskey( 'p-logo' ) ? rel=nofollow
img src=?php echo $wgLogo ? alt= /
/a
/div
@@ -187,7 +187,7 @@
?php
// Only show the link to
Special:TopUsers if wAvatar class exists and $wgUserLevels is an array
if ( class_exists( 'wAvatar' )
is_array( $wgUserLevels ) ) {
- echo 'a href=' .
htmlspecialchars( $top_fans_link-getFullURL() ) . '' . wfMessage( 'topusers'
)-plain() . '/a';
+ echo 'a href=' .
$top_fans_link-escapeFullURL() . '' . wfMessage( 'topusers' )-plain() .
'/a';
}
echo Linker::link(
@@ -220,8 +220,8 @@
'div class=cleared/div' .
\n;
}
?
- a href=?php echo htmlspecialchars(
$help_link-getFullURL() ) ??php echo wfMessage( 'help' )-plain() ?/a
- a href=?php echo htmlspecialchars(
$special_pages_link-getFullURL() ) ??php
[MediaWiki-commits] [Gerrit] Changed special page alias - change (mediawiki...BlueSpiceExtensions)
Pigpen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152052
Change subject: Changed special page alias
..
Changed special page alias
MW debug toolbar threw warning because of unknown alias
Change-Id: I9869d38a4dc7eb4c16356aa64def306b71fbda09
---
M Statistics/Statistics.class.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/52/152052/1
diff --git a/Statistics/Statistics.class.php b/Statistics/Statistics.class.php
index 1862a19..e289f99 100644
--- a/Statistics/Statistics.class.php
+++ b/Statistics/Statistics.class.php
@@ -226,7 +226,7 @@
*/
public function onBeforePageDisplay( $oOutputPage, $oSkin ) {
if(
!$oSkin-getTitle()-equals(SpecialPage::getTitleFor('AdminDashboard'))
-
!$oSkin-getTitle()-equals(SpecialPage::getTitleFor('SpecialWikiAdmin'))
+
!$oSkin-getTitle()-equals(SpecialPage::getTitleFor('WikiAdmin'))
!$oSkin-getTitle()-equals(SpecialPage::getTitleFor('UserDashboard'))
) return true;
@@ -539,4 +539,4 @@
return true;
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/152052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9869d38a4dc7eb4c16356aa64def306b71fbda09
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pigpen reym...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move the wrapping checkbox under the alignment buttons - change (mediawiki...VisualEditor)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152054
Change subject: Move the wrapping checkbox under the alignment buttons
..
Move the wrapping checkbox under the alignment buttons
The alignment button group doesn't have its own label,
and if the checkbox is above the buttons, it looks like a label
for the button group.
Moving it under the buttons makes it less confusing.
Bug: 69164
Change-Id: I0ca409900606c584c3015a13292cde1581856451
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
1 file changed, 21 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/54/152054/1
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index f663d02..ee82823 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -251,7 +251,25 @@
altTextFieldset.$element
.append( this.altTextInput.$element );
- // Position
+ // Position section
+
+ // Wrapping
+ this.positionCheckbox = new OO.ui.CheckboxInputWidget( {
+ '$': this.$
+ } );
+ positionField = new OO.ui.FieldLayout( this.positionCheckbox, {
+ '$': this.$,
+ 'align': 'inline',
+ 'label': ve.msg( 'visualeditor-dialog-media-position-checkbox' )
+ } );
+
+ positionFieldset = new OO.ui.FieldsetLayout( {
+ '$': this.$,
+ 'label': ve.msg( 'visualeditor-dialog-media-position-section' ),
+ 'icon': 'parameter'
+ } );
+
+ // Alignment
this.positionInput = new OO.ui.ButtonSelectWidget( {
'$': this.$
} );
@@ -278,25 +296,10 @@
this.positionInput.addItems( alignButons, 0 );
- this.positionCheckbox = new OO.ui.CheckboxInputWidget( {
- '$': this.$
- } );
- positionField = new OO.ui.FieldLayout( this.positionCheckbox, {
- '$': this.$,
- 'align': 'inline',
- 'label': ve.msg( 'visualeditor-dialog-media-position-checkbox' )
- } );
-
- positionFieldset = new OO.ui.FieldsetLayout( {
- '$': this.$,
- 'label': ve.msg( 'visualeditor-dialog-media-position-section' ),
- 'icon': 'parameter'
- } );
-
// Build position fieldset
positionFieldset.$element.append( [
- positionField.$element,
- this.positionInput.$element
+ this.positionInput.$element,
+ positionField.$element
] );
// Type
--
To view, visit https://gerrit.wikimedia.org/r/152054
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ca409900606c584c3015a13292cde1581856451
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (0e50d2e336) - change (VisualEditor/VisualEditor)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152053
Change subject: Update OOjs UI to v0.1.0-pre (0e50d2e336)
..
Update OOjs UI to v0.1.0-pre (0e50d2e336)
New changes:
1283a33 Localisation updates from https://translatewiki.net.
0e50d2e Initialise dir property and use a getter
Change-Id: I0a4d3d9e1ef3602f3829a65ea6ff22df3d218ce2
---
M lib/oojs-ui/i18n/zh-hans.json
M lib/oojs-ui/oojs-ui-agora.css
M lib/oojs-ui/oojs-ui-agora.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui.js
M lib/oojs-ui/oojs-ui.rtl.css
M lib/oojs-ui/oojs-ui.svg.css
M lib/oojs-ui/oojs-ui.svg.rtl.css
9 files changed, 31 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/53/152053/1
diff --git a/lib/oojs-ui/i18n/zh-hans.json b/lib/oojs-ui/i18n/zh-hans.json
index 50df67a..02bdafa 100644
--- a/lib/oojs-ui/i18n/zh-hans.json
+++ b/lib/oojs-ui/i18n/zh-hans.json
@@ -15,14 +15,15 @@
Xiaomingyan,
Yfdyh000,
Zhangjintao,
- 乌拉跨氪
+ 乌拉跨氪,
+ Great Brightstar
]
},
ooui-outline-control-move-down: 下移项,
ooui-outline-control-move-up: 上移项,
ooui-outline-control-remove: 删除项,
ooui-toolbar-more: 更多,
- ooui-dialog-message-accept: 好,
+ ooui-dialog-message-accept: 确定,
ooui-dialog-message-reject: 取消,
ooui-dialog-process-error: 发生一些错误,
ooui-dialog-process-dismiss: 解除,
diff --git a/lib/oojs-ui/oojs-ui-agora.css b/lib/oojs-ui/oojs-ui-agora.css
index 14a4a0a..eba427c 100644
--- a/lib/oojs-ui/oojs-ui-agora.css
+++ b/lib/oojs-ui/oojs-ui-agora.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-07-30T23:10:48Z
+ * Date: 2014-08-06T12:54:48Z
*/
.oo-ui-dialog-content .oo-ui-window-head,
.oo-ui-dialog-content .oo-ui-window-body,
diff --git a/lib/oojs-ui/oojs-ui-agora.rtl.css
b/lib/oojs-ui/oojs-ui-agora.rtl.css
index 4209ac0..d4445cb 100644
--- a/lib/oojs-ui/oojs-ui-agora.rtl.css
+++ b/lib/oojs-ui/oojs-ui-agora.rtl.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-07-30T23:10:48Z
+ * Date: 2014-08-06T12:54:48Z
*/
.oo-ui-dialog-content .oo-ui-window-head,
.oo-ui-dialog-content .oo-ui-window-body,
diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css
index 8875299..39a7135 100644
--- a/lib/oojs-ui/oojs-ui-apex.css
+++ b/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-07-30T23:10:48Z
+ * Date: 2014-08-06T12:54:48Z
*/
.oo-ui-dialog-content .oo-ui-window-head,
.oo-ui-dialog-content .oo-ui-window-body,
diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css
index 2a3bd1f..07acf31 100644
--- a/lib/oojs-ui/oojs-ui-apex.rtl.css
+++ b/lib/oojs-ui/oojs-ui-apex.rtl.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-07-30T23:10:48Z
+ * Date: 2014-08-06T12:54:48Z
*/
.oo-ui-dialog-content .oo-ui-window-head,
.oo-ui-dialog-content .oo-ui-window-body,
diff --git a/lib/oojs-ui/oojs-ui.js b/lib/oojs-ui/oojs-ui.js
index 11be9b2..7051d78 100644
--- a/lib/oojs-ui/oojs-ui.js
+++ b/lib/oojs-ui/oojs-ui.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-07-30T23:10:48Z
+ * Date: 2014-08-06T12:54:48Z
*/
( function ( OO ) {
@@ -1114,6 +1114,7 @@
// Properties
this.loading = null;
this.config = config;
+ this.dir = null;
// Initialize
this.$element
@@ -1287,7 +1288,7 @@
win = this.$element.prop( 'contentWindow' );
doc = win.document;
- // Figure out directionality:
+ // Cache directionality
this.dir =
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (0e50d2e336) - change (mediawiki/core)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152055
Change subject: Update OOjs UI to v0.1.0-pre (0e50d2e336)
..
Update OOjs UI to v0.1.0-pre (0e50d2e336)
New changes:
1283a33 Localisation updates from https://translatewiki.net.
0e50d2e Initialise dir property and use a getter
Change-Id: Ieb469d38e881cf7de284a987301626a2f945d2df
---
M resources/lib/oojs-ui/i18n/zh-hans.json
M resources/lib/oojs-ui/oojs-ui-agora.css
M resources/lib/oojs-ui/oojs-ui-apex.css
M resources/lib/oojs-ui/oojs-ui.js
M resources/lib/oojs-ui/oojs-ui.svg.css
5 files changed, 23 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/55/152055/1
diff --git a/resources/lib/oojs-ui/i18n/zh-hans.json
b/resources/lib/oojs-ui/i18n/zh-hans.json
index 50df67a..02bdafa 100644
--- a/resources/lib/oojs-ui/i18n/zh-hans.json
+++ b/resources/lib/oojs-ui/i18n/zh-hans.json
@@ -15,14 +15,15 @@
Xiaomingyan,
Yfdyh000,
Zhangjintao,
- 乌拉跨氪
+ 乌拉跨氪,
+ Great Brightstar
]
},
ooui-outline-control-move-down: 下移项,
ooui-outline-control-move-up: 上移项,
ooui-outline-control-remove: 删除项,
ooui-toolbar-more: 更多,
- ooui-dialog-message-accept: 好,
+ ooui-dialog-message-accept: 确定,
ooui-dialog-message-reject: 取消,
ooui-dialog-process-error: 发生一些错误,
ooui-dialog-process-dismiss: 解除,
diff --git a/resources/lib/oojs-ui/oojs-ui-agora.css
b/resources/lib/oojs-ui/oojs-ui-agora.css
index 525304c..22c3079 100644
--- a/resources/lib/oojs-ui/oojs-ui-agora.css
+++ b/resources/lib/oojs-ui/oojs-ui-agora.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-07-30T23:10:53Z
+ * Date: 2014-08-06T12:56:55Z
*/
.oo-ui-dialog-content .oo-ui-window-head,
.oo-ui-dialog-content .oo-ui-window-body,
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css
b/resources/lib/oojs-ui/oojs-ui-apex.css
index 1267a3c..c53772e 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-07-30T23:10:53Z
+ * Date: 2014-08-06T12:56:55Z
*/
.oo-ui-dialog-content .oo-ui-window-head,
.oo-ui-dialog-content .oo-ui-window-body,
diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js
index 737113e..6f63575 100644
--- a/resources/lib/oojs-ui/oojs-ui.js
+++ b/resources/lib/oojs-ui/oojs-ui.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-07-30T23:10:53Z
+ * Date: 2014-08-06T12:56:55Z
*/
( function ( OO ) {
@@ -1114,6 +1114,7 @@
// Properties
this.loading = null;
this.config = config;
+ this.dir = null;
// Initialize
this.$element
@@ -1287,7 +1288,7 @@
win = this.$element.prop( 'contentWindow' );
doc = win.document;
- // Figure out directionality:
+ // Cache directionality
this.dir = OO.ui.Element.getDir( this.$element ) || 'ltr';
// Initialize contents
@@ -1298,7 +1299,7 @@
doc.write(
'!doctype html' +
'html' +
- 'body class=oo-ui-frame-content oo-ui-' + this.dir +
' dir=' + this.dir + '' +
+ 'body class=oo-ui-frame-content oo-ui-' +
this.getDir() + ' dir=' + this.getDir() + '' +
'/body' +
'/html'
);
@@ -1332,6 +1333,15 @@
};
/**
+ * Get the directionality of the frame
+ *
+ * @return {string} Directionality, 'ltr' or 'rtl'
+ */
+OO.ui.Frame.prototype.getDir = function () {
+ return this.dir;
+};
+
+/**
* Container for elements.
*
* @abstract
diff --git a/resources/lib/oojs-ui/oojs-ui.svg.css
b/resources/lib/oojs-ui/oojs-ui.svg.css
index bffc230..aa5e6ac 100644
--- a/resources/lib/oojs-ui/oojs-ui.svg.css
+++ b/resources/lib/oojs-ui/oojs-ui.svg.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
[MediaWiki-commits] [Gerrit] Update / remove references to TermCache interface - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152056
Change subject: Update / remove references to TermCache interface
..
Update / remove references to TermCache interface
TermCache has been renamed to TermIndex.
Change-Id: I088f4408958a0c2d6339eecfb75c6e32a108c8ad
---
M lib/includes/store/TermIndex.php
M lib/includes/store/sql/TermSqlIndex.php
2 files changed, 10 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/56/152056/1
diff --git a/lib/includes/store/TermIndex.php b/lib/includes/store/TermIndex.php
index 3b838c2..7f4ea0d 100644
--- a/lib/includes/store/TermIndex.php
+++ b/lib/includes/store/TermIndex.php
@@ -9,8 +9,6 @@
*
* @licence GNU GPL v2+
* @author Jeroen De Dauw jeroended...@gmail.com
- *
- * @todo: rename to TermIndex
*/
interface TermIndex extends TermCombinationMatchFinder {
diff --git a/lib/includes/store/sql/TermSqlIndex.php
b/lib/includes/store/sql/TermSqlIndex.php
index 6a7a137..3ba2f35 100644
--- a/lib/includes/store/sql/TermSqlIndex.php
+++ b/lib/includes/store/sql/TermSqlIndex.php
@@ -76,7 +76,7 @@
}
/**
-* @see TermCache::saveTermsOfEntity
+* @see TermIndex::saveTermsOfEntity
*
* @since 0.1
*
@@ -317,7 +317,7 @@
}
/**
-* @see TermCache::deleteTermsOfEntity
+* @see TermIndex::deleteTermsOfEntity
*
* @since 0.5
*
@@ -349,7 +349,7 @@
/**
* Returns the terms stored for the given entity.
-* @see TermCache::getTermsOfEntity
+* @see TermIndex::getTermsOfEntity
*
* @param EntityId $id
*
@@ -390,7 +390,7 @@
/**
* Returns the terms stored for the given entities.
*
-* @see TermCache::getTermsOfEntities
+* @see TermIndex::getTermsOfEntities
*
* @param EntityId[] $ids
* @param string $entityType
@@ -475,7 +475,7 @@
}
/**
-* @see TermCache::termExists
+* @see TermIndex::termExists
*
* @since 0.1
*
@@ -524,7 +524,7 @@
}
/**
-* @see TermCache::getEntityIdsForLabel
+* @see TermIndex::getEntityIdsForLabel
*
* @since 0.1
*
@@ -585,7 +585,7 @@
}
/**
-* @see TermCache::getMatchingTerms
+* @see TermIndex::getMatchingTerms
*
* @since 0.2
*
@@ -634,7 +634,7 @@
}
/**
-* @see TermCache::getMatchingIDs
+* @see TermIndex::getMatchingIDs
*
* @since 0.4
*
@@ -866,7 +866,7 @@
}
/**
-* @see TermCache::clear
+* @see TermIndex::clear
*
* @since 0.2
*
@@ -880,7 +880,7 @@
}
/**
-* @see TermCache::getMatchingTermCombination
+* @see TermIndex::getMatchingTermCombination
*
* Note: the interface specifies capability for only a single join,
which in this implementation
* is enforced by the $joinCount var. The code itself however could
handle multiple joins.
--
To view, visit https://gerrit.wikimedia.org/r/152056
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I088f4408958a0c2d6339eecfb75c6e32a108c8ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Drop instructions for manual port forwarding in Vagrant - change (analytics/wikimetrics)
QChris has uploaded a new change for review. https://gerrit.wikimedia.org/r/152057 Change subject: Drop instructions for manual port forwarding in Vagrant .. Drop instructions for manual port forwarding in Vagrant Since vagrant's 4ff12aa080e50709a1d72054ab5fa60d4f05ac7e, the port forward gets set up automatically when provisioning the wikimetrics role. Change-Id: I57c7649c956201367ac2d4105754cfb6c1c7e169 --- M README.md 1 file changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics refs/changes/57/152057/1 diff --git a/README.md b/README.md index e829780..42fd6ad 100644 --- a/README.md +++ b/README.md @@ -19,14 +19,6 @@ $ vagrant enable-role wikimetrics $ git submodule update --init -$ vim Vagrantfile - - -* Add this under the other config.vm.network section(s): - - -config.vm.network :forwarded_port, -guest: 5000, host: 5000, id: 'wikimetrics' * Reload vagrant: `$ vagrant reload --provision` -- To view, visit https://gerrit.wikimedia.org/r/152057 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I57c7649c956201367ac2d4105754cfb6c1c7e169 Gerrit-PatchSet: 1 Gerrit-Project: analytics/wikimetrics Gerrit-Branch: master Gerrit-Owner: QChris christ...@quelltextlich.at ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (0e50d2e336) - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Update OOjs UI to v0.1.0-pre (0e50d2e336)
..
Update OOjs UI to v0.1.0-pre (0e50d2e336)
New changes:
1283a33 Localisation updates from https://translatewiki.net.
0e50d2e Initialise dir property and use a getter
Change-Id: I0a4d3d9e1ef3602f3829a65ea6ff22df3d218ce2
---
M lib/oojs-ui/i18n/zh-hans.json
M lib/oojs-ui/oojs-ui-agora.css
M lib/oojs-ui/oojs-ui-agora.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui.js
M lib/oojs-ui/oojs-ui.rtl.css
M lib/oojs-ui/oojs-ui.svg.css
M lib/oojs-ui/oojs-ui.svg.rtl.css
9 files changed, 31 insertions(+), 20 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/oojs-ui/i18n/zh-hans.json b/lib/oojs-ui/i18n/zh-hans.json
index 50df67a..02bdafa 100644
--- a/lib/oojs-ui/i18n/zh-hans.json
+++ b/lib/oojs-ui/i18n/zh-hans.json
@@ -15,14 +15,15 @@
Xiaomingyan,
Yfdyh000,
Zhangjintao,
- 乌拉跨氪
+ 乌拉跨氪,
+ Great Brightstar
]
},
ooui-outline-control-move-down: 下移项,
ooui-outline-control-move-up: 上移项,
ooui-outline-control-remove: 删除项,
ooui-toolbar-more: 更多,
- ooui-dialog-message-accept: 好,
+ ooui-dialog-message-accept: 确定,
ooui-dialog-message-reject: 取消,
ooui-dialog-process-error: 发生一些错误,
ooui-dialog-process-dismiss: 解除,
diff --git a/lib/oojs-ui/oojs-ui-agora.css b/lib/oojs-ui/oojs-ui-agora.css
index 14a4a0a..eba427c 100644
--- a/lib/oojs-ui/oojs-ui-agora.css
+++ b/lib/oojs-ui/oojs-ui-agora.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-07-30T23:10:48Z
+ * Date: 2014-08-06T12:54:48Z
*/
.oo-ui-dialog-content .oo-ui-window-head,
.oo-ui-dialog-content .oo-ui-window-body,
diff --git a/lib/oojs-ui/oojs-ui-agora.rtl.css
b/lib/oojs-ui/oojs-ui-agora.rtl.css
index 4209ac0..d4445cb 100644
--- a/lib/oojs-ui/oojs-ui-agora.rtl.css
+++ b/lib/oojs-ui/oojs-ui-agora.rtl.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-07-30T23:10:48Z
+ * Date: 2014-08-06T12:54:48Z
*/
.oo-ui-dialog-content .oo-ui-window-head,
.oo-ui-dialog-content .oo-ui-window-body,
diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css
index 8875299..39a7135 100644
--- a/lib/oojs-ui/oojs-ui-apex.css
+++ b/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-07-30T23:10:48Z
+ * Date: 2014-08-06T12:54:48Z
*/
.oo-ui-dialog-content .oo-ui-window-head,
.oo-ui-dialog-content .oo-ui-window-body,
diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css
index 2a3bd1f..07acf31 100644
--- a/lib/oojs-ui/oojs-ui-apex.rtl.css
+++ b/lib/oojs-ui/oojs-ui-apex.rtl.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-07-30T23:10:48Z
+ * Date: 2014-08-06T12:54:48Z
*/
.oo-ui-dialog-content .oo-ui-window-head,
.oo-ui-dialog-content .oo-ui-window-body,
diff --git a/lib/oojs-ui/oojs-ui.js b/lib/oojs-ui/oojs-ui.js
index 11be9b2..7051d78 100644
--- a/lib/oojs-ui/oojs-ui.js
+++ b/lib/oojs-ui/oojs-ui.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-07-30T23:10:48Z
+ * Date: 2014-08-06T12:54:48Z
*/
( function ( OO ) {
@@ -1114,6 +1114,7 @@
// Properties
this.loading = null;
this.config = config;
+ this.dir = null;
// Initialize
this.$element
@@ -1287,7 +1288,7 @@
win = this.$element.prop( 'contentWindow' );
doc = win.document;
- // Figure out directionality:
+ // Cache directionality
this.dir = OO.ui.Element.getDir( this.$element ) || 'ltr';
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (0e50d2e336) - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Update OOjs UI to v0.1.0-pre (0e50d2e336)
..
Update OOjs UI to v0.1.0-pre (0e50d2e336)
New changes:
1283a33 Localisation updates from https://translatewiki.net.
0e50d2e Initialise dir property and use a getter
Change-Id: Ieb469d38e881cf7de284a987301626a2f945d2df
---
M resources/lib/oojs-ui/i18n/zh-hans.json
M resources/lib/oojs-ui/oojs-ui-agora.css
M resources/lib/oojs-ui/oojs-ui-apex.css
M resources/lib/oojs-ui/oojs-ui.js
M resources/lib/oojs-ui/oojs-ui.svg.css
5 files changed, 23 insertions(+), 12 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/lib/oojs-ui/i18n/zh-hans.json
b/resources/lib/oojs-ui/i18n/zh-hans.json
index 50df67a..02bdafa 100644
--- a/resources/lib/oojs-ui/i18n/zh-hans.json
+++ b/resources/lib/oojs-ui/i18n/zh-hans.json
@@ -15,14 +15,15 @@
Xiaomingyan,
Yfdyh000,
Zhangjintao,
- 乌拉跨氪
+ 乌拉跨氪,
+ Great Brightstar
]
},
ooui-outline-control-move-down: 下移项,
ooui-outline-control-move-up: 上移项,
ooui-outline-control-remove: 删除项,
ooui-toolbar-more: 更多,
- ooui-dialog-message-accept: 好,
+ ooui-dialog-message-accept: 确定,
ooui-dialog-message-reject: 取消,
ooui-dialog-process-error: 发生一些错误,
ooui-dialog-process-dismiss: 解除,
diff --git a/resources/lib/oojs-ui/oojs-ui-agora.css
b/resources/lib/oojs-ui/oojs-ui-agora.css
index 525304c..22c3079 100644
--- a/resources/lib/oojs-ui/oojs-ui-agora.css
+++ b/resources/lib/oojs-ui/oojs-ui-agora.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-07-30T23:10:53Z
+ * Date: 2014-08-06T12:56:55Z
*/
.oo-ui-dialog-content .oo-ui-window-head,
.oo-ui-dialog-content .oo-ui-window-body,
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css
b/resources/lib/oojs-ui/oojs-ui-apex.css
index 1267a3c..c53772e 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-07-30T23:10:53Z
+ * Date: 2014-08-06T12:56:55Z
*/
.oo-ui-dialog-content .oo-ui-window-head,
.oo-ui-dialog-content .oo-ui-window-body,
diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js
index 737113e..6f63575 100644
--- a/resources/lib/oojs-ui/oojs-ui.js
+++ b/resources/lib/oojs-ui/oojs-ui.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-07-30T23:10:53Z
+ * Date: 2014-08-06T12:56:55Z
*/
( function ( OO ) {
@@ -1114,6 +1114,7 @@
// Properties
this.loading = null;
this.config = config;
+ this.dir = null;
// Initialize
this.$element
@@ -1287,7 +1288,7 @@
win = this.$element.prop( 'contentWindow' );
doc = win.document;
- // Figure out directionality:
+ // Cache directionality
this.dir = OO.ui.Element.getDir( this.$element ) || 'ltr';
// Initialize contents
@@ -1298,7 +1299,7 @@
doc.write(
'!doctype html' +
'html' +
- 'body class=oo-ui-frame-content oo-ui-' + this.dir +
' dir=' + this.dir + '' +
+ 'body class=oo-ui-frame-content oo-ui-' +
this.getDir() + ' dir=' + this.getDir() + '' +
'/body' +
'/html'
);
@@ -1332,6 +1333,15 @@
};
/**
+ * Get the directionality of the frame
+ *
+ * @return {string} Directionality, 'ltr' or 'rtl'
+ */
+OO.ui.Frame.prototype.getDir = function () {
+ return this.dir;
+};
+
+/**
* Container for elements.
*
* @abstract
diff --git a/resources/lib/oojs-ui/oojs-ui.svg.css
b/resources/lib/oojs-ui/oojs-ui.svg.css
index bffc230..aa5e6ac 100644
--- a/resources/lib/oojs-ui/oojs-ui.svg.css
+++ b/resources/lib/oojs-ui/oojs-ui.svg.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (dd294dc785)
+ * OOjs UI v0.1.0-pre (0e50d2e336)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- *
[MediaWiki-commits] [Gerrit] Whitelist se4598 - change (integration/zuul-config)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/152058 Change subject: Whitelist se4598 .. Whitelist se4598 Trusted volunteer Change-Id: Iced237b863ca1c5e19195a67e992c945190b9775 --- M layout.yaml 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/58/152058/1 diff --git a/layout.yaml b/layout.yaml index cb6dd27..19a43a6 100644 --- a/layout.yaml +++ b/layout.yaml @@ -37,7 +37,7 @@ # TODO: Figure out a way to not have to repeat this from pipeline 'test'. # This email_filter and the one for 'test' can be removed once we have fixed bug 45499. email_filter: -- ^(?!(.*?@wikimedia\.org|.*?@wikimedia\.de|l10n-bot@translatewiki\.net|anomie\.wikipedia@gmail\.com|amir\.aharoni@mail\.huji\.ac\.il|hashar@free\.fr|jeroendedauw@gmail\.com|maxsem\.wiki@gmail\.com|mtraceur@member\.fsf\.org|niklas\.laxstrom@gmail\.com|santhosh\.thottingal@gmail\.com|s\.mazeland@xs4all\.nl|stefan\.petrea@gmail\.com|stefan@garage-coding\.com|roan\.kattouw@gmail\.com|krinklemail@gmail\.com|trevorparscal@gmail\.com|inez@wikia-inc\.com|orbit@framezero\.com|david@sheetmusic\.org\.uk|git@samsmith\.io|glaser@hallowelt\.biz|aude\.wiki@gmail\.com|bawolff\+wn@gmail\.com|bryan\.tongminh@gmail\.com|dereckson@espace-win\.org|hartman\.wiki@gmail\.com|hoo@online\.de|codereview@emsenhuber\.ch|daniel@nadir-seen-fire\.com|jamesin\.hongkong\.1@gmail\.com|krenair@gmail\.com|liangent@gmail\.com|mah@everybody\.org|matma\.rex@gmail\.com|raimond\.spekking@gmail\.com|robinp\.1273@gmail\.com|tim@tim-landscheidt\.de|tylerromeo@gmail\.com|umherirrender_de\.wp@web\.de|yuriastrakhan@gmail\.com|yaron57@gmail\.com|markus@semantic-mediawiki\.org|s7eph4n@gmail\.org|wiki@physikerwelt\.de|addshorewiki@gmail\.com|pragun06@gmail\.com|nilesh@nileshc\.com|benestar\.wikimedia@googlemail\.com|mlazowik@gmail\.com|pleasestand@live\.com|legoktm\.wikipedia@gmail\.com|moriel@gmail\.com|d_entous@yahoo\.com|kartik\.mistry@gmail\.com|drenfro@vistaprint\.com|matanya\.moses@gmail\.com|matanya@foss\.co\.il|andrew\.green\.df@gmail\.com|thomaspt@hotmail\.fr|twkozlowski@gmail\.com|yuvipanda@gmail\.com|aarcos\.wiki@gmail\.com|saper@saper\.info|christian@quelltextlich\.at|maria\.pacana@gmail\.com|bebirchall@gmail\.com|shahyar@gmail\.com|federicoleva@tiscali\.it|jack@countervandalism\.net|at\.light@live\.com\.au|jackmcbarn@gmail\.com|platonides@gmail\.com|jarry1250@gmail\.com|admin@alphacorp\.tk|01tonythomas@gmail\.com|benapetr@gmail\.com|pastakhov@yandex\.ru|hardikjuneja\.hj@gmail\.com|siebrand@kitano\.nl|wctaiwan@gmail\.com|ladsgroup@gmail\.com|info@gno\.de|valhallasw@arctus\.nl|zhorishna@gmail\.com|jayvdb@gmail\.com|skizzerz@gmail\.com|jan\.wikimedia@zerebecki\.de|rillke@wikipedia\.de|mwalker@khaosdev\.com)).*$ +-
[MediaWiki-commits] [Gerrit] Move two users unaffiliated with WMDE out of the WMDE section - change (integration/zuul-config)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/152059 Change subject: Move two users unaffiliated with WMDE out of the WMDE section .. Move two users unaffiliated with WMDE out of the WMDE section Change-Id: I5b9fa0734448fa6186e14a11547f4d94ba0d5c9d --- M layout.yaml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/59/152059/1 diff --git a/layout.yaml b/layout.yaml index 19a43a6..e3806a3 100644 --- a/layout.yaml +++ b/layout.yaml @@ -144,8 +144,6 @@ - ^addshorewiki@gmail\.com$ - ^aude\.wiki@gmail\.com$ - ^hoo@online\.de$ - - ^nilesh@nileshc\.com$ - - ^pragun06@gmail\.com$ # VistaPrint # They are heavily using MediaWiki internally and open sourced @@ -180,9 +178,11 @@ - ^matanya@foss\.co\.il$ - ^matma\.rex@gmail\.com$ - ^mlazowik@gmail\.com$ + - ^nilesh@nileshc\.com$ - ^pastakhov@yandex\.ru$ # PhpTags maintainer - ^platonides@gmail\.com$ - ^pleasestand@live\.com$ + - ^pragun06@gmail\.com$ - ^raimond\.spekking@gmail\.com$ - ^rillke@wikipedia\.de$ - ^robinp\.1273@gmail\.com$ -- To view, visit https://gerrit.wikimedia.org/r/152059 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b9fa0734448fa6186e14a11547f4d94ba0d5c9d Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hoo man h...@online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix missed rename of config.py to config.yaml - change (analytics...web)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152061
Change subject: Fix missed rename of config.py to config.yaml
..
Fix missed rename of config.py to config.yaml
Change-Id: I3bcaa15d1bcbf60e88b7074359cfbb53964aa6ba
---
M fabfile.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web
refs/changes/61/152061/1
diff --git a/fabfile.py b/fabfile.py
index ecc23f4..8e33155 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -35,7 +35,7 @@
@roles('web', 'runner')
def update_config(config_file):
put(config_file, '/srv/quarry/quarry/config.yaml', use_sudo=True)
-sudo('chown quarry:www-data /srv/quarry/quarry/config.py')
+sudo('chown quarry:www-data /srv/quarry/quarry/config.yaml')
@roles('db')
--
To view, visit https://gerrit.wikimedia.org/r/152061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bcaa15d1bcbf60e88b7074359cfbb53964aa6ba
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add new runner node to fabfile - change (analytics...web)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152060
Change subject: Add new runner node to fabfile
..
Add new runner node to fabfile
Change-Id: Ia0fa9057bf418107d80c20ccf3c0df2a29338bea
---
M fabfile.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web
refs/changes/60/152060/1
diff --git a/fabfile.py b/fabfile.py
index d82bd88..ecc23f4 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -3,7 +3,7 @@
env.roledefs = {
'web': ['quarry-web-test.eqiad.wmflabs'],
'db': ['quarry-web-test.eqiad.wmflabs'],
-'runner': ['quarry-runner-test.eqiad.wmflabs']
+'runner': ['quarry-runner-test.eqiad.wmflabs',
'quarry-runner-01.eqiad.wmflabs']
}
env.use_ssh_config = True
--
To view, visit https://gerrit.wikimedia.org/r/152060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0fa9057bf418107d80c20ccf3c0df2a29338bea
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add new runner node to fabfile - change (analytics...web)
jenkins-bot has submitted this change and it was merged.
Change subject: Add new runner node to fabfile
..
Add new runner node to fabfile
Change-Id: Ia0fa9057bf418107d80c20ccf3c0df2a29338bea
---
M fabfile.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/fabfile.py b/fabfile.py
index d82bd88..ecc23f4 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -3,7 +3,7 @@
env.roledefs = {
'web': ['quarry-web-test.eqiad.wmflabs'],
'db': ['quarry-web-test.eqiad.wmflabs'],
-'runner': ['quarry-runner-test.eqiad.wmflabs']
+'runner': ['quarry-runner-test.eqiad.wmflabs',
'quarry-runner-01.eqiad.wmflabs']
}
env.use_ssh_config = True
--
To view, visit https://gerrit.wikimedia.org/r/152060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0fa9057bf418107d80c20ccf3c0df2a29338bea
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix missed rename of config.py to config.yaml - change (analytics...web)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix missed rename of config.py to config.yaml
..
Fix missed rename of config.py to config.yaml
Change-Id: I3bcaa15d1bcbf60e88b7074359cfbb53964aa6ba
---
M fabfile.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/fabfile.py b/fabfile.py
index ecc23f4..8e33155 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -35,7 +35,7 @@
@roles('web', 'runner')
def update_config(config_file):
put(config_file, '/srv/quarry/quarry/config.yaml', use_sudo=True)
-sudo('chown quarry:www-data /srv/quarry/quarry/config.py')
+sudo('chown quarry:www-data /srv/quarry/quarry/config.yaml')
@roles('db')
--
To view, visit https://gerrit.wikimedia.org/r/152061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3bcaa15d1bcbf60e88b7074359cfbb53964aa6ba
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] quarry: Specify uid of user explicitly - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152062
Change subject: quarry: Specify uid of user explicitly
..
quarry: Specify uid of user explicitly
Prevents permission problems on NFS
Change-Id: I88813018c0b420566d1c2843303f89ad9d6d00de
---
M modules/quarry/manifests/init.pp
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/152062/1
diff --git a/modules/quarry/manifests/init.pp b/modules/quarry/manifests/init.pp
index bb5f7c3..43e5b88 100644
--- a/modules/quarry/manifests/init.pp
+++ b/modules/quarry/manifests/init.pp
@@ -20,7 +20,8 @@
user { 'quarry':
ensure = present,
-system = true
+system = true,
+uid= 997
}
file { [$clone_path, $result_path_parent, $result_path]:
--
To view, visit https://gerrit.wikimedia.org/r/152062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I88813018c0b420566d1c2843303f89ad9d6d00de
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: fix ansi escapes for wmf-beta-autoupdater - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152063
Change subject: beta: fix ansi escapes for wmf-beta-autoupdater
..
beta: fix ansi escapes for wmf-beta-autoupdater
* the ANSI escape to reset color was wrong. Fixed it up.
* changed colors scheme entirely
* created entry for level CRITICAL, although it is unused.
Change-Id: I8423bd8e9c072fb8b55622be20b34686e6ca0651
---
M modules/beta/templates/wmf-beta-autoupdate.py.erb
1 file changed, 11 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/63/152063/1
diff --git a/modules/beta/templates/wmf-beta-autoupdate.py.erb
b/modules/beta/templates/wmf-beta-autoupdate.py.erb
index a7fe331..8aea46b 100755
--- a/modules/beta/templates/wmf-beta-autoupdate.py.erb
+++ b/modules/beta/templates/wmf-beta-autoupdate.py.erb
@@ -35,18 +35,21 @@
options = parse_args()
logging.basicConfig(level=options.log_level)
# Color codes http://www.tldp.org/HOWTO/Bash-Prompt-HOWTO/x329.html
-logging.addLevelName(
-logging.DEBUG, \033[0;37m%s\033[1;m %
+logging.addLevelName( # cyan
+logging.DEBUG, \033[36m%s\033[0m %
logging.getLevelName(logging.DEBUG))
-logging.addLevelName(
-logging.INFO, \033[1;33m%s\033[1;m %
+logging.addLevelName( # green
+logging.INFO, \033[32m%s\033[0m %
logging.getLevelName(logging.INFO))
-logging.addLevelName(
-logging.WARNING, \033[1;31m%s\033[1;m %
+logging.addLevelName( # yellow
+logging.WARNING, \033[33m%s\033[0m %
logging.getLevelName(logging.WARNING))
-logging.addLevelName(
-logging.ERROR, \033[1;41m%s\033[1;m %
+logging.addLevelName( # red
+logging.ERROR, \033[31m%s\033[0m %
logging.getLevelName(logging.ERROR))
+ logging.addLevelName( # red background
+ logging.CRITICAL, \033[41m%s\033[0m %
+ logging.getLevelName(logging.CRITICAL))
logger = logging.getLogger('main')
--
To view, visit https://gerrit.wikimedia.org/r/152063
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8423bd8e9c072fb8b55622be20b34686e6ca0651
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid dependance on a WikiEditor class that have been recent... - change (mediawiki...ProofreadPage)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid dependance on a WikiEditor class that have been recently
removed
..
Avoid dependance on a WikiEditor class that have been recently removed
Change-Id: Id6e16577646358714d9e9d42a89edef825244370
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Phe: Looks good to me, but someone else must approve
Tpt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/page/ext.proofreadpage.page.edit.js
b/modules/page/ext.proofreadpage.page.edit.js
index 28c428e..b0b3f25 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -217,7 +217,7 @@
}
mw.loader.using( 'ext.wikiEditor', function() {
$editForm.find( '.prp-page-edit-body' ).append( $(
'#wpTextbox1' ) );
- $editForm.find( '.wikiEditor-oldToolbar' ).after(
$editForm.find( '.wikiEditor-ui' ) );
+ $editForm.find( '.editOptions' ).before(
$editForm.find( '.wikiEditor-ui' ) );
$editForm.find( '.wikiEditor-ui-text' ).append(
$editForm.find( '.prp-page-container' ) );
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/152029
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id6e16577646358714d9e9d42a89edef825244370
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt thoma...@hotmail.fr
Gerrit-Reviewer: Phe phil...@free.fr
Gerrit-Reviewer: Tpt thoma...@hotmail.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixes Algerian messages file so it does not convert to Arabi... - change (mediawiki/core)
Jsahleen has uploaded a new change for review. https://gerrit.wikimedia.org/r/152064 Change subject: Fixes Algerian messages file so it does not convert to Arabic digits. .. Fixes Algerian messages file so it does not convert to Arabic digits. Bug: 69172 Change-Id: I8ba9e135daa2fc80907703b1023172c680fa571b --- M languages/messages/MessagesArq.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/64/152064/1 diff --git a/languages/messages/MessagesArq.php b/languages/messages/MessagesArq.php index 0fcf660..19e070f 100644 --- a/languages/messages/MessagesArq.php +++ b/languages/messages/MessagesArq.php @@ -8,5 +8,7 @@ * */ +$digitTransformTable = Null; + $fallback = 'ar'; -- To view, visit https://gerrit.wikimedia.org/r/152064 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8ba9e135daa2fc80907703b1023172c680fa571b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jsahleen jsahl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Check if view should be added before creating it - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152065
Change subject: Check if view should be added before creating it
..
Check if view should be added before creating it
Check in the hooks if something should be added not when it is created. So
the authors box was added on some special pages for example
Change-Id: I508a6579e2068ebd177889760e53b6dc8507b2e5
---
M Authors/Authors.class.php
1 file changed, 17 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/65/152065/1
diff --git a/Authors/Authors.class.php b/Authors/Authors.class.php
index b07db22..c5edec2 100644
--- a/Authors/Authors.class.php
+++ b/Authors/Authors.class.php
@@ -160,10 +160,15 @@
* @return bool always true
*/
public function onSkinTemplateOutputPageBeforeExec( $skin, $tpl ) {
- global $wgDefaultSkin;
- if ( $wgDefaultSkin != bluespiceskin ){
+ if ( $this-checkContext() === false ) {
return true;
}
+
+ global $wgDefaultSkin;
+ if ( $wgDefaultSkin != bluespiceskin ) {
+ return true;
+ }
+
$oAuthorsView = $this-getAuthorsViewForAfterContent( $skin );
$tpl-data['bs_dataAfterContent']['bs-authors'] = array(
'position' = 10,
@@ -181,20 +186,22 @@
* @return boolean
*/
public function onSkinAfterContent( $data, $sktemplate ) {
- global $wgDefaultSkin;
- if ( $wgDefaultSkin == bluespiceskin )
+ if ( $this-checkContext() === false ) {
return true;
- $oAuthorsView = $this-getAuthorsViewForAfterContent(
$sktemplate );
- if ( $oAuthorsView instanceof ViewAuthors ) {
- $data .= $oAuthorsView-execute();
}
+
+ global $wgDefaultSkin;
+ if ( $wgDefaultSkin == bluespiceskin ) {
+ return true;
+ }
+
+ $oAuthorsView = $this-getAuthorsViewForAfterContent(
$sktemplate );
+ $data .= $oAuthorsView-execute();
+
return true;
}
private function getAuthorsViewForAfterContent( $oSkin ) {
- if ( $this-checkContext() === false ) {
- return true;
- }
$oTitle = $oSkin-getTitle();
//Read in config variables
--
To view, visit https://gerrit.wikimedia.org/r/152065
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I508a6579e2068ebd177889760e53b6dc8507b2e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed superfluous char - change (mediawiki...BlueSpiceExtensions)
Smuggli has submitted this change and it was merged.
Change subject: Removed superfluous char
..
Removed superfluous char
: is already included in message
Change-Id: Ie0093d6dff91bba838dc197847badf8d05c7a3c7
---
M ExtendedSearch/includes/SearchIndex/SearchIndex.class.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
diff --git a/ExtendedSearch/includes/SearchIndex/SearchIndex.class.php
b/ExtendedSearch/includes/SearchIndex/SearchIndex.class.php
index eddb14a..7fab828 100644
--- a/ExtendedSearch/includes/SearchIndex/SearchIndex.class.php
+++ b/ExtendedSearch/includes/SearchIndex/SearchIndex.class.php
@@ -216,7 +216,7 @@
*/
public function createErrorMessageView( $sMessage ) {
$res = new ViewBaseElement();
- $res-setTemplate( 'div id=bs-es-searchterm-error' .
wfMessage( 'bs-extendedsearch-error' )-plain() . ': {message}/div' );
+ $res-setTemplate( 'div id=bs-es-searchterm-error' .
wfMessage( 'bs-extendedsearch-error' )-plain() . ' {message}/div' );
$res-addData( array( 'message' = wfMessage( $sMessage
)-plain() ) );
return $res;
}
--
To view, visit https://gerrit.wikimedia.org/r/152030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0093d6dff91bba838dc197847badf8d05c7a3c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Swidmann widm...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
