[MediaWiki-commits] [Gerrit] puppet3: fix $mariadb dynamic lookup - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: puppet3: fix $mariadb dynamic lookup
..
puppet3: fix $mariadb dynamic lookup
Change-Id: I001748655bb6a5513b6d0b66852ec2721d440480
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/coredb_mysql/manifests/packages.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
Springle: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/coredb_mysql/manifests/packages.pp
b/modules/coredb_mysql/manifests/packages.pp
index 41a03ad..2eb53c5 100644
--- a/modules/coredb_mysql/manifests/packages.pp
+++ b/modules/coredb_mysql/manifests/packages.pp
@@ -1,5 +1,5 @@
# coredb_mysql required packages
-class coredb_mysql::packages {
+class coredb_mysql::packages ( $mariadb = $::coredb_mysql::mariadb ) {
if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '12.04') =
0 {
if $mariadb == true {
file { '/etc/apt/sources.list.d/wikimedia-mariadb.list':
--
To view, visit https://gerrit.wikimedia.org/r/134374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I001748655bb6a5513b6d0b66852ec2721d440480
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@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] Make default wgContentTranslationServerURL match default cxs... - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review. https://gerrit.wikimedia.org/r/134565 Change subject: Make default wgContentTranslationServerURL match default cxserver port .. Make default wgContentTranslationServerURL match default cxserver port Change-Id: Ib10e46f0512aacbaf569bf6cbf722939d373476c --- M ContentTranslation.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/65/134565/1 diff --git a/ContentTranslation.php b/ContentTranslation.php index 567d104..2b92c38 100644 --- a/ContentTranslation.php +++ b/ContentTranslation.php @@ -45,7 +45,7 @@ $GLOBALS['wgMessagesDirs']['ContentTranslation'] = $dir/i18n; // Content translation server URL -$GLOBALS['wgContentTranslationServerURL'] = 'http://localhost:8000'; +$GLOBALS['wgContentTranslationServerURL'] = 'http://localhost:8080'; $GLOBALS['wgContentTranslationServerTimeout'] = 15; $GLOBALS['wgContentTranslationParsoid'] = array( -- To view, visit https://gerrit.wikimedia.org/r/134565 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib10e46f0512aacbaf569bf6cbf722939d373476c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] simple helper script to convert scripts from compat to... - change (pywikibot/compat)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134566
Change subject: [WIP] simple helper script to convert scripts from compat to
core
..
[WIP] simple helper script to convert scripts from compat to core
Change-Id: I1fdcea46c4a3beeb0eb34a5c3c3c33b4c0c23ccf
---
A compat2core.py
1 file changed, 88 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat
refs/changes/66/134566/1
diff --git a/compat2core.py b/compat2core.py
new file mode 100644
index 000..e0e64fb
--- /dev/null
+++ b/compat2core.py
@@ -0,0 +1,88 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+This is a helper script to convert compat 1.0 scripts to the new core 2.0
+framework
+
+#
+# (C) xqt, 2014
+#
+# Distributed under the terms of the MIT license.
+#
+__version__ = '$Id$'
+#
+
+import os
+import codecs
+import wikipedia as pywikibot
+
+replacements = (
+('import wikipedia as pywikibot', 'import pywikibot'),
+('import wikipedia', 'import pywikibot'),
+('import pagegenerator', 'from pywikibot import pagegenerator'),
+('import config', 'from pywikibot import config'),
+('import catlib', ''),
+('import userlib', ''),
+('wikipedia.', u'pywikibot.'),
+('pywikibot.getSite(', 'pywikibot.Site('),
+('catlib.Category(', 'pywikibot.Category('),
+('userlib.User(', 'pywikibot.User('),
+)
+
+
+class ConvertBot(object):
+
+def __init__(self, filename=None):
+self.source = filename
+
+def run(self):
+self.get_source()
+self.get_dest()
+self.convert()
+pywikibot.output(u'\nDone.')
+
+def get_source(self):
+while True:
+if self.source is None:
+self.source = pywikibot.input(
+'Please input the .py file to convert '
+'(no input to leave):')
+if not self.source:
+exit()
+if not self.source.endswith(u'.py'):
+self.source += '.py'
+if os.path.exists(self.source):
+break
+pywikibot.output(u'%s does not exist. Please retry.' % self.source)
+self.source = None
+
+def get_dest(self):
+self.dest = u'%s-core.%s' % tuple(self.source.rsplit(u'.', 1))
+pywikibot.output(u'Destination file is %s.' % self.dest)
+
+def convert(self):
+f = codecs.open(self.source, r, utf-8)
+g = codecs.open(self.dest, w, utf-8)
+for i, line in enumerate(f):
+for r in replacements:
+line = unicode(line).replace(r[0], r[1])
+g.write(line)
+if i % 50 == 0:
+pywikibot.output('.', newline=False)
+f.close()
+g.close()
+
+
+def main():
+filename = None
+
+# Parse command line arguments for -help option
+for arg in pywikibot.handleArgs():
+pass
+bot = ConvertBot(filename)
+bot.run()
+
+
+if __name__ == __main__:
+pywikibot.stopme() # we do not work on any site
+main()
--
To view, visit https://gerrit.wikimedia.org/r/134566
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1fdcea46c4a3beeb0eb34a5c3c3c33b4c0c23ccf
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] typo - change (wikimedia...tools)
Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134567
Change subject: typo
..
typo
Change-Id: I0a04bdf729e38d319bf07e238f007f3bb37c5eb8
---
M AmazonAudit/amazon-audit.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools
refs/changes/67/134567/1
diff --git a/AmazonAudit/amazon-audit.py b/AmazonAudit/amazon-audit.py
index 4c0efcf..5819d50 100755
--- a/AmazonAudit/amazon-audit.py
+++ b/AmazonAudit/amazon-audit.py
@@ -42,7 +42,7 @@
_config.read(fileList)
# === Open up ze STOMP ===
-_stompLink = DistStomp(config.get('Stomp', 'server'),
config.getint('Stomp', 'port'))
+_stompLink = DistStomp(_config.get('Stomp', 'server'),
_config.getint('Stomp', 'port'))
_stompLink.connect()
# === Connection to Amazon ===
--
To view, visit https://gerrit.wikimedia.org/r/134567
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a04bdf729e38d319bf07e238f007f3bb37c5eb8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Adamw awi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Failmail module - change (wikimedia...tools)
Adamw has submitted this change and it was merged.
Change subject: Failmail module
..
Failmail module
Change-Id: I01fd608afef990f26c5ddda52100955249a865ab
---
A failmail/__init__.py
A failmail/mailer.py
2 files changed, 37 insertions(+), 0 deletions(-)
Approvals:
Mwalker: Looks good to me, approved
jenkins-bot: Verified
diff --git a/failmail/__init__.py b/failmail/__init__.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/failmail/__init__.py
diff --git a/failmail/mailer.py b/failmail/mailer.py
new file mode 100644
index 000..0d53d35
--- /dev/null
+++ b/failmail/mailer.py
@@ -0,0 +1,37 @@
+from email.mime.text import MIMEText
+import smtplib
+import sys
+import traceback
+import yaml
+
+from process.globals import config
+from process.logging import Logger as log
+
+class FailMailer(object):
+@staticmethod
+def mail(errorcode, data=None, print_exception=False):
+body =
+if print_exception:
+exception_info =
.join(traceback.format_exception(*sys.exc_info()))
+body = body + exception_info
+if data:
+if not isinstance(data, basestring):
+data = yaml.safe_dump([data], default_flow_style=False)
+body = body + \n\nWhile processing:\n{data}.format(data=data)
+
+log.error(sending failmail: + body)
+
+msg = MIMEText(body)
+
+from_address = config.failmail_sender
+to_address = config.failmail_recipients
+if hasattr(to_address, 'split'):
+to_address = to_address.split(,)
+
+msg['Subject'] = Fail Mail: {code}
({process}).format(code=errorcode, process=config.app_name)
+msg['From'] = from_address
+msg['To'] = to_address[0]
+
+mailer = smtplib.SMTP('localhost')
+mailer.sendmail(from_address, to_address, msg.as_string())
+mailer.quit()
--
To view, visit https://gerrit.wikimedia.org/r/134275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I01fd608afef990f26c5ddda52100955249a865ab
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Adamw awi...@wikimedia.org
Gerrit-Reviewer: Adamw awi...@wikimedia.org
Gerrit-Reviewer: Mwalker mwal...@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] Failmail on recoverable errors during PayPal audit - change (wikimedia...tools)
Adamw has submitted this change and it was merged.
Change subject: Failmail on recoverable errors during PayPal audit
..
Failmail on recoverable errors during PayPal audit
Change-Id: I06878cccdaa61cca51f85ab5e5d1b91823714c3a
---
M audit/paypal/ppreport.py
M process/globals.py
2 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
Mwalker: Looks good to me, approved
jenkins-bot: Verified
diff --git a/audit/paypal/ppreport.py b/audit/paypal/ppreport.py
index 958cb9a..d83865c 100644
--- a/audit/paypal/ppreport.py
+++ b/audit/paypal/ppreport.py
@@ -1,5 +1,6 @@
import io
+from failmail.mailer import FailMailer
from process.logging import Logger as log
from unicode_csv_reader import unicode_csv_reader
@@ -40,7 +41,10 @@
for line in plainreader:
row = dict(zip(column_headers, line))
if row['Column Type'] == 'SB':
-callback(row)
+try:
+callback(row)
+except:
+FailMailer.mail('BAD_AUDIT_LINE', data=row,
print_exception=True)
elif row['Column Type'] in ('SF', 'SC', 'RF', 'RC', 'FF'):
pass
else:
diff --git a/process/globals.py b/process/globals.py
index 1678374..edb6aa5 100644
--- a/process/globals.py
+++ b/process/globals.py
@@ -28,6 +28,8 @@
config = DictAsAttrDict(load_yaml(file(filename, 'r')))
log.info(Loaded config from {path}..format(path=filename))
+config.app_name = app_name
+
return
raise Exception(No config found, searched + , .join(search_filenames))
--
To view, visit https://gerrit.wikimedia.org/r/134276
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I06878cccdaa61cca51f85ab5e5d1b91823714c3a
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Adamw awi...@wikimedia.org
Gerrit-Reviewer: Adamw awi...@wikimedia.org
Gerrit-Reviewer: Mwalker mwal...@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] Merge remote-tracking branch 'origin/master' into HEAD - change (wikimedia...tools)
Adamw has uploaded a new change for review. https://gerrit.wikimedia.org/r/134568 Change subject: Merge remote-tracking branch 'origin/master' into HEAD .. Merge remote-tracking branch 'origin/master' into HEAD Change-Id: I779ad25f0e72da6149173d10a5356ee79dfec76d --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools refs/changes/68/134568/1 -- To view, visit https://gerrit.wikimedia.org/r/134568 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I779ad25f0e72da6149173d10a5356ee79dfec76d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/tools Gerrit-Branch: master Gerrit-Owner: Adamw awi...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'origin/master' into HEAD - change (wikimedia...tools)
Adamw has uploaded a new change for review. https://gerrit.wikimedia.org/r/134569 Change subject: Merge remote-tracking branch 'origin/master' into HEAD .. Merge remote-tracking branch 'origin/master' into HEAD Change-Id: I7a5d0e1fc35a325cebaee0c1ea2cf60bf9dd9919 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools refs/changes/69/134569/1 -- To view, visit https://gerrit.wikimedia.org/r/134569 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7a5d0e1fc35a325cebaee0c1ea2cf60bf9dd9919 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/tools Gerrit-Branch: deploy Gerrit-Owner: Adamw awi...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'origin/master' into HEAD - change (wikimedia...tools)
Adamw has submitted this change and it was merged. Change subject: Merge remote-tracking branch 'origin/master' into HEAD .. Merge remote-tracking branch 'origin/master' into HEAD Change-Id: I7a5d0e1fc35a325cebaee0c1ea2cf60bf9dd9919 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Adamw: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/134569 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7a5d0e1fc35a325cebaee0c1ea2cf60bf9dd9919 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/tools Gerrit-Branch: deploy Gerrit-Owner: Adamw awi...@wikimedia.org Gerrit-Reviewer: Adamw awi...@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] prevent apache2 service log churn on non-web mediawiki servers - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: prevent apache2 service log churn on non-web mediawiki servers
..
prevent apache2 service log churn on non-web mediawiki servers
This fixes a bug I introduced in the patch series that culminated in
Ie0807c706, the result of which is the apache2 service getting picked up by the
non-web application servers.
* Rename mediawiki::service to mediawiki::web
* Move contents of mediawiki::config::apache to mediawiki::web
* ...with the exception of File['/etc/cluster'], which belongs in init.pp.
* Include mediawiki::web in role::mediawiki::webserver.
There is substantial clean-up work remaining: the whole mediawiki::config::*
hierarchy ought to be dissolved, with mediawiki::config::php moved up to
mediawiki::php, but this is a first step.
To validate this patch after it is merged:
* Run Puppet on mw1114 (api), mw1021 (app), mw1149 (bits) and confirm that the
patch is a no-op on these host classes.
* Run Puppet on mw1157 (image scaler), mw1002 (job runner), and tmh1001 (video
scaler) and confirm that the apache service is stopped and not restarted.
Change-Id: I0b2580a757fc1c54987a290d1d3aaf006f7f794e
---
M manifests/role/mediawiki.pp
D modules/mediawiki/manifests/config/apache.pp
M modules/mediawiki/manifests/init.pp
D modules/mediawiki/manifests/service.pp
A modules/mediawiki/manifests/web.pp
5 files changed, 87 insertions(+), 91 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index aeb9be3..fae4df9 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -95,7 +95,9 @@
role::mediawiki,
role::mediawiki::configuration::php
-class { ::mediawiki::config::apache: maxclients = $maxclients }
+class { '::mediawiki::web':
+maxclients = $maxclients,
+}
class { '::mediawiki::syslog':
apache_log_aggregator =
$role::mediawiki::mediawiki_log_aggregator,
diff --git a/modules/mediawiki/manifests/config/apache.pp
b/modules/mediawiki/manifests/config/apache.pp
deleted file mode 100644
index d6f99d7..000
--- a/modules/mediawiki/manifests/config/apache.pp
+++ /dev/null
@@ -1,53 +0,0 @@
-# Configuration files for apache running on application servers
-# note: it uses $cluster for the apache2.conf
-#
-# requires mediawiki::packages to be in place
-class mediawiki::config::apache(
-$maxclients='40'
-) {
-require mediawiki::packages
-
-Class['mediawiki::config::apache'] - Class['mediawiki::config::base']
-
-file { '/etc/apache2/apache2.conf':
-owner = root,
-group = root,
-mode= '0444',
-content = template('mediawiki/apache/apache2.conf.erb'),
-}
-file { '/etc/apache2/envvars':
-owner = root,
-group = root,
-mode = '0444',
-source = 'puppet:///modules/mediawiki/apache/envvars.appserver',
-}
-file { '/etc/cluster':
-owner = root,
-group = root,
-mode= '0444',
-content = $::site,
-}
-
-if $::realm == 'production' {
-file { '/usr/local/apache':
-ensure = directory,
-}
-exec { 'sync apache wmf config':
-require = File['/usr/local/apache'],
-path= '/bin:/sbin:/usr/bin:/usr/sbin',
-command = 'rsync -av 10.0.5.8::httpdconf/ /usr/local/apache/conf',
-creates = '/usr/local/apache/conf',
-notify = Service[apache]
-}
-} else { # labs
-# bug 38996 - Apache service does not run on start, need a fake
-# sync to start it up though don't bother restarting it is already
-# running.
-exec { 'Fake sync apache wmf config on beta':
-command = '/bin/true',
-unless = '/bin/ps -C apache2 /dev/null',
-notify = Service[apache],
-}
-}
-
-}
diff --git a/modules/mediawiki/manifests/init.pp
b/modules/mediawiki/manifests/init.pp
index 9aff034..16f3f55 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -4,7 +4,13 @@
include ::mediawiki::cgroup
include ::mediawiki::packages
include ::mediawiki::config::base
-include ::mediawiki::service
+
+file { '/etc/cluster':
+owner = 'root',
+group = 'root',
+mode= '0444',
+content = $::site,
+}
class { '::twemproxy':
default_file = 'puppet:///modules/mediawiki/twemproxy.default',
diff --git a/modules/mediawiki/manifests/service.pp
b/modules/mediawiki/manifests/service.pp
deleted file mode 100644
index bacc76f..000
--- a/modules/mediawiki/manifests/service.pp
+++ /dev/null
@@ -1,36 +0,0 @@
-# mediawiki::service
-
-class mediawiki::service {
-require
[MediaWiki-commits] [Gerrit] Fix monolingual-text parser registration - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review. https://gerrit.wikimedia.org/r/134570 Change subject: Fix monolingual-text parser registration .. Fix monolingual-text parser registration This fixes I07d2e56d2f6dfc0bf329dfdca99c76fe69836402. Change-Id: I22a881bb026f957d88ce0c9cadfadaf42b06899b --- M repo/Wikibase.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/70/134570/1 diff --git a/repo/Wikibase.php b/repo/Wikibase.php index b132cf1..dbbea8a 100644 --- a/repo/Wikibase.php +++ b/repo/Wikibase.php @@ -86,7 +86,7 @@ $wgValueParsers['time'] = 'Wikibase\Lib\Parsers\TimeParser'; $wgValueParsers['globecoordinate'] = 'ValueParsers\GlobeCoordinateParser'; $wgValueParsers['null'] = 'ValueParsers\NullParser'; - $wgValueParsers['monolongualtext'] = 'Wikibase\Parsers\MonolingualTextParser'; + $wgValueParsers['monolingual-text'] = 'Wikibase\Parsers\MonolingualTextParser'; // API module registration $wgAPIModules['wbgetentities'] = 'Wikibase\Api\GetEntities'; -- To view, visit https://gerrit.wikimedia.org/r/134570 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22a881bb026f957d88ce0c9cadfadaf42b06899b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Get DataTypeFactory from Wikibase{Client, Repo} directly - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134571
Change subject: Get DataTypeFactory from Wikibase{Client,Repo} directly
..
Get DataTypeFactory from Wikibase{Client,Repo} directly
Change-Id: I1de9262e12c2703dd05cb279daab9d9abee7caf4
---
M lib/resources/Resources.php
1 file changed, 4 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/71/134571/1
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 5328a0f..30b133e 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -74,30 +74,15 @@
'mw.config.values.wbDataTypes' = $moduleTemplate + array(
'class' = 'DataTypes\DataTypesModule',
'datatypefactory' = function() {
- // TODO: extreme uglynes here! Get rid of this
method!
+ // TODO: relative uglynes here! Get rid of this
method!
if ( defined( 'WB_VERSION' ) ) { // repo mode
- $repo =
WikibaseRepo::getDefaultInstance();
- $entityIdParser =
$repo-getEntityIdParser();
- $entityLookup =
$repo-getEntityLookup();
+ $wikibase =
WikibaseRepo::getDefaultInstance();
} elseif ( defined( 'WBC_VERSION' ) ) { //
client mode
- $client =
WikibaseClient::getDefaultInstance();
- $entityIdParser =
$client-getEntityIdParser();
- $entityLookup =
$client-getStore()-getEntityLookup();
+ $wikibase =
WikibaseClient::getDefaultInstance();
} else {
throw new \RuntimeException( Neither
repo nor client found! );
}
-
- $settings = Settings::singleton();
-
- $urlSchemes = $settings-getSetting(
'urlSchemes' );
- $builders = new WikibaseDataTypeBuilders(
$entityLookup, $entityIdParser, $urlSchemes );
-
- $typeBuilderSpecs = array_intersect_key(
- $builders-getDataTypeBuilders(),
- array_flip( $settings-getSetting(
'dataTypes' ) )
- );
-
- return new DataTypeFactory( $typeBuilderSpecs );
+ return $wikibase-getDataTypeFactory();
},
'datatypesconfigvarname' = 'wbDataTypes',
),
--
To view, visit https://gerrit.wikimedia.org/r/134571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1de9262e12c2703dd05cb279daab9d9abee7caf4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move DataTypeBuilder test for quantity out of experimental - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134572
Change subject: Move DataTypeBuilder test for quantity out of experimental
..
Move DataTypeBuilder test for quantity out of experimental
Change-Id: Id251c1f185a9e757c92499aea857a5a0b7eb7adf
---
M lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
1 file changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/72/134572/1
diff --git a/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
b/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
index 0582ff1..0138867 100644
--- a/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
+++ b/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
@@ -158,14 +158,15 @@
array( 'url', new StringValue( ' http://acme.com' ),
false, 'URL with leading space' ),
array( 'url', new StringValue( 'http://acme.com ' ),
false, 'URL with trailing space' ),
+
+ //quantity
+ array( 'quantity', QuantityValue::newFromNumber( 5 ),
true, 'Simple integer' ),
+ array( 'quantity', QuantityValue::newFromNumber( 5, 'm'
), false, 'We don\'t support units yet' ),
+ array( 'quantity', QuantityValue::newFromDecimal(
'-11.234', '1', '-10', '-12' ), true, 'decimal strings' ),
);
if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
$cases = array_merge( $cases, array(
- //quantity
- array( 'quantity',
QuantityValue::newFromNumber( 5 ), true, 'Simple integer' ),
- array( 'quantity',
QuantityValue::newFromNumber( 5, 'm' ), false, 'We don\'t support units yet' ),
- array( 'quantity',
QuantityValue::newFromDecimal( '-11.234', '1', '-10', '-12' ), true, 'decimal
strings' ),
//
) );
--
To view, visit https://gerrit.wikimedia.org/r/134572
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id251c1f185a9e757c92499aea857a5a0b7eb7adf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix MonolingualText DataType building and add tests - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134573
Change subject: Fix MonolingualText DataType building and add tests
..
Fix MonolingualText DataType building and add tests
Change-Id: I85fdcaa86f74a0a34ac57f16514399f67a6a9892
---
M lib/includes/WikibaseDataTypeBuilders.php
M lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
2 files changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/73/134573/1
diff --git a/lib/includes/WikibaseDataTypeBuilders.php
b/lib/includes/WikibaseDataTypeBuilders.php
index 1683054..29a74c5 100644
--- a/lib/includes/WikibaseDataTypeBuilders.php
+++ b/lib/includes/WikibaseDataTypeBuilders.php
@@ -182,10 +182,10 @@
new MembershipValidator( Utils::getLanguageCodes() )
);
- $topValidator = new CompositeValidator(
+ $topValidator = new DataValueValidator( new CompositeValidator(
array( $textValidator, $languageValidator ),
true
- );
+ ) );
return new DataType( $id, 'monolingual-text', array( new
TypeValidator( 'DataValues\DataValue' ), $topValidator ) );
}
diff --git a/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
b/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
index 0582ff1..2971872 100644
--- a/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
+++ b/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
@@ -6,6 +6,7 @@
use DataTypes\DataTypeFactory;
use DataValues\GlobeCoordinateValue;
use DataValues\LatLongValue;
+use DataValues\MonolingualTextValue;
use DataValues\NumberValue;
use DataValues\QuantityValue;
use DataValues\StringValue;
@@ -162,11 +163,15 @@
if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
$cases = array_merge( $cases, array(
+
//quantity
array( 'quantity',
QuantityValue::newFromNumber( 5 ), true, 'Simple integer' ),
array( 'quantity',
QuantityValue::newFromNumber( 5, 'm' ), false, 'We don\'t support units yet' ),
array( 'quantity',
QuantityValue::newFromDecimal( '-11.234', '1', '-10', '-12' ), true, 'decimal
strings' ),
+ array( 'monolingual-text', new
MonoLingualTextValue( 'en', 'text' ), true, 'Simple value' ),
+ array( 'monolingual-text', new
MonoLingualTextValue( 'grrr', 'text' ), false, 'Not a valid language' ),
+
//
) );
}
--
To view, visit https://gerrit.wikimedia.org/r/134573
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I85fdcaa86f74a0a34ac57f16514399f67a6a9892
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] whitespace fixup - change (mediawiki/core)
Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134574
Change subject: whitespace fixup
..
whitespace fixup
Change-Id: Id3164f1a36d3b36f2e7404af5dd0545049e2b778
---
M includes/EditPage.php
1 file changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/74/134574/1
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 1035ad4..ca11f16 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1597,7 +1597,8 @@
# Check image redirect
if ( $this-mTitle-getNamespace() == NS_FILE
$textbox_content-isRedirect()
- !$wgUser-isAllowed( 'upload' ) ) {
+ !$wgUser-isAllowed( 'upload' )
+ ) {
$code = $wgUser-isAnon() ?
self::AS_IMAGE_REDIRECT_ANON : self::AS_IMAGE_REDIRECT_LOGGED;
$status-setResult( false, $code );
@@ -1959,7 +1960,7 @@
}
// Check for length errors again now that the section is merged
in
- $this-kblength = (int)( strlen( $this-toEditText(
$content ) ) / 1024 );
+ $this-kblength = (int)( strlen( $this-toEditText( $content )
) / 1024 );
if ( $this-kblength $wgMaxArticleSize ) {
$this-tooBig = true;
$status-setResult( false,
self::AS_MAX_ARTICLE_SIZE_EXCEEDED );
@@ -1972,8 +1973,8 @@
( ( $this-minoredit !$this-isNew ) ? EDIT_MINOR :
0 ) |
( $bot ? EDIT_FORCE_BOT : 0 );
- $doEditStatus = $this-mArticle-doEditContent(
$content, $this-summary, $flags,
-
false, null, $this-contentFormat );
+ $doEditStatus = $this-mArticle-doEditContent( $content,
$this-summary, $flags,
+
false, null, $this-contentFormat );
if ( !$doEditStatus-isOK() ) {
// Failure from doEdit()
@@ -3482,7 +3483,6 @@
if ( $this-mTriedSave !$this-mTokenOk ) {
if ( $this-mTokenOkExceptSuffix ) {
$note = wfMessage(
'token_suffix_mismatch' )-plain();
-
} else {
$note = wfMessage(
'session_fail_preview' )-plain();
}
@@ -3890,11 +3890,11 @@
#$categories = $skin-getCategoryLinks();
$s =
- '?xml version=1.0 encoding=UTF-8 ?' . \n .
- Xml::tags( 'livepreview', null,
- Xml::element( 'preview', null, $previewText )
- #. Xml::element( 'category', null, $categories )
- );
+ '?xml version=1.0 encoding=UTF-8 ?' . \n .
+ Xml::tags( 'livepreview', null,
+ Xml::element( 'preview', null, $previewText )
+ #. Xml::element( 'category', null,
$categories )
+ );
echo $s;
}
--
To view, visit https://gerrit.wikimedia.org/r/134574
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3164f1a36d3b36f2e7404af5dd0545049e2b778
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Adamw awi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correct a comment about updateRevisionOn - change (mediawiki/core)
Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134575
Change subject: Correct a comment about updateRevisionOn
..
Correct a comment about updateRevisionOn
to reflect its compare-and-swap semantics.
Change-Id: I6a68e673195e0b6688f6fbc9199a8355b20c0da0
---
M includes/WikiPage.php
1 file changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/75/134575/1
diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index 9a26c15..9d07b37 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -1838,11 +1838,7 @@
// Update page
//
- // Note that we use $this-mLatest
instead of fetching a value from the master DB
- // during the course of this function.
This makes sure that EditPage can detect
- // edit conflicts reliably, either by
$ok here, or by $article-getTimestamp()
- // before this function is called. A
previous function used a separate query, this
- // creates a window where concurrent
edits can cause an ignored edit conflict.
+ // We check for conflicts by comparing
$oldid with the current latest revision ID.
$ok = $this-updateRevisionOn( $dbw,
$revision, $oldid, $oldIsRedirect );
if ( !$ok ) {
--
To view, visit https://gerrit.wikimedia.org/r/134575
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a68e673195e0b6688f6fbc9199a8355b20c0da0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Adamw awi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed incorrect sub-pipeline option for HTML params - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixed incorrect sub-pipeline option for HTML params
..
Fixed incorrect sub-pipeline option for HTML params
Change-Id: If26da0219d63fb2aad22301f045d922f27a62ce8
---
M lib/ext.core.TemplateHandler.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Marcoil: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/ext.core.TemplateHandler.js b/lib/ext.core.TemplateHandler.js
index e52829a..d379b79 100644
--- a/lib/ext.core.TemplateHandler.js
+++ b/lib/ext.core.TemplateHandler.js
@@ -728,7 +728,7 @@
{
pipelineType: text/x-mediawiki/full,
pipelineOpts: {
- isInclude: true,
+ isInclude: false,
wrapTemplates: true,
inBlockToken: true,
// TODO: This helps in the case of unnamed
--
To view, visit https://gerrit.wikimedia.org/r/134371
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If26da0219d63fb2aad22301f045d922f27a62ce8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: Marcoil marc...@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] Docs: Added documentation about supported parsing pipeline o... - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Docs: Added documentation about supported parsing pipeline
options.
..
Docs: Added documentation about supported parsing pipeline options.
* There is some scope for cleaning up some of these in the coming
weeks/months once we get the block-token related paragraph wrapping
code fixed.
Change-Id: I182a3af04c8b6c5518b884f49ced932b804396a6
---
M lib/mediawiki.parser.js
1 file changed, 19 insertions(+), 0 deletions(-)
Approvals:
Marcoil: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki.parser.js b/lib/mediawiki.parser.js
index 308639e..917639f 100644
--- a/lib/mediawiki.parser.js
+++ b/lib/mediawiki.parser.js
@@ -302,6 +302,25 @@
* Get a subpipeline (not the top-level one) of a given type.
*
* Subpipelines are cached as they are frequently created.
+ *
+ * Supported options:
+ *
+ * wrapTemplates : if true, templates found in content will be encapsulated
+ * inTemplate: if true, indicates pipeline is processing content of a
template
+ * (in current usage, wrapTemplates === !inTemplate)
+ * isInclude : if true, indicates that we are in a includeonly context
+ * (in current usage, isInclude === inTemplate)
+ * extTag: the extension tag that is being processed (Ex: ref,
references)
+ * (in current usage, only used for native tag
implementation)
+ * extTagId : any id assigned to the extension tag (ex: references)
+ * inBlockToken : used to influence paragraph-wrapping for transclusion
content
+ * (in current usage, this looks like this is always true
+ *for sub-pipelines. once html+tidy setup is completed for
+ *parser tests, paragraph-wrapping code will get a fixup
and
+ *this flag might not be necessary actually)
+ * noPre : suppress indent-pre processing for content in this
pipeline
+ * attrExpansion : are we processing content of attributes?
+ * (in current usage, used for transcluded attr.
keys/values).
*/
var globalPipelineId = 0;
ParserPipelineFactory.prototype.getPipeline = function ( type, options ) {
--
To view, visit https://gerrit.wikimedia.org/r/134372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I182a3af04c8b6c5518b884f49ced932b804396a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Marcoil marc...@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] Reset branch based on origin, not local copy - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134576
Change subject: Reset branch based on origin, not local copy
..
Reset branch based on origin, not local copy
The MultimediaViewer job was no more running any feature. The issue was
because we did a git reset to master instead of origin/master.
Change-Id: I0e9c591df1140adaaff95a4108bfb64aa722672d
---
M macro.yaml
1 file changed, 4 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/76/134576/1
diff --git a/macro.yaml b/macro.yaml
index 94863e9..92d0d26 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -45,13 +45,13 @@
MEDIAWIKI_GIT_BRANCH=$(/srv/deployment/integration/slave-scripts/bin/mw-api-siteinfo.py
$MEDIAWIKI_API_URL git_branch)
- git checkout -f $MEDIAWIKI_GIT_BRANCH || {{
- echo $MEDIAWIKI_GIT_BRANCH branch does not exist.
+ git checkout -f origin/$MEDIAWIKI_GIT_BRANCH || {{
+ echo origin/$MEDIAWIKI_GIT_BRANCH branch does not exist.
echo Fallbacking to master branch...
MEDIAWIKI_GIT_BRANCH='master'
- git checkout -f $MEDIAWIKI_GIT_BRANCH
+ git checkout -f origin/$MEDIAWIKI_GIT_BRANCH
}}
- git reset --hard $MEDIAWIKI_GIT_BRANCH
+ git reset --hard origin/$MEDIAWIKI_GIT_BRANCH
git clean -x -q -d -f
# install ruby dependencies
--
To view, visit https://gerrit.wikimedia.org/r/134576
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e9c591df1140adaaff95a4108bfb64aa722672d
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
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] bacula: Also encrypt the data channel - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: bacula: Also encrypt the data channel .. bacula: Also encrypt the data channel The actual data is already encrypted by the client before being transmitted on the network but the metadata (filenames, permissions etc) was not. This will incur some extra load on both servers due to the extra layer of encryption but it should be relatively neglegible Change-Id: I499a0d50d54e7b8e7d67f130d8887ee96d09c76d --- M modules/bacula/templates/bacula-fd.conf.erb M modules/bacula/templates/bacula-sd.conf.erb 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/bacula/templates/bacula-fd.conf.erb b/modules/bacula/templates/bacula-fd.conf.erb index 3ac4fb7..0f9d655 100644 --- a/modules/bacula/templates/bacula-fd.conf.erb +++ b/modules/bacula/templates/bacula-fd.conf.erb @@ -28,8 +28,8 @@ PKI Signatures = Yes PKI Keypair = /var/lib/puppet/ssl/private_keys/bacula-keypair-%= @fqdn %.pem PKI Master Key = /var/lib/puppet/ssl/certs/ca.pem -# Do NOT enable Data channel encryption. -TLS Enable = no +# Do enable Data channel encryption. +TLS Enable = yes TLS Require = yes TLS Certificate = /var/lib/puppet/ssl/certs/%= @fqdn %.pem TLS Key = /var/lib/puppet/ssl/private_keys/%= @fqdn %.pem diff --git a/modules/bacula/templates/bacula-sd.conf.erb b/modules/bacula/templates/bacula-sd.conf.erb index 22cd6f2..7022581 100644 --- a/modules/bacula/templates/bacula-sd.conf.erb +++ b/modules/bacula/templates/bacula-sd.conf.erb @@ -20,8 +20,8 @@ Pid Directory = /var/run/bacula Maximum Concurrent Jobs = %= @sd_max_concur_jobs % Plugin Directory = /usr/lib/bacula -# Do NOT Have the data channel encrypted. -TLS Enable = no +# Do Have the data channel encrypted. +TLS Enable = yes TLS Require = yes TLS CA Certificate File = /var/lib/puppet/ssl/certs/ca.pem TLS Verify Peer = yes -- To view, visit https://gerrit.wikimedia.org/r/133702 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I499a0d50d54e7b8e7d67f130d8887ee96d09c76d 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] Reset branch based on origin, not local copy - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Reset branch based on origin, not local copy
..
Reset branch based on origin, not local copy
The MultimediaViewer job was no more running any feature. The issue was
because we did a git reset to master instead of origin/master.
Change-Id: I0e9c591df1140adaaff95a4108bfb64aa722672d
---
M macro.yaml
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/macro.yaml b/macro.yaml
index 94863e9..92d0d26 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -45,13 +45,13 @@
MEDIAWIKI_GIT_BRANCH=$(/srv/deployment/integration/slave-scripts/bin/mw-api-siteinfo.py
$MEDIAWIKI_API_URL git_branch)
- git checkout -f $MEDIAWIKI_GIT_BRANCH || {{
- echo $MEDIAWIKI_GIT_BRANCH branch does not exist.
+ git checkout -f origin/$MEDIAWIKI_GIT_BRANCH || {{
+ echo origin/$MEDIAWIKI_GIT_BRANCH branch does not exist.
echo Fallbacking to master branch...
MEDIAWIKI_GIT_BRANCH='master'
- git checkout -f $MEDIAWIKI_GIT_BRANCH
+ git checkout -f origin/$MEDIAWIKI_GIT_BRANCH
}}
- git reset --hard $MEDIAWIKI_GIT_BRANCH
+ git reset --hard origin/$MEDIAWIKI_GIT_BRANCH
git clean -x -q -d -f
# install ruby dependencies
--
To view, visit https://gerrit.wikimedia.org/r/134576
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e9c591df1140adaaff95a4108bfb64aa722672d
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
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] Improve mathtable - change (mediawiki...Math)
Frédéric Wang has submitted this change and it was merged.
Change subject: Improve mathtable
..
Improve mathtable
* Add primary key to mathtable
* Unify naming of database files
Bug: 65525
Change-Id: I4f4d31c281257014734e9e3a8d7f1506855ea6d9
---
M Math.hooks.php
R db/math.mysql.sql
R db/math.postgres.sql
C db/math.sqlite.sql
R db/mathlatexml.postgres.sql
R db/mathlatexml.sqlite.sql
6 files changed, 8 insertions(+), 19 deletions(-)
Approvals:
Frédéric Wang: Looks good to me, approved
diff --git a/Math.hooks.php b/Math.hooks.php
index 87d669e..db3a8cc 100644
--- a/Math.hooks.php
+++ b/Math.hooks.php
@@ -2,7 +2,7 @@
/**
* MediaWiki math extension
*
- * (c) 2002-2012 various MediaWiki contributors
+ * (c) 2002-2014 various MediaWiki contributors
* GPLv2 license; info in main package.
*/
@@ -176,8 +176,7 @@
MW_MATH_SOURCE = 'mw_math_source',
MW_MATH_PNG = 'mw_math_png',
MW_MATH_MATHML = 'mw_math_mathml',
- MW_MATH_LATEXML = 'mw_math_latexml',
- MW_MATH_MATHJAX = 'mw_math_mathjax'
+ MW_MATH_LATEXML = 'mw_math_latexml'
);
$names = array();
foreach ( $wgMathValidModes as $mode ) {
@@ -214,19 +213,13 @@
throw new MWException( 'Math extension is only
necessary in 1.18 or above' );
}
- $map = array(
- 'mysql' = 'math.sql',
- 'sqlite' = 'math.sql',
- 'postgres' = 'math.pg.sql',
- 'oracle' = 'math.oracle.sql',
- 'mssql' = 'math.mssql.sql',
- );
+ $map = array( 'mysql', 'sqlite', 'postgres', 'oracle', 'mssql'
);
$type = $updater-getDB()-getType();
- if ( isset( $map[$type] ) ) {
- $sql = dirname( __FILE__ ) . '/db/' . $map[$type];
- $updater-addExtensionTable( 'math', $sql );
+ if ( in_array( $type, $map ) ) {
+ $sql = dirname( __FILE__ ) . '/db/math.' .
$type . '.sql';
+ $updater-addExtensionTable( 'math', $sql );
} else {
throw new MWException( Math extension does not
currently support $type database. );
}
diff --git a/db/math.sql b/db/math.mysql.sql
similarity index 83%
rename from db/math.sql
rename to db/math.mysql.sql
index f509555..d0a3e01 100644
--- a/db/math.sql
+++ b/db/math.mysql.sql
@@ -4,7 +4,7 @@
--
CREATE TABLE /*_*/math (
-- Binary MD5 hash of the latex fragment, used as an identifier key.
- math_inputhash varbinary(16) NOT NULL,
+ math_inputhash varbinary(16) NOT NULL PRIMARY KEY,
-- Not sure what this is, exactly...
math_outputhash varbinary(16) NOT NULL,
@@ -19,5 +19,3 @@
-- MathML output from texvc, or from LaTeXML
math_mathml text
) /*$wgDBTableOptions*/;
-
-CREATE UNIQUE INDEX /*i*/math_inputhash ON /*_*/math (math_inputhash);
diff --git a/db/math.pg.sql b/db/math.postgres.sql
similarity index 100%
rename from db/math.pg.sql
rename to db/math.postgres.sql
diff --git a/db/math.sql b/db/math.sqlite.sql
similarity index 83%
copy from db/math.sql
copy to db/math.sqlite.sql
index f509555..d0a3e01 100644
--- a/db/math.sql
+++ b/db/math.sqlite.sql
@@ -4,7 +4,7 @@
--
CREATE TABLE /*_*/math (
-- Binary MD5 hash of the latex fragment, used as an identifier key.
- math_inputhash varbinary(16) NOT NULL,
+ math_inputhash varbinary(16) NOT NULL PRIMARY KEY,
-- Not sure what this is, exactly...
math_outputhash varbinary(16) NOT NULL,
@@ -19,5 +19,3 @@
-- MathML output from texvc, or from LaTeXML
math_mathml text
) /*$wgDBTableOptions*/;
-
-CREATE UNIQUE INDEX /*i*/math_inputhash ON /*_*/math (math_inputhash);
diff --git a/db/mathlatexml.pg.sql b/db/mathlatexml.postgres.sql
similarity index 100%
rename from db/mathlatexml.pg.sql
rename to db/mathlatexml.postgres.sql
diff --git a/db/mathlatexml.sqllite.sql b/db/mathlatexml.sqlite.sql
similarity index 100%
rename from db/mathlatexml.sqllite.sql
rename to db/mathlatexml.sqlite.sql
--
To view, visit https://gerrit.wikimedia.org/r/134326
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f4d31c281257014734e9e3a8d7f1506855ea6d9
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: Frédéric Wang fred.w...@free.fr
Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: TheDJ hartman.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] mw-sort-wmf-branches: simplify implementation - change (integration/jenkins)
jenkins-bot has submitted this change and it was merged. Change subject: mw-sort-wmf-branches: simplify implementation .. mw-sort-wmf-branches: simplify implementation Use the `key` optional argument to sequence.sort() to simplify the sorting code. Change-Id: I63639d228e8e24846d710bc6f18dbff68a1b4421 --- M bin/mw-sort-wmf-branches.py 1 file changed, 2 insertions(+), 9 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/bin/mw-sort-wmf-branches.py b/bin/mw-sort-wmf-branches.py index 944ab18..bc598ec 100755 --- a/bin/mw-sort-wmf-branches.py +++ b/bin/mw-sort-wmf-branches.py @@ -9,7 +9,7 @@ import fileinput -from distutils.version import LooseVersion +import distutils.version import re RE_WMF_BRANCH = r'^[^\/]+/wmf/\d+\.\d+wmf\d+' @@ -21,12 +21,5 @@ VERSIONS.append(l.rstrip()) -def version_compare(a, b): -Very lame version comparaison -if LooseVersion(a) LooseVersion(b): -return 1 -else: -return -1 - -VERSIONS.sort(cmp=version_compare) +VERSIONS.sort(key=distutils.version.LooseVersion) print \n.join(VERSIONS) -- To view, visit https://gerrit.wikimedia.org/r/134385 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I63639d228e8e24846d710bc6f18dbff68a1b4421 Gerrit-PatchSet: 2 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: BryanDavis bda...@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] Move DataTypeBuilder test for quantity out of experimental - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Move DataTypeBuilder test for quantity out of experimental
..
Move DataTypeBuilder test for quantity out of experimental
Change-Id: Id251c1f185a9e757c92499aea857a5a0b7eb7adf
---
M lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
WikidataJenkins: Verified
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
b/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
index 0582ff1..0138867 100644
--- a/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
+++ b/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
@@ -158,14 +158,15 @@
array( 'url', new StringValue( ' http://acme.com' ),
false, 'URL with leading space' ),
array( 'url', new StringValue( 'http://acme.com ' ),
false, 'URL with trailing space' ),
+
+ //quantity
+ array( 'quantity', QuantityValue::newFromNumber( 5 ),
true, 'Simple integer' ),
+ array( 'quantity', QuantityValue::newFromNumber( 5, 'm'
), false, 'We don\'t support units yet' ),
+ array( 'quantity', QuantityValue::newFromDecimal(
'-11.234', '1', '-10', '-12' ), true, 'decimal strings' ),
);
if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
$cases = array_merge( $cases, array(
- //quantity
- array( 'quantity',
QuantityValue::newFromNumber( 5 ), true, 'Simple integer' ),
- array( 'quantity',
QuantityValue::newFromNumber( 5, 'm' ), false, 'We don\'t support units yet' ),
- array( 'quantity',
QuantityValue::newFromDecimal( '-11.234', '1', '-10', '-12' ), true, 'decimal
strings' ),
//
) );
--
To view, visit https://gerrit.wikimedia.org/r/134572
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id251c1f185a9e757c92499aea857a5a0b7eb7adf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] compare-puppet-catalogs: fix small bugs - change (operations/software)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134577
Change subject: compare-puppet-catalogs: fix small bugs
..
compare-puppet-catalogs: fix small bugs
- Fixed the bug that swapped new and old resources missing.
- Fixed the line numbering in diffs.
- Now we output a reminder of the index url when it gets updated.
- Will do a minor version bump
Change-Id: Ie238b78444a4e20751093e2d693d5f534679175d
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M compare-puppet-catalogs/puppet_compare/diff2html.py
M compare-puppet-catalogs/puppet_compare/generator.py
M compare-puppet-catalogs/puppet_compare/parser.py
3 files changed, 9 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software
refs/changes/77/134577/1
diff --git a/compare-puppet-catalogs/puppet_compare/diff2html.py
b/compare-puppet-catalogs/puppet_compare/diff2html.py
index 878e47e..55fb1a0 100755
--- a/compare-puppet-catalogs/puppet_compare/diff2html.py
+++ b/compare-puppet-catalogs/puppet_compare/diff2html.py
@@ -312,12 +312,12 @@
res['line2'] = ''
s2 =
-return ('diffline', res)
if s1 != :
line1 += 1
if s2 != :
line2 += 1
+return ('diffline', res)
def empty_buffer(output):
global buf
diff --git a/compare-puppet-catalogs/puppet_compare/generator.py
b/compare-puppet-catalogs/puppet_compare/generator.py
index 89a7990..7b7cddd 100644
--- a/compare-puppet-catalogs/puppet_compare/generator.py
+++ b/compare-puppet-catalogs/puppet_compare/generator.py
@@ -165,13 +165,13 @@
node = msg['data'][0][0]
self.count += 1
if not self.count % 5:
-log.info('Updating index.html')
self.update_index()
-log.info(Nodes: %s OK %s DIFF %s FAIL % (
-len(self.nodelist['OK']),
-len(self.nodelist['DIFF']),
-len(self.nodelist['ERROR'])
-))
+log.info('Index updated, you can see detailed progress for your
work at %s/%s', self.host, self.html_path)
+log.info(Nodes: %s OK %s DIFF %s FAIL,
+ len(self.nodelist['OK']),
+ len(self.nodelist['DIFF']),
+ len(self.nodelist['ERROR'])
+)
def node_output(self, node):
if node in self.nodelist['ERROR']:
diff --git a/compare-puppet-catalogs/puppet_compare/parser.py
b/compare-puppet-catalogs/puppet_compare/parser.py
index 5f8ec36..48b24e7 100644
--- a/compare-puppet-catalogs/puppet_compare/parser.py
+++ b/compare-puppet-catalogs/puppet_compare/parser.py
@@ -7,11 +7,6 @@
log = logging.getLogger('puppet_compare')
-
-def contains(haystack, needle):
-return (haystack.find(needle) = 0)
-
-
class DiffParser(object):
def __init__(self, filename, nodename):
@@ -31,9 +26,9 @@
new_content)
if self._diffs['only_in_old']:
-self._get_diffs('old_missing', [], self._diffs['only_in_old'])
+self._get_diffs('missing_in_new', self._diffs['only_in_old'], [])
if self._diffs['only_in_new']:
-self._get_diffs('new_missing', self._diffs['only_in_new'], [])
+self._get_diffs('missing_in_old', [], self._diffs['only_in_new'])
return self.results
--
To view, visit https://gerrit.wikimedia.org/r/134577
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie238b78444a4e20751093e2d693d5f534679175d
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added new message - change (mediawiki...BlueSpiceFoundation)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134578
Change subject: Added new message
..
Added new message
Change-Id: I15703e17063708729bcf3f84256ced9f1827ee66
---
M i18n/core/de.json
M i18n/core/en.json
M i18n/core/qqq.json
3 files changed, 67 insertions(+), 64 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/78/134578/1
diff --git a/i18n/core/de.json b/i18n/core/de.json
index dc5b84a..ffb3176 100644
--- a/i18n/core/de.json
+++ b/i18n/core/de.json
@@ -60,5 +60,6 @@
bs-filesystemhelper-upload-local-error-create: Die Datei konnte im
Wiki nicht angelegt werden.,
bs-navigation-instructions: Anleitung,
bs-navigation-support: Support,
- bs-navigation-contact: Kontakt
+ bs-navigation-contact: Kontakt,
+ bs-imagepage-download-text = Herunterladen
}
diff --git a/i18n/core/en.json b/i18n/core/en.json
index 7a2f2ed..19eabb7 100644
--- a/i18n/core/en.json
+++ b/i18n/core/en.json
@@ -1,64 +1,65 @@
{
-@metadata: {
-authors: [
-Stephan Muggli mug...@hallowelt.biz
-]
-},
-bs-ns_main: (Pages),
-bs-ns_all: (all),
-bs-tab_navigation: Navigation,
-bs-tab_focus: Focus,
-bs-tab_admin: Admin,
-bs-userbar_loginswitch_logout: Log out,
-bs-userbar_loginswitch_login: Log in,
-bs-extended-search-tooltip-fulltext: Fulltext search,
-bs-extended-search-textfield-defaultvalue: Search...,
-bs-extended-search-textfield-tooltip: Search wiki,
-bs-no-information-available: No information available,
-bs-years-duration: {{PLURAL:$1|one year|$1 years}},
-bs-months-duration: {{PLURAL:$1|one month|$1 months}},
-bs-weeks-duration: {{PLURAL:$1|one week|$1 weeks}},
-bs-days-duration: {{PLURAL:$1|one day|$1 days}},
-bs-hours-duration: {{PLURAL:$1|one hour|$1 hours}},
-bs-mins-duration: {{PLURAL:$1|one minute|$1 minutes}},
-bs-secs-duration: {{PLURAL:$1|one second|$1 seconds}},
-bs-two-units-ago: $1 and $2 ago,
-bs-one-unit-ago: $1 ago,
-bs-now: now,
-bs-email-greeting-receiver: {{GENDER:$1|Hello Mr $1|Hello Mrs $1|Hello
$1}},,
-bs-email-greeting-no-receiver: Hello,,
-bs-email-footer: This message was generated automatically. Please do
not reply to this email.,
-bs-userpagesettings-legend: User settings,
-bs-userpreferences-link-text: More user settings,
-bs-userpreferences-link-title: Display your personal user settings,
-bs-exception-view-heading: An error occurred,
-bs-exception-view-text: While processing your request the following
error occurred:,
-bs-exception-view-admin-hint: Please contact your system
administrator.,
-bs-exception-view-stacktrace-toggle-show-text: Show error details,
-bs-exception-view-stacktrace-toggle-hide-text: Hide error details,
-action-responsibleeditors-viewspecialpage: view pages which are
protected with the \ResponsibleEditors-Viewspecialpage\ right,
-bs-viewtagerrorlist-legend: $1 - Error,
-bs-readonly: The database is currently locked to new entries and other
modifications, probably for routine database maintenance, after which it will
be back to normal. The administrator who locked it offered this explanation:
$1,
-bs-imageofotheruser: You are not allowed to upload an image for another
user.,
-bs-pref-sortalph: Sort namespaces alphabetically,
-bs-permissionerror: Permission error!,
-bs-filesystemhelper-no-directory: code$1/code is not a valid
directory.,
-bs-filesystemhelper-has-path-traversal: Path traversal detected!,
-bs-filesystemhelper-file-not-exists: The file code$1/code does not
exist.,
-bs-filesystemhelper-file-copy-error: The file code$1/code could not
be copied.,
-bs-filesystemhelper-file-already-exists: The file code$1/code
already exists.,
-bs-filesystemhelper-file-delete-error: The file code$1/code could
not be deleted.,
-bs-filesystemhelper-folder-already-exists: The folder code$1/code
already exists.,
-bs-filesystemhelper-folder-copy-error: The folder code$1/code could
not be renamed.,
-bs-filesystemhelper-folder-not-exists: The folder code$1/code does
not exist.,
-bs-filesystemhelper-upload-err-code: The file could not be uploaded:
$1,
-bs-filesystemhelper-upload-wrong-ext: The file does not have the
required extension: $1.,
-bs-filesystemhelper-upload-unsupported-type: This file type is not
supported.,
-bs-filesystemhelper-save-base64-error: The file could not be saved.,
-bs-filesystemhelper-upload-base64-error: The file could not be
uploaded.,
-bs-filesystemhelper-upload-local-error-stash-file: The file could not
be moved to the upload stash.,
-bs-filesystemhelper-upload-local-error-create: The file could not be
created in the wiki.,
-bs-navigation-instructions: Instructions,
-bs-navigation-support:
[MediaWiki-commits] [Gerrit] [DNM] Documentation for Data Type to Data Value Type mapping - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/134579 Change subject: [DNM] Documentation for Data Type to Data Value Type mapping .. [DNM] Documentation for Data Type to Data Value Type mapping Merge all the other patches first! I will rebase this if needed. Change-Id: I8caed8af113b3c6a748548f974ebd7cee2edd951 --- M lib/includes/WikibaseDataTypeBuilders.php 1 file changed, 17 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/79/134579/1 diff --git a/lib/includes/WikibaseDataTypeBuilders.php b/lib/includes/WikibaseDataTypeBuilders.php index 1683054..879225b 100644 --- a/lib/includes/WikibaseDataTypeBuilders.php +++ b/lib/includes/WikibaseDataTypeBuilders.php @@ -71,14 +71,25 @@ // the dataTypes setting. On the other hand, perhaps that setting should only // be used for the UI, and the factory should simply know all data types always. + // Current data type to data value type mapping: + // 'commonsMedia' = 'string' (camel case, FIXME maybe?) + // 'globe-coordinate' = 'globecoordinate' (FIXME!) + // 'quantity' = 'quantity' + // 'string' = 'string' + // 'time' = 'time' + // 'url' = 'string' + // 'wikibase-item'= 'wikibase-entityid' + // 'monolingualtext' = 'monolingualtext' + // 'multilingualtext' = 'multilingualtext' + $types = array( - 'commonsMedia' = array( $this, 'buildMediaType' ), + 'commonsMedia' = array( $this, 'buildMediaType' ), 'globe-coordinate' = array( $this, 'buildCoordinateType' ), - 'quantity'= array( $this, 'buildQuantityType' ), - 'string' = array( $this, 'buildStringType' ), - 'time' = array( $this, 'buildTimeType' ), - 'url' = array( $this, 'buildUrlType' ), - 'wikibase-item' = array( $this, 'buildItemType' ), + 'quantity' = array( $this, 'buildQuantityType' ), + 'string' = array( $this, 'buildStringType' ), + 'time' = array( $this, 'buildTimeType' ), + 'url' = array( $this, 'buildUrlType' ), + 'wikibase-item'= array( $this, 'buildItemType' ), ); $experimental = array( -- To view, visit https://gerrit.wikimedia.org/r/134579 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8caed8af113b3c6a748548f974ebd7cee2edd951 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added new messages - change (mediawiki...BlueSpiceFoundation)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134580
Change subject: Added new messages
..
Added new messages
Change-Id: I5912bd821df8a93b7305b762f5e11a6929ad8fc7
---
M i18n/extjs/de.json
M i18n/extjs/en.json
M i18n/extjs/qqq.json
3 files changed, 59 insertions(+), 34 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/80/134580/1
diff --git a/i18n/extjs/de.json b/i18n/extjs/de.json
index 12ee5a7..1a24cbc 100644
--- a/i18n/extjs/de.json
+++ b/i18n/extjs/de.json
@@ -1,5 +1,9 @@
{
- @metadata: [],
+ @metadata: {
+ authors: [
+ Stephan Muggli mug...@hallowelt.biz
+ ]
+ },
bs-extjs-ok: OK,
bs-extjs-cancel: Abbrechen,
bs-extjs-yes: Ja,
@@ -25,5 +29,12 @@
bs-extjs-uploading: Lädt hoch...,
bs-extjs-confirmNavigationTitle: Dem Link folgen,
bs-extjs-confirmNavigationText: Möchtest du wirklich diesem Link
folgen? Alle dynamischen Einstellungen, wie Filter und Sortierung, auf dieser
Seite gehen dabei verloren.,
- bs-extjs-allns: (alle)
+ bs-extjs-allns: (alle),
+ bs-extjs-filters: Filter,
+ bs-extjs-filter-equals: ist,
+ bs-extjs-filter-equals-not: ist nicht,
+ bs-extjs-filter-contains: enthält,
+ bs-extjs-filter-contains-not: enthält nicht,
+ bs-extjs-filter-starts-with: beginnt mit,
+ bs-extjs-filter-ends-with: endet mit
}
diff --git a/i18n/extjs/en.json b/i18n/extjs/en.json
index 22bbc1c..d708fee 100644
--- a/i18n/extjs/en.json
+++ b/i18n/extjs/en.json
@@ -1,33 +1,40 @@
{
-@metadata: {
-authors: [
-Stephan Muggli mug...@hallowelt.biz
-]
-},
-bs-extjs-ok: Ok,
-bs-extjs-cancel: Cancel,
-bs-extjs-yes: Yes,
-bs-extjs-no: No,
-bs-extjs-save: Save,
-bs-extjs-delete: Delete,
-bs-extjs-add: Add,
-bs-extjs-remove: Remove,
-bs-extjs-edit: Edit,
-bs-extjs-hint: Hint,
-bs-extjs-error: Error,
-bs-extjs-confirm: Confirm,
-bs-extjs-loading: Loading...,
-bs-extjs-pageSize: Page size,
-bs-extjs-actions-column-header: Actions,
-bs-extjs-warning: Warning,
-bs-extjs-saving: saving...,
-bs-extjs-reset: Reset,
-bs-extjs-close: Close,
-bs-extjs-label-user: User,
-bs-extjs-upload: Upload,
-bs-extjs-browse: Browse,
-bs-extjs-uploading: Uploading...,
-bs-extjs-confirmNavigationTitle: Follow link,
-bs-extjs-confirmNavigationText: Do you really want to follow this link?
All dynamic settings like filtering or sorting on the current page will be
lost.,
-bs-extjs-allns: (all)
+ @metadata: {
+ authors: [
+ Stephan Muggli mug...@hallowelt.biz
+ ]
+ },
+ bs-extjs-ok: Ok,
+ bs-extjs-cancel: Cancel,
+ bs-extjs-yes: Yes,
+ bs-extjs-no: No,
+ bs-extjs-save: Save,
+ bs-extjs-delete: Delete,
+ bs-extjs-add: Add,
+ bs-extjs-remove: Remove,
+ bs-extjs-edit: Edit,
+ bs-extjs-hint: Hint,
+ bs-extjs-error: Error,
+ bs-extjs-confirm: Confirm,
+ bs-extjs-loading: Loading...,
+ bs-extjs-pageSize: Page size,
+ bs-extjs-actions-column-header: Actions,
+ bs-extjs-warning: Warning,
+ bs-extjs-saving: saving...,
+ bs-extjs-reset: Reset,
+ bs-extjs-close: Close,
+ bs-extjs-label-user: User,
+ bs-extjs-upload: Upload,
+ bs-extjs-browse: Browse,
+ bs-extjs-uploading: Uploading...,
+ bs-extjs-confirmNavigationTitle: Follow link,
+ bs-extjs-confirmNavigationText: Do you really want to follow this
link? All dynamic settings like filtering or sorting on the current page will
be lost.,
+ bs-extjs-allns: (all),
+ bs-extjs-filters: Filters,
+ bs-extjs-filter-equals: equals,
+ bs-extjs-filter-equals-not: equals not,
+ bs-extjs-filter-contains: contains,
+ bs-extjs-filter-contains-not: contains not,
+ bs-extjs-filter-starts-with: starts with,
+ bs-extjs-filter-ends-with: ends with
}
diff --git a/i18n/extjs/qqq.json b/i18n/extjs/qqq.json
index deda297..13e5b34 100644
--- a/i18n/extjs/qqq.json
+++ b/i18n/extjs/qqq.json
@@ -30,5 +30,12 @@
bs-extjs-uploading: Label for elements that are shown when uploading
files from a dialogue.\n{{Identical|Uploading}},
bs-extjs-confirmNavigationTitle: Title for prompt that warns you if
you want to follow a link but have unsaved changes.\n\nFollowed by the
following prompt:\n* {{msg-mw|Bs-extjs-confirmNavigationText}},
bs-extjs-confirmNavigationText: Text for prompt that warns you if
you want to follow a link but have unsaved changes.\n\nPreceded by the title
{{msg-mw|Bs-extjs-confirmNavigationTitle}}.,
- bs-extjs-allns: Selector for all namespaces in namespace combo
[MediaWiki-commits] [Gerrit] Get DataTypeFactory from Wikibase{Client, Repo} directly - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Get DataTypeFactory from Wikibase{Client,Repo} directly
..
Get DataTypeFactory from Wikibase{Client,Repo} directly
Change-Id: I1de9262e12c2703dd05cb279daab9d9abee7caf4
---
M lib/resources/Resources.php
1 file changed, 4 insertions(+), 19 deletions(-)
Approvals:
WikidataJenkins: Verified
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 5328a0f..30b133e 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -74,30 +74,15 @@
'mw.config.values.wbDataTypes' = $moduleTemplate + array(
'class' = 'DataTypes\DataTypesModule',
'datatypefactory' = function() {
- // TODO: extreme uglynes here! Get rid of this
method!
+ // TODO: relative uglynes here! Get rid of this
method!
if ( defined( 'WB_VERSION' ) ) { // repo mode
- $repo =
WikibaseRepo::getDefaultInstance();
- $entityIdParser =
$repo-getEntityIdParser();
- $entityLookup =
$repo-getEntityLookup();
+ $wikibase =
WikibaseRepo::getDefaultInstance();
} elseif ( defined( 'WBC_VERSION' ) ) { //
client mode
- $client =
WikibaseClient::getDefaultInstance();
- $entityIdParser =
$client-getEntityIdParser();
- $entityLookup =
$client-getStore()-getEntityLookup();
+ $wikibase =
WikibaseClient::getDefaultInstance();
} else {
throw new \RuntimeException( Neither
repo nor client found! );
}
-
- $settings = Settings::singleton();
-
- $urlSchemes = $settings-getSetting(
'urlSchemes' );
- $builders = new WikibaseDataTypeBuilders(
$entityLookup, $entityIdParser, $urlSchemes );
-
- $typeBuilderSpecs = array_intersect_key(
- $builders-getDataTypeBuilders(),
- array_flip( $settings-getSetting(
'dataTypes' ) )
- );
-
- return new DataTypeFactory( $typeBuilderSpecs );
+ return $wikibase-getDataTypeFactory();
},
'datatypesconfigvarname' = 'wbDataTypes',
),
--
To view, visit https://gerrit.wikimedia.org/r/134571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1de9262e12c2703dd05cb279daab9d9abee7caf4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Output pep8 version - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/134581 Change subject: Output pep8 version .. Output pep8 version Give hint to users by outputing the pep8 version being used. Change-Id: I1f5f0495fbb408fd4c08c3e37bb9d0c1a8ffc923 --- M macro.yaml 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/81/134581/1 diff --git a/macro.yaml b/macro.yaml index d84fc14..7c07937 100644 --- a/macro.yaml +++ b/macro.yaml @@ -453,7 +453,11 @@ - builder: name: pep8 builders: - - shell: set -o pipefail ; pep8 . | tee pep8.txt ; set +o pipefail + - shell: | + set +x + echo Using pep8 version: `pep8 --version` + set -x + set -o pipefail ; pep8 . | tee pep8.txt ; set +o pipefail # Python pep8 publisher - copied from OpenStack project - publisher: -- To view, visit https://gerrit.wikimedia.org/r/134581 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f5f0495fbb408fd4c08c3e37bb9d0c1a8ffc923 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] Output pep8 version - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: Output pep8 version .. Output pep8 version Give hint to users by outputing the pep8 version being used. Change-Id: I1f5f0495fbb408fd4c08c3e37bb9d0c1a8ffc923 --- M macro.yaml 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/macro.yaml b/macro.yaml index d84fc14..7c07937 100644 --- a/macro.yaml +++ b/macro.yaml @@ -453,7 +453,11 @@ - builder: name: pep8 builders: - - shell: set -o pipefail ; pep8 . | tee pep8.txt ; set +o pipefail + - shell: | + set +x + echo Using pep8 version: `pep8 --version` + set -x + set -o pipefail ; pep8 . | tee pep8.txt ; set +o pipefail # Python pep8 publisher - copied from OpenStack project - publisher: -- To view, visit https://gerrit.wikimedia.org/r/134581 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1f5f0495fbb408fd4c08c3e37bb9d0c1a8ffc923 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] Fix monolingual-text parser registration - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Fix monolingual-text parser registration .. Fix monolingual-text parser registration This fixes I07d2e56d2f6dfc0bf329dfdca99c76fe69836402. Change-Id: I22a881bb026f957d88ce0c9cadfadaf42b06899b --- M repo/Wikibase.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: WikidataJenkins: Verified Daniel Kinzler: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/Wikibase.php b/repo/Wikibase.php index b132cf1..dbbea8a 100644 --- a/repo/Wikibase.php +++ b/repo/Wikibase.php @@ -86,7 +86,7 @@ $wgValueParsers['time'] = 'Wikibase\Lib\Parsers\TimeParser'; $wgValueParsers['globecoordinate'] = 'ValueParsers\GlobeCoordinateParser'; $wgValueParsers['null'] = 'ValueParsers\NullParser'; - $wgValueParsers['monolongualtext'] = 'Wikibase\Parsers\MonolingualTextParser'; + $wgValueParsers['monolingual-text'] = 'Wikibase\Parsers\MonolingualTextParser'; // API module registration $wgAPIModules['wbgetentities'] = 'Wikibase\Api\GetEntities'; -- To view, visit https://gerrit.wikimedia.org/r/134570 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I22a881bb026f957d88ce0c9cadfadaf42b06899b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Typo in pep8 builder macro - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/134583 Change subject: Typo in pep8 builder macro .. Typo in pep8 builder macro Change-Id: I487df83bcbd58493525fce125ecfd0daf1d3bbca --- M macro.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/83/134583/1 diff --git a/macro.yaml b/macro.yaml index 7c07937..c7e6da1 100644 --- a/macro.yaml +++ b/macro.yaml @@ -457,7 +457,7 @@ set +x echo Using pep8 version: `pep8 --version` set -x - set -o pipefail ; pep8 . | tee pep8.txt ; set +o pipefail + set -o pipefail ; pep8 . | tee pep8.txt ; set +o pipefail # Python pep8 publisher - copied from OpenStack project - publisher: -- To view, visit https://gerrit.wikimedia.org/r/134583 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I487df83bcbd58493525fce125ecfd0daf1d3bbca 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] Hygiene: Remove unused schema - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/134582 Change subject: Hygiene: Remove unused schema .. Hygiene: Remove unused schema Change-Id: Ice8d1788d8e72736d878aa4647046bf204652a63 --- M includes/MobileFrontend.hooks.php 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/82/134582/1 diff --git a/includes/MobileFrontend.hooks.php b/includes/MobileFrontend.hooks.php index 84c79e5..e4adb76 100644 --- a/includes/MobileFrontend.hooks.php +++ b/includes/MobileFrontend.hooks.php @@ -766,10 +766,6 @@ 'schema' = 'MobileWebUploads', 'revision' = 8209043, ), - 'mobile.watchlist.schema' = array( - 'schema' = 'MobileBetaWatchlist', - 'revision' = 5281061, - ), 'mobile.editing.schema' = array( 'schema' = 'MobileWebEditing', 'revision' = 7675117, -- To view, visit https://gerrit.wikimedia.org/r/134582 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice8d1788d8e72736d878aa4647046bf204652a63 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Typo in pep8 builder macro - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: Typo in pep8 builder macro .. Typo in pep8 builder macro Change-Id: I487df83bcbd58493525fce125ecfd0daf1d3bbca --- M macro.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/macro.yaml b/macro.yaml index 7c07937..c7e6da1 100644 --- a/macro.yaml +++ b/macro.yaml @@ -457,7 +457,7 @@ set +x echo Using pep8 version: `pep8 --version` set -x - set -o pipefail ; pep8 . | tee pep8.txt ; set +o pipefail + set -o pipefail ; pep8 . | tee pep8.txt ; set +o pipefail # Python pep8 publisher - copied from OpenStack project - publisher: -- To view, visit https://gerrit.wikimedia.org/r/134583 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I487df83bcbd58493525fce125ecfd0daf1d3bbca 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] Adapt to changes in DataTypes 0.3 - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134584
Change subject: Adapt to changes in DataTypes 0.3
..
Adapt to changes in DataTypes 0.3
Change-Id: Ie0b40e317202e19f7f9941fc4d2b09452c5257bf
---
M composer.json
M lib/config/WikibaseLib.default.php
M lib/i18n/en.json
M lib/i18n/qqq.json
M lib/includes/WikibaseDataTypeBuilders.php
M lib/includes/formatters/MonolingualHtmlFormatter.php
M repo/Wikibase.php
M repo/i18n/en.json
M repo/i18n/qqq.json
M repo/includes/specials/SpecialListDatatypes.php
10 files changed, 22 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/84/134584/1
diff --git a/composer.json b/composer.json
index 5a62e18..33ef8ce 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
data-values/number: ~0.4.0,
data-values/time: ~0.5.2,
data-values/validators: ~0.1.0,
- data-values/data-types: ~0.2.0,
+ data-values/data-types: ~0.3.0,
data-values/serialization: ~1.0,
data-values/javascript: ~0.5.0,
data-values/value-view: ~0.5.0,
diff --git a/lib/config/WikibaseLib.default.php
b/lib/config/WikibaseLib.default.php
index 1a7f77a..b73dbfc 100644
--- a/lib/config/WikibaseLib.default.php
+++ b/lib/config/WikibaseLib.default.php
@@ -116,7 +116,7 @@
if ( defined( 'WB_EXPERIMENTAL_FEATURES' ) WB_EXPERIMENTAL_FEATURES
) {
// experimental data types
$defaults['dataTypes'] = array_merge( $defaults['dataTypes'],
array(
- 'monolingual-text',
+ 'monolingualtext',
//'multilingual-text',
) );
}
diff --git a/lib/i18n/en.json b/lib/i18n/en.json
index d686721..d12792e 100644
--- a/lib/i18n/en.json
+++ b/lib/i18n/en.json
@@ -102,5 +102,5 @@
wikibase-time-precision-BCE-millennium: $1. millennium BCE,
wikibase-time-precision-BCE-century: $1. century BCE,
wikibase-time-precision-BCE-10annum: $1s BCE,
-wikibase-monolingual-text: span lang=\$2\
class=\wb-monolingual-text-value\$1/span span
class=\wb-monolingual-text-language-name\($3)/span
+wikibase-monolingualtext: span lang=\$2\
class=\wb-monolingualtext-value\$1/span span
class=\wb-monolingualtext-language-name\($3)/span
}
diff --git a/lib/i18n/qqq.json b/lib/i18n/qqq.json
index 4242baf..a79fc27 100644
--- a/lib/i18n/qqq.json
+++ b/lib/i18n/qqq.json
@@ -110,5 +110,5 @@
wikibase-time-precision-BCE-millennium: !!DO NOT TRANSLATE!! Used to
present a point in time BCE (before current era) with the precession of 1000
years\n{{Related|Wikibase-time-precision}},
wikibase-time-precision-BCE-century: !!DO NOT TRANSLATE!! Used to
present a point in time BCE (before current era) with the precession of 100
years\n{{Related|Wikibase-time-precision}},
wikibase-time-precision-BCE-10annum: !!DO NOT TRANSLATE!! Used to
present a point in time BCE (before current era) with the precession of 10
years\n{{Related|Wikibase-time-precision}},
- wikibase-monolingual-text: Format for displaying monolingual text
(along with a language name).\n\nParameters:\n* $1 - the text\n* $2 - the code
of the language of the text\n* $3 - the name of the language of the text, in
the user's language.
+ wikibase-monolingualtext: Format for displaying monolingual text
(along with a language name).\n\nParameters:\n* $1 - the text\n* $2 - the code
of the language of the text\n* $3 - the name of the language of the text, in
the user's language.
}
diff --git a/lib/includes/WikibaseDataTypeBuilders.php
b/lib/includes/WikibaseDataTypeBuilders.php
index 1683054..5104adc 100644
--- a/lib/includes/WikibaseDataTypeBuilders.php
+++ b/lib/includes/WikibaseDataTypeBuilders.php
@@ -82,8 +82,8 @@
);
$experimental = array(
- 'monolingual-text' = array( $this,
'buildMonolingualTextType' ),
- // 'multilingual-text' = array( $this,
'buildMultilingualTextType' ),
+ 'monolingualtext' = array( $this,
'buildMonolingualTextType' ),
+ // 'multilingualtext' = array( $this,
'buildMultilingualTextType' ),
);
if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
@@ -164,7 +164,7 @@
}
/**
-* @param string $id Data type ID, e.g. 'monolingual-text'
+* @param string $id Data type ID, e.g. 'monolingualtext'
*
* @return DataType
*/
@@ -187,7 +187,7 @@
true
);
- return new DataType( $id, 'monolingual-text', array( new
TypeValidator( 'DataValues\DataValue' ), $topValidator ) );
+ return new DataType( $id,
[MediaWiki-commits] [Gerrit] Inserted test whether the resource 'uploadsource' is already... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Inserted test whether the resource 'uploadsource' is already
registered. Bug: 65530
..
Inserted test whether the resource 'uploadsource' is already registered.
Bug: 65530
Change-Id: I1b82d6dc6a37792d4e7b7d01316802ea4d38a88b
---
M includes/Import.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Import.php b/includes/Import.php
index 743037c..4940c19 100644
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -45,7 +45,9 @@
function __construct( $source ) {
$this-reader = new XMLReader();
- stream_wrapper_register( 'uploadsource', 'UploadSourceAdapter'
);
+ if ( !in_array( 'uploadsource', stream_get_wrappers() ) ) {
+ stream_wrapper_register( 'uploadsource',
'UploadSourceAdapter' );
+ }
$id = UploadSourceAdapter::registerSource( $source );
if ( defined( 'LIBXML_PARSEHUGE' ) ) {
$this-reader-open( uploadsource://$id, null,
LIBXML_PARSEHUGE );
--
To view, visit https://gerrit.wikimedia.org/r/134344
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b82d6dc6a37792d4e7b7d01316802ea4d38a88b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alexander.lehmann alexander.lehm...@student.hpi.uni-potsdam.de
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: TTO at.li...@live.com.au
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] compare-puppet-catalogs: fix small bugs - change (operations/software)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: compare-puppet-catalogs: fix small bugs
..
compare-puppet-catalogs: fix small bugs
- Fixed the bug that swapped new and old resources missing.
- Fixed the line numbering in diffs.
- Now we output a reminder of the index url when it gets updated.
- Will do a minor version bump
Change-Id: Ie238b78444a4e20751093e2d693d5f534679175d
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M compare-puppet-catalogs/puppet_compare/diff2html.py
M compare-puppet-catalogs/puppet_compare/generator.py
M compare-puppet-catalogs/puppet_compare/parser.py
3 files changed, 7 insertions(+), 11 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/compare-puppet-catalogs/puppet_compare/diff2html.py
b/compare-puppet-catalogs/puppet_compare/diff2html.py
index 878e47e..55fb1a0 100755
--- a/compare-puppet-catalogs/puppet_compare/diff2html.py
+++ b/compare-puppet-catalogs/puppet_compare/diff2html.py
@@ -312,12 +312,12 @@
res['line2'] = ''
s2 =
-return ('diffline', res)
if s1 != :
line1 += 1
if s2 != :
line2 += 1
+return ('diffline', res)
def empty_buffer(output):
global buf
diff --git a/compare-puppet-catalogs/puppet_compare/generator.py
b/compare-puppet-catalogs/puppet_compare/generator.py
index 89a7990..2496be6 100644
--- a/compare-puppet-catalogs/puppet_compare/generator.py
+++ b/compare-puppet-catalogs/puppet_compare/generator.py
@@ -165,13 +165,14 @@
node = msg['data'][0][0]
self.count += 1
if not self.count % 5:
-log.info('Updating index.html')
self.update_index()
-log.info(Nodes: %s OK %s DIFF %s FAIL % (
+log.info('Index updated, you can see detailed progress for your
work at %s/%s', self.host, self.html_path)
+log.info(
+Nodes: %s OK %s DIFF %s FAIL,
len(self.nodelist['OK']),
len(self.nodelist['DIFF']),
len(self.nodelist['ERROR'])
-))
+)
def node_output(self, node):
if node in self.nodelist['ERROR']:
diff --git a/compare-puppet-catalogs/puppet_compare/parser.py
b/compare-puppet-catalogs/puppet_compare/parser.py
index 5f8ec36..48b24e7 100644
--- a/compare-puppet-catalogs/puppet_compare/parser.py
+++ b/compare-puppet-catalogs/puppet_compare/parser.py
@@ -7,11 +7,6 @@
log = logging.getLogger('puppet_compare')
-
-def contains(haystack, needle):
-return (haystack.find(needle) = 0)
-
-
class DiffParser(object):
def __init__(self, filename, nodename):
@@ -31,9 +26,9 @@
new_content)
if self._diffs['only_in_old']:
-self._get_diffs('old_missing', [], self._diffs['only_in_old'])
+self._get_diffs('missing_in_new', self._diffs['only_in_old'], [])
if self._diffs['only_in_new']:
-self._get_diffs('new_missing', self._diffs['only_in_new'], [])
+self._get_diffs('missing_in_old', [], self._diffs['only_in_new'])
return self.results
--
To view, visit https://gerrit.wikimedia.org/r/134577
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie238b78444a4e20751093e2d693d5f534679175d
Gerrit-PatchSet: 3
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't log events for anonymous user in CPB - change (mediawiki...VectorBeta)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't log events for anonymous user in CPB
..
Don't log events for anonymous user in CPB
Events for Privacy and Help were logged. This ensures they're not.
Change-Id: I7960a161a25621fea307a8a5c515dad6c6e1897f
---
M VectorBeta.hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VectorBeta.hooks.php b/VectorBeta.hooks.php
index f1c1a72..7ea9866 100644
--- a/VectorBeta.hooks.php
+++ b/VectorBeta.hooks.php
@@ -359,10 +359,10 @@
}
// Compact Personal Bar modules
- $modules[] =
'skins.vector.compactPersonalBar.defaultTracking';
-
if ( BetaFeatures::isFeatureEnabled( $user,
'betafeatures-vector-compact-personal-bar' ) ) {
$modules[] = 'skins.vector.compactPersonalBar';
+ } elseif ( $user-isLoggedIn() ) {
+ $modules[] =
'skins.vector.compactPersonalBar.defaultTracking';
}
$out-addModules( $modules );
--
To view, visit https://gerrit.wikimedia.org/r/134331
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7960a161a25621fea307a8a5c515dad6c6e1897f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: JGonera jgon...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Jorm bhar...@wikimedia.org
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] ChangeOps performance and style clean-up - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: ChangeOps performance and style clean-up
..
ChangeOps performance and style clean-up
Change-Id: I9adb6102081871860e99b02b7064880abd285c27
---
M repo/includes/ChangeOp/ChangeOpsMerge.php
M repo/includes/ChangeOp/MergeChangeOpsFactory.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
3 files changed, 54 insertions(+), 36 deletions(-)
Approvals:
WikidataJenkins: Verified
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/ChangeOp/ChangeOpsMerge.php
b/repo/includes/ChangeOp/ChangeOpsMerge.php
index 81af3d4..c40841a 100644
--- a/repo/includes/ChangeOp/ChangeOpsMerge.php
+++ b/repo/includes/ChangeOp/ChangeOpsMerge.php
@@ -3,15 +3,15 @@
namespace Wikibase\ChangeOp;
use InvalidArgumentException;
-use ValueValidators\Result;
use ValueValidators\Error;
-use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\Validators\EntityConstraintProvider;
+use ValueValidators\Result;
use Wikibase\DataModel\Claim\Claim;
use Wikibase\DataModel\Claim\Statement;
use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Reference;
+use Wikibase\Validators\EntityConstraintProvider;
use Wikibase\Validators\UniquenessViolation;
/**
@@ -23,17 +23,34 @@
*/
class ChangeOpsMerge {
+ /**
+* @var Item
+*/
private $fromItem;
+
+ /**
+* @var Item
+*/
private $toItem;
+
+ /**
+* @var ChangeOps
+*/
private $fromChangeOps;
+
+ /**
+* @var ChangeOps
+*/
private $toChangeOps;
/**
-* @var array
+* @var string[]
*/
private $ignoreConflicts;
- /** @var EntityConstraintProvider */
+ /**
+* @var EntityConstraintProvider
+*/
private $constraintProvider;
/**
@@ -44,7 +61,7 @@
/**
* @param Item $fromItem
* @param Item $toItem
-* @param array $ignoreConflicts list of elements to ignore conflicts
for
+* @param string[] $ignoreConflicts list of elements to ignore
conflicts for
*can only contain 'label' and or 'description' and or
'sitelink'
* @param EntityConstraintProvider $constraintProvider
* @param ChangeOpFactoryProvider $changeOpFactoryProvider
@@ -56,7 +73,7 @@
public function __construct(
Item $fromItem,
Item $toItem,
- $ignoreConflicts,
+ array $ignoreConflicts,
EntityConstraintProvider $constraintProvider,
ChangeOpFactoryProvider $changeOpFactoryProvider
) {
@@ -78,11 +95,11 @@
* @throws InvalidArgumentException
*/
private function assertValidIgnoreConflictValues( $ignoreConflicts ) {
- if( !is_array( $ignoreConflicts ) ){
+ if ( !is_array( $ignoreConflicts ) ) {
throw new InvalidArgumentException( '$ignoreConflicts
must be an array' );
}
- foreach( $ignoreConflicts as $ignoreConflict ){
- if(
+ foreach ( $ignoreConflicts as $ignoreConflict ) {
+ if (
$ignoreConflict !== 'label'
$ignoreConflict !== 'description'
$ignoreConflict !== 'sitelink'
@@ -147,13 +164,13 @@
}
private function generateLabelsChangeOps() {
- foreach( $this-fromItem-getLabels() as $langCode = $label ){
+ foreach ( $this-fromItem-getLabels() as $langCode = $label )
{
$toLabel = $this-toItem-getLabel( $langCode );
- if( $toLabel === false || $toLabel === $label ){
+ if ( $toLabel === false || $toLabel === $label ) {
$this-fromChangeOps-add(
$this-getFingerprintChangeOpFactory()-newRemoveLabelOp( $langCode ) );
$this-toChangeOps-add(
$this-getFingerprintChangeOpFactory()-newSetLabelOp( $langCode, $label ) );
} else {
- if( !in_array( 'label', $this-ignoreConflicts
) ){
+ if ( !in_array( 'label', $this-ignoreConflicts
) ) {
throw new ChangeOpException(
Conflicting labels for language {$langCode} );
}
}
@@ -161,13 +178,13 @@
}
private function generateDescriptionsChangeOps() {
- foreach( $this-fromItem-getDescriptions() as $langCode =
$desc ){
+ foreach ( $this-fromItem-getDescriptions() as $langCode =
$desc ) {
[MediaWiki-commits] [Gerrit] Change banned Elasticsearch plugins - change (operations/mediawiki-config)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/134585 Change subject: Change banned Elasticsearch plugins .. Change banned Elasticsearch plugins The hebrew plugin is a bit unstable - it'll crash some searches. The unicode plugin should just be better. Hopefully. We'll deploy it in phases by doing in place reindexes in this order: group0 hebrew wikis Then we'll wait a few days for soaking, then do group1, soak a few days, then group2. Change-Id: I19b5fe468abf4de56b5e446b4606d60b97afb729 --- M wmf-config/CirrusSearch-common.php M wmf-config/CirrusSearch-labs.php M wmf-config/CirrusSearch-production.php 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/85/134585/1 diff --git a/wmf-config/CirrusSearch-common.php b/wmf-config/CirrusSearch-common.php index ac2037d..7967483 100644 --- a/wmf-config/CirrusSearch-common.php +++ b/wmf-config/CirrusSearch-common.php @@ -40,6 +40,9 @@ # Raise the refresh interval to save some CPU at the cost of being slightly less realtime. $wgCirrusSearchRefreshInterval = 30; +# Ban the hebrew plugin, it is unstable +$wgCirrusSearchBannedPlugins[] = 'elasticsearch-analysis-hebrew'; + # Settings customized per index. $wgCirrusSearchShardCount = $wmgCirrusSearchShardCount; $wgCirrusSearchUseAggressiveSplitting = $wmgCirrusSearchUseAggressiveSplitting; diff --git a/wmf-config/CirrusSearch-labs.php b/wmf-config/CirrusSearch-labs.php index a37629c..98da557 100644 --- a/wmf-config/CirrusSearch-labs.php +++ b/wmf-config/CirrusSearch-labs.php @@ -27,4 +27,3 @@ $wgCirrusSearchUseExperimentalHighlighter = true; $wgCirrusSearchOptimizeIndexForExperimentalHighlighter = true; -$wgCirrusSearchBannedPlugins[] = 'elasticsearch-analysis-hebrew'; diff --git a/wmf-config/CirrusSearch-production.php b/wmf-config/CirrusSearch-production.php index 849e824..89b7c00 100644 --- a/wmf-config/CirrusSearch-production.php +++ b/wmf-config/CirrusSearch-production.php @@ -28,5 +28,3 @@ $wgCirrusSearchInterwikiSources = $interwikiSearchConf; $wgCirrusSearchInterwikiCacheTime = 60; } - -$wgCirrusSearchBannedPlugins[] = 'analysis-icu'; -- To view, visit https://gerrit.wikimedia.org/r/134585 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I19b5fe468abf4de56b5e446b4606d60b97afb729 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 21/05/2014 10:00 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134586
Change subject: New Wikidata Build - 21/05/2014 10:00
..
New Wikidata Build - 21/05/2014 10:00
Change-Id: Ifb759492e23b7c99b36c89e937366ddfca3dbd36
---
M composer.lock
M extensions/Wikibase/client/i18n/diq.json
M extensions/Wikibase/lib/i18n/et.json
M extensions/Wikibase/lib/i18n/tl.json
M extensions/Wikibase/lib/resources/Resources.php
M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
M extensions/Wikibase/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
M extensions/Wikibase/repo/Wikibase.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpsMerge.php
M extensions/Wikibase/repo/includes/ChangeOp/MergeChangeOpsFactory.php
A extensions/Wikibase/repo/includes/api/AvailableBadges.php
M extensions/Wikibase/repo/includes/specials/SpecialSetSiteLink.php
M
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
A extensions/Wikibase/repo/tests/phpunit/includes/api/AvailableBadgesTest.php
M vendor/autoload.php
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
M vendor/serialization/serialization/.travis.yml
M vendor/serialization/serialization/README.md
M vendor/serialization/serialization/Serialization.php
M vendor/serialization/serialization/composer.json
M
vendor/serialization/serialization/src/Serializers/Exceptions/SerializationException.php
23 files changed, 233 insertions(+), 104 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/86/134586/1
diff --git a/composer.lock b/composer.lock
index 9601a61..c199a5f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -726,16 +726,16 @@
},
{
name: serialization/serialization,
-version: 3.1,
+version: 3.2,
source: {
type: git,
url: https://github.com/wmde/Serialization.git;,
-reference: 3cea2bbef70c74db9614e1cc3e149b4a79ff05dd
+reference: 7e13a0bc0173adc3aea0f16545e871e03a2ac4c4
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wmde/Serialization/zipball/3cea2bbef70c74db9614e1cc3e149b4a79ff05dd;,
-reference: 3cea2bbef70c74db9614e1cc3e149b4a79ff05dd,
+url:
https://api.github.com/repos/wmde/Serialization/zipball/7e13a0bc0173adc3aea0f16545e871e03a2ac4c4;,
+reference: 7e13a0bc0173adc3aea0f16545e871e03a2ac4c4,
shasum:
},
require: {
@@ -744,7 +744,7 @@
type: library,
extra: {
branch-alias: {
-dev-master: 3.1.x-dev
+dev-master: 3.2.x-dev
}
},
autoload: {
@@ -778,7 +778,7 @@
unserialization,
wikidata
],
-time: 2014-03-18 18:45:35
+time: 2014-05-20 15:57:52
},
{
name: wikibase/data-model,
@@ -869,12 +869,12 @@
source: {
type: git,
url:
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: 56608d53d8f72591528cca253f0b128fc346ddb7
+reference: 8aa95d6346743c14b47385a9d199742013fcccf8
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/56608d53d8f72591528cca253f0b128fc346ddb7;,
-reference: 56608d53d8f72591528cca253f0b128fc346ddb7,
+url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8aa95d6346743c14b47385a9d199742013fcccf8;,
+reference: 8aa95d6346743c14b47385a9d199742013fcccf8,
shasum:
},
require: {
@@ -937,7 +937,7 @@
wikibaserepo,
wikidata
],
-time: 2014-05-18 20:08:56
+time: 2014-05-21 09:48:21
}
],
packages-dev: [
diff --git a/extensions/Wikibase/client/i18n/diq.json
b/extensions/Wikibase/client/i18n/diq.json
index 1b81806..635ff79 100644
--- a/extensions/Wikibase/client/i18n/diq.json
+++ b/extensions/Wikibase/client/i18n/diq.json
@@ -20,7 +20,7 @@
wikibase-dataitem: Unsurê melumati,
wikibase-editlinks: Gıreyan bıvurne,
wikibase-editlinkstitle: Gıreyanê miyanzıwani bıvurne,
- wikibase-linkitem-addlinks: Gre de kerê,
+ wikibase-linkitem-addlinks: Gıreyan cı ke,
wikibase-linkitem-title: Pela rê gıre,
wikibase-linkitem-linkpage: Pela rê gıre,
wikibase-linkitem-selectlink: Şıma şenê ke ena pela rê gıre yana
sita berzê.,
diff --git
[MediaWiki-commits] [Gerrit] Stop EventLogging errors when switching from VisualEditor to... - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134587
Change subject: Stop EventLogging errors when switching from VisualEditor to
Editor
..
Stop EventLogging errors when switching from VisualEditor to Editor
Pass the funnel parameter
Bug: 65378
Change-Id: Ide6ef2a91f8f2915697ed186d8474a98e1da09af
---
M javascripts/modules/editor/editor.js
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/87/134587/1
diff --git a/javascripts/modules/editor/editor.js
b/javascripts/modules/editor/editor.js
index 2709982..f008e2e 100644
--- a/javascripts/modules/editor/editor.js
+++ b/javascripts/modules/editor/editor.js
@@ -80,6 +80,7 @@
loadingOverlay.show();
sectionId = page.isWikiText() ? parseInt( sectionId, 10
) : null;
+ funnel = funnel || 'article';
// Check whether VisualEditor should be loaded
if ( isVisualEditorEnabled
@@ -102,7 +103,8 @@
loadingOverlay.hide();
result.resolve( new
VisualEditorOverlay( {
title: page.title,
- sectionId: parseInt( sectionId,
10 )
+ sectionId: parseInt( sectionId,
10 ),
+ funnel: funnel
} ) );
} );
} else {
@@ -116,7 +118,7 @@
isNewEditor:
user.getEditCount() === 0,
sectionId: sectionId,
oldId: M.query.oldid,
- funnel: funnel || 'article'
+ funnel: funnel
} ) );
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/134587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide6ef2a91f8f2915697ed186d8474a98e1da09af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix exposed nbsp; markup - change (mediawiki...GuidedTour)
Phuedx has submitted this change and it was merged.
Change subject: Fix exposed nbsp; markup
..
Fix exposed nbsp; markup
Bug: 65561
Change-Id: Ica4d39d844427b8c8b7cc0c925bd7bccc0a0a0d6
---
M modules/tours/firsteditve.js
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tours/firsteditve.js b/modules/tours/firsteditve.js
index 51951d0..948fedd 100644
--- a/modules/tours/firsteditve.js
+++ b/modules/tours/firsteditve.js
@@ -4,7 +4,9 @@
( function ( window, document, $, mw, gt ) {
var hasEditSectionAtLoadTime, editSectionSelector =
'.mw-editsection-visualeditor',
tabMessages, editTabText, editSectionText, editPageDescription,
- editSectionDescription;
+ editSectionDescription,
+ // Work around jQueryMsg issue (\u00A0 is a non-breaking space
(i.e. nbsp;))
+ NBSP = '\u00A0';
function shouldShowForPage() {
// Excludes pages outside the main namespace and pages with
editing restrictions
@@ -29,13 +31,13 @@
editTabText = mw.message( 'vector-view-edit' ).parse();
if ( tabMessages.editappendix !== null ) {
- editTabText += 'nbsp;' + mw.message( tabMessages.editappendix
).parse();
+ editTabText += NBSP + mw.message( tabMessages.editappendix
).parse();
}
editPageDescription = mw.message(
'guidedtour-tour-firsteditve-edit-page-description', editTabText ).parse();
editSectionText = mw.message( 'editsection' ).parse();
if ( tabMessages.editsectionappendix !== null ) {
- editSectionText += 'nbsp;' + mw.message(
tabMessages.editsectionappendix ).parse();
+ editSectionText += NBSP + mw.message(
tabMessages.editsectionappendix ).parse();
}
editSectionDescription = mw.message(
'guidedtour-tour-firsteditve-edit-section-description',
editSectionText
--
To view, visit https://gerrit.wikimedia.org/r/134516
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica4d39d844427b8c8b7cc0c925bd7bccc0a0a0d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GuidedTour
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: Robmoen rm...@wikimedia.org
Gerrit-Reviewer: Swalling swall...@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] puppet3: fix videoscaler role - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134588
Change subject: puppet3: fix videoscaler role
..
puppet3: fix videoscaler role
Fixed the lookup of classes as puppet 3 if you use 'include foo'
will lookup its actual namespace.
So if you do 'include foo' withing 'role::foo::baz' it will try to
include 'role::foo' and not the class 'foo' you defined as an autoload
module.
The solution is to use 'include ::foo' to tell puppet to search
correctly from the top scope for it. Yes this *is* *really* *really*
elegant and beautiful to read...
Change-Id: Ie52f8d7a135290cce0c14148ca6f63381b31fd59
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M manifests/role/mediawiki.pp
1 file changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/134588/1
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index fae4df9..9328154 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -44,10 +44,10 @@
include standard
if $::realm == 'production' {
-include admins::roots,
-admins::mortals,
-geoip,
-mediawiki
+include admins::roots
+include admins::mortals,
+include geoip
+include ::mediawiki
nrpe::monitor_service { twemproxy:
description = twemproxy process,
@@ -62,7 +62,7 @@
if $::realm == 'labs' {
# MediaWiki configuration specific to labs instances ('beta'
project)
include ::beta::common
-include mediawiki
+include ::mediawiki
# Eqiad instances do not mount additional disk space
include labs_lvm
@@ -212,9 +212,9 @@
include role::mediawiki::common
-include ::imagescaler::cron,
-::imagescaler::packages,
-::imagescaler::files
+include ::imagescaler::cron
+include ::imagescaler::packages,
+include ::imagescaler::files
class {::mediawiki::jobrunner:
run_jobs_enabled = $run_jobs_enabled,
--
To view, visit https://gerrit.wikimedia.org/r/134588
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie52f8d7a135290cce0c14148ca6f63381b31fd59
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implement upload via Add image on New file pages - change (mediawiki...MobileFrontend)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134589
Change subject: Implement upload via Add image on New file pages
..
Implement upload via Add image on New file pages
Disabled edit button on pages with not existing files (new file pages), enabled
the upload button
starts the upload workflow. Edit workflow so no new page will be created if
upload starts via new file page.
Simply reload the page after finished upload.
Bug: 58311
Change-Id: I16d969f2a84c25376468bdb4c0458fe3426b92ee
---
M javascripts/modules/editor/editor.js
M javascripts/modules/uploads/PhotoApi.js
M javascripts/modules/uploads/lead-photo-init.js
3 files changed, 23 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/89/134589/1
diff --git a/javascripts/modules/editor/editor.js
b/javascripts/modules/editor/editor.js
index 2709982..7924cfd 100644
--- a/javascripts/modules/editor/editor.js
+++ b/javascripts/modules/editor/editor.js
@@ -66,7 +66,8 @@
* @param {Page} page The page to edit.
*/
function setupEditor( page ) {
- var isNewPage = page.options.id === 0;
+ var isNewPage = page.options.id === 0,
+ isNewFile = M.inNamespace( 'file' ) isNewPage;
if ( M.query.undo ) {
window.alert( mw.msg(
'mobile-frontend-editor-undo-unsupported' ) );
}
@@ -137,6 +138,11 @@
}
}
+ // Bug 58311 disable edit button if new page file
+ if ( isNewFile ) {
+ $( '#ca-edit' ).removeClass( 'enabled' );
+ }
+
// FIXME change when micro.tap.js in stable
$( '.edit-page' ).on( M.tapEvent( 'mouseup' ), function( ev ) {
// prevent folding section when clicking Edit
diff --git a/javascripts/modules/uploads/PhotoApi.js
b/javascripts/modules/uploads/PhotoApi.js
index 2b10d8c..81a9482 100644
--- a/javascripts/modules/uploads/PhotoApi.js
+++ b/javascripts/modules/uploads/PhotoApi.js
@@ -129,7 +129,11 @@
* containing error message).
*/
save: function( options ) {
- var self = this, result = $.Deferred(), apiUrl =
endpoint || this.apiUrl;
+ var isNewPage = mw.config.get( 'wgArticleId' ) === 0,
+ isNewFile = M.inNamespace( 'file' ) isNewPage,
+ self = this,
+ result = $.Deferred(),
+ apiUrl = endpoint || this.apiUrl;
options.editSummaryMessage = options.insertInPage ?
'mobile-frontend-photo-article-edit-comment' :
@@ -141,7 +145,11 @@
ext = options.file.name.slice(
options.file.name.lastIndexOf( '.' ) + 1 ),
request, data;
- options.fileName = generateFileName(
options.description, '.' + ext );
+ if ( !isNewFile ) {
+ options.fileName = generateFileName(
options.description, '.' + ext );
+ } else {
+ options.fileName = mw.config.get(
'wgTitle' );
+ }
data = {
action: 'upload',
@@ -208,7 +216,7 @@
descriptionUrl =
data.upload.imageinfo.descriptionurl;
}
- if ( self.editorApi ) {
+ if ( self.editorApi !isNewFile ) {
self.editorApi.setPrependText(
'[[File:' + options.fileName + '|thumbnail|' + options.description + ']]\n\n' );
self.editorApi.save( { summary:
mw.msg( 'mobile-frontend-photo-upload-comment' ) } ).
done( function() {
@@ -218,6 +226,8 @@
err.stage =
'edit';
result.reject(
err );
} );
+ } else if ( isNewFile ) {
+ window.location.reload( );
} else {
result.resolve(
options.fileName, descriptionUrl );
}
diff --git a/javascripts/modules/uploads/lead-photo-init.js
[MediaWiki-commits] [Gerrit] Adapt to changes in DataTypes 0.3 - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Adapt to changes in DataTypes 0.3
..
Adapt to changes in DataTypes 0.3
Change-Id: Ie0b40e317202e19f7f9941fc4d2b09452c5257bf
---
M composer.json
M lib/config/WikibaseLib.default.php
M lib/i18n/en.json
M lib/i18n/qqq.json
M lib/includes/WikibaseDataTypeBuilders.php
M lib/includes/formatters/MonolingualHtmlFormatter.php
M repo/Wikibase.php
M repo/i18n/en.json
M repo/i18n/qqq.json
M repo/includes/specials/SpecialListDatatypes.php
10 files changed, 22 insertions(+), 22 deletions(-)
Approvals:
WikidataJenkins: Verified
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
Objections:
Adrian Lang: There's a problem with this change, please improve
diff --git a/composer.json b/composer.json
index 5a62e18..33ef8ce 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
data-values/number: ~0.4.0,
data-values/time: ~0.5.2,
data-values/validators: ~0.1.0,
- data-values/data-types: ~0.2.0,
+ data-values/data-types: ~0.3.0,
data-values/serialization: ~1.0,
data-values/javascript: ~0.5.0,
data-values/value-view: ~0.5.0,
diff --git a/lib/config/WikibaseLib.default.php
b/lib/config/WikibaseLib.default.php
index 1a7f77a..b73dbfc 100644
--- a/lib/config/WikibaseLib.default.php
+++ b/lib/config/WikibaseLib.default.php
@@ -116,7 +116,7 @@
if ( defined( 'WB_EXPERIMENTAL_FEATURES' ) WB_EXPERIMENTAL_FEATURES
) {
// experimental data types
$defaults['dataTypes'] = array_merge( $defaults['dataTypes'],
array(
- 'monolingual-text',
+ 'monolingualtext',
//'multilingual-text',
) );
}
diff --git a/lib/i18n/en.json b/lib/i18n/en.json
index d686721..d12792e 100644
--- a/lib/i18n/en.json
+++ b/lib/i18n/en.json
@@ -102,5 +102,5 @@
wikibase-time-precision-BCE-millennium: $1. millennium BCE,
wikibase-time-precision-BCE-century: $1. century BCE,
wikibase-time-precision-BCE-10annum: $1s BCE,
-wikibase-monolingual-text: span lang=\$2\
class=\wb-monolingual-text-value\$1/span span
class=\wb-monolingual-text-language-name\($3)/span
+wikibase-monolingualtext: span lang=\$2\
class=\wb-monolingualtext-value\$1/span span
class=\wb-monolingualtext-language-name\($3)/span
}
diff --git a/lib/i18n/qqq.json b/lib/i18n/qqq.json
index 4242baf..a79fc27 100644
--- a/lib/i18n/qqq.json
+++ b/lib/i18n/qqq.json
@@ -110,5 +110,5 @@
wikibase-time-precision-BCE-millennium: !!DO NOT TRANSLATE!! Used to
present a point in time BCE (before current era) with the precession of 1000
years\n{{Related|Wikibase-time-precision}},
wikibase-time-precision-BCE-century: !!DO NOT TRANSLATE!! Used to
present a point in time BCE (before current era) with the precession of 100
years\n{{Related|Wikibase-time-precision}},
wikibase-time-precision-BCE-10annum: !!DO NOT TRANSLATE!! Used to
present a point in time BCE (before current era) with the precession of 10
years\n{{Related|Wikibase-time-precision}},
- wikibase-monolingual-text: Format for displaying monolingual text
(along with a language name).\n\nParameters:\n* $1 - the text\n* $2 - the code
of the language of the text\n* $3 - the name of the language of the text, in
the user's language.
+ wikibase-monolingualtext: Format for displaying monolingual text
(along with a language name).\n\nParameters:\n* $1 - the text\n* $2 - the code
of the language of the text\n* $3 - the name of the language of the text, in
the user's language.
}
diff --git a/lib/includes/WikibaseDataTypeBuilders.php
b/lib/includes/WikibaseDataTypeBuilders.php
index 1683054..5104adc 100644
--- a/lib/includes/WikibaseDataTypeBuilders.php
+++ b/lib/includes/WikibaseDataTypeBuilders.php
@@ -82,8 +82,8 @@
);
$experimental = array(
- 'monolingual-text' = array( $this,
'buildMonolingualTextType' ),
- // 'multilingual-text' = array( $this,
'buildMultilingualTextType' ),
+ 'monolingualtext' = array( $this,
'buildMonolingualTextType' ),
+ // 'multilingualtext' = array( $this,
'buildMultilingualTextType' ),
);
if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
@@ -164,7 +164,7 @@
}
/**
-* @param string $id Data type ID, e.g. 'monolingual-text'
+* @param string $id Data type ID, e.g. 'monolingualtext'
*
* @return DataType
*/
@@ -187,7 +187,7 @@
true
);
- return new DataType( $id, 'monolingual-text', array( new
TypeValidator( 'DataValues\DataValue' ), $topValidator ) );
+
[MediaWiki-commits] [Gerrit] Inserted test whether the resource 'uploadsource' is already... - change (mediawiki/core)
Mwjames has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134590
Change subject: Inserted test whether the resource 'uploadsource' is already
registered. Bug: 65530
..
Inserted test whether the resource 'uploadsource' is already registered.
Bug: 65530
Change-Id: I1b82d6dc6a37792d4e7b7d01316802ea4d38a88b
---
M includes/Import.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/90/134590/1
diff --git a/includes/Import.php b/includes/Import.php
index b18e257..ef601ed 100644
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -45,7 +45,9 @@
function __construct( $source ) {
$this-reader = new XMLReader();
- stream_wrapper_register( 'uploadsource', 'UploadSourceAdapter'
);
+ if ( !in_array( 'uploadsource', stream_get_wrappers() ) ) {
+ stream_wrapper_register( 'uploadsource',
'UploadSourceAdapter' );
+ }
$id = UploadSourceAdapter::registerSource( $source );
if ( defined( 'LIBXML_PARSEHUGE' ) ) {
$this-reader-open( uploadsource://$id, null,
LIBXML_PARSEHUGE );
--
To view, visit https://gerrit.wikimedia.org/r/134590
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b82d6dc6a37792d4e7b7d01316802ea4d38a88b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
Gerrit-Owner: Mwjames jamesin.hongkon...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Fix: numFields wrong for sqlite - change (mediawiki/core)
Physikerwelt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134591
Change subject: WIP: Fix: numFields wrong for sqlite
..
WIP: Fix: numFields wrong for sqlite
* Sqlite returned a doubled number of fields.
Bug: 65578
Change-Id: I399c7c857dcbd774cc4eb6102bbfe8a8764b07c9
---
M includes/db/DatabaseSqlite.php
M tests/phpunit/includes/db/DatabaseSqliteTest.php
2 files changed, 17 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/91/134591/1
diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 468ed6d..39a74f8 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -342,8 +342,8 @@
*/
function numFields( $res ) {
$r = $res instanceof ResultWrapper ? $res-result : $res;
-
- return is_array( $r ) ? count( $r[0] ) : 0;
+ // The size of the result array is twice the number of fields.
(Bug: 65578)
+ return is_array( $r ) ? count( $r[0] ) / 2 : 0;
}
/**
diff --git a/tests/phpunit/includes/db/DatabaseSqliteTest.php
b/tests/phpunit/includes/db/DatabaseSqliteTest.php
index b4c1953..29b6a4e 100644
--- a/tests/phpunit/includes/db/DatabaseSqliteTest.php
+++ b/tests/phpunit/includes/db/DatabaseSqliteTest.php
@@ -431,4 +431,19 @@
$row = $res-fetchRow();
$this-assertFalse( (bool)$row['a'] );
}
+
+ /**
+* @covers DatabaseSqlite::numFields
+*/
+ public function testNumFields() {
+ $db = new DatabaseSqliteStandalone( ':memory:' );
+
+ $databaseCreation = $db-query( 'CREATE TABLE a ( a_1 )',
__METHOD__ );
+ $this-assertInstanceOf( 'ResultWrapper', $databaseCreation,
Failed to create table a );
+
+ $res = $db-select( 'a' , '*');
+ $this-assertEquals( 1, $db-numFields($res), wrong number of
fields );
+
+ $this-assertTrue( $db-close(), closing database );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/134591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I399c7c857dcbd774cc4eb6102bbfe8a8764b07c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace #p-lang-list with #p-lang .body ul - change (mediawiki...UniversalLanguageSelector)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134592
Change subject: Replace #p-lang-list with #p-lang .body ul
..
Replace #p-lang-list with #p-lang .body ul
The #p-lang-list id was removed from core,
and this broke the compact links beta feature.
This commit replaces it with a different selector.
Change-Id: I154919a54b032dd481fe080204a2a16819d85140
---
M resources/css/ext.uls.compactlinks.css
M resources/js/ext.uls.compactlinks.js
2 files changed, 3 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/92/134592/1
diff --git a/resources/css/ext.uls.compactlinks.css
b/resources/css/ext.uls.compactlinks.css
index dc01bf8..281a25d 100644
--- a/resources/css/ext.uls.compactlinks.css
+++ b/resources/css/ext.uls.compactlinks.css
@@ -6,7 +6,7 @@
margin: 5px 0;
}
-#p-lang-list .uls-trigger {
+#p-lang .body ul .uls-trigger {
background-image: none;
padding: 0;
}
@@ -37,4 +37,4 @@
border-right-color: #55;
border-width: 20px;
top: 250px;
-}
\ No newline at end of file
+}
diff --git a/resources/js/ext.uls.compactlinks.js
b/resources/js/ext.uls.compactlinks.js
index 104a5d6..2f276fd 100644
--- a/resources/js/ext.uls.compactlinks.js
+++ b/resources/js/ext.uls.compactlinks.js
@@ -317,6 +317,6 @@
};
$( document ).ready( function () {
- $( '#p-lang-list' ).compactInterlanguageList();
+ $( '#p-lang .body ul' ).compactInterlanguageList();
} );
}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/134592
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I154919a54b032dd481fe080204a2a16819d85140
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
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] Page.site is a property - change (pywikibot/core)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/134593 Change subject: Page.site is a property .. Page.site is a property Page.site() is unknown in core Change-Id: If91625baa6f88d2768239c7482e506f059327102 --- M README-conversion.txt 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/93/134593/1 diff --git a/README-conversion.txt b/README-conversion.txt index c3c69cb..ae5966d 100644 --- a/README-conversion.txt +++ b/README-conversion.txt @@ -77,7 +77,7 @@ - titleWithoutNamespace(): replaced by Page.title(withNamespace=False) - sectionFreeTitle(): replaced by Page.title(withSection=False) - aslink(): replaced by Page.title(asLink=True) -- encoding(): replaced by Page.site().encoding() +- encoding(): replaced by Page.site.encoding() The following methods of the Page object have been obsoleted and no longer work (but these methods don't appear to be used anywhere in the code -- To view, visit https://gerrit.wikimedia.org/r/134593 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If91625baa6f88d2768239c7482e506f059327102 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pool db1068 in s4, warm up - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/134594 Change subject: pool db1068 in s4, warm up .. pool db1068 in s4, warm up Change-Id: Ie987674aef4d8fc0435c0c32abf3835c3ec208fa --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/94/134594/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index f195d4e..3bc7853 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -122,6 +122,7 @@ 'db1056' = 400, # 2.8TB 96GB 'db1059' = 400, # 2.8TB 96GB 'db1064' = 500, # 2.8TB 160GB + 'db1068' = 50, # 2.8TB 160GB, warm up ), 's5' = array( 'db1058' = 0, # 2.8TB 96GB @@ -406,6 +407,7 @@ 'db1065' = '10.64.48.20', #do not remove or comment out 'db1066' = '10.64.48.21', #do not remove or comment out 'db1067' = '10.64.48.22', #do not remove or comment out + 'db1068' = '10.64.48.23', #do not remove or comment out 'db1070' = '10.64.48.25', #do not remove or comment out 'db1071' = '10.64.48.26', #do not remove or comment out ), -- To view, visit https://gerrit.wikimedia.org/r/134594 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie987674aef4d8fc0435c0c32abf3835c3ec208fa Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pool db1068 in s4, warm up - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: pool db1068 in s4, warm up .. pool db1068 in s4, warm up Change-Id: Ie987674aef4d8fc0435c0c32abf3835c3ec208fa --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index f195d4e..3bc7853 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -122,6 +122,7 @@ 'db1056' = 400, # 2.8TB 96GB 'db1059' = 400, # 2.8TB 96GB 'db1064' = 500, # 2.8TB 160GB + 'db1068' = 50, # 2.8TB 160GB, warm up ), 's5' = array( 'db1058' = 0, # 2.8TB 96GB @@ -406,6 +407,7 @@ 'db1065' = '10.64.48.20', #do not remove or comment out 'db1066' = '10.64.48.21', #do not remove or comment out 'db1067' = '10.64.48.22', #do not remove or comment out + 'db1068' = '10.64.48.23', #do not remove or comment out 'db1070' = '10.64.48.25', #do not remove or comment out 'db1071' = '10.64.48.26', #do not remove or comment out ), -- To view, visit https://gerrit.wikimedia.org/r/134594 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie987674aef4d8fc0435c0c32abf3835c3ec208fa Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@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] Notify qa-ale...@lists.wikimedia.org - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/134595 Change subject: Notify qa-ale...@lists.wikimedia.org .. Notify qa-ale...@lists.wikimedia.org A notification mailling list has been added (bug 64610). Send all browser tests result to there. Change-Id: I85cb331f81ca56edd2998158d864f4000d231aee --- M jobs.yaml 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/95/134595/1 diff --git a/jobs.yaml b/jobs.yaml index 3306d65..9a98365 100644 --- a/jobs.yaml +++ b/jobs.yaml @@ -3,21 +3,21 @@ name: listofemails # a 'name' is required by JJB. lists: - CentralAuth: emails-CentralAuth -cmcma...@wikimedia.org cste...@wikimedia.org +qa-ale...@lists.wikimedia.org cmcma...@wikimedia.org cste...@wikimedia.org - CirrusSearch: emails-CirrusSearch -cmcma...@wikimedia.org never...@wikimedia.org +qa-ale...@lists.wikimedia.org cmcma...@wikimedia.org never...@wikimedia.org - i18n: emails-i18n -aahar...@wikimedia.org cmcma...@wikimedia.org nlaxst...@wikimedia.org +qa-ale...@lists.wikimedia.org aahar...@wikimedia.org cmcma...@wikimedia.org nlaxst...@wikimedia.org - mobile: emails-mobile -cmcma...@wikimedia.org mobile-t...@wikimedia.org +qa-ale...@lists.wikimedia.org cmcma...@wikimedia.org mobile-t...@wikimedia.org - MultimediaViewer: emails-multimedia -multimedia-ale...@lists.wikimedia.org +qa-ale...@lists.wikimedia.org multimedia-ale...@lists.wikimedia.org - qa: emails-qa -cmcma...@wikimedia.org +qa-ale...@lists.wikimedia.org cmcma...@wikimedia.org - ULS: emails-ULS -aahar...@wikimedia.org cmcma...@wikimedia.org kmis...@wikimedia.org nlaxst...@wikimedia.org sthottin...@wikimedia.org +qa-ale...@lists.wikimedia.org aahar...@wikimedia.org cmcma...@wikimedia.org kmis...@wikimedia.org nlaxst...@wikimedia.org sthottin...@wikimedia.org - VisualEditor: emails-VisualEditor -cmcma...@wikimedia.org jforres...@wikimedia.org +qa-ale...@lists.wikimedia.org cmcma...@wikimedia.org jforres...@wikimedia.org # CentralAuth - project: -- To view, visit https://gerrit.wikimedia.org/r/134595 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85cb331f81ca56edd2998158d864f4000d231aee Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: cloudbees 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] puppet_compiler: update to 0.2.2 - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134596
Change subject: puppet_compiler: update to 0.2.2
..
puppet_compiler: update to 0.2.2
Change-Id: I586533ee2c1d9b70a1068707b87c252d96582faa
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M manifests/role/puppet_compiler.pp
M modules/puppet_compiler/manifests/init.pp
2 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/134596/1
diff --git a/manifests/role/puppet_compiler.pp
b/manifests/role/puppet_compiler.pp
index a59113f..d67afb0 100644
--- a/manifests/role/puppet_compiler.pp
+++ b/manifests/role/puppet_compiler.pp
@@ -10,7 +10,7 @@
class {'::puppet_compiler':
ensure = 'present',
-version = '0.2.1',
+version = '0.2.2',
user= 'jenkins-deploy',
}
diff --git a/modules/puppet_compiler/manifests/init.pp
b/modules/puppet_compiler/manifests/init.pp
index c471935..9d60506 100644
--- a/modules/puppet_compiler/manifests/init.pp
+++ b/modules/puppet_compiler/manifests/init.pp
@@ -17,6 +17,12 @@
content = template('puppet_compiler/nginx_site.erb'),
}
+file_line {'modify_nginx_magic_types':
+path = '/etc/nginx/mime.types',
+line = ' text/plain txt pson
warnings.out;',
+match = ' text/plain txt;'
+}
+
# This wrapper defines the env variables for running.
file {'run_wrapper':
ensure = $ensure,
--
To view, visit https://gerrit.wikimedia.org/r/134596
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I586533ee2c1d9b70a1068707b87c252d96582faa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Run tests against MW 1.23 - change (mediawiki...Wikibase)
Jeroen De Dauw has uploaded a new change for review. https://gerrit.wikimedia.org/r/134597 Change subject: Run tests against MW 1.23 .. Run tests against MW 1.23 Change-Id: Iadf6a5e71ac2349eaf1c454af294892d5611b6c0 --- M .travis.yml 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/97/134597/1 diff --git a/.travis.yml b/.travis.yml index 4b5207a..a359289 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,11 @@ php: 5.3 - env: DBTYPE=sqlite LANG=de; MW=master WB=repo php: 5.3 -- env: DBTYPE=sqlite LANG=de; MW=master WB=both +- env: DBTYPE=sqlite LANG=de; MW=1.23.0-rc.1 WB=both php: 5.4 -- env: DBTYPE=sqlite LANG=en; MW=master WB=client +- env: DBTYPE=sqlite LANG=en; MW=1.23.0-rc.1 WB=client php: 5.5 -- env: DBTYPE=sqlite LANG=en; MW=master WB=repo +- env: DBTYPE=sqlite LANG=en; MW=1.23.0-rc.1 WB=repo php: 5.6 - env: DBTYPE=sqlite LANG=en; MW=master WB=both php: hhvm -- To view, visit https://gerrit.wikimedia.org/r/134597 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iadf6a5e71ac2349eaf1c454af294892d5611b6c0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] puppet_compiler: update to 0.2.2 - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: puppet_compiler: update to 0.2.2
..
puppet_compiler: update to 0.2.2
Change-Id: I586533ee2c1d9b70a1068707b87c252d96582faa
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M manifests/role/puppet_compiler.pp
M modules/puppet_compiler/manifests/init.pp
2 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/puppet_compiler.pp
b/manifests/role/puppet_compiler.pp
index a59113f..d67afb0 100644
--- a/manifests/role/puppet_compiler.pp
+++ b/manifests/role/puppet_compiler.pp
@@ -10,7 +10,7 @@
class {'::puppet_compiler':
ensure = 'present',
-version = '0.2.1',
+version = '0.2.2',
user= 'jenkins-deploy',
}
diff --git a/modules/puppet_compiler/manifests/init.pp
b/modules/puppet_compiler/manifests/init.pp
index c471935..9d60506 100644
--- a/modules/puppet_compiler/manifests/init.pp
+++ b/modules/puppet_compiler/manifests/init.pp
@@ -17,6 +17,12 @@
content = template('puppet_compiler/nginx_site.erb'),
}
+file_line {'modify_nginx_magic_types':
+path = '/etc/nginx/mime.types',
+line = ' text/plain txt pson
warnings.out;',
+match = ' text/plain txt;'
+}
+
# This wrapper defines the env variables for running.
file {'run_wrapper':
ensure = $ensure,
--
To view, visit https://gerrit.wikimedia.org/r/134596
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I586533ee2c1d9b70a1068707b87c252d96582faa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.toc.test: Stub $.cookie to avoid test pollution - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.toc.test: Stub $.cookie to avoid test pollution
..
mediawiki.toc.test: Stub $.cookie to avoid test pollution
When running the tests locally the mediawiki.toc tests often
fail because where it asserts hidden it is visible, and where it
asserts visible it is hidden (this happens if you've ever closed
a toc section on your local wiki, causes the tests to be one-off).
Change-Id: Idc5e7123f3be3e11dac50d76d13089a2fabcfdb5
---
M tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
index 3f856b9..e43516b 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
@@ -1,5 +1,10 @@
( function ( mw, $ ) {
- QUnit.module( 'mediawiki.toc', QUnit.newMwEnvironment() );
+ QUnit.module( 'mediawiki.toc', QUnit.newMwEnvironment( {
+ setup: function () {
+ // Prevent live cookies like mw_hidetoc=1 from
interferring with the test
+ this.stub( $, 'cookie' ).returns( null );
+ }
+ } ) );
QUnit.asyncTest( 'toggleToc', 4, function ( assert ) {
var tocHtml, $toggleLink, $tocList;
--
To view, visit https://gerrit.wikimedia.org/r/134361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idc5e7123f3be3e11dac50d76d13089a2fabcfdb5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
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] Allow for URLs in article assignment - change (mediawiki...EducationProgram)
Jlloyd has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134598
Change subject: Allow for URLs in article assignment
..
Allow for URLs in article assignment
Users could potentially misuse the article assignment box by inputting
a URL instead of the title of an article. This bugfix parses the input
if it doesn't appear to be an article and tries to add the article
referenced by the end of the URL.
(e.g. http://en.wikipedia.org/wiki/Greece - Greece)
Bug: 44397
Change-Id: I294835999c265d309af05c3de9869ae353a10ea7
---
M includes/actions/AddArticleAction.php
1 file changed, 57 insertions(+), 44 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EducationProgram
refs/changes/98/134598/1
diff --git a/includes/actions/AddArticleAction.php
b/includes/actions/AddArticleAction.php
index bc974b7..757d025 100644
--- a/includes/actions/AddArticleAction.php
+++ b/includes/actions/AddArticleAction.php
@@ -17,57 +17,70 @@
*/
class AddArticleAction extends \FormlessAction {
- /**
-* @see Action::getName()
-*/
- public function getName() {
- return 'epaddarticle';
- }
+/**
+ * @see Action::getName()
+ */
+public function getName() {
+return 'epaddarticle';
+}
- /**
-* @see FormlessAction::onView()
-*/
- public function onView() {
- $req = $this-getRequest();
- $user = $this-getUser();
- $courseId = $req-getInt( 'course-id' );
- $studentUserId = $req-getInt( 'student-user-id' );
+/**
+ * @see FormlessAction::onView()
+ */
+public function onView() {
+$req = $this-getRequest();
+$user = $this-getUser();
+$courseId = $req-getInt( 'course-id' );
+$studentUserId = $req-getInt( 'student-user-id' );
- $salt = 'addarticle' . $courseId . $studentUserId;
- $title = \Title::newFromText( $req-getText( 'addarticlename' )
);
+$salt = 'addarticle' . $courseId . $studentUserId;
+$reqArticleName = $req-getText( 'addarticlename' );
+$title = \Title::newFromText( $reqArticleName );
- // TODO: some kind of warning when entering invalid title
- if ( $user-matchEditToken( $req-getText( 'token' ), $salt )
!is_null( $title ) ) {
+// If the article isn't found, perhaps the user entered a URL instead
+// of an article title. So let's try extracting the title from the URL.
+if ( $title-getArticleID() == 0 ) {
+$wikiDelimiter = '/wiki/';
+$wikiPosition = strpos( $reqArticleName, $wikiDelimiter);
- // TODO: migrate into ArticleAdder
- $course = Courses::singleton()-selectRow(
- array( 'students', 'name' ),
- array( 'id' = $courseId )
- );
+if ( $wikiPosition !== false ) {
+$newTitleText = substr( $reqArticleName, $wikiPosition +
strlen( $wikiDelimiter ) );
+$title = \Title::newFromText( $newTitleText );
+}
+}
- if ( $course !== false in_array( $studentUserId,
$course-getField( 'students' ) ) ) {
-
Extension::globalInstance()-newArticleAdder()-addArticle(
- $user,
- $courseId,
- $studentUserId,
- $title-getArticleID(),
- $title-getFullText()
- );
- }
- }
+// TODO: some kind of warning when entering invalid title
+if ( $user-matchEditToken( $req-getText( 'token' ), $salt )
!is_null( $title ) ) {
- $returnTo = null;
+// TODO: migrate into ArticleAdder
+$course = Courses::singleton()-selectRow(
+array( 'students', 'name' ),
+array( 'id' = $courseId )
+);
- if ( $req-getCheck( 'returnto' ) ) {
- $returnTo = Title::newFromText( $req-getText(
'returnto' ) );
- }
+if ( $course !== false in_array( $studentUserId,
$course-getField( 'students' ) ) ) {
+Extension::globalInstance()-newArticleAdder()-addArticle(
+$user,
+$courseId,
+$studentUserId,
+$title-getArticleID(),
+$title-getFullText()
+);
+}
+}
- if ( is_null( $returnTo ) ) {
- $returnTo = $this-getTitle();
- }
+$returnTo = null;
-
[MediaWiki-commits] [Gerrit] puppet_compiler: assign mime types to produced files - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134599
Change subject: puppet_compiler: assign mime types to produced files
..
puppet_compiler: assign mime types to produced files
Change-Id: I359cdf73785e285197820bb482112065192c1db9
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/puppet_compiler/manifests/init.pp
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/99/134599/1
diff --git a/modules/puppet_compiler/manifests/init.pp
b/modules/puppet_compiler/manifests/init.pp
index 9d60506..d9abc9d 100644
--- a/modules/puppet_compiler/manifests/init.pp
+++ b/modules/puppet_compiler/manifests/init.pp
@@ -18,9 +18,11 @@
}
file_line {'modify_nginx_magic_types':
-path = '/etc/nginx/mime.types',
-line = ' text/plain txt pson
warnings.out;',
-match = ' text/plain txt;'
+path= '/etc/nginx/mime.types',
+line= \ttext/plain\t\t\t\ttxt pson warnings out diff formatted;,
+match = \ttext/plain\t\t\t\ttxt,
+require = Nginx::Site['puppet-compiler'],
+notify = Service['nginx']
}
# This wrapper defines the env variables for running.
--
To view, visit https://gerrit.wikimedia.org/r/134599
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I359cdf73785e285197820bb482112065192c1db9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] puppet_compiler: assign mime types to produced files - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: puppet_compiler: assign mime types to produced files
..
puppet_compiler: assign mime types to produced files
Change-Id: I359cdf73785e285197820bb482112065192c1db9
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/puppet_compiler/manifests/init.pp
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppet_compiler/manifests/init.pp
b/modules/puppet_compiler/manifests/init.pp
index 9d60506..d9abc9d 100644
--- a/modules/puppet_compiler/manifests/init.pp
+++ b/modules/puppet_compiler/manifests/init.pp
@@ -18,9 +18,11 @@
}
file_line {'modify_nginx_magic_types':
-path = '/etc/nginx/mime.types',
-line = ' text/plain txt pson
warnings.out;',
-match = ' text/plain txt;'
+path= '/etc/nginx/mime.types',
+line= \ttext/plain\t\t\t\ttxt pson warnings out diff formatted;,
+match = \ttext/plain\t\t\t\ttxt,
+require = Nginx::Site['puppet-compiler'],
+notify = Service['nginx']
}
# This wrapper defines the env variables for running.
--
To view, visit https://gerrit.wikimedia.org/r/134599
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I359cdf73785e285197820bb482112065192c1db9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.searchSuggest: Code clean up - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.searchSuggest: Code clean up
..
mediawiki.searchSuggest: Code clean up
* Cache mw.Api instance.
* Remove redundant str.length check in fetch(),
jquery.suggestions already takes care of this (it never calls
fetch if the string is empty, and if it did, then this code would've
left it unhandled causing bugs (e.g. suggestions of the previous
fetch remain visible).
* Remove redundant promise.abort check.
* Use $.data() and $.removeData() to bypass unneeded convenience
logic for collections and HTML data attributes.
Change-Id: I59ae21c4b481ef52e4db14cb1f3f2fe026c23b3f
---
M resources/src/mediawiki/mediawiki.searchSuggest.js
1 file changed, 21 insertions(+), 20 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.searchSuggest.js
b/resources/src/mediawiki/mediawiki.searchSuggest.js
index cbdf666..c2c70b0 100644
--- a/resources/src/mediawiki/mediawiki.searchSuggest.js
+++ b/resources/src/mediawiki/mediawiki.searchSuggest.js
@@ -3,7 +3,7 @@
*/
( function ( mw, $ ) {
$( function () {
- var map, resultRenderCache, searchboxesSelectors,
+ var api, map, resultRenderCache, searchboxesSelectors,
// Region where the suggestions box will appear
directly below
// (using the same width). Can be a container element
or the input
// itself, depending on what suits best in the
environment.
@@ -121,33 +121,34 @@
$( searchboxesSelectors.join( ', ' ) )
.suggestions( {
fetch: function ( query ) {
- var $el;
+ var $textbox = this,
+ node = this[0];
- if ( query.length !== 0 ) {
- $el = $( this );
- $el.data( 'request', ( new
mw.Api() ).get( {
- action: 'opensearch',
- search: query,
- namespace: 0,
- suggest: ''
- } ).done( function ( data ) {
- $el.suggestions(
'suggestions', data[1] );
- } ) );
- }
+ api = api || new mw.Api();
+
+ $.data( node, 'request', api.get( {
+ action: 'opensearch',
+ search: query,
+ namespace: 0,
+ suggest: ''
+ } ).done( function ( data ) {
+ $textbox.suggestions(
'suggestions', data[1] );
+ } ) );
},
cancel: function () {
- var apiPromise = $( this ).data(
'request' );
- // If the delay setting has caused the
fetch to have not even happened
- // yet, the apiPromise object will have
never been set.
- if ( apiPromise $.isFunction(
apiPromise.abort ) ) {
- apiPromise.abort();
- $( this ).removeData( 'request'
);
+ var node = this[0],
+ request = $.data( node,
'request' );
+
+ if ( request ) {
+ request.abort();
+ $.removeData( node, 'request' );
}
},
result: {
render: renderFunction,
select: function () {
- return true; // allow the form
to be submitted
+ // allow the form to be
submitted
+ return true;
}
},
[MediaWiki-commits] [Gerrit] A simple script to help converting scripts from compat to core - change (pywikibot/core)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134600
Change subject: A simple script to help converting scripts from compat to core
..
A simple script to help converting scripts from compat to core
most of the conversions are for README-conversion.txt
Change-Id: I17e80e0fd17ec619c95d986ed210b389a0e8d73d
---
A scripts/maintenance/compat2core.py
1 file changed, 160 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/00/134600/1
diff --git a/scripts/maintenance/compat2core.py
b/scripts/maintenance/compat2core.py
new file mode 100644
index 000..00d6195
--- /dev/null
+++ b/scripts/maintenance/compat2core.py
@@ -0,0 +1,160 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+This is a helper script to convert compat 1.0 scripts to the new core 2.0
+framework. The scripts asks for the .py file and converts it to
+scriptname-core.py in the same directory. The following options are
supported:
+
+- warnonly: Do not convert the source but show warning messages. This is good
+to check already merged scripts.
+
+usage
+
+to convert a script and show warnings about deprecated methods:
+compat2core.py scriptname
+
+to show warnings about deprecated methods:
+compat2core.py scriptname -warnonly
+
+#
+# (C) xqt, 2014
+#
+# Distributed under the terms of the MIT license.
+#
+__version__ = '$Id$'
+#
+
+import os
+import re
+import codecs
+import pywikibot
+
+# be carefull with replacement order!
+replacements = (
+# importing changes
+('import wikipedia as pywikibot', 'import pywikibot'),
+('import wikipedia', 'import pywikibot'),
+('import pagegenerator', 'from pywikibot import pagegenerator'),
+('import config', 'from pywikibot import config'),
+# remove deprecated libs
+('import catlib\r?\n', ''),
+('import userlib\r?\n', ''),
+# change wikipedia to pywikibot
+('wikipedia\.', u'pywikibot.'),
+# site instance call
+('pywikibot\.getSite\s*\(\s*', 'pywikibot.Site('),
+# change compat library classes to pywikibot intrinsic classes
+('catlib\.Category\s*\(\s*', 'pywikibot.Category('),
+('userlib\.User\s*\(\s*', 'pywikibot.User('),
+# deprecated title methods
+('\.urlname\s*\(\s*\)', '.title(asUrl=True)'),
+('\.urlname\s*\(\s*(?:withNamespace\s*=\s*)?(True|False)+\s*\)',
+ r'.title(asUrl=True, withNamespace=\1)'),
+('\.titleWithoutNamespace\s*\(\s*\)', '.title(withNamespace=False)'),
+('\.sectionFreeTitle\s*\(\s*\)', '.title(withSection=False)'),
+('\.aslink\s*\(\s*\)', '.title(asLink=True)'),
+# other deprecated methods
+('\.encoding\s*\(\s*\)', '.site.encoding()'),
+# stopme() is doen by the framework itself
+
('\s+try\:\s*\r?\n\s+main\(\)\s*\r?\n\s+finally\:\s*\r?\n\s+pywikibot\.stopme\(\)',
+ '\nmain()'),
+)
+
+# some warnings which must be changed manually
+warnings = (
+('pywikibot.setAction(',
+ 'setAction() no longer works; you must pass an explicit edit summary\n'
+ 'message to put() or put_async()'),
+('.removeImage(',
+ 'Page.removeImage() is deprecated and does not work at core'),
+('.replaceImage(',
+ 'Page.replaceImage() is deprecated and does not work at core'),
+('.getVersionHistory(',
+ 'Page.getVersionHistory() returns a pywikibot.Timestamp object instead of
a\n'
+ 'MediaWiki one'),
+('.contributions(',
+ 'User.contributions() returns a pywikibot.Timestamp object instead of a\n'
+ 'MediaWiki one'),
+('.getFileMd5Sum(',
+ 'ImagePage.getFileMd5Sum() is deprecated should be replaced by
getFileSHA1Sum()'),
+)
+
+
+class ConvertBot(object):
+
+def __init__(self, filename=None, warnonly=False):
+self.source = filename
+self.warnonly = warnonly
+
+def run(self):
+self.get_source()
+self.get_dest()
+if not self.warnonly:
+self.convert()
+self.warning()
+
+def get_source(self):
+while True:
+if self.source is None:
+self.source = pywikibot.input(
+'Please input the .py file to convert '
+'(no input to leave):')
+if not self.source:
+exit()
+if not self.source.endswith(u'.py'):
+self.source += '.py'
+if os.path.exists(self.source):
+break
+self.source = os.path.join('scripts', self.source)
+if os.path.exists(self.source):
+break
+pywikibot.output(u'%s does not exist. Please retry.' % self.source)
+self.source = None
+
+def get_dest(self):
+self.dest = u'%s-core.%s' % tuple(self.source.rsplit(u'.', 1))
+if not self.warnonly and pywikibot.inputChoice(
+u'Destination file is %s.' % self.dest,
+['Yes', 'No'], ['y',
[MediaWiki-commits] [Gerrit] Run tests against MW 1.23 - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Run tests against MW 1.23 .. Run tests against MW 1.23 Change-Id: Iadf6a5e71ac2349eaf1c454af294892d5611b6c0 --- M .travis.yml 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Aude: Looks good to me, approved WikidataJenkins: Verified jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index 4b5207a..a359289 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,11 @@ php: 5.3 - env: DBTYPE=sqlite LANG=de; MW=master WB=repo php: 5.3 -- env: DBTYPE=sqlite LANG=de; MW=master WB=both +- env: DBTYPE=sqlite LANG=de; MW=1.23.0-rc.1 WB=both php: 5.4 -- env: DBTYPE=sqlite LANG=en; MW=master WB=client +- env: DBTYPE=sqlite LANG=en; MW=1.23.0-rc.1 WB=client php: 5.5 -- env: DBTYPE=sqlite LANG=en; MW=master WB=repo +- env: DBTYPE=sqlite LANG=en; MW=1.23.0-rc.1 WB=repo php: 5.6 - env: DBTYPE=sqlite LANG=en; MW=master WB=both php: hhvm -- To view, visit https://gerrit.wikimedia.org/r/134597 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iadf6a5e71ac2349eaf1c454af294892d5611b6c0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: Addshore addshorew...@gmail.com Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add method to determine EnhancedChangesList cache grouping key - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Add method to determine EnhancedChangesList cache grouping key
..
Add method to determine EnhancedChangesList cache grouping key
Change-Id: Iaf3734baa53b71affca77d5243a579cc70bb522b
---
M includes/changes/EnhancedChangesList.php
1 file changed, 30 insertions(+), 17 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/changes/EnhancedChangesList.php
b/includes/changes/EnhancedChangesList.php
index 6c42601..7307c69 100644
--- a/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@ -90,7 +90,6 @@
public function recentChangesLine( $baseRC, $watched = false ) {
wfProfileIn( __METHOD__ );
- # If it's a new day, add the headline and flush the cache
$date = $this-getLanguage()-userDate(
$baseRC-mAttribs['rc_timestamp'],
$this-getUser()
@@ -98,6 +97,7 @@
$ret = '';
+ # If it's a new day, add the headline and flush the cache
if ( $date != $this-lastdate ) {
# Process current cache
$ret = $this-recentChangesBlock();
@@ -121,28 +121,41 @@
* @param RCCacheEntry $cacheEntry
*/
protected function addCacheEntry( RCCacheEntry $cacheEntry ) {
+ $cacheGroupingKey = $this-makeCacheGroupingKey( $cacheEntry );
+
+ if ( !isset( $this-rc_cache[$cacheGroupingKey] ) ) {
+ $this-rc_cache[$cacheGroupingKey] = array();
+ }
+
+ array_push( $this-rc_cache[$cacheGroupingKey], $cacheEntry );
+ }
+
+ /**
+* @todo use rc_source to group, if set; fallback to rc_type
+*
+* @param RCCacheEntry $cacheEntry
+*
+* @return string
+*/
+ protected function makeCacheGroupingKey( RCCacheEntry $cacheEntry ) {
$title = $cacheEntry-getTitle();
- $secureName = $title-getPrefixedDBkey();
+ $cacheGroupingKey = $title-getPrefixedDBkey();
$type = $cacheEntry-mAttribs['rc_type'];
+ // @todo remove handling for RC_MOVE and RC_MOVE_OVER_REDIRECT
(bug 63755)
if ( $type == RC_MOVE || $type == RC_MOVE_OVER_REDIRECT ) {
- # Use an @ character to prevent collision with page
names
- $this-rc_cache['@@' . ( $this-rcMoveIndex++ )] =
array( $cacheEntry );
- } else {
- # Logs are grouped by type
- if ( $type == RC_LOG ) {
- $secureName = SpecialPage::getTitleFor(
- 'Log',
- $cacheEntry-mAttribs['rc_log_type']
- )-getPrefixedDBkey();
- }
- if ( !isset( $this-rc_cache[$secureName] ) ) {
- $this-rc_cache[$secureName] = array();
- }
-
- array_push( $this-rc_cache[$secureName], $cacheEntry );
+ // Use an # character to prevent collision with page
names
+ $cacheGroupingKey = '##' . ( $this-rcMoveIndex++ );
+ } elseif ( $type == RC_LOG ) {
+ // Group by log type
+ $cacheGroupingKey = SpecialPage::getTitleFor(
+ 'Log',
+ $cacheEntry-mAttribs['rc_log_type']
+ )-getPrefixedDBkey();
}
+
+ return $cacheGroupingKey;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/125391
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf3734baa53b71affca77d5243a579cc70bb522b
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix MonolingualText DataType building and add tests - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix MonolingualText DataType building and add tests
..
Fix MonolingualText DataType building and add tests
Change-Id: I85fdcaa86f74a0a34ac57f16514399f67a6a9892
---
M lib/includes/WikibaseDataTypeBuilders.php
M lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
2 files changed, 6 insertions(+), 2 deletions(-)
Approvals:
WikidataJenkins: Verified
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/WikibaseDataTypeBuilders.php
b/lib/includes/WikibaseDataTypeBuilders.php
index 5104adc..b0d9d2f 100644
--- a/lib/includes/WikibaseDataTypeBuilders.php
+++ b/lib/includes/WikibaseDataTypeBuilders.php
@@ -182,10 +182,10 @@
new MembershipValidator( Utils::getLanguageCodes() )
);
- $topValidator = new CompositeValidator(
+ $topValidator = new DataValueValidator( new CompositeValidator(
array( $textValidator, $languageValidator ),
true
- );
+ ) );
return new DataType( $id, 'monolingualtext', array( new
TypeValidator( 'DataValues\DataValue' ), $topValidator ) );
}
diff --git a/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
b/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
index 0138867..fc2abd8 100644
--- a/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
+++ b/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
@@ -6,6 +6,7 @@
use DataTypes\DataTypeFactory;
use DataValues\GlobeCoordinateValue;
use DataValues\LatLongValue;
+use DataValues\MonolingualTextValue;
use DataValues\NumberValue;
use DataValues\QuantityValue;
use DataValues\StringValue;
@@ -168,6 +169,9 @@
if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
$cases = array_merge( $cases, array(
+ array( 'monolingualtext', new
MonoLingualTextValue( 'en', 'text' ), true, 'Simple value' ),
+ array( 'monolingualtext', new
MonoLingualTextValue( 'grrr', 'text' ), false, 'Not a valid language' ),
+
//
) );
}
--
To view, visit https://gerrit.wikimedia.org/r/134573
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I85fdcaa86f74a0a34ac57f16514399f67a6a9892
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Unbind confirm dialog handlers after either of the events fi... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Unbind confirm dialog handlers after either of the events fires
once
..
Unbind confirm dialog handlers after either of the events fires once
We weren't unbinding these handlers at all, and so the 'ok' or 'cancel'
handlers could run multiple times for one button click, and even worse,
you could get in a situation where clicking 'ok' in one confirm dialog
would also run the 'ok' handler for the other one. This happens because
the ConfirmDialog instance is recycled by the WindowSet.
The way the unbinding is done is ugly; we should either consolidate the
'ok' and 'cancel' events so we can use .once(), or come up with some other
way to automatically unbind the handlers.
Bug: 65557
Change-Id: Iabf0c0d0229add09cc775358fc5a4e5ae783db04
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 16 insertions(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index d1cd805..fb9efa8 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -292,7 +292,17 @@
'cancelLabel': ve.msg(
'visualeditor-viewpage-savewarning-keep' ),
'cancelFlags': []
} );
- confirmDialog.connect( this, { 'ok': 'cancel' } );
+ confirmDialog.connect( this, {
+ 'ok': function () {
+ // Prevent future confirm dialogs from
executing this handler (bug 65557)
+ confirmDialog.disconnect( this );
+ this.cancel();
+ },
+ 'cancel': function () {
+ // Prevent future confirm dialogs from
executing this handler (bug 65557)
+ confirmDialog.disconnect( this );
+ }
+ } );
}
}
};
@@ -906,6 +916,8 @@
} );
confirmDialog.connect( this, {
'ok': function () {
+ // Prevent future confirm dialogs from executing this
handler (bug 65557)
+ confirmDialog.disconnect( this );
// Get Wikitext from the DOM
this.serialize(
this.docToSave ||
ve.dm.converter.getDomFromModel( this.surface.getModel().getDocument() ),
@@ -913,6 +925,9 @@
);
},
'cancel': function () {
+ // Prevent future confirm dialogs from executing this
handler (bug 65557)
+ confirmDialog.disconnect( this );
+ // Undo the opacity change
this.$document.css( 'opacity', 1 );
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/134546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iabf0c0d0229add09cc775358fc5a4e5ae783db04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@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] Syncronize VisualEditor: fad534e..8094a2f - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: fad534e..8094a2f .. Syncronize VisualEditor: fad534e..8094a2f Change-Id: Ic575ab3cb2fe6fbd09fdf3205ea103def4893811 --- 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 fad534e..8094a2f 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit fad534ee4bf240aea02f6051a54f47386c9ec16d +Subproject commit 8094a2f64c485e31d901e45ed26bebc0600cbd8e -- To view, visit https://gerrit.wikimedia.org/r/134601 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic575ab3cb2fe6fbd09fdf3205ea103def4893811 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] Syncronize VisualEditor: fad534e..8094a2f - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/134601 Change subject: Syncronize VisualEditor: fad534e..8094a2f .. Syncronize VisualEditor: fad534e..8094a2f Change-Id: Ic575ab3cb2fe6fbd09fdf3205ea103def4893811 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/01/134601/1 diff --git a/VisualEditor b/VisualEditor index fad534e..8094a2f 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit fad534ee4bf240aea02f6051a54f47386c9ec16d +Subproject commit 8094a2f64c485e31d901e45ed26bebc0600cbd8e -- To view, visit https://gerrit.wikimedia.org/r/134601 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic575ab3cb2fe6fbd09fdf3205ea103def4893811 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] Use dummy user to make taking-over revision - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Use dummy user to make taking-over revision
..
Use dummy user to make taking-over revision
Instead of using the user viewing the page, use a dummy username to add
the revision made when a page is taken over by flow.
Bug: 64344
Change-Id: I923623881431011aff6d3a3f01c2da56017e79de
---
M Hooks.php
M i18n/en.json
M i18n/qqq.json
M includes/TalkpageManager.php
4 files changed, 24 insertions(+), 5 deletions(-)
Approvals:
Werdna: Looks good to me, but someone else must approve
Legoktm: Looks good to me, but someone else must approve
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Hooks.php b/Hooks.php
index daeaaa0..e2d9c64 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -406,7 +406,8 @@
/**
* Make sure no user can register a flow-*-usertext username, to avoid
* confusion with a real user when we print e.g. Suppressed instead
of a
-* username.
+* username. Additionally reserve the username used to add a revision on
+* taking over a page.
*
* @param array $names
* @return bool
@@ -416,8 +417,12 @@
foreach ( $permissions as $permission ) {
$names[] = msg:flow-$permission-usertext;
}
+ $names[] = 'msg:flow-system-usertext';
- $names[] = msg:flow-system-usertext;
+ // Reserve both the localized username and the English fallback
for the
+ // taking-over revision.
+ $names[] = 'msg:flow-talk-username';
+ $names[] = 'Flow talk page manager';
return true;
}
diff --git a/i18n/en.json b/i18n/en.json
index 056a0ca..c833da4 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,6 +11,7 @@
},
flow-desc: Workflow management system,
flow-talk-taken-over: This talk page has been taken over by a
[https://www.mediawiki.org/wiki/Special:MyLanguage/Flow_Portal Flow board].,
+flow-talk-username: Flow talk page manager,
log-name-flow: Flow activity log,
logentry-delete-flow-delete-post: $1 {{GENDER:$2|deleted}} a [$4 post]
on [[$3]],
logentry-delete-flow-restore-post: $1 {{GENDER:$2|restored}} a [$4
post] on [[$3]],
diff --git a/i18n/qqq.json b/i18n/qqq.json
index f0349ae..97ca4c1 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -13,6 +13,7 @@
},
flow-desc:
{{desc|name=Flow|url=http://www.mediawiki.org/wiki/Extension:Flow}};,
flow-talk-taken-over: Content to replace existing page content by
for pages that are turned into Flow boards.,
+ flow-talk-username: Username used for the revision added when Flow
takes over a talk page.,
log-name-flow: {{doc-logpage}}\nName of the Flow log filter on the
[[Special:Log]] page.,
logentry-delete-flow-delete-post: Text for a deletion log entry when
a post was deleted. Parameters:\n* $1 - the user: link to the user page\n* $2 -
the username. Can be used for GENDER.\n* $3 - the page where the post was
moderated\n* $4 - permalink URL to the moderated
post\n{{Related|Flow-logentry}},
logentry-delete-flow-restore-post: Text for a deletion log entry
when a deleted post was restored. Parameters:\n* $1 - the user: link to the
user page\n* $2 - the username. Can be used for GENDER.\n* $3 - the page where
the post was moderated\n* $4 - permalink URL to the moderated
post\n{{Related|Flow-logentry}},
diff --git a/includes/TalkpageManager.php b/includes/TalkpageManager.php
index d3b0ed6..f682819 100644
--- a/includes/TalkpageManager.php
+++ b/includes/TalkpageManager.php
@@ -7,6 +7,7 @@
use ContentHandler;
use Revision;
use Title;
+use User;
// I got the feeling NinetyNinePercentController was a bit much.
interface OccupationController {
@@ -64,17 +65,28 @@
throw new InvalidInputException( 'Requested article is
not Flow enabled', 'invalid-input' );
}
- // comment to add to the Revision to indicate Flow taking over
+ // Comment to add to the Revision to indicate Flow taking over
$comment = '/* Taken over by Flow */';
$page = $article-getPage();
$revision = $page-getRevision();
- // make sure a Flow revision has not yet been inserted
+ // Add a revision only if a Flow revision has not yet been
inserted.
if ( $revision === null || $revision-getComment( Revision::RAW
) != $comment ) {
$message = wfMessage( 'flow-talk-taken-over'
)-inContentLanguage()-text();
$content = ContentHandler::makeContent( $message,
$title );
- $page-doEditContent( $content, $comment,
EDIT_FORCE_BOT | EDIT_SUPPRESS_RC );
+
+ $user = User::newFromName(
+
[MediaWiki-commits] [Gerrit] jquery.suggestions: Support caching results to save http req... - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134603
Change subject: jquery.suggestions: Support caching results to save http
requests
..
jquery.suggestions: Support caching results to save http requests
When typing the same thing multipe times, or when pressing backspace
(thus reverting to an earlier known value), or otherwise ending
up with the same value, we can re-use the data we already used.
Doesn't happen in the basic case of typing one thing without mistakes
and selecting a results, but happens more than one might think.
People are often impatient, or even use the suggestions as their
search results and based on that might try something else and then
go back (e.g. try Foo, find a good result but not ideal, try Bar,
even worse, go back to Foo, select Foo thing).
During this, requests for B, Ba, F, Fo and Foo would be
fired more than once (B-Ba when backspacing, F-Fo-Foo when typing it
the second time, or simply using ctrl-Z a couple times).
By default cache disabled (individual users of this plugin have
to opt-in). When enabled it defaults to an expiry of 1 minute.
Change-Id: Ib10c65f6ab31773b7f517b2f9c3cc7c7b93c6d39
---
M resources/src/jquery/jquery.suggestions.js
1 file changed, 47 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/03/134603/1
diff --git a/resources/src/jquery/jquery.suggestions.js
b/resources/src/jquery/jquery.suggestions.js
index a20a948..73f119c 100644
--- a/resources/src/jquery/jquery.suggestions.js
+++ b/resources/src/jquery/jquery.suggestions.js
@@ -31,6 +31,10 @@
* Type: Number, Range: 1 - 100, Default: 7
* delay: Number of ms to wait for the user to stop typing
* Type: Number, Range: 0 - 1200, Default: 120
+ * cache: Whether to cache results from a fetch
+ * Type: Boolean, Default: false
+ * cacheMaxAge: Number of ms to cache results from a fetch
+ * Type: Number, Range: 1 - Infinity, Default: 6 (1 minute)
* submitOnClick: Whether to submit the form containing the textbox when a
suggestion is clicked
* Type: Boolean, Default: false
* maxExpandFactor: Maximum suggestions box width relative to the textbox
width. If set
@@ -46,6 +50,8 @@
* Type: Boolean, Default: false
*/
( function ( $ ) {
+
+var hasOwn = Object.hasOwnProperty;
$.suggestions = {
/**
@@ -90,18 +96,44 @@
*/
update: function ( context, delayed ) {
function maybeFetch() {
+ var val = context.data.$textbox.val(),
+ cache = context.data.cache,
+ cacheHit;
+
// Only fetch if the value in the textbox changed and
is not empty, or if the results were hidden
// if the textbox is empty then clear the result div,
but leave other settings intouched
- if ( context.data.$textbox.val().length === 0 ) {
+ if ( val.length === 0 ) {
$.suggestions.hide( context );
context.data.prevText = '';
} else if (
- context.data.$textbox.val() !==
context.data.prevText ||
+ val !== context.data.prevText ||
!context.data.$container.is( ':visible' )
) {
- if ( typeof context.config.fetch === 'function'
) {
- context.data.prevText =
context.data.$textbox.val();
- context.config.fetch.call(
context.data.$textbox, context.data.$textbox.val() );
+ context.data.prevText = val;
+ // Try cache first
+ if ( context.config.cache hasOwn.call(
cache, val ) ) {
+ if ( +new Date() - cache[ val
].timestamp context.config.cacheMaxAge ) {
+
context.data.$textbox.suggestions( 'suggestions', cache[ val ].suggestions );
+ cacheHit = true;
+ } else {
+ // Cache expired
+ delete cache[ val ];
+ }
+ }
+ if ( !cacheHit typeof context.config.fetch
=== 'function' ) {
+ context.config.fetch.call(
+ context.data.$textbox,
+ val,
+ function ( suggestions ) {
+
[MediaWiki-commits] [Gerrit] raise db1068 to normal load - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/134602 Change subject: raise db1068 to normal load .. raise db1068 to normal load Change-Id: I2f59dc0cce3011b81dae437992f246e583d01d51 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/02/134602/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 3bc7853..701f329 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -122,7 +122,7 @@ 'db1056' = 400, # 2.8TB 96GB 'db1059' = 400, # 2.8TB 96GB 'db1064' = 500, # 2.8TB 160GB - 'db1068' = 50, # 2.8TB 160GB, warm up + 'db1068' = 500, # 2.8TB 160GB ), 's5' = array( 'db1058' = 0, # 2.8TB 96GB -- To view, visit https://gerrit.wikimedia.org/r/134602 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2f59dc0cce3011b81dae437992f246e583d01d51 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix crash after switching languages - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix crash after switching languages
..
Fix crash after switching languages
getView() returns null if the activity is recreated.
Using UI Thread Handler instead of getView().
Since app could be null I added another way to get to it.
To repo turn on don't keep activities in dev options.
Bug: 65539
Change-Id: Ifd7bdc3eb53876f214a67d1e750f2114a6efaebf
---
M wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
M wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
2 files changed, 25 insertions(+), 6 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
index cbc4e3a..302af79 100644
--- a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
@@ -86,14 +86,14 @@
// Do login / logout swap
if (app.getUserInfoStorage().isLoggedIn()) {
loginContainer.setVisibility(View.GONE);
-for (int i = 0; i loggedInOnyActionViews.length; i++) {
-loggedInOnyActionViews[i].setVisibility(View.VISIBLE);
+for (View loggedInOnyActionView : loggedInOnyActionViews) {
+loggedInOnyActionView.setVisibility(View.VISIBLE);
}
usernamePrimaryText.setText(app.getUserInfoStorage().getUser().getUsername());
} else {
loginContainer.setVisibility(View.VISIBLE);
-for (int i = 0; i loggedInOnyActionViews.length; i++) {
-loggedInOnyActionViews[i].setVisibility(View.GONE);
+for (View loggedInOnyActionView : loggedInOnyActionViews) {
+loggedInOnyActionView.setVisibility(View.GONE);
}
}
@@ -162,10 +162,11 @@
// registering the activity for the bus.
// - The 1s delay ensures a smoother transition, otherwise was
// very jarring
-getView().postDelayed(new Runnable() {
+Handler uiThread = new Handler(Looper.getMainLooper());
+uiThread.postDelayed(new Runnable() {
@Override
public void run() {
-app.getBus().post(new RequestMainPageEvent());
+WikipediaApp.getInstance().getBus().post(new
RequestMainPageEvent());
Log.d(Wikipedia, Show da main page yo);
}
}, DateUtils.SECOND_IN_MILLIS);
diff --git a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
index 94ff632..71158dc 100644
--- a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
@@ -60,8 +60,26 @@
public static String APP_VERSION_STRING;
+/**
+ * Singleton instance of WikipediaApp
+ */
+private static WikipediaApp instance;
+
private ConnectionChangeReceiver connChangeReceiver;
+public WikipediaApp() {
+instance = this;
+}
+
+/**
+ * Returns the singleton instance of the WikipediaApp
+ *
+ * This is ok, since android treats it as a singleton anyway.
+ */
+public static WikipediaApp getInstance() {
+return instance;
+}
+
@Override
public void onCreate() {
super.onCreate();
--
To view, visit https://gerrit.wikimedia.org/r/134557
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd7bdc3eb53876f214a67d1e750f2114a6efaebf
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
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] raise db1068 to normal load - change (operations/mediawiki-config)
Springle has submitted this change and it was merged. Change subject: raise db1068 to normal load .. raise db1068 to normal load Change-Id: I2f59dc0cce3011b81dae437992f246e583d01d51 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 3bc7853..701f329 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -122,7 +122,7 @@ 'db1056' = 400, # 2.8TB 96GB 'db1059' = 400, # 2.8TB 96GB 'db1064' = 500, # 2.8TB 160GB - 'db1068' = 50, # 2.8TB 160GB, warm up + 'db1068' = 500, # 2.8TB 160GB ), 's5' = array( 'db1058' = 0, # 2.8TB 96GB -- To view, visit https://gerrit.wikimedia.org/r/134602 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2f59dc0cce3011b81dae437992f246e583d01d51 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@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 table setup to support SQLite - change (mediawiki...Petition)
Pcoombe has uploaded a new change for review. https://gerrit.wikimedia.org/r/134604 Change subject: Fix table setup to support SQLite .. Fix table setup to support SQLite SQLite requires pt_id to be set as primary key when first defined in order for auto_increment to work https://sqlite.org/faq.html#q1 Bug:65488 Change-Id: I747f0f27ee68c8587bb359f588793e2dcdf665c2 --- M table.sql 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Petition refs/changes/04/134604/1 diff --git a/table.sql b/table.sql index 7f1fc8c..6e919a7 100755 --- a/table.sql +++ b/table.sql @@ -1,6 +1,6 @@ -- Adds tables for petition CREATE TABLE /*_*/petition_data ( - pt_id int unsigned auto_increment, + pt_id int unsigned PRIMARY KEY auto_increment, pt_petitionname varchar(255), pt_pagetitle varchar(255), pt_source varchar(255), @@ -9,8 +9,7 @@ pt_country varchar(2), pt_message blob, pt_share boolean, - pt_timestamp varbinary(14), - PRIMARY KEY (pt_id) + pt_timestamp varbinary(14) ) /*$wgDBTableOptions*/; CREATE INDEX /*i*/pt_petitionname ON /*_*/petition_data (pt_petitionname); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/134604 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I747f0f27ee68c8587bb359f588793e2dcdf665c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Petition Gerrit-Branch: master Gerrit-Owner: Pcoombe pcoo...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.user: Use mw.log.deprecate to track user() and ano... - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134605
Change subject: mediawiki.user: Use mw.log.deprecate to track user() and
anonymous()
..
mediawiki.user: Use mw.log.deprecate to track user() and anonymous()
Follows-up I5970be9e859358 which deprecated these originally.
Also remove obsolete tests now that they're linked by reference.
Change-Id: I559efa8a61de9f7b600c7b74edd5a56fb0a33b00
(cherry picked from commit de5e13598a79b3876de3902f5985a3bf0bd0d6a0)
---
M resources/src/mediawiki/mediawiki.user.js
M tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
2 files changed, 15 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/05/134605/1
diff --git a/resources/src/mediawiki/mediawiki.user.js
b/resources/src/mediawiki/mediawiki.user.js
index 0cf897a..fd9690b 100644
--- a/resources/src/mediawiki/mediawiki.user.js
+++ b/resources/src/mediawiki/mediawiki.user.js
@@ -89,14 +89,6 @@
},
/**
-* @inheritdoc #getName
-* @deprecated since 1.20 Use #getName instead
-*/
- name: function () {
- return user.getName();
- },
-
- /**
* Get date user registered, if available
*
* @return {Date|boolean|null} Date user registered, or false
for anonymous users, or
@@ -122,14 +114,6 @@
*/
isAnon: function () {
return user.getName() === null;
- },
-
- /**
-* @inheritdoc #isAnon
-* @deprecated since 1.20 Use #isAnon instead
-*/
- anonymous: function () {
- return user.isAnon();
},
/**
@@ -258,4 +242,18 @@
}
};
+ /**
+* @method name
+* @inheritdoc #getName
+* @deprecated since 1.20 Use #getName instead
+*/
+ mw.log.deprecate( user, 'name', user.getName );
+
+ /**
+* @method anonymous
+* @inheritdoc #isAnon
+* @deprecated since 1.20 Use #isAnon instead
+*/
+ mw.log.deprecate( user, 'anonymous', user.isAnon );
+
}( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
index e6c2b5c..c84f264 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
@@ -5,16 +5,14 @@
assert.ok( mw.user.options instanceof mw.Map, 'options instance
of mw.Map' );
} );
- QUnit.test( 'user status', 11, function ( assert ) {
+ QUnit.test( 'user status', 7, function ( assert ) {
// Forge an anonymous user
mw.config.set( 'wgUserName', null );
delete mw.config.values.wgUserId;
assert.strictEqual( mw.user.getName(), null, 'user.getName()
returns null when anonymous' );
- assert.strictEqual( mw.user.name(), null, 'user.name()
compatibility' );
assert.assertTrue( mw.user.isAnon(), 'user.isAnon() returns
true when anonymous' );
- assert.assertTrue( mw.user.anonymous(), 'user.anonymous()
compatibility' );
assert.strictEqual( mw.user.getId(), 0, 'user.getId() returns 0
when anonymous' );
// Not part of startUp module
@@ -22,9 +20,7 @@
mw.config.set( 'wgUserId', 123 );
assert.equal( mw.user.getName(), 'John', 'user.getName()
returns username when logged-in' );
- assert.equal( mw.user.name(), 'John', 'user.name()
compatibility' );
assert.assertFalse( mw.user.isAnon(), 'user.isAnon() returns
false when logged-in' );
- assert.assertFalse( mw.user.anonymous(), 'user.anonymous()
compatibility' );
assert.strictEqual( mw.user.getId(), 123, 'user.getId() returns
correct ID when logged-in' );
assert.equal( mw.user.id(), 'John', 'user.id Returns username
when logged-in' );
--
To view, visit https://gerrit.wikimedia.org/r/134605
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I559efa8a61de9f7b600c7b74edd5a56fb0a33b00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf5
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add the mwext-GettingStarted-qunit job - change (integration/jenkins-job-builder-config)
Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134606
Change subject: Add the mwext-GettingStarted-qunit job
..
Add the mwext-GettingStarted-qunit job
Change-Id: I1b48c4b6910fdb4c5c854c6199ff415fd92dca3e
---
M mediawiki-extensions.yaml
1 file changed, 4 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/06/134606/1
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index b30a40d..06fe7cf 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -686,6 +686,10 @@
ext-name: EventLogging
- '{name}-{ext-name}-qunit':
name: mwext
+ext-name: GettingStarted
+dependencies: 'CentralAuth,EventLogging,GuidedTour'
+ - '{name}-{ext-name}-qunit':
+name: mwext
ext-name: GuidedTour
dependencies: 'EventLogging'
- '{name}-{ext-name}-qunit':
--
To view, visit https://gerrit.wikimedia.org/r/134606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b48c4b6910fdb4c5c854c6199ff415fd92dca3e
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Phuedx g...@samsmith.io
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove jQuery Migrate - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134607
Change subject: Remove jQuery Migrate
..
Remove jQuery Migrate
Follows-up e5502d1 (add-jqmigrate), 63c3650 (upgrade-jquery).
Per the plan[1], after a few weeks of migration, the jQuery Migrate
plugin shall be removed.
Info:
http://jquery.com/upgrade-guide/1.9/#jquery-migrate-plugin
[1]
http://www.mail-archive.com/wikitech-l@lists.wikimedia.org/msg75735.html
http://lists.wikimedia.org/pipermail/wikitech-l/2014-May/076340.html
Bug: 44740
Change-Id: I0ee426ab85ad8aa41621fe1754766d664b9d38cb
---
M resources/Resources.php
D resources/lib/jquery/jquery.migrate.js
2 files changed, 1 insertion(+), 525 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/07/134607/1
diff --git a/resources/Resources.php b/resources/Resources.php
index c2112ae..5618e78 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -190,10 +190,7 @@
/* jQuery */
'jquery' = array(
- 'scripts' = array(
- 'resources/lib/jquery/jquery.js',
- 'resources/lib/jquery/jquery.migrate.js',
- ),
+ 'scripts' = 'resources/lib/jquery/jquery.js',
'debugRaw' = false,
'targets' = array( 'desktop', 'mobile' ),
),
diff --git a/resources/lib/jquery/jquery.migrate.js
b/resources/lib/jquery/jquery.migrate.js
deleted file mode 100644
index 25b6c81..000
--- a/resources/lib/jquery/jquery.migrate.js
+++ /dev/null
@@ -1,521 +0,0 @@
-/*!
- * jQuery Migrate - v1.2.1 - 2013-05-08
- * https://github.com/jquery/jquery-migrate
- * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors;
Licensed MIT
- */
-(function( jQuery, window, undefined ) {
-// See http://bugs.jquery.com/ticket/13335
-// use strict;
-
-
-var warnedAbout = {};
-
-// List of warnings already given; public read only
-jQuery.migrateWarnings = [];
-
-// Set to true to prevent console output; migrateWarnings still maintained
-// jQuery.migrateMute = false;
-
-// Show a message on the console so devs know we're active
-if ( !jQuery.migrateMute window.console window.console.log ) {
- window.console.log(JQMIGRATE: Logging is active);
-}
-
-// Set to false to disable traces that appear with warnings
-if ( jQuery.migrateTrace === undefined ) {
- jQuery.migrateTrace = true;
-}
-
-// Forget any warnings we've already given; public
-jQuery.migrateReset = function() {
- warnedAbout = {};
- jQuery.migrateWarnings.length = 0;
-};
-
-function migrateWarn( msg) {
- var console = window.console;
- if ( !warnedAbout[ msg ] ) {
- warnedAbout[ msg ] = true;
- jQuery.migrateWarnings.push( msg );
- if ( console console.warn !jQuery.migrateMute ) {
- console.warn( JQMIGRATE: + msg );
- if ( jQuery.migrateTrace console.trace ) {
- console.trace();
- }
- }
- }
-}
-
-function migrateWarnProp( obj, prop, value, msg ) {
- if ( Object.defineProperty ) {
- // On ES5 browsers (non-oldIE), warn if the code tries to get
prop;
- // allow property to be overwritten in case some other plugin
wants it
- try {
- Object.defineProperty( obj, prop, {
- configurable: true,
- enumerable: true,
- get: function() {
- migrateWarn( msg );
- return value;
- },
- set: function( newValue ) {
- migrateWarn( msg );
- value = newValue;
- }
- });
- return;
- } catch( err ) {
- // IE8 is a dope about Object.defineProperty, can't
warn there
- }
- }
-
- // Non-ES5 (or broken) browser; just set the property
- jQuery._definePropertyBroken = true;
- obj[ prop ] = value;
-}
-
-if ( document.compatMode === BackCompat ) {
- // jQuery has never supported or tested Quirks Mode
- migrateWarn( jQuery is not compatible with Quirks Mode );
-}
-
-
-var attrFn = jQuery( input/, { size: 1 } ).attr(size) jQuery.attrFn,
- oldAttr = jQuery.attr,
- valueAttrGet = jQuery.attrHooks.value jQuery.attrHooks.value.get ||
- function() { return null; },
- valueAttrSet = jQuery.attrHooks.value jQuery.attrHooks.value.set ||
- function() { return undefined; },
- rnoType = /^(?:input|button)$/i,
- rnoAttrNodeType = /^[238]$/,
-
[MediaWiki-commits] [Gerrit] Add i18n message to 'workflow' link - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Add i18n message to 'workflow' link
..
Add i18n message to 'workflow' link
Bug: 65102
Change-Id: I3b1166d3a5c9597933a8be50aab58cb82342b86c
---
M i18n/en.json
M i18n/qqq.json
M includes/UrlGenerator.php
3 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index e7ab638..3f31ef3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -178,6 +178,7 @@
flow-paging-rev: More recent topics,
flow-paging-fwd: Older topics,
flow-last-modified: Last modified about $1,
+flow-workflow: workflow,
flow-notification-reply: $1 {{GENDER:$1|replied}} to your span
class=\plainlinks\[$5 post]/span in \$2\ on \$4\.,
flow-notification-reply-bundle: $1 and $5 {{PLURAL:$6|other|others}}
{{GENDER:$1|replied}} to your span class=\plainlinks\[$4 post]/span in
\$2\ on \$3\.,
flow-notification-edit: $1 {{GENDER:$1|edited}} a span
class=\plainlinks\[$5 post]/span in \$2\ on [[$3|$4]].,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 6dc71b6..e00ce70 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -180,6 +180,7 @@
flow-paging-rev: Label for paging link that shows more recently
modified topics.\n\nSee also:\n* {{msg-mw|Flow-paging-fwd}},
flow-paging-fwd: Label for paging link that shows less recently
modified topics.\n\nSee also:\n* {{msg-mw|Flow-paging-rev}},
flow-last-modified: Followed by the timestamp.\n\nParameters:\n* $1
- most significant unit of time since modification rendered by
MWTimestamp::getHumanTimestamp,
+ flow-workflow: Anchor link text for linking to a workflow,
flow-notification-reply: Notification text for when a user receives
a reply. Parameters:\n* $1 - Username of the person who replied\n* $2 - Title
of the topic\n* $3 - Title for the Flow board, this parameter is not used for
the message at this moment\n* $4 - Title for the page that the Flow board is
attached to\n* $5 - Permanent URL for the post\n{{Related|Flow-notification}},
flow-notification-reply-bundle: Notification text for when a user
receives replies from multiple users on the same topic.\n\nParameters:\n* $1 -
username of the person who replied\n* $2 - title of the topic\n* $3 - title for
the page that the Flow board is attached to\n* $4 - permantent URL for the
post\n* $5 - the count of other action performers, could be number or
{{msg-mw|Echo-notification-count}}. e.g. 7 others or 99+ others\n* $6 - a
number used for plural support\nSee also:\n*
{{msg-mw|Flow-notification-reply-email-batch-bundle-body}}\n{{Related|Flow-notification}},
flow-notification-edit: Notification text for when a user's post is
edited. Parameters:\n* $1 - Username of the person who edited the post\n* $2 -
Title of the topic\n* $3 - Title for the Flow board\n* $4 - Title for the page
that the Flow board is attached to\n* $5 - Permanent URL for the
post\n{{Related|Flow-notification}},
diff --git a/includes/UrlGenerator.php b/includes/UrlGenerator.php
index bafd5fd..9686d51 100644
--- a/includes/UrlGenerator.php
+++ b/includes/UrlGenerator.php
@@ -342,7 +342,7 @@
*/
public function workflowLink( Title $title = null, UUID $workflowId ) {
return new Anchor(
- wfMessage( 'flow-something' ),
+ wfMessage( 'flow-workflow' ),
$this-resolveTitle( $title, $workflowId ),
array( 'workflow' = $workflowId-getAlphadecimal() )
);
--
To view, visit https://gerrit.wikimedia.org/r/134508
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b1166d3a5c9597933a8be50aab58cb82342b86c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu bs...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@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] contint: rsync host in labs - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134608
Change subject: contint: rsync host in labs
..
contint: rsync host in labs
Creates role::ci::publisher::labs, an intermediary rsync hosts to have
the Jenkins slaves to push their build result. Can later have the
production host gallium (which hosts doc.wikimedia.org) to fetch from
it.
Change-Id: I2044c7a2d3818da5fc9301cf8a36912922821af9
---
M manifests/role/ci.pp
1 file changed, 26 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/08/134608/1
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index d30d4ff..59cd559 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -353,6 +353,32 @@
}
+
+# == Class role::ci::publisher::labs
+#
+# Intermediary rsync hosts in labs to let Jenkins slave publish their results
+# safely. The production machine hosting doc.wikimedia.org can then fetch the
+# doc from there.
+class role::ci::publisher::labs {
+
+include role::labs::lvm::srv
+include rsync::server
+
+rsync::server::module { 'srv_doc':
+path= '/srv/doc',
+read_only = 'no',
+# FIXME figure out how to automatically list instances IP of the
+# 'integration' labs project
+hosts_allow = [
+'208.80.154.135', # gallium.wikimedia.org
+'10.68.16.171', # integration-slave1001.eqiad.wmflabs
+'10.68.16.175', # integration-slave1002.eqiad.wmflabs
+],
+require Class['role::labs::lvm::srv']
+}
+
+}
+
# Website for Continuous integration
#
# http://doc.mediawiki.org/
--
To view, visit https://gerrit.wikimedia.org/r/134608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2044c7a2d3818da5fc9301cf8a36912922821af9
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] (bugfix) compare the default key in the right order - change (pywikibot/core)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/134609 Change subject: (bugfix) compare the default key in the right order .. (bugfix) compare the default key in the right order if default key exist and answer is an empty string, the default value must be returned. Return the choice if it is in hotkeys. Otherwise try again. With this patch the keys may be given as list or tuple or also as string which simplifies the code. Because '' in 'anystring' is always True the old order didn't work for hotkeys string. Change-Id: I2caddf213818de231a3258b3a00cca0f6e51b268 --- M pywikibot/userinterfaces/terminal_interface_base.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/09/134609/1 diff --git a/pywikibot/userinterfaces/terminal_interface_base.py b/pywikibot/userinterfaces/terminal_interface_base.py index 927ec13..745aa26 100755 --- a/pywikibot/userinterfaces/terminal_interface_base.py +++ b/pywikibot/userinterfaces/terminal_interface_base.py @@ -217,10 +217,10 @@ while True: prompt = '%s (%s)' % (question, ', '.join(options)) answer = self.input(prompt) -if answer.lower() in hotkeys or answer.upper() in hotkeys: -return answer -elif default and answer == '': # empty string entered +if default and answer == '': # empty string entered return default +elif answer.lower() in hotkeys or answer.upper() in hotkeys: +return answer def editText(self, text, jumpIndex=None, highlight=None): Return the text as edited by the user. -- To view, visit https://gerrit.wikimedia.org/r/134609 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2caddf213818de231a3258b3a00cca0f6e51b268 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move release notes for Introducing pp_sortkey to 1.24 - change (mediawiki/core)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/134610 Change subject: Move release notes for Introducing pp_sortkey to 1.24 .. Move release notes for Introducing pp_sortkey to 1.24 Follows-up I217c42656fb877f, the commit was merged after the branch cut and was not backported. Change-Id: Iaa78a8254b3114600052005ce28d752b5f472354 --- M RELEASE-NOTES-1.23 M RELEASE-NOTES-1.24 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/10/134610/1 diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index d010358..ad06059 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -9,9 +9,6 @@ production. === Configuration changes in 1.23 === -* Introduced $wgPagePropsHaveSortkey as a backwards-compatibility switch, - for using the old schema of the page_props table, in case the respective - schema update was not applied. * When $wgJobRunRate is higher that zero, jobs are now executed via an asynchronous HTTP request to a MediaWiki entry point. This may require increasing the number of server worker threads. $wgRunJobsAsync has been diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index 72a9982..7968b2e 100644 --- a/RELEASE-NOTES-1.24 +++ b/RELEASE-NOTES-1.24 @@ -11,6 +11,9 @@ === Configuration changes in 1.24 === * The server's canonical hostname is available as $wgServerName, which is exposed in both mw.config and ApiQuerySiteInfo. +* Introduced $wgPagePropsHaveSortkey as a backwards-compatibility switch, + for using the old schema of the page_props table, in case the respective + schema update was not applied. === New features in 1.24 === * Added a new hook, WhatLinksHereProps, to allow extensions to annotate -- To view, visit https://gerrit.wikimedia.org/r/134610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa78a8254b3114600052005ce28d752b5f472354 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move release notes for Introducing pp_sortkey to 1.24 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Move release notes for Introducing pp_sortkey to 1.24 .. Move release notes for Introducing pp_sortkey to 1.24 Follows-up I217c42656fb877f, the commit was merged after the branch cut and was not backported. Change-Id: Iaa78a8254b3114600052005ce28d752b5f472354 --- M RELEASE-NOTES-1.23 M RELEASE-NOTES-1.24 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index d010358..ad06059 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -9,9 +9,6 @@ production. === Configuration changes in 1.23 === -* Introduced $wgPagePropsHaveSortkey as a backwards-compatibility switch, - for using the old schema of the page_props table, in case the respective - schema update was not applied. * When $wgJobRunRate is higher that zero, jobs are now executed via an asynchronous HTTP request to a MediaWiki entry point. This may require increasing the number of server worker threads. $wgRunJobsAsync has been diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index 72a9982..7968b2e 100644 --- a/RELEASE-NOTES-1.24 +++ b/RELEASE-NOTES-1.24 @@ -11,6 +11,9 @@ === Configuration changes in 1.24 === * The server's canonical hostname is available as $wgServerName, which is exposed in both mw.config and ApiQuerySiteInfo. +* Introduced $wgPagePropsHaveSortkey as a backwards-compatibility switch, + for using the old schema of the page_props table, in case the respective + schema update was not applied. === New features in 1.24 === * Added a new hook, WhatLinksHereProps, to allow extensions to annotate -- To view, visit https://gerrit.wikimedia.org/r/134610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaa78a8254b3114600052005ce28d752b5f472354 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: remove ruby-bundler outdated package - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: contint: remove ruby-bundler outdated package
..
contint: remove ruby-bundler outdated package
The ruby bundler shipped by Ubuntu Precise is way too old and we do not
use it. One can either use the version provided in
integration/jenkins.git or install the gem version.
Bug: 58040
Change-Id: Ica53d458fe11b4c0cde7ea7d6b949b2e3fd73ea9
---
M modules/contint/manifests/browsertests.pp
1 file changed, 13 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
Zfilipin: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/contint/manifests/browsertests.pp
b/modules/contint/manifests/browsertests.pp
index 3b3362e..f90b6e9 100644
--- a/modules/contint/manifests/browsertests.pp
+++ b/modules/contint/manifests/browsertests.pp
@@ -14,14 +14,25 @@
# Dependencies for qa/browsertests.git
package { [
-'ruby-bundler', # installer for qa/browsertests.git
'ruby1.9.1-dev', # Bundler compiles gems
-'rubygems', # dependency of ruby-bundler
+'rubygems',
'phantomjs', # headless browser
]:
ensure = present
}
+# Ubuntu Precise version is too old. Instead use either:
+# /srv/deployment/integration/slave-scripts/tools/bundler/bundle
+# or:
+# gem1.9.3 install bundle
+#
+# See JJB configuration files.
+package { [
+'ruby-bundler',
+]:
+ensure = absent
+}
+
# Set up all packages required for MediaWiki (includes Apache)
package { [
'chromium-browser',
--
To view, visit https://gerrit.wikimedia.org/r/126953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica53d458fe11b4c0cde7ea7d6b949b2e3fd73ea9
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@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] Labs: Add deployment related sudoer rules for svn group - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: Labs: Add deployment related sudoer rules for svn group
..
Labs: Add deployment related sudoer rules for svn group
Allow old timers who have svn as their default group in ldap to do all
the deployment related things that kids these days can do.
Bug: 65548
Change-Id: I98dd88bb277bf8f173a896540cd89a02677add3f
---
M modules/mediawiki/manifests/users.pp
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
BryanDavis: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/mediawiki/manifests/users.pp
b/modules/mediawiki/manifests/users.pp
index d1b3517..077c85b 100644
--- a/modules/mediawiki/manifests/users.pp
+++ b/modules/mediawiki/manifests/users.pp
@@ -74,7 +74,13 @@
source = 'puppet:///modules/mediawiki/authorized_keys.l10nupdate',
}
-sudo_group { 'wikidev':
+$deployers_group = $::realm ? {
+ # Bug 65548: Older ldap accounts in labs have 'svn' as the default
+ # group rather than the 'wikidev' group.
+ 'labs' = ['wikidev', 'svn'],
+ default = 'wikidev',
+}
+sudo_group { $deployers_group:
privileges = [
'ALL = (apache,mwdeploy,l10nupdate) NOPASSWD: ALL',
'ALL = (root) NOPASSWD: /sbin/restart twemproxy',
--
To view, visit https://gerrit.wikimedia.org/r/134491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I98dd88bb277bf8f173a896540cd89a02677add3f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@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] contint: get composer on Jenkins slaves - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: contint: get composer on Jenkins slaves
..
contint: get composer on Jenkins slaves
Change-Id: I6513092351066fbcf001b2d721d5acd252d6854a
---
M modules/contint/manifests/slave-scripts.pp
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/contint/manifests/slave-scripts.pp
b/modules/contint/manifests/slave-scripts.pp
index 548c5c6..7344f34 100644
--- a/modules/contint/manifests/slave-scripts.pp
+++ b/modules/contint/manifests/slave-scripts.pp
@@ -18,6 +18,12 @@
origin =
'https://gerrit.wikimedia.org/r/p/integration/kss.git',
recurse_submodules = true,
}
+git::clone { 'jenkins CI Composer':
+ensure = 'latest',
+directory = '/srv/deployment/integration/composer',
+origin =
'https://gerrit.wikimedia.org/r/p/integration/composer.git',
+recurse_submodules = true,
+}
git::clone { 'jenkins CI phpcs':
ensure = 'latest',
directory = '/srv/deployment/integration/phpcs',
--
To view, visit https://gerrit.wikimedia.org/r/124305
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6513092351066fbcf001b2d721d5acd252d6854a
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@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] contint: install python-requests on all hosts - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: contint: install python-requests on all hosts
..
contint: install python-requests on all hosts
The 'requests' python modules makes dev life easier. Have to harness
the puppet definition since publish-console uses the package already and
I want to keep the explicit dependency there.
Change-Id: I4ca9ea77c4bb6c22d9ac3d14c1c165edc0ae6edc
---
M modules/contint/manifests/packages.pp
M modules/contint/manifests/publish-console.pp
2 files changed, 13 insertions(+), 5 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Hashar: Verified; Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/contint/manifests/packages.pp
b/modules/contint/manifests/packages.pp
index cd83755..4f8365a 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -89,6 +89,13 @@
ensure = present,
}
+if ! defined ( Package['python-requests'] ) {
+package { 'python-requests':
+ensure = present,
+}
+}
+
+
# Includes packages needed for building
# analytics and statistics related packages.
diff --git a/modules/contint/manifests/publish-console.pp
b/modules/contint/manifests/publish-console.pp
index 142461a..1f76a96 100644
--- a/modules/contint/manifests/publish-console.pp
+++ b/modules/contint/manifests/publish-console.pp
@@ -3,10 +3,11 @@
# https://integration.wikimedia.org/logs/
class contint::publish-console {
- # publish-console.py dependencies
- package { 'python-requests':
-ensure = present,
- }
-
+# publish-console.py dependencies
+if ! defined ( Package['python-requests'] ) {
+package { 'python-requests':
+ensure = present,
+}
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/134234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4ca9ea77c4bb6c22d9ac3d14c1c165edc0ae6edc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@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] contint: symlink for Jenkins email templates - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: contint: symlink for Jenkins email templates
..
contint: symlink for Jenkins email templates
The email templates for the Email-ext plugin are hold in
integration/jenkins.git but the plugin expects them under Jenkins home.
So just do a symbolic link to where git-deploy put the files.
Bug: 64232
Change-Id: I47f8df11194d2b700a3a0533dc0fe0008cb70b2d
---
M manifests/role/ci.pp
1 file changed, 10 insertions(+), 0 deletions(-)
Approvals:
Hashar: Verified; Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index d30d4ff..e64b45d 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -35,6 +35,16 @@
require = User['jenkins'],
}
+# Templates for Jenkins plugin Email-ext. The templates are hosted in
+# the repository integration/jenkins.git, so link to there.
+file { '/var/lib/jenkins/email-templates':
+ensure = link,
+target =
'/srv/deployment/integration/slave-scripts/tools/email-templates',
+mode = '0444',
+owner = 'root',
+group = 'root',
+}
+
# As of October 2013, the slave scripts are installed with
# contint::slave-scripts and land under /srv/jenkins.
# FIXME: clean up Jenkins jobs to no more refer to the paths below:
--
To view, visit https://gerrit.wikimedia.org/r/129152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47f8df11194d2b700a3a0533dc0fe0008cb70b2d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@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] Add memkeys to role::memcached - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134612
Change subject: Add memkeys to role::memcached
..
Add memkeys to role::memcached
memkeys is a top-like utility for memcache keys by Tumblr, ported to C++
from a Ruby utility by Etsy. It's useful to debug memcache regressions.
Try it on memcached servers, for now, although eventually it could be
also very useful in appservers themselves as they would have the full
view of all keys.
Change-Id: Ida4b76470871bc1911d878fea44fc71bda58e004
---
M manifests/role/memcached.pp
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/134612/1
diff --git a/manifests/role/memcached.pp b/manifests/role/memcached.pp
index b91e820..04ba68a 100644
--- a/manifests/role/memcached.pp
+++ b/manifests/role/memcached.pp
@@ -26,4 +26,7 @@
}
}
+ package { 'memkeys':
+ ensure = present,
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/134612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida4b76470871bc1911d878fea44fc71bda58e004
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add memkeys to role::memcached - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Add memkeys to role::memcached
..
Add memkeys to role::memcached
memkeys is a top-like utility for memcache keys by Tumblr, ported to C++
from a Ruby utility by Etsy. It's useful to debug memcache regressions.
Try it on memcached servers, for now, although eventually it could be
also very useful in appservers themselves as they would have the full
view of all keys.
Change-Id: Ida4b76470871bc1911d878fea44fc71bda58e004
---
M manifests/role/memcached.pp
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/manifests/role/memcached.pp b/manifests/role/memcached.pp
index b91e820..04ba68a 100644
--- a/manifests/role/memcached.pp
+++ b/manifests/role/memcached.pp
@@ -26,4 +26,7 @@
}
}
+ package { 'memkeys':
+ ensure = present,
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/134612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida4b76470871bc1911d878fea44fc71bda58e004
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixup typography changes release notes between 1.23 and 1.14 - change (mediawiki/core)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/134611 Change subject: Fixup typography changes release notes between 1.23 and 1.14 .. Fixup typography changes release notes between 1.23 and 1.14 Hotfix I595feec9a to REL1_23 changes release notes directly in REL1_23 without applying to master first. The files are now out of sync. * Sync the line in RELEASE-NOTES-1.23 with what is in REL1_23 (basically cherry-picking hotfix I595feec9a from REL1_23 to master here). * Move the remainder to RELEASE-NOTES-1.24. Change-Id: Ic3dc2655101086521403cfc9929887a97bbed811 --- M RELEASE-NOTES-1.23 M RELEASE-NOTES-1.24 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/11/134611/1 diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index ad06059..3e5eb98 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -144,7 +144,7 @@ * Added BaseTemplateAfterPortlet hook to allow injecting html after portlets in skins. * Support has been added for a JSON based localisation file format. The installer has been updated to use it. -* Changes to content typography (fonts, line-height, etc.). See +* Changes to content typography (colors, line-height etc.). See https://www.mediawiki.org/wiki/Typography_refresh for further information. * The Vector skin's visual treatment of external links has been simplified to a single icon (from nine). This should not affect local rules unless they were diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index 7968b2e..f7e0599 100644 --- a/RELEASE-NOTES-1.24 +++ b/RELEASE-NOTES-1.24 @@ -33,6 +33,8 @@ jQuery.cookie so that getting/setting a cookie is syntactically and functionally similar to using the WebRequest#getCookie/WebResponse#setcookie methods. * (bug 44740) jQuery upgraded from 1.8.3 to 1.11.1. +* Changes to content typography (fonts, etc.). See + https://www.mediawiki.org/wiki/Typography_refresh for further information. === Bug fixes in 1.24 === * (bug 49116) Footer copyright notice is now always displayed in user language -- To view, visit https://gerrit.wikimedia.org/r/134611 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic3dc2655101086521403cfc9929887a97bbed811 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixup typography changes release notes between 1.23 and 1.14 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Fixup typography changes release notes between 1.23 and 1.14 .. Fixup typography changes release notes between 1.23 and 1.14 Hotfix I595feec9a to REL1_23 changes release notes directly in REL1_23 without applying to master first. The files are now out of sync. * Sync the line in RELEASE-NOTES-1.23 with what is in REL1_23 (basically cherry-picking hotfix I595feec9a from REL1_23 to master here). * Move the remainder to RELEASE-NOTES-1.24. Change-Id: Ic3dc2655101086521403cfc9929887a97bbed811 --- M RELEASE-NOTES-1.23 M RELEASE-NOTES-1.24 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index ad06059..3e5eb98 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -144,7 +144,7 @@ * Added BaseTemplateAfterPortlet hook to allow injecting html after portlets in skins. * Support has been added for a JSON based localisation file format. The installer has been updated to use it. -* Changes to content typography (fonts, line-height, etc.). See +* Changes to content typography (colors, line-height etc.). See https://www.mediawiki.org/wiki/Typography_refresh for further information. * The Vector skin's visual treatment of external links has been simplified to a single icon (from nine). This should not affect local rules unless they were diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index 7968b2e..f7e0599 100644 --- a/RELEASE-NOTES-1.24 +++ b/RELEASE-NOTES-1.24 @@ -33,6 +33,8 @@ jQuery.cookie so that getting/setting a cookie is syntactically and functionally similar to using the WebRequest#getCookie/WebResponse#setcookie methods. * (bug 44740) jQuery upgraded from 1.8.3 to 1.11.1. +* Changes to content typography (fonts, etc.). See + https://www.mediawiki.org/wiki/Typography_refresh for further information. === Bug fixes in 1.24 === * (bug 49116) Footer copyright notice is now always displayed in user language -- To view, visit https://gerrit.wikimedia.org/r/134611 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic3dc2655101086521403cfc9929887a97bbed811 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace FOR UPDATE with LockManager use in LocalFile::lock() - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Replace FOR UPDATE with LockManager use in LocalFile::lock()
..
Replace FOR UPDATE with LockManager use in LocalFile::lock()
* This avoids excess contention where inserts of rows for
similarly named files get blocked. This often would effect
users of UploadWizard or any bot doing mass uploads.
Change-Id: Ie7a328f7d4f03aa249770804417347a50356ea42
---
M includes/filebackend/FileBackend.php
M includes/filerepo/file/LocalFile.php
2 files changed, 23 insertions(+), 16 deletions(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filebackend/FileBackend.php
b/includes/filebackend/FileBackend.php
index f99da6d..9da1b73 100644
--- a/includes/filebackend/FileBackend.php
+++ b/includes/filebackend/FileBackend.php
@@ -1230,12 +1230,13 @@
*
* @param array $paths Storage paths
* @param int $type LockManager::LOCK_* constant
+* @param int $timeout Timeout in seconds (0 means non-blocking) (since
1.24)
* @return Status
*/
- final public function lockFiles( array $paths, $type ) {
+ final public function lockFiles( array $paths, $type, $timeout = 0 ) {
$paths = array_map( 'FileBackend::normalizeStoragePath', $paths
);
- return $this-lockManager-lock( $paths, $type );
+ return $this-lockManager-lock( $paths, $type, $timeout );
}
/**
@@ -1264,9 +1265,10 @@
* @param array $paths List of storage paths or map of lock types to
path lists
* @param int|string $type LockManager::LOCK_* constant or mixed
* @param Status $status Status to update on lock/unlock
+* @param int $timeout Timeout in seconds (0 means non-blocking) (since
1.24)
* @return ScopedLock|null Returns null on failure
*/
- final public function getScopedFileLocks( array $paths, $type, Status
$status ) {
+ final public function getScopedFileLocks( array $paths, $type, Status
$status, $timeout = 0 ) {
if ( $type === 'mixed' ) {
foreach ( $paths as $typePaths ) {
$typePaths = array_map(
'FileBackend::normalizeStoragePath', $typePaths );
@@ -1275,7 +1277,7 @@
$paths = array_map(
'FileBackend::normalizeStoragePath', $paths );
}
- return ScopedLock::factory( $this-lockManager, $paths, $type,
$status );
+ return ScopedLock::factory( $this-lockManager, $paths, $type,
$status, $timeout );
}
/**
diff --git a/includes/filerepo/file/LocalFile.php
b/includes/filerepo/file/LocalFile.php
index a8fa8bd..660f193 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1249,7 +1249,7 @@
}
if ( $timestamp === false ) {
- // Use FOR UPDATE in case lock()/unlock() did not start
the transaction
+ // Use FOR UPDATE to ignore any transaction snapshotting
$ltimestamp = $dbw-selectField( 'image',
'img_timestamp',
array( 'img_name' = $this-getName() ),
__METHOD__, array( 'FOR UPDATE' ) );
$ltime = $ltimestamp ? wfTimestamp( TS_UNIX,
$ltimestamp ) : false;
@@ -1836,8 +1836,8 @@
/**
* Start a transaction and lock the image for update
* Increments a reference counter if the lock is already held
-* @throws MWException
-* @return bool True if the image exists, false otherwise
+* @throws MWException Throws an error if the lock was not acquired
+* @return bool success
*/
function lock() {
$dbw = $this-repo-getMasterDB();
@@ -1849,21 +1849,22 @@
}
$this-locked++;
// Bug 54736: use simple lock to handle when the file
does not exist.
- // SELECT FOR UPDATE only locks records not the gaps
where there are none.
- $cache = wfGetMainCache();
- $key = $this-getCacheKey();
- if ( !$cache-lock( $key, 5 ) ) {
+ // SELECT FOR UPDATE prevents changes, not other
SELECTs with FOR UPDATE.
+ // Also, that would cause contention on INSERT of
similarly named rows.
+ $backend = $this-getRepo()-getBackend();
+ $lockPaths = array( $this-getPath() ); // represents
all versions of the file
+ $status = $backend-lockFiles( $lockPaths,
LockManager::LOCK_EX, 5 );
+ if ( !$status-isGood() ) {
throw new MWException( Could not acquire lock
for
[MediaWiki-commits] [Gerrit] Remove the empty ItemContentDiffView - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134613
Change subject: Remove the empty ItemContentDiffView
..
Remove the empty ItemContentDiffView
PropertyContent was even also using ItemContentDiffView,
indicating that both Item and Property should just be using
EntityContentDiffView.
Change-Id: I301eed3bce5d96fdedd68393aab759d290f67889
---
M repo/includes/EntityContentDiffView.php
D repo/includes/ItemContentDiffView.php
M repo/includes/content/EntityHandler.php
M repo/includes/content/ItemHandler.php
M repo/includes/content/PropertyHandler.php
R repo/tests/phpunit/includes/EntityContentDiffViewTest.php
6 files changed, 17 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/13/134613/1
diff --git a/repo/includes/EntityContentDiffView.php
b/repo/includes/EntityContentDiffView.php
index 2a95cb5..8963dd9 100644
--- a/repo/includes/EntityContentDiffView.php
+++ b/repo/includes/EntityContentDiffView.php
@@ -29,7 +29,7 @@
* @author Daniel Kinzler
* @author Jeroen De Dauw jeroended...@gmail.com
*/
-abstract class EntityContentDiffView extends DifferenceEngine {
+class EntityContentDiffView extends DifferenceEngine {
/**
* @var EntityDiffVisualizer
diff --git a/repo/includes/ItemContentDiffView.php
b/repo/includes/ItemContentDiffView.php
deleted file mode 100644
index 6debbed..000
--- a/repo/includes/ItemContentDiffView.php
+++ /dev/null
@@ -1,17 +0,0 @@
-?php
-
-namespace Wikibase;
-
-/**
- * Difference view for Wikibase items.
- *
- * @since 0.1
- *
- * @licence GNU GPL v2+
- * @author Jeroen De Dauw jeroended...@gmail.com
- */
-class ItemContentDiffView extends EntityContentDiffView {
-
-
-
-}
diff --git a/repo/includes/content/EntityHandler.php
b/repo/includes/content/EntityHandler.php
index 6e4212f..4e1c88e 100644
--- a/repo/includes/content/EntityHandler.php
+++ b/repo/includes/content/EntityHandler.php
@@ -57,6 +57,17 @@
abstract protected function getContentClass();
/**
+* @see ContentHandler::getDiffEngineClass
+*
+* @since 0.1
+*
+* @return string
+*/
+ protected function getDiffEngineClass() {
+ return '\Wikibase\EntityContentDiffView';
+ }
+
+ /**
* Returns a set of validators for enforcing hard constraints on the
content
* before saving. For soft constraints, see the TermValidatorFactory.
*
diff --git a/repo/includes/content/ItemHandler.php
b/repo/includes/content/ItemHandler.php
index d672b6d..2438d08 100644
--- a/repo/includes/content/ItemHandler.php
+++ b/repo/includes/content/ItemHandler.php
@@ -58,17 +58,6 @@
}
/**
-* @see ContentHandler::getDiffEngineClass
-*
-* @since 0.1
-*
-* @return string
-*/
- protected function getDiffEngineClass() {
- return '\Wikibase\ItemContentDiffView';
- }
-
- /**
* @see EntityHandler::getSpecialPageForCreation
* @since 0.2
*
diff --git a/repo/includes/content/PropertyHandler.php
b/repo/includes/content/PropertyHandler.php
index 6669e02..156cd19 100644
--- a/repo/includes/content/PropertyHandler.php
+++ b/repo/includes/content/PropertyHandler.php
@@ -24,17 +24,6 @@
}
/**
-* @see ContentHandler::getDiffEngineClass
-*
-* @since 0.1
-*
-* @return string
-*/
- protected function getDiffEngineClass() {
- return '\Wikibase\ItemContentDiffView';
- }
-
- /**
* @param PreSaveValidator[] $preSaveValidators
*/
public function __construct( $preSaveValidators ) {
diff --git a/repo/tests/phpunit/includes/ItemContentDiffViewTest.php
b/repo/tests/phpunit/includes/EntityContentDiffViewTest.php
similarity index 81%
rename from repo/tests/phpunit/includes/ItemContentDiffViewTest.php
rename to repo/tests/phpunit/includes/EntityContentDiffViewTest.php
index d3b8e85..9a95104 100644
--- a/repo/tests/phpunit/includes/ItemContentDiffViewTest.php
+++ b/repo/tests/phpunit/includes/EntityContentDiffViewTest.php
@@ -3,12 +3,12 @@
namespace Wikibase\Test;
use RequestContext;
-use Wikibase\ItemContentDiffView;
+use Wikibase\EntityContentDiffView;
use Wikibase\Item;
use Wikibase\ItemContent;
/**
- * @covers Wikibase\ItemContentDiffView
+ * @covers Wikibase\EntityContentDiffView
*
* @group Wikibase
* @group WikibaseRepo
@@ -16,12 +16,12 @@
* @licence GNU GPL v2+
* @author Jeroen De Dauw jeroended...@gmail.com
*/
-class ItemDiffViewTest extends \MediaWikiTestCase {
+class EntityContentDiffViewTest extends \MediaWikiTestCase {
//@todo: make this a baseclass to use with all types of entities.
public function testConstructor() {
- new ItemContentDiffView(
[MediaWiki-commits] [Gerrit] Move release notes for Introducing pp_sortkey to 1.24 - change (mediawiki/core)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/134614 Change subject: Move release notes for Introducing pp_sortkey to 1.24 .. Move release notes for Introducing pp_sortkey to 1.24 Follows-up I217c42656 and Iaa78a8254, the commit was merged before the branch cut and then reverted in REL1_23. The notes were never fixed in master. Change-Id: I5355ac405aef4d2b0d660205bc1231c6eb35c02d --- M RELEASE-NOTES-1.23 M RELEASE-NOTES-1.24 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/14/134614/1 diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index 3e5eb98..29d58a6 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -275,9 +275,6 @@ * Support was added for Northern Luri (lrc). === Other changes in 1.23 === -* Added pp_sortkey column to page_props table, so pages can be efficiently - queried and sorted by property value (bug 58032). - See $wgPagePropsHaveSortkey if you want to postpone the schema change. * The rc_type field in the recentchanges table has been superseded by a new rc_source field. The rc_source field is a string representation of the change type where rc_type was a numeric constant. This field is not yet diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index f7e0599..bb5a662 100644 --- a/RELEASE-NOTES-1.24 +++ b/RELEASE-NOTES-1.24 @@ -73,6 +73,9 @@ * mediawiki.util.$content no longer supports old versions of the Vector, Monobook, Modern and CologneBlue skins that don't yet implement the mw-body and/or mw-body-primary class name in their html. +* Added pp_sortkey column to page_props table, so pages can be efficiently + queried and sorted by property value (bug 58032). + See $wgPagePropsHaveSortkey if you want to postpone the schema change. Renamed classes * CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression -- To view, visit https://gerrit.wikimedia.org/r/134614 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5355ac405aef4d2b0d660205bc1231c6eb35c02d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ignore jshint warnings in dumped tokenizer - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Ignore jshint warnings in dumped tokenizer
..
Ignore jshint warnings in dumped tokenizer
* Trying to upstream some of this:
https://github.com/dmajda/pegjs/pull/269
Change-Id: I62887bdbaa2230c8fdece2f619c7a836d5be9a31
---
M lib/mediawiki.tokenizer.peg.js
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
Cscott: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/lib/mediawiki.tokenizer.peg.js b/lib/mediawiki.tokenizer.peg.js
index 1bb0ea4..ebd43c2 100644
--- a/lib/mediawiki.tokenizer.peg.js
+++ b/lib/mediawiki.tokenizer.peg.js
@@ -115,8 +115,12 @@
PegTokenizer.prototype.tokenizer = new Function(
'return ' + tokenizerSource )();
} else {
// Optionally save require the tokenizer source
+ tokenizerSource = tokenizerSource
+ .replace(/peg\$subclass\(child, parent\) {/g,
function(m) {
+ return m + \n/*jshint
validthis:true, newcap:false */;
+ });
tokenizerSource =
- '/* jshint loopfunc:true, latedef:false,
nonstandard:true */\n' +
+ '/* jshint loopfunc:true, latedef:false,
nonstandard:true, -W100 */\n' +
'use strict;\n' +
'require(./core-upgrade.js);\n' +
'module.exports = ' + tokenizerSource + ';';
--
To view, visit https://gerrit.wikimedia.org/r/134530
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I62887bdbaa2230c8fdece2f619c7a836d5be9a31
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@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] Adjust role::zuul::labs - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: Adjust role::zuul::labs
..
Adjust role::zuul::labs
Migrating Gerrit/Jenkins/Zuul to be all on the same instance
(integration-dev.eqiad.wmflabs) so we can reasonably use 127.0.0.1
everywhere.
The Zuul git repositories are local to the instance for now at
/srv/zuul/git. Should be moved under /data/project whenever we have the
'jenkins' and 'zuul' users created on the NFS server (bug 64868).
Change-Id: I220dfde6a65742114e290942694c151b93c33b53
---
M manifests/role/zuul.pp
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index 38788fe..7cd1cd4 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -9,7 +9,9 @@
$zuul_git_dir = $::realm ? {
'production' = '/srv/ssd/zuul/git',
-'labs' = '/var/lib/zuul/git',
+'labs' = '/srv/zuul/git',
+# FIXME migrate under /data/project whenever bug 64868 is solved
+#'labs' = '/data/project/zuul/git',
}
} # /role::zuul::configuration
@@ -29,9 +31,9 @@
zuulwikimedia::instance { 'zuul-labs':
gearman_server = '127.0.0.1',
gearman_server_start = true,
-jenkins_server = 'http://10.4.0.172:8080/ci',
+jenkins_server = 'http://127.0.0.1:8080/ci',
jenkins_user = 'zuul',
-gerrit_server= '10.4.0.172',
+gerrit_server= '127.0.0.1',
gerrit_user = 'jenkins',
url_pattern =
'http://integration.wmflabs.org/ci/job/{job.name}/{build.number}/console',
status_url = 'http://integration.wmflabs.org/zuul/status',
--
To view, visit https://gerrit.wikimedia.org/r/131438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I220dfde6a65742114e290942694c151b93c33b53
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@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] Removed 'Remember my login' preference - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134615
Change subject: Removed 'Remember my login' preference
..
Removed 'Remember my login' preference
Removed 'Remember my login' from Preferences, as it was unwanted. It adds
to the complexity of the user preferences
Bug: 52342
Co-Author: Tyler Romeo tylerro...@gmail.com
Change-Id: I7c957e1e1aaecf47f7c47bc063b5d3b364644afc
(cherry picked from commit 74756a24091d3b875a2fbf8759d8688609727586)
---
M RELEASE-NOTES-1.23
M includes/DefaultSettings.php
M includes/Preferences.php
M includes/User.php
M includes/api/ApiLogin.php
M includes/specials/SpecialUserlogin.php
M languages/i18n/en.json
M maintenance/dictionary/mediawiki.dic
M maintenance/language/messages.inc
9 files changed, 15 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/15/134615/1
diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 831daeb..974d546 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -361,6 +361,7 @@
scope (like Zepto.js or document.querySelectorAll, for example) you will need
to use different names to or re-bind them at the top of each
ResourceLoader-loaded module.
+* (bug 52342) Preference Remember my login was removed.
Removed classes
* FakeMemCachedClient (deprecated in 1.18)
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 96fc113..8cda45b 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4075,7 +4075,6 @@
'previewontop' = 1,
'rcdays' = 7,
'rclimit' = 50,
- 'rememberpassword' = 0,
'rows' = 25,
'showhiddencats' = 0,
'shownumberswatching' = 1,
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 1825cce..661d2c6 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -301,14 +301,6 @@
'section' = 'personal/info',
);
}
- if ( $wgCookieExpiration 0 ) {
- $defaultPreferences['rememberpassword'] = array(
- 'type' = 'toggle',
- 'label' = $context-msg(
'tog-rememberpassword' )-numParams(
- ceil( $wgCookieExpiration / ( 3600 * 24
) ) )-text(),
- 'section' = 'personal/info',
- );
- }
// Only show prefershttps if secure login is turned on
if ( $wgSecureLogin wfCanIPUseHTTPS(
$context-getRequest()-getIP() ) ) {
$defaultPreferences['prefershttps'] = array(
diff --git a/includes/User.php b/includes/User.php
index 1ccb732..fd10e9a 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3319,8 +3319,9 @@
* @param $request WebRequest object to use; $wgRequest will be used if
null
*is passed.
* @param bool $secure Whether to force secure/insecure cookies or use
default
+* @param bool $rememberMe Whether to add a Token cookie for elongated
sessions
*/
- public function setCookies( $request = null, $secure = null ) {
+ public function setCookies( $request = null, $secure = null,
$rememberMe = false ) {
if ( $request === null ) {
$request = $this-getRequest();
}
@@ -3346,7 +3347,7 @@
'UserID' = $this-mId,
'UserName' = $this-getName(),
);
- if ( 1 == $this-getOption( 'rememberpassword' ) ) {
+ if ( $rememberMe ) {
$cookies['Token'] = $this-mToken;
} else {
$cookies['Token'] = false;
@@ -3373,14 +3374,10 @@
* standard time setting, based on if rememberme was set.
*/
if ( $request-getCheck( 'wpStickHTTPS' ) ||
$this-requiresHTTPS() ) {
- $time = null;
- if ( ( 1 == $this-getOption( 'rememberpassword' ) ) ) {
- $time = 0; // set to $wgCookieExpiration
- }
$this-setCookie(
'forceHTTPS',
'true',
- $time,
+ $rememberMe ? 0 : null,
false,
array( 'prefix' = '' ) // no prefix
);
@@ -4786,11 +4783,13 @@
$priorKeys[] = $row-up_property;
}
if ( count( $priorKeys ) ) {
- // Do the DELETE by PRIMARY KEY for prior rows. A very
large portion of
- // calls to this function are for setting
[MediaWiki-commits] [Gerrit] Tweaked timestamp kludge logic in recordUpload2 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Tweaked timestamp kludge logic in recordUpload2
..
Tweaked timestamp kludge logic in recordUpload2
* This now only does the SELECT FOR UPDATE for the re-upload case
Change-Id: I21b1b0328b6dbfb30f4f0293212515b9ee081778
---
M includes/filerepo/file/LocalFile.php
1 file changed, 20 insertions(+), 12 deletions(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filerepo/file/LocalFile.php
b/includes/filerepo/file/LocalFile.php
index 660f193..a178093 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1248,19 +1248,13 @@
wfProfileOut( __METHOD__ . '-getProps' );
}
+ # Imports or such might force a certain timestamp; otherwise we
generate
+ # it and can fudge it slightly to keep (name,timestamp) unique
on re-upload.
if ( $timestamp === false ) {
- // Use FOR UPDATE to ignore any transaction snapshotting
- $ltimestamp = $dbw-selectField( 'image',
'img_timestamp',
- array( 'img_name' = $this-getName() ),
__METHOD__, array( 'FOR UPDATE' ) );
- $ltime = $ltimestamp ? wfTimestamp( TS_UNIX,
$ltimestamp ) : false;
- $ctime = time();
- // Avoid a timestamp that is not newer than the last
version
- if ( $ctime $ltime ) {
- $timestamp = $dbw-timestamp( $ctime );
- } else {
- sleep( 1 ); // fast enough uploads will go in
to the future otherwise
- $timestamp = $dbw-timestamp( $ltime + 1 );
- }
+ $timestamp = $dbw-timestamp();
+ $allowTimeKludge = true;
+ } else {
+ $allowTimeKludge = false;
}
$props['description'] = $comment;
@@ -1303,6 +1297,20 @@
'IGNORE'
);
if ( $dbw-affectedRows() == 0 ) {
+ if ( $allowTimeKludge ) {
+ # Use FOR UPDATE to ignore any transaction
snapshotting
+ $ltimestamp = $dbw-selectField( 'image',
'img_timestamp',
+ array( 'img_name' = $this-getName()
), __METHOD__, array( 'FOR UPDATE' ) );
+ $lUnixtime = $ltimestamp ? wfTimestamp(
TS_UNIX, $ltimestamp ) : false;
+ # Avoid a timestamp that is not newer than the
last version
+ # TODO: the image/oldimage tables should be
like page/revision with an ID field
+ if ( $lUnixtime wfTimestamp( TS_UNIX,
$timestamp ) = $lUnixtime ) {
+ sleep( 1 ); // fast enough re-uploads
would go far in the future otherwise
+ $timestamp = $dbw-timestamp(
$lUnixtime + 1 );
+ $this-timestamp = wfTimestamp( TS_MW,
$timestamp ); // DB - TS_MW
+ }
+ }
+
# (bug 34993) Note: $oldver can be empty here, if the
previous
# version of the file was broken. Allow registration of
the new
# version to continue anyway, because that's better
than having
--
To view, visit https://gerrit.wikimedia.org/r/134536
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I21b1b0328b6dbfb30f4f0293212515b9ee081778
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf5
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@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] Sync 1.23 release notes for bug 64289 from REL1_23 - change (mediawiki/core)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/134616 Change subject: Sync 1.23 release notes for bug 64289 from REL1_23 .. Sync 1.23 release notes for bug 64289 from REL1_23 Change Ib97f47ef1 was merged after the branch cut, but did not have release notes. Then whoever backported it to REL1_23 decided it really should have release notes and wrote them directly in REL1_23... * (bug 64289) jquery.textSelection: Don't throw errors on empty collections. Change-Id: I5d36dc86f10e757cac286bcb9b63c9e711a921b9 --- M RELEASE-NOTES-1.23 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/16/134616/1 diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index 29d58a6..ced3717 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -207,6 +207,7 @@ warnings to be printed on Windows due to large path length. * (bug 48084) Fixed a bug in the installer that could cause $wgLogo to hold the wrong path to the placeholder logo (skins/common/images/wiki.png). +* (bug 64289) jquery.textSelection: Don't throw errors on empty collections. === Web API changes in 1.23 === * (bug 54884) action=parseprop=categories now indicates hidden and missing -- To view, visit https://gerrit.wikimedia.org/r/134616 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5d36dc86f10e757cac286bcb9b63c9e711a921b9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
