[MediaWiki-commits] [Gerrit] Style improvements for page selector - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Style improvements for page selector
..
Style improvements for page selector
* All items should have the same height.
* All images should occupy the same (square) area.
* Articles without an image should show a generic article placeholder.
Bug: T105966
Change-Id: I4ba24b76dcc354034c7e2b474a05b1dff24876c8
---
M modules/widgets/pageselector/ext.cx.pageselector.js
M modules/widgets/pageselector/ext.cx.pageselector.less
A modules/widgets/pageselector/page-placeholder.png
A modules/widgets/pageselector/page-placeholder.svg
4 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/widgets/pageselector/ext.cx.pageselector.js
b/modules/widgets/pageselector/ext.cx.pageselector.js
index 71388fa..6821140 100644
--- a/modules/widgets/pageselector/ext.cx.pageselector.js
+++ b/modules/widgets/pageselector/ext.cx.pageselector.js
@@ -115,8 +115,7 @@
thumbnailHeight = 50;
}
$resultItem.css( {
- 'background-image': 'url(' +
page.thumbnail.source + ')',
- 'background-size': thumbnailWidth + 'px
' + thumbnailHeight + 'px'
+ 'background-image': 'url(' +
page.thumbnail.source + ')'
} );
}
this.$menu.append( $resultItem );
diff --git a/modules/widgets/pageselector/ext.cx.pageselector.less
b/modules/widgets/pageselector/ext.cx.pageselector.less
index 76859fc..3a2ca14 100644
--- a/modules/widgets/pageselector/ext.cx.pageselector.less
+++ b/modules/widgets/pageselector/ext.cx.pageselector.less
@@ -18,6 +18,8 @@
background-position: left center;
background-size: 50px 50px;
padding: 5px 5px 5px 60px;
+ min-height: 40px;
+ .background-image-svg('page-placeholder.svg',
'page-placeholder.png');
}
li.mw-pageselector-selected {
diff --git a/modules/widgets/pageselector/page-placeholder.png
b/modules/widgets/pageselector/page-placeholder.png
new file mode 100644
index 000..6a79e7b
--- /dev/null
+++ b/modules/widgets/pageselector/page-placeholder.png
Binary files differ
diff --git a/modules/widgets/pageselector/page-placeholder.svg
b/modules/widgets/pageselector/page-placeholder.svg
new file mode 100644
index 000..6e27a49
--- /dev/null
+++ b/modules/widgets/pageselector/page-placeholder.svg
@@ -0,0 +1 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?svg
xmlns=http://www.w3.org/2000/svg; width=24 height=24 viewBox=0 0 24
24path d=M11.975 11.954h8.571v-9.333h-8.571zm-8.571
4v1.333h17.143v-1.333m0-1.333v-1.333h-17.143v1.333m0
5.333h17.143v-1.333h-17.143zm6.857-14.667h-6.857v1.333h6.857zm0
4v-1.333h-6.857v1.333m0
1.333v1.333h6.857v-1.333m0-8h-6.857v1.333h6.857zm-10.286-2.667h24v24h-17.671c-3.583
0-6.329-2.169-6.329-5z fill=#999//svg
--
To view, visit https://gerrit.wikimedia.org/r/224982
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4ba24b76dcc354034c7e2b474a05b1dff24876c8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API: Fixed documentation for hasmg parameter - change (mediawiki/core)
Quiddity has uploaded a new change for review. https://gerrit.wikimedia.org/r/225000 Change subject: API: Fixed documentation for hasmg parameter .. API: Fixed documentation for hasmg parameter The API returns a plural messages key. Bug: T105120 Change-Id: I385609b6b24ca767a0b0d26cfaec30ed423c3460 --- M includes/api/i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/00/225000/1 diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json index f972a42..ab513a2 100644 --- a/includes/api/i18n/en.json +++ b/includes/api/i18n/en.json @@ -980,7 +980,7 @@ apihelp-query+usercontribs-example-ipprefix: Show contributions from all IP addresses with prefix kbd192.0.2./kbd., apihelp-query+userinfo-description: Get information about the current user., - apihelp-query+userinfo-param-prop: Which pieces of information to include:\n;blockinfo:Tags if the current user is blocked, by whom, and for what reason.\n;hasmsg:Adds a tag sampmessage/samp if the current user has pending messages.\n;groups:Lists all the groups the current user belongs to.\n;implicitgroups:Lists all the groups the current user is automatically a member of.\n;rights:Lists all the rights the current user has.\n;changeablegroups:Lists the groups the current user can add to and remove from.\n;options:Lists all preferences the current user has set.\n;preferencestoken:span class=\apihelp-deprecated\Deprecated./span Get a token to change current user's preferences.\n;editcount:Adds the current user's edit count.\n;ratelimits:Lists all rate limits applying to the current user.\n;realname:Adds the user's real name.\n;email:Adds the user's email address and email authentication date.\n;acceptlang:Echoes the codeAccept-Language/code header sent by the client in a structured format.\n;registrationdate:Adds the user's registration date.\n;unreadcount:Adds the count of unread pages on the user's watchlist (maximum $1; returns samp$2/samp if more)., + apihelp-query+userinfo-param-prop: Which pieces of information to include:\n;blockinfo:Tags if the current user is blocked, by whom, and for what reason.\n;hasmsg:Adds a tag sampmessages/samp if the current user has pending messages.\n;groups:Lists all the groups the current user belongs to.\n;implicitgroups:Lists all the groups the current user is automatically a member of.\n;rights:Lists all the rights the current user has.\n;changeablegroups:Lists the groups the current user can add to and remove from.\n;options:Lists all preferences the current user has set.\n;preferencestoken:span class=\apihelp-deprecated\Deprecated./span Get a token to change current user's preferences.\n;editcount:Adds the current user's edit count.\n;ratelimits:Lists all rate limits applying to the current user.\n;realname:Adds the user's real name.\n;email:Adds the user's email address and email authentication date.\n;acceptlang:Echoes the codeAccept-Language/code header sent by the client in a structured format.\n;registrationdate:Adds the user's registration date.\n;unreadcount:Adds the count of unread pages on the user's watchlist (maximum $1; returns samp$2/samp if more)., apihelp-query+userinfo-example-simple: Get information about the current user., apihelp-query+userinfo-example-data: Get additional information about the current user., -- To view, visit https://gerrit.wikimedia.org/r/225000 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I385609b6b24ca767a0b0d26cfaec30ed423c3460 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Quiddity nwil...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API: Changing the output if there are zero users for the fea... - change (mediawiki...BetaFeatures)
Quiddity has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225003
Change subject: API: Changing the output if there are zero users for the feature
..
API: Changing the output if there are zero users for the feature
Bug: T99502
Change-Id: Ie97f3e41d68e8acac8f96083dd2e9647a3d83dd0
---
M includes/ApiListBetaFeatures.php
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BetaFeatures
refs/changes/03/225003/1
diff --git a/includes/ApiListBetaFeatures.php b/includes/ApiListBetaFeatures.php
index 9955a81..d61870e 100644
--- a/includes/ApiListBetaFeatures.php
+++ b/includes/ApiListBetaFeatures.php
@@ -47,12 +47,15 @@
$key
);
if ( isset( $counts[$key] ) ) {
- $this-getResult()-addValue(
+ $count = $counts[$key];
+ } else {
+ $count = 0;
+ }
+ $this-getResult()-addValue(
$path,
'count',
- $counts[$key]
+ $count
);
- }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/225003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie97f3e41d68e8acac8f96083dd2e9647a3d83dd0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: Quiddity nwil...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Get outdated messages in the target language using MessageCo... - change (mediawiki...Translate)
Phoenix303 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225005
Change subject: Get outdated messages in the target language using
MessageCollection
..
Get outdated messages in the target language using MessageCollection
Steps:
1. Used filtered query to search for a string in a source language.
Suppose source language is finnish, search for 'Aloita', it returns all
finnish messages with 'Aloita'.(Default source language is the wiki's content
language)
2. Create message definitions for all message keys found in step 1.
3. Filter to get all the outdated messages in the selected target language.
By default the target language is the interface language.
Use parameter 'filter=translated' to get translated messages.
Bug: T101221
Change-Id: Ic0326d688f799a91d308ebd1d78facccb2a4e61a
---
M specials/SpecialSearchTranslations.php
M ttmserver/ElasticSearchTTMServer.php
2 files changed, 106 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/05/225005/1
diff --git a/specials/SpecialSearchTranslations.php
b/specials/SpecialSearchTranslations.php
index 17c880e..364ed16 100644
--- a/specials/SpecialSearchTranslations.php
+++ b/specials/SpecialSearchTranslations.php
@@ -51,6 +51,7 @@
}
public function execute( $par ) {
+ global $wgLanguageCode;
$this-setHeaders();
$this-checkPermissions();
@@ -64,9 +65,11 @@
$this-opts = $opts = new FormOptions();
$opts-add( 'query', '' );
+ $opts-add( 'sourcelanguage', '' );
$opts-add( 'language', '' );
$opts-add( 'group', '' );
$opts-add( 'grouppath', '' );
+ $opts-add( 'filter', '' );
$opts-add( 'limit', $this-limit );
$opts-add( 'offset', 0 );
@@ -87,9 +90,23 @@
throw new ErrorPageError( 'tux-sst-solr-offline-title',
'tux-sst-solr-offline-body' );
}
+ $terms = array();
+ if( $opts-getValue( 'filter' ) === 'outdated' ) {
+ if ( $opts-getValue( 'language' ) === '' ) {
+ $opts-add( 'language',
$this-getLanguage()-getCode() );
+ }
+ $collection = $this-applyFilter( $resultset );
+ $docs = $collection['documents'];
+ $terms = $collection['terms'];
+ $documents = $this-getMessages( $docs );
+ $total = $collection['total'];
+ } else {
+ $documents = $server-getDocuments( $resultset );
+ $total = $server-getTotalHits( $resultset );
+ }
+
// Part 1: facets
$facets = $server-getFacets( $resultset );
- $total = $server-getTotalHits( $resultset );
$facetHtml = '';
if ( count( $facets['language'] ) 0 ) {
@@ -113,7 +130,6 @@
// Part 2: results
$resultsHtml = '';
- $documents = $server-getDocuments( $resultset );
foreach ( $documents as $document ) {
$text = $document['content'];
@@ -145,7 +161,7 @@
$resultAttribs['data-translation'] =
$helpers-getTranslation();
$resultAttribs['data-group'] = $groupId;
- $uri = wfAppendQuery( $document['uri'], array(
'action' = 'edit' ) );
+ $uri = wfAppendQuery(
$handle-getTitle()-getCanonicalUrl(), array( 'action' = 'edit' ) );
$link = Html::element( 'a', array(
'href' = $uri,
), $this-msg( 'tux-sst-edit' )-text() );
@@ -209,6 +225,47 @@
$this-showSearch( $search, $count, $facetHtml, $resultsHtml );
}
+ protected function getMessages( $collect ) {
+ $ret = $documents = array();
+ foreach ( $collect as $mkey = $value ) {
+ $ret = array();
+ $ret['content'] = $collect[$mkey]['translation'];
+ $localid = explode( '/',
$collect[$mkey]['title']-getPrefixedText() );
+ $ret['localid'] = $localid[0];
+ $ret['language'] = $localid[1];
+ $documents[] = $ret;
+ }
+ return $documents;
+ }
+
+ protected function applyFilter( $resultset ) {
+ $messages = $documents = $terms = array();
+ $language = $this-opts-getValue( 'language' );
+ foreach ( $resultset-getResults() as $document ) {
+ $data
[MediaWiki-commits] [Gerrit] Last minute changes, turning all 'Projects' into 'projects' - change (wikimedia/TransparencyReport-private)
MSyed has uploaded a new change for review. https://gerrit.wikimedia.org/r/225009 Change subject: Last minute changes, turning all 'Projects' into 'projects' .. Last minute changes, turning all 'Projects' into 'projects' Change-Id: I3fecbd38df83ab3edd80789370dbf066c7174591 --- M locales/en.yml 1 file changed, 22 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private refs/changes/09/225009/1 diff --git a/locales/en.yml b/locales/en.yml index a86ec77..fc5b918 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -22,7 +22,7 @@ home: title: Wikimedia Foundation title_two: Transparencybr Report -lead: a target='_blank' href='//wikimediafoundation.org/wiki/Vision'Our mission/a is to provide free access to the sum of all human knowledge. We believe that protecting user privacy and defending against censorship are essential to the success of that mission. Every year, we receive requests from governments, individuals, and organizations to disclose information about our users or to delete or alter content on our Projects. Some are legitimate. Some are not.br / br /The purpose of this transparency report is to shed light on the requests we receive and how we respond to them. +lead: a target='_blank' href='//wikimediafoundation.org/wiki/Vision'Our mission/a is to provide free access to the sum of all human knowledge. We believe that protecting user privacy and defending against censorship are essential to the success of that mission. Every year, we receive requests from governments, individuals, and organizations to disclose information about our users or to delete or alter content on our projects. Some are legitimate. Some are not.br / br /The purpose of this transparency report is to shed light on the requests we receive and how we respond to them. privacy: Requests for br/User Data content: Requests for Content Alteration amp; Takedown faq: Frequently Askedbr/Questions @@ -36,7 +36,7 @@ title: Requests forbr/User Data total_number_of_requests: Total Number of Requests percentage_of_times_information_produced: Percentage of Times Information Produced -lead: a href='//meta.wikimedia.org/wiki/Wikimedia_Foundation_Guiding_Principles#Free_speech'Freedom of speech is essential/a to the Wikimedia movement—our Projects cannot flourish in an ecosystem where individuals cannot speak freely. Our users trust us to protect their identities against unlawful disclosure and we take this responsibility seriously. +lead: a href='//meta.wikimedia.org/wiki/Wikimedia_Foundation_Guiding_Principles#Free_speech'Freedom of speech is essential/a to the Wikimedia movement—our projects cannot flourish in an ecosystem where individuals cannot speak freely. Our users trust us to protect their identities against unlawful disclosure and we take this responsibility seriously. intro: pHowever, every year, governments, individuals, and corporations ask us to disclose user data. Often, we have no nonpublic information to disclose because we a href='//wikimediafoundation.org/wiki/Privacy_policy#Types_of_Information_We_Receive_From_You.2C_How_We_Get_It.2C_.26_How_We_Use_It'collect little nonpublic information/a about users and retain that information for a a href='//meta.wikimedia.org/wiki/Data_retention_guidelines'short period of time/a. But when we do have data, we carefully evaluate every request before considering disclosure. If the requests do not meet our a href='//wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines'standards/a—if they are overly broad, unclear, or irrelevant—we will push back on behalf of our users./ppIf we must produce information due to a legally valid request, we will a href='//wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines#Notifying_Our_Users_of_Your_Request'notify the affected user/a before we disclose, if we are a href='/faq.html#nonpublic_personal_information'legally permitted and have the means/a to do so. In certain cases, we may a href='/faq.html#my_personal_information'help find assistance/a for users to fight an invalid request./ppBelow, you will find more information about the requests for user data we receive./p quote: Awareness that the Government may be watching chills associational and expressive freedoms. And the Government’s unrestrained power to assemble data that reveal private aspects of identity is susceptible to abuse. cite: a href='//en.wikipedia.org/wiki/Sonia_Sotomayor'Justice Sonia Sotomayor/asmalla href='//en.wikipedia.org/wiki/Supreme_Court_of_the_United_States'U.S. Supreme Court/a (a href='//www.law.cornell.edu/supremecourt/text/10-1259#writing-10-1259_CONCUR_4'2012/a)/small @@ -65,7 +65,7 @@ by_country: By Country graph_voluntary_disclosure: Voluntary disclosures
[MediaWiki-commits] [Gerrit] scholarships: switch app to backend krypton - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: scholarships: switch app to backend krypton
..
scholarships: switch app to backend krypton
Bug:T105003
Change-Id: I1daf4ffb8a9cbb3f3f80ce3221812ab3ad7bde11
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index 34517df..63e1012 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -20,7 +20,7 @@
set req.backend = logstash;
} elsif (req.http.Host == releases.wikimedia.org) {
set req.backend = caesium;
- } elsif (req.http.Host == scholarships.wikimedia.org || req.http.Host
== grafana.wikimedia.org || req.http.Host == iegreview.wikimedia.org) {
+ } elsif (req.http.Host == grafana.wikimedia.org || req.http.Host ==
iegreview.wikimedia.org) {
set req.backend = zirconium;
} elsif (req.http.Host == parsoid-tests.wikimedia.org) {
set req.backend = ruthenium;
@@ -53,6 +53,8 @@
return (pass);
} elsif (req.http.Host == noc.wikimedia.org || req.http.Host ==
dbtree.wikimedia.org) {
set req.backend = terbium;
+ } elsif (req.http.Host == scholarships.wikimedia.org) {
+ set req.backend = krypton;
} elsif (req.http.Host == hue.wikimedia.org) {
// make sure all requests to Hue are via https proxy
if (req.http.X-Forwarded-Proto != https) {
--
To view, visit https://gerrit.wikimedia.org/r/224996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1daf4ffb8a9cbb3f3f80ce3221812ab3ad7bde11
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduce the z-index of callout to a reasonable level - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Reduce the z-index of callout to a reasonable level
..
Reduce the z-index of callout to a reasonable level
It had a huge z-index causing IME selector hidden under it.
Bug: T105954
Change-Id: I78a206c449309237efa04889dbdef536b8af3b2a
---
M modules/widgets/callout/ext.cx.callout.css
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/widgets/callout/ext.cx.callout.css
b/modules/widgets/callout/ext.cx.callout.css
index 9fbf067..0531b32 100644
--- a/modules/widgets/callout/ext.cx.callout.css
+++ b/modules/widgets/callout/ext.cx.callout.css
@@ -7,7 +7,7 @@
border: 1px solid #ccc;
border-radius: 3px;
max-width: 500px;
- z-index: 10;
+ z-index: 999;
}
.cx-callout::after, .cx-callout::before {
--
To view, visit https://gerrit.wikimedia.org/r/224990
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78a206c449309237efa04889dbdef536b8af3b2a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't show groups on Special:ListGroupRights if they have no... - change (mediawiki/core)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224999
Change subject: Don't show groups on Special:ListGroupRights if they have no
actual enabled rights
..
Don't show groups on Special:ListGroupRights if they have no actual enabled
rights
Change-Id: I9b80679ec4f9980619969f7af78bcf6a646fd3d4
---
M includes/specials/SpecialListgrouprights.php
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/99/224999/1
diff --git a/includes/specials/SpecialListgrouprights.php
b/includes/specials/SpecialListgrouprights.php
index 828a93b..5950595 100644
--- a/includes/specials/SpecialListgrouprights.php
+++ b/includes/specials/SpecialListgrouprights.php
@@ -56,7 +56,17 @@
$config = $this-getConfig();
$groupPermissions = $config-get( 'GroupPermissions' );
+ foreach ( $groupPermissions as $group = $rights ) {
+ if ( count( array_filter( $rights ) ) === 0 ) {
+ unset( $groupPermissions[$group] );
+ }
+ }
$revokePermissions = $config-get( 'RevokePermissions' );
+ foreach ( $revokePermissions as $group = $rights ) {
+ if ( count( array_filter( $rights ) ) === 0 ) {
+ unset( $revokePermissions[$group] );
+ }
+ }
$addGroups = $config-get( 'AddGroups' );
$removeGroups = $config-get( 'RemoveGroups' );
$groupsAddToSelf = $config-get( 'GroupsAddToSelf' );
--
To view, visit https://gerrit.wikimedia.org/r/224999
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b80679ec4f9980619969f7af78bcf6a646fd3d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dumpInterwiki: Get interwiki map via HTTPS - change (mediawiki...WikimediaMaintenance)
jenkins-bot has submitted this change and it was merged.
Change subject: dumpInterwiki: Get interwiki map via HTTPS
..
dumpInterwiki: Get interwiki map via HTTPS
Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
---
M dumpInterwiki.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dumpInterwiki.php b/dumpInterwiki.php
index 5f3a195..8d012bf 100644
--- a/dumpInterwiki.php
+++ b/dumpInterwiki.php
@@ -264,7 +264,7 @@
}
// Extract the intermap from meta
- $intermap = Http::get(
'http://meta.wikimedia.org/w/index.php?title=Interwiki_mapaction=raw', 30 );
+ $intermap = Http::get(
'https://meta.wikimedia.org/w/index.php?title=Interwiki_mapaction=raw', 30 );
$lines = array_map( 'trim', explode( \n, trim( $intermap ) )
);
if ( !$lines || count( $lines ) 2 ) {
--
To view, visit https://gerrit.wikimedia.org/r/225004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert spaces to tabs in CrossCheckViolationFormatter.php - change (mediawiki...WikibaseQualityExternalValidation)
jenkins-bot has submitted this change and it was merged.
Change subject: Convert spaces to tabs in CrossCheckViolationFormatter.php
..
Convert spaces to tabs in CrossCheckViolationFormatter.php
Change-Id: I29d8ac3b34e7d59a63c86cd8e39afa589a76086b
---
M includes/Violations/CrossCheckViolationFormatter.php
1 file changed, 229 insertions(+), 197 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Violations/CrossCheckViolationFormatter.php
b/includes/Violations/CrossCheckViolationFormatter.php
index 9b0a0ad..361d82e 100755
--- a/includes/Violations/CrossCheckViolationFormatter.php
+++ b/includes/Violations/CrossCheckViolationFormatter.php
@@ -3,8 +3,8 @@
namespace WikibaseQuality\ExternalValidation\Violations;
use Deserializers\Deserializer;
-use InvalidArgumentException;
use Html;
+use InvalidArgumentException;
use ValueFormatters\ValueFormatter;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Lib\EntityIdFormatter;
@@ -12,216 +12,244 @@
use WikibaseQuality\Violations\Violation;
use WikibaseQuality\Violations\ViolationFormatter;
-
class CrossCheckViolationFormatter implements ViolationFormatter {
+ const EXTERNAL_VIOLATION_ICON_CLASS = 'wbq-icon-arrows-severe';
-const EXTERNAL_VIOLATION_ICON_CLASS = 'wbq-icon-arrows-severe';
+ /**
+* @var Deserializer
+*/
+ private $dataValueDeserializer;
-/**
- * @var Deserializer
- */
-private $dataValueDeserializer;
+ /**
+* @var EntityIdFormatter
+*/
+ private $entityIdFormatter;
-/**
- * @var EntityIdFormatter
- */
-private $entityIdFormatter;
+ /**
+* @var ValueFormatter
+*/
+ private $valueFormatter;
-/**
- * @var ValueFormatter
- */
-private $valueFormatter;
+ /**
+* @var DumpMetaInformationLookup
+*/
+ private $dumpMetaInformationLookup;
-/**
- * @var DumpMetaInformationLookup
- */
-private $dumpMetaInformationLookup;
+ /**
+* @param Deserializer $dataValueDeserializer
+* @param EntityIdFormatter $entityIdFormatter (must return HTML)
+* @param ValueFormatter $valueFormatter (must return HTML)
+* @param DumpMetaInformationLookup $dumpMetaInformationLookup
+*/
+ public function __construct(
+ Deserializer $dataValueDeserializer,
+ EntityIdFormatter $entityIdFormatter,
+ ValueFormatter $valueFormatter,
+ DumpMetaInformationLookup $dumpMetaInformationLookup
+ ) {
+ $this-dataValueDeserializer = $dataValueDeserializer;
+ $this-entityIdFormatter = $entityIdFormatter;
+ $this-valueFormatter = $valueFormatter;
+ $this-dumpMetaInformationLookup = $dumpMetaInformationLookup;
+ }
-/**
- * @param Deserializer $dataValueDeserializer
- * @param EntityIdFormatter $entityIdFormatter (must return HTML)
- * @param ValueFormatter $valueFormatter (must return HTML)
- * @param DumpMetaInformationLookup $dumpMetaInformationLookup
- */
-public function __construct( Deserializer $dataValueDeserializer,
-
EntityIdFormatter $entityIdFormatter,
-ValueFormatter
$valueFormatter,
-
DumpMetaInformationLookup $dumpMetaInformationLookup ) {
-$this-dataValueDeserializer = $dataValueDeserializer;
-$this-entityIdFormatter = $entityIdFormatter;
-$this-valueFormatter = $valueFormatter;
-$this-dumpMetaInformationLookup = $dumpMetaInformationLookup;
-}
+ /**
+* @see ViolationFormatter::isFormatterFor
+*
+* @param Violation $violation
+*
+* @return bool
+*/
+ public function isFormatterFor( Violation $violation ) {
+ $splitConstraintId =
+ explode( Violation::CONSTRAINT_ID_DELIMITER,
$violation-getConstraintId() );
+ $prefix = $splitConstraintId[0];
-/**
- * @see ViolationFormatter::isFormatterFor
- *
- * @param Violation $violation
- *
- * @return bool
- */
-public function isFormatterFor( Violation $violation ) {
-$splitConstraintId = explode( Violation::CONSTRAINT_ID_DELIMITER,
$violation-getConstraintId() );
-$prefix = $splitConstraintId[0];
+ return $prefix === WBQ_EXTERNAL_VALIDATION_ID;
+ }
-return $prefix === WBQ_EXTERNAL_VALIDATION_ID;
-}
+ /**
+* @see ViolationFormatter::formatAdditionalInformation
+*
+* @param Violation $violation
+*
+* @throws InvalidArgumentException
+* @return
[MediaWiki-commits] [Gerrit] Change time of Wikidata browser test to run at 01:00 UTC - change (integration/config)
JanZerebecki has uploaded a new change for review. https://gerrit.wikimedia.org/r/224998 Change subject: Change time of Wikidata browser test to run at 01:00 UTC .. Change time of Wikidata browser test to run at 01:00 UTC This is in preparation for running them also against testwikidata and making sure that they run after the deployment train for group 0 and so that we can still react before train for group 1. Bug: T105985 Change-Id: I8a1f10c5b2a53e068416d454222dc73deece684d --- M jjb/job-templates-browsertests.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/98/224998/1 diff --git a/jjb/job-templates-browsertests.yaml b/jjb/job-templates-browsertests.yaml index 79fbcf4..da431ec 100644 --- a/jjb/job-templates-browsertests.yaml +++ b/jjb/job-templates-browsertests.yaml @@ -58,7 +58,7 @@ defaults: browsertests triggers: - - timed: H 14 * * * + - timed: H 01 * * * - defaults: name: browsertests -- To view, visit https://gerrit.wikimedia.org/r/224998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a1f10c5b2a53e068416d454222dc73deece684d Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: JanZerebecki jan.wikime...@zerebecki.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Adjust styling of main menu so browser tests do not... - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225001
Change subject: Hygiene: Adjust styling of main menu so browser tests do not
fail
..
Hygiene: Adjust styling of main menu so browser tests do not fail
Confusingly the header-title element covers the entire header. I'm not sure
what purpose this is for, given that we do not want to cover the notifications
icon (and will not due to z-index) and the search icon to the left of it does
the same thing.
This however does confuse browser tests which attempt to click on the left
search
icon but cannot click it, as the header accepts the clicks.
If the sole purpose is to center without the notifications icon, given that
this is beta
I'd rather remove this now and revisit it in the event we push to beta.
Bug: T105878
Change-Id: I3a1ab6f615f80ee5947dc0b0cbe0112d88a9a309
---
M resources/skins.minerva.beta.styles/ui.less
1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/01/225001/1
diff --git a/resources/skins.minerva.beta.styles/ui.less
b/resources/skins.minerva.beta.styles/ui.less
index c1cdb2a..821fe49 100644
--- a/resources/skins.minerva.beta.styles/ui.less
+++ b/resources/skins.minerva.beta.styles/ui.less
@@ -36,12 +36,7 @@
.header-title {
// align the text in the middle regardless of whether the
notification icon exists or not
- bottom: 0;
- left: 0;
- position: absolute;
- right: 0;
text-align: center;
- top: 0;
width: auto;
a {
display: block;
--
To view, visit https://gerrit.wikimedia.org/r/225001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a1ab6f615f80ee5947dc0b0cbe0112d88a9a309
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make the height of search input field same as its container - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Make the height of search input field same as its container
..
Make the height of search input field same as its container
Bug: T105960
Change-Id: I916c2add6cec3fe193de424a9d98a5e6cd08ccb0
---
M modules/tools/styles/ext.cx.tools.less
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tools/styles/ext.cx.tools.less
b/modules/tools/styles/ext.cx.tools.less
index e044684..9fa84ff 100644
--- a/modules/tools/styles/ext.cx.tools.less
+++ b/modules/tools/styles/ext.cx.tools.less
@@ -10,7 +10,7 @@
.cx-card--search__input {
font-size: 16px;
width: 100%;
- height: 100%;
+ height: 2.5em;
border: none;
background: none;
outline: none;
--
To view, visit https://gerrit.wikimedia.org/r/224974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I916c2add6cec3fe193de424a9d98a5e6cd08ccb0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API: Changing the output if there are zero users for the fea... - change (mediawiki...BetaFeatures)
jenkins-bot has submitted this change and it was merged.
Change subject: API: Changing the output if there are zero users for the feature
..
API: Changing the output if there are zero users for the feature
Bug: T99502
Change-Id: Ie97f3e41d68e8acac8f96083dd2e9647a3d83dd0
---
M includes/ApiListBetaFeatures.php
1 file changed, 8 insertions(+), 5 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ApiListBetaFeatures.php b/includes/ApiListBetaFeatures.php
index 9955a81..f6fc2e6 100644
--- a/includes/ApiListBetaFeatures.php
+++ b/includes/ApiListBetaFeatures.php
@@ -47,12 +47,15 @@
$key
);
if ( isset( $counts[$key] ) ) {
- $this-getResult()-addValue(
- $path,
- 'count',
- $counts[$key]
- );
+ $count = $counts[$key];
+ } else {
+ $count = 0;
}
+ $this-getResult()-addValue(
+ $path,
+ 'count',
+ $count
+ );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/225003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie97f3e41d68e8acac8f96083dd2e9647a3d83dd0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: Quiddity nwil...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert MWExceptionHandler to use structured logging - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Convert MWExceptionHandler to use structured logging
..
Convert MWExceptionHandler to use structured logging
Replace wfDebugLog() calls in MWExceptionHandler with direct use of
LoggerFactory and LoggerInterface. Logged exceptions are added to the
log message context.
LegacyLogger is also updated to append stack traces to any log event
when $wgLogExceptionBacktrace is true and the PSR-3 recommendation of
passing the exception as an 'exception' context item.
Handling of context data in LegacyLogger is expanded to support arrays,
exceptions and common object types.
Bug: T88649
Change-Id: I71499d895582bdea033a2516c902e23e38084080
---
M includes/debug/logger/LegacyLogger.php
M includes/exception/MWExceptionHandler.php
M tests/phpunit/includes/debug/logger/LegacyLoggerTest.php
3 files changed, 215 insertions(+), 48 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/debug/logger/LegacyLogger.php
b/includes/debug/logger/LegacyLogger.php
index 6bd6411..8010790 100644
--- a/includes/debug/logger/LegacyLogger.php
+++ b/includes/debug/logger/LegacyLogger.php
@@ -22,6 +22,7 @@
use DateTimeZone;
use MWDebug;
+use MWExceptionHandler;
use Psr\Log\AbstractLogger;
use Psr\Log\LogLevel;
use UDPTransport;
@@ -167,7 +168,7 @@
* @return string
*/
public static function format( $channel, $message, $context ) {
- global $wgDebugLogGroups;
+ global $wgDebugLogGroups, $wgLogExceptionBacktrace;
if ( $channel === 'wfDebug' ) {
$text = self::formatAsWfDebug( $channel, $message,
$context );
@@ -213,6 +214,16 @@
} else {
// Default formatting is wfDebugLog's historic style
$text = self::formatAsWfDebugLog( $channel, $message,
$context );
+ }
+
+ // Append stacktrace of exception if available
+ if ( $wgLogExceptionBacktrace
+ isset( $context['exception'] )
+ $context['exception'] instanceof Exception
+ ) {
+ $text .= MWExceptionHandler::getRedactedTraceAsString(
+ $context['exception']-getTraceAsString()
+ ) . \n;
}
return self::interpolate( $text, $context );
@@ -301,7 +312,7 @@
if ( strpos( $message, '{' ) !== false ) {
$replace = array();
foreach ( $context as $key = $val ) {
- $replace['{' . $key . '}'] = $val;
+ $replace['{' . $key . '}'] = self::flatten(
$val );
}
$message = strtr( $message, $replace );
}
@@ -310,6 +321,66 @@
/**
+* Convert a logging context element to a string suitable for
+* interpolation.
+*
+* @param mixed $item
+* @return string
+*/
+ protected static function flatten( $item ) {
+ if ( null === $item ) {
+ return '[Null]';
+ }
+
+ if ( is_bool( $item ) ) {
+ return $item ? 'true' : 'false';
+ }
+
+ if ( is_float( $item ) ) {
+ if ( is_infinite( $item ) ) {
+ return ( $item 0 ? '' : '-' ) . 'INF';
+ }
+ if ( is_nan( $item ) ) {
+ return 'NaN';
+ }
+ return $data;
+ }
+
+ if ( is_scalar( $item ) ) {
+ return (string) $item;
+ }
+
+ if ( is_array( $item ) ) {
+ return '[Array(' . count( $item ) . ')]';
+ }
+
+ if ( $item instanceof \DateTime ) {
+ return $item-format( 'c' );
+ }
+
+ if ( $item instanceof \Exception ) {
+ return '[Exception ' . get_class( $item ) . '( ' .
+ $item-getFile() . ':' . $item-getLine() . ')
' .
+ $item-getMessage() . ']';
+ }
+
+ if ( is_object( $item ) ) {
+ if ( method_exists( $item, '__toString' ) ) {
+ return (string) $item;
+ }
+
+ return '[Object ' . get_class( $item ) . ']';
+ }
+
+ if ( is_resource( $item ) ) {
+ return '[Resource ' . get_resource_type( $item ) . ']';
+ }
+
+ return '[Unknown ' . gettype( $item )
[MediaWiki-commits] [Gerrit] Fix link to WD Json dumps on other dumps html page - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: Fix link to WD Json dumps on other dumps html page .. Fix link to WD Json dumps on other dumps html page This makes the 'other' dumps link to the newer / correct location for the WD json dumps. Bug: T104307 Change-Id: Icfb78eea7953a9320d595535324402c617efa76f --- M modules/dataset/files/html/other_index.html 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hoo man: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/dataset/files/html/other_index.html b/modules/dataset/files/html/other_index.html index 926c14a..dc85649 100644 --- a/modules/dataset/files/html/other_index.html +++ b/modules/dataset/files/html/other_index.html @@ -114,7 +114,7 @@ Also see a href=incr/daily dumps of additions/changes to content/a (Experimental!)br / Historical material only: a href=../archive/archives of sql/XML dumps for previous years starting from 2001/a h1Other content/h1 - a href=wikidataWikidata JSON dumps/abr / + a href=../wikidatawiki/entities/Wikidata entity dumps/abr / a href=pagecounts-rawPagecount data collected by Domas Mituzas/abr / a href=pagecounts-ezPagecount/projectcount data derived by Erik Zachte from Domas Mituzas' archives/abr / a href=pagecounts-all-sitesPagecount/projectcount data including mobile/zero sites/abr / -- To view, visit https://gerrit.wikimedia.org/r/224768 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icfb78eea7953a9320d595535324402c617efa76f Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Addshore addshorew...@gmail.com Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Chinese Conversion Table Update 2015-6 - change (mediawiki/core)
Chiefwei has uploaded a new change for review. https://gerrit.wikimedia.org/r/225002 Change subject: Chinese Conversion Table Update 2015-6 .. Chinese Conversion Table Update 2015-6 Update the Chinese conversion table routinely to fix bugs reported from https://zh.wikipedia.org/wiki/Wikipedia:%E5%AD%97%E8%AF%8D%E8%BD%AC%E6%8D%A2/%E4%BF%AE%E5%A4%8D%E8%AF%B7%E6%B1%82. It is only data changes and only works for Chinese WikiProjects. Change-Id: Ibf6d776d07a611a2afcb2c6c984074c39c8c0d70 --- M includes/ZhConversion.php M maintenance/language/zhtable/simp2trad.manual M maintenance/language/zhtable/toCN.manual M maintenance/language/zhtable/toHK.manual M maintenance/language/zhtable/toTW.manual M maintenance/language/zhtable/toTrad.manual M maintenance/language/zhtable/tradphrases.manual M maintenance/language/zhtable/tradphrases_exclude.manual 8 files changed, 266 insertions(+), 812 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/02/225002/1 diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php index 87cc48e..8b6c0b0 100644 --- a/includes/ZhConversion.php +++ b/includes/ZhConversion.php @@ -1370,6 +1370,7 @@ '脶' = '腡', '脸' = '臉', '腊' = '臘', +'腌' = '醃', '腘' = '膕', '腭' = '齶', '腻' = '膩', @@ -3355,6 +3356,7 @@ '干奴才' = '乾奴才', '干妹' = '乾妹', '干姊' = '乾姊', +'干姐' = '乾姐', '干娘' = '乾娘', '干妈' = '乾媽', '干子' = '乾子', @@ -3416,6 +3418,7 @@ '干癣' = '乾癬', '干瘾' = '乾癮', '干白儿' = '乾白兒', +'干白葡萄酒' = '乾白葡萄酒', '干的' = '乾的', '干眼' = '乾眼', '干瞪眼' = '乾瞪眼', @@ -3426,6 +3429,7 @@ '干篾片' = '乾篾片', '干粉' = '乾粉', '干粮' = '乾糧', +'干红葡萄酒' = '乾紅葡萄酒', '干结' = '乾結', '干丝' = '乾絲', '干纲' = '乾綱', @@ -3654,7 +3658,6 @@ '于贈' = '于贈', '于赠' = '于贈', '于越' = '于越', -'于军' = '于軍', '于軍' = '于軍', '于道泉' = '于道泉', '于远伟' = '于遠偉', @@ -3677,9 +3680,8 @@ '于韦斯屈莱' = '于韋斯屈萊', '于風政' = '于風政', '于风政' = '于風政', +'于飛' = '于飛', '于飞' = '于飛', -'于飛島' = '于飛島', -'于飞岛' = '于飛島', '于余曲折' = '于餘曲折', '于鬯' = '于鬯', '于魁智' = '于魁智', @@ -3731,6 +3733,7 @@ '人数里' = '人數裡', '人物志' = '人物誌', '人生天里' = '人生天里', +'人发指' = '人髮指', '什锦面' = '什錦麵', '仇仇' = '仇讎', '介胄' = '介冑', @@ -3744,7 +3747,6 @@ '代理发行' = '代理發行', '代码表' = '代碼表', '代表' = '代表', -'令人发指' = '令人髮指', '以自制' = '以自制', '仲裁制' = '仲裁制', '件钟' = '件鐘', @@ -3835,6 +3837,7 @@ '依托' = '依託', '侵并' = '侵併', '局促' = '侷促', +'便于' = '便於', '系数' = '係數', '系为' = '係為', '保险柜' = '保險柜', @@ -3854,7 +3857,6 @@ '候复' = '候覆', '倚闲' = '倚閑', '倛丑' = '倛醜', -'借听于聋' = '借聽於聾', '借鉴' = '借鑑', '倦游' = '倦遊', '假里' = '假裡', @@ -4066,7 +4068,6 @@ '分子钟' = '分子鐘', '分子云' = '分子雲', '分布于' = '分布於', -'分散于' = '分散於', '分钟' = '分鐘', '刑余' = '刑餘', '划一桨' = '划一槳', @@ -4243,7 +4244,6 @@ '卵与石斗' = '卵與石鬥', '卷须' = '卷鬚', '厂部' = '厂部', -'厝薪于火' = '厝薪於火', '原子钟' = '原子鐘', '原钟' = '原鐘', '历物之意' = '厤物之意', @@ -4256,6 +4256,7 @@ '反复' = '反覆', '反覆' = '反覆', '取舍' = '取捨', +'取决于' = '取決於', '受雇' = '受僱', '受托' = '受託', '丛林里' = '叢林裡', @@ -4517,6 +4518,7 @@ '回游' = '回遊', '因于' = '因於', '困倦起来' = '困倦起來', +'困于' = '困於', '困兽之斗' = '困獸之鬥', '困兽犹斗' = '困獸猶鬥', '困斗' = '困鬥', @@ -4568,6 +4570,7 @@ '埃及历史' = '埃及歷史', '埃及艳后' = '埃及豔后', '埃荣冲' = '埃榮衝', +'城市里' = '城市裡', '城里' = '城裡', '埔子里' = '埔子里', '埔里社' = '埔裏社', @@ -4765,7 +4768,6 @@ '字汇' = '字彙', '字码表' = '字碼表', '字里行间' = '字裡行間', -'存十一于千百' = '存十一於千百', '存折' = '存摺', '存于' = '存於', '孛里海' = '孛里海', @@ -4811,10 +4813,10 @@ '实干' = '實幹', '实累累' = '實纍纍', '写字台' = '寫字檯', -'宽宽松松' = '寬寬鬆鬆', '宽于' = '寬於', '宽余' = '寬餘', '宽松' = '寬鬆', +'宽松松' = '寬鬆鬆', '寮采' = '寮寀', '寶山庄' = '寶山庄', '宝历' = '寶曆', @@ -4870,7 +4872,9 @@ '就范' = '就範', '就里' = '就裡', '尸位素餐' = '尸位素餐', +'尸佼' = '尸佼', '尸利' = '尸利', +'尸子' = '尸子', '尸居余气' = '尸居餘氣', '尸弃佛' = '尸棄佛', '尸祝' = '尸祝', @@ -4900,7 +4904,7 @@ '山羊胡' = '山羊鬍', '山里有' = '山裡有', '山里的' = '山裡的', -'山谷道' = '山谷道', +'山谷' = '山谷', '山重水复' = '山重水複', '岫岩' = '岫巖', '岱岳' = '岱嶽', @@ -4945,7 +4949,7 @@ '已占算' = '已占算', '巴尔干' = '巴爾幹', '巷里' = '巷裡', -'市里' = '市裡', +'市里的' = '市裡的', '布谷' = '布穀', '布谷鸟' = '布穀鳥', '布谷鸟钟' = '布穀鳥鐘', @@ -4985,8 +4989,8 @@ '干了' = '幹了', '干事' = '幹事', '干些' = '幹些', -'干人' = '幹人', '干什么' = '幹什麼', +'干仗' = '幹仗', '干个' = '幹個', '干劲' = '幹勁', '干吏' = '幹吏', @@ -5025,8 +5029,7 @@ '干起来' = '幹起來', '干路' = '幹路', '干办' = '幹辦', -'干这一行' = '幹這一行', -'干这种事' = '幹這種事', +'干这' = '幹這', '干道' = '幹道', '干部' = '幹部', '干革命' = '幹革命', @@ -5344,6 +5347,7 @@ '忠于' = '忠於', '快快当当' = '快快當當', '快冲' = '快衝', +'怎么干' = '怎麼幹', '怒于' = '怒於', '怒气冲天' = '怒氣衝天', '怒火冲天' = '怒火衝天', @@ -5441,6 +5445,7 @@ '截发' = '截髮', '战天斗地' = '戰天鬥地', '战栗' = '戰慄', +'战于' = '戰於', '战斗' = '戰鬥', '戏里' = '戲裡', '戲院里' = '戲院里', @@ -5734,7 +5739,6 @@ '控制' = '控制', '推情准理' = '推情準理', '推托之词' = '推托之詞', -'推舟于陆' = '推舟於陸', '推托' = '推託', '提子干' = '提子乾', '提心吊胆' = '提心弔膽', @@ -5876,126 +5880,10 @@ '方志恒' = '方志恒', '方法里' = '方法裡', '方志' = '方誌', -'于0' = '於0', -'于1' = '於1', -'于1天' = '於1天', -'于2' = '於2', -'于2天' = '於2天', -'于3' = '於3', -'于3天' = '於3天', -'于4' = '於4', -'于4天' = '於4天', -'于5' = '於5', -'于5天' = '於5天', -'于6' = '於6', -'于6天' = '於6天', -'于7' = '於7', -'于7天' = '於7天', -'于8' = '於8', -'于8天' = '於8天',
[MediaWiki-commits] [Gerrit] Add salt configuration for Sentry - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: Add salt configuration for Sentry .. Add salt configuration for Sentry Split out from I1207235f0ee97c253b1a1e9e2bfa89eb79665290 as a self-hosted puppetmaster is not enough to make salt work and using a self-hosted salt master runs into all kinds of OS incompatibilities. Bug: T84956 Change-Id: I898ccb43489ae2dc1b285153116945c2f3b45192 --- M hieradata/common/role/deployment.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: BryanDavis: Looks good to me, but someone else must approve John F. Lewis: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/hieradata/common/role/deployment.yaml b/hieradata/common/role/deployment.yaml index 69b4677..9e05ebe 100644 --- a/hieradata/common/role/deployment.yaml +++ b/hieradata/common/role/deployment.yaml @@ -94,3 +94,5 @@ wdqs/wdqs: gitfat_enabled: true upstream: https://gerrit.wikimedia.org/r/wikidata/query/deploy + sentry/sentry: +upstream: https://gerrit.wikimedia.org/r/operations/software/sentry -- To view, visit https://gerrit.wikimedia.org/r/224987 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I898ccb43489ae2dc1b285153116945c2f3b45192 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gergő Tisza gti...@wikimedia.org Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Gilles gdu...@wikimedia.org Gerrit-Reviewer: John F. Lewis johnflewi...@gmail.com Gerrit-Reviewer: Yuvipanda yuvipa...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] scholarships: switch app to backend krypton - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224996
Change subject: scholarships: switch app to backend krypton
..
scholarships: switch app to backend krypton
Bug:T105003
Change-Id: I1daf4ffb8a9cbb3f3f80ce3221812ab3ad7bde11
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/224996/1
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index 34517df..f70f448 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -20,7 +20,7 @@
set req.backend = logstash;
} elsif (req.http.Host == releases.wikimedia.org) {
set req.backend = caesium;
- } elsif (req.http.Host == scholarships.wikimedia.org || req.http.Host
== grafana.wikimedia.org || req.http.Host == iegreview.wikimedia.org) {
+ } elsif (req.http.Host == grafana.wikimedia.org || req.http.Host ==
iegreview.wikimedia.org) {
set req.backend = zirconium;
} elsif (req.http.Host == parsoid-tests.wikimedia.org) {
set req.backend = ruthenium;
@@ -53,6 +53,8 @@
return (pass);
} elsif (req.http.Host == noc.wikimedia.org || req.http.Host ==
dbtree.wikimedia.org) {
set req.backend = terbium;
+} elsif (req.http.Host == scholarships.wikimedia.org) {
+set req.backend = krypton;
} elsif (req.http.Host == hue.wikimedia.org) {
// make sure all requests to Hue are via https proxy
if (req.http.X-Forwarded-Proto != https) {
--
To view, visit https://gerrit.wikimedia.org/r/224996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1daf4ffb8a9cbb3f3f80ce3221812ab3ad7bde11
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dumpInterwiki: Get interwiki map via HTTPS - change (mediawiki...WikimediaMaintenance)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225006
Change subject: dumpInterwiki: Get interwiki map via HTTPS
..
dumpInterwiki: Get interwiki map via HTTPS
Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
(cherry picked from commit 52c945b744102ef8ed5c0a7320c075be7f3efd98)
---
M dumpInterwiki.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance
refs/changes/06/225006/1
diff --git a/dumpInterwiki.php b/dumpInterwiki.php
index 5f3a195..8d012bf 100644
--- a/dumpInterwiki.php
+++ b/dumpInterwiki.php
@@ -264,7 +264,7 @@
}
// Extract the intermap from meta
- $intermap = Http::get(
'http://meta.wikimedia.org/w/index.php?title=Interwiki_mapaction=raw', 30 );
+ $intermap = Http::get(
'https://meta.wikimedia.org/w/index.php?title=Interwiki_mapaction=raw', 30 );
$lines = array_map( 'trim', explode( \n, trim( $intermap ) )
);
if ( !$lines || count( $lines ) 2 ) {
--
To view, visit https://gerrit.wikimedia.org/r/225006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: wmf/1.26wmf13
Gerrit-Owner: Alex Monk kren...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dumpInterwiki: Get interwiki map via HTTPS - change (mediawiki...WikimediaMaintenance)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225007
Change subject: dumpInterwiki: Get interwiki map via HTTPS
..
dumpInterwiki: Get interwiki map via HTTPS
Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
(cherry picked from commit 52c945b744102ef8ed5c0a7320c075be7f3efd98)
---
M dumpInterwiki.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance
refs/changes/07/225007/1
diff --git a/dumpInterwiki.php b/dumpInterwiki.php
index 5f3a195..8d012bf 100644
--- a/dumpInterwiki.php
+++ b/dumpInterwiki.php
@@ -264,7 +264,7 @@
}
// Extract the intermap from meta
- $intermap = Http::get(
'http://meta.wikimedia.org/w/index.php?title=Interwiki_mapaction=raw', 30 );
+ $intermap = Http::get(
'https://meta.wikimedia.org/w/index.php?title=Interwiki_mapaction=raw', 30 );
$lines = array_map( 'trim', explode( \n, trim( $intermap ) )
);
if ( !$lines || count( $lines ) 2 ) {
--
To view, visit https://gerrit.wikimedia.org/r/225007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: wmf/1.26wmf14
Gerrit-Owner: Alex Monk kren...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dumpInterwiki: Get interwiki map via HTTPS - change (mediawiki...WikimediaMaintenance)
jenkins-bot has submitted this change and it was merged.
Change subject: dumpInterwiki: Get interwiki map via HTTPS
..
dumpInterwiki: Get interwiki map via HTTPS
Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
(cherry picked from commit 52c945b744102ef8ed5c0a7320c075be7f3efd98)
---
M dumpInterwiki.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dumpInterwiki.php b/dumpInterwiki.php
index 5f3a195..8d012bf 100644
--- a/dumpInterwiki.php
+++ b/dumpInterwiki.php
@@ -264,7 +264,7 @@
}
// Extract the intermap from meta
- $intermap = Http::get(
'http://meta.wikimedia.org/w/index.php?title=Interwiki_mapaction=raw', 30 );
+ $intermap = Http::get(
'https://meta.wikimedia.org/w/index.php?title=Interwiki_mapaction=raw', 30 );
$lines = array_map( 'trim', explode( \n, trim( $intermap ) )
);
if ( !$lines || count( $lines ) 2 ) {
--
To view, visit https://gerrit.wikimedia.org/r/225007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: wmf/1.26wmf14
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update WikimediaMaintenance for Ifda867ef - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update WikimediaMaintenance for Ifda867ef .. Update WikimediaMaintenance for Ifda867ef Change-Id: Ic89197fa0815127ec7ab6b2036c16f516581ba76 --- M extensions/WikimediaMaintenance 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/WikimediaMaintenance b/extensions/WikimediaMaintenance index 45ee134..bb11b01 16 --- a/extensions/WikimediaMaintenance +++ b/extensions/WikimediaMaintenance -Subproject commit 45ee134be922328263dd6f45b65dec03173f76b2 +Subproject commit bb11b01343e7561539c5162c862616165c7837f6 -- To view, visit https://gerrit.wikimedia.org/r/225008 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic89197fa0815127ec7ab6b2036c16f516581ba76 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf14 Gerrit-Owner: Alex Monk kren...@gmail.com Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] misc-web: add node krypton as a backend - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: misc-web: add node krypton as a backend .. misc-web: add node krypton as a backend Bug:T104946 Change-Id: Ib986ace95ce5c336c81e2a9bbc2cddc9602d87e9 --- M modules/role/manifests/cache/misc.pp 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/role/manifests/cache/misc.pp b/modules/role/manifests/cache/misc.pp index 7e010e4..d5beec8 100644 --- a/modules/role/manifests/cache/misc.pp +++ b/modules/role/manifests/cache/misc.pp @@ -32,7 +32,7 @@ 'analytics1001.eqiad.wmnet', # Hadoop Yarn ResourceManager GUI 'analytics1027.eqiad.wmnet', # Hue (Hadoop GUI) 'antimony.wikimedia.org', -'bromine.eqiad.wmnet', # ganeti VM for misc. services +'bromine.eqiad.wmnet', # ganeti VM for misc. static HTML sites 'caesium.eqiad.wmnet', 'californium.wikimedia.org', 'dataset1001.wikimedia.org', @@ -40,6 +40,7 @@ 'gallium.wikimedia.org', # CI server 'graphite1001.eqiad.wmnet', 'iridium.eqiad.wmnet', # main phab +'krypton.eqiad.wmnet', # ganeti VM for misc. PHP apps 'logstash1001.eqiad.wmnet', 'logstash1002.eqiad.wmnet', 'logstash1003.eqiad.wmnet', -- To view, visit https://gerrit.wikimedia.org/r/224995 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib986ace95ce5c336c81e2a9bbc2cddc9602d87e9 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduce the size of icons in dashboard to match the font size - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Reduce the size of icons in dashboard to match the font size
..
Reduce the size of icons in dashboard to match the font size
Bug: T105962
Change-Id: I1d21ef1046f6b60fe39bfb1c1c71a3a1307997bf
---
M modules/dashboard/styles/ext.cx.dashboard.less
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dashboard/styles/ext.cx.dashboard.less
b/modules/dashboard/styles/ext.cx.dashboard.less
index 8341a45..926 100644
--- a/modules/dashboard/styles/ext.cx.dashboard.less
+++ b/modules/dashboard/styles/ext.cx.dashboard.less
@@ -56,7 +56,7 @@
padding: 30px 40px;
background-position: center left;
background-repeat: no-repeat;
- background-size: 25px;
+ background-size: 20px;
}
__title {
--
To view, visit https://gerrit.wikimedia.org/r/224976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1d21ef1046f6b60fe39bfb1c1c71a3a1307997bf
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dumpInterwiki: Get interwiki map via HTTPS - change (mediawiki...WikimediaMaintenance)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225004
Change subject: dumpInterwiki: Get interwiki map via HTTPS
..
dumpInterwiki: Get interwiki map via HTTPS
Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
---
M dumpInterwiki.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance
refs/changes/04/225004/1
diff --git a/dumpInterwiki.php b/dumpInterwiki.php
index 5f3a195..8d012bf 100644
--- a/dumpInterwiki.php
+++ b/dumpInterwiki.php
@@ -264,7 +264,7 @@
}
// Extract the intermap from meta
- $intermap = Http::get(
'http://meta.wikimedia.org/w/index.php?title=Interwiki_mapaction=raw', 30 );
+ $intermap = Http::get(
'https://meta.wikimedia.org/w/index.php?title=Interwiki_mapaction=raw', 30 );
$lines = array_map( 'trim', explode( \n, trim( $intermap ) )
);
if ( !$lines || count( $lines ) 2 ) {
--
To view, visit https://gerrit.wikimedia.org/r/225004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dumpInterwiki: Get interwiki map via HTTPS - change (mediawiki...WikimediaMaintenance)
jenkins-bot has submitted this change and it was merged.
Change subject: dumpInterwiki: Get interwiki map via HTTPS
..
dumpInterwiki: Get interwiki map via HTTPS
Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
(cherry picked from commit 52c945b744102ef8ed5c0a7320c075be7f3efd98)
---
M dumpInterwiki.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dumpInterwiki.php b/dumpInterwiki.php
index 5f3a195..8d012bf 100644
--- a/dumpInterwiki.php
+++ b/dumpInterwiki.php
@@ -264,7 +264,7 @@
}
// Extract the intermap from meta
- $intermap = Http::get(
'http://meta.wikimedia.org/w/index.php?title=Interwiki_mapaction=raw', 30 );
+ $intermap = Http::get(
'https://meta.wikimedia.org/w/index.php?title=Interwiki_mapaction=raw', 30 );
$lines = array_map( 'trim', explode( \n, trim( $intermap ) )
);
if ( !$lines || count( $lines ) 2 ) {
--
To view, visit https://gerrit.wikimedia.org/r/225006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifda867efbf94ec5cb11188000b04e68b57d23c35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: wmf/1.26wmf13
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update WikimediaMaintenance for Ifda867ef - change (mediawiki/core)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/225008 Change subject: Update WikimediaMaintenance for Ifda867ef .. Update WikimediaMaintenance for Ifda867ef Change-Id: Ic89197fa0815127ec7ab6b2036c16f516581ba76 --- M extensions/WikimediaMaintenance 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/08/225008/1 diff --git a/extensions/WikimediaMaintenance b/extensions/WikimediaMaintenance index 45ee134..bb11b01 16 --- a/extensions/WikimediaMaintenance +++ b/extensions/WikimediaMaintenance -Subproject commit 45ee134be922328263dd6f45b65dec03173f76b2 +Subproject commit bb11b01343e7561539c5162c862616165c7837f6 -- To view, visit https://gerrit.wikimedia.org/r/225008 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic89197fa0815127ec7ab6b2036c16f516581ba76 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf14 Gerrit-Owner: Alex Monk kren...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] misc-web varnish: retab - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224997
Change subject: misc-web varnish: retab
..
misc-web varnish: retab
Let's use spaces instead of literal tabs because we do in all the puppet
classes and this just means having to switch editor config back and forth.
Change-Id: Iff01aa9549e0db474b3439bf238c0f58d0a0f57e
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 99 insertions(+), 99 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/224997/1
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index 63e1012..47a6b38 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -1,109 +1,109 @@
include errorpage.inc.vcl;
sub vcl_recv {
- if (req.http.Host == git.wikimedia.org) {
- set req.backend = antimony;
- // gitblit requires the following request headers:
- set req.http.X-Forwarded-Proto = https;
- set req.http.X-Forwarded-Port = 443;
- } elsif (req.http.Host == doc.wikimedia.org || req.http.Host ==
integration.wikimedia.org) {
- set req.backend = gallium;
- } elsif (req.http.Host == download.wikimedia.org) {
- set req.backend = dataset1001;
- } elsif (req.http.Host == gerrit.wikimedia.org) {
- set req.backend = ytterbium;
- // No caching
- return (pass);
- } elsif (req.http.Host == gdash.wikimedia.org || req.http.Host ==
tessera.wikimedia.org || req.http.Host == performance.wikimedia.org ||
req.http.Host == graphite.wikimedia.org) {
- set req.backend = graphite1001;
- } elsif (req.http.Host == logstash.wikimedia.org){
- set req.backend = logstash;
- } elsif (req.http.Host == releases.wikimedia.org) {
- set req.backend = caesium;
- } elsif (req.http.Host == grafana.wikimedia.org || req.http.Host ==
iegreview.wikimedia.org) {
- set req.backend = zirconium;
- } elsif (req.http.Host == parsoid-tests.wikimedia.org) {
- set req.backend = ruthenium;
- } elsif (req.http.Host == horizon.wikimedia.org) {
- set req.backend = californium;
- } elsif (req.http.Host == phabricator.wikimedia.org || req.http.Host
== phab.wmfusercontent.org || req.http.Host == bugzilla.wikimedia.org ||
req.http.Host == bugs.wikimedia.org) {
- set req.backend = iridium;
- } elsif (req.http.Host == static-bugzilla.wikimedia.org ||
req.http.Host == annual.wikimedia.org || req.http.Host ==
transparency.wikimedia.org || req.http.Host == policy.wikimedia.org) {
- set req.backend = bromine;
- return (pass);
- } elsif (req.http.Host == servermon.wikimedia.org) {
- set req.backend = netmon1001;
- } elsif (req.http.Host == people.wikimedia.org) {
- set req.backend = terbium;
- // No caching of public_html dirs
- return (pass);
- } elsif (req.http.Host == ishmael.wikimedia.org) {
- set req.backend = neon;
- } elsif (req.http.Host == racktables.wikimedia.org || req.http.Host
== rt.wikimedia.org) {
- set req.backend = magnesium;
- } elsif (req.http.Host == metrics.wikimedia.org || req.http.Host ==
stats.wikimedia.org) {
- set req.backend = stat1001;
- } elsif (req.http.Host == datasets.wikimedia.org) {
- set req.backend = stat1001;
- // No caching of datasets. They can be larger than misc
varnish can deal with.
- return (pass);
- } elsif (req.http.Host == config-master.wikimedia.org) {
- set req.backend = palladium;
- // No caching of configs; scripts may want to know when things
change
- return (pass);
- } elsif (req.http.Host == noc.wikimedia.org || req.http.Host ==
dbtree.wikimedia.org) {
- set req.backend = terbium;
- } elsif (req.http.Host == scholarships.wikimedia.org) {
- set req.backend = krypton;
- } elsif (req.http.Host == hue.wikimedia.org) {
- // make sure all requests to Hue are via https proxy
- if (req.http.X-Forwarded-Proto != https) {
- set req.http.Location = https://; + req.http.Host +
req.url;
- // Use a custom 755 error code to indicate internally
- // that we are forcing a 301 redirect to https.
- error 755 TLS Redirect;
- }
- else {
- set req.backend = analytics1027;
- }
- }
- elsif (req.http.Host == yarn.wikimedia.org) {
- // make sure all requests to Yarn ResourceManager UI are via
https proxy
-
[MediaWiki-commits] [Gerrit] API: Fixed documentation for hasmg parameter - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: API: Fixed documentation for hasmg parameter .. API: Fixed documentation for hasmg parameter The API returns a plural messages key. Bug: T105120 Change-Id: I385609b6b24ca767a0b0d26cfaec30ed423c3460 --- M includes/api/i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json index f972a42..ab513a2 100644 --- a/includes/api/i18n/en.json +++ b/includes/api/i18n/en.json @@ -980,7 +980,7 @@ apihelp-query+usercontribs-example-ipprefix: Show contributions from all IP addresses with prefix kbd192.0.2./kbd., apihelp-query+userinfo-description: Get information about the current user., - apihelp-query+userinfo-param-prop: Which pieces of information to include:\n;blockinfo:Tags if the current user is blocked, by whom, and for what reason.\n;hasmsg:Adds a tag sampmessage/samp if the current user has pending messages.\n;groups:Lists all the groups the current user belongs to.\n;implicitgroups:Lists all the groups the current user is automatically a member of.\n;rights:Lists all the rights the current user has.\n;changeablegroups:Lists the groups the current user can add to and remove from.\n;options:Lists all preferences the current user has set.\n;preferencestoken:span class=\apihelp-deprecated\Deprecated./span Get a token to change current user's preferences.\n;editcount:Adds the current user's edit count.\n;ratelimits:Lists all rate limits applying to the current user.\n;realname:Adds the user's real name.\n;email:Adds the user's email address and email authentication date.\n;acceptlang:Echoes the codeAccept-Language/code header sent by the client in a structured format.\n;registrationdate:Adds the user's registration date.\n;unreadcount:Adds the count of unread pages on the user's watchlist (maximum $1; returns samp$2/samp if more)., + apihelp-query+userinfo-param-prop: Which pieces of information to include:\n;blockinfo:Tags if the current user is blocked, by whom, and for what reason.\n;hasmsg:Adds a tag sampmessages/samp if the current user has pending messages.\n;groups:Lists all the groups the current user belongs to.\n;implicitgroups:Lists all the groups the current user is automatically a member of.\n;rights:Lists all the rights the current user has.\n;changeablegroups:Lists the groups the current user can add to and remove from.\n;options:Lists all preferences the current user has set.\n;preferencestoken:span class=\apihelp-deprecated\Deprecated./span Get a token to change current user's preferences.\n;editcount:Adds the current user's edit count.\n;ratelimits:Lists all rate limits applying to the current user.\n;realname:Adds the user's real name.\n;email:Adds the user's email address and email authentication date.\n;acceptlang:Echoes the codeAccept-Language/code header sent by the client in a structured format.\n;registrationdate:Adds the user's registration date.\n;unreadcount:Adds the count of unread pages on the user's watchlist (maximum $1; returns samp$2/samp if more)., apihelp-query+userinfo-example-simple: Get information about the current user., apihelp-query+userinfo-example-data: Get additional information about the current user., -- To view, visit https://gerrit.wikimedia.org/r/225000 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I385609b6b24ca767a0b0d26cfaec30ed423c3460 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Quiddity nwil...@wikimedia.org Gerrit-Reviewer: Anomie bjor...@wikimedia.org Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add salt configuration for Sentry - change (operations/puppet)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/224987 Change subject: Add salt configuration for Sentry .. Add salt configuration for Sentry Bug: T84956 Change-Id: I898ccb43489ae2dc1b285153116945c2f3b45192 --- M hieradata/common/role/deployment.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/87/224987/1 diff --git a/hieradata/common/role/deployment.yaml b/hieradata/common/role/deployment.yaml index 69b4677..9e05ebe 100644 --- a/hieradata/common/role/deployment.yaml +++ b/hieradata/common/role/deployment.yaml @@ -94,3 +94,5 @@ wdqs/wdqs: gitfat_enabled: true upstream: https://gerrit.wikimedia.org/r/wikidata/query/deploy + sentry/sentry: +upstream: https://gerrit.wikimedia.org/r/operations/software/sentry -- To view, visit https://gerrit.wikimedia.org/r/224987 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I898ccb43489ae2dc1b285153116945c2f3b45192 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gergő Tisza gti...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimania scholarships: remove namevirtualhost file - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224988
Change subject: wikimania scholarships: remove namevirtualhost file
..
wikimania scholarships: remove namevirtualhost file
There is no need for this to listen on 443 anymore, it is behind misc-web
and it only causes errors when applied on a host with Apache 2.4 anyways
since there is no more conf.d directory.
Bug:T105920
Change-Id: Ia1819e013f126f0322065696128d59d16268f2fa
---
M modules/wikimania_scholarships/manifests/init.pp
1 file changed, 2 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/224988/1
diff --git a/modules/wikimania_scholarships/manifests/init.pp
b/modules/wikimania_scholarships/manifests/init.pp
index 0845a8b..82581a8 100644
--- a/modules/wikimania_scholarships/manifests/init.pp
+++ b/modules/wikimania_scholarships/manifests/init.pp
@@ -73,10 +73,7 @@
include ::apache::mod::rewrite
include ::apache::mod::headers
-file { '/etc/apache2/conf.d/namevirtualhost':
-source = 'puppet:///files/apache/conf.d/namevirtualhost',
-mode = '0444',
-notify = Service['apache2'],
-}
}
+
+
# vim:sw=4 ts=4 sts=4 et:
--
To view, visit https://gerrit.wikimedia.org/r/224988
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1819e013f126f0322065696128d59d16268f2fa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimania scholarships: remove namevirtualhost file - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: wikimania scholarships: remove namevirtualhost file
..
wikimania scholarships: remove namevirtualhost file
There is no need for this to listen on 443 anymore, it is behind misc-web
and it only causes errors when applied on a host with Apache 2.4 anyways
since there is no more conf.d directory.
Bug:T105920
Change-Id: Ia1819e013f126f0322065696128d59d16268f2fa
---
M modules/wikimania_scholarships/manifests/init.pp
1 file changed, 2 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/wikimania_scholarships/manifests/init.pp
b/modules/wikimania_scholarships/manifests/init.pp
index 0845a8b..82581a8 100644
--- a/modules/wikimania_scholarships/manifests/init.pp
+++ b/modules/wikimania_scholarships/manifests/init.pp
@@ -73,10 +73,7 @@
include ::apache::mod::rewrite
include ::apache::mod::headers
-file { '/etc/apache2/conf.d/namevirtualhost':
-source = 'puppet:///files/apache/conf.d/namevirtualhost',
-mode = '0444',
-notify = Service['apache2'],
-}
}
+
+
# vim:sw=4 ts=4 sts=4 et:
--
To view, visit https://gerrit.wikimedia.org/r/224988
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1819e013f126f0322065696128d59d16268f2fa
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove en2.wikipedia.org from redirects - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224989
Change subject: remove en2.wikipedia.org from redirects
..
remove en2.wikipedia.org from redirects
It was already removed from DNS in I85104f7156b3edf so this is
just cleanup as requested in T105981
Bug:T105981
Change-Id: Id3831c77da7b6d0753470bafb158204a66d37dca
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/89/224989/1
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index bb95b4e..5802f1f 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -293,7 +293,6 @@
ServerAlias www.wikipedia.com
ServerAlias www.wikipedia.net
ServerAlias en.wikipedia.com
- ServerAlias en2.wikipedia.org
ServerAlias wikipaedia.net
ServerAlias wiki-pedia.org
ServerAlias wiktionary.com
@@ -703,9 +702,6 @@
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.wikipedia.org$0
[R=301,L,NE]
# rewrite en.wikipedia.com//en.wikipedia.org
RewriteCond %{HTTP_HOST} =en.wikipedia.com
- RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0
[R=301,L,NE]
- # rewrite en2.wikipedia.org //en.wikipedia.org
- RewriteCond %{HTTP_HOST} =en2.wikipedia.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0
[R=301,L,NE]
# rewrite wikipaedia.net //www.wikipedia.org
RewriteCond %{HTTP_HOST} =wikipaedia.net
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 236f1c5..f2258f6 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -211,7 +211,6 @@
rewritewww.wikipedia.net //www.wikipedia.org
rewriteen.wikipedia.com//en.wikipedia.org
-rewriteen2.wikipedia.org //en.wikipedia.org
rewrite*wikipedia.co.uk//en.wikipedia.org
--
To view, visit https://gerrit.wikimedia.org/r/224989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3831c77da7b6d0753470bafb158204a66d37dca
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduce the z-index of callout to a reasonable level - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224990
Change subject: Reduce the z-index of callout to a reasonable level
..
Reduce the z-index of callout to a reasonable level
It had a huge z-index causing IME selector hidden under it.
Bug: T105954
Change-Id: I78a206c449309237efa04889dbdef536b8af3b2a
---
M modules/widgets/callout/ext.cx.callout.css
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/90/224990/1
diff --git a/modules/widgets/callout/ext.cx.callout.css
b/modules/widgets/callout/ext.cx.callout.css
index 9fbf067..0531b32 100644
--- a/modules/widgets/callout/ext.cx.callout.css
+++ b/modules/widgets/callout/ext.cx.callout.css
@@ -7,7 +7,7 @@
border: 1px solid #ccc;
border-radius: 3px;
max-width: 500px;
- z-index: 10;
+ z-index: 999;
}
.cx-callout::after, .cx-callout::before {
--
To view, visit https://gerrit.wikimedia.org/r/224990
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I78a206c449309237efa04889dbdef536b8af3b2a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove en2.wikipedia.org from redirects - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: remove en2.wikipedia.org from redirects
..
remove en2.wikipedia.org from redirects
It was already removed from DNS in I85104f7156b3edf so this is
just cleanup as requested in T105981
Bug:T105981
Change-Id: Id3831c77da7b6d0753470bafb158204a66d37dca
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 0 insertions(+), 5 deletions(-)
Approvals:
John F. Lewis: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index bb95b4e..5802f1f 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -293,7 +293,6 @@
ServerAlias www.wikipedia.com
ServerAlias www.wikipedia.net
ServerAlias en.wikipedia.com
- ServerAlias en2.wikipedia.org
ServerAlias wikipaedia.net
ServerAlias wiki-pedia.org
ServerAlias wiktionary.com
@@ -703,9 +702,6 @@
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://www.wikipedia.org$0
[R=301,L,NE]
# rewrite en.wikipedia.com//en.wikipedia.org
RewriteCond %{HTTP_HOST} =en.wikipedia.com
- RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0
[R=301,L,NE]
- # rewrite en2.wikipedia.org //en.wikipedia.org
- RewriteCond %{HTTP_HOST} =en2.wikipedia.org
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://en.wikipedia.org$0
[R=301,L,NE]
# rewrite wikipaedia.net //www.wikipedia.org
RewriteCond %{HTTP_HOST} =wikipaedia.net
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 236f1c5..f2258f6 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -211,7 +211,6 @@
rewritewww.wikipedia.net //www.wikipedia.org
rewriteen.wikipedia.com//en.wikipedia.org
-rewriteen2.wikipedia.org //en.wikipedia.org
rewrite*wikipedia.co.uk//en.wikipedia.org
--
To view, visit https://gerrit.wikimedia.org/r/224989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id3831c77da7b6d0753470bafb158204a66d37dca
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: John F. Lewis johnflewi...@gmail.com
Gerrit-Reviewer: MZMcBride w...@mzmcbride.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] racktables: delete namevirtualhost file - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224992
Change subject: racktables: delete namevirtualhost file
..
racktables: delete namevirtualhost file
There is no need for this file anymore. It was only here to have
virtual host on 443 and racktables is behind misc-web.
Also, this seems the last module/role using this at all, so we can
delete from files/apache/conf.d/. The general ./files/ directory
should all move into modules where possible.
Change-Id: I347ab9d2197b87fffd7dff8931b763fedcd669c7
---
M modules/racktables/manifests/init.pp
1 file changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/92/224992/1
diff --git a/modules/racktables/manifests/init.pp
b/modules/racktables/manifests/init.pp
index 02a06ae..46f9a95 100644
--- a/modules/racktables/manifests/init.pp
+++ b/modules/racktables/manifests/init.pp
@@ -32,10 +32,6 @@
content = template('racktables/racktables.wikimedia.org.erb'),
}
-apache::conf { 'namevirtualhost':
-source = 'puppet:///files/apache/conf.d/namevirtualhost',
-}
-
# Increase the default memory limit T102092
file_line { 'racktables_php_memory':
path= '/etc/php5/apache2/php.ini',
--
To view, visit https://gerrit.wikimedia.org/r/224992
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I347ab9d2197b87fffd7dff8931b763fedcd669c7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] PHPUnit test for DonationInterface::createAdapter - change (wikimedia...crm)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224991
Change subject: PHPUnit test for DonationInterface::createAdapter
..
PHPUnit test for DonationInterface::createAdapter
Helps not break recurring GlobalCollect. Currently failing because
of wacky session detection bug I tried to sledgehammer with
I3875c7386572041b1b111d62e341c46894f0ad1f
Bug: T105848
Change-Id: Ib2e2d7ff113fec3ceb5b99f4db8140920e437ed8
---
A sites/all/modules/wmf_civicrm/tests/phpunit/DonationInterfaceTest.php
1 file changed, 34 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/91/224991/1
diff --git
a/sites/all/modules/wmf_civicrm/tests/phpunit/DonationInterfaceTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/DonationInterfaceTest.php
new file mode 100644
index 000..e5437fa
--- /dev/null
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/DonationInterfaceTest.php
@@ -0,0 +1,34 @@
+?php
+
+/**
+ * Helps us not break the DonationInterface gateway adapter wrapper
+ *
+ * @group WmfCivicrm
+ */
+class DonationInterfaceTest extends BaseWmfDrupalPhpUnitTestCase {
+
+ /**
+* Do we blow up on the launch pad?
+*/
+ public function testCreateAdapter() {
+ $values = array(
+ 'amount' = 9.99,
+ 'effort_id' = 1,
+ 'order_id' = mt_rand(),
+ 'currency_code' = 'USD',
+ 'payment_product' = '',
+ 'language' = 'en',
+ 'contribution_tracking_id' = mt_rand(),
+ 'referrer' = 'dummy',
+ );
+ $adapter = DonationInterface::createAdapter( 'GlobalCollect',
$values );
+ // see FIXME in recurring globalcollect
+ $adapter-addRequestData( array(
+ 'effort_id' = 1,
+ ) );
+ $data = $adapter-getData_Unstaged_Escaped();
+ foreach ( $values as $key = $value ) {
+ $this-assertEquals( $value, $data[$key], $key is
being mangled in adapter construction );
+ }
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/224991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2e2d7ff113fec3ceb5b99f4db8140920e437ed8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] delete files/apache/conf.d/namevirtualhost - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/224993 Change subject: delete files/apache/conf.d/namevirtualhost .. delete files/apache/conf.d/namevirtualhost After it was recently removed from the scholarships and the racktables modules (both of them did not need it anymore), this file is now unused and can be removed. Change-Id: I88f116289de8077b5610ed421118b5547c5e8145 --- D files/apache/conf.d/namevirtualhost 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/93/224993/1 diff --git a/files/apache/conf.d/namevirtualhost b/files/apache/conf.d/namevirtualhost deleted file mode 100644 index 81424c4..000 --- a/files/apache/conf.d/namevirtualhost +++ /dev/null @@ -1,2 +0,0 @@ -NameVirtualHost *:80 -NameVirtualHost *:443 -- To view, visit https://gerrit.wikimedia.org/r/224993 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I88f116289de8077b5610ed421118b5547c5e8145 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow adding any external or internal link to the translation - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow adding any external or internal link to the translation
..
Allow adding any external or internal link to the translation
Bug: T89953
Change-Id: Ife7de3415fab71edccb6cc20e3646439bdb2f9c8
---
M extension.json
M hooks.md
M i18n/en.json
M i18n/he.json
M i18n/qqq.json
M modules/tools/ext.cx.tools.js
M modules/tools/ext.cx.tools.link.js
A modules/tools/images/add_link_gray.png
A modules/tools/images/add_link_gray.svg
A modules/tools/images/external_link.png
A modules/tools/images/external_link.svg
M modules/tools/styles/ext.cx.tools.link.less
A modules/tools/styles/ext.cx.tools.linker.less
M modules/translation/ext.cx.translation.js
M modules/util/ext.cx.util.selection.js
M modules/widgets/pageselector/ext.cx.pageselector.js
M modules/widgets/pageselector/ext.cx.pageselector.less
17 files changed, 546 insertions(+), 66 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index c76108b..512b3f6 100644
--- a/extension.json
+++ b/extension.json
@@ -318,6 +318,9 @@
styles: [
widgets/pageselector/ext.cx.pageselector.less
],
+ messages: [
+ mw-pageselector-missing
+ ],
dependencies: [
mediawiki.api
]
@@ -469,7 +472,8 @@
tools/ext.cx.tools.link.js
],
styles: [
- tools/styles/ext.cx.tools.link.less
+ tools/styles/ext.cx.tools.link.less,
+ tools/styles/ext.cx.tools.linker.less
],
messages: [
cx-tools-link-title,
@@ -479,9 +483,17 @@
cx-tools-missing-link-title,
cx-tools-missing-link-text,
cx-tools-missing-link-tooltip,
- cx-tools-missing-link-mark-link
+ cx-tools-missing-link-mark-link,
+ cx-tools-link-internal-link,
+ cx-tools-link-internal-link-placeholder,
+ cx-tools-link-external-link,
+ cx-tools-link-external-link-placeholder,
+ cx-tools-link-to-another-page,
+ cx-tools-link-apply
],
dependencies: [
+ ext.cx.pageselector,
+ ext.cx.tools.manager,
ext.cx.tools.card,
ext.cx.tools.manager,
jquery.uls.data,
diff --git a/hooks.md b/hooks.md
index 00b6f26..1293bc2 100644
--- a/hooks.md
+++ b/hooks.md
@@ -39,11 +39,6 @@
Used to trigger the publish action.
-## mw.cx.search.link
-
-This is fired when a link title is searched in tools search box.
-The search string is passed as an argument. Example subscribers are link and
dictionary tools.
-
## mw.cx.search.word
This is fired when a word is searched in the tools search box.
diff --git a/i18n/en.json b/i18n/en.json
index 33cc8a6..d560abb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -209,5 +209,12 @@
cx-notification-hundredth-translation: You just made 100
translations! That is a remarkable achievement. Share the word to other
editors.,
cx-notification-hundredth-translation-email-subject: Congratulations
for your one hundredth translation,
cx-translationlist-empty-title: Nothing to translate?,
- cx-translationlist-empty-desc: {{GENDER:|Start}} your translation
now and continue it anytime.
+ cx-translationlist-empty-desc: {{GENDER:|Start}} your translation
now and continue it anytime.,
+ cx-tools-link-internal-link: Link to page,
+ cx-tools-link-internal-link-placeholder: Find page to link,
+ cx-tools-link-external-link: External,
+ cx-tools-link-external-link-placeholder: Add external link,
+ cx-tools-link-to-another-page: Link to another page,
+ cx-tools-link-apply: Done,
+ mw-pageselector-missing: Page does not exist
}
diff --git a/i18n/he.json b/i18n/he.json
index d476d0a..4ee0d83 100644
--- a/i18n/he.json
+++ b/i18n/he.json
@@ -204,5 +204,12 @@
cx-notification-hundredth-translation: עשית 100 תרגומים! זה הישג
מרשים. זה הזמן לספר על כך לעורכים אחרים.,
cx-notification-hundredth-translation-email-subject: ברכות על התרגום
המאה שלך,
cx-translationlist-empty-title: לא מצאת מה לתרגם?,
- cx-translationlist-empty-desc:
[MediaWiki-commits] [Gerrit] wikimania scholarships: update Apache config for 2.4 - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/224994 Change subject: wikimania scholarships: update Apache config for 2.4 .. wikimania scholarships: update Apache config for 2.4 Apache 2.2 - Apache 2.4 changed syntax. Need to adjust it for this app to work on a jessie host now. Bug:T105003 Change-Id: I969d6f411adb7f42059ff20c96880e762608bb76 --- M modules/wikimania_scholarships/templates/apache.conf.erb 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/94/224994/1 diff --git a/modules/wikimania_scholarships/templates/apache.conf.erb b/modules/wikimania_scholarships/templates/apache.conf.erb index fdd22e6..d41612e 100644 --- a/modules/wikimania_scholarships/templates/apache.conf.erb +++ b/modules/wikimania_scholarships/templates/apache.conf.erb @@ -23,8 +23,7 @@ Directory %= @deploy_dir %/public Options Indexes FollowSymLinks AllowOverride None -Order allow,deny -allow from all +Require all granted /Directory Location / -- To view, visit https://gerrit.wikimedia.org/r/224994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I969d6f411adb7f42059ff20c96880e762608bb76 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moar restriction icons! - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged. Change subject: Moar restriction icons! .. Moar restriction icons! Icons for all important non-copyright restriction types. Also, some tweaks made in CSS e.g. add 1 px margin to top of mw-mmv-labels Finally, new test to check if default restriction is placed last. Example files: copydesign: https://commons.wikimedia.org/wiki/File:Peugeot_404_dsc01875.jpg trademark: https://commons.wikimedia.org/wiki/File:Logo_NIKE.svg trademark+insignia: https://commons.wikimedia.org/wiki/File:Flag_of_UNESCO.svg personality: https://commons.wikimedia.org/wiki/File:Vice_President_Megawati_Sukarnoputri_-_Indonesia.jpg communist+insignia: https://commons.wikimedia.org/wiki/File:Flag_of_Georgian_SSR.svg nazi: https://commons.wikimedia.org/wiki/File:PropagandaNaziJapaneseMonster.gif costume: https://commons.wikimedia.org/wiki/File:Shrek_%26_Fiona.jpg fan-art: https://commons.wikimedia.org/wiki/File:Magic_wand.gif (I think that's enough) Bug: T102693 Change-Id: I907396c59752511448145a4ac5d29096166f841f --- M MultimediaViewer.php M i18n/en.json M i18n/qqq.json A resources/mmv/ui/img/restrict-2257.svg A resources/mmv/ui/img/restrict-aus-reserve.svg A resources/mmv/ui/img/restrict-communist.svg A resources/mmv/ui/img/restrict-costume.svg A resources/mmv/ui/img/restrict-currency.svg A resources/mmv/ui/img/restrict-default.svg A resources/mmv/ui/img/restrict-design.svg A resources/mmv/ui/img/restrict-fan-art.svg A resources/mmv/ui/img/restrict-ihl.svg A resources/mmv/ui/img/restrict-insignia.svg A resources/mmv/ui/img/restrict-ita-mibac.svg A resources/mmv/ui/img/restrict-nazi.svg A resources/mmv/ui/img/restrict-personality.svg M resources/mmv/ui/mmv.ui.metadataPanel.js M resources/mmv/ui/mmv.ui.metadataPanel.less M tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js 19 files changed, 1,039 insertions(+), 15 deletions(-) Approvals: Gergő Tisza: Looks good to me, approved jenkins-bot: Verified diff --git a/MultimediaViewer.php b/MultimediaViewer.php index 4cb5b1c..fb790e3 100644 --- a/MultimediaViewer.php +++ b/MultimediaViewer.php @@ -271,7 +271,23 @@ // for license messages see end of file 'multimediaviewer-permission-link', 'multimediaviewer-permission-link-hide', + + 'multimediaviewer-restriction-2257', + 'multimediaviewer-restriction-aus-reserve', + 'multimediaviewer-restriction-communist', + 'multimediaviewer-restriction-costume', + 'multimediaviewer-restriction-currency', + 'multimediaviewer-restriction-design', + 'multimediaviewer-restriction-fan-art', + 'multimediaviewer-restriction-ihl', + 'multimediaviewer-restriction-insignia', + 'multimediaviewer-restriction-ita-mibac', + 'multimediaviewer-restriction-nazi', + 'multimediaviewer-restriction-personality', 'multimediaviewer-restriction-trademarked', + 'multimediaviewer-restriction-default', + 'multimediaviewer-restriction-default-and-others', + 'multimediaviewer-geoloc-north', 'multimediaviewer-geoloc-east', 'multimediaviewer-geoloc-south', diff --git a/i18n/en.json b/i18n/en.json index e105b2a..adfe8f4 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -43,7 +43,21 @@ multimediaviewer-permission-link: view terms, multimediaviewer-permission-link-hide: hide terms, multimediaviewer-permission-viewmore: View more, + multimediaviewer-restriction-2257: This image contains sexually explicit content which may be subject to the Child Protection and Obscenity Enforcement Act in the United States., + multimediaviewer-restriction-aus-reserve: This image was photographed in an Australian Commonwealth reserve and cannot be used for commercial gain without a permit., + multimediaviewer-restriction-communist: This image contains Communist insignia which may be banned in some countries., + multimediaviewer-restriction-costume: This image depicts costuming and may be subject to legal restrictions., + multimediaviewer-restriction-currency: This image represents a depiction of a unit of currency and may be subject to legal restrictions., + multimediaviewer-restriction-design: The design of the subject of this image may be copyrighted and subject to legal restrictions., + multimediaviewer-restriction-fan-art: This image is a work of fan art, and re-use may be subject to legal restrictions., + multimediaviewer-restriction-ihl: This image contains symbols restricted by International Humanitarian Law., +
[MediaWiki-commits] [Gerrit] wikimania scholarships: update Apache config for 2.4 - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: wikimania scholarships: update Apache config for 2.4 .. wikimania scholarships: update Apache config for 2.4 Apache 2.2 - Apache 2.4 changed syntax. Need to adjust it for this app to work on a jessie host now. Bug:T105003 Change-Id: I969d6f411adb7f42059ff20c96880e762608bb76 --- M modules/wikimania_scholarships/templates/apache.conf.erb 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: John F. Lewis: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/wikimania_scholarships/templates/apache.conf.erb b/modules/wikimania_scholarships/templates/apache.conf.erb index fdd22e6..d41612e 100644 --- a/modules/wikimania_scholarships/templates/apache.conf.erb +++ b/modules/wikimania_scholarships/templates/apache.conf.erb @@ -23,8 +23,7 @@ Directory %= @deploy_dir %/public Options Indexes FollowSymLinks AllowOverride None -Order allow,deny -allow from all +Require all granted /Directory Location / -- To view, visit https://gerrit.wikimedia.org/r/224994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I969d6f411adb7f42059ff20c96880e762608bb76 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: John F. Lewis johnflewi...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] misc-web: add node krypton as a backend - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/224995 Change subject: misc-web: add node krypton as a backend .. misc-web: add node krypton as a backend Bug:T104946 Change-Id: Ib986ace95ce5c336c81e2a9bbc2cddc9602d87e9 --- M modules/role/manifests/cache/misc.pp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/95/224995/1 diff --git a/modules/role/manifests/cache/misc.pp b/modules/role/manifests/cache/misc.pp index 7e010e4..d5beec8 100644 --- a/modules/role/manifests/cache/misc.pp +++ b/modules/role/manifests/cache/misc.pp @@ -32,7 +32,7 @@ 'analytics1001.eqiad.wmnet', # Hadoop Yarn ResourceManager GUI 'analytics1027.eqiad.wmnet', # Hue (Hadoop GUI) 'antimony.wikimedia.org', -'bromine.eqiad.wmnet', # ganeti VM for misc. services +'bromine.eqiad.wmnet', # ganeti VM for misc. static HTML sites 'caesium.eqiad.wmnet', 'californium.wikimedia.org', 'dataset1001.wikimedia.org', @@ -40,6 +40,7 @@ 'gallium.wikimedia.org', # CI server 'graphite1001.eqiad.wmnet', 'iridium.eqiad.wmnet', # main phab +'krypton.eqiad.wmnet', # ganeti VM for misc. PHP apps 'logstash1001.eqiad.wmnet', 'logstash1002.eqiad.wmnet', 'logstash1003.eqiad.wmnet', -- To view, visit https://gerrit.wikimedia.org/r/224995 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib986ace95ce5c336c81e2a9bbc2cddc9602d87e9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Provide static PNG logo for emlwiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Provide static PNG logo for emlwiki .. Provide static PNG logo for emlwiki The PNG had been exported from SVG originally created during the Great Vectorization. The Emiliano-Romagnolo Wikipedia already uses this new logo, so this patch's only change is to provide a cache-friendly logo instead of serving one defined by $stdlogo. The file was optimized with optipng before being uploaded. See Phabricator task for more details. Bug: T100953 Change-Id: I6b23fd3115b7547f09e05eb2be10dea2b856830c --- M w/static/images/project-logos/emlwiki.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/emlwiki.png b/w/static/images/project-logos/emlwiki.png index aa6c230..d45dafa 100644 --- a/w/static/images/project-logos/emlwiki.png +++ b/w/static/images/project-logos/emlwiki.png Binary files differ diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index fb484cd..df16299 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -496,6 +496,7 @@ 'dzwiki' = '/static/images/project-logos/dzwiki.png', // T50397 'eewiki' = '/static/images/project-logos/eewiki.png', // T50397 'elwiki' = '/static/images/project-logos/elwiki.png', + 'emlwiki' = '/static/images/project-logos/emlwiki.png', // T100953 'enwiki' = '/static/images/project-logos/enwiki.png', 'eowiki' = '/static/images/project-logos/eowiki.png', 'eswiki' = '/static/images/project-logos/eswiki.png', -- To view, visit https://gerrit.wikimedia.org/r/214981 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6b23fd3115b7547f09e05eb2be10dea2b856830c Gerrit-PatchSet: 5 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Odder tom...@twkozlowski.com Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Odder tom...@twkozlowski.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Conversion to using getMainStashInstance() - change (mediawiki...AbuseFilter)
jenkins-bot has submitted this change and it was merged.
Change subject: Conversion to using getMainStashInstance()
..
Conversion to using getMainStashInstance()
Bug: T97620
Change-Id: I7fc2c0a42bf295d71b9e0721ab4261290334cdec
---
M AbuseFilter.class.php
M AbuseFilter.hooks.php
M Views/AbuseFilterViewRevert.php
M api/ApiAbuseFilterUnblockAutopromote.php
4 files changed, 11 insertions(+), 13 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index fff2ddb..87f2010 100755
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -1300,10 +1300,12 @@
break;
case 'blockautopromote':
- global $wgUser, $wgMemc;
+ global $wgUser;
if ( !$wgUser-isAnon() ) {
$blockPeriod = (int)mt_rand( 3 * 86400,
7 * 86400 ); // Block for 3-7 days.
- $wgMemc-set(
self::autoPromoteBlockKey( $wgUser ), true, $blockPeriod );
+
ObjectCache::getMainStashInstance()-set(
+ self::autoPromoteBlockKey(
$wgUser ), true, $blockPeriod
+ );
$message = array(
'abusefilter-autopromote-blocked',
diff --git a/AbuseFilter.hooks.php b/AbuseFilter.hooks.php
old mode 100644
new mode 100755
index 892d901..faaafb3
--- a/AbuseFilter.hooks.php
+++ b/AbuseFilter.hooks.php
@@ -277,11 +277,8 @@
* @return bool
*/
public static function onGetAutoPromoteGroups( $user, $promote ) {
- global $wgMemc;
-
$key = AbuseFilter::autoPromoteBlockKey( $user );
-
- if ( $wgMemc-get( $key ) ) {
+ if ( ObjectCache::getMainStashInstance()-get( $key ) ) {
$promote = array();
}
diff --git a/Views/AbuseFilterViewRevert.php b/Views/AbuseFilterViewRevert.php
old mode 100644
new mode 100755
index 941fa66..c1a7738
--- a/Views/AbuseFilterViewRevert.php
+++ b/Views/AbuseFilterViewRevert.php
@@ -209,9 +209,9 @@
);
return true;
case 'blockautopromote':
- global $wgMemc;
- $wgMemc-delete(
AbuseFilter::autopromoteBlockKey(
- User::newFromId( $result['userid'] ) )
);
+ ObjectCache::getMainStashInstance()-delete(
+ AbuseFilter::autopromoteBlockKey(
User::newFromId( $result['userid'] ) )
+ );
return true;
case 'degroup':
// Pull the user's groups from the vars.
diff --git a/api/ApiAbuseFilterUnblockAutopromote.php
b/api/ApiAbuseFilterUnblockAutopromote.php
old mode 100644
new mode 100755
index 73d1558..6b3cb17
--- a/api/ApiAbuseFilterUnblockAutopromote.php
+++ b/api/ApiAbuseFilterUnblockAutopromote.php
@@ -15,16 +15,15 @@
$this-dieUsage( $msg, 'notsuspended' );
}
- global $wgMemc;
$key = AbuseFilter::autoPromoteBlockKey( $user );
-
- if ( !$wgMemc-get( $key ) ) {
+ $stash = ObjectCache::getMainStashInstance();
+ if ( !$stash-get( $key ) ) {
// Same as above :(
$msg = wfMessage( 'abusefilter-reautoconfirm-none',
$params['user'] )-text();
$this-dieUsage( $msg, 'notsuspended' );
}
- $wgMemc-delete( $key );
+ $stash-delete( $key );
$res = array( 'user' = $params['user'] );
$this-getResult()-addValue( null, $this-getModuleName(),
$res );
--
To view, visit https://gerrit.wikimedia.org/r/212717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7fc2c0a42bf295d71b9e0721ab4261290334cdec
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: Se4598 se4...@gmx.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed from legal - change (wikimedia/TransparencyReport-private)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/224756 Change subject: Fixed from legal .. Fixed from legal Change-Id: I6e7cf45ea8e573426198fd15076a2590f140f642 --- M locales/en.yml M source/data/other_companies.csv M source/data/targeted_dmca.csv A source/images/flags_svg/ro.svg A source/images/flags_svg/sr.svg A source/images/flags_svg/tw.svg M source/javascripts/rag.js M source/localizable/content.html.erb M source/localizable/privacy.html.erb 9 files changed, 50 insertions(+), 58 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private refs/changes/56/224756/1 diff --git a/locales/en.yml b/locales/en.yml index 8c92230..ef0fd7c 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -36,7 +36,7 @@ title: Requests forbr/User Data total_number_of_requests: Total Number of Requests percentage_of_times_information_produced: Percentage of Times Information Produced -lead: a href='//meta.wikimedia.org/wiki/Wikimedia_Foundation_Guiding_Principles#Free_speech'Freedom of speech is essential/a to the Wikimedia movement—our projects cannot flourish in an ecosystem where individuals cannot speak freely. Our users trust us to protect their identities against unlawful disclosure and we take this responsibility seriously. +lead: a href='//meta.wikimedia.org/wiki/Wikimedia_Foundation_Guiding_Principles#Free_speech'Freedom of speech is essential/a to the Wikimedia movement—our Projects cannot flourish in an ecosystem where individuals cannot speak freely. Our users trust us to protect their identities against unlawful disclosure and we take this responsibility seriously. intro: pHowever, every year, governments, individuals, and corporations ask us to disclose user data. Often, we have no nonpublic information to disclose because we a href='//wikimediafoundation.org/wiki/Privacy_policy#Types_of_Information_We_Receive_From_You.2C_How_We_Get_It.2C_.26_How_We_Use_It'collect little nonpublic information/a about users and retain that information for a a href='//meta.wikimedia.org/wiki/Data_retention_guidelines'short period of time/a. But when we do have data, we carefully evaluate every request before considering disclosure. If the requests do not meet our a href='//wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines'standards/a—if they are overly broad, unclear, or irrelevant—we will push back on behalf of our users./ppIf we must produce information due to a legally valid request, we will a href='//wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines#Notifying_Our_Users_of_Your_Request'notify the affected user/a before we disclose, if we are a href='/faq.html#nonpublic_personal_information'legally permitted and have the means/a to do so. In certain cases, we may a href='/faq.html#my_personal_information'help find assistance/a for users to fight an invalid request./ppBelow, you will find more information about the requests for user data we receive./p quote: Awareness that the Government may be watching chills associational and expressive freedoms. And the Government’s unrestrained power to assemble data that reveal private aspects of identity is susceptible to abuse. cite: a href='//en.wikipedia.org/wiki/Sonia_Sotomayor'Justice Sonia Sotomayor/asmalla href='//en.wikipedia.org/wiki/Supreme_Court_of_the_United_States'U.S. Supreme Court/a (a href='//www.law.cornell.edu/supremecourt/text/10-1259#writing-10-1259_CONCUR_4'2012/a)/small @@ -58,14 +58,14 @@ total_requests: Total requests information_produced: Information produced information_was_produced: Requests where information was produced -bubble_graph_fineprint: Due to the inconsistent release dates across different organizations, comparison data for the period covered by this report (July 2014 - December 2014) was not available, so we are presenting the comparison data above for July 2013 - June 2014. Please also note that figures for Wikimedia include additional types of requests for user data that are not included in the other organizations' figures. See the a href='/faq.html#different_compare'FAQ/a for more details. +bubble_graph_fineprint: Due to the inconsistent release dates across different organizations, comparison data for the period covered by this report (January 2015 - June 2015) was not available, so we are presenting the comparison data above for July 2014 - December 2014. Please also note that figures for Wikimedia include additional types of requests for user data that are not included in the other organizations' figures. See the a href='/faq.html#different_compare'FAQ/a for more details. show_all: Show All request_type: Request Type information_produced_title: Information Produced? by_country: By Country
[MediaWiki-commits] [Gerrit] Use 'json' module instead of deprecated 'jquery.json' - change (mediawiki...ArticleFeedbackv5)
jenkins-bot has submitted this change and it was merged.
Change subject: Use 'json' module instead of deprecated 'jquery.json'
..
Use 'json' module instead of deprecated 'jquery.json'
See
* https://lists.wikimedia.org/pipermail/wikitech-l/2014-September/078725.html
* https://gerrit.wikimedia.org/r/#/c/140560/
Bug: T105866
Change-Id: I36b6f6d26e7154f3ef820df63bfc521271f17b58
---
M ArticleFeedbackv5.php
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
3 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ArticleFeedbackv5.php b/ArticleFeedbackv5.php
index cfe7add..3986917 100644
--- a/ArticleFeedbackv5.php
+++ b/ArticleFeedbackv5.php
@@ -719,7 +719,7 @@
'dependencies' = array(
'jquery.appear',
'jquery.tipsy',
- 'jquery.json',
+ 'json',
'jquery.localize',
'jquery.ui.button',
'jquery.cookie',
@@ -906,7 +906,7 @@
'jquery.tipsy',
'jquery.localize',
'jquery.articleFeedbackv5.track',
- 'jquery.json',
+ 'json',
'jquery.ui.button',
),
) + $wgArticleFeedbackResourcePaths;
diff --git a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
index 0fb2e9a..6268b12 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
@@ -2677,14 +2677,14 @@
var feedbackIdsCookieName =
mw.config.get( 'wgCookiePrefix' ) + $.aftUtils.getCookieName( 'feedback-ids' );
// save add feedback id to cookie (only
most recent 20)
- var feedbackIds = $.parseJSON(
$.cookie( feedbackIdsCookieName ) );
+ var feedbackIds = JSON.parse( $.cookie(
feedbackIdsCookieName ) );
if ( !$.isArray( feedbackIds ) ) {
feedbackIds = [];
}
feedbackIds.unshift(
data.articlefeedbackv5.feedback_id );
$.cookie(
feedbackIdsCookieName,
- $.toJSON( feedbackIds.splice(
0, 20 ) ),
+ JSON.stringify(
feedbackIds.splice( 0, 20 ) ),
{ expires: 30, path: '/' }
);
diff --git
a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
index ba1d371..d7e2a77 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
@@ -1294,7 +1294,7 @@
'page': $.articleFeedbackv5special.page,
'listControls': $.articleFeedbackv5special.listControls
};
- filterParams = $.toJSON( filterParams );
+ filterParams = JSON.stringify( filterParams );
// note: we're overwriting the same cookie for every page;
assuming that they won't like to come
// back later to previous pages and find their previous
settings again (plus less cookie size)
--
To view, visit https://gerrit.wikimedia.org/r/224760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I36b6f6d26e7154f3ef820df63bfc521271f17b58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] install-server: fix logstash partman recipe - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224757
Change subject: install-server: fix logstash partman recipe
..
install-server: fix logstash partman recipe
Currently logstash/es hosts have a big / partition, shrink that and use the
remaining space for elasticsearch instead. Also provision unused disks as
spares for raid1 on /.
Bug: T104035
Change-Id: Iac879a56407c6f1193d28b05188aa45d1ff73e26
---
M modules/install_server/files/autoinstall/partman/logstash.cfg
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/224757/1
diff --git a/modules/install_server/files/autoinstall/partman/logstash.cfg
b/modules/install_server/files/autoinstall/partman/logstash.cfg
index 69d7e91..b0d66d0 100644
--- a/modules/install_server/files/autoinstall/partman/logstash.cfg
+++ b/modules/install_server/files/autoinstall/partman/logstash.cfg
@@ -21,7 +21,7 @@
1 1 1 grub\
$primary{ } method{ biosgrub } \
. \
- 256000 256000 256000 raid\
+ 5 5 5 raid\
$primary{ } method{ raid } \
device{ /dev/sda /dev/sdb } \
. \
@@ -34,8 +34,8 @@
# raidtype devcount sparecount fstype mountpoint \
# devices sparedevices
d-ipartman-auto-raid/recipestring \
- 1 4 0 ext3/ \
- /dev/sda2#/dev/sdb2 \
+ 1 4 2 ext3/ \
+ /dev/sda2#/dev/sdb2 /dev/sdc2#/dev/sdd2 \
. \
0 4 0 xfs /var/lib/elasticsearch \
/dev/sda3#/dev/sdb3#/dev/sdc3#/dev/sdd3 \
--
To view, visit https://gerrit.wikimedia.org/r/224757
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac879a56407c6f1193d28b05188aa45d1ff73e26
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Trigger tests for ArticleFeedbackv5 - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/224759 Change subject: Trigger tests for ArticleFeedbackv5 .. Trigger tests for ArticleFeedbackv5 Fails with: 1) ResourcesTest::testMissingDependencies The module 'jquery.json' required by 'jquery.articleFeedbackv5' must exist Failed asserting that an array contains 'jquery.json'. Bug: T105866 Change-Id: I36b6f6d26e7154f3ef820df63bfc521271f17b58 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/59/224759/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 1e0ca69..5368cf7 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3021,7 +3021,7 @@ - name: mediawiki/extensions/ArticleFeedbackv5 template: - - name: extension-checks + - name: extension-unittests-generic - name: extension-rubylint - name: mediawiki/extensions/ApiSandbox -- To view, visit https://gerrit.wikimedia.org/r/224759 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I36b6f6d26e7154f3ef820df63bfc521271f17b58 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use 'json' module instead of deprecated 'jquery.json' - change (mediawiki...ArticleFeedbackv5)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224760
Change subject: Use 'json' module instead of deprecated 'jquery.json'
..
Use 'json' module instead of deprecated 'jquery.json'
See
* https://lists.wikimedia.org/pipermail/wikitech-l/2014-September/078725.html
* https://gerrit.wikimedia.org/r/#/c/140560/
Bug: T105866
Change-Id: I36b6f6d26e7154f3ef820df63bfc521271f17b58
---
M ArticleFeedbackv5.php
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
3 files changed, 5 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5
refs/changes/60/224760/1
diff --git a/ArticleFeedbackv5.php b/ArticleFeedbackv5.php
index cfe7add..3986917 100644
--- a/ArticleFeedbackv5.php
+++ b/ArticleFeedbackv5.php
@@ -719,7 +719,7 @@
'dependencies' = array(
'jquery.appear',
'jquery.tipsy',
- 'jquery.json',
+ 'json',
'jquery.localize',
'jquery.ui.button',
'jquery.cookie',
@@ -906,7 +906,7 @@
'jquery.tipsy',
'jquery.localize',
'jquery.articleFeedbackv5.track',
- 'jquery.json',
+ 'json',
'jquery.ui.button',
),
) + $wgArticleFeedbackResourcePaths;
diff --git a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
index 0fb2e9a..6268b12 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.js
@@ -2677,14 +2677,14 @@
var feedbackIdsCookieName =
mw.config.get( 'wgCookiePrefix' ) + $.aftUtils.getCookieName( 'feedback-ids' );
// save add feedback id to cookie (only
most recent 20)
- var feedbackIds = $.parseJSON(
$.cookie( feedbackIdsCookieName ) );
+ var feedbackIds = JSON.parse( $.cookie(
feedbackIdsCookieName ) );
if ( !$.isArray( feedbackIds ) ) {
feedbackIds = [];
}
feedbackIds.unshift(
data.articlefeedbackv5.feedback_id );
$.cookie(
feedbackIdsCookieName,
- $.toJSON( feedbackIds.splice(
0, 20 ) ),
+ JSON.stringify(
feedbackIds.splice( 0, 20 ) ),
{ expires: 30, path: '/' }
);
diff --git
a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
index ba1d371..d7e2a77 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
@@ -1294,7 +1294,7 @@
'page': $.articleFeedbackv5special.page,
'listControls': $.articleFeedbackv5special.listControls
};
- filterParams = $.toJSON( filterParams );
+ filterParams = JSON.stringify( filterParams );
// note: we're overwriting the same cookie for every page;
assuming that they won't like to come
// back later to previous pages and find their previous
settings again (plus less cookie size)
--
To view, visit https://gerrit.wikimedia.org/r/224760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I36b6f6d26e7154f3ef820df63bfc521271f17b58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] updates to upstream master 184623a7c6bbcf8053d177861174b3709... - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: updates to upstream master
184623a7c6bbcf8053d177861174b37094c33948 15-07-2015
..
updates to upstream master 184623a7c6bbcf8053d177861174b37094c33948
15-07-2015
Change-Id: I0cf6602bcd9030ef94ecab9aad5a3a2bca8924fb
---
M src/controller/SprintReportController.php
M src/controller/board/SprintBoardBatchEditController.php
M src/controller/board/SprintBoardController.php
M src/controller/board/SprintBoardViewController.php
4 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Christopher Johnson (WMDE): Verified; Looks good to me, approved
diff --git a/src/controller/SprintReportController.php
b/src/controller/SprintReportController.php
index 203a781..0afc60c 100644
--- a/src/controller/SprintReportController.php
+++ b/src/controller/SprintReportController.php
@@ -56,6 +56,7 @@
$nav-appendChild($core);
$nav-setCrumbs(
$this-buildSprintApplicationCrumbs($can_create)
+-setBorder(true)
-addTextCrumb(pht('Reports')));
return $this-buildApplicationPage(
diff --git a/src/controller/board/SprintBoardBatchEditController.php
b/src/controller/board/SprintBoardBatchEditController.php
index 2467aab..49133e9 100644
--- a/src/controller/board/SprintBoardBatchEditController.php
+++ b/src/controller/board/SprintBoardBatchEditController.php
@@ -173,7 +173,7 @@
$task_box = id(new PHUIObjectBoxView())
-setHeaderText(pht('Selected Tasks'))
--appendChild($list);
+-setObjectList($list);
$form_box = id(new PHUIObjectBoxView())
-setHeaderText(pht('Batch Editor'))
diff --git a/src/controller/board/SprintBoardController.php
b/src/controller/board/SprintBoardController.php
index ee5bd86..423a842 100644
--- a/src/controller/board/SprintBoardController.php
+++ b/src/controller/board/SprintBoardController.php
@@ -17,6 +17,7 @@
$id = $project-getID();
$nav = parent::buildIconNavView($project);
$nav-selectFilter(board/{$id}/);
+$nav-addClass('project-board-nav');
return $nav;
}
}
diff --git a/src/controller/board/SprintBoardViewController.php
b/src/controller/board/SprintBoardViewController.php
index 1919324..a38e246 100755
--- a/src/controller/board/SprintBoardViewController.php
+++ b/src/controller/board/SprintBoardViewController.php
@@ -395,7 +395,7 @@
$project-getName());
$header = id(new PHUIHeaderView())
- -setHeader(pht('%s Workboard', $header_link))
+ -setHeader($header_link)
-setUser($viewer)
-setNoBackground(true)
-addActionLink($sort_menu)
--
To view, visit https://gerrit.wikimedia.org/r/224764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0cf6602bcd9030ef94ecab9aad5a3a2bca8924fb
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de
Gerrit-Reviewer: Christopher Johnson (WMDE) christopher.john...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Autologin for m. domains - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: Autologin for m. domains
..
Autologin for m. domains
Have the central login wiki redirect to the mobile version of a wiki,
if the original autologin started on a mobile domain.
Depends on Ia90a587b0579ff2a65c9477f083692aab3945577
Bug: T100413
Change-Id: Ie1c373a1f039fb1ab9866543288bcfaf87c51ab4
---
M includes/CentralAuthHooks.php
M includes/specials/SpecialCentralAutoLogin.php
2 files changed, 55 insertions(+), 10 deletions(-)
Approvals:
MaxSem: Looks good to me, but someone else must approve
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/CentralAuthHooks.php b/includes/CentralAuthHooks.php
index 692dd8c..42b239a 100644
--- a/includes/CentralAuthHooks.php
+++ b/includes/CentralAuthHooks.php
@@ -596,10 +596,17 @@
foreach ( $wgCentralAuthAutoLoginWikis as $alt =
$wikiID ) {
$wiki = WikiMap::getWiki( $wikiID );
// Use WikiReference::getFullUrl(), returns a
protocol-relative URL if needed
- $url = wfAppendQuery( $wiki-getFullUrl(
'Special:CentralAutoLogin/start' ), array(
+ $params = array(
'type' = 'icon',
'from' = wfWikiID(),
- ) );
+ );
+ if ( self::isMobileDomain() ) {
+ $params['mobile'] = 1;
+ }
+ $url = wfAppendQuery(
+ $wiki-getFullUrl(
'Special:CentralAutoLogin/start' ),
+ $params
+ );
$inject_html .= Xml::element( 'img',
array(
'src' = $url,
@@ -728,6 +735,11 @@
}
return true;
+ }
+
+ private static function isMobileDomain() {
+ return class_exists( 'MobileContext' )
+MobileContext::singleton()-usingMobileDomain();
}
/**
@@ -1315,10 +1327,14 @@
$wgCentralAuthLoginWiki,
'Special:CentralAutoLogin/checkLoggedIn'
);
if ( $url !== false ) {
- $vars['wgCentralAuthCheckLoggedInURL'] =
wfAppendQuery( $url, array(
+ $params = array(
'type' = 'script',
'wikiid' = wfWikiID(),
- ) );
+ );
+ if ( self::isMobileDomain() ) {
+ $params['mobile'] = 1;
+ }
+ $vars['wgCentralAuthCheckLoggedInURL'] =
wfAppendQuery( $url, $params );
}
}
}
@@ -1423,9 +1439,16 @@
// For non-JS clients. Use WikiMap to avoid
localization of the
// 'Special' namespace, see bug 54195.
$wiki = WikiMap::getWiki( wfWikiID() );
- $url = wfAppendQuery( $wiki-getFullUrl(
'Special:CentralAutoLogin/start' ), array(
+ $params = array(
'type' = '1x1',
- ) );
+ );
+ if ( self::isMobileDomain() ) {
+ $params['mobile'] = 1;
+ }
+ $url = wfAppendQuery(
+ $wiki-getFullUrl(
'Special:CentralAutoLogin/start' ),
+ $params
+ );
$out-addHTML( 'noscript' . Xml::element(
'img',
array(
'src' = $url,
@@ -1480,10 +1503,24 @@
foreach ( $wgCentralAuthAutoLoginWikis as $wiki ) {
$wiki = WikiMap::getWiki( $wiki );
// Use WikiReference::getFullUrl(), returns a
protocol-relative URL if needed
- $url = wfAppendQuery( $wiki-getFullUrl(
'Special:CentralAutoLogin/start' ), array(
+ $params = array(
'type' = '1x1',
'from' = wfWikiID(),
- ) );
+ );
+ $url =
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...ActivityMonitor)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/224761 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 --- A JENKINS A jenkins-testfile.py A jenkins.erb A jenkins.js A jenkins.php A jenkins.pp A jenkins.rb 7 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ActivityMonitor refs/changes/61/224761/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.erb b/jenkins.erb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.erb diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php diff --git a/jenkins.pp b/jenkins.pp new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.pp diff --git a/jenkins.rb b/jenkins.rb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.rb -- To view, visit https://gerrit.wikimedia.org/r/224761 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ActivityMonitor Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FEAT] ParamInfo: Support any submodules - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: [FEAT] ParamInfo: Support any submodules
..
[FEAT] ParamInfo: Support any submodules
This automatically loads the submodules of fetched param info. This allows
ParamInfo to return all modules available and the submodules for a specific
module instead of just specifically query's and main's modules. With that it is
also possible to get the attributes in general for all modules, which is
necessary to get the prefixes. It deprecates some methods because they were
using the name and not the path.
It also enables users to determine to which module any of the parameters belong
which is currently only possible for submodules of the main and query modules.
Change-Id: I7f5438d8d98649405c9510a610743e4ce4fa7c82
---
M pywikibot/data/api.py
M tests/api_tests.py
M tests/dry_api_tests.py
3 files changed, 316 insertions(+), 47 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index c6cbf67..f54fa6b 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -145,6 +145,8 @@
Partially supports MW 1.11, using data extracted from API 'help'.
MW 1.10 not supported as module prefixes are not extracted from API 'help'.
+It does not support the format modules.
+
TODO: Rewrite help parser to support earlier releases.
TODO: establish a data structure in the class which prefills
@@ -185,10 +187,11 @@
# Cached data.
self._prefixes = {}
+self._prefix_map = {}
self._with_limits = None
-self._action_modules = None
-self._query_modules = [] # filled in _init()
+self._action_modules = frozenset() # top level modules
+self._modules = {} # filled in _init() (and enlarged in fetch)
self._limit = None
self.preloaded_modules = self.init_modules
@@ -199,6 +202,24 @@
self.modules_only_mode = modules_only_mode
if self.modules_only_mode:
self.paraminfo_keys = frozenset(['modules'])
+
+def _add_submodules(self, name, modules):
+Add the modules to the internal cache or check if equal.
+# The current implementation here doesn't support submodules inside of
+# submodules, because that would require to fetch all modules when only
+# the names of them were requested
+assert '+' not in name
+modules = frozenset(modules)
+if name == 'main':
+# The main module behaves differently as it has no prefix
+if self._action_modules:
+assert modules == self._action_modules
+else:
+self._action_modules = modules
+elif name in self._modules:
+assert modules == self._modules[name]
+else:
+self._modules[name] = modules
def _init(self):
_mw_ver = MediaWikiVersion(self.site.version())
@@ -228,7 +249,7 @@
assert(main_modules_param)
assert('type' in main_modules_param)
assert(isinstance(main_modules_param['type'], list))
-self._action_modules = frozenset(main_modules_param['type'])
+assert self._action_modules == set(main_modules_param['type'])
# While deprecated with warning in 1.25, paraminfo param 'querymodules'
# provides a list of all query modules. This will likely be removed
@@ -242,36 +263,14 @@
if query_modules_param and 'type' in query_modules_param:
# 1.19+ 'type' is the list of modules; on 1.18, it is 'string'
if isinstance(query_modules_param['type'], list):
-self._query_modules = frozenset(query_modules_param['type'])
+self._add_submodules('query', query_modules_param['type'])
-if not self._query_modules:
-if 'query' not in self._paraminfo:
-self.fetch(set(['query']), _init=True)
+if 'query' not in self._modules:
+assert 'query' not in self._paraminfo
+self.fetch(set(['query']), _init=True)
+assert 'query' in self._modules
-meta_param = self.parameter('query', 'meta')
-prop_param = self.parameter('query', 'prop')
-list_param = self.parameter('query', 'list')
-generator_param = self.parameter('query', 'generator')
-
-assert(meta_param)
-assert(prop_param)
-assert(list_param)
-assert(generator_param)
-assert('type' in meta_param)
-assert('type' in prop_param)
-assert('type' in list_param)
-assert('type' in generator_param)
-assert(isinstance(meta_param['type'], list))
-assert(isinstance(prop_param['type'], list))
-assert(isinstance(list_param['type'], list))
-
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-07-15T10:00:01+0000 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review. https://gerrit.wikimedia.org/r/224762 Change subject: New Wikidata Build - 2015-07-15T10:00:01+ .. New Wikidata Build - 2015-07-15T10:00:01+ Change-Id: I6e88efe49499ea791ed9f7d49dc560fd27c56cd1 --- M composer.lock M extensions/Constraints/README.md M extensions/Constraints/composer.json R extensions/Constraints/maintenance/UpdateConstraintsTable.php R extensions/Constraints/tests/phpunit/Maintenance/UpdateConstraintsTableTest.php M extensions/PropertySuggester/README.md M extensions/PropertySuggester/tests/phpunit/PropertySuggester/GetSuggestionsTest.php M extensions/PropertySuggester/tests/phpunit/PropertySuggester/ResultBuilderTest.php M extensions/PropertySuggester/tests/phpunit/PropertySuggester/SuggesterParamsParserTest.php M extensions/PropertySuggester/tests/phpunit/PropertySuggester/Suggesters/SimpleSuggesterTest.php M extensions/PropertySuggester/tests/phpunit/PropertySuggester/SuggestionGeneratorTest.php M extensions/PropertySuggester/tests/phpunit/PropertySuggester/UpdateTable/UpdateTableTest.php M extensions/Wikibase/build/travis/install.sh M extensions/Wikibase/client/WikibaseClient.i18n.magic.php M extensions/Wikibase/client/i18n/av.json M extensions/Wikibase/client/i18n/az.json M extensions/Wikibase/client/i18n/bn.json M extensions/Wikibase/client/i18n/bs.json M extensions/Wikibase/client/i18n/cs.json M extensions/Wikibase/client/i18n/fa.json M extensions/Wikibase/client/i18n/frr.json M extensions/Wikibase/client/i18n/it.json M extensions/Wikibase/client/i18n/ja.json A extensions/Wikibase/client/i18n/kw.json A extensions/Wikibase/client/i18n/ky.json M extensions/Wikibase/client/i18n/luz.json M extensions/Wikibase/client/i18n/mzn.json M extensions/Wikibase/client/i18n/ps.json M extensions/Wikibase/client/i18n/ro.json M extensions/Wikibase/client/i18n/sl.json M extensions/Wikibase/client/includes/DataAccess/Scribunto/EntityAccessor.php M extensions/Wikibase/client/includes/api/ApiClientInfo.php M extensions/Wikibase/client/includes/api/PageTerms.php M extensions/Wikibase/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php M extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php M extensions/Wikibase/client/tests/phpunit/includes/store/sql/ConsistentReadConnectionManagerTest.php M extensions/Wikibase/lib/WikibaseLib.hooks.php M extensions/Wikibase/lib/WikibaseLib.php M extensions/Wikibase/lib/i18n/bs.json M extensions/Wikibase/lib/i18n/it.json M extensions/Wikibase/lib/i18n/ky.json M extensions/Wikibase/lib/i18n/ps.json M extensions/Wikibase/lib/includes/serializers/DispatchingEntitySerializer.php R extensions/Wikibase/lib/includes/serializers/LibSerializerFactory.php M extensions/Wikibase/lib/includes/store/EntityRevision.php A extensions/Wikibase/lib/includes/store/RedirectRevision.php A extensions/Wikibase/lib/includes/store/RevisionInfo.php M extensions/Wikibase/lib/includes/store/UnresolvedRedirectException.php M extensions/Wikibase/lib/includes/store/sql/WikiPageEntityRevisionLookup.php M extensions/Wikibase/lib/resources/Resources.php M extensions/Wikibase/lib/tests/phpunit/EntityRevisionLookupTest.php M extensions/Wikibase/lib/tests/phpunit/MockRepository.php M extensions/Wikibase/lib/tests/phpunit/MockRepositoryTest.php M extensions/Wikibase/lib/tests/phpunit/StringNormalizerTest.php M extensions/Wikibase/lib/tests/phpunit/changes/TestChanges.php M extensions/Wikibase/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php M extensions/Wikibase/lib/tests/phpunit/serializers/DispatchingEntitySerializerTest.php M extensions/Wikibase/lib/tests/phpunit/serializers/ItemSerializerTest.php R extensions/Wikibase/lib/tests/phpunit/serializers/LibSerializerFactoryTest.php M extensions/Wikibase/phpcs.xml M extensions/Wikibase/repo/Wikibase.hooks.php M extensions/Wikibase/repo/Wikibase.php M extensions/Wikibase/repo/i18n/ar.json M extensions/Wikibase/repo/i18n/ast.json M extensions/Wikibase/repo/i18n/be-tarask.json M extensions/Wikibase/repo/i18n/bn.json M extensions/Wikibase/repo/i18n/bs.json M extensions/Wikibase/repo/i18n/ckb.json M extensions/Wikibase/repo/i18n/cs.json M extensions/Wikibase/repo/i18n/de.json M extensions/Wikibase/repo/i18n/en.json M extensions/Wikibase/repo/i18n/es.json M extensions/Wikibase/repo/i18n/eu.json M extensions/Wikibase/repo/i18n/fi.json M extensions/Wikibase/repo/i18n/fr.json M extensions/Wikibase/repo/i18n/gl.json M extensions/Wikibase/repo/i18n/he.json M extensions/Wikibase/repo/i18n/ht.json M extensions/Wikibase/repo/i18n/hy.json M extensions/Wikibase/repo/i18n/it.json M extensions/Wikibase/repo/i18n/ja.json M extensions/Wikibase/repo/i18n/ksh.json A extensions/Wikibase/repo/i18n/kw.json M extensions/Wikibase/repo/i18n/ky.json M extensions/Wikibase/repo/i18n/lb.json M extensions/Wikibase/repo/i18n/luz.json M extensions/Wikibase/repo/i18n/mzn.json M
[MediaWiki-commits] [Gerrit] adds Phobject to extend classes - change (phabricator...Sprint)
Christopher Johnson (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224763
Change subject: adds Phobject to extend classes
..
adds Phobject to extend classes
Change-Id: I7a1f4e05ed9a5b92d2e3af4c7d482171b2af6347
---
M src/util/BurndownDataDate.php
M src/util/SprintBoardCardToken.php
M src/util/SprintPoints.php
M src/util/SprintValidator.php
M src/view/SprintBoardTaskCard.php
M src/view/SprintListTableView.php
M src/view/burndown/BoardDataPieView.php
M src/view/burndown/BoardDataTableView.php
M src/view/burndown/BurndownChartView.php
M src/view/burndown/EventTableView.php
M src/view/burndown/TasksTableView.php
11 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint
refs/changes/63/224763/1
diff --git a/src/util/BurndownDataDate.php b/src/util/BurndownDataDate.php
index 6c736d6..2d6eb7c 100644
--- a/src/util/BurndownDataDate.php
+++ b/src/util/BurndownDataDate.php
@@ -5,7 +5,7 @@
* @license GPL version 3
*/
-final class BurndownDataDate {
+final class BurndownDataDate extends Phobject {
private $date;
private $tasks_added_today;
diff --git a/src/util/SprintBoardCardToken.php
b/src/util/SprintBoardCardToken.php
index 0e8a886..ea3e677 100644
--- a/src/util/SprintBoardCardToken.php
+++ b/src/util/SprintBoardCardToken.php
@@ -1,6 +1,6 @@
?php
-final class SprintBoardCardToken {
+final class SprintBoardCardToken extends Phobject {
private $viewer;
public function setViewer ($viewer) {
diff --git a/src/util/SprintPoints.php b/src/util/SprintPoints.php
index 6c4f8f2..ea3c7a3 100644
--- a/src/util/SprintPoints.php
+++ b/src/util/SprintPoints.php
@@ -1,6 +1,6 @@
?php
-final class SprintPoints {
+final class SprintPoints extends Phobject {
private $taskpoints;
private $task_open_status_sum;
diff --git a/src/util/SprintValidator.php b/src/util/SprintValidator.php
index 863a671..c8fd8ef 100644
--- a/src/util/SprintValidator.php
+++ b/src/util/SprintValidator.php
@@ -1,6 +1,6 @@
?php
-final class SprintValidator {
+final class SprintValidator extends Phobject {
public function checkForSprint($showfields, $project_phid) {
$show = $showfields($project_phid);
diff --git a/src/view/SprintBoardTaskCard.php b/src/view/SprintBoardTaskCard.php
index b971dd6..a3614c5 100644
--- a/src/view/SprintBoardTaskCard.php
+++ b/src/view/SprintBoardTaskCard.php
@@ -1,6 +1,6 @@
?php
-final class SprintBoardTaskCard {
+final class SprintBoardTaskCard extends Phobject {
private $project;
private $viewer;
diff --git a/src/view/SprintListTableView.php b/src/view/SprintListTableView.php
index 95553cc..b3e250b 100644
--- a/src/view/SprintListTableView.php
+++ b/src/view/SprintListTableView.php
@@ -1,6 +1,6 @@
?php
-final class SprintListTableView {
+final class SprintListTableView extends Phobject {
private $tableData;
diff --git a/src/view/burndown/BoardDataPieView.php
b/src/view/burndown/BoardDataPieView.php
index a2b5d85..757a4ef 100644
--- a/src/view/burndown/BoardDataPieView.php
+++ b/src/view/burndown/BoardDataPieView.php
@@ -1,6 +1,6 @@
?php
-final class BoardDataPieView {
+final class BoardDataPieView extends Phobject{
private $boardData;
diff --git a/src/view/burndown/BoardDataTableView.php
b/src/view/burndown/BoardDataTableView.php
index 50f046d..b185f2c 100644
--- a/src/view/burndown/BoardDataTableView.php
+++ b/src/view/burndown/BoardDataTableView.php
@@ -1,6 +1,6 @@
?php
-final class BoardDataTableView {
+final class BoardDataTableView extends Phobject{
private $boardData;
@@ -21,7 +21,7 @@
$box = id(new PHUIObjectBoxView())
-setHeaderText(pht('Board Column List'))
--appendChild($table);
+-setTable($table);
return $box;
}
}
diff --git a/src/view/burndown/BurndownChartView.php
b/src/view/burndown/BurndownChartView.php
index eae5047..9d4583e 100644
--- a/src/view/burndown/BurndownChartView.php
+++ b/src/view/burndown/BurndownChartView.php
@@ -1,6 +1,6 @@
?php
-final class BurndownChartView {
+final class BurndownChartView extends Phobject{
private $data;
public function setChartData($chart_data) {
diff --git a/src/view/burndown/EventTableView.php
b/src/view/burndown/EventTableView.php
index d8cabdd..2c036c0 100644
--- a/src/view/burndown/EventTableView.php
+++ b/src/view/burndown/EventTableView.php
@@ -1,6 +1,6 @@
?php
-final class EventTableView {
+final class EventTableView extends Phobject{
private $project;
private $viewer;
private $request;
@@ -66,7 +66,7 @@
));
$box = id(new PHUIObjectBoxView())
-setHeaderText(pht('Events related to this sprint'))
--appendChild($table);
+-setTable($table);
return $box;
}
diff --git a/src/view/burndown/TasksTableView.php
b/src/view/burndown/TasksTableView.php
index 51aa305..ba35d7a 100644
---
[MediaWiki-commits] [Gerrit] adds enable Phragile configuration option enables 'View in P... - change (phabricator...Sprint)
Christopher Johnson (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224765
Change subject: adds enable Phragile configuration option enables 'View in
Phragile' option in Project Profile Action menu enables icon in Project
Navigation menu
..
adds enable Phragile configuration option
enables 'View in Phragile' option in Project Profile Action menu
enables icon in Project Navigation menu
Bug: T104454
Change-Id: I9eae7306b3288b2a92a6a2164b7eda806d91f4bf
---
M src/config/SprintConfigOptions.php
M src/controller/SprintController.php
M src/events/BurndownActionMenuEventListener.php
3 files changed, 35 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint
refs/changes/65/224765/1
diff --git a/src/config/SprintConfigOptions.php
b/src/config/SprintConfigOptions.php
index f7ae983..5835e6e 100644
--- a/src/config/SprintConfigOptions.php
+++ b/src/config/SprintConfigOptions.php
@@ -88,6 +88,17 @@
pht(
The Sprint Board is optional.
\n\n.)),
+$this-newOption('sprint.enable-phragile', 'bool', false)
+-setBoolOptions(
+array(
+pht('Enable Phragile'),
+pht('Disble Phragile'),
+))
+-setSummary(pht('Enable or Disable Phragile Extension.'))
+-setDescription(
+pht(
+Phragile charts are provided by an external application
at https://phragile.wmflabs.org;.
+\n\n.)),
);
}
diff --git a/src/controller/SprintController.php
b/src/controller/SprintController.php
index 401f9fb..bb7667d 100644
--- a/src/controller/SprintController.php
+++ b/src/controller/SprintController.php
@@ -129,7 +129,8 @@
$id = $project-getID();
$picture = $project-getProfileImageURI();
$name = $project-getName();
-
+$enable_phragile = PhabricatorEnv::getEnvConfig('sprint.enable-phragile');
+$phragile_uri = new PhutilURI('https://phragile.wmflabs.org/sprints/'.$id);
$columns = id(new PhabricatorProjectColumnQuery())
-setViewer($viewer)
-withProjectPHIDs(array($project-getPHID()))
@@ -144,10 +145,13 @@
$nav-setIconNav(true);
if ($this-isSprint($project) !== false) {
$nav-setBaseURI(new PhutilURI($this-getApplicationURI()));
- $nav-addIcon(profile/{$id}/, $name, null, $picture);
- $nav-addIcon(burn/{$id}/, pht('Burndown'), 'fa-fire');
- $nav-addIcon(board/{$id}/, pht('Sprint Board'), $board_icon);
- $nav-addIcon('.', pht('Sprint List'), 'fa-bar-chart');
+ $nav-addIcon(profile/{$id}/, $name, null, $picture, null);
+ $nav-addIcon(burn/{$id}/, pht('Burndown'), 'fa-fire', null, null);
+ if ($enable_phragile) {
+$nav-addIcon(sprints/{$id}/, pht('Phragile'), 'fa-pie-chart', null,
$phragile_uri);
+ }
+ $nav-addIcon(board/{$id}/, pht('Sprint Board'), $board_icon, null,
null);
+ $nav-addIcon('.', pht('Sprint List'), 'fa-bar-chart', null, null);
} else {
$nav-setBaseURI(new PhutilURI($this-getProjectsURI()));
$nav-addIcon(profile/{$id}/, $name, null, $picture);
@@ -162,9 +166,9 @@
$nav-addIcon(null, pht('Open Tasks'), 'fa-anchor', null, $query_uri);
}
-$nav-addIcon(feed/{$id}/, pht('Feed'), 'fa-newspaper-o');
-$nav-addIcon(members/{$id}/, pht('Members'), 'fa-group');
-$nav-addIcon(details/{$id}/, pht('Edit Details'), 'fa-pencil');
+$nav-addIcon(feed/{$id}/, pht('Feed'), 'fa-newspaper-o', null, null);
+$nav-addIcon(members/{$id}/, pht('Members'), 'fa-group', null, null);
+$nav-addIcon(details/{$id}/, pht('Edit Details'), 'fa-pencil', null,
null);
return $nav;
}
diff --git a/src/events/BurndownActionMenuEventListener.php
b/src/events/BurndownActionMenuEventListener.php
index e0b44ec..962c553 100644
--- a/src/events/BurndownActionMenuEventListener.php
+++ b/src/events/BurndownActionMenuEventListener.php
@@ -42,12 +42,13 @@
if (!$this-canUseApplication($event-getUser())) {
return null;
}
-
+$enable_phragile = PhabricatorEnv::getEnvConfig('sprint.enable-phragile');
$project = $event-getValue('object');
$projectid = $project-getId();
$view_uri = '/project/sprint/view/'.$projectid;
$board_uri = '/project/sprint/board/'.$projectid;
+$phragile_uri = 'https://phragile.wmflabs.org/sprints/'.$projectid;
$burndown = id(new PhabricatorActionView())
-setIcon('fa-bar-chart-o')
@@ -59,7 +60,16 @@
-setName(pht('View Sprint Board'))
-setHref($board_uri);
-return array ($burndown, $board);
+$phragile = null;
+if ($enable_phragile) {
+ $phragile = id(new PhabricatorActionView())
+ -setIcon('fa-pie-chart')
+ -setName(pht('View in Phragile'))
+ -setHref($phragile_uri);
+}
+
+
+
[MediaWiki-commits] [Gerrit] updates to upstream master 184623a7c6bbcf8053d177861174b3709... - change (phabricator...Sprint)
Christopher Johnson (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224764
Change subject: updates to upstream master
184623a7c6bbcf8053d177861174b37094c33948 15-07-2015
..
updates to upstream master 184623a7c6bbcf8053d177861174b37094c33948
15-07-2015
Change-Id: I0cf6602bcd9030ef94ecab9aad5a3a2bca8924fb
---
M src/controller/SprintReportController.php
M src/controller/board/SprintBoardBatchEditController.php
M src/controller/board/SprintBoardController.php
M src/controller/board/SprintBoardViewController.php
4 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint
refs/changes/64/224764/1
diff --git a/src/controller/SprintReportController.php
b/src/controller/SprintReportController.php
index 203a781..0afc60c 100644
--- a/src/controller/SprintReportController.php
+++ b/src/controller/SprintReportController.php
@@ -56,6 +56,7 @@
$nav-appendChild($core);
$nav-setCrumbs(
$this-buildSprintApplicationCrumbs($can_create)
+-setBorder(true)
-addTextCrumb(pht('Reports')));
return $this-buildApplicationPage(
diff --git a/src/controller/board/SprintBoardBatchEditController.php
b/src/controller/board/SprintBoardBatchEditController.php
index 2467aab..49133e9 100644
--- a/src/controller/board/SprintBoardBatchEditController.php
+++ b/src/controller/board/SprintBoardBatchEditController.php
@@ -173,7 +173,7 @@
$task_box = id(new PHUIObjectBoxView())
-setHeaderText(pht('Selected Tasks'))
--appendChild($list);
+-setObjectList($list);
$form_box = id(new PHUIObjectBoxView())
-setHeaderText(pht('Batch Editor'))
diff --git a/src/controller/board/SprintBoardController.php
b/src/controller/board/SprintBoardController.php
index ee5bd86..423a842 100644
--- a/src/controller/board/SprintBoardController.php
+++ b/src/controller/board/SprintBoardController.php
@@ -17,6 +17,7 @@
$id = $project-getID();
$nav = parent::buildIconNavView($project);
$nav-selectFilter(board/{$id}/);
+$nav-addClass('project-board-nav');
return $nav;
}
}
diff --git a/src/controller/board/SprintBoardViewController.php
b/src/controller/board/SprintBoardViewController.php
index 1919324..a38e246 100755
--- a/src/controller/board/SprintBoardViewController.php
+++ b/src/controller/board/SprintBoardViewController.php
@@ -395,7 +395,7 @@
$project-getName());
$header = id(new PHUIHeaderView())
- -setHeader(pht('%s Workboard', $header_link))
+ -setHeader($header_link)
-setUser($viewer)
-setNoBackground(true)
-addActionLink($sort_menu)
--
To view, visit https://gerrit.wikimedia.org/r/224764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cf6602bcd9030ef94ecab9aad5a3a2bca8924fb
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Autocomplete search operators - change (mediawiki...Translate)
Phoenix303 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224753
Change subject: Autocomplete search operators
..
Autocomplete search operators
Allows a user to easily access search operators with the autocompletion.
Bug: T98559
Change-Id: I168bdcdaf75caf17397c326980a7ddaefb6c3ea3
---
M Resources.php
A resources/js/ext.translate.special.operatorsuggest.js
M specials/SpecialSearchTranslations.php
3 files changed, 44 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/53/224753/1
diff --git a/Resources.php b/Resources.php
index 93246b4..2ac9831 100644
--- a/Resources.php
+++ b/Resources.php
@@ -418,6 +418,13 @@
'position' = 'top',
) + $resourcePaths;
+$wgResourceModules['ext.translate.special.operatorsuggest'] = array(
+ 'scripts' = 'resources/js/ext.translate.special.operatorsuggest.js',
+ 'dependencies' = array(
+ 'jquery.ui.autocomplete',
+ ),
+) + $resourcePaths;
+
$wgResourceModules['ext.translate.special.translate'] = array(
'styles' = 'resources/css/ext.translate.special.translate.css',
'scripts' = 'resources/js/ext.translate.special.translate.js',
diff --git a/resources/js/ext.translate.special.operatorsuggest.js
b/resources/js/ext.translate.special.operatorsuggest.js
new file mode 100644
index 000..4628487
--- /dev/null
+++ b/resources/js/ext.translate.special.operatorsuggest.js
@@ -0,0 +1,36 @@
+/*
+ * Autocomplete search operators.
+ */
+( function ( mw, $ ) {
+ function autocompleteOperators( request, response ) {
+ var operators = [ 'language:', 'group:' ],
+ result = [],
+ lastterm = request.term.split( ' ' ).pop();
+
+ $.each( operators, function ( index, value ) {
+ var pos = value.indexOf( lastterm );
+ if ( pos === 0 ) {
+ result.push( value );
+ }
+ } );
+ response( result );
+ };
+ $( '.tux-searchpage .searchinputbox' )
+ .autocomplete( {
+ source: autocompleteOperators,
+ select: function ( event, ui ) {
+ var $value = $( this ).val(),
+ operators = $value.split( ' ' );
+
+ operators.pop();
+ operators.push( ui.item.value );
+
+ $( this ).val( operators.join( ' ' ) );
+ return false;
+ },
+
+ focus: function (event, ui) {
+ event.preventDefault();
+ }
+ } );
+}( mediaWiki, jQuery ) );
diff --git a/specials/SpecialSearchTranslations.php
b/specials/SpecialSearchTranslations.php
index 17c880e..a4169b7 100644
--- a/specials/SpecialSearchTranslations.php
+++ b/specials/SpecialSearchTranslations.php
@@ -61,6 +61,7 @@
$out = $this-getOutput();
$out-addModules( 'ext.translate.special.searchtranslations' );
+ $out-addModules( 'ext.translate.special.operatorsuggest' );
$this-opts = $opts = new FormOptions();
$opts-add( 'query', '' );
--
To view, visit https://gerrit.wikimedia.org/r/224753
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I168bdcdaf75caf17397c326980a7ddaefb6c3ea3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Phoenix303 divyalife...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove deprecated method Property.getType() - change (pywikibot/core)
Ricordisamoa has uploaded a new change for review. https://gerrit.wikimedia.org/r/224754 Change subject: Remove deprecated method Property.getType() .. Remove deprecated method Property.getType() Obsolete for over 1 year, see commit 2c1902849c8d4cb3256aa09db2bd68a7b599e6f9. Change-Id: Id734cdcbfd13eeeb63b66ce9c98e72006daba623 --- M pywikibot/page.py M tests/wikibase_tests.py 2 files changed, 0 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/54/224754/1 diff --git a/pywikibot/page.py b/pywikibot/page.py index 933a51e..d349248 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -3936,20 +3936,6 @@ self._type = self.repo.getPropertyType(self) return self._type -@deprecated(Property.type) -def getType(self): - -Return the type of this property. - -It returns 'globecoordinate' for type 'globe-coordinate' -in order to be backwards compatible. See -https://gerrit.wikimedia.org/r/#/c/135405/ for background. - -if self.type == 'globe-coordinate': -return 'globecoordinate' -else: -return self._type - def getID(self, numeric=False): Get the identifier of this property. diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index ef98b5d..2e483e9 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -540,11 +540,9 @@ wikidata = self.get_repo() property_page = pywikibot.PropertyPage(wikidata, 'P625') self.assertEqual(property_page.type, 'globe-coordinate') -self.assertEqual(property_page.getType(), 'globecoordinate') claim = pywikibot.Claim(wikidata, 'P625') self.assertEqual(claim.type, 'globe-coordinate') -self.assertEqual(claim.getType(), 'globecoordinate') def test_get(self): wikidata = self.get_repo() -- To view, visit https://gerrit.wikimedia.org/r/224754 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id734cdcbfd13eeeb63b66ce9c98e72006daba623 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa ricordisa...@openmailbox.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Conversion to using getMainStashInstance() - change (mediawiki...ConfirmEdit)
jenkins-bot has submitted this change and it was merged.
Change subject: Conversion to using getMainStashInstance()
..
Conversion to using getMainStashInstance()
Bug: T97620
Change-Id: I94be31eb95cd86c2b922d1c802c6e6c6785b7905
---
M includes/CaptchaStore.php
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/CaptchaStore.php b/includes/CaptchaStore.php
old mode 100644
new mode 100755
index b0854df..7580071
--- a/includes/CaptchaStore.php
+++ b/includes/CaptchaStore.php
@@ -58,7 +58,6 @@
}
class CaptchaSessionStore extends CaptchaStore {
-
protected function __construct() {
// Make sure the session is started
if ( session_id() === '' ) {
@@ -88,16 +87,18 @@
}
class CaptchaCacheStore extends CaptchaStore {
-
function store( $index, $info ) {
- global $wgMemc, $wgCaptchaSessionExpiration;
- $wgMemc-set( wfMemcKey( 'captcha', $index ), $info,
- $wgCaptchaSessionExpiration );
+ global $wgCaptchaSessionExpiration;
+
+ ObjectCache::getMainStashInstance()-set(
+ wfMemcKey( 'captcha', $index ),
+ $info,
+ $wgCaptchaSessionExpiration
+ );
}
function retrieve( $index ) {
- global $wgMemc;
- $info = $wgMemc-get( wfMemcKey( 'captcha', $index ) );
+ $info = ObjectCache::getMainStashInstance()-get( wfMemcKey(
'captcha', $index ) );
if ( $info ) {
return $info;
} else {
@@ -106,8 +107,7 @@
}
function clear( $index ) {
- global $wgMemc;
- $wgMemc-delete( wfMemcKey( 'captcha', $index ) );
+ ObjectCache::getMainStashInstance()-delete( wfMemcKey(
'captcha', $index ) );
}
function cookiesNeeded() {
--
To view, visit https://gerrit.wikimedia.org/r/213762
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94be31eb95cd86c2b922d1c802c6e6c6785b7905
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.stargatewis...@gmail.com
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jquery.makeCollapsible: Make it possible to clone a collapsible - change (mediawiki/core)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224758
Change subject: jquery.makeCollapsible: Make it possible to clone a collapsible
..
jquery.makeCollapsible: Make it possible to clone a collapsible
Currently collapsible elements are no longer collapsible after you
cloned them and made them collapsible again, e.g. via
$clone = $('#bodyContent').clone();
mw.hook('wikipage.content').fire($clone);
$('#bodyContent').replaceWith($clone);
This patch fixes this by ignoring the linksPassthru option on links
with href=#.
Bug: T71288
Change-Id: I954483f3e26f46172ec2374a3717f37dd309ca57
---
M resources/src/jquery/jquery.makeCollapsible.js
M tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js
2 files changed, 25 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/58/224758/1
diff --git a/resources/src/jquery/jquery.makeCollapsible.js
b/resources/src/jquery/jquery.makeCollapsible.js
index f7c4217..19fdb26 100644
--- a/resources/src/jquery/jquery.makeCollapsible.js
+++ b/resources/src/jquery/jquery.makeCollapsible.js
@@ -159,8 +159,13 @@
}
if ( e ) {
- if ( e.type === 'click' options.linksPassthru
$.nodeName( e.target, 'a' ) ) {
- // Don't fire if a link was clicked, if
requested (for premade togglers by default)
+ if (
+ e.type === 'click'
+ options.linksPassthru
+ $.nodeName( e.target, 'a' )
+ $( e.target ).attr( 'href' ) !== '#'
+ ) {
+ // Don't fire if a link with href !== '#' was
clicked, if requested (for premade togglers by default)
return;
} else if ( e.type === 'keypress' e.which !== 13
e.which !== 32 ) {
// Only handle keypresses on the Enter or
Space keys
diff --git a/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js
b/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js
index 8040581..c51e409 100644
--- a/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js
@@ -336,4 +336,22 @@
this.clock.tick( 500 );
} );
+ QUnit.test( 'cloned collapsibles can be made collapsible again', 2,
function ( assert ) {
+ var test = this,
+ $collapsible = prepareCollapsible(
+ 'div class=mw-collapsible' + loremIpsum +
'/div'
+ ),
+ $clone = $collapsible.clone() // clone without data and
events
+ .appendTo( '#qunit-fixture' ).makeCollapsible(),
+ $content = $clone.find( '.mw-collapsible-content' );
+
+ assert.assertTrue( $content.is( ':visible' ), 'content is
visible' );
+
+ $clone.on( 'afterCollapse.mw-collapsible', function () {
+ assert.assertTrue( $content.is( ':hidden' ), 'after
collapsing: content is hidden' );
+ } );
+
+ $clone.find( '.mw-collapsible-toggle a' ).trigger( 'click' );
+ test.clock.tick( 500 );
+ } );
}( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/224758
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I954483f3e26f46172ec2374a3717f37dd309ca57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: Schnark listenle...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adds Phobject to extend classes - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: adds Phobject to extend classes
..
adds Phobject to extend classes
Change-Id: I7a1f4e05ed9a5b92d2e3af4c7d482171b2af6347
---
M src/util/BurndownDataDate.php
M src/util/SprintBoardCardToken.php
M src/util/SprintPoints.php
M src/util/SprintValidator.php
M src/view/SprintBoardTaskCard.php
M src/view/SprintListTableView.php
M src/view/burndown/BoardDataPieView.php
M src/view/burndown/BoardDataTableView.php
M src/view/burndown/BurndownChartView.php
M src/view/burndown/EventTableView.php
M src/view/burndown/TasksTableView.php
11 files changed, 14 insertions(+), 14 deletions(-)
Approvals:
Christopher Johnson (WMDE): Verified; Looks good to me, approved
diff --git a/src/util/BurndownDataDate.php b/src/util/BurndownDataDate.php
index 6c736d6..2d6eb7c 100644
--- a/src/util/BurndownDataDate.php
+++ b/src/util/BurndownDataDate.php
@@ -5,7 +5,7 @@
* @license GPL version 3
*/
-final class BurndownDataDate {
+final class BurndownDataDate extends Phobject {
private $date;
private $tasks_added_today;
diff --git a/src/util/SprintBoardCardToken.php
b/src/util/SprintBoardCardToken.php
index 0e8a886..ea3e677 100644
--- a/src/util/SprintBoardCardToken.php
+++ b/src/util/SprintBoardCardToken.php
@@ -1,6 +1,6 @@
?php
-final class SprintBoardCardToken {
+final class SprintBoardCardToken extends Phobject {
private $viewer;
public function setViewer ($viewer) {
diff --git a/src/util/SprintPoints.php b/src/util/SprintPoints.php
index 6c4f8f2..ea3c7a3 100644
--- a/src/util/SprintPoints.php
+++ b/src/util/SprintPoints.php
@@ -1,6 +1,6 @@
?php
-final class SprintPoints {
+final class SprintPoints extends Phobject {
private $taskpoints;
private $task_open_status_sum;
diff --git a/src/util/SprintValidator.php b/src/util/SprintValidator.php
index 863a671..c8fd8ef 100644
--- a/src/util/SprintValidator.php
+++ b/src/util/SprintValidator.php
@@ -1,6 +1,6 @@
?php
-final class SprintValidator {
+final class SprintValidator extends Phobject {
public function checkForSprint($showfields, $project_phid) {
$show = $showfields($project_phid);
diff --git a/src/view/SprintBoardTaskCard.php b/src/view/SprintBoardTaskCard.php
index b971dd6..a3614c5 100644
--- a/src/view/SprintBoardTaskCard.php
+++ b/src/view/SprintBoardTaskCard.php
@@ -1,6 +1,6 @@
?php
-final class SprintBoardTaskCard {
+final class SprintBoardTaskCard extends Phobject {
private $project;
private $viewer;
diff --git a/src/view/SprintListTableView.php b/src/view/SprintListTableView.php
index 95553cc..b3e250b 100644
--- a/src/view/SprintListTableView.php
+++ b/src/view/SprintListTableView.php
@@ -1,6 +1,6 @@
?php
-final class SprintListTableView {
+final class SprintListTableView extends Phobject {
private $tableData;
diff --git a/src/view/burndown/BoardDataPieView.php
b/src/view/burndown/BoardDataPieView.php
index a2b5d85..757a4ef 100644
--- a/src/view/burndown/BoardDataPieView.php
+++ b/src/view/burndown/BoardDataPieView.php
@@ -1,6 +1,6 @@
?php
-final class BoardDataPieView {
+final class BoardDataPieView extends Phobject{
private $boardData;
diff --git a/src/view/burndown/BoardDataTableView.php
b/src/view/burndown/BoardDataTableView.php
index 50f046d..b185f2c 100644
--- a/src/view/burndown/BoardDataTableView.php
+++ b/src/view/burndown/BoardDataTableView.php
@@ -1,6 +1,6 @@
?php
-final class BoardDataTableView {
+final class BoardDataTableView extends Phobject{
private $boardData;
@@ -21,7 +21,7 @@
$box = id(new PHUIObjectBoxView())
-setHeaderText(pht('Board Column List'))
--appendChild($table);
+-setTable($table);
return $box;
}
}
diff --git a/src/view/burndown/BurndownChartView.php
b/src/view/burndown/BurndownChartView.php
index eae5047..9d4583e 100644
--- a/src/view/burndown/BurndownChartView.php
+++ b/src/view/burndown/BurndownChartView.php
@@ -1,6 +1,6 @@
?php
-final class BurndownChartView {
+final class BurndownChartView extends Phobject{
private $data;
public function setChartData($chart_data) {
diff --git a/src/view/burndown/EventTableView.php
b/src/view/burndown/EventTableView.php
index d8cabdd..2c036c0 100644
--- a/src/view/burndown/EventTableView.php
+++ b/src/view/burndown/EventTableView.php
@@ -1,6 +1,6 @@
?php
-final class EventTableView {
+final class EventTableView extends Phobject{
private $project;
private $viewer;
private $request;
@@ -66,7 +66,7 @@
));
$box = id(new PHUIObjectBoxView())
-setHeaderText(pht('Events related to this sprint'))
--appendChild($table);
+-setTable($table);
return $box;
}
diff --git a/src/view/burndown/TasksTableView.php
b/src/view/burndown/TasksTableView.php
index 51aa305..ba35d7a 100644
--- a/src/view/burndown/TasksTableView.php
+++ b/src/view/burndown/TasksTableView.php
@@
[MediaWiki-commits] [Gerrit] Fix blurry banners when no support for srcset - change (mediawiki...WikidataPageBanner)
jenkins-bot has submitted this change and it was merged. Change subject: Fix blurry banners when no support for srcset .. Fix blurry banners when no support for srcset Set src attribute of banner image to url of largest in order to load best banner when browser has no support for srcset. Bug: T105203 Change-Id: I0b659b30b89171a91c70b0e243accf7f0046d1b6 --- M includes/WikidataPageBanner.hooks.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jdlrobson: Looks good to me, approved Nicolas Raoul: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/includes/WikidataPageBanner.hooks.php b/includes/WikidataPageBanner.hooks.php index 29e57c7..4ce610a 100644 --- a/includes/WikidataPageBanner.hooks.php +++ b/includes/WikidataPageBanner.hooks.php @@ -195,7 +195,8 @@ } // create full src set from individual urls, separated by comma $srcset = implode( ',', $srcset ); - $bannerurl = $urls[0]; + // use largest image url as src attribute + $bannerurl = $urls[count( $urls ) - 1]; $bannerfile = str_replace( $1, File:$bannername, $wgArticlePath ); $templateParser = new TemplateParser( __DIR__ . '/../templates' ); $options['bannerfile'] = $bannerfile; -- To view, visit https://gerrit.wikimedia.org/r/223746 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0b659b30b89171a91c70b0e243accf7f0046d1b6 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/WikidataPageBanner Gerrit-Branch: master Gerrit-Owner: Sumit asthana.sumi...@gmail.com Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Nicolas Raoul nicolas.ra...@gmail.com Gerrit-Reviewer: Sumit asthana.sumi...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move some extensions jobs from check-only to check - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/224766 Change subject: Move some extensions jobs from check-only to check .. Move some extensions jobs from check-only to check The mw-checks pipeline will vote +2, which does not make sense when there are tests that should be run such as jshint. Change some extensions to use mw-checks-test template instead, wich has the check jobs in the 'check' pipeline. Changes: * ActivityMonitor * Narayam * XAnalytics * PoolCounter * WikiLexicalData Change-Id: I8c36c26bca1e59882d40aaa3dcc9888fac1bcfbd --- M zuul/layout.yaml 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/66/224766/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 5368cf7..7f47182 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2962,7 +2962,7 @@ - name: mediawiki/extensions/ActivityMonitor template: - - name: mw-checks + - name: mw-checks-test - name: jshint - name: jsonlint @@ -4162,7 +4162,7 @@ # TODO: add qunit - name: mediawiki/extensions/Narayam template: - - name: mw-checks + - name: mw-checks-test - name: jshint - name: jsonlint @@ -6477,7 +6477,7 @@ - name: mediawiki/extensions/XAnalytics template: - - name: mw-checks + - name: mw-checks-test - name: npm check: - jsonlint @@ -6626,7 +6626,7 @@ - name: mediawiki/extensions/PoolCounter template: - - name: mw-checks + - name: mw-checks-test - name: jshint - name: npm check: @@ -7413,7 +7413,7 @@ - name: mediawiki/extensions/WikiLexicalData template: - - name: mw-checks + - name: mw-checks-test - name: jshint - name: jsonlint -- To view, visit https://gerrit.wikimedia.org/r/224766 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8c36c26bca1e59882d40aaa3dcc9888fac1bcfbd Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.jqueryMsg: Use load urls instead of file urls for ... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.jqueryMsg: Use load urls instead of file urls for
debug
..
mediawiki.jqueryMsg: Use load urls instead of file urls for debug
Follows-up 2dd9ec2.
Bug: T104490
Change-Id: I140194785c1f9d210d5c0daca51413b2d0b26527
---
M includes/resourceloader/ResourceLoaderJqueryMsgModule.php
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, but someone else must approve
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/resourceloader/ResourceLoaderJqueryMsgModule.php
b/includes/resourceloader/ResourceLoaderJqueryMsgModule.php
index d159284..f9dfbdc 100644
--- a/includes/resourceloader/ResourceLoaderJqueryMsgModule.php
+++ b/includes/resourceloader/ResourceLoaderJqueryMsgModule.php
@@ -49,6 +49,15 @@
}
/**
+ * @param ResourceLoaderContext $context
+ * @return array
+ */
+ public function getScriptURLsForDebug( ResourceLoaderContext $context )
{
+ // Bypass file module urls
+ return ResourceLoaderModule::getScriptURLsForDebug( $context );
+ }
+
+ /**
* @return bool
*/
public function enableModuleContentVersion() {
--
To view, visit https://gerrit.wikimedia.org/r/222182
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I140194785c1f9d210d5c0daca51413b2d0b26527
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improved BSCoreConfigGet Hook - change (mediawiki...BlueSpiceFoundation)
Pwirth has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224755
Change subject: Improved BSCoreConfigGet Hook
..
Improved BSCoreConfigGet Hook
* Added doc
Change-Id: Ifaa14b435bf0d5a75037ec372767d8f2482b5a8e
---
M doc/hooks.txt
M includes/Config.class.php
2 files changed, 15 insertions(+), 13 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/55/224755/1
diff --git a/doc/hooks.txt b/doc/hooks.txt
index ae488f4..a3920f9 100644
--- a/doc/hooks.txt
+++ b/doc/hooks.txt
@@ -13,4 +13,9 @@
'BsFoundationBeforeMakeGlobalVariablesScript': Allows last minute manipulation
of the RENDER_AS_JAVASCRIPT config vars
$oUser: The current MediaWiki User object
-$aScriptSettings: Array of script settings (BsConfig::getScriptSettings())
\ No newline at end of file
+$aScriptSettings: Array of script settings (BsConfig::getScriptSettings())
+
+'BSCoreConfigGet': Allows override of the config return value before the
setting
+is loaded - return false to use own value
+$sPath: Key of the Config (Like 'MW::SomeExttension::SomePreference')
+$mReturn: Value to return, when hook handler returns false
\ No newline at end of file
diff --git a/includes/Config.class.php b/includes/Config.class.php
index da5a355..904763b 100644
--- a/includes/Config.class.php
+++ b/includes/Config.class.php
@@ -175,23 +175,20 @@
}
/**
-* gets the value of the variable, which is specified by the path
-*
-* @param string $path
-* The unique identifier the variable should be accessibly
by. I.e. 'Adapter::Extension::MyVar'.
+* Gets the value of the variable, which is specified by the path
+* @param string $sPath The unique identifier the variable should be
accessibly by. I.e. 'Adapter::Extension::MyVar'.
* @return mixed the value
*/
- public static function get( $path ) {
+ public static function get( $sPath ) {
wfProfileIn ( 'BS::Core::ConfigGet' );
- if ( function_exists ( 'wfRunHooks' ) ) {
- $bChanged = false;
- wfRunHooks ( BSCoreConfigGet, array ( $path,
$bChanged ) );
- if ( $bChanged === true ) {
- return $path;
- }
+ $mReturn = null;
+ if( !wfRunHooks ( BSCoreConfigGet, array ( $sPath, $mReturn
) ) ) {
+ wfProfileOut ( 'BS::Core::ConfigGet' );
+ return $mReturn;
}
- $oSetting = self::getSettingObject ( $path );
+
+ $oSetting = self::getSettingObject ( $sPath );
wfProfileOut ( 'BS::Core::ConfigGet' );
--
To view, visit https://gerrit.wikimedia.org/r/224755
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifaa14b435bf0d5a75037ec372767d8f2482b5a8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth wi...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Minor optimization - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged.
Change subject: Minor optimization
..
Minor optimization
Instead of calling $this-getSkin() a dozen times all over the place, call
it once and store the result in a variable, and then call the variable
instead.
Change-Id: I84b2ea0324ab778a71b64ffeebfc2c722fb7ad19
---
M MetrolookTemplate.php
1 file changed, 14 insertions(+), 13 deletions(-)
Approvals:
Paladox: Looks good to me, approved
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 7ed938c..e864641 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -83,11 +83,12 @@
* Outputs the entire contents of the (X)HTML page
*/
public function execute() {
+ $skin = $this-getSkin();
// Build additional attributes for navigation urls
$nav = $this-data['content_navigation'];
if ( $this-config-get( 'VectorUseIconWatch' ) ) {
- $mode = $this-getSkin()-getUser()-isWatched(
$this-getSkin()-getRelevantTitle() )
+ $mode = $skin-getUser()-isWatched(
$skin-getRelevantTitle() )
? 'unwatch'
: 'watch';
@@ -147,13 +148,13 @@
}
$this-data['pageLanguage'] =
-
$this-getSkin()-getTitle()-getPageViewLanguage()-getHtmlCode();
+ $skin-getTitle()-getPageViewLanguage()-getHtmlCode();
// User name (or Guest) to be displayed at the top right (on
LTR
// interfaces) portion of the skin
- $user = $this-getSkin()-getUser();
+ $user = $skin-getUser();
if ( !$user-isLoggedIn() ) {
- $userNameTop = $this-getSkin()-msg( 'metrolook-guest'
)-text();
+ $userNameTop = $skin-msg( 'metrolook-guest' )-text();
} else {
$userNameTop = htmlspecialchars( $user-getName(),
ENT_QUOTES );
}
@@ -270,7 +271,7 @@
li id=footer-?php echo
htmlspecialchars( $blockName ); ?ico
?php
foreach ( $footerIcons
as $icon ) {
- echo
$this-getSkin()-makeFooterIcon( $icon );
+ echo
$skin-makeFooterIcon( $icon );
}
?
/li
@@ -307,7 +308,7 @@
class=userIcon20
alt=
src=?php
- echo
htmlspecialchars( $this-getSkin()-getSkinStylePath( 'images/Transparent.gif'
) )
+ echo
htmlspecialchars( $skin-getSkinStylePath( 'images/Transparent.gif' ) )
?
/
/span
@@ -317,7 +318,7 @@
class=userIcon40
alt=
src=?php
- echo
htmlspecialchars( $this-getSkin()-getSkinStylePath( 'images/Transparent.gif'
) )
+ echo
htmlspecialchars( $skin-getSkinStylePath( 'images/Transparent.gif' ) )
?
/
/span
@@ -339,7 +340,7 @@
class=hamburger
alt=
src=?php echo htmlspecialchars(
- $this-getSkin()-getSkinStylePath(
'images/Transparent.gif' ) ) ? /
+ $skin-getSkinStylePath(
'images/Transparent.gif' ) ) ? /
/div
?php
@@ -381,7 +382,7 @@
class=line
alt=
src=?php echo htmlspecialchars(
- $this-getSkin()-getSkinStylePath(
'images/Transparent.gif' ) ) ?
+
[MediaWiki-commits] [Gerrit] Added two hooks for ad integration - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged.
Change subject: Added two hooks for ad integration
..
Added two hooks for ad integration
An additional extension, such as [[mw:Extension:ShoutWiki Ads]], can
contain all the actual logic and CSS for displaying ads, but we still need
a few hook points here so that we can insert the ads in the correct
locations.
Technically speaking I guess even the #mw-panel-right HTML could be
offloaded to the advertising extension, but I don't see an empty div doing
much harm to anyone.
An example implementation is PidgiWiki
(http://www.pidgi.net/wiki/Main_Page), which is actually running an older
version of Metrolook. We don't want to bundle any ad code with Metrolook
itself, as such code would likely be site-specific as well as outside the
scope of what a skin should provide.
Change-Id: I7d93d304776b1f8c5bf274e89b29a9988d570fc2
---
M MetrolookTemplate.php
M hooks.txt
2 files changed, 17 insertions(+), 2 deletions(-)
Approvals:
Paladox: Looks good to me, approved
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index e864641..ce60255 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -544,8 +544,14 @@
?
/div
- ?php $this-printTrail(); ?
+ div id=mw-panel-right class=noprint
+ ?php
+ // Hook point for the ShoutWiki Ads extension
+ Hooks::run( 'MetrolookRightPanel', array( $this ) );
+ ?
+ /div
+ ?php $this-printTrail(); ?
/body
/html
?php
@@ -581,6 +587,8 @@
break;
case 'TOOLBOX':
$this-renderPortal( 'tb',
$this-getToolbox(), 'toolbox', 'SkinTemplateToolboxEnd' );
+ // Hook point for the ShoutWiki Ads
extension
+ Hooks::run( 'MetrolookAfterToolbox',
array( $this ) );
break;
case 'LANGUAGES':
if ( $this-data['language_urls'] !==
false ) {
diff --git a/hooks.txt b/hooks.txt
index f226ef3..f59618d 100644
--- a/hooks.txt
+++ b/hooks.txt
@@ -1,6 +1,13 @@
Hooks provided by the Metrolook skin.
+'MetrolookAfterToolbox': Called after the toolbox (#p-tb) has been rendered
+$tpl: MetrolookTemplate object
+
+'MetrolookRightPanel': Called inside div#mw-panel-right; can be used to
populate
+that div element with ad HTML, for example.
+$tpl: MetrolookTemplate object
+
'SkinMetrolookStyleModules': Called when defining the list of module styles to
be
-loaded by the Vector skin.
+loaded by the Metrolook skin.
$skin: SkinMetrolook object
$styles: Array of module names whose style will be loaded for the skin
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/224736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7d93d304776b1f8c5bf274e89b29a9988d570fc2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Trigger tests for ArticleFeedbackv5 - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Trigger tests for ArticleFeedbackv5 .. Trigger tests for ArticleFeedbackv5 Fails with: 1) ResourcesTest::testMissingDependencies The module 'jquery.json' required by 'jquery.articleFeedbackv5' must exist Failed asserting that an array contains 'jquery.json'. Bug: T105866 Change-Id: I36b6f6d26e7154f3ef820df63bfc521271f17b58 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 1e0ca69..5368cf7 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3021,7 +3021,7 @@ - name: mediawiki/extensions/ArticleFeedbackv5 template: - - name: extension-checks + - name: extension-unittests-generic - name: extension-rubylint - name: mediawiki/extensions/ApiSandbox -- To view, visit https://gerrit.wikimedia.org/r/224759 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I36b6f6d26e7154f3ef820df63bfc521271f17b58 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Use strtr() instead of str_replace() for character ... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Use strtr() instead of str_replace() for character
swapping
..
Hygiene: Use strtr() instead of str_replace() for character swapping
strtr() is marginally faster as it runs through the string only
once. A better fit for one-for-one character translation.
The strtr() function also supports an associative array as second
parameter for entire string replacements. This, too, has the same
performance and predictable behaviour (starts with the longest key).
Whereas str_replace is for more aggressive needs where you want
multiple passes until there are no further matches.
The associative array form is arguably also easier to understand
and harder to mess up since the needle/replacement pairs are
explicitly connected instead of two separate arrays.
Also:
* Use getFormattedNsText instead of strtr( getNsText, .. ) which
reduces duplication of this fact through a more semantic intent.
Change-Id: Ie23e4210a5b6908dd79eebc8a2b931d12fe31af6
---
M includes/Export.php
M includes/GlobalFunctions.php
M includes/Linker.php
M includes/Title.php
M includes/api/ApiQueryAllUsers.php
M includes/cache/LinkBatch.php
M includes/filerepo/LocalRepo.php
M includes/resourceloader/ResourceLoaderModule.php
M languages/Language.php
9 files changed, 27 insertions(+), 33 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Export.php b/includes/Export.php
index 0d55d7d..adab21c 100644
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -874,7 +874,7 @@
}
global $wgContLang;
- $prefix = str_replace( '_', ' ', $wgContLang-getNsText(
$title-getNamespace() ) );
+ $prefix = $wgContLang-getFormattedNsText(
$title-getNamespace() );
if ( $prefix !== '' ) {
$prefix .= ':';
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 97042fd..3014070 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3505,8 +3505,7 @@
$prefix = $wgCachePrefix === false ? wfWikiID() : $wgCachePrefix;
$args = func_get_args();
$key = $prefix . ':' . implode( ':', $args );
- $key = str_replace( ' ', '_', $key );
- return $key;
+ return strtr( $key, ' ', '_' );
}
/**
@@ -3527,7 +3526,7 @@
} else {
$key = $db . ':' . implode( ':', $args );
}
- return str_replace( ' ', '_', $key );
+ return strtr( $key, ' ', '_' );
}
/**
@@ -3544,8 +3543,7 @@
function wfGlobalCacheKey( /*...*/ ) {
$args = func_get_args();
$key = 'global:' . implode( ':', $args );
- $key = str_replace( ' ', '_', $key );
- return $key;
+ return strtr( $key, ' ', '_' );
}
/**
diff --git a/includes/Linker.php b/includes/Linker.php
index 4a1aa87..bb65cdf 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -77,7 +77,7 @@
wfDeprecated( __METHOD__, '1.25' );
$title = urldecode( $title );
- $title = str_replace( '_', ' ', $title );
+ $title = strtr( $title, '_', ' ' );
return self::getLinkAttributesInternal( $title, $class );
}
@@ -1414,10 +1414,9 @@
# fix up urlencoded title texts (copied from
Parser::replaceInternalLinks)
if ( strpos( $match[1], '%' ) !== false ) {
- $match[1] = str_replace(
- array( '', '' ),
- array( 'lt;', 'gt;' ),
- rawurldecode( $match[1] )
+ $match[1] = strtr(
+ rawurldecode( $match[1] ),
+ array( '' = 'lt;', '' =
'gt;' )
);
}
diff --git a/includes/Title.php b/includes/Title.php
index 9c8ed47..1ab88a6 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -313,7 +313,7 @@
$filteredText = Sanitizer::decodeCharReferencesAndNormalize(
$text );
$t = new Title();
- $t-mDbkeyform = str_replace( ' ', '_', $filteredText );
+ $t-mDbkeyform = strtr( $filteredText, ' ', '_' );
$t-mDefaultNamespace = intval( $defaultNamespace );
$t-secureAndSplit();
@@ -345,10 +345,10 @@
# but some URLs used it as a space replacement and they still
come
# from some external search tools.
if ( strpos( self::legalChars(), '+' ) === false ) {
- $url = str_replace( '+', ' ', $url );
+ $url = strtr(
[MediaWiki-commits] [Gerrit] Reorder Option classes - change (pywikibot/core)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/224748 Change subject: Reorder Option classes .. Reorder Option classes Place ListOption near by its superclass IntegerOoption and ContextOption near by NestedOption which are both inherited from OutputOptionand StandardOption. Change-Id: Ic66d0aba4401ffc5767d9c2d036fed32b7490d2d --- M pywikibot/bot_choice.py 1 file changed, 29 insertions(+), 29 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/48/224748/1 diff --git a/pywikibot/bot_choice.py b/pywikibot/bot_choice.py index 3db1958..24a39d4 100755 --- a/pywikibot/bot_choice.py +++ b/pywikibot/bot_choice.py @@ -159,6 +159,35 @@ pywikibot.output(self._output) +class ContextOption(OutputOption, StandardOption): + +An option to show more and more context. + +def __init__(self, option, shortcut, text, context, delta=100, start=0, end=0): +Constructor. +super(ContextOption, self).__init__(option, shortcut, False) +self.text = text +self.context = context +self.delta = delta +self.start = start +self.end = end + +def result(self, value): +Add the delta to the context and output it. +self.context += self.delta +super(ContextOption, self).result(value) + +def output(self): +Output the context. +start = max(0, self.start - self.context) +end = min(len(self.text), self.end + self.context) +self.output_range(start, end) + +def output_range(self, start_context, end_context): +Output a section from the text. +pywikibot.output(self.text[start_context:end_context]) + + class IntegerOption(Option): An option allowing a range of integers. @@ -234,35 +263,6 @@ def result(self, value): Return the value converted into int. return (self.prefix, self.parse(value)) - - -class ContextOption(OutputOption, StandardOption): - -An option to show more and more context. - -def __init__(self, option, shortcut, text, context, delta=100, start=0, end=0): -Constructor. -super(ContextOption, self).__init__(option, shortcut, False) -self.text = text -self.context = context -self.delta = delta -self.start = start -self.end = end - -def result(self, value): -Add the delta to the context and output it. -self.context += self.delta -super(ContextOption, self).result(value) - -def output(self): -Output the context. -start = max(0, self.start - self.context) -end = min(len(self.text), self.end + self.context) -self.output_range(start, end) - -def output_range(self, start_context, end_context): -Output a section from the text. -pywikibot.output(self.text[start_context:end_context]) class ListOption(IntegerOption): -- To view, visit https://gerrit.wikimedia.org/r/224748 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic66d0aba4401ffc5767d9c2d036fed32b7490d2d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] maxheight for window, otherwise it's too big at some point - change (mediawiki...BlueSpiceExtensions)
jenkins-bot has submitted this change and it was merged.
Change subject: maxheight for window, otherwise it's too big at some point
..
maxheight for window, otherwise it's too big at some point
Change-Id: I09cf15ed1c008967f66d32a10954f6ab3fb08e73
---
M FormattingHelp/resources/bluespice.formattinghelp.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Pwirth: Looks good to me, approved
jenkins-bot: Verified
diff --git a/FormattingHelp/resources/bluespice.formattinghelp.js
b/FormattingHelp/resources/bluespice.formattinghelp.js
index c20a3ca..f967717 100644
--- a/FormattingHelp/resources/bluespice.formattinghelp.js
+++ b/FormattingHelp/resources/bluespice.formattinghelp.js
@@ -16,7 +16,8 @@
$(document).on( 'click', 'a#bs-editbutton-formattinghelp', function(e){
e.preventDefault();
- Ext.require( 'BS.FormattingHelp.Window', function() {
+ Ext.require( 'BS.FormattingHelp.Window', function () {
+ BS.FormattingHelp.Window.maxHeight =
Ext.getBody().getViewSize().height;
BS.FormattingHelp.Window.show();
});
--
To view, visit https://gerrit.wikimedia.org/r/224574
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I09cf15ed1c008967f66d32a10954f6ab3fb08e73
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_22
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable packet filter for heze - change (operations/puppet)
Muehlenhoff has submitted this change and it was merged.
Change subject: Enable packet filter for heze
..
Enable packet filter for heze
Change-Id: I96dfa7262d53f2a9192ff7b4a4f0643674446ecb
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 36f3051..1d45499 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1065,6 +1065,7 @@
node 'heze.codfw.wmnet' {
include standard
include role::backup::storage
+include base::firewall
}
# Holmium hosts openstack-designate, the labs DNS service.
--
To view, visit https://gerrit.wikimedia.org/r/224576
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I96dfa7262d53f2a9192ff7b4a4f0643674446ecb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff mmuhlenh...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Muehlenhoff mmuhlenh...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BSCategoryBoxSelect: Changed delimiter from ', ' to '|' - change (mediawiki...BlueSpiceExtensions)
Pwirth has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224749
Change subject: BSCategoryBoxSelect: Changed delimiter from ',' to '|'
..
BSCategoryBoxSelect: Changed delimiter from ',' to '|'
* changed qqq
* Requires I24366a9ad0459ca1d40e8cff61468b837ea8af8f
Change-Id: If78844df285b14b4c8bef3a03c308730e7fde29b
(cherry picked from commit 1d7d45c23d8ebd6beb5ee4f3ab0732a03f6643cf)
---
M InsertCategory/i18n/qqq.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/49/224749/1
diff --git a/InsertCategory/i18n/qqq.json b/InsertCategory/i18n/qqq.json
index 65adefd..33d3e4d 100644
--- a/InsertCategory/i18n/qqq.json
+++ b/InsertCategory/i18n/qqq.json
@@ -13,6 +13,6 @@
bs-insertcategory-cat-label: Label for the \Assigned categories\
box.,
bs-insertcategory-success: Text for add category successful,
bs-insertcategory-failure: Text for error.\n{{Identical|Error}},
- bs-insertcategory-hint: Text for note: to add a category, you have
to press enter or terminate your entry with a comma.,
+ bs-insertcategory-hint: Text for note: to add a category, you have
to press enter.,
bs-insertcategory-panel-title: Title for
categories.\n{{Identical|Category}}
}
--
To view, visit https://gerrit.wikimedia.org/r/224749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If78844df285b14b4c8bef3a03c308730e7fde29b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Pwirth wi...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Manually merged: BSCategoryBoxSelect: Changed delimiter from... - change (mediawiki...BlueSpiceFoundation)
jenkins-bot has submitted this change and it was merged.
Change subject: Manually merged: BSCategoryBoxSelect: Changed delimiter from
',' to '|'
..
Manually merged: BSCategoryBoxSelect: Changed delimiter from ',' to '|'
* comma should be a valid category title
* Change-Id: I24366a9ad0459ca1d40e8cff61468b837ea8af8f
Change-Id: I0f351880c98d494020279a2a23c5a7f870c5ee2c
---
M resources/bluespice.extjs/BS/form/CategoryBoxSelect.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Tweichart: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/bluespice.extjs/BS/form/CategoryBoxSelect.js
b/resources/bluespice.extjs/BS/form/CategoryBoxSelect.js
index 7203154..17ecb19 100644
--- a/resources/bluespice.extjs/BS/form/CategoryBoxSelect.js
+++ b/resources/bluespice.extjs/BS/form/CategoryBoxSelect.js
@@ -14,7 +14,7 @@
createNewOnEnter: true,
queryMode: 'local',
emptyText: 'Add a category',
- delimiter: ',',
+ delimiter: '|',
deferredSetValueConf: false,
initComponent: function() {
this.store = Ext.create( 'Ext.data.JsonStore', {
--
To view, visit https://gerrit.wikimedia.org/r/224751
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f351880c98d494020279a2a23c5a7f870c5ee2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_22
Gerrit-Owner: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Upgraded User::saveSettings logged errors to exceptions - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Upgraded User::saveSettings logged errors to exceptions
..
Upgraded User::saveSettings logged errors to exceptions
* This gives more visibility and the error rate is not
extreme (and mostly affects certain users due to
usage patterns).
Change-Id: I3eae28a584e4db8ae40ae80087a97c416b3bd3e8
---
M includes/User.php
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/User.php b/includes/User.php
index 63c0d37..005fc7d 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3679,12 +3679,10 @@
$this-clearSharedCache();
// User was changed in the meantime or loaded with
stale data
$from = ( $this-queryFlagsUsed self::READ_LATEST ) ?
'master' : 'slave';
- MWExceptionHandler::logException( new MWException(
+ throw new MWException(
CAS update failed on user_touched for user ID
'{$this-mId}' (read from $from); .
the version of the user to be saved is older
than the current version.
- ) );
-
- return;
+ );
}
$this-mTouched = $newTouched;
--
To view, visit https://gerrit.wikimedia.org/r/224030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3eae28a584e4db8ae40ae80087a97c416b3bd3e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove Processor parameter in fetchExpandedTpl() - change (mediawiki...parsoid)
Tim Starling has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224747
Change subject: Remove Processor parameter in fetchExpandedTpl()
..
Remove Processor parameter in fetchExpandedTpl()
It was always PreprocessorRequest. The code is easier to read when the
class is named.
Also fix a potentially offensive comment.
Change-Id: I0e4970452d2626f17d6549c480da2cec6aa8ff4a
---
M lib/ext.core.TemplateHandler.js
M lib/mediawiki.ApiRequest.js
2 files changed, 4 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/47/224747/1
diff --git a/lib/ext.core.TemplateHandler.js b/lib/ext.core.TemplateHandler.js
index 2703ee3..b5b60ec 100644
--- a/lib/ext.core.TemplateHandler.js
+++ b/lib/ext.core.TemplateHandler.js
@@ -149,8 +149,7 @@
accumReceiveToksFromChild);
// Fetch and process the template expansion
this.fetchExpandedTpl( env.page.name || '',
- text, PreprocessorRequest,
- accumReceiveToksFromSibling,
srcHandler);
+ text,
accumReceiveToksFromSibling, srcHandler);
}
} else {
// We don't perform recursive template expansion-
something
@@ -1129,9 +1128,8 @@
/**
* Fetch the preprocessed wikitext for a template-like construct.
- * (The 'Processor' argument is a constructor, hence the capitalization.)
*/
-TemplateHandler.prototype.fetchExpandedTpl = function( title, text, Processor,
parentCB, cb ) {
+TemplateHandler.prototype.fetchExpandedTpl = function( title, text, parentCB,
cb ) {
var env = this.manager.env;
if ( text in env.pageCache ) {
// XXX: store type too (and cache tokens/x-mediawiki)
@@ -1146,7 +1144,7 @@
// Start a new request if none is outstanding
if ( env.requestQueue[text] === undefined ) {
env.tp( 'Note: Starting new request for ' + text );
- env.requestQueue[text] = new Processor( env, title,
text );
+ env.requestQueue[text] = new PreprocessorRequest( env,
title, text );
}
// append request, process in document order
env.requestQueue[text].once( 'src', cb );
diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js
index 517a217..69aae9e 100644
--- a/lib/mediawiki.ApiRequest.js
+++ b/lib/mediawiki.ApiRequest.js
@@ -903,7 +903,7 @@
}
if ( data data.query ) {
- // The API indexes its response by page ID. That's stupid.
+ // The API indexes its response by page ID. That's inconvenient.
newpages = {};
pagenames = {};
pages = data.query.pages;
--
To view, visit https://gerrit.wikimedia.org/r/224747
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e4970452d2626f17d6549c480da2cec6aa8ff4a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Tim Starling tstarl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update links on dumps.wm.org to HTTPS - change (operations/puppet)
Chmarkine has uploaded a new change for review. https://gerrit.wikimedia.org/r/224750 Change subject: Update links on dumps.wm.org to HTTPS .. Update links on dumps.wm.org to HTTPS Some links on https://dumps.wikimedia.org/ are hard-coded http:. I changed them to either https: or relative links. Change-Id: Ic8abfffa607dbe19106a5b9cf927a38d788cf234 --- M modules/dataset/files/html/legal.html M modules/dataset/files/html/pagecounts-ez_index.html M modules/dataset/files/html/poty_index.html M modules/dataset/files/html/public_index.html 4 files changed, 17 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/50/224750/1 diff --git a/modules/dataset/files/html/legal.html b/modules/dataset/files/html/legal.html index fc98664..07b4451 100644 --- a/modules/dataset/files/html/legal.html +++ b/modules/dataset/files/html/legal.html @@ -108,22 +108,22 @@ div id=globalWrapper div id=content h1License information/h1 -pWikimedia’s a href=https://wikimediafoundation.org/wiki/Mission;mission/a is to create educational content that is freely available to all people. In keeping with that goal, all information on Wikimedia projects may be freely shared, copied, remixed, and used for any purpose (including commercial purposes!) in perpetuity. To help guide users of a href=http://dumps.wikimedia.org/;dumps.wikimedia.org/a, this page contains more detailed information about Wikimedia’s licensing and licensing policies as they may apply to our dumps./p +pWikimedia’s a href=https://wikimediafoundation.org/wiki/Mission;mission/a is to create educational content that is freely available to all people. In keeping with that goal, all information on Wikimedia projects may be freely shared, copied, remixed, and used for any purpose (including commercial purposes!) in perpetuity. To help guide users of a href=https://dumps.wikimedia.org/;dumps.wikimedia.org/a, this page contains more detailed information about Wikimedia’s licensing and licensing policies as they may apply to our dumps./p div style=background:#ff;border-width:1px;border-style:solid;border-color:red;padding:1em;font-size:large;This is a high-level guide only. Where this information conflicts with specific information in the a href=https://wikimediafoundation.org/wiki/Terms_of_Use;Wikimedia Foundation Terms of Use/a, or with other information contained inside the dumps themselves, this description should be ignored. Those terms are controlling./div h2Text/h2 -pExcept as discussed below, all original textual content is licensed under the a href=http://www.wikipedia.org/wiki/Wikipedia:Copyrights; title=Wikipedia Copyrights -GNU Free Documentation License/a (GFDL) and the a href=http://creativecommons.org/licenses/by-sa/3.0/; title=Creative Commons Attribution-Share-Alike 3.0 LicenseCreative Commons Attribution-Share-Alike 3.0 License/a. Some text may be available only under the Creative Commons license; see our a href=http://wikimediafoundation.org/wiki/Terms_of_use;Terms of Use/a for details. Text written by some authors may be released under additional licenses or into the public domain./p +pExcept as discussed below, all original textual content is licensed under the a href=https://www.wikipedia.org/wiki/Wikipedia:Copyrights; title=Wikipedia Copyrights +GNU Free Documentation License/a (GFDL) and the a href=https://creativecommons.org/licenses/by-sa/3.0/; title=Creative Commons Attribution-Share-Alike 3.0 LicenseCreative Commons Attribution-Share-Alike 3.0 License/a. Some text may be available only under the Creative Commons license; see our a href=https://wikimediafoundation.org/wiki/Terms_of_use;Terms of Use/a for details. Text written by some authors may be released under additional licenses or into the public domain./p h2Images/h2 -pBy default, images uploaded to our services are under the a href=http://creativecommons.org/licenses/by-sa/3.0/; title=Creative Commons Attribution-Share-Alike 3.0 LicenseCreative Commons Attribution-Share-Alike 3.0 License/a. However, many images are NOT released under Creative Commons. Image copyright information is contained in the image description page inside the text dumps.p +pBy default, images uploaded to our services are under the a href=https://creativecommons.org/licenses/by-sa/3.0/; title=Creative Commons Attribution-Share-Alike 3.0 LicenseCreative Commons Attribution-Share-Alike 3.0 License/a. However, many images are NOT released under Creative Commons. Image copyright information is contained in the image description page inside the text dumps.p h2Exceptions/h2 h3Wikinews/h3 -pAs of 2005-09-25 all Wikinews textual content is licensed under the a
[MediaWiki-commits] [Gerrit] BSCategoryBoxSelect: Changed delimiter from ', ' to '|' - change (mediawiki...BlueSpiceFoundation)
Pwirth has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224752
Change subject: BSCategoryBoxSelect: Changed delimiter from ',' to '|'
..
BSCategoryBoxSelect: Changed delimiter from ',' to '|'
* comma should be a valid category title
Change-Id: I24366a9ad0459ca1d40e8cff61468b837ea8af8f
(cherry picked from commit a9abcda13db7ba92dbb7d357257aa8fd2f6cc167)
---
M resources/bluespice.extjs/BS/form/CategoryBoxSelect.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/52/224752/1
diff --git a/resources/bluespice.extjs/BS/form/CategoryBoxSelect.js
b/resources/bluespice.extjs/BS/form/CategoryBoxSelect.js
index 888ea79..4eda7b2 100644
--- a/resources/bluespice.extjs/BS/form/CategoryBoxSelect.js
+++ b/resources/bluespice.extjs/BS/form/CategoryBoxSelect.js
@@ -14,7 +14,7 @@
createNewOnEnter: true,
queryMode: 'local',
emptyText: mw.message('bs-extjs-categoryboxselect-emptytext').plain(),
- delimiter: ',',
+ delimiter: '|',
deferredSetValueConf: false,
initComponent: function() {
this.store = Ext.create( 'Ext.data.JsonStore', {
--
To view, visit https://gerrit.wikimedia.org/r/224752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24366a9ad0459ca1d40e8cff61468b837ea8af8f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Pwirth wi...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add MediaWiki-Timestamp header to ResourceLoader requests - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add MediaWiki-Timestamp header to ResourceLoader requests .. Add MediaWiki-Timestamp header to ResourceLoader requests To help distinguish cache hits from cache misses, send a MediaWiki-Timestamp header on ResourceLoader responses, indicating the current time as fractional seconds since epoch, with microsecond precision. Change-Id: I954a96ced1435a47d458de12411b257fe6b4ea34 --- M includes/resourceloader/ResourceLoader.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Gilles: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php index 5d0ed3c..54cc6e5 100644 --- a/includes/resourceloader/ResourceLoader.php +++ b/includes/resourceloader/ResourceLoader.php @@ -813,6 +813,11 @@ $exp = min( $maxage, $smaxage ); header( 'Expires: ' . wfTimestamp( TS_RFC2822, $exp + time() ) ); } + + // Send the current time expressed as fractional seconds since epoch, + // with microsecond precision. This helps distinguish hits from misses + // in edge caches. + header( 'MediaWiki-Timestamp: ' . microtime( true ) ); } /** -- To view, visit https://gerrit.wikimedia.org/r/222532 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I954a96ced1435a47d458de12411b257fe6b4ea34 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Fomafix Gerrit-Reviewer: Gilles gdu...@wikimedia.org Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed User class IDE warnings - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixed User class IDE warnings
..
Fixed User class IDE warnings
Change-Id: I68c30fd81a266aa1acdf74162bfa864b67922347
---
M includes/User.php
1 file changed, 36 insertions(+), 34 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/User.php b/includes/User.php
index 772330b..72d6383 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -183,50 +183,50 @@
*/
protected static $mAllRights = false;
- /** @name Cache variables */
+ /** Cache variables */
//@{
public $mId;
-
+ /** @var string */
public $mName;
-
+ /** @var string */
public $mRealName;
-
/**
* @todo Make this actually private
* @private
+* @var Password
*/
public $mPassword;
-
/**
* @todo Make this actually private
* @private
+* @var Password
*/
public $mNewpassword;
-
+ /** @var string */
public $mNewpassTime;
-
+ /** @var string */
public $mEmail;
/** @var string TS_MW timestamp from the DB */
public $mTouched;
/** @var string TS_MW timestamp from cache */
protected $mQuickTouched;
-
+ /** @var string */
protected $mToken;
-
+ /** @var string */
public $mEmailAuthenticated;
-
+ /** @var string */
protected $mEmailToken;
-
+ /** @var string */
protected $mEmailTokenExpires;
-
+ /** @var string */
protected $mRegistration;
-
+ /** @var int */
protected $mEditCount;
-
+ /** @var array */
public $mGroups;
-
+ /** @var array */
protected $mOptionOverrides;
-
+ /** @var string */
protected $mPasswordExpires;
//@}
@@ -257,29 +257,29 @@
* Lazy-initialized variables, invalidated with clearInstanceCache
*/
protected $mNewtalk;
-
+ /** @var string */
protected $mDatePreference;
-
+ /** @var string */
public $mBlockedby;
-
+ /** @var string */
protected $mHash;
-
+ /** @var array */
public $mRights;
-
+ /** @var string */
protected $mBlockreason;
-
+ /** @var array */
protected $mEffectiveGroups;
-
+ /** @var array */
protected $mImplicitGroups;
-
+ /** @var array */
protected $mFormerGroups;
-
+ /** @var bool */
protected $mBlockedGlobally;
-
+ /** @var bool */
protected $mLocked;
-
+ /** @var bool */
public $mHideName;
-
+ /** @var array */
public $mOptions;
/**
@@ -2152,6 +2152,7 @@
$newMessageLinks[0]['wiki'] === wfWikiID()
$newMessageLinks[0]['rev']
) {
+ /** @var Revision $newMessageRevision */
$newMessageRevision =
$newMessageLinks[0]['rev'];
$newMessageRevisionId =
$newMessageRevision-getId();
}
@@ -4234,21 +4235,22 @@
*
* @param string $subject Message subject
* @param string $body Message body
-* @param string $from Optional From address; if unspecified, default
+* @param User|null $from Optional sending user; if unspecified, default
* $wgPasswordSender will be used.
* @param string $replyto Reply-To address
* @return Status
*/
public function sendMail( $subject, $body, $from = null, $replyto =
null ) {
- if ( is_null( $from ) ) {
- global $wgPasswordSender;
+ global $wgPasswordSender;
+
+ if ( $from instanceof User ) {
+ $sender = MailAddress::newFromUser( $from );
+ } else {
$sender = new MailAddress( $wgPasswordSender,
wfMessage( 'emailsender'
)-inContentLanguage()-text() );
- } else {
- $sender = MailAddress::newFromUser( $from );
}
-
$to = MailAddress::newFromUser( $this );
+
return UserMailer::send( $to, $sender, $subject, $body,
$replyto );
}
--
To view, visit https://gerrit.wikimedia.org/r/224516
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I68c30fd81a266aa1acdf74162bfa864b67922347
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
[MediaWiki-commits] [Gerrit] Manually merged: BSCategoryBoxSelect: Changed delimiter from... - change (mediawiki...BlueSpiceFoundation)
Pwirth has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224751
Change subject: Manually merged: BSCategoryBoxSelect: Changed delimiter from
',' to '|'
..
Manually merged: BSCategoryBoxSelect: Changed delimiter from ',' to '|'
* comma should be a valid category title
* Change-Id: I24366a9ad0459ca1d40e8cff61468b837ea8af8f
Change-Id: I0f351880c98d494020279a2a23c5a7f870c5ee2c
---
M resources/bluespice.extjs/BS/form/CategoryBoxSelect.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/51/224751/1
diff --git a/resources/bluespice.extjs/BS/form/CategoryBoxSelect.js
b/resources/bluespice.extjs/BS/form/CategoryBoxSelect.js
index 7203154..17ecb19 100644
--- a/resources/bluespice.extjs/BS/form/CategoryBoxSelect.js
+++ b/resources/bluespice.extjs/BS/form/CategoryBoxSelect.js
@@ -14,7 +14,7 @@
createNewOnEnter: true,
queryMode: 'local',
emptyText: 'Add a category',
- delimiter: ',',
+ delimiter: '|',
deferredSetValueConf: false,
initComponent: function() {
this.store = Ext.create( 'Ext.data.JsonStore', {
--
To view, visit https://gerrit.wikimedia.org/r/224751
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f351880c98d494020279a2a23c5a7f870c5ee2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_22
Gerrit-Owner: Pwirth wi...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ores: Use virtualenv package rather than python-virtualenv - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: ores: Use virtualenv package rather than python-virtualenv
..
ores: Use virtualenv package rather than python-virtualenv
Change-Id: I79184a1eb3ceeb27402d0e328a02d2c99a40ece6
---
M modules/ores/manifests/base.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/ores/manifests/base.pp b/modules/ores/manifests/base.pp
index 128e1a7..83d3009 100644
--- a/modules/ores/manifests/base.pp
+++ b/modules/ores/manifests/base.pp
@@ -8,7 +8,7 @@
# this to deb packages in the future if needed. We also install build tools
# because they are needed by pip to install scikit.
# FIXME: Use debian packages for all the packages needing compilation
-require_package('python-virtualenv', 'python3-dev', 'build-essential',
+require_package('virtualenv', 'python3-dev', 'build-essential',
'gfortran', 'libopenblas-dev', 'liblapack-dev')
# Install scipy via debian package so we don't need to build it via pip
--
To view, visit https://gerrit.wikimedia.org/r/224831
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I79184a1eb3ceeb27402d0e328a02d2c99a40ece6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert removal of SVN admin group which doesn't work with co... - change (operations/mediawiki-config)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/224833 Change subject: Revert removal of SVN admin group which doesn't work with config .. Revert removal of SVN admin group which doesn't work with config Partial revert of I39786fe6 Change-Id: Ib59bf62ff30f1eb5b67b7aa356539e8ab692ac56 --- M wmf-config/CommonSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/33/224833/1 diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index c3cbbdf..5993652 100755 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -1641,7 +1641,7 @@ $wgGroupPermissions['user']['codereview-link-user'] = false; $wgGroupPermissions['user']['codereview-signoff'] = false; $wgGroupPermissions['user']['codereview-associate'] = false; - unset( $wgGroupPermissions['svnadmins'] ); + $wgGroupPermissions['svnadmins']['repoadmin'] = false; $wgCodeReviewRepoStatsCacheTime = 24 * 60 * 60; $wgCodeReviewMaxDiffPaths = 100; -- To view, visit https://gerrit.wikimedia.org/r/224833 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib59bf62ff30f1eb5b67b7aa356539e8ab692ac56 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk kren...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] disable LCStoreStaticArray completely for now - change (operations/mediawiki-config)
20after4 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224840
Change subject: disable LCStoreStaticArray completely for now
..
disable LCStoreStaticArray completely for now
Change-Id: I5bce3c60b3a3ad5ece32c5a88fd059557cab6b19
---
M wmf-config/CommonSettings.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/40/224840/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 5993652..2c21fbf 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -232,9 +232,9 @@
// Temporary hack to facilitate migration of l10n cache implementations.
// Use LCStoreStaticArray if a magic file is present and if the l10n cache
// appears to be populated. -- Ori, 2015-07-13
-if ( file_exists( '/etc/lcstore' ) file_exists(
$IP/cache/l10n/zu.l10n.php ) ) {
- $wgLocalisationCacheConf['storeClass'] = 'LCStoreStaticArray';
-}
+//if ( file_exists( '/etc/lcstore' ) file_exists(
$IP/cache/l10n/zu.l10n.php ) ) {
+// $wgLocalisationCacheConf['storeClass'] = 'LCStoreStaticArray';
+//}
// T29320: skip MessageBlobStore::clear(); handle via refreshMessageBlobs.php
instead
$wgHooks['LocalisationCacheRecache'][] = function( $cache, $code, $allData,
$purgeBlobs = true ) {
--
To view, visit https://gerrit.wikimedia.org/r/224840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bce3c60b3a3ad5ece32c5a88fd059557cab6b19
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 mmod...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimania scholarships app: apply role on krypton - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: wikimania scholarships app: apply role on krypton
..
wikimania scholarships app: apply role on krypton
Bug:T105003
Change-Id: I1e79e50f7f870b040932b9616b9ba48d738c5fb6
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 2e314f3..cc0494d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1179,6 +1179,7 @@
node 'krypton.eqiad.wmnet' {
include standard
include base::firewall
+include role::wikimania_scholarships
}
node 'labcontrol1001.wikimedia.org' {
--
To view, visit https://gerrit.wikimedia.org/r/224849
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e79e50f7f870b040932b9616b9ba48d738c5fb6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove sandbox wiki - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove sandbox wiki
..
Remove sandbox wiki
Change-Id: I8283f7b4508e1709c24f5f1fc2e4da133b9df38e
---
D bin/sandbox-update-all
M puppet/modules/nginx/files/offline
M puppet/modules/wiki/templates/wikimaintenance.erb
3 files changed, 1 insertion(+), 18 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/sandbox-update-all b/bin/sandbox-update-all
deleted file mode 100755
index 065f957..000
--- a/bin/sandbox-update-all
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-BASEDIR=$(dirname $0)
-WIKINAME=sandbox.translatewiki.net
-WIKI=/www/$WIKINAME/docroot/w
-
-cd $WIKI
-REV=`git log --pretty='%h %ci (%cr)' -n 1`
-$BASEDIR/udpcast updating $WIKINAME from $REV...
-
-sudo -H -u betawiki $BASEDIR/wikiupdate $WIKI
-
-REV=`git log --pretty='%h %ci (%cr)' -n 1`
-$BASEDIR/udpcast updated $WIKINAME to $REV
diff --git a/puppet/modules/nginx/files/offline
b/puppet/modules/nginx/files/offline
index 44136d1..92218bc 100644
--- a/puppet/modules/nginx/files/offline
+++ b/puppet/modules/nginx/files/offline
@@ -18,7 +18,7 @@
spdy_headers_comp 7;
- server_name translatewiki.net dev.translatewiki.net
sandbox.translatewiki.net;
+ server_name translatewiki.net dev.translatewiki.net;
root /www/offline;
location /index.php {
diff --git a/puppet/modules/wiki/templates/wikimaintenance.erb
b/puppet/modules/wiki/templates/wikimaintenance.erb
index fe481a9..bf26bbe 100644
--- a/puppet/modules/wiki/templates/wikimaintenance.erb
+++ b/puppet/modules/wiki/templates/wikimaintenance.erb
@@ -1,5 +1,4 @@
# file managed by puppet
* * * * * %= @user % nice php
/srv/mediawiki/targets/production/maintenance/runJobs.php --maxtime=50
--procs=1 --memory-limit=250M /www/translatewiki.net/logs/jobqueue 2
/dev/null
-*/5 * * * * %= @user % nice php
/www/sandbox.translatewiki.net/docroot/w/maintenance/runJobs.php --maxtime=50
--procs=1 --memory-limit=250M /www/sandbox.translatewiki.net/logs/jobqueue
2 /dev/null
@weekly www-data find /www/translatewiki.net/docroot/images/thumb/ -name
*.png -type f -print0 | nice xargs -0 -P4 -I{} optipng -o7 {} 1 /dev/null
@weekly %= @user % nice php
/srv/mediawiki/targets/production/maintenance/generateSitemap.php --fspath
/www/translatewiki.net/docroot/sitemap/ --skip-redirects --urlpath
https://translatewiki.net/sitemap/
--
To view, visit https://gerrit.wikimedia.org/r/224854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8283f7b4508e1709c24f5f1fc2e4da133b9df38e
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Raise account creation throttle for hackathon on labswiki to... - change (operations/mediawiki-config)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/224856 Change subject: Raise account creation throttle for hackathon on labswiki to 500 .. Raise account creation throttle for hackathon on labswiki to 500 Change-Id: I2c917b997597eaf9308b8bf4f553a1653cec15c1 --- M wmf-config/throttle.php 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/56/224856/1 diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php index 00a7b14..8e7ce05 100644 --- a/wmf-config/throttle.php +++ b/wmf-config/throttle.php @@ -43,6 +43,14 @@ 'value' = 50, // 50 expected max ); +$wmgThrottlingExceptions[] = array( + 'from' = '2015-07-15T00:00 +0:00', + 'to' = '2015-07-21T00:00 +0:00', + 'ip' = array( '201.149.6.36' ), + 'dbname' = array( 'labswiki' ), + 'value' = 500 +); + ## Add throttling definitions above. /** -- To view, visit https://gerrit.wikimedia.org/r/224856 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2c917b997597eaf9308b8bf4f553a1653cec15c1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk kren...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] celery: Make systemd do the chdir - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: celery: Make systemd do the chdir .. celery: Make systemd do the chdir Change-Id: I4453b862840da3cb8eb670ecb493056cc1fb1ab0 --- M modules/celery/templates/initscripts/celery.systemd.erb 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Yuvipanda: Verified; Looks good to me, approved diff --git a/modules/celery/templates/initscripts/celery.systemd.erb b/modules/celery/templates/initscripts/celery.systemd.erb index 2116f69..8a73a1e 100644 --- a/modules/celery/templates/initscripts/celery.systemd.erb +++ b/modules/celery/templates/initscripts/celery.systemd.erb @@ -5,8 +5,9 @@ [Service] User=%= @user % Group=%= @group % +WorkingDirectory=%= @working_dir % ExecStart=%= @celery_bin_path % worker \ ---app %= @app % --workingdir %= @working_dir % +--app %= @app % [Install] WantedBy=multi-user.target -- To view, visit https://gerrit.wikimedia.org/r/224827 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4453b862840da3cb8eb670ecb493056cc1fb1ab0 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@wikimedia.org Gerrit-Reviewer: Yuvipanda yuvipa...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Migrate article images from un-migrated save page entries - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Migrate article images from un-migrated save page entries .. Migrate article images from un-migrated save page entries At launch, we start a process which recursively grabs an unmigrated entry from the saved page list and - Reads the article data from the data store - Iterates each image - Moves legacy image data into the disk storage under the new image cache - Marks the entry as migrated - Rinse and repeat... - When done, iterate through migrated entries and save the updated list to disk Tests were run migrating 200+ articles while using the app to ensure the background process isn't noticeable to users. Bug: T101527 Change-Id: I2de490556a7902d7e71e3d179bd8f91cd8e17bf7 --- M MediaWikiKit/MediaWikiKit/MWKArticle.h M MediaWikiKit/MediaWikiKit/MWKArticle.m M MediaWikiKit/MediaWikiKit/MWKDataStore.h M MediaWikiKit/MediaWikiKit/MWKDataStore.m M MediaWikiKit/MediaWikiKit/MWKImage.h M MediaWikiKit/MediaWikiKit/MWKImage.m M MediaWikiKit/MediaWikiKit/MWKImageInfo.h M MediaWikiKit/MediaWikiKit/MWKImageList.h M MediaWikiKit/MediaWikiKit/MWKImageList.m M MediaWikiKit/MediaWikiKit/MWKSavedPageEntry.h M MediaWikiKit/MediaWikiKit/MWKSavedPageEntry.m M MediaWikiKit/MediaWikiKit/MWKSavedPageList.h M MediaWikiKit/MediaWikiKit/MWKSavedPageList.m M MediaWikiKit/MediaWikiKit/MWKSiteDataObject.m M Wikipedia.xcodeproj/project.pbxproj M Wikipedia/AppDelegate.m M Wikipedia/Categories/MWKArticle+Convenience.h A Wikipedia/Categories/SDWebImageManager+WMFCacheRemoval.h A Wikipedia/Categories/SDWebImageManager+WMFCacheRemoval.m M Wikipedia/Housekeeping/DataHousekeeping.m A Wikipedia/Housekeeping/WMFBackgroundTaskManager.swift A Wikipedia/Images/SDImageCache+WMFPersistentCache.h A Wikipedia/Images/SDImageCache+WMFPersistentCache.m M Wikipedia/Images/WMFImageController+Debug.swift M Wikipedia/Images/WMFImageController.swift A Wikipedia/Legacy Data Migration/WMFLegacyImageDataMigration.swift M Wikipedia/UI-V5/WMFArticleViewController.m M Wikipedia/UI-V5/iPhone_Root.storyboard M Wikipedia/View Controllers/Image Gallery/WMFImageGalleryViewController.m M Wikipedia/Wikipedia-Bridging-Header.h M Wikipedia/mw-utils/WMFLogging.h A WikipediaUnitTests/Fixtures/ArticleWithoutImages.dataexport.json A WikipediaUnitTests/Fixtures/Barack_Obama/Article.plist A WikipediaUnitTests/Fixtures/Barack_Obama/Images.plist A WikipediaUnitTests/Fixtures/Barack_Obama/Images/100px-Seal_of_the_President_of_the_United_States.svg.png/Image.plist A WikipediaUnitTests/Fixtures/Barack_Obama/Images/100px-Seal_of_the_President_of_the_United_States.svg.png/Image.png A WikipediaUnitTests/Fixtures/Barack_Obama/Images/110px-2004_Illinois_Senate_results.svg.png/Image.plist A WikipediaUnitTests/Fixtures/Barack_Obama/Images/110px-2004_Illinois_Senate_results.svg.png/Image.png A WikipediaUnitTests/Fixtures/Barack_Obama/Images/115px-President_Barack_Obama.jpg/Image.jpg A WikipediaUnitTests/Fixtures/Barack_Obama/Images/115px-President_Barack_Obama.jpg/Image.plist A WikipediaUnitTests/Fixtures/Barack_Obama/Images/170px-BarackObamaportrait.jpg/Image.jpg A WikipediaUnitTests/Fixtures/Barack_Obama/Images/170px-BarackObamaportrait.jpg/Image.plist A WikipediaUnitTests/Fixtures/Barack_Obama/Images/170px-Barack_Obama_at_Cairo_University_cropped.jpg/Image.jpg A WikipediaUnitTests/Fixtures/Barack_Obama/Images/170px-Barack_Obama_at_Cairo_University_cropped.jpg/Image.plist A WikipediaUnitTests/Fixtures/Barack_Obama/Images/170px-Barack_Obama_playing_basketball_with_members_of_Congress_and_Cabinet_secretaries_2.jpg/Image.jpg A WikipediaUnitTests/Fixtures/Barack_Obama/Images/170px-Barack_Obama_playing_basketball_with_members_of_Congress_and_Cabinet_secretaries_2.jpg/Image.plist A WikipediaUnitTests/Fixtures/Barack_Obama/Images/170px-Official_portrait_of_Barack_Obama.jpg/Image.jpg A WikipediaUnitTests/Fixtures/Barack_Obama/Images/170px-Official_portrait_of_Barack_Obama.jpg/Image.plist A WikipediaUnitTests/Fixtures/Barack_Obama/Images/220px--President_Obama_on_Death_of_Osama_bin_Laden.ogv.jpg/Image.jpg A WikipediaUnitTests/Fixtures/Barack_Obama/Images/220px--President_Obama_on_Death_of_Osama_bin_Laden.ogv.jpg/Image.plist A WikipediaUnitTests/Fixtures/Barack_Obama/Images/220px-2004_Illinois_Senate_results.svg.png/Image.plist A WikipediaUnitTests/Fixtures/Barack_Obama/Images/220px-2004_Illinois_Senate_results.svg.png/Image.png A WikipediaUnitTests/Fixtures/Barack_Obama/Images/220px-Ann_Dunham_with_father_and_children.jpg/Image.jpg A WikipediaUnitTests/Fixtures/Barack_Obama/Images/220px-Ann_Dunham_with_father_and_children.jpg/Image.plist A WikipediaUnitTests/Fixtures/Barack_Obama/Images/220px-Barack_Obama_addresses_joint_session_of_Congress_2009-02-24.jpg/Image.jpg A WikipediaUnitTests/Fixtures/Barack_Obama/Images/220px-Barack_Obama_addresses_joint_session_of_Congress_2009-02-24.jpg/Image.plist A
[MediaWiki-commits] [Gerrit] Remove /docroot/noc/conf/echowikis.dblist - change (operations/mediawiki-config)
Glaisher has uploaded a new change for review. https://gerrit.wikimedia.org/r/224836 Change subject: Remove /docroot/noc/conf/echowikis.dblist .. Remove /docroot/noc/conf/echowikis.dblist Follow up to Ibde4c0c143315 Change-Id: I33a143d40fcbd661c45d4fa69ce8ba33dcdfd4b8 --- D docroot/noc/conf/echowikis.dblist 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/36/224836/1 diff --git a/docroot/noc/conf/echowikis.dblist b/docroot/noc/conf/echowikis.dblist deleted file mode 12 index c21d8fc..000 --- a/docroot/noc/conf/echowikis.dblist +++ /dev/null @@ -1 +0,0 @@ -../../../echowikis.dblist \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/224836 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I33a143d40fcbd661c45d4fa69ce8ba33dcdfd4b8 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Glaisher glaisher.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add krypton to site.pp with base::firewall - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224835
Change subject: add krypton to site.pp with base::firewall
..
add krypton to site.pp with base::firewall
Bug:T105507
Change-Id: I888158099fa88c94d7da0952ad004e56ba18
---
M manifests/site.pp
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/35/224835/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 1d45499..2e314f3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1175,6 +1175,12 @@
include role::access_new_install
}
+# virtual machine for misc. PHP apps
+node 'krypton.eqiad.wmnet' {
+include standard
+include base::firewall
+}
+
node 'labcontrol1001.wikimedia.org' {
$is_puppet_master = true
$is_labs_puppet_master = true
--
To view, visit https://gerrit.wikimedia.org/r/224835
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I888158099fa88c94d7da0952ad004e56ba18
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] group0 to 1.26wmf14 - change (operations/mediawiki-config)
20after4 has uploaded a new change for review. https://gerrit.wikimedia.org/r/224842 Change subject: group0 to 1.26wmf14 .. group0 to 1.26wmf14 Change-Id: Ia16e94e753b2a4e57ad26448e0ba04fb3ae0b967 --- M php M w/static/current/extensions M w/static/current/resources M w/static/current/skins M wikiversions.json 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/42/224842/1 diff --git a/php b/php index 0cd831e..d6a4b50 12 --- a/php +++ b/php @@ -1 +1 @@ -php-1.26wmf13 \ No newline at end of file +php-1.26wmf14 \ No newline at end of file diff --git a/w/static/current/extensions b/w/static/current/extensions index 50263ce..4e65c54 12 --- a/w/static/current/extensions +++ b/w/static/current/extensions @@ -1 +1 @@ -/srv/mediawiki/php-1.26wmf13/extensions \ No newline at end of file +/srv/mediawiki/php-1.26wmf14/extensions \ No newline at end of file diff --git a/w/static/current/resources b/w/static/current/resources index c23e48f..e915146 12 --- a/w/static/current/resources +++ b/w/static/current/resources @@ -1 +1 @@ -/srv/mediawiki/php-1.26wmf13/resources \ No newline at end of file +/srv/mediawiki/php-1.26wmf14/resources \ No newline at end of file diff --git a/w/static/current/skins b/w/static/current/skins index 42ad415..7fd74f7 12 --- a/w/static/current/skins +++ b/w/static/current/skins @@ -1 +1 @@ -/srv/mediawiki/php-1.26wmf13/skins \ No newline at end of file +/srv/mediawiki/php-1.26wmf14/skins \ No newline at end of file diff --git a/wikiversions.json b/wikiversions.json index c979ab6..22251e9 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -1 +1 @@
[MediaWiki-commits] [Gerrit] Add extension.json, remove php entry point - change (mediawiki...Theme)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224847
Change subject: Add extension.json, remove php entry point
..
Add extension.json, remove php entry point
Change-Id: I8cf29941ee70a9382c87b1b173acf730dc7c8eca
---
A Theme.hooks.php
M Theme.php
A extension.json
M monobook/dark.css
M vector/dark.css
5 files changed, 146 insertions(+), 110 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Theme
refs/changes/47/224847/1
diff --git a/Theme.hooks.php b/Theme.hooks.php
new file mode 100644
index 000..58488c8
--- /dev/null
+++ b/Theme.hooks.php
@@ -0,0 +1,45 @@
+?php
+
+class ThemeHooks {
+
+ public static function wfDisplayTheme( $out, $sk ) {
+ global $wgRequest, $wgDefaultTheme, $wgValidSkinNames;
+ global $wgResourceModules;
+
+ $theme = $wgRequest-getVal( 'usetheme', false );
+ $useskin = $wgRequest-getVal( 'useskin', false );
+ $skin = $useskin ? $useskin : $sk-getSkinName();
+
+ if ( !array_key_exists( strtolower( $skin ), $wgValidSkinNames
) ) {
+ // so we don't load themes for skins when we can't
actually load the skin
+ $skin = $sk-getSkinName();
+ }
+
+ // Monaco is a special case, since it handles its themes in its
main PHP
+ // file instead of leaving theme handling to us (ShoutWiki bug
#173)
+ if ( strtolower( $skin ) == 'monaco' ) {
+ return true;
+ }
+
+ if ( $theme ) {
+ $themeName = $theme;
+ } elseif ( isset( $wgDefaultTheme ) $wgDefaultTheme !=
'default' ) {
+ $themeName = $wgDefaultTheme;
+ } else {
+ $themeName = false;
+ }
+
+ $moduleName = 'themeloader.skins.' . strtolower( $skin ) . '.' .
+ strtolower( $themeName );
+
+ // Check that we have something to include later on; if not,
bail out
+ if ( !$themeName || !isset( $wgResourceModules[$moduleName] ) )
{
+ return true;
+ }
+
+ // Add the CSS file via ResourceLoader.
+ $out-addModuleStyles( $moduleName );
+
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/Theme.php b/Theme.php
index 6216fc1..e168cb9 100644
--- a/Theme.php
+++ b/Theme.php
@@ -4,116 +4,20 @@
*
* @file
* @ingroup Extensions
- * @version 1.7
+ * @version 1.7.1
* @author Ryan Schmidt skizzerz at gmail dot com
* @author Jack Phoenix j...@countervandalism.net
* @license https://en.wikipedia.org/wiki/Public_domain Public domain
* @link https://www.mediawiki.org/wiki/Extension:Theme Documentation
*/
-if ( !defined( 'MEDIAWIKI' ) ) {
- die();
-}
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['other'][] = array(
- 'name' = 'Theme',
- 'version' = '1.7',
- 'author' = array( 'Ryan Schmidt', 'Jack Phoenix' ),
- 'description' = 'Theme loader extension for skins',
- 'url' = 'https://www.mediawiki.org/wiki/Extension:Theme'
-);
-
-// For ShoutWiki, $wgDefaultTheme is set in GlobalSettings.php to 'default'
-// For a non-ShoutWiki site where you want to use this extension, you should
-// set $wgDefaultTheme to the name of one of the available themes for your
-// $wgDefaultSkin
-
-// Register themes for core skins here; for custom skins, do the registration
-// in the custom skin's Skinname.php file
-//
-// Monobook
-/**
- * XXX FILTHY HACK ALERT!
- * The 'themeloader.' prefix is needed to work around a dumb MediaWiki core bug
- * introduced in MW 1.23. Without a prefix of any kind (i.e. if we have
- * 'skins.monobook.foobar'), the modules are loaded *before* the skin's core
- * CSS, and hence shit hits the fan.
- * Same goes if the prefix sorts *above* 'skins' in the alphabet (hence why we
- * can't use 'shoutwiki.' as the prefix, for example).
- * Apparently™ this never should have worked and it only worked due to dumb
luck,
- * despite working consistently from MW 1.16 to 1.22.
- * I honestly have no idea anymore.
- *
- * @see https://bugzilla.wikimedia.org/show_bug.cgi?id=45229
- * @see https://bugzilla.wikimedia.org/show_bug.cgi?id=66508
- */
-$wgResourceModules['themeloader.skins.monobook.dark'] = array(
- 'styles' = array(
- 'extensions/Theme/monobook/dark.css' = array( 'media' =
'screen' )
- )
-);
-
-$wgResourceModules['themeloader.skins.monobook.pink'] = array(
- 'styles' = array(
- 'extensions/Theme/monobook/pink.css' = array( 'media' =
'screen' )
- )
-);
-
-$wgResourceModules['themeloader.skins.monobook.stellarbook'] = array(
- 'styles' = array(
-
[MediaWiki-commits] [Gerrit] several fundraising DNS changes moving toward service-orient... - change (operations/dns)
Jgreen has uploaded a new change for review. https://gerrit.wikimedia.org/r/224846 Change subject: several fundraising DNS changes moving toward service-oriented NAT and hostnames .. several fundraising DNS changes moving toward service-oriented NAT and hostnames Change-Id: Idedea24bd58e0696b3a5a2194ef30bdb89d38cfc --- M templates/152.80.208.in-addr.arpa M templates/155.80.208.in-addr.arpa M templates/wikimedia.org 3 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/46/224846/1 diff --git a/templates/152.80.208.in-addr.arpa b/templates/152.80.208.in-addr.arpa index 0522a85..9ae746b 100644 --- a/templates/152.80.208.in-addr.arpa +++ b/templates/152.80.208.in-addr.arpa @@ -16,13 +16,13 @@ 1D IN NS ns2.wikimedia.org. ; 208.80.152.224/28 frack-codfw (208.80.152.224 - 208.80.152.239) -228 1H IN PTR payments.wikimedia.org. +228 1H IN PTR payments-codfw.wikimedia.org. 229 1H IN PTR frack-payments-nat.wikimedia.org. -230 1H IN PTR frack-nat.wikimedia.org. +230 1H IN PTR frack-default-nat.wikimedia.org. 231 1H IN PTR rigel.wikimedia.org. -232 1H IN PTR civicrm.wikimedia.org. -233 1H IN PTR payments-listener.wikimedia.org. -234 1H IN PTR fundraising.wikimedia.org. +232 1H IN PTR civicrm-codfw.wikimedia.org. +233 1H IN PTR payments-listener-codfw.wikimedia.org. +234 1H IN PTR fundraising-codfw.wikimedia.org. ; 208.80.152.240/28 sandbox1-a-codfw (208.80.152.240 - 208.80.152.255) 241 1H IN PTR vrrp-gw-2201.wikimedia.org. diff --git a/templates/155.80.208.in-addr.arpa b/templates/155.80.208.in-addr.arpa index adecf13..c7c914b 100644 --- a/templates/155.80.208.in-addr.arpa +++ b/templates/155.80.208.in-addr.arpa @@ -23,13 +23,12 @@ 5 1H IN PTR payments.wikimedia.org. 6 1H IN PTR frack-ubuntu-repo.wikimedia.org. 7 1H IN PTR frack-payments-nat.wikimedia.org. -8 1H IN PTR silicon.wikimedia.org. 9 1H IN PTR tellurium.wikimedia.org. -10 1H IN PTR samarium.wikimedia.org. +10 1H IN PTR public-reporting-eqiad.wikimedia.org. 11 1H IN PTR barium.wikimedia.org. 12 1H IN PTR thulium.wikimedia.org. 13 1H IN PTR lutetium.wikimedia.org. -14 1H IN PTR barium-fundraising.wikimedia.org. +14 1H IN PTR fundraising-eqiad.wikimedia.org. ; 208.80.155.32/27 Infrastructure block diff --git a/templates/wikimedia.org b/templates/wikimedia.org index e093d98..8ba85d9 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -95,7 +95,6 @@ baham 1H IN A208.80.153.13 1H IN 2620:0:860:1:208:80:153:13 barium 1H IN A208.80.155.11 -barium-fundraising 1H IN A208.80.155.14 bast10011H IN A208.80.154.149 1H IN 2620:0:861:2:208:80:154:149 bast20011H IN A208.80.153.5 @@ -111,6 +110,9 @@ 1H IN 2620:0:861:1:208:80:154:11 dickson 1H IN A208.80.155.68 1H IN 2620:0:861:202:208:80:155:68 + +fundraising-eqiad 1H IN A208.80.155.14 + gadolinium 1H IN A208.80.154.73 gallium 1H IN A208.80.154.135 hafnium 1H IN A208.80.154.79 @@ -154,6 +156,7 @@ pollux 1H IN A208.80.153.43 procyon 1H IN A208.80.152.245 protactinium1H IN A208.80.154.13 +public-reporting-eqiad 1H IN A208.80.155.10 radium 1H IN A208.80.154.39 1H IN 2620:0:861:1:208:80:154:39 radon 1H IN A208.80.154.93 @@ -167,8 +170,6 @@ ripe-atlas-ulsfo 1H IN A198.35.26.244 1H IN 2620:0:863:201:198:35:26:244 rubidium1H IN A208.80.154.40 -samarium1H IN A208.80.155.10 -silicon 1H IN A208.80.155.8 silver 1H IN A208.80.154.136 1H IN 2620:0:861:2:208:80:154:136 californium 1H IN A208.80.154.147 @@ -422,7 +423,7 @@ ; don't want this for anything but wikimedia.org domain -frdata.wikimedia.org. 1H IN CNAMEsamarium.wikimedia.org. +frdata.wikimedia.org. 1H IN CNAMEpublic-reporing-eqiad.wikimedia.org. gerrit 1H IN A208.80.154.81 1H IN 2620:0:861:3:208:80:154:81 @@ -594,7 +595,7 @@ datasets 1H IN CNAMEmisc-web-lb.eqiad download 1H IN CNAMEdumps etherpad 5M IN CNAMEmisc-web-lb.eqiad -fundraising 1H IN CNAMEbarium-fundraising +fundraising 1H IN CNAMEfundraising-eqiad ganglia 1H IN CNAMEuranium hue 1H IN CNAMEmisc-web-lb.eqiad iegreview1H IN CNAMEmisc-web-lb.eqiad -- To view, visit https://gerrit.wikimedia.org/r/224846 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id:
[MediaWiki-commits] [Gerrit] Finish fixing drush parse-audit - change (wikimedia...crm)
jenkins-bot has submitted this change and it was merged.
Change subject: Finish fixing drush parse-audit
..
Finish fixing drush parse-audit
D'oh! Didn't quite get it right last night.
Bug: T90507
Change-Id: Iecc14cd873327338937c47c7097a42c406d9140a
---
M sites/all/modules/wmf_audit/wmf_audit.drush.inc
M sites/all/modules/wmf_audit/wmf_audit.module
2 files changed, 3 insertions(+), 6 deletions(-)
Approvals:
Cdentinger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/wmf_audit/wmf_audit.drush.inc
b/sites/all/modules/wmf_audit/wmf_audit.drush.inc
index b9a221a..8248458 100644
--- a/sites/all/modules/wmf_audit/wmf_audit.drush.inc
+++ b/sites/all/modules/wmf_audit/wmf_audit.drush.inc
@@ -51,10 +51,7 @@
function drush_wmf_audit_parse_audit() {
$args = drush_get_arguments();
- if ( count( $args ) !== 2 ) {
-throw new WmfException( {$args[0]} requires a gateway. );
- }
- $gateway = $args[1];
+ $gateway = $args[1]; // required-arguments should ensure this exists
$simple_opts = array(
'test' = 'Running in test mode: No stomp messages will be sent',
diff --git a/sites/all/modules/wmf_audit/wmf_audit.module
b/sites/all/modules/wmf_audit/wmf_audit.module
index 4711d96..0ef8a7d 100644
--- a/sites/all/modules/wmf_audit/wmf_audit.module
+++ b/sites/all/modules/wmf_audit/wmf_audit.module
@@ -34,9 +34,9 @@
* @param array $options Runtime parameters
*/
function wmf_audit_main( $gateway, $options ) {
-$audit = module_hook_invoke( {$gateway}_audit, 'create_processor',
$options );
+$audit = module_invoke( {$gateway}_audit, 'create_processor', $options );
if ( !$audit ) {
- throw new Exception( Gateway [$gateway] not found );
+throw new Exception( Gateway [$gateway] not found );
}
$audit-run();
}
--
To view, visit https://gerrit.wikimedia.org/r/224845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iecc14cd873327338937c47c7097a42c406d9140a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Cdentinger cdentin...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP]: ProofreadPage refactoring (use application/json fmt) - change (pywikibot/core)
Mpaa has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224852
Change subject: [WIP]: ProofreadPage refactoring (use application/json fmt)
..
[WIP]: ProofreadPage refactoring (use application/json fmt)
Loading text as application/json is more efficien and less error prone,
as no regex processing is needed unless the page is not existing yet.
ProofreadPage has been heavily refactored and raises exceptions if
correct json format is not recognised.
This approach has one issue to be solved, that is how to make sure that
all BasePage methods using site.loadrevisions are not broken.
Change-Id: I5128fbb59e0a78498057ceece095e917c1f77e86
---
M pywikibot/data/api.py
M pywikibot/page.py
M pywikibot/proofreadpage.py
M pywikibot/site.py
M tests/proofreadpage_tests.py
5 files changed, 200 insertions(+), 106 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/52/224852/1
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 88701de..715bbf1 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -2840,6 +2840,7 @@
kwargs = self._clean_kwargs(kwargs, prop=prop)
QueryGenerator.__init__(self, **kwargs)
+
self._props = frozenset(prop.split('|'))
self.resultkey = pages
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 933a51e..be4ab1b 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -326,7 +326,7 @@
return self.autoFormat()[0] is not None
@deprecated_args(throttle=None, change_edit_time=None)
-def get(self, force=False, get_redirect=False, sysop=False):
+def get(self, force=False, get_redirect=False, sysop=False, **kwargs):
Return the wiki-text of the page.
This will retrieve the page from the server if it has not been
@@ -350,7 +350,7 @@
if force:
del self.latest_revision_id
try:
-self._getInternals(sysop)
+self._getInternals(sysop, **kwargs)
except pywikibot.IsRedirectPage:
if not get_redirect:
raise
@@ -365,7 +365,7 @@
else:
return None
-def _getInternals(self, sysop):
+def _getInternals(self, sysop, **kwargs):
Helper function for get().
Stores latest revision in self if it doesn't contain it, doesn't think.
@@ -380,7 +380,7 @@
# If not already stored, fetch revision
if self._latest_cached_revision() is None:
try:
-self.site.loadrevisions(self, getText=True, sysop=sysop)
+self.site.loadrevisions(self, getText=True, sysop=sysop,
**kwargs)
except (pywikibot.NoPage, pywikibot.SectionError) as e:
self._getexception = e
raise
@@ -4462,7 +4462,7 @@
@type revid: int
@param text: Revision wikitext.
@type text: unicode, or None if text not yet retrieved
-@param timestamp: Revision time stamp
+@param timestamp: Revision timestamp
@type timestamp: pywikibot.Timestamp
@param user: user who edited this revision
@type user: unicode
@@ -4472,6 +4472,10 @@
@type comment: unicode
@param minor: edit flagged as minor
@type minor: bool
+@param contentmodel
+@type text: unicode, or None if not available
+@param sha1
+@type text: unicode, or None if not available
self.revid = revid
diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py
index 234dee2..939ae93 100644
--- a/pywikibot/proofreadpage.py
+++ b/pywikibot/proofreadpage.py
@@ -25,37 +25,6 @@
import pywikibot
-class FullHeader(object):
-
-Header of a ProofreadPage object.
-
-p_header = re.compile(
-r'pagequality level=(?Pql\d) user=(?Puser.*?) /'
-r'div class=pagetext(?Pheader.*)',
-re.DOTALL)
-
-_template = ('pagequality level={0.ql} user={0.user} /'
- 'div class=pagetext{0.header}\n\n\n')
-
-def __init__(self, text=None):
-Constructor.
-self._text = text or ''
-
-m = self.p_header.search(self._text)
-if m:
-self.ql = int(m.group('ql'))
-self.user = m.group('user')
-self.header = m.group('header')
-else:
-self.ql = ProofreadPage.NOT_PROOFREAD
-self.user = ''
-self.header = ''
-
-def __str__(self):
-Return a string representation.
-return self._template.format(self)
-
-
class ProofreadPage(pywikibot.Page):
ProofreadPage page used in Mediawiki ProofreadPage extension.
@@ -70,6 +39,12 @@
close_tag = '/noinclude'
p_open = re.compile(r'noinclude')
p_close = re.compile(r'(/div|\n\n\n)?/noinclude')
+p_header = re.compile(
+r'pagequality level=(?Plevel\d) user=(?Puser.*?) /'
+r'div
[MediaWiki-commits] [Gerrit] more fundraising hostnames shift to service-oriented scheme - change (operations/dns)
Jgreen has uploaded a new change for review. https://gerrit.wikimedia.org/r/224851 Change subject: more fundraising hostnames shift to service-oriented scheme .. more fundraising hostnames shift to service-oriented scheme Change-Id: I884e9ca85fa53ea3a2daaad2b25368252d3c30ed --- M templates/152.80.208.in-addr.arpa M templates/155.80.208.in-addr.arpa M templates/wikimedia.org 3 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/51/224851/1 diff --git a/templates/152.80.208.in-addr.arpa b/templates/152.80.208.in-addr.arpa index 9ae746b..ca23db5 100644 --- a/templates/152.80.208.in-addr.arpa +++ b/templates/152.80.208.in-addr.arpa @@ -17,8 +17,8 @@ ; 208.80.152.224/28 frack-codfw (208.80.152.224 - 208.80.152.239) 228 1H IN PTR payments-codfw.wikimedia.org. -229 1H IN PTR frack-payments-nat.wikimedia.org. -230 1H IN PTR frack-default-nat.wikimedia.org. +229 1H IN PTR frack-payments-nat-codfw.wikimedia.org. +230 1H IN PTR frack-default-nat-codfw.wikimedia.org. 231 1H IN PTR rigel.wikimedia.org. 232 1H IN PTR civicrm-codfw.wikimedia.org. 233 1H IN PTR payments-listener-codfw.wikimedia.org. diff --git a/templates/155.80.208.in-addr.arpa b/templates/155.80.208.in-addr.arpa index ad3cb80..7b3af52 100644 --- a/templates/155.80.208.in-addr.arpa +++ b/templates/155.80.208.in-addr.arpa @@ -21,12 +21,12 @@ 2 1H IN PTR pay-lvs1001.wikimedia.org. 3 1H IN PTR pay-lvs1002.wikimedia.org. 5 1H IN PTR payments.wikimedia.org. -6 1H IN PTR frack-ubuntu-repo.wikimedia.org. -7 1H IN PTR frack-payments-nat.wikimedia.org. +6 1H IN PTR frack-default-net-eqiad.wikimedia.org. +7 1H IN PTR frack-payments-nat-eqiad.wikimedia.org. 9 1H IN PTR tellurium.wikimedia.org. 10 1H IN PTR frdata-eqiad.wikimedia.org. 11 1H IN PTR barium.wikimedia.org. -12 1H IN PTR thulium.wikimedia.org. +12 1H IN PTR payments-listener-eqiad.wikimedia.org. 13 1H IN PTR lutetium.wikimedia.org. 14 1H IN PTR fundraising-eqiad.wikimedia.org. diff --git a/templates/wikimedia.org b/templates/wikimedia.org index d0398ff..3002896 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -177,7 +177,6 @@ 1H IN 2620:0:861:1:208:80:154:61 tellurium 1H IN A208.80.155.9 -thulium 1H IN A208.80.155.12 titanium1H IN A208.80.154.154 uranium 1H IN A208.80.154.53 1H IN 2620:0:861:1:208:80:154:53 @@ -457,7 +456,8 @@ payments5M IN A208.80.155.5 ; eqiad -payments-listener 1H IN CNAMEthulium +payments-listener-eqiad 1H IN A208.80.155.12 +payments-listener 1H IN CNAMEpayments-listener-eqiad payments-listener.frdev 1H IN CNAMElutetium people 1H IN CNAMEmisc-web-lb.eqiad -- To view, visit https://gerrit.wikimedia.org/r/224851 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I884e9ca85fa53ea3a2daaad2b25368252d3c30ed Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Jgreen jgr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
