[MediaWiki-commits] [Gerrit] Trim MediaWiki:Quicksurveys-desc for clarity - change (mediawiki...QuickSurveys)
Purodha has uploaded a new change for review. https://gerrit.wikimedia.org/r/235985 Change subject: Trim MediaWiki:Quicksurveys-desc for clarity .. Trim MediaWiki:Quicksurveys-desc for clarity See: https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Quicksurveys-desc/en Change-Id: Ie914d219eac71059373ab2b2569121bc029c9a08 --- M i18n/en.json 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSurveys refs/changes/85/235985/1 diff --git a/i18n/en.json b/i18n/en.json index f53bfb4..6150130 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -4,10 +4,11 @@ "Bahodir Mansurov", "Joaquin Hernandez", "Jon Robson", - "Rob Moen" + "Rob Moen", + "Purodha Blissenbach" ] }, - "quicksurveys-desc": "Displays configured surveys on Mobile and Desktop.", + "quicksurveys-desc": "Displays configured surveys.", "ext-quicksurveys-example-internal-survey-question": "Should the text be bigger?", "ext-quicksurveys-example-internal-survey-answer-positive": "Yes", "ext-quicksurveys-example-internal-survey-answer-neutral": "Not sure", -- To view, visit https://gerrit.wikimedia.org/r/235985 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie914d219eac71059373ab2b2569121bc029c9a08 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/QuickSurveys Gerrit-Branch: dev Gerrit-Owner: Purodha ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use base::firewall on analytics1015 - change (operations/puppet)
Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235984
Change subject: Use base::firewall on analytics1015
..
Use base::firewall on analytics1015
Change-Id: Ic004836e21c0f1134b17a684786e0450cf836d81
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/235984/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 9424680..683d55c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -115,6 +115,7 @@
# This node is being repurposed - otto 2015-09
node 'analytics1015.eqiad.wmnet' {
include standard
+include base::firewall
}
# analytics1011, analytics1016-analytics1017, analytics1019,
--
To view, visit https://gerrit.wikimedia.org/r/235984
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic004836e21c0f1134b17a684786e0450cf836d81
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Restrict access to analytics network for Hadoop master/standby - change (operations/puppet)
Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235983
Change subject: Restrict access to analytics network for Hadoop master/standby
..
Restrict access to analytics network for Hadoop master/standby
Change-Id: I76239efcb36b3982df55ff0d25a63068c8d9def2
---
M manifests/role/analytics/hadoop.pp
1 file changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/235983/1
diff --git a/manifests/role/analytics/hadoop.pp
b/manifests/role/analytics/hadoop.pp
index 5c5ab72..100390a 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -510,6 +510,12 @@
require => Class['cdh::hadoop::master'],
}
+# T111433
+ferm::service{ 'hadoop-access':
+proto => 'tcp',
+port => '1024:65535',
+srange => '$ANALYTICS_NETWORKS',
+}
# Include icinga alerts if production realm.
if $::realm == 'production' {
@@ -684,6 +690,13 @@
}
}
+# T111433
+ferm::service{ 'hadoop-access':
+proto => 'tcp',
+port => '1024:65535',
+srange => '$ANALYTICS_NETWORKS',
+}
+
# Open up port for debugging
ferm::service{ 'jmxtrans-jmx':
proto => 'tcp',
--
To view, visit https://gerrit.wikimedia.org/r/235983
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76239efcb36b3982df55ff0d25a63068c8d9def2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Restrict Hadoop access to the analytics network - change (operations/puppet)
Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235982
Change subject: Restrict Hadoop access to the analytics network
..
Restrict Hadoop access to the analytics network
Due to a bug in Hadoop is uses unrepredictable dynamic ports although
configured not to do so, see T111433. Until that is fixed we only
restrict access to the analytics network.
Change-Id: Iddc3c02a0cd3026508fe49bc76588820e5a3d9d5
---
M manifests/role/analytics/hadoop.pp
1 file changed, 3 insertions(+), 77 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/82/235982/1
diff --git a/manifests/role/analytics/hadoop.pp
b/manifests/role/analytics/hadoop.pp
index 92d5e19..5c5ab72 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -619,84 +619,10 @@
}
}
-# Open up port for debugging
-ferm::service{ 'jmxtrans-jmx':
+# T111433
+ferm::service{ 'hadoop-access':
proto => 'tcp',
-port => '2101',
-srange => '$INTERNAL',
-}
-
-ferm::service{ 'hadoop-hdfs-journalnode-jmx':
-proto => 'tcp',
-port => '9981',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-yarn-nodemanager-jmx':
-proto => 'tcp',
-port => '9984',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-yarn-nodemanager':
-proto => 'tcp',
-port => '8041',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-yarn-nodemanager-localizer':
-proto => 'tcp',
-port => '8040',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-yarn-nodemanager-http-ui':
-proto => 'tcp',
-port => '8042',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-yarn-mapreduce-application-master':
-proto => 'tcp',
-# $yarn_app_mapreduce_am_job_client_port_range could look like
'55000-55199,55500-55599'.
-# Translate '-' -> ':' and ',' => ' ' for ferm, e.g. (55000:55199
55500:55599)
-port => inline_template('(<%=
@yarn_app_mapreduce_am_job_client_port_range.tr("-,", ": ") %>)'),
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-hdfs-ha-journalnode-http':
-proto => 'tcp',
-port => '8480',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-hdfs-ha-journalnode':
-proto => 'tcp',
-port => '8485',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-mapreduce-shuffle':
-proto => 'tcp',
-port => '13562',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-hdfs-datanode-http-ui':
-proto => 'tcp',
-port => '50075',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-hdfs-datanode-ipc':
-proto => 'tcp',
-port => '50020',
-srange => '$ANALYTICS_NETWORKS',
-}
-
-ferm::service{ 'hadoop-hdfs-datanode-dfs-transfer':
-proto => 'tcp',
-port => '50010',
+port => '1024:65535',
srange => '$ANALYTICS_NETWORKS',
}
--
To view, visit https://gerrit.wikimedia.org/r/235982
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddc3c02a0cd3026508fe49bc76588820e5a3d9d5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding kbd tags to API message - change (mediawiki...CirrusSearch)
Purodha has uploaded a new change for review. https://gerrit.wikimedia.org/r/235981 Change subject: Adding kbd tags to API message .. Adding kbd tags to API message as per mw:API:Localisation#Message_formatting See also: https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-cirrus-suggest-param-context/uk Change-Id: Ie1dc441e66a57d2af3f129df9f16d25a335559f5 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/81/235981/1 diff --git a/i18n/en.json b/i18n/en.json index 28ec5c6..dcdfe83 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -22,7 +22,7 @@ "apihelp-cirrus-suggest-description": "Suggest completions for search term.", "apihelp-cirrus-suggest-param-text": "Search term to provide completions for.", "apihelp-cirrus-suggest-param-limit": "How many results to return.", - "apihelp-cirrus-suggest-param-context": "Search context limiting the search, e.g. geo or category.", + "apihelp-cirrus-suggest-param-context": "Search context limiting the search, e.g. geo or category.", "cirrussearch-give-feedback": "Give us your feedback", "cirrussearch-morelikethis-settings": " # \n# This message lets you configure the settings of the \"more like this\" feature.\n# Changes to this take effect immediately.\n# The syntax is as follows:\n# * Everything from a \"#\" character to the end of the line is a comment.\n# * Every non-blank line is the setting name followed by a \":\" character followed by the setting value\n# The settings are:\n# * min_doc_freq (integer): Minimum number of documents (per shard) that need a term for it to be considered.\n# * max_doc_freq (integer): Maximum number of documents (per shard) that have a term for it to be considered.\n# High frequency terms are generally \"stop words\".\n# * max_query_terms (integer): Maximum number of terms to be considered. This value is limited to $wgCirrusSearchMoreLikeThisMaxQueryTermsLimit (100).\n# * min_term_freq (integer): Minimum number of times the term appears in the input to doc to be considered. For small fields (title) this value should be 1.\n# * percent_terms_to_match (float 0 to 1): The percentage of terms to match on. Defaults to 0.3 (30 percent).\n# * min_word_len (integer): Minimal length of a term to be considered. Defaults to 0.\n# * max_word_len (integer): The maximum word length above which words will be ignored. Defaults to unbounded (0).\n# * fields (comma separated list of values): These are the fields to use. Allowed fields are title, text, auxiliary_text, opening_text, headings and all.\n# * use_fields (true|false) : Tell the \"more like this\" query to use only the field data. Defaults to false: the system will extract the content of the text field to build the query.\n# Examples of good lines:\n# min_doc_freq:2\n# max_doc_freq:2\n# max_query_terms:25\n# min_term_freq:2\n# percent_terms_to_match:0.3\n# min_word_len:2\n# max_word_len:40\n# fields:text,opening_text\n# use_fields:true\n# ", "cirrussearch-didyoumean-settings": " # \n# This message lets you configure the settings of the \"Did you mean\" suggestions.\n# See also https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters-phrase.html\n# Changes to this take effect immediately.\n# The syntax is as follows:\n# * Everything from a \"#\" character to the end of the line is a comment.\n# * Every non-blank line is the setting name followed by a \":\" character followed by the setting value\n# The settings are :\n# * max_errors (integer): the maximum number of terms that will be considered misspelled in order to be corrected. 1 or 2.\n# * confidence (float): The confidence level defines a factor applied to the input phrases score which is used as a threshold for other suggestion candidates. Only candidates that score higher than the threshold will be included in the result. For instance a confidence level of 1.0 will only return suggestions that score higher than the input phrase. If set to 0.0 the best candidate are returned.\n# * min_doc_freq (float 0 to 1): The minimal threshold in number of documents a suggestion should appear in.\n# High frequency terms are generally \"stop words\".\n# * max_term_freq (float 0 to 1): The maximum threshold in number of documents in which a term can exist in order to be included.\n# * prefix_length (integer): The minimal number of prefix characters that must match a term in order to be a suggestion.\n# * suggest_mode (missing, popular, always): The suggest mode controls the way suggestions are included.\n# Examples of good lines:\n# max_errors:2\n# confidence:2.0\n# max_term_freq:0.5\n# min_doc_freq:0.01\n# prefix_length:2\n# suggest_mode:always\n#\
[MediaWiki-commits] [Gerrit] Revert "Covert Polish listinfo template back to ISO 8859-2" - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: Revert "Covert Polish listinfo template back to ISO 8859-2"
..
Revert "Covert Polish listinfo template back to ISO 8859-2"
This reverts commit fec4f446f8db0c4fb49a88f9767def1c174de86a.
Error: /Stage[main]/Mailman::Webui/File[/etc/mailman/pl/listinfo.html]
/content: change from {md5}040559cef4dc791bc0c22826d854543d to
{md5}fe5e30773451f3cce1b77e0a14476a42
failed: invalid byte sequence in UTF-8
Notice: /Stage[main]/Mailman::Listserve/File[/etc/mailman/mm_cfg.py]:
Dependency File[/etc/mailman/pl/listinfo.html] has failures: true
Warning: /Stage[main]/Mailman::Listserve/File[/etc/mailman/mm_cfg.py]: Skipping
because of failed dependencies
Notice: /Stage[main]/Mailman::Listserve/Service[mailman]: Dependency
File[/etc/mailman/pl/listinfo.html] has failures: true
Warning: /Stage[main]/Mailman::Listserve/Service[mailman]: Skipping because of
failed dependencies
Notice: /Stage[main]/Mailman::Webui/File[/var/lib/mailman/templates]:
Dependency File[/etc/mailman/pl/listinfo.html] has failures: true
Warning: /Stage[main]/Mailman::Webui/File[/var/lib/mailman/templates]: Skipping
because of failed dependencies
Notice: Finished catalog run in 9.89 seconds
Change-Id: I65e95bb278686ec8abed814a30d68e2a80a689be
---
M modules/mailman/files/templates/pl/listinfo.html
1 file changed, 13 insertions(+), 13 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/mailman/files/templates/pl/listinfo.html
b/modules/mailman/files/templates/pl/listinfo.html
index 9bc9004..296b62e 100644
--- a/modules/mailman/files/templates/pl/listinfo.html
+++ b/modules/mailman/files/templates/pl/listinfo.html
@@ -1,7 +1,7 @@
-
+
Lista dyskusyjna - Wikimedia
[MediaWiki-commits] [Gerrit] Revert "Covert Polish listinfo template back to ISO 8859-2" - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/235980 Change subject: Revert "Covert Polish listinfo template back to ISO 8859-2" .. Revert "Covert Polish listinfo template back to ISO 8859-2" This reverts commit fec4f446f8db0c4fb49a88f9767def1c174de86a. Change-Id: I65e95bb278686ec8abed814a30d68e2a80a689be --- M modules/mailman/files/templates/pl/listinfo.html 1 file changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/80/235980/1 diff --git a/modules/mailman/files/templates/pl/listinfo.html b/modules/mailman/files/templates/pl/listinfo.html index 9bc9004..296b62e 100644 --- a/modules/mailman/files/templates/pl/listinfo.html +++ b/modules/mailman/files/templates/pl/listinfo.html @@ -1,7 +1,7 @@ - + Lista dyskusyjna - Wikimedia
[MediaWiki-commits] [Gerrit] Covert Polish listinfo template back to ISO 8859-2 - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: Covert Polish listinfo template back to ISO 8859-2 .. Covert Polish listinfo template back to ISO 8859-2 Mailman messages are being output in ISO 8859-2, which got mixed with the UTF-8 text in this file. Currently the list description is in ISO-8859-2 as well. English page is still badly broken (due to inclusion of a pure ISO 8859-2 description on the UTF-8 page. Fixes: T111457 Change-Id: I66518ee8fbc1173aa8ef75b9d0a1c382d6e8cc6f --- M modules/mailman/files/templates/pl/listinfo.html 1 file changed, 13 insertions(+), 13 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/mailman/files/templates/pl/listinfo.html b/modules/mailman/files/templates/pl/listinfo.html index 296b62e..9bc9004 100644 --- a/modules/mailman/files/templates/pl/listinfo.html +++ b/modules/mailman/files/templates/pl/listinfo.html @@ -1,7 +1,7 @@ - + Lista dyskusyjna - Wikimedia
[MediaWiki-commits] [Gerrit] Migrate to a terser cookie name and format - change (mediawiki...CentralNotice)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235979
Change subject: Migrate to a terser cookie name and format
..
Migrate to a terser cookie name and format
* Rename cookie from 'centralnotice_buckets_by_campaign' to 'CN'.
* Store start as offset from UNIX time 14 (March 2014).
* Store end as offset from start.
* Instead of JSON, use this format: 'NAME!START!END[!VALUE]'.
Separate campaigns with '*'.
Before:
centralnotice_buckets_by_campaign=%257B%2522WikiConference_USA%2522
%253A%257B%2522val%2522%253A0%252C%2522start%2522%253A1439942400%25
2C%2522end%2522%253A1443672000%257D%257D
After:
CN=WikiConference_USA!39942400!3729600
Change-Id: I2b39d153bebce90b47a901be24fbb0c0f605e53d
---
M resources/subscribing/ext.centralNotice.display.bucketer.js
1 file changed, 52 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/79/235979/1
diff --git a/resources/subscribing/ext.centralNotice.display.bucketer.js
b/resources/subscribing/ext.centralNotice.display.bucketer.js
index 3b1e41e..4f41012 100644
--- a/resources/subscribing/ext.centralNotice.display.bucketer.js
+++ b/resources/subscribing/ext.centralNotice.display.bucketer.js
@@ -4,11 +4,11 @@
*/
( function ( $, mw ) {
- var BUCKET_COOKIE_NAME = 'centralnotice_buckets_by_campaign',
+ var LEGACY_COOKIE = 'centralnotice_buckets_by_campaign',
// Bucket objects by campaign; properties are campaign names.
// Retrieved from bucket cookie, if available.
- buckets,
+ buckets = {},
// The campaign we're working with.
campaign = null;
@@ -18,17 +18,37 @@
* bucket cookie, set buckets to an empty object.
*/
function loadBuckets() {
- var cookieVal = $.cookie( BUCKET_COOKIE_NAME );
+ var cookieVal = $.cookie( 'CN' ) || '';
+ $.each( cookieVal.split( '*' ), function ( idx, strBucket ) {
+ var parts = strBucket.split( '!' ),
+ key = parts[0],
+ start = parseInt( parts[1], 10 ) + 14e8,
+ end = start + parseInt( parts[2], 10 ),
+ val = parts[3];
+
+ if ( key && start && end ) {
+ buckets[ key ] = {
+ start: start,
+ end: end,
+ val: val
+ };
+ }
+ } );
+ }
+
+ /**
+* Convert a legacy, JSON-encoded cookie to the current, more concise
+* cookie key and format.
+*/
+ function migrateLegacyBuckets() {
+ var cookieVal = $.cookie( LEGACY_COOKIE );
if ( cookieVal ) {
try {
- buckets = JSON.parse( cookieVal );
- } catch ( e ) {
- // Very likely a syntax error due to corrupt
cookie contents
- buckets = {};
- }
- } else {
- buckets = {};
+ $.extend( buckets, JSON.parse(
decodeURIComponent( cookieVal ) ) );
+ storeBuckets();
+ } catch ( e ) {}
+ $.removeCookie( LEGACY_COOKIE, { path: '/' } );
}
}
@@ -37,29 +57,30 @@
* after the all the buckets it contains do.
*/
function storeBuckets() {
- var now = new Date(),
- latestDate,
- campaignName, bucketEndDate;
+ var expires = new Date / 1000,
+ cookieVal = $.map( buckets, function ( opts, key ) {
+ var parts = [
+ key,
+ opts.start - 14e8,
+ opts.end - opts.start
+ ];
- // Cycle through the buckets to find the latest end date
- latestDate = now;
- for ( campaignName in buckets ) {
+ if ( opts.val ) {
+ parts.push( opts.val );
+ }
- bucketEndDate = new Date();
- bucketEndDate.setTime( buckets[campaignName].end * 1000
);
+ if ( opts.end > expires ) {
+ expires = opts.end;
+ }
- if ( bucketEndDate > latestDate ) {
-
[MediaWiki-commits] [Gerrit] Add l10n testing using pywikibot - change (pywikibot/i18n)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/235978 Change subject: Add l10n testing using pywikibot .. Add l10n testing using pywikibot Change-Id: Iff5910371cee8ebe3e82aff5ec88a88568fd82b7 --- A .travis.yml 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/i18n refs/changes/78/235978/1 diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000..907dcd2 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,22 @@ +language: python + +sudo: false + +python: + - '3.4' + +env: + - PYWIKIBOT2_NO_USER_CONFIG=2 + +before_install: + - git clone https://github.com/wikimedia/pywikibot-core + - mkdir -p pywikibot-core/scripts/i18n + - touch pywikibot-core/scripts/i18n/__init__.py + - for item in *; do if [[ -d "$item" ]]; then cp -rp "$item" pywikibot-core/scripts/i18n; fi; done + +install: + - pip install six nose requests + +script: + - cd pywikibot-core + - nosetests --verbosity=2 tests.l10n_tests -- To view, visit https://gerrit.wikimedia.org/r/235978 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iff5910371cee8ebe3e82aff5ec88a88568fd82b7 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Owner: John Vandenberg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Fix complex single-line nowiki tests - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235977
Change subject: WIP: Fix complex single-line nowiki tests
..
WIP: Fix complex single-line nowiki tests
Change-Id: Ie8dbac6b968f3f4e3792f0e7d1db7cf2aacde80c
---
M lib/wts.SerializerState.js
M lib/wts.escapeWikitext.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
4 files changed, 51 insertions(+), 49 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/77/235977/1
diff --git a/lib/wts.SerializerState.js b/lib/wts.SerializerState.js
index b88853d..97f4310 100644
--- a/lib/wts.SerializerState.js
+++ b/lib/wts.SerializerState.js
@@ -403,8 +403,8 @@
}
// Emitting text that has not been escaped
+ this.currLine.text += res.text;
if (DU.isText(node) && res.equals(origRes)) {
- this.currLine.text += res.text;
this.currLine.processed = false;
}
diff --git a/lib/wts.escapeWikitext.js b/lib/wts.escapeWikitext.js
index a03a0a2..7eccf43 100644
--- a/lib/wts.escapeWikitext.js
+++ b/lib/wts.escapeWikitext.js
@@ -44,7 +44,7 @@
line = text;
}
return line[0] === '=' &&
- text && text.length > 0 && text[text.length - 1] ===
'=';
+ text && text.length > 0 && text[0] === '=' &&
text[text.length - 1] === '=';
} else {
return false;
}
@@ -59,7 +59,7 @@
// For first nodes of 's, bullets in sol posn trigger escaping
if (liNode.nodeName === 'DT' && /:/.test(text)) {
return true;
- } else if (state.currLine.text === '' &&
this.isFirstContentNode(opts.node)) {
+ } else if (state.currLine.text === '*' &&
this.isFirstContentNode(opts.node)) {
return text.match(/^[#\*:;]/);
} else {
return false;
@@ -203,7 +203,7 @@
return (!opts.node || state.currLine.firstNode === tdNode) &&
(text.match(/\|/) || (
!state.inWideTD &&
- state.currLine.text === '' &&
+ state.currLine.text === '|' &&
text.match(/^[\-+]/) &&
opts.node && DU.pathToAncestor(opts.node,
tdNode).every(function(n) {
return this.isFirstContentNode(n) &&
@@ -730,18 +730,7 @@
var cl = state.currLine;
if (!cl.processed) {
cl.processed = true;
- cl.hasOpenHeadingChar = false;
cl.hasOpenBrackets = false;
-
- // If accumulated text starts with a '=', verify that
that
- // the opening bit came from one of two places:
- // - a text node: (Ex: =foo=)
- // - the first child of a heading node: (Ex:
=foo=)
- if (cl.text.match(/^=/) &&
-
(DU.isText(DU.firstNonSepChildNode(cl.firstNode.parentNode)) ||
- cl.firstNode.nodeName.match(/^H/) &&
cl.firstNode.firstChild && DU.isText(cl.firstNode.firstChild))) {
- cl.hasOpenHeadingChar = true;
- }
// Does cl.text have an open '['?
if (cl.text.match(/\[[^\]]*$/)) {
@@ -760,11 +749,28 @@
// NOTE: Escaping the "=" char in the regexp because JSHint
complains that
// it can be confused by other developers.
// See
http://jslinterrors.com/a-regular-expression-literal-can-be-confused-with/
- if (cl.hasOpenHeadingChar && opts.isLastChild &&
text.match(/\=$/) ||
- cl.hasOpenBrackets && text.match(/^[^\[]*\]/) &&
+ if (cl.hasOpenBrackets && text.match(/^[^\[]*\]/) &&
this.hasWikitextTokens(state, sol,
this.serializer.options, cl.text + text, true)) {
- state.env.log("trace/wt-escape", "---Wikilink chars:
complex single-line test---");
+ state.env.log("trace/wt-escape", "---Links: complex
single-line test---");
return this.escapedText(state, sol, text,
fullCheckNeeded);
+ } else if (opts.isLastChild && text.match(/=$/)) {
+ var headingMatch =
cl.firstNode.nodeName.match(/^H(\d)/);
+ if (headingMatch) {
+ var n = headingMatch[1];
+ if (cl.text[n] === '=') {
+ // The first character after the
heading wikitext is a '='
+ // So, the trailing '=' can change
semantics if it is not nowikied
+
[MediaWiki-commits] [Gerrit] Revert "mailman: ferm, allow rsync from sodium for migration" - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235976
Change subject: Revert "mailman: ferm, allow rsync from sodium for migration"
..
Revert "mailman: ferm, allow rsync from sodium for migration"
This reverts commit 9c0d9fdb7723ce6b481b4942f47052eb7a6599c0.
Change-Id: Id82319868a3a949b7c8fc46c8e23bff1f317adaa
---
M manifests/role/lists.pp
1 file changed, 0 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/76/235976/1
diff --git a/manifests/role/lists.pp b/manifests/role/lists.pp
index 04e4e66..e2b69e4 100644
--- a/manifests/role/lists.pp
+++ b/manifests/role/lists.pp
@@ -156,12 +156,6 @@
ferm::rule { 'mailman-spamd-local':
rule => 'proto tcp dport 783 { saddr (127.0.0.1 ::1) ACCEPT; }'
}
-
-ferm::service { 'sodium-rysnc':
-proto => 'tcp',
-port => '873',
-srange => '208.80.154.61/32',
-}
}
class role::lists::migration {
--
To view, visit https://gerrit.wikimedia.org/r/235976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id82319868a3a949b7c8fc46c8e23bff1f317adaa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] broken_table_attribute_name_char - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235975
Change subject: broken_table_attribute_name_char
..
broken_table_attribute_name_char
Change-Id: I0e6e597e2f4eb9dfe0ded34f92aa15a83338229e
---
M lib/pegTokenizer.pegjs.txt
M tests/parserTests-blacklist.js
2 files changed, 34 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/75/235975/1
diff --git a/lib/pegTokenizer.pegjs.txt b/lib/pegTokenizer.pegjs.txt
index 767956e..809f10d 100644
--- a/lib/pegTokenizer.pegjs.txt
+++ b/lib/pegTokenizer.pegjs.txt
@@ -102,7 +102,8 @@
// These rules are exposed as start rules.
generic_newline_attributes "generic_newline_attributes" =
generic_newline_attribute*
-table_attributes "table_attributes" = table_attribute*
+table_attributes "table_attributes"
+ = (table_attribute / optionalSpaceToken b:broken_table_attribute_name_char {
return b; })*
/* The 'redirect' magic word.
* The leading whitespace allowed is due to the PHP trim() function.
@@ -1291,7 +1292,7 @@
// Also eat these chars in a wikitext table or tr attribute name. They are
// normally not matched by the generic_attribute_name.
-broken_table_attribute_name_char = c:[ \t\0/=>"'\[] { return new KV(c, ''); }
+broken_table_attribute_name_char = c:[\0/=>"'] { return new KV(c, ''); }
// The arrangement of chars is to emphasize the split between what's disallowed
// by html5 and what's necessary to give directive a chance.
@@ -1581,7 +1582,7 @@
= sc:(space / comment)* startPos:("" { return endOffset(); }) b:"{" p:pipe
// ok to normalize away stray |} on rt (see T59360)
& { return stops.push('table', false); }
-ta:(table_attribute / broken_table_attribute_name_char)*
+ta:table_attributes
tsEndPos:("" { stops.pop('table'); return endOffset(); })
{
var coms = tu.popComments(ta);
@@ -1618,7 +1619,7 @@
! { return stops.onStack('tableDataBlock'); }
p:pipe dashes:$"-"+
& { return stops.push('table', false); }
-a:(table_attribute / broken_table_attribute_name_char)*
+a:table_attributes
tagEndPos:("" { stops.pop('table'); return endOffset(); })
// handle tables with missing table cells after a row
td:implicit_table_data_tag?
@@ -1770,7 +1771,7 @@
*/
row_syntax_table_args
= & { return stops.inc('tableCellArg'); }
-& could_be_attribute
+// & could_be_attribute
as:table_attributes s:space* p:pipe !pipe {
stops.dec('tableCellArg');
return [as, s, p];
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 293a187..444a507 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -180,7 +180,6 @@
add("wt2html", "Sanitizer: Validating that and work, but only
for Microdata", "\n\t\n\t\n\t\n\t\n\t\n\t\n");
add("wt2html", "Language converter: output gets cut off unexpectedly (bug
5757)", "this bit is safe: }-\n\nbut if we add a conversion instance:
-{zh-cn:xxx;zh-tw:yyy}-\n\nthen we
get cut off here: }-\n\nall
additional text is vanished");
add("wt2html", "Self closed html pairs (bug 5487)", "Centered
text\nIn
div text");
-add("wt2html", "Fuzz testing: Parser13", "\n http://a|");
add("wt2html", "Fuzz testing: Parser14", " onmouseover= \nhttp://__TOC__\";
data-parsoid='{\"stx\":\"url\",\"dsr\":[19,33,0,0]}'>http://__TOC__");
add("wt2html", "Fuzz testing: Parser14-table", "a\n");
add("wt2html", "Fuzz testing: Parser24", "{{{|\n\nMOVE
YOUR MOUSE CURSOR OVER THIS TEXT\n\n\n\n");
@@ -307,12 +306,13 @@
add("wt2html", "Language parser function", "ar");
add("wt2html", "Special parser function", "Parser
function implementation for pf_#special missing in Parsoid.\nParser
function implementation for pf_#special missing in Parsoid.\nParser
function implementation for pf_#special missing in Parsoid.");
add("wt2html", "1. SOL-sensitive wikitext tokens as template-args", "*a\n#a\n:a");
+add("wt2html", "Tables: Digest broken attributes on table and tr tag", "
[\n\n\n");
add("wt2html", "Links 3. WikiLinks: No escapes needed", "[[Foo|[Foobar]]\nfoo|bar");
add("wt2html", "1. a tags", "google");
add("wt2html", "2. Parsoid-only: Don't wrap broken template tags in
on wt2wt (Bug 42353)", "{{}}");
add("wt2html", "1. Parsoid-only: Don't wrap broken template tags in
on wt2wt (Bug 42353)", "}}{{");
add("wt2html", "Empty table rows go away", "\n Hello\n
there\n\n\n");
-add("wt2html", "RT-ed inter-element separators should be valid separators",
"\n\n");
+add("wt2html", "RT-ed inter-element
[MediaWiki-commits] [Gerrit] → in 'flow-notification-enabled-on-talkpage-titl... - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: → in
'flow-notification-enabled-on-talkpage-title-message'
..
→ in 'flow-notification-enabled-on-talkpage-title-message'
See:
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Flow-notification-enabled-on-talkpage-title-message/en
Change-Id: I5793b268d1ae46f70e777631141c21385181ef7b
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 31fdb01..89ddb9c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -561,7 +561,7 @@
"flow-talk-page-beta-feature-message": "Flow on user talk",
"flow-talk-page-beta-feature-description": "Enables a new structured
discussion system on your user talk page. Flow simplifies talk page discussions
with clear places to write and reply, and allows conversation-level
notifications. Existing wikitext discussions are moved to an archive. This
feature is not auto-enabled; users will have to enable it separately. Disabling
this feature will move the Flow board to a subpage and un-archive the previous
talkpage.",
"flow-notification-link-text-enabled-on-talkpage": "View user talk
page",
- "flow-notification-enabled-on-talkpage-title-message": "New discussion
system enabled for your user talk pageAvailable at [[$1]]",
+ "flow-notification-enabled-on-talkpage-title-message": "New discussion
system enabled for your user talk pageAvailable at [[$1]]",
"flow-notification-enabled-on-talkpage-email-subject": "New discussion
system on $1",
"flow-notification-enabled-on-talkpage-email-batch-body": "Flow, the
new wiki discussion system, has been enabled on your user talk page on
{{SITENAME}}. You can get more information, provide feedback or disable the new
system any time from the Beta features section in your preferences.",
"flow-beta-feature-add-archive-template-edit-summary": "Adding archive
template",
--
To view, visit https://gerrit.wikimedia.org/r/235974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5793b268d1ae46f70e777631141c21385181ef7b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Purodha
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Preferences: Fix issues from 6d3c65b5b0 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Preferences: Fix issues from 6d3c65b5b0
..
Preferences: Fix issues from 6d3c65b5b0
* Use .mw-preferences-messagebox instead of .successbox to
avoid conflicts with other Special pages using '.successbox'
as a class and so that the new class can be used to check
for messages to replace with notifications
* Add logic to check for messages to replace using the new
aforementioned class
* Use Html::rawElement and Html::element instead of Xml::tags
to add the non-JS successbox
* Re-added tags around non-JS successbox message that were
accidentally ommitted in the original patch
Bug: T19496
Change-Id: I990667aa114d8201516bee6cb2ad22994de53c6c
---
M includes/specials/SpecialPreferences.php
M resources/src/mediawiki.special/mediawiki.special.preferences.css
M resources/src/mediawiki.special/mediawiki.special.preferences.js
3 files changed, 24 insertions(+), 17 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialPreferences.php
b/includes/specials/SpecialPreferences.php
index f2a315e..4b75e5f 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -50,10 +50,13 @@
if ( $this->getRequest()->getCheck( 'success' ) ) {
$out->wrapWikiMsg(
- Xml::tags(
+ Html::rawElement(
'div',
- array( 'class' => 'successbox', 'id' =>
'mw-preferences-success' ),
- '$1'
+ array(
+ 'class' =>
'mw-preferences-messagebox successbox',
+ 'id' => 'mw-preferences-success'
+ ),
+ Html::element( 'p', array(), '$1' )
),
'savedprefs'
);
diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.css
b/resources/src/mediawiki.special/mediawiki.special.preferences.css
index 0e71d30..8fb9a47 100644
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.css
+++ b/resources/src/mediawiki.special/mediawiki.special.preferences.css
@@ -20,7 +20,7 @@
zoom: 1;
}
-/* When JS is enabled, .successbox is replaced with a mw.notification */
-.successbox {
+/* When JS is enabled, .mw-preferences-messageboxes are replaced with
mw.notifications */
+.mw-preferences-messagebox {
display: none;
}
diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.js
b/resources/src/mediawiki.special/mediawiki.special.preferences.js
index 893db98..7f13f29 100644
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.js
+++ b/resources/src/mediawiki.special/mediawiki.special.preferences.js
@@ -1,4 +1,3 @@
-
/*!
* JavaScript for Special:Preferences
*/
@@ -86,18 +85,23 @@
}
}
- // If there is a #mw-preferences-success box and javascript is enabled,
use a slick notification instead!
- if ( $( '#mw-preferences-success' ).length ) {
- notif = mediaWiki.notification.notify( mediaWiki.message(
'savedprefs' ), { autoHide: false } );
- $( '#preftoc, .prefsection' ).one( 'change keydown mousedown',
function () { // 'change' event not reliable!
- if ( notif ) {
- notif.close();
- }
- } );
+ // Check for messageboxes (.successbox, .warningbox, .errorbox) to
replace with notifications
+ if ( $( '.mw-preferences-messagebox' ).length ) {
+ // If there is a #mw-preferences-success box and javascript is
enabled, use a slick notification instead!
+ if ( $( '#mw-preferences-success' ).length ) {
+ notif = mediaWiki.notification.notify(
mediaWiki.message( 'savedprefs' ), { autoHide: false } );
+ // 'change' event not reliable!
+ $( '#preftoc, .prefsection' ).one( 'change keydown
mousedown', function () {
+ if ( notif ) {
+ notif.close();
+ notif = null;
+ }
+ } );
- // Remove now-unnecessary success=1 querystring to prevent
reappearance of notification on reload
- if ( history.replaceState ) {
- history.replaceState( {}, document.title,
document.URL.replace( /&?success=1/, '' ) );
+ // Remove now-unnecessary success=1 querystring to
prevent re
[MediaWiki-commits] [Gerrit] Fix minor typo in message - change (mediawiki...Flow)
Purodha has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235974
Change subject: Fix minor typo in message
..
Fix minor typo in message
See:
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Flow-notification-enabled-on-talkpage-title-message/en
Change-Id: I5793b268d1ae46f70e777631141c21385181ef7b
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/74/235974/1
diff --git a/i18n/en.json b/i18n/en.json
index 31fdb01..89ddb9c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -561,7 +561,7 @@
"flow-talk-page-beta-feature-message": "Flow on user talk",
"flow-talk-page-beta-feature-description": "Enables a new structured
discussion system on your user talk page. Flow simplifies talk page discussions
with clear places to write and reply, and allows conversation-level
notifications. Existing wikitext discussions are moved to an archive. This
feature is not auto-enabled; users will have to enable it separately. Disabling
this feature will move the Flow board to a subpage and un-archive the previous
talkpage.",
"flow-notification-link-text-enabled-on-talkpage": "View user talk
page",
- "flow-notification-enabled-on-talkpage-title-message": "New discussion
system enabled for your user talk pageAvailable at [[$1]]",
+ "flow-notification-enabled-on-talkpage-title-message": "New discussion
system enabled for your user talk pageAvailable at [[$1]]",
"flow-notification-enabled-on-talkpage-email-subject": "New discussion
system on $1",
"flow-notification-enabled-on-talkpage-email-batch-body": "Flow, the
new wiki discussion system, has been enabled on your user talk page on
{{SITENAME}}. You can get more information, provide feedback or disable the new
system any time from the Beta features section in your preferences.",
"flow-beta-feature-add-archive-template-edit-summary": "Adding archive
template",
--
To view, visit https://gerrit.wikimedia.org/r/235974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5793b268d1ae46f70e777631141c21385181ef7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Purodha
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] resourceloader: Create state "executing" - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235973
Change subject: resourceloader: Create state "executing"
..
resourceloader: Create state "executing"
Change-Id: I35c8d2bc2da7135456c39d4b513661d2d11fb0f4
---
M resources/src/mediawiki/mediawiki.js
M tests/qunit/suites/resources/mediawiki/mediawiki.test.js
2 files changed, 6 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/73/235973/1
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index 842492c..967434f 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -742,7 +742,7 @@
*The module is known to the system but not yet
requested.
*Meta data is registered via mw.loader#register.
Calls to that method are
*generated server-side by the startup module.
-* - `loading` (1):
+* - `loading`:
*The module is requested through mw.loader (either
directly or as dependency of
*another module). The client will be fetching
module contents from the server.
*The contents are then stashed in the registry via
mw.loader#implement.
@@ -750,9 +750,8 @@
*The module has been requested from the server and
stashed via mw.loader#implement.
*If the module has no more dependencies in-fight,
the module will be executed
*right away. Otherwise execution is deferred,
controlled via #handlePending.
-* - `loading` (2):
+* - `executing`:
*The module is being executed.
-*TODO: Create a new state instead of re-using the
"loading" state.
* - `ready`:
*The module has been successfully executed.
* - `error`:
@@ -1190,21 +1189,11 @@
if ( !hasOwn.call( registry, module ) ) {
throw new Error( 'Module has not been
registered yet: ' + module );
}
- if ( registry[module].state === 'registered' ) {
- throw new Error( 'Module has not been
requested from the server yet: ' + module );
- }
- if ( registry[module].state === 'loading' ) {
- throw new Error( 'Module has not
completed loading yet: ' + module );
- }
- if ( registry[module].state === 'ready' ) {
- throw new Error( 'Module has already
been executed: ' + module );
+ if ( registry[module].state !== 'loaded' ) {
+ throw new Error( 'Module in state "' +
registry[module].state + '" may not be executed: ' + module );
}
- // This used to be inside runScript, but since
that is now fired asychronously
- // (after CSS is loaded) we need to set it here
right away. It is crucial that
- // when execute() is called this is set
synchronously, otherwise modules will get
- // executed multiple times as the registry will
state that it isn't loading yet.
- registry[module].state = 'loading';
+ registry[module].state = 'executing';
runScript = function () {
var script, markModuleReady,
nestedAddScript, legacyWait,
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
index fcf6dda..ddf14b8 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
@@ -639,7 +639,7 @@
assert.strictEqual( isJsExecuted, undefined,
'script not executed multiple times' );
isJsExecuted = true;
- assert.equal( mw.loader.getState(
'test.implement.import' ), 'loading', 'module state during implement() script
execution' );
+ assert.equal( mw.loader.getState(
'test.implement.import' ), 'executing', 'module state during implement() script
execution' );
$element = $( 'Foo bar' ).appendTo( '#qunit-fixture' );
--
To view, visit htt
[MediaWiki-commits] [Gerrit] resourceloader: Document mw.loader state machine - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235971
Change subject: resourceloader: Document mw.loader state machine
..
resourceloader: Document mw.loader state machine
Change-Id: I5d40a6d30805a10e638e94e9d179a0db1af2126c
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 26 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/71/235971/1
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index a73accf..18f1c60 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -718,7 +718,7 @@
*
* {
* 'moduleName': {
-* // From mw.loader.register() in startup
module
+* // From mw.loader.register()
* 'version': '' (hash)
* 'dependencies': ['required.foo',
'bar.also', ...], (or) function () {}
* 'group': 'somegroup', (or) null
@@ -736,6 +736,31 @@
* }
* }
*
+* State machine:
+*
+* - `registered`:
+*The module is known to the system but not yet
requested.
+*Meta data is registered via mw.loader#register.
Calls to that method are
+*generated server-side by the startup module.
+* - `loading` (1):
+*The module is requested through mw.loader (either
directly or as dependency of
+*another module). The client will be fetching
module contents from the server.
+*The contents are then stashed in the registry via
mw.loader#implement.
+* - `loaded`:
+*The module has been requested from the server and
stashed via mw.loader#implement.
+*If the module has no more dependencies in-fight,
the module will be executed
+*right away. Otherwise execution is deferred,
controlled via #handlePending.
+* - `loading` (2):
+*The module is being executed.
+*TODO: Create a new state instead of re-using the
"loading" state.
+* - `ready`:
+*The module has been successfully executed.
+* - `error`:
+*The module (or one of its dependencies) produced
an error during execution.
+* - `missing`:p
+*The module was registered client-side and
requested, but the server denied knowledge
+*of the module's existence.
+*
* @property
* @private
*/
--
To view, visit https://gerrit.wikimedia.org/r/235971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d40a6d30805a10e638e94e9d179a0db1af2126c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] resourceloader: Move creation addLink() function to shared m... - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235972
Change subject: resourceloader: Move creation addLink() function to shared
mw.loader scope
..
resourceloader: Move creation addLink() function to shared mw.loader scope
No need for this function to be re-created on each call of execute().
Also set state to loading" earlier in runScript for clarity.
Change-Id: I46c7f850df90f8c160613dc6ffd251c7e9aee147
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 23 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/72/235972/1
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index 18f1c60..842492c 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1160,6 +1160,24 @@
}
/**
+* Utility function for execute()
+* @ignore
+*/
+ function addLink( media, url ) {
+ var el = document.createElement( 'link' );
+ // Support: IE
+ // Insert in document *before* setting href
+ getMarker().before( el );
+ el.rel = 'stylesheet';
+ if ( media && media !== 'all' ) {
+ el.media = media;
+ }
+ // If you end up here from an IE exception
"SCRIPT: Invalid property value.",
+ // see #addEmbeddedCSS, bug 31676, and bug
47277 for details.
+ el.href = url;
+ }
+
+ /**
* Executes a loaded module, making it ready to use
*
* @private
@@ -1182,24 +1200,11 @@
throw new Error( 'Module has already
been executed: ' + module );
}
- /**
-* Define loop-function here for efficiency
-* and to avoid re-using badly scoped variables.
-* @ignore
-*/
- function addLink( media, url ) {
- var el = document.createElement( 'link'
);
- // Support: IE
- // Insert in document *before* setting
href
- getMarker().before( el );
- el.rel = 'stylesheet';
- if ( media && media !== 'all' ) {
- el.media = media;
- }
- // If you end up here from an IE
exception "SCRIPT: Invalid property value.",
- // see #addEmbeddedCSS, bug 31676, and
bug 47277 for details.
- el.href = url;
- }
+ // This used to be inside runScript, but since
that is now fired asychronously
+ // (after CSS is loaded) we need to set it here
right away. It is crucial that
+ // when execute() is called this is set
synchronously, otherwise modules will get
+ // executed multiple times as the registry will
state that it isn't loading yet.
+ registry[module].state = 'loading';
runScript = function () {
var script, markModuleReady,
nestedAddScript, legacyWait,
@@ -1263,12 +1268,6 @@
handlePending( module );
}
};
-
- // This used to be inside runScript, but since
that is now fired asychronously
- // (after CSS is loaded) we need to set it here
right away. It is crucial that
- // when execute() is called this is set
synchronously, otherwise modules will get
- // executed multiple times as the registry will
state that it isn't loading yet.
- registry[module].state = 'loading';
// Add localizations to message system
if ( registry[module].messages ) {
--
To view, visit https://gerrit.wikimedia.org/r/235972
T
[MediaWiki-commits] [Gerrit] ResultBuilder: set array type to 'assoc' in addTermList() an... - change (mediawiki...Wikibase)
Ricordisamoa has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235970
Change subject: ResultBuilder: set array type to 'assoc' in addTermList() and
addRemovedTerm()
..
ResultBuilder: set array type to 'assoc' in addTermList() and addRemovedTerm()
Like LabelsChanger and DescriptionsChanger expect it to be.
Change-Id: If8830bb76a685ef45a94c869e94e051db88866e7
---
M repo/includes/api/ResultBuilder.php
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/70/235970/1
diff --git a/repo/includes/api/ResultBuilder.php
b/repo/includes/api/ResultBuilder.php
index 5e38938..c8b21f4 100644
--- a/repo/includes/api/ResultBuilder.php
+++ b/repo/includes/api/ResultBuilder.php
@@ -646,6 +646,7 @@
private function addTermList( TermList $termList, $name, $tag, $path ) {
$serializer = $this->serializerFactory->newTermListSerializer();
$value = $serializer->serialize( $termList );
+ ApiResult::setArrayType( $value, 'assoc' );
$this->setList( $path, $name, $value, $tag );
}
@@ -662,6 +663,7 @@
'removed' => '',
)
);
+ ApiResult::setArrayType( $value, 'assoc' );
$this->setList( $path, $name, $value, $tag );
}
--
To view, visit https://gerrit.wikimedia.org/r/235970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8830bb76a685ef45a94c869e94e051db88866e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused qunit-mobile jobs - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove unused qunit-mobile jobs
..
Remove unused qunit-mobile jobs
Change-Id: I6bbc82659106bda0cca71742027d0914bc6c6329
---
M jjb/macro.yaml
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
3 files changed, 0 insertions(+), 38 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 0f6ec50..250748c 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -341,11 +341,6 @@
- qunit-querystring:
querystring: ''
- builder:
-name: qunit-mobile
-builders:
- - qunit-querystring:
-querystring: '&useformat=mobile'
-- builder:
name: qunit-karma
builders:
builders:
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 7a8a89f..9895a9f 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -123,22 +123,6 @@
- archive-log-dir
- job-template:
-name: '{name}-{ext-name}-qunit-mobile'
-node: contintLabsSlave && UbuntuPrecise
-concurrent: true
-triggers:
- - zuul
-builders:
- - prepare-mediawiki:
- ext-name: '{ext-name}'
- dependencies: '{dependencies}'
- - qunit-mobile
-publishers:
- - localhost-cleanup
- - mw-teardown-mysql
- - archive-log-dir
-
-- job-template:
# This is a copy of '{name}-{ext-name}-qunit', but with processes ve's
submodule
# since Zuul cloner does not support git submodules.
name: 'mwext-VisualEditor-qunit'
@@ -610,14 +594,7 @@
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: MobileFrontend
- - '{name}-{ext-name}-qunit-mobile':
-name: mwext
-ext-name: MobileFrontend
- '{name}-{ext-name}-qunit':
-name: mwext
-ext-name: Thanks
-dependencies:
'Echo,Flow,MobileFrontend,VisualEditor,GuidedTour,AbuseFilter,SpamBlacklist,CheckUser,EventLogging,ConfirmEdit'
- - '{name}-{ext-name}-qunit-mobile':
name: mwext
ext-name: Thanks
dependencies:
'Echo,Flow,MobileFrontend,VisualEditor,GuidedTour,AbuseFilter,SpamBlacklist,CheckUser,EventLogging,ConfirmEdit'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4b72e61..14bc16a 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1835,16 +1835,6 @@
- 'mwext-{name}-phpcs-HEAD'
# Template for MediaWiki extensions.
- # Triggers qunit and qunit mobile jobs
- - name: extension-qunit-and-mobile
-test:
- - 'mwext-{name}-qunit'
- - 'mwext-{name}-qunit-mobile'
-gate-and-submit:
- - 'mwext-{name}-qunit'
- - 'mwext-{name}-qunit-mobile'
-
- # Template for MediaWiki extensions.
# No unit tests but vote on linting.
- name: extension-checks
check-only:
--
To view, visit https://gerrit.wikimedia.org/r/235969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6bbc82659106bda0cca71742027d0914bc6c6329
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix logic in hasWikitextTokens when asking for linksOnly - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix logic in hasWikitextTokens when asking for linksOnly
..
Fix logic in hasWikitextTokens when asking for linksOnly
* I'm assuming this `linksOnly` flag means that the test only cares
about link tokens.
* The early return meant that if another type of SelfclosingTagTk was
encountered, it would return false. And yes, we do have other types
in the tokenizer.
* There seems to be another bug here which isn't addressed in that
it'll only return true for wikilinks with valid targets. But, what
about extlinks?
Change-Id: Id70219ab27c32e28886407f979f907230bfbf42d
---
M lib/wts.escapeWikitext.js
1 file changed, 13 insertions(+), 3 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/wts.escapeWikitext.js b/lib/wts.escapeWikitext.js
index 0f18fc6..a03a0a2 100644
--- a/lib/wts.escapeWikitext.js
+++ b/lib/wts.escapeWikitext.js
@@ -243,6 +243,10 @@
// Ignore non-whitelisted html tags
if (t.isHTMLTag()) {
+ if (linksOnly) {
+ continue;
+ }
+
if
(/(?:^|\s)mw:Extension(?=$|\s)/.test(t.getAttribute("typeof")) &&
options.extName !== t.getAttribute("name")) {
return true;
@@ -307,14 +311,20 @@
}
}
- return !linksOnly;
+ if (!linksOnly) {
+ return true;
+ }
+ }
+
+ if (linksOnly) {
+ continue;
}
if (state.inCaption && tc === pd.TagTk && t.name ===
'listItem') {
continue;
}
- if (!linksOnly && tc === pd.TagTk) {
+ if (tc === pd.TagTk) {
var ttype = t.getAttribute('typeof');
// Ignore mw:Entity tokens
if (t.name === 'span' && ttype === 'mw:Entity') {
@@ -342,7 +352,7 @@
return true;
}
- if (!linksOnly && tc === pd.EndTagTk) {
+ if (tc === pd.EndTagTk) {
// Ignore mw:Entity tokens
if (numEntities > 0 && t.name === 'span') {
numEntities--;
--
To view, visit https://gerrit.wikimedia.org/r/235668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id70219ab27c32e28886407f979f907230bfbf42d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Cscott
Gerrit-Reviewer: Subramanya Sastry
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused qunit-mobile jobs - change (integration/config)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235969
Change subject: Remove unused qunit-mobile jobs
..
Remove unused qunit-mobile jobs
Change-Id: I6bbc82659106bda0cca71742027d0914bc6c6329
---
M jjb/macro.yaml
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
3 files changed, 0 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/69/235969/1
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 0f6ec50..250748c 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -341,11 +341,6 @@
- qunit-querystring:
querystring: ''
- builder:
-name: qunit-mobile
-builders:
- - qunit-querystring:
-querystring: '&useformat=mobile'
-- builder:
name: qunit-karma
builders:
builders:
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 7a8a89f..9895a9f 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -123,22 +123,6 @@
- archive-log-dir
- job-template:
-name: '{name}-{ext-name}-qunit-mobile'
-node: contintLabsSlave && UbuntuPrecise
-concurrent: true
-triggers:
- - zuul
-builders:
- - prepare-mediawiki:
- ext-name: '{ext-name}'
- dependencies: '{dependencies}'
- - qunit-mobile
-publishers:
- - localhost-cleanup
- - mw-teardown-mysql
- - archive-log-dir
-
-- job-template:
# This is a copy of '{name}-{ext-name}-qunit', but with processes ve's
submodule
# since Zuul cloner does not support git submodules.
name: 'mwext-VisualEditor-qunit'
@@ -610,14 +594,7 @@
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: MobileFrontend
- - '{name}-{ext-name}-qunit-mobile':
-name: mwext
-ext-name: MobileFrontend
- '{name}-{ext-name}-qunit':
-name: mwext
-ext-name: Thanks
-dependencies:
'Echo,Flow,MobileFrontend,VisualEditor,GuidedTour,AbuseFilter,SpamBlacklist,CheckUser,EventLogging,ConfirmEdit'
- - '{name}-{ext-name}-qunit-mobile':
name: mwext
ext-name: Thanks
dependencies:
'Echo,Flow,MobileFrontend,VisualEditor,GuidedTour,AbuseFilter,SpamBlacklist,CheckUser,EventLogging,ConfirmEdit'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4b72e61..14bc16a 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1835,16 +1835,6 @@
- 'mwext-{name}-phpcs-HEAD'
# Template for MediaWiki extensions.
- # Triggers qunit and qunit mobile jobs
- - name: extension-qunit-and-mobile
-test:
- - 'mwext-{name}-qunit'
- - 'mwext-{name}-qunit-mobile'
-gate-and-submit:
- - 'mwext-{name}-qunit'
- - 'mwext-{name}-qunit-mobile'
-
- # Template for MediaWiki extensions.
# No unit tests but vote on linting.
- name: extension-checks
check-only:
--
To view, visit https://gerrit.wikimedia.org/r/235969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6bbc82659106bda0cca71742027d0914bc6c6329
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] poolcounter: PoolCounterRedis doc cleanups - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: poolcounter: PoolCounterRedis doc cleanups
..
poolcounter: PoolCounterRedis doc cleanups
Change-Id: I0266941c40d30f631ae77695cbe81bbdc2a85a79
---
M includes/poolcounter/PoolCounterRedis.php
1 file changed, 2 insertions(+), 5 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/poolcounter/PoolCounterRedis.php
b/includes/poolcounter/PoolCounterRedis.php
index 98797a3..d7357cf 100644
--- a/includes/poolcounter/PoolCounterRedis.php
+++ b/includes/poolcounter/PoolCounterRedis.php
@@ -76,7 +76,7 @@
const AWAKE_ONE = 1; // wake-up if when a slot can be taken from an
existing process
const AWAKE_ALL = 2; // wake-up if an existing process finishes and
wake up such others
- /** @var array List of active PoolCounterRedis objects in this script */
+ /** @var PoolCounterRedis[] List of active PoolCounterRedis objects in
this script */
protected static $active = null;
function __construct( $conf, $type, $key ) {
@@ -121,7 +121,6 @@
}
function acquireForMe() {
-
$status = $this->precheckAcquire();
if ( !$status->isGood() ) {
return $status;
@@ -131,7 +130,6 @@
}
function acquireForAnyone() {
-
$status = $this->precheckAcquire();
if ( !$status->isGood() ) {
return $status;
@@ -141,7 +139,6 @@
}
function release() {
-
if ( $this->slot === null ) {
return Status::newGood( PoolCounter::NOT_LOCKED ); //
not locked
}
@@ -190,7 +187,7 @@
return 1
LUA;
try {
- $res = $conn->luaEval( $script,
+ $conn->luaEval( $script,
array(
$this->getSlotListKey(),
$this->getSlotRTimeSetKey(),
--
To view, visit https://gerrit.wikimedia.org/r/235952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0266941c40d30f631ae77695cbe81bbdc2a85a79
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...ExtensionDistributor)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235968
Change subject: build: Updating development dependencies
..
build: Updating development dependencies
* grunt-contrib-jshint: 0.11.2 → 0.11.3
Change-Id: Ia48f1d80ea52c142a8c320fabda3e0df153e670b
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExtensionDistributor
refs/changes/68/235968/1
diff --git a/package.json b/package.json
index d1d076e..15b2b1b 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
"devDependencies": {
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.2",
+"grunt-contrib-jshint": "0.11.3",
"grunt-banana-checker": "0.2.2",
"grunt-jscs": "1.8.0",
"grunt-jsonlint": "1.0.4"
--
To view, visit https://gerrit.wikimedia.org/r/235968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia48f1d80ea52c142a8c320fabda3e0df153e670b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExtensionDistributor
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Add Phabricator/Diffusion provider - change (mediawiki...ExtensionDistributor)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235967
Change subject: [WIP] Add Phabricator/Diffusion provider
..
[WIP] Add Phabricator/Diffusion provider
Change-Id: I7e75243e7f7538bbed59d8d8e93ae9d2c718ed02
---
A providers/PhabricatorExtDistProvider.php
1 file changed, 59 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExtensionDistributor
refs/changes/67/235967/1
diff --git a/providers/PhabricatorExtDistProvider.php
b/providers/PhabricatorExtDistProvider.php
new file mode 100644
index 000..2377a72
--- /dev/null
+++ b/providers/PhabricatorExtDistProvider.php
@@ -0,0 +1,59 @@
+ 'PhabricatorExtDistProvider',
+ * 'apiUrl' =>
'https://gerrit.wikimedia.org/r/projects/mediawiki%2F$TYPE%2F$EXT/branches',
+ * 'tarballUrl' =>
'http://extdist.wmflabs.org/dist/$TYPE/$EXT-$REF-$SHA.tar.gz',
+ * 'tarballName' => '$EXT-$REF-$SHA.tar.gz',
+ * 'repoListUrl' =>
'https://gerrit.wikimedia.org/r/projects/?p=mediawiki/$TYPE/',
+ *
+ */
+class PhabricatorExtDistProvider extends ExtDistProvider {
+
+ private $username;
+ private $certificate;
+ private $session;
+
+ public function __construct( array $options ) {
+ parent::__construct( $options );
+ $this->username = $options['username'];
+ $this->certificate = $options['certificate'];
+ }
+
+ private function initSession() {
+ $url = $this->apiUrl . '/api/conduit.connect';
+ $params = array(
+ 'params' => FormatJson::encode( '' ),
+ 'output' => 'json',
+ '__conduit__' => true
+ );
+ $req = MWHttpRequest::factory( $url, array( 'data' => $params )
);
+ $status = $req->execute();
+ $json = FormatJson::decode( $req->getContent() );
+ $this->session = array(
+ 'sessionKey' => $json['result']['sessionKey'],
+ 'connectionID' => $json['result']['connectionID'],
+ );
+ }
+
+ private function makeRequest( $endpoint, array $params ) {
+ if ( !$this->session ) {
+ $this->initSession();
+ }
+
+ $url = $this->apiUrl . '/api/' . $endpoint;
+ $params['__conduit__'] = $this->session;
+ $req = MWHttpRequest::factory( $url, array( 'data' => array(
+ 'params'
+ ) ) );
+ }
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/235967
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e75243e7f7538bbed59d8d8e93ae9d2c718ed02
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExtensionDistributor
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...MassMessage)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235966
Change subject: build: Updating development dependencies
..
build: Updating development dependencies
* grunt-contrib-jshint: 0.11.2 → 0.11.3
Change-Id: I25f7ec413146904f6a204c7f96fc7e885813a5c0
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage
refs/changes/66/235966/1
diff --git a/package.json b/package.json
index 93beca9..1d12959 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"devDependencies": {
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.2",
+"grunt-contrib-jshint": "0.11.3",
"grunt-banana-checker": "0.2.2",
"grunt-jscs": "1.8.0",
"grunt-jsonlint": "1.0.4"
--
To view, visit https://gerrit.wikimedia.org/r/235966
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I25f7ec413146904f6a204c7f96fc7e885813a5c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert parsoidsvc-php-parsertests job to use zuul-cloner - change (integration/config)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235965
Change subject: Convert parsoidsvc-php-parsertests job to use zuul-cloner
..
Convert parsoidsvc-php-parsertests job to use zuul-cloner
Bug: T111469
Change-Id: I350c3bd8958de798b695d8c842b3a43161c7282c
---
M jjb/macro-scm.yaml
M jjb/parsoidsvc.yaml
2 files changed, 20 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/65/235965/1
diff --git a/jjb/macro-scm.yaml b/jjb/macro-scm.yaml
index d0930c6..40f530c 100644
--- a/jjb/macro-scm.yaml
+++ b/jjb/macro-scm.yaml
@@ -67,3 +67,17 @@
--workspace src \
https://gerrit.wikimedia.org/r/p \
{projects}
+
+# Same as above, but uses a different clonemap, and root as workspace
+- builder:
+name: zuul-parsoid-cloner
+builders:
+- shell: |
+zuul-cloner --version
+zuul-cloner \
+--color \
+--verbose \
+--map
/srv/deployment/integration/slave-scripts/etc/zuul-parsoid-clonemap.yaml \
+--workspace . \
+https://gerrit.wikimedia.org/r/p \
+{projects}
diff --git a/jjb/parsoidsvc.yaml b/jjb/parsoidsvc.yaml
index 1311202..b9309cd 100644
--- a/jjb/parsoidsvc.yaml
+++ b/jjb/parsoidsvc.yaml
@@ -20,28 +20,15 @@
- ansicolor
triggers:
- zuul
-scm:
-- git:
-url: '$ZUUL_URL/$ZUUL_PROJECT'
-branches:
- - '$ZUUL_COMMIT'
-refspec: '$ZUUL_REF'
-submodule:
-disable: true
-basedir: parsoidsvc
builders:
-# Hack to get mediawiki/core installed in a different directory
+- zuul-parsoid-cloner:
+ projects: >
+mediawiki/core
+mediawiki/services/parsoid
+
- shell: |
-rm -fR src/mediawiki/core
-mkdir -p src/mediawiki/core
+$ Install MediaWiki in a different directory
export MW_INSTALL_PATH='src/mediawiki/core'
-
-# mw-core-get.sh only recognize $WORKSPACE so override it to point
-# to MW_INSTALL_PATH
-# Support added with https://gerrit.wikimedia.org/r/#/c/130662/
-# which is pending merge.
-WORKSPACE=$MW_INSTALL_PATH
/srv/deployment/integration/slave-scripts/bin/mw-core-get.sh master
-
/srv/deployment/integration/slave-scripts/bin/mw-install-sqlite.sh
- shell: |
--
To view, visit https://gerrit.wikimedia.org/r/235965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I350c3bd8958de798b695d8c842b3a43161c7282c
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add zuul-cloner map for parsoidsvc jobs - change (integration/jenkins)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/235964 Change subject: Add zuul-cloner map for parsoidsvc jobs .. Add zuul-cloner map for parsoidsvc jobs Bug: T111469 Change-Id: Ida89f44dde9668edca3af48cfdcd308b3de46df0 --- A etc/zuul-parsoid-clonemap.yaml 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins refs/changes/64/235964/1 diff --git a/etc/zuul-parsoid-clonemap.yaml b/etc/zuul-parsoid-clonemap.yaml new file mode 100644 index 000..a4b85b6 --- /dev/null +++ b/etc/zuul-parsoid-clonemap.yaml @@ -0,0 +1,22 @@ +# Clone map for Zuul cloner in Parsoid jobs +# +# Canonical repository in integration/jenkins.git +# Please add tests to /tests/test_zuul_clonemap_config.py +# +clonemap: + + # Parsoid plus MediaWiki core + # + # workspace/ + # ├── parsoidsvc/ + # └── src/ + # └── mediawiki/ + # └── core/ + + # MediaWiki to src/mediawiki/core/ + - name: 'mediawiki/core' + dest: './src/mediawiki/core' + + # Parsoid to parsoidsvc + - name: 'mediawiki/services/parsoid' + dest: './parsoidsvc' -- To view, visit https://gerrit.wikimedia.org/r/235964 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida89f44dde9668edca3af48cfdcd308b3de46df0 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add #Differential for -releng - change (labs...wikibugs2)
jenkins-bot has submitted this change and it was merged. Change subject: Add #Differential for -releng .. Add #Differential for -releng Change-Id: I6e0f312a35a106318049bbd5a4aeccd34eec94b6 --- M channels.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/channels.yaml b/channels.yaml index 5afe36b..b08e529 100644 --- a/channels.yaml +++ b/channels.yaml @@ -89,6 +89,7 @@ - Browser-Tests - Gitblit-Deprecate - Gerrit-Migration +- Differential "#mediawiki-visualeditor": -- To view, visit https://gerrit.wikimedia.org/r/235962 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6e0f312a35a106318049bbd5a4aeccd34eec94b6 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: Greg Grossmeier Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] resourceloader: Expose fetch promise in addScript() - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235963
Change subject: resourceloader: Expose fetch promise in addScript()
..
resourceloader: Expose fetch promise in addScript()
Prerequisite for T68598 so that callers can handle errors.
Change-Id: I214159001e04c4b51453e47299b8e5d5033c258a
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/63/235963/1
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index a73accf..f574519 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1118,10 +1118,10 @@
*
* @private
* @param {string} src URL to script, will be used as
the src attribute in the script tag
-* @param {Function} [callback] Callback which will be
run when the script is done
+* @return {jQuery.Promise}
*/
- function addScript( src, callback ) {
- $.ajax( {
+ function addScript( src ) {
+ return $.ajax( {
url: src,
dataType: 'script',
// Force jQuery behaviour to be for
crossDomain. Otherwise jQuery would use
@@ -1131,7 +1131,7 @@
// text, so we'd need to $.globalEval,
which then messes up line numbers.
crossDomain: true,
cache: true
- } ).always( callback );
+ } );
}
/**
@@ -1196,7 +1196,7 @@
return;
}
- addScript( arr[i],
function () {
+ addScript( arr[i]
).always( function () {
nestedAddScript( arr, callback, i + 1 );
} );
};
--
To view, visit https://gerrit.wikimedia.org/r/235963
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I214159001e04c4b51453e47299b8e5d5033c258a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add #Differential for -releng - change (labs...wikibugs2)
Greg Grossmeier has uploaded a new change for review. https://gerrit.wikimedia.org/r/235962 Change subject: Add #Differential for -releng .. Add #Differential for -releng Change-Id: I6e0f312a35a106318049bbd5a4aeccd34eec94b6 --- M channels.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 refs/changes/62/235962/1 diff --git a/channels.yaml b/channels.yaml index 5afe36b..b08e529 100644 --- a/channels.yaml +++ b/channels.yaml @@ -89,6 +89,7 @@ - Browser-Tests - Gitblit-Deprecate - Gerrit-Migration +- Differential "#mediawiki-visualeditor": -- To view, visit https://gerrit.wikimedia.org/r/235962 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e0f312a35a106318049bbd5a4aeccd34eec94b6 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/wikibugs2 Gerrit-Branch: master Gerrit-Owner: Greg Grossmeier ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve Personality Rights restriction icon - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged. Change subject: Improve Personality Rights restriction icon .. Improve Personality Rights restriction icon Make it more gender-neutral and better-looking: - No necktie - A frame around the icon similar to the frame of a photograph Change-Id: I05ec5a5a546b19f08ac9a6ab1470b769025e076b --- M resources/mmv/ui/img/restrict-personality.svg 1 file changed, 15 insertions(+), 12 deletions(-) Approvals: Gergő Tisza: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/mmv/ui/img/restrict-personality.svg b/resources/mmv/ui/img/restrict-personality.svg index a379fe1..b8de1ad 100644 --- a/resources/mmv/ui/img/restrict-personality.svg +++ b/resources/mmv/ui/img/restrict-personality.svg @@ -25,11 +25,11 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="7.9195958" - inkscape:cx="-4.874333" - inkscape:cy="13.406729" + inkscape:zoom="1.28" + inkscape:cx="-10.476845" + inkscape:cy="-36.075279" inkscape:document-units="px" - inkscape:current-layer="layer1" + inkscape:current-layer="svg4162" showgrid="false" units="px" showguides="true" @@ -39,7 +39,12 @@ inkscape:window-height="1018" inkscape:window-x="-8" inkscape:window-y="-8" - inkscape:window-maximized="1" /> + inkscape:window-maximized="1" + inkscape:snap-page="true"> + + @@ -55,13 +60,11 @@ + id="layer1"> + style="fill:#33;fill-opacity:1;stroke:none;stroke-width:16;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 0,0 0,64.4 10.345703,0 43.308594,0 L 64,64.4 64,0 0,0 Z m 6,6 52,0 0,52.4 -6.060547,0 A 25.20602,60.413365 0 0 0 41.75,39.05474 c -2.753842,1.9904 -6.120159,3.1816 -9.757812,3.1816 -3.624277,0 -6.978291,-1.1811 -9.726563,-3.1582 A 25.20602,60.413365 0 0 0 12.060547,58.4 L 6,58.4 6,6 Z m 25.992188,6.4 c -7.45154,0 -13.492255,6.0405 -13.492188,13.4922 -5e-6,7.4516 6.040693,13.4921 13.492188,13.4921 7.451495,0 13.492192,-6.0405 13.492187,-13.4921 6.6e-5,-7.4517 -6.040648,-13.4922 -13.492187,-13.4922 z" + id="path4134" + inkscape:connector-curvature="0" /> -- To view, visit https://gerrit.wikimedia.org/r/235957 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05ec5a5a546b19f08ac9a6ab1470b769025e076b Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Sn1per Gerrit-Reviewer: Gergő Tisza Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gdash: Remove 'frontend' dashboard - change (operations/puppet)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/235961 Change subject: gdash: Remove 'frontend' dashboard .. gdash: Remove 'frontend' dashboard These have been migrated to Grafana and are no longer maintained in gdash. Some of these no longer work due to metrics having changed. Bug: T104365 Change-Id: I825bc8b16e37911cf65baf24aa733524d856e455 --- D files/gdash/dashboards/frontend/01.totalPageLoadTime.desktop.hour.graph D files/gdash/dashboards/frontend/02.totalPageLoadTime.desktop.day.graph D files/gdash/dashboards/frontend/03.totalPageLoadTime.desktop.week.graph D files/gdash/dashboards/frontend/04.totalPageLoadTime.desktop.month.graph D files/gdash/dashboards/frontend/05.mediaWikiLoadComplete.desktop.hour.graph D files/gdash/dashboards/frontend/06.mediaWikiLoadComplete.desktop.day.graph D files/gdash/dashboards/frontend/07.mediaWikiLoadComplete.desktop.week.graph D files/gdash/dashboards/frontend/08.mediaWikiLoadComplete.desktop.month.graph D files/gdash/dashboards/frontend/09.totalPageLoadTime.mobile.hour.graph D files/gdash/dashboards/frontend/10.totalPageLoadTime.mobile.day.graph D files/gdash/dashboards/frontend/11.totalPageLoadTime.mobile.week.graph D files/gdash/dashboards/frontend/12.totalPageLoadTime.mobile.month.graph D files/gdash/dashboards/frontend/13.mediaWikiLoadComplete.mobile.hour.graph D files/gdash/dashboards/frontend/14.mediaWikiLoadComplete.mobile.day.graph D files/gdash/dashboards/frontend/15.mediaWikiLoadComplete.mobile.week.graph D files/gdash/dashboards/frontend/16.mediaWikiLoadComplete.mobile.month.graph D files/gdash/dashboards/frontend/17.totalPageLoadTime.desktop.year.graph D files/gdash/dashboards/frontend/18.mediaWikiLoadComplete.desktop.year.graph D files/gdash/dashboards/frontend/19.totalPageLoadTime.mobile.year.graph D files/gdash/dashboards/frontend/20.mediaWikiLoadComplete.mobile.year.graph D files/gdash/dashboards/frontend/dash.yaml 21 files changed, 0 insertions(+), 282 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/61/235961/1 diff --git a/files/gdash/dashboards/frontend/01.totalPageLoadTime.desktop.hour.graph b/files/gdash/dashboards/frontend/01.totalPageLoadTime.desktop.hour.graph deleted file mode 100644 index 4ddf7ca..000 --- a/files/gdash/dashboards/frontend/01.totalPageLoadTime.desktop.hour.graph +++ /dev/null @@ -1,14 +0,0 @@ -title 'navigationStart to loadEventEnd on desktop sites, last hour' -linewidth 1 -linemode 'connected' -hide_legend 'false' -from '-1hour' -vtitle 'milliseconds' - -field :q2, :color => 'blue', - :alias => 'median', - :data => 'frontend.navtiming.totalPageLoadTime.desktop.overall.median' - -field :q3, :color => 'red', - :alias => '95th percentile', - :data => 'frontend.navtiming.totalPageLoadTime.desktop.overall.p95' diff --git a/files/gdash/dashboards/frontend/02.totalPageLoadTime.desktop.day.graph b/files/gdash/dashboards/frontend/02.totalPageLoadTime.desktop.day.graph deleted file mode 100644 index fefd9e4..000 --- a/files/gdash/dashboards/frontend/02.totalPageLoadTime.desktop.day.graph +++ /dev/null @@ -1,14 +0,0 @@ -title 'navigationStart to loadEventEnd on desktop sites, last day' -linewidth 1 -linemode 'connected' -hide_legend 'false' -from '-1day' -vtitle 'milliseconds' - -field :q2, :color => 'blue', - :alias => 'median', - :data => 'frontend.navtiming.totalPageLoadTime.desktop.overall.median' - -field :q3, :color => 'red', - :alias => '95th percentile', - :data => 'frontend.navtiming.totalPageLoadTime.desktop.overall.p95' diff --git a/files/gdash/dashboards/frontend/03.totalPageLoadTime.desktop.week.graph b/files/gdash/dashboards/frontend/03.totalPageLoadTime.desktop.week.graph deleted file mode 100644 index 4e8b1a5..000 --- a/files/gdash/dashboards/frontend/03.totalPageLoadTime.desktop.week.graph +++ /dev/null @@ -1,14 +0,0 @@ -title 'navigationStart to loadEventEnd on desktop sites, last week' -linewidth 1 -linemode 'connected' -hide_legend 'false' -from '-1week' -vtitle 'milliseconds' - -field :q2, :color => 'blue', - :alias => 'median', - :data => 'frontend.navtiming.totalPageLoadTime.desktop.overall.median' - -field :q3, :color => 'red', - :alias => '95th percentile', - :data => 'frontend.navtiming.totalPageLoadTime.desktop.overall.p95' diff --git a/files/gdash/dashboards/frontend/04.totalPageLoadTime.desktop.month.graph b/files/gdash/dashboards/frontend/04.totalPageLoadTime.desktop.month.graph deleted file mode 100644 index a2b3bfa..000 --- a/files/gdash/dashboards/frontend/04.totalPageLoadTime.desktop.month.graph +++ /dev/null @@ -1,14 +0,0 @@ -title 'navigationStart to loadEventEnd on desktop sites, last month' -linewidth 1 -linemode 'connected' -hide_legend 'false' -from '-1month' -vtitle 'milliseconds' - -field :q2, :colo
[MediaWiki-commits] [Gerrit] Revoke suppression-level rights from interface editors on he... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Revoke suppression-level rights from interface editors on hewiki .. Revoke suppression-level rights from interface editors on hewiki Bug: T111439 Change-Id: I07c3bedcf6e2734ca9f8a6ee74a495e910d11880 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index a79edec..900daec 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -7540,8 +7540,7 @@ 'unwatchedpages' => true, ), 'interface-editor' => array( - 'abusefilter-hidden-log' => true, - 'abusefilter-hide-log' => true, + // Some rights removed per T111439 'abusefilter-log' => true, 'abusefilter-log-detail' => true, 'abusefilter-modify' => true, -- To view, visit https://gerrit.wikimedia.org/r/235960 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I07c3bedcf6e2734ca9f8a6ee74a495e910d11880 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revoke suppression-level rights from interface editors on he... - change (operations/mediawiki-config)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/235960 Change subject: Revoke suppression-level rights from interface editors on hewiki .. Revoke suppression-level rights from interface editors on hewiki Bug: T111439 Change-Id: I07c3bedcf6e2734ca9f8a6ee74a495e910d11880 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/60/235960/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index a79edec..900daec 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -7540,8 +7540,7 @@ 'unwatchedpages' => true, ), 'interface-editor' => array( - 'abusefilter-hidden-log' => true, - 'abusefilter-hide-log' => true, + // Some rights removed per T111439 'abusefilter-log' => true, 'abusefilter-log-detail' => true, 'abusefilter-modify' => true, -- To view, visit https://gerrit.wikimedia.org/r/235960 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I07c3bedcf6e2734ca9f8a6ee74a495e910d11880 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikistats: add cronjob for miraheze import script - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235959
Change subject: wikistats: add cronjob for miraheze import script
..
wikistats: add cronjob for miraheze import script
This cronjob will run a script that gets the list of wikis
from the miraheze farm and updates the database.
Bug:T107398
Change-Id: Ib9b9aa94f5bfd53be22af01ee7837d013f25aead
---
M modules/wikistats/manifests/updates.pp
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/235959/1
diff --git a/modules/wikistats/manifests/updates.pp
b/modules/wikistats/manifests/updates.pp
index 8981642..319fefd 100644
--- a/modules/wikistats/manifests/updates.pp
+++ b/modules/wikistats/manifests/updates.pp
@@ -55,4 +55,11 @@
'w3@23', # W3C
]: }
+cron { 'import-miraheze-wikis':
+ensure => 'present',
+command => '/usr/bin/php /usr/bin/import_miraheze.php | mysql
wikistats',
+user=> 'wikistatsuser',
+hour=> '20',
+minute => '20',
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/235959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9b9aa94f5bfd53be22af01ee7837d013f25aead
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] resourceloader: Fully remove ResourceLoaderLESSFunctions - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: resourceloader: Fully remove ResourceLoaderLESSFunctions
..
resourceloader: Fully remove ResourceLoaderLESSFunctions
Deprecated in 1.24, for reasons explained in a0c41ae39d. I don't see any
usage in core or extensions.
Change-Id: I46f9e04ae633e7ff1ee112b652e1865731172f1f
---
M RELEASE-NOTES-1.26
M docs/extension.schema.json
M includes/DefaultSettings.php
M includes/resourceloader/ResourceLoader.php
M tests/phpunit/data/less/common/test.common.mixins.less
M tests/phpunit/data/less/module/styles.css
M tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
7 files changed, 2 insertions(+), 30 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index ddf6f7d..ff7f884 100644
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -27,6 +27,8 @@
MediaWiki 1.26, in where ResourceLoader became fully asynchronous.
* $wgMasterWaitTimeout was removed (deprecated in 1.24).
* Fields in ParserOptions are now private. Use the accessors instead.
+* Custom LESS functions (defined via $wgResourceLoaderLESSFunctions)
+ have been removed, after being deprecated in 1.24.
=== New features in 1.26 ===
* (T51506) Now action=info gives estimates of actual watchers for a page.
diff --git a/docs/extension.schema.json b/docs/extension.schema.json
index 63bf1b5..d11635d 100644
--- a/docs/extension.schema.json
+++ b/docs/extension.schema.json
@@ -429,10 +429,6 @@
"type": "object",
"description": "ResourceLoader LESS variables"
},
- "ResourceLoaderLESSFunctions": {
- "type": "object",
- "description": "ResourceLoader LESS functions"
- },
"ResourceLoaderLESSImportPaths": {
"type": "object",
"description": "ResourceLoader import paths"
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f0450a9..06cd55a 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3637,18 +3637,6 @@
$wgResourceLoaderLESSVars = array();
/**
- * Custom LESS functions. An associative array mapping function name to PHP
- * callable.
- *
- * Changes to LESS functions do not trigger cache invalidation.
- *
- * @since 1.22
- * @deprecated since 1.24 Questionable usefulness and problematic to support,
- * will be removed in the future.
- */
-$wgResourceLoaderLESSFunctions = array();
-
-/**
* Default import paths for LESS modules. LESS files referenced in @import
* statements will be looked up here first, and relative to the importing file
* second. To avoid collisions, it's important for the LESS files in these
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index 5fb6c96..b8ec63b 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -1625,9 +1625,6 @@
$less->setPreserveComments( true );
$less->setVariables( self::getLessVars( $config ) );
$less->setImportDir( $config->get(
'ResourceLoaderLESSImportPaths' ) );
- foreach ( $config->get( 'ResourceLoaderLESSFunctions' ) as
$name => $func ) {
- $less->registerFunction( $name, $func );
- }
return $less;
}
diff --git a/tests/phpunit/data/less/common/test.common.mixins.less
b/tests/phpunit/data/less/common/test.common.mixins.less
index 2fbe9b7..4064729 100644
--- a/tests/phpunit/data/less/common/test.common.mixins.less
+++ b/tests/phpunit/data/less/common/test.common.mixins.less
@@ -1,5 +1,4 @@
.test-mixin (@value) {
color: @value;
border: @foo solid @Foo;
- line-height: test-sum(@bar, 10, 20);
}
diff --git a/tests/phpunit/data/less/module/styles.css
b/tests/phpunit/data/less/module/styles.css
index b78780a..e8099d1 100644
--- a/tests/phpunit/data/less/module/styles.css
+++ b/tests/phpunit/data/less/module/styles.css
@@ -2,5 +2,4 @@
.unit-tests {
color: green;
border: 2px solid #ee;
- line-height: 35;
}
diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
index cc20e7f..b683885 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
@@ -6,15 +6,6 @@
parent::setUp();
$this->setMwGlobals( array(
- 'wgResourceLoaderLESSFunctions' => array(
- 'test-sum' => function ( $frame, $less ) {
- $sum = 0;
- foreach ( $frame[2] as $arg ) {
[MediaWiki-commits] [Gerrit] add script to import miraheze wikis - change (operations...wikistats)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235958
Change subject: add script to import miraheze wikis
..
add script to import miraheze wikis
Bug:T107398
Change-Id: Ib133c542c902ac4c24881271923e767661bdde10
---
A usr/bin/import_miraheze.php
1 file changed, 24 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/wikistats
refs/changes/58/235958/1
diff --git a/usr/bin/import_miraheze.php b/usr/bin/import_miraheze.php
new file mode 100644
index 000..a805541
--- /dev/null
+++ b/usr/bin/import_miraheze.php
@@ -0,0 +1,24 @@
+http://meta.miraheze.org/w/api.php?action=sitematrix&format=php";;
+
+# echo "\nTrying to import from ${importurl}\n\n";
+$buffer=file_get_contents($importurl);
+# print_r($buffer);
+
+$mydata=unserialize($buffer);
+# print_r($mydata);
+
+$my_count=$mydata['sitematrix']['count'];
+# echo "Found ${my_count} wikis on miraheze. \n\n";
+
+foreach ($mydata['sitematrix']['specials'] as $wiki) {
+$counter++;
+$my_wiki=$wiki['code'];
+# echo "[${counter}] ${my_wiki}\n";
+echo "INSERT IGNORE INTO miraheze (prefix,method) values
('${my_wiki}','8');\n";
+}
+
+?>
--
To view, visit https://gerrit.wikimedia.org/r/235958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib133c542c902ac4c24881271923e767661bdde10
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve Personality Rights restriction icon - change (mediawiki...MultimediaViewer)
Sn1per has uploaded a new change for review. https://gerrit.wikimedia.org/r/235957 Change subject: Improve Personality Rights restriction icon .. Improve Personality Rights restriction icon Make it more gender-neutral and better-looking: - No necktie - A frame around the icon similar to the frame of a photograph Change-Id: I05ec5a5a546b19f08ac9a6ab1470b769025e076b --- M resources/mmv/ui/img/restrict-personality.svg 1 file changed, 13 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/57/235957/1 diff --git a/resources/mmv/ui/img/restrict-personality.svg b/resources/mmv/ui/img/restrict-personality.svg index a379fe1..078378f 100644 --- a/resources/mmv/ui/img/restrict-personality.svg +++ b/resources/mmv/ui/img/restrict-personality.svg @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="7.9195958" - inkscape:cx="-4.874333" - inkscape:cy="13.406729" + inkscape:zoom="0.25" + inkscape:cx="1619.7606" + inkscape:cy="480.19427" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -39,7 +39,12 @@ inkscape:window-height="1018" inkscape:window-x="-8" inkscape:window-y="-8" - inkscape:window-maximized="1" /> + inkscape:window-maximized="1" + inkscape:snap-page="true"> + + @@ -58,10 +63,9 @@ id="layer1" transform="translate(0,-988.36216)"> + style="fill:#33;fill-opacity:1;stroke:none;stroke-width:16;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 0 0 L 0 64 L 10.345703 64 L 53.654297 64 L 64 64 L 64 0 L 0 0 z M 6 6 L 58 6 L 58 58 L 51.939453 58 A 25.20602 60.413365 0 0 0 41.75 39.054688 C 38.996158 41.045087 35.629841 42.236328 31.992188 42.236328 C 28.367911 42.236328 25.013897 41.055225 22.265625 39.078125 A 25.20602 60.413365 0 0 0 12.060547 58 L 6 58 L 6 6 z M 31.992188 12 C 24.540648 12 18.499933 18.040487 18.5 25.492188 C 18.45 32.943787 24.540693 38.984375 31.992188 38.984375 C 39.443683 38.984375 45.48438 32.943787 45.484375 25.492188 C 45.484441 18.040488 39.443727 12 31.992188 12 z " + transform="translate(0,988.36216)" + id="path4134" /> -- To view, visit https://gerrit.wikimedia.org/r/235957 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05ec5a5a546b19f08ac9a6ab1470b769025e076b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Sn1per ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] asset-check: Use mwLoadEvent hook instead of polling modules... - change (operations/puppet)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235956
Change subject: asset-check: Use mwLoadEvent hook instead of polling modules
directly
..
asset-check: Use mwLoadEvent hook instead of polling modules directly
Follows-up 41b37bc. Depends on Ic0b1fb64ee in MediaWiki core.
Change-Id: Iaa3f2fc305753da67d01eca185e5e0b13f122675
---
M modules/webperf/files/asset-check.js
1 file changed, 1 insertion(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/56/235956/1
diff --git a/modules/webperf/files/asset-check.js
b/modules/webperf/files/asset-check.js
index daffe7e..4df5fad 100644
--- a/modules/webperf/files/asset-check.js
+++ b/modules/webperf/files/asset-check.js
@@ -182,19 +182,7 @@
// to finish as well.
page.evaluate( function () {
/*global mw */
- var loadingPromises = mw.loader.getModuleNames()
- .filter( function ( name ) {
- return mw.loader.getState( name ) ===
'loading';
- } )
- .map( function ( name ) {
- return mw.loader.using( name ).then(
null, function () {
- // In order to use the
jQuery.when utility and it to not
- // call back on the first error
when other modules are
- // still pending, cast any
error to success.
- return $.Deferred().resolve();
- } );
- } );
- $.when.apply( $, loadingPromises ).then( function () {
+ mw.hook( 'resourceloader.loadEnd' ).add( function () {
window.callPhantom( 'mw-modules-ready' );
} );
} );
--
To view, visit https://gerrit.wikimedia.org/r/235956
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa3f2fc305753da67d01eca185e5e0b13f122675
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] use https urls for miraheze updates - change (operations...wikistats)
Dzahn has submitted this change and it was merged.
Change subject: use https urls for miraheze updates
..
use https urls for miraheze updates
Bug:T107398
Change-Id: I03a876fb9bcb324359abd9fa3e17a92c9d21007c
---
M etc/wikistats/config.php
M usr/lib/wikistats/update.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/etc/wikistats/config.php b/etc/wikistats/config.php
index aec9eb8..1a2869e 100644
--- a/etc/wikistats/config.php
+++ b/etc/wikistats/config.php
@@ -91,7 +91,7 @@
$tables_with_statsurl=array('mediawikis','uncyclomedia','metapedias','wmspecials',
'wikifur');
# list tables for which we should use only https URLs
-$tables_https_only=array('wikipedias','wikiquotes','wikibooks','wiktionaries','wikinews','wikisources','wmspecials','wikiversity','wikivoyage',
'opensuse');
+$tables_https_only=array('wikipedias','wikiquotes','wikibooks','wiktionaries','wikinews','wikisources','wmspecials','wikiversity','wikivoyage',
'opensuse', 'miraheze');
# cut off wiki name after X characters when showing it in HTML tables
$name_max_len="42";
diff --git a/usr/lib/wikistats/update.php b/usr/lib/wikistats/update.php
index 0814714..76e45b2 100644
--- a/usr/lib/wikistats/update.php
+++ b/usr/lib/wikistats/update.php
@@ -329,7 +329,7 @@
if ($row['statsurl']!='') {
$url=$row['statsurl'];
} else {
-
$url="http://".$row['prefix'].".${domain}/w/api.php${api_query_stat}";
+
$url="https://".$row['prefix'].".${domain}/w/api.php${api_query_stat}";
}
} elseif (in_array($table, $tables_with_suffix_short)) {
$prefix=$row['prefix'];
--
To view, visit https://gerrit.wikimedia.org/r/235955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I03a876fb9bcb324359abd9fa3e17a92c9d21007c
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] use https urls for miraheze updates - change (operations...wikistats)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235955
Change subject: use https urls for miraheze updates
..
use https urls for miraheze updates
Bug:T107398
Change-Id: I03a876fb9bcb324359abd9fa3e17a92c9d21007c
---
M etc/wikistats/config.php
M usr/lib/wikistats/update.php
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/wikistats
refs/changes/55/235955/1
diff --git a/etc/wikistats/config.php b/etc/wikistats/config.php
index aec9eb8..1a2869e 100644
--- a/etc/wikistats/config.php
+++ b/etc/wikistats/config.php
@@ -91,7 +91,7 @@
$tables_with_statsurl=array('mediawikis','uncyclomedia','metapedias','wmspecials',
'wikifur');
# list tables for which we should use only https URLs
-$tables_https_only=array('wikipedias','wikiquotes','wikibooks','wiktionaries','wikinews','wikisources','wmspecials','wikiversity','wikivoyage',
'opensuse');
+$tables_https_only=array('wikipedias','wikiquotes','wikibooks','wiktionaries','wikinews','wikisources','wmspecials','wikiversity','wikivoyage',
'opensuse', 'miraheze');
# cut off wiki name after X characters when showing it in HTML tables
$name_max_len="42";
diff --git a/usr/lib/wikistats/update.php b/usr/lib/wikistats/update.php
index 0814714..76e45b2 100644
--- a/usr/lib/wikistats/update.php
+++ b/usr/lib/wikistats/update.php
@@ -329,7 +329,7 @@
if ($row['statsurl']!='') {
$url=$row['statsurl'];
} else {
-
$url="http://".$row['prefix'].".${domain}/w/api.php${api_query_stat}";
+
$url="https://".$row['prefix'].".${domain}/w/api.php${api_query_stat}";
}
} elseif (in_array($table, $tables_with_suffix_short)) {
$prefix=$row['prefix'];
--
To view, visit https://gerrit.wikimedia.org/r/235955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I03a876fb9bcb324359abd9fa3e17a92c9d21007c
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] hhvm: Disable fss.so on canary API and APP servers - change (operations/puppet)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/235954 Change subject: hhvm: Disable fss.so on canary API and APP servers .. hhvm: Disable fss.so on canary API and APP servers Change-Id: I6985a81285469387dbc99cfb9ef550948ef705ec --- M hieradata/role/common/mediawiki/appserver/canary_api.yaml M hieradata/role/common/mediawiki/canary_appserver.yaml 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/54/235954/1 diff --git a/hieradata/role/common/mediawiki/appserver/canary_api.yaml b/hieradata/role/common/mediawiki/appserver/canary_api.yaml index 0047ac9..1bd3466 100644 --- a/hieradata/role/common/mediawiki/appserver/canary_api.yaml +++ b/hieradata/role/common/mediawiki/appserver/canary_api.yaml @@ -6,6 +6,7 @@ - deployment hhvm::extra::fcgi: hhvm: +dynamic_extensions: ['luasandbox.so', 'tidy.so', 'wikidiff2.so'] mysql: connect_timeout: 3000 hhvm::extra::cli: diff --git a/hieradata/role/common/mediawiki/canary_appserver.yaml b/hieradata/role/common/mediawiki/canary_appserver.yaml index 36c0ad6..7f6eaf7 100644 --- a/hieradata/role/common/mediawiki/canary_appserver.yaml +++ b/hieradata/role/common/mediawiki/canary_appserver.yaml @@ -6,6 +6,7 @@ - deployment hhvm::extra::fcgi: hhvm: +dynamic_extensions: ['luasandbox.so', 'tidy.so', 'wikidiff2.so'] mysql: connect_timeout: 3000 hhvm::extra::cli: -- To view, visit https://gerrit.wikimedia.org/r/235954 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6985a81285469387dbc99cfb9ef550948ef705ec Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] resourceloader: Implement mwLoadEnd marker - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235953
Change subject: resourceloader: Implement mwLoadEnd marker
..
resourceloader: Implement mwLoadEnd marker
Complements mwLoadStart in startup.js.
Change-Id: Ic0b1fb64ee7cd72eea6d6faebdedf0def50ad4fd
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 24 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/53/235953/1
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index a73accf..4e5aae9 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -2532,10 +2532,33 @@
}
}
- // subscribe to error streams
+ // Subscribe to error streams
mw.trackSubscribe( 'resourceloader.exception', log );
mw.trackSubscribe( 'resourceloader.assert', log );
+ /**
+* Fired when all modules associated with the page have finished
loading.
+*
+* @event resourceloader_loadEnd
+* @member mw.hook
+*/
+ $( function () {
+ var loading = $.grep( mw.loader.getModuleNames(), function (
module ) {
+ return mw.loader.getState( module ) === 'loading';
+ } );
+ // In order to use jQuery.when (which stops early if one of the
promises got rejected)
+ // cast any loading failures into successes. We only need a
callback, not the module.
+ loading = $.map( loading, function ( module ) {
+ return mw.loader.using( module ).then( null, function
() {
+ return $.Deferred().resolve();
+ } );
+ } );
+ $.when.apply( $, loading ).then( function () {
+ performance.mark( 'mwLoadEnd' );
+ mw.hook( 'resourceloader.loadEnd' ).fire();
+ } );
+ } );
+
// Attach to window and globally alias
window.mw = window.mediaWiki = mw;
}( jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/235953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0b1fb64ee7cd72eea6d6faebdedf0def50ad4fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] PoolCounterRedis doc cleanups - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235952
Change subject: PoolCounterRedis doc cleanups
..
PoolCounterRedis doc cleanups
Change-Id: I0266941c40d30f631ae77695cbe81bbdc2a85a79
---
M includes/poolcounter/PoolCounterRedis.php
1 file changed, 2 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/52/235952/1
diff --git a/includes/poolcounter/PoolCounterRedis.php
b/includes/poolcounter/PoolCounterRedis.php
index 98797a3..d7357cf 100644
--- a/includes/poolcounter/PoolCounterRedis.php
+++ b/includes/poolcounter/PoolCounterRedis.php
@@ -76,7 +76,7 @@
const AWAKE_ONE = 1; // wake-up if when a slot can be taken from an
existing process
const AWAKE_ALL = 2; // wake-up if an existing process finishes and
wake up such others
- /** @var array List of active PoolCounterRedis objects in this script */
+ /** @var PoolCounterRedis[] List of active PoolCounterRedis objects in
this script */
protected static $active = null;
function __construct( $conf, $type, $key ) {
@@ -121,7 +121,6 @@
}
function acquireForMe() {
-
$status = $this->precheckAcquire();
if ( !$status->isGood() ) {
return $status;
@@ -131,7 +130,6 @@
}
function acquireForAnyone() {
-
$status = $this->precheckAcquire();
if ( !$status->isGood() ) {
return $status;
@@ -141,7 +139,6 @@
}
function release() {
-
if ( $this->slot === null ) {
return Status::newGood( PoolCounter::NOT_LOCKED ); //
not locked
}
@@ -190,7 +187,7 @@
return 1
LUA;
try {
- $res = $conn->luaEval( $script,
+ $conn->luaEval( $script,
array(
$this->getSlotListKey(),
$this->getSlotRTimeSetKey(),
--
To view, visit https://gerrit.wikimedia.org/r/235952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0266941c40d30f631ae77695cbe81bbdc2a85a79
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid PHP warning if key is not set in getValidationHash() - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid PHP warning if key is not set in getValidationHash()
..
Avoid PHP warning if key is not set in getValidationHash()
* Follow up to 2be60e777
Change-Id: Ic5c27226bc3f5cc870728a925b504a0dcbedaefb
---
M includes/cache/MessageCache.php
1 file changed, 10 insertions(+), 6 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 9a6f7d0..f22c860 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -645,16 +645,20 @@
if ( !$value ) {
// No hash found at all; cache must regenerate to be
safe
+ $hash = false;
$expired = true;
- } elseif ( ( time() - $value['latest'] ) <
WANObjectCache::HOLDOFF_TTL ) {
- // Cache was recently updated via replace() and should
be up-to-date
- $expired = false;
} else {
- // See if the "check" key was bumped after the hash was
generated
- $expired = ( $curTTL < 0 );
+ $hash = $value['hash'];
+ if ( ( time() - $value['latest'] ) <
WANObjectCache::HOLDOFF_TTL ) {
+ // Cache was recently updated via replace() and
should be up-to-date
+ $expired = false;
+ } else {
+ // See if the "check" key was bumped after the
hash was generated
+ $expired = ( $curTTL < 0 );
+ }
}
- return array( $value['hash'], $expired );
+ return array( $hash, $expired );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/235672
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5c27226bc3f5cc870728a925b504a0dcbedaefb
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump Schema:Edit to revision 13457736 - change (mediawiki...WikiEditor)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/235951 Change subject: Bump Schema:Edit to revision 13457736 .. Bump Schema:Edit to revision 13457736 Bug: T111421 Change-Id: Ib5fc6004482b7324fc52acd7d28ad2b1529e55a3 --- M WikiEditor.hooks.php 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor refs/changes/51/235951/1 diff --git a/WikiEditor.hooks.php b/WikiEditor.hooks.php index 0732457..ccb5448 100644 --- a/WikiEditor.hooks.php +++ b/WikiEditor.hooks.php @@ -190,7 +190,6 @@ 'editor' => 'wikitext', 'platform' => 'desktop', // FIXME 'integration' => 'page', - 'page.length' => -1, // FIXME 'page.id' => $page->getId(), 'page.title' => $title->getPrefixedText(), 'page.ns' => $title->getNamespace(), @@ -204,7 +203,7 @@ $data['user.class'] = 'IP'; } - return EventLogging::logEvent( 'Edit', 11448630, $data ); + return EventLogging::logEvent( 'Edit', 13457736, $data ); } /** -- To view, visit https://gerrit.wikimedia.org/r/235951 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib5fc6004482b7324fc52acd7d28ad2b1529e55a3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiEditor Gerrit-Branch: master Gerrit-Owner: Alex Monk ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump Schema:Edit to 13457736 - change (mediawiki...VisualEditor)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235950
Change subject: Bump Schema:Edit to 13457736
..
Bump Schema:Edit to 13457736
* Remove page.length
* Add action.abort.type = switchnochange
Needs to be deployed at the same time as Ib99700ac
Bug: T111420
Change-Id: I7ee245157d4de6c220d7cdf54cd1dd69ff836f15
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/ve.init.mw.trackSubscriber.js
M modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
3 files changed, 11 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/50/235950/1
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 87efefb..3ec9f60 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -797,7 +797,7 @@
*/
ve.init.mw.DesktopArticleTarget.prototype.editSource = function () {
if ( !this.getSurface().getModel().hasBeenModified() ) {
- this.switchToWikitextEditor( true );
+ this.switchToWikitextEditor( true, false );
return;
}
@@ -1356,11 +1356,16 @@
* Switches to the wikitext editor, either keeping (default) or discarding
changes.
*
* @param {boolean} [discardChanges] Whether to discard changes or not.
+ * @param {boolean} [modified] Whether there were any changes at all.
*/
-ve.init.mw.DesktopArticleTarget.prototype.switchToWikitextEditor = function (
discardChanges ) {
+ve.init.mw.DesktopArticleTarget.prototype.switchToWikitextEditor = function (
discardChanges, modified ) {
var target = this;
if ( discardChanges ) {
- ve.track( 'mwedit.abort', { type: 'switchwithout', mechanism:
'navigate' } );
+ if ( modified ) {
+ ve.track( 'mwedit.abort', { type: 'switchwithout',
mechanism: 'navigate' } );
+ } else {
+ ve.track( 'mwedit.abort', { type: 'switchnochange',
mechanism: 'navigate' } );
+ }
this.submitting = true;
location.href = this.viewUri.clone().extend( {
action: 'edit',
diff --git a/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
b/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
index f4870e2..c815a1e 100644
--- a/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
+++ b/modules/ve-mw/init/ve.init.mw.trackSubscriber.js
@@ -52,6 +52,7 @@
case 'nochange':
case 'switchwith':
case 'switchwithout':
+ case 'switchnochange':
case 'abandon':
return timeStamp - timing.ready;
case 'abandonMidsave':
@@ -103,7 +104,6 @@
'page.title': mw.config.get( 'wgPageName' ),
'page.ns': mw.config.get( 'wgNamespaceNumber' ),
'page.revid': mw.config.get( 'wgRevisionId' ),
- 'page.length': -1, // FIXME
editingSessionId: editingSessionId,
'user.id': mw.user.getId(),
'user.editCount': mw.config.get( 'wgUserEditCount', 0 ),
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
index 2ba5b53..226301b 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWWikitextSwitchConfirmDialog.js
@@ -67,13 +67,13 @@
return new OO.ui.Process( function () {
this.getActions().setAbilities( { cancel: false,
discard: false } );
this.getActions().get()[ 1 ].pushPending();
- this.target.switchToWikitextEditor( false );
+ this.target.switchToWikitextEditor( false, true );
}, this );
} else if ( action === 'discard' ) {
return new OO.ui.Process( function () {
this.getActions().setAbilities( { cancel: false,
switch: false } );
this.getActions().get()[ 2 ].pushPending();
- this.target.switchToWikitextEditor( true );
+ this.target.switchToWikitextEditor( true, true );
}, this );
} else if ( action === 'cancel' ) {
return new OO.ui.Process( function () {
--
To view, visit https://gerrit.wikimedia.org/r/235950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit
[MediaWiki-commits] [Gerrit] Bump Schema:Edit to revision 13457736 - change (mediawiki...WikimediaEvents)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/235949 Change subject: Bump Schema:Edit to revision 13457736 .. Bump Schema:Edit to revision 13457736 Needs to be deployed at the same time as I7ee24515 Bug: T111420 Change-Id: Ib99700acb70996588c2b118a1781a5c08d7ca1de --- M WikimediaEvents.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents refs/changes/49/235949/1 diff --git a/WikimediaEvents.php b/WikimediaEvents.php index 4a2f0eb..e655ce5 100644 --- a/WikimediaEvents.php +++ b/WikimediaEvents.php @@ -68,7 +68,7 @@ 'schema.Edit' => array( 'class' => 'ResourceLoaderSchemaModule', 'schema' => 'Edit', - 'revision' => 11448630, + 'revision' => 13457736, ), 'schema.DidYouMean' => array( 'class' => 'ResourceLoaderSchemaModule', -- To view, visit https://gerrit.wikimedia.org/r/235949 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib99700acb70996588c2b118a1781a5c08d7ca1de Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaEvents Gerrit-Branch: master Gerrit-Owner: Alex Monk ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fully remove ResourceLoaderLESSFunctions - change (mediawiki/core)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235948
Change subject: Fully remove ResourceLoaderLESSFunctions
..
Fully remove ResourceLoaderLESSFunctions
Deprecated in 1.24, for reasons explained in I3062346ed6. I don't see any
usage in core or extensions.
Change-Id: I46f9e04ae633e7ff1ee112b652e1865731172f1f
---
M RELEASE-NOTES-1.26
M docs/extension.schema.json
M includes/DefaultSettings.php
M includes/resourceloader/ResourceLoader.php
M tests/phpunit/data/less/common/test.common.mixins.less
M tests/phpunit/data/less/module/styles.css
M tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
7 files changed, 2 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/48/235948/1
diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index ddf6f7d..98e974b 100644
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -70,6 +70,8 @@
page. During the deprecation period, the styles will only be loaded on pages
which contain 'mw-ui-button' in their HTML. Starting in 1.28, the styles will
only be loaded if explicitly required.
+* Custom LESS functions (defined via the ResourceLoaderLESSFunctions
+ configuration option) have been removed, after being deprecated in 1.24.
External libraries
* Update es5-shim from v4.0.0 to v4.1.5.
diff --git a/docs/extension.schema.json b/docs/extension.schema.json
index 63bf1b5..d11635d 100644
--- a/docs/extension.schema.json
+++ b/docs/extension.schema.json
@@ -429,10 +429,6 @@
"type": "object",
"description": "ResourceLoader LESS variables"
},
- "ResourceLoaderLESSFunctions": {
- "type": "object",
- "description": "ResourceLoader LESS functions"
- },
"ResourceLoaderLESSImportPaths": {
"type": "object",
"description": "ResourceLoader import paths"
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f0450a9..06cd55a 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3637,18 +3637,6 @@
$wgResourceLoaderLESSVars = array();
/**
- * Custom LESS functions. An associative array mapping function name to PHP
- * callable.
- *
- * Changes to LESS functions do not trigger cache invalidation.
- *
- * @since 1.22
- * @deprecated since 1.24 Questionable usefulness and problematic to support,
- * will be removed in the future.
- */
-$wgResourceLoaderLESSFunctions = array();
-
-/**
* Default import paths for LESS modules. LESS files referenced in @import
* statements will be looked up here first, and relative to the importing file
* second. To avoid collisions, it's important for the LESS files in these
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index 5fb6c96..b8ec63b 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -1625,9 +1625,6 @@
$less->setPreserveComments( true );
$less->setVariables( self::getLessVars( $config ) );
$less->setImportDir( $config->get(
'ResourceLoaderLESSImportPaths' ) );
- foreach ( $config->get( 'ResourceLoaderLESSFunctions' ) as
$name => $func ) {
- $less->registerFunction( $name, $func );
- }
return $less;
}
diff --git a/tests/phpunit/data/less/common/test.common.mixins.less
b/tests/phpunit/data/less/common/test.common.mixins.less
index 2fbe9b7..4064729 100644
--- a/tests/phpunit/data/less/common/test.common.mixins.less
+++ b/tests/phpunit/data/less/common/test.common.mixins.less
@@ -1,5 +1,4 @@
.test-mixin (@value) {
color: @value;
border: @foo solid @Foo;
- line-height: test-sum(@bar, 10, 20);
}
diff --git a/tests/phpunit/data/less/module/styles.css
b/tests/phpunit/data/less/module/styles.css
index b78780a..e8099d1 100644
--- a/tests/phpunit/data/less/module/styles.css
+++ b/tests/phpunit/data/less/module/styles.css
@@ -2,5 +2,4 @@
.unit-tests {
color: green;
border: 2px solid #ee;
- line-height: 35;
}
diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
index cc20e7f..b683885 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
@@ -6,15 +6,6 @@
parent::setUp();
$this->setMwGlobals( array(
- 'wgResourceLoaderLESSFunctions' => array(
- 'test-sum' => function ( $frame, $less ) {
- $sum = 0;
- foreach ( $frame[2] as $arg
[MediaWiki-commits] [Gerrit] resourceloader: Rename 'mediaWikiStartUp' mark to 'mwLoadStart' - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: resourceloader: Rename 'mediaWikiStartUp' mark to 'mwLoadStart'
..
resourceloader: Rename 'mediaWikiStartUp' mark to 'mwLoadStart'
By ending with "Start" we can create a sensibly named "mwLoadEnd".
Also calling it LoadStart instead of StartUp so that it matches
the mediaWikiLoadStart global.
Abandoning 'mediaWiki' as prefix since that's a left-over from the
mediawiki.js global variable, as abbreviation 'mw' makes more sense
or full on 'MediaWiki' (with proper capital 'M').
Change-Id: I3ab0ddf53ccb83db87d705b670cf5c46516b4488
---
M resources/src/startup.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/startup.js b/resources/src/startup.js
index 197a672..1d1455c 100644
--- a/resources/src/startup.js
+++ b/resources/src/startup.js
@@ -12,7 +12,7 @@
if ( !performance.mark ) {
performance.mark = function () {};
}
-performance.mark( 'mediaWikiStartUp' );
+performance.mark( 'mwLoadStart' );
/**
* Returns false for Grade C supported browsers.
--
To view, visit https://gerrit.wikimedia.org/r/235782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ab0ddf53ccb83db87d705b670cf5c46516b4488
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Edokter
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: Phedenskog
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use the correct cache key when storing 'hasMessages' - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged.
Change subject: Use the correct cache key when storing 'hasMessages'
..
Use the correct cache key when storing 'hasMessages'
The key used was empty, and therefore did not work. Use the correct
key when caching 'hasMessages' for the user to see their message
badge when receiving the first message.
Change-Id: Ib5b07854f96efed974d53267d9ed573c6ca1cf04
---
M includes/NotifUser.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/NotifUser.php b/includes/NotifUser.php
index 29935ae..e80e629 100644
--- a/includes/NotifUser.php
+++ b/includes/NotifUser.php
@@ -276,7 +276,7 @@
$count = count( $this->notifMapper->fetchByUser( $this->mUser,
1, 0, $eventTypesToLoad ) );
- $result = $count > 0 ? 1 : 0;
+ $result = (int)( $count > 0 );
$this->cache->set( $memcKey, $result, 86400 );
return (bool)$result;
@@ -288,7 +288,7 @@
* of whether they have messages against the database at all.
*/
public function cacheHasMessages() {
- $this->cache->set( $memcKey, 1, 86400 );
+ $this->cache->set( $this->getHasMessagesKey(), 1, 86400 );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/235945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5b07854f96efed974d53267d9ed573c6ca1cf04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QA: Add sleep step to workaround test flakiness - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/235947 Change subject: QA: Add sleep step to workaround test flakiness .. QA: Add sleep step to workaround test flakiness Various Gather tests are failing. Taking lazy route to solve. Change-Id: Id739dd346e70d8719dc5f6f20a872466d1748f3c --- M tests/browser/features/new_collection.feature 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/47/235947/1 diff --git a/tests/browser/features/new_collection.feature b/tests/browser/features/new_collection.feature index a41c5e3..032db3b 100644 --- a/tests/browser/features/new_collection.feature +++ b/tests/browser/features/new_collection.feature @@ -6,6 +6,7 @@ And I have Gather And I am logged into the mobile website And I am on the "Selenium Gather test" page + And I wait When I click the watchstar Scenario: New collection overlay interface visible -- To view, visit https://gerrit.wikimedia.org/r/235947 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id739dd346e70d8719dc5f6f20a872466d1748f3c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Test by Suman - change (mediawiki...examples)
Sukar has uploaded a new change for review. https://gerrit.wikimedia.org/r/235946 Change subject: Test by Suman .. Test by Suman Change-Id: I4ca742ab960367454e66521f935a0ff758cf386f --- M DataPages/DataPages.php M Example/Example.php 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/examples refs/changes/46/235946/1 diff --git a/DataPages/DataPages.php b/DataPages/DataPages.php index a3dfda5..a26be09 100644 --- a/DataPages/DataPages.php +++ b/DataPages/DataPages.php @@ -3,7 +3,7 @@ * Data pages extension, an example for how to use the ContentHandler * facility to handle XML content in MediaWiki. * - * See DataPages.example.php for information on what to put into + * See Suman DataPages.example.php for information on what to put into * your LocalSettings file. * * Note that this example represents XML as a string internally. diff --git a/Example/Example.php b/Example/Example.php index 8dd18f8..7012a0d 100644 --- a/Example/Example.php +++ b/Example/Example.php @@ -1,6 +1,6 @@ https://gerrit.wikimedia.org/r/235946 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ca742ab960367454e66521f935a0ff758cf386f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/examples Gerrit-Branch: master Gerrit-Owner: Sukar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use the correct cache key when storing 'hasMessages' - change (mediawiki...Echo)
Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235945
Change subject: Use the correct cache key when storing 'hasMessages'
..
Use the correct cache key when storing 'hasMessages'
The key used was empty, and therefore did not work. Use the correct
key when caching 'hasMessages' for the user to see their message
badge when receiving the first message.
Change-Id: Ib5b07854f96efed974d53267d9ed573c6ca1cf04
---
M includes/NotifUser.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/45/235945/1
diff --git a/includes/NotifUser.php b/includes/NotifUser.php
index 29935ae..e80e629 100644
--- a/includes/NotifUser.php
+++ b/includes/NotifUser.php
@@ -276,7 +276,7 @@
$count = count( $this->notifMapper->fetchByUser( $this->mUser,
1, 0, $eventTypesToLoad ) );
- $result = $count > 0 ? 1 : 0;
+ $result = (int)( $count > 0 );
$this->cache->set( $memcKey, $result, 86400 );
return (bool)$result;
@@ -288,7 +288,7 @@
* of whether they have messages against the database at all.
*/
public function cacheHasMessages() {
- $this->cache->set( $memcKey, 1, 86400 );
+ $this->cache->set( $this->getHasMessagesKey(), 1, 86400 );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/235945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5b07854f96efed974d53267d9ed573c6ca1cf04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support empty string for wgEmergencyContact/wgPasswordSender - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Support empty string for wgEmergencyContact/wgPasswordSender
..
Support empty string for wgEmergencyContact/wgPasswordSender
In previous versions, the installer often outputted the following
in the generated LocalSettings.php:
> $wgEmergencyContact = '';
> $wgPasswordSender = '';
While this case did not result in providing default values in recent
MediaWiki versions, the mail handling didn't cause an error.
As of MediaWiki 1.25, the error handling is more strict and these
values being empty causes a fatal error and breaks all outgoing mail.
Bug: T104142
Change-Id: Ibf1f857b2f250dac9b725aff8f442e08b8ecd5c9
(cherry picked from commit 583fdd54ad14d3b8a5efc57069f89474c9f8362e)
---
M RELEASE-NOTES-1.25
M includes/Setup.php
2 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index 8e777fd..3e25423 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -10,6 +10,8 @@
* (T98975) Fix having multiple callbacks for a single hook.
* (T107632) maintenance/refreshLinks.php did not always remove all links
pointing to nonexistent pages.
+* (T104142) $wgEmergencyContact and $wgPasswordSender now use their default
+ value if set to an empty string.
== MediaWiki 1.25.2 ==
diff --git a/includes/Setup.php b/includes/Setup.php
index b3bf0fc..1ab07cc 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -502,11 +502,11 @@
// Set defaults for configuration variables
// that are derived from the server name by default
-if ( $wgEmergencyContact === false ) {
+// Note: $wgEmergencyContact and $wgPasswordSender may be false or empty
string (T104142)
+if ( !$wgEmergencyContact ) {
$wgEmergencyContact = 'wikiadmin@' . $wgServerName;
}
-
-if ( $wgPasswordSender === false ) {
+if ( !$wgPasswordSender ) {
$wgPasswordSender = 'apache@' . $wgServerName;
}
--
To view, visit https://gerrit.wikimedia.org/r/235944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf1f857b2f250dac9b725aff8f442e08b8ecd5c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_25
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support empty string for wgEmergencyContact/wgPasswordSender - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235944
Change subject: Support empty string for wgEmergencyContact/wgPasswordSender
..
Support empty string for wgEmergencyContact/wgPasswordSender
In previous versions, the installer often outputted the following
in the generated LocalSettings.php:
> $wgEmergencyContact = '';
> $wgPasswordSender = '';
While this case did not result in providing default values in recent
MediaWiki versions, the mail handling didn't cause an error.
As of MediaWiki 1.25, the error handling is more strict and these
values being empty causes a fatal error and breaks all outgoing mail.
Bug: T104142
Change-Id: Ibf1f857b2f250dac9b725aff8f442e08b8ecd5c9
(cherry picked from commit 583fdd54ad14d3b8a5efc57069f89474c9f8362e)
---
M RELEASE-NOTES-1.25
M includes/Setup.php
2 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/44/235944/1
diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index 8e777fd..3e25423 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -10,6 +10,8 @@
* (T98975) Fix having multiple callbacks for a single hook.
* (T107632) maintenance/refreshLinks.php did not always remove all links
pointing to nonexistent pages.
+* (T104142) $wgEmergencyContact and $wgPasswordSender now use their default
+ value if set to an empty string.
== MediaWiki 1.25.2 ==
diff --git a/includes/Setup.php b/includes/Setup.php
index b3bf0fc..1ab07cc 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -502,11 +502,11 @@
// Set defaults for configuration variables
// that are derived from the server name by default
-if ( $wgEmergencyContact === false ) {
+// Note: $wgEmergencyContact and $wgPasswordSender may be false or empty
string (T104142)
+if ( !$wgEmergencyContact ) {
$wgEmergencyContact = 'wikiadmin@' . $wgServerName;
}
-
-if ( $wgPasswordSender === false ) {
+if ( !$wgPasswordSender ) {
$wgPasswordSender = 'apache@' . $wgServerName;
}
--
To view, visit https://gerrit.wikimedia.org/r/235944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf1f857b2f250dac9b725aff8f442e08b8ecd5c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_25
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] wikimediachapter: Use dk prefix instead - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: [FIX] wikimediachapter: Use dk prefix instead
..
[FIX] wikimediachapter: Use dk prefix instead
With 28cd83f7 the site constructor assumed that `dk:wikimediachapter` assumed
that it's obsolete and replaced by `da:wikimediachapter` which is not the case
for `wikimediachapter`. This is removing all code aliases as they are designed
for Wikipedia.
Change-Id: I2841df3d4e5b5df42096151a49ad1705015763a0
---
M pywikibot/families/wikimediachapter_family.py
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/families/wikimediachapter_family.py
b/pywikibot/families/wikimediachapter_family.py
index 9f3bbdf..891fc5b 100644
--- a/pywikibot/families/wikimediachapter_family.py
+++ b/pywikibot/families/wikimediachapter_family.py
@@ -11,6 +11,8 @@
"""Family for Wikimedia chapters hosted on wikimedia.org."""
+code_aliases = {}
+
def __init__(self):
"""Constructor."""
super(Family, self).__init__()
--
To view, visit https://gerrit.wikimedia.org/r/235942
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2841df3d4e5b5df42096151a49ad1705015763a0
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Redirect be-x-old.wikipedia.org to be-tarask.wikipedia.org - change (operations/puppet)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235943
Change subject: Redirect be-x-old.wikipedia.org to be-tarask.wikipedia.org
..
Redirect be-x-old.wikipedia.org to be-tarask.wikipedia.org
Bug: T11823
Change-Id: Ia83fe892460dace5c9858b3d241891274fc6b56c
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/235943/1
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index d7e643b..9f2cd25 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -278,6 +278,7 @@
ServerAlias pa.us.wikimedia.org
ServerAlias noboard.chapters.wikimedia.org
ServerAlias chapcom.wikimedia.org
+ ServerAlias be-x-old.wikipedia.org
ServerAlias zh-cfr.wikipedia.org
ServerAlias minnan.wikipedia.org
ServerAlias nan.wikipedia.org
@@ -661,6 +662,9 @@
# rewrite chapcom.wikimedia.org https://affcom.wikimedia.org
RewriteCond %{HTTP_HOST} =chapcom.wikimedia.org
RewriteRule ^[^\x00-\x1F]* https://affcom.wikimedia.org$0 [R=301,L,NE]
+ # rewrite be-x-old.wikipedia.org https://be-tarask.wikipedia.org
+ RewriteCond %{HTTP_HOST} =be-x-old.wikipedia.org
+ RewriteRule ^[^\x00-\x1F]* https://be-tarask.wikipedia.org$0
[R=301,L,NE]
# rewrite zh-cfr.wikipedia.org//zh-min-nan.wikipedia.org
RewriteCond %{HTTP_HOST} =zh-cfr.wikipedia.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://zh-min-nan.wikipedia.org$0
[R=301,L,NE]
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 9d75502..2544531 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -101,6 +101,8 @@
rewrite chapcom.wikimedia.org https://affcom.wikimedia.org
+rewrite be-x-old.wikipedia.org https://be-tarask.wikipedia.org
+
rewritezh-cfr.wikipedia.org//zh-min-nan.wikipedia.org
rewriteminnan.wikipedia.org//zh-min-nan.wikipedia.org
rewritenan.wikipedia.org //zh-min-nan.wikipedia.org
--
To view, visit https://gerrit.wikimedia.org/r/235943
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia83fe892460dace5c9858b3d241891274fc6b56c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] resourceloader: Use increment() for resourceloader_cache mis... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: resourceloader: Use increment() for resourceloader_cache miss
metric
..
resourceloader: Use increment() for resourceloader_cache miss metric
This makes it consistent with how we handle the resourceloader_cache hit metric.
When I added the miss metric I figured it was nice to get both counts and
timings
in a single metric, but I can't trust StatsD/Graphite not to screw this up so
let's untangle them to be sure.
Change-Id: I24f68e34a9fa491806fdb6023bdd757f6688c2ed
(cherry picked from commit f28e51adafc0c8a40518d6f9f58b340c7d9a5087)
---
M includes/resourceloader/ResourceLoader.php
1 file changed, 4 insertions(+), 5 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index fd2263b..5fb6c96 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -191,6 +191,7 @@
}
// Defaults
$options += array( 'cache' => true, 'cacheReport' => false );
+ $stats = RequestContext::getMain()->getStats();
// Don't filter empty content
if ( trim( $data ) === '' ) {
@@ -211,18 +212,16 @@
$cache = wfGetCache( wfIsHHVM() ? CACHE_ACCEL :
CACHE_ANYTHING );
$cacheEntry = $cache->get( $key );
if ( is_string( $cacheEntry ) ) {
- wfIncrStats( "resourceloader_cache.$filter.hit"
);
+ $stats->increment(
"resourceloader_cache.$filter.hit" );
return $cacheEntry;
}
$result = '';
try {
- $stats = RequestContext::getMain()->getStats();
$statStart = microtime( true );
-
$result = self::applyFilter( $filter, $data,
$this->config );
-
$statTiming = microtime( true ) - $statStart;
- $stats->timing(
"resourceloader_cache.$filter.miss", 1000 * $statTiming );
+ $stats->increment(
"resourceloader_cache.$filter.miss" );
+ $stats->timing(
"resourceloader_cache.$filter.timing", 1000 * $statTiming );
if ( $options['cacheReport'] ) {
$result .= "\n/* cache key: $key */";
}
--
To view, visit https://gerrit.wikimedia.org/r/235938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I24f68e34a9fa491806fdb6023bdd757f6688c2ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf21
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] wikimediachapter: Use dk prefix instead - change (pywikibot/core)
XZise has uploaded a new change for review. https://gerrit.wikimedia.org/r/235942 Change subject: [FIX] wikimediachapter: Use dk prefix instead .. [FIX] wikimediachapter: Use dk prefix instead With 28cd83f7 the site constructor assumed that `dk:wikimediachapter` assumed that it's obsolete and replaced by `da:wikimediachapter` which is not the case for `wikimediachapter`. This is explicitly removing the `dk` alias for `wikimediachapter`. Change-Id: I2841df3d4e5b5df42096151a49ad1705015763a0 --- M pywikibot/families/wikimediachapter_family.py 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/42/235942/1 diff --git a/pywikibot/families/wikimediachapter_family.py b/pywikibot/families/wikimediachapter_family.py index 9f3bbdf..35fd60a 100644 --- a/pywikibot/families/wikimediachapter_family.py +++ b/pywikibot/families/wikimediachapter_family.py @@ -11,6 +11,9 @@ """Family for Wikimedia chapters hosted on wikimedia.org.""" +code_aliases = dict(family.WikimediaFamily.code_aliases) +del code_aliases['dk'] + def __init__(self): """Constructor.""" super(Family, self).__init__() -- To view, visit https://gerrit.wikimedia.org/r/235942 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2841df3d4e5b5df42096151a49ad1705015763a0 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move be-x-old wgServer/wgCanonicalServer to be-tarask - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Move be-x-old wgServer/wgCanonicalServer to be-tarask .. Move be-x-old wgServer/wgCanonicalServer to be-tarask Bug: T11823 Change-Id: Ia8c840d3f1e291be7d078fc8161e39a8055cfba1 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5e8b39c..a79edec 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -1318,6 +1318,7 @@ 'advisorywiki' => '//advisory.wikimedia.org', 'arwikimedia' => '//ar.wikimedia.org', 'auditcomwiki' => '//auditcom.wikimedia.org', + 'be_x_oldwiki' => '//be-tarask.wikipedia.org', 'boardgovcomwiki' => '//boardgovcom.wikimedia.org', 'boardwiki' => '//board.wikimedia.org', 'brwikimedia' => '//br.wikimedia.org', @@ -1397,6 +1398,7 @@ 'advisorywiki' => 'https://advisory.wikimedia.org', 'arwikimedia' => 'https://ar.wikimedia.org', 'auditcomwiki' => 'https://auditcom.wikimedia.org', + 'be_x_oldwiki' => 'https://be-tarask.wikipedia.org', 'boardgovcomwiki' => 'https://boardgovcom.wikimedia.org', 'boardwiki' => 'https://board.wikimedia.org', 'brwikimedia' => 'https://br.wikimedia.org', -- To view, visit https://gerrit.wikimedia.org/r/235940 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia8c840d3f1e291be7d078fc8161e39a8055cfba1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tools: Replace references to tools.wmflabs.org - change (operations/puppet)
Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235941
Change subject: Tools: Replace references to tools.wmflabs.org
..
Tools: Replace references to tools.wmflabs.org
Bug: T87387
Change-Id: I6efa8ffdcf407d98a10baeca7193af1b90e53610
---
M modules/dynamicproxy/templates/urlproxy.conf
M modules/toollabs/manifests/init.pp
M modules/toollabs/templates/static-server.conf.erb
3 files changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/41/235941/1
diff --git a/modules/dynamicproxy/templates/urlproxy.conf
b/modules/dynamicproxy/templates/urlproxy.conf
index 1b33a80..7f99639 100644
--- a/modules/dynamicproxy/templates/urlproxy.conf
+++ b/modules/dynamicproxy/templates/urlproxy.conf
@@ -105,7 +105,7 @@
proxy_intercept_errors on;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
-proxy_set_header Host 'tools.wmflabs.org';
+proxy_set_header Host '<%= @web_domain %>';
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Original-URI $request_uri;
@@ -115,7 +115,7 @@
# in over. There may be fringe cases where upstream servers
# want https requests to redirect to non-Tools servers over
# http, so we limit the rewriting to tools.wmflabs.org.
-proxy_redirect http://tools.wmflabs.org/ $scheme://tools.wmflabs.org/;
+proxy_redirect http://<%= @web_domain %>/ $scheme://<%= @web_domain
%>/;
}
<% end %>
# GZIP ALL THE THINGS!
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index 3fa278c..1ddc205 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -21,6 +21,7 @@
$is_mail_relay = false,
$active_mail_relay = 'tools-mail.eqiad.wmflabs',
$mail_domain = 'tools.wmflabs.org',
+$web_domain = 'tools.wmflabs.org',
) {
include labs_lvm
diff --git a/modules/toollabs/templates/static-server.conf.erb
b/modules/toollabs/templates/static-server.conf.erb
index dce45db..700544f 100644
--- a/modules/toollabs/templates/static-server.conf.erb
+++ b/modules/toollabs/templates/static-server.conf.erb
@@ -52,15 +52,15 @@
charset utf-8;
location = / {
-return 302 "https://tools.wmflabs.org";;
+return 302 "https://<%= @web_domain %>";
}
location = /cdnjs {
-return 302 "https://tools.wmflabs.org/cdnjs/";;
+return 302 "https://<%= @web_domain %>/cdnjs/";
}
location = /cdnjs/ {
-return 302 "https://tools.wmflabs.org/cdnjs/";;
+return 302 "https://<%= @web_domain %>/cdnjs/";
}
location ^~ /cdnjs/ {
--
To view, visit https://gerrit.wikimedia.org/r/235941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6efa8ffdcf407d98a10baeca7193af1b90e53610
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move be-x-old wgServer/wgCanonicalServer to be-tarask - change (operations/mediawiki-config)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/235940 Change subject: Move be-x-old wgServer/wgCanonicalServer to be-tarask .. Move be-x-old wgServer/wgCanonicalServer to be-tarask Bug: T11823 Change-Id: Ia8c840d3f1e291be7d078fc8161e39a8055cfba1 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/40/235940/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5e8b39c..a79edec 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -1318,6 +1318,7 @@ 'advisorywiki' => '//advisory.wikimedia.org', 'arwikimedia' => '//ar.wikimedia.org', 'auditcomwiki' => '//auditcom.wikimedia.org', + 'be_x_oldwiki' => '//be-tarask.wikipedia.org', 'boardgovcomwiki' => '//boardgovcom.wikimedia.org', 'boardwiki' => '//board.wikimedia.org', 'brwikimedia' => '//br.wikimedia.org', @@ -1397,6 +1398,7 @@ 'advisorywiki' => 'https://advisory.wikimedia.org', 'arwikimedia' => 'https://ar.wikimedia.org', 'auditcomwiki' => 'https://auditcom.wikimedia.org', + 'be_x_oldwiki' => 'https://be-tarask.wikipedia.org', 'boardgovcomwiki' => 'https://boardgovcom.wikimedia.org', 'boardwiki' => 'https://board.wikimedia.org', 'brwikimedia' => 'https://br.wikimedia.org', -- To view, visit https://gerrit.wikimedia.org/r/235940 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia8c840d3f1e291be7d078fc8161e39a8055cfba1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] resourceloader: Use increment() for resourceloader_cache mis... - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235938
Change subject: resourceloader: Use increment() for resourceloader_cache miss
metric
..
resourceloader: Use increment() for resourceloader_cache miss metric
This makes it consistent with how we handle the resourceloader_cache hit metric.
When I added the miss metric I figured it was nice to get both counts and
timings
in a single metric, but I can't trust StatsD/Graphite not to screw this up so
let's untangle them to be sure.
Change-Id: I24f68e34a9fa491806fdb6023bdd757f6688c2ed
(cherry picked from commit f28e51adafc0c8a40518d6f9f58b340c7d9a5087)
---
M includes/resourceloader/ResourceLoader.php
1 file changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/38/235938/1
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index fd2263b..5fb6c96 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -191,6 +191,7 @@
}
// Defaults
$options += array( 'cache' => true, 'cacheReport' => false );
+ $stats = RequestContext::getMain()->getStats();
// Don't filter empty content
if ( trim( $data ) === '' ) {
@@ -211,18 +212,16 @@
$cache = wfGetCache( wfIsHHVM() ? CACHE_ACCEL :
CACHE_ANYTHING );
$cacheEntry = $cache->get( $key );
if ( is_string( $cacheEntry ) ) {
- wfIncrStats( "resourceloader_cache.$filter.hit"
);
+ $stats->increment(
"resourceloader_cache.$filter.hit" );
return $cacheEntry;
}
$result = '';
try {
- $stats = RequestContext::getMain()->getStats();
$statStart = microtime( true );
-
$result = self::applyFilter( $filter, $data,
$this->config );
-
$statTiming = microtime( true ) - $statStart;
- $stats->timing(
"resourceloader_cache.$filter.miss", 1000 * $statTiming );
+ $stats->increment(
"resourceloader_cache.$filter.miss" );
+ $stats->timing(
"resourceloader_cache.$filter.timing", 1000 * $statTiming );
if ( $options['cacheReport'] ) {
$result .= "\n/* cache key: $key */";
}
--
To view, visit https://gerrit.wikimedia.org/r/235938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24f68e34a9fa491806fdb6023bdd757f6688c2ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf21
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enhace message - change (mediawiki...GlobalCssJs)
MarcoAurelio has uploaded a new change for review. https://gerrit.wikimedia.org/r/235937 Change subject: Enhace message .. Enhace message * Changed "all wikis" to "all Wikimedia wikis" for clarity. * Added a link to the help docs for the Extension for info. Bug: T72588 Change-Id: Ic0553bcb7f45b3b6dd78f95da30df7bd9c6c1a22 --- M i18n/core/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalCssJs refs/changes/37/235937/1 diff --git a/i18n/core/en.json b/i18n/core/en.json index cc5fcd3..13b60bb 100644 --- a/i18n/core/en.json +++ b/i18n/core/en.json @@ -9,7 +9,7 @@ "globalcssjs-desc": "Allows CSS and JavaScript on a central wiki to be loaded for all connected wikis", "globalcssjs-warning-js": "Any JavaScript added to this page will be loaded on all wikis where you have an account.", "globalcssjs-warning-css": "Any CSS added to this page will be loaded on all wikis where you have an account.", - "globalcssjs-custom-css-js": "Shared CSS/JavaScript for all wikis:", + "globalcssjs-custom-css-js": "Shared CSS/JavaScript for all Wikimedia wikis ([[:mw:Help:Extension:GlobalCssJs|more information]]):", "globalcssjs-custom-js": "Custom JavaScript", "globalcssjs-custom-css": "Custom CSS", "globalcssjs-delete-css": "Deleting CSS page on user request due to deployment of [[mw:Help:Extension:GlobalCssJs]]", -- To view, visit https://gerrit.wikimedia.org/r/235937 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0553bcb7f45b3b6dd78f95da30df7bd9c6c1a22 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GlobalCssJs Gerrit-Branch: master Gerrit-Owner: MarcoAurelio ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...WikidataPageBanner)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Updating development dependencies
..
build: Updating development dependencies
* grunt-contrib-jshint: 0.11.2 → 0.11.3
Change-Id: I3d0ddf348e219e96fed5f470d1b85e37d051f804
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index 614655f..daf19ff 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
"devDependencies": {
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.2",
+"grunt-contrib-jshint": "0.11.3",
"grunt-banana-checker": "0.2.2",
"grunt-jsonlint": "1.0.4"
}
--
To view, visit https://gerrit.wikimedia.org/r/235935
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d0ddf348e219e96fed5f470d1b85e37d051f804
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataPageBanner
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Jdz
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Sumit
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Lift account creation throttle for National Library of Wales... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Lift account creation throttle for National Library of Wales Rugby Editathon .. Lift account creation throttle for National Library of Wales Rugby Editathon Bug: T111332 Change-Id: I240190fed14b4f526237dc5973290d96d254cb0a --- M wmf-config/throttle.php 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php index f4d71e0..580a6ef 100644 --- a/wmf-config/throttle.php +++ b/wmf-config/throttle.php @@ -45,6 +45,14 @@ 'value' => 50 ); +$wmgThrottlingExceptions[] = array( // T111332 + 'from' => '2015-09-07T10:00 +1:00', + 'to' => '2015-09-07T16:00 +1:00', + 'ip' => '91.194.46.122', + 'dbname' => 'enwiki', + 'value' => 50 +); + ## Add throttling definitions above. /** -- To view, visit https://gerrit.wikimedia.org/r/235853 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I240190fed14b4f526237dc5973290d96d254cb0a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating development dependencies .. build: Updating development dependencies * grunt-contrib-jshint: 0.11.2 → 0.11.3 Change-Id: I4770a7fa011cfadcb8eb4d8b3a135b18e1e1f53a --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/package.json b/package.json index e1f7b2e..2f93ccf 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "grunt": "0.4.5", "grunt-cli": "0.1.13", "grunt-contrib-csslint": "0.4.0", -"grunt-contrib-jshint": "0.11.2", +"grunt-contrib-jshint": "0.11.3", "grunt-contrib-watch": "0.6.1", "grunt-banana-checker": "0.2.2", "grunt-jscs": "1.8.0", -- To view, visit https://gerrit.wikimedia.org/r/235933 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4770a7fa011cfadcb8eb4d8b3a135b18e1e1f53a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UploadWizard Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...SmiteSpam)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating development dependencies .. build: Updating development dependencies * grunt-contrib-jshint: ^0.11.2 → 0.11.3 Change-Id: I94c99642cb81881e120a156023122a906e2c9a01 --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/package.json b/package.json index 3cc6875..224cd25 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "grunt": "^0.4.5", "grunt-banana-checker": "^0.2.1", "grunt-cli": "^0.1.13", -"grunt-contrib-jshint": "^0.11.2", +"grunt-contrib-jshint": "0.11.3", "grunt-jscs": "^1.8.0" } } -- To view, visit https://gerrit.wikimedia.org/r/235931 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I94c99642cb81881e120a156023122a906e2c9a01 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SmiteSpam Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...UrlShortener)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Updating development dependencies
..
build: Updating development dependencies
* grunt-contrib-jshint: 0.11.2 → 0.11.3
Change-Id: Ia733b0fefe0a9caa19cf43bdda15b43c722099de
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index 63d5896..108147a 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"devDependencies": {
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.2",
+"grunt-contrib-jshint": "0.11.3",
"grunt-banana-checker": "0.2.2",
"grunt-jscs": "1.8.0",
"grunt-jsonlint": "1.0.4",
--
To view, visit https://gerrit.wikimedia.org/r/235934
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia733b0fefe0a9caa19cf43bdda15b43c722099de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UrlShortener
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Map be-tarask.wikipedia.org to be_x_oldwiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Map be-tarask.wikipedia.org to be_x_oldwiki .. Map be-tarask.wikipedia.org to be_x_oldwiki Bug: T11823 Change-Id: Id08b716aed2bcc3d21fc98baa83e0a09587eabd4 --- M multiversion/MWMultiVersion.php M wmf-config/InitialiseSettings.php 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php index 985912d..2a419a4 100644 --- a/multiversion/MWMultiVersion.php +++ b/multiversion/MWMultiVersion.php @@ -143,6 +143,7 @@ 'wikisource.org' => 'sources', 'wikitech.wikimedia.org' => 'labs', 'affcom.wikimedia.org' => 'chapcom', + 'be-tarask.wikipedia.org' => 'be_x_old', // Labs 'beta.wmflabs.org' => 'deployment', diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 1fe8b4f..7acc9f0 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -71,6 +71,7 @@ 'default' => '$lang', # Non-ISO language codes + 'be_x_oldwiki' => 'be-tarask', 'crhwiki' => 'crh-latn', 'nowiki' => 'nb', 'simplewiki' => 'en', @@ -83,7 +84,6 @@ 'alswikibooks' => 'gsw', 'alswikiquote' => 'gsw', 'bat_smgwiki' => 'sgs', - 'be_x_oldwiki' => 'be-tarask', 'bhwiki' => 'bho', 'bhwiktionary' => 'bho', 'fiu_vrowiki' => 'vro', -- To view, visit https://gerrit.wikimedia.org/r/235843 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id08b716aed2bcc3d21fc98baa83e0a09587eabd4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Shrinkwrap the dependencies - change (mediawiki...deploy)
jenkins-bot has submitted this change and it was merged. Change subject: Shrinkwrap the dependencies .. Shrinkwrap the dependencies * This is the result of running, npm shrinkwrap --dev rm -rf node_modules/ npm install * Ideally, you should be able to run `rm -rf node_modules/ && npm install` now and the `git diff` will be empty. However, the version of core-js we're using (and apparently the version that babel, by way of jscs, is using) has windows style line endings that get normalized on checkout. That's fixed upstream. Also, the hash in the package.json for pegjs from git isn't reproducible. Maybe it's produced with a timestamp as input. * We are going with shrinkwrapping to make sure all parsoid installs get the same versions of libraries against with the code has been tested. We cannot assume that all packages we use follow semantic versioning concepts identically. Change-Id: I7cd4d66530f78e0efa80bc9b809e7c8cfbe60674 --- M node_modules/alea/package.json M node_modules/async/package.json M node_modules/body-parser/node_modules/bytes/package.json M node_modules/body-parser/node_modules/content-type/package.json M node_modules/body-parser/node_modules/debug/node_modules/ms/package.json M node_modules/body-parser/node_modules/debug/package.json M node_modules/body-parser/node_modules/depd/package.json M node_modules/body-parser/node_modules/http-errors/node_modules/inherits/package.json M node_modules/body-parser/node_modules/http-errors/node_modules/statuses/package.json M node_modules/body-parser/node_modules/http-errors/package.json M node_modules/body-parser/node_modules/iconv-lite/package.json M node_modules/body-parser/node_modules/on-finished/node_modules/ee-first/package.json M node_modules/body-parser/node_modules/on-finished/package.json M node_modules/body-parser/node_modules/qs/package.json M node_modules/body-parser/node_modules/raw-body/node_modules/unpipe/package.json M node_modules/body-parser/node_modules/raw-body/package.json M node_modules/body-parser/node_modules/type-is/node_modules/media-typer/package.json M node_modules/body-parser/node_modules/type-is/node_modules/mime-types/node_modules/mime-db/package.json M node_modules/body-parser/node_modules/type-is/node_modules/mime-types/package.json M node_modules/body-parser/node_modules/type-is/package.json M node_modules/body-parser/package.json M node_modules/bunyan/node_modules/mv/node_modules/mkdirp/node_modules/minimist/package.json M node_modules/bunyan/node_modules/mv/node_modules/mkdirp/package.json M node_modules/bunyan/node_modules/mv/node_modules/ncp/package.json M node_modules/bunyan/node_modules/mv/node_modules/rimraf/package.json M node_modules/bunyan/node_modules/mv/package.json M node_modules/bunyan/package.json M node_modules/chai/node_modules/assertion-error/package.json M node_modules/chai/node_modules/deep-eql/node_modules/type-detect/package.json M node_modules/chai/node_modules/deep-eql/package.json M node_modules/chai/node_modules/type-detect/package.json M node_modules/chai/package.json M node_modules/colors/package.json M node_modules/compression/node_modules/accepts/node_modules/mime-types/node_modules/mime-db/package.json M node_modules/compression/node_modules/accepts/node_modules/mime-types/package.json M node_modules/compression/node_modules/accepts/node_modules/negotiator/package.json M node_modules/compression/node_modules/accepts/package.json M node_modules/compression/node_modules/bytes/package.json M node_modules/compression/node_modules/compressible/node_modules/mime-db/package.json M node_modules/compression/node_modules/compressible/package.json M node_modules/compression/node_modules/debug/node_modules/ms/package.json M node_modules/compression/node_modules/debug/package.json M node_modules/compression/node_modules/on-headers/package.json M node_modules/compression/node_modules/vary/package.json M node_modules/compression/package.json M node_modules/connect-busboy/node_modules/busboy/node_modules/dicer/node_modules/streamsearch/package.json M node_modules/connect-busboy/node_modules/busboy/node_modules/dicer/package.json M node_modules/connect-busboy/node_modules/busboy/node_modules/readable-stream/node_modules/core-util-is/package.json M node_modules/connect-busboy/node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json M node_modules/connect-busboy/node_modules/busboy/node_modules/readable-stream/node_modules/isarray/package.json M node_modules/connect-busboy/node_modules/busboy/node_modules/readable-stream/node_modules/string_decoder/package.json M node_modules/connect-busboy/node_modules/busboy/node_modules/readable-stream/package.json M node_modules/connect-busboy/node_modules/busboy/package.json M node_modules/connect-busboy/package.json M node_modules/core-js/package.json M node_modules/coveralls/node_modules/js-yaml
[MediaWiki-commits] [Gerrit] Update logo for ukwikivoyage - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Update logo for ukwikivoyage .. Update logo for ukwikivoyage Bug: T110370 Change-Id: I10871b6c3fd7ed4a6a49dd20f91888409af79258 --- M w/static/images/project-logos/ukwikivoyage.png M wmf-config/InitialiseSettings.php 2 files changed, 1 insertion(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/w/static/images/project-logos/ukwikivoyage.png b/w/static/images/project-logos/ukwikivoyage.png index a9b0cc6..a693bf4 100644 --- a/w/static/images/project-logos/ukwikivoyage.png +++ b/w/static/images/project-logos/ukwikivoyage.png Binary files differ diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 8af7639..2c94450 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -1001,6 +1001,7 @@ 'fawikivoyage' => '/static/images/project-logos/fawikivoyage.png', // T73382 'hewikivoyage' => '/static/images/project-logos/hewikivoyage.png', 'plwikivoyage' => '/static/images/project-logos/plwikivoyage.png', + 'ukwikivoyage' => '/static/images/project-logos/ukwikivoyage.png', // T110370 'zhwikivoyage' => '/static/images/project-logos/zhwikivoyage.png', // T61077 // Chapter wikis -- To view, visit https://gerrit.wikimedia.org/r/235850 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I10871b6c3fd7ed4a6a49dd20f91888409af79258 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Design the anon warning widget - change (mediawiki...Flow)
Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235936
Change subject: Design the anon warning widget
..
Design the anon warning widget
Design according to spec in the task, and add an additional message
per each submit button for anonymous users.
Bug: T110086
Change-Id: Idda7377fc1ce92ca644b8424c219456e21d741e1
---
M Resources.php
M i18n/en.json
M i18n/qqq.json
M modules/flow/ui/widgets/editor/mw.flow.ui.EditorControlsWidget.js
A modules/styles/flow/images/anon-user.svg
M modules/styles/flow/widgets/editor/mw.flow.ui.AnonWarningWidget.less
6 files changed, 48 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/36/235936/1
diff --git a/Resources.php b/Resources.php
index e5d433a..63b7bff 100644
--- a/Resources.php
+++ b/Resources.php
@@ -103,16 +103,22 @@
'flow-edit-header-link',
'flow-edit-header-placeholder',
'flow-edit-header-submit',
+ 'flow-edit-header-submit-anonymously',
'flow-edit-title-submit',
+ 'flow-edit-title-submit-anonymously',
+ 'flow-edit-post-submit',
+ 'flow-edit-post-submit-anonymously',
'flow-load-more',
'flow-newest-topics',
'flow-newtopic-content-placeholder',
'flow-newtopic-save',
+ 'flow-newtopic-save-anonymously',
'flow-newtopic-start-placeholder',
'flow-post-action-delete-post',
'flow-post-action-undelete-post',
'flow-post-action-edit-post',
'flow-post-action-edit-post-submit',
+ 'flow-post-action-edit-post-submit-anonymously',
'flow-post-action-hide-post',
'flow-post-action-unhide-post',
'flow-post-action-post-history',
diff --git a/i18n/en.json b/i18n/en.json
index 31fdb01..2f82035 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -68,6 +68,7 @@
"flow-newtopic-content-placeholder": "Post a new message to \"$1\"",
"flow-newtopic-header": "Add a new topic",
"flow-newtopic-save": "Add topic",
+ "flow-newtopic-save-anonymously": "Add topic anonymously",
"flow-newtopic-start-placeholder": "Start a new topic",
"flow-newtopic-first-heading": "Start a new topic on $1",
"flow-summarize-topic-placeholder": "Please summarize this discussion",
@@ -94,6 +95,7 @@
"flow-post-action-hide-post": "Hide",
"flow-post-action-edit-post": "Edit",
"flow-post-action-edit-post-submit": "Save changes",
+ "flow-post-action-edit-post-submit-anonymously": "Save changes
anonymously",
"flow-post-action-unsuppress-post": "Unsuppress",
"flow-post-action-undelete-post": "Undelete",
"flow-post-action-unhide-post": "Unhide",
@@ -193,8 +195,11 @@
"flow-error-search": "We could not complete your search due to a
temporary problem. Please try again later.",
"flow-edit-header-placeholder": "Describe this discussion board",
"flow-edit-header-submit": "Save description",
+ "flow-edit-header-submit-anonymously": "Save description anonymously",
"flow-edit-title-submit": "Change title",
+ "flow-edit-title-submit-anonymously": "Change title anonymously",
"flow-edit-post-submit": "Submit changes",
+ "flow-edit-post-submit-anonymously": "Submit changes anonymously",
"flow-rev-message-edit-post": "$1 {{GENDER:$2|edited}} a [$3 comment]
on \"$4\"",
"flow-rev-message-edit-post-recentchanges": "$1",
"flow-rev-message-edit-post-recentchanges-summary":
"{{GENDER:$2|Edited}} a post",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ebbd4d6..7b18bd6 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -76,6 +76,7 @@
"flow-newtopic-content-placeholder": "Used as placeholder for the
\"Content\" textarea.\nParameters:\n* $1 - The prefixed name of the current
page.",
"flow-newtopic-header": "Unused at this time.",
"flow-newtopic-save": "Used as label for the Submit button.\n\nAlso
used in:\n* {{msg-mw|Flow-terms-of-use-new-topic}}\n*
{{msg-mw|Wikimedia-flow-terms-of-use-new-topic}}\n{{Identical|Add topic}}",
+ "flow-newtopic-save-anonymously": "Used as label for the Submit button
when submitting as anonymous users.\n\nAlso used in:\n*
{{msg-mw|Flow-terms-of-use-new-topic}}\n*
{{msg-mw|Wikimedia-flow-terms-of-use-new-topic}}\n{{Identical|Add topic}}",
"flow-newtopic-start-placeholder": "Used as placeholder for the
\"Topic\" textarea.",
"flow-newtopic-first-heading": "First heading on the page with the form
to create a new topic
[MediaWiki-commits] [Gerrit] Change Kannada Wikisource logo and project title - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Change Kannada Wikisource logo and project title .. Change Kannada Wikisource logo and project title * Created path on 'wgLogo' regarding knwikisource logo * Changed 'wgSitename' to change project's name. * Changed wgMetaNamespace' and 'wgMetaNamespaceTalk' to modify NS_PROJECT and NS_PROJECT_TALK name * New logo uploaded to static/images/project-logos Bug: T110806 Change-Id: Iba0683969b7f91105e1b8f5c92845a903f9c9e64 --- M w/static/images/project-logos/knwikisource.png M wmf-config/InitialiseSettings.php 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/w/static/images/project-logos/knwikisource.png b/w/static/images/project-logos/knwikisource.png index 290f254..77a1ee2 100644 --- a/w/static/images/project-logos/knwikisource.png +++ b/w/static/images/project-logos/knwikisource.png Binary files differ diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 8af7639..ad1369d 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -963,6 +963,7 @@ 'huwikisource' => '/static/images/project-logos/huwikisource.png', // T54019 'hywikisource' => '/static/images/project-logos/hywikisource.png', // T54019 'iswikisource' => '/static/images/project-logos/iswikisource.png', // T54019 + 'knwikisource' => '/static/images/project-logos/knwikisource.png', // T110806 'kowikisource' => '/static/images/project-logos/kowikisource.png', // T40543 'lawikisource' => '/static/images/project-logos/lawikisource.png', // T54019 'liwikisource' => '/static/images/project-logos/liwikisource.png', // T54019 @@ -1693,6 +1694,7 @@ 'kmwiki' => 'វិគីភីឌា', 'knwiki' => 'ವಿಕಿಪೀಡಿಯ', 'knwikiquote' => 'ವಿಕಿಕೋಟ್', + 'knwikisource' => 'ವಿಕಿಸೋರ್ಸ್', // T110806 'knwiktionary' => 'ವಿಕ್ಷನರಿ', 'koiwiki' => 'Википедия', 'kowiki' => '위키백과', @@ -2164,6 +2166,7 @@ 'kkwiktionary' => 'Уикисөздік', 'kmwiki' => 'វិគីភីឌា', 'knwiki' => 'ವಿಕಿಪೀಡಿಯ', + 'knwikisource' => 'ವಿಕಿಸೋರ್ಸ್', // T110806 'koiwiki' => 'Википедия', 'kowiki' => '위키백과', 'kowikinews' => '위키뉴스', @@ -2402,6 +2405,7 @@ 'huwikinews' => 'Wikihírek-vita', 'iswiktionary' => 'Wikiorðabókarspjall', 'kbdwiki' => 'Уикипедиэм_и_тепсэлъыхьыгъуэ', + 'knwikisource' => 'ವಿಕಿಸೋರ್ಸ್_ಚರ್ಚೆ', // T110806 'kmwiki' => 'ការពិភាក្សាអំពីវិគីភីឌា', 'koiwiki' => 'Баитам_Википедия_йылiсь', 'kowikinews' => '위키뉴스토론', -- To view, visit https://gerrit.wikimedia.org/r/235728 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba0683969b7f91105e1b8f5c92845a903f9c9e64 Gerrit-PatchSet: 5 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MarcoAurelio Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: MarcoAurelio Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update WikimediaFamily cross_projects - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Update WikimediaFamily cross_projects
..
Update WikimediaFamily cross_projects
Move cross_projects to be a class attribute.
Break down the list of cross_projects into different types,
adding missing project families.
Update wikimediachapter family to be a WikimediaFamily subclass,
and remove an obsolete 'continue' in the Family tests related
to the wikimediachapter family.
Bug: T103254
Change-Id: I29e720088502757b0461489a9476e40d434ba0d5
---
M pywikibot/families/wikimediachapter_family.py
M pywikibot/family.py
M tests/family_tests.py
3 files changed, 49 insertions(+), 16 deletions(-)
Approvals:
XZise: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/families/wikimediachapter_family.py
b/pywikibot/families/wikimediachapter_family.py
index b240954..dccf1ce 100644
--- a/pywikibot/families/wikimediachapter_family.py
+++ b/pywikibot/families/wikimediachapter_family.py
@@ -7,13 +7,13 @@
from pywikibot import family
-class Family(family.Family):
+class Family(family.WikimediaFamily):
"""Family for Wikimedia chapters hosted on wikimedia.org."""
def __init__(self):
"""Constructor."""
-family.Family.__init__(self)
+super(Family, self).__init__()
self.name = 'wikimediachapter'
self.countries = [
diff --git a/pywikibot/family.py b/pywikibot/family.py
index 6c2e071..e809240 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -691,7 +691,8 @@
}
# A list of projects that share cross-project sessions.
-self.cross_projects = []
+if not hasattr(self, 'cross_projects'):
+self.cross_projects = []
# A list with the name for cross-project cookies.
# default for wikimedia centralAuth extensions.
@@ -1411,6 +1412,51 @@
"""Class for all wikimedia families."""
+multi_language_content_families = [
+'wikipedia', 'test',
+'wiktionary', 'wikisource',
+'wikibooks', 'wikinews', 'wikiquote',
+'wikiversity', 'wikivoyage',
+]
+
+wikimedia_org_content_families = [
+'commons', 'incubator', 'species',
+]
+
+wikimedia_org_meta_families = [
+'meta', 'outreach', 'strategy',
+'wikimediachapter',
+]
+
+wikimedia_org_other_families = [
+'wikitech',
+]
+
+other_content_families = [
+'wikidata'
+'mediawiki',
+]
+
+content_families = set(
+multi_language_content_families +
+wikimedia_org_content_families +
+other_content_families
+)
+
+wikimedia_org_families = set(
+wikimedia_org_content_families +
+wikimedia_org_meta_families +
+wikimedia_org_other_families
+)
+
+# CentralAuth cross avaliable projects.
+cross_projects = set(
+multi_language_content_families +
+wikimedia_org_content_families +
+wikimedia_org_meta_families +
+other_content_families
+)
+
# Code mappings which are only an alias, and there is no 'old' wiki.
# For all except 'nl_nds', subdomains do exist as a redirect, but that
# should not be relied upon.
@@ -1447,16 +1493,6 @@
# Romanian was to be the replacement.
'mo': 'ro',
}
-
-def __init__(self):
-super(WikimediaFamily, self).__init__()
-
-# CentralAuth cross avaliable projects.
-self.cross_projects = [
-'commons', 'incubator', 'mediawiki', 'meta', 'species', 'test',
-'wikibooks', 'wikidata', 'wikinews', 'wikipedia', 'wikiquote',
-'wikisource', 'wikiversity', 'wiktionary',
-]
@property
def interwiki_removals(self):
diff --git a/tests/family_tests.py b/tests/family_tests.py
index 6fe8823..7a08da7 100644
--- a/tests/family_tests.py
+++ b/tests/family_tests.py
@@ -33,9 +33,6 @@
f = Family.load(name)
self.assertIsInstance(f.langs, dict)
self.assertNotEqual(f.langs, {})
-# There is one inconsistency
-if f.name == 'wikimediachapter' and name == 'wikimedia':
-continue
self.assertEqual(f.name, name)
def test_family_load_invalid(self):
--
To view, visit https://gerrit.wikimedia.org/r/219613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I29e720088502757b0461489a9476e40d434ba0d5
Gerrit-PatchSet: 6
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: Nemo bis
Gerrit-Reviewer: XZise
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/med
[MediaWiki-commits] [Gerrit] Consistency tweaks in preparation for translatewiki.net - change (mediawiki...ParsoidBatchAPI)
Tim Starling has submitted this change and it was merged.
Change subject: Consistency tweaks in preparation for translatewiki.net
..
Consistency tweaks in preparation for translatewiki.net
* Change description message key to default
* Add qqq
Change-Id: Ib47a5f08cba007ec6dc40545c719226ce2b8e024
---
M extension.json
M i18n/en.json
A i18n/qqq.json
3 files changed, 15 insertions(+), 2 deletions(-)
Approvals:
Tim Starling: Verified; Looks good to me, approved
diff --git a/extension.json b/extension.json
index 85de141..a7e468e 100644
--- a/extension.json
+++ b/extension.json
@@ -3,7 +3,7 @@
"author": "Tim Starling",
"version": "1.0.0",
"url": "https://www.mediawiki.org/wiki/Extension:ParsoidBatchAPI";,
- "descriptionmsg": "parsoidbatchapi-description",
+ "descriptionmsg": "parsoidbatchapi-desc",
"license-name": "CC0-1.0",
"manifest_version": 1,
"APIModules": {
diff --git a/i18n/en.json b/i18n/en.json
index d10195f..2999de4 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,3 +1,8 @@
{
- "parsoidbatchapi-description": "Batch API for Parsoid"
+ "@metadata": {
+ "authors": [
+ "Tim Starling"
+ ]
+ },
+ "parsoidbatchapi-desc": "Batch API for Parsoid"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..801f2a0
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,8 @@
+{
+ "@metadata": {
+ "authors": [
+ "Raimond Spekking"
+ ]
+ },
+ "parsoidbatchapi-desc":
"{{desc|name=ParsoidBatchAPI|url=https://www.mediawiki.org/wiki/Extension:ParsoidBatchAPI}}";,
+}
--
To view, visit https://gerrit.wikimedia.org/r/231018
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib47a5f08cba007ec6dc40545c719226ce2b8e024
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ParsoidBatchAPI
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking
Gerrit-Reviewer: Amire80
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: Tim Starling
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...Petition)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating development dependencies .. build: Updating development dependencies * grunt-contrib-jshint: 0.11.2 → 0.11.3 Change-Id: I4ab04d52463798b54c0f4807bfb538d48919e0ec --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/package.json b/package.json index 7cf35b6..1db1fe6 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,6 @@ "grunt-cli": "0.1.13", "grunt-banana-checker": "0.2.2", "grunt-jsonlint": "1.0.4", -"grunt-contrib-jshint": "0.11.2" +"grunt-contrib-jshint": "0.11.3" } } -- To view, visit https://gerrit.wikimedia.org/r/235925 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4ab04d52463798b54c0f4807bfb538d48919e0ec Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Petition Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Add explicit dependency upon grunt-cli - change (mediawiki...PronunciationRecording)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Add explicit dependency upon grunt-cli
..
build: Add explicit dependency upon grunt-cli
Change-Id: Iafae61a65c2068322a902ed09cd0224506f9249d
---
M package.json
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index eb789b4..efe7217 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
},
"devDependencies": {
"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
"grunt-banana-checker": "0.2.2",
"grunt-contrib-csslint": "0.5.0",
"grunt-contrib-jshint": "0.11.2",
--
To view, visit https://gerrit.wikimedia.org/r/235926
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iafae61a65c2068322a902ed09cd0224506f9249d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PronunciationRecording
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Mattflaschen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...ImageMetrics)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Updating development dependencies
..
build: Updating development dependencies
* grunt-contrib-jshint: 0.11.2 → 0.11.3
Change-Id: Id0f0bc8bdb451320757bbef35eb2c5ebae5bb967
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index 93beca9..1d12959 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"devDependencies": {
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.2",
+"grunt-contrib-jshint": "0.11.3",
"grunt-banana-checker": "0.2.2",
"grunt-jscs": "1.8.0",
"grunt-jsonlint": "1.0.4"
--
To view, visit https://gerrit.wikimedia.org/r/235921
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id0f0bc8bdb451320757bbef35eb2c5ebae5bb967
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageMetrics
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...Graph)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Updating development dependencies
..
build: Updating development dependencies
* grunt-contrib-jshint: 0.11.2 → 0.11.3
Change-Id: Ibdb42055b158e7b0ae68e660e0cb32196cfe5766
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index 1ac41cb..1c0de2b 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
"devDependencies": {
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.2",
+"grunt-contrib-jshint": "0.11.3",
"grunt-contrib-watch": "0.6.1",
"grunt-jscs": "1.8.0",
"grunt-banana-checker": "0.2.2",
--
To view, visit https://gerrit.wikimedia.org/r/235920
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdb42055b158e7b0ae68e660e0cb32196cfe5766
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...PronunciationRecording)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating development dependencies .. build: Updating development dependencies * grunt-contrib-jshint: 0.11.2 → 0.11.3 Change-Id: I2af0d9c8922d8b341259f58aeb0c876d26ce2dcb --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/package.json b/package.json index efe7217..a242f4a 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "grunt-cli": "0.1.13", "grunt-banana-checker": "0.2.2", "grunt-contrib-csslint": "0.5.0", -"grunt-contrib-jshint": "0.11.2", +"grunt-contrib-jshint": "0.11.3", "grunt-contrib-watch": "0.6.1", "grunt-jscs": "2.1.0", "grunt-jsonlint": "1.0.4" -- To view, visit https://gerrit.wikimedia.org/r/235927 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2af0d9c8922d8b341259f58aeb0c876d26ce2dcb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PronunciationRecording Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Mattflaschen Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve completion suggestion suggester (take 2) - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Improve completion suggestion suggester (take 2)
..
Improve completion suggestion suggester (take 2)
* Lower score for suggestions based on redirects that do not start with the
same letter.
* Fuzzy weirdness: run fuzzy with prefix len = 0 only if query is more than 4
char.
* Do not remove stopwords from user query (to be or not to be).
* Better precision for punctuation (use whitespace analyzer for plain instead
of standard analyzer).
* Enable ASCII folding only for plain_stop.
Bug: T110915
Change-Id: I7ed88ba76746bf0189d8ba7038122b554403
(cherry picked from commit 660f8c44044101f02c443ccdb40a3cd1fdba0334)
---
M includes/BuildDocument/SuggestBuilder.php
M includes/ElasticsearchIntermediary.php
M includes/Maintenance/SuggesterAnalysisConfigBuilder.php
M includes/Searcher.php
M profiles/SuggestProfiles.php
M tests/unit/SuggestBuilderTest.php
6 files changed, 156 insertions(+), 28 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/BuildDocument/SuggestBuilder.php
b/includes/BuildDocument/SuggestBuilder.php
index 9570b2f..45824f9 100644
--- a/includes/BuildDocument/SuggestBuilder.php
+++ b/includes/BuildDocument/SuggestBuilder.php
@@ -42,6 +42,13 @@
const REDIRECT_DISCOUNT = 0.1;
/**
+* Number of common prefix chars a redirect must share with the title
to be
+* promoted as a title suggestion.
+* This is useful not to promote Eraq as a title suggestion for Iraq
+*/
+ const REDIRECT_COMMON_PREFIX_LEN = 1;
+
+ /**
* @var SuggestScoringMethod the scoring function
*/
private $scoringMethod;
@@ -301,6 +308,25 @@
$a = mb_strtolower( $a );
$b = mb_strtolower( $b );
+ $aLength = mb_strlen( $a );
+ $bLength = mb_strlen( $b );
+
+ $commonPrefixLen = self::REDIRECT_COMMON_PREFIX_LEN;
+
+ if ( $aLength < $commonPrefixLen ) {
+ $commonPrefixLen = $aLength;
+ }
+ if( $bLength < $commonPrefixLen ) {
+ $commonPrefixLen = $bLength;
+ }
+
+ // check the common prefix
+ if ( mb_substr( $a, 0, $commonPrefixLen ) != mb_substr( $b, 0,
$commonPrefixLen ) ) {
+ return PHP_INT_MAX;
+ }
+
+ // TODO: switch to a ratio instead of raw distance would help
to group
+ // longer strings
return levenshtein( $a, $b );
}
}
diff --git a/includes/ElasticsearchIntermediary.php
b/includes/ElasticsearchIntermediary.php
index 10701d4..7b62813 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -313,8 +313,8 @@
$this->searchMetrics['wgCirrusStartTime'] = $this->requestStart;
$this->searchMetrics['wgCirrusEndTime'] = $endTime;
$logContext = $this->buildLogContext( $took );
- if ( isset( $logContext['elasticTook'] ) ) {
- $this->searchMetrics['wgCirrusElasticTime'] =
$logContext['elasticTook'];
+ if ( isset( $logContext['elasticTookMs'] ) ) {
+ $this->searchMetrics['wgCirrusElasticTime'] =
$logContext['elasticTookMs'];
}
if ( $wgCirrusSearchLogElasticRequests ) {
$logMessage = $this->buildLogMessage( $logContext );
@@ -341,6 +341,9 @@
$message .= " against {index} took {tookMs} millis";
if ( isset( $context['elasticTookMs'] ) ) {
$message .= " and {elasticTookMs} Elasticsearch millis";
+ if ( isset( $context['elasticTook2PassMs'] ) ) {
+ $message .= " (with 2nd pass:
{elasticTook2PassMs} ms)";
+ }
}
if ( isset( $context['hitsTotal'] ) ){
$message .= ". Found {hitsTotal} total results";
diff --git a/includes/Maintenance/SuggesterAnalysisConfigBuilder.php
b/includes/Maintenance/SuggesterAnalysisConfigBuilder.php
index eaf9ecc..7367dd5 100644
--- a/includes/Maintenance/SuggesterAnalysisConfigBuilder.php
+++ b/includes/Maintenance/SuggesterAnalysisConfigBuilder.php
@@ -43,16 +43,39 @@
*/
protected function defaults() {
$defaults = array(
+ 'char_filter' => array(
+ 'word_break_helper' => array(
+ 'type' => 'mapping',
+ 'mappings' => array(
+ '_=>\u0020', // a space for mw
+ ',=>\u0020', // useful for
"Lastname,
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...MaintenanceShell)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating development dependencies .. build: Updating development dependencies * grunt-contrib-jshint: 0.11.2 → 0.11.3 Change-Id: I1e859a77c0508bbba26e23d71dde8a795648b1e4 --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/package.json b/package.json index 505fb36..84d8d7a 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "grunt": "0.4.5", "grunt-banana-checker": "0.2.2", "grunt-cli": "0.1.13", -"grunt-contrib-jshint": "0.11.2", +"grunt-contrib-jshint": "0.11.3", "grunt-jscs": "1.8.0", "grunt-jsonlint": "1.0.4" } -- To view, visit https://gerrit.wikimedia.org/r/235923 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1e859a77c0508bbba26e23d71dde8a795648b1e4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MaintenanceShell Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...NavigationTiming)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating development dependencies .. build: Updating development dependencies * grunt-contrib-jshint: 0.11.2 → 0.11.3 Change-Id: I5cd80f4277764d765068b881897648f1f53ab6c1 --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/package.json b/package.json index 1fe6198..2691d6a 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "grunt": "0.4.5", "grunt-banana-checker": "0.2.2", "grunt-cli": "0.1.13", -"grunt-contrib-jshint": "0.11.2", +"grunt-contrib-jshint": "0.11.3", "grunt-jscs": "2.1.0", "grunt-jsonlint": "1.0.4" } -- To view, visit https://gerrit.wikimedia.org/r/235924 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5cd80f4277764d765068b881897648f1f53ab6c1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/NavigationTiming Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...LanguageTool)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating development dependencies .. build: Updating development dependencies * grunt-contrib-jshint: 0.10.0 → 0.11.3 Change-Id: Ia4593a3d17f5affbc0502fcd3d44b5974b785c72 --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/package.json b/package.json index c884568..250bdec 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "grunt": "0.4.5", "grunt-cli": "0.1.13", "grunt-banana-checker": "0.2.0", -"grunt-contrib-jshint": "0.10.0", +"grunt-contrib-jshint": "0.11.3", "grunt-jscs": "1.8.0" } } -- To view, visit https://gerrit.wikimedia.org/r/235922 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia4593a3d17f5affbc0502fcd3d44b5974b785c72 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LanguageTool Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Updating development dependencies
..
build: Updating development dependencies
* grunt-contrib-jshint: 0.10.0 → 0.11.3
Change-Id: Idd837b6ac8d9e6d80a1ec6947cc094d937802f8a
---
M package.json
1 file changed, 34 insertions(+), 34 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index c742cdf..c05d087 100644
--- a/package.json
+++ b/package.json
@@ -1,36 +1,36 @@
{
- "name": "Gather-dependencies",
- "description": "Node.js dependencies used in Gather",
- "version": "0.0.1",
- "scripts": {
- "test": "grunt test"
- },
- "repository": {
- "type": "git",
- "url":
"git://git.wikimedia.org/git/mediawiki/extensions/Gather.git"
- },
- "dependencies": {
- "grunt": "0.4.5",
- "grunt-cli": "0.1.13",
- "grunt-phpdocumentor": "~0.4.1",
- "jshint": ">=1.1.0",
- "jsdoc": "<=3.3.0",
- "kss": ">=0.3.6",
- "svgo": ">=0.4.4"
- },
- "devDependencies": {
- "grunt-contrib-clean": "^0.6.0",
- "grunt-mkdir": "^0.1.2",
- "grunt-svg2png": "0.2.5",
- "grunt-contrib-jshint": "0.10.0",
- "grunt-jscs": "1.8.0",
- "grunt-banana-checker": "0.2.1",
- "jscs-jsdoc":
"git+https://github.com/jdlrobson/jscs-jsdoc.git#checkParamExistence";,
- "grunt-jsduck": "^1.0.1",
- "js-beautify": "^1.5.4",
- "grunt-notify": "^0.3.1",
- "grunt-contrib-watch": "0.6.1",
- "grunt-lib-phantomjs-istanbul": "0.6.0",
- "grunt-qunit-istanbul":
"git+https://github.com/joakin/grunt-qunit-istanbul.git#prefix-url";
- }
+ "name": "Gather-dependencies",
+ "description": "Node.js dependencies used in Gather",
+ "version": "0.0.1",
+ "scripts": {
+"test": "grunt test"
+ },
+ "repository": {
+"type": "git",
+"url": "git://git.wikimedia.org/git/mediawiki/extensions/Gather.git"
+ },
+ "dependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-phpdocumentor": "~0.4.1",
+"jshint": ">=1.1.0",
+"jsdoc": "<=3.3.0",
+"kss": ">=0.3.6",
+"svgo": ">=0.4.4"
+ },
+ "devDependencies": {
+"grunt-contrib-clean": "^0.6.0",
+"grunt-mkdir": "^0.1.2",
+"grunt-svg2png": "0.2.5",
+"grunt-contrib-jshint": "0.11.3",
+"grunt-jscs": "1.8.0",
+"grunt-banana-checker": "0.2.1",
+"jscs-jsdoc":
"git+https://github.com/jdlrobson/jscs-jsdoc.git#checkParamExistence";,
+"grunt-jsduck": "^1.0.1",
+"js-beautify": "^1.5.4",
+"grunt-notify": "^0.3.1",
+"grunt-contrib-watch": "0.6.1",
+"grunt-lib-phantomjs-istanbul": "0.6.0",
+"grunt-qunit-istanbul":
"git+https://github.com/joakin/grunt-qunit-istanbul.git#prefix-url";
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/235919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd837b6ac8d9e6d80a1ec6947cc094d937802f8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...Farmer)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Updating development dependencies
..
build: Updating development dependencies
* grunt-contrib-jshint: 0.11.2 → 0.11.3
Change-Id: Ia41d23d8b84f1042c0bf0daf1aa72d767c95cb5f
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index 7a6ece4..31844b0 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"devDependencies": {
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.2",
+"grunt-contrib-jshint": "0.11.3",
"grunt-banana-checker": "0.2.2",
"grunt-jscs": "2.0.0",
"grunt-jsonlint": "1.0.4"
--
To view, visit https://gerrit.wikimedia.org/r/235918
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia41d23d8b84f1042c0bf0daf1aa72d767c95cb5f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Farmer
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Bump grunt-contrib-jshint from 0.11.2 to 0.11.3 to fi... - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Bump grunt-contrib-jshint from 0.11.2 to 0.11.3 to fix
upstream issue
..
build: Bump grunt-contrib-jshint from 0.11.2 to 0.11.3 to fix upstream issue
Change-Id: I6f7fe18a3d43d5f86a3c6111d20e2ccd805da069
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index 7c49ae0..c15c6fa 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
"devDependencies": {
"grunt-cli": "0.1.13",
"grunt-mkdir": "^0.1.2",
- "grunt-contrib-jshint": "0.11.2",
+ "grunt-contrib-jshint": "0.11.3",
"grunt-banana-checker": "0.2.2",
"grunt-jscs": "2.0.0",
"js-beautify": "1.5.10",
--
To view, visit https://gerrit.wikimedia.org/r/235883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f7fe18a3d43d5f86a3c6111d20e2ccd805da069
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Updating development dependencies
..
build: Updating development dependencies
* grunt-contrib-jshint: 0.11.2 → 0.11.3
Change-Id: Ie0fae02a18eeac477ac367db09977c3c98a78fca
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index d970ccc..04620ca 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
"devDependencies": {
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.2",
+"grunt-contrib-jshint": "0.11.3",
"grunt-contrib-watch": "0.6.1",
"grunt-banana-checker": "0.2.2",
"grunt-jscs-checker": "0.8.1"
--
To view, visit https://gerrit.wikimedia.org/r/235916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0fae02a18eeac477ac367db09977c3c98a78fca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Cdentinger
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: XenoRyet
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...Collection)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating development dependencies .. build: Updating development dependencies * grunt-contrib-jshint: 0.11.2 → 0.11.3 Change-Id: I648ff2b46bc40a1d985ea0f14575802361168cc1 --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/package.json b/package.json index 90ec40c..8f8ac65 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "grunt": "0.4.5", "grunt-cli": "0.1.13", "grunt-jsonlint": "1.0.4", -"grunt-contrib-jshint": "0.11.2", +"grunt-contrib-jshint": "0.11.3", "grunt-jscs": "1.8.0" } } -- To view, visit https://gerrit.wikimedia.org/r/235914 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I648ff2b46bc40a1d985ea0f14575802361168cc1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Collection Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Cscott Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...Cargo)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Updating development dependencies
..
build: Updating development dependencies
* grunt-contrib-jshint: 0.11.2 → 0.11.3
Change-Id: I4b7d0f68f902bec8f2819bbce2a8d12e0b6011ff
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index 064530e..2717c89 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"devDependencies": {
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.2",
+"grunt-contrib-jshint": "0.11.3",
"grunt-banana-checker": "0.2.2",
"grunt-jscs": "2.1.0",
"grunt-jsonlint": "1.0.4"
--
To view, visit https://gerrit.wikimedia.org/r/235913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b7d0f68f902bec8f2819bbce2a8d12e0b6011ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...EditUser)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Updating development dependencies
..
build: Updating development dependencies
* grunt-contrib-jshint: 0.11.2 → 0.11.3
Change-Id: If72501900a5bdf98ed96aed7c94c4c09a8739ff8
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index 064530e..2717c89 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"devDependencies": {
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.2",
+"grunt-contrib-jshint": "0.11.3",
"grunt-banana-checker": "0.2.2",
"grunt-jscs": "2.1.0",
"grunt-jsonlint": "1.0.4"
--
To view, visit https://gerrit.wikimedia.org/r/235917
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If72501900a5bdf98ed96aed7c94c4c09a8739ff8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EditUser
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...DismissableSiteNotice)
jenkins-bot has submitted this change and it was merged. Change subject: build: Updating development dependencies .. build: Updating development dependencies * grunt-contrib-jshint: 0.11.2 → 0.11.3 Change-Id: Ife0247f855a69cb4ef933915c5491b61620e4411 --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/package.json b/package.json index 73a4a2b..03efc4b 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "grunt": "0.4.5", "grunt-banana-checker": "0.2.2", "grunt-cli": "0.1.13", -"grunt-contrib-jshint": "0.11.2", +"grunt-contrib-jshint": "0.11.3", "grunt-jsonlint": "1.0.4" } } -- To view, visit https://gerrit.wikimedia.org/r/235915 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife0247f855a69cb4ef933915c5491b61620e4411 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DismissableSiteNotice Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...WikidataPageBanner)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235935
Change subject: build: Updating development dependencies
..
build: Updating development dependencies
* grunt-contrib-jshint: 0.11.2 → 0.11.3
Change-Id: I3d0ddf348e219e96fed5f470d1b85e37d051f804
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataPageBanner
refs/changes/35/235935/1
diff --git a/package.json b/package.json
index 614655f..daf19ff 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
"devDependencies": {
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.2",
+"grunt-contrib-jshint": "0.11.3",
"grunt-banana-checker": "0.2.2",
"grunt-jsonlint": "1.0.4"
}
--
To view, visit https://gerrit.wikimedia.org/r/235935
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d0ddf348e219e96fed5f470d1b85e37d051f804
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataPageBanner
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...UrlShortener)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235934
Change subject: build: Updating development dependencies
..
build: Updating development dependencies
* grunt-contrib-jshint: 0.11.2 → 0.11.3
Change-Id: Ia733b0fefe0a9caa19cf43bdda15b43c722099de
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UrlShortener
refs/changes/34/235934/1
diff --git a/package.json b/package.json
index 63d5896..108147a 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"devDependencies": {
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.2",
+"grunt-contrib-jshint": "0.11.3",
"grunt-banana-checker": "0.2.2",
"grunt-jscs": "1.8.0",
"grunt-jsonlint": "1.0.4",
--
To view, visit https://gerrit.wikimedia.org/r/235934
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia733b0fefe0a9caa19cf43bdda15b43c722099de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UrlShortener
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...UploadWizard)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/235933 Change subject: build: Updating development dependencies .. build: Updating development dependencies * grunt-contrib-jshint: 0.11.2 → 0.11.3 Change-Id: I4770a7fa011cfadcb8eb4d8b3a135b18e1e1f53a --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard refs/changes/33/235933/1 diff --git a/package.json b/package.json index e1f7b2e..2f93ccf 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "grunt": "0.4.5", "grunt-cli": "0.1.13", "grunt-contrib-csslint": "0.4.0", -"grunt-contrib-jshint": "0.11.2", +"grunt-contrib-jshint": "0.11.3", "grunt-contrib-watch": "0.6.1", "grunt-banana-checker": "0.2.2", "grunt-jscs": "1.8.0", -- To view, visit https://gerrit.wikimedia.org/r/235933 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4770a7fa011cfadcb8eb4d8b3a135b18e1e1f53a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UploadWizard Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...Thanks)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/235932 Change subject: build: Updating development dependencies .. build: Updating development dependencies * grunt-contrib-jshint: 0.11.2 → 0.11.3 Change-Id: I07b98afddde7072fba88c428b0475d6781202fbf --- M package.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Thanks refs/changes/32/235932/1 diff --git a/package.json b/package.json index 2ad4a1e..f6b78ae 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "grunt": "0.4.5", "grunt-cli": "0.1.13", "grunt-contrib-csslint": "0.4.0", -"grunt-contrib-jshint": "0.11.2", +"grunt-contrib-jshint": "0.11.3", "grunt-contrib-watch": "0.6.1", "grunt-banana-checker": "0.2.2", "grunt-jscs": "1.8.0", -- To view, visit https://gerrit.wikimedia.org/r/235932 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I07b98afddde7072fba88c428b0475d6781202fbf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Thanks Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
