[MediaWiki-commits] [Gerrit] Fix styling of deletion page when $wgUseMediaWikiUIEverywher... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix styling of deletion page when $wgUseMediaWikiUIEverywhere
enabled
..
Fix styling of deletion page when $wgUseMediaWikiUIEverywhere enabled
* Stop using tables use divs instead. It's the future!
* Update MediaWiki UI so that inline inputs have a minimum width (as pointed
out by Bartosz, the summary field would've gotten smaller than it was
before to the point of being near unusable).
* Change submit button to be mw-ui-destructive (it deletes a page after all).
* Switch to using Html rather than Xml where possible.
Bug: 70134
Change-Id: Ic308a43cb0ec26ea9fdb8c9c8aa0de481a922435
---
M includes/page/Article.php
M resources/src/mediawiki.ui/components/inputs.less
2 files changed, 57 insertions(+), 55 deletions(-)
Approvals:
Mattflaschen: Looks good to me, but someone else must approve
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/page/Article.php b/includes/page/Article.php
index e562d43..96e315f 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1676,7 +1676,9 @@
wfDebug( Article::confirmDelete\n );
$title = $this-getTitle();
- $outputPage = $this-getContext()-getOutput();
+ $ctx = $this-getContext();
+ $outputPage = $ctx-getOutput();
+ $useMediaWikiUIEverywhere = $ctx-getConfig()-get(
'UseMediaWikiUIEverywhere' );
$outputPage-setPageTitle( wfMessage( 'delete-confirm',
$title-getPrefixedText() ) );
$outputPage-addBacklinkSubtitle( $title );
$outputPage-setRobotPolicy( 'noindex,nofollow' );
@@ -1692,75 +1694,67 @@
$user = $this-getContext()-getUser();
if ( $user-isAllowed( 'suppressrevision' ) ) {
- $suppress = tr id=\wpDeleteSuppressRow\
- td/td
- td class='mw-input'strong .
+ $suppress = Html::openElement( 'div', array( 'id' =
'wpDeleteSuppressRow' ) ) .
+ strong .
Xml::checkLabel( wfMessage(
'revdelete-suppress' )-text(),
'wpSuppress',
'wpSuppress', false, array( 'tabindex' = '4' ) ) .
- /strong/td
- /tr;
+ /strong .
+ Html::closeElement( 'div' );
} else {
$suppress = '';
}
$checkWatch = $user-getBoolOption( 'watchdeletion' ) ||
$user-isWatched( $title );
- $form = Xml::openElement( 'form', array( 'method' = 'post',
+ $form = Html::openElement( 'form', array( 'method' = 'post',
'action' = $title-getLocalURL( 'action=delete' ),
'id' = 'deleteconfirm' ) ) .
- Xml::openElement( 'fieldset', array( 'id' =
'mw-delete-table' ) ) .
- Xml::tags( 'legend', null, wfMessage( 'delete-legend'
)-escaped() ) .
- Xml::openElement( 'table', array( 'id' =
'mw-deleteconfirm-table' ) ) .
- tr id=\wpDeleteReasonListRow\
- td class='mw-label' .
- Xml::label( wfMessage( 'deletecomment'
)-text(), 'wpDeleteReasonList' ) .
- /td
- td class='mw-input' .
- Xml::listDropDown(
- 'wpDeleteReasonList',
- wfMessage(
'deletereason-dropdown' )-inContentLanguage()-text(),
- wfMessage(
'deletereasonotherlist' )-inContentLanguage()-text(),
- '',
- 'wpReasonDropDown',
- 1
- ) .
- /td
- /tr
- tr id=\wpDeleteReasonRow\
- td class='mw-label' .
- Xml::label( wfMessage(
'deleteotherreason' )-text(), 'wpReason' ) .
- /td
- td class='mw-input' .
- Html::input( 'wpReason', $reason, 'text', array(
- 'size' = '60',
- 'maxlength' = '255',
- 'tabindex' = '2',
- 'id' = 'wpReason',
-
[MediaWiki-commits] [Gerrit] repool es1008 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/164286 Change subject: repool es1008 .. repool es1008 Change-Id: I9915654cb67b7186142ee0b8c1ae19e3a54d622d --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/86/164286/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 4e1d755..1e411c1 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -462,9 +462,9 @@ ), # es3 'cluster25' = array( - # maintenance '10.64.32.18' = 1, # es1008, old master - '10.64.32.19' = 3, # es1009, new master - '10.64.32.20' = 1, # es1010 snapshot host + '10.64.32.19' = 1, # es1009, master + '10.64.32.18' = 3, # es1008 + '10.64.32.20' = 3, # es1010 ), # ExtensionStore shard1 - initially for AFTv5 'extension1' = array( @@ -513,7 +513,7 @@ $wgDefaultExternalStore = array( 'DB://cluster24', - # maintenance 'DB://cluster25', + 'DB://cluster25', ); $wgMasterWaitTimeout = 2; $wgDBAvgStatusPoll = 3; -- To view, visit https://gerrit.wikimedia.org/r/164286 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9915654cb67b7186142ee0b8c1ae19e3a54d622d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool es1008 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: repool es1008 .. repool es1008 Change-Id: I9915654cb67b7186142ee0b8c1ae19e3a54d622d --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 4e1d755..1e411c1 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -462,9 +462,9 @@ ), # es3 'cluster25' = array( - # maintenance '10.64.32.18' = 1, # es1008, old master - '10.64.32.19' = 3, # es1009, new master - '10.64.32.20' = 1, # es1010 snapshot host + '10.64.32.19' = 1, # es1009, master + '10.64.32.18' = 3, # es1008 + '10.64.32.20' = 3, # es1010 ), # ExtensionStore shard1 - initially for AFTv5 'extension1' = array( @@ -513,7 +513,7 @@ $wgDefaultExternalStore = array( 'DB://cluster24', - # maintenance 'DB://cluster25', + 'DB://cluster25', ); $wgMasterWaitTimeout = 2; $wgDBAvgStatusPoll = 3; -- To view, visit https://gerrit.wikimedia.org/r/164286 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9915654cb67b7186142ee0b8c1ae19e3a54d622d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add method for determining if a version is a snapshot - change (mediawiki...release)
MarkAHershberger has uploaded a new change for review. https://gerrit.wikimedia.org/r/164289 Change subject: Add method for determining if a version is a snapshot .. Add method for determining if a version is a snapshot Change-Id: I6aa1df6bd14cf5ad7de133a3a3fe066d7bf6dc76 --- M make-release/make-release.py 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release refs/changes/89/164289/1 diff --git a/make-release/make-release.py b/make-release/make-release.py index 51d3ce2..e88b287 100755 --- a/make-release/make-release.py +++ b/make-release/make-release.py @@ -204,6 +204,11 @@ self.branch ) +def isSnapshot(self): +if self.raw[:9] == snapshot-: +return True +return False + def decomposeVersion(self, version): '''Split a version number to branch / major -- To view, visit https://gerrit.wikimedia.org/r/164289 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6aa1df6bd14cf5ad7de133a3a3fe066d7bf6dc76 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: MarkAHershberger m...@nichework.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Start adding extension information to .yaml file - change (mediawiki...release)
MarkAHershberger has uploaded a new change for review. https://gerrit.wikimedia.org/r/164288 Change subject: Start adding extension information to .yaml file .. Start adding extension information to .yaml file Change-Id: Ibd00711a16c26e5c2bc09b830848bd5d6f93428a --- M make-release/make-release.yaml 1 file changed, 42 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release refs/changes/88/164288/1 diff --git a/make-release/make-release.yaml b/make-release/make-release.yaml index 9bc38ca..4b4ce99 100644 --- a/make-release/make-release.yaml +++ b/make-release/make-release.yaml @@ -1,3 +1,35 @@ +extensions: +1.18: +add: +- ConfirmEdit +- Gadgets +- Nuke +- ParserFunctions +- Renameuser +- Vector +- WikiEditor +1.21: +add: +- PdfHandler +- SpamBlacklist +1.22: +add: +- Cite +- ImageMap +- Interwiki +- TitleBlacklist +- SpamBlacklist +- Poem +- InputBox +- LocalisationUpdate +- SyntaxHighlight_GeSHi +- SimpleAntiSpam + +1.23: +remove: +- Vector +- SimpleAntiSpam + bundles: smw: - AdminLinks @@ -23,13 +55,13 @@ - Validator - Widgets tar: - ignore: -- *~ -- .js* -- .git* -- testsuite -- tests -- *.xcf -- #*# -- .#* -- .travis.yml +ignore: +- *~ +- .js* +- .git* +- testsuite +- tests +- *.xcf +- #*# +- .#* +- .travis.yml -- To view, visit https://gerrit.wikimedia.org/r/164288 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd00711a16c26e5c2bc09b830848bd5d6f93428a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: MarkAHershberger m...@nichework.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add .dir-locals for emacs - change (mediawiki...release)
MarkAHershberger has uploaded a new change for review. https://gerrit.wikimedia.org/r/164287 Change subject: Add .dir-locals for emacs .. Add .dir-locals for emacs Change-Id: Iecf725caab75407c0143f9965a21956849ea8fdd --- A make-release/.dir-locals.el 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release refs/changes/87/164287/1 diff --git a/make-release/.dir-locals.el b/make-release/.dir-locals.el new file mode 100644 index 000..d0cabb9 --- /dev/null +++ b/make-release/.dir-locals.el @@ -0,0 +1,5 @@ +;;; Directory Local Variables +;;; See Info node `(emacs) Directory Variables' for more information. + +((yaml-mode + (yaml-indent-offset . 4))) -- To view, visit https://gerrit.wikimedia.org/r/164287 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iecf725caab75407c0143f9965a21956849ea8fdd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: MarkAHershberger m...@nichework.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup variable declarations, documentation and whitespaces - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Cleanup variable declarations, documentation and whitespaces
..
Cleanup variable declarations, documentation and whitespaces
Change-Id: I8a771e907898a7e95377deeef60380733bbc
---
M modules/tools/ext.cx.progressbar.js
M modules/tools/ext.cx.tools.instructions.js
M modules/tools/ext.cx.tools.link.js
M modules/tools/ext.cx.tools.mt.js
M modules/tools/ext.cx.tools.mtabuse.js
5 files changed, 34 insertions(+), 27 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tools/ext.cx.progressbar.js
b/modules/tools/ext.cx.progressbar.js
index 46e03aa..9c74e14 100644
--- a/modules/tools/ext.cx.progressbar.js
+++ b/modules/tools/ext.cx.progressbar.js
@@ -39,10 +39,8 @@
this.$info = $( 'div' )
.addClass( 'cx-progressbar__info' )
.append(
- $( 'div' )
- .addClass(
'cx-progressbar__info--total' ),
- $( 'div' )
- .addClass( 'cx-progressbar__info--mt' )
+ $( 'div' ).addClass(
'cx-progressbar__info--total' ),
+ $( 'div' ).addClass(
'cx-progressbar__info--mt' )
);
this.$container.append( this.$info.hide() );
diff --git a/modules/tools/ext.cx.tools.instructions.js
b/modules/tools/ext.cx.tools.instructions.js
index 7a9318e..4e05ac9 100644
--- a/modules/tools/ext.cx.tools.instructions.js
+++ b/modules/tools/ext.cx.tools.instructions.js
@@ -40,8 +40,6 @@
InstructionsCard.prototype.constructor = InstructionsCard;
InstructionsCard.prototype.render = function () {
- var $guidelines;
-
this.$card.find( '.tools.count.one' )
.text( mw.language.convertNumber( 1 ) );
this.$card.find( '.text.heading.one' )
@@ -63,13 +61,12 @@
this.$card.find( '.text.description.three' )
.text( mw.msg( 'cx-tools-instructions-text6' ) );
- $guidelines = this.$card.find( '.card__section.guidelines' )
- .append( $( 'a' )
- .prop( {
- href: mw.msg(
'cx-tools-view-guidelines-link' ),
- target: '_blank'
- } )
- .text( mw.msg( 'cx-tools-view-guidelines' ) )
+ this.$card.find( '.card__section.guidelines' ).append( $( 'a'
)
+ .prop( {
+ href: mw.msg( 'cx-tools-view-guidelines-link' ),
+ target: '_blank'
+ } )
+ .text( mw.msg( 'cx-tools-view-guidelines' ) )
);
};
diff --git a/modules/tools/ext.cx.tools.link.js
b/modules/tools/ext.cx.tools.link.js
index 8d23b1e..b66b5d1 100644
--- a/modules/tools/ext.cx.tools.link.js
+++ b/modules/tools/ext.cx.tools.link.js
@@ -86,6 +86,7 @@
.text( mw.msg( 'cx-tools-link-instruction-shortcut' ) );
$linkInstructionSection.append( $linkInstructionShortcut );
this.$sourceLinkCard.find( '.card__link-info' ).append(
$linkInstructionSection );
+
return this.$sourceLinkCard.hide();
};
@@ -105,6 +106,7 @@
.text( mw.msg( 'cx-tools-link-add' ) );
this.$targetLinkCard.find( '.card__link-info' )
.append( this.$addLink, this.$removeLink );
+
return this.$targetLinkCard.hide();
};
@@ -118,6 +120,7 @@
this.$card.append( this.getSourceLinkCard() );
this.$card.append( this.getTargetLinkCard() );
this.listen();
+
return this.$card.hide();
};
@@ -376,17 +379,20 @@
return;
}
+
page = response.query.pages[ pageId ];
linkCard.createExternalLink(
linkCard.$sourceLinkCard.find(
'.card__link-text' ),
page.title,
language
);
+
if ( page.thumbnail ) {
imgSrc = page.thumbnail.source;
linkCard.$sourceLinkCard.find(
'.card__link-image-container' )
.append( $( 'img' ).attr( 'src',
imgSrc ) );
}
+
linkCard.$sourceLinkCard.show();
linkCard.$card.show();
linkCard.onShow();
@@ -408,7
[MediaWiki-commits] [Gerrit] prepare es1010 for upgrade - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164290
Change subject: prepare es1010 for upgrade
..
prepare es1010 for upgrade
Change-Id: I04b2a026cb3a82208238d0b0516a8c65bbd9058c
---
M manifests/role/coredb.pp
M manifests/site.pp
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/90/164290/1
diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index 76e62df..906c22b 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -91,8 +91,8 @@
'es3' = {
'hosts' = { 'eqiad' = [ 'es1008', 'es1009', 'es1010' ] },
'primary_site' = $::mw_primary,
-'masters' = { 'eqiad' = 'es1008' },
-'snapshot' = [ 'es1010' ],
+'masters' = { 'eqiad' = 'es1009' },
+'snapshot' = [],
'no_master'= []
},
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 4d31f1a..f0627e6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1207,7 +1207,7 @@
}
}
-node /es10(09|10)\.eqiad\.wmnet/ {
+node /es100[9]\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
class { 'role::coredb::es3':
@@ -1215,7 +1215,7 @@
}
}
-node /es100[8]\.eqiad\.wmnet/ {
+node /es10(08|10)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
--
To view, visit https://gerrit.wikimedia.org/r/164290
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I04b2a026cb3a82208238d0b0516a8c65bbd9058c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle sprin...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] prepare es1010 for upgrade - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: prepare es1010 for upgrade
..
prepare es1010 for upgrade
Change-Id: I04b2a026cb3a82208238d0b0516a8c65bbd9058c
---
M manifests/role/coredb.pp
M manifests/site.pp
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index 76e62df..906c22b 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -91,8 +91,8 @@
'es3' = {
'hosts' = { 'eqiad' = [ 'es1008', 'es1009', 'es1010' ] },
'primary_site' = $::mw_primary,
-'masters' = { 'eqiad' = 'es1008' },
-'snapshot' = [ 'es1010' ],
+'masters' = { 'eqiad' = 'es1009' },
+'snapshot' = [],
'no_master'= []
},
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 4d31f1a..f0627e6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1207,7 +1207,7 @@
}
}
-node /es10(09|10)\.eqiad\.wmnet/ {
+node /es100[9]\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
class { 'role::coredb::es3':
@@ -1215,7 +1215,7 @@
}
}
-node /es100[8]\.eqiad\.wmnet/ {
+node /es10(08|10)\.eqiad\.wmnet/ {
include admin
$cluster = 'mysql'
--
To view, visit https://gerrit.wikimedia.org/r/164290
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I04b2a026cb3a82208238d0b0516a8c65bbd9058c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle sprin...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make submit of Special:NewFiles progressive - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Make submit of Special:NewFiles progressive .. Make submit of Special:NewFiles progressive Bug: 71445 Change-Id: Iba2a8e7f37c2c1af3a018740d5a9b48edc84e238 --- M includes/specials/SpecialNewimages.php 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialNewimages.php b/includes/specials/SpecialNewimages.php index 546c191..b9d1872 100644 --- a/includes/specials/SpecialNewimages.php +++ b/includes/specials/SpecialNewimages.php @@ -201,7 +201,10 @@ $context = new DerivativeContext( $this-getContext() ); $context-setTitle( $this-getTitle() ); // Remove subpage $form = new HTMLForm( $fields, $context ); + $form-setSubmitTextMsg( 'ilsubmit' ); + $form-setSubmitProgressive(); + $form-setMethod( 'get' ); $form-setWrapperLegendMsg( 'newimages-legend' ); -- To view, visit https://gerrit.wikimedia.org/r/164279 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba2a8e7f37c2c1af3a018740d5a9b48edc84e238 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Prtksxna psax...@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] Increase the stack size soft limit to 32MiB - change (operations/puppet)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/164291 Change subject: Increase the stack size soft limit to 32MiB .. Increase the stack size soft limit to 32MiB See https://bugzilla.wikimedia.org/show_bug.cgi?id=71486#c6. HHVM's default thread count is CPU cores * 2, so 48 for most app servers. This means a cumulative max size of 1.3 GiB for all threads, which is acceptable. The hard limit stays unlimited, as before. Change-Id: I455c0e9f1746ba9f79c0e7c58d481f1677879783 --- M modules/hhvm/files/hhvm.conf 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/91/164291/1 diff --git a/modules/hhvm/files/hhvm.conf b/modules/hhvm/files/hhvm.conf index d4df907..2c6f8ed 100644 --- a/modules/hhvm/files/hhvm.conf +++ b/modules/hhvm/files/hhvm.conf @@ -74,6 +74,9 @@ # Increase the maximum number of open files. limit nofile 65536 65536 +# Increase the maximum size of the stack. See bug 71486. +limit stack 33554432 unlimited + # When `hhvm.server.graceful_shutdown_wait` is set to a positive # integer, HHVM will perform a graceful shutdown on SIGHUP. kill signal HUP -- To view, visit https://gerrit.wikimedia.org/r/164291 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I455c0e9f1746ba9f79c0e7c58d481f1677879783 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Cleanup the Sanitarium - change (operations/software)
Springle has submitted this change and it was merged.
Change subject: WIP: Cleanup the Sanitarium
..
WIP: Cleanup the Sanitarium
We already set triggers on tables for the nulling out fields
replicated to labs; extend that to a cleaner whitelist approach
that does not care when new tables and wikis are created.
Make it easier to resync the labs slaves by using activity
logging along side normal replication, designed along the lines
of Tungsten Replicator (without the java bit).
Probably also relevant to the impending replication of some Event
Logging tables to labs, pending discussion.
Change-Id: I4d060cce995380709caf5facada15c57bc3fc5a1
---
A dbtools/repl_dump_shard.sh
A dbtools/repl_load_shard.sh
A dbtools/repl_prepare_schema.sh
A dbtools/repl_prepare_table.sh
A dbtools/repl_prepare_wiki.sh
A dbtools/repl_sync_schema.sh
A dbtools/repl_sync_table.sh
7 files changed, 803 insertions(+), 0 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dbtools/repl_dump_shard.sh b/dbtools/repl_dump_shard.sh
new file mode 100755
index 000..03066a5
--- /dev/null
+++ b/dbtools/repl_dump_shard.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -e
+
+usage() {
+echo $0 --host=... --db=...
+exit 1
+}
+
+shard=
+
+for var in $@; do
+
+if [[ $var =~ ^--shard=(.+) ]]; then
+shard=${BASH_REMATCH[1]}
+fi
+
+done
+
+[ $shard ] || usage
+
+mysql=mysql -S /tmp/mysql.$shard.sock --skip-column-names
+mysqldump=mysqldump -S /tmp/mysql.$shard.sock --single-transaction --quick
--no-create-info --skip-add-locks --skip-triggers --hex-blob
+
+for db in $(cat mediawiki-config/$shard.dblist); do
+for tbl in $($mysql $db -e select table_name from repl_tables); do
+while [ $(pgrep mysqldump | wc -l) -gt 10 ]; do
+sleep 1s
+done
+echo $db.$tbl
+$mysqldump $db $tbl | pigz ${db}_${tbl}.sql.gz
+done
+done
\ No newline at end of file
diff --git a/dbtools/repl_load_shard.sh b/dbtools/repl_load_shard.sh
new file mode 100755
index 000..a802140
--- /dev/null
+++ b/dbtools/repl_load_shard.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e
+
+usage() {
+echo $0 --host=... --db=...
+exit 1
+}
+
+shard=
+
+for var in $@; do
+
+if [[ $var =~ ^--shard=(.+) ]]; then
+shard=${BASH_REMATCH[1]}
+fi
+
+done
+
+[ $shard ] || usage
+
+mysql=mysql -S /tmp/mysql.sock --skip-column-names
+
+for db in $(cat mediawiki-config/$shard.dblist); do
+for tbl in $($mysql repl_${db} -e select table_name from repl_tables); do
+while [ $(pgrep gzip | wc -l) -gt 10 ]; do
+sleep 1s
+done
+echo repl_${db}.${tbl}
+zcat ${db}_${tbl}.sql.gz | $mysql repl_${db}
+done
+done
\ No newline at end of file
diff --git a/dbtools/repl_prepare_schema.sh b/dbtools/repl_prepare_schema.sh
new file mode 100755
index 000..d79f6bf
--- /dev/null
+++ b/dbtools/repl_prepare_schema.sh
@@ -0,0 +1,245 @@
+#!/bin/bash
+
+set -e
+
+usage() {
+echo $0 --host=... --db=...
+exit 1
+}
+
+user=root
+host=
+port=3306
+db=
+
+for var in $@; do
+
+if [[ $var =~ ^--host=(.+) ]]; then
+host=${BASH_REMATCH[1]}
+fi
+
+if [[ $var =~ ^--port=(.+) ]]; then
+port=${BASH_REMATCH[1]}
+fi
+
+if [[ $var =~ ^--user=(.+) ]]; then
+user=${BASH_REMATCH[1]}
+fi
+
+if [[ $var =~ ^--db=(.+) ]]; then
+db=${BASH_REMATCH[1]}
+fi
+
+done
+
+[ $db ] || usage
+[ $host ] || usage
+
+my=mysql -h $host -P $port -u $user --skip-column-names
+
+today=$($my -e select to_days(now()))
+tomorrow=$((today+1))
+
+$my EOD
+
+set session sql_log_bin = 0;
+
+create database if not exists ${db};
+use ${db};
+
+drop table if exists repl_tables;
+create table if not exists repl_tables (
+table_name varchar(100) not null primary key,
+table_stamp datetime not null,
+table_md5 binary(16) not null,
+index (table_name),
+index (table_md5)
+) engine=innodb default charset=binary;
+
+drop trigger if exists repl_tables_ins;
+create trigger repl_tables_ins before insert on repl_tables
+for each row set new.table_stamp = now(), new.table_md5 =
unhex(md5(new.table_name));
+
+drop table if exists repl_ignore;
+create table if not exists repl_ignore (
+table_name varchar(100) not null,
+primary key (table_name)
+) engine=innodb default charset=binary;
+
+replace into repl_ignore values ('accountaudit_login');
+replace into repl_ignore values ('arbcom1_vote');
+replace into repl_ignore values ('archive_old');
+replace into repl_ignore values ('blob_orphans');
+replace into repl_ignore values ('blob_tracking');
+replace into repl_ignore values ('bv2009_edits');
+replace into repl_ignore values ('categorylinks_old');
+replace into repl_ignore values ('click_tracking');
+replace into repl_ignore values ('cu_changes');
+replace into repl_ignore values ('cu_log');
+replace into repl_ignore values
[MediaWiki-commits] [Gerrit] Hygiene: Remove obsolete files from less/ - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Remove obsolete files from less/
..
Hygiene: Remove obsolete files from less/
Used for Nearby beta features, which was removed in
I6033ed78c9b00fb938241294482f22fa1ed484f5
Change-Id: Ia1be0984d8dd6fe3916b83c5a99b5aec6e157e2f
---
D less/desktop/images/geo.png
D less/desktop/mobileBridge.less
2 files changed, 0 insertions(+), 121 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/less/desktop/images/geo.png b/less/desktop/images/geo.png
deleted file mode 100644
index 4620bf7..000
--- a/less/desktop/images/geo.png
+++ /dev/null
Binary files differ
diff --git a/less/desktop/mobileBridge.less b/less/desktop/mobileBridge.less
deleted file mode 100644
index 7a24024..000
--- a/less/desktop/mobileBridge.less
+++ /dev/null
@@ -1,121 +0,0 @@
-@import 'minerva.mixins';
-@import '../pagelist.less';
-
-.overlay-enabled {
- .skin-vector {
-
- // FIXME: Design to be reviewed at a later date.
- .overlay {
- width: auto;
- height: auto;
- top: 84px;
- left: 60%;
- right: 14px;
- border: solid 3px #3F77D7;
- padding: 8px;
-
- .overlay-header-container {
- position: relative;
- .cancel {
- background-color: white;
- border: none;
- }
-
- ul {
- li {
- margin: 0;
- }
- list-style: none;
- }
- }
-
- .loading {
-
- .spinner {
- height: 100px;
- }
-
- .background-image('../images/ajax-loader.gif');
- background-repeat: no-repeat;
- background-position: center;
- .background-size( 32px, auto );
-
- .content {
- padding-top: 48px;
- text-align: center;
- background-position: 50% 0;
- }
- }
-
- // Override Vector's default
- p {
- margin: 0;
- .content-header {
- margin: 0;
- }
- }
-
- .page-list {
- margin: 0;
- font-size: .9em;
- line-height: inherit;
- .thumbs {
- li {
- padding-left: 55px;
- }
- }
-
- .listThumb {
- width: 40px;
- }
- }
-
- .content {
- margin: .8em @contentMargin 0;
- }
- }
- }
-}
-
-.skin-vector {
-
- .mw-body {
- position: relative;
- }
-
- #page-secondary-actions {
-
- .button.nearby {
- display: inline-block;
- border-radius: 3px;
- text-indent: -px;
- .box-sizing(border-box);
- vertical-align: top;
- .background-size(30px, auto);
- background-repeat: no-repeat;
- background-position: center center;
- height: 40px;
- width: 40px;
- border: 1px #33589f solid;
- color: white;
- background-color: @colorProgressive;
-
- :hover {
- background-color: #3f77d7;
- }
-
- :active {
- background-color: #2a549c;
- }
-
- background-image: url(images/geo.png);
- }
- }
-}
-
-// Hide nearby button when VisualEditor enabled
-.ve-activated {
- .button.nearby {
-
[MediaWiki-commits] [Gerrit] Update Wikia's MediaWiki version to 1.19.20 - change (pywikibot/core)
Grunny has uploaded a new change for review. https://gerrit.wikimedia.org/r/164292 Change subject: Update Wikia's MediaWiki version to 1.19.20 .. Update Wikia's MediaWiki version to 1.19.20 Change-Id: Ibfcef58d19080dff09758d5827f6dbbb245cec1d --- M pywikibot/families/lyricwiki_family.py M pywikibot/families/wikia_family.py M pywikibot/families/wowwiki_family.py 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/92/164292/1 diff --git a/pywikibot/families/lyricwiki_family.py b/pywikibot/families/lyricwiki_family.py index 3a48529..a0bfcf9 100644 --- a/pywikibot/families/lyricwiki_family.py +++ b/pywikibot/families/lyricwiki_family.py @@ -24,7 +24,7 @@ def version(self, code): Return the version for this family. -return '1.19.19' +return '1.19.20' def scriptpath(self, code): Return the script path for this family. diff --git a/pywikibot/families/wikia_family.py b/pywikibot/families/wikia_family.py index 81ee442..9ab8cdd 100644 --- a/pywikibot/families/wikia_family.py +++ b/pywikibot/families/wikia_family.py @@ -27,7 +27,7 @@ def version(self, code): Return the version for this family. -return 1.19.19 +return 1.19.20 def scriptpath(self, code): Return the script path for this family. diff --git a/pywikibot/families/wowwiki_family.py b/pywikibot/families/wowwiki_family.py index aff88f7..6aa1ebf 100644 --- a/pywikibot/families/wowwiki_family.py +++ b/pywikibot/families/wowwiki_family.py @@ -65,4 +65,4 @@ def version(self, code): Return the version for this family. -return '1.19.19' +return '1.19.20' -- To view, visit https://gerrit.wikimedia.org/r/164292 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibfcef58d19080dff09758d5827f6dbbb245cec1d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Grunny mwgru...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] prepare dbproxy100[12] for trials - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164293
Change subject: prepare dbproxy100[12] for trials
..
prepare dbproxy100[12] for trials
Change-Id: Ic1d4aebca2ae3b60e5b2f4dceb5892c105685e7f
---
M manifests/role/mariadb.pp
M manifests/site.pp
2 files changed, 35 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/164293/1
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 0b0e855..d184666 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -393,3 +393,32 @@
mode= '0755',
}
}
+
+class role::mariadb::proxy {
+
+system::role { 'role::mariadb::proxy':
+description = 'DB Proxy',
+}
+
+include standard
+include passwords::misc::scripts
+
+$prompt = 'PROXY'
+$password = $passwords::misc::scripts::mysql_root_pass
+
+package { [
+'haproxy',
+'mysql-client',
+'percona-toolkit',
+'percona-xtrabackup',
+]:
+ensure = present,
+}
+
+file { '/root/.my.cnf':
+owner = 'root',
+group = 'root',
+mode= '0400',
+content = template(mariadb/root.my.cnf.erb),
+}
+}
\ No newline at end of file
diff --git a/manifests/site.pp b/manifests/site.pp
index f0627e6..023941e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1074,6 +1074,12 @@
include standard
}
+node /^dbproxy100[12]\.eqiad\.wmnet/ {
+include admin
+$cluster = 'mysql'
+include role::mariadb::proxy
+}
+
node 'dobson.wikimedia.org' {
include admin
--
To view, visit https://gerrit.wikimedia.org/r/164293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1d4aebca2ae3b60e5b2f4dceb5892c105685e7f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle sprin...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] use cp1008 to test authdns stuff too - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164294
Change subject: use cp1008 to test authdns stuff too
..
use cp1008 to test authdns stuff too
Change-Id: I3bc0448cf45544411f8ba86629f7cd3e5bfaef10
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/94/164294/1
diff --git a/manifests/site.pp b/manifests/site.pp
index f0627e6..6bbff5c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -503,6 +503,7 @@
$cluster = 'cache_text'
include role::cache::text
include role::cache::ssl::sni
+include role::authdns::testns # test dns stuff too
}
node /^cp10(3[7-9]|40)\.eqiad\.wmnet$/ {
--
To view, visit https://gerrit.wikimedia.org/r/164294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bc0448cf45544411f8ba86629f7cd3e5bfaef10
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] use cp1008 to test authdns stuff too - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: use cp1008 to test authdns stuff too
..
use cp1008 to test authdns stuff too
Change-Id: I3bc0448cf45544411f8ba86629f7cd3e5bfaef10
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index f0627e6..6bbff5c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -503,6 +503,7 @@
$cluster = 'cache_text'
include role::cache::text
include role::cache::ssl::sni
+include role::authdns::testns # test dns stuff too
}
node /^cp10(3[7-9]|40)\.eqiad\.wmnet$/ {
--
To view, visit https://gerrit.wikimedia.org/r/164294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3bc0448cf45544411f8ba86629f7cd3e5bfaef10
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix gitrepo for role::authdns::testns - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164295
Change subject: fix gitrepo for role::authdns::testns
..
fix gitrepo for role::authdns::testns
Change-Id: I237935ba4df0c53d7cdf50ceb8e720e49d7f7d11
---
M manifests/role/authdns.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/164295/1
diff --git a/manifests/role/authdns.pp b/manifests/role/authdns.pp
index f64a73a..bc656ae 100644
--- a/manifests/role/authdns.pp
+++ b/manifests/role/authdns.pp
@@ -59,6 +59,7 @@
# For deploying the basic software config without participating in the full
role
# for e.g. public addrs, monitoring, authdns-update, etc.
class role::authdns::testns {
+include role::authdns::data
class { 'authdns':
gitrepo = $role::authdns::data::gitrepo,
monitoring = false,
--
To view, visit https://gerrit.wikimedia.org/r/164295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I237935ba4df0c53d7cdf50ceb8e720e49d7f7d11
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix gitrepo for role::authdns::testns - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: fix gitrepo for role::authdns::testns
..
fix gitrepo for role::authdns::testns
Change-Id: I237935ba4df0c53d7cdf50ceb8e720e49d7f7d11
---
M manifests/role/authdns.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/manifests/role/authdns.pp b/manifests/role/authdns.pp
index f64a73a..bc656ae 100644
--- a/manifests/role/authdns.pp
+++ b/manifests/role/authdns.pp
@@ -59,6 +59,7 @@
# For deploying the basic software config without participating in the full
role
# for e.g. public addrs, monitoring, authdns-update, etc.
class role::authdns::testns {
+include role::authdns::data
class { 'authdns':
gitrepo = $role::authdns::data::gitrepo,
monitoring = false,
--
To view, visit https://gerrit.wikimedia.org/r/164295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I237935ba4df0c53d7cdf50ceb8e720e49d7f7d11
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Increase the stack size soft limit to 32MiB - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: Increase the stack size soft limit to 32MiB .. Increase the stack size soft limit to 32MiB See https://bugzilla.wikimedia.org/show_bug.cgi?id=71486#c6. HHVM's default thread count is CPU cores * 2, so 48 for most app servers. This means a cumulative max size of 1.3 GiB for all threads, which is acceptable. The hard limit stays unlimited, as before. Change-Id: I455c0e9f1746ba9f79c0e7c58d481f1677879783 --- M modules/hhvm/files/hhvm.conf 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/modules/hhvm/files/hhvm.conf b/modules/hhvm/files/hhvm.conf index d4df907..2c6f8ed 100644 --- a/modules/hhvm/files/hhvm.conf +++ b/modules/hhvm/files/hhvm.conf @@ -74,6 +74,9 @@ # Increase the maximum number of open files. limit nofile 65536 65536 +# Increase the maximum size of the stack. See bug 71486. +limit stack 33554432 unlimited + # When `hhvm.server.graceful_shutdown_wait` is set to a positive # integer, HHVM will perform a graceful shutdown on SIGHUP. kill signal HUP -- To view, visit https://gerrit.wikimedia.org/r/164291 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I455c0e9f1746ba9f79c0e7c58d481f1677879783 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Tim Starling tstarl...@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] Collapse /etc/hhvm/fcgi into /etc/hhvm - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164296
Change subject: Collapse /etc/hhvm/fcgi into /etc/hhvm
..
Collapse /etc/hhvm/fcgi into /etc/hhvm
Since we now only have one config file for each SAPI, it doesn't make sense to
have a separate directly for FastCGI stuff. Instead just keep /etc/hhvm/php.ini
and /etc/hhvm/fcgi.ini.
Change-Id: I6f60a14c052a275681556490264737d75305b74a
---
M modules/hhvm/files/hhvm.conf
M modules/hhvm/manifests/init.pp
2 files changed, 7 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/164296/1
diff --git a/modules/hhvm/files/hhvm.conf b/modules/hhvm/files/hhvm.conf
index 2c6f8ed..a89f199 100644
--- a/modules/hhvm/files/hhvm.conf
+++ b/modules/hhvm/files/hhvm.conf
@@ -30,7 +30,7 @@
--chuid ${HHVM_USER:-www-data}:${HHVM_GROUP:-www-data} \
--make-pidfile --pidfile ${HHVM_RUN_DIR:-/run/hhvm}/hhvm.pid \
--startas /usr/bin/hhvm -- \
- --config ${HHVM_CONFIG_DIR:-/etc/hhvm/fcgi}/php.ini \
+ --config ${HHVM_CONFIG_DIR:-/etc/hhvm}/fcgi.ini \
--mode server
end script
@@ -40,7 +40,7 @@
# warmup.urls is an optional configuration file. If it exists, we
# expect it to be a list of URLs, one per line. We request each URL
# from HHVM on start-up.
- WARMUP_URLS_FILE=${HHVM_CONFIG_DIR:-/etc/hhvm/fcgi}/warmup.urls
+ WARMUP_URLS_FILE=${HHVM_CONFIG_DIR:-/etc/hhvm}/warmup.urls
grep -vEs '^[[:space:]]*(#|$)' $WARMUP_URLS_FILE | while read -r URL; do
HOST=$(echo $URL | cut -d/ -f3)
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 1e1ee3b..18156d9 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -6,12 +6,8 @@
# The layout of configuration files in /etc/hhvm is as follows:
#
# /etc/hhvm
-# │
-# ├── php.ini # Settings for CLI mode
-# │
-# └── fcgi
-# │
-# └── php.ini # Settings for FastCGI mode
+# ├── php.ini # Settings for CLI mode
+# └── fcgi.ini # Settings for FastCGI mode
#
# The CLI configs are located in the paths HHVM automatically loads by
# default. This makes it easy to invoke HHVM from the command line,
@@ -29,9 +25,7 @@
# HHVM is also configured to write stack traces to the same directory.
#
# /var/log/hhvm
-# │
# ├── error.log
-# │
# └── stacktrace.NNN.log.MMDD, ...
#
#
@@ -49,7 +43,6 @@
#
# [*fcgi_settings*]
# Ditto, except for FastCGI mode.
-#
#
# [*warmup_urls*]
# An array of URLs to fetch from the server on startup. Optional.
@@ -162,7 +155,7 @@
mode= '0444',
}
-file { '/etc/hhvm/fcgi/php.ini':
+file { '/etc/hhvm/fcgi.ini':
content = php_ini($common_defaults, $fcgi_defaults, $fcgi_settings),
owner = 'root',
group = 'root',
@@ -170,7 +163,7 @@
notify = Service['hhvm'],
}
-file { '/etc/hhvm/fcgi/warmup.urls':
+file { '/etc/hhvm/warmup.urls':
content = template('hhvm/warmup.urls.erb'),
owner = 'root',
group = 'root',
@@ -214,7 +207,7 @@
provider = 'upstart',
}
-file { [ '/etc/hhvm', '/etc/hhvm/fcgi' ]:
+file { '/etc/hhvm':
ensure = directory,
owner = 'root',
group = 'root',
--
To view, visit https://gerrit.wikimedia.org/r/164296
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f60a14c052a275681556490264737d75305b74a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make SidebarHookHandlersTest::testNewFromGlobalState more ro... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Make SidebarHookHandlersTest::testNewFromGlobalState more robust
..
Make SidebarHookHandlersTest::testNewFromGlobalState more robust
Right now that test fails for me, if run individually.
Change-Id: Ic6bf76b716f533b867f9ed49748274301f9f28e2
---
M client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Aude: Looks good to me, but someone else must approve
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
b/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
index 4a7df35..71f38b9 100644
--- a/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
+++ b/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
@@ -15,6 +15,7 @@
use SiteStore;
use StripState;
use Title;
+use Wikibase\Client\WikibaseClient;
use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
use Wikibase\Client\Hooks\OtherProjectsSidebarGenerator;
use Wikibase\Client\Hooks\SidebarHookHandlers;
@@ -255,8 +256,15 @@
}
public function testNewFromGlobalState() {
+ $settings = WikibaseClient::getDefaultInstance()-getSettings();
+
+ $oldSiteGroupValue = $settings-getSetting( 'siteGroup' );
+ $settings-setSetting( 'siteGroup', 'NYAN' );
+
$handler = SidebarHookHandlers::newFromGlobalState();
$this-assertInstanceOf(
'Wikibase\Client\Hooks\SidebarHookHandlers', $handler );
+
+ $settings-setSetting( 'siteGroup', $oldSiteGroupValue );
}
public function parserAfterParseProvider() {
--
To view, visit https://gerrit.wikimedia.org/r/163832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6bf76b716f533b867f9ed49748274301f9f28e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@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] Remove wb.RepoApi.{get, post} - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164297
Change subject: Remove wb.RepoApi.{get,post}
..
Remove wb.RepoApi.{get,post}
This reverts d8a554f17c2dc9c51c963d734ab35acb7d11e615.
Change-Id: I37de037fe9307f6ac03e9387fbfb42855fac76ec
---
M lib/resources/wikibase.RepoApi/wikibase.RepoApi.js
1 file changed, 14 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/97/164297/1
diff --git a/lib/resources/wikibase.RepoApi/wikibase.RepoApi.js
b/lib/resources/wikibase.RepoApi/wikibase.RepoApi.js
index d02b4d4..fab2d34 100644
--- a/lib/resources/wikibase.RepoApi/wikibase.RepoApi.js
+++ b/lib/resources/wikibase.RepoApi/wikibase.RepoApi.js
@@ -41,7 +41,7 @@
data: JSON.stringify( data ),
'new': type
};
- return this.post( params );
+ return this._post( params );
},
/**
@@ -65,7 +65,7 @@
params.clear = true;
}
- return this.post( params );
+ return this._post( params );
},
/**
@@ -211,7 +211,7 @@
language: language,
baserevid: baseRevId
};
- return this.post( params );
+ return this._post( params );
},
/**
@@ -231,7 +231,7 @@
language: language,
baserevid: baseRevId
};
- return this.post( params );
+ return this._post( params );
},
/**
@@ -255,7 +255,7 @@
language: language,
baserevid: baseRevId
};
- return this.post( params );
+ return this._post( params );
},
/**
@@ -278,7 +278,7 @@
params.index = index;
}
- return this.post( params );
+ return this._post( params );
},
/**
@@ -304,7 +304,7 @@
params.value = JSON.stringify( value );
}
- return this.post( params );
+ return this._post( params );
},
/**
@@ -314,7 +314,7 @@
* @return {jQuery.Promise}
*/
removeClaim: function( claimGuid ) {
- return this.post( {
+ return this._post( {
action: 'wbremoveclaims',
claim: claimGuid
} );
@@ -370,7 +370,7 @@
params.value = JSON.stringify( value );
}
- return this.post( params );
+ return this._post( params );
},
/**
@@ -409,7 +409,7 @@
params.index = index;
}
- return this.post( params );
+ return this._post( params );
},
/**
@@ -430,7 +430,7 @@
baserevid: baseRevId
};
- return this.post( params );
+ return this._post( params );
},
/**
@@ -456,7 +456,7 @@
params.badges = this._normalizeParam( badges );
}
- return this.post( params );
+ return this._post( params );
},
/**
@@ -484,7 +484,7 @@
params.summary = summary;
}
- return this.post( params );
+ return this._post( params );
},
/**
@@ -515,7 +515,7 @@
*
* @throws {Error} If a parameter is not specified properly
*/
- post: function( params ) {
+ _post: function( params ) {
// Unconditionally set the bot parameter to match the UI
behaviour of core
params.bot = 1;
@@ -527,23 +527,6 @@
return this._api.postWithToken( 'edit', params );
},
-
- /**
-* Performs an API get request.
-* @see mw.Api.get
-* @since 0.3
-*
-* @param {Object} params
-* @return {jQuery.Promise}
-* Resolved parameters:
-* - {*}
-* Rejected parameters:
-* - {string}
-* - {*}
-*/
- 'get': function( params ) {
- return this._api.get( params );
- }
} );
}( mediaWiki, wikibase, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/164297
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37de037fe9307f6ac03e9387fbfb42855fac76ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang
[MediaWiki-commits] [Gerrit] [FEAT] Add nose34 test for pywikibot and Python 3 - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: [FEAT] Add nose34 test for pywikibot and Python 3 .. [FEAT] Add nose34 test for pywikibot and Python 3 Change-Id: Ie47b8d229bd32fed726116d28559d5855e788a18 --- M layout.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 42442a0..2b66ea7 100644 --- a/layout.yaml +++ b/layout.yaml @@ -5714,10 +5714,12 @@ - 'pywikibot-core-tox-flake8-docstrings' - 'pywikibot-core-tox-flake8-docstrings-mandatory' - 'pywikibot-core-tox-nose' + - 'pywikibot-core-tox-nose34-trusty' gate-and-submit: - 'pywikibot-core-tox-flake8' - 'pywikibot-core-tox-flake8-docstrings-mandatory' - 'pywikibot-core-tox-nose' + - 'pywikibot-core-tox-nose34-trusty' - name: pywikibot/i18n template: -- To view, visit https://gerrit.wikimedia.org/r/162635 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie47b8d229bd32fed726116d28559d5855e788a18 Gerrit-PatchSet: 2 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de 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] Collapse /etc/hhvm/fcgi into /etc/hhvm - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Collapse /etc/hhvm/fcgi into /etc/hhvm
..
Collapse /etc/hhvm/fcgi into /etc/hhvm
Since we now only have one config file for each SAPI, it doesn't make sense to
have a separate directly for FastCGI stuff. Instead just keep /etc/hhvm/php.ini
and /etc/hhvm/fcgi.ini.
Change-Id: I6f60a14c052a275681556490264737d75305b74a
---
M modules/hhvm/files/hhvm.conf
M modules/hhvm/manifests/init.pp
2 files changed, 7 insertions(+), 14 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/hhvm/files/hhvm.conf b/modules/hhvm/files/hhvm.conf
index 2c6f8ed..a89f199 100644
--- a/modules/hhvm/files/hhvm.conf
+++ b/modules/hhvm/files/hhvm.conf
@@ -30,7 +30,7 @@
--chuid ${HHVM_USER:-www-data}:${HHVM_GROUP:-www-data} \
--make-pidfile --pidfile ${HHVM_RUN_DIR:-/run/hhvm}/hhvm.pid \
--startas /usr/bin/hhvm -- \
- --config ${HHVM_CONFIG_DIR:-/etc/hhvm/fcgi}/php.ini \
+ --config ${HHVM_CONFIG_DIR:-/etc/hhvm}/fcgi.ini \
--mode server
end script
@@ -40,7 +40,7 @@
# warmup.urls is an optional configuration file. If it exists, we
# expect it to be a list of URLs, one per line. We request each URL
# from HHVM on start-up.
- WARMUP_URLS_FILE=${HHVM_CONFIG_DIR:-/etc/hhvm/fcgi}/warmup.urls
+ WARMUP_URLS_FILE=${HHVM_CONFIG_DIR:-/etc/hhvm}/warmup.urls
grep -vEs '^[[:space:]]*(#|$)' $WARMUP_URLS_FILE | while read -r URL; do
HOST=$(echo $URL | cut -d/ -f3)
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 1e1ee3b..18156d9 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -6,12 +6,8 @@
# The layout of configuration files in /etc/hhvm is as follows:
#
# /etc/hhvm
-# │
-# ├── php.ini # Settings for CLI mode
-# │
-# └── fcgi
-# │
-# └── php.ini # Settings for FastCGI mode
+# ├── php.ini # Settings for CLI mode
+# └── fcgi.ini # Settings for FastCGI mode
#
# The CLI configs are located in the paths HHVM automatically loads by
# default. This makes it easy to invoke HHVM from the command line,
@@ -29,9 +25,7 @@
# HHVM is also configured to write stack traces to the same directory.
#
# /var/log/hhvm
-# │
# ├── error.log
-# │
# └── stacktrace.NNN.log.MMDD, ...
#
#
@@ -49,7 +43,6 @@
#
# [*fcgi_settings*]
# Ditto, except for FastCGI mode.
-#
#
# [*warmup_urls*]
# An array of URLs to fetch from the server on startup. Optional.
@@ -162,7 +155,7 @@
mode= '0444',
}
-file { '/etc/hhvm/fcgi/php.ini':
+file { '/etc/hhvm/fcgi.ini':
content = php_ini($common_defaults, $fcgi_defaults, $fcgi_settings),
owner = 'root',
group = 'root',
@@ -170,7 +163,7 @@
notify = Service['hhvm'],
}
-file { '/etc/hhvm/fcgi/warmup.urls':
+file { '/etc/hhvm/warmup.urls':
content = template('hhvm/warmup.urls.erb'),
owner = 'root',
group = 'root',
@@ -214,7 +207,7 @@
provider = 'upstart',
}
-file { [ '/etc/hhvm', '/etc/hhvm/fcgi' ]:
+file { '/etc/hhvm':
ensure = directory,
owner = 'root',
group = 'root',
--
To view, visit https://gerrit.wikimedia.org/r/164296
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f60a14c052a275681556490264737d75305b74a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Forward syslog messages logged by the kernel about HHVM to f... - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: Forward syslog messages logged by the kernel about HHVM to fluorine .. Forward syslog messages logged by the kernel about HHVM to fluorine HHVM doesn't always manage to write a stacktrace when it segfaults, so forward warnings from the kernel about HHVM getting killed or respawned to fluorine. I tested the selector and confirmed it matched the following message: Oct 2 04:23:22 vagrant: [3762297.322324] init: hhvm main process (10963) killed by SEGV signal Oct 2 04:23:22 vagrant: [3762297.322335] init: hhvm main process ended, respawning Change-Id: I955c2385ba9c9c4c3fbcc2754936c5f2d2c166da --- M modules/mediawiki/files/rsyslog.conf 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/modules/mediawiki/files/rsyslog.conf b/modules/mediawiki/files/rsyslog.conf index 28734d0..e0566f2 100644 --- a/modules/mediawiki/files/rsyslog.conf +++ b/modules/mediawiki/files/rsyslog.conf @@ -21,3 +21,8 @@ :syslogtag, isequal, hhvm-fatal: @udplog:8420;MediaWiki ~ + +# Forward messages logged by the kernel and containing the string +# hhvm (such as warnings that the process was killed or respawned) +# to the log aggregator. +if $msg contains hhvm and $programname == kernel then @udplog:8420;MediaWiki -- To view, visit https://gerrit.wikimedia.org/r/164278 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I955c2385ba9c9c4c3fbcc2754936c5f2d2c166da Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Tim Starling tstarl...@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] Set content language for ContentHandlerTest::testGetAutosummary - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Set content language for ContentHandlerTest::testGetAutosummary
..
Set content language for ContentHandlerTest::testGetAutosummary
This test depends on content language when comparing to a english
message text.
Change-Id: Ic50c0b6a821fb1d51d70119fbf712a18b73ce4c8
---
M tests/phpunit/includes/content/ContentHandlerTest.php
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php
b/tests/phpunit/includes/content/ContentHandlerTest.php
index f744973..1a90d6e 100644
--- a/tests/phpunit/includes/content/ContentHandlerTest.php
+++ b/tests/phpunit/includes/content/ContentHandlerTest.php
@@ -317,6 +317,8 @@
* page.
*/
public function testGetAutosummary() {
+ $this-setMwGlobals( 'wgContLang', Language::factory( 'en' ) );
+
$content = new DummyContentHandlerForTesting(
CONTENT_MODEL_WIKITEXT );
$title = Title::newFromText( 'Help:Test' );
// Create a new content object with no content
--
To view, visit https://gerrit.wikimedia.org/r/163342
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic50c0b6a821fb1d51d70119fbf712a18b73ce4c8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
Gerrit-Reviewer: IAlex coderev...@emsenhuber.ch
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused code/messages - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove unused code/messages
..
Remove unused code/messages
Remove the following:
* Unused category-based tasks
* GettingStarted.i18n.php shim
* GettingStartedNavbarNoArticle instrumentation [0],[1]
* Anonymous Editor Acquisition controller and tours
* getting started revision tagging
* GettingStarted\Hooks::hasEditedMainNamespace method
[0]
https://trello.com/c/c45DXjZF/288-updates-for-gettingstartednosuggestedarticle
[1] https://trello.com/c/Um8MWlpa/339-measure-gettingstarted-api-usage
Change-Id: I9ec9b0295acd51ad37f227182f65f47aad3d3c1b
---
D GettingStarted.i18n.php
M GettingStarted.php
M Hooks.php
M i18n/en.json
M maintenance/generate_config.php
D resources/ext.gettingstarted.anonymousEditorAcquisition.js
M resources/ext.gettingstarted.return.js
D resources/tours/anonymouseditoracquisitionpreeditv1.js
D resources/tours/anonymouseditoracquisitionpreeditv2.js
9 files changed, 1 insertion(+), 556 deletions(-)
Approvals:
Mattflaschen: Looks good to me, but someone else must approve
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GettingStarted.i18n.php b/GettingStarted.i18n.php
deleted file mode 100644
index c2006ab..000
--- a/GettingStarted.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShimf34dc99382764a55' ) ) {
- function wfJsonI18nShimf34dc99382764a55( $cache, $code, $cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . /i18n/$csCode.json;
- if ( is_readable( $fileName ) ) {
- $data = FormatJson::decode( file_get_contents(
$fileName ), true );
- foreach ( array_keys( $data ) as $key ) {
- if ( $key === '' || $key[0] === '@' ) {
- unset( $data[$key] );
- }
- }
- $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
- }
-
- $cachedData['deps'][] = new FileDependency( $fileName );
- }
- return true;
- }
-
- $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShimf34dc99382764a55';
-}
diff --git a/GettingStarted.php b/GettingStarted.php
index 16ba0e3..ffa4594 100644
--- a/GettingStarted.php
+++ b/GettingStarted.php
@@ -29,14 +29,6 @@
'copyedit' = array(
'toolbarDescription' =
'gettingstarted-task-copyedit-toolbar-description',
'toolbarTryAnotherTitle' =
'gettingstarted-task-copyedit-toolbar-try-another-title',
- ),
- 'clarify' = array(
- 'toolbarDescription' =
'gettingstarted-task-clarify-toolbar-description',
- 'toolbarTryAnotherTitle' =
'gettingstarted-task-clarify-toolbar-try-another-title',
- ),
- 'addlinks' = array(
- 'toolbarDescription' =
'gettingstarted-task-addlinks-toolbar-description',
- 'toolbarTryAnotherTitle' =
'gettingstarted-task-addlinks-toolbar-try-another-title',
)
);
@@ -99,7 +91,6 @@
);
$wgMessagesDirs['GettingStarted'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles[ 'GettingStarted' ] = __DIR__ .
'/GettingStarted.i18n.php';
// APIs
$wgAPIListModules['gettingstartedgetpages'] =
'GettingStarted\ApiGettingStartedGetPages';
@@ -110,12 +101,6 @@
$gettingStartedModuleInfo = array(
'localBasePath' = __DIR__ . '/resources',
'remoteExtPath' = 'GettingStarted/resources',
-);
-
-$wgResourceModules[ 'schema.GettingStartedNavbarNoArticle' ] = array(
- 'class'= 'ResourceLoaderSchemaModule',
- 'schema' = 'GettingStartedNavbarNoArticle',
- 'revision' = 5483117
);
$wgResourceModules[ 'schema.GettingStartedRedirectImpression' ] = array(
@@ -292,10 +277,6 @@
'gettingstarted-task-toolbar-no-suggested-page',
'gettingstarted-task-copyedit-toolbar-description',
'gettingstarted-task-copyedit-toolbar-try-another-title',
-
[MediaWiki-commits] [Gerrit] Update Wikia's MediaWiki version to 1.19.20 - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged. Change subject: Update Wikia's MediaWiki version to 1.19.20 .. Update Wikia's MediaWiki version to 1.19.20 Change-Id: Id41cef85510633833f7a851e5e88a355171c02b8 --- M families/lyricwiki_family.py M families/wikia_family.py M families/wowwiki_family.py 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/families/lyricwiki_family.py b/families/lyricwiki_family.py index 05ce4b7..a6ad39c 100644 --- a/families/lyricwiki_family.py +++ b/families/lyricwiki_family.py @@ -41,7 +41,7 @@ def version(self, code): Return the version for this family. -return '1.19.18' +return '1.19.20' def scriptpath(self, code): Return the script path for this family. diff --git a/families/wikia_family.py b/families/wikia_family.py index 7b4c992..2c52e4e 100644 --- a/families/wikia_family.py +++ b/families/wikia_family.py @@ -46,7 +46,7 @@ def version(self, code): Return the version for this family. -return 1.19.18 +return 1.19.20 def scriptpath(self, code): Return the script path for this family. diff --git a/families/wowwiki_family.py b/families/wowwiki_family.py index 8e2c8c6..3c4665d 100644 --- a/families/wowwiki_family.py +++ b/families/wowwiki_family.py @@ -359,4 +359,4 @@ def version(self, code): Return the version for this family. -return '1.19.18' +return '1.19.20' -- To view, visit https://gerrit.wikimedia.org/r/162864 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id41cef85510633833f7a851e5e88a355171c02b8 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Grunny mwgru...@gmail.com Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikia's MediaWiki version to 1.19.20 - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update Wikia's MediaWiki version to 1.19.20 .. Update Wikia's MediaWiki version to 1.19.20 Change-Id: Ibfcef58d19080dff09758d5827f6dbbb245cec1d --- M pywikibot/families/lyricwiki_family.py M pywikibot/families/wikia_family.py M pywikibot/families/wowwiki_family.py 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/lyricwiki_family.py b/pywikibot/families/lyricwiki_family.py index 3a48529..a0bfcf9 100644 --- a/pywikibot/families/lyricwiki_family.py +++ b/pywikibot/families/lyricwiki_family.py @@ -24,7 +24,7 @@ def version(self, code): Return the version for this family. -return '1.19.19' +return '1.19.20' def scriptpath(self, code): Return the script path for this family. diff --git a/pywikibot/families/wikia_family.py b/pywikibot/families/wikia_family.py index 81ee442..9ab8cdd 100644 --- a/pywikibot/families/wikia_family.py +++ b/pywikibot/families/wikia_family.py @@ -27,7 +27,7 @@ def version(self, code): Return the version for this family. -return 1.19.19 +return 1.19.20 def scriptpath(self, code): Return the script path for this family. diff --git a/pywikibot/families/wowwiki_family.py b/pywikibot/families/wowwiki_family.py index aff88f7..6aa1ebf 100644 --- a/pywikibot/families/wowwiki_family.py +++ b/pywikibot/families/wowwiki_family.py @@ -65,4 +65,4 @@ def version(self, code): Return the version for this family. -return '1.19.19' +return '1.19.20' -- To view, visit https://gerrit.wikimedia.org/r/164292 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibfcef58d19080dff09758d5827f6dbbb245cec1d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Grunny mwgru...@gmail.com Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.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] syslog: switch to lithium - change (operations/dns)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164298
Change subject: syslog: switch to lithium
..
syslog: switch to lithium
Change-Id: I732927daa731eba5da5a73330ea7b93008904d0a
---
M templates/wmnet
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/98/164298/1
diff --git a/templates/wmnet b/templates/wmnet
index 478606f..71d4acc 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -36,7 +36,7 @@
nfs-home1H IN A10.0.5.8
config-master 1H IN CNAMEpalladium.eqiad.wmnet.
puppet 1H IN CNAMEpalladium.eqiad.wmnet.
-syslog 1H IN CNAMEnfs-home
+syslog 1H IN CNAMElithium.eqiad.wmnet.
s1-secondary5M IN CNAMEdb60.pmtpa.wmnet.
s5-secondary5M IN CNAMEdb73.pmtpa.wmnet.
@@ -178,7 +178,7 @@
$ORIGIN eqiad.{{ zonename }}.
; Service aliases
-syslog 1H IN CNAMEnfs-home.pmtpa.wmnet.
+syslog 1H IN CNAMElithium.eqiad.wmnet.
webproxy1H IN CNAMEcarbon.wikimedia.org.
zuul1H IN CNAMEgallium.wikimedia.org.
carbon-relay1H IN CNAMEtungsten.eqiad.wmnet.
--
To view, visit https://gerrit.wikimedia.org/r/164298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I732927daa731eba5da5a73330ea7b93008904d0a
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
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] Move wgGuidedTourHelpGuiderUrl to static config data - change (mediawiki...GuidedTour)
jenkins-bot has submitted this change and it was merged.
Change subject: Move wgGuidedTourHelpGuiderUrl to static config data
..
Move wgGuidedTourHelpGuiderUrl to static config data
This is not request-specific, so it belongs in ResourceLoaderGetConfigVars
rather than MakeGlobalVariablesScript.
This avoids putting it in the source code of every page.
Bug: 71537
Change-Id: I701e418f1b462ebc46a0e264967576c78d15dbb2
---
M GuidedTour.php
M GuidedTourHooks.php
2 files changed, 7 insertions(+), 6 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GuidedTour.php b/GuidedTour.php
index cfe0776..4309ba6 100644
--- a/GuidedTour.php
+++ b/GuidedTour.php
@@ -34,7 +34,7 @@
);
$wgHooks['BeforePageDisplay'][] = 'GuidedTourHooks::onBeforePageDisplay';
-$wgHooks['MakeGlobalVariablesScript'][] =
'GuidedTourHooks::onMakeGlobalVariablesScript';
+$wgHooks['ResourceLoaderGetConfigVars'][] =
'GuidedTourHooks::onResourceLoaderGetConfigVars';
$wgHooks['ResourceLoaderTestModules'][] =
'GuidedTourHooks::onResourceLoaderTestModules';
$wgHooks['UnitTestsList'][] = 'GuidedTourHooks::onUnitTestsList';
$wgHooks['RedirectSpecialArticleRedirectParams'][] =
'GuidedTourHooks::onRedirectSpecialArticleRedirectParams';
diff --git a/GuidedTourHooks.php b/GuidedTourHooks.php
index 2f8e155..ae4fa8d 100644
--- a/GuidedTourHooks.php
+++ b/GuidedTourHooks.php
@@ -50,14 +50,15 @@
https://bugzilla.wikimedia.org/show_bug.cgi?id=25349
*/
/**
-* MakeGlobalVariablesScript hook.
-* Add config vars to mw.config.
+* Add static config vars to startup module that will be exposed via
mw.config.
*
-* @param $vars array
-* @param $out OutputPage output page
+* No value added here can depend on the page name, user, or other
request-specific
+* data.
+*
+* @param array $vars Associative array of config variables
* @return bool
*/
- public static function onMakeGlobalVariablesScript( $vars, $out ) {
+ public static function onResourceLoaderGetConfigVars( $vars ) {
$vars['wgGuidedTourHelpGuiderUrl'] =
wfMessage( 'guidedtour-help-guider-url'
)-inContentLanguage()-plain();
--
To view, visit https://gerrit.wikimedia.org/r/164252
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I701e418f1b462ebc46a0e264967576c78d15dbb2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/GuidedTour
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: Robmoen rm...@wikimedia.org
Gerrit-Reviewer: Swalling swall...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] syslog: switch to lithium - change (operations/dns)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: syslog: switch to lithium
..
syslog: switch to lithium
Change-Id: I732927daa731eba5da5a73330ea7b93008904d0a
---
M templates/wmnet
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Giuseppe Lavagetto: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/templates/wmnet b/templates/wmnet
index 478606f..71d4acc 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -36,7 +36,7 @@
nfs-home1H IN A10.0.5.8
config-master 1H IN CNAMEpalladium.eqiad.wmnet.
puppet 1H IN CNAMEpalladium.eqiad.wmnet.
-syslog 1H IN CNAMEnfs-home
+syslog 1H IN CNAMElithium.eqiad.wmnet.
s1-secondary5M IN CNAMEdb60.pmtpa.wmnet.
s5-secondary5M IN CNAMEdb73.pmtpa.wmnet.
@@ -178,7 +178,7 @@
$ORIGIN eqiad.{{ zonename }}.
; Service aliases
-syslog 1H IN CNAMEnfs-home.pmtpa.wmnet.
+syslog 1H IN CNAMElithium.eqiad.wmnet.
webproxy1H IN CNAMEcarbon.wikimedia.org.
zuul1H IN CNAMEgallium.wikimedia.org.
carbon-relay1H IN CNAMEtungsten.eqiad.wmnet.
--
To view, visit https://gerrit.wikimedia.org/r/164298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I732927daa731eba5da5a73330ea7b93008904d0a
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FEAT] Rewritten generate_user_files and Py3 support - change (pywikibot/core)
XZise has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164299
Change subject: [FEAT] Rewritten generate_user_files and Py3 support
..
[FEAT] Rewritten generate_user_files and Py3 support
This is a general overhaul of generate_user_files. The questions have
been rewritten to apear and work like one generated by 'inputChoice'.
It now also requires a non empty username (and doesn't default to
'UnnamedBot'). The default values when adding additional projects are
those of the main.
The default language of a project which only has one (e.g. commons) is
that language (and not 'en'). It'll require a confirmation when the
language is not known (and there are languages known).
All usernames are now by design together. Previously they could
have been separated by other config values in the extended mode.
It also supports now Python 3.
Change-Id: I5d8209d2357a6ebe90a55766a8ff27e953647738
---
M generate_user_files.py
1 file changed, 168 insertions(+), 126 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/99/164299/1
diff --git a/generate_user_files.py b/generate_user_files.py
index d38cca0..7db4fd2 100644
--- a/generate_user_files.py
+++ b/generate_user_files.py
@@ -13,8 +13,10 @@
import re
import codecs
import platform
+import math
-single_wiki_families = ['commons', 'wikidata']
+if sys.version_info[0] 2:
+raw_input = input
def get_base_dir():
@@ -78,8 +80,9 @@
message += u:
+line_template = u{{0: {0}}}:
{{1}}.format(math.floor(math.log10(len(clist)) + 1))
for n, i in enumerate(clist):
-print(u%d: %s % (n + 1, i))
+print(line_template.format(n + 1, i))
while True:
choice = raw_input(message)
@@ -89,23 +92,20 @@
try:
choice = int(choice)
except ValueError:
-# User typed choice name
-if choice not in clist:
-print(Invalid response)
-continue
-else:
-return choice
+try:
+choice = clist.index(choice) + 1
+except IndexError:
+choice = 0
# User typed choice number
if 1 = choice = len(clist):
-return clist[choice - 1]
+return clist[choice - 1]
else:
-print(Invalid response)
+print(Invalid response)
def change_base_dir():
Create a new user directory.
-global base_dir
while True:
new_base = raw_input(New user directory? )
new_base = os.path.abspath(new_base)
@@ -137,10 +137,9 @@
set environment variables. % locals(), width=76)
for line in msg:
print(line)
-ok = raw_input(Is this OK? ([y]es, [N]o) )
-if ok in [Y, y]:
-base_dir = new_base
-return True
+ok = raw_input(Is this OK? ([y]es, [N]o) ).lower()
+if ok in [y, yes]:
+return new_base
print(Aborting changes.)
return False
@@ -152,88 +151,92 @@
return False
-def get_site_and_lang():
-known_families = re.findall(
-r'(.+)_family.py\b',
-'\n'.join(os.listdir(os.path.join(
-pywikibot_dir,
-pywikibot,
-families)))
-)
-known_families = sorted(known_families)
-fam = listchoice(known_families,
- uSelect family of sites we are working on,
- ujust enter the number not name,
- default=u'wikipedia')
-if fam not in single_wiki_families:
-codesds = codecs.open(os.path.join(pywikibot_dir,
- upywikibot,
- ufamilies,
- u%s_family.py % fam),
- r, utf-8).read()
-rre = re.compile(uself\.languages\_by\_size *\= *(.+?)\],
- re.DOTALL)
-known_langs = []
-if not rre.findall(codesds):
-rre = re.compile(uself\.langs *\= *(.+?)\}, re.DOTALL)
-if rre.findall(codesds):
-import ast
-known_langs = ast.literal_eval(
-rre.findall(codesds)[0] + u}).keys()
-else:
-known_langs = eval(rre.findall(codesds)[0] + u])
-print(This is the list of known language(s):)
-print(u .join(sorted(known_langs)))
-mylang = raw_input(The language code of the site we're working on
- (default: 'en'): ) or 'en'
+def get_site_and_lang(default_family='wikipedia', default_lang='en',
+ default_username=None):
+
+Ask the user for the family, language and username.
+
+@param default_family: The default family which should be
[MediaWiki-commits] [Gerrit] Don't yet include statements yet on properties - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't yet include statements yet on properties
..
Don't yet include statements yet on properties
These are mistakenly being added in the JS entityview,
but shouldn't be yet as not possible yet to actually
save them, among other issues still to resolve.
Change-Id: I13166578fcaea99f901901abf3c8531f18c82df1
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index bb41339..962abfb 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -98,8 +98,12 @@
this._initDescription();
this._initAliases();
this._initFingerprints();
- this._initClaims();
- this._initSiteLinks();
+
+ // TODO: Have an itemview and propertyview instead of ugly hack
here.
+ if ( this.options.value.getDataType() === 'wikibase-item' ) {
+ this._initClaims();
+ this._initSiteLinks();
+ }
this._attachEventHandlers();
},
--
To view, visit https://gerrit.wikimedia.org/r/164093
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I13166578fcaea99f901901abf3c8531f18c82df1
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@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] First initialize sitelinklistview, then attach events - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164300
Change subject: First initialize sitelinklistview, then attach events
..
First initialize sitelinklistview, then attach events
This improves performance substantially with a lot of sitelinks.
Change-Id: Ife8dc884b75a473e99bd20fe3dfb821be52a709e
---
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
1 file changed, 18 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/00/164300/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index 435fdd7..753f1ff 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -122,6 +122,23 @@
// Encapsulate sitelinkviews by suppressing their events:
this.$listview
+ .listview( {
+ listItemAdapter: new
$.wikibase.listview.ListItemAdapter( {
+ listItemWidget: listItemWidget,
+ listItemWidgetValueAccessor: 'value',
+ newItemOptionsFn: function( value ) {
+ return {
+ value: value,
+ getAllowedSiteIds: function() {
+ return
self._getUnusedAllowedSiteIds();
+ },
+ entityStore:
self.options.entityStore
+ };
+ }
+ } ),
+ value: self.options.value || null,
+ listItemNodeName: 'TR'
+ } )
.on( prefix + 'change.' + this.widgetName, function( event ) {
event.stopPropagation();
self._trigger( 'change' );
@@ -179,24 +196,7 @@
self._refreshTableHeader();
self._trigger( 'change' );
}
- )
- .listview( {
- listItemAdapter: new
$.wikibase.listview.ListItemAdapter( {
- listItemWidget: listItemWidget,
- listItemWidgetValueAccessor: 'value',
- newItemOptionsFn: function( value ) {
- return {
- value: value,
- getAllowedSiteIds: function() {
- return
self._getUnusedAllowedSiteIds();
- },
- entityStore:
self.options.entityStore
- };
- }
- } ),
- value: self.options.value || null,
- listItemNodeName: 'TR'
- } );
+ );
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/164300
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife8dc884b75a473e99bd20fe3dfb821be52a709e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't use Statement class alias - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Don't use Statement class alias .. Don't use Statement class alias Bug: 71508 Change-Id: Id648010f6432c32205824499ead79570014cdbba --- M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php M client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php M client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php M lib/includes/serializers/ClaimSerializer.php M lib/tests/phpunit/changes/TestChanges.php M lib/tests/phpunit/serializers/ClaimSerializerTest.php M lib/tests/phpunit/serializers/ClaimsSerializerTest.php M lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php M lib/tests/phpunit/serializers/ItemSerializerTest.php M repo/includes/ChangeOp/ChangeOpReference.php M repo/includes/ChangeOp/ChangeOpReferenceRemove.php M repo/includes/ChangeOp/ChangeOpStatementRank.php M repo/includes/ChangeOp/ChangeOpsMerge.php M repo/includes/Validators/SnakValidator.php M repo/includes/api/RemoveReferences.php M repo/includes/api/SetReference.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php M repo/tests/phpunit/includes/ChangeOp/StatementChangeOpFactoryTest.php M repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php M repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php M repo/tests/phpunit/includes/Diff/ClaimDifferTest.php M repo/tests/phpunit/includes/Diff/ClaimDifferenceTest.php M repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php M repo/tests/phpunit/includes/EntityViewTest.php M repo/tests/phpunit/includes/Hook/MakeGlobalVariablesScriptHandlerTest.php M repo/tests/phpunit/includes/ItemViewTest.php M repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php M repo/tests/phpunit/includes/PropertyViewTest.php M repo/tests/phpunit/includes/Validators/SnakValidatorTest.php M repo/tests/phpunit/includes/WikibaseRepoTest.php M repo/tests/phpunit/includes/api/ApiXmlFormatTest.php M repo/tests/phpunit/includes/api/GetClaimsTest.php M repo/tests/phpunit/includes/api/RemoveClaimsTest.php M repo/tests/phpunit/includes/api/RemoveQualifiersTest.php M repo/tests/phpunit/includes/api/SetClaimTest.php M repo/tests/phpunit/includes/api/SetClaimValueTest.php M repo/tests/phpunit/includes/api/SetQualifierTest.php M repo/tests/phpunit/includes/content/ItemContentTest.php 41 files changed, 50 insertions(+), 50 deletions(-) Approvals: JanZerebecki: Looks good to me, approved jenkins-bot: Verified diff --git a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php index 7a0699b..e497a04 100644 --- a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php +++ b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php @@ -5,12 +5,12 @@ use DataValues\StringValue; use Wikibase\DataAccess\PropertyParserFunction\SnaksFinder; use Wikibase\DataModel\Claim\Claim; -use Wikibase\DataModel\Claim\Statement; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Entity\Property; use Wikibase\DataModel\Entity\PropertyId; use Wikibase\DataModel\Snak\PropertyValueSnak; +use Wikibase\DataModel\Statement\Statement; use Wikibase\Test\MockPropertyLabelResolver; use Wikibase\Test\MockRepository; diff --git a/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php b/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php index 5cb2584..9b9fcb8 100644 --- a/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php +++ b/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php @@ -4,10 +4,10 @@ use Language; use Wikibase\Client\Scribunto\WikibaseLuaEntityBindings; -use Wikibase\DataModel\Claim\Statement; use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\PropertyId; +use Wikibase\DataModel\Statement\Statement; use Wikibase\Lib\SnakFormatter; use Wikibase\Lib\Store\EntityLookup; use Wikibase\SnakFactory; diff --git a/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php b/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php index 2587d22..a1ea74b 100644 --- a/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php +++ b/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php @@ -6,13 +6,13 @@ use DataValues\StringValue; use Wikibase\Client\WikibaseClient; use Wikibase\DataModel\Claim\Claim; -use
[MediaWiki-commits] [Gerrit] Don't use EntityDiff and ItemDiff class aliases - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Don't use EntityDiff and ItemDiff class aliases .. Don't use EntityDiff and ItemDiff class aliases Change-Id: Iec0e975d7fb960b62768ca032e9a80914e3d80e7 --- M client/tests/phpunit/includes/ChangeHandlerTest.php M lib/tests/phpunit/ChangesTableTest.php M lib/tests/phpunit/changes/ItemChangeTest.php M repo/includes/content/EntityContentDiff.php M repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php M repo/tests/phpunit/includes/content/EntityContentDiffTest.php M repo/tests/phpunit/includes/content/EntityContentTest.php M repo/tests/phpunit/includes/content/ItemContentTest.php 8 files changed, 8 insertions(+), 8 deletions(-) Approvals: Daniel Kinzler: Looks good to me, approved jenkins-bot: Verified diff --git a/client/tests/phpunit/includes/ChangeHandlerTest.php b/client/tests/phpunit/includes/ChangeHandlerTest.php index 0c5a6eb..cc3e15d 100644 --- a/client/tests/phpunit/includes/ChangeHandlerTest.php +++ b/client/tests/phpunit/includes/ChangeHandlerTest.php @@ -8,8 +8,8 @@ use Wikibase\Change; use Wikibase\ChangeHandler; use Wikibase\Client\WikibaseClient; +use Wikibase\DataModel\Entity\Diff\EntityDiff; use Wikibase\DataModel\Entity\Entity; -use Wikibase\DataModel\Entity\EntityDiff; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\SiteLink; diff --git a/lib/tests/phpunit/ChangesTableTest.php b/lib/tests/phpunit/ChangesTableTest.php index c21df53..2795c11 100644 --- a/lib/tests/phpunit/ChangesTableTest.php +++ b/lib/tests/phpunit/ChangesTableTest.php @@ -7,7 +7,7 @@ use Diff\DiffOp\DiffOpChange; use Wikibase\ChangesTable; use Wikibase\DataModel\Claim\Claim; -use Wikibase\DataModel\Entity\ItemDiff; +use Wikibase\DataModel\Entity\Diff\ItemDiff; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Snak\PropertyNoValueSnak; diff --git a/lib/tests/phpunit/changes/ItemChangeTest.php b/lib/tests/phpunit/changes/ItemChangeTest.php index 05a6c72..24d6c63 100644 --- a/lib/tests/phpunit/changes/ItemChangeTest.php +++ b/lib/tests/phpunit/changes/ItemChangeTest.php @@ -5,9 +5,9 @@ use Diff\DiffOp\Diff\Diff; use Diff\DiffOp\DiffOpChange; use Exception; +use Wikibase\DataModel\Entity\Diff\ItemDiff; use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\Item; -use Wikibase\DataModel\Entity\ItemDiff; use Wikibase\EntityChange; use Wikibase\ItemChange; diff --git a/repo/includes/content/EntityContentDiff.php b/repo/includes/content/EntityContentDiff.php index 771eb2a..07e9404 100644 --- a/repo/includes/content/EntityContentDiff.php +++ b/repo/includes/content/EntityContentDiff.php @@ -3,7 +3,7 @@ namespace Wikibase\Repo\Content; use Diff\DiffOp\Diff\Diff; -use Wikibase\DataModel\Entity\EntityDiff; +use Wikibase\DataModel\Entity\Diff\EntityDiff; /** * Represents a diff between two Wikibase\EntityContent instances. diff --git a/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php b/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php index 3a3492a..220b7f2 100644 --- a/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php +++ b/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php @@ -8,7 +8,7 @@ use IContextSource; use Language; use Site; -use Wikibase\DataModel\Entity\EntityDiff; +use Wikibase\DataModel\Entity\Diff\EntityDiff; use Wikibase\Repo\Content\EntityContentDiff; use Wikibase\Repo\Diff\ClaimDiffer; use Wikibase\Repo\Diff\ClaimDifferenceVisualizer; diff --git a/repo/tests/phpunit/includes/content/EntityContentDiffTest.php b/repo/tests/phpunit/includes/content/EntityContentDiffTest.php index dce7dc1..1e71c14 100644 --- a/repo/tests/phpunit/includes/content/EntityContentDiffTest.php +++ b/repo/tests/phpunit/includes/content/EntityContentDiffTest.php @@ -5,7 +5,7 @@ use Diff\DiffOp\Diff\Diff; use Diff\DiffOp\DiffOpAdd; use Diff\DiffOp\DiffOpRemove; -use Wikibase\DataModel\Entity\EntityDiff; +use Wikibase\DataModel\Entity\Diff\EntityDiff; use Wikibase\Repo\Content\EntityContentDiff; /** diff --git a/repo/tests/phpunit/includes/content/EntityContentTest.php b/repo/tests/phpunit/includes/content/EntityContentTest.php index 4837006..60e424c 100644 --- a/repo/tests/phpunit/includes/content/EntityContentTest.php +++ b/repo/tests/phpunit/includes/content/EntityContentTest.php @@ -9,8 +9,8 @@ use PHPUnit_Framework_Assert; use RequestContext; use Title; +use Wikibase\DataModel\Entity\Diff\EntityDiff; use Wikibase\DataModel\Entity\Entity; -use Wikibase\DataModel\Entity\EntityDiff; use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Term\Term; use Wikibase\EntityContent; diff --git a/repo/tests/phpunit/includes/content/ItemContentTest.php b/repo/tests/phpunit/includes/content/ItemContentTest.php index fd45b72..a5925b5 100644 --- a/repo/tests/phpunit/includes/content/ItemContentTest.php +++
[MediaWiki-commits] [Gerrit] nagios_common: use a template for contacts. - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164301
Change subject: nagios_common: use a template for contacts.
..
nagios_common: use a template for contacts.
By using a template, we'll guarantee us that we can save the private
data of all the notified people in the private hiera repo only, under
nagios_common::contacts::contacts
Change-Id: I7ce1715104e64c77afb6b08d1084c5befea1591a
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/nagios_common/manifests/contacts.pp
A modules/nagios_common/templates/contacts.cfg.erb
2 files changed, 25 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/164301/1
diff --git a/modules/nagios_common/manifests/contacts.pp
b/modules/nagios_common/manifests/contacts.pp
index 2792d2d..0565e04 100644
--- a/modules/nagios_common/manifests/contacts.pp
+++ b/modules/nagios_common/manifests/contacts.pp
@@ -10,9 +10,9 @@
# The base directory to put configuration directory in.
# Defaults to '/etc/icinga/'
#
-# [*source*]
-# puppet URL specifying the source of the contacts.cfg
-# Defaults to 'puppet:///modules/nagios_common/contacts.cfg'
+# [*template*]
+# puppet URL specifying the template of the contacts.cfg file
+# Defaults to 'nagios_common/contacts.cfg.erb'
#
# [*owner*]
# The user which should own the check config files.
@@ -22,16 +22,20 @@
# The group which should own the check config files.
# Defaults to 'root'
#
+# [*contacts*]
+# The list of contacts to include in the configuration.
+#
class nagios_common::contacts(
$ensure = present,
$config_dir = '/etc/icinga',
-$source = 'puppet:///modules/nagios_common/contacts.cfg',
+$template = 'nagios_common/contacts.cfg.erb',
$owner = 'root',
$group = 'root',
+$contacts = [],
) {
file { $config_dir/contacts.cfg:
ensure = $ensure,
-source = $source,
+content = template($template),
owner = $owner,
group = $group,
}
diff --git a/modules/nagios_common/templates/contacts.cfg.erb
b/modules/nagios_common/templates/contacts.cfg.erb
new file mode 100644
index 000..a80971b
--- /dev/null
+++ b/modules/nagios_common/templates/contacts.cfg.erb
@@ -0,0 +1,16 @@
+%- @contacts.each do |contact| -%
+%- period = contact.include? 'period' ? contact['period'] : '24x7' -%
+%- email = contact.include? 'email' ? contact['email'] : 'nowhere' -%
+%- commands = contact.include? 'commands' ? contact['commands']: ['by-email']
-%
+define contact{
+contact_name%= contact['name'] %
+alias %= contact['alias'] %
+host_notification_period%= period %
+service_notification_period %= period %
+host_notification_options d,u,r,f
+service_notification_optionsc,r,f
+email %= email %
+host_notification_commands %= commands.map{|v|
host-notify-#{v}}.join(',') %
+service_notification_commands %= commands.map{|v|
host-notify-#{v}}.join(',') %
+}
+% end %
--
To view, visit https://gerrit.wikimedia.org/r/164301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ce1715104e64c77afb6b08d1084c5befea1591a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix nginx access log format - change (translatewiki)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/164302 Change subject: Fix nginx access log format .. Fix nginx access log format Change-Id: Ib01eb9db22fc67f709ef63488429f757a87730d9 --- M puppet/modules/nginx/files/nginx.conf 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/02/164302/1 diff --git a/puppet/modules/nginx/files/nginx.conf b/puppet/modules/nginx/files/nginx.conf index 8b1b62e..b9e80e1 100644 --- a/puppet/modules/nginx/files/nginx.conf +++ b/puppet/modules/nginx/files/nginx.conf @@ -30,10 +30,9 @@ # Logging Settings ## - access_log /var/log/nginx/access.log; - error_log /var/log/nginx/error.log; - log_format main '$remote_addr $host $remote_user [$time_local] $request $status $body_bytes_sent $http_referer $http_user_agent $ssl_cipher $request_time'; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log; ## # Gzip Settings -- To view, visit https://gerrit.wikimedia.org/r/164302 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib01eb9db22fc67f709ef63488429f757a87730d9 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update hhvm configuration - change (translatewiki)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164303
Change subject: Update hhvm configuration
..
Update hhvm configuration
Get rid of hdf file and some increased resource limits taken
from I455c0e9f1746ba9.
Remove access log rules, were not working anyway and not needed
since nginx is proxying hhvm.
Change-Id: I49840b9821f8d8ddea4aee89b0b30096d4130080
---
D puppet/modules/hhvm/files/config.hdf
M puppet/modules/hhvm/files/php.ini
M puppet/modules/hhvm/files/upstart
M puppet/modules/hhvm/manifests/init.pp
4 files changed, 8 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/03/164303/1
diff --git a/puppet/modules/hhvm/files/config.hdf
b/puppet/modules/hhvm/files/config.hdf
deleted file mode 100644
index 160aafd..000
--- a/puppet/modules/hhvm/files/config.hdf
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is managed by puppet
-
-Eval {
- PerfPidMap = false
-}
-
-DynamicExtensions {
- * = luasandbox.so
- * = fss.so
- * = wikidiff2.so
-}
diff --git a/puppet/modules/hhvm/files/php.ini
b/puppet/modules/hhvm/files/php.ini
index bd6378b..470f864 100644
--- a/puppet/modules/hhvm/files/php.ini
+++ b/puppet/modules/hhvm/files/php.ini
@@ -13,6 +13,11 @@
hhvm.server.graceful_shutdown_wait = 5
hhvm.dynamic_extension_path =
/usr/lib/x86_64-linux-gnu/hhvm/extensions/20140829
+hhvm.dynamic_extensions[*] = ffs.so
+hhvm.dynamic_extensions[*] = luasandbox.so
+hhvm.dynamic_extensions[*] = wikidiff2.so
+
+hhvm.perf_pid_map = false
hhvm.jit = true
hhvm.jit_a_size = 1
@@ -25,8 +30,6 @@
hhvm.log.use_log_file = true
hhvm.log.use_syslog = false
hhvm.log.file = /var/log/hhvm/error.log
-hhvm.log.access.file = /var/log/hhvm/access.log
-hhvm.log.access.format = %h %l %u % t \”%r\” %s %b
hhvm.log.header = true
hhvm.log.native_stack_trace = true
diff --git a/puppet/modules/hhvm/files/upstart
b/puppet/modules/hhvm/files/upstart
index 47f0697..1b07445 100644
--- a/puppet/modules/hhvm/files/upstart
+++ b/puppet/modules/hhvm/files/upstart
@@ -16,8 +16,10 @@
--pidfile /run/hhvm/hhvm.pid \
--startas /usr/bin/hhvm \
-- \
---config /etc/hhvm/config.hdf \
--config /etc/hhvm/php.ini \
--mode server
+limit nofile 65536 65536
+limit stack 33554432 unlimited
+
respawn
diff --git a/puppet/modules/hhvm/manifests/init.pp
b/puppet/modules/hhvm/manifests/init.pp
index b2faa5c..b6b5f9f 100644
--- a/puppet/modules/hhvm/manifests/init.pp
+++ b/puppet/modules/hhvm/manifests/init.pp
@@ -35,12 +35,6 @@
notify = Service['hhvm'],
}
- file { '/etc/hhvm/config.hdf':
-source = 'puppet:///modules/hhvm/config.hdf',
-require = Package['hhvm'],
-notify = Service['hhvm'],
- }
-
file { '/etc/hhvm/php.ini':
source = 'puppet:///modules/hhvm/php.ini',
require = Package['hhvm'],
--
To view, visit https://gerrit.wikimedia.org/r/164303
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I49840b9821f8d8ddea4aee89b0b30096d4130080
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix nginx access log format - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Fix nginx access log format .. Fix nginx access log format Change-Id: Ib01eb9db22fc67f709ef63488429f757a87730d9 --- M puppet/modules/nginx/files/nginx.conf 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/nginx/files/nginx.conf b/puppet/modules/nginx/files/nginx.conf index 8b1b62e..b9e80e1 100644 --- a/puppet/modules/nginx/files/nginx.conf +++ b/puppet/modules/nginx/files/nginx.conf @@ -30,10 +30,9 @@ # Logging Settings ## - access_log /var/log/nginx/access.log; - error_log /var/log/nginx/error.log; - log_format main '$remote_addr $host $remote_user [$time_local] $request $status $body_bytes_sent $http_referer $http_user_agent $ssl_cipher $request_time'; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log; ## # Gzip Settings -- To view, visit https://gerrit.wikimedia.org/r/164302 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib01eb9db22fc67f709ef63488429f757a87730d9 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com 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] Update hhvm configuration - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Update hhvm configuration
..
Update hhvm configuration
Get rid of hdf file and some increased resource limits taken
from I455c0e9f1746ba9.
Remove access log rules, were not working anyway and not needed
since nginx is proxying hhvm.
Change-Id: I49840b9821f8d8ddea4aee89b0b30096d4130080
---
D puppet/modules/hhvm/files/config.hdf
M puppet/modules/hhvm/files/php.ini
M puppet/modules/hhvm/files/upstart
M puppet/modules/hhvm/manifests/init.pp
4 files changed, 8 insertions(+), 20 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/hhvm/files/config.hdf
b/puppet/modules/hhvm/files/config.hdf
deleted file mode 100644
index 160aafd..000
--- a/puppet/modules/hhvm/files/config.hdf
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is managed by puppet
-
-Eval {
- PerfPidMap = false
-}
-
-DynamicExtensions {
- * = luasandbox.so
- * = fss.so
- * = wikidiff2.so
-}
diff --git a/puppet/modules/hhvm/files/php.ini
b/puppet/modules/hhvm/files/php.ini
index bd6378b..470f864 100644
--- a/puppet/modules/hhvm/files/php.ini
+++ b/puppet/modules/hhvm/files/php.ini
@@ -13,6 +13,11 @@
hhvm.server.graceful_shutdown_wait = 5
hhvm.dynamic_extension_path =
/usr/lib/x86_64-linux-gnu/hhvm/extensions/20140829
+hhvm.dynamic_extensions[*] = ffs.so
+hhvm.dynamic_extensions[*] = luasandbox.so
+hhvm.dynamic_extensions[*] = wikidiff2.so
+
+hhvm.perf_pid_map = false
hhvm.jit = true
hhvm.jit_a_size = 1
@@ -25,8 +30,6 @@
hhvm.log.use_log_file = true
hhvm.log.use_syslog = false
hhvm.log.file = /var/log/hhvm/error.log
-hhvm.log.access.file = /var/log/hhvm/access.log
-hhvm.log.access.format = %h %l %u % t \”%r\” %s %b
hhvm.log.header = true
hhvm.log.native_stack_trace = true
diff --git a/puppet/modules/hhvm/files/upstart
b/puppet/modules/hhvm/files/upstart
index 47f0697..1b07445 100644
--- a/puppet/modules/hhvm/files/upstart
+++ b/puppet/modules/hhvm/files/upstart
@@ -16,8 +16,10 @@
--pidfile /run/hhvm/hhvm.pid \
--startas /usr/bin/hhvm \
-- \
---config /etc/hhvm/config.hdf \
--config /etc/hhvm/php.ini \
--mode server
+limit nofile 65536 65536
+limit stack 33554432 unlimited
+
respawn
diff --git a/puppet/modules/hhvm/manifests/init.pp
b/puppet/modules/hhvm/manifests/init.pp
index b2faa5c..b6b5f9f 100644
--- a/puppet/modules/hhvm/manifests/init.pp
+++ b/puppet/modules/hhvm/manifests/init.pp
@@ -35,12 +35,6 @@
notify = Service['hhvm'],
}
- file { '/etc/hhvm/config.hdf':
-source = 'puppet:///modules/hhvm/config.hdf',
-require = Package['hhvm'],
-notify = Service['hhvm'],
- }
-
file { '/etc/hhvm/php.ini':
source = 'puppet:///modules/hhvm/php.ini',
require = Package['hhvm'],
--
To view, visit https://gerrit.wikimedia.org/r/164303
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I49840b9821f8d8ddea4aee89b0b30096d4130080
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
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] Fix entity type check in jquery.wikibase.entityview - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164304
Change subject: Fix entity type check in jquery.wikibase.entityview
..
Fix entity type check in jquery.wikibase.entityview
Change-Id: Ic1ce9c08959a1e4468d052c216f6aa2e53650785
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/04/164304/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index 962abfb..f323c34 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -100,7 +100,7 @@
this._initFingerprints();
// TODO: Have an itemview and propertyview instead of ugly hack
here.
- if ( this.options.value.getDataType() === 'wikibase-item' ) {
+ if ( this.options.value.getType() === 'item' ) {
this._initClaims();
this._initSiteLinks();
}
--
To view, visit https://gerrit.wikimedia.org/r/164304
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1ce9c08959a1e4468d052c216f6aa2e53650785
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix invalid array_merge in MergeItems api module - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164305
Change subject: Fix invalid array_merge in MergeItems api module
..
Fix invalid array_merge in MergeItems api module
This module inherits directly from ApiBase where
getParamDescription returns false, thus calling it then
array_merge results in a php warning and incomplete
description on the api help page.
Bug: 71469
Change-Id: Ib508355a3720c1c54b95c34aeb2446ac48909b32
---
M repo/includes/api/MergeItems.php
1 file changed, 13 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/05/164305/1
diff --git a/repo/includes/api/MergeItems.php b/repo/includes/api/MergeItems.php
index bd29918..d5ec03c 100644
--- a/repo/includes/api/MergeItems.php
+++ b/repo/includes/api/MergeItems.php
@@ -23,7 +23,6 @@
*/
class MergeItems extends ApiBase {
-
/**
* @var EntityIdParser
*/
@@ -208,22 +207,19 @@
* @see ApiBase::getParamDescription
*/
public function getParamDescription() {
- return array_merge(
- parent::getParamDescription(),
- array(
- 'fromid' = array( 'The id to merge from' ),
- 'toid' = array( 'The id to merge to' ),
- 'ignoreconflicts' = array( 'Array of elements
of the item to ignore conflicts for, can only contain values of label and or
description and or sitelink' ),
- 'token' = 'An edittoken token previously
obtained through the token module (prop=info).',
- 'summary' = array( 'Summary for the edit.',
- Will be prepended by an automatically
generated comment. The length limit of the
- autocomment together with the summary
is 260 characters. Be aware that everything above that
- limit will be cut off.
- ),
- 'bot' = array( 'Mark this edit as bot',
- 'This URL flag will only be respected
if the user belongs to the group bot.'
- ),
- )
+ return array(
+ 'fromid' = array( 'The id to merge from' ),
+ 'toid' = array( 'The id to merge to' ),
+ 'ignoreconflicts' = array( 'Array of elements of the
item to ignore conflicts for, can only contain values of label and or
description and or sitelink' ),
+ 'token' = 'An edittoken token previously obtained
through the token module (prop=info).',
+ 'summary' = array( 'Summary for the edit.',
+ Will be prepended by an automatically
generated comment. The length limit of the
+ autocomment together with the summary is 260
characters. Be aware that everything above that
+ limit will be cut off.
+ ),
+ 'bot' = array( 'Mark this edit as bot',
+ 'This URL flag will only be respected if the
user belongs to the group bot.'
+ ),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/164305
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib508355a3720c1c54b95c34aeb2446ac48909b32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use pointer cursor for the navitoggle icon - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164306
Change subject: Use pointer cursor for the navitoggle icon
..
Use pointer cursor for the navitoggle icon
Change-Id: I129da15d25108eee65e3506583ab7cd300e387f5
---
M resources/css/ext.translate.navitoggle.css
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/06/164306/1
diff --git a/resources/css/ext.translate.navitoggle.css
b/resources/css/ext.translate.navitoggle.css
index 2ccc5a3..96882ad 100644
--- a/resources/css/ext.translate.navitoggle.css
+++ b/resources/css/ext.translate.navitoggle.css
@@ -10,6 +10,7 @@
position: absolute;
top: 0;
z-index: 104;
+ cursor: pointer;
}
.tux-navitoggle {
--
To view, visit https://gerrit.wikimedia.org/r/164306
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I129da15d25108eee65e3506583ab7cd300e387f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unnecessary calls to variation.draw() - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164307
Change subject: Remove unnecessary calls to variation.draw()
..
Remove unnecessary calls to variation.draw()
snakview._setValue is the only method calling variation.value. It drawed the
variation three times per call. First, in snakview._updateVariation, then by
calling variation.value directly, and finally through snakview.draw.
The variation.value call in snakview._updateVariation is also unnecessary,
since snakview._setValue (only caller) immediately calls variation.value
afterwards.
Change-Id: I66c0f13d09cccec7096a4c08db3ebd860c4931c0
---
M lib/resources/jquery.wikibase/snakview/snakview.js
M lib/resources/jquery.wikibase/snakview/snakview.variations.Variation.js
2 files changed, 1 insertion(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/07/164307/1
diff --git a/lib/resources/jquery.wikibase/snakview/snakview.js
b/lib/resources/jquery.wikibase/snakview/snakview.js
index 3ebd418..555fddd 100644
--- a/lib/resources/jquery.wikibase/snakview/snakview.js
+++ b/lib/resources/jquery.wikibase/snakview/snakview.js
@@ -112,13 +112,6 @@
_variation: null,
/**
-* Keeps track of values from previously used variations. This allows
to display the same value
-* when using a previously used variation again during one edit-mode
session.
-* @type Object
-*/
- _recentVariationValues: null,
-
- /**
* The property of the Snak currently represented by the view.
* @type {String}
*/
@@ -169,8 +162,6 @@
_create: function() {
// apply template to this.element:
PARENT.prototype._create.call( this );
-
- this._recentVariationValues = {};
this._entityStore = this.option( 'entityStore' );
this._valueViewBuilder = this.option( 'valueViewBuilder' );
@@ -388,9 +379,6 @@
// TODO: should throw an error somewhere when trying to
leave edit mode while
// this.snak() still returns null. For now setting {}
is a simple solution for non-
// existent error handling in the snak UI
-
- // forget about values set in different variations
- this._recentVariationValues = {};
this.element.off( 'keydown.' + this.widgetName );
@@ -690,9 +678,6 @@
if( this._variation
( !this._propertyId || this._variation.constructor
!== VariationConstructor )
) {
- // remember variation's value for next time variation
is used during same edit mode:
- variationType =
this._variation.variationSnakConstructor.TYPE;
- this._recentVariationValues[ variationType ] =
this._variation.value();
this.$snakValue.empty();
@@ -710,9 +695,6 @@
this._valueViewBuilder
);
variationType =
this._variation.variationSnakConstructor.TYPE;
-
- // display value used last for this variation within
same edit-mode session:
- this._variation.value( this._recentVariationValues[
variationType ] || {} );
}
},
diff --git
a/lib/resources/jquery.wikibase/snakview/snakview.variations.Variation.js
b/lib/resources/jquery.wikibase/snakview/snakview.variations.Variation.js
index 965d75b..8932990 100644
--- a/lib/resources/jquery.wikibase/snakview/snakview.variations.Variation.js
+++ b/lib/resources/jquery.wikibase/snakview/snakview.variations.Variation.js
@@ -123,8 +123,7 @@
},
/**
-* Will set or return the value of the variation's part of the
Snak. This will trigger
-* draw() as well.
+* Will set or return the value of the variation's part of the
Snak.
*
* @since 0.4
*
@@ -139,7 +138,6 @@
return this._getValue();
}
this._setValue( value );
- this.draw();
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/164307
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I66c0f13d09cccec7096a4c08db3ebd860c4931c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Differentiate between no mt, use source and mt disabled by user - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164308
Change subject: Differentiate between no mt, use source and mt disabled by user
..
Differentiate between no mt, use source and mt disabled by user
Removed mw.cx.translation.change which was fired without parameter.
The MT card no longer disappears when you type text.
Change-Id: I5b28a426da669ec43937551d16f8a3e70715fb46
---
M hooks.md
M modules/tools/ext.cx.tools.mt.js
M modules/translation/ext.cx.translation.js
3 files changed, 38 insertions(+), 14 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/08/164308/1
diff --git a/hooks.md b/hooks.md
index cd17b59..86f8ef6 100644
--- a/hooks.md
+++ b/hooks.md
@@ -88,7 +88,7 @@
## mw.cx.translation.add
-Used to trigger the pre-translation for a source section. Source section id is
passed as argument. Second argument is a string which explains what action is
appropriate. Known values are: clear, click, mt-disabled, non-editable,
restore, service-failure.
+Used to trigger the pre-translation for a source section. Source section id is
passed as argument. Second argument is a string which explains what action is
appropriate. Known values are: clear, click, mt-not-available,
mt-user-disabled, non-editable, restore, service-failure.
## mw.cx.translation.change
diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 9f170f6..61900ff 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -13,7 +13,9 @@
var cache = {}, // MT requests cache
providerIdPrefix = 'cx-provider-',
- disableMT = 'disable-mt';
+ disableMT = 'disable-mt',
+ noMT = 'no-mt',
+ sourceMT = 'source-mt';
/**
* Get the registry of machine translation providers
@@ -40,7 +42,7 @@
MTControlCard.providers = response.providers;
if ( $.isEmptyObject( MTControlCard.providers )
) {
- MTControlCard.provider = disableMT;
+ MTControlCard.provider = noMT;
} else {
// TODO Consider user preferences
MTControlCard.provider =
MTControlCard.providers[ 0 ];
@@ -117,8 +119,16 @@
} );
}
- if ( MTControlCard.provider === disableMT ) {
- return $.Deferred().reject( 'mt-disabled' ).promise();
+ if ( provider === disableMT ) {
+ return $.Deferred().reject( 'mt-user-disabled'
).promise();
+ }
+
+ if ( provider === noMT ) {
+ return $.Deferred().reject( 'mt-not-available'
).promise();
+ }
+
+ if ( provider === sourceMT ) {
+ return $.Deferred().reject( 'mt-not-available'
).promise();
}
if ( $section.data( 'editable' ) === false ) {
@@ -134,7 +144,7 @@
doMT( mw.cx.sourceLanguage,
mw.cx.targetLanguage, sourceContent );
// Put that in cache.
cache[ sectionId ] = cache[ sectionId ] || {};
- cache[ sectionId ][ MTControlCard.provider ] =
sectionTranslationRequest;
+ cache[ sectionId ][ provider ] =
sectionTranslationRequest;
}
if ( prefetch ) {
@@ -330,7 +340,10 @@
}
// Add an item to disable machine translation for the language
- this.$providersMenu.append( this.getProviderItem( disableMT ) );
+ this.$providersMenu.append(
+ this.getProviderItem( sourceMT ),
+ this.getProviderItem( disableMT )
+ );
this.$providerSelectorTrigger
.on( 'click', function ( e ) {
@@ -355,6 +368,11 @@
MTControlCard.prototype.getProviderTitle = function ( id ) {
if ( id === disableMT ) {
return mw.msg( 'cx-tools-mt-dont-use' );
+ } else if ( id === noMT ) {
+ return mw.msg( 'cx-tools-mt-not-available',
$.uls.data.getAutonym( mw.cx.targetLanguage ) );
+ } else if ( id === sourceMT ) {
+ // FIXME: message reuse
+ return mw.msg( 'cx-tools-mt-use-source' );
} else {
return mw.msg( 'cx-tools-mt-provider-title', id );
}
@@ -377,10 +395,11 @@
};
MTControlCard.prototype.start = function ( $section ) {
- var state;
+
[MediaWiki-commits] [Gerrit] mediawiki-core-regression* jobs now use Zuul cloner - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164309
Change subject: mediawiki-core-regression* jobs now use Zuul cloner
..
mediawiki-core-regression* jobs now use Zuul cloner
Bug: 71549
Change-Id: I25c017ae99b9af34a270271f0851e3cca4407e36
---
M mediawiki.yaml
1 file changed, 8 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/09/164309/1
diff --git a/mediawiki.yaml b/mediawiki.yaml
index df24a17..8e6b379 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -172,13 +172,13 @@
- job-template:
name: mediawiki-core-regression-hhvm-{branch}
node: contintLabsSlave UbuntuTrusty
-defaults: use-remote-zuul
-concurrent: true
-scm:
- - git-mwcore
triggers:
- zuul
builders:
+ - zuul-cloner:
+ projects:
+ mediawiki/core
+ mediawiki/vendor
- mw-install-sqlite
- mw-apply-settings
- shell:
/srv/deployment/integration/slave-scripts/bin/mw-run-phpunit-hhvm.sh
@@ -290,13 +290,14 @@
- job-template:
name: 'mediawiki-core-regression-{branch}'
node: hasSlaveScripts UbuntuPrecise
-defaults: use-zuul
-scm:
- - git-mwcore
triggers:
- zuul
builders:
+ - zuul-cloner:
+ projects:
+ mediawiki/core
+ mediawiki/vendor
- mw-install-sqlite
- mw-apply-settings
- shell: /srv/deployment/integration/slave-scripts/bin/mw-run-phpunit.sh
--
To view, visit https://gerrit.wikimedia.org/r/164309
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I25c017ae99b9af34a270271f0851e3cca4407e36
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] torrus - remove pmtpa data sources - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: torrus - remove pmtpa data sources
..
torrus - remove pmtpa data sources
Change-Id: Id4f653097c63bbdf0900543a2b7f4e4bce5bdbb2
---
M templates/torrus/cdn-aggregates.xml.erb
1 file changed, 1 insertion(+), 16 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/torrus/cdn-aggregates.xml.erb
b/templates/torrus/cdn-aggregates.xml.erb
index 60026bb..f69d309 100644
--- a/templates/torrus/cdn-aggregates.xml.erb
+++ b/templates/torrus/cdn-aggregates.xml.erb
@@ -43,18 +43,7 @@
/creator-info
datasources
- param name=expr-Squid_text_pmtpa
-%= squid_rpn('text', 'pmtpa') %
- /param
- param name=expr-Squid_api_pmtpa
-%= squid_rpn('text', 'pmtpa', node_list_squid('api', 'pmtpa')) %
- /param
-
- param name=expr-Squid_upload_pmtpa
-%= squid_rpn('upload', 'pmtpa') %
- /param
-
param name=expr-Squid_text_eqiad
%= squid_rpn('text', 'eqiad') %
/param
@@ -71,10 +60,6 @@
%= squid_rpn('upload', 'esams') %
/param
- param name=expr-Varnish_bits_pmtpa
-%= varnish_rpn('bits', 'pmtpa') %
- /param
-
param name=expr-Varnish_text_eqiad
%= varnish_rpn('text', 'eqiad', dual=true) %
/param
@@ -374,7 +359,7 @@
param name=line-color-text-esams
value=##text-esams/
param name=line-order-text-esams value=9/
- param name=ds-expr-total
value=%expr-Varnish_bits_pmtpa%,%expr-Varnish_text_eqiad%,%expr-Varnish_bits_eqiad%,%expr-Varnish_upload_eqiad%,%expr-Varnish_mobile_eqiad%,%expr-Varnish_text_esams%,%expr-Varnish_bits_esams%,%expr-Varnish_upload_esams%,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,0,100,LIMIT/
+ param name=ds-expr-total
value=%expr-Varnish_text_eqiad%,%expr-Varnish_bits_eqiad%,%expr-Varnish_upload_eqiad%,%expr-Varnish_mobile_eqiad%,%expr-Varnish_text_esams%,%expr-Varnish_bits_esams%,%expr-Varnish_upload_esams%,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,0,100,LIMIT/
param name=graph-legend-total value=Total/
param name=line-style-total value=LINE1/
param name=line-stack-total value=no/
--
To view, visit https://gerrit.wikimedia.org/r/164248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4f653097c63bbdf0900543a2b7f4e4bce5bdbb2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Matanya mata...@foss.co.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] mediawiki-core-regression* jobs now use Zuul cloner - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki-core-regression* jobs now use Zuul cloner
..
mediawiki-core-regression* jobs now use Zuul cloner
As a side effect, hhvm jobs are no more running concurrently just like
the PHP ones. That is to avoid creating multiple workspaces on the
same instance. Will be fixed later by throttling them.
Bug: 71549
Change-Id: I25c017ae99b9af34a270271f0851e3cca4407e36
---
M mediawiki.yaml
1 file changed, 8 insertions(+), 7 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki.yaml b/mediawiki.yaml
index df24a17..8e6b379 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -172,13 +172,13 @@
- job-template:
name: mediawiki-core-regression-hhvm-{branch}
node: contintLabsSlave UbuntuTrusty
-defaults: use-remote-zuul
-concurrent: true
-scm:
- - git-mwcore
triggers:
- zuul
builders:
+ - zuul-cloner:
+ projects:
+ mediawiki/core
+ mediawiki/vendor
- mw-install-sqlite
- mw-apply-settings
- shell:
/srv/deployment/integration/slave-scripts/bin/mw-run-phpunit-hhvm.sh
@@ -290,13 +290,14 @@
- job-template:
name: 'mediawiki-core-regression-{branch}'
node: hasSlaveScripts UbuntuPrecise
-defaults: use-zuul
-scm:
- - git-mwcore
triggers:
- zuul
builders:
+ - zuul-cloner:
+ projects:
+ mediawiki/core
+ mediawiki/vendor
- mw-install-sqlite
- mw-apply-settings
- shell: /srv/deployment/integration/slave-scripts/bin/mw-run-phpunit.sh
--
To view, visit https://gerrit.wikimedia.org/r/164309
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I25c017ae99b9af34a270271f0851e3cca4407e36
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Fix failing VisualEditor_save_dialog scenario - change (mediawiki...VisualEditor)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/164310 Change subject: [BrowserTest] Fix failing VisualEditor_save_dialog scenario .. [BrowserTest] Fix failing VisualEditor_save_dialog scenario Looks like VisualEditor does not allow saving the page, if the changes to the page were made while the browser did not have focus. Change-Id: I959bcb4cc2f72237d2ea75249a56e140d4f7c867 Paired-With: Amir Aharoni --- M modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/10/164310/1 diff --git a/modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb b/modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb index d32e5a7..7e619d7 100644 --- a/modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb +++ b/modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb @@ -17,7 +17,10 @@ end Given(/^I click in the editable part$/) do - on(VisualEditorPage).content_element.when_present.send_keys() + on(VisualEditorPage) do |page| +page.content_element.when_present.fire_event(onfocus) +page.content_element.send_keys() + end end Given(/^I make the text (.*?) be selected$/) do |select_text| @@ -99,4 +102,4 @@ Then(/^I can click Cancel save$/) do on(VisualEditorPage).confirm_switch_cancel_element.when_present.click -end \ No newline at end of file +end -- To view, visit https://gerrit.wikimedia.org/r/164310 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I959bcb4cc2f72237d2ea75249a56e140d4f7c867 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Refactor BufferedCache - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/164311 Change subject: Refactor BufferedCache .. Refactor BufferedCache Our current cache usage was slightly unreliable. We have BufferedCache in place, but that only does its transactional- like magic in SubmissionHandler's commit(). However, there's code both before after that, that will still store date to cache. E.g.: Before: when locating workflow, we'll try to find the workflow in cache. If that fails, we'll defer to DB cache that result. After: renderAPI will get to RevisionFormatter::formatApi, which will load the root post, which will use TreeRepository::findRootPaths, which will cache whatever it finds. None of the above should actually cause any trouble, but somehow it apparently did (well, I guess that's where the problem may lay... :p) This patch will: * add BufferedBagOStuff LocalBufferedBagOStuff * remove LocalBufferedCache * SubmissionHandler.php will no longer begin() and commit() * ApiFlowBase.php View.php will commit() * container.php will begin() immediately BufferedBagOStuff is similar to what BagOStuff was, but: * more thorough in implementation * set() values will be returned on next get() * extends BagOStuff * no fixed expiration time LocalBagOStuffCache is similar to what LocalBufferedCache was, but now based on new BufferedBagOStuff. LocalBufferedCache has been removed. BufferedCache has been changed to wrap around the new LocalBagOStuffCache so we can set a fixed expiration time. I've stuck to the BufferedCache name because outwardly, it's the same to all places that call it, and we already had some typehints in place that I didn't want to go rename all. And there's tests for all of the new cache things. Only potential issue is when some buffered update fails. That will not cause a rollback. The failed updates should all remove the key from cache (to make sure the invalid data is cleared), but all buffered writes before after a fail will still go out. But that was already the case, so that shouldn't cause regressions. Needless to say, this should be tested thoroughly. Change-Id: I2cc65603ee422602e46fdf14cbc2261e392edc7e --- M autoload.php M container.php A includes/Data/BagOStuff/BufferedBagOStuff.php A includes/Data/BagOStuff/LocalBufferedBagOStuff.php M includes/Data/BufferedCache.php D includes/Data/Utils/LocalBufferedCache.php M includes/SubmissionHandler.php M includes/View.php M includes/api/ApiFlowBase.php A tests/phpunit/Data/BagOStuff/BufferedBagOStuffTest.php A tests/phpunit/Data/BagOStuff/LocalBufferedBagOStuffTest.php A tests/phpunit/Data/BufferedCacheTest.php 12 files changed, 908 insertions(+), 261 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/11/164311/1 diff --git a/autoload.php b/autoload.php index d465b48..35a6e09 100644 --- a/autoload.php +++ b/autoload.php @@ -63,6 +63,8 @@ $wgAutoloadClasses['Flow\\Content\\BoardContent'] = __DIR__ . '/includes/Content/BoardContent.php'; $wgAutoloadClasses['Flow\\Content\\BoardContentHandler'] = __DIR__ . '/includes/Content/BoardContentHandler.php'; $wgAutoloadClasses['Flow\\Content\\Content'] = __DIR__ . '/includes/Content/Content.php'; +$wgAutoloadClasses['Flow\\Data\\BagOStuff\\BufferedBagOStuff'] = __DIR__ . '/includes/Data/BagOStuff/BufferedBagOStuff.php'; +$wgAutoloadClasses['Flow\\Data\\BagOStuff\\LocalBufferedBagOStuff'] = __DIR__ . '/includes/Data/BagOStuff/LocalBufferedBagOStuff.php'; $wgAutoloadClasses['Flow\\Data\\BufferedCache'] = __DIR__ . '/includes/Data/BufferedCache.php'; $wgAutoloadClasses['Flow\\Data\\Compactor'] = __DIR__ . '/includes/Data/Compactor.php'; $wgAutoloadClasses['Flow\\Data\\Compactor\\FeatureCompactor'] = __DIR__ . '/includes/Data/Compactor/FeatureCompactor.php'; @@ -106,7 +108,6 @@ $wgAutoloadClasses['Flow\\Data\\Storage\\TopicHistoryStorage'] = __DIR__ . '/includes/Data/Storage/TopicHistoryStorage.php'; $wgAutoloadClasses['Flow\\Data\\Storage\\TopicListLastUpdatedStorage'] = __DIR__ . '/includes/Data/Storage/TopicListLastUpdatedStorage.php'; $wgAutoloadClasses['Flow\\Data\\Storage\\TopicListStorage'] = __DIR__ . '/includes/Data/Storage/TopicListStorage.php'; -$wgAutoloadClasses['Flow\\Data\\Utils\\LocalBufferedCache'] = __DIR__ . '/includes/Data/Utils/LocalBufferedCache.php'; $wgAutoloadClasses['Flow\\Data\\Utils\\Merger'] = __DIR__ . '/includes/Data/Utils/Merger.php'; $wgAutoloadClasses['Flow\\Data\\Utils\\MultiDimArray'] = __DIR__ . '/includes/Data/Utils/MultiDimArray.php'; $wgAutoloadClasses['Flow\\Data\\Utils\\RawSql'] = __DIR__ . '/includes/Data/Utils/RawSql.php'; @@ -217,6 +218,8 @@ $wgAutoloadClasses['Flow\\TemplateHelper'] = __DIR__ . '/includes/TemplateHelper.php'; $wgAutoloadClasses['Flow\\Templating'] = __DIR__ . '/includes/Templating.php'; $wgAutoloadClasses['Flow\\Tests\\BlockFactoryTest'] = __DIR__ .
[MediaWiki-commits] [Gerrit] [BrowserTest] Fix failing VisualEditor_save_dialog scenario - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: [BrowserTest] Fix failing VisualEditor_save_dialog scenario .. [BrowserTest] Fix failing VisualEditor_save_dialog scenario Looks like VisualEditor does not allow saving the page, if the changes to the page were made while the browser did not have focus. Change-Id: I959bcb4cc2f72237d2ea75249a56e140d4f7c867 Paired-With: Amir Aharoni --- M modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb b/modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb index d32e5a7..7e619d7 100644 --- a/modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb +++ b/modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb @@ -17,7 +17,10 @@ end Given(/^I click in the editable part$/) do - on(VisualEditorPage).content_element.when_present.send_keys() + on(VisualEditorPage) do |page| +page.content_element.when_present.fire_event(onfocus) +page.content_element.send_keys() + end end Given(/^I make the text (.*?) be selected$/) do |select_text| @@ -99,4 +102,4 @@ Then(/^I can click Cancel save$/) do on(VisualEditorPage).confirm_switch_cancel_element.when_present.click -end \ No newline at end of file +end -- To view, visit https://gerrit.wikimedia.org/r/164310 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I959bcb4cc2f72237d2ea75249a56e140d4f7c867 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Vikassy vikasyaligar...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 005c6fe..4ab4ad6 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/164312 Change subject: Syncronize VisualEditor: 005c6fe..4ab4ad6 .. Syncronize VisualEditor: 005c6fe..4ab4ad6 Change-Id: I375228c70b7e4237378185a3169ef08916bc862c --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/12/164312/1 diff --git a/VisualEditor b/VisualEditor index 005c6fe..4ab4ad6 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 005c6fef2799f1917413be29031dcd42ea061e89 +Subproject commit 4ab4ad64dc2e285056ac64661e6b589fb2be983f -- To view, visit https://gerrit.wikimedia.org/r/164312 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I375228c70b7e4237378185a3169ef08916bc862c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 005c6fe..4ab4ad6 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 005c6fe..4ab4ad6 .. Syncronize VisualEditor: 005c6fe..4ab4ad6 Change-Id: I375228c70b7e4237378185a3169ef08916bc862c --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 005c6fe..4ab4ad6 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 005c6fef2799f1917413be29031dcd42ea061e89 +Subproject commit 4ab4ad64dc2e285056ac64661e6b589fb2be983f -- To view, visit https://gerrit.wikimedia.org/r/164312 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I375228c70b7e4237378185a3169ef08916bc862c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Migrate mediawiki-core-code-coverage to Zuul cloner - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164313
Change subject: Migrate mediawiki-core-code-coverage to Zuul cloner
..
Migrate mediawiki-core-code-coverage to Zuul cloner
zuul-cloner requires a bunch of ZUUL_* env variable which are provided
by Zuul scheduler when triggering a job. Since the code coverage is
triggered by Jenkins own scheduler it is missing the ZUUL variable.
Thus hardcode required parameters in the job definition with sane
values.
Change-Id: I222afd038df073be9fd32796fd5d3bb564aeae9e
---
M mediawiki.yaml
1 file changed, 33 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/13/164313/1
diff --git a/mediawiki.yaml b/mediawiki.yaml
index 8e6b379..ca41aa1 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -292,7 +292,6 @@
node: hasSlaveScripts UbuntuPrecise
triggers:
- zuul
-
builders:
- zuul-cloner:
projects:
@@ -310,14 +309,41 @@
- job:
name: 'mediawiki-core-code-coverage'
node: gallium
-defaults: global
+# Set env variables needed by zuul-cloner since job is not triggered by
+# Zuul but is timed using Jenkins own scheduler.
+parameters:
+ - string:
+ name: 'ZUUL_BRANCH'
+ default: 'master'
+ - string:
+ name: 'ZUUL_REF'
+ default: 'master'
+ - string:
+ name: 'ZUUL_CHANGE'
+ default: 'timed_build'
+ - string:
+ name: 'ZUUL_PATCHSET'
+ default: 'timed_build'
+ - string:
+ name: 'ZUUL_PIPELINE'
+ default: 'timed_build'
+ - string:
+ name: 'ZUUL_PROJECT'
+ default: 'mediawiki/core'
+ - string:
+ name: 'ZUUL_URL'
+ default: 'https://gerrit.wikimedia.org/r/p'
builders:
- - wipe-workspace
- - get-mw-core:
-branch: 'master'
+ - zuul-cloner:
+ projects:
+ mediawiki/core
+ mediawiki/vendor
- mw-install-sqlite
+ - mw-apply-settings
# FIXME should use the mw-run-phpunit.sh wrapper
- shell: |
+. /srv/deployment/integration/slave-scripts/bin/mw-set-env.sh
+
mkdir -p log
rm -f log/clover.xml log/clover.bz2
@@ -332,6 +358,8 @@
}
trap compress_clover_log EXIT
+
+cd ${MW_INSTALL_PATH}
nice -n 19 php tests/phpunit/phpunit.php \
--with-phpunitdir
/srv/deployment/integration/phpunit/vendor/phpunit/phpunit \
--exclude-group Dump,Broken,ParserFuzz,Stub \
--
To view, visit https://gerrit.wikimedia.org/r/164313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I222afd038df073be9fd32796fd5d3bb564aeae9e
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix entity type check in jquery.wikibase.entityview - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: Fix entity type check in jquery.wikibase.entityview
..
Fix entity type check in jquery.wikibase.entityview
Change-Id: Ic1ce9c08959a1e4468d052c216f6aa2e53650785
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index 962abfb..f323c34 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -100,7 +100,7 @@
this._initFingerprints();
// TODO: Have an itemview and propertyview instead of ugly hack
here.
- if ( this.options.value.getDataType() === 'wikibase-item' ) {
+ if ( this.options.value.getType() === 'item' ) {
this._initClaims();
this._initSiteLinks();
}
--
To view, visit https://gerrit.wikimedia.org/r/164304
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1ce9c08959a1e4468d052c216f6aa2e53650785
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@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] Migrate mediawiki-core-code-coverage to Zuul cloner - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Migrate mediawiki-core-code-coverage to Zuul cloner
..
Migrate mediawiki-core-code-coverage to Zuul cloner
zuul-cloner requires a bunch of ZUUL_* env variable which are provided
by Zuul scheduler when triggering a job. Since the code coverage is
triggered by Jenkins own scheduler it is missing the ZUUL variable.
Thus hardcode required parameters in the job definition with sane
values.
Change-Id: I222afd038df073be9fd32796fd5d3bb564aeae9e
---
M mediawiki.yaml
1 file changed, 33 insertions(+), 5 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki.yaml b/mediawiki.yaml
index 8e6b379..ca41aa1 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -292,7 +292,6 @@
node: hasSlaveScripts UbuntuPrecise
triggers:
- zuul
-
builders:
- zuul-cloner:
projects:
@@ -310,14 +309,41 @@
- job:
name: 'mediawiki-core-code-coverage'
node: gallium
-defaults: global
+# Set env variables needed by zuul-cloner since job is not triggered by
+# Zuul but is timed using Jenkins own scheduler.
+parameters:
+ - string:
+ name: 'ZUUL_BRANCH'
+ default: 'master'
+ - string:
+ name: 'ZUUL_REF'
+ default: 'master'
+ - string:
+ name: 'ZUUL_CHANGE'
+ default: 'timed_build'
+ - string:
+ name: 'ZUUL_PATCHSET'
+ default: 'timed_build'
+ - string:
+ name: 'ZUUL_PIPELINE'
+ default: 'timed_build'
+ - string:
+ name: 'ZUUL_PROJECT'
+ default: 'mediawiki/core'
+ - string:
+ name: 'ZUUL_URL'
+ default: 'https://gerrit.wikimedia.org/r/p'
builders:
- - wipe-workspace
- - get-mw-core:
-branch: 'master'
+ - zuul-cloner:
+ projects:
+ mediawiki/core
+ mediawiki/vendor
- mw-install-sqlite
+ - mw-apply-settings
# FIXME should use the mw-run-phpunit.sh wrapper
- shell: |
+. /srv/deployment/integration/slave-scripts/bin/mw-set-env.sh
+
mkdir -p log
rm -f log/clover.xml log/clover.bz2
@@ -332,6 +358,8 @@
}
trap compress_clover_log EXIT
+
+cd ${MW_INSTALL_PATH}
nice -n 19 php tests/phpunit/phpunit.php \
--with-phpunitdir
/srv/deployment/integration/phpunit/vendor/phpunit/phpunit \
--exclude-group Dump,Broken,ParserFuzz,Stub \
--
To view, visit https://gerrit.wikimedia.org/r/164313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I222afd038df073be9fd32796fd5d3bb564aeae9e
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move fatalmonitor to fluorine - change (operations/puppet)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164314
Change subject: Move fatalmonitor to fluorine
..
Move fatalmonitor to fluorine
Change-Id: I15c46ddccd67b95575dd064304332675f58b1658
---
M files/misc/scripts/fatalmonitor
M manifests/misc/deployment.pp
M manifests/site.pp
3 files changed, 12 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/14/164314/1
diff --git a/files/misc/scripts/fatalmonitor b/files/misc/scripts/fatalmonitor
index ae1dbcd..523c342 100755
--- a/files/misc/scripts/fatalmonitor
+++ b/files/misc/scripts/fatalmonitor
@@ -1,2 +1,2 @@
#! /bin/bash
-watch tail -n 1000 /home/wikipedia/syslog/apache.log | grep
'PHP\|Segmentation fault' | grep -v 'filemtime\|failed to mkdir\|GC cache
entry\|cache slam averted\|SHA-1 metadata' | sed -r 's/\[notice\] child pid
[0-9]+ exit signal //g' | sed 's/, referer.*$//g' | cut -d ' ' -f 7- | sort |
uniq -c | sort -rn
+watch tail -n 1000 /a/mw-log/apache2.log | grep 'PHP\|Segmentation fault' |
grep -v 'filemtime\|failed to mkdir\|GC cache entry\|cache slam averted\|SHA-1
metadata' | sed -r 's/\[notice\] child pid [0-9]+ exit signal //g' | sed 's/,
referer.*$//g' | cut -d ' ' -f 7- | sort | uniq -c | sort -rn
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 0fee3ec..ba99b02 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -38,11 +38,6 @@
group = 'root',
mode = '0555',
source = 'puppet:///files/misc/scripts/deploy2graphite';
-'/usr/local/bin/fatalmonitor':
-owner = 'root',
-group = 'root',
-mode = '0555',
-source = 'puppet:///files/misc/scripts/fatalmonitor';
'/usr/local/bin/foreachwiki':
owner = 'root',
group = 'root',
@@ -143,6 +138,16 @@
include misc::deployment::vars
}
+class misc::deployment:fatalmonitor {
+file {
+'/usr/local/bin/fatalmonitor':
+owner = 'root',
+group = 'root',
+mode = '0555',
+source = 'puppet:///files/misc/scripts/fatalmonitor';
+}
+}
+
class misc::deployment::passwordscripts {
include passwords::misc::scripts
$cachemgr_pass = $passwords::misc::scripts::cachemgr_pass
diff --git a/manifests/site.pp b/manifests/site.pp
index 6bbff5c..2bfc563 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1229,6 +1229,7 @@
$cluster = 'misc'
include standard
+include misc::deployment::fatalmonitor
class { 'admin':
groups = ['deployment',
--
To view, visit https://gerrit.wikimedia.org/r/164314
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I15c46ddccd67b95575dd064304332675f58b1658
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move search* jobs from misc.yaml to search.yaml - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164315
Change subject: Move search* jobs from misc.yaml to search.yaml
..
Move search* jobs from misc.yaml to search.yaml
Change-Id: I9e9c8dc4017fa6aed77067c5640381bba600686f
---
M misc.yaml
A search.yaml
2 files changed, 43 insertions(+), 44 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/15/164315/1
diff --git a/misc.yaml b/misc.yaml
index f09e1a6..7c0758a 100644
--- a/misc.yaml
+++ b/misc.yaml
@@ -78,50 +78,6 @@
- '{name}-phplint'
- job:
-name: 'search-highlighter'
-project-type: maven
-jdk: 'Ubuntu - OpenJdk 7'
-triggers:
- - zuul
-scm:
- - git-remote-zuul
-wrappers:
- - timeout:
- timeout: 60 # minutes
- fail: true
- - timestamps
- - ansicolor
-maven:
- goals: clean package
-
-- project:
-name: 'search-highlighter'
-jobs:
- - 'search-highlighter'
-
-- job:
-name: 'search-repository-swift'
-project-type: maven
-jdk: 'Ubuntu - OpenJdk 7'
-triggers:
- - zuul
-scm:
- - git-remote-zuul
-wrappers:
- - timeout:
- timeout: 60 # minutes
- fail: true
- - timestamps
- - ansicolor
-maven:
- goals: clean package
-
-- project:
-name: 'search-repository-swift'
-jobs:
- - 'search-repository-swift'
-
-- job:
name: 'unicodejs-jsduck-publish'
node: gallium
defaults: use-remote-zuul
diff --git a/search.yaml b/search.yaml
new file mode 100644
index 000..154c86f
--- /dev/null
+++ b/search.yaml
@@ -0,0 +1,43 @@
+- job:
+name: 'search-highlighter'
+project-type: maven
+jdk: 'Ubuntu - OpenJdk 7'
+triggers:
+ - zuul
+scm:
+ - git-remote-zuul
+wrappers:
+ - timeout:
+ timeout: 60 # minutes
+ fail: true
+ - timestamps
+ - ansicolor
+maven:
+ goals: clean package
+
+- project:
+name: 'search-highlighter'
+jobs:
+ - 'search-highlighter'
+
+- job:
+name: 'search-repository-swift'
+project-type: maven
+jdk: 'Ubuntu - OpenJdk 7'
+triggers:
+ - zuul
+scm:
+ - git-remote-zuul
+wrappers:
+ - timeout:
+ timeout: 60 # minutes
+ fail: true
+ - timestamps
+ - ansicolor
+maven:
+ goals: clean package
+
+- project:
+name: 'search-repository-swift'
+jobs:
+ - 'search-repository-swift'
--
To view, visit https://gerrit.wikimedia.org/r/164315
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e9c8dc4017fa6aed77067c5640381bba600686f
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jobs for search/extra - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/164316 Change subject: Jobs for search/extra .. Jobs for search/extra Lamely copy pasted, create a job for each target 'package' and 'javadoc:javadoc'. Change-Id: I7bc5df71021eca0e4391583cd55a80a2fbbff743 --- M search.yaml 1 file changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/16/164316/1 diff --git a/search.yaml b/search.yaml index 154c86f..55304c6 100644 --- a/search.yaml +++ b/search.yaml @@ -1,4 +1,38 @@ - job: +name: 'search-extra' +project-type: maven +jdk: 'Ubuntu - OpenJdk 7' +triggers: + - zuul +scm: + - git-remote-zuul +wrappers: + - timeout: + timeout: 60 # minutes + fail: true + - timestamps + - ansicolor +maven: + goals: clean package + +- job: +name: 'search-extra-javadoc' +project-type: maven +jdk: 'Ubuntu - OpenJdk 7' +triggers: + - zuul +scm: + - git-remote-zuul +wrappers: + - timeout: + timeout: 60 # minutes + fail: true + - timestamps + - ansicolor +maven: + goals: clean javadoc:javadoc + +- job: name: 'search-highlighter' project-type: maven jdk: 'Ubuntu - OpenJdk 7' -- To view, visit https://gerrit.wikimedia.org/r/164316 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7bc5df71021eca0e4391583cd55a80a2fbbff743 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jobs for search/extra - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/164317 Change subject: Jobs for search/extra .. Jobs for search/extra Change-Id: I7bc5df71021eca0e4391583cd55a80a2fbbff743 --- M layout.yaml 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/17/164317/1 diff --git a/layout.yaml b/layout.yaml index 2b66ea7..29b01e1 100644 --- a/layout.yaml +++ b/layout.yaml @@ -5737,6 +5737,14 @@ - name: 'python' prefix: 'sartoris' + - name: search/extra +test: + - search-extra + - search-extra-javadoc +gate-and-submit: + - search-extra + - search-extra-javadoc + - name: search/highlighter test: - search-highlighter -- To view, visit https://gerrit.wikimedia.org/r/164317 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7bc5df71021eca0e4391583cd55a80a2fbbff743 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jobs for search/extra - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Jobs for search/extra .. Jobs for search/extra Change-Id: I7bc5df71021eca0e4391583cd55a80a2fbbff743 --- M layout.yaml 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 2b66ea7..29b01e1 100644 --- a/layout.yaml +++ b/layout.yaml @@ -5737,6 +5737,14 @@ - name: 'python' prefix: 'sartoris' + - name: search/extra +test: + - search-extra + - search-extra-javadoc +gate-and-submit: + - search-extra + - search-extra-javadoc + - name: search/highlighter test: - search-highlighter -- To view, visit https://gerrit.wikimedia.org/r/164317 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7bc5df71021eca0e4391583cd55a80a2fbbff743 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Manybubbles never...@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] Move search* jobs from misc.yaml to search.yaml - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Move search* jobs from misc.yaml to search.yaml
..
Move search* jobs from misc.yaml to search.yaml
Change-Id: I9e9c8dc4017fa6aed77067c5640381bba600686f
---
M misc.yaml
A search.yaml
2 files changed, 43 insertions(+), 44 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/misc.yaml b/misc.yaml
index f09e1a6..7c0758a 100644
--- a/misc.yaml
+++ b/misc.yaml
@@ -78,50 +78,6 @@
- '{name}-phplint'
- job:
-name: 'search-highlighter'
-project-type: maven
-jdk: 'Ubuntu - OpenJdk 7'
-triggers:
- - zuul
-scm:
- - git-remote-zuul
-wrappers:
- - timeout:
- timeout: 60 # minutes
- fail: true
- - timestamps
- - ansicolor
-maven:
- goals: clean package
-
-- project:
-name: 'search-highlighter'
-jobs:
- - 'search-highlighter'
-
-- job:
-name: 'search-repository-swift'
-project-type: maven
-jdk: 'Ubuntu - OpenJdk 7'
-triggers:
- - zuul
-scm:
- - git-remote-zuul
-wrappers:
- - timeout:
- timeout: 60 # minutes
- fail: true
- - timestamps
- - ansicolor
-maven:
- goals: clean package
-
-- project:
-name: 'search-repository-swift'
-jobs:
- - 'search-repository-swift'
-
-- job:
name: 'unicodejs-jsduck-publish'
node: gallium
defaults: use-remote-zuul
diff --git a/search.yaml b/search.yaml
new file mode 100644
index 000..154c86f
--- /dev/null
+++ b/search.yaml
@@ -0,0 +1,43 @@
+- job:
+name: 'search-highlighter'
+project-type: maven
+jdk: 'Ubuntu - OpenJdk 7'
+triggers:
+ - zuul
+scm:
+ - git-remote-zuul
+wrappers:
+ - timeout:
+ timeout: 60 # minutes
+ fail: true
+ - timestamps
+ - ansicolor
+maven:
+ goals: clean package
+
+- project:
+name: 'search-highlighter'
+jobs:
+ - 'search-highlighter'
+
+- job:
+name: 'search-repository-swift'
+project-type: maven
+jdk: 'Ubuntu - OpenJdk 7'
+triggers:
+ - zuul
+scm:
+ - git-remote-zuul
+wrappers:
+ - timeout:
+ timeout: 60 # minutes
+ fail: true
+ - timestamps
+ - ansicolor
+maven:
+ goals: clean package
+
+- project:
+name: 'search-repository-swift'
+jobs:
+ - 'search-repository-swift'
--
To view, visit https://gerrit.wikimedia.org/r/164315
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9e9c8dc4017fa6aed77067c5640381bba600686f
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Manybubbles never...@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] [BrowserTest] Fixed language screenshot scenario - change (mediawiki...VisualEditor)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164319
Change subject: [BrowserTest] Fixed language screenshot scenario
..
[BrowserTest] Fixed language screenshot scenario
VisualEditor no longer has cancel button.
Change-Id: Ia06469c23cc527ae87170d6aa5b9066fbc9933a6
Paired-With: Amir Aharoni
---
M modules/ve-mw/tests/browser/features/language_screenshot.feature
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
3 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/19/164319/1
diff --git a/modules/ve-mw/tests/browser/features/language_screenshot.feature
b/modules/ve-mw/tests/browser/features/language_screenshot.feature
index d449fd1..7aad934 100644
--- a/modules/ve-mw/tests/browser/features/language_screenshot.feature
+++ b/modules/ve-mw/tests/browser/features/language_screenshot.feature
@@ -139,10 +139,10 @@
Then I should see the formula insertion menu
@language_screenshot
- Scenario: VisualEditor_cancel_save
+ Scenario: VisualEditor_toolbar_actions
Given I am logged in
When I am edit language screenshot page with Testing toolbar
-Then I should see VisualEditor toolbar containing cancel and save button
+Then I should see action buttons in the end of the VisualEditor toolbar
@language_screenshot
Scenario: VisualEditor_references_list
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index 28e7d98..ebc0b18 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -274,12 +274,12 @@
capture_screenshot(#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
[@current_page.iframe_element, @current_page.formula_image_element], nil, 0)
end
-Then(/^I should see VisualEditor toolbar containing cancel and save button$/)
do
+Then(/^I should see action buttons in the end of the VisualEditor toolbar$/) do
on(VisualEditorPage) do |page|
-page.toolbar_action_element.when_present.should be_visible
+page.toolbar_actions_element.when_present.should be_visible
page.save_enabled_element.when_present(10).should be_visible
end
-
capture_screenshot(#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
[@current_page.toolbar_action_element])
+
capture_screenshot(#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
[@current_page.toolbar_actions_element])
end
Then(/^I should see References list dialog box$/) do
diff --git
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index dfa5316..6824e3a 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -87,7 +87,7 @@
a(:internal_link, class: ve-ce-linkAnnotation
ve-ce-mwInternalLinkAnnotation)
unordered_list(:popup_icon, class: ve-ui-context-menu)
span(:basic_reference, class: oo-ui-iconElement-icon oo-ui-icon-reference)
- div(:toolbar_action, class: oo-ui-toolbar-actions)
+ div(:toolbar_actions, class: oo-ui-toolbar-actions)
span(:media_insert_menu, class: oo-ui-tool-name-media)
span(:template_insert_menu, class: oo-ui-tool-name-transclusion)
span(:ref_list_insert_menu, class: oo-ui-tool-name-referencesList)
--
To view, visit https://gerrit.wikimedia.org/r/164319
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia06469c23cc527ae87170d6aa5b9066fbc9933a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (search/extra)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/164318 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I7bc5df71021eca0e4391583cd55a80a2fbbff743 --- 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/search/extra refs/changes/18/164318/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/164318 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7bc5df71021eca0e4391583cd55a80a2fbbff743 Gerrit-PatchSet: 1 Gerrit-Project: search/extra 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] Formatting of some options for improved readability - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164322
Change subject: Formatting of some options for improved readability
..
Formatting of some options for improved readability
Change-Id: I4f6771c05ebb2386b0e1e8fdb1e64b072749670e
---
M modules/toollabs/templates/exim4.conf.erb
1 file changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/22/164322/1
diff --git a/modules/toollabs/templates/exim4.conf.erb
b/modules/toollabs/templates/exim4.conf.erb
index 2257361..9fb3cd8 100644
--- a/modules/toollabs/templates/exim4.conf.erb
+++ b/modules/toollabs/templates/exim4.conf.erb
@@ -88,7 +88,7 @@
driver = redirect
caseful_local_part
check_local_user
- no_expn
+ expn = false
check_ancestor
modemask = 002
data = ${run{/usr/local/sbin/localuser $local_part}{$value}fail}
@@ -99,18 +99,18 @@
tool_forward_specific:
driver = redirect
local_part_suffix = .*
- not_local_part_suffix_optional
+ local_part_suffix_optional = false
caseful_local_part
local_parts = passwd;%= instanceproject %.$local_part
- require_files = %= instanceproject
%.$local_part:$home/.forward$local_part_suffix
+ require_files = %= instanceproject %.$local_part :
$home/.forward$local_part_suffix
router_home_directory = ${lookup passwd{%= instanceproject
%.$local_part}{${extract{5}{:}{$value}}}fail}
file = /data/project/$local_part/.forward$local_part_suffix
- no_expn
+ expn = false
check_ancestor
modemask = 002
pipe_transport = gridqueue
- no_allow_filter
- no_allow_defer
+ allow_filter = false
+ allow_defer = false
allow_fail
forbid_include
forbid_file
@@ -123,18 +123,18 @@
tool_forward_general:
driver = redirect
local_part_suffix = .*
- not_local_part_suffix_optional
+ local_part_suffix_optional = false
caseful_local_part
local_parts = passwd;%= instanceproject %.$local_part
- require_files = %= instanceproject %.$local_part:$home/.forward
+ require_files = %= instanceproject %.$local_part : $home/.forward
router_home_directory = ${lookup passwd{%= instanceproject
%.$local_part}{${extract{5}{:}{$value}}}fail}
file = /data/project/$local_part/.forward
- no_expn
+ expn = false
check_ancestor
modemask = 002
pipe_transport = gridqueue
- no_allow_filter
- no_allow_defer
+ allow_filter = false
+ allow_defer = false
allow_fail
forbid_include
forbid_file
@@ -146,11 +146,11 @@
tool_default:
driver = redirect
local_part_suffix = .*
- not_local_part_suffix_optional
+ local_part_suffix_optional = false
caseful_local_part
local_parts = passwd;%= instanceproject %.$local_part
router_home_directory = ${lookup passwd{%= instanceproject
%.$local_part}{${extract{5}{:}{$value}}}fail}
- no_expn
+ expn = false
check_ancestor
modemask = 002
data = ${run{/usr/local/sbin/maintainers %= instanceproject
%.$local_part}{$value}fail}
--
To view, visit https://gerrit.wikimedia.org/r/164322
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f6771c05ebb2386b0e1e8fdb1e64b072749670e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use Exim's macro facility to define INSTANCEPROJECT and MAIL... - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164324
Change subject: Use Exim's macro facility to define INSTANCEPROJECT and
MAILDOMAIN
..
Use Exim's macro facility to define INSTANCEPROJECT and MAILDOMAIN
Rather than mixing both Exim's and ERB's quoting rules etc, let's
use Exim's macro rules consistently.
Also added comments to better indicate the Exim config sections.
Change-Id: I81191b6f19551aa26e89bf18c491ab48facf2c97
---
M modules/toollabs/templates/exim4.conf.erb
1 file changed, 43 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/24/164324/1
diff --git a/modules/toollabs/templates/exim4.conf.erb
b/modules/toollabs/templates/exim4.conf.erb
index 770d24f..95b0fb6 100644
--- a/modules/toollabs/templates/exim4.conf.erb
+++ b/modules/toollabs/templates/exim4.conf.erb
@@ -4,10 +4,21 @@
# from: toollabs::mailrelay
#
-primary_hostname = relay.%= @maildomain %
-qualify_domain = %= @maildomain %
+##
+# Macros #
+##
-domainlist local_domains = %= @maildomain %
+INSTANCEPROJECT=%= @instanceproject %
+MAILDOMAIN=%= @maildomain %
+
+###
+# Main configuration settings #
+###
+
+primary_hostname = relay.MAILDOMAIN
+qualify_domain = MAILDOMAIN
+
+domainlist local_domains = MAILDOMAIN
hostlist relay_from_hosts = 10.0.0.0/8
acl_smtp_rcpt = acl_check_rcpt
@@ -20,6 +31,10 @@
timeout_frozen_after = 7d
local_from_suffix = .*
+
+###
+# Access Control Lists (ACLs) #
+###
begin acl
@@ -53,6 +68,9 @@
acl_check_data:
accept
+###
+# Routers #
+###
begin routers
@@ -68,16 +86,16 @@
postmaster_mail:
driver = redirect
local_parts = root : postmaster
- data = %= instanceproject %.admin
+ data = INSTANCEPROJECT.admin
# Alias tools.toolname@ to toolname.maintainers@
tool_fallback:
driver = redirect
- local_part_prefix = %= instanceproject %.
+ local_part_prefix = INSTANCEPROJECT.
not_local_part_prefix_optional
caseful_local_part
- local_parts = passwd;%= instanceproject %.$local_part
+ local_parts = passwd;INSTANCEPROJECT.$local_part
check_ancestor
modemask = 002
data = $local_part.maintainers
@@ -101,9 +119,9 @@
local_part_suffix = .*
local_part_suffix_optional = false
caseful_local_part
- local_parts = passwd;%= instanceproject %.$local_part
- require_files = %= instanceproject %.$local_part :
$home/.forward$local_part_suffix
- router_home_directory = ${lookup passwd{%= instanceproject
%.$local_part}{${extract{5}{:}{$value}}}fail}
+ local_parts = passwd;INSTANCEPROJECT.$local_part
+ require_files = INSTANCEPROJECT.$local_part :
$home/.forward$local_part_suffix
+ router_home_directory = ${lookup
passwd{INSTANCEPROJECT.$local_part}{${extract{5}{:}{$value}}}fail}
file = /data/project/$local_part/.forward$local_part_suffix
expn = false
check_ancestor
@@ -125,9 +143,9 @@
local_part_suffix = .*
local_part_suffix_optional = false
caseful_local_part
- local_parts = passwd;%= instanceproject %.$local_part
- require_files = %= instanceproject %.$local_part : $home/.forward
- router_home_directory = ${lookup passwd{%= instanceproject
%.$local_part}{${extract{5}{:}{$value}}}fail}
+ local_parts = passwd;INSTANCEPROJECT.$local_part
+ require_files = INSTANCEPROJECT.$local_part : $home/.forward
+ router_home_directory = ${lookup
passwd{INSTANCEPROJECT.$local_part}{${extract{5}{:}{$value}}}fail}
file = /data/project/$local_part/.forward
expn = false
check_ancestor
@@ -148,12 +166,12 @@
local_part_suffix = .*
local_part_suffix_optional = false
caseful_local_part
- local_parts = passwd;%= instanceproject %.$local_part
- router_home_directory = ${lookup passwd{%= instanceproject
%.$local_part}{${extract{5}{:}{$value}}}fail}
+ local_parts = passwd;INSTANCEPROJECT.$local_part
+ router_home_directory = ${lookup
passwd{INSTANCEPROJECT.$local_part}{${extract{5}{:}{$value}}}fail}
expn = false
check_ancestor
modemask = 002
- data = ${run{/usr/local/sbin/maintainers %= instanceproject
%.$local_part}{$value}fail}
+ data = ${run{/usr/local/sbin/maintainers
INSTANCEPROJECT.$local_part}{$value}fail}
system_aliases:
driver = redirect
@@ -161,14 +179,18 @@
allow_defer
data = ${lookup{$local_part}lsearch{/etc/aliases}}
+##
+# Transports #
+##
+
begin transports
gridqueue:
driver = pipe
batch_max = 1
umask = 007
- user = %= instanceproject %.$local_part
- group = %= instanceproject %.$local_part
+ user = INSTANCEPROJECT.$local_part
+ group = INSTANCEPROJECT.$local_part
path = /bin:/usr/bin:/usr/local/bin
allow_commands = jmail
return_fail_output
@@ -177,6 +199,10 @@
remote_smtp:
driver = smtp
+###
+# Retry rules #
[MediaWiki-commits] [Gerrit] Add comments to explain the routers' functions - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164321
Change subject: Add comments to explain the routers' functions
..
Add comments to explain the routers' functions
Change-Id: Iaf628a6f321c3a02841b275b2f7b5002303268f7
---
M modules/toollabs/templates/exim4.conf.erb
1 file changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/164321/1
diff --git a/modules/toollabs/templates/exim4.conf.erb
b/modules/toollabs/templates/exim4.conf.erb
index 7a82491..2257361 100644
--- a/modules/toollabs/templates/exim4.conf.erb
+++ b/modules/toollabs/templates/exim4.conf.erb
@@ -63,10 +63,14 @@
ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
no_more
+# Send mail to root@ or postmaster@ to the Labs project admin
+
postmaster_mail:
driver = redirect
condition = ${if forany{root:postmaster}{eq{$item}{$local_part}}}
data = %= instanceproject %.admin
+
+# Alias tools.toolname@ to toolname.maintainers@
tool_fallback:
driver = redirect
@@ -78,6 +82,8 @@
modemask = 002
data = $local_part.maintainers
+# Forward mail to user@ to the mail address set in LDAP (wikitech preference)
+
user_forward:
driver = redirect
caseful_local_part
@@ -86,6 +92,9 @@
check_ancestor
modemask = 002
data = ${run{/usr/local/sbin/localuser $local_part}{$value}fail}
+
+# Forward mail to toolname.anything@ using a specific .forward.anything
file
+# if present in the tool's home directory
tool_forward_specific:
driver = redirect
@@ -108,6 +117,9 @@
forbid_smtp_code
hide_child_in_errmsg
+# Forward mail to toolname.anything@ using the plain .forward file if
+# .forward.anything doesn't exist
+
tool_forward_general:
driver = redirect
local_part_suffix = .*
@@ -129,6 +141,8 @@
forbid_smtp_code
hide_child_in_errmsg
+# Forward mail to toolname.anything to the tool's maintainers if no
.forward file exists
+
tool_default:
driver = redirect
local_part_suffix = .*
--
To view, visit https://gerrit.wikimedia.org/r/164321
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf628a6f321c3a02841b275b2f7b5002303268f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Indent ACLs - change (operations/puppet)
Mark Bergsma has uploaded a new change for review. https://gerrit.wikimedia.org/r/164320 Change subject: Indent ACLs .. Indent ACLs Change-Id: I9d2968ef39ee62d5ba6db0fe73e8f88e480b705f --- M modules/toollabs/templates/exim4.conf.erb 1 file changed, 18 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/20/164320/1 diff --git a/modules/toollabs/templates/exim4.conf.erb b/modules/toollabs/templates/exim4.conf.erb index 1a3d008..7a82491 100644 --- a/modules/toollabs/templates/exim4.conf.erb +++ b/modules/toollabs/templates/exim4.conf.erb @@ -24,34 +24,34 @@ begin acl acl_check_rcpt: -accept hosts = : -denymessage = Restricted characters in address -domains = +local_domains -local_parts = ^[.] : ^.*[@%!/|] + accept hosts = : + denymessage = Restricted characters in address + domains = +local_domains + local_parts = ^[.] : ^.*[@%!/|] -denymessage = Restricted characters in address -domains = !+local_domains -local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ + denymessage = Restricted characters in address + domains = !+local_domains + local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ -accept local_parts = postmaster -domains = +local_domains + accept local_parts = postmaster + domains = +local_domains -accept hosts = +relay_from_hosts -control = submission + accept hosts = +relay_from_hosts + control = submission -accept authenticated = * -control = submission + accept authenticated = * + control = submission -require message = relay not permitted -domains = +local_domains + require message = relay not permitted + domains = +local_domains -require verify = recipient + require verify = recipient -accept + accept acl_check_data: -accept + accept begin routers -- To view, visit https://gerrit.wikimedia.org/r/164320 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d2968ef39ee62d5ba6db0fe73e8f88e480b705f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mark Bergsma m...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use local_parts router option instead of a condition - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164323
Change subject: Use local_parts router option instead of a condition
..
Use local_parts router option instead of a condition
Change-Id: Id7145b25d4c9d8388482113f1c9956670a2e0d15
---
M modules/toollabs/templates/exim4.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/164323/1
diff --git a/modules/toollabs/templates/exim4.conf.erb
b/modules/toollabs/templates/exim4.conf.erb
index 9fb3cd8..770d24f 100644
--- a/modules/toollabs/templates/exim4.conf.erb
+++ b/modules/toollabs/templates/exim4.conf.erb
@@ -67,7 +67,7 @@
postmaster_mail:
driver = redirect
- condition = ${if forany{root:postmaster}{eq{$item}{$local_part}}}
+ local_parts = root : postmaster
data = %= instanceproject %.admin
# Alias tools.toolname@ to toolname.maintainers@
--
To view, visit https://gerrit.wikimedia.org/r/164323
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7145b25d4c9d8388482113f1c9956670a2e0d15
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4ab4ad6..4d036f6 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 4ab4ad6..4d036f6 .. Syncronize VisualEditor: 4ab4ad6..4d036f6 Change-Id: Id5cb1ce48a07565c3682c32ee99d5418180d7ee8 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 4ab4ad6..4d036f6 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 4ab4ad64dc2e285056ac64661e6b589fb2be983f +Subproject commit 4d036f6fe1161357e41846c2cdd719b40f959c77 -- To view, visit https://gerrit.wikimedia.org/r/164325 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id5cb1ce48a07565c3682c32ee99d5418180d7ee8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Fixed language screenshot scenario - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] Fixed language screenshot scenario
..
[BrowserTest] Fixed language screenshot scenario
VisualEditor no longer has cancel button.
Change-Id: Ia06469c23cc527ae87170d6aa5b9066fbc9933a6
Paired-With: Amir Aharoni
---
M modules/ve-mw/tests/browser/features/language_screenshot.feature
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
3 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/tests/browser/features/language_screenshot.feature
b/modules/ve-mw/tests/browser/features/language_screenshot.feature
index d449fd1..7aad934 100644
--- a/modules/ve-mw/tests/browser/features/language_screenshot.feature
+++ b/modules/ve-mw/tests/browser/features/language_screenshot.feature
@@ -139,10 +139,10 @@
Then I should see the formula insertion menu
@language_screenshot
- Scenario: VisualEditor_cancel_save
+ Scenario: VisualEditor_toolbar_actions
Given I am logged in
When I am edit language screenshot page with Testing toolbar
-Then I should see VisualEditor toolbar containing cancel and save button
+Then I should see action buttons in the end of the VisualEditor toolbar
@language_screenshot
Scenario: VisualEditor_references_list
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index 28e7d98..ebc0b18 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -274,12 +274,12 @@
capture_screenshot(#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
[@current_page.iframe_element, @current_page.formula_image_element], nil, 0)
end
-Then(/^I should see VisualEditor toolbar containing cancel and save button$/)
do
+Then(/^I should see action buttons in the end of the VisualEditor toolbar$/) do
on(VisualEditorPage) do |page|
-page.toolbar_action_element.when_present.should be_visible
+page.toolbar_actions_element.when_present.should be_visible
page.save_enabled_element.when_present(10).should be_visible
end
-
capture_screenshot(#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
[@current_page.toolbar_action_element])
+
capture_screenshot(#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
[@current_page.toolbar_actions_element])
end
Then(/^I should see References list dialog box$/) do
diff --git
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index dfa5316..6824e3a 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -87,7 +87,7 @@
a(:internal_link, class: ve-ce-linkAnnotation
ve-ce-mwInternalLinkAnnotation)
unordered_list(:popup_icon, class: ve-ui-context-menu)
span(:basic_reference, class: oo-ui-iconElement-icon oo-ui-icon-reference)
- div(:toolbar_action, class: oo-ui-toolbar-actions)
+ div(:toolbar_actions, class: oo-ui-toolbar-actions)
span(:media_insert_menu, class: oo-ui-tool-name-media)
span(:template_insert_menu, class: oo-ui-tool-name-transclusion)
span(:ref_list_insert_menu, class: oo-ui-tool-name-referencesList)
--
To view, visit https://gerrit.wikimedia.org/r/164319
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia06469c23cc527ae87170d6aa5b9066fbc9933a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Vikassy vikasyaligar...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4ab4ad6..4d036f6 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/164325 Change subject: Syncronize VisualEditor: 4ab4ad6..4d036f6 .. Syncronize VisualEditor: 4ab4ad6..4d036f6 Change-Id: Id5cb1ce48a07565c3682c32ee99d5418180d7ee8 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/25/164325/1 diff --git a/VisualEditor b/VisualEditor index 4ab4ad6..4d036f6 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 4ab4ad64dc2e285056ac64661e6b589fb2be983f +Subproject commit 4d036f6fe1161357e41846c2cdd719b40f959c77 -- To view, visit https://gerrit.wikimedia.org/r/164325 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id5cb1ce48a07565c3682c32ee99d5418180d7ee8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Show labels instead of item ids on badge diffs - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164326
Change subject: Show labels instead of item ids on badge diffs
..
Show labels instead of item ids on badge diffs
Bug: 69832
Change-Id: Ie94ea8c6a3612e14996641812f95a1e0a2e9ee98
(cherry picked from commit 807839e906b743e15c074204de00fbf9e245e302)
---
M repo/includes/Diff/DiffView.php
M repo/includes/Diff/EntityContentDiffView.php
M repo/includes/Diff/EntityDiffVisualizer.php
M repo/includes/actions/EditEntityAction.php
M repo/tests/phpunit/includes/Diff/DiffViewTest.php
M repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
6 files changed, 79 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/26/164326/1
diff --git a/repo/includes/Diff/DiffView.php b/repo/includes/Diff/DiffView.php
index 8b15c61..354528f 100644
--- a/repo/includes/Diff/DiffView.php
+++ b/repo/includes/Diff/DiffView.php
@@ -12,7 +12,9 @@
use IContextSource;
use MWException;
use SiteStore;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityTitleLookup;
/**
@@ -54,6 +56,11 @@
private $entityTitleLookup;
/**
+* @var EntityRevisionLookup
+*/
+ private $entityRevisionLookup;
+
+ /**
* Constructor.
*
* @since 0.1
@@ -62,6 +69,7 @@
* @param Diff $diff
* @param SiteStore $siteStore
* @param EntityTitleLookup $entityTitleLookup
+* @param EntityRevisionLookup $entityRevisionLookup
* @param IContextSource|null $contextSource
*/
public function __construct(
@@ -69,12 +77,14 @@
Diff $diff,
SiteStore $siteStore,
EntityTitleLookup $entityTitleLookup,
+ EntityRevisionLookup $entityRevisionLookup,
IContextSource $contextSource = null
) {
$this-path = $path;
$this-diff = $diff;
$this-siteStore = $siteStore;
$this-entityTitleLookup = $entityTitleLookup;
+ $this-entityRevisionLookup = $entityRevisionLookup;
if ( !is_null( $contextSource ) ) {
$this-setContext( $contextSource );
@@ -237,7 +247,32 @@
return Html::element( 'a', array(
'href' = $title-getLinkURL(),
'dir' = 'auto',
- ), $badgeId );
+ ), $this-getLabelForBadge( new ItemId( $badgeId ) ) );
+ }
+
+ /**
+* Returns the title for the given badge id.
+* @todo use TermLookup when we have one
+* @todo this is copied from SpecialSetSiteLink
+*
+* @param EntityId $badgeId
+* @return string
+*/
+ private function getLabelForBadge( EntityId $badgeId ) {
+ $entityRevision =
$this-entityRevisionLookup-getEntityRevision( $badgeId );
+
+ if ( $entityRevision === null ) {
+ return $badgeId-getSerialization();
+ }
+
+ $languageCode = $this-getLanguage()-getCode();
+ $labels =
$entityRevision-getEntity()-getFingerprint()-getLabels();
+
+ if ( $labels-hasTermForLanguage( $languageCode ) ) {
+ return $labels-getByLanguage( $languageCode
)-getText();
+ } else {
+ return $badgeId-getSerialization();
+ }
}
/**
diff --git a/repo/includes/Diff/EntityContentDiffView.php
b/repo/includes/Diff/EntityContentDiffView.php
index 8cd7d2e..b437bc1 100644
--- a/repo/includes/Diff/EntityContentDiffView.php
+++ b/repo/includes/Diff/EntityContentDiffView.php
@@ -86,7 +86,8 @@
new ClaimDiffer( new OrderedListDiffer( new
ComparableComparer() ) ),
new ClaimDifferenceVisualizer(
$this-propertyNameFormatter, $this-detailedSnakFormatter,
$this-terseSnakFormatter, $langCode ),
$wikibaseRepo-getSiteStore(),
- $wikibaseRepo-getEntityTitleLookup()
+ $wikibaseRepo-getEntityTitleLookup(),
+ $wikibaseRepo-getEntityRevisionLookup()
);
}
diff --git a/repo/includes/Diff/EntityDiffVisualizer.php
b/repo/includes/Diff/EntityDiffVisualizer.php
index 0c73e69..441d794 100644
--- a/repo/includes/Diff/EntityDiffVisualizer.php
+++ b/repo/includes/Diff/EntityDiffVisualizer.php
@@ -2,8 +2,8 @@
namespace Wikibase\Repo\Diff;
-use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp;
+use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp\DiffOpAdd;
use Diff\DiffOp\DiffOpChange;
use Diff\DiffOp\DiffOpRemove;
@@ -11,6 +11,8 @@
use MWException;
use SiteStore;
use
[MediaWiki-commits] [Gerrit] Don't yet include statements yet on properties - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164327
Change subject: Don't yet include statements yet on properties
..
Don't yet include statements yet on properties
These are mistakenly being added in the JS entityview,
but shouldn't be yet as not possible yet to actually
save them, among other issues still to resolve.
Change-Id: I13166578fcaea99f901901abf3c8531f18c82df1
(cherry picked from commit 81badf300de1663f54847e5af7519afcca2a0fb5)
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
1 file changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/27/164327/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index bb41339..962abfb 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -98,8 +98,12 @@
this._initDescription();
this._initAliases();
this._initFingerprints();
- this._initClaims();
- this._initSiteLinks();
+
+ // TODO: Have an itemview and propertyview instead of ugly hack
here.
+ if ( this.options.value.getDataType() === 'wikibase-item' ) {
+ this._initClaims();
+ this._initSiteLinks();
+ }
this._attachEventHandlers();
},
--
To view, visit https://gerrit.wikimedia.org/r/164327
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I13166578fcaea99f901901abf3c8531f18c82df1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't use Statement class alias - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/164328 Change subject: Don't use Statement class alias .. Don't use Statement class alias Bug: 71508 Change-Id: Id648010f6432c32205824499ead79570014cdbba (cherry picked from commit 960db3d68eec3e406e2d3ff15e76e3e1f36ba5d0) --- M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php M client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php M client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php M lib/includes/serializers/ClaimSerializer.php M lib/tests/phpunit/changes/TestChanges.php M lib/tests/phpunit/serializers/ClaimSerializerTest.php M lib/tests/phpunit/serializers/ClaimsSerializerTest.php M lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php M lib/tests/phpunit/serializers/ItemSerializerTest.php M repo/includes/ChangeOp/ChangeOpReference.php M repo/includes/ChangeOp/ChangeOpReferenceRemove.php M repo/includes/ChangeOp/ChangeOpStatementRank.php M repo/includes/ChangeOp/ChangeOpsMerge.php M repo/includes/Validators/SnakValidator.php M repo/includes/api/RemoveReferences.php M repo/includes/api/SetReference.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php M repo/tests/phpunit/includes/ChangeOp/StatementChangeOpFactoryTest.php M repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php M repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php M repo/tests/phpunit/includes/Diff/ClaimDifferTest.php M repo/tests/phpunit/includes/Diff/ClaimDifferenceTest.php M repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php M repo/tests/phpunit/includes/EntityViewTest.php M repo/tests/phpunit/includes/Hook/MakeGlobalVariablesScriptHandlerTest.php M repo/tests/phpunit/includes/ItemViewTest.php M repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php M repo/tests/phpunit/includes/PropertyViewTest.php M repo/tests/phpunit/includes/Validators/SnakValidatorTest.php M repo/tests/phpunit/includes/WikibaseRepoTest.php M repo/tests/phpunit/includes/api/ApiXmlFormatTest.php M repo/tests/phpunit/includes/api/GetClaimsTest.php M repo/tests/phpunit/includes/api/RemoveClaimsTest.php M repo/tests/phpunit/includes/api/RemoveQualifiersTest.php M repo/tests/phpunit/includes/api/SetClaimTest.php M repo/tests/phpunit/includes/api/SetClaimValueTest.php M repo/tests/phpunit/includes/api/SetQualifierTest.php M repo/tests/phpunit/includes/content/ItemContentTest.php 41 files changed, 50 insertions(+), 50 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/28/164328/1 diff --git a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php index 7a0699b..e497a04 100644 --- a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php +++ b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php @@ -5,12 +5,12 @@ use DataValues\StringValue; use Wikibase\DataAccess\PropertyParserFunction\SnaksFinder; use Wikibase\DataModel\Claim\Claim; -use Wikibase\DataModel\Claim\Statement; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Entity\Property; use Wikibase\DataModel\Entity\PropertyId; use Wikibase\DataModel\Snak\PropertyValueSnak; +use Wikibase\DataModel\Statement\Statement; use Wikibase\Test\MockPropertyLabelResolver; use Wikibase\Test\MockRepository; diff --git a/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php b/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php index 5cb2584..9b9fcb8 100644 --- a/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php +++ b/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php @@ -4,10 +4,10 @@ use Language; use Wikibase\Client\Scribunto\WikibaseLuaEntityBindings; -use Wikibase\DataModel\Claim\Statement; use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\PropertyId; +use Wikibase\DataModel\Statement\Statement; use Wikibase\Lib\SnakFormatter; use Wikibase\Lib\Store\EntityLookup; use Wikibase\SnakFactory; diff --git a/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php b/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php index 2587d22..a1ea74b 100644 --- a/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php +++ b/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php @@ -6,13 +6,13
[MediaWiki-commits] [Gerrit] Fix invalid array_merge in MergeItems api module - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164329
Change subject: Fix invalid array_merge in MergeItems api module
..
Fix invalid array_merge in MergeItems api module
This module inherits directly from ApiBase where
getParamDescription returns false, thus calling it then
array_merge results in a php warning and incomplete
description on the api help page.
Bug: 71469
Change-Id: Ib508355a3720c1c54b95c34aeb2446ac48909b32
---
M repo/includes/api/MergeItems.php
1 file changed, 13 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/29/164329/1
diff --git a/repo/includes/api/MergeItems.php b/repo/includes/api/MergeItems.php
index bd29918..d5ec03c 100644
--- a/repo/includes/api/MergeItems.php
+++ b/repo/includes/api/MergeItems.php
@@ -23,7 +23,6 @@
*/
class MergeItems extends ApiBase {
-
/**
* @var EntityIdParser
*/
@@ -208,22 +207,19 @@
* @see ApiBase::getParamDescription
*/
public function getParamDescription() {
- return array_merge(
- parent::getParamDescription(),
- array(
- 'fromid' = array( 'The id to merge from' ),
- 'toid' = array( 'The id to merge to' ),
- 'ignoreconflicts' = array( 'Array of elements
of the item to ignore conflicts for, can only contain values of label and or
description and or sitelink' ),
- 'token' = 'An edittoken token previously
obtained through the token module (prop=info).',
- 'summary' = array( 'Summary for the edit.',
- Will be prepended by an automatically
generated comment. The length limit of the
- autocomment together with the summary
is 260 characters. Be aware that everything above that
- limit will be cut off.
- ),
- 'bot' = array( 'Mark this edit as bot',
- 'This URL flag will only be respected
if the user belongs to the group bot.'
- ),
- )
+ return array(
+ 'fromid' = array( 'The id to merge from' ),
+ 'toid' = array( 'The id to merge to' ),
+ 'ignoreconflicts' = array( 'Array of elements of the
item to ignore conflicts for, can only contain values of label and or
description and or sitelink' ),
+ 'token' = 'An edittoken token previously obtained
through the token module (prop=info).',
+ 'summary' = array( 'Summary for the edit.',
+ Will be prepended by an automatically
generated comment. The length limit of the
+ autocomment together with the summary is 260
characters. Be aware that everything above that
+ limit will be cut off.
+ ),
+ 'bot' = array( 'Mark this edit as bot',
+ 'This URL flag will only be respected if the
user belongs to the group bot.'
+ ),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/164329
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib508355a3720c1c54b95c34aeb2446ac48909b32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix invalid array_merge in MergeItems api module - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix invalid array_merge in MergeItems api module
..
Fix invalid array_merge in MergeItems api module
This module inherits directly from ApiBase where
getParamDescription returns false, thus calling it then
array_merge results in a php warning and incomplete
description on the api help page.
Bug: 71469
Change-Id: Ib508355a3720c1c54b95c34aeb2446ac48909b32
---
M repo/includes/api/MergeItems.php
1 file changed, 13 insertions(+), 17 deletions(-)
Approvals:
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/MergeItems.php b/repo/includes/api/MergeItems.php
index bd29918..d5ec03c 100644
--- a/repo/includes/api/MergeItems.php
+++ b/repo/includes/api/MergeItems.php
@@ -23,7 +23,6 @@
*/
class MergeItems extends ApiBase {
-
/**
* @var EntityIdParser
*/
@@ -208,22 +207,19 @@
* @see ApiBase::getParamDescription
*/
public function getParamDescription() {
- return array_merge(
- parent::getParamDescription(),
- array(
- 'fromid' = array( 'The id to merge from' ),
- 'toid' = array( 'The id to merge to' ),
- 'ignoreconflicts' = array( 'Array of elements
of the item to ignore conflicts for, can only contain values of label and or
description and or sitelink' ),
- 'token' = 'An edittoken token previously
obtained through the token module (prop=info).',
- 'summary' = array( 'Summary for the edit.',
- Will be prepended by an automatically
generated comment. The length limit of the
- autocomment together with the summary
is 260 characters. Be aware that everything above that
- limit will be cut off.
- ),
- 'bot' = array( 'Mark this edit as bot',
- 'This URL flag will only be respected
if the user belongs to the group bot.'
- ),
- )
+ return array(
+ 'fromid' = array( 'The id to merge from' ),
+ 'toid' = array( 'The id to merge to' ),
+ 'ignoreconflicts' = array( 'Array of elements of the
item to ignore conflicts for, can only contain values of label and or
description and or sitelink' ),
+ 'token' = 'An edittoken token previously obtained
through the token module (prop=info).',
+ 'summary' = array( 'Summary for the edit.',
+ Will be prepended by an automatically
generated comment. The length limit of the
+ autocomment together with the summary is 260
characters. Be aware that everything above that
+ limit will be cut off.
+ ),
+ 'bot' = array( 'Mark this edit as bot',
+ 'This URL flag will only be respected if the
user belongs to the group bot.'
+ ),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/164305
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib508355a3720c1c54b95c34aeb2446ac48909b32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.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] i18n: Use user language and direction on input - change (mediawiki...Wikibase)
Ebrahim has uploaded a new change for review. https://gerrit.wikimedia.org/r/164330 Change subject: i18n: Use user language and direction on input .. i18n: Use user language and direction on input 'entityselector' is using user languuage on its suggestion so lets put direction and override .sitedir-ltr input dir ltr Bug: 71552 Change-Id: I902fc4bcf471b55423af98b1ae88e9a1c3422dce --- M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/30/164330/1 diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js index e7d52b8..e6195af 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js @@ -137,6 +137,7 @@ $.ui.suggester.prototype._create.call( this ); this.element.addClass( 'ui-entityselector-input' ); + this.element.prop( 'dir', $( document ).prop( 'dir' ) ); this.options.menu.element.addClass( 'ui-entityselector-list' ); this.element -- To view, visit https://gerrit.wikimedia.org/r/164330 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I902fc4bcf471b55423af98b1ae88e9a1c3422dce Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Ebrahim ebra...@gnu.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Workaround for thumbnail pre rendering with PHP 5.4.7 - change (mediawiki/core)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164331
Change subject: Workaround for thumbnail pre rendering with PHP 5.4.7
..
Workaround for thumbnail pre rendering with PHP 5.4.7
Since this code is dealing with scheme-less URLs, parse_url()
can cause issues in older versions of PHP.
Change-Id: Ic1276feed9ed51772a05c4a73c787a315b848066
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/301
---
M includes/jobqueue/jobs/ThumbnailRenderJob.php
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/31/164331/1
diff --git a/includes/jobqueue/jobs/ThumbnailRenderJob.php
b/includes/jobqueue/jobs/ThumbnailRenderJob.php
index ec68d7e..6b1e7e3 100644
--- a/includes/jobqueue/jobs/ThumbnailRenderJob.php
+++ b/includes/jobqueue/jobs/ThumbnailRenderJob.php
@@ -81,6 +81,10 @@
$thumbUrl = $file-getThumbUrl( $thumbName );
if ( $wgUploadThumbnailRenderHttpCustomDomain ) {
+ // Workaround for parse_url not handling scheme-less
urls properly in PHP 5.4.7
+ if ( substr( $thumbUrl, 0, 2 ) === '//' ) {
+ $thumbUrl = 'http:' . $thumbUrl;
+ }
$thumbUrl = '//' .
$wgUploadThumbnailRenderHttpCustomDomain . parse_url( $thumbUrl, PHP_URL_PATH );
}
--
To view, visit https://gerrit.wikimedia.org/r/164331
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1276feed9ed51772a05c4a73c787a315b848066
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make repository host parameterizable - change (integration/jenkins-job-builder-config)
Tobias Gritschacher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164332
Change subject: Make repository host parameterizable
..
Make repository host parameterizable
This allows to clone repositories from other
hosts than gerrit, e.g. GitHub
Change-Id: I2c2208f5c6b95e92affedcdc889bb2a93be7dd5f
---
M browsertests.yaml
M job-templates-browsertests.yaml
2 files changed, 39 insertions(+), 20 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/32/164332/1
diff --git a/browsertests.yaml b/browsertests.yaml
index 29860b4..b74c1d0 100644
--- a/browsertests.yaml
+++ b/browsertests.yaml
@@ -38,7 +38,8 @@
mediawiki_user: Selenium_user
platform: linux
recipients: *emails-CirrusSearch
-repository: mediawiki/extensions/CirrusSearch
+repository_name: mediawiki/extensions/CirrusSearch
+repository_host: gerrit.wikimedia.org/r
jobs:
- 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce':
@@ -59,7 +60,8 @@
mediawiki_url: language-stage.wmflabs.org
mediawiki_user: Selenium_user
platform: linux
-repository: mediawiki/extensions/ContentTranslation
+repository_name: mediawiki/extensions/ContentTranslation
+repository_host: gerrit.wikimedia.org/r
# Restrict email notifications since language-stage is broken
#recipients: *emails-ULS
@@ -79,7 +81,8 @@
mediawiki_user: Selenium_user
platform: linux
recipients: *emails-qa
-repository: mediawiki/core
+repository_name: mediawiki/core
+repository_host: gerrit.wikimedia.org/r
jobs:
- 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce'
@@ -92,7 +95,8 @@
mediawiki_user: Selenium_user
platform: linux
recipients: *emails-qa
-repository: mediawiki/extensions/Echo
+repository_name: mediawiki/extensions/Echo
+repository_host: gerrit.wikimedia.org/r
jobs:
- 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce':
@@ -123,7 +127,8 @@
mediawiki_user: Selenium_user
platform: linux
recipients: *emails-qa
-repository: mediawiki/extensions/Flow
+repository_name: mediawiki/extensions/Flow
+repository_host: gerrit.wikimedia.org/r
jobs:
- 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce':
@@ -183,7 +188,8 @@
mediawiki_user: Selenium_user
platform: linux
recipients: *emails-qa
-repository: mediawiki/extensions/Math
+repository_name: mediawiki/extensions/Math
+repository_host: gerrit.wikimedia.org/r
jobs:
- 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce':
@@ -203,7 +209,8 @@
mediawiki_user: Selenium_user
platform: linux
recipients: *emails-growth
-repository: mediawiki/extensions/GettingStarted
+repository_name: mediawiki/extensions/GettingStarted
+repository_host: gerrit.wikimedia.org/r
jobs:
- 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce'
@@ -218,7 +225,8 @@
mediawiki_user: Selenium_user
platform: linux
recipients: *emails-qa
-repository: mediawiki/extensions/MobileFrontend
+repository_name: mediawiki/extensions/MobileFrontend
+repository_host: gerrit.wikimedia.org/r
jobs:
- 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce':
@@ -243,7 +251,8 @@
mediawiki_user: Selenium_user
platform: linux
recipients: *emails-multimedia
-repository: mediawiki/extensions/MultimediaViewer
+repository_name: mediawiki/extensions/MultimediaViewer
+repository_host: gerrit.wikimedia.org/r
jobs:
- 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce':
@@ -294,7 +303,8 @@
mediawiki_user: Selenium_user
platform: linux
recipients: *emails-qa
-repository: mediawiki/extensions/PageTriage
+repository_name: mediawiki/extensions/PageTriage
+repository_host: gerrit.wikimedia.org/r
jobs:
- 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce':
@@ -314,7 +324,8 @@
mediawiki_user: Selenium_user
platform: linux
recipients: *emails-qa
-repository: mediawiki/extensions/PdfHandler
+repository_name: mediawiki/extensions/PdfHandler
+repository_host: gerrit.wikimedia.org/r
jobs:
- 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce':
@@ -330,7 +341,8 @@
mediawiki_user: Selenium
platform: linux
recipients: *emails-i18n
-repository: mediawiki/extensions/TwnMainPage
+repository_name: mediawiki/extensions/TwnMainPage
+repository_host: gerrit.wikimedia.org/r
jobs:
- 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce'
@@ -343,7 +355,8 @@
headless: 'false'
platform: linux
recipients: *emails-i18n
-repository: mediawiki/extensions/Translate
+repository_name:
[MediaWiki-commits] [Gerrit] Bug 70196: Add all categories from action=parse - change (mediawiki...parsoid)
Marcoil has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164333
Change subject: Bug 70196: Add all categories from action=parse
..
Bug 70196: Add all categories from action=parse
Don't test for hidden categories, as some are not hidden on some
wikis and repeating them doesn't produce any errors.
Change-Id: Ibe71f95764f4b0cd0c055e06571abaa9ff7732b8
---
M lib/mediawiki.ApiRequest.js
1 file changed, 9 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/33/164333/1
diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js
index 55b7e2c..58d91ec 100644
--- a/lib/mediawiki.ApiRequest.js
+++ b/lib/mediawiki.ApiRequest.js
@@ -427,7 +427,8 @@
// Add the source to the cache
this.env.pageCache[this.text] = src;
- // Add the categories which were added by extensions
+ // Add the categories which were added by parser functions
directly
+ // into the page and not as in-text links.
if (data.expandtemplates.categories) {
for (var i in data.expandtemplates.categories) {
var category =
data.expandtemplates.categories[i];
@@ -562,20 +563,17 @@
for (i in data.parse.modulemessages) {
this.env.page.extensionModuleMessages.add(data.parse.modulemessages[i]); }
}
- // Add the categories which were added by extensions
+ // Add the categories which were added by extensions directly
into the
+ // page and not as in-text links
if (data.parse.categories) {
for (i in data.parse.categories) {
var category = data.parse.categories[i];
- // Only add those categories given as hidden by
the parser, the
- // rest will be already included in the parser
output.
- if (category.hidden !== undefined) {
- parsedHtml += '\nlink
rel=mw:PageProp/Category href=./Category:' +
- category['*'];
- if (category.sortkey) {
- parsedHtml += # +
category.sortkey;
- }
- parsedHtml += '/';
+ parsedHtml += '\nlink
rel=mw:PageProp/Category href=./Category:' +
+ category['*'];
+ if (category.sortkey) {
+ parsedHtml += # + category.sortkey;
}
+ parsedHtml += '/';
}
}
} catch ( e2 ) {
--
To view, visit https://gerrit.wikimedia.org/r/164333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe71f95764f4b0cd0c055e06571abaa9ff7732b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Marcoil marc...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't use Statement class alias - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Don't use Statement class alias .. Don't use Statement class alias Bug: 71508 Change-Id: Id648010f6432c32205824499ead79570014cdbba (cherry picked from commit 960db3d68eec3e406e2d3ff15e76e3e1f36ba5d0) --- M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php M client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php M client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php M lib/includes/serializers/ClaimSerializer.php M lib/tests/phpunit/changes/TestChanges.php M lib/tests/phpunit/serializers/ClaimSerializerTest.php M lib/tests/phpunit/serializers/ClaimsSerializerTest.php M lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php M lib/tests/phpunit/serializers/ItemSerializerTest.php M repo/includes/ChangeOp/ChangeOpReference.php M repo/includes/ChangeOp/ChangeOpReferenceRemove.php M repo/includes/ChangeOp/ChangeOpStatementRank.php M repo/includes/ChangeOp/ChangeOpsMerge.php M repo/includes/Validators/SnakValidator.php M repo/includes/api/RemoveReferences.php M repo/includes/api/SetReference.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php M repo/tests/phpunit/includes/ChangeOp/StatementChangeOpFactoryTest.php M repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php M repo/tests/phpunit/includes/ClaimSummaryBuilderTest.php M repo/tests/phpunit/includes/Diff/ClaimDifferTest.php M repo/tests/phpunit/includes/Diff/ClaimDifferenceTest.php M repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php M repo/tests/phpunit/includes/EntityViewTest.php M repo/tests/phpunit/includes/Hook/MakeGlobalVariablesScriptHandlerTest.php M repo/tests/phpunit/includes/ItemViewTest.php M repo/tests/phpunit/includes/ParserOutputJsConfigBuilderTest.php M repo/tests/phpunit/includes/PropertyViewTest.php M repo/tests/phpunit/includes/Validators/SnakValidatorTest.php M repo/tests/phpunit/includes/WikibaseRepoTest.php M repo/tests/phpunit/includes/api/ApiXmlFormatTest.php M repo/tests/phpunit/includes/api/GetClaimsTest.php M repo/tests/phpunit/includes/api/RemoveClaimsTest.php M repo/tests/phpunit/includes/api/RemoveQualifiersTest.php M repo/tests/phpunit/includes/api/SetClaimTest.php M repo/tests/phpunit/includes/api/SetClaimValueTest.php M repo/tests/phpunit/includes/api/SetQualifierTest.php M repo/tests/phpunit/includes/content/ItemContentTest.php 41 files changed, 50 insertions(+), 50 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php index 7a0699b..e497a04 100644 --- a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php +++ b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php @@ -5,12 +5,12 @@ use DataValues\StringValue; use Wikibase\DataAccess\PropertyParserFunction\SnaksFinder; use Wikibase\DataModel\Claim\Claim; -use Wikibase\DataModel\Claim\Statement; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Entity\Property; use Wikibase\DataModel\Entity\PropertyId; use Wikibase\DataModel\Snak\PropertyValueSnak; +use Wikibase\DataModel\Statement\Statement; use Wikibase\Test\MockPropertyLabelResolver; use Wikibase\Test\MockRepository; diff --git a/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php b/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php index 5cb2584..9b9fcb8 100644 --- a/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php +++ b/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php @@ -4,10 +4,10 @@ use Language; use Wikibase\Client\Scribunto\WikibaseLuaEntityBindings; -use Wikibase\DataModel\Claim\Statement; use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\PropertyId; +use Wikibase\DataModel\Statement\Statement; use Wikibase\Lib\SnakFormatter; use Wikibase\Lib\Store\EntityLookup; use Wikibase\SnakFactory; diff --git a/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php b/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php index 2587d22..a1ea74b 100644 --- a/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php +++ b/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php @@ -6,13 +6,13 @@ use DataValues\StringValue; use
[MediaWiki-commits] [Gerrit] Show labels instead of item ids on badge diffs - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Show labels instead of item ids on badge diffs
..
Show labels instead of item ids on badge diffs
Bug: 69832
Change-Id: Ie94ea8c6a3612e14996641812f95a1e0a2e9ee98
(cherry picked from commit 807839e906b743e15c074204de00fbf9e245e302)
---
M repo/includes/Diff/DiffView.php
M repo/includes/Diff/EntityContentDiffView.php
M repo/includes/Diff/EntityDiffVisualizer.php
M repo/includes/actions/EditEntityAction.php
M repo/tests/phpunit/includes/Diff/DiffViewTest.php
M repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
6 files changed, 79 insertions(+), 9 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/Diff/DiffView.php b/repo/includes/Diff/DiffView.php
index 8b15c61..354528f 100644
--- a/repo/includes/Diff/DiffView.php
+++ b/repo/includes/Diff/DiffView.php
@@ -12,7 +12,9 @@
use IContextSource;
use MWException;
use SiteStore;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityTitleLookup;
/**
@@ -54,6 +56,11 @@
private $entityTitleLookup;
/**
+* @var EntityRevisionLookup
+*/
+ private $entityRevisionLookup;
+
+ /**
* Constructor.
*
* @since 0.1
@@ -62,6 +69,7 @@
* @param Diff $diff
* @param SiteStore $siteStore
* @param EntityTitleLookup $entityTitleLookup
+* @param EntityRevisionLookup $entityRevisionLookup
* @param IContextSource|null $contextSource
*/
public function __construct(
@@ -69,12 +77,14 @@
Diff $diff,
SiteStore $siteStore,
EntityTitleLookup $entityTitleLookup,
+ EntityRevisionLookup $entityRevisionLookup,
IContextSource $contextSource = null
) {
$this-path = $path;
$this-diff = $diff;
$this-siteStore = $siteStore;
$this-entityTitleLookup = $entityTitleLookup;
+ $this-entityRevisionLookup = $entityRevisionLookup;
if ( !is_null( $contextSource ) ) {
$this-setContext( $contextSource );
@@ -237,7 +247,32 @@
return Html::element( 'a', array(
'href' = $title-getLinkURL(),
'dir' = 'auto',
- ), $badgeId );
+ ), $this-getLabelForBadge( new ItemId( $badgeId ) ) );
+ }
+
+ /**
+* Returns the title for the given badge id.
+* @todo use TermLookup when we have one
+* @todo this is copied from SpecialSetSiteLink
+*
+* @param EntityId $badgeId
+* @return string
+*/
+ private function getLabelForBadge( EntityId $badgeId ) {
+ $entityRevision =
$this-entityRevisionLookup-getEntityRevision( $badgeId );
+
+ if ( $entityRevision === null ) {
+ return $badgeId-getSerialization();
+ }
+
+ $languageCode = $this-getLanguage()-getCode();
+ $labels =
$entityRevision-getEntity()-getFingerprint()-getLabels();
+
+ if ( $labels-hasTermForLanguage( $languageCode ) ) {
+ return $labels-getByLanguage( $languageCode
)-getText();
+ } else {
+ return $badgeId-getSerialization();
+ }
}
/**
diff --git a/repo/includes/Diff/EntityContentDiffView.php
b/repo/includes/Diff/EntityContentDiffView.php
index 8cd7d2e..b437bc1 100644
--- a/repo/includes/Diff/EntityContentDiffView.php
+++ b/repo/includes/Diff/EntityContentDiffView.php
@@ -86,7 +86,8 @@
new ClaimDiffer( new OrderedListDiffer( new
ComparableComparer() ) ),
new ClaimDifferenceVisualizer(
$this-propertyNameFormatter, $this-detailedSnakFormatter,
$this-terseSnakFormatter, $langCode ),
$wikibaseRepo-getSiteStore(),
- $wikibaseRepo-getEntityTitleLookup()
+ $wikibaseRepo-getEntityTitleLookup(),
+ $wikibaseRepo-getEntityRevisionLookup()
);
}
diff --git a/repo/includes/Diff/EntityDiffVisualizer.php
b/repo/includes/Diff/EntityDiffVisualizer.php
index 0c73e69..441d794 100644
--- a/repo/includes/Diff/EntityDiffVisualizer.php
+++ b/repo/includes/Diff/EntityDiffVisualizer.php
@@ -2,8 +2,8 @@
namespace Wikibase\Repo\Diff;
-use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp;
+use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp\DiffOpAdd;
use Diff\DiffOp\DiffOpChange;
use Diff\DiffOp\DiffOpRemove;
@@ -11,6 +11,8 @@
use MWException;
use SiteStore;
use Wikibase\DataModel\Entity\Diff\EntityDiff;
+use
[MediaWiki-commits] [Gerrit] Don't yet include statements yet on properties - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't yet include statements yet on properties
..
Don't yet include statements yet on properties
These are mistakenly being added in the JS entityview,
but shouldn't be yet as not possible yet to actually
save them, among other issues still to resolve.
Change-Id: I13166578fcaea99f901901abf3c8531f18c82df1
(cherry picked from commit 81badf300de1663f54847e5af7519afcca2a0fb5)
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index bb41339..962abfb 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -98,8 +98,12 @@
this._initDescription();
this._initAliases();
this._initFingerprints();
- this._initClaims();
- this._initSiteLinks();
+
+ // TODO: Have an itemview and propertyview instead of ugly hack
here.
+ if ( this.options.value.getDataType() === 'wikibase-item' ) {
+ this._initClaims();
+ this._initSiteLinks();
+ }
this._attachEventHandlers();
},
--
To view, visit https://gerrit.wikimedia.org/r/164327
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I13166578fcaea99f901901abf3c8531f18c82df1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix entity type check in jquery.wikibase.entityview - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164334
Change subject: Fix entity type check in jquery.wikibase.entityview
..
Fix entity type check in jquery.wikibase.entityview
Change-Id: Ic1ce9c08959a1e4468d052c216f6aa2e53650785
(cherry picked from commit 75f7d734dd250014bb8e2e22ba03bea20699e030)
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/34/164334/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index 962abfb..f323c34 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -100,7 +100,7 @@
this._initFingerprints();
// TODO: Have an itemview and propertyview instead of ugly hack
here.
- if ( this.options.value.getDataType() === 'wikibase-item' ) {
+ if ( this.options.value.getType() === 'item' ) {
this._initClaims();
this._initSiteLinks();
}
--
To view, visit https://gerrit.wikimedia.org/r/164334
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1ce9c08959a1e4468d052c216f6aa2e53650785
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't use EntityDiff and ItemDiff class aliases - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/164335 Change subject: Don't use EntityDiff and ItemDiff class aliases .. Don't use EntityDiff and ItemDiff class aliases Change-Id: Iec0e975d7fb960b62768ca032e9a80914e3d80e7 (cherry picked from commit 28d4e0f925d671d5a78bbad50baa6c9be027f6fd) --- M client/tests/phpunit/includes/ChangeHandlerTest.php M lib/tests/phpunit/ChangesTableTest.php M lib/tests/phpunit/changes/ItemChangeTest.php M repo/includes/content/EntityContentDiff.php M repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php M repo/tests/phpunit/includes/content/EntityContentDiffTest.php M repo/tests/phpunit/includes/content/EntityContentTest.php M repo/tests/phpunit/includes/content/ItemContentTest.php 8 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/35/164335/1 diff --git a/client/tests/phpunit/includes/ChangeHandlerTest.php b/client/tests/phpunit/includes/ChangeHandlerTest.php index 0c5a6eb..cc3e15d 100644 --- a/client/tests/phpunit/includes/ChangeHandlerTest.php +++ b/client/tests/phpunit/includes/ChangeHandlerTest.php @@ -8,8 +8,8 @@ use Wikibase\Change; use Wikibase\ChangeHandler; use Wikibase\Client\WikibaseClient; +use Wikibase\DataModel\Entity\Diff\EntityDiff; use Wikibase\DataModel\Entity\Entity; -use Wikibase\DataModel\Entity\EntityDiff; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\SiteLink; diff --git a/lib/tests/phpunit/ChangesTableTest.php b/lib/tests/phpunit/ChangesTableTest.php index c21df53..2795c11 100644 --- a/lib/tests/phpunit/ChangesTableTest.php +++ b/lib/tests/phpunit/ChangesTableTest.php @@ -7,7 +7,7 @@ use Diff\DiffOp\DiffOpChange; use Wikibase\ChangesTable; use Wikibase\DataModel\Claim\Claim; -use Wikibase\DataModel\Entity\ItemDiff; +use Wikibase\DataModel\Entity\Diff\ItemDiff; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Snak\PropertyNoValueSnak; diff --git a/lib/tests/phpunit/changes/ItemChangeTest.php b/lib/tests/phpunit/changes/ItemChangeTest.php index 05a6c72..24d6c63 100644 --- a/lib/tests/phpunit/changes/ItemChangeTest.php +++ b/lib/tests/phpunit/changes/ItemChangeTest.php @@ -5,9 +5,9 @@ use Diff\DiffOp\Diff\Diff; use Diff\DiffOp\DiffOpChange; use Exception; +use Wikibase\DataModel\Entity\Diff\ItemDiff; use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\Item; -use Wikibase\DataModel\Entity\ItemDiff; use Wikibase\EntityChange; use Wikibase\ItemChange; diff --git a/repo/includes/content/EntityContentDiff.php b/repo/includes/content/EntityContentDiff.php index 771eb2a..07e9404 100644 --- a/repo/includes/content/EntityContentDiff.php +++ b/repo/includes/content/EntityContentDiff.php @@ -3,7 +3,7 @@ namespace Wikibase\Repo\Content; use Diff\DiffOp\Diff\Diff; -use Wikibase\DataModel\Entity\EntityDiff; +use Wikibase\DataModel\Entity\Diff\EntityDiff; /** * Represents a diff between two Wikibase\EntityContent instances. diff --git a/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php b/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php index 3a3492a..220b7f2 100644 --- a/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php +++ b/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php @@ -8,7 +8,7 @@ use IContextSource; use Language; use Site; -use Wikibase\DataModel\Entity\EntityDiff; +use Wikibase\DataModel\Entity\Diff\EntityDiff; use Wikibase\Repo\Content\EntityContentDiff; use Wikibase\Repo\Diff\ClaimDiffer; use Wikibase\Repo\Diff\ClaimDifferenceVisualizer; diff --git a/repo/tests/phpunit/includes/content/EntityContentDiffTest.php b/repo/tests/phpunit/includes/content/EntityContentDiffTest.php index dce7dc1..1e71c14 100644 --- a/repo/tests/phpunit/includes/content/EntityContentDiffTest.php +++ b/repo/tests/phpunit/includes/content/EntityContentDiffTest.php @@ -5,7 +5,7 @@ use Diff\DiffOp\Diff\Diff; use Diff\DiffOp\DiffOpAdd; use Diff\DiffOp\DiffOpRemove; -use Wikibase\DataModel\Entity\EntityDiff; +use Wikibase\DataModel\Entity\Diff\EntityDiff; use Wikibase\Repo\Content\EntityContentDiff; /** diff --git a/repo/tests/phpunit/includes/content/EntityContentTest.php b/repo/tests/phpunit/includes/content/EntityContentTest.php index 4837006..60e424c 100644 --- a/repo/tests/phpunit/includes/content/EntityContentTest.php +++ b/repo/tests/phpunit/includes/content/EntityContentTest.php @@ -9,8 +9,8 @@ use PHPUnit_Framework_Assert; use RequestContext; use Title; +use Wikibase\DataModel\Entity\Diff\EntityDiff; use Wikibase\DataModel\Entity\Entity; -use Wikibase\DataModel\Entity\EntityDiff; use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Term\Term; use Wikibase\EntityContent; diff --git a/repo/tests/phpunit/includes/content/ItemContentTest.php
[MediaWiki-commits] [Gerrit] Prerender thumbnails at upload time on all wikis except commons - change (operations/mediawiki-config)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/164336 Change subject: Prerender thumbnails at upload time on all wikis except commons .. Prerender thumbnails at upload time on all wikis except commons Change-Id: I57ee8e676202977322562189d701e799ef222810 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/301 --- M wmf-config/InitialiseSettings.php 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/36/164336/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 9e88cdb..657fc8f 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14042,6 +14042,24 @@ 'labswiki' = false, ), +// Thumbnail prerendering at upload time +'wgUploadThumbnailRenderMap' = array( + 'default' = array( 320, 640, 800, 1024, 1280, 1920, 2560, 2880 ), + 'commonswiki' = array(), +), + +'wgUploadThumbnailRenderMethod' = array( + 'default' = 'http', +), + +'wgUploadThumbnailRenderHttpCustomHost' = array( + 'default' = 'upload.wikimedia.org', +), + +'wgUploadThumbnailRenderHttpCustomDomain' = array( + 'default' = 'upload.svc.eqiad.wmnet', +), + ); -- To view, visit https://gerrit.wikimedia.org/r/164336 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I57ee8e676202977322562189d701e799ef222810 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tool Labs: fix mail to bind to LDAP and not use -x - change (operations/puppet)
coren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164337
Change subject: Tool Labs: fix mail to bind to LDAP and not use -x
..
Tool Labs: fix mail to bind to LDAP and not use -x
Those lookups used to work with anonymous binds, but they no
longer do since the LDAP migration. This fixes the script to
use the credentials in /etc/ldap.conf
Change-Id: Ie584fe25197acef2226751149c2a1c552ec771c2
---
M modules/toollabs/files/localuser
M modules/toollabs/files/maintainers
2 files changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/164337/1
diff --git a/modules/toollabs/files/localuser b/modules/toollabs/files/localuser
index 1a8ba28..9805b94 100755
--- a/modules/toollabs/files/localuser
+++ b/modules/toollabs/files/localuser
@@ -5,8 +5,10 @@
# from: toollabs::mailrelay
#
+BIND=-D $(sed -ne '/^binddn\s/{;s/.*\s\(.*\)/\1/;p;}' /etc/ldap.conf)
+BIND=$BIND -w $(sed -ne '/^bindpw\s/{;s/.*\s\(.*\)/\1/;p;}' /etc/ldap.conf)
echo $(
- /usr/bin/ldapsearch -LLL -x -b uid=$1,ou=people,dc=wikimedia,dc=org mail |
+ /usr/bin/ldapsearch -LLL $BIND -b uid=$1,ou=people,dc=wikimedia,dc=org
mail |
/bin/sed -ne '/^mail: \(.*\)/{;s//\1,/;p;}'
) | sed -e 's/,\s*$//'
diff --git a/modules/toollabs/files/maintainers
b/modules/toollabs/files/maintainers
index 2847104..97e4a97 100755
--- a/modules/toollabs/files/maintainers
+++ b/modules/toollabs/files/maintainers
@@ -11,10 +11,13 @@
# be replaced by a proper recursive query with protections against
# circular loops, etc.
+
+BIND=-D $(sed -ne '/^binddn\s/{;s/.*\s\(.*\)/\1/;p;}' /etc/ldap.conf)
+BIND=$BIND -w $(sed -ne '/^bindpw\s/{;s/.*\s\(.*\)/\1/;p;}' /etc/ldap.conf)
echo $(
- (/usr/bin/ldapsearch -LLL -x -b cn=$1,ou=servicegroups,dc=wikimedia,dc=org
member|grep member:|grep -v '^member: uid=\(local-\|tools\.\)'|while read x dn
+ (/usr/bin/ldapsearch -LLL $BIND -b
cn=$1,ou=servicegroups,dc=wikimedia,dc=org member|grep member:|grep -v
'^member: uid=\(local-\|tools\.\)'|while read x dn
do
-/usr/bin/ldapsearch -LLL -x -b $dn mail
+/usr/bin/ldapsearch -LLL $BIND -b $dn mail
done) |
/bin/sed -ne '/^mail: \(.*\)/{;s//\1,/;p;}'
) | sed -e 's/,\s*$//'
--
To view, visit https://gerrit.wikimedia.org/r/164337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie584fe25197acef2226751149c2a1c552ec771c2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] syslog-ng: create archive directory - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164338
Change subject: syslog-ng: create archive directory
..
syslog-ng: create archive directory
Change-Id: I95165c7fb5f639eda237d09212e40c3041e5b3e1
RT: #8501
---
M manifests/misc/logging.pp
M templates/syslog-ng/remote-logs.erb
2 files changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/164338/1
diff --git a/manifests/misc/logging.pp b/manifests/misc/logging.pp
index ff67044..09f6502 100644
--- a/manifests/misc/logging.pp
+++ b/manifests/misc/logging.pp
@@ -15,6 +15,8 @@
system::role { 'misc::syslog-server': description = central syslog
server (${config}) }
+$archivepath = $basepath/archive
+
package { 'syslog-ng':
ensure = latest,
}
@@ -47,6 +49,13 @@
group = 'root',
mode= '0755',
}
+file { $archivepath:
+ensure = directory,
+require = Exec['create_syslog_basepath'],
+owner = 'root',
+group = 'root',
+mode= '0755',
+}
}
service { 'syslog-ng':
diff --git a/templates/syslog-ng/remote-logs.erb
b/templates/syslog-ng/remote-logs.erb
index 009d2e4..914d766 100644
--- a/templates/syslog-ng/remote-logs.erb
+++ b/templates/syslog-ng/remote-logs.erb
@@ -6,7 +6,7 @@
%= @basepath %/* {
rotate 7
dateext
- olddir %= @basepath %/archive
+ olddir %= @archivepath %
daily
compress
missingok
--
To view, visit https://gerrit.wikimedia.org/r/164338
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I95165c7fb5f639eda237d09212e40c3041e5b3e1
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] Use Exim's macro facility to define INSTANCEPROJECT and MAIL... - change (operations/puppet)
coren has submitted this change and it was merged.
Change subject: Use Exim's macro facility to define INSTANCEPROJECT and
MAILDOMAIN
..
Use Exim's macro facility to define INSTANCEPROJECT and MAILDOMAIN
Rather than mixing both Exim's and ERB's quoting rules etc, let's
use Exim's macro rules consistently.
Also added comments to better indicate the Exim config sections.
Change-Id: I81191b6f19551aa26e89bf18c491ab48facf2c97
---
M modules/toollabs/templates/exim4.conf.erb
1 file changed, 43 insertions(+), 17 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/templates/exim4.conf.erb
b/modules/toollabs/templates/exim4.conf.erb
index 48123ee..4b7df6f 100644
--- a/modules/toollabs/templates/exim4.conf.erb
+++ b/modules/toollabs/templates/exim4.conf.erb
@@ -4,10 +4,21 @@
# from: toollabs::mailrelay
#
-primary_hostname = relay.%= @maildomain %
-qualify_domain = %= @maildomain %
+##
+# Macros #
+##
-domainlist local_domains = %= @maildomain %
+INSTANCEPROJECT=%= @instanceproject %
+MAILDOMAIN=%= @maildomain %
+
+###
+# Main configuration settings #
+###
+
+primary_hostname = relay.MAILDOMAIN
+qualify_domain = MAILDOMAIN
+
+domainlist local_domains = MAILDOMAIN
hostlist relay_from_hosts = 10.0.0.0/8
acl_smtp_rcpt = acl_check_rcpt
@@ -20,6 +31,10 @@
timeout_frozen_after = 7d
local_from_suffix = .*
+
+###
+# Access Control Lists (ACLs) #
+###
begin acl
@@ -53,6 +68,9 @@
acl_check_data:
accept
+###
+# Routers #
+###
begin routers
@@ -68,16 +86,16 @@
postmaster_mail:
driver = redirect
local_parts = root : postmaster
- data = %= instanceproject %.admin
+ data = INSTANCEPROJECT.admin
# Alias tools.toolname@ to toolname.maintainers@
tool_fallback:
driver = redirect
- local_part_prefix = %= instanceproject %.
+ local_part_prefix = INSTANCEPROJECT.
not_local_part_prefix_optional
caseful_local_part
- local_parts = passwd;%= instanceproject %.$local_part
+ local_parts = passwd;INSTANCEPROJECT.$local_part
check_ancestor
modemask = 002
data = $local_part.maintainers
@@ -101,9 +119,9 @@
local_part_suffix = .*
local_part_suffix_optional = false
caseful_local_part
- local_parts = passwd;%= instanceproject %.$local_part
- require_files = %= instanceproject
%.$local_part:$home/.forward$local_part_suffix
- router_home_directory = ${lookup passwd{%= instanceproject
%.$local_part}{${extract{5}{:}{$value}}}fail}
+ local_parts = passwd;INSTANCEPROJECT.$local_part
+ require_files = INSTANCEPROJECT.$local_part:$home/.forward$local_part_suffix
+ router_home_directory = ${lookup
passwd{INSTANCEPROJECT.$local_part}{${extract{5}{:}{$value}}}fail}
file = /data/project/$local_part/.forward$local_part_suffix
expn = false
check_ancestor
@@ -125,9 +143,9 @@
local_part_suffix = .*
local_part_suffix_optional = false
caseful_local_part
- local_parts = passwd;%= instanceproject %.$local_part
- require_files = %= instanceproject %.$local_part:$home/.forward
- router_home_directory = ${lookup passwd{%= instanceproject
%.$local_part}{${extract{5}{:}{$value}}}fail}
+ local_parts = passwd;INSTANCEPROJECT.$local_part
+ require_files = INSTANCEPROJECT.$local_part:$home/.forward
+ router_home_directory = ${lookup
passwd{INSTANCEPROJECT.$local_part}{${extract{5}{:}{$value}}}fail}
file = /data/project/$local_part/.forward
expn = false
check_ancestor
@@ -148,12 +166,12 @@
local_part_suffix = .*
local_part_suffix_optional = false
caseful_local_part
- local_parts = passwd;%= instanceproject %.$local_part
- router_home_directory = ${lookup passwd{%= instanceproject
%.$local_part}{${extract{5}{:}{$value}}}fail}
+ local_parts = passwd;INSTANCEPROJECT.$local_part
+ router_home_directory = ${lookup
passwd{INSTANCEPROJECT.$local_part}{${extract{5}{:}{$value}}}fail}
expn = false
check_ancestor
modemask = 002
- data = ${run{/usr/local/sbin/maintainers %= instanceproject
%.$local_part}{$value}fail}
+ data = ${run{/usr/local/sbin/maintainers
INSTANCEPROJECT.$local_part}{$value}fail}
system_aliases:
driver = redirect
@@ -161,14 +179,18 @@
allow_defer
data = ${lookup{$local_part}lsearch{/etc/aliases}}
+##
+# Transports #
+##
+
begin transports
gridqueue:
driver = pipe
batch_max = 1
umask = 007
- user = %= instanceproject %.$local_part
- group = %= instanceproject %.$local_part
+ user = INSTANCEPROJECT.$local_part
+ group = INSTANCEPROJECT.$local_part
path = /bin:/usr/bin:/usr/local/bin
allow_commands = jmail
return_fail_output
@@ -177,6 +199,10 @@
remote_smtp:
driver = smtp
+###
+# Retry rules #
+###
+
begin retry
* * F,2h,15m; G,16h,1h,1.5; F,4d,6h
[MediaWiki-commits] [Gerrit] Use local_parts router option instead of a condition - change (operations/puppet)
coren has submitted this change and it was merged.
Change subject: Use local_parts router option instead of a condition
..
Use local_parts router option instead of a condition
Change-Id: Id7145b25d4c9d8388482113f1c9956670a2e0d15
---
M modules/toollabs/templates/exim4.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/templates/exim4.conf.erb
b/modules/toollabs/templates/exim4.conf.erb
index 9b72aa0..48123ee 100644
--- a/modules/toollabs/templates/exim4.conf.erb
+++ b/modules/toollabs/templates/exim4.conf.erb
@@ -67,7 +67,7 @@
postmaster_mail:
driver = redirect
- condition = ${if forany{root:postmaster}{eq{$item}{$local_part}}}
+ local_parts = root : postmaster
data = %= instanceproject %.admin
# Alias tools.toolname@ to toolname.maintainers@
--
To view, visit https://gerrit.wikimedia.org/r/164323
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id7145b25d4c9d8388482113f1c9956670a2e0d15
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add comments to explain the routers' functions - change (operations/puppet)
coren has submitted this change and it was merged.
Change subject: Add comments to explain the routers' functions
..
Add comments to explain the routers' functions
Change-Id: Iaf628a6f321c3a02841b275b2f7b5002303268f7
---
M modules/toollabs/templates/exim4.conf.erb
1 file changed, 14 insertions(+), 0 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/templates/exim4.conf.erb
b/modules/toollabs/templates/exim4.conf.erb
index 7a82491..2257361 100644
--- a/modules/toollabs/templates/exim4.conf.erb
+++ b/modules/toollabs/templates/exim4.conf.erb
@@ -63,10 +63,14 @@
ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
no_more
+# Send mail to root@ or postmaster@ to the Labs project admin
+
postmaster_mail:
driver = redirect
condition = ${if forany{root:postmaster}{eq{$item}{$local_part}}}
data = %= instanceproject %.admin
+
+# Alias tools.toolname@ to toolname.maintainers@
tool_fallback:
driver = redirect
@@ -78,6 +82,8 @@
modemask = 002
data = $local_part.maintainers
+# Forward mail to user@ to the mail address set in LDAP (wikitech preference)
+
user_forward:
driver = redirect
caseful_local_part
@@ -86,6 +92,9 @@
check_ancestor
modemask = 002
data = ${run{/usr/local/sbin/localuser $local_part}{$value}fail}
+
+# Forward mail to toolname.anything@ using a specific .forward.anything
file
+# if present in the tool's home directory
tool_forward_specific:
driver = redirect
@@ -108,6 +117,9 @@
forbid_smtp_code
hide_child_in_errmsg
+# Forward mail to toolname.anything@ using the plain .forward file if
+# .forward.anything doesn't exist
+
tool_forward_general:
driver = redirect
local_part_suffix = .*
@@ -129,6 +141,8 @@
forbid_smtp_code
hide_child_in_errmsg
+# Forward mail to toolname.anything to the tool's maintainers if no
.forward file exists
+
tool_default:
driver = redirect
local_part_suffix = .*
--
To view, visit https://gerrit.wikimedia.org/r/164321
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf628a6f321c3a02841b275b2f7b5002303268f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Indent ACLs - change (operations/puppet)
coren has submitted this change and it was merged. Change subject: Indent ACLs .. Indent ACLs Change-Id: I9d2968ef39ee62d5ba6db0fe73e8f88e480b705f --- M modules/toollabs/templates/exim4.conf.erb 1 file changed, 18 insertions(+), 18 deletions(-) Approvals: coren: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/toollabs/templates/exim4.conf.erb b/modules/toollabs/templates/exim4.conf.erb index 1a3d008..7a82491 100644 --- a/modules/toollabs/templates/exim4.conf.erb +++ b/modules/toollabs/templates/exim4.conf.erb @@ -24,34 +24,34 @@ begin acl acl_check_rcpt: -accept hosts = : -denymessage = Restricted characters in address -domains = +local_domains -local_parts = ^[.] : ^.*[@%!/|] + accept hosts = : + denymessage = Restricted characters in address + domains = +local_domains + local_parts = ^[.] : ^.*[@%!/|] -denymessage = Restricted characters in address -domains = !+local_domains -local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ + denymessage = Restricted characters in address + domains = !+local_domains + local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ -accept local_parts = postmaster -domains = +local_domains + accept local_parts = postmaster + domains = +local_domains -accept hosts = +relay_from_hosts -control = submission + accept hosts = +relay_from_hosts + control = submission -accept authenticated = * -control = submission + accept authenticated = * + control = submission -require message = relay not permitted -domains = +local_domains + require message = relay not permitted + domains = +local_domains -require verify = recipient + require verify = recipient -accept + accept acl_check_data: -accept + accept begin routers -- To view, visit https://gerrit.wikimedia.org/r/164320 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d2968ef39ee62d5ba6db0fe73e8f88e480b705f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mark Bergsma m...@wikimedia.org Gerrit-Reviewer: coren mpellet...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Formatting of some options for improved readability - change (operations/puppet)
coren has submitted this change and it was merged.
Change subject: Formatting of some options for improved readability
..
Formatting of some options for improved readability
Change-Id: I4f6771c05ebb2386b0e1e8fdb1e64b072749670e
---
M modules/toollabs/templates/exim4.conf.erb
1 file changed, 11 insertions(+), 11 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/templates/exim4.conf.erb
b/modules/toollabs/templates/exim4.conf.erb
index 2257361..9b72aa0 100644
--- a/modules/toollabs/templates/exim4.conf.erb
+++ b/modules/toollabs/templates/exim4.conf.erb
@@ -88,7 +88,7 @@
driver = redirect
caseful_local_part
check_local_user
- no_expn
+ expn = false
check_ancestor
modemask = 002
data = ${run{/usr/local/sbin/localuser $local_part}{$value}fail}
@@ -99,18 +99,18 @@
tool_forward_specific:
driver = redirect
local_part_suffix = .*
- not_local_part_suffix_optional
+ local_part_suffix_optional = false
caseful_local_part
local_parts = passwd;%= instanceproject %.$local_part
require_files = %= instanceproject
%.$local_part:$home/.forward$local_part_suffix
router_home_directory = ${lookup passwd{%= instanceproject
%.$local_part}{${extract{5}{:}{$value}}}fail}
file = /data/project/$local_part/.forward$local_part_suffix
- no_expn
+ expn = false
check_ancestor
modemask = 002
pipe_transport = gridqueue
- no_allow_filter
- no_allow_defer
+ allow_filter = false
+ allow_defer = false
allow_fail
forbid_include
forbid_file
@@ -123,18 +123,18 @@
tool_forward_general:
driver = redirect
local_part_suffix = .*
- not_local_part_suffix_optional
+ local_part_suffix_optional = false
caseful_local_part
local_parts = passwd;%= instanceproject %.$local_part
require_files = %= instanceproject %.$local_part:$home/.forward
router_home_directory = ${lookup passwd{%= instanceproject
%.$local_part}{${extract{5}{:}{$value}}}fail}
file = /data/project/$local_part/.forward
- no_expn
+ expn = false
check_ancestor
modemask = 002
pipe_transport = gridqueue
- no_allow_filter
- no_allow_defer
+ allow_filter = false
+ allow_defer = false
allow_fail
forbid_include
forbid_file
@@ -146,11 +146,11 @@
tool_default:
driver = redirect
local_part_suffix = .*
- not_local_part_suffix_optional
+ local_part_suffix_optional = false
caseful_local_part
local_parts = passwd;%= instanceproject %.$local_part
router_home_directory = ${lookup passwd{%= instanceproject
%.$local_part}{${extract{5}{:}{$value}}}fail}
- no_expn
+ expn = false
check_ancestor
modemask = 002
data = ${run{/usr/local/sbin/maintainers %= instanceproject
%.$local_part}{$value}fail}
--
To view, visit https://gerrit.wikimedia.org/r/164322
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f6771c05ebb2386b0e1e8fdb1e64b072749670e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tool Labs: fix mail to bind to LDAP and not use -x - change (operations/puppet)
coren has submitted this change and it was merged.
Change subject: Tool Labs: fix mail to bind to LDAP and not use -x
..
Tool Labs: fix mail to bind to LDAP and not use -x
Those lookups used to work with anonymous binds, but they no
longer do since the LDAP migration. This fixes the script to
use the credentials in /etc/ldap.conf
Change-Id: Ie584fe25197acef2226751149c2a1c552ec771c2
---
M modules/toollabs/files/localuser
M modules/toollabs/files/maintainers
2 files changed, 8 insertions(+), 3 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/files/localuser b/modules/toollabs/files/localuser
index 1a8ba28..9805b94 100755
--- a/modules/toollabs/files/localuser
+++ b/modules/toollabs/files/localuser
@@ -5,8 +5,10 @@
# from: toollabs::mailrelay
#
+BIND=-D $(sed -ne '/^binddn\s/{;s/.*\s\(.*\)/\1/;p;}' /etc/ldap.conf)
+BIND=$BIND -w $(sed -ne '/^bindpw\s/{;s/.*\s\(.*\)/\1/;p;}' /etc/ldap.conf)
echo $(
- /usr/bin/ldapsearch -LLL -x -b uid=$1,ou=people,dc=wikimedia,dc=org mail |
+ /usr/bin/ldapsearch -LLL $BIND -b uid=$1,ou=people,dc=wikimedia,dc=org
mail |
/bin/sed -ne '/^mail: \(.*\)/{;s//\1,/;p;}'
) | sed -e 's/,\s*$//'
diff --git a/modules/toollabs/files/maintainers
b/modules/toollabs/files/maintainers
index 2847104..97e4a97 100755
--- a/modules/toollabs/files/maintainers
+++ b/modules/toollabs/files/maintainers
@@ -11,10 +11,13 @@
# be replaced by a proper recursive query with protections against
# circular loops, etc.
+
+BIND=-D $(sed -ne '/^binddn\s/{;s/.*\s\(.*\)/\1/;p;}' /etc/ldap.conf)
+BIND=$BIND -w $(sed -ne '/^bindpw\s/{;s/.*\s\(.*\)/\1/;p;}' /etc/ldap.conf)
echo $(
- (/usr/bin/ldapsearch -LLL -x -b cn=$1,ou=servicegroups,dc=wikimedia,dc=org
member|grep member:|grep -v '^member: uid=\(local-\|tools\.\)'|while read x dn
+ (/usr/bin/ldapsearch -LLL $BIND -b
cn=$1,ou=servicegroups,dc=wikimedia,dc=org member|grep member:|grep -v
'^member: uid=\(local-\|tools\.\)'|while read x dn
do
-/usr/bin/ldapsearch -LLL -x -b $dn mail
+/usr/bin/ldapsearch -LLL $BIND -b $dn mail
done) |
/bin/sed -ne '/^mail: \(.*\)/{;s//\1,/;p;}'
) | sed -e 's/,\s*$//'
--
To view, visit https://gerrit.wikimedia.org/r/164337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie584fe25197acef2226751149c2a1c552ec771c2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren mpellet...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix entity type check in jquery.wikibase.entityview - change (mediawiki...Wikibase)
Aude has submitted this change and it was merged.
Change subject: Fix entity type check in jquery.wikibase.entityview
..
Fix entity type check in jquery.wikibase.entityview
Change-Id: Ic1ce9c08959a1e4468d052c216f6aa2e53650785
(cherry picked from commit 75f7d734dd250014bb8e2e22ba03bea20699e030)
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Aude: Verified; Looks good to me, approved
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index 962abfb..f323c34 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -100,7 +100,7 @@
this._initFingerprints();
// TODO: Have an itemview and propertyview instead of ugly hack
here.
- if ( this.options.value.getDataType() === 'wikibase-item' ) {
+ if ( this.options.value.getType() === 'item' ) {
this._initClaims();
this._initSiteLinks();
}
--
To view, visit https://gerrit.wikimedia.org/r/164334
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1ce9c08959a1e4468d052c216f6aa2e53650785
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't use EntityDiff and ItemDiff class aliases - change (mediawiki...Wikibase)
Aude has submitted this change and it was merged. Change subject: Don't use EntityDiff and ItemDiff class aliases .. Don't use EntityDiff and ItemDiff class aliases Change-Id: Iec0e975d7fb960b62768ca032e9a80914e3d80e7 (cherry picked from commit 28d4e0f925d671d5a78bbad50baa6c9be027f6fd) --- M client/tests/phpunit/includes/ChangeHandlerTest.php M lib/tests/phpunit/ChangesTableTest.php M lib/tests/phpunit/changes/ItemChangeTest.php M repo/includes/content/EntityContentDiff.php M repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php M repo/tests/phpunit/includes/content/EntityContentDiffTest.php M repo/tests/phpunit/includes/content/EntityContentTest.php M repo/tests/phpunit/includes/content/ItemContentTest.php 8 files changed, 8 insertions(+), 8 deletions(-) Approvals: Aude: Verified; Looks good to me, approved diff --git a/client/tests/phpunit/includes/ChangeHandlerTest.php b/client/tests/phpunit/includes/ChangeHandlerTest.php index 0c5a6eb..cc3e15d 100644 --- a/client/tests/phpunit/includes/ChangeHandlerTest.php +++ b/client/tests/phpunit/includes/ChangeHandlerTest.php @@ -8,8 +8,8 @@ use Wikibase\Change; use Wikibase\ChangeHandler; use Wikibase\Client\WikibaseClient; +use Wikibase\DataModel\Entity\Diff\EntityDiff; use Wikibase\DataModel\Entity\Entity; -use Wikibase\DataModel\Entity\EntityDiff; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\SiteLink; diff --git a/lib/tests/phpunit/ChangesTableTest.php b/lib/tests/phpunit/ChangesTableTest.php index c21df53..2795c11 100644 --- a/lib/tests/phpunit/ChangesTableTest.php +++ b/lib/tests/phpunit/ChangesTableTest.php @@ -7,7 +7,7 @@ use Diff\DiffOp\DiffOpChange; use Wikibase\ChangesTable; use Wikibase\DataModel\Claim\Claim; -use Wikibase\DataModel\Entity\ItemDiff; +use Wikibase\DataModel\Entity\Diff\ItemDiff; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\Snak\PropertyNoValueSnak; diff --git a/lib/tests/phpunit/changes/ItemChangeTest.php b/lib/tests/phpunit/changes/ItemChangeTest.php index 05a6c72..24d6c63 100644 --- a/lib/tests/phpunit/changes/ItemChangeTest.php +++ b/lib/tests/phpunit/changes/ItemChangeTest.php @@ -5,9 +5,9 @@ use Diff\DiffOp\Diff\Diff; use Diff\DiffOp\DiffOpChange; use Exception; +use Wikibase\DataModel\Entity\Diff\ItemDiff; use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\Item; -use Wikibase\DataModel\Entity\ItemDiff; use Wikibase\EntityChange; use Wikibase\ItemChange; diff --git a/repo/includes/content/EntityContentDiff.php b/repo/includes/content/EntityContentDiff.php index 771eb2a..07e9404 100644 --- a/repo/includes/content/EntityContentDiff.php +++ b/repo/includes/content/EntityContentDiff.php @@ -3,7 +3,7 @@ namespace Wikibase\Repo\Content; use Diff\DiffOp\Diff\Diff; -use Wikibase\DataModel\Entity\EntityDiff; +use Wikibase\DataModel\Entity\Diff\EntityDiff; /** * Represents a diff between two Wikibase\EntityContent instances. diff --git a/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php b/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php index 3a3492a..220b7f2 100644 --- a/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php +++ b/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php @@ -8,7 +8,7 @@ use IContextSource; use Language; use Site; -use Wikibase\DataModel\Entity\EntityDiff; +use Wikibase\DataModel\Entity\Diff\EntityDiff; use Wikibase\Repo\Content\EntityContentDiff; use Wikibase\Repo\Diff\ClaimDiffer; use Wikibase\Repo\Diff\ClaimDifferenceVisualizer; diff --git a/repo/tests/phpunit/includes/content/EntityContentDiffTest.php b/repo/tests/phpunit/includes/content/EntityContentDiffTest.php index dce7dc1..1e71c14 100644 --- a/repo/tests/phpunit/includes/content/EntityContentDiffTest.php +++ b/repo/tests/phpunit/includes/content/EntityContentDiffTest.php @@ -5,7 +5,7 @@ use Diff\DiffOp\Diff\Diff; use Diff\DiffOp\DiffOpAdd; use Diff\DiffOp\DiffOpRemove; -use Wikibase\DataModel\Entity\EntityDiff; +use Wikibase\DataModel\Entity\Diff\EntityDiff; use Wikibase\Repo\Content\EntityContentDiff; /** diff --git a/repo/tests/phpunit/includes/content/EntityContentTest.php b/repo/tests/phpunit/includes/content/EntityContentTest.php index 4837006..60e424c 100644 --- a/repo/tests/phpunit/includes/content/EntityContentTest.php +++ b/repo/tests/phpunit/includes/content/EntityContentTest.php @@ -9,8 +9,8 @@ use PHPUnit_Framework_Assert; use RequestContext; use Title; +use Wikibase\DataModel\Entity\Diff\EntityDiff; use Wikibase\DataModel\Entity\Entity; -use Wikibase\DataModel\Entity\EntityDiff; use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Term\Term; use Wikibase\EntityContent; diff --git a/repo/tests/phpunit/includes/content/ItemContentTest.php b/repo/tests/phpunit/includes/content/ItemContentTest.php index fd45b72..a5925b5 100644 ---
