[MediaWiki-commits] [Gerrit] (bugfix) catDB is undefined invoking category.py -help - change (pywikibot/compat)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/130288 Change subject: (bugfix) catDB is undefined invoking category.py -help .. (bugfix) catDB is undefined invoking category.py -help This patch solves this point. Change-Id: I9892c0486a7ebda8ff7793530923d261abb45865 --- M category.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat refs/changes/88/130288/1 diff --git a/category.py b/category.py index e2bf0c1..59ffddc 100644 --- a/category.py +++ b/category.py @@ -1072,5 +1072,6 @@ try: main() finally: -catDB.dump() +if 'catDB' in globals(): +catDB.dump() pywikibot.stopme() -- To view, visit https://gerrit.wikimedia.org/r/130288 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9892c0486a7ebda8ff7793530923d261abb45865 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] (bugfix) catDB is undefined invoking category.py -help - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged. Change subject: (bugfix) catDB is undefined invoking category.py -help .. (bugfix) catDB is undefined invoking category.py -help This patch solves this point. Change-Id: I9892c0486a7ebda8ff7793530923d261abb45865 --- M category.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/category.py b/category.py index e2bf0c1..59ffddc 100644 --- a/category.py +++ b/category.py @@ -1072,5 +1072,6 @@ try: main() finally: -catDB.dump() +if 'catDB' in globals(): +catDB.dump() pywikibot.stopme() -- To view, visit https://gerrit.wikimedia.org/r/130288 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9892c0486a7ebda8ff7793530923d261abb45865 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de Gerrit-Reviewer: Ladsgroup ladsgr...@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] motd updates must be sh wrappers - change (operations/puppet)
ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130289
Change subject: motd updates must be sh wrappers
..
motd updates must be sh wrappers
Change-Id: I694e60eb61cce8e02b3e96951f55c90bd0d6d79a
---
M manifests/backups.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/89/130289/1
diff --git a/manifests/backups.pp b/manifests/backups.pp
index 1896f2b..05c066c 100644
--- a/manifests/backups.pp
+++ b/manifests/backups.pp
@@ -11,7 +11,7 @@
jobdefaults = $jobdefaults,
}
-$motd_content = Backed up on this host: $name\n
+$motd_content = #!/bin/sh\necho \Backed up on this host: $name\
@file { /etc/update-motd.d/06-backups-${name}:
ensure = 'present',
owner = 'root',
--
To view, visit https://gerrit.wikimedia.org/r/130289
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I694e60eb61cce8e02b3e96951f55c90bd0d6d79a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] motd updates must be sh wrappers - change (operations/puppet)
ArielGlenn has submitted this change and it was merged.
Change subject: motd updates must be sh wrappers
..
motd updates must be sh wrappers
Change-Id: I694e60eb61cce8e02b3e96951f55c90bd0d6d79a
---
M manifests/backups.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/backups.pp b/manifests/backups.pp
index 1896f2b..05c066c 100644
--- a/manifests/backups.pp
+++ b/manifests/backups.pp
@@ -11,7 +11,7 @@
jobdefaults = $jobdefaults,
}
-$motd_content = Backed up on this host: $name\n
+$motd_content = #!/bin/sh\necho \Backed up on this host: $name\
@file { /etc/update-motd.d/06-backups-${name}:
ensure = 'present',
owner = 'root',
--
To view, visit https://gerrit.wikimedia.org/r/130289
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I694e60eb61cce8e02b3e96951f55c90bd0d6d79a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@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] Various fixes for the JSON-relational mapper - change (mediawiki...EventLogging)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130290
Change subject: Various fixes for the JSON-relational mapper
..
Various fixes for the JSON-relational mapper
* Update EventCapsule schema to 8326736.
* Infer uniqueness of UUID from the property's format specifier.
* Factor out column sort into separate function.
* Make deeply-nested properties sort after shallow-nested ones.
* Fix nullable constraint detection.
Change-Id: I36002e62f570f418bd59dd1fb5ace2a23514b098
---
M server/eventlogging/jrm.py
M server/eventlogging/schema.py
M server/tests/fixtures.py
3 files changed, 25 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging
refs/changes/90/130290/1
diff --git a/server/eventlogging/jrm.py b/server/eventlogging/jrm.py
index 1cc46e5..c493685 100644
--- a/server/eventlogging/jrm.py
+++ b/server/eventlogging/jrm.py
@@ -90,10 +90,12 @@
}),
('format', {
'utc-millisec': {'type_': MediaWikiTimestamp, 'index': True},
+'uuid5-hex': {'type_': sqlalchemy.CHAR(32), 'index': True,
+ 'unique': True},
}),
('required', {
-True: {'nullable': True},
-False: {'nullable': False}
+True: {'nullable': False},
+False: {'nullable': True}
})
))
@@ -151,15 +153,7 @@
the database, issue ``CREATE TABLE`` statement.
schema = get_schema(scid, encapsulate=True)
-# Every table gets an integer auto-increment primary key column `id`
-# and an indexed CHAR(32) column, `uuid`. (UUIDs could be stored as
-# binary in a CHAR(16) column, but at the cost of readability.)
-columns = [
-sqlalchemy.Column('id', sqlalchemy.Integer, primary_key=True),
-sqlalchemy.Column('uuid', sqlalchemy.CHAR(32), index=True,
- unique=True, nullable=False)
-]
-columns.extend(schema_mapper(schema))
+columns = schema_mapper(schema)
table_options = ENGINE_TABLE_OPTIONS.get(meta.bind.name, {})
table_name = TABLE_NAME_FORMAT % scid
@@ -214,18 +208,29 @@
return dict(flat)
+def column_sort_key(column):
+Sort key for column names. 'id' and 'uuid' come first, then the
+top-level properties in alphabetical order, followed by the nested
+properties (identifiable by the presence of an underscore).
+return (
+('id', 'uuid', column.name).index(column.name),
+column.name.count('_'),
+column.name,
+)
+
+
def schema_mapper(schema):
Takes a schema and map its properties to database column
definitions.
properties = {k: v for k, v in items(schema.get('properties', {}))
if k not in NO_DB_PROPERTIES}
-columns = []
+
+# Every table gets an integer auto-increment primary key column `id`
+columns = [sqlalchemy.Column('id', sqlalchemy.Integer, primary_key=True)]
+
for name, col in items(flatten(properties, f=_property_getter)):
col.name = name
columns.append(col)
-# Sort the mapped columns lexicographically by name, with 'nested'
-# columns (identifiable by the presence of an underscore in the
-# name) appearing last.
-columns.sort(key=lambda col: ('_' in col.name, col.name))
+columns.sort(key=column_sort_key)
return columns
diff --git a/server/eventlogging/schema.py b/server/eventlogging/schema.py
index 67dd318..9e77409 100644
--- a/server/eventlogging/schema.py
+++ b/server/eventlogging/schema.py
@@ -29,7 +29,7 @@
schema_cache = {}
#: SCID of the metadata object which wraps each event.
-CAPSULE_SCID = ('EventCapsule', 6862080)
+CAPSULE_SCID = ('EventCapsule', 8326736)
def get_schema(scid, encapsulate=False):
diff --git a/server/tests/fixtures.py b/server/tests/fixtures.py
index 75a4c9d..7e4a6ef 100644
--- a/server/tests/fixtures.py
+++ b/server/tests/fixtures.py
@@ -62,7 +62,9 @@
'format': 'utc-millisec'
},
'uuid': {
-'type': 'string'
+'type': 'string',
+'required': True,
+'format': 'uuid5-hex'
}
},
'additionalProperties': False
--
To view, visit https://gerrit.wikimedia.org/r/130290
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I36002e62f570f418bd59dd1fb5ace2a23514b098
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Include language-0 categories for betawikiversity - change (operations/mediawiki-config)
Withoutaname has uploaded a new change for review. https://gerrit.wikimedia.org/r/130291 Change subject: Include language-0 categories for betawikiversity .. Include language-0 categories for betawikiversity Amending gerrit 129103 to include language-0 categories, per newfound consensus at https://beta.wikiversity.org/wiki/?oldid=154979#User_XX-0 Bug: 64168 Change-Id: I59e1fa87ee78a11779b08a5fffc49e4bfbc4c931 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/91/130291/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 60e1ede..e6375d9 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11322,7 +11322,7 @@ 'N' = false, ), 'betawikiversity' = array( // bug 64168 - '0' = false, + '0' = 'User %code%-0', '1' = 'User %code%-1', '2' = 'User %code%-2', '3' = 'User %code%-3', -- To view, visit https://gerrit.wikimedia.org/r/130291 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59e1fa87ee78a11779b08a5fffc49e4bfbc4c931 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Withoutaname drevit...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Various fixes for the JSON-relational mapper - change (mediawiki...EventLogging)
jenkins-bot has submitted this change and it was merged.
Change subject: Various fixes for the JSON-relational mapper
..
Various fixes for the JSON-relational mapper
* Update EventCapsule schema to 8326736.
* Infer uniqueness of UUID from the property's format specifier.
* Factor out column sort into separate function.
* Make deeply-nested properties sort after shallow-nested ones.
* Fix nullable constraint detection.
Change-Id: I36002e62f570f418bd59dd1fb5ace2a23514b098
---
M server/eventlogging/jrm.py
M server/eventlogging/schema.py
M server/tests/fixtures.py
3 files changed, 25 insertions(+), 18 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/server/eventlogging/jrm.py b/server/eventlogging/jrm.py
index 1cc46e5..c493685 100644
--- a/server/eventlogging/jrm.py
+++ b/server/eventlogging/jrm.py
@@ -90,10 +90,12 @@
}),
('format', {
'utc-millisec': {'type_': MediaWikiTimestamp, 'index': True},
+'uuid5-hex': {'type_': sqlalchemy.CHAR(32), 'index': True,
+ 'unique': True},
}),
('required', {
-True: {'nullable': True},
-False: {'nullable': False}
+True: {'nullable': False},
+False: {'nullable': True}
})
))
@@ -151,15 +153,7 @@
the database, issue ``CREATE TABLE`` statement.
schema = get_schema(scid, encapsulate=True)
-# Every table gets an integer auto-increment primary key column `id`
-# and an indexed CHAR(32) column, `uuid`. (UUIDs could be stored as
-# binary in a CHAR(16) column, but at the cost of readability.)
-columns = [
-sqlalchemy.Column('id', sqlalchemy.Integer, primary_key=True),
-sqlalchemy.Column('uuid', sqlalchemy.CHAR(32), index=True,
- unique=True, nullable=False)
-]
-columns.extend(schema_mapper(schema))
+columns = schema_mapper(schema)
table_options = ENGINE_TABLE_OPTIONS.get(meta.bind.name, {})
table_name = TABLE_NAME_FORMAT % scid
@@ -214,18 +208,29 @@
return dict(flat)
+def column_sort_key(column):
+Sort key for column names. 'id' and 'uuid' come first, then the
+top-level properties in alphabetical order, followed by the nested
+properties (identifiable by the presence of an underscore).
+return (
+('id', 'uuid', column.name).index(column.name),
+column.name.count('_'),
+column.name,
+)
+
+
def schema_mapper(schema):
Takes a schema and map its properties to database column
definitions.
properties = {k: v for k, v in items(schema.get('properties', {}))
if k not in NO_DB_PROPERTIES}
-columns = []
+
+# Every table gets an integer auto-increment primary key column `id`
+columns = [sqlalchemy.Column('id', sqlalchemy.Integer, primary_key=True)]
+
for name, col in items(flatten(properties, f=_property_getter)):
col.name = name
columns.append(col)
-# Sort the mapped columns lexicographically by name, with 'nested'
-# columns (identifiable by the presence of an underscore in the
-# name) appearing last.
-columns.sort(key=lambda col: ('_' in col.name, col.name))
+columns.sort(key=column_sort_key)
return columns
diff --git a/server/eventlogging/schema.py b/server/eventlogging/schema.py
index 67dd318..9e77409 100644
--- a/server/eventlogging/schema.py
+++ b/server/eventlogging/schema.py
@@ -29,7 +29,7 @@
schema_cache = {}
#: SCID of the metadata object which wraps each event.
-CAPSULE_SCID = ('EventCapsule', 6862080)
+CAPSULE_SCID = ('EventCapsule', 8326736)
def get_schema(scid, encapsulate=False):
diff --git a/server/tests/fixtures.py b/server/tests/fixtures.py
index 75a4c9d..7e4a6ef 100644
--- a/server/tests/fixtures.py
+++ b/server/tests/fixtures.py
@@ -62,7 +62,9 @@
'format': 'utc-millisec'
},
'uuid': {
-'type': 'string'
+'type': 'string',
+'required': True,
+'format': 'uuid5-hex'
}
},
'additionalProperties': False
--
To view, visit https://gerrit.wikimedia.org/r/130290
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I36002e62f570f418bd59dd1fb5ace2a23514b098
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixes for Kafka consumer - change (mediawiki...EventLogging)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130292
Change subject: Fixes for Kafka consumer
..
Fixes for Kafka consumer
* Don't pass driver's kwargs (which includes path) to KeyedProducer
constructor.
* Encode topic key to bytes.
Change-Id: Idec52a421e82660c9f62f97dec29ace5e6dcb09c
---
M server/eventlogging/handlers.py
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging
refs/changes/92/130292/1
diff --git a/server/eventlogging/handlers.py b/server/eventlogging/handlers.py
index 9806d46..c8b4459 100644
--- a/server/eventlogging/handlers.py
+++ b/server/eventlogging/handlers.py
@@ -65,18 +65,20 @@
@writes('kafka')
-def kafka_writer(brokers, topic='eventlogging', **kwargs):
+def kafka_writer(brokers, topic='eventlogging'):
Write events to Kafka, keyed by SCID.
from kafka.client import KafkaClient
from kafka.producer import KeyedProducer
kafka = KafkaClient(brokers)
-producer = KeyedProducer(kafka, topic, **kwargs)
+producer = KeyedProducer(kafka)
+topic = topic.encode('utf-8')
while 1:
event = (yield)
key = '%(schema)s_%(revision)s' % event # e.g. 'EchoMail_5467650'
-producer.send(key, json.dumps(event, sort_keys=True))
+key = key.encode('utf-8')
+producer.send(topic, key, json.dumps(event, sort_keys=True))
@writes('mysql', 'sqlite')
--
To view, visit https://gerrit.wikimedia.org/r/130292
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idec52a421e82660c9f62f97dec29ace5e6dcb09c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixes for Kafka consumer - change (mediawiki...EventLogging)
Ori.livneh has submitted this change and it was merged.
Change subject: Fixes for Kafka consumer
..
Fixes for Kafka consumer
* Don't pass driver's kwargs (which includes path) to KeyedProducer
constructor.
* Encode topic key to bytes.
Change-Id: Idec52a421e82660c9f62f97dec29ace5e6dcb09c
---
M server/eventlogging/handlers.py
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/server/eventlogging/handlers.py b/server/eventlogging/handlers.py
index 9806d46..c8b4459 100644
--- a/server/eventlogging/handlers.py
+++ b/server/eventlogging/handlers.py
@@ -65,18 +65,20 @@
@writes('kafka')
-def kafka_writer(brokers, topic='eventlogging', **kwargs):
+def kafka_writer(brokers, topic='eventlogging'):
Write events to Kafka, keyed by SCID.
from kafka.client import KafkaClient
from kafka.producer import KeyedProducer
kafka = KafkaClient(brokers)
-producer = KeyedProducer(kafka, topic, **kwargs)
+producer = KeyedProducer(kafka)
+topic = topic.encode('utf-8')
while 1:
event = (yield)
key = '%(schema)s_%(revision)s' % event # e.g. 'EchoMail_5467650'
-producer.send(key, json.dumps(event, sort_keys=True))
+key = key.encode('utf-8')
+producer.send(topic, key, json.dumps(event, sort_keys=True))
@writes('mysql', 'sqlite')
--
To view, visit https://gerrit.wikimedia.org/r/130292
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idec52a421e82660c9f62f97dec29ace5e6dcb09c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Small changes to default dashboard - change (mediawiki...MultimediaViewer)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130293
Change subject: Small changes to default dashboard
..
Small changes to default dashboard
* add TimedMediaHandler section
* increase MediaViewer section size
* add gerrit config changes to config section
Change-Id: Ie29d0aed86d668cef92f806b58cb123143e5ba10
---
M default
1 file changed, 5 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/93/130293/1
diff --git a/default b/default
index 7344191..69a44db 100644
--- a/default
+++ b/default
@@ -2,17 +2,19 @@
title = Multimedia
description = All kinds of things
[section MultimediaViewer]
- query = project:mediawiki/extensions/MultimediaViewer status:open limit:10
+ query = project:mediawiki/extensions/MultimediaViewer status:open limit:20
[section Core]
query = project:mediawiki/core status:open (owner:MarkTraceur OR
owner:{Gergő Tisza} OR owner:Gilles) limit:10
[section Config]
- query = project:operations/mediawiki-config status:open (owner:MarkTraceur
OR owner:{Gergő Tisza} OR owner:Gilles) limit:10
-[section Dashboards]
+ query = (project:operations/mediawiki-config OR
project:mediawiki/extensions/MultimediaViewer AND
(ref:refs/meta/dashboards/custom OR ref:refs/meta/config)) status:open
(owner:MarkTraceur OR owner:{Gergő Tisza} OR owner:Gilles) limit:10
+[section Metrics]
query = (project:analytics/multimedia OR
project:analytics/multimedia/config) status:open limit:10
[section CommonsMetadata]
query = project:mediawiki/extensions/CommonsMetadata status:open limit:10
[section UploadWizard]
query = project:mediawiki/extensions/UploadWizard status:open limit:10
+[section TimedMediaHandler]
+ query = project:mediawiki/extensions/TimedMediaHandler status:open limit:10
[section BetaFeatures]
query = project:mediawiki/extensions/BetaFeatures status:open limit:10
[section Recently merged]
--
To view, visit https://gerrit.wikimedia.org/r/130293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie29d0aed86d668cef92f806b58cb123143e5ba10
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: refs/meta/dashboards/custom
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Small changes to default dashboard - change (mediawiki...MultimediaViewer)
Gergő Tisza has submitted this change and it was merged.
Change subject: Small changes to default dashboard
..
Small changes to default dashboard
* add TimedMediaHandler section
* increase MediaViewer section size
* add gerrit config changes to config section
Change-Id: Ie29d0aed86d668cef92f806b58cb123143e5ba10
---
M default
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Gergő Tisza: Verified; Looks good to me, approved
diff --git a/default b/default
index 7344191..69a44db 100644
--- a/default
+++ b/default
@@ -2,17 +2,19 @@
title = Multimedia
description = All kinds of things
[section MultimediaViewer]
- query = project:mediawiki/extensions/MultimediaViewer status:open limit:10
+ query = project:mediawiki/extensions/MultimediaViewer status:open limit:20
[section Core]
query = project:mediawiki/core status:open (owner:MarkTraceur OR
owner:{Gergő Tisza} OR owner:Gilles) limit:10
[section Config]
- query = project:operations/mediawiki-config status:open (owner:MarkTraceur
OR owner:{Gergő Tisza} OR owner:Gilles) limit:10
-[section Dashboards]
+ query = (project:operations/mediawiki-config OR
project:mediawiki/extensions/MultimediaViewer AND
(ref:refs/meta/dashboards/custom OR ref:refs/meta/config)) status:open
(owner:MarkTraceur OR owner:{Gergő Tisza} OR owner:Gilles) limit:10
+[section Metrics]
query = (project:analytics/multimedia OR
project:analytics/multimedia/config) status:open limit:10
[section CommonsMetadata]
query = project:mediawiki/extensions/CommonsMetadata status:open limit:10
[section UploadWizard]
query = project:mediawiki/extensions/UploadWizard status:open limit:10
+[section TimedMediaHandler]
+ query = project:mediawiki/extensions/TimedMediaHandler status:open limit:10
[section BetaFeatures]
query = project:mediawiki/extensions/BetaFeatures status:open limit:10
[section Recently merged]
--
To view, visit https://gerrit.wikimedia.org/r/130293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie29d0aed86d668cef92f806b58cb123143e5ba10
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: refs/meta/dashboards/custom
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 64186) Decrease exhausing memory usage, speed up proces... - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 64186) Decrease exhausing memory usage, speed up processing
..
(bug 64186) Decrease exhausing memory usage, speed up processing
- delete local list after we are done with it
- decrease processing speed: list.remove() consumes a lot of time
because lists are not indexed and removing an item needs to
search inside the sequence. There is an easy way for more speed
when the parent category is just skipped inside the loop. This
decreases time consumtion by 65% for depth:3
Change-Id: I067c2a0c95e86fa7367d6a3795962ec31fd5208c
---
M scripts/category.py
1 file changed, 19 insertions(+), 22 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/category.py b/scripts/category.py
index e12fd6c..8922efe 100755
--- a/scripts/category.py
+++ b/scripts/category.py
@@ -876,41 +876,37 @@
-result = u'#' * currentDepth + ' '
+result = u'#' * currentDepth
+if currentDepth 0:
+result += u' '
result += cat.title(asLink=True, textlink=True, withNamespace=False)
result += ' (%d)' % len(self.catDB.getArticles(cat))
-# We will remove an element of supercats, but need the original set
-# later, so we create a list from the catDB.getSupercats(cat) set
-supercats = list(self.catDB.getSupercats(cat))
+if currentDepth self.maxDepth / 2:
+# noisy dots
+pywikibot.output('.', newline=False)
# Find out which other cats are supercats of the current cat
-try:
-supercats.remove(parent)
-except:
-pass
-if supercats:
-if currentDepth self.maxDepth / 2:
-# noisy dots
-pywikibot.output('.', newline=False)
-supercat_names = []
-for i, cat in enumerate(supercats):
-# create a list of wiki links to the supercategories
+supercat_names = []
+for cat in self.catDB.getSupercats(cat):
+# create a list of wiki links to the supercategories
+if cat != parent:
supercat_names.append(cat.title(asLink=True,
textlink=True,
withNamespace=False))
-# print this list, separated with commas, using translations
-# given in also_in_cats
+if supercat_names:
+# print this list, separated with commas, using translations
+# given in also_in_cats
result += ' ' + i18n.twtranslate(self.site, 'category-also-in',
{'alsocat': ', '.join(
supercat_names)})
+del supercat_names
result += '\n'
if currentDepth self.maxDepth:
for subcat in self.catDB.getSubcats(cat):
# recurse into subdirectories
result += self.treeview(subcat, currentDepth + 1, parent=cat)
-else:
-if self.catDB.getSubcats(cat):
-# show that there are more categories beyond the depth limit
-result += '#' * (currentDepth + 1) + ' [...]\n'
+elif self.catDB.getSubcats(cat):
+# show that there are more categories beyond the depth limit
+result += '#' * (currentDepth + 1) + ' [...]\n'
return result
def run(self):
@@ -1097,4 +1093,5 @@
except pywikibot.Error:
pywikibot.error(Fatal error:, exc_info=True)
finally:
-catDB.dump()
+if 'catDB' in globals():
+catDB.dump()
--
To view, visit https://gerrit.wikimedia.org/r/128433
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I067c2a0c95e86fa7367d6a3795962ec31fd5208c
Gerrit-PatchSet: 4
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Pyfisch pyfi...@gmail.com
Gerrit-Reviewer: Ricordisamoa ricordisa...@live.it
Gerrit-Reviewer: Russell Blau russb...@imapmail.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] Ensure click playback happens at the right time - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Ensure click playback happens at the right time
..
Ensure click playback happens at the right time
The code to replay clicks and clean up the handler was called after
processing each thumbnail, instead of just once at the end.
This might have caused many subtle issues such as clicks on any
but the first image not replaying correctly; more problematically,
of there were no MediaViewer-compatible thumbs, the handler was
never cleaned up and the clicks were never replayed.
Besides fixing that, this commit also adds a try..finally wrapper
so that the click replaying is not broken even if there is an error
in the thumb processing code. This might or might not be a good
idea. The internets say that try..finally without a catch causes
errors in IE8, but only if it is not wrapped in another try..catch,
so we are probably fine. (Adding a catch which just rethrows the
error would be an alternative, but it messes up stack traces.)
Change-Id: I2f645762103274c92c15a0d4b595d18d93b08415
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/497
Bug: 64345
---
M resources/mmv/mmv.bootstrap.js
1 file changed, 12 insertions(+), 8 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mmv/mmv.bootstrap.js b/resources/mmv/mmv.bootstrap.js
index 007617f..9c40546 100755
--- a/resources/mmv/mmv.bootstrap.js
+++ b/resources/mmv/mmv.bootstrap.js
@@ -125,9 +125,18 @@
MMVB.processThumbs = function () {
var bs = this;
- this.$thumbs.each( function ( i, thumb ) {
- bs.processThumb( thumb );
- } );
+ // if this breaks in IE8, see
https://github.com/ebryn/backburner.js/pull/50
+ // but it probably won't since there is a catch further up the
chain
+ try {
+ this.$thumbs.each( function ( i, thumb ) {
+ bs.processThumb( thumb );
+ } );
+ } finally {
+ this.thumbsReadyDeferred.resolve();
+ // now that we have set up our real click handler we
can we can remove the temporary
+ // handler added in mmv.head.js which just replays
clicks to the real handler
+ $( document ).off( 'click.mmv-head' );
+ }
};
/**
@@ -207,11 +216,6 @@
$link.add( $enlarge ).click( function ( e ) {
return bs.click( this, e, title, alwaysOpen );
} );
- // now that we have set up our real click handler we can we can
remove the temporary
- // handler added in mmv.head.js which just replays clicks to
the real handler
- $( document ).off( 'click.mmv-head' );
-
- this.thumbsReadyDeferred.resolve();
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/130264
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2f645762103274c92c15a0d4b595d18d93b08415
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@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] Handle window.localStorage === null case correctly. - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Handle window.localStorage === null case correctly.
..
Handle window.localStorage === null case correctly.
Change-Id: I49ddf45093daee4988fb7f3b481fb35bfaceb152
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/521
Bug: 64525
---
M resources/mmv/ui/mmv.ui.metadataPanel.js
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.js
b/resources/mmv/ui/mmv.ui.metadataPanel.js
index 47c3b2f..f1001a3 100644
--- a/resources/mmv/ui/mmv.ui.metadataPanel.js
+++ b/resources/mmv/ui/mmv.ui.metadataPanel.js
@@ -37,8 +37,7 @@
* @property {boolean}
* @private
*/
- this.hasAnimatedMetadata = window.localStorage === undefined ||
- localStorage.getItem( 'mmv.hasOpenedMetadata' );
+ this.hasAnimatedMetadata = !window.localStorage ||
localStorage.getItem( 'mmv.hasOpenedMetadata' );
/** @property {mw.mmv.HtmlUtils} htmlUtils - */
this.htmlUtils = new mw.mmv.HtmlUtils();
@@ -829,7 +828,7 @@
if (
!this.savedHasOpenedMetadata
scrolled
- window.localStorage !== undefined
+ window.localStorage
) {
localStorage.setItem( 'mmv.hasOpenedMetadata', true );
this.savedHasOpenedMetadata = true;
--
To view, visit https://gerrit.wikimedia.org/r/130230
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I49ddf45093daee4988fb7f3b481fb35bfaceb152
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@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 invite animation for Media Viewer - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Adjust invite animation for Media Viewer
..
Adjust invite animation for Media Viewer
With latest refactorings, the animatin looked like a glitch.
The position of the panel has been adjusted to (a) make the initial
position the same as shown while the progress bar for better continuity,
and (b) make the move more noticeable by increasing the distance the
panel moves.
To test, clear the local storage variable mmv.hasOpenedMetadata
Change-Id: Ie3ed29826fa15bf4c6b38f0fc8bde4bd84563fb9
---
M resources/mmv/ui/mmv.ui.metadataPanel.less
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.less
b/resources/mmv/ui/mmv.ui.metadataPanel.less
index f892f8d..3d615e9 100644
--- a/resources/mmv/ui/mmv.ui.metadataPanel.less
+++ b/resources/mmv/ui/mmv.ui.metadataPanel.less
@@ -56,10 +56,10 @@
.mw-mmv-invite-animation() {
0% {
- margin-top: 5px;
+ margin-top: 0px;
}
50% {
- margin-top: -3px;
+ margin-top: -15px;
}
100% {
margin-top: 0;
--
To view, visit https://gerrit.wikimedia.org/r/130107
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3ed29826fa15bf4c6b38f0fc8bde4bd84563fb9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.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] version update - change (mediawiki...GWToolset)
jenkins-bot has submitted this change and it was merged.
Change subject: version update
..
version update
* updated HISTORY, RELEASE-NOTES and version to 0.2.0
Change-Id: If0760984cc108bb5ac61e8bfd9d491abe761602f
---
M HISTORY
M RELEASE-NOTES
M includes/Constants.php
3 files changed, 68 insertions(+), 23 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/HISTORY b/HISTORY
index 6653ae2..d543a8b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,8 +1,61 @@
+== GWToolset 0.1.5 ==
+MediaWiki_1.24/wmf1
+deployed: Tuesday, 22 April 2014
+https://www.mediawiki.org/wiki/MediaWiki_1.24/wmf1#GWToolset
+
+=== version update ===
+gerrit: https://gerrit.wikimedia.org/r/#/c/125922/
+
+=== wfStripIllegalFilenameChars truncates title ===
+gerrit: https://gerrit.wikimedia.org/r/#/c/125401/
+bugzilla: https://bugzilla.wikimedia.org/show_bug.cgi?id=62909
+
+
+
+== GWToolset 0.1.4 ==
+MediaWiki_1.23/wmf22
+deployed: Tuesday, 15 April 2014
+https://www.mediawiki.org/wiki/MediaWiki_1.23/wmf22#GWToolset
+
+=== fix inconsistency in GWToolset directory reference ===
+gerrit: https://gerrit.wikimedia.org/r/#/c/124351/
+
+=== Fix some minor HTML issues ===
+gerrit: https://gerrit.wikimedia.org/r/#/c/124012/
+
+
+
+== GWToolset 0.1.3 ==
+MediaWiki_1.23/wmf21
+deployed: Tuesday, 08 April 2014
+https://www.mediawiki.org/wiki/MediaWiki_1.23/wmf21#GWToolset
+
+=== Mark GWToolset namespace as being json for code editor ===
+gerrit: https://gerrit.wikimedia.org/r/#/c/123159/
+bugzilla: https://bugzilla.wikimedia.org/show_bug.cgi?id=58507
+
+=== Correct the format of the wikitext output ===
+gerrit: https://gerrit.wikimedia.org/r/#q,dd0757d5,n,z
+bugzilla: https://bugzilla.wikimedia.org/show_bug.cgi?id=63168
+
+=== make sure unicode characters are normalized ===
+gerrit: https://gerrit.wikimedia.org/r/#q,d1e32990,n,z
+bugzilla: https://bugzilla.wikimedia.org/show_bug.cgi?id=62870
+
+=== relax wiki title restrictions ===
+gerrit: https://gerrit.wikimedia.org/r/#q,cc0705be,n,z
+bugzilla: https://bugzilla.wikimedia.org/show_bug.cgi?id=62909
+
+
+
== GWToolset 0.1.2 ==
+MediaWiki_1.23/wmf20
deployed: Tuesday, 01 April 2014
+https://www.mediawiki.org/wiki/MediaWiki_1.23/wmf20#GWToolset
+=== Fix various inconsistencies in messages ===
+gerrit: https://gerrit.wikimedia.org/r/#/c/120003/
-=== assembla/260 ===
-Categorisation, unwanted concatenation
+=== don’t concatenate item specific categories ===
gerrit: https://gerrit.wikimedia.org/r/#/c/119467/
assembla: https://www.assembla.com/spaces/glamwiki/tickets/209
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 613135e..091db96 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,23 +1,15 @@
-== GWToolset 0.1.3 ==
-scheduled deploy: Tuesday, 15 April 2014
+== GWToolset 0.2.0 ==
+MediaWiki_1.24/wmf2
+scheduled deploy: Tuesday, 29 April 2014
+https://www.mediawiki.org/wiki/MediaWiki_1.24/wmf2#GWToolset
+=== fix MediawikiTemplate::getTitle() method ===
+gerrit: https://gerrit.wikimedia.org/r/#/c/127211/
+bugzilla: https://bugzilla.wikimedia.org/show_bug.cgi?id=64086
-=== bug/58507 ===
-Mark GWToolset namespace as being json for code editor
-gerrit: https://gerrit.wikimedia.org/r/#/c/123159/
-bugzilla: https://bugzilla.wikimedia.org/show_bug.cgi?id=58507
+=== Update i18n shim ===
+gerrit: https://gerrit.wikimedia.org/r/#/c/128092/
-=== bug/63168 ===
-Correct the format of the wikitext output
-gerrit: https://gerrit.wikimedia.org/r/#q,dd0757d5,n,z
-bugzilla: https://bugzilla.wikimedia.org/show_bug.cgi?id=63168
-
-=== bug/62870 ===
-make sure unicode characters are normalized
-gerrit: https://gerrit.wikimedia.org/r/#q,d1e32990,n,z
-bugzilla: https://bugzilla.wikimedia.org/show_bug.cgi?id=62870
-
-=== bug/62909 ===
-relax wiki title restrictions
-gerrit: https://gerrit.wikimedia.org/r/#q,cc0705be,n,z
-bugzilla: https://bugzilla.wikimedia.org/show_bug.cgi?id=62909
+=== auto-add additional mediawiki template parameters as creator template
values ===
+gerrit: https://gerrit.wikimedia.org/r/#/c/125552/
+bugzilla: https://bugzilla.wikimedia.org/show_bug.cgi?id=63822
diff --git a/includes/Constants.php b/includes/Constants.php
index 499791f..a272d37 100644
--- a/includes/Constants.php
+++ b/includes/Constants.php
@@ -12,7 +12,7 @@
class Constants {
const EXTENSION_NAME = 'GWToolset';
- const EXTENSION_VERSION = '0.1.3';
+ const EXTENSION_VERSION = '0.2.0';
const REQUIRED_MEDIAWIKI_VERSION = '1.22c';
const USE_FILEBACKEND = true;
--
To view, visit https://gerrit.wikimedia.org/r/130277
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If0760984cc108bb5ac61e8bfd9d491abe761602f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GWToolset
Gerrit-Branch: master
Gerrit-Owner: Dan-nl d_ent...@yahoo.com
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: MarkTraceur
[MediaWiki-commits] [Gerrit] Enable survey in Spanish - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Enable survey in Spanish
..
Enable survey in Spanish
Related core change: Ibd1a4b14faa11fd764fe078880355d7184b698bf
Change-Id: If44279fff1aad3fb68a01d167ef5cce69dbb3b34
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/525
---
M resources/mmv/ui/mmv.ui.stripeButtons.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mmv/ui/mmv.ui.stripeButtons.js
b/resources/mmv/ui/mmv.ui.stripeButtons.js
index 5278970..c4d460a 100644
--- a/resources/mmv/ui/mmv.ui.stripeButtons.js
+++ b/resources/mmv/ui/mmv.ui.stripeButtons.js
@@ -194,7 +194,8 @@
SBP.getFeedbackSurveyBaseUrlForLanguage = function ( langcode ) {
var baseLangcode,
baseUrl =
'https://www.surveymonkey.com/s/media-viewer-1',
- surveyTranslations = { ca: 'ca', hu: 'hu', fr: 'fr',
pt: 'pt-br', 'pt-br': 'pt-br', de: 'de' };
+ surveyTranslations = { ca: 'ca', hu: 'hu', fr: 'fr',
pt: 'pt-br', 'pt-br': 'pt-br',
+ de: 'de', es: 'es' };
baseLangcode = langcode.split( /[_-]/ )[0]; // get rid of
variants
if ( baseLangcode === 'en') {
--
To view, visit https://gerrit.wikimedia.org/r/130233
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If44279fff1aad3fb68a01d167ef5cce69dbb3b34
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@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] Catch exceptions raise by localStorage write operations - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130294
Change subject: Catch exceptions raise by localStorage write operations
..
Catch exceptions raise by localStorage write operations
Change-Id: I3f062ff88c03ad3baca00461bff486a883776eb1
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/530
---
M resources/mmv/ui/mmv.ui.metadataPanel.js
M resources/mmv/ui/mmv.ui.stripeButtons.js
2 files changed, 22 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/94/130294/1
diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.js
b/resources/mmv/ui/mmv.ui.metadataPanel.js
index f1001a3..5ee27bf 100644
--- a/resources/mmv/ui/mmv.ui.metadataPanel.js
+++ b/resources/mmv/ui/mmv.ui.metadataPanel.js
@@ -830,7 +830,13 @@
scrolled
window.localStorage
) {
- localStorage.setItem( 'mmv.hasOpenedMetadata', true );
+ try {
+ localStorage.setItem( 'mmv.hasOpenedMetadata',
true );
+ } catch ( e ) {
+ // localStorage is full or disabled
+ }
+
+ // We mark it as saved even when localStorage failed,
because retrying will very likely fail as well
this.savedHasOpenedMetadata = true;
}
};
diff --git a/resources/mmv/ui/mmv.ui.stripeButtons.js
b/resources/mmv/ui/mmv.ui.stripeButtons.js
index c4d460a..d26420e 100644
--- a/resources/mmv/ui/mmv.ui.stripeButtons.js
+++ b/resources/mmv/ui/mmv.ui.stripeButtons.js
@@ -138,7 +138,11 @@
this.tooltipDisplayCount = this.localStorage.getItem(
'mmv.tooltipDisplayCount' );
if ( this.tooltipDisplayCount === null ) {
this.tooltipDisplayCount = 0;
- this.localStorage.setItem(
'mmv.tooltipDisplayCount', 0 );
+ try {
+ this.localStorage.setItem(
'mmv.tooltipDisplayCount', 0 );
+ } catch ( e ) {
+ // localStorage is full or disabled
+ }
}
}
return this.tooltipDisplayCount;
@@ -151,7 +155,11 @@
this.getTooltipDisplayCount();
if ( this.tooltipDisplayCount !== undefined ) {
this.tooltipDisplayCount++;
- this.localStorage.setItem( 'mmv.tooltipDisplayCount',
this.tooltipDisplayCount );
+ try {
+ this.localStorage.setItem(
'mmv.tooltipDisplayCount', this.tooltipDisplayCount );
+ } catch ( e ) {
+ // localStorage is full or disabled
+ }
}
};
@@ -163,7 +171,11 @@
this.getTooltipDisplayCount();
if ( this.tooltipDisplayCount !== undefined ) {
this.tooltipDisplayCount = 999;
- this.localStorage.setItem( 'mmv.tooltipDisplayCount',
this.tooltipDisplayCount );
+ try {
+ this.localStorage.setItem(
'mmv.tooltipDisplayCount', this.tooltipDisplayCount );
+ } catch ( e ) {
+ // localStorage is full or disabled
+ }
}
};
--
To view, visit https://gerrit.wikimedia.org/r/130294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f062ff88c03ad3baca00461bff486a883776eb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make progress bar less erratic - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Make progress bar less erratic
..
Make progress bar less erratic
Solves the bug, and makes the code slightly cleaner, but it
still does not inspire confidence (e.g. use of viewer flags
by a bunch of callbacks that can run for a background image).
Also, the tests seem underspecified.
I'll follow up with some more refactoring.
Change-Id: I2557abcec173691ffce21185bf1a939f1644ba8c
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/489
---
M resources/mmv/mmv.js
M resources/mmv/ui/mmv.ui.canvas.js
M tests/qunit/mmv/mmv.test.js
3 files changed, 117 insertions(+), 52 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mmv/mmv.js b/resources/mmv/mmv.js
index ed64043..8457789 100755
--- a/resources/mmv/mmv.js
+++ b/resources/mmv/mmv.js
@@ -239,9 +239,7 @@
metadataPromise,
start,
viewer = this,
- $initialImage = $( initialImage ),
- fileWidth = image.originalWidth,
- fileHeight = image.originalHeight;
+ $initialImage = $( initialImage );
this.currentIndex = image.index;
@@ -273,48 +271,13 @@
start = $.now();
- // Reset the progress bar, it could be at any state if we're
calling loadImage
- // while another image is already loading
- viewer.ui.panel.progressBar.percent( 0 );
-
imagePromise = this.fetchThumbnailForLightboxImage( image,
imageWidths.real );
- // Check that the image hasn't already been loaded
- if ( imagePromise.state() === 'pending' ) {
- // Animate it to 5 to give a sense to something is
happening, even if we're stuck
- // waiting for server-side processing, such as
thumbnail (re)generation
- viewer.ui.panel.progressBar.percent( 5 );
- }
+ viewer.displayPlaceholderThumbnail( image, $initialImage,
imageWidths );
- if ( fileWidth 0 fileHeight 0 ) {
- viewer.displayPlaceholderThumbnail( { width : fileWidth
, height : fileHeight },
- $initialImage,
- imageWidths );
- } else {
- this.imageInfoProvider.get( image.filePageTitle ).done(
function ( imageInfo ) {
- if ( viewer.currentIndex !== image.index ) {
- return;
- }
+ this.setupProgressBar( image, imagePromise );
- viewer.displayPlaceholderThumbnail( imageInfo,
$initialImage, imageWidths );
- } );
- }
-
- imagePromise.progress( function ( thumbnailInfoResponse,
imageResponse ) {
- if ( viewer.currentIndex !== image.index ) {
- return;
- }
-
- if ( viewer.ui
-viewer.ui.panel
-imageResponse.length === 2
-imageResponse[ 1 ] 5 ) {
- viewer.ui.panel.progressBar.percent(
imageResponse[ 1 ] );
- }
- } ).done( function ( thumbnail, imageElement ) {
- // Fallback in case the browser doesn't have fancy
progress updates
- viewer.ui.panel.progressBar.percent( 100 );
-
+ imagePromise.done( function ( thumbnail, imageElement ) {
if ( viewer.currentIndex !== image.index ) {
return;
}
@@ -406,18 +369,97 @@
/**
* Display the blurred thumbnail from the page
-* @param {mw.mmv.model.Image} imageInfo
+* @param {mw.mmv.LightboxImage} image
* @param {jQuery} $initialImage The thumbnail from the page
* @param {mw.mmv.model.ThumbnailWidth} imageWidths
+* @param {boolean} [recursion=false] for internal use, never set this
*/
- MMVP.displayPlaceholderThumbnail = function ( imageInfo, $initialImage,
imageWidths ) {
+ MMVP.displayPlaceholderThumbnail = function ( image, $initialImage,
imageWidths, recursion ) {
+ var viewer = this,
+ size = { width : image.originalWidth, height :
image.originalHeight };
+
// If the actual image has already been displayed, there's no
point showing the blurry one
if ( this.realThumbnailShown ) {
return;
}
-
[MediaWiki-commits] [Gerrit] Publish carbon's IPv6 address in DNS - change (operations/dns)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Publish carbon's IPv6 address in DNS .. Publish carbon's IPv6 address in DNS This means apt.wikimedia.org, ubuntu.wikimedia.org, proxy will become IPv6 enabled. Change-Id: I70a0a86931032a077cf344f1afa6568a300d5ac7 --- M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa M templates/wikimedia.org 2 files changed, 3 insertions(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa index 5000e3a..0ac2ac9 100644 --- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa +++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa @@ -35,6 +35,7 @@ 0.5.0.0.4.5.1.0.0.8.0.0.8.0.2.01H IN PTR hydrogen.wikimedia.org. +0.1.0.0.4.5.1.0.0.8.0.0.8.0.2.01H IN PTR carbon.wikimedia.org. 2.5.0.0.4.5.1.0.0.8.0.0.8.0.2.01H IN PTR cp1042.wikimedia.org. 3.5.0.0.4.5.1.0.0.8.0.0.8.0.2.01H IN PTR cp1043.wikimedia.org. 4.5.0.0.4.5.1.0.0.8.0.0.8.0.2.01H IN PTR cp1044.wikimedia.org. diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 066357f..21dbae3 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -114,6 +114,7 @@ boron 1H IN A208.80.155.4 calcium1H IN A208.80.154.158 carbon 1H IN A208.80.154.10 +carbon 1H IN 2620:0:861:1:208:80:154:10 chromium 1H IN A208.80.154.157 1H IN 2620:0:861:2:208:80:154:157 dataset2 1H IN A208.80.152.185 @@ -647,6 +648,7 @@ techblog 1H IN CNAMEholmium.wikimedia.org. ticket 1H IN CNAMEiodine ubuntu 1H IN A208.80.154.10 +ubuntu 1H IN 2620:0:861:1:208:80:154:10 wikitech 1H IN A208.80.154.18 wikitech-static1H IN A166.78.57.240 -- To view, visit https://gerrit.wikimedia.org/r/130087 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I70a0a86931032a077cf344f1afa6568a300d5ac7 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master 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] categoryinfo is only availlable for categories - change (pywikibot/core)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/130295 Change subject: categoryinfo is only availlable for categories .. categoryinfo is only availlable for categories categoryinfo is now a Category attribute. Assinging it from a page object raises an AttributeError as suggested in the comment. There is no need to try calling the site method. It always return a dict. Change-Id: I0b73f4f07dbb079a42345290ebf6c259a23442b9 --- M pywikibot/page.py 1 file changed, 31 insertions(+), 35 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/95/130295/1 diff --git a/pywikibot/page.py b/pywikibot/page.py index 92607f7..efb5902 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1333,12 +1333,13 @@ pywikibot.output(u'Deleting %s.' % (self.title(asLink=True))) reason = pywikibot.input(u'Please enter a reason for the deletion:') -if self.site.username(sysop=True): # If user is a sysop, delete the page +# If user is a sysop, delete the page +if self.site.username(sysop=True): answer = u'y' if prompt and not hasattr(self.site, '_noDeletePrompt'): answer = pywikibot.inputChoice( -u'Do you want to delete %s?' % self.title(asLink=True, - forceInterwiki=True), +u'Do you want to delete %s?' % self.title( +asLink=True, forceInterwiki=True), ['Yes', 'No', 'All'], ['Y', 'N', 'A'], 'N') @@ -1572,20 +1573,6 @@ % (self.title(asLink=True), error.message)) return False -@property -def categoryinfo(self): -If supported, return a dict containing category content values: - -Numbers of pages, subcategories, files, and total contents. - - -if not self.isCategory(): -return # should this raise an exception?? -try: -return self.site.categoryinfo(self) -except NotImplementedError: -return - DEPRECATED METHODS @deprecated(Site.encoding()) @@ -1726,13 +1713,13 @@ username, resolution, filesize, comment). -#TODO; return value may need to change +# TODO; return value may need to change return self.site.loadimageinfo(self, history=True) def getFileVersionHistoryTable(self): Return the version history in the form of a wiki table. lines = [] -#TODO: if getFileVersionHistory changes, make sure this follows it +# TODO: if getFileVersionHistory changes, make sure this follows it for (datetime, username, resolution, size, comment) \ in self.getFileVersionHistory(): lines.append(u'| %s || %s || %s || %s || nowiki%s/nowiki' @@ -2048,6 +2035,15 @@ targetCat.put(newtext, creationSummary) return True +@property +def categoryinfo(self): +If supported, return a dict containing category content values: + +Numbers of pages, subcategories, files, and total contents. + + +return self.site.categoryinfo(self) + DEPRECATED METHODS @deprecated(list(Category.subcategories(...))) def subcategoriesList(self, recurse=False): @@ -2224,8 +2220,8 @@ @type subpage: unicode if self._isAutoblock: -#This user is probably being queried for purpose of lifting -#an autoblock, so has no user pages per se. +# This user is probably being queried for purpose of lifting +# an autoblock, so has no user pages per se. raise AutoblockUser( This is an autoblock ID, you can only use to unblock it.) if subpage: @@ -2241,8 +2237,8 @@ @type subpage: unicode if self._isAutoblock: -#This user is probably being queried for purpose of lifting -#an autoblock, so has no user talk pages per se. +# This user is probably being queried for purpose of lifting +# an autoblock, so has no user talk pages per se. raise AutoblockUser( This is an autoblock ID, you can only use to unblock it.) if subpage: @@ -2438,12 +2434,12 @@ id = 'ids' site = 'sites' title = 'titles' -#id overrides all +# id overrides all if hasattr(self, 'id'): params[id] = self.id return params -#the rest only applies to ItemPages, but is still needed here. +# the rest only applies to ItemPages, but is still needed here. if hasattr(self, '_site') and hasattr(self, '_title'): params[site] =
[MediaWiki-commits] [Gerrit] Add default value for user option mathJax - change (mediawiki...Math)
jenkins-bot has submitted this change and it was merged. Change subject: Add default value for user option mathJax .. Add default value for user option mathJax Bug: 63915 Change-Id: I9aa0b1c9a3f09c412f14756ffd251957ba47 --- M Math.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: TheDJ: Looks good to me, approved jenkins-bot: Verified diff --git a/Math.php b/Math.php index 3c1acf8..34a0ef4 100644 --- a/Math.php +++ b/Math.php @@ -59,6 +59,8 @@ * Valid options are defined in $wgMathValidModes. */ $wgDefaultUserOptions['math'] = MW_MATH_PNG; +/** @var boolean $wgDefaultUserOptions['mathJax'] determines if client-side MathJax is enabled by default */ +$wgDefaultUserOptions['mathJax'] = false; /** Location of the texvc binary */ $wgTexvc = __DIR__ . '/math/texvc'; -- To view, visit https://gerrit.wikimedia.org/r/127607 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9aa0b1c9a3f09c412f14756ffd251957ba47 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: Physikerwelt w...@physikerwelt.de Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: TheDJ hartman.w...@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] keep two weeks of apache logs instead of a year - change (operations/puppet)
ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130296
Change subject: keep two weeks of apache logs instead of a year
..
keep two weeks of apache logs instead of a year
to do this without needing apache restart, we use
copytruncate
Change-Id: Ifbde230f947de4f404618675af73680d1e28384a
---
A modules/applicationserver/files/apache/logrotate-apache
M modules/applicationserver/manifests/init.pp
A modules/applicationserver/manifests/log.pp
3 files changed, 24 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/130296/1
diff --git a/modules/applicationserver/files/apache/logrotate-apache
b/modules/applicationserver/files/apache/logrotate-apache
new file mode 100644
index 000..6ebb94f
--- /dev/null
+++ b/modules/applicationserver/files/apache/logrotate-apache
@@ -0,0 +1,14 @@
+#
+### THIS FILE IS MANAGED BY PUPPET
+### modules/applicationserver/files/apache/logrotate-apache
+#
+
+# Rotate apache logs without restart
+/var/log/apache2.log {
+missingok
+rotate 14
+daily
+compress
+copytruncate
+}
+
diff --git a/modules/applicationserver/manifests/init.pp
b/modules/applicationserver/manifests/init.pp
index a38e3e1..8b10e59 100644
--- a/modules/applicationserver/manifests/init.pp
+++ b/modules/applicationserver/manifests/init.pp
@@ -8,5 +8,5 @@
}
}
-include apache_packages, service, cron, sudo, config::base
+include apache_packages, service, cron, sudo, log, config::base
}
diff --git a/modules/applicationserver/manifests/log.pp
b/modules/applicationserver/manifests/log.pp
new file mode 100644
index 000..5a8bf23
--- /dev/null
+++ b/modules/applicationserver/manifests/log.pp
@@ -0,0 +1,9 @@
+class applicationserver::log {
+file { '/etc/logrotate.d/apache2':
+ensure = present,
+source = 'puppet:///modules/apache/logrotate-apache',
+mode= '0444',
+owner = 'root',
+group = 'root',
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/130296
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbde230f947de4f404618675af73680d1e28384a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add more pilot sites - change (analytics...config)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/130298 Change subject: Add more pilot sites .. Add more pilot sites Dutch, Japanese, Portuguese, Spanish, Swedish, Telugu, Italian, Russian Change-Id: I8408cdaa6e24340b347bd508748596f925a04454 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/526 --- A dashboards/mmv_eswiki.json A dashboards/mmv_itwiki.json A dashboards/mmv_jawiki.json A dashboards/mmv_nlwiki.json A dashboards/mmv_ruwiki.json A dashboards/mmv_svwiki.json A dashboards/mmv_tewiki.json A datasources/mmv_actions_eswiki.json A datasources/mmv_actions_itwiki.json A datasources/mmv_actions_jawiki.json A datasources/mmv_actions_nlwiki.json A datasources/mmv_actions_ruwiki.json A datasources/mmv_actions_svwiki.json A datasources/mmv_actions_tewiki.json A datasources/mmv_performance_filerepoinfo_eswiki.json A datasources/mmv_performance_filerepoinfo_itwiki.json A datasources/mmv_performance_filerepoinfo_jawiki.json A datasources/mmv_performance_filerepoinfo_nlwiki.json A datasources/mmv_performance_filerepoinfo_ruwiki.json A datasources/mmv_performance_filerepoinfo_svwiki.json A datasources/mmv_performance_filerepoinfo_tewiki.json A datasources/mmv_performance_globalusage_eswiki.json A datasources/mmv_performance_globalusage_itwiki.json A datasources/mmv_performance_globalusage_jawiki.json A datasources/mmv_performance_globalusage_nlwiki.json A datasources/mmv_performance_globalusage_ruwiki.json A datasources/mmv_performance_globalusage_svwiki.json A datasources/mmv_performance_globalusage_tewiki.json A datasources/mmv_performance_image_eswiki.json A datasources/mmv_performance_image_itwiki.json A datasources/mmv_performance_image_jawiki.json A datasources/mmv_performance_image_nlwiki.json A datasources/mmv_performance_image_ruwiki.json A datasources/mmv_performance_image_svwiki.json A datasources/mmv_performance_image_tewiki.json A datasources/mmv_performance_imagehit_eswiki.json A datasources/mmv_performance_imagehit_itwiki.json A datasources/mmv_performance_imagehit_jawiki.json A datasources/mmv_performance_imagehit_nlwiki.json A datasources/mmv_performance_imagehit_ruwiki.json A datasources/mmv_performance_imagehit_svwiki.json A datasources/mmv_performance_imagehit_tewiki.json A datasources/mmv_performance_imageinfo_eswiki.json A datasources/mmv_performance_imageinfo_itwiki.json A datasources/mmv_performance_imageinfo_jawiki.json A datasources/mmv_performance_imageinfo_nlwiki.json A datasources/mmv_performance_imageinfo_ruwiki.json A datasources/mmv_performance_imageinfo_svwiki.json A datasources/mmv_performance_imageinfo_tewiki.json A datasources/mmv_performance_imagemiss_eswiki.json A datasources/mmv_performance_imagemiss_itwiki.json A datasources/mmv_performance_imagemiss_jawiki.json A datasources/mmv_performance_imagemiss_nlwiki.json A datasources/mmv_performance_imagemiss_ruwiki.json A datasources/mmv_performance_imagemiss_svwiki.json A datasources/mmv_performance_imagemiss_tewiki.json A datasources/mmv_performance_imageusage_eswiki.json A datasources/mmv_performance_imageusage_itwiki.json A datasources/mmv_performance_imageusage_jawiki.json A datasources/mmv_performance_imageusage_nlwiki.json A datasources/mmv_performance_imageusage_ruwiki.json A datasources/mmv_performance_imageusage_svwiki.json A datasources/mmv_performance_imageusage_tewiki.json A datasources/mmv_performance_thumbnailinfo_eswiki.json A datasources/mmv_performance_thumbnailinfo_itwiki.json A datasources/mmv_performance_thumbnailinfo_jawiki.json A datasources/mmv_performance_thumbnailinfo_nlwiki.json A datasources/mmv_performance_thumbnailinfo_ruwiki.json A datasources/mmv_performance_thumbnailinfo_svwiki.json A datasources/mmv_performance_thumbnailinfo_tewiki.json A datasources/mmv_performance_userinfo_eswiki.json A datasources/mmv_performance_userinfo_itwiki.json A datasources/mmv_performance_userinfo_jawiki.json A datasources/mmv_performance_userinfo_nlwiki.json A datasources/mmv_performance_userinfo_ruwiki.json A datasources/mmv_performance_userinfo_svwiki.json A datasources/mmv_performance_userinfo_tewiki.json M generate.php A graphs/mmv_actions_eswiki.json A graphs/mmv_actions_itwiki.json A graphs/mmv_actions_jawiki.json A graphs/mmv_actions_nlwiki.json A graphs/mmv_actions_ruwiki.json A graphs/mmv_actions_svwiki.json A graphs/mmv_actions_tewiki.json A graphs/mmv_performance_filerepoinfo_eswiki.json A graphs/mmv_performance_filerepoinfo_itwiki.json A graphs/mmv_performance_filerepoinfo_jawiki.json A graphs/mmv_performance_filerepoinfo_nlwiki.json A graphs/mmv_performance_filerepoinfo_ruwiki.json A graphs/mmv_performance_filerepoinfo_svwiki.json A graphs/mmv_performance_filerepoinfo_tewiki.json A graphs/mmv_performance_globalusage_eswiki.json A graphs/mmv_performance_globalusage_itwiki.json A graphs/mmv_performance_globalusage_jawiki.json A graphs/mmv_performance_globalusage_nlwiki.json A
[MediaWiki-commits] [Gerrit] Update Ace to 29-04-2014 - change (mediawiki...CodeEditor)
TheDJ has uploaded a new change for review. https://gerrit.wikimedia.org/r/130299 Change subject: Update Ace to 29-04-2014 .. Update Ace to 29-04-2014 Updates ACE to commit: 4949e18f00e4dbf34fc8a213909ef6ae3e1a1015 This includes fixes for IE7/8 support, which was broken in the last ACE release. Specifically https://github.com/ajaxorg/ace/commit/051128c16ff939d329eb0aa4ba9d9d511211b1b7#diff-502b909e9de186749df3051f8d4bfa42L137 Bug: 64559 Change-Id: I0765c5f95de81a5ce9632f6eb5422b98c02941ff --- M modules/ace/ace.js A modules/ace/ext-beautify.js M modules/ace/ext-chromevox.js M modules/ace/ext-elastic_tabstops_lite.js M modules/ace/ext-emmet.js M modules/ace/ext-error_marker.js M modules/ace/ext-keybinding_menu.js M modules/ace/ext-language_tools.js M modules/ace/ext-modelist.js M modules/ace/ext-old_ie.js M modules/ace/ext-searchbox.js M modules/ace/ext-settings_menu.js M modules/ace/ext-spellcheck.js M modules/ace/ext-split.js M modules/ace/ext-static_highlight.js M modules/ace/ext-statusbar.js M modules/ace/ext-textarea.js M modules/ace/ext-themelist.js M modules/ace/ext-whitespace.js M modules/ace/keybinding-vim.js M modules/ace/mode-abap.js M modules/ace/mode-actionscript.js M modules/ace/mode-ada.js M modules/ace/mode-apache_conf.js M modules/ace/mode-asciidoc.js M modules/ace/mode-assembly_x86.js M modules/ace/mode-autohotkey.js M modules/ace/mode-batchfile.js M modules/ace/mode-c9search.js M modules/ace/mode-c_cpp.js M modules/ace/mode-cirru.js M modules/ace/mode-clojure.js M modules/ace/mode-cobol.js M modules/ace/mode-coffee.js M modules/ace/mode-coldfusion.js M modules/ace/mode-csharp.js M modules/ace/mode-css.js M modules/ace/mode-curly.js M modules/ace/mode-d.js M modules/ace/mode-dart.js M modules/ace/mode-diff.js M modules/ace/mode-django.js A modules/ace/mode-dockerfile.js M modules/ace/mode-dot.js M modules/ace/mode-ejs.js M modules/ace/mode-erlang.js M modules/ace/mode-forth.js M modules/ace/mode-ftl.js M modules/ace/mode-gherkin.js M modules/ace/mode-glsl.js M modules/ace/mode-golang.js M modules/ace/mode-groovy.js M modules/ace/mode-haml.js M modules/ace/mode-handlebars.js M modules/ace/mode-haskell.js M modules/ace/mode-haxe.js M modules/ace/mode-html.js M modules/ace/mode-html_ruby.js M modules/ace/mode-ini.js M modules/ace/mode-jack.js M modules/ace/mode-jade.js M modules/ace/mode-java.js M modules/ace/mode-javascript.js M modules/ace/mode-json.js M modules/ace/mode-jsoniq.js M modules/ace/mode-jsp.js M modules/ace/mode-jsx.js M modules/ace/mode-julia.js M modules/ace/mode-latex.js M modules/ace/mode-less.js M modules/ace/mode-liquid.js M modules/ace/mode-lisp.js M modules/ace/mode-logiql.js M modules/ace/mode-lsl.js M modules/ace/mode-lua.js M modules/ace/mode-luapage.js M modules/ace/mode-lucene.js M modules/ace/mode-makefile.js M modules/ace/mode-markdown.js M modules/ace/mode-matlab.js M modules/ace/mode-mel.js M modules/ace/mode-mushcode.js M modules/ace/mode-mysql.js M modules/ace/mode-nix.js M modules/ace/mode-objectivec.js M modules/ace/mode-ocaml.js M modules/ace/mode-pascal.js M modules/ace/mode-perl.js M modules/ace/mode-pgsql.js M modules/ace/mode-php.js M modules/ace/mode-plain_text.js M modules/ace/mode-powershell.js M modules/ace/mode-prolog.js M modules/ace/mode-properties.js M modules/ace/mode-protobuf.js M modules/ace/mode-python.js M modules/ace/mode-r.js M modules/ace/mode-rdoc.js M modules/ace/mode-rhtml.js M modules/ace/mode-ruby.js M modules/ace/mode-rust.js M modules/ace/mode-sass.js M modules/ace/mode-scad.js M modules/ace/mode-scala.js M modules/ace/mode-scheme.js M modules/ace/mode-scss.js M modules/ace/mode-sh.js M modules/ace/mode-sjs.js M modules/ace/mode-smarty.js M modules/ace/mode-snippets.js M modules/ace/mode-soy_template.js M modules/ace/mode-space.js M modules/ace/mode-sql.js M modules/ace/mode-stylus.js M modules/ace/mode-svg.js M modules/ace/mode-tcl.js M modules/ace/mode-tex.js M modules/ace/mode-textile.js M modules/ace/mode-toml.js M modules/ace/mode-twig.js M modules/ace/mode-typescript.js M modules/ace/mode-vbscript.js M modules/ace/mode-velocity.js M modules/ace/mode-verilog.js M modules/ace/mode-vhdl.js M modules/ace/mode-xml.js M modules/ace/mode-xquery.js M modules/ace/mode-yaml.js A modules/ace/snippets/dockerfile.js M modules/ace/snippets/haskell.js M modules/ace/snippets/html.js M modules/ace/snippets/javascript.js M modules/ace/snippets/jsoniq.js M modules/ace/snippets/lsl.js M modules/ace/snippets/xquery.js M modules/ace/theme-ambiance.js M modules/ace/theme-chaos.js M modules/ace/worker-coffee.js M modules/ace/worker-css.js M modules/ace/worker-html.js M modules/ace/worker-javascript.js M modules/ace/worker-json.js M modules/ace/worker-lua.js M modules/ace/worker-php.js M modules/ace/worker-xquery.js 145 files changed, 107,086 insertions(+), 76,084 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor
[MediaWiki-commits] [Gerrit] render.article: Break down the createThumbnail method - change (mediawiki...Popups)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130300
Change subject: render.article: Break down the createThumbnail method
..
render.article: Break down the createThumbnail method
Change-Id: Id17bc6d19f044d6a4837eebb6b1a264ee104ea84
---
M resources/ext.popups.renderer.article.js
1 file changed, 80 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/00/130300/1
diff --git a/resources/ext.popups.renderer.article.js
b/resources/ext.popups.renderer.article.js
index 6633acf..c2814a6 100644
--- a/resources/ext.popups.renderer.article.js
+++ b/resources/ext.popups.renderer.article.js
@@ -152,62 +152,42 @@
if ( tall ) {
if ( mw.popups.supportsSVG ) {
- $thumbnailSVGImage = $( article.createSVGTag(
'image' ) );
- $thumbnailSVGImage
- .addClass( 'mwe-popups-is-not-tall' )
- .attr( {
- 'xlink:href': thumbnail.source,
- x: ( thumbnail.width
article.SIZES.portraitImage.w ) ?
+ $thumbnail = article.createSvgImageThumbnail(
+ 'mwe-popups-is-not-tall',
+ thumbnail.source,
+ ( thumbnail.width
article.SIZES.portraitImage.w ) ?
( ( thumbnail.width -
article.SIZES.portraitImage.w ) / -2 ) :
(
article.SIZES.portraitImage.w - thumbnail.width ),
- y: ( thumbnail.height
article.SIZES.portraitImage.h ) ?
+ ( thumbnail.height
article.SIZES.portraitImage.h ) ?
( ( thumbnail.height -
article.SIZES.portraitImage.h ) / -2 ) :
0,
- width: thumbnail.width,
- height: thumbnail.height
- } );
-
- $thumbnail = $( 'svg' )
- .attr( {
- xmlns:
'http://www.w3.org/2000/svg',
- width:
article.SIZES.portraitImage.w,
- height:
article.SIZES.portraitImage.h
- } )
- .append( $thumbnailSVGImage );
+ thumbnail.width,
+ thumbnail.height,
+ article.SIZES.portraitImage.w,
+ article.SIZES.portraitImage.h
+ );
} else {
- $thumbnail = $( 'div' )
- .addClass( 'mwe-popups-is-tall' )
- .css( 'background-image', 'url(' +
thumbnail.source + ')' );
+ $thumbnail = article.createImgThumbnail(
'mwe-popups-is-tall', thumbnail.source );
}
} else {
if ( mw.popups.supportsSVG ) {
- $thumbnailSVGImage = $( article.createSVGTag(
'image' ) );
- $thumbnailSVGImage
- .addClass( 'mwe-popups-is-not-tall' )
- .attr( {
- 'xlink:href': thumbnail.source,
- 'clip-path':
'url(#mwe-popups-mask)',
- x: 0,
- y: ( thumbnail.height
article.SIZES.landscapeImage.h ) ?
+ $thumbnail = article.createSvgImageThumbnail(
+ 'mwe-popups-is-not-tall',
+ thumbnail.source,
+ 0,
+ ( thumbnail.height
article.SIZES.landscapeImage.h ) ?
( ( thumbnail.height -
article.SIZES.landscapeImage.h ) / -2 ) :
0,
- width: thumbnail.width,
- height: thumbnail.height
- } );
-
-
[MediaWiki-commits] [Gerrit] use categoryinfo for the number of articles and subcats, pep... - change (pywikibot/core)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130301
Change subject: use categoryinfo for the number of articles and subcats, pep8
changes
..
use categoryinfo for the number of articles and subcats, pep8 changes
categoryinfo gives the number of articles and subcategories. We use
this information for the messages and use the generator functions
to process each article or subcat. This speeds up processing time
(f.e. 10% for tree with depth:3)
Made some pep8 changes.
Change-Id: I32e23ccfdc4a9e623fde93fcd161dd910879e9af
---
M scripts/category.py
1 file changed, 15 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/01/130301/1
diff --git a/scripts/category.py b/scripts/category.py
index 8922efe..d032c3a 100755
--- a/scripts/category.py
+++ b/scripts/category.py
@@ -323,7 +323,7 @@
comment = self.editSummary
if not comment:
comment = i18n.twtranslate(page.site, 'category-adding',
-{'newcat': newcatTitle})
+ {'newcat': newcatTitle})
pywikibot.output(u'Comment: %s' % comment)
if not self.dry:
if not self.always:
@@ -449,16 +449,14 @@
self.comment = comment
if not self.comment:
if self.newcat:
-template_vars = { \
-'oldcat': self.oldcat.title(
-withNamespace=False),
-'newcat': self.newcat.title(
-withNamespace=False)}
+template_vars = {
+'oldcat': self.oldcat.title(withNamespace=False),
+'newcat': self.newcat.title(withNamespace=False)}
self.comment = i18n.twtranslate(self.site,
'category-replacing',
template_vars)
else:
-template_vars = {'oldcat': self.oldcat.title( \
+template_vars = {'oldcat': self.oldcat.title(
withNamespace=False)}
self.comment = i18n.twtranslate(self.site,
'category-removing',
@@ -475,8 +473,7 @@
self._hist()
self._change(pagegenerators.CategorizedPageGenerator(self.oldcat))
if not self.pagesonly:
-self._change(pagegenerators.SubCategoriesPageGenerator( \
-self.oldcat))
+
self._change(pagegenerators.SubCategoriesPageGenerator(self.oldcat))
if self.oldcat.isEmptyCategory() and self.delete_oldcat and \
((self.newcat and self.move_oldcat) or not self.newcat):
self._delete()
@@ -524,7 +521,8 @@
match = re.compile(REGEX,
re.IGNORECASE | re.MULTILINE | re.DOTALL)
self.newcat.text = match.sub('', self.newcat.text)
-site_templates = pywikibot.translate(self.site, cfd_templates,
fallback=False)
+site_templates = pywikibot.translate(self.site, cfd_templates,
+ fallback=False)
for template_name in site_templates:
match = re.compile(r{{%s.*?}} % template_name, re.IGNORECASE)
self.newcat.text = match.sub('', self.newcat.text)
@@ -641,12 +639,11 @@
{'oldcat': self.cat.title()})
def run(self):
-articles = set(self.cat.articles())
-if len(articles) == 0:
+if self.cat.categoryinfo['pages'] == 0:
pywikibot.output(u'There are no articles in category %s'
% self.cat.title())
else:
-for article in articles:
+for article in self.cat.articles():
if not self.titleRegex or re.search(self.titleRegex,
article.title()):
article.change_category(self.cat, None,
@@ -656,12 +653,11 @@
return
# Also removes the category tag from subcategories' pages
-subcategories = set(self.cat.subcategories())
-if len(subcategories) == 0:
+if self.cat.categoryinfo['subcats'] == 0:
pywikibot.output(u'There are no subcategories in category %s'
% self.cat.title())
else:
-for subcategory in subcategories:
+for subcategory in self.cat.subcategories():
subcategory.change_category(self.cat, None,
comment=self.editSummary,
inPlace=self.inPlace)
@@ -831,12 +827,11 @@
def run(self):
cat = pywikibot.Category(self.site, self.catTitle)
-articles =
[MediaWiki-commits] [Gerrit] Allow wikimedia's IPv6 space through apt proxy - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/130302 Change subject: Allow wikimedia's IPv6 space through apt proxy .. Allow wikimedia's IPv6 space through apt proxy This will allow all wikimedia servers and labs machines to access security.ubuntu.com etc Change-Id: I0999e0f4bb753b087d4498a5255872d6799cb3de --- M modules/install-server/files/squid3-apt-proxy.conf 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/02/130302/1 diff --git a/modules/install-server/files/squid3-apt-proxy.conf b/modules/install-server/files/squid3-apt-proxy.conf index e0afccb..6c6a53d 100644 --- a/modules/install-server/files/squid3-apt-proxy.conf +++ b/modules/install-server/files/squid3-apt-proxy.conf @@ -41,6 +41,7 @@ acl wikimedia src 198.35.26.0/23 acl wikimedia src 185.15.56.0/22 acl wikimedia src 10.0.0.0/8 +acl wikimedia src 2620:0:860::/46 http_access allow manager localhost http_access deny manager http_access allow purge localhost -- To view, visit https://gerrit.wikimedia.org/r/130302 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0999e0f4bb753b087d4498a5255872d6799cb3de Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow wikimedia's IPv6 space through apt proxy - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Allow wikimedia's IPv6 space through apt proxy .. Allow wikimedia's IPv6 space through apt proxy This will allow all wikimedia servers and labs machines to access security.ubuntu.com etc Change-Id: I0999e0f4bb753b087d4498a5255872d6799cb3de --- M modules/install-server/files/squid3-apt-proxy.conf 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/install-server/files/squid3-apt-proxy.conf b/modules/install-server/files/squid3-apt-proxy.conf index e0afccb..6c6a53d 100644 --- a/modules/install-server/files/squid3-apt-proxy.conf +++ b/modules/install-server/files/squid3-apt-proxy.conf @@ -41,6 +41,7 @@ acl wikimedia src 198.35.26.0/23 acl wikimedia src 185.15.56.0/22 acl wikimedia src 10.0.0.0/8 +acl wikimedia src 2620:0:860::/46 http_access allow manager localhost http_access deny manager http_access allow purge localhost -- To view, visit https://gerrit.wikimedia.org/r/130302 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0999e0f4bb753b087d4498a5255872d6799cb3de 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] New Wikidata Build - 29/04/2014 10:00 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review. https://gerrit.wikimedia.org/r/130303 Change subject: New Wikidata Build - 29/04/2014 10:00 .. New Wikidata Build - 29/04/2014 10:00 Change-Id: I3317f95af8be8d50034bca5006b0633516622b37 --- M composer.lock M extensions/Wikibase/client/i18n/diq.json M extensions/Wikibase/client/i18n/es.json M extensions/Wikibase/client/i18n/mn.json M extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseEntityLibrary.php M extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php M extensions/Wikibase/client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTestCase.php M extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php M extensions/Wikibase/composer.json A extensions/Wikibase/docs/constraints.wiki M extensions/Wikibase/docs/options.wiki M extensions/Wikibase/lib/i18n/ast.json M extensions/Wikibase/lib/i18n/be-tarask.json M extensions/Wikibase/lib/i18n/bn.json M extensions/Wikibase/lib/i18n/cs.json M extensions/Wikibase/lib/i18n/da.json M extensions/Wikibase/lib/i18n/de.json M extensions/Wikibase/lib/i18n/diq.json M extensions/Wikibase/lib/i18n/el.json M extensions/Wikibase/lib/i18n/en.json M extensions/Wikibase/lib/i18n/eo.json M extensions/Wikibase/lib/i18n/es.json M extensions/Wikibase/lib/i18n/et.json M extensions/Wikibase/lib/i18n/fa.json M extensions/Wikibase/lib/i18n/fi.json M extensions/Wikibase/lib/i18n/fr.json M extensions/Wikibase/lib/i18n/gl.json M extensions/Wikibase/lib/i18n/he.json M extensions/Wikibase/lib/i18n/ia.json M extensions/Wikibase/lib/i18n/ilo.json M extensions/Wikibase/lib/i18n/is.json M extensions/Wikibase/lib/i18n/it.json M extensions/Wikibase/lib/i18n/ja.json A extensions/Wikibase/lib/i18n/kn.json M extensions/Wikibase/lib/i18n/ko.json M extensions/Wikibase/lib/i18n/lb.json M extensions/Wikibase/lib/i18n/lv.json M extensions/Wikibase/lib/i18n/mk.json M extensions/Wikibase/lib/i18n/ml.json M extensions/Wikibase/lib/i18n/mr.json M extensions/Wikibase/lib/i18n/ms.json M extensions/Wikibase/lib/i18n/nb.json M extensions/Wikibase/lib/i18n/nl.json M extensions/Wikibase/lib/i18n/nn.json M extensions/Wikibase/lib/i18n/pl.json M extensions/Wikibase/lib/i18n/pms.json M extensions/Wikibase/lib/i18n/qqq.json M extensions/Wikibase/lib/i18n/ro.json M extensions/Wikibase/lib/i18n/roa-tara.json M extensions/Wikibase/lib/i18n/ru.json M extensions/Wikibase/lib/i18n/sl.json M extensions/Wikibase/lib/i18n/sr-ec.json M extensions/Wikibase/lib/i18n/sv.json M extensions/Wikibase/lib/i18n/uk.json M extensions/Wikibase/lib/i18n/vi.json M extensions/Wikibase/lib/i18n/zh-hans.json M extensions/Wikibase/lib/i18n/zh-hant.json A extensions/Wikibase/lib/includes/Validators/MembershipValidator.php A extensions/Wikibase/lib/includes/Validators/NotEntityIdValidator.php M extensions/Wikibase/lib/includes/Validators/StringLengthValidator.php M extensions/Wikibase/lib/includes/Validators/ValidatorErrorLocalizer.php M extensions/Wikibase/lib/includes/formatters/FormattingException.php A extensions/Wikibase/lib/includes/i18n/MessageParameterFormatter.php M extensions/Wikibase/lib/includes/i18n/WikibaseExceptionLocalizer.php M extensions/Wikibase/lib/includes/parsers/MWTimeIsoParser.php M extensions/Wikibase/lib/includes/store/EntityTitleLookup.php M extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php M extensions/Wikibase/lib/resources/wikibase.css A extensions/Wikibase/lib/tests/phpunit/Validators/MembershipValidatorTest.php A extensions/Wikibase/lib/tests/phpunit/Validators/NotEntityIdValidatorTest.php M extensions/Wikibase/lib/tests/phpunit/Validators/ValidatorErrorLocalizerTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php A extensions/Wikibase/lib/tests/phpunit/i18n/MessageParameterFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/i18n/WikibaseExceptionLocalizerTest.php M extensions/Wikibase/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php M extensions/Wikibase/lib/tests/phpunit/parsers/TimeParserTest.php M extensions/Wikibase/lib/tests/phpunit/parsers/YearTimeParserTest.php M extensions/Wikibase/lib/tests/phpunit/store/MockTermIndex.php M extensions/Wikibase/lib/tests/phpunit/store/TermIndexTest.php M extensions/Wikibase/repo/Wikibase.hooks.php M extensions/Wikibase/repo/Wikibase.php M extensions/Wikibase/repo/config/Wikibase.default.php M extensions/Wikibase/repo/i18n/bn.json M extensions/Wikibase/repo/i18n/ce.json M extensions/Wikibase/repo/i18n/da.json M extensions/Wikibase/repo/i18n/de.json M extensions/Wikibase/repo/i18n/diq.json M extensions/Wikibase/repo/i18n/en.json M extensions/Wikibase/repo/i18n/eo.json M extensions/Wikibase/repo/i18n/gl.json M extensions/Wikibase/repo/i18n/he.json M extensions/Wikibase/repo/i18n/hu.json A extensions/Wikibase/repo/i18n/kn.json M extensions/Wikibase/repo/i18n/pl.json M
[MediaWiki-commits] [Gerrit] Add the non SLAAC IPv6 addresses for bastions - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/130304 Change subject: Add the non SLAAC IPv6 addresses for bastions .. Add the non SLAAC IPv6 addresses for bastions network.pp only had the IPv6 SLAAC addresses for bastions. Bastions also have non-SLAAC IPv6 addresses, so add them in network.pp. Also put a comment to indicate SLAAC IPv6 addresses. Change-Id: Ia83a9f1bdb281f1bb6de79894adfd4bc759cdf58 --- M manifests/network.pp 1 file changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/04/130304/1 diff --git a/manifests/network.pp b/manifests/network.pp index ffb8eb7..30af04a 100644 --- a/manifests/network.pp +++ b/manifests/network.pp @@ -53,11 +53,16 @@ '91.198.174.113', # hooft.esams.wikimedia.org '198.35.26.5', # bast4001.wikimedia.org '208.80.154.151', # iron.wikimedia.org -'2620:0:860:2:21e:c9ff:feea:ab95', # fenari.wikimedia.org -'2620:0:861:2:7a2b:cbff:fe09:11ba', # bast1001.wikimedia.org -'2620:0:862:1:a6ba:dbff:fe30:d770', # hooft.esams.wikimedia.org -'2620:0:863:1:92b1:1cff:fe4d:4249', # bast4001.wikimedia.org -'2620:0:861:2:7a2b:cbff:fe09:d5c', # iron.wikimedia.org +'2620:0:860:2:208:80:152:165', # fenari.wikimedia.org +'2620:0:860:2:21e:c9ff:feea:ab95', # fenari.wikimedia.org SLAAC +'2620:0:861:2:208:80:154:149', # bast1001.wikimedia.org +'2620:0:861:2:7a2b:cbff:fe09:11ba', # bast1001.wikimedia.org SLAAC +'2620:0:862:1:91:198:174:113', # hooft.esams.wikimedia.org +'2620:0:862:1:a6ba:dbff:fe30:d770', # hooft.esams.wikimedia.org SLAAC +'2620:0:863:1:198:35:26:5', # bast4001.wikimedia.org +'2620:0:863:1:92b1:1cff:fe4d:4249', # bast4001.wikimedia.org SLAAC +'2620:0:861:2:208:80:154:151', # iron.wikimedia.org +'2620:0:861:2:7a2b:cbff:fe09:d5c', # iron.wikimedia.org SLAAC ], 'monitoring_hosts' = [ '208.80.154.14', # neon.wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/130304 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia83a9f1bdb281f1bb6de79894adfd4bc759cdf58 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add more time parser test cases - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130305
Change subject: Add more time parser test cases
..
Add more time parser test cases
Change-Id: I305c7c9e0d451d6d6d291c5e1ae80bd5f3ad1175
---
M lib/tests/phpunit/parsers/DateTimeParserTest.php
M lib/tests/phpunit/parsers/TimeParserTest.php
M lib/tests/phpunit/parsers/YearMonthTimeParserTest.php
3 files changed, 17 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/05/130305/1
diff --git a/lib/tests/phpunit/parsers/DateTimeParserTest.php
b/lib/tests/phpunit/parsers/DateTimeParserTest.php
index 88a51c8..803169a 100644
--- a/lib/tests/phpunit/parsers/DateTimeParserTest.php
+++ b/lib/tests/phpunit/parsers/DateTimeParserTest.php
@@ -177,6 +177,8 @@
'Jann 2014',
'1980x',
'1980s', // supported by MWTimeIsoParser
+ '1980s ',
+ '1980 ',
'1980ss',
'1980er',
'1980UTC', // we don't support year + timezone here
diff --git a/lib/tests/phpunit/parsers/TimeParserTest.php
b/lib/tests/phpunit/parsers/TimeParserTest.php
index 2e03ff0..4e887bb 100644
--- a/lib/tests/phpunit/parsers/TimeParserTest.php
+++ b/lib/tests/phpunit/parsers/TimeParserTest.php
@@ -52,6 +52,8 @@
array( '+2000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
'2010' =
array( '+2010-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ '1980 ' =
+ array( '+1980-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
'1' =
array( '+0001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
'-11' =
@@ -66,6 +68,10 @@
//Wikibase\Lib\YearMonthTimeParser
'1 1999' =
array( '+1999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ 'March 1999' =
+ array( '+1999-03-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ '1999 March' =
+ array( '+1999-03-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
//ValueParsers\TimeParser
'+-01-01T00:00:00Z (Gregorian)' =
@@ -120,7 +126,10 @@
'111 111 111',
'Jann 2014',
'1980x',
- '1980ss'
+ '1980ss',
+ '1980UTC',
+ '1980 America/New_York',
+ '1980America/New_York'
);
foreach ( $invalid as $value ) {
diff --git a/lib/tests/phpunit/parsers/YearMonthTimeParserTest.php
b/lib/tests/phpunit/parsers/YearMonthTimeParserTest.php
index f3b0ff9..745c468 100644
--- a/lib/tests/phpunit/parsers/YearMonthTimeParserTest.php
+++ b/lib/tests/phpunit/parsers/YearMonthTimeParserTest.php
@@ -57,6 +57,10 @@
array( '+1999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
'January/1' =
array( '+0001-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ '1999 January' =
+ array( '+1999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ 'January 1999' =
+ array( '+1999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
'January-1' =
array( '+0001-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
'JanuARY-1' =
@@ -153,4 +157,4 @@
return $argLists;
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/130305
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I305c7c9e0d451d6d6d291c5e1ae80bd5f3ad1175
[MediaWiki-commits] [Gerrit] Add the non SLAAC IPv6 addresses for bastions - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Add the non SLAAC IPv6 addresses for bastions .. Add the non SLAAC IPv6 addresses for bastions network.pp only had the IPv6 SLAAC addresses for bastions. Bastions also have non-SLAAC IPv6 addresses, so add them in network.pp. Also put a comment to indicate SLAAC IPv6 addresses. Change-Id: Ia83a9f1bdb281f1bb6de79894adfd4bc759cdf58 --- M manifests/network.pp 1 file changed, 10 insertions(+), 5 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/network.pp b/manifests/network.pp index ffb8eb7..30af04a 100644 --- a/manifests/network.pp +++ b/manifests/network.pp @@ -53,11 +53,16 @@ '91.198.174.113', # hooft.esams.wikimedia.org '198.35.26.5', # bast4001.wikimedia.org '208.80.154.151', # iron.wikimedia.org -'2620:0:860:2:21e:c9ff:feea:ab95', # fenari.wikimedia.org -'2620:0:861:2:7a2b:cbff:fe09:11ba', # bast1001.wikimedia.org -'2620:0:862:1:a6ba:dbff:fe30:d770', # hooft.esams.wikimedia.org -'2620:0:863:1:92b1:1cff:fe4d:4249', # bast4001.wikimedia.org -'2620:0:861:2:7a2b:cbff:fe09:d5c', # iron.wikimedia.org +'2620:0:860:2:208:80:152:165', # fenari.wikimedia.org +'2620:0:860:2:21e:c9ff:feea:ab95', # fenari.wikimedia.org SLAAC +'2620:0:861:2:208:80:154:149', # bast1001.wikimedia.org +'2620:0:861:2:7a2b:cbff:fe09:11ba', # bast1001.wikimedia.org SLAAC +'2620:0:862:1:91:198:174:113', # hooft.esams.wikimedia.org +'2620:0:862:1:a6ba:dbff:fe30:d770', # hooft.esams.wikimedia.org SLAAC +'2620:0:863:1:198:35:26:5', # bast4001.wikimedia.org +'2620:0:863:1:92b1:1cff:fe4d:4249', # bast4001.wikimedia.org SLAAC +'2620:0:861:2:208:80:154:151', # iron.wikimedia.org +'2620:0:861:2:7a2b:cbff:fe09:d5c', # iron.wikimedia.org SLAAC ], 'monitoring_hosts' = [ '208.80.154.14', # neon.wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/130304 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia83a9f1bdb281f1bb6de79894adfd4bc759cdf58 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] antimony: add firewall - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130306
Change subject: antimony: add firewall
..
antimony: add firewall
Change-Id: Ifeca39cb501939b5b650f3e28dfeda3be594a71b
---
M manifests/site.pp
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/130306/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 45ebfcf..16d1aad 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -252,6 +252,8 @@
ca = 'RapidSSL_CA.pem',
}
+class { 'base::firewall': }
+
include standard
include groups::wikidev
include accounts::demon
--
To view, visit https://gerrit.wikimedia.org/r/130306
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifeca39cb501939b5b650f3e28dfeda3be594a71b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Feature name should not end with dot - change (mediawiki...ContentTranslation)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/130307 Change subject: Feature name should not end with dot .. Feature name should not end with dot Jenkins gets confused. See broken link at https://integration.wikimedia.org/ci/view/BrowserTests/job/browsertests- ContentTranslation-language-stage.wmflabs.org-linux-firefox/17/testRepor t/Basic%20machine%20translation//Clicking_the_translation_area_and_getti ng_a_translation/ Change-Id: Ic20bf3abbe745cfa965ef7a6327b1c21fd6d310b --- M tests/browser/features/basic_mt.feature 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/07/130307/1 diff --git a/tests/browser/features/basic_mt.feature b/tests/browser/features/basic_mt.feature index fd08961..333cb2b 100644 --- a/tests/browser/features/basic_mt.feature +++ b/tests/browser/features/basic_mt.feature @@ -1,5 +1,5 @@ @firefox @language-stage.wmflabs.org @login -Feature: Basic machine translation. +Feature: Basic machine translation As a user, I can use machine translations as templates, -- To view, visit https://gerrit.wikimedia.org/r/130307 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic20bf3abbe745cfa965ef7a6327b1c21fd6d310b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Feature name should not end with dot - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged. Change subject: Feature name should not end with dot .. Feature name should not end with dot Jenkins gets confused. See broken link at https://integration.wikimedia.org/ci/view/BrowserTests/job/browsertests- ContentTranslation-language-stage.wmflabs.org-linux-firefox/17/testRepor t/Basic%20machine%20translation//Clicking_the_translation_area_and_getti ng_a_translation/ Change-Id: Ic20bf3abbe745cfa965ef7a6327b1c21fd6d310b --- M tests/browser/features/basic_mt.feature 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/basic_mt.feature b/tests/browser/features/basic_mt.feature index fd08961..333cb2b 100644 --- a/tests/browser/features/basic_mt.feature +++ b/tests/browser/features/basic_mt.feature @@ -1,5 +1,5 @@ @firefox @language-stage.wmflabs.org @login -Feature: Basic machine translation. +Feature: Basic machine translation As a user, I can use machine translations as templates, -- To view, visit https://gerrit.wikimedia.org/r/130307 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic20bf3abbe745cfa965ef7a6327b1c21fd6d310b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: KartikMistry kartik.mis...@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] Add percentiles to the Geo data - change (analytics/multimedia)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/130308 Change subject: Add percentiles to the Geo data .. Add percentiles to the Geo data Change-Id: I9c4ac62fd6c2efdfbcaa31d8931988026051ec0c Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/506 --- M perf/country-api.sql M perf/country-image.sql 2 files changed, 36 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/multimedia refs/changes/08/130308/1 diff --git a/perf/country-api.sql b/perf/country-api.sql index 81a9025..9e75f2e 100644 --- a/perf/country-api.sql +++ b/perf/country-api.sql @@ -1,4 +1,21 @@ -SELECT event_country as country, EXP(AVG(LOG(event_total))) as mean, EXP(STD(LOG(event_total))) as std, COUNT(event_total) as sample_size FROM ( +SET group_concat_max_len = 10485760; +SELECT event_country as country, +EXP(AVG(LOG(event_total))) as mean, +EXP(STD(LOG(event_total))) as std, +COUNT(event_total) as sample_size, +CAST(SUBSTRING_INDEX(SUBSTRING_INDEX( + GROUP_CONCAT(event_total ORDER BY event_total SEPARATOR ','), + ',', 1/100 * COUNT(*) + 1), ',', -1) AS DECIMAL) AS 1st_percentile, +CAST(SUBSTRING_INDEX(SUBSTRING_INDEX( + GROUP_CONCAT(event_total ORDER BY event_total SEPARATOR ','), + ',', 50/100 * COUNT(*) + 1), ',', -1) AS DECIMAL) AS 50th_percentile, +CAST(SUBSTRING_INDEX(SUBSTRING_INDEX( + GROUP_CONCAT(event_total ORDER BY event_total SEPARATOR ','), + ',', 90/100 * COUNT(*) + 1), ',', -1) AS DECIMAL) AS 90th_percentile, +CAST(SUBSTRING_INDEX(SUBSTRING_INDEX( + GROUP_CONCAT(event_total ORDER BY event_total SEPARATOR ','), + ',', 99/100 * COUNT(*) + 1), ',', -1) AS DECIMAL) AS 99th_percentile +FROM ( SELECT timestamp, event_total, event_country, event_type FROM MultimediaViewerNetworkPerformance_7393226 UNION ALL SELECT timestamp, event_total, event_country, event_type FROM MultimediaViewerNetworkPerformance_7488625 diff --git a/perf/country-image.sql b/perf/country-image.sql index ee1a2d9..c3e4364 100644 --- a/perf/country-image.sql +++ b/perf/country-image.sql @@ -1,4 +1,21 @@ -SELECT event_country as country, EXP(AVG(LOG(event_total))) as mean, EXP(STD(LOG(event_total))) as std, COUNT(event_total) as sample_size FROM ( +SET group_concat_max_len = 10485760; +SELECT event_country as country, +EXP(AVG(LOG(event_total))) as mean, +EXP(STD(LOG(event_total))) as std, +COUNT(event_total) as sample_size, +CAST(SUBSTRING_INDEX(SUBSTRING_INDEX( + GROUP_CONCAT(event_total ORDER BY event_total SEPARATOR ','), + ',', 1/100 * COUNT(*) + 1), ',', -1) AS DECIMAL) AS 1st_percentile, +CAST(SUBSTRING_INDEX(SUBSTRING_INDEX( + GROUP_CONCAT(event_total ORDER BY event_total SEPARATOR ','), + ',', 50/100 * COUNT(*) + 1), ',', -1) AS DECIMAL) AS 50th_percentile, +CAST(SUBSTRING_INDEX(SUBSTRING_INDEX( + GROUP_CONCAT(event_total ORDER BY event_total SEPARATOR ','), + ',', 90/100 * COUNT(*) + 1), ',', -1) AS DECIMAL) AS 90th_percentile, +CAST(SUBSTRING_INDEX(SUBSTRING_INDEX( + GROUP_CONCAT(event_total ORDER BY event_total SEPARATOR ','), + ',', 99/100 * COUNT(*) + 1), ',', -1) AS DECIMAL) AS 99th_percentile +FROM ( SELECT timestamp, event_total, event_country, event_type FROM MultimediaViewerNetworkPerformance_7393226 UNION ALL SELECT timestamp, event_total, event_country, event_type FROM MultimediaViewerNetworkPerformance_7488625 -- To view, visit https://gerrit.wikimedia.org/r/130308 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c4ac62fd6c2efdfbcaa31d8931988026051ec0c Gerrit-PatchSet: 1 Gerrit-Project: analytics/multimedia Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 29/04/2014 10:00 - change (mediawiki...Wikidata)
Tobias Gritschacher has submitted this change and it was merged. Change subject: New Wikidata Build - 29/04/2014 10:00 .. New Wikidata Build - 29/04/2014 10:00 Change-Id: I3317f95af8be8d50034bca5006b0633516622b37 --- M composer.lock M extensions/Wikibase/client/i18n/diq.json M extensions/Wikibase/client/i18n/es.json M extensions/Wikibase/client/i18n/mn.json M extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseEntityLibrary.php M extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php M extensions/Wikibase/client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTestCase.php M extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php M extensions/Wikibase/composer.json A extensions/Wikibase/docs/constraints.wiki M extensions/Wikibase/docs/options.wiki M extensions/Wikibase/lib/i18n/ast.json M extensions/Wikibase/lib/i18n/be-tarask.json M extensions/Wikibase/lib/i18n/bn.json M extensions/Wikibase/lib/i18n/cs.json M extensions/Wikibase/lib/i18n/da.json M extensions/Wikibase/lib/i18n/de.json M extensions/Wikibase/lib/i18n/diq.json M extensions/Wikibase/lib/i18n/el.json M extensions/Wikibase/lib/i18n/en.json M extensions/Wikibase/lib/i18n/eo.json M extensions/Wikibase/lib/i18n/es.json M extensions/Wikibase/lib/i18n/et.json M extensions/Wikibase/lib/i18n/fa.json M extensions/Wikibase/lib/i18n/fi.json M extensions/Wikibase/lib/i18n/fr.json M extensions/Wikibase/lib/i18n/gl.json M extensions/Wikibase/lib/i18n/he.json M extensions/Wikibase/lib/i18n/ia.json M extensions/Wikibase/lib/i18n/ilo.json M extensions/Wikibase/lib/i18n/is.json M extensions/Wikibase/lib/i18n/it.json M extensions/Wikibase/lib/i18n/ja.json A extensions/Wikibase/lib/i18n/kn.json M extensions/Wikibase/lib/i18n/ko.json M extensions/Wikibase/lib/i18n/lb.json M extensions/Wikibase/lib/i18n/lv.json M extensions/Wikibase/lib/i18n/mk.json M extensions/Wikibase/lib/i18n/ml.json M extensions/Wikibase/lib/i18n/mr.json M extensions/Wikibase/lib/i18n/ms.json M extensions/Wikibase/lib/i18n/nb.json M extensions/Wikibase/lib/i18n/nl.json M extensions/Wikibase/lib/i18n/nn.json M extensions/Wikibase/lib/i18n/pl.json M extensions/Wikibase/lib/i18n/pms.json M extensions/Wikibase/lib/i18n/qqq.json M extensions/Wikibase/lib/i18n/ro.json M extensions/Wikibase/lib/i18n/roa-tara.json M extensions/Wikibase/lib/i18n/ru.json M extensions/Wikibase/lib/i18n/sl.json M extensions/Wikibase/lib/i18n/sr-ec.json M extensions/Wikibase/lib/i18n/sv.json M extensions/Wikibase/lib/i18n/uk.json M extensions/Wikibase/lib/i18n/vi.json M extensions/Wikibase/lib/i18n/zh-hans.json M extensions/Wikibase/lib/i18n/zh-hant.json A extensions/Wikibase/lib/includes/Validators/MembershipValidator.php A extensions/Wikibase/lib/includes/Validators/NotEntityIdValidator.php M extensions/Wikibase/lib/includes/Validators/StringLengthValidator.php M extensions/Wikibase/lib/includes/Validators/ValidatorErrorLocalizer.php M extensions/Wikibase/lib/includes/formatters/FormattingException.php A extensions/Wikibase/lib/includes/i18n/MessageParameterFormatter.php M extensions/Wikibase/lib/includes/i18n/WikibaseExceptionLocalizer.php M extensions/Wikibase/lib/includes/parsers/MWTimeIsoParser.php M extensions/Wikibase/lib/includes/store/EntityTitleLookup.php M extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php M extensions/Wikibase/lib/resources/wikibase.css A extensions/Wikibase/lib/tests/phpunit/Validators/MembershipValidatorTest.php A extensions/Wikibase/lib/tests/phpunit/Validators/NotEntityIdValidatorTest.php M extensions/Wikibase/lib/tests/phpunit/Validators/ValidatorErrorLocalizerTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php A extensions/Wikibase/lib/tests/phpunit/i18n/MessageParameterFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/i18n/WikibaseExceptionLocalizerTest.php M extensions/Wikibase/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php M extensions/Wikibase/lib/tests/phpunit/parsers/TimeParserTest.php M extensions/Wikibase/lib/tests/phpunit/parsers/YearTimeParserTest.php M extensions/Wikibase/lib/tests/phpunit/store/MockTermIndex.php M extensions/Wikibase/lib/tests/phpunit/store/TermIndexTest.php M extensions/Wikibase/repo/Wikibase.hooks.php M extensions/Wikibase/repo/Wikibase.php M extensions/Wikibase/repo/config/Wikibase.default.php M extensions/Wikibase/repo/i18n/bn.json M extensions/Wikibase/repo/i18n/ce.json M extensions/Wikibase/repo/i18n/da.json M extensions/Wikibase/repo/i18n/de.json M extensions/Wikibase/repo/i18n/diq.json M extensions/Wikibase/repo/i18n/en.json M extensions/Wikibase/repo/i18n/eo.json M extensions/Wikibase/repo/i18n/gl.json M extensions/Wikibase/repo/i18n/he.json M extensions/Wikibase/repo/i18n/hu.json A extensions/Wikibase/repo/i18n/kn.json M extensions/Wikibase/repo/i18n/pl.json M extensions/Wikibase/repo/i18n/qqq.json M
[MediaWiki-commits] [Gerrit] add wikidev group to admins::pmacct - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130309
Change subject: add wikidev group to admins::pmacct
..
add wikidev group to admins::pmacct
Change-Id: Ibddb80200b0d20a33bb4e2422f5775e6ea48a1af
---
M manifests/admins.pp
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/09/130309/1
diff --git a/manifests/admins.pp b/manifests/admins.pp
index c9ea06c..5d73024 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -3964,5 +3964,9 @@
# access to pmacct tools
class admins::pmacct {
+
+$gid = '500' # 'wikidev' by default
+include groups::wikidev
+
include accounts::jkrauska
}
--
To view, visit https://gerrit.wikimedia.org/r/130309
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibddb80200b0d20a33bb4e2422f5775e6ea48a1af
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add wikidev group to admins::pmacct - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: add wikidev group to admins::pmacct
..
add wikidev group to admins::pmacct
this new admins group has been added in I49c36df0a
but for the account to be actually created we need
to add the wikidev group and set the gid.
see how this is done in the other admins:: groups
as well, otherwise we get:
err: Failed to apply catalog:
Could not find dependency Group[500] for User..
at /etc/puppet/manifests/admins.pp:60
and the account does not get created due to that
RT #7368 to give Joel access to rhenium
Change-Id: Ibddb80200b0d20a33bb4e2422f5775e6ea48a1af
---
M manifests/admins.pp
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/admins.pp b/manifests/admins.pp
index c9ea06c..5d73024 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -3964,5 +3964,9 @@
# access to pmacct tools
class admins::pmacct {
+
+$gid = '500' # 'wikidev' by default
+include groups::wikidev
+
include accounts::jkrauska
}
--
To view, visit https://gerrit.wikimedia.org/r/130309
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibddb80200b0d20a33bb4e2422f5775e6ea48a1af
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@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] Introduce role::puppetmaster classes - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130310
Change subject: Introduce role::puppetmaster classes
..
Introduce role::puppetmaster classes
Move the puppetmaster definitions from site.pp into two role classes.
This should be a noop. The motivation behind the move is to have the
puppetmaster stuff more manageable and having the usual role classes to
avoid configuration directly in site.pp
Change-Id: I87554a63dbeeade93d7c760b9b9b851841922fd9
---
A manifests/role/puppetmaster.pp
M manifests/site.pp
2 files changed, 53 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/130310/1
diff --git a/manifests/role/puppetmaster.pp b/manifests/role/puppetmaster.pp
new file mode 100644
index 000..0cca484
--- /dev/null
+++ b/manifests/role/puppetmaster.pp
@@ -0,0 +1,51 @@
+# vim: set tabstop=4 shiftwidth=4 softtabstop=4 expandtab textwidth=80 smarttab
+
+class role::puppetmaster::config {
+$allow_from = [
+'*.wikimedia.org',
+'*.pmtpa.wmnet',
+'*.eqiad.wmnet',
+'*.ulsfo.wmnet',
+'*.esams.wmnet',
+]
+}
+
+class role::puppetmaster::frontend {
+include role::puppetmaster::config
+include passwords::puppet::database
+
+class { '::puppetmaster':
+allow_from = $role::puppetmaster::config::allow_from,
+server_type = 'frontend',
+workers = ['palladium.eqiad.wmnet',
+'strontium.eqiad.wmnet'
+],
+config = {
+'thin_storeconfigs' = true,
+'dbadapter' = 'mysql',
+'dbuser'= 'puppet',
+'dbpassword'=
$passwords::puppet::database::puppet_production_db_pass,
+'dbserver' = 'db1001.eqiad.wmnet',
+}
+}
+}
+
+class role::puppetmaster::backend {
+include role::puppetmaster::config
+include passwords::puppet::database
+
+class { '::puppetmaster':
+allow_from = $role::puppetmaster::config::allow_from,
+server_type = 'backend',
+config = {
+'thin_storeconfigs' = true,
+'ca'= 'false',
+'ca_server' = 'palladium.eqiad.wmnet',
+'dbadapter' = 'mysql',
+'dbuser'= 'puppet',
+'dbpassword'=
$passwords::puppet::database::puppet_production_db_pass,
+'dbserver' = 'db1001.eqiad.wmnet',
+'dbconnections' = '256',
+}
+}
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index 45ebfcf..c2ea341 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1917,35 +1917,13 @@
}
node 'palladium.eqiad.wmnet' {
-include passwords::puppet::database
-
include standard
include backup::client
include misc::management::ipmi
include role::salt::masters::production
include role::deployment::salt_masters::production
include role::access_new_install
-
-class { 'puppetmaster':
-allow_from = [
-'*.wikimedia.org',
-'*.pmtpa.wmnet',
-'*.eqiad.wmnet',
-'*.ulsfo.wmnet',
-'*.esams.wmnet',
-],
-server_type = 'frontend',
-workers = ['palladium.eqiad.wmnet',
-'strontium.eqiad.wmnet'
-],
-config = {
-'thin_storeconfigs' = true,
-'dbadapter' = 'mysql',
-'dbuser'= 'puppet',
-'dbpassword'=
$passwords::puppet::database::puppet_production_db_pass,
-'dbserver' = 'db1001.eqiad.wmnet',
-}
-}
+include role::puppetmaster::frontend
}
node /pc100[1-3]\.eqiad\.wmnet/ {
@@ -2156,28 +2134,7 @@
node 'strontium.eqiad.wmnet' {
include standard
-include passwords::puppet::database
-
-class { 'puppetmaster':
-allow_from = [
-'*.wikimedia.org',
-'*.pmtpa.wmnet',
-'*.eqiad.wmnet',
-'*.ulsfo.wmnet',
-'*.esams.wmnet',
-],
-server_type = 'backend',
-config = {
-'thin_storeconfigs' = true,
-'ca'= 'false',
-'ca_server' = 'palladium.eqiad.wmnet',
-'dbadapter' = 'mysql',
-'dbuser'= 'puppet',
-'dbpassword'=
$passwords::puppet::database::puppet_production_db_pass,
-'dbserver' = 'db1001.eqiad.wmnet',
-'dbconnections' = '256',
-}
-}
+include role::puppetmaster::backend
}
node 'stat1001.wikimedia.org' {
--
To view, visit https://gerrit.wikimedia.org/r/130310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id:
[MediaWiki-commits] [Gerrit] planet: add ferm rules - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130311
Change subject: planet: add ferm rules
..
planet: add ferm rules
Change-Id: I586eb3d3249ed878ca109c310c90d165d32d5732
---
M manifests/role/planet.pp
1 file changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/11/130311/1
diff --git a/manifests/role/planet.pp b/manifests/role/planet.pp
index 831184f..9ea7864 100644
--- a/manifests/role/planet.pp
+++ b/manifests/role/planet.pp
@@ -197,5 +197,16 @@
planet_languages = $planet_languages,
planet_meta_link = $planet_meta_link
}
+
+ferm::service { 'http':
+proto = 'tcp',
+port = '80',
+}
+
+ferm::service { 'https':
+proto = 'tcp',
+port = '443',
+}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/130311
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I586eb3d3249ed878ca109c310c90d165d32d5732
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] rt: add ferm rules - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130312
Change subject: rt: add ferm rules
..
rt: add ferm rules
Change-Id: I880609ec13715256ba1330cdc1b0a6f169a62434
---
M manifests/role/rt.pp
1 file changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/130312/1
diff --git a/manifests/role/rt.pp b/manifests/role/rt.pp
index 3336903..c31f44b 100644
--- a/manifests/role/rt.pp
+++ b/manifests/role/rt.pp
@@ -27,6 +27,17 @@
enable_mail_submission = 'false',
enable_spamassassin= 'false',
}
+
+ferm::service { 'http':
+proto = 'tcp',
+port = '80',
+}
+
+ferm::service { 'https':
+proto = 'tcp',
+port = '443',
+}
+
}
# Labs/testing RT
--
To view, visit https://gerrit.wikimedia.org/r/130312
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I880609ec13715256ba1330cdc1b0a6f169a62434
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] racktables: add ferm rules - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130313
Change subject: racktables: add ferm rules
..
racktables: add ferm rules
Change-Id: I1be8b417ed9e0cd5c1d5bfce497f40db2922ee32
---
M manifests/role/racktables.pp
1 file changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/130313/1
diff --git a/manifests/role/racktables.pp b/manifests/role/racktables.pp
index 76ddfa2..e6c4a93 100644
--- a/manifests/role/racktables.pp
+++ b/manifests/role/racktables.pp
@@ -54,7 +54,14 @@
apache_confd {'namevirtualhost': install = true, name =
'namevirtualhost'}
apache_module { 'rewrite': name = 'rewrite' }
+ferm::service { 'http':
+proto = 'tcp',
+port = '80',
+}
-
+ferm::service { 'https':
+proto = 'tcp',
+port = '443',
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/130313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1be8b417ed9e0cd5c1d5bfce497f40db2922ee32
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Export MEDIAWIKI_API_URL when running browser tests - change (integration/jenkins-job-builder-config)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130314
Change subject: Export MEDIAWIKI_API_URL when running browser tests
..
Export MEDIAWIKI_API_URL when running browser tests
There are a lot of failed ContentTranslation tests with error message:
“Environment variable MEDIAWIKI_API_URL must be set in order to create
a target page for this test (SystemExit)”
https://integration.wikimedia.org/ci/view/BrowserTests/job/browsertests-
ContentTranslation-language-stage.wmflabs.org-linux-firefox/17/consoleFu
ll
Change-Id: I99b86e1a8c3cd9d738c2b2a244940e7b8954cf8e
---
M macro.yaml
1 file changed, 1 insertion(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/14/130314/1
diff --git a/macro.yaml b/macro.yaml
index 89513ad..9ba4f5a 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -5,6 +5,7 @@
# set up environment variables
export BROWSER={browser}
export HEADLESS=true
+ export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php
export MEDIAWIKI_PASSWORD_VARIABLE={mediawiki_password_variable}
export MEDIAWIKI_URL=http://{mediawiki_url}/wiki/
export MEDIAWIKI_USER={mediawiki_user}
--
To view, visit https://gerrit.wikimedia.org/r/130314
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I99b86e1a8c3cd9d738c2b2a244940e7b8954cf8e
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Unset $wgUseXVO - change (operations/mediawiki-config)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/130315 Change subject: Revert Unset $wgUseXVO .. Revert Unset $wgUseXVO Testing impact on a current production issue, will un-revert if this wasn't the culprit. This reverts commit 22145c96e5724aaf8f2c354cf4270f952a3f330e. Change-Id: Idc976713cf1bbeeaa304eadcb3429f6fde7a91d3 --- M wmf-config/InitialiseSettings.php 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/15/130315/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 39e2ef2..f78c779 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10458,6 +10458,10 @@ 'default' = 1024, ), +'wgUseXVO' = array( + 'default' = true, +), + 'wmgUseLocalisationUpdate' = array( 'default' = true, ), -- To view, visit https://gerrit.wikimedia.org/r/130315 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc976713cf1bbeeaa304eadcb3429f6fde7a91d3 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Unset $wgUseXVO - change (operations/mediawiki-config)
BBlack has submitted this change and it was merged. Change subject: Revert Unset $wgUseXVO .. Revert Unset $wgUseXVO Testing impact on a current production issue, will un-revert if this wasn't the culprit. This reverts commit 22145c96e5724aaf8f2c354cf4270f952a3f330e. Change-Id: Idc976713cf1bbeeaa304eadcb3429f6fde7a91d3 --- M wmf-config/InitialiseSettings.php 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 60e1ede..04dbd27 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10458,6 +10458,10 @@ 'default' = 1024, ), +'wgUseXVO' = array( + 'default' = true, +), + 'wmgUseLocalisationUpdate' = array( 'default' = true, ), -- To view, visit https://gerrit.wikimedia.org/r/130315 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc976713cf1bbeeaa304eadcb3429f6fde7a91d3 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@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] Revert Unset $wgUseXVO - change (operations/mediawiki-config)
Mark Bergsma has uploaded a new change for review. https://gerrit.wikimedia.org/r/130316 Change subject: Revert Unset $wgUseXVO .. Revert Unset $wgUseXVO This reverts commit 22145c96e5724aaf8f2c354cf4270f952a3f330e. We suspect it may be the cause of the Varnish issues on cp1055, and it doesn't hurt to try. Change-Id: I5468218c1ab9dba7919ea09bd80b97a7d31c40d7 --- M wmf-config/InitialiseSettings.php 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/16/130316/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 39e2ef2..f78c779 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10458,6 +10458,10 @@ 'default' = 1024, ), +'wgUseXVO' = array( + 'default' = true, +), + 'wmgUseLocalisationUpdate' = array( 'default' = true, ), -- To view, visit https://gerrit.wikimedia.org/r/130316 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5468218c1ab9dba7919ea09bd80b97a7d31c40d7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Mark Bergsma m...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Consistently use '@deprecated since' in JavaScript code - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Consistently use '@deprecated since' in JavaScript code
..
Consistently use '@deprecated since' in JavaScript code
JSDuck doesn't actually handle the 'since', but IMO that's a bug in JSDuck.
Change-Id: I9142a3c46ffc2890f5b58133e44caf5873c1229f
---
M resources/src/mediawiki/mediawiki.js
M resources/src/mediawiki/mediawiki.user.js
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index f6154ee..1591a94 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -471,7 +471,7 @@
*
* This was reserved for future use but never ended up being
used.
*
-* @deprecated since 1.22: Let deprecated identifiers keep
their original name
+* @deprecated since 1.22 Let deprecated identifiers keep their
original name
* and use mw.log#deprecate to create an access container for
tracking.
* @property
*/
diff --git a/resources/src/mediawiki/mediawiki.user.js
b/resources/src/mediawiki/mediawiki.user.js
index 8344111..0cf897a 100644
--- a/resources/src/mediawiki/mediawiki.user.js
+++ b/resources/src/mediawiki/mediawiki.user.js
@@ -90,7 +90,7 @@
/**
* @inheritdoc #getName
-* @deprecated since 1.20 use #getName instead
+* @deprecated since 1.20 Use #getName instead
*/
name: function () {
return user.getName();
@@ -126,7 +126,7 @@
/**
* @inheritdoc #isAnon
-* @deprecated since 1.20 use #isAnon instead
+* @deprecated since 1.20 Use #isAnon instead
*/
anonymous: function () {
return user.isAnon();
--
To view, visit https://gerrit.wikimedia.org/r/130235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9142a3c46ffc2890f5b58133e44caf5873c1229f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
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] magnesium: misc-webserver-ferm rules and firewall - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130317
Change subject: magnesium: misc-webserver-ferm rules and firewall
..
magnesium: misc-webserver-ferm rules and firewall
Change-Id: I8ce3549461a673530ae817e796bb79389b163b52
---
M manifests/site.pp
1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/130317/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 45ebfcf..c24e0a7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1572,6 +1572,18 @@
$cluster = 'misc'
+class { 'base::firewall':
+ferm::service { 'http':
+proto = 'tcp',
+port= '80',
+}
+
+ferm::service { 'https':
+proto = 'tcp',
+port= '443',
+}
+}
+
include role::racktables
include role::rt
}
--
To view, visit https://gerrit.wikimedia.org/r/130317
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ce3549461a673530ae817e796bb79389b163b52
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not run tests that are not implemented - change (mediawiki...ContentTranslation)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/130318 Change subject: Do not run tests that are not implemented .. Do not run tests that are not implemented Change-Id: I8c303c824ec8dd6ef80f6c1bb9140fe56b588931 --- M tests/browser/features/dialog.feature 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/18/130318/1 diff --git a/tests/browser/features/dialog.feature b/tests/browser/features/dialog.feature index 5245d19..e06e46c 100644 --- a/tests/browser/features/dialog.feature +++ b/tests/browser/features/dialog.feature @@ -1,4 +1,4 @@ -@firefox @language-stage.wmflabs.org @login +@firefox @login Feature: New Page dialog As a wiki editor -- To view, visit https://gerrit.wikimedia.org/r/130318 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8c303c824ec8dd6ef80f6c1bb9140fe56b588931 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed can't modify frozen String (RuntimeError) error - change (mediawiki...ContentTranslation)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/130319 Change subject: Fixed can't modify frozen String (RuntimeError) error .. Fixed can't modify frozen String (RuntimeError) error See https://integration.wikimedia.org/ci/view/BrowserTests/job/browsertests- ContentTranslation-language-stage.wmflabs.org-linux-firefox/18/consoleFu ll Change-Id: I079be2ca4a53d0e86fe6158875dbec407eb11fdc --- M tests/browser/features/step_definitions/special_content_translation_steps.rb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/19/130319/1 diff --git a/tests/browser/features/step_definitions/special_content_translation_steps.rb b/tests/browser/features/step_definitions/special_content_translation_steps.rb index 82bc24b..6aaf192 100644 --- a/tests/browser/features/step_definitions/special_content_translation_steps.rb +++ b/tests/browser/features/step_definitions/special_content_translation_steps.rb @@ -85,7 +85,7 @@ end Then(/^I see the username at the top of the page$/) do - on(ContentTranslationPage).user_name_element.text.should == ENV[MEDIAWIKI_USER].gsub!(/_/, ' ') + on(ContentTranslationPage).user_name_element.text.should == ENV[MEDIAWIKI_USER] end Then(/^the content of the page is (.*?)$/) do |page_content| -- To view, visit https://gerrit.wikimedia.org/r/130319 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I079be2ca4a53d0e86fe6158875dbec407eb11fdc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not run tests that are not implemented - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged. Change subject: Do not run tests that are not implemented .. Do not run tests that are not implemented Change-Id: I8c303c824ec8dd6ef80f6c1bb9140fe56b588931 --- M tests/browser/features/dialog.feature 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/dialog.feature b/tests/browser/features/dialog.feature index 5245d19..e06e46c 100644 --- a/tests/browser/features/dialog.feature +++ b/tests/browser/features/dialog.feature @@ -1,4 +1,4 @@ -@firefox @language-stage.wmflabs.org @login +@firefox @login Feature: New Page dialog As a wiki editor -- To view, visit https://gerrit.wikimedia.org/r/130318 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8c303c824ec8dd6ef80f6c1bb9140fe56b588931 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: KartikMistry kartik.mis...@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] In case we are working on Wikidata (site=wikidata), return I... - change (pywikibot/core)
FelixReimann has uploaded a new change for review. https://gerrit.wikimedia.org/r/130320 Change subject: In case we are working on Wikidata (site=wikidata), return ItemPages directly. .. In case we are working on Wikidata (site=wikidata), return ItemPages directly. Change-Id: I04010c199bb346f54554567166b36a64d5eabec3 --- M pywikibot/pagegenerators.py 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/20/130320/1 diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 3922333..0bac9b1 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -1391,11 +1391,14 @@ pywikibot.output(u'retrieved %d items' % data[u'status'][u'items']) for item in data[u'items']: page = pywikibot.ItemPage(repo, u'Q' + unicode(item)) -try: -link = page.getSitelink(site) -except pywikibot.NoPage: -continue -yield pywikibot.Page(pywikibot.Link(link, site)) +if isinstance(site, pywikibot.site.DataSite): +yield page +else: +try: +link = page.getSitelink(site) +except pywikibot.NoPage: +continue +yield pywikibot.Page(pywikibot.Link(link, site)) if __name__ == __main__: -- To view, visit https://gerrit.wikimedia.org/r/130320 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04010c199bb346f54554567166b36a64d5eabec3 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: FelixReimann fe...@fex-it.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Set domain to TLD on GeoIP cookie - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130321
Change subject: Revert Set domain to TLD on GeoIP cookie
..
Revert Set domain to TLD on GeoIP cookie
Testing impact on current production issues.
This reverts commit 1c252fa8fc091dd78983c051341eb4e317259450.
Change-Id: Ie833b1130efdb6be5b3630097802b2e24bf49492
---
M templates/varnish/geoip.inc.vcl.erb
1 file changed, 6 insertions(+), 58 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/130321/1
diff --git a/templates/varnish/geoip.inc.vcl.erb
b/templates/varnish/geoip.inc.vcl.erb
index 3cbb2b2..b9e5d71 100644
--- a/templates/varnish/geoip.inc.vcl.erb
+++ b/templates/varnish/geoip.inc.vcl.erb
@@ -22,7 +22,6 @@
char * geo_get_xff_ip (const struct sess *sp);
char * geo_sanitize_for_cookie (char *string);
void geo_set_cache_control (const struct sess *sp);
- const char * geo_get_top_cookie_domain (const char *host);
void
geo_init() {
@@ -94,51 +93,6 @@
VRT_SetHdr(sp, HDR_OBJ, \016Last-Modified:, now,
vrt_magic_string_end);
VRT_SetHdr(sp, HDR_OBJ, \016Cache-Control:, private,
max-age=86400, s-maxage=0, vrt_magic_string_end);
}
-
-
- /*
-* Extract the topmost part of the domain name for which a cookie may
be set.
-* This consists of the public suffix (e.g., 'org') plus one more level.
-*
-* In Wikimedia's case, this is always the top two parts of the name
(for example,
-* 'wikipedia.org' for 'en.m.wikipedia.org'. But we handle other common
cases correctly too,
-* like 'news.bbc.co.uk' (which may set cookies for bbc.co.uk, but not
the entire co.uk public
-* suffix), by assuming that if either of the top two levels is less
than three characters
-* long, then the public suffix contains two parts. A fully
comprehensive and correct solution
-* would require checking against a public suffix database like
https://publicsuffix.org/.
-*/
- const char *
- geo_get_top_cookie_domain(const char *host) {
- const char *last, *second_last, *third_last, *pos,
*top_cookie_domain;
-
- if (host == NULL) {
- return NULL;
- }
-
- last = second_last = third_last = host;
- for (pos = host; *pos != '\0'; pos++) {
- if (*pos == '.') {
- third_last = second_last;
- second_last = last;
- last = pos;
- }
- }
-
- /* If either the second- or top-level domain is less than three
characters long,*/
- /* assume that the domain uses a two-part public suffix (like
'.co.uk') and include */
- /* one additional level in the result.
*/
- if ((pos - last) = 3 || (last - second_last) = 3) {
- top_cookie_domain = third_last;
- } else {
- top_cookie_domain = second_last;
- }
-
- if (*top_cookie_domain == '.') {
- top_cookie_domain++;
- }
-
- return top_cookie_domain;
- }
}C
sub geoip_lookup {
@@ -187,8 +141,7 @@
const char *cookie_out = NULL;
char cookie_buf[255];
- const char *host = VRT_GetHdr(sp, HDR_REQ, \005host:);
- const char *ip = geo_get_xff_ip(sp);
+ char *ip = geo_get_xff_ip(sp);
int af = geo_get_addr_family(ip);
if (af == -1) {
ip = VRT_IP_string(sp, VRT_r_client_ip(sp));
@@ -198,26 +151,21 @@
geo_init();
record = GeoIP_record_by_addr(gi, ip);
- int snp_len;
if (record) {
/* Set-Cookie:
GeoIP=US:San_Francisco:37.7749:-122.4194:v4; path=/ */
- snp_len = snprintf(cookie_buf, sizeof(cookie_buf),
GeoIP=%s:%s:%.4f:%.4f:%s; Path=/; Domain=.%s,
+ int snp_len = snprintf(cookie_buf, sizeof(cookie_buf),
GeoIP=%s:%s:%.4f:%.4f:%s; path=/,
record-country_code ?
geo_sanitize_for_cookie(record-country_code) : ,
record-city ?
geo_sanitize_for_cookie(record-city) : ,
record-latitude,
record-longitude,
- (af == AF_INET6) ? v6 : v4,
- geo_get_top_cookie_domain(host)
+ (af == AF_INET6) ? v6 : v4
);
+ if (snp_len sizeof(cookie_buf)) /* don't use
truncated output
[MediaWiki-commits] [Gerrit] magnesium: add firewall - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130322
Change subject: magnesium: add firewall
..
magnesium: add firewall
Change-Id: I2f7311d7d3cbe3335b126608ed0a799b950ef644
---
M manifests/site.pp
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/22/130322/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 45ebfcf..c7cd0dc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1572,6 +1572,8 @@
$cluster = 'misc'
+class { 'base::firewall': }
+
include role::racktables
include role::rt
}
--
To view, visit https://gerrit.wikimedia.org/r/130322
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f7311d7d3cbe3335b126608ed0a799b950ef644
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Set domain to TLD on GeoIP cookie - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Revert Set domain to TLD on GeoIP cookie
..
Revert Set domain to TLD on GeoIP cookie
Testing impact on current production issues.
This reverts commit 1c252fa8fc091dd78983c051341eb4e317259450.
Change-Id: Ie833b1130efdb6be5b3630097802b2e24bf49492
---
M templates/varnish/geoip.inc.vcl.erb
1 file changed, 6 insertions(+), 58 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/templates/varnish/geoip.inc.vcl.erb
b/templates/varnish/geoip.inc.vcl.erb
index 3cbb2b2..b9e5d71 100644
--- a/templates/varnish/geoip.inc.vcl.erb
+++ b/templates/varnish/geoip.inc.vcl.erb
@@ -22,7 +22,6 @@
char * geo_get_xff_ip (const struct sess *sp);
char * geo_sanitize_for_cookie (char *string);
void geo_set_cache_control (const struct sess *sp);
- const char * geo_get_top_cookie_domain (const char *host);
void
geo_init() {
@@ -94,51 +93,6 @@
VRT_SetHdr(sp, HDR_OBJ, \016Last-Modified:, now,
vrt_magic_string_end);
VRT_SetHdr(sp, HDR_OBJ, \016Cache-Control:, private,
max-age=86400, s-maxage=0, vrt_magic_string_end);
}
-
-
- /*
-* Extract the topmost part of the domain name for which a cookie may
be set.
-* This consists of the public suffix (e.g., 'org') plus one more level.
-*
-* In Wikimedia's case, this is always the top two parts of the name
(for example,
-* 'wikipedia.org' for 'en.m.wikipedia.org'. But we handle other common
cases correctly too,
-* like 'news.bbc.co.uk' (which may set cookies for bbc.co.uk, but not
the entire co.uk public
-* suffix), by assuming that if either of the top two levels is less
than three characters
-* long, then the public suffix contains two parts. A fully
comprehensive and correct solution
-* would require checking against a public suffix database like
https://publicsuffix.org/.
-*/
- const char *
- geo_get_top_cookie_domain(const char *host) {
- const char *last, *second_last, *third_last, *pos,
*top_cookie_domain;
-
- if (host == NULL) {
- return NULL;
- }
-
- last = second_last = third_last = host;
- for (pos = host; *pos != '\0'; pos++) {
- if (*pos == '.') {
- third_last = second_last;
- second_last = last;
- last = pos;
- }
- }
-
- /* If either the second- or top-level domain is less than three
characters long,*/
- /* assume that the domain uses a two-part public suffix (like
'.co.uk') and include */
- /* one additional level in the result.
*/
- if ((pos - last) = 3 || (last - second_last) = 3) {
- top_cookie_domain = third_last;
- } else {
- top_cookie_domain = second_last;
- }
-
- if (*top_cookie_domain == '.') {
- top_cookie_domain++;
- }
-
- return top_cookie_domain;
- }
}C
sub geoip_lookup {
@@ -187,8 +141,7 @@
const char *cookie_out = NULL;
char cookie_buf[255];
- const char *host = VRT_GetHdr(sp, HDR_REQ, \005host:);
- const char *ip = geo_get_xff_ip(sp);
+ char *ip = geo_get_xff_ip(sp);
int af = geo_get_addr_family(ip);
if (af == -1) {
ip = VRT_IP_string(sp, VRT_r_client_ip(sp));
@@ -198,26 +151,21 @@
geo_init();
record = GeoIP_record_by_addr(gi, ip);
- int snp_len;
if (record) {
/* Set-Cookie:
GeoIP=US:San_Francisco:37.7749:-122.4194:v4; path=/ */
- snp_len = snprintf(cookie_buf, sizeof(cookie_buf),
GeoIP=%s:%s:%.4f:%.4f:%s; Path=/; Domain=.%s,
+ int snp_len = snprintf(cookie_buf, sizeof(cookie_buf),
GeoIP=%s:%s:%.4f:%.4f:%s; path=/,
record-country_code ?
geo_sanitize_for_cookie(record-country_code) : ,
record-city ?
geo_sanitize_for_cookie(record-city) : ,
record-latitude,
record-longitude,
- (af == AF_INET6) ? v6 : v4,
- geo_get_top_cookie_domain(host)
+ (af == AF_INET6) ? v6 : v4
);
+ if (snp_len sizeof(cookie_buf)) /* don't use
truncated output */
+ cookie_out = cookie_buf;
[MediaWiki-commits] [Gerrit] Fixed can't modify frozen String (RuntimeError) error - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged. Change subject: Fixed can't modify frozen String (RuntimeError) error .. Fixed can't modify frozen String (RuntimeError) error See https://integration.wikimedia.org/ci/view/BrowserTests/job/browsertests-ContentTranslation-language-stage.wmflabs.org-linux-firefox/18/consoleFull Change-Id: I079be2ca4a53d0e86fe6158875dbec407eb11fdc --- M tests/browser/features/step_definitions/special_content_translation_steps.rb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/step_definitions/special_content_translation_steps.rb b/tests/browser/features/step_definitions/special_content_translation_steps.rb index 82bc24b..6aaf192 100644 --- a/tests/browser/features/step_definitions/special_content_translation_steps.rb +++ b/tests/browser/features/step_definitions/special_content_translation_steps.rb @@ -85,7 +85,7 @@ end Then(/^I see the username at the top of the page$/) do - on(ContentTranslationPage).user_name_element.text.should == ENV[MEDIAWIKI_USER].gsub!(/_/, ' ') + on(ContentTranslationPage).user_name_element.text.should == ENV[MEDIAWIKI_USER] end Then(/^the content of the page is (.*?)$/) do |page_content| -- To view, visit https://gerrit.wikimedia.org/r/130319 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I079be2ca4a53d0e86fe6158875dbec407eb11fdc Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: KartikMistry kartik.mis...@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] Add percentile data to the maps - change (analytics...config)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130323
Change subject: Add percentile data to the maps
..
Add percentile data to the maps
Change-Id: Ib1d7dcf40615f1144c082d731757fe013870fc27
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/506
---
M datasources/mmv_performance_country_api.json
M datasources/mmv_performance_country_image.json
M graphs/mmv_performance_country_api.json
M graphs/mmv_performance_country_image.json
4 files changed, 150 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/multimedia/config
refs/changes/23/130323/1
diff --git a/datasources/mmv_performance_country_api.json
b/datasources/mmv_performance_country_api.json
index 1e6cdcf..ac63fad 100644
--- a/datasources/mmv_performance_country_api.json
+++ b/datasources/mmv_performance_country_api.json
@@ -26,6 +26,26 @@
id: sample_size,
label: Sample size,
type: float
+},
+{
+id: 1st_percentile,
+label: 1st percently,
+type: float
+},
+{
+id: 50th_percentile,
+label: 50th percentile,
+type: float
+},
+{
+id: 90th_percentile,
+label: 90th percentile,
+type: float
+},
+{
+id: 99th_percentile,
+label: 99th percentile,
+type: float
}
]
}
\ No newline at end of file
diff --git a/datasources/mmv_performance_country_image.json
b/datasources/mmv_performance_country_image.json
index 543b325..6c3479f 100644
--- a/datasources/mmv_performance_country_image.json
+++ b/datasources/mmv_performance_country_image.json
@@ -26,6 +26,26 @@
id: sample_size,
label: Sample size,
type: float
+},
+{
+id: 1st_percentile,
+label: 1st percently,
+type: float
+},
+{
+id: 50th_percentile,
+label: 50th percentile,
+type: float
+},
+{
+id: 90th_percentile,
+label: 90th percentile,
+type: float
+},
+{
+id: 99th_percentile,
+label: 99th percentile,
+type: float
}
]
}
\ No newline at end of file
diff --git a/graphs/mmv_performance_country_api.json
b/graphs/mmv_performance_country_api.json
index dc05580..a2ed42d 100644
--- a/graphs/mmv_performance_country_api.json
+++ b/graphs/mmv_performance_country_api.json
@@ -32,10 +32,49 @@
type: Number
},
options: {
-label: Mean,
-scale: log,
+label: Geometric mean,
+valueFormat: ,.3r,
+valueUnitSuffix: ms
+}
+},
+{
+nodeType: geo-feature,
+metric: {
+source_id: mmv_performance_country_api,
+source_col: 1st_percentile,
+type: Number
+},
+options: {
+label: 1st percentile,
+valueFormat: ,.3r,
+valueUnitSuffix: ms
+}
+},
+{
+nodeType: geo-feature,
+metric: {
+source_id: mmv_performance_country_api,
+source_col: 50th_percentile,
+type: Number
+},
+options: {
+label: 50th percentile,
+valueFormat: ,.3r,
+valueUnitSuffix: ms
+}
+},
+{
+nodeType: geo-feature,
+metric: {
+source_id: mmv_performance_country_api,
+source_col: 90th_percentile,
+type: Number
+},
+options: {
+label: 90th percentile,
valueFormat: ,.3r,
valueUnitSuffix: ms,
+scale: log,
fill: [
#00FF00,
#FF
@@ -54,11 +93,24 @@
nodeType: geo-feature,
metric: {
source_id: mmv_performance_country_api,
+
[MediaWiki-commits] [Gerrit] CodeEditor: Disable in IE7, too unstable. - change (mediawiki...CodeEditor)
TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130324
Change subject: CodeEditor: Disable in IE7, too unstable.
..
CodeEditor: Disable in IE7, too unstable.
Bug: 64559
Change-Id: I59a8cebf1d1c7f3e839295d8a85739d9c2dc2683
---
M modules/jquery.codeEditor.js
1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor
refs/changes/24/130324/1
diff --git a/modules/jquery.codeEditor.js b/modules/jquery.codeEditor.js
index 4fee225..49a681d 100644
--- a/modules/jquery.codeEditor.js
+++ b/modules/jquery.codeEditor.js
@@ -7,6 +7,18 @@
*/
'req': [ 'codeEditor' ],
/**
+* Compatability map
+*/
+ browsers: {
+ // Left-to-right languages
+ ltr: {
+ msie: [['', 7]],
+ },
+ rtl: {
+ msie: [['', 7]],
+ }
+ },
+ /**
* Configuration
*/
cfg: {
--
To view, visit https://gerrit.wikimedia.org/r/130324
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I59a8cebf1d1c7f3e839295d8a85739d9c2dc2683
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: TheDJ hartman.w...@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] Tie together the migrator and the importer - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130326
Change subject: Tie together the migrator and the importer
..
Tie together the migrator and the importer
Creates saved page records for all old-app saved pages
upon first load, then removes one of the old data files
to keep it from triggering again.
Note that pages are not actually fetched and saved yet --
you have to load them at least once to populate them.
May want to consider a fetch-all process which can be
triggered in the background or something.
Change-Id: Ibbb839e8396e13971ac1641008bb8b36f9afde88
---
M Wikipedia.xcodeproj/project.pbxproj
M wikipedia/AppDelegate.m
M wikipedia/DataMigrator.m
M wikipedia/Importer/ArticleImporter.m
M wikipedia/View Controllers/WebView/WebViewController.m
5 files changed, 48 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/26/130326/1
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index 757be2a..c48925f 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -607,8 +607,8 @@
D4991466181D51DF00E6073C /* Wikipedia_Tests.m */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path =
Wikipedia_Tests.m; sourceTree = group; };
D4BC22B3181E9E6300CAC673 /* empty.png */ = {isa =
PBXFileReference; lastKnownFileType = image.png; path = empty.png; sourceTree =
group; };
D4DE203018283FF200148CA2 /* CommunicationBridgeTests.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = CommunicationBridgeTests.m; sourceTree = group; };
- D4E8A8A2190835C100DA4765 /* DataMigrator.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
DataMigrator.h; sourceTree = group; };
- D4E8A8A3190835C100DA4765 /* DataMigrator.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= DataMigrator.m; sourceTree = group; };
+ D4E8A8A2190835C100DA4765 /* DataMigrator.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
DataMigrator.h; path = wikipedia/DataMigrator.h; sourceTree = SOURCE_ROOT; };
+ D4E8A8A3190835C100DA4765 /* DataMigrator.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name
= DataMigrator.m; path = wikipedia/DataMigrator.m; sourceTree = SOURCE_ROOT; };
D4E8A8A519084F1300DA4765 /* SQLiteHelper.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SQLiteHelper.h; sourceTree = group; };
D4E8A8A619084F1300DA4765 /* SQLiteHelper.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= SQLiteHelper.m; sourceTree = group; };
D4E8A8A819085CEA00DA4765 /* libsqlite3.dylib */ = {isa =
PBXFileReference; lastKnownFileType = compiled.mach-o.dylib; name =
libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
@@ -640,6 +640,8 @@
040E5C831846AC13007AFE6F /*
ArticleDataContextSingleton.m */,
04EA7779184E4CED00D2F3C9 /* Model */,
04D149E519CA006B4104 /* Operations */,
+ D4E8A8A11908357600DA4765 /* Data Migration */,
+ 04B0EA42190AFDBA007458AF /* Importer */,
);
path = Data;
sourceTree = group;
@@ -885,7 +887,8 @@
04B0EA43190AFDD8007458AF /* ArticleImporter.h
*/,
04B0EA44190AFDD8007458AF /* ArticleImporter.m
*/,
);
- path = Importer;
+ name = Importer;
+ path = ../Importer;
sourceTree = group;
};
04B7B9BA18B5569600A63551 /* Captcha */ = {
@@ -1243,12 +1246,10 @@
045A9F0C18F6090E0057EA85 /* assets */,
04C43AB7183442FC006C643B /* Categories */,
040E5C50184673F2007AFE6F /* Data */,
- D4E8A8A11908357600DA4765 /* Data Migration */,
04292FFB185FC026002A13FC /* Defines */,
0442F57C1900718600F55DF9 /* Fonts */,
04D34DA31863D2D600610A87 /* HTML Parsing */,
0466F44C183A30CC00EA1FD7 /* Images */,
- 04B0EA42190AFDBA007458AF /* Importer */,
0463639518A844380049EE4F /* Keychain */,
[MediaWiki-commits] [Gerrit] Generate the maps for each site dashboard - change (analytics...config)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/130327 Change subject: Generate the maps for each site dashboard .. Generate the maps for each site dashboard Change-Id: I4cd5d94cd81c5d8575523708427d07ead7473af3 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/510/ --- M dashboards/mmv.json M dashboards/mmv_cawiki.json M dashboards/mmv_commonswiki.json M dashboards/mmv_czwiki.json M dashboards/mmv_dewiki.json M dashboards/mmv_enwiki.json M dashboards/mmv_enwikivoyage.json M dashboards/mmv_eswiki.json M dashboards/mmv_etwiki.json M dashboards/mmv_fiwiki.json M dashboards/mmv_frwiki.json M dashboards/mmv_global.json M dashboards/mmv_hewiki.json M dashboards/mmv_huwiki.json M dashboards/mmv_itwiki.json M dashboards/mmv_jawiki.json M dashboards/mmv_kowiki.json M dashboards/mmv_mediawikiwiki.json M dashboards/mmv_nlwiki.json M dashboards/mmv_plwiki.json M dashboards/mmv_ptwiki.json M dashboards/mmv_rowiki.json M dashboards/mmv_ruwiki.json M dashboards/mmv_skwiki.json M dashboards/mmv_svwiki.json M dashboards/mmv_template.json M dashboards/mmv_tewiki.json M dashboards/mmv_thwiki.json M dashboards/mmv_viwiki.json C datasources/mmv_geoperformance_api_cawiki.json C datasources/mmv_geoperformance_api_commonswiki.json C datasources/mmv_geoperformance_api_czwiki.json C datasources/mmv_geoperformance_api_dewiki.json C datasources/mmv_geoperformance_api_enwiki.json C datasources/mmv_geoperformance_api_enwikivoyage.json C datasources/mmv_geoperformance_api_eswiki.json C datasources/mmv_geoperformance_api_etwiki.json C datasources/mmv_geoperformance_api_fiwiki.json C datasources/mmv_geoperformance_api_frwiki.json C datasources/mmv_geoperformance_api_global.json C datasources/mmv_geoperformance_api_hewiki.json C datasources/mmv_geoperformance_api_huwiki.json R datasources/mmv_geoperformance_api_itwiki.json C datasources/mmv_geoperformance_api_jawiki.json C datasources/mmv_geoperformance_api_kowiki.json C datasources/mmv_geoperformance_api_mediawikiwiki.json C datasources/mmv_geoperformance_api_nlwiki.json C datasources/mmv_geoperformance_api_plwiki.json C datasources/mmv_geoperformance_api_ptwiki.json C datasources/mmv_geoperformance_api_rowiki.json C datasources/mmv_geoperformance_api_ruwiki.json C datasources/mmv_geoperformance_api_skwiki.json C datasources/mmv_geoperformance_api_svwiki.json C datasources/mmv_geoperformance_api_tewiki.json C datasources/mmv_geoperformance_api_thwiki.json C datasources/mmv_geoperformance_api_viwiki.json C datasources/mmv_geoperformance_image_cawiki.json C datasources/mmv_geoperformance_image_commonswiki.json C datasources/mmv_geoperformance_image_czwiki.json R datasources/mmv_geoperformance_image_dewiki.json C datasources/mmv_geoperformance_image_enwiki.json C datasources/mmv_geoperformance_image_enwikivoyage.json C datasources/mmv_geoperformance_image_eswiki.json C datasources/mmv_geoperformance_image_etwiki.json C datasources/mmv_geoperformance_image_fiwiki.json C datasources/mmv_geoperformance_image_frwiki.json C datasources/mmv_geoperformance_image_global.json C datasources/mmv_geoperformance_image_hewiki.json C datasources/mmv_geoperformance_image_huwiki.json C datasources/mmv_geoperformance_image_itwiki.json C datasources/mmv_geoperformance_image_jawiki.json C datasources/mmv_geoperformance_image_kowiki.json C datasources/mmv_geoperformance_image_mediawikiwiki.json C datasources/mmv_geoperformance_image_nlwiki.json C datasources/mmv_geoperformance_image_plwiki.json C datasources/mmv_geoperformance_image_ptwiki.json C datasources/mmv_geoperformance_image_rowiki.json C datasources/mmv_geoperformance_image_ruwiki.json C datasources/mmv_geoperformance_image_skwiki.json C datasources/mmv_geoperformance_image_svwiki.json C datasources/mmv_geoperformance_image_tewiki.json C datasources/mmv_geoperformance_image_thwiki.json C datasources/mmv_geoperformance_image_viwiki.json C datasources/mmv_geoperformance_template.json M generate.php C graphs/mmv_geoperformance_api_cawiki.json C graphs/mmv_geoperformance_api_commonswiki.json C graphs/mmv_geoperformance_api_czwiki.json C graphs/mmv_geoperformance_api_dewiki.json C graphs/mmv_geoperformance_api_enwiki.json C graphs/mmv_geoperformance_api_enwikivoyage.json C graphs/mmv_geoperformance_api_eswiki.json C graphs/mmv_geoperformance_api_etwiki.json C graphs/mmv_geoperformance_api_fiwiki.json C graphs/mmv_geoperformance_api_frwiki.json C graphs/mmv_geoperformance_api_global.json C graphs/mmv_geoperformance_api_hewiki.json C graphs/mmv_geoperformance_api_huwiki.json C graphs/mmv_geoperformance_api_itwiki.json C graphs/mmv_geoperformance_api_jawiki.json C graphs/mmv_geoperformance_api_kowiki.json C graphs/mmv_geoperformance_api_mediawikiwiki.json C graphs/mmv_geoperformance_api_nlwiki.json C graphs/mmv_geoperformance_api_plwiki.json C graphs/mmv_geoperformance_api_ptwiki.json C graphs/mmv_geoperformance_api_rowiki.json C
[MediaWiki-commits] [Gerrit] Allow users to set whether a page is for Disambiguation or not - change (mediawiki...VisualEditor)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130328
Change subject: Allow users to set whether a page is for Disambiguation or not
..
Allow users to set whether a page is for Disambiguation or not
Bug: 61073
Change-Id: I78dd68ff5aad20c7e66c4ce1528b6f1bbc74892d
---
M VisualEditor.hooks.php
M VisualEditor.php
A modules/ve-mw/dm/metaitems/ve.dm.MWDisambiguationMetaItem.js
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
6 files changed, 60 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/28/130328/1
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 145db26..752e052 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -422,7 +422,8 @@
'tabPosition' = $wgVisualEditorTabPosition,
'tabMessages' = $wgVisualEditorTabMessages,
'showBetaWelcome' = $wgVisualEditorShowBetaWelcome,
- 'enableTocWidget' = $wgVisualEditorEnableTocWidget
+ 'enableTocWidget' = $wgVisualEditorEnableTocWidget,
+ 'disambigEnabled' = class_exists( 'DisambiguatorHooks'
)
);
foreach ( $wgVisualEditorPreferenceModules as $pref = $module
) {
diff --git a/VisualEditor.php b/VisualEditor.php
index 520951e..cb0d9ee 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -841,6 +841,7 @@
'scripts' = array(
'modules/ve-mw/dm/metaitems/ve.dm.MWCategoryMetaItem.js',
'modules/ve-mw/dm/metaitems/ve.dm.MWDefaultSortMetaItem.js',
+
'modules/ve-mw/dm/metaitems/ve.dm.MWDisambiguationMetaItem.js',
'modules/ve-mw/dm/metaitems/ve.dm.MWHiddenCategoryMetaItem.js',
'modules/ve-mw/dm/metaitems/ve.dm.MWIndexDisableMetaItem.js',
'modules/ve-mw/dm/metaitems/ve.dm.MWIndexForceMetaItem.js',
@@ -905,6 +906,7 @@
'visualeditor-dialog-meta-languages-name-label',
'visualeditor-dialog-meta-languages-readonlynote',
'visualeditor-dialog-meta-languages-section',
+
'visualeditor-dialog-meta-settings-disambiguation-label',
'visualeditor-dialog-meta-settings-hiddencat-label',
'visualeditor-dialog-meta-settings-index-default',
'visualeditor-dialog-meta-settings-index-disable',
diff --git a/modules/ve-mw/dm/metaitems/ve.dm.MWDisambiguationMetaItem.js
b/modules/ve-mw/dm/metaitems/ve.dm.MWDisambiguationMetaItem.js
new file mode 100644
index 000..8095ca5
--- /dev/null
+++ b/modules/ve-mw/dm/metaitems/ve.dm.MWDisambiguationMetaItem.js
@@ -0,0 +1,47 @@
+/*!
+ * VisualEditor DataModel MWDisambiguationMetaItem class.
+ *
+ * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+/**
+ * DataModel disambiguation meta item (for __DISAMBIG__).
+ *
+ * @class
+ * @extends ve.dm.MetaItem
+ * @constructor
+ * @param {Object} element Reference to element in meta-linmod
+ */
+ve.dm.MWDisambiguationMetaItem = function VeDmMWDisambiguationMetaItem(
element ) {
+ // Parent constructor
+ ve.dm.MetaItem.call( this, element );
+};
+
+/* Inheritance */
+
+OO.inheritClass( ve.dm.MWDisambiguationMetaItem, ve.dm.MetaItem );
+
+/* Static Properties */
+
+ve.dm.MWDisambiguationMetaItem.static.name = 'mwDisambiguation';
+
+ve.dm.MWDisambiguationMetaItem.static.group = 'mwDisambiguation';
+
+ve.dm.MWDisambiguationMetaItem.static.matchTagNames = [ 'meta' ];
+
+ve.dm.MWDisambiguationMetaItem.static.matchRdfaTypes = [
'mw:PageProp/disambiguation' ];
+
+ve.dm.MWDisambiguationMetaItem.static.toDataElement = function ( ) {
+ return { 'type': this.name };
+};
+
+ve.dm.MWDisambiguationMetaItem.static.toDomElements = function ( dataElement,
doc ) {
+ var meta = doc.createElement( 'meta' );
+ meta.setAttribute( 'property', 'mw:PageProp/disambiguation' );
+ return [ meta ];
+};
+
+/* Registration */
+
+ve.dm.modelRegistry.register( ve.dm.MWDisambiguationMetaItem );
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 20ea544..9e5aaf8 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -89,6 +89,7 @@
visualeditor-dialog-meta-languages-name-label: Language,
visualeditor-dialog-meta-languages-readonlynote: This is a list of
pages in other languages that are linked to this one. For now, it can only be
edited in source mode or on Wikidata.,
visualeditor-dialog-meta-languages-section: Languages,
+visualeditor-dialog-meta-settings-disambiguation-label: Disambiguation
page,
[MediaWiki-commits] [Gerrit] jquery.getAttrs: Add jsduck documentation - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: jquery.getAttrs: Add jsduck documentation
..
jquery.getAttrs: Add jsduck documentation
Change-Id: Ic7c10bb4fdeb7d76c0b6b09dab6957536601a20a
---
M maintenance/jsduck/config.json
M resources/src/jquery/jquery.getAttrs.js
2 files changed, 25 insertions(+), 6 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/jsduck/config.json b/maintenance/jsduck/config.json
index 5d2e304..d203baf 100644
--- a/maintenance/jsduck/config.json
+++ b/maintenance/jsduck/config.json
@@ -22,6 +22,7 @@
../../resources/src/jquery/jquery.byteLimit.js,
../../resources/src/jquery/jquery.client.js,
../../resources/src/jquery/jquery.colorUtil.js,
+ ../../resources/src/jquery/jquery.getAttrs.js,
../../resources/src/jquery/jquery.localize.js,
../../resources/src/jquery/jquery.makeCollapsible.js,
../../resources/src/jquery/jquery.spinner.js,
diff --git a/resources/src/jquery/jquery.getAttrs.js
b/resources/src/jquery/jquery.getAttrs.js
index 25b806b..c44831c 100644
--- a/resources/src/jquery/jquery.getAttrs.js
+++ b/resources/src/jquery/jquery.getAttrs.js
@@ -1,7 +1,24 @@
/**
- * Utility to get all attributes of an element directy as an object.
+ * @class jQuery.plugin.getAttrs
+ */
+
+/**
+ * Get the attributes of an element directy as a plain object.
*
- * @author Timo Tijhof, 2011
+ * If there are more elements in the collection, like most jQuery get/read
methods,
+ * this method will use the first element in the collection.
+ *
+ * In IE6, the `attributes` map of a node includes *all* allowed attributes
+ * for an element (including those not set). Those will have values like
+ * `undefined`, `null`, `0`, `false`, `` or `inherit`.
+ *
+ * However there may be attributes genuinely set to one of those values, and
there
+ * is no way to distinguish between attributes set to that and those not set
and
+ * it being the default. If you need them, set `all` to `true`. They are
filtered out
+ * by default.
+ *
+ * @param {boolean} [all=false]
+ * @return {Object}
*/
jQuery.fn.getAttrs = function ( all ) {
var map = this[0].attributes,
@@ -10,10 +27,6 @@
i, v;
for ( i = 0; i len; i++ ) {
- // IE6 includes *all* allowed attributes for thew element
(including those
- // not set). Those have values like undefined, null, 0, false,
or inherit.
- // However there may be genuine attributes set to that. If you
need them,
- // set all to true. They are excluded by default.
v = map[i].nodeValue;
if ( all || ( v v !== 'inherit' ) ) {
attrs[ map[i].nodeName ] = v;
@@ -22,3 +35,8 @@
return attrs;
};
+
+/**
+ * @class jQuery
+ * @mixins jQuery.plugin.getAttrs
+ */
--
To view, visit https://gerrit.wikimedia.org/r/129959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7c10bb4fdeb7d76c0b6b09dab6957536601a20a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Parent5446 tylerro...@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] jquery.byteLength: Add jsduck documentation - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: jquery.byteLength: Add jsduck documentation
..
jquery.byteLength: Add jsduck documentation
Change-Id: Iee8a5c930b6d2dcb0f5a66aca04e9b18c755d787
---
M maintenance/jsduck/config.json
M resources/src/jquery/jquery.byteLength.js
2 files changed, 13 insertions(+), 6 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/jsduck/config.json b/maintenance/jsduck/config.json
index d203baf..6f91cad 100644
--- a/maintenance/jsduck/config.json
+++ b/maintenance/jsduck/config.json
@@ -19,6 +19,7 @@
../../resources/src/jquery/jquery.arrowSteps.js,
../../resources/src/jquery/jquery.autoEllipsis.js,
../../resources/src/jquery/jquery.badge.js,
+ ../../resources/src/jquery/jquery.byteLength.js,
../../resources/src/jquery/jquery.byteLimit.js,
../../resources/src/jquery/jquery.client.js,
../../resources/src/jquery/jquery.colorUtil.js,
diff --git a/resources/src/jquery/jquery.byteLength.js
b/resources/src/jquery/jquery.byteLength.js
index 398937e..0b8f9da 100644
--- a/resources/src/jquery/jquery.byteLength.js
+++ b/resources/src/jquery/jquery.byteLength.js
@@ -1,14 +1,16 @@
/**
- * jQuery.byteLength
- *
- * Calculate the byte length of a string (accounting for UTF-8).
- *
+ * @class jQuery.plugin.byteLength
* @author Jan Paul Posma, 2011
* @author Timo Tijhof, 2012
* @author David Chan, 2013
*/
-jQuery.byteLength = function ( str ) {
+/**
+ * Calculate the byte length of a string (accounting for UTF-8).
+ *
+ * @static
+ */
+jQuery.byteLength = function ( str ) {
// This basically figures out how many bytes a UTF-16 string (which is
what js sees)
// will take in UTF-8 by replacing a 2 byte character with 2 *'s, etc,
and counting that.
// Note, surrogate (\uD800-\uDFFF) characters are counted as 2 bytes,
since there's two of them
@@ -27,5 +29,9 @@
.replace( /[\u0080-\u07FF\uD800-\uDFFF]/g, '**' )
.replace( /[\u0800-\uD7FF\uE000-\u]/g, '***' )
.length;
-
};
+
+/**
+ * @class jQuery
+ * @mixins jQuery.plugin.byteLength
+ */
--
To view, visit https://gerrit.wikimedia.org/r/129960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee8a5c930b6d2dcb0f5a66aca04e9b18c755d787
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: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Parent5446 tylerro...@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] jquery.checkboxShiftClick: Add jsduck documentation - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: jquery.checkboxShiftClick: Add jsduck documentation
..
jquery.checkboxShiftClick: Add jsduck documentation
Change-Id: Ifb0ad7bface406e6e322186f92083b2b8877a8af
---
M maintenance/jsduck/config.json
M resources/src/jquery/jquery.checkboxShiftClick.js
2 files changed, 16 insertions(+), 7 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/jsduck/config.json b/maintenance/jsduck/config.json
index 6f91cad..0197012 100644
--- a/maintenance/jsduck/config.json
+++ b/maintenance/jsduck/config.json
@@ -21,6 +21,7 @@
../../resources/src/jquery/jquery.badge.js,
../../resources/src/jquery/jquery.byteLength.js,
../../resources/src/jquery/jquery.byteLimit.js,
+ ../../resources/src/jquery/jquery.checkboxShiftClick.js,
../../resources/src/jquery/jquery.client.js,
../../resources/src/jquery/jquery.colorUtil.js,
../../resources/src/jquery/jquery.getAttrs.js,
diff --git a/resources/src/jquery/jquery.checkboxShiftClick.js
b/resources/src/jquery/jquery.checkboxShiftClick.js
index b206566..d99e9f0 100644
--- a/resources/src/jquery/jquery.checkboxShiftClick.js
+++ b/resources/src/jquery/jquery.checkboxShiftClick.js
@@ -1,13 +1,15 @@
/**
- * jQuery checkboxShiftClick
- *
- * This will enable checkboxes to be checked or unchecked in a row by clicking
one,
- * holding shift and clicking another one.
- *
- * @author Timo Tijhof, 2011 - 2012
- * @license GPL v2
+ * @class jQuery.plugin.checkboxShiftClick
*/
( function ( $ ) {
+
+ /**
+* Enable checkboxes to be checked or unchecked in a row by clicking
one,
+* holding shift and clicking another one.
+*
+* @return {jQuery}
+* @chainable
+*/
$.fn.checkboxShiftClick = function () {
var prevCheckbox = null,
$box = this;
@@ -32,4 +34,10 @@
} );
return $box;
};
+
+ /**
+* @class jQuery
+* @mixins jQuery.plugin.checkboxShiftClick
+*/
+
}( jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/129961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb0ad7bface406e6e322186f92083b2b8877a8af
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Parent5446 tylerro...@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] add 'rebuild' mode to otrs mail exporter, for use when retra... - change (operations/puppet)
Jgreen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130329
Change subject: add 'rebuild' mode to otrs mail exporter, for use when
retraining Bayes database
..
add 'rebuild' mode to otrs mail exporter, for use when retraining Bayes database
Change-Id: Ic7fe238e6924d0983c2af536cda95c95454f013d
---
M files/otrs/otrs.TicketExport2Mbox.pl
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/29/130329/1
diff --git a/files/otrs/otrs.TicketExport2Mbox.pl
b/files/otrs/otrs.TicketExport2Mbox.pl
index c0ac609..c9b40ec 100755
--- a/files/otrs/otrs.TicketExport2Mbox.pl
+++ b/files/otrs/otrs.TicketExport2Mbox.pl
@@ -60,6 +60,7 @@
'mbox=s' = \$Mbox,
'TicketNumber=s{,}' = \@TicketNumbers,
'TicketID=s{,}' = \@TicketIDs,
+ 'rebuild' = \$Rebuild,
);
# when called from Generic Agent, ARG[0] is TicketNumber and ARG[1] is TicketID
@@ -100,7 +101,7 @@
);
if (($HistoryData{'Queue'} eq 'Junk') and ($HistoryData{'CreateQueue'}
eq 'Junk')) {
printlog(Skip TicketID $TicketID, it was already autoqueued to
Junk.,'debug');
- } elsif ($HistoryData{'State'} =~ /^closed successful$/) {
+ } elsif (($HistoryData{'State'} =~ /^closed successful$/) and (!
defined $Rebuild)) {
printlog(Skip TicketID $TicketID, it is already 'Closed
successful'.,'debug');
} else {
my @TicketArticleIds =
$CommonObject{TicketObject}-ArticleIndex(
@@ -166,6 +167,7 @@
--help display this option help\n .
--mbox /path/to/mboxmbox output file (default
$Mbox)\n .
--close change ticket status to
'closed successful'\n .
+ --rebuild run all messages for Bayes
rebuild (don't skip already-closed messages)\n .
--TicketID no1 no2 no3 export messages by
TicketID\n .
--TicketNumber no1 no2 no3 export messages by
TicketNumber\n\n;
exit;
--
To view, visit https://gerrit.wikimedia.org/r/130329
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7fe238e6924d0983c2af536cda95c95454f013d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen jgr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added an ability to login into the zero config server - change (mediawiki...ZeroRatedMobileAccess)
Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130330
Change subject: Added an ability to login into the zero config server
..
Added an ability to login into the zero config server
Change-Id: Ic91c135c5c48c48041700432da47011de7cf
---
M ZeroRatedMobileAccess.php
M includes/CarrierConfigStore.php
2 files changed, 66 insertions(+), 20 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess
refs/changes/30/130330/1
diff --git a/ZeroRatedMobileAccess.php b/ZeroRatedMobileAccess.php
index 511f6ee..7b5e692 100644
--- a/ZeroRatedMobileAccess.php
+++ b/ZeroRatedMobileAccess.php
@@ -107,6 +107,8 @@
$wgEnableZeroRatedMobileAccessTesting = false;
$wgZeroRatedMobileAccessApiUri = false;
+$wgZeroRatedMobileAccessApiUserName = false;
+$wgZeroRatedMobileAccessApiPassword = false;
$wgZeroRatedMobileAccessDisableCache = false;
$wgZeroRatedMobileAccessEnableZeroConfigPages = false;
$wgZeroRatedMobileAccessEnableESI = false;
diff --git a/includes/CarrierConfigStore.php b/includes/CarrierConfigStore.php
index 7ff9bde..3f9a45c 100644
--- a/includes/CarrierConfigStore.php
+++ b/includes/CarrierConfigStore.php
@@ -3,6 +3,7 @@
namespace Extensions\ZeroRatedMobileAccess;
use FormatJson;
use Http;
+use MWHttpRequest;
use ObjectCache;
use stdClass;
@@ -132,20 +133,23 @@
'format' = 'json',
'titles' = $articleName,
);
- $pageInfo = $this-getPageFromApi( $query );
- if ( $pageInfo !== false ) {
- $revId = array_key_exists ( 'flagged',
$pageInfo ) ?
- $pageInfo['flagged']['stable_revid'] :
- $pageInfo['lastrevid'];
+ $req = $this-initApiRequestObj();
+ if ( $req !== false ) {
+ $pageInfo = $this-getPageFromApi( $req, $query
);
+ if ( $pageInfo !== false ) {
+ $revId = array_key_exists ( 'flagged',
$pageInfo ) ?
+
$pageInfo['flagged']['stable_revid'] :
+ $pageInfo['lastrevid'];
- $query = array(
- 'action' = 'query',
- 'prop' = 'revisions',
- 'rvprop' = 'content',
- 'format' = 'json',
- 'revids' = $revId,
- );
- $pageInfo = $this-getPageFromApi( $query );
+ $query = array(
+ 'action' = 'query',
+ 'prop' = 'revisions',
+ 'rvprop' = 'content',
+ 'format' = 'json',
+ 'revids' = $revId,
+ );
+ $pageInfo = $this-getPageFromApi(
$req, $query );
+ }
}
}
wfProfileOut( __METHOD__ );
@@ -162,20 +166,60 @@
);
}
- /** Given a legal set of API parameters, return page from API
-* @param array $query
-* @return bool|mixed
+ /** Init HTTP request object to make requests to the API, and login
+* @return bool|\CurlHttpRequest|\PhpHttpRequest
*/
- private function getPageFromApi( $query )
- {
+ private function initApiRequestObj() {
global $wgZeroRatedMobileAccessApiUri;
if ( $wgZeroRatedMobileAccessApiUri === false ) {
wfLogWarning( '$wgZeroRatedMobileAccessApiUri is not
set' );
return false;
}
- $apiUri = wfAppendQuery( $wgZeroRatedMobileAccessApiUri, $query
);
- $revInfo = json_decode( $this-http-get( $apiUri,
self::LOCK_TIMEOUT * 0.8 ), true );
+ $apiUri = wfAppendQuery( $wgZeroRatedMobileAccessApiUri, array(
+ 'action' = 'login',
+ 'format' = 'json',
+ ) );
+ $options = array(
+ 'timeout' = self::LOCK_TIMEOUT * 0.4,
+ 'connectTimeout' = 'default',
+ 'method' = 'POST',
+ );
+ $req = MWHttpRequest::factory( $apiUri, $options );
+ global $wgZeroRatedMobileAccessApiUserName,
$wgZeroRatedMobileAccessApiPassword;
+
[MediaWiki-commits] [Gerrit] Usage of a weighted loadfactor in puppetmaster - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130331
Change subject: Usage of a weighted loadfactor in puppetmaster
..
Usage of a weighted loadfactor in puppetmaster
This allows for a more fine tuned distribution of load to backend
puppetmasters through mod_proxy's loadfactor attribute. This is exposed
to class callers via converting the workers parameter to a hash.
Change-Id: I2ba49b278af428da7e390c2b75ad11f04d022420
---
M manifests/role/puppetmaster.pp
M modules/puppetmaster/manifests/init.pp
M modules/puppetmaster/templates/post-merge.erb
M modules/puppetmaster/templates/puppetmaster.erb
4 files changed, 12 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/31/130331/1
diff --git a/manifests/role/puppetmaster.pp b/manifests/role/puppetmaster.pp
index 0cca484..0fba384 100644
--- a/manifests/role/puppetmaster.pp
+++ b/manifests/role/puppetmaster.pp
@@ -17,8 +17,9 @@
class { '::puppetmaster':
allow_from = $role::puppetmaster::config::allow_from,
server_type = 'frontend',
-workers = ['palladium.eqiad.wmnet',
-'strontium.eqiad.wmnet'
+workers = [
+{ 'worker' = 'palladium.eqiad.wmnet', 'loadfactor' =
10, },
+{ 'worker' = 'strontium.eqiad.wmnet', 'loadfactor' =
10, },
],
config = {
'thin_storeconfigs' = true,
diff --git a/modules/puppetmaster/manifests/init.pp
b/modules/puppetmaster/manifests/init.pp
index bbb4ba6..0166a19 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -16,6 +16,10 @@
#- $config:
#Hash containing all config settings for the [master] section of
#puppet.conf (ini-style)
+#- $workers:
+#Array of hashes in the form. If loadfactor is omitted, it is assumed
to
+#be equal to 1
+# [{ 'worker' = 'worker1.example.com', loadfactor = '1' }]
class puppetmaster(
$server_name='puppet',
$bind_address='*',
diff --git a/modules/puppetmaster/templates/post-merge.erb
b/modules/puppetmaster/templates/post-merge.erb
index bbfad1d..f3aab09 100644
--- a/modules/puppetmaster/templates/post-merge.erb
+++ b/modules/puppetmaster/templates/post-merge.erb
@@ -9,9 +9,9 @@
%- if @server_type == 'frontend' -%
# If no key is forwarded then this will use the ready-made equivalent
command
# on worker and ignore our command.
- %- @workers.each do |worker| -%
- %- if worker == @fqdn then next end -%
- ssh -t -t %= worker -% 'cd /var/lib/git/operations/puppet git pull
git submodule update --init'
+ %- @workers.each do |workerhash| -%
+ %- if workerhash['worker'] == @fqdn then next end -%
+ ssh -t -t %= worker['worker'] -% 'cd /var/lib/git/operations/puppet
git pull git submodule update --init'
%- end -%
%- end -%
fi
diff --git a/modules/puppetmaster/templates/puppetmaster.erb
b/modules/puppetmaster/templates/puppetmaster.erb
index 170eec9..59a57fd 100644
--- a/modules/puppetmaster/templates/puppetmaster.erb
+++ b/modules/puppetmaster/templates/puppetmaster.erb
@@ -48,8 +48,8 @@
# The rest gets balanced
ProxyPass / balancer://mycluster/
Proxy balancer://mycluster
- %- @workers.each do |worker| -%
- BalancerMember https://%= worker %:8141 connectiontimeout=1
retry=500 timeout=900
+ %- @workers.each do |workerhash| -%
+ BalancerMember https://%= workerhash['worker'] %:8141
connectiontimeout=1 retry=500 timeout=900 % if workerhash['loadfactor']
%loadfactor=%= workerhash['loadfactor'] %%- end -%
%- end -%
Order allow,deny
Allow from all
--
To view, visit https://gerrit.wikimedia.org/r/130331
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ba49b278af428da7e390c2b75ad11f04d022420
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add 'rebuild' mode to otrs mail exporter, for use when retra... - change (operations/puppet)
Jgreen has submitted this change and it was merged.
Change subject: add 'rebuild' mode to otrs mail exporter, for use when
retraining Bayes database
..
add 'rebuild' mode to otrs mail exporter, for use when retraining Bayes database
Change-Id: Ic7fe238e6924d0983c2af536cda95c95454f013d
---
M files/otrs/otrs.TicketExport2Mbox.pl
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Jgreen: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/otrs/otrs.TicketExport2Mbox.pl
b/files/otrs/otrs.TicketExport2Mbox.pl
index c0ac609..c9b40ec 100755
--- a/files/otrs/otrs.TicketExport2Mbox.pl
+++ b/files/otrs/otrs.TicketExport2Mbox.pl
@@ -60,6 +60,7 @@
'mbox=s' = \$Mbox,
'TicketNumber=s{,}' = \@TicketNumbers,
'TicketID=s{,}' = \@TicketIDs,
+ 'rebuild' = \$Rebuild,
);
# when called from Generic Agent, ARG[0] is TicketNumber and ARG[1] is TicketID
@@ -100,7 +101,7 @@
);
if (($HistoryData{'Queue'} eq 'Junk') and ($HistoryData{'CreateQueue'}
eq 'Junk')) {
printlog(Skip TicketID $TicketID, it was already autoqueued to
Junk.,'debug');
- } elsif ($HistoryData{'State'} =~ /^closed successful$/) {
+ } elsif (($HistoryData{'State'} =~ /^closed successful$/) and (!
defined $Rebuild)) {
printlog(Skip TicketID $TicketID, it is already 'Closed
successful'.,'debug');
} else {
my @TicketArticleIds =
$CommonObject{TicketObject}-ArticleIndex(
@@ -166,6 +167,7 @@
--help display this option help\n .
--mbox /path/to/mboxmbox output file (default
$Mbox)\n .
--close change ticket status to
'closed successful'\n .
+ --rebuild run all messages for Bayes
rebuild (don't skip already-closed messages)\n .
--TicketID no1 no2 no3 export messages by
TicketID\n .
--TicketNumber no1 no2 no3 export messages by
TicketNumber\n\n;
exit;
--
To view, visit https://gerrit.wikimedia.org/r/130329
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7fe238e6924d0983c2af536cda95c95454f013d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen jgr...@wikimedia.org
Gerrit-Reviewer: Jgreen jgr...@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] Revert Assign token to all users and instrument TrackedPage... - change (mediawiki...GettingStarted)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130332
Change subject: Revert Assign token to all users and instrument
TrackedPageContentSaveComplete
..
Revert Assign token to all users and instrument TrackedPageContentSaveComplete
Reverted in 1.24wmf1/2 already because of #64573, but
this revert is for a different breakage:
Varnish generally ignores MediaWiki's Vary: Cookie instruction and caches the
page once, but this does not happen if the Cookie value contains a Cookie that
contains the value session or Token. This token value did just that and
inadvertently broke the site in a spectacular way.
This reverts commit 99286bb24e86185fa7a0759588ec09ee74b2cd8c.
Change-Id: I978282c1a83620b8522399fea9008d0379dce6df
---
M GettingStarted.php
M Hooks.php
D resources/ext.gettingstarted.assignToken.js
3 files changed, 4 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted
refs/changes/32/130332/1
diff --git a/GettingStarted.php b/GettingStarted.php
index 5e9702d..77cf165 100644
--- a/GettingStarted.php
+++ b/GettingStarted.php
@@ -253,13 +253,6 @@
),
) + $gettingStartedModuleInfo;
-$wgResourceModules[ 'ext.gettingstarted.assignToken' ] = array(
- 'scripts' = 'ext.gettingstarted.assignToken.js',
- 'dependencies' = array(
- 'ext.gettingstarted.user'
- ),
-) + $gettingStartedModuleInfo;
-
$wgDefaultUserOptions[ GettingStarted\Hooks::INTRO_OPTION ] = true;
$wgHooks[ 'BeforePageDisplay' ][] =
'GettingStarted\Hooks::onBeforePageDisplay';
@@ -275,4 +268,3 @@
// Extension:CentralAuth's hook
$wgHooks[ 'CentralAuthPostLoginRedirect' ][] =
'GettingStarted\Hooks::onCentralAuthPostLoginRedirect';
$wgHooks[ 'ResourceLoaderTestModules' ][] =
'GettingStarted\Hooks::onResourceLoaderTestModules';
-$wgHooks[ 'PageContentSaveComplete' ][] =
'GettingStarted\Hooks::onPageContentSaveComplete';
\ No newline at end of file
diff --git a/Hooks.php b/Hooks.php
index 21cd710..c172b3c 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -26,10 +26,8 @@
*/
protected static $openTask = null;
- // This is used unprefixed and with a custom path for legacy reasons.
- const OPENTASK_COOKIE_NAME = 'openTask';
-
- const USER_TOKEN_COOKIE_NAME = 'gettingStartedUserToken';
+ // There is used unprefixed and with a custom path for legacy reasons.
+ const COOKIE_NAME = 'openTask';
protected static $COOKIE_OPTIONS = array(
'prefix' = '',
@@ -74,7 +72,7 @@
return;
}
- $cookie = $request-getCookie( self::OPENTASK_COOKIE_NAME, '' );
+ $cookie = $request-getCookie( self::COOKIE_NAME, '' );
$tasks = FormatJson::decode( $cookie, true );
if ( !is_array( $tasks ) ) {
$tasks = array();
@@ -257,9 +255,6 @@
public static function onBeforePageDisplay( OutputPage $out, \Skin
$skin ) {
$user = $out-getUser();
- // Assign token; will support anonymous signup invite experiment
- $out-addModules( 'ext.gettingstarted.assignToken' );
-
if ( self::shouldLoadToolbar( $out, $user ) ) {
// Uses addModuleStyles since no-JS code must load it
this way
// and this avoids double-loading.
@@ -402,7 +397,7 @@
global $wgRequest;
// Set expiration time in the past to expire. Uses -1 day like
User.php.
- $wgRequest-response()-setcookie( self::OPENTASK_COOKIE_NAME,
'', time() - 86400, self::$COOKIE_OPTIONS );
+ $wgRequest-response()-setcookie( self::COOKIE_NAME, '',
time() - 86400, self::$COOKIE_OPTIONS );
return true;
}
@@ -448,29 +443,5 @@
'localBasePath' = __DIR__,
'remoteExtPath' = 'GettingStarted',
);
- }
-
- /**
-* Log server-side event on successful page edit.
-* @see
https://www.mediawiki.org/wiki/Manual:Hooks/PageContentSaveComplete
-* @see https://meta.wikimedia.org/wiki/Schema:PageContentSaveComplete
-*/
- public static function onPageContentSaveComplete( $article, $user,
$content, $summary,
- $isMinor, $isWatch, $section, $flags, $revision, $status,
$baseRevId ) {
-
- global $wgRequest;
-
- $revId = $revision-getId();
- $event = array(
- 'revId' = $revId,
- );
-
- $token = $wgRequest-getCookie( self::USER_TOKEN_COOKIE_NAME );
- if ( $token !== null ) {
- $event['token'] = $token;
- }
-
- \EventLogging::logEvent( 'TrackedPageContentSaveComplete',
7872558, $event );
-
[MediaWiki-commits] [Gerrit] disable Bayes auto-learn for OTRS now that the db is working... - change (operations/puppet)
Jgreen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130333
Change subject: disable Bayes auto-learn for OTRS now that the db is working
well
..
disable Bayes auto-learn for OTRS now that the db is working well
Change-Id: I660c0f867283dd8c3cf92b88b7a3769fa901a7a0
---
M manifests/role/otrs.pp
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/33/130333/1
diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index 934da8b..a22efe4 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -75,9 +75,7 @@
class { 'spamassassin':
required_score = '3.5',
use_bayes = '1',
-# 20140425 jgreen enabled bayes_auto_learn to populate the bayes db
-# after a bug(?) corrupted it
-bayes_auto_learn = '1',
+bayes_auto_learn = '0',
short_report_template = 'true',
spamd_user = 'otrs',
spamd_group = 'otrs',
--
To view, visit https://gerrit.wikimedia.org/r/130333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I660c0f867283dd8c3cf92b88b7a3769fa901a7a0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen jgr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jquery.hidpi: Add jsduck documentation - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: jquery.hidpi: Add jsduck documentation
..
jquery.hidpi: Add jsduck documentation
Change-Id: Ib33eaa488f967efbf45cee83d903e6279b8b782a
---
M maintenance/jsduck/config.json
M resources/src/jquery/jquery.hidpi.js
2 files changed, 24 insertions(+), 10 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/jsduck/config.json b/maintenance/jsduck/config.json
index 344e5c2..fb8166b 100644
--- a/maintenance/jsduck/config.json
+++ b/maintenance/jsduck/config.json
@@ -26,6 +26,7 @@
../../resources/src/jquery/jquery.colorUtil.js,
../../resources/src/jquery/jquery.footHovzer.js,
../../resources/src/jquery/jquery.getAttrs.js,
+ ../../resources/src/jquery/jquery.hidpi.js,
../../resources/src/jquery/jquery.localize.js,
../../resources/src/jquery/jquery.makeCollapsible.js,
../../resources/src/jquery/jquery.spinner.js,
diff --git a/resources/src/jquery/jquery.hidpi.js
b/resources/src/jquery/jquery.hidpi.js
index eb29db9..99889f1 100644
--- a/resources/src/jquery/jquery.hidpi.js
+++ b/resources/src/jquery/jquery.hidpi.js
@@ -1,21 +1,26 @@
/**
- * Responsive images based on 'srcset' and 'window.devicePixelRatio' emulation
where needed.
+ * Responsive images based on `srcset` and `window.devicePixelRatio` emulation
where needed.
*
- * Call $().hidpi() on a document or part of a document to replace image srcs
in that section.
+ * Call `.hidpi()` on a document or part of a document to proces image srcsets
within that section.
*
- * $.devicePixelRatio() can be used to supplement window.devicePixelRatio with
support on
- * some additional browsers.
+ * `$.devicePixelRatio()` can be used as a substitute for
`window.devicePixelRatio`.
+ * It provides a familiar interface to retrieve the pixel ratio for browsers
that don't
+ * implement `window.devicePixelRatio` but do have a different way of getting
it.
+ *
+ * @class jQuery.plugin.hidpi
*/
( function ( $ ) {
/**
- * Detect reported or approximate device pixel ratio.
- * 1.0 means 1 CSS pixel is 1 hardware pixel
- * 2.0 means 1 CSS pixel is 2 hardware pixels
- * etc
+ * Get reported or approximate device pixel ratio.
*
- * Uses window.devicePixelRatio if available, or CSS media queries on IE.
+ * - 1.0 means 1 CSS pixel is 1 hardware pixel
+ * - 2.0 means 1 CSS pixel is 2 hardware pixels
+ * - etc.
*
+ * Uses `window.devicePixelRatio` if available, or CSS media queries on IE.
+ *
+ * @static
* @return {number} Device pixel ratio
*/
$.devicePixelRatio = function () {
@@ -51,6 +56,7 @@
* native srcset support.
*
* @return {jQuery} This selection
+ * @chainable
*/
$.fn.hidpi = function () {
var $target = this,
@@ -81,9 +87,11 @@
*
* Exposed for testing.
*
+ * @private
+ * @static
* @param {number} devicePixelRatio
* @param {string} srcset
- * @return {mixed} null or the matching src string
+ * @return {Mixed} null or the matching src string
*/
$.matchSrcSet = function ( devicePixelRatio, srcset ) {
var candidates,
@@ -112,4 +120,9 @@
return selectedSrc;
};
+/**
+ * @class jQuery
+ * @mixins jQuery.plugin.hidpi
+ */
+
}( jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/129963
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib33eaa488f967efbf45cee83d903e6279b8b782a
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Parent5446 tylerro...@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] jquery.footHovzer: Add jsduck documentation - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: jquery.footHovzer: Add jsduck documentation
..
jquery.footHovzer: Add jsduck documentation
Change-Id: I554a64951e47b2d8aa0a791619337f4b96e94f48
---
M maintenance/jsduck/config.json
M resources/src/jquery/jquery.footHovzer.js
2 files changed, 37 insertions(+), 15 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/jsduck/config.json b/maintenance/jsduck/config.json
index 0197012..344e5c2 100644
--- a/maintenance/jsduck/config.json
+++ b/maintenance/jsduck/config.json
@@ -24,6 +24,7 @@
../../resources/src/jquery/jquery.checkboxShiftClick.js,
../../resources/src/jquery/jquery.client.js,
../../resources/src/jquery/jquery.colorUtil.js,
+ ../../resources/src/jquery/jquery.footHovzer.js,
../../resources/src/jquery/jquery.getAttrs.js,
../../resources/src/jquery/jquery.localize.js,
../../resources/src/jquery/jquery.makeCollapsible.js,
diff --git a/resources/src/jquery/jquery.footHovzer.js
b/resources/src/jquery/jquery.footHovzer.js
index 56fc32d..de745c3 100644
--- a/resources/src/jquery/jquery.footHovzer.js
+++ b/resources/src/jquery/jquery.footHovzer.js
@@ -1,14 +1,5 @@
/**
- * Utility to stack stuff in an overlay fixed on the bottom of the page.
- *
- * Usage:
- * code
- * var hovzer = $.getFootHovzer();
- * hovzer.$.append( $myCollection );
- * hovzer.update();
- * /code
- *
- * @author Timo Tijhof, 2012
+ * @class jQuery.plugin.footHovzer
*/
( function ( $ ) {
var $hovzer, footHovzer, prevHeight, newHeight;
@@ -20,13 +11,43 @@
return $hovzer;
}
+ /**
+* Utility to stack stuff in an overlay fixed on the bottom of the page.
+*
+* Usage:
+*
+* var hovzer = $.getFootHovzer();
+* hovzer.$.append( $myCollection );
+* hovzer.update();
+*
+* @static
+* @inheritable
+* @return {jQuery.footHovzer}
+*/
+ $.getFootHovzer = function () {
+ footHovzer.$ = getHovzer();
+ return footHovzer;
+ };
+
+ /**
+* @private
+* @class jQuery.footHovzer
+*/
footHovzer = {
+
+ /**
+* @property {jQuery} $ The stack container
+*/
+
+ /**
+* Update dimensions of stack to account for changes in the
subtree.
+*/
update: function () {
var $body;
$body = $( 'body' );
if ( prevHeight === undefined ) {
- prevHeight = getHovzer().outerHeight(
/*includeMargin=*/true );
+ prevHeight = getHovzer().outerHeight( /*
includeMargin = */ true );
$body.css( 'paddingBottom', '+=' + prevHeight +
'px' );
} else {
newHeight = getHovzer().outerHeight( true );
@@ -37,9 +58,9 @@
}
};
- $.getFootHovzer = function () {
- footHovzer.$ = getHovzer();
- return footHovzer;
- };
+ /**
+* @class jQuery
+* @mixins jQuery.plugin.footHovzer
+*/
}( jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/129962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I554a64951e47b2d8aa0a791619337f4b96e94f48
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Parent5446 tylerro...@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] bugzilla: add ferm rules - change (operations/puppet)
Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130334
Change subject: bugzilla: add ferm rules
..
bugzilla: add ferm rules
Change-Id: I272af027fd7dc7a686b50c4fe36712847d0bdf6c
---
M manifests/role/bugzilla.pp
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/34/130334/1
diff --git a/manifests/role/bugzilla.pp b/manifests/role/bugzilla.pp
index 672622b..e9360af 100644
--- a/manifests/role/bugzilla.pp
+++ b/manifests/role/bugzilla.pp
@@ -10,5 +10,15 @@
db_user = 'bugs',
}
+ferm::service { 'bugzilla_http':
+proto = 'tcp',
+port = '80',
+}
+
+ferm::service { 'bugzilla_https':
+proto = 'tcp',
+port = '443',
+}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/130334
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I272af027fd7dc7a686b50c4fe36712847d0bdf6c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] disable Bayes auto-learn for OTRS now that the db is working... - change (operations/puppet)
Jgreen has submitted this change and it was merged.
Change subject: disable Bayes auto-learn for OTRS now that the db is working
well
..
disable Bayes auto-learn for OTRS now that the db is working well
Change-Id: I660c0f867283dd8c3cf92b88b7a3769fa901a7a0
---
M manifests/role/otrs.pp
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Jgreen: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index 934da8b..a22efe4 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -75,9 +75,7 @@
class { 'spamassassin':
required_score = '3.5',
use_bayes = '1',
-# 20140425 jgreen enabled bayes_auto_learn to populate the bayes db
-# after a bug(?) corrupted it
-bayes_auto_learn = '1',
+bayes_auto_learn = '0',
short_report_template = 'true',
spamd_user = 'otrs',
spamd_group = 'otrs',
--
To view, visit https://gerrit.wikimedia.org/r/130333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I660c0f867283dd8c3cf92b88b7a3769fa901a7a0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen jgr...@wikimedia.org
Gerrit-Reviewer: Jgreen jgr...@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] Reorder data types - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review. https://gerrit.wikimedia.org/r/130335 Change subject: Reorder data types .. Reorder data types Change-Id: I52ee05b5b5c7347e0ae7a3dc0d23ab77162cf6e3 --- M lib/config/WikibaseLib.default.php M lib/includes/WikibaseDataTypeBuilders.php 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/35/130335/1 diff --git a/lib/config/WikibaseLib.default.php b/lib/config/WikibaseLib.default.php index c4be0fc..88ae9a5 100644 --- a/lib/config/WikibaseLib.default.php +++ b/lib/config/WikibaseLib.default.php @@ -98,13 +98,13 @@ ), 'dataTypes' = array( - 'wikibase-item', 'commonsMedia', + 'globe-coordinate', + 'quantity', 'string', 'time', - 'globe-coordinate', 'url', - 'quantity' + 'wikibase-item', ), // URL schemes allowed for values of the URL type. diff --git a/lib/includes/WikibaseDataTypeBuilders.php b/lib/includes/WikibaseDataTypeBuilders.php index aef75e7..ab6e6a0 100644 --- a/lib/includes/WikibaseDataTypeBuilders.php +++ b/lib/includes/WikibaseDataTypeBuilders.php @@ -69,13 +69,13 @@ // be used for the UI, and the factory should simply know all data types always. $types = array( - 'wikibase-item' = array( $this, 'buildItemType' ), 'commonsMedia' = array( $this, 'buildMediaType' ), + 'globe-coordinate' = array( $this, 'buildCoordinateType' ), + 'quantity'= array( $this, 'buildQuantityType' ), 'string' = array( $this, 'buildStringType' ), 'time' = array( $this, 'buildTimeType' ), - 'globe-coordinate' = array( $this, 'buildCoordinateType' ), 'url' = array( $this, 'buildUrlType' ), - 'quantity'= array( $this, 'buildQuantityType' ) + 'wikibase-item' = array( $this, 'buildItemType' ), ); $experimental = array( -- To view, visit https://gerrit.wikimedia.org/r/130335 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52ee05b5b5c7347e0ae7a3dc0d23ab77162cf6e3 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] Work around cache explosion from gettingStarted feature - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130336
Change subject: Work around cache explosion from gettingStarted feature
..
Work around cache explosion from gettingStarted feature
Related:
https://gerrit.wikimedia.org/r/#/c/130134/1
https://gerrit.wikimedia.org/r/#/q/Ib235e6175ffdd7a17d459d449e047e524e3b8819,n,z
We probably want this fixed in MW, but this works around it for now
Change-Id: Ice1648d1c240af087992f31781887f561f55b288
---
M templates/varnish/text-common.inc.vcl.erb
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/36/130336/1
diff --git a/templates/varnish/text-common.inc.vcl.erb
b/templates/varnish/text-common.inc.vcl.erb
index 010b274..eccf7aa 100644
--- a/templates/varnish/text-common.inc.vcl.erb
+++ b/templates/varnish/text-common.inc.vcl.erb
@@ -36,7 +36,10 @@
/* A session or token cookie will prevent caching if varied on,
* move the Cookie header out of the way otherwise
*/
- if (req.http.Cookie ~ ([sS]ession|Token)=) {
+ /* gettingStarted exclusion is to work around e.g.
enwikigettingStartedUserToken=
+* which probably shouldn't end in Token= ...
+*/
+ if (req.http.Cookie ~ ([sS]ession|Token)= req.http.Cookie !~
gettingStarted) {
set req.hash_ignore_busy = true;
} else {
call cookie_munging;
--
To view, visit https://gerrit.wikimedia.org/r/130336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice1648d1c240af087992f31781887f561f55b288
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add monolingual-text data type to experimental features - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130337
Change subject: Add monolingual-text data type to experimental features
..
Add monolingual-text data type to experimental features
We still need parsers, formatters and the frontend.
Change-Id: I3aeeb935d685e3eda16b44d21af0ac3f2a84872c
---
M lib/config/WikibaseLib.default.php
M lib/includes/WikibaseDataTypeBuilders.php
2 files changed, 33 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/37/130337/1
diff --git a/lib/config/WikibaseLib.default.php
b/lib/config/WikibaseLib.default.php
index c4be0fc..369eba9 100644
--- a/lib/config/WikibaseLib.default.php
+++ b/lib/config/WikibaseLib.default.php
@@ -115,12 +115,10 @@
// experimental stuff
if ( defined( 'WB_EXPERIMENTAL_FEATURES' ) WB_EXPERIMENTAL_FEATURES
) {
// experimental data types
- /*
$defaults['dataTypes'] = array_merge( $defaults['dataTypes'],
array(
- //'monolingual-text',
+ 'monolingual-text',
//'multilingual-text',
) );
- */
}
return $defaults;
diff --git a/lib/includes/WikibaseDataTypeBuilders.php
b/lib/includes/WikibaseDataTypeBuilders.php
index aef75e7..9c3895e 100644
--- a/lib/includes/WikibaseDataTypeBuilders.php
+++ b/lib/includes/WikibaseDataTypeBuilders.php
@@ -4,12 +4,14 @@
use DataTypes\DataType;
use DataValues\TimeValue;
+use Wikibase\Utils;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\EntityLookup;
use Wikibase\Validators\CompositeValidator;
use Wikibase\Validators\DataFieldValidator;
use Wikibase\Validators\DataValueValidator;
use Wikibase\Validators\EntityExistsValidator;
+use Wikibase\Validators\MembershipValidator;
use Wikibase\Validators\NumberRangeValidator;
use Wikibase\Validators\NumberValidator;
use Wikibase\Validators\RegexValidator;
@@ -79,7 +81,7 @@
);
$experimental = array(
- // 'monolingual-text' = array( $this,
'buildMonolingualTextType' ),
+ 'monolingual-text' = array( $this,
'buildMonolingualTextType' ),
// 'multilingual-text' = array( $this,
'buildMultilingualTextType' ),
);
@@ -134,6 +136,35 @@
return new DataType( $id, 'string', array( new TypeValidator(
'DataValues\DataValue' ), $topValidator ) );
}
+ public function buildMonolingualTextType( $id ) {
+ $validators = array();
+
+ $validators[] = new TypeValidator( 'string' );
+ //TODO: validate UTF8 (here and elsewhere)
+ $validators[] = new StringLengthValidator( 1, 400, 'mb_strlen'
);
+ $validators[] = new RegexValidator( '/^\s|[\r\n\t]|\s$/', true
); // no leading/trailing whitespace, no line breaks.
+
+ $textValidator = new DataFieldValidator(
+ 'text',
+ new CompositeValidator( $validators, true ) //Note:
each validator is fatal
+ );
+
+ $validators = array();
+ $validators[] = new MembershipValidator(
Utils::getLanguageCodes() );
+
+ $languageValidator = new DataFieldValidator(
+ 'language',
+ new CompositeValidator( $validators, true )
+ );
+
+ $topValidator = new CompositeValidator(
+ array( $textValidator, $languageValidator ),
+ true
+ );
+
+ return new DataType( $id, 'monolingual-text', array( new
TypeValidator( 'DataValues\DataValue' ), $topValidator ) );
+ }
+
public function buildTimeType( $id ) {
$validators = array();
$validators[] = new TypeValidator( 'array' );
--
To view, visit https://gerrit.wikimedia.org/r/130337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3aeeb935d685e3eda16b44d21af0ac3f2a84872c
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] Work around cache explosion from gettingStarted feature - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Work around cache explosion from gettingStarted feature
..
Work around cache explosion from gettingStarted feature
We probably want this fixed in MW, but this works around it for now
Change-Id: Ice1648d1c240af087992f31781887f561f55b288
---
M templates/varnish/text-common.inc.vcl.erb
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/templates/varnish/text-common.inc.vcl.erb
b/templates/varnish/text-common.inc.vcl.erb
index 010b274..eccf7aa 100644
--- a/templates/varnish/text-common.inc.vcl.erb
+++ b/templates/varnish/text-common.inc.vcl.erb
@@ -36,7 +36,10 @@
/* A session or token cookie will prevent caching if varied on,
* move the Cookie header out of the way otherwise
*/
- if (req.http.Cookie ~ ([sS]ession|Token)=) {
+ /* gettingStarted exclusion is to work around e.g.
enwikigettingStartedUserToken=
+* which probably shouldn't end in Token= ...
+*/
+ if (req.http.Cookie ~ ([sS]ession|Token)= req.http.Cookie !~
gettingStarted) {
set req.hash_ignore_busy = true;
} else {
call cookie_munging;
--
To view, visit https://gerrit.wikimedia.org/r/130336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice1648d1c240af087992f31781887f561f55b288
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set precision in MWTimeIsoParser - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130339
Change subject: Set precision in MWTimeIsoParser
..
Set precision in MWTimeIsoParser
instead of automagically handling in ValueParsers\TimeParser
Fixes handling of input like '10. century BC'
includes partial revert of changes to test in I927209e2
(the tests were doing the right thing before that)
Change-Id: I74f88c0f629614e93bc33d4b1d893da594a0276e
---
M lib/includes/parsers/MWTimeIsoParser.php
M lib/tests/phpunit/parsers/MwTimeIsoParserTest.php
2 files changed, 70 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/39/130339/1
diff --git a/lib/includes/parsers/MWTimeIsoParser.php
b/lib/includes/parsers/MWTimeIsoParser.php
index b0230bc..526f7bb 100644
--- a/lib/includes/parsers/MWTimeIsoParser.php
+++ b/lib/includes/parsers/MWTimeIsoParser.php
@@ -111,8 +111,8 @@
* @return TimeValue|bool
*/
private function reconvertOutputString( $value ) {
- foreach( self::$precisionMsgKeys as $repeat0Char = $msgKeys ) {
- foreach( $msgKeys as $msgKey ) {
+ foreach( self::$precisionMsgKeys as $repeat0Char =
$msgKeysGroup ) {
+ foreach( $msgKeysGroup as $msgKey ) {
$msg = new Message( $msgKey );
//FIXME: Use the language passed in options!
//The only reason we are not currently doing
this is due to the formatting not currently Localizing
@@ -120,28 +120,19 @@
//$msg-inLanguage( $this-lang ); // todo
check other translations?
$msg-inLanguage( 'en' );
$msgText = $msg-text();
- $isBceMsg = strstr( $msgKey, '-BCE-' );
+ $isBceMsg = $this-isBceMsg( $msgKey );
list( $start, $end ) = explode( '$1' , $msgText
, 2 );
if( preg_match( '/^\s*' . preg_quote( $start )
. '(.+?)' . preg_quote( $end ) . '\s*$/i', $value, $matches ) ) {
list( , $number ) = $matches;
- $number =
$this-lang-parseFormattedNumber( $number );
-
- return $this-getTimeFromYear(
- $number . str_repeat( '0',
$repeat0Char ),
- $isBceMsg
- );
+ return $this-parseNumber( $number,
$repeat0Char, $isBceMsg );
}
+
// If the msg string ends with BCE also check
for BC
if( substr_compare( $end, 'BCE', - 3, 3 ) === 0
) {
if( preg_match( '/^\s*' . preg_quote(
$start ) . '(.+?)' . preg_quote( substr( $end, 0, -1 ) ) . '\s*$/i', $value,
$matches ) ) {
list( , $number ) = $matches;
- $number =
$this-lang-parseFormattedNumber( $number );
-
- return $this-getTimeFromYear(
- $number . str_repeat(
'0', $repeat0Char ),
- $isBceMsg
- );
+ return $this-parseNumber(
$number, $repeat0Char, $isBceMsg );
}
}
@@ -149,6 +140,32 @@
}
return false;
+ }
+
+ /**
+* @param string $number
+* @param int $repeat0Char
+* @param boolean $isBceMsg
+*
+* @return TimeValue
+*/
+ private function parseNumber( $number, $repeat0Char, $isBceMsg ) {
+ $number = $this-lang-parseFormattedNumber( $number );
+ $year = $number . str_repeat( '0', $repeat0Char );
+
+ $precision = $this-determinePrecision( $year );
+ $this-setPrecision( $precision );
+
+ return $this-getTimeFromYear( $year, $isBceMsg );
+ }
+
+ /**
+* @param string $msgKey
+*
+* @return boolean
+*/
+ private function isBceMsg( $msgKey ) {
+ return strstr( $msgKey, '-BCE-' );
}
/**
@@ -163,8 +180,36 @@
} else {
$sign = EraParser::CURRENT_ERA;
}
+
$timeString = $sign . $year . '-00-00T00:00:00Z';
+
return $this-timeValueTimeParser-parse( $timeString );
[MediaWiki-commits] [Gerrit] Use data-values/time 0.5.2, fix for year time parsing - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/130338 Change subject: Use data-values/time 0.5.2, fix for year time parsing .. Use data-values/time 0.5.2, fix for year time parsing Change-Id: I927209e293e5bf05240705686cab040468a6b445 --- M composer.json M lib/tests/phpunit/parsers/MwTimeIsoParserTest.php 2 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/38/130338/1 diff --git a/composer.json b/composer.json index 4629a20..0958102 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ data-values/geo: ~0.1.0, data-values/interfaces: ~0.1.4, data-values/number: ~0.3.0, - data-values/time: ~0.5.1, + data-values/time: ~0.5.2, data-values/validators: ~0.1.0, data-values/data-types: ~0.2.0, data-values/serialization: ~1.0, diff --git a/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php b/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php index a681b6c..194352c 100644 --- a/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php +++ b/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php @@ -83,11 +83,11 @@ '55. millennium' = array( '+00055000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ), '10. century' = - array( '+1000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ), + array( '+1000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), '12. century' = - array( '+1200-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_100a , TimeFormatter::CALENDAR_GREGORIAN ), + array( '+1200-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), '10s' = - array( '+0010-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_10a , TimeFormatter::CALENDAR_GREGORIAN ), + array( '+0010-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), '12s' = array( '+0012-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), @@ -129,11 +129,11 @@ '55. millennium BCE' = array( '-00055000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ), '10. century BCE' = - array( '-1000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ), + array( '-1000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), '12. century BCE' = - array( '-1200-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_100a , TimeFormatter::CALENDAR_GREGORIAN ), + array( '-1200-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), '10s BCE' = - array( '-0010-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_10a , TimeFormatter::CALENDAR_GREGORIAN ), + array( '-0010-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), '12s BCE' = array( '-0012-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), // also parse BC @@ -142,11 +142,11 @@ '55. millennium BC' = array( '-00055000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ), '10. century BC' = - array( '-1000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ), + array( '-1000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), '12. century BC' = - array( '-1200-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_100a ,
[MediaWiki-commits] [Gerrit] Add test cases for year time parsing - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130340
Change subject: Add test cases for year time parsing
..
Add test cases for year time parsing
actual fix is in DataValues time component, but
added tests that things also work correctly in Wikibase
time parsers.
https://github.com/DataValues/Time/pull/16
Bug: 64537
Change-Id: Ib7c698de517d226dcbc89d4c9dacd09430eb0e19
---
M lib/tests/phpunit/parsers/TimeParserTest.php
M lib/tests/phpunit/parsers/YearTimeParserTest.php
2 files changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/40/130340/1
diff --git a/lib/tests/phpunit/parsers/TimeParserTest.php
b/lib/tests/phpunit/parsers/TimeParserTest.php
index d320362..d600cda 100644
--- a/lib/tests/phpunit/parsers/TimeParserTest.php
+++ b/lib/tests/phpunit/parsers/TimeParserTest.php
@@ -48,6 +48,10 @@
//Wikibase\Lib\YearTimeParser
'1999' =
array( '+1999-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ '2000' =
+ array( '+2000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ '2010' =
+ array( '+2010-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
'1' =
array( '+0001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
'-11' =
@@ -94,7 +98,6 @@
array( '-2013-07-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeFormatter::CALENDAR_GREGORIAN ),
'-10100-02-29' =
array( '-00010100-03-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeFormatter::CALENDAR_GREGORIAN ),
-
);
foreach ( $valid as $value = $expected ) {
diff --git a/lib/tests/phpunit/parsers/YearTimeParserTest.php
b/lib/tests/phpunit/parsers/YearTimeParserTest.php
index 36a1777..d6ab814 100644
--- a/lib/tests/phpunit/parsers/YearTimeParserTest.php
+++ b/lib/tests/phpunit/parsers/YearTimeParserTest.php
@@ -62,6 +62,10 @@
$valid = array(
'1999' =
array( '+1999-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ '2000' =
+ array( '+2000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ '2010' =
+ array( '+2010-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
'200' =
array( '+0200-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeFormatter::CALENDAR_GREGORIAN ),
'20' =
--
To view, visit https://gerrit.wikimedia.org/r/130340
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7c698de517d226dcbc89d4c9dacd09430eb0e19
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: mw1.24-wmf2
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Revert Unset $wgUseXVO - change (operations/mediawiki-config)
BBlack has submitted this change and it was merged. Change subject: Revert Revert Unset $wgUseXVO .. Revert Revert Unset $wgUseXVO This apparently wasn't the culprit This reverts commit 557904bf6959acb248212ef73f49a1d21c274ba0. Change-Id: I14f85714e21634b1bbfc3ecf96b88cb130b8be06 --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 04dbd27..60e1ede 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10458,10 +10458,6 @@ 'default' = 1024, ), -'wgUseXVO' = array( - 'default' = true, -), - 'wmgUseLocalisationUpdate' = array( 'default' = true, ), -- To view, visit https://gerrit.wikimedia.org/r/130341 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I14f85714e21634b1bbfc3ecf96b88cb130b8be06 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Revert Unset $wgUseXVO - change (operations/mediawiki-config)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/130341 Change subject: Revert Revert Unset $wgUseXVO .. Revert Revert Unset $wgUseXVO This apparently wasn't the culprit This reverts commit 557904bf6959acb248212ef73f49a1d21c274ba0. Change-Id: I14f85714e21634b1bbfc3ecf96b88cb130b8be06 --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/41/130341/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 04dbd27..60e1ede 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10458,10 +10458,6 @@ 'default' = 1024, ), -'wgUseXVO' = array( - 'default' = true, -), - 'wmgUseLocalisationUpdate' = array( 'default' = true, ), -- To view, visit https://gerrit.wikimedia.org/r/130341 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14f85714e21634b1bbfc3ecf96b88cb130b8be06 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Revert Set domain to TLD on GeoIP cookie - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130342
Change subject: Revert Revert Set domain to TLD on GeoIP cookie
..
Revert Revert Set domain to TLD on GeoIP cookie
Apparently not causing current prod issue, un-reverting.
This reverts commit bcc85b3806aba03c354d266a7715c52de21c6d43.
Change-Id: Ibcb07f4d513863d9970fa76eede5dce48f8e5f4e
---
M templates/varnish/geoip.inc.vcl.erb
1 file changed, 58 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/42/130342/1
diff --git a/templates/varnish/geoip.inc.vcl.erb
b/templates/varnish/geoip.inc.vcl.erb
index b9e5d71..3cbb2b2 100644
--- a/templates/varnish/geoip.inc.vcl.erb
+++ b/templates/varnish/geoip.inc.vcl.erb
@@ -22,6 +22,7 @@
char * geo_get_xff_ip (const struct sess *sp);
char * geo_sanitize_for_cookie (char *string);
void geo_set_cache_control (const struct sess *sp);
+ const char * geo_get_top_cookie_domain (const char *host);
void
geo_init() {
@@ -93,6 +94,51 @@
VRT_SetHdr(sp, HDR_OBJ, \016Last-Modified:, now,
vrt_magic_string_end);
VRT_SetHdr(sp, HDR_OBJ, \016Cache-Control:, private,
max-age=86400, s-maxage=0, vrt_magic_string_end);
}
+
+
+ /*
+* Extract the topmost part of the domain name for which a cookie may
be set.
+* This consists of the public suffix (e.g., 'org') plus one more level.
+*
+* In Wikimedia's case, this is always the top two parts of the name
(for example,
+* 'wikipedia.org' for 'en.m.wikipedia.org'. But we handle other common
cases correctly too,
+* like 'news.bbc.co.uk' (which may set cookies for bbc.co.uk, but not
the entire co.uk public
+* suffix), by assuming that if either of the top two levels is less
than three characters
+* long, then the public suffix contains two parts. A fully
comprehensive and correct solution
+* would require checking against a public suffix database like
https://publicsuffix.org/.
+*/
+ const char *
+ geo_get_top_cookie_domain(const char *host) {
+ const char *last, *second_last, *third_last, *pos,
*top_cookie_domain;
+
+ if (host == NULL) {
+ return NULL;
+ }
+
+ last = second_last = third_last = host;
+ for (pos = host; *pos != '\0'; pos++) {
+ if (*pos == '.') {
+ third_last = second_last;
+ second_last = last;
+ last = pos;
+ }
+ }
+
+ /* If either the second- or top-level domain is less than three
characters long,*/
+ /* assume that the domain uses a two-part public suffix (like
'.co.uk') and include */
+ /* one additional level in the result.
*/
+ if ((pos - last) = 3 || (last - second_last) = 3) {
+ top_cookie_domain = third_last;
+ } else {
+ top_cookie_domain = second_last;
+ }
+
+ if (*top_cookie_domain == '.') {
+ top_cookie_domain++;
+ }
+
+ return top_cookie_domain;
+ }
}C
sub geoip_lookup {
@@ -141,7 +187,8 @@
const char *cookie_out = NULL;
char cookie_buf[255];
- char *ip = geo_get_xff_ip(sp);
+ const char *host = VRT_GetHdr(sp, HDR_REQ, \005host:);
+ const char *ip = geo_get_xff_ip(sp);
int af = geo_get_addr_family(ip);
if (af == -1) {
ip = VRT_IP_string(sp, VRT_r_client_ip(sp));
@@ -151,21 +198,26 @@
geo_init();
record = GeoIP_record_by_addr(gi, ip);
+ int snp_len;
if (record) {
/* Set-Cookie:
GeoIP=US:San_Francisco:37.7749:-122.4194:v4; path=/ */
- int snp_len = snprintf(cookie_buf, sizeof(cookie_buf),
GeoIP=%s:%s:%.4f:%.4f:%s; path=/,
+ snp_len = snprintf(cookie_buf, sizeof(cookie_buf),
GeoIP=%s:%s:%.4f:%.4f:%s; Path=/; Domain=.%s,
record-country_code ?
geo_sanitize_for_cookie(record-country_code) : ,
record-city ?
geo_sanitize_for_cookie(record-city) : ,
record-latitude,
record-longitude,
- (af == AF_INET6) ? v6 : v4
+ (af == AF_INET6) ? v6 : v4,
+ geo_get_top_cookie_domain(host)
);
- if (snp_len sizeof(cookie_buf)) /*
[MediaWiki-commits] [Gerrit] Revert Revert Set domain to TLD on GeoIP cookie - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Revert Revert Set domain to TLD on GeoIP cookie
..
Revert Revert Set domain to TLD on GeoIP cookie
Apparently not causing current prod issue, un-reverting.
This reverts commit bcc85b3806aba03c354d266a7715c52de21c6d43.
Change-Id: Ibcb07f4d513863d9970fa76eede5dce48f8e5f4e
---
M templates/varnish/geoip.inc.vcl.erb
1 file changed, 58 insertions(+), 6 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/templates/varnish/geoip.inc.vcl.erb
b/templates/varnish/geoip.inc.vcl.erb
index b9e5d71..3cbb2b2 100644
--- a/templates/varnish/geoip.inc.vcl.erb
+++ b/templates/varnish/geoip.inc.vcl.erb
@@ -22,6 +22,7 @@
char * geo_get_xff_ip (const struct sess *sp);
char * geo_sanitize_for_cookie (char *string);
void geo_set_cache_control (const struct sess *sp);
+ const char * geo_get_top_cookie_domain (const char *host);
void
geo_init() {
@@ -93,6 +94,51 @@
VRT_SetHdr(sp, HDR_OBJ, \016Last-Modified:, now,
vrt_magic_string_end);
VRT_SetHdr(sp, HDR_OBJ, \016Cache-Control:, private,
max-age=86400, s-maxage=0, vrt_magic_string_end);
}
+
+
+ /*
+* Extract the topmost part of the domain name for which a cookie may
be set.
+* This consists of the public suffix (e.g., 'org') plus one more level.
+*
+* In Wikimedia's case, this is always the top two parts of the name
(for example,
+* 'wikipedia.org' for 'en.m.wikipedia.org'. But we handle other common
cases correctly too,
+* like 'news.bbc.co.uk' (which may set cookies for bbc.co.uk, but not
the entire co.uk public
+* suffix), by assuming that if either of the top two levels is less
than three characters
+* long, then the public suffix contains two parts. A fully
comprehensive and correct solution
+* would require checking against a public suffix database like
https://publicsuffix.org/.
+*/
+ const char *
+ geo_get_top_cookie_domain(const char *host) {
+ const char *last, *second_last, *third_last, *pos,
*top_cookie_domain;
+
+ if (host == NULL) {
+ return NULL;
+ }
+
+ last = second_last = third_last = host;
+ for (pos = host; *pos != '\0'; pos++) {
+ if (*pos == '.') {
+ third_last = second_last;
+ second_last = last;
+ last = pos;
+ }
+ }
+
+ /* If either the second- or top-level domain is less than three
characters long,*/
+ /* assume that the domain uses a two-part public suffix (like
'.co.uk') and include */
+ /* one additional level in the result.
*/
+ if ((pos - last) = 3 || (last - second_last) = 3) {
+ top_cookie_domain = third_last;
+ } else {
+ top_cookie_domain = second_last;
+ }
+
+ if (*top_cookie_domain == '.') {
+ top_cookie_domain++;
+ }
+
+ return top_cookie_domain;
+ }
}C
sub geoip_lookup {
@@ -141,7 +187,8 @@
const char *cookie_out = NULL;
char cookie_buf[255];
- char *ip = geo_get_xff_ip(sp);
+ const char *host = VRT_GetHdr(sp, HDR_REQ, \005host:);
+ const char *ip = geo_get_xff_ip(sp);
int af = geo_get_addr_family(ip);
if (af == -1) {
ip = VRT_IP_string(sp, VRT_r_client_ip(sp));
@@ -151,21 +198,26 @@
geo_init();
record = GeoIP_record_by_addr(gi, ip);
+ int snp_len;
if (record) {
/* Set-Cookie:
GeoIP=US:San_Francisco:37.7749:-122.4194:v4; path=/ */
- int snp_len = snprintf(cookie_buf, sizeof(cookie_buf),
GeoIP=%s:%s:%.4f:%.4f:%s; path=/,
+ snp_len = snprintf(cookie_buf, sizeof(cookie_buf),
GeoIP=%s:%s:%.4f:%.4f:%s; Path=/; Domain=.%s,
record-country_code ?
geo_sanitize_for_cookie(record-country_code) : ,
record-city ?
geo_sanitize_for_cookie(record-city) : ,
record-latitude,
record-longitude,
- (af == AF_INET6) ? v6 : v4
+ (af == AF_INET6) ? v6 : v4,
+ geo_get_top_cookie_domain(host)
);
- if (snp_len sizeof(cookie_buf)) /* don't use
truncated output */
-
[MediaWiki-commits] [Gerrit] jquery.tabIndex: Add jsduck documentation - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: jquery.tabIndex: Add jsduck documentation
..
jquery.tabIndex: Add jsduck documentation
Change-Id: I73ec9b6e8a5fcc95ea71dcaa19f9b9aa481fde18
---
M maintenance/jsduck/config.json
M resources/src/jquery/jquery.tabIndex.js
2 files changed, 11 insertions(+), 5 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/jsduck/config.json b/maintenance/jsduck/config.json
index fb8166b..d4d78f9 100644
--- a/maintenance/jsduck/config.json
+++ b/maintenance/jsduck/config.json
@@ -30,6 +30,7 @@
../../resources/src/jquery/jquery.localize.js,
../../resources/src/jquery/jquery.makeCollapsible.js,
../../resources/src/jquery/jquery.spinner.js,
+ ../../resources/src/jquery/jquery.tabIndex.js,
../../resources/lib/oojs,
../../resources/lib/oojs-ui
]
diff --git a/resources/src/jquery/jquery.tabIndex.js
b/resources/src/jquery/jquery.tabIndex.js
index cdae0ba..46cc8f2 100644
--- a/resources/src/jquery/jquery.tabIndex.js
+++ b/resources/src/jquery/jquery.tabIndex.js
@@ -1,12 +1,12 @@
/**
- * jQuery tabIndex
+ * @class jQuery.plugin.tabIndex
*/
( function ( $ ) {
/**
-* Finds the lowerst tabindex in use within a selection
+* Find the lowest tabindex in use within a selection.
*
-* @return number Lowest tabindex on the page
+* @return {number} Lowest tabindex on the page
*/
$.fn.firstTabIndex = function () {
var minTabIndex = null;
@@ -29,9 +29,9 @@
};
/**
-* Finds the highest tabindex in use within a selection
+* Find the highest tabindex in use within a selection.
*
-* @return number Highest tabindex on the page
+* @return {number} Highest tabindex on the page
*/
$.fn.lastTabIndex = function () {
var maxTabIndex = null;
@@ -49,4 +49,9 @@
return maxTabIndex;
};
+ /**
+* @class jQuery
+* @mixins jQuery.plugin.tabIndex
+*/
+
}( jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/129966
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I73ec9b6e8a5fcc95ea71dcaa19f9b9aa481fde18
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: TheDJ hartman.w...@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] JSDuck-ify /resources/mediawiki.action/* - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: JSDuck-ify /resources/mediawiki.action/*
..
JSDuck-ify /resources/mediawiki.action/*
Change-Id: If7dcd9675b54fceb5b2b10b30cc26844a4907f79
---
M maintenance/jsduck/config.json
M resources/src/mediawiki.action/mediawiki.action.edit.preview.js
M resources/src/mediawiki.action/mediawiki.action.edit.styles.css
M resources/src/mediawiki.action/mediawiki.action.history.js
M resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
M resources/src/mediawiki.action/mediawiki.action.view.metadata.js
M resources/src/mediawiki.action/mediawiki.action.view.redirectToFragment.js
M resources/src/mediawiki.action/mediawiki.action.view.rightClickEdit.js
8 files changed, 11 insertions(+), 10 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/jsduck/config.json b/maintenance/jsduck/config.json
index d4d78f9..1d91288 100644
--- a/maintenance/jsduck/config.json
+++ b/maintenance/jsduck/config.json
@@ -9,8 +9,7 @@
--: [
./external.js,
../../resources/src/mediawiki,
- ../../resources/src/mediawiki.action/mediawiki.action.edit.js,
-
../../resources/src/mediawiki.action/mediawiki.action.view.postEdit.js,
+ ../../resources/src/mediawiki.action,
../../resources/src/mediawiki.page/mediawiki.page.startup.js,
../../resources/src/mediawiki.page/mediawiki.page.watch.ajax.js,
../../resources/src/mediawiki.api,
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
index 4c2fc3a..6b212c2 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
@@ -1,9 +1,10 @@
-/**
+/*!
* Live edit preview.
*/
( function ( mw, $ ) {
/**
+* @ignore
* @param {jQuery.Event} e
*/
function doLivePreview( e ) {
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.styles.css
b/resources/src/mediawiki.action/mediawiki.action.edit.styles.css
index 4a2bab3..7148b96 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.styles.css
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.styles.css
@@ -1,4 +1,4 @@
-/**
+/*!
* Styles for elements of the editing form.
*/
diff --git a/resources/src/mediawiki.action/mediawiki.action.history.js
b/resources/src/mediawiki.action/mediawiki.action.history.js
index 2a02d87..8aa5a1f 100644
--- a/resources/src/mediawiki.action/mediawiki.action.history.js
+++ b/resources/src/mediawiki.action/mediawiki.action.history.js
@@ -1,4 +1,4 @@
-/**
+/*!
* JavaScript for History action
*/
jQuery( function ( $ ) {
@@ -7,6 +7,7 @@
$lis = $( '#pagehistory li' );
/**
+* @ignore
* @context {Element} input
* @param e {jQuery.Event}
*/
diff --git
a/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
b/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
index 727a525..2ded40c 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
@@ -1,5 +1,5 @@
-/**
- * This module enables double-click-to-edit functionality.
+/*!
+ * Enables double-click-to-edit functionality.
*/
( function ( mw, $ ) {
$( function () {
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
b/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
index 21f40c5..712cf29 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
@@ -1,4 +1,4 @@
-/**
+/*!
* Exif metadata display for MediaWiki file uploads
*
* Add an expand/collapse link and collapse by default if set to
diff --git
a/resources/src/mediawiki.action/mediawiki.action.view.redirectToFragment.js
b/resources/src/mediawiki.action/mediawiki.action.view.redirectToFragment.js
index 1e2d624..cbfd7b5 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.redirectToFragment.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.redirectToFragment.js
@@ -1,4 +1,4 @@
-/**
+/*!
* JavaScript to scroll the page to an id, when a redirect with fragment is
viewed.
*/
( function ( mw, $ ) {
diff --git
a/resources/src/mediawiki.action/mediawiki.action.view.rightClickEdit.js
b/resources/src/mediawiki.action/mediawiki.action.view.rightClickEdit.js
index 93befe3..ada101e 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.rightClickEdit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.rightClickEdit.js
@@ -1,4 +1,4 @@
-/**
+/*!
*
[MediaWiki-commits] [Gerrit] Reorder data types - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Reorder data types .. Reorder data types Change-Id: I52ee05b5b5c7347e0ae7a3dc0d23ab77162cf6e3 --- M lib/config/WikibaseLib.default.php M lib/includes/WikibaseDataTypeBuilders.php 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: WikidataJenkins: Verified Daniel Kinzler: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/config/WikibaseLib.default.php b/lib/config/WikibaseLib.default.php index c4be0fc..88ae9a5 100644 --- a/lib/config/WikibaseLib.default.php +++ b/lib/config/WikibaseLib.default.php @@ -98,13 +98,13 @@ ), 'dataTypes' = array( - 'wikibase-item', 'commonsMedia', + 'globe-coordinate', + 'quantity', 'string', 'time', - 'globe-coordinate', 'url', - 'quantity' + 'wikibase-item', ), // URL schemes allowed for values of the URL type. diff --git a/lib/includes/WikibaseDataTypeBuilders.php b/lib/includes/WikibaseDataTypeBuilders.php index aef75e7..ab6e6a0 100644 --- a/lib/includes/WikibaseDataTypeBuilders.php +++ b/lib/includes/WikibaseDataTypeBuilders.php @@ -69,13 +69,13 @@ // be used for the UI, and the factory should simply know all data types always. $types = array( - 'wikibase-item' = array( $this, 'buildItemType' ), 'commonsMedia' = array( $this, 'buildMediaType' ), + 'globe-coordinate' = array( $this, 'buildCoordinateType' ), + 'quantity'= array( $this, 'buildQuantityType' ), 'string' = array( $this, 'buildStringType' ), 'time' = array( $this, 'buildTimeType' ), - 'globe-coordinate' = array( $this, 'buildCoordinateType' ), 'url' = array( $this, 'buildUrlType' ), - 'quantity'= array( $this, 'buildQuantityType' ) + 'wikibase-item' = array( $this, 'buildItemType' ), ); $experimental = array( -- To view, visit https://gerrit.wikimedia.org/r/130335 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I52ee05b5b5c7347e0ae7a3dc0d23ab77162cf6e3 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] JSDuck-ify /resources/mediawiki.page/* - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: JSDuck-ify /resources/mediawiki.page/* .. JSDuck-ify /resources/mediawiki.page/* Adds mw.hook mediawiki.page.gallery.resize to the index. Change-Id: I538659a62fe1de2a99cbc61c25eb98dd7f8e --- M maintenance/jsduck/config.json M resources/src/mediawiki.page/mediawiki.page.gallery.js M resources/src/mediawiki.page/mediawiki.page.image.pagination.js M resources/src/mediawiki.page/mediawiki.page.patrol.ajax.js 4 files changed, 4 insertions(+), 5 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/maintenance/jsduck/config.json b/maintenance/jsduck/config.json index 1d91288..33f7652 100644 --- a/maintenance/jsduck/config.json +++ b/maintenance/jsduck/config.json @@ -10,8 +10,7 @@ ./external.js, ../../resources/src/mediawiki, ../../resources/src/mediawiki.action, - ../../resources/src/mediawiki.page/mediawiki.page.startup.js, - ../../resources/src/mediawiki.page/mediawiki.page.watch.ajax.js, + ../../resources/src/mediawiki.page, ../../resources/src/mediawiki.api, ../../resources/src/mediawiki.language, ../../resources/src/jquery/jquery.accessKeyLabel.js, diff --git a/resources/src/mediawiki.page/mediawiki.page.gallery.js b/resources/src/mediawiki.page/mediawiki.page.gallery.js index f92d372..671cec6 100644 --- a/resources/src/mediawiki.page/mediawiki.page.gallery.js +++ b/resources/src/mediawiki.page/mediawiki.page.gallery.js @@ -1,4 +1,4 @@ -/** +/*! * Show gallery captions when focused. Copied directly from jquery.mw-jump.js. * Also Dynamically resize images to justify them. */ diff --git a/resources/src/mediawiki.page/mediawiki.page.image.pagination.js b/resources/src/mediawiki.page/mediawiki.page.image.pagination.js index 50301bd..4819be0 100644 --- a/resources/src/mediawiki.page/mediawiki.page.image.pagination.js +++ b/resources/src/mediawiki.page/mediawiki.page.image.pagination.js @@ -1,4 +1,4 @@ -/** +/*! * Change multi-page image navigation so that the current page display can be changed * without a page reload. Currently, the only image formats that can be multi-page images are * PDF and DjVu files diff --git a/resources/src/mediawiki.page/mediawiki.page.patrol.ajax.js b/resources/src/mediawiki.page/mediawiki.page.patrol.ajax.js index 5fb14dd..1fe0e26 100644 --- a/resources/src/mediawiki.page/mediawiki.page.patrol.ajax.js +++ b/resources/src/mediawiki.page/mediawiki.page.patrol.ajax.js @@ -1,4 +1,4 @@ -/** +/*! * Animate patrol links to use asynchronous API requests to * patrol pages, rather than navigating to a different URI. * -- To view, visit https://gerrit.wikimedia.org/r/129968 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I538659a62fe1de2a99cbc61c25eb98dd7f8e 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: Jack Phoenix j...@countervandalism.net Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org Gerrit-Reviewer: Parent5446 tylerro...@gmail.com Gerrit-Reviewer: TheDJ hartman.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert GettingStarted tokens logic - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert GettingStarted tokens logic
..
Revert GettingStarted tokens logic
Parts of this were already reverted as an emergency in 1.24wmf1/2
because of #64573 and subsequently fixed in this lineage with 0477aa,
but it was discovered that this whole series is breaking the site in a
different way:
Our caching layer (Varnish) is configured to generally ignore
MediaWiki's Vary: Cookie directive. This allows it to keep one version
in its cache, rather than one per user, since Cookie values are
generally unique. The semi-obvious exception to this is when the Cookie
value contains either the word Session or the word Token, as this
would make them non anon pages with a different, possibly private,
content (and Cache-Control would also avoid them being cached
altogether)
This changeset introduced a gettingStartedUserToken Cookie for all
anons, which made Varnish just keep different versions for*every (just
invalidated) page for *every* user in its cache. This would already be
bad in terms of hit ratio and backend load, but it got even more
spectacular by a combination with a Varnish limitation during which
Varnish was crashing when attempting to purge pages that had accumulated
thousands of variants (i.e. certain popular pages, such as Main_Page).
The issue is being worked around at the Varnish layer with
Ice1648d1c240af087992f31781887f561f55b288 and changing the Cookie name
here would also be enough to make this a more sane change, but since a)
the data for experiment are probably already ruined by now and b) it's
the second different outage this individual change brings in 24h, I'm
opting in a full revert of the change for now and until it gets
reintroduced with a more thorough review.
This reverts commits:
- 533c7f3b5821f6637f349dd0fd8ecd6a0de660d0
- 99286bb24e86185fa7a0759588ec09ee74b2cd8c
- 0477aa472a6a49f943097d6431ea7c44ecb310ca
Change-Id: I978282c1a83620b8522399fea9008d0379dce6df
---
M GettingStarted.php
M Hooks.php
D resources/ext.gettingstarted.assignToken.js
D resources/ext.gettingstarted.user.js
D tests/qunit/ext.gettingstarted.user.test.js
5 files changed, 4 insertions(+), 219 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GettingStarted.php b/GettingStarted.php
index 5e9702d..220e179 100644
--- a/GettingStarted.php
+++ b/GettingStarted.php
@@ -245,21 +245,6 @@
'position' = 'top',
) + $gettingStartedModuleInfo;
-$wgResourceModules[ 'ext.gettingstarted.user' ] = array(
- 'scripts' = 'ext.gettingstarted.user.js',
- 'dependencies' = array(
- 'mediawiki.user',
- 'jquery.cookie',
- ),
-) + $gettingStartedModuleInfo;
-
-$wgResourceModules[ 'ext.gettingstarted.assignToken' ] = array(
- 'scripts' = 'ext.gettingstarted.assignToken.js',
- 'dependencies' = array(
- 'ext.gettingstarted.user'
- ),
-) + $gettingStartedModuleInfo;
-
$wgDefaultUserOptions[ GettingStarted\Hooks::INTRO_OPTION ] = true;
$wgHooks[ 'BeforePageDisplay' ][] =
'GettingStarted\Hooks::onBeforePageDisplay';
@@ -274,5 +259,3 @@
$wgHooks[ 'UserLogoutComplete'][] =
'GettingStarted\Hooks::onUserLogoutComplete';
// Extension:CentralAuth's hook
$wgHooks[ 'CentralAuthPostLoginRedirect' ][] =
'GettingStarted\Hooks::onCentralAuthPostLoginRedirect';
-$wgHooks[ 'ResourceLoaderTestModules' ][] =
'GettingStarted\Hooks::onResourceLoaderTestModules';
-$wgHooks[ 'PageContentSaveComplete' ][] =
'GettingStarted\Hooks::onPageContentSaveComplete';
\ No newline at end of file
diff --git a/Hooks.php b/Hooks.php
index daf3096..b8d4375 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -26,10 +26,8 @@
*/
protected static $openTask = null;
- // This is used unprefixed and with a custom path for legacy reasons.
- const OPENTASK_COOKIE_NAME = 'openTask';
-
- const USER_TOKEN_COOKIE_NAME = 'gettingStartedUserToken';
+ // There is used unprefixed and with a custom path for legacy reasons.
+ const COOKIE_NAME = 'openTask';
protected static $COOKIE_OPTIONS = array(
'prefix' = '',
@@ -74,7 +72,7 @@
return;
}
- $cookie = $request-getCookie( self::OPENTASK_COOKIE_NAME, '' );
+ $cookie = $request-getCookie( self::COOKIE_NAME, '' );
$tasks = FormatJson::decode( $cookie, true );
if ( !is_array( $tasks ) ) {
$tasks = array();
@@ -257,9 +255,6 @@
public static function onBeforePageDisplay( OutputPage $out, \Skin
$skin ) {
$user = $out-getUser();
- // Assign token; will support anonymous signup invite experiment
- $out-addModules( 'ext.gettingstarted.assignToken' );
-
if ( self::shouldLoadToolbar( $out, $user ) ) {
[MediaWiki-commits] [Gerrit] Revert Generate a token and use it to bucket users - change (mediawiki...GettingStarted)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130343
Change subject: Revert Generate a token and use it to bucket users
..
Revert Generate a token and use it to bucket users
See I978282c1a83620b8522399fea9008d0379dce6df for the
rationale.
This reverts commit 2e5fa0d0359f4de22bfa8b041b08b0c42568f628.
Change-Id: I7e69a1ac1d718f2270ae3cc16df6847bfc46a8c7
---
M GettingStarted.php
M Hooks.php
D resources/ext.gettingstarted.user.js
D tests/qunit/ext.gettingstarted.user.test.js
4 files changed, 0 insertions(+), 169 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted
refs/changes/43/130343/1
diff --git a/GettingStarted.php b/GettingStarted.php
index 77cf165..220e179 100644
--- a/GettingStarted.php
+++ b/GettingStarted.php
@@ -245,14 +245,6 @@
'position' = 'top',
) + $gettingStartedModuleInfo;
-$wgResourceModules[ 'ext.gettingstarted.user' ] = array(
- 'scripts' = 'ext.gettingstarted.user.js',
- 'dependencies' = array(
- 'mediawiki.user',
- 'jquery.cookie',
- ),
-) + $gettingStartedModuleInfo;
-
$wgDefaultUserOptions[ GettingStarted\Hooks::INTRO_OPTION ] = true;
$wgHooks[ 'BeforePageDisplay' ][] =
'GettingStarted\Hooks::onBeforePageDisplay';
@@ -267,4 +259,3 @@
$wgHooks[ 'UserLogoutComplete'][] =
'GettingStarted\Hooks::onUserLogoutComplete';
// Extension:CentralAuth's hook
$wgHooks[ 'CentralAuthPostLoginRedirect' ][] =
'GettingStarted\Hooks::onCentralAuthPostLoginRedirect';
-$wgHooks[ 'ResourceLoaderTestModules' ][] =
'GettingStarted\Hooks::onResourceLoaderTestModules';
diff --git a/Hooks.php b/Hooks.php
index c172b3c..b8d4375 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -435,13 +435,4 @@
$returnToQuery = $returnToQuery . 'gettingStartedReturn=true';
return true;
}
-
- public static function onResourceLoaderTestModules( array
$testModules, \ResourceLoader $resourceLoader ) {
- $testModules[ 'qunit' ][ 'ext.gettingstarted.user.tests' ] =
array(
- 'scripts' = array(
'tests/qunit/ext.gettingstarted.user.test.js' ),
- 'dependencies' = array( 'ext.gettingstarted.user' ),
- 'localBasePath' = __DIR__,
- 'remoteExtPath' = 'GettingStarted',
- );
- }
}
diff --git a/resources/ext.gettingstarted.user.js
b/resources/ext.gettingstarted.user.js
deleted file mode 100644
index 5caa046..000
--- a/resources/ext.gettingstarted.user.js
+++ /dev/null
@@ -1,74 +0,0 @@
-( function ( mw, $ ) {
-
- 'use strict';
-
- var user,
- tokenCookieName = mw.config.get( 'wgCookiePrefix' ) +
'gettingStartedUserToken';
-
- mw.gettingStarted = mw.gettingStarted || {};
-
- /**
-* The GettingStarted user API.
-*
-* This is currently used as part of the [Signup CTA experiment][0],
which is
-* part of the [Anonymous editor acquisition][1] research project.
-*
-* [0]:
https://meta.wikimedia.org/wiki/Research:Anonymous_editor_acquisition/Signup_CTA_experiment
-* [1]:
https://meta.wikimedia.org/wiki/Research:Anonymous_editor_acquisition
-*
-* @class mw.gettingStarted.user
-* @singleton
-*/
- mw.gettingStarted.user = user = {
-
- /**
-* Gets the user's token from the gettingStartedUserToken
-* cookie. If the cookie isn't set, then a token is generated,
-* stored in the cookie for 90 days, and then returned.
-*
-* See `mw.user.generateRandomSessionId`.
-*
-* @return {string}
-*/
- getToken: function () {
- var storedToken = $.cookie( tokenCookieName ),
- generatedToken;
-
- if ( storedToken ) {
- return storedToken;
- }
-
- generatedToken = mw.user.generateRandomSessionId();
-
- $.cookie( tokenCookieName, generatedToken, {
- expires: 90, // (days)
- path: '/'
- } );
-
- return generatedToken;
- },
-
- /**
-* Gets the bucket that the user is in based on their token.
-*
-* Currently, the bucket corresponds to the variant of the
-* Signup CTA experiement that the user will be shown: pre-edit,
-* post-edit, or control.
-*
-* @return {string}
-*/
- getBucket: function () {
- var token = user.getToken(),
-
[MediaWiki-commits] [Gerrit] Revert Generate a token and use it to bucket users - change (mediawiki...GettingStarted)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130344
Change subject: Revert Generate a token and use it to bucket users
..
Revert Generate a token and use it to bucket users
See I978282c1a83620b8522399fea9008d0379dce6df for the
rationale.
This reverts commit 42f0cb7bbdd5e27b7e2bdbfdb515b72b69553a76.
Change-Id: I4cd34902b607893dc5892ec08739fec5c6105f0f
---
M GettingStarted.php
M Hooks.php
D resources/ext.gettingstarted.user.js
D tests/qunit/ext.gettingstarted.user.test.js
4 files changed, 0 insertions(+), 169 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted
refs/changes/44/130344/1
diff --git a/GettingStarted.php b/GettingStarted.php
index 77cf165..220e179 100644
--- a/GettingStarted.php
+++ b/GettingStarted.php
@@ -245,14 +245,6 @@
'position' = 'top',
) + $gettingStartedModuleInfo;
-$wgResourceModules[ 'ext.gettingstarted.user' ] = array(
- 'scripts' = 'ext.gettingstarted.user.js',
- 'dependencies' = array(
- 'mediawiki.user',
- 'jquery.cookie',
- ),
-) + $gettingStartedModuleInfo;
-
$wgDefaultUserOptions[ GettingStarted\Hooks::INTRO_OPTION ] = true;
$wgHooks[ 'BeforePageDisplay' ][] =
'GettingStarted\Hooks::onBeforePageDisplay';
@@ -267,4 +259,3 @@
$wgHooks[ 'UserLogoutComplete'][] =
'GettingStarted\Hooks::onUserLogoutComplete';
// Extension:CentralAuth's hook
$wgHooks[ 'CentralAuthPostLoginRedirect' ][] =
'GettingStarted\Hooks::onCentralAuthPostLoginRedirect';
-$wgHooks[ 'ResourceLoaderTestModules' ][] =
'GettingStarted\Hooks::onResourceLoaderTestModules';
diff --git a/Hooks.php b/Hooks.php
index c172b3c..b8d4375 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -435,13 +435,4 @@
$returnToQuery = $returnToQuery . 'gettingStartedReturn=true';
return true;
}
-
- public static function onResourceLoaderTestModules( array
$testModules, \ResourceLoader $resourceLoader ) {
- $testModules[ 'qunit' ][ 'ext.gettingstarted.user.tests' ] =
array(
- 'scripts' = array(
'tests/qunit/ext.gettingstarted.user.test.js' ),
- 'dependencies' = array( 'ext.gettingstarted.user' ),
- 'localBasePath' = __DIR__,
- 'remoteExtPath' = 'GettingStarted',
- );
- }
}
diff --git a/resources/ext.gettingstarted.user.js
b/resources/ext.gettingstarted.user.js
deleted file mode 100644
index 5caa046..000
--- a/resources/ext.gettingstarted.user.js
+++ /dev/null
@@ -1,74 +0,0 @@
-( function ( mw, $ ) {
-
- 'use strict';
-
- var user,
- tokenCookieName = mw.config.get( 'wgCookiePrefix' ) +
'gettingStartedUserToken';
-
- mw.gettingStarted = mw.gettingStarted || {};
-
- /**
-* The GettingStarted user API.
-*
-* This is currently used as part of the [Signup CTA experiment][0],
which is
-* part of the [Anonymous editor acquisition][1] research project.
-*
-* [0]:
https://meta.wikimedia.org/wiki/Research:Anonymous_editor_acquisition/Signup_CTA_experiment
-* [1]:
https://meta.wikimedia.org/wiki/Research:Anonymous_editor_acquisition
-*
-* @class mw.gettingStarted.user
-* @singleton
-*/
- mw.gettingStarted.user = user = {
-
- /**
-* Gets the user's token from the gettingStartedUserToken
-* cookie. If the cookie isn't set, then a token is generated,
-* stored in the cookie for 90 days, and then returned.
-*
-* See `mw.user.generateRandomSessionId`.
-*
-* @return {string}
-*/
- getToken: function () {
- var storedToken = $.cookie( tokenCookieName ),
- generatedToken;
-
- if ( storedToken ) {
- return storedToken;
- }
-
- generatedToken = mw.user.generateRandomSessionId();
-
- $.cookie( tokenCookieName, generatedToken, {
- expires: 90, // (days)
- path: '/'
- } );
-
- return generatedToken;
- },
-
- /**
-* Gets the bucket that the user is in based on their token.
-*
-* Currently, the bucket corresponds to the variant of the
-* Signup CTA experiement that the user will be shown: pre-edit,
-* post-edit, or control.
-*
-* @return {string}
-*/
- getBucket: function () {
- var token = user.getToken(),
-
[MediaWiki-commits] [Gerrit] Revert Generate a token and use it to bucket users - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert Generate a token and use it to bucket users
..
Revert Generate a token and use it to bucket users
See I978282c1a83620b8522399fea9008d0379dce6df for the
rationale.
This reverts commit 42f0cb7bbdd5e27b7e2bdbfdb515b72b69553a76.
Change-Id: I4cd34902b607893dc5892ec08739fec5c6105f0f
---
M GettingStarted.php
M Hooks.php
D resources/ext.gettingstarted.user.js
D tests/qunit/ext.gettingstarted.user.test.js
4 files changed, 0 insertions(+), 169 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GettingStarted.php b/GettingStarted.php
index 77cf165..220e179 100644
--- a/GettingStarted.php
+++ b/GettingStarted.php
@@ -245,14 +245,6 @@
'position' = 'top',
) + $gettingStartedModuleInfo;
-$wgResourceModules[ 'ext.gettingstarted.user' ] = array(
- 'scripts' = 'ext.gettingstarted.user.js',
- 'dependencies' = array(
- 'mediawiki.user',
- 'jquery.cookie',
- ),
-) + $gettingStartedModuleInfo;
-
$wgDefaultUserOptions[ GettingStarted\Hooks::INTRO_OPTION ] = true;
$wgHooks[ 'BeforePageDisplay' ][] =
'GettingStarted\Hooks::onBeforePageDisplay';
@@ -267,4 +259,3 @@
$wgHooks[ 'UserLogoutComplete'][] =
'GettingStarted\Hooks::onUserLogoutComplete';
// Extension:CentralAuth's hook
$wgHooks[ 'CentralAuthPostLoginRedirect' ][] =
'GettingStarted\Hooks::onCentralAuthPostLoginRedirect';
-$wgHooks[ 'ResourceLoaderTestModules' ][] =
'GettingStarted\Hooks::onResourceLoaderTestModules';
diff --git a/Hooks.php b/Hooks.php
index c172b3c..b8d4375 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -435,13 +435,4 @@
$returnToQuery = $returnToQuery . 'gettingStartedReturn=true';
return true;
}
-
- public static function onResourceLoaderTestModules( array
$testModules, \ResourceLoader $resourceLoader ) {
- $testModules[ 'qunit' ][ 'ext.gettingstarted.user.tests' ] =
array(
- 'scripts' = array(
'tests/qunit/ext.gettingstarted.user.test.js' ),
- 'dependencies' = array( 'ext.gettingstarted.user' ),
- 'localBasePath' = __DIR__,
- 'remoteExtPath' = 'GettingStarted',
- );
- }
}
diff --git a/resources/ext.gettingstarted.user.js
b/resources/ext.gettingstarted.user.js
deleted file mode 100644
index 5caa046..000
--- a/resources/ext.gettingstarted.user.js
+++ /dev/null
@@ -1,74 +0,0 @@
-( function ( mw, $ ) {
-
- 'use strict';
-
- var user,
- tokenCookieName = mw.config.get( 'wgCookiePrefix' ) +
'gettingStartedUserToken';
-
- mw.gettingStarted = mw.gettingStarted || {};
-
- /**
-* The GettingStarted user API.
-*
-* This is currently used as part of the [Signup CTA experiment][0],
which is
-* part of the [Anonymous editor acquisition][1] research project.
-*
-* [0]:
https://meta.wikimedia.org/wiki/Research:Anonymous_editor_acquisition/Signup_CTA_experiment
-* [1]:
https://meta.wikimedia.org/wiki/Research:Anonymous_editor_acquisition
-*
-* @class mw.gettingStarted.user
-* @singleton
-*/
- mw.gettingStarted.user = user = {
-
- /**
-* Gets the user's token from the gettingStartedUserToken
-* cookie. If the cookie isn't set, then a token is generated,
-* stored in the cookie for 90 days, and then returned.
-*
-* See `mw.user.generateRandomSessionId`.
-*
-* @return {string}
-*/
- getToken: function () {
- var storedToken = $.cookie( tokenCookieName ),
- generatedToken;
-
- if ( storedToken ) {
- return storedToken;
- }
-
- generatedToken = mw.user.generateRandomSessionId();
-
- $.cookie( tokenCookieName, generatedToken, {
- expires: 90, // (days)
- path: '/'
- } );
-
- return generatedToken;
- },
-
- /**
-* Gets the bucket that the user is in based on their token.
-*
-* Currently, the bucket corresponds to the variant of the
-* Signup CTA experiement that the user will be shown: pre-edit,
-* post-edit, or control.
-*
-* @return {string}
-*/
- getBucket: function () {
- var token = user.getToken(),
- lastCharacter = token.slice( -1 );
-
-
[MediaWiki-commits] [Gerrit] Export MEDIAWIKI_API_URL when running browser tests - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Export MEDIAWIKI_API_URL when running browser tests
..
Export MEDIAWIKI_API_URL when running browser tests
There are a lot of failed ContentTranslation tests with error message:
“Environment variable MEDIAWIKI_API_URL must be set in order to create
a target page for this test (SystemExit)”
https://integration.wikimedia.org/ci/view/BrowserTests/job/browsertests-ContentTranslation-language-stage.wmflabs.org-linux-firefox/17/consoleFull
Change-Id: I99b86e1a8c3cd9d738c2b2a244940e7b8954cf8e
---
M macro.yaml
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
KartikMistry: Looks good to me, but someone else must approve
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/macro.yaml b/macro.yaml
index 89513ad..9ba4f5a 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -5,6 +5,7 @@
# set up environment variables
export BROWSER={browser}
export HEADLESS=true
+ export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php
export MEDIAWIKI_PASSWORD_VARIABLE={mediawiki_password_variable}
export MEDIAWIKI_URL=http://{mediawiki_url}/wiki/
export MEDIAWIKI_USER={mediawiki_user}
--
To view, visit https://gerrit.wikimedia.org/r/130314
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I99b86e1a8c3cd9d738c2b2a244940e7b8954cf8e
Gerrit-PatchSet: 3
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Generate a token and use it to bucket users - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert Generate a token and use it to bucket users
..
Revert Generate a token and use it to bucket users
See I978282c1a83620b8522399fea9008d0379dce6df for the
rationale.
This reverts commit 2e5fa0d0359f4de22bfa8b041b08b0c42568f628.
Change-Id: I7e69a1ac1d718f2270ae3cc16df6847bfc46a8c7
---
M GettingStarted.php
M Hooks.php
D resources/ext.gettingstarted.user.js
D tests/qunit/ext.gettingstarted.user.test.js
4 files changed, 0 insertions(+), 169 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GettingStarted.php b/GettingStarted.php
index 77cf165..220e179 100644
--- a/GettingStarted.php
+++ b/GettingStarted.php
@@ -245,14 +245,6 @@
'position' = 'top',
) + $gettingStartedModuleInfo;
-$wgResourceModules[ 'ext.gettingstarted.user' ] = array(
- 'scripts' = 'ext.gettingstarted.user.js',
- 'dependencies' = array(
- 'mediawiki.user',
- 'jquery.cookie',
- ),
-) + $gettingStartedModuleInfo;
-
$wgDefaultUserOptions[ GettingStarted\Hooks::INTRO_OPTION ] = true;
$wgHooks[ 'BeforePageDisplay' ][] =
'GettingStarted\Hooks::onBeforePageDisplay';
@@ -267,4 +259,3 @@
$wgHooks[ 'UserLogoutComplete'][] =
'GettingStarted\Hooks::onUserLogoutComplete';
// Extension:CentralAuth's hook
$wgHooks[ 'CentralAuthPostLoginRedirect' ][] =
'GettingStarted\Hooks::onCentralAuthPostLoginRedirect';
-$wgHooks[ 'ResourceLoaderTestModules' ][] =
'GettingStarted\Hooks::onResourceLoaderTestModules';
diff --git a/Hooks.php b/Hooks.php
index c172b3c..b8d4375 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -435,13 +435,4 @@
$returnToQuery = $returnToQuery . 'gettingStartedReturn=true';
return true;
}
-
- public static function onResourceLoaderTestModules( array
$testModules, \ResourceLoader $resourceLoader ) {
- $testModules[ 'qunit' ][ 'ext.gettingstarted.user.tests' ] =
array(
- 'scripts' = array(
'tests/qunit/ext.gettingstarted.user.test.js' ),
- 'dependencies' = array( 'ext.gettingstarted.user' ),
- 'localBasePath' = __DIR__,
- 'remoteExtPath' = 'GettingStarted',
- );
- }
}
diff --git a/resources/ext.gettingstarted.user.js
b/resources/ext.gettingstarted.user.js
deleted file mode 100644
index 5caa046..000
--- a/resources/ext.gettingstarted.user.js
+++ /dev/null
@@ -1,74 +0,0 @@
-( function ( mw, $ ) {
-
- 'use strict';
-
- var user,
- tokenCookieName = mw.config.get( 'wgCookiePrefix' ) +
'gettingStartedUserToken';
-
- mw.gettingStarted = mw.gettingStarted || {};
-
- /**
-* The GettingStarted user API.
-*
-* This is currently used as part of the [Signup CTA experiment][0],
which is
-* part of the [Anonymous editor acquisition][1] research project.
-*
-* [0]:
https://meta.wikimedia.org/wiki/Research:Anonymous_editor_acquisition/Signup_CTA_experiment
-* [1]:
https://meta.wikimedia.org/wiki/Research:Anonymous_editor_acquisition
-*
-* @class mw.gettingStarted.user
-* @singleton
-*/
- mw.gettingStarted.user = user = {
-
- /**
-* Gets the user's token from the gettingStartedUserToken
-* cookie. If the cookie isn't set, then a token is generated,
-* stored in the cookie for 90 days, and then returned.
-*
-* See `mw.user.generateRandomSessionId`.
-*
-* @return {string}
-*/
- getToken: function () {
- var storedToken = $.cookie( tokenCookieName ),
- generatedToken;
-
- if ( storedToken ) {
- return storedToken;
- }
-
- generatedToken = mw.user.generateRandomSessionId();
-
- $.cookie( tokenCookieName, generatedToken, {
- expires: 90, // (days)
- path: '/'
- } );
-
- return generatedToken;
- },
-
- /**
-* Gets the bucket that the user is in based on their token.
-*
-* Currently, the bucket corresponds to the variant of the
-* Signup CTA experiement that the user will be shown: pre-edit,
-* post-edit, or control.
-*
-* @return {string}
-*/
- getBucket: function () {
- var token = user.getToken(),
- lastCharacter = token.slice( -1 );
-
-
[MediaWiki-commits] [Gerrit] Use data-values/time 0.5.2, fix for year time parsing - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Use data-values/time 0.5.2, fix for year time parsing .. Use data-values/time 0.5.2, fix for year time parsing Change-Id: I927209e293e5bf05240705686cab040468a6b445 --- M composer.json M lib/tests/phpunit/parsers/MwTimeIsoParserTest.php 2 files changed, 10 insertions(+), 10 deletions(-) Approvals: Aude: Looks good to me, approved WikidataJenkins: Verified jenkins-bot: Verified diff --git a/composer.json b/composer.json index 4629a20..0958102 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ data-values/geo: ~0.1.0, data-values/interfaces: ~0.1.4, data-values/number: ~0.3.0, - data-values/time: ~0.5.1, + data-values/time: ~0.5.2, data-values/validators: ~0.1.0, data-values/data-types: ~0.2.0, data-values/serialization: ~1.0, diff --git a/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php b/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php index a681b6c..194352c 100644 --- a/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php +++ b/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php @@ -83,11 +83,11 @@ '55. millennium' = array( '+00055000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ), '10. century' = - array( '+1000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ), + array( '+1000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), '12. century' = - array( '+1200-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_100a , TimeFormatter::CALENDAR_GREGORIAN ), + array( '+1200-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), '10s' = - array( '+0010-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_10a , TimeFormatter::CALENDAR_GREGORIAN ), + array( '+0010-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), '12s' = array( '+0012-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), @@ -129,11 +129,11 @@ '55. millennium BCE' = array( '-00055000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ), '10. century BCE' = - array( '-1000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ), + array( '-1000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), '12. century BCE' = - array( '-1200-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_100a , TimeFormatter::CALENDAR_GREGORIAN ), + array( '-1200-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), '10s BCE' = - array( '-0010-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_10a , TimeFormatter::CALENDAR_GREGORIAN ), + array( '-0010-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), '12s BCE' = array( '-0012-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), // also parse BC @@ -142,11 +142,11 @@ '55. millennium BC' = array( '-00055000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ), '10. century BC' = - array( '-1000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ), + array( '-1000-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ), '12. century BC' = - array( '-1200-00-00T00:00:00Z', 0 , 0 , 0 , TimeValue::PRECISION_100a , TimeFormatter::CALENDAR_GREGORIAN ), +
[MediaWiki-commits] [Gerrit] Can't use the same config file for eventlogging and webrequest - change (analytics/kraken)
Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/130346 Change subject: Can't use the same config file for eventlogging and webrequest .. Can't use the same config file for eventlogging and webrequest Duh! They have different timestamps, don't know why I did this yesterday. Change-Id: I05d77dae1b9f71ac2cb9ce1f331fec11a73fe760 --- C kraken-etl/conf/camus.eventlogging.properties R kraken-etl/conf/camus.webrequest.properties 2 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/kraken refs/changes/46/130346/1 diff --git a/kraken-etl/conf/camus.properties b/kraken-etl/conf/camus.eventlogging.properties similarity index 92% copy from kraken-etl/conf/camus.properties copy to kraken-etl/conf/camus.eventlogging.properties index 02e2e4e..f5854e8 100644 --- a/kraken-etl/conf/camus.properties +++ b/kraken-etl/conf/camus.eventlogging.properties @@ -7,11 +7,11 @@ # where completed Camus job output directories are kept, usually a sub-dir in the base.path etl.execution.history.path=hdfs://kraken/wmf/camus/history -# Our timestamps look like 2013-09-20T15:40:17 -camus.message.timestamp.format=-MM-dd'T'HH:mm:ss +# Eventlogging timestamps are in unix epoch seconds +camus.message.timestamp.format=unix # use the dt field -camus.message.timestamp.field=dt +camus.message.timestamp.field=timestamp # Store output into hourly buckets etl.output.file.time.partition.mins=60 @@ -33,7 +33,7 @@ # Max hadoop tasks to use, each task can pull multiple topic partitions. # Currently importing mobile, bits, and eventlogging each with 10 partitions. Setting # map.tasks to 40. -mapred.map.tasks=40 +mapred.map.tasks=10 # Connection parameters. kafka.brokers=analytics1021.eqiad.wmnet:9092,analytics1022.eqiad.wmnet:9092 @@ -56,10 +56,10 @@ kafka.blacklist.topics= # For now, we are only importing webrequest_mobile logs. -kafka.whitelist.topics=webrequest_mobile,webrequest_bits,webrequest_text,eventlogging-00 +kafka.whitelist.topics=eventlogging-00 # Name of the client as seen by kafka -kafka.client.name=camus-webrequest-01 +kafka.client.name=camus-eventlogging-01 # Fetch Request Parameters #kafka.fetch.buffer.size= diff --git a/kraken-etl/conf/camus.properties b/kraken-etl/conf/camus.webrequest.properties similarity index 95% rename from kraken-etl/conf/camus.properties rename to kraken-etl/conf/camus.webrequest.properties index 02e2e4e..40c83ef 100644 --- a/kraken-etl/conf/camus.properties +++ b/kraken-etl/conf/camus.webrequest.properties @@ -31,9 +31,9 @@ etl.record.writer.provider.class=com.linkedin.camus.etl.kafka.common.SequenceFileRecordWriterProvider # Max hadoop tasks to use, each task can pull multiple topic partitions. -# Currently importing mobile, bits, and eventlogging each with 10 partitions. Setting -# map.tasks to 40. -mapred.map.tasks=40 +# Currently importing mobile, and bits each with 10 partitions. Setting +# map.tasks to 30. +mapred.map.tasks=30 # Connection parameters. kafka.brokers=analytics1021.eqiad.wmnet:9092,analytics1022.eqiad.wmnet:9092 @@ -56,7 +56,7 @@ kafka.blacklist.topics= # For now, we are only importing webrequest_mobile logs. -kafka.whitelist.topics=webrequest_mobile,webrequest_bits,webrequest_text,eventlogging-00 +kafka.whitelist.topics=webrequest_mobile,webrequest_bits,webrequest_text # Name of the client as seen by kafka kafka.client.name=camus-webrequest-01 -- To view, visit https://gerrit.wikimedia.org/r/130346 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05d77dae1b9f71ac2cb9ce1f331fec11a73fe760 Gerrit-PatchSet: 1 Gerrit-Project: analytics/kraken Gerrit-Branch: master Gerrit-Owner: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Can't use the same config file for eventlogging and webrequest - change (analytics/kraken)
Ottomata has submitted this change and it was merged. Change subject: Can't use the same config file for eventlogging and webrequest .. Can't use the same config file for eventlogging and webrequest Duh! They have different timestamps, don't know why I did this yesterday. Change-Id: I05d77dae1b9f71ac2cb9ce1f331fec11a73fe760 --- C kraken-etl/conf/camus.eventlogging.properties R kraken-etl/conf/camus.webrequest.properties 2 files changed, 11 insertions(+), 11 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/kraken-etl/conf/camus.properties b/kraken-etl/conf/camus.eventlogging.properties similarity index 91% copy from kraken-etl/conf/camus.properties copy to kraken-etl/conf/camus.eventlogging.properties index 02e2e4e..26adde6 100644 --- a/kraken-etl/conf/camus.properties +++ b/kraken-etl/conf/camus.eventlogging.properties @@ -7,11 +7,11 @@ # where completed Camus job output directories are kept, usually a sub-dir in the base.path etl.execution.history.path=hdfs://kraken/wmf/camus/history -# Our timestamps look like 2013-09-20T15:40:17 -camus.message.timestamp.format=-MM-dd'T'HH:mm:ss +# Eventlogging timestamps are in unix epoch seconds +camus.message.timestamp.format=unix # use the dt field -camus.message.timestamp.field=dt +camus.message.timestamp.field=timestamp # Store output into hourly buckets etl.output.file.time.partition.mins=60 @@ -33,7 +33,7 @@ # Max hadoop tasks to use, each task can pull multiple topic partitions. # Currently importing mobile, bits, and eventlogging each with 10 partitions. Setting # map.tasks to 40. -mapred.map.tasks=40 +mapred.map.tasks=10 # Connection parameters. kafka.brokers=analytics1021.eqiad.wmnet:9092,analytics1022.eqiad.wmnet:9092 @@ -55,11 +55,11 @@ # if whitelist has values, only whitelisted topic are pulled. nothing on the blacklist is pulled kafka.blacklist.topics= -# For now, we are only importing webrequest_mobile logs. -kafka.whitelist.topics=webrequest_mobile,webrequest_bits,webrequest_text,eventlogging-00 +# Import eventlogging logs +kafka.whitelist.topics=eventlogging-00 # Name of the client as seen by kafka -kafka.client.name=camus-webrequest-01 +kafka.client.name=camus-eventlogging-01 # Fetch Request Parameters #kafka.fetch.buffer.size= diff --git a/kraken-etl/conf/camus.properties b/kraken-etl/conf/camus.webrequest.properties similarity index 95% rename from kraken-etl/conf/camus.properties rename to kraken-etl/conf/camus.webrequest.properties index 02e2e4e..40c83ef 100644 --- a/kraken-etl/conf/camus.properties +++ b/kraken-etl/conf/camus.webrequest.properties @@ -31,9 +31,9 @@ etl.record.writer.provider.class=com.linkedin.camus.etl.kafka.common.SequenceFileRecordWriterProvider # Max hadoop tasks to use, each task can pull multiple topic partitions. -# Currently importing mobile, bits, and eventlogging each with 10 partitions. Setting -# map.tasks to 40. -mapred.map.tasks=40 +# Currently importing mobile, and bits each with 10 partitions. Setting +# map.tasks to 30. +mapred.map.tasks=30 # Connection parameters. kafka.brokers=analytics1021.eqiad.wmnet:9092,analytics1022.eqiad.wmnet:9092 @@ -56,7 +56,7 @@ kafka.blacklist.topics= # For now, we are only importing webrequest_mobile logs. -kafka.whitelist.topics=webrequest_mobile,webrequest_bits,webrequest_text,eventlogging-00 +kafka.whitelist.topics=webrequest_mobile,webrequest_bits,webrequest_text # Name of the client as seen by kafka kafka.client.name=camus-webrequest-01 -- To view, visit https://gerrit.wikimedia.org/r/130346 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05d77dae1b9f71ac2cb9ce1f331fec11a73fe760 Gerrit-PatchSet: 2 Gerrit-Project: analytics/kraken Gerrit-Branch: master Gerrit-Owner: Ottomata o...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
