[MediaWiki-commits] [Gerrit] Fix: Placeholder height wrong for figures in Firefox - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154016
Change subject: Fix: Placeholder height wrong for figures in Firefox
..
Fix: Placeholder height wrong for figures in Firefox
Firefox specific fix for section height calculation for figures
due to an upstream bug.
Bug: 68498
Change-Id: I3d9c57f8fea58bb83028bdf4e013597c328a2cd9
---
M modules/translation/ext.cx.translation.aligner.js
1 file changed, 13 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/16/154016/1
diff --git a/modules/translation/ext.cx.translation.aligner.js
b/modules/translation/ext.cx.translation.aligner.js
index 072e9b8..17d471f 100644
--- a/modules/translation/ext.cx.translation.aligner.js
+++ b/modules/translation/ext.cx.translation.aligner.js
@@ -35,6 +35,19 @@
clear: $sourceSection.css( 'clear' ),
position: $sourceSection.css( 'position' )
} );
+ // Firefox fix for figure heights. Uses InstallTrigger
for browser detection.
+ // See https://bugzilla.wikimedia.org/68498
+ if ( $sourceSection.prop( 'tagName' ) === 'FIGURE'
+ typeof InstallTrigger !== 'undefined' ) {
+ $section.css( {
+ // add figcaption height also to the
placeholder height since Firefox ignore it
+ // while calculating height of figure.
Set it as height instead of min-height since
+ // firefox does not allow setting
min-height for elements with display: table. Figures
+ // in wikipages has display style
property as table.
+ // See
https://bugzilla.mozilla.org/show_bug.cgi?id=1043294
+ height: $sourceSection.outerHeight() +
$sourceSection.find( 'figcaption' ).outerHeight()
+ } );
+ }
return this;
}
--
To view, visit https://gerrit.wikimedia.org/r/154016
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d9c57f8fea58bb83028bdf4e013597c328a2cd9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@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 the broken layout of CX source selector in Firefox - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix the broken layout of CX source selector in Firefox
..
Fix the broken layout of CX source selector in Firefox
The input fields were aligned incorrectly. Fix it by wrapping them in
divs and apply grid properly
Change-Id: Ib5cf8661fd481af60eb6d0900d891e1dfd81de58
---
M modules/source/ext.cx.source.selector.js
M modules/source/styles/ext.cx.source.selector.less
M modules/tools/ext.cx.tools.mt.js
3 files changed, 44 insertions(+), 12 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/source/ext.cx.source.selector.js
b/modules/source/ext.cx.source.selector.js
index 511c243..ba94286 100644
--- a/modules/source/ext.cx.source.selector.js
+++ b/modules/source/ext.cx.source.selector.js
@@ -127,6 +127,7 @@
var $actions,
$sourceLanguageLabel,
$heading, $targetLanguageLabel,
+ $sourceInputs, $targetInputs,
index;
this.$dialog = $( 'div' )
@@ -178,15 +179,25 @@
.append( this.$translateFromButton );
this.$titleList = $( 'datalist' ).prop( 'id', 'searchresults'
);
+ $sourceInputs = $( 'div' )
+ .addClass( 'cx-sourceselector-dialog__source-inputs' )
+ .append( $sourceLanguageLabel,
+ this.$sourceLanguage,
+ this.$sourceTitleInput
+ );
+ $targetInputs = $( 'div' )
+ .addClass( 'cx-sourceselector-dialog__target-inputs' )
+ .append(
+ $targetLanguageLabel,
+ this.$targetLanguage,
+ this.$targetTitleInput
+ );
+
this.$dialog.append( $heading,
- $sourceLanguageLabel,
- this.$sourceLanguage,
- this.$sourceTitleInput,
- $( 'br' ),
- $targetLanguageLabel,
- this.$targetLanguage,
- this.$targetTitleInput,
- $actions, this.$titleList
+ $sourceInputs,
+ $targetInputs,
+ $actions,
+ this.$titleList
);
$( 'body' ).append( this.$dialog );
diff --git a/modules/source/styles/ext.cx.source.selector.less
b/modules/source/styles/ext.cx.source.selector.less
index 5e16baf..7ae5f48 100644
--- a/modules/source/styles/ext.cx.source.selector.less
+++ b/modules/source/styles/ext.cx.source.selector.less
@@ -1,4 +1,5 @@
@import ../../base/styles/grid/agora-grid;
+@import mediawiki.mixins;
.hidden {
display: none;
@@ -44,27 +45,43 @@
}
}
+.cx-sourceselector-dialog__target-inputs,
+.cx-sourceselector-dialog__source-inputs {
+ .mw-ui-item;
+ .mw-ui-one-whole;
+}
+
.cx-sourceselector-dialog__language-label {
.mw-ui-item;
.mw-ui-one-sixth;
padding: 5px;
- line-height: 1.5em;
font-size: large;
}
.cx-sourceselector-dialog__language {
.mw-ui-item;
.mw-ui-one-third;
- padding: 5px;
- line-height: 1.5em;
+ margin: 5px 0;
font-size: large;
}
.cx-sourceselector-dialog__title {
.mw-ui-item;
.mw-ui-one-half;
- padding: 5px;
+ margin: 5px 0;
font-size: large;
+ -webkit-appearance: none;
+
+ [type=search] {
+ /* @embed */
+ .background-image-svg('../../tools/images/search.svg',
'../../tools/images/search.png');
+ background-repeat: no-repeat;
+ background-position: 5px center;
+ background-size: 20px;
+ padding-left: 30px;
+ }
+
+ border: 1px solid #ccc;
}
.cx-sourceselector-dialog__actions {
diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index dde3b3c..4e96c49 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -190,6 +190,8 @@
MTControlCard.prototype.useSource = function () {
this.updateSection( false );
this.showRestore();
+
+ this.$section.focus();
};
/**
@@ -200,6 +202,8 @@
MTControlCard.prototype.restoreTranslation = function () {
this.updateSection( true );
this.hideRestore();
+
+ this.$section.focus();
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/153570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id:
[MediaWiki-commits] [Gerrit] Remove the unused style for close icon in translation source... - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove the unused style for close icon in translation source
selector
..
Remove the unused style for close icon in translation source selector
Close icon is not present in this dialog
Change-Id: I6138c0ba2a2832fa9a843142f179d56c67d2cb27
---
M modules/source/styles/ext.cx.source.selector.less
1 file changed, 0 insertions(+), 15 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/source/styles/ext.cx.source.selector.less
b/modules/source/styles/ext.cx.source.selector.less
index 7ae5f48..9fa0b43 100644
--- a/modules/source/styles/ext.cx.source.selector.less
+++ b/modules/source/styles/ext.cx.source.selector.less
@@ -28,21 +28,6 @@
font-size: larger;
line-height: 1.5em;
background-color: #fbfbfb;
-
- .icon-close {
- /* @embed */
- background: transparent url('../images/close.png') no-repeat
scroll center center;
- /* @embed */
- background-image: -webkit-linear-gradient(transparent,
transparent), url('../images/close.svg');
- /* @embed */
- background-image: linear-gradient(transparent, transparent),
url('../images/close.svg');
- float: right;
- padding: 15px;
- cursor: pointer;
- position: relative;
- top: -@vertical-margin;
- left: @horizontal-margin;
- }
}
.cx-sourceselector-dialog__target-inputs,
--
To view, visit https://gerrit.wikimedia.org/r/153776
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6138c0ba2a2832fa9a843142f179d56c67d2cb27
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] '#translation' added as magic word in Translate extension - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: '#translation' added as magic word in Translate extension
..
'#translation' added as magic word in Translate extension
One cannot rely on the presence of {{translation}} on the wiki, hence
a parser function has been created to have the same behavior as that of
the template. The function checks for the language code in the page title,
and returns it if it is a valid code. Else, it returns an empty string,
meaning that it is not a translation page.
Bug: 68385
Change-Id: I16bb4fe5294c238aa345e9b33350d64d518748f4
---
A Translate.i18n.magic.php
M Translate.php
M TranslateHooks.php
A tests/parser/translateParserTests.txt
4 files changed, 71 insertions(+), 0 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
Nemo bis: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/Translate.i18n.magic.php b/Translate.i18n.magic.php
new file mode 100644
index 000..8aaa515
--- /dev/null
+++ b/Translate.i18n.magic.php
@@ -0,0 +1,15 @@
+?php
+/**
+ * Internationalisation file for magic words in the Translate extension
+ *
+ * @file
+ * @ingroup Extensions
+ */
+
+$magicWords = array();
+
+/** English (English) */
+$magicWords['en'] = array(
+ 'translation' = array( 0, 'translation' ),
+);
+
diff --git a/Translate.php b/Translate.php
index d4101b4..a394786 100644
--- a/Translate.php
+++ b/Translate.php
@@ -62,6 +62,7 @@
$GLOBALS['wgExtensionMessagesFiles']['TranslateSearch'] =
$dir/TranslateSearch.i18n.php;
$GLOBALS['wgExtensionMessagesFiles']['TranslateSandbox'] =
$dir/TranslateSandbox.i18n.php;
$GLOBALS['wgExtensionMessagesFiles']['TranslateAlias'] =
$dir/Translate.alias.php;
+$GLOBALS['wgExtensionMessagesFiles']['TranslateMagic'] =
$dir/Translate.i18n.magic.php;
// Register initialization code
$GLOBALS['wgExtensionFunctions'][] = 'TranslateHooks::setupTranslate';
@@ -135,6 +136,8 @@
$GLOBALS['wgHooks']['TranslateSupportedLanguages'][] =
'TranslateHooks::translateMessageDocumentationLanguage';
$GLOBALS['wgHooks']['ArticlePrepareTextForEdit'][] =
'TranslateEditAddons::disablePreSaveTransform';
+$GLOBALS['wgHooks']['ParserFirstCallInit'][] =
'TranslateHooks::setupTranslateParserFunction';
+
// Prevent translations creating bogus categories
$GLOBALS['wgHooks']['LinksUpdate'][] = 'TranslateHooks::preventCategorization';
// Fuzzy tags for speed.
@@ -223,6 +226,8 @@
$GLOBALS['wgJobClasses']['TTMServerMessageUpdateJob'] =
'TTMServerMessageUpdateJob';
$GLOBALS['wgJobClasses']['TranslateSandboxEmailJob'] =
'TranslateSandboxEmailJob';
+$GLOBALS['wgParserTestFiles'][] = $dir/tests/parser/translateParserTests.txt;
+
require $dir/Resources.php;
/** @endcond */
diff --git a/TranslateHooks.php b/TranslateHooks.php
index 6d38c85..d27ee59 100644
--- a/TranslateHooks.php
+++ b/TranslateHooks.php
@@ -579,4 +579,21 @@
return true;
}
+
+ public static function setupTranslateParserFunction( $parser ) {
+ $parser-setFunctionHook( 'translation',
'TranslateHooks::translateRenderParserFunction' );
+
+ return true;
+ }
+
+ public static function translateRenderParserFunction( $parser ) {
+ $pageTitle = $parser-getTitle();
+
+ $handle = new MessageHandle( $pageTitle );
+ $code = $handle-getCode();
+ if ( Language::isKnownLanguageTag( $code ) ) {
+ return '/' . $code;
+ }
+ return '';
+ }
}
diff --git a/tests/parser/translateParserTests.txt
b/tests/parser/translateParserTests.txt
new file mode 100644
index 000..db49410
--- /dev/null
+++ b/tests/parser/translateParserTests.txt
@@ -0,0 +1,34 @@
+!! functionhooks
+translation
+!! endfunctionhooks
+
+!! test
+#translation as magic word for valid language code
+!! options
+title=[[Test/mr]]
+!! input
+{{#translation:}}
+!!result
+p/mr
+/p
+!! end
+
+!! test
+#translation as magic word for source page
+!! options
+title=[[Test]]
+!! input
+{{#translation:}}
+!!result
+
+!! end
+
+!! test
+#translation as magic word for invalid language code
+!! options
+title=[[Test/ugaaa]]
+!! input
+{{#translation:}}
+!!result
+
+!! end
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/148759
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16bb4fe5294c238aa345e9b33350d64d518748f4
Gerrit-PatchSet: 17
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: BPositive pr4tiklah...@gmail.com
Gerrit-Reviewer: BPositive pr4tiklah...@gmail.com
Gerrit-Reviewer: IAlex coderev...@emsenhuber.ch
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Shirayuki shirayuk...@gmail.com
Gerrit-Reviewer: jenkins-bot
[MediaWiki-commits] [Gerrit] Remove page.QueryPage - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Remove page.QueryPage .. Remove page.QueryPage QueryPage is not implemented in Wikibase yet, there are no uses of a stub class in pywikibot, and there is no novel code in this stub that warrants keeping while we wait for the functionality to exist in the Wikibase software. Change-Id: I9bcdb022c7e7e4db2d24327a29531e417c16ce76 --- M pywikibot/page.py 1 file changed, 0 insertions(+), 16 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index d35de4f..5d5114a 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -3149,22 +3149,6 @@ return Claim(self.site, self.getID(), *args, **kwargs) -class QueryPage(WikibasePage): - - -A Wikibase Query entity. - -For future usage, not implemented yet. - - -def __init__(self, site, title): -Constructor. -WikibasePage.__init__(self, site, title, ns=122) -self.id = self.title(withNamespace=False).upper() -if not self.id.startswith(u'U'): -raise ValueError(u'%s' is not a query page! % self.title()) - - class Claim(Property): -- To view, visit https://gerrit.wikimedia.org/r/154014 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9bcdb022c7e7e4db2d24327a29531e417c16ce76 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: Xqt i...@gno.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] Update Pywikipedia to Pywikibot and fix (C) lines - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Update Pywikipedia to Pywikibot and fix (C) lines
..
Update Pywikipedia to Pywikibot and fix (C) lines
- Replace pywikibot with Pywikibot where possible.
- Standardise content and layout of copyright info at the top of files.
- Update year of last substantive code change on touched files.
- Revise the intro prose of externals/README
Change-Id: I8822e3f978f5113df778d835030f372d3c98e68e
---
M CREDITS
M README.rst
M externals/README
M generate_family_file.py
M generate_user_files.py
M pywikibot/botirc.py
M pywikibot/comms/__init__.py
M pywikibot/date.py
M pywikibot/editor.py
M pywikibot/families/__init__.py
M pywikibot/pagegenerators.py
M pywikibot/userinterfaces/__init__.py
M pywikibot/userinterfaces/terminal_interface_win32.py
M scripts/blockpageschecker.py
M scripts/capitalize_redirects.py
M scripts/checkimages.py
M scripts/coordinate_import.py
M scripts/delete.py
M scripts/disambredir.py
M scripts/editarticle.py
M scripts/fixing_redirects.py
M scripts/illustrate_wikidata.py
M scripts/imagerecat.py
M scripts/imageuncat.py
M scripts/maintenance/make_i18n_dict.py
M scripts/makecat.py
M scripts/protect.py
M scripts/reflinks.py
M scripts/replace.py
M scripts/replicate_wiki.py
M scripts/spamremove.py
M scripts/template.py
M scripts/templatecount.py
M scripts/transferbot.py
M scripts/version.py
M scripts/welcome.py
M tests/__init__.py
M tests/api_tests.py
M tests/i18n_tests.py
M tests/pwb_tests.py
M tests/weblib_tests.py
M tests/wikidataquery_tests.py
42 files changed, 56 insertions(+), 52 deletions(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CREDITS b/CREDITS
index a87d3e5..5807c00 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,4 +1,4 @@
-pywikibot is an open-source project that cannot exist without your
+Pywikibot is an open-source project that cannot exist without your
contributions. We would therefore like to thank everyone who has
contributed:
diff --git a/README.rst b/README.rst
index e340093..131da86 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
Pywikibot Framework
===
-The pywikibot framework is a Python library that interfaces with the
+The Pywikibot framework is a Python library that interfaces with the
`MediaWiki API
https://www.mediawiki.org/wiki/Special:MyLanguage/API:Main_page`_. Also
included are
various general function scripts that can be adapted for different
tasks.
diff --git a/externals/README b/externals/README
index 52cb293..2195f75 100644
--- a/externals/README
+++ b/externals/README
@@ -1,4 +1,4 @@
-This package is only necessary to run pywikibot from a fully self-sufficient
+This package is only necessary to run Pywikibot from a fully self-sufficient
(no other dependencies other than python 2.6+) directory.
This is especially useful on Windows.
diff --git a/generate_family_file.py b/generate_family_file.py
index fd5aa0d..5a8f6e5 100644
--- a/generate_family_file.py
+++ b/generate_family_file.py
@@ -8,7 +8,7 @@
print_function, unicode_literals)
#
# (C) Merlijn van Deen, 2010-2013
-# (C) Pywikibot team, 2010-2013
+# (C) Pywikibot team, 2010-2014
#
# Distributed under the terms of the MIT license
#
@@ -39,7 +39,8 @@
def urlopen(url):
req = urllib2.Request(
url,
-headers={'User-agent': 'Pywikibot Family File Generator 2.0 -
https://www.mediawiki.org/wiki/pywikibot'})
+headers={'User-agent': 'Pywikibot Family File Generator 2.0'
+ ' - https://www.mediawiki.org/wiki/Pywikibot'})
uo = urllib2.urlopen(req)
try:
if sys.version_info[0] == 2:
diff --git a/generate_user_files.py b/generate_user_files.py
index 328ba53..9cf7aeb 100644
--- a/generate_user_files.py
+++ b/generate_user_files.py
@@ -333,7 +333,7 @@
if os.path.exists(os.path.join(base_dir, user-config.py)):
break
do_copy = raw_input(Do you want to copy user files from an existing
-pywikibot installation? ).upper().strip()
+Pywikibot installation? ).upper().strip()
if do_copy and YES.startswith(do_copy):
oldpath = raw_input(Path to existing wikipedia.py? )
if not os.path.exists(oldpath):
diff --git a/pywikibot/botirc.py b/pywikibot/botirc.py
index f2138d3..6ec058e 100644
--- a/pywikibot/botirc.py
+++ b/pywikibot/botirc.py
@@ -6,7 +6,7 @@
http://python-irclib.sourceforge.net/
#
-# (C) Balasyum
+# (C) Balasyum, 2008
# (C) Pywikibot team, 2008-2014
#
# Distributed under the terms of the MIT license.
diff --git a/pywikibot/comms/__init__.py b/pywikibot/comms/__init__.py
index 22a940a..df0dcca 100644
--- a/pywikibot/comms/__init__.py
+++ b/pywikibot/comms/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-#
[MediaWiki-commits] [Gerrit] Send email from $wgPasswordSender instead of user's email - change (mediawiki...InviteSignup)
Snail has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154017
Change subject: Send email from $wgPasswordSender instead of user's email
..
Send email from $wgPasswordSender instead of user's email
This is to stop emails going to spam if an SPF record is set.
This is required for the extension to work on wikis hosted by sites with strict
sender domain policies (like Dreamhost).
See:
https://www.mediawiki.org/wiki/Thread:Extension_talk:InviteSignup/Sending_mails_from_users%27_addresses_is_not_a_great_idea
Change-Id: I1d39996697223966a7abbc40713df2aeb9ed3763
Send e-mail from instead of users' e-mails
Change-Id: If495b325c228f7257117c460ff9e107aa0cc7082
---
M SpecialInviteSignup.php
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/InviteSignup
refs/changes/17/154017/1
diff --git a/SpecialInviteSignup.php b/SpecialInviteSignup.php
index 8ff0e9e..82f8050 100644
--- a/SpecialInviteSignup.php
+++ b/SpecialInviteSignup.php
@@ -172,14 +172,16 @@
}
public static function sendInviteEmail( User $inviter, $email, $hash ) {
- $url = Title::newFromText( 'Special:Userlogin/signup'
)-getCanonicalUrl( array( 'invite' = $hash, 'returnto' = 'Special:Dashboard'
) );
+global $wgPasswordSender, $wgPasswordSenderName;
+$emailFrom = new MailAddress( $wgPasswordSender, $wgPasswordSenderName
);
+
+ $url = Title::newFromText( 'Special:Userlogin/signup'
)-getCanonicalUrl( array( 'invite' = $hash, 'returnto' = 'Special:Dashboard'
) );
$subj = wfMessage( 'is-emailsubj' )-inContentLanguage();
$body = wfMessage( 'is-emailbody' )
-params( $inviter-getName(), $url )
-inContentLanguage();
- $emailFrom = new MailAddress( $inviter );
$emailTo = new MailAddress( $email );
$params = array(
'to' = $emailTo,
--
To view, visit https://gerrit.wikimedia.org/r/154017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If495b325c228f7257117c460ff9e107aa0cc7082
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InviteSignup
Gerrit-Branch: master
Gerrit-Owner: Snail sn...@solitarysnail.com
Gerrit-Reviewer: Lewis Cawte le...@lewiscawte.me
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bumping up version of wikimetrics module in vagrant - change (mediawiki/vagrant)
Nuria has uploaded a new change for review. https://gerrit.wikimedia.org/r/154018 Change subject: Bumping up version of wikimetrics module in vagrant .. Bumping up version of wikimetrics module in vagrant Change-Id: Ie398b90f6ba70578c9d452a26b3b51d9783bfc8e --- M puppet/modules/wikimetrics 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/18/154018/1 diff --git a/puppet/modules/wikimetrics b/puppet/modules/wikimetrics index 0e4af73..d0a4350 16 --- a/puppet/modules/wikimetrics +++ b/puppet/modules/wikimetrics -Subproject commit 0e4af7341f28f652466c31fe0ddd028dab5264cb +Subproject commit d0a43502b7e4d0066a39ecd05a85030d2b7624e3 -- To view, visit https://gerrit.wikimedia.org/r/154018 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie398b90f6ba70578c9d452a26b3b51d9783bfc8e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Nuria nu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bumping up version of wikimetrics module - change (operations/puppet)
Nuria has uploaded a new change for review. https://gerrit.wikimedia.org/r/154019 Change subject: Bumping up version of wikimetrics module .. Bumping up version of wikimetrics module Change-Id: I953ea5ee0ae270cdfba46e92955d94c7b83dabb1 --- M modules/wikimetrics 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/19/154019/1 diff --git a/modules/wikimetrics b/modules/wikimetrics index 0e4af73..d0a4350 16 --- a/modules/wikimetrics +++ b/modules/wikimetrics -Subproject commit 0e4af7341f28f652466c31fe0ddd028dab5264cb +Subproject commit d0a43502b7e4d0066a39ecd05a85030d2b7624e3 -- To view, visit https://gerrit.wikimedia.org/r/154019 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I953ea5ee0ae270cdfba46e92955d94c7b83dabb1 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Nuria nu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fall back to language code in wikibase.getLanguageNameByCode() - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154020
Change subject: Fall back to language code in wikibase.getLanguageNameByCode()
..
Fall back to language code in wikibase.getLanguageNameByCode()
wikibase.getLanguageNameByCode() is used to fill messages. If ULS is not loaded,
those messages would contain en empty string.
Change-Id: I156e29d1a1a02e20461146c581608f66cff6d337
---
M lib/resources/wikibase.js
M lib/tests/qunit/wikibase.tests.js
2 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/20/154020/1
diff --git a/lib/resources/wikibase.js b/lib/resources/wikibase.js
index bc59067..0aa73c5 100644
--- a/lib/resources/wikibase.js
+++ b/lib/resources/wikibase.js
@@ -89,7 +89,7 @@
/**
* Returns the name of a language by its language code. If the language
code is unknown or ULS
-* can not provide sufficient language information, then an empty
string will be returned.
+* can not provide sufficient language information, the language code
is returned.
*
* @param {string} langCode
* @return string
@@ -99,7 +99,7 @@
if( language language[2] ) {
return language[2];
}
- return '';
+ return langCode;
};
this._proxyToWbSites = function( fnName ) {
diff --git a/lib/tests/qunit/wikibase.tests.js
b/lib/tests/qunit/wikibase.tests.js
index c4e0d4b..64a54fd 100644
--- a/lib/tests/qunit/wikibase.tests.js
+++ b/lib/tests/qunit/wikibase.tests.js
@@ -39,20 +39,20 @@
assert.strictEqual(
wb.getLanguageNameByCode( 'de' ),
'Deutsch',
- 'getLanguageNameByCode returns language name'
+ 'getLanguageNameByCode() returns language name.'
);
} else {
assert.strictEqual(
wb.getLanguageNameByCode( 'de' ),
- '',
- 'getLanguageNameByCode returns empty string
(ULS not loaded)'
+ 'de',
+ 'getLanguageNameByCode() returns language code
(ULS not loaded).'
);
}
assert.strictEqual(
wb.getLanguageNameByCode( 'nonexistantlanguagecode' ),
- '',
- 'getLanguageNameByCode returns empty string if unknown
code'
+ 'nonexistantlanguagecode',
+ 'getLanguageNameByCode() returns language code if
unknown code.'
);
} );
--
To view, visit https://gerrit.wikimedia.org/r/154020
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I156e29d1a1a02e20461146c581608f66cff6d337
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jobrunner: puppetize HAT runner - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154021
Change subject: jobrunner: puppetize HAT runner
..
jobrunner: puppetize HAT runner
The HAT jobrunner will spawn jobs by polling the fastcgi hhvm daemon via
curl spawned by the jobrunner loop. In detail:
* added a virtual host and the corresponding port definition
* added the apache modules needed
* disabled jit from command-line hhvm config
Change-Id: I3d002968c30827b2e8c0fdf6fc55d8846080a104
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
A modules/hhvm/files/config-cli.hdf
M modules/hhvm/manifests/init.pp
A modules/mediawiki/files/jobrunner.site.conf
M modules/mediawiki/manifests/jobrunner.pp
4 files changed, 50 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/154021/1
diff --git a/modules/hhvm/files/config-cli.hdf
b/modules/hhvm/files/config-cli.hdf
new file mode 100644
index 000..98120f8
--- /dev/null
+++ b/modules/hhvm/files/config-cli.hdf
@@ -0,0 +1,17 @@
+# Configuration for HHVM
+#
+# Note: HDF syntax is deprecated. Use php.ini where possible.
+# The configuration options declared in this file do not have
+# php.ini equivalents yet (Aug 2014).
+#
+# This file is managed by Puppet.
+DynamicExtensions {
+ * = fss.so
+ * = luasandbox.so
+ * = wikidiff2.so
+}
+
+Eval {
+ PerfPidMap = false
+ Jit = false
+}
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 3ffb02f..80583be 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -129,7 +129,7 @@
}
file { '/etc/hhvm/config.hdf':
-source = 'puppet:///modules/hhvm/config.hdf',
+source = 'puppet:///modules/hhvm/config-cli.hdf',
owner = 'root',
group = 'root',
mode= '0444',
diff --git a/modules/mediawiki/files/jobrunner.site.conf
b/modules/mediawiki/files/jobrunner.site.conf
new file mode 100644
index 000..9067940
--- /dev/null
+++ b/modules/mediawiki/files/jobrunner.site.conf
@@ -0,0 +1,12 @@
+# This file is managed by Puppet
+VirtualHost *:9002
+DocumentRoot /usr/local/apache/common
+
+ServerAdmin r...@wikimedia.org
+
+# Pass requests to the HHVM FastCGI server
+ProxyPassMatch ^/(.*\.php(/.*)?)$
fcgi://127.0.0.1:9000/usr/local/apache/common/$1
+
+ErrorLog ${APACHE_LOG_DIR}/jobqueue-fcgi-error.log
+ CustomLog ${APACHE_LOG_DIR}/jobqueue-fcgi-access.log combined
+/VirtualHost
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index fe7dddb..ee1c4bc 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -62,4 +62,24 @@
group = 'root',
mode= '0444',
}
+
+if ubuntu_version('= trusty') {
+include ::apache::mod::proxy_fcgi
+
+# Temporarily disabled, need hhvm repackaging
+#class { 'apache::mpm':
+#mpm = 'worker',
+#}
+
+apache::conf { 'hhvm_jobrunner_port':
+priority = 1,
+content = # This file is managed by Puppet\nListen 9002\n,
+}
+
+apache::site{ 'hhvm_jobrunner':
+priority = 1,
+source = 'puppet:///modules/mediawiki/jobrunner.site.conf',
+}
+}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/154021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d002968c30827b2e8c0fdf6fc55d8846080a104
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] jobrunner: puppetize HAT runner - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: jobrunner: puppetize HAT runner
..
jobrunner: puppetize HAT runner
The HAT jobrunner will spawn jobs by polling the fastcgi hhvm daemon via
curl spawned by the jobrunner loop. In detail:
* added a virtual host and the corresponding port definition
* added the apache modules needed
* disabled jit from command-line hhvm config
Change-Id: I3d002968c30827b2e8c0fdf6fc55d8846080a104
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
A modules/hhvm/files/config-cli.hdf
M modules/hhvm/manifests/init.pp
A modules/mediawiki/files/jobrunner.site.conf
M modules/mediawiki/manifests/jobrunner.pp
4 files changed, 50 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/hhvm/files/config-cli.hdf
b/modules/hhvm/files/config-cli.hdf
new file mode 100644
index 000..98120f8
--- /dev/null
+++ b/modules/hhvm/files/config-cli.hdf
@@ -0,0 +1,17 @@
+# Configuration for HHVM
+#
+# Note: HDF syntax is deprecated. Use php.ini where possible.
+# The configuration options declared in this file do not have
+# php.ini equivalents yet (Aug 2014).
+#
+# This file is managed by Puppet.
+DynamicExtensions {
+ * = fss.so
+ * = luasandbox.so
+ * = wikidiff2.so
+}
+
+Eval {
+ PerfPidMap = false
+ Jit = false
+}
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 3ffb02f..80583be 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -129,7 +129,7 @@
}
file { '/etc/hhvm/config.hdf':
-source = 'puppet:///modules/hhvm/config.hdf',
+source = 'puppet:///modules/hhvm/config-cli.hdf',
owner = 'root',
group = 'root',
mode= '0444',
diff --git a/modules/mediawiki/files/jobrunner.site.conf
b/modules/mediawiki/files/jobrunner.site.conf
new file mode 100644
index 000..9067940
--- /dev/null
+++ b/modules/mediawiki/files/jobrunner.site.conf
@@ -0,0 +1,12 @@
+# This file is managed by Puppet
+VirtualHost *:9002
+DocumentRoot /usr/local/apache/common
+
+ServerAdmin r...@wikimedia.org
+
+# Pass requests to the HHVM FastCGI server
+ProxyPassMatch ^/(.*\.php(/.*)?)$
fcgi://127.0.0.1:9000/usr/local/apache/common/$1
+
+ErrorLog ${APACHE_LOG_DIR}/jobqueue-fcgi-error.log
+ CustomLog ${APACHE_LOG_DIR}/jobqueue-fcgi-access.log combined
+/VirtualHost
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index fe7dddb..ee1c4bc 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -62,4 +62,24 @@
group = 'root',
mode= '0444',
}
+
+if ubuntu_version('= trusty') {
+include ::apache::mod::proxy_fcgi
+
+# Temporarily disabled, need hhvm repackaging
+#class { 'apache::mpm':
+#mpm = 'worker',
+#}
+
+apache::conf { 'hhvm_jobrunner_port':
+priority = 1,
+content = # This file is managed by Puppet\nListen 9002\n,
+}
+
+apache::site{ 'hhvm_jobrunner':
+priority = 1,
+source = 'puppet:///modules/mediawiki/jobrunner.site.conf',
+}
+}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/154021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d002968c30827b2e8c0fdf6fc55d8846080a104
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] use STATIC function PhpTags\Compiler::compile() (v 3.4.2) - change (mediawiki...PhpTags)
Pastakhov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154022
Change subject: use STATIC function PhpTags\Compiler::compile() (v 3.4.2)
..
use STATIC function PhpTags\Compiler::compile() (v 3.4.2)
* move old public function compile() as new private getBytecode()
Change-Id: I7708da7cb6bedec8d41549accafb82507634eea7
---
M PhpTags.body.php
M PhpTags.php
M includes/Compiler.php
A includes/Runtime.hh
M includes/Runtime.php
5 files changed, 771 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PhpTags
refs/changes/22/154022/1
diff --git a/PhpTags.body.php b/PhpTags.body.php
index f05dc21..aac1f48 100644
--- a/PhpTags.body.php
+++ b/PhpTags.body.php
@@ -137,8 +137,7 @@
}
}
- $compiler = new PhpTags\Compiler();
- $bytecode = $compiler-compile( $source, $frameTitleText );
+ $bytecode = \PhpTags\Compiler::compile( $source,
$frameTitleText );
self::$bytecodeCache[$frameID][$md5Source] = $bytecode;
self::$bytecodeNeedsUpdate[$frameID] =
self::$bytecodeCache[$frameID];
diff --git a/PhpTags.php b/PhpTags.php
index be945f7..9ad9228 100644
--- a/PhpTags.php
+++ b/PhpTags.php
@@ -17,7 +17,7 @@
define( 'PHPTAGS_MAJOR_VERSION', 3 );
define( 'PHPTAGS_MINOR_VERSION', 4 );
-define( 'PHPTAGS_RELEASE_VERSION', 1 );
+define( 'PHPTAGS_RELEASE_VERSION', 2 );
define( 'PHPTAGS_VERSION', PHPTAGS_MAJOR_VERSION . '.' . PHPTAGS_MINOR_VERSION
. '.' . PHPTAGS_RELEASE_VERSION );
define( 'PHPTAGS_HOOK_RELEASE', 5 );
diff --git a/includes/Compiler.php b/includes/Compiler.php
index 00bea8d..406ae50 100644
--- a/includes/Compiler.php
+++ b/includes/Compiler.php
@@ -117,6 +117,12 @@
*/
private static $precedencesMatrix=array();
+ /**
+*
+* @var Compiler
+*/
+ private static $instance;
+
private $stack = array();
private $tokens;
private $id;
@@ -147,7 +153,14 @@
$this-stepUP();
}
- public function compile( $source, $place = 'Command line code' ) {
+ public static function compile( $source, $place = 'Command line code' )
{
+ if ( null === self::$instance ) {
+ self::$instance = new self();
+ }
+ return self::$instance-getBytecode( $source, $place );
+ }
+
+ private function getBytecode( $source, $place ) {
$this-place = $place;
$this-setTokensFromSource( $source );
@@ -1567,7 +1580,7 @@
* @return array Hook
* @throws PhpTagsException
*/
- public function stepFunctionFromVariable( $variable, $text, $owner ) {
+ private function stepFunctionFromVariable( $variable, $text, $owner )
{
$hook = array( // define the blank hook
PHPTAGS_STACK_COMMAND = PHPTAGS_T_HOOK,
PHPTAGS_STACK_HOOK_TYPE = false,
diff --git a/includes/Runtime.hh b/includes/Runtime.hh
new file mode 100644
index 000..ccf6cb0
--- /dev/null
+++ b/includes/Runtime.hh
@@ -0,0 +1,753 @@
+?php
+namespace PhpTags;
+
+define( 'PHPTAGS_STACK_RESULT', 'r' );
+define( 'PHPTAGS_STACK_COMMAND', 'c' );
+define( 'PHPTAGS_STACK_PARAM', 'p' );
+define( 'PHPTAGS_STACK_PARAM_2', 's' );
+define( 'PHPTAGS_STACK_PARAM_3', 'o' );
+define( 'PHPTAGS_STACK_INC_AFTER', 'i' );
+define( 'PHPTAGS_STACK_TOKEN_LINE', 'l' );
+define( 'PHPTAGS_STACK_DO_TRUE', 't' );
+define( 'PHPTAGS_STACK_DO_FALSE', 'f' );
+define( 'PHPTAGS_STACK_ARRAY_INDEX', 'a' );
+define( 'PHPTAGS_STACK_DEBUG', '#' );
+define( 'PHPTAGS_STACK_AIM', '*' );
+define( 'PHPTAGS_STACK_HOOK_TYPE', 'h' );
+
+define( 'PHPTAGS_HOOK_GET_CONSTANT', '_' );
+define( 'PHPTAGS_HOOK_FUNCTION', 'f' );
+define( 'PHPTAGS_HOOK_GET_OBJECT_CONSTANT', 'c' );
+define( 'PHPTAGS_HOOK_GET_STATIC_PROPERTY', 'q' );
+define( 'PHPTAGS_HOOK_GET_OBJECT_PROPERTY', 'p' );
+define( 'PHPTAGS_HOOK_SET_STATIC_PROPERTY', 'd' );
+define( 'PHPTAGS_HOOK_SET_OBJECT_PROPERTY', 'b' );
+define( 'PHPTAGS_HOOK_STATIC_METHOD', 's' );
+define( 'PHPTAGS_HOOK_OBJECT_METHOD', 'm' );
+
+define( 'PHPTAGS_OBJECT_DEFINITION', 0 );
+define( 'PHPTAGS_METHOD_CONSTRUCTOR', 1 );
+
+define( 'PHPTAGS_T_LOGICAL_OR', 263 );
+define( 'PHPTAGS_T_LOGICAL_XOR', 264 );
+define( 'PHPTAGS_T_LOGICAL_AND', 265 );
+define( 'PHPTAGS_T_PRINT', 266 );
+define( 'PHPTAGS_T_SR_EQUAL', 268 );
+define( 'PHPTAGS_T_SL_EQUAL', 269 );
+define( 'PHPTAGS_T_XOR_EQUAL', 270 );
+define( 'PHPTAGS_T_OR_EQUAL', 271 );
+define( 'PHPTAGS_T_AND_EQUAL', 272 );
+define( 'PHPTAGS_T_MOD_EQUAL', 273 );
+define( 'PHPTAGS_T_CONCAT_EQUAL', 274 );
+define( 'PHPTAGS_T_DIV_EQUAL', 275 );
+define( 'PHPTAGS_T_MUL_EQUAL', 276 );
+define( 'PHPTAGS_T_MINUS_EQUAL', 277 );
+define( 'PHPTAGS_T_PLUS_EQUAL', 278 );
+define( 'PHPTAGS_T_IS_NOT_IDENTICAL', 281 );
[MediaWiki-commits] [Gerrit] Add Monobook to please 2.5% of users - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Add Monobook to please 2.5% of users .. Add Monobook to please 2.5% of users Change-Id: Ie9fbdeed0042de19ea031b561f344019c935268c --- M TranslatewikiSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php index 5b5b0e4..c4b6860 100644 --- a/TranslatewikiSettings.php +++ b/TranslatewikiSettings.php @@ -148,6 +148,7 @@ // Skins require_once $IP/skins/Vector/Vector.php; +require_once $IP/skins/Monobook/Monobook.php; ### # Search -- To view, visit https://gerrit.wikimedia.org/r/153624 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie9fbdeed0042de19ea031b561f344019c935268c 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] Also update skins - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Also update skins .. Also update skins Change-Id: I9e70769859ebc4a39229d61aa22e90ed51aeb682 --- M bin/wikiupdate 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/bin/wikiupdate b/bin/wikiupdate index c34f597..c89d64e 100755 --- a/bin/wikiupdate +++ b/bin/wikiupdate @@ -7,7 +7,7 @@ CURRENTTIME=`date +%T` echo *** $CURRENTTIME: Updating core and extensions *** -find $WIKI $WIKI/extensions/* -maxdepth 1 -type d -name .git | +find $WIKI $WIKI/extensions/* $WIKI/skins/* -maxdepth 1 -type d -name .git | xargs -n1 dirname | xargs -n1 -P5 $BASEDIR/wikiupdate-repo -- To view, visit https://gerrit.wikimedia.org/r/153623 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9e70769859ebc4a39229d61aa22e90ed51aeb682 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] Make the MTAbuse card sticky - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154023
Change subject: Make the MTAbuse card sticky
..
Make the MTAbuse card sticky
Keep it in tools column till the MT percentage is below threshold.
We were keeping it in tools column, but it was not cooexisting with
other cards. Made it sticky.
Also, change the event trigger for the card. Now it listen for mw.cx.progress
Change-Id: Ic073634f6316e14221544383fad3bab87293f7d7
---
M hooks.md
M modules/tools/ext.cx.tools.manager.js
M modules/tools/ext.cx.tools.mtabuse.js
M modules/translation/ext.cx.translation.progress.js
4 files changed, 30 insertions(+), 19 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/23/154023/1
diff --git a/hooks.md b/hooks.md
index 64b9fe9..722cbfe 100644
--- a/hooks.md
+++ b/hooks.md
@@ -117,7 +117,3 @@
## mw.cx.translation.updated
Fired when the translation section was updated using the MT card, for example
with the 'restore' or 'use source text' actions.
-
-## mw.cx.warning.mtabuse
-
-Fired by the progress calculation module when the MT is beyond a threshold.
The percentage of MT is passed as argument. The MT abuse tool card listens for
this.
diff --git a/modules/tools/ext.cx.tools.manager.js
b/modules/tools/ext.cx.tools.manager.js
index 9e696dc..5c3cea1 100644
--- a/modules/tools/ext.cx.tools.manager.js
+++ b/modules/tools/ext.cx.tools.manager.js
@@ -20,6 +20,9 @@
* 3. stop()- Destroys the DOM of the card. End of the card instance.
*
* The tool needs to fire the event mw.cx.tool.shown once the card is shown.
+ *
+ * Additionally, if the card need to stay in tools till a condition is met,
mark
+ * the sticky property of tool object true. See MTAbuseCard for example.
*/
( function ( $, mw ) {
'use strict';
@@ -155,18 +158,22 @@
* @param {string} currentToolName current tool name
*/
CXToolManager.prototype.hideUnrelatedCards = function ( currentToolName
) {
- var currentToolEvents, toolEvents, toolName;
+ var currentToolEvents, toolEvents, tool, toolName;
if ( this.tools[ currentToolName ] ) {
currentToolEvents = this.tools[ currentToolName
].getTriggerEvents();
}
for ( toolName in this.tools ) {
+ tool = this.tools[ toolName ];
if ( toolName === currentToolName ) {
continue;
}
-
- toolEvents = this.tools[ toolName ].getTriggerEvents();
+ if ( tool.sticky ) {
+ // If the card is sticky, do not hide till it
is done. Example: MTAbuse card.
+ continue;
+ }
+ toolEvents = tool.getTriggerEvents();
if ( intersection( currentToolEvents, toolEvents
).length === 0 ) {
this.hideCard( toolName );
}
diff --git a/modules/tools/ext.cx.tools.mtabuse.js
b/modules/tools/ext.cx.tools.mtabuse.js
index bbd0831..1c2a62d 100644
--- a/modules/tools/ext.cx.tools.mtabuse.js
+++ b/modules/tools/ext.cx.tools.mtabuse.js
@@ -11,7 +11,8 @@
( function ( $, mw ) {
'use strict';
- var template = 'div class=card mtabuse' +
+ var MT_ABUSE_THRRESHOLD = 1,
+ template = 'div class=card mtabuse' +
'h2 class=card__mtabuse-title/h2' +
'div class=card__mtabuse-details/div' +
'div class=card__mtabuse-link/div' +
@@ -19,6 +20,9 @@
function MTAbuseCard() {
this.$card = $( template );
+ this.mtPercentage = 0;
+ // This card need to be sticky till mt is below abuse
threshold.
+ this.sticky = true;
this.render();
}
@@ -32,27 +36,34 @@
href: mw.msg(
'cx-tools-view-guidelines-link' ),
target: '_blank'
} )
- .text( mw.msg( 'cx-tools-view-guidelines' ) )
- );
+ .text( mw.msg( 'cx-tools-view-guidelines' ) ) );
+ this.$card.hide();
};
MTAbuseCard.prototype.onShow = function () {
mw.hook( 'mw.cx.tools.shown' ).fire( true );
};
+ MTAbuseCard.prototype.isAbuse = function () {
+ return this.mtPercentage MT_ABUSE_THRRESHOLD;
+ };
+
MTAbuseCard.prototype.getCard = function () {
return this.$card;
};
- MTAbuseCard.prototype.start = function ( mtPercentage ) {
+ MTAbuseCard.prototype.start = function ( translationPercentage,
mtPercentage ) {
+
[MediaWiki-commits] [Gerrit] use STATIC function PhpTags\Compiler::compile() (v 3.4.2) - change (mediawiki...PhpTags)
jenkins-bot has submitted this change and it was merged.
Change subject: use STATIC function PhpTags\Compiler::compile() (v 3.4.2)
..
use STATIC function PhpTags\Compiler::compile() (v 3.4.2)
* move old public function compile() as new private getBytecode()
Change-Id: I7708da7cb6bedec8d41549accafb82507634eea7
---
M PhpTags.body.php
M PhpTags.php
M includes/Compiler.php
M includes/Runtime.php
4 files changed, 13 insertions(+), 7 deletions(-)
Approvals:
Pastakhov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PhpTags.body.php b/PhpTags.body.php
index f05dc21..aac1f48 100644
--- a/PhpTags.body.php
+++ b/PhpTags.body.php
@@ -137,8 +137,7 @@
}
}
- $compiler = new PhpTags\Compiler();
- $bytecode = $compiler-compile( $source, $frameTitleText );
+ $bytecode = \PhpTags\Compiler::compile( $source,
$frameTitleText );
self::$bytecodeCache[$frameID][$md5Source] = $bytecode;
self::$bytecodeNeedsUpdate[$frameID] =
self::$bytecodeCache[$frameID];
diff --git a/PhpTags.php b/PhpTags.php
index be945f7..9ad9228 100644
--- a/PhpTags.php
+++ b/PhpTags.php
@@ -17,7 +17,7 @@
define( 'PHPTAGS_MAJOR_VERSION', 3 );
define( 'PHPTAGS_MINOR_VERSION', 4 );
-define( 'PHPTAGS_RELEASE_VERSION', 1 );
+define( 'PHPTAGS_RELEASE_VERSION', 2 );
define( 'PHPTAGS_VERSION', PHPTAGS_MAJOR_VERSION . '.' . PHPTAGS_MINOR_VERSION
. '.' . PHPTAGS_RELEASE_VERSION );
define( 'PHPTAGS_HOOK_RELEASE', 5 );
diff --git a/includes/Compiler.php b/includes/Compiler.php
index 00bea8d..14c4cb6 100644
--- a/includes/Compiler.php
+++ b/includes/Compiler.php
@@ -147,7 +147,15 @@
$this-stepUP();
}
- public function compile( $source, $place = 'Command line code' ) {
+ public static function compile( $source, $place = 'Command line code' )
{
+ static $instance = null;
+ if ( null === $instance ) {
+ $instance = new self();
+ }
+ return $instance-getBytecode( $source, $place );
+ }
+
+ private function getBytecode( $source, $place ) {
$this-place = $place;
$this-setTokensFromSource( $source );
@@ -1567,7 +1575,7 @@
* @return array Hook
* @throws PhpTagsException
*/
- public function stepFunctionFromVariable( $variable, $text, $owner ) {
+ private function stepFunctionFromVariable( $variable, $text, $owner )
{
$hook = array( // define the blank hook
PHPTAGS_STACK_COMMAND = PHPTAGS_T_HOOK,
PHPTAGS_STACK_HOOK_TYPE = false,
diff --git a/includes/Runtime.php b/includes/Runtime.php
index ccf6cb0..080 100644
--- a/includes/Runtime.php
+++ b/includes/Runtime.php
@@ -107,8 +107,7 @@
}
public static function runSource($code, array $args = array(), $scope =
'' ) {
- $compiler = new Compiler();
- return self::run( $compiler-compile($code), $args, $scope );
+ return self::run( Compiler::compile($code), $args, $scope );
}
public static function run( $code, array $args, $scope = '' ) {
--
To view, visit https://gerrit.wikimedia.org/r/154022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7708da7cb6bedec8d41549accafb82507634eea7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/PhpTags
Gerrit-Branch: master
Gerrit-Owner: Pastakhov pastak...@yandex.ru
Gerrit-Reviewer: Pastakhov pastak...@yandex.ru
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 jquery.ui Vector theme to 1.9.2 - change (mediawiki...Vector)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/154024 Change subject: Update jquery.ui Vector theme to 1.9.2 .. Update jquery.ui Vector theme to 1.9.2 Follows-up 3cb2ccd87863abb8a99ed7d970730ae9e4138fcc. Various structural changes were made in jQuery UI 1.9, and the Vector theme was not updated to accommodate for those changes. There have also been lots of small improvements to the base theme (which is substituted inside the Vector theme) that were made over the past few releases that weren't backported (such as Ib099282484b for bug 67243). And there were two new modules in jQuery UI 1.9 (menu and spinner) that were lacking Vector theme stylesheets. Source of files ecept from jquery.ui.button.css * http://jqueryui.com/themeroller/#!zThemeParams=5d0100fa05003dd844329a8dfe02723de3e5703cbd43cf96f3a920b558cb446a22b658a4d3176070385d135e78d37aae70bb7da85b905ef37cf73ef19688c641a8b4816a76208b49febeda8b4f3d386a5b7842d83a4b9c295a7f24821180316a22b5661b80a2b39c04329733838511e530a893ce3e2cae5eb72439b9513ef1540c3fa0ef48c80a7f202fac72e1281027c05dab602bce0df44d94864a4bd2122ca35c6c3c08fa7a8e6dd2d73776189074d8abe36b5dbdfc2180aa38779635e9695267f7d92b15ca39c7e10767f4a4f27f6a877530505bac3b36a61c6194ad1b91562929905d99e882480720ac441d34b43229a92ff7c1cda737609dbea7a72315a861e033e91185ad8c181fb56e92f6556be568678eee13cf447a56496f58273ddd9ffcc3280b23253ebcec2082cb73c0e3999ab24aadb15cbb1668796947e63f0c165063f06bc1b3da85260b9a2c60d7aa2cf687bf89893ae3028716287159d67db6415d0759d6ea306e77fc351ee69a97a43b4cbc97076ace00a05ab6b035cda69f3d6ca31098fb8e3a186e85d3c51c5fd04efdef52769fc84fa25d89d383b6f7e09ae80f0dcaa9b181e42069ff782faf8e9a3d0f922fb4b616f2ea5629192b0492fe43df657336a12b7fea98b5922ccc7454270ee68dcd1bae9ba03cdcfff95c0d96 to get the file click download theme and then 1.9.2 is the version of jquery ui you need. for jquery.ui.button.css * https://github.com/jquery/jquery-ui/blob/master/themes/base/button.css It is a newer version of jquery.ui but user MarkTraceur suggested that that file for jquery ui button had fixes that were not included in 1.9.2 and does not cause problem with commons. please see I27accab309da063f4d7965a103951b152e77937d for the suggestions. Change-Id: I2a31e4a3d969a966935a50392deafd756e2b9fca --- M Vector.php A hooks.txt M skinStyles/jquery.ui/images/ui-bg_flat_15_cd0a0a_40x100.png M skinStyles/jquery.ui/images/ui-bg_flat_70_00_40x100.png M skinStyles/jquery.ui/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png M skinStyles/jquery.ui/images/ui-bg_highlight-hard_80_d7ebf9_1x100.png M skinStyles/jquery.ui/images/ui-bg_highlight-soft_100_e4f1fb_1x100.png M skinStyles/jquery.ui/images/ui-bg_highlight-soft_100_ff_1x100.png M skinStyles/jquery.ui/images/ui-bg_highlight-soft_25_ffef8f_1x100.png M skinStyles/jquery.ui/images/ui-bg_inset-hard_100_f0f0f0_1x100.png M skinStyles/jquery.ui/images/ui-icons_2694e8_256x240.png M skinStyles/jquery.ui/images/ui-icons_3d80b3_256x240.png M skinStyles/jquery.ui/images/ui-icons_66_256x240.png M skinStyles/jquery.ui/images/ui-icons_72a7cf_256x240.png M skinStyles/jquery.ui/images/ui-icons_ff_256x240.png M skinStyles/jquery.ui/jquery.ui.autocomplete.css M skinStyles/jquery.ui/jquery.ui.button.css M skinStyles/jquery.ui/jquery.ui.datepicker.css M skinStyles/jquery.ui/jquery.ui.dialog.css A skinStyles/jquery.ui/jquery.ui.menu.css M skinStyles/jquery.ui/jquery.ui.resizable.css A skinStyles/jquery.ui/jquery.ui.spinner.css M skinStyles/jquery.ui/jquery.ui.theme.css A skinStyles/jquery.ui/jquery.ui.tooltip.css 24 files changed, 270 insertions(+), 111 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector refs/changes/24/154024/1 diff --git a/Vector.php b/Vector.php index d16e8bb..0acab20 100644 --- a/Vector.php +++ b/Vector.php @@ -75,11 +75,14 @@ 'jquery.ui.button' = 'skinStyles/jquery.ui/jquery.ui.button.css', 'jquery.ui.datepicker' = 'skinStyles/jquery.ui/jquery.ui.datepicker.css', 'jquery.ui.dialog' = 'skinStyles/jquery.ui/jquery.ui.dialog.css', + 'jquery.ui.menu' = 'skinStyles/jquery.ui/jquery.ui.menu.css', 'jquery.ui.progressbar' = 'skinStyles/jquery.ui/jquery.ui.progressbar.css', 'jquery.ui.resizable' = 'skinStyles/jquery.ui/jquery.ui.resizable.css', 'jquery.ui.selectable' = 'skinStyles/jquery.ui/jquery.ui.selectable.css', 'jquery.ui.slider' = 'skinStyles/jquery.ui/jquery.ui.slider.css', + 'jquery.ui.spinner' = 'skinStyles/jquery.ui/jquery.ui.spinner.css', 'jquery.ui.tabs' = 'skinStyles/jquery.ui/jquery.ui.tabs.css', + 'jquery.ui.tooltips' = 'skinStyles/jquery.ui/jquery.ui.tooltips.css', 'mediawiki.notification' = 'skinStyles/mediawiki.notification.less', 'mediawiki.special' = 'skinStyles/mediawiki.special.less', 'mediawiki.special.preferences' = 'skinStyles/mediawiki.special.preferences.less', diff --git
[MediaWiki-commits] [Gerrit] New Wikidata Build - 14/08/2014 10:00 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review. https://gerrit.wikimedia.org/r/154025 Change subject: New Wikidata Build - 14/08/2014 10:00 .. New Wikidata Build - 14/08/2014 10:00 Change-Id: I6187a9a745d62c8a1d94f57f380bf5a91182f7ad --- M composer.lock M extensions/ValueView/README.md M extensions/ValueView/ValueView.php M extensions/ValueView/lib/jquery.ui/jquery.ui.ooMenu.js M extensions/ValueView/lib/jquery.ui/jquery.ui.suggester.js M extensions/ValueView/src/ExpertExtender/ExpertExtender.LanguageSelector.js M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.suggester.tests.js M extensions/Wikibase/client/WikibaseClient.hooks.php M extensions/Wikibase/client/i18n/es.json M extensions/Wikibase/client/i18n/pt.json M extensions/Wikibase/client/i18n/qqq.json M extensions/Wikibase/client/i18n/zh-hant.json M extensions/Wikibase/client/includes/ChangeHandler.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php M extensions/Wikibase/client/includes/WikibaseClient.php M extensions/Wikibase/client/includes/hooks/InfoActionHookHandler.php M extensions/Wikibase/client/includes/hooks/LanguageLinkBadgeDisplay.php M extensions/Wikibase/client/includes/hooks/MovePageNotice.php M extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php M extensions/Wikibase/client/maintenance/populateInterwiki.php M extensions/Wikibase/client/tests/phpunit/MockClientStore.php M extensions/Wikibase/client/tests/phpunit/includes/ChangeHandlerTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RendererFactoryTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php M extensions/Wikibase/client/tests/phpunit/includes/OtherProjectsSitesProviderTest.php M extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php M extensions/Wikibase/client/tests/phpunit/includes/hooks/LanguageLinkBadgeDisplayTest.php M extensions/Wikibase/lib/WikibaseLib.php M extensions/Wikibase/lib/config/WikibaseLib.default.php M extensions/Wikibase/lib/includes/DataValueFactory.php M extensions/Wikibase/lib/includes/Localizer/DispatchingExceptionLocalizer.php M extensions/Wikibase/lib/includes/Localizer/MessageExceptionLocalizer.php M extensions/Wikibase/lib/includes/Localizer/ParseExceptionLocalizer.php M extensions/Wikibase/lib/includes/Reporting/ReportingExceptionHandler.php M extensions/Wikibase/lib/includes/WikibaseDataTypeBuilders.php M extensions/Wikibase/lib/includes/changes/EntityChange.php M extensions/Wikibase/lib/includes/formatters/EntityIdHtmlLinkFormatter.php M extensions/Wikibase/lib/includes/formatters/EntityIdLabelFormatter.php M extensions/Wikibase/lib/includes/serializers/LegacyInternalEntitySerializer.php M extensions/Wikibase/lib/includes/serializers/SnakSerializer.php M extensions/Wikibase/lib/includes/store/CachingEntityRevisionLookup.php M extensions/Wikibase/lib/includes/store/EntityStore.php M extensions/Wikibase/lib/includes/store/UnresolvedRedirectException.php M extensions/Wikibase/lib/includes/store/sql/SqlEntityInfoBuilderFactory.php M extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php M extensions/Wikibase/lib/tests/phpunit/EntityRetrievingDataTypeLookupTest.php M extensions/Wikibase/lib/tests/phpunit/MockRepositoryTest.php M extensions/Wikibase/lib/tests/phpunit/NoBadDependencyUsageTest.php M extensions/Wikibase/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php M extensions/Wikibase/lib/tests/phpunit/changes/ItemChangeTest.php M extensions/Wikibase/lib/tests/phpunit/changes/TestChanges.php M extensions/Wikibase/lib/tests/phpunit/entity/EntityFactoryTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/EntityIdLabelFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/parsers/MonthNameUnlocalizerTest.php M extensions/Wikibase/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php M extensions/Wikibase/lib/tests/phpunit/serializers/DispatchingEntitySerializerTest.php M extensions/Wikibase/lib/tests/phpunit/serializers/LegacyInternalEntitySerializerTest.php M extensions/Wikibase/lib/tests/phpunit/store/CachingEntityRevisionLookupTest.php M extensions/Wikibase/lib/tests/phpunit/store/ItemUsageIndexTest.php M extensions/Wikibase/lib/tests/phpunit/store/SiteLinkTableTest.php A extensions/Wikibase/repo/i18n/av.json M extensions/Wikibase/repo/i18n/gu.json M extensions/Wikibase/repo/i18n/pl.json M extensions/Wikibase/repo/i18n/pt.json M extensions/Wikibase/repo/i18n/sr-el.json M extensions/Wikibase/repo/i18n/zh-hant.json M extensions/Wikibase/repo/includes/WikibaseRepo.php M extensions/Wikibase/repo/includes/content/ItemContent.php M
[MediaWiki-commits] [Gerrit] apache::conf: append trailing newline if missing - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154026
Change subject: apache::conf: append trailing newline if missing
..
apache::conf: append trailing newline if missing
If $content is not undefined, make sure it ends with a trailing newline.
Change-Id: I863e2f9ed684c1d7e98c74c84db23d7ce066a404
---
M modules/apache/manifests/conf.pp
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/26/154026/1
diff --git a/modules/apache/manifests/conf.pp b/modules/apache/manifests/conf.pp
index 3118c33..0b5aab9 100644
--- a/modules/apache/manifests/conf.pp
+++ b/modules/apache/manifests/conf.pp
@@ -61,10 +61,14 @@
$title_safe = regsubst($title, '[\W_]', '-', 'G')
$file_ext= $conf_type ? { env = 'sh', default = 'conf' }
$conf_file = sprintf('%02d-%s.%s', $priority, $title_safe, $file_ext)
+$content_formatted = $content ? {
+undef = undef,
+default = regsubst($content, \n?$, \n),
+}
file { /etc/apache2/${conf_type}-available/${conf_file}:
ensure = $ensure,
-content = $content,
+content = $content_formatted,
source = $source,
owner = 'root',
group = 'root',
--
To view, visit https://gerrit.wikimedia.org/r/154026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I863e2f9ed684c1d7e98c74c84db23d7ce066a404
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] Fix-ups for I3d002968c - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154027
Change subject: Fix-ups for I3d002968c
..
Fix-ups for I3d002968c
* Remove trailing whitespace and tabs from jobrunner.site.conf.
* Use priority = 10 for the listen directive (always using the minimum and
maximum for priorities means you don't leave room for future additions.)
Change-Id: I0008c6ed03e074b0c228c0cce9f8734eee00917f
---
M modules/mediawiki/files/jobrunner.site.conf
M modules/mediawiki/manifests/jobrunner.pp
2 files changed, 6 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/154027/1
diff --git a/modules/mediawiki/files/jobrunner.site.conf
b/modules/mediawiki/files/jobrunner.site.conf
index 9067940..618a845 100644
--- a/modules/mediawiki/files/jobrunner.site.conf
+++ b/modules/mediawiki/files/jobrunner.site.conf
@@ -1,12 +1,10 @@
# This file is managed by Puppet
VirtualHost *:9002
DocumentRoot /usr/local/apache/common
-
-ServerAdmin r...@wikimedia.org
# Pass requests to the HHVM FastCGI server
ProxyPassMatch ^/(.*\.php(/.*)?)$
fcgi://127.0.0.1:9000/usr/local/apache/common/$1
-
-ErrorLog ${APACHE_LOG_DIR}/jobqueue-fcgi-error.log
- CustomLog ${APACHE_LOG_DIR}/jobqueue-fcgi-access.log combined
+
+ErrorLog ${APACHE_LOG_DIR}/jobqueue-error.log
+CustomLog ${APACHE_LOG_DIR}/jobqueue-access.log combined
/VirtualHost
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index ee1c4bc..c271254 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -66,20 +66,13 @@
if ubuntu_version('= trusty') {
include ::apache::mod::proxy_fcgi
-# Temporarily disabled, need hhvm repackaging
-#class { 'apache::mpm':
-#mpm = 'worker',
-#}
-
apache::conf { 'hhvm_jobrunner_port':
-priority = 1,
-content = # This file is managed by Puppet\nListen 9002\n,
+content = 'Listen 9002',
+priority = 10,
}
-apache::site{ 'hhvm_jobrunner':
-priority = 1,
+apache::site { 'hhvm_jobrunner':
source = 'puppet:///modules/mediawiki/jobrunner.site.conf',
}
}
-
}
--
To view, visit https://gerrit.wikimedia.org/r/154027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0008c6ed03e074b0c228c0cce9f8734eee00917f
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] jobrunner: parametrize the port for the fcgi interface - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154028
Change subject: jobrunner: parametrize the port for the fcgi interface
..
jobrunner: parametrize the port for the fcgi interface
Change-Id: I8e92a0689c5ab41cc3fdbc8bb816bba356390ceb
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/mediawiki/manifests/jobrunner.pp
M modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
R modules/mediawiki/templates/jobrunner/site.conf.erb
3 files changed, 7 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/154028/1
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index ee1c4bc..0ca7ec3 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -12,6 +12,7 @@
$runners_parsoid = 0,
$runners_transcode = 0,
$statsd_server = undef,
+$jr_port = 9002,
) {
include ::passwords::redis
@@ -73,12 +74,12 @@
apache::conf { 'hhvm_jobrunner_port':
priority = 1,
-content = # This file is managed by Puppet\nListen 9002\n,
+content = inline_template(# This file is managed by
Puppet\nListen %= @jr_port %\n,)
}
apache::site{ 'hhvm_jobrunner':
priority = 1,
-source = 'puppet:///modules/mediawiki/jobrunner.site.conf',
+content =
template('puppet:///modules/mediawiki/jobrunner/site.conf.erb')
}
}
diff --git a/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
b/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
index 58bbea5..f0d6737 100644
--- a/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
+++ b/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
@@ -1 +1 @@
-curl -XPOST -s -a
'http:\/\/127.0.0.1:9002\/rpc\/RunJobs.php?wiki=%(db)utype=%(type)umaxtime=%(maxtime)umaxmem=%(maxmem)u'
\ No newline at end of file
+curl -XPOST -s -a 'http:\/\/127.0.0.1:%= @jr_port
%\/rpc\/RunJobs.php?wiki=%(db)utype=%(type)umaxtime=%(maxtime)umaxmem=%(maxmem)u'
diff --git a/modules/mediawiki/files/jobrunner.site.conf
b/modules/mediawiki/templates/jobrunner/site.conf.erb
similarity index 62%
rename from modules/mediawiki/files/jobrunner.site.conf
rename to modules/mediawiki/templates/jobrunner/site.conf.erb
index 9067940..5d40d21 100644
--- a/modules/mediawiki/files/jobrunner.site.conf
+++ b/modules/mediawiki/templates/jobrunner/site.conf.erb
@@ -1,12 +1,9 @@
# This file is managed by Puppet
-VirtualHost *:9002
+VirtualHost *:%= @jr_port %
DocumentRoot /usr/local/apache/common
-
ServerAdmin r...@wikimedia.org
-
# Pass requests to the HHVM FastCGI server
ProxyPassMatch ^/(.*\.php(/.*)?)$
fcgi://127.0.0.1:9000/usr/local/apache/common/$1
-
-ErrorLog ${APACHE_LOG_DIR}/jobqueue-fcgi-error.log
- CustomLog ${APACHE_LOG_DIR}/jobqueue-fcgi-access.log combined
+ErrorLog ${APACHE_LOG_DIR}/jobqueue-error.log
+CustomLog ${APACHE_LOG_DIR}/jobqueue-access.log combined
/VirtualHost
--
To view, visit https://gerrit.wikimedia.org/r/154028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e92a0689c5ab41cc3fdbc8bb816bba356390ceb
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] jobrunner: parametrize the port for the fcgi interface - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: jobrunner: parametrize the port for the fcgi interface
..
jobrunner: parametrize the port for the fcgi interface
Change-Id: I8e92a0689c5ab41cc3fdbc8bb816bba356390ceb
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
D modules/mediawiki/files/jobrunner.site.conf
M modules/mediawiki/manifests/jobrunner.pp
M modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
A modules/mediawiki/templates/jobrunner/site.conf.erb
4 files changed, 12 insertions(+), 15 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/files/jobrunner.site.conf
b/modules/mediawiki/files/jobrunner.site.conf
deleted file mode 100644
index 9067940..000
--- a/modules/mediawiki/files/jobrunner.site.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file is managed by Puppet
-VirtualHost *:9002
-DocumentRoot /usr/local/apache/common
-
-ServerAdmin r...@wikimedia.org
-
-# Pass requests to the HHVM FastCGI server
-ProxyPassMatch ^/(.*\.php(/.*)?)$
fcgi://127.0.0.1:9000/usr/local/apache/common/$1
-
-ErrorLog ${APACHE_LOG_DIR}/jobqueue-fcgi-error.log
- CustomLog ${APACHE_LOG_DIR}/jobqueue-fcgi-access.log combined
-/VirtualHost
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index ee1c4bc..c3f82eb 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -12,6 +12,7 @@
$runners_parsoid = 0,
$runners_transcode = 0,
$statsd_server = undef,
+$jr_port = 9002,
) {
include ::passwords::redis
@@ -73,12 +74,12 @@
apache::conf { 'hhvm_jobrunner_port':
priority = 1,
-content = # This file is managed by Puppet\nListen 9002\n,
+content = inline_template(# This file is managed by
Puppet\nListen %= @jr_port %\n),
}
apache::site{ 'hhvm_jobrunner':
priority = 1,
-source = 'puppet:///modules/mediawiki/jobrunner.site.conf',
+content = template('mediawiki/jobrunner/site.conf.erb')
}
}
diff --git a/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
b/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
index 58bbea5..f0d6737 100644
--- a/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
+++ b/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
@@ -1 +1 @@
-curl -XPOST -s -a
'http:\/\/127.0.0.1:9002\/rpc\/RunJobs.php?wiki=%(db)utype=%(type)umaxtime=%(maxtime)umaxmem=%(maxmem)u'
\ No newline at end of file
+curl -XPOST -s -a 'http:\/\/127.0.0.1:%= @jr_port
%\/rpc\/RunJobs.php?wiki=%(db)utype=%(type)umaxtime=%(maxtime)umaxmem=%(maxmem)u'
diff --git a/modules/mediawiki/templates/jobrunner/site.conf.erb
b/modules/mediawiki/templates/jobrunner/site.conf.erb
new file mode 100644
index 000..d28ad81
--- /dev/null
+++ b/modules/mediawiki/templates/jobrunner/site.conf.erb
@@ -0,0 +1,8 @@
+# This file is managed by Puppet
+VirtualHost *:%= @jr_port %
+DocumentRoot /usr/local/apache/common
+# Pass requests to the HHVM FastCGI server
+ProxyPassMatch ^/(.*\.php(/.*)?)$
fcgi://127.0.0.1:9000/usr/local/apache/common/$1
+ErrorLog ${APACHE_LOG_DIR}/jobqueue-error.log
+CustomLog ${APACHE_LOG_DIR}/jobqueue-access.log combined
+/VirtualHost
--
To view, visit https://gerrit.wikimedia.org/r/154028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e92a0689c5ab41cc3fdbc8bb816bba356390ceb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update QUnit to 1.15.0 - change (mediawiki/core)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154029
Change subject: Update QUnit to 1.15.0
..
Update QUnit to 1.15.0
Change-Id: I4c0068dd0754f74172f89453251726cd1a21fc68
---
M resources/lib/jquery/jquery.qunit.css
M resources/lib/jquery/jquery.qunit.js
2 files changed, 1,140 insertions(+), 933 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/29/154029/1
diff --git a/resources/lib/jquery/jquery.qunit.css
b/resources/lib/jquery/jquery.qunit.css
index 93026e3..9437b4b 100644
--- a/resources/lib/jquery/jquery.qunit.css
+++ b/resources/lib/jquery/jquery.qunit.css
@@ -1,12 +1,12 @@
/*!
- * QUnit 1.14.0
+ * QUnit 1.15.0
* http://qunitjs.com/
*
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
*
- * Date: 2014-01-31T16:40Z
+ * Date: 2014-08-08T16:00Z
*/
/** Font Family and Sizes */
@@ -62,14 +62,14 @@
}
#qunit-testrunner-toolbar {
- padding: 0.5em 0 0.5em 2em;
+ padding: 0.5em 1em 0.5em 1em;
color: #5E740B;
background-color: #EEE;
overflow: hidden;
}
#qunit-userAgent {
- padding: 0.5em 0 0.5em 2.5em;
+ padding: 0.5em 1em 0.5em 1em;
background-color: #2B81AF;
color: #FFF;
text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
@@ -86,7 +86,7 @@
}
#qunit-tests li {
- padding: 0.4em 0.5em 0.4em 2.5em;
+ padding: 0.4em 1em 0.4em 1em;
border-bottom: 1px solid #FFF;
list-style-position: inside;
}
@@ -215,7 +215,7 @@
/** Result */
#qunit-testresult {
- padding: 0.5em 0.5em 0.5em 2.5em;
+ padding: 0.5em 1em 0.5em 1em;
color: #2B81AF;
background-color: #D2E0E6;
diff --git a/resources/lib/jquery/jquery.qunit.js
b/resources/lib/jquery/jquery.qunit.js
index 0e279fd..474cfe5 100644
--- a/resources/lib/jquery/jquery.qunit.js
+++ b/resources/lib/jquery/jquery.qunit.js
@@ -1,26 +1,27 @@
/*!
- * QUnit 1.14.0
+ * QUnit 1.15.0
* http://qunitjs.com/
*
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
*
- * Date: 2014-01-31T16:40Z
+ * Date: 2014-08-08T16:00Z
*/
(function( window ) {
var QUnit,
- assert,
config,
onErrorFnPrev,
- testId = 0,
- fileName = (sourceFromStacktrace( 0 ) || ).replace(/(:\d+)+\)?/,
).replace(/.+\//, ),
+ fileName = ( sourceFromStacktrace( 0 ) || ).replace( /(:\d+)+\)?/,
).replace( /.+\//, ),
toString = Object.prototype.toString,
hasOwn = Object.prototype.hasOwnProperty,
// Keep a local reference to Date (GH-283)
Date = window.Date,
+ now = Date.now || function() {
+ return new Date().getTime();
+ },
setTimeout = window.setTimeout,
clearTimeout = window.clearTimeout,
defined = {
@@ -32,7 +33,7 @@
sessionStorage.setItem( x, x );
sessionStorage.removeItem( x );
return true;
- } catch( e ) {
+ } catch ( e ) {
return false;
}
}())
@@ -74,19 +75,16 @@
* @return {Object} New object with only the own properties
(recursively).
*/
objectValues = function( obj ) {
- // Grunt 0.3.x uses an older version of jshint that still has
jshint/jshint#392.
- /*jshint newcap: false */
var key, val,
vals = QUnit.is( array, obj ) ? [] : {};
for ( key in obj ) {
if ( hasOwn.call( obj, key ) ) {
- val = obj[key];
- vals[key] = val === Object(val) ?
objectValues(val) : val;
+ val = obj[ key ];
+ vals[ key ] = val === Object( val ) ?
objectValues( val ) : val;
}
}
return vals;
};
-
// Root QUnit object.
// `QUnit` initialized at top of scope
@@ -96,7 +94,7 @@
module: function( name, testEnvironment ) {
config.currentModule = name;
config.currentModuleTestEnvironment = testEnvironment;
- config.modules[name] = true;
+ config.modules[ name ] = true;
},
asyncTest: function( testName, expected, callback ) {
@@ -109,20 +107,14 @@
},
test: function( testName, expected, callback, async ) {
- var test,
- nameHtml = span class='test-name' + escapeText(
testName ) + /span;
+
[MediaWiki-commits] [Gerrit] Use protocol relative URLs for some links on Transparency Re... - change (wikimedia/TransparencyReport)
Prtksxna has submitted this change and it was merged. Change subject: Use protocol relative URLs for some links on Transparency Report pages .. Use protocol relative URLs for some links on Transparency Report pages Some links on the Wikimedia Foundation Transparency Report have hard coded http: as their protocol. I changed them to protocol relative links (those start with //). The links with hard coded https are not changed to protocol relative. Change-Id: Id2b651cb64cf803bf87cb7d5e25ea350a944474f --- M build/content.html M build/faq.html M build/index.html M build/javascripts/content.js M build/privacy.html M locales/en.yml M source/javascripts/content.js M source/layouts/layout.erb M source/localizable/content.html.erb 9 files changed, 33 insertions(+), 33 deletions(-) Approvals: Prtksxna: Verified; Looks good to me, approved JanZerebecki: Looks good to me, but someone else must approve diff --git a/build/content.html b/build/content.html index f01f626..7a59750 100644 --- a/build/content.html +++ b/build/content.html @@ -75,7 +75,7 @@ blockquote pWe change people through conversation, not through censorship./p footer - a href=http://commons.wikimedia.org/wiki/File:Jay-Z_2011.jpg;img src=/images/quote_jay.png/a + a href=//commons.wikimedia.org/wiki/File:Jay-Z_2011.jpgimg src=/images/quote_jay.png/a pa href='https://en.wikipedia.org/wiki/Jay-Z'Jay Z/asmallMusician (a href='https://en.wikipedia.org/wiki/Decoded_%28book%29'2010/a)/small/p /footer /blockquote @@ -195,7 +195,7 @@ h3 The ClassicsbrsmallNovember 2013/small /h3 -pA publishing company sent us a takedown request concerning four famous works on a href='https://wikisource.org/'Wikisource/a: French translations of a href='https://en.wikipedia.org/wiki/Jane_Austen'Jane Austen's/a a href='http://fr.wikisource.org/wiki/Les_Cinq_Filles_de_Mrs_Bennet'emPride and Prejudice/em/a and a href='http://fr.wikisource.org/wiki/Persuasion'emPersuasion/em/a, a French translation of a href='https://en.wikipedia.org/wiki/Arthur_Conan_Doyle'Arthur Conan Doyle's/a a href='https://fr.wikisource.org/wiki/Les_Aventures_de_Sherlock_Holmes'emThe Adventures of Sherlock Holmes/em/a, and a href='https://en.wikipedia.org/wiki/Jean_de_la_Fontaine'Jean de la Fontaine’s/a a href='http://fr.wikisource.org/wiki/Fables_de_La_Fontaine,_livres_I-III'emFables/em/a. We immediately noticed the peculiarity with the request: all four original works (and likely their French translations as well) were old enough to have fallen into the a href='https://en.wikipedia.org/wiki/Public_domain'public domain/a. When we alerted the company to this point, it rescinded the takedown notice./p +pA publishing company sent us a takedown request concerning four famous works on a href='https://wikisource.org/'Wikisource/a: French translations of a href='https://en.wikipedia.org/wiki/Jane_Austen'Jane Austen's/a a href='//fr.wikisource.org/wiki/Les_Cinq_Filles_de_Mrs_Bennet'emPride and Prejudice/em/a and a href='//fr.wikisource.org/wiki/Persuasion'emPersuasion/em/a, a French translation of a href='https://en.wikipedia.org/wiki/Arthur_Conan_Doyle'Arthur Conan Doyle's/a a href='https://fr.wikisource.org/wiki/Les_Aventures_de_Sherlock_Holmes'emThe Adventures of Sherlock Holmes/em/a, and a href='https://en.wikipedia.org/wiki/Jean_de_la_Fontaine'Jean de la Fontaine’s/a a href='//fr.wikisource.org/wiki/Fables_de_La_Fontaine,_livres_I-III'emFables/em/a. We immediately noticed the peculiarity with the request: all four original works (and likely their French translations as well) were old enough to have fallen into the a href='https://en.wikipedia.org/wiki/Public_domain'public domain/a. When we alerted the company to this point, it rescinded the takedown notice./p /div /div @@ -265,16 +265,16 @@ ul lia href=https://meta.wikimedia.org/wiki/Wikimedia_Foundation_Transparency_Report;Wiki Version/a/li lia href=/data/data_aug2014.odsDownload Data/a/li - lia href=http://wikimediafoundation.org/wiki/Privacy_policy;Privacy Policy/a/li + lia href=//wikimediafoundation.org/wiki/Privacy_policyPrivacy Policy/a/li lia href=https://meta.wikimedia.org/wiki/Data_retention_guidelines;Data Retention Guidelines/a/li /ul /div div class=col-md-2 ul - lia href=http://wikimediafoundation.org;About Us/a/li + lia
[MediaWiki-commits] [Gerrit] hhvm: add Provides: php5 - change (operations...hhvm)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154030
Change subject: hhvm: add Provides: php5
..
hhvm: add Provides: php5
Change-Id: I5c43a427ac2849d7ea665c0ac7eca4373925656f
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M debian/changelog
M debian/control
2 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/hhvm
refs/changes/30/154030/1
diff --git a/debian/changelog b/debian/changelog
index ad7ca35..924f52f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hhvm (3.3-dev+20140728+wmf4) trusty-wikimedia; urgency=low
+
+ * Add php5 to the 'provides' list for hhvm
+
+ -- Giuseppe Lavagetto glavage...@wikimedia.org Thu, 14 Aug 2014 12:29:40
+0200
+
hhvm (3.3-dev+20140728+wmf3) trusty-wikimedia; urgency=low
* lintian fixes
diff --git a/debian/control b/debian/control
index 11ee451..47ea383 100644
--- a/debian/control
+++ b/debian/control
@@ -64,7 +64,7 @@
Package: hhvm
Architecture: amd64
Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: ${hhvm:ApiVersion}
+Provides: ${hhvm:ApiVersion}, php5
Description: HipHop Virtual Machine, a JIT replacement for PHP
HHVM is a new open-source virtual machine designed for executing programs
written in PHP. HHVM uses a just-in-time (JIT) compilation approach to
--
To view, visit https://gerrit.wikimedia.org/r/154030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c43a427ac2849d7ea665c0ac7eca4373925656f
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/hhvm
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apache::conf: append trailing newline if missing - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: apache::conf: append trailing newline if missing
..
apache::conf: append trailing newline if missing
If $content is not undefined, make sure it ends with a trailing newline.
Change-Id: I863e2f9ed684c1d7e98c74c84db23d7ce066a404
---
M modules/apache/manifests/conf.pp
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
Giuseppe Lavagetto: Looks good to me, but someone else must approve
diff --git a/modules/apache/manifests/conf.pp b/modules/apache/manifests/conf.pp
index 3118c33..0b5aab9 100644
--- a/modules/apache/manifests/conf.pp
+++ b/modules/apache/manifests/conf.pp
@@ -61,10 +61,14 @@
$title_safe = regsubst($title, '[\W_]', '-', 'G')
$file_ext= $conf_type ? { env = 'sh', default = 'conf' }
$conf_file = sprintf('%02d-%s.%s', $priority, $title_safe, $file_ext)
+$content_formatted = $content ? {
+undef = undef,
+default = regsubst($content, \n?$, \n),
+}
file { /etc/apache2/${conf_type}-available/${conf_file}:
ensure = $ensure,
-content = $content,
+content = $content_formatted,
source = $source,
owner = 'root',
group = 'root',
--
To view, visit https://gerrit.wikimedia.org/r/154026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I863e2f9ed684c1d7e98c74c84db23d7ce066a404
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: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use protocol relative URLs for links with https - change (wikimedia/TransparencyReport)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/154031 Change subject: Use protocol relative URLs for links with https .. Use protocol relative URLs for links with https None of the occurrences of https seem to require extra security. Thus, making those protocol relative too. Change-Id: I136d08dd9bb0d17ffeac568558de3dd5955f6b7d --- M locales/en.yml M source/layouts/layout.erb M source/localizable/content.html.erb M source/localizable/index.html.erb M source/localizable/privacy.html.erb 5 files changed, 37 insertions(+), 37 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport refs/changes/31/154031/1 diff --git a/locales/en.yml b/locales/en.yml index 46999a1..bd85999 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -26,16 +26,16 @@ content: Requests for Content Alteration amp; Takedown faq: Frequently Askedbr/Questions quote: Sunlight is said to be the best of disinfectants. -cite: a href='https://en.wikipedia.org/wiki/Louis_Brandeis'Louis Brandeis/asmallFormer a href='https://en.wikipedia.org/wiki/Associate_Justice_of_the_Supreme_Court_of_the_United_States'Associate Justice/a of the br /a href='https://en.wikipedia.org/wiki/Supreme_Court_of_the_United_States'Supreme Court of the United States/a (a href='https://en.wikiquote.org/wiki/Louis_Brandeis'1914/a)/small +cite: a href='//en.wikipedia.org/wiki/Louis_Brandeis'Louis Brandeis/asmallFormer a href='//en.wikipedia.org/wiki/Associate_Justice_of_the_Supreme_Court_of_the_United_States'Associate Justice/a of the br /a href='//en.wikipedia.org/wiki/Supreme_Court_of_the_United_States'Supreme Court of the United States/a (a href='//en.wikiquote.org/wiki/Louis_Brandeis'1914/a)/small privacy: title: Requests forbr/User Data total_number_of_requests: Total Number of Requests percentage_of_times_information_produced: Percentage of Times Information Produced -lead: a href='https://meta.wikimedia.org/wiki/Wikimedia_Foundation_Guiding_Principles#Free_speech'Freedom of speech is essential/a to the Wikimedia movement—our projects cannot flourish in an ecosystem where individuals cannot speak freely. Our users trust us to protect their identities against unlawful disclosure and we take this responsibility seriously. -intro: pHowever, every year, governments, individuals, and corporations ask us to disclose user data. Often, we have no nonpublic information to disclose because we a href='https://wikimediafoundation.org/wiki/Privacy_policy#Types_of_Information_We_Receive_From_You.2C_How_We_Get_It.2C_.26_How_We_Use_It'collect little nonpublic information/a about users and retain that information for a a href='https://meta.wikimedia.org/wiki/Data_retention_guidelines'short period of time/a. But when we do have data, we carefully evaluate every request before considering disclosure. If the requests do not meet our a href='https://wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines'standards/a—if they are overly broad, unclear, or irrelevant—we will push back on behalf of our users./ppIf we must produce information due to a legally valid request, we will a href='https://wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines#Notifying_Our_Users_of_Your_Request'notify the affected user/a before we disclose, if we are a href='/faq.html#nonpublic_personal_information'legally permitted and have the means/a to do so. In certain cases, we may a href='/faq.html#my_personal_information'help find assistance/a for users to fight an invalid request./ppBelow, you will find more information about the requests for user data we receive./p +lead: a href='//meta.wikimedia.org/wiki/Wikimedia_Foundation_Guiding_Principles#Free_speech'Freedom of speech is essential/a to the Wikimedia movement—our projects cannot flourish in an ecosystem where individuals cannot speak freely. Our users trust us to protect their identities against unlawful disclosure and we take this responsibility seriously. +intro: pHowever, every year, governments, individuals, and corporations ask us to disclose user data. Often, we have no nonpublic information to disclose because we a href='//wikimediafoundation.org/wiki/Privacy_policy#Types_of_Information_We_Receive_From_You.2C_How_We_Get_It.2C_.26_How_We_Use_It'collect little nonpublic information/a about users and retain that information for a a href='//meta.wikimedia.org/wiki/Data_retention_guidelines'short period of time/a. But when we do have data, we carefully evaluate every request before considering disclosure. If the requests do not meet our a href='//wikimediafoundation.org/wiki/Requests_for_user_information_procedures_%26_guidelines'standards/a—if they are overly broad, unclear, or irrelevant—we will push back on behalf of our users./ppIf we must produce
[MediaWiki-commits] [Gerrit] jobrunner: use mpm_worker instead of mpm_prefork - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154032
Change subject: jobrunner: use mpm_worker instead of mpm_prefork
..
jobrunner: use mpm_worker instead of mpm_prefork
Change-Id: I9a1d31c7e81ed56d51267dcb98b856d7e38df768
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/mediawiki/manifests/jobrunner.pp
M modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
M modules/mediawiki/templates/jobrunner/site.conf.erb
3 files changed, 7 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/154032/1
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index c3f82eb..5dea85e 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -12,7 +12,7 @@
$runners_parsoid = 0,
$runners_transcode = 0,
$statsd_server = undef,
-$jr_port = 9002,
+$port = 9002,
) {
include ::passwords::redis
@@ -67,14 +67,13 @@
if ubuntu_version('= trusty') {
include ::apache::mod::proxy_fcgi
-# Temporarily disabled, need hhvm repackaging
-#class { 'apache::mpm':
-#mpm = 'worker',
-#}
+class { 'apache::mpm':
+mpm = 'worker',
+}
apache::conf { 'hhvm_jobrunner_port':
priority = 1,
-content = inline_template(# This file is managed by
Puppet\nListen %= @jr_port %\n),
+content = inline_template(# This file is managed by
Puppet\nListen %= @port %\n),
}
apache::site{ 'hhvm_jobrunner':
diff --git a/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
b/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
index f0d6737..7708fed 100644
--- a/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
+++ b/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
@@ -1 +1 @@
-curl -XPOST -s -a 'http:\/\/127.0.0.1:%= @jr_port
%\/rpc\/RunJobs.php?wiki=%(db)utype=%(type)umaxtime=%(maxtime)umaxmem=%(maxmem)u'
+curl -XPOST -s -a 'http:\/\/127.0.0.1:%= @port
%\/rpc\/RunJobs.php?wiki=%(db)utype=%(type)umaxtime=%(maxtime)umaxmem=%(maxmem)u'
diff --git a/modules/mediawiki/templates/jobrunner/site.conf.erb
b/modules/mediawiki/templates/jobrunner/site.conf.erb
index d28ad81..08382f6 100644
--- a/modules/mediawiki/templates/jobrunner/site.conf.erb
+++ b/modules/mediawiki/templates/jobrunner/site.conf.erb
@@ -1,5 +1,5 @@
# This file is managed by Puppet
-VirtualHost *:%= @jr_port %
+VirtualHost *:%= @port %
DocumentRoot /usr/local/apache/common
# Pass requests to the HHVM FastCGI server
ProxyPassMatch ^/(.*\.php(/.*)?)$
fcgi://127.0.0.1:9000/usr/local/apache/common/$1
--
To view, visit https://gerrit.wikimedia.org/r/154032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a1d31c7e81ed56d51267dcb98b856d7e38df768
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] jobrunner: use mpm_worker instead of mpm_prefork - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: jobrunner: use mpm_worker instead of mpm_prefork
..
jobrunner: use mpm_worker instead of mpm_prefork
Change-Id: I9a1d31c7e81ed56d51267dcb98b856d7e38df768
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/mediawiki/manifests/jobrunner.pp
M modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
M modules/mediawiki/templates/jobrunner/site.conf.erb
3 files changed, 7 insertions(+), 8 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index c3f82eb..5dea85e 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -12,7 +12,7 @@
$runners_parsoid = 0,
$runners_transcode = 0,
$statsd_server = undef,
-$jr_port = 9002,
+$port = 9002,
) {
include ::passwords::redis
@@ -67,14 +67,13 @@
if ubuntu_version('= trusty') {
include ::apache::mod::proxy_fcgi
-# Temporarily disabled, need hhvm repackaging
-#class { 'apache::mpm':
-#mpm = 'worker',
-#}
+class { 'apache::mpm':
+mpm = 'worker',
+}
apache::conf { 'hhvm_jobrunner_port':
priority = 1,
-content = inline_template(# This file is managed by
Puppet\nListen %= @jr_port %\n),
+content = inline_template(# This file is managed by
Puppet\nListen %= @port %\n),
}
apache::site{ 'hhvm_jobrunner':
diff --git a/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
b/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
index f0d6737..7708fed 100644
--- a/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
+++ b/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
@@ -1 +1 @@
-curl -XPOST -s -a 'http:\/\/127.0.0.1:%= @jr_port
%\/rpc\/RunJobs.php?wiki=%(db)utype=%(type)umaxtime=%(maxtime)umaxmem=%(maxmem)u'
+curl -XPOST -s -a 'http:\/\/127.0.0.1:%= @port
%\/rpc\/RunJobs.php?wiki=%(db)utype=%(type)umaxtime=%(maxtime)umaxmem=%(maxmem)u'
diff --git a/modules/mediawiki/templates/jobrunner/site.conf.erb
b/modules/mediawiki/templates/jobrunner/site.conf.erb
index d28ad81..08382f6 100644
--- a/modules/mediawiki/templates/jobrunner/site.conf.erb
+++ b/modules/mediawiki/templates/jobrunner/site.conf.erb
@@ -1,5 +1,5 @@
# This file is managed by Puppet
-VirtualHost *:%= @jr_port %
+VirtualHost *:%= @port %
DocumentRoot /usr/local/apache/common
# Pass requests to the HHVM FastCGI server
ProxyPassMatch ^/(.*\.php(/.*)?)$
fcgi://127.0.0.1:9000/usr/local/apache/common/$1
--
To view, visit https://gerrit.wikimedia.org/r/154032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a1d31c7e81ed56d51267dcb98b856d7e38df768
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: 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] apache: change mpm dependency to work on trusty as well. - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154033
Change subject: apache: change mpm dependency to work on trusty as well.
..
apache: change mpm dependency to work on trusty as well.
Change-Id: Ibbfec0a1e07fd6f333b8121860f9e4b81bc9c4a5
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/apache/manifests/mpm.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/33/154033/1
diff --git a/modules/apache/manifests/mpm.pp b/modules/apache/manifests/mpm.pp
index 6808b52..f037153 100644
--- a/modules/apache/manifests/mpm.pp
+++ b/modules/apache/manifests/mpm.pp
@@ -35,7 +35,7 @@
# mod_php5 is unsafe for threaded MPMs
apache::mod_conf { 'php5':
ensure = absent,
-before = Package[$selected_pkg],
+before = Apache::Mod_conf[$selected_mod],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/154033
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbfec0a1e07fd6f333b8121860f9e4b81bc9c4a5
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] apache: change mpm dependency to work on trusty as well. - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: apache: change mpm dependency to work on trusty as well.
..
apache: change mpm dependency to work on trusty as well.
Change-Id: Ibbfec0a1e07fd6f333b8121860f9e4b81bc9c4a5
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/apache/manifests/mpm.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/apache/manifests/mpm.pp b/modules/apache/manifests/mpm.pp
index 6808b52..f037153 100644
--- a/modules/apache/manifests/mpm.pp
+++ b/modules/apache/manifests/mpm.pp
@@ -35,7 +35,7 @@
# mod_php5 is unsafe for threaded MPMs
apache::mod_conf { 'php5':
ensure = absent,
-before = Package[$selected_pkg],
+before = Apache::Mod_conf[$selected_mod],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/154033
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibbfec0a1e07fd6f333b8121860f9e4b81bc9c4a5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add flag image to the MT abuse card - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154034
Change subject: Add flag image to the MT abuse card
..
Add flag image to the MT abuse card
Change-Id: Ie174ad7a2f1356bbec53d203c66b16a4c76da0cc
---
A modules/tools/images/flag_yellow.png
A modules/tools/images/flag_yellow.svg
M modules/tools/styles/ext.cx.tools.mtabuse.less
3 files changed, 15 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/34/154034/1
diff --git a/modules/tools/images/flag_yellow.png
b/modules/tools/images/flag_yellow.png
new file mode 100644
index 000..0ef517f
--- /dev/null
+++ b/modules/tools/images/flag_yellow.png
Binary files differ
diff --git a/modules/tools/images/flag_yellow.svg
b/modules/tools/images/flag_yellow.svg
new file mode 100644
index 000..7b84288
--- /dev/null
+++ b/modules/tools/images/flag_yellow.svg
@@ -0,0 +1,8 @@
+?xml version=1.0 encoding=utf-8?
+!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) --
+!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
+svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg;
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px
+viewBox=258 348 96 96 enable-background=new 258 348 96 96
xml:space=preserve
+path fill=#FFB500
d=M308.4,357.3c-21.3-10.7-38.4-9.2-38.4-9.2v95.7c0,0,8,1.4,8-3.5s0-40.8,0-40.8c4.6-1.5,12.6-2.8,30.5,8.8
+ c23,13.5,33.6-4.1,33.6-4.1v-51C342,353.2,329.8,367.5,308.4,357.3z/
+/svg
diff --git a/modules/tools/styles/ext.cx.tools.mtabuse.less
b/modules/tools/styles/ext.cx.tools.mtabuse.less
index 7d7d9ff..e6ae6d9 100644
--- a/modules/tools/styles/ext.cx.tools.mtabuse.less
+++ b/modules/tools/styles/ext.cx.tools.mtabuse.less
@@ -1,4 +1,5 @@
@import ../../base/styles/grid/agora-grid;
+@import mediawiki.mixins;
.card.mtabuse {
animation-name: card-show-animation;
@@ -9,6 +10,12 @@
.card__mtabuse-title {
font-size: large;
+ /* @embed */
+ .background-image-svg('../images/flag_yellow.svg',
'../images/flag_yellow.png');
+ background-repeat: no-repeat;
+ background-position: 10px center;
+ background-size: 50px;
+ padding: 10px 30px 10px 70px;
}
.card__mtabuse-details {
--
To view, visit https://gerrit.wikimedia.org/r/154034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie174ad7a2f1356bbec53d203c66b16a4c76da0cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wmflib: add ensure_final_newline() - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154035
Change subject: wmflib: add ensure_final_newline()
..
wmflib: add ensure_final_newline()
If the argument is a string, ensure it ends with a final newline.
If it is not a string, pass it through unmodified.
This function is designed to make it easier to write custom Puppet
resource types that delegate to file resources and that take
either a content or a source parameter.
Change-Id: Ib1f88b11b6308900a0bf0279eaca863793f614cd
---
M modules/apache/manifests/conf.pp
M modules/eventlogging/manifests/plugin.pp
M modules/logstash/manifests/conf.pp
M modules/rsyslog/manifests/conf.pp
M modules/sysctl/manifests/conffile.pp
A modules/wmflib/lib/puppet/parser/functions/ensure_final_newline.rb
6 files changed, 33 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/35/154035/1
diff --git a/modules/apache/manifests/conf.pp b/modules/apache/manifests/conf.pp
index 0b5aab9..2f8c6f5 100644
--- a/modules/apache/manifests/conf.pp
+++ b/modules/apache/manifests/conf.pp
@@ -61,14 +61,10 @@
$title_safe = regsubst($title, '[\W_]', '-', 'G')
$file_ext= $conf_type ? { env = 'sh', default = 'conf' }
$conf_file = sprintf('%02d-%s.%s', $priority, $title_safe, $file_ext)
-$content_formatted = $content ? {
-undef = undef,
-default = regsubst($content, \n?$, \n),
-}
file { /etc/apache2/${conf_type}-available/${conf_file}:
ensure = $ensure,
-content = $content_formatted,
+content = ensure_final_newline($content),
source = $source,
owner = 'root',
group = 'root',
diff --git a/modules/eventlogging/manifests/plugin.pp
b/modules/eventlogging/manifests/plugin.pp
index d7ed4cf..40ca902 100644
--- a/modules/eventlogging/manifests/plugin.pp
+++ b/modules/eventlogging/manifests/plugin.pp
@@ -42,7 +42,7 @@
file { /usr/local/lib/eventlogging/${basename}.py:
ensure = $ensure,
-content = $content,
+content = ensure_final_newline($content),
source = $source,
require = File['/usr/local/lib/eventlogging'],
notify = Service['eventlogging/init'],
diff --git a/modules/logstash/manifests/conf.pp
b/modules/logstash/manifests/conf.pp
index 542bbff..ef94a11 100644
--- a/modules/logstash/manifests/conf.pp
+++ b/modules/logstash/manifests/conf.pp
@@ -30,7 +30,7 @@
file { /etc/logstash/conf.d/${priority}-${config_name}.conf:
ensure = $ensure,
-content = $content,
+content = ensure_final_newline($content),
source = $source,
require = File['/etc/logstash/conf.d'],
notify = Service['logstash'],
diff --git a/modules/rsyslog/manifests/conf.pp
b/modules/rsyslog/manifests/conf.pp
index 6f5f7c6..c6a95ad 100644
--- a/modules/rsyslog/manifests/conf.pp
+++ b/modules/rsyslog/manifests/conf.pp
@@ -41,15 +41,9 @@
$basename = regsubst($title, '[\W_]', '-', 'G')
$filename = sprintf('/etc/rsyslog.d/%02d-%s.conf', $priority, $basename)
-# append a trailing newline if omitted
-$content_formatted = $content ? {
-undef = undef,
-default = regsubst($content, \n?$, \n)
-}
-
file { $filename:
ensure = $ensure,
-content = $content_formatted,
+content = ensure_final_newline($content),
source = $source,
owner = 'root',
group = 'root',
diff --git a/modules/sysctl/manifests/conffile.pp
b/modules/sysctl/manifests/conffile.pp
index 1e80d13..0c4797a 100644
--- a/modules/sysctl/manifests/conffile.pp
+++ b/modules/sysctl/manifests/conffile.pp
@@ -47,7 +47,7 @@
file { $filename:
ensure = $ensure,
-content = $content,
+content = ensure_final_newline($content),
source = $source,
notify = Exec['update_sysctl'],
}
diff --git a/modules/wmflib/lib/puppet/parser/functions/ensure_final_newline.rb
b/modules/wmflib/lib/puppet/parser/functions/ensure_final_newline.rb
new file mode 100644
index 000..a4bde14
--- /dev/null
+++ b/modules/wmflib/lib/puppet/parser/functions/ensure_final_newline.rb
@@ -0,0 +1,28 @@
+# == Function: ensure_final_newline
+#
+# If the argument is a string, ensure it ends with a final newline.
+# If it is not a string, pass it through unmodified.
+#
+# This function is designed to make it easier to write custom Puppet
+# resource types that delegate to file resources and that take
+# either a content or a source parameter.
+#
+module Puppet::Parser::Functions
+ newfunction(
+:ensure_final_newline,
+:arity = 1,
+:type = :rvalue,
+:doc = -END
+ If the argument is a string, ensure it ends with a final newline.
+ If it is not a string, pass it through unmodified.
+
+ This function is designed to make it easier to write custom Puppet
+
[MediaWiki-commits] [Gerrit] Make sure image attribute is cleared if set to null - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154036
Change subject: Make sure image attribute is cleared if set to null
..
Make sure image attribute is cleared if set to null
If 'to' is null, $.css acts as a getter, so in this case change
it to empty string to clear the style.
Bug: 69531
Change-Id: I61d132a11730b6d124e81635d2f930f7b17d9605
---
M modules/ve/ce/nodes/ve.ce.ImageNode.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/36/154036/1
diff --git a/modules/ve/ce/nodes/ve.ce.ImageNode.js
b/modules/ve/ce/nodes/ve.ce.ImageNode.js
index 448d491..6d5a873 100644
--- a/modules/ve/ce/nodes/ve.ce.ImageNode.js
+++ b/modules/ve/ce/nodes/ve.ce.ImageNode.js
@@ -78,7 +78,7 @@
this.$image.attr( 'src', this.getResolvedAttribute( 'src' ) );
}
if ( key === 'width' || key === 'height' ) {
- this.$image.css( key, to );
+ this.$image.css( key, to || '' );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/154036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61d132a11730b6d124e81635d2f930f7b17d9605
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix hack in ve.test.utils to prevent immediate surface setup - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix hack in ve.test.utils to prevent immediate surface setup
..
Fix hack in ve.test.utils to prevent immediate surface setup
This used to work because loading i18n files took time. However,
we now don't register any message paths with the platform, so
platform initialization is now synchronous, which breaks the hack.
Instead, explicitly assign an unresolved deferred to the platform's
initialization promise, and resolve it after the mw.Target has been
constructed.
*barf*
Change-Id: I287cb86ce8c4c534fd723532f34463359a8ccc7c
---
M modules/ve-mw/tests/ve.test.utils.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, but someone else must approve
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/tests/ve.test.utils.js
b/modules/ve-mw/tests/ve.test.utils.js
index ba16ce6..92a6083 100644
--- a/modules/ve-mw/tests/ve.test.utils.js
+++ b/modules/ve-mw/tests/ve.test.utils.js
@@ -7,12 +7,13 @@
ve.test.utils.createSurfaceFromDocument = function ( doc ) {
// Prevent the target from setting up the surface immediately
- ve.init.platform.initialized = null;
+ ve.init.platform.initialized = $.Deferred();
// HACK: MW targets are async and heavy, use an SA target but
// override the global registration
var target = new ve.init.sa.Target( $( '#qunit-fixture' ), doc ),
mwTarget = new ve.init.mw.Target( $( 'div' ).appendTo( $(
'#qunit-fixture' ) ) );
+ ve.init.platform.initialized.resolve();
mwTarget = null;
target.setup( doc );
return target.surface;
--
To view, visit https://gerrit.wikimedia.org/r/153875
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I287cb86ce8c4c534fd723532f34463359a8ccc7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@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] Syncronize VisualEditor: 1434b45..afd32fb - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/154037 Change subject: Syncronize VisualEditor: 1434b45..afd32fb .. Syncronize VisualEditor: 1434b45..afd32fb Change-Id: I59c997b9216b81e10842683537840327ff71a44a --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/37/154037/1 diff --git a/VisualEditor b/VisualEditor index 1434b45..afd32fb 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 1434b450fef1c3bc184c662ccd6503481f10e06d +Subproject commit afd32fb26704008baada5c2f8f490d9e9e9c3b0e -- To view, visit https://gerrit.wikimedia.org/r/154037 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59c997b9216b81e10842683537840327ff71a44a 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] Update VE core submodule to master (8e56dd5) - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (8e56dd5)
..
Update VE core submodule to master (8e56dd5)
New changes:
36705e9 Replace setModulesPath with addMessagePath
Change-Id: I7b95d1f10bf2d131343613bc5e6bc334d3ad40d0
---
M .docs/eg-iframe.html
M lib/ve
2 files changed, 0 insertions(+), 2 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index ee1af02..3878392 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -321,8 +321,6 @@
script
src=lib/ve/modules/ve/ui/ve.ui.DesktopContext.js/script
script
src=lib/ve/modules/ve/ui/ve.ui.DesktopInspectorManager.js/script
- scriptve.init.platform.setModulesUrl( 'lib/ve/modules'
);/script
-
!-- example scripts --
script
function loadInlineExample( code, options, callback ) {
diff --git a/lib/ve b/lib/ve
index f443f90..8e56dd5 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit f443f9025d7cbfe142747dd4a26b00919b8fd1a1
+Subproject commit 8e56dd552299bf8e17c067dcb562576803e0f077
--
To view, visit https://gerrit.wikimedia.org/r/153864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7b95d1f10bf2d131343613bc5e6bc334d3ad40d0
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@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] Syncronize VisualEditor: 1434b45..afd32fb - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 1434b45..afd32fb .. Syncronize VisualEditor: 1434b45..afd32fb Change-Id: I59c997b9216b81e10842683537840327ff71a44a --- 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 1434b45..afd32fb 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 1434b450fef1c3bc184c662ccd6503481f10e06d +Subproject commit afd32fb26704008baada5c2f8f490d9e9e9c3b0e -- To view, visit https://gerrit.wikimedia.org/r/154037 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59c997b9216b81e10842683537840327ff71a44a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: afd32fb..3d47542 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/154038 Change subject: Syncronize VisualEditor: afd32fb..3d47542 .. Syncronize VisualEditor: afd32fb..3d47542 Change-Id: I31b3f6d4af170aa532ca1108cf0c593de3367979 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/38/154038/1 diff --git a/VisualEditor b/VisualEditor index afd32fb..3d47542 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit afd32fb26704008baada5c2f8f490d9e9e9c3b0e +Subproject commit 3d475420cb879cd178f07883289d740887ed008a -- To view, visit https://gerrit.wikimedia.org/r/154038 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I31b3f6d4af170aa532ca1108cf0c593de3367979 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: afd32fb..3d47542 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: afd32fb..3d47542 .. Syncronize VisualEditor: afd32fb..3d47542 Change-Id: I31b3f6d4af170aa532ca1108cf0c593de3367979 --- 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 afd32fb..3d47542 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit afd32fb26704008baada5c2f8f490d9e9e9c3b0e +Subproject commit 3d475420cb879cd178f07883289d740887ed008a -- To view, visit https://gerrit.wikimedia.org/r/154038 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I31b3f6d4af170aa532ca1108cf0c593de3367979 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] Make sure image attribute is cleared if set to null - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Make sure image attribute is cleared if set to null
..
Make sure image attribute is cleared if set to null
If 'to' is null $.css acts as a getter, so in this case change
it to empty string to clear the style.
Bug: 69531
Change-Id: I61d132a11730b6d124e81635d2f930f7b17d9605
---
M modules/ve/ce/nodes/ve.ce.ImageNode.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ce/nodes/ve.ce.ImageNode.js
b/modules/ve/ce/nodes/ve.ce.ImageNode.js
index 448d491..e5d619a 100644
--- a/modules/ve/ce/nodes/ve.ce.ImageNode.js
+++ b/modules/ve/ce/nodes/ve.ce.ImageNode.js
@@ -78,7 +78,7 @@
this.$image.attr( 'src', this.getResolvedAttribute( 'src' ) );
}
if ( key === 'width' || key === 'height' ) {
- this.$image.css( key, to );
+ this.$image.css( key, to !== null ? to : '' );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/154036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I61d132a11730b6d124e81635d2f930f7b17d9605
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@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] Update VE core submodule to master (ce51e22) - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/154039 Change subject: Update VE core submodule to master (ce51e22) .. Update VE core submodule to master (ce51e22) New changes: 2075a46 Embed CSS images in dist 9e15b04 Localisation updates from https://translatewiki.net. ce51e22 Make sure image attribute is cleared if set to null Change-Id: I8edefe662d5d3c88abef242fdaf4d45644a130b1 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/39/154039/1 diff --git a/lib/ve b/lib/ve index 8e56dd5..ce51e22 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 8e56dd552299bf8e17c067dcb562576803e0f077 +Subproject commit ce51e220a32ad2733185c4e1a20767c97e20c824 -- To view, visit https://gerrit.wikimedia.org/r/154039 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8edefe662d5d3c88abef242fdaf4d45644a130b1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make the MTAbuse card sticky - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Make the MTAbuse card sticky
..
Make the MTAbuse card sticky
Keep it in tools column till the MT percentage is below threshold.
We were keeping it in tools column, but it was not cooexisting with
other cards. Made it sticky.
Also, change the event trigger for the card. Now it listen for mw.cx.progress
Change-Id: Ic073634f6316e14221544383fad3bab87293f7d7
---
M hooks.md
M modules/tools/ext.cx.tools.manager.js
M modules/tools/ext.cx.tools.mtabuse.js
M modules/translation/ext.cx.translation.progress.js
4 files changed, 30 insertions(+), 19 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hooks.md b/hooks.md
index 64b9fe9..722cbfe 100644
--- a/hooks.md
+++ b/hooks.md
@@ -117,7 +117,3 @@
## mw.cx.translation.updated
Fired when the translation section was updated using the MT card, for example
with the 'restore' or 'use source text' actions.
-
-## mw.cx.warning.mtabuse
-
-Fired by the progress calculation module when the MT is beyond a threshold.
The percentage of MT is passed as argument. The MT abuse tool card listens for
this.
diff --git a/modules/tools/ext.cx.tools.manager.js
b/modules/tools/ext.cx.tools.manager.js
index 9e696dc..5c3cea1 100644
--- a/modules/tools/ext.cx.tools.manager.js
+++ b/modules/tools/ext.cx.tools.manager.js
@@ -20,6 +20,9 @@
* 3. stop()- Destroys the DOM of the card. End of the card instance.
*
* The tool needs to fire the event mw.cx.tool.shown once the card is shown.
+ *
+ * Additionally, if the card need to stay in tools till a condition is met,
mark
+ * the sticky property of tool object true. See MTAbuseCard for example.
*/
( function ( $, mw ) {
'use strict';
@@ -155,18 +158,22 @@
* @param {string} currentToolName current tool name
*/
CXToolManager.prototype.hideUnrelatedCards = function ( currentToolName
) {
- var currentToolEvents, toolEvents, toolName;
+ var currentToolEvents, toolEvents, tool, toolName;
if ( this.tools[ currentToolName ] ) {
currentToolEvents = this.tools[ currentToolName
].getTriggerEvents();
}
for ( toolName in this.tools ) {
+ tool = this.tools[ toolName ];
if ( toolName === currentToolName ) {
continue;
}
-
- toolEvents = this.tools[ toolName ].getTriggerEvents();
+ if ( tool.sticky ) {
+ // If the card is sticky, do not hide till it
is done. Example: MTAbuse card.
+ continue;
+ }
+ toolEvents = tool.getTriggerEvents();
if ( intersection( currentToolEvents, toolEvents
).length === 0 ) {
this.hideCard( toolName );
}
diff --git a/modules/tools/ext.cx.tools.mtabuse.js
b/modules/tools/ext.cx.tools.mtabuse.js
index bbd0831..34edd43 100644
--- a/modules/tools/ext.cx.tools.mtabuse.js
+++ b/modules/tools/ext.cx.tools.mtabuse.js
@@ -11,7 +11,8 @@
( function ( $, mw ) {
'use strict';
- var template = 'div class=card mtabuse' +
+ var MT_ABUSE_THRESHOLD = 75,
+ template = 'div class=card mtabuse' +
'h2 class=card__mtabuse-title/h2' +
'div class=card__mtabuse-details/div' +
'div class=card__mtabuse-link/div' +
@@ -19,6 +20,9 @@
function MTAbuseCard() {
this.$card = $( template );
+ this.mtPercentage = 0;
+ // This card need to be sticky till mt is below abuse
threshold.
+ this.sticky = true;
this.render();
}
@@ -32,27 +36,34 @@
href: mw.msg(
'cx-tools-view-guidelines-link' ),
target: '_blank'
} )
- .text( mw.msg( 'cx-tools-view-guidelines' ) )
- );
+ .text( mw.msg( 'cx-tools-view-guidelines' ) ) );
+ this.$card.hide();
};
MTAbuseCard.prototype.onShow = function () {
mw.hook( 'mw.cx.tools.shown' ).fire( true );
};
+ MTAbuseCard.prototype.isAbuse = function () {
+ return this.mtPercentage MT_ABUSE_THRESHOLD;
+ };
+
MTAbuseCard.prototype.getCard = function () {
return this.$card;
};
- MTAbuseCard.prototype.start = function ( mtPercentage ) {
+ MTAbuseCard.prototype.start = function ( translationPercentage,
mtPercentage ) {
+ this.mtPercentage = parseInt( mtPercentage, 10 );
+
[MediaWiki-commits] [Gerrit] mwconf: let us override magic extension loader - change (integration/jenkins)
jenkins-bot has submitted this change and it was merged.
Change subject: mwconf: let us override magic extension loader
..
mwconf: let us override magic extension loader
I am going to have to keep a job workspace with a bunch of extension
from a previous run. So let us skip the magic autoloader by listing the
extensions we want to require in a file named $IP/extension_load.txt
The file will be generated by the job I am working on to test all
extensions together.
Change-Id: Iaa4f2aa2dc0efc4e69c9545dbc0df12fa54866b7
---
M mediawiki/conf.d/50_mw_ext_loader.php
M tests/mediawiki/conf.d/50_mw_ext_loaderTest.php
2 files changed, 80 insertions(+), 3 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki/conf.d/50_mw_ext_loader.php
b/mediawiki/conf.d/50_mw_ext_loader.php
index 97ccaa4..35da46b 100644
--- a/mediawiki/conf.d/50_mw_ext_loader.php
+++ b/mediawiki/conf.d/50_mw_ext_loader.php
@@ -2,6 +2,13 @@
#
# Snippet coming from integration/jenkins.git:/mediawiki/conf.d/
#
+# Loads extensions using either:
+# - a list of extension names in /extensions_load.txt . They can be either the
+# name of the Gerrit repository (mediawiki/extensions/Foobar) or the basename
+# (Foobar).
+# - a scan of the directory /extensions/
+#
+# It will then load the default entry point: /Foo/Foo.php
$func_get_exts = function () {
global $IP;
@@ -28,7 +35,19 @@
$ext_to_load = array();
$ext_missing = array();
- foreach ( scandir( {$IP}/extensions/ ) as $extname ) {
+ $ext_candidates = array();
+
+ $loadFile = $IP . '/extensions_load.txt';
+ if ( file_exists( $loadFile ) ) {
+ $ext_candidates = file( $loadFile, FILE_IGNORE_NEW_LINES );
+ $ext_candidates = array_map( function ( $entry ) {
+ return str_replace( 'mediawiki/extensions/', '', $entry
);
+ }, $ext_candidates );
+ } else {
+ $ext_candidates = scandir( ${IP}/extensions/ );
+ }
+
+ foreach ( $ext_candidates as $extname ) {
if ( $extname == '.'
|| $extname == '..'
|| !is_dir( {$IP}/extensions/${extname} )
diff --git a/tests/mediawiki/conf.d/50_mw_ext_loaderTest.php
b/tests/mediawiki/conf.d/50_mw_ext_loaderTest.php
index 61b3556..57fdee2 100644
--- a/tests/mediawiki/conf.d/50_mw_ext_loaderTest.php
+++ b/tests/mediawiki/conf.d/50_mw_ext_loaderTest.php
@@ -53,13 +53,19 @@
*/
protected function fakeExtension( $name ) {
$dir = $this-tmpName . /extensions/$name;
- mkdir( $dir, 0777, /** recursirve: */ true );
+ mkdir( $dir, 0777, /** recursive: */ true );
$fileHandle = fopen( $dir . /{$name}.php, 'w+' );
fwrite( $fileHandle, ?php
/** Fake extension $name */
global \$fakeExtensions;
\$fakeExtensions['$name'] = true;
);
+ }
+
+ protected function createLoadFile( Array $extensions ) {
+ $fileHandle = fopen( $this-tmpName . /extensions_load.txt,
'w+' );
+ fwrite( $fileHandle, implode( \n, $extensions ) );
+ fclose( $fileHandle );
}
/**
@@ -70,7 +76,19 @@
protected function assertLoaded( $name ) {
global $fakeExtensions;
$this-assertArrayHasKey( $name, $fakeExtensions,
- Extension $name did not get loaded
+ Extension $name did not get loaded
+ );
+ }
+
+ /**
+* Verify whether a fake extension has NOT been loaded.
+*
+* Create the extension using fakeExtension().
+*/
+ protected function assertNotLoaded( $name ) {
+ global $fakeExtensions;
+ $this-assertArrayNotHasKey( $name, $fakeExtensions,
+ Extension $name has been loaded
);
}
@@ -99,4 +117,44 @@
$this-assertLoaded( 'ExtOne' );
$this-assertLoaded( 'ExtTwo' );
}
+
+ function testOnlyLoadFromFile() {
+ $this-fakeExtension( 'Must_not_be_loaded' );
+ $this-createLoadFile( array() );
+ $this-runLoader();
+ $this-assertNotLoaded( 'Must_not_be_loaded' );
+ }
+
+ function testLoadFromFile() {
+ $this-fakeExtension( 'LoadedFromFile' );
+ $this-createLoadFile( array( 'LoadedFromFile' ) );
+ $this-runLoader();
+ $this-assertNotLoaded( 'Must_not_be_loaded' );
+ $this-assertLoaded( 'LoadedFromFile' );
+ }
+
+ function testLoadFromFileWithMultipleEntries() {
+ $this-fakeExtension( 'FirstExt' );
+ $this-fakeExtension( 'SecondExt' );
+ $this-createLoadFile( array(
+
[MediaWiki-commits] [Gerrit] Let users star and unstar queries - change (analytics...web)
jenkins-bot has submitted this change and it was merged.
Change subject: Let users star and unstar queries
..
Let users star and unstar queries
- Displays starred queries info in User profile page
- Adds new star table
Change-Id: If5e976522969e7d6d43569f108c212b76c43eff0
---
M quarry/web/app.py
A quarry/web/models/star.py
M quarry/web/static/css/query/view.css
M quarry/web/static/css/user.css
M quarry/web/static/js/query/view.js
M quarry/web/templates/query/view.html
M quarry/web/templates/user.html
M tables.sql
8 files changed, 164 insertions(+), 12 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/quarry/web/app.py b/quarry/web/app.py
index 64a371e..c57b71c 100644
--- a/quarry/web/app.py
+++ b/quarry/web/app.py
@@ -4,12 +4,13 @@
from models.query import Query
from models.queryrevision import QueryRevision
from models.queryrun import QueryRun
+from models.star import Star
import json
import yaml
import time
import os
from sqlalchemy import desc, func
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm import sessionmaker, joinedload
from redissession import RedisSessionInterface
from mwoauth import ConsumerToken, Handshaker
from connections import Connections
@@ -99,19 +100,67 @@
user_name = user_name.replace('_', ' ').lower()
user = g.session.query(User).filter(func.lower(User.username) ==
user_name).one()
stats = {
-'query_count':
g.session.query(func.count(Query.id)).filter(Query.user_id == user.id).scalar()
+'query_count':
g.session.query(func.count(Query.id)).filter(Query.user_id == user.id).scalar(),
+'stars_count':
g.session.query(func.count(Star.id)).filter(Star.user_id == user.id).scalar()
}
recent_queries = g.session.query(Query)\
.filter(Query.user_id == user.id)\
.order_by(desc(Query.last_touched))\
+.limit(10)
+self_stars = g.session.query(Star).join(Star.query)\
+.options(joinedload(Star.query))\
+.filter(Star.user_id == user.id)\
+.filter(Query.user_id == user.id)\
+.order_by(desc(Star.timestamp))\
+.limit(10)
+other_stars = g.session.query(Star).join(Star.query) \
+.options(joinedload(Star.query))\
+.filter(Star.user_id == user.id) \
+.filter(Query.user_id != user.id) \
+.order_by(desc(Star.timestamp))\
.limit(10)
return render_template(
user.html,
display_user=user,
user=g.user,
stats=stats,
-recent_queries=recent_queries
+recent_queries=recent_queries,
+self_stars=self_stars,
+other_stars=other_stars
)
+
+
+@app.route(/api/query/unstar, methods=[POST])
+def unstar_query():
+if g.user is None:
+return Unauthorized access, 403
+query = g.session.query(Query).get(request.form['query_id'])
+if query:
+star = g.session.query(Star)\
+.filter(Star.query_id == request.form['query_id'])\
+.filter(Star.user_id == g.user.id)\
+.one()
+g.session.delete(star)
+g.session.commit()
+return
+else:
+return Query not found, 404
+
+
+@app.route(/api/query/star, methods=[POST])
+def star_query():
+if g.user is None:
+return Unauthorized access, 403
+query = g.session.query(Query).get(request.form['query_id'])
+if query:
+star = Star()
+star.user = g.user
+star.query = query
+g.session.add(star)
+g.session.commit()
+return
+else:
+return Query not found, 404
@app.route(/query/new)
@@ -136,9 +185,15 @@
def query_show(query_id):
query = g.session.query(Query).filter(Query.id == query_id).one()
can_edit = g.user is not None and g.user.id == query.user_id
+is_starred = False
+if g.user:
+is_starred = g.session.query(func.count(Star.id))\
+.filter(Star.user_id == g.user.id)\
+.filter(Star.query_id == query_id).scalar() == 1
jsvars = {
'query_id': query.id,
-'can_edit': can_edit
+'can_edit': can_edit,
+'is_starred': is_starred
}
if query.latest_rev and query.latest_rev.latest_run:
diff --git a/quarry/web/models/star.py b/quarry/web/models/star.py
new file mode 100644
index 000..ff93654
--- /dev/null
+++ b/quarry/web/models/star.py
@@ -0,0 +1,15 @@
+from sqlalchemy import Column, Integer, ForeignKey, DateTime
+from sqlalchemy.orm import relationship
+from base import Base
+
+
+class Star(Base):
+__tablename__ = 'star'
+
+id = Column(Integer, primary_key=True)
+user_id = Column(Integer, ForeignKey('user.id'))
+timestamp = Column(DateTime)
+query_id = Column(Integer, ForeignKey('query.id'))
+
+query = relationship('Query', uselist=False)
+user = relationship('User', uselist=False)
diff --git
[MediaWiki-commits] [Gerrit] Use gender neutral pronouns - change (analytics...web)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154040
Change subject: Use gender neutral pronouns
..
Use gender neutral pronouns
Change-Id: I068f08b59091589adaa703221277ab34e3f3ba93
---
M quarry/web/templates/user.html
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web
refs/changes/40/154040/1
diff --git a/quarry/web/templates/user.html b/quarry/web/templates/user.html
index c66848d..ed04284 100644
--- a/quarry/web/templates/user.html
+++ b/quarry/web/templates/user.html
@@ -26,7 +26,7 @@
a class=query-title
href=/query/{{star.query.id}}{{star.query.title}}/a
/li
{% else %}
-This user has not starred any of his queries yet.
+This user has not starred any of their queries yet.
{% endfor %}
/ul
/div
--
To view, visit https://gerrit.wikimedia.org/r/154040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I068f08b59091589adaa703221277ab34e3f3ba93
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Compactlinks: Use an actual button to build a button - change (mediawiki...UniversalLanguageSelector)
TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154041
Change subject: Compactlinks: Use an actual button to build a button
..
Compactlinks: Use an actual button to build a button
Change-Id: Id9c72975df7b3dc9a38aca2a9d6165275bb39731
---
M resources/js/ext.uls.compactlinks.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/41/154041/1
diff --git a/resources/js/ext.uls.compactlinks.js
b/resources/js/ext.uls.compactlinks.js
index bebaf14..871f076 100644
--- a/resources/js/ext.uls.compactlinks.js
+++ b/resources/js/ext.uls.compactlinks.js
@@ -285,7 +285,7 @@
addTrigger: function () {
var $trigger, $triggerLabel;
- $trigger = $( 'div' )
+ $trigger = $( 'button' )
.addClass( 'mw-interlanguage-selector
mw-ui-button active' )
.html( '#8230' ); // '…'
--
To view, visit https://gerrit.wikimedia.org/r/154041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9c72975df7b3dc9a38aca2a9d6165275bb39731
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: TheDJ hartman.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwgrep: Sort results before printing them - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: mwgrep: Sort results before printing them
..
mwgrep: Sort results before printing them
Change-Id: I2d4d2dd3c3ffa8242ae65a76e83ebb6f63c57e7f
---
M files/misc/scripts/mwgrep
1 file changed, 9 insertions(+), 3 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/files/misc/scripts/mwgrep b/files/misc/scripts/mwgrep
index 498d268..82efaa2 100755
--- a/files/misc/scripts/mwgrep
+++ b/files/misc/scripts/mwgrep
@@ -24,6 +24,8 @@
sys.setdefaultencoding('utf-8')
import argparse
+import bisect
+import collections
import json
import urllib
import urllib2
@@ -102,14 +104,18 @@
'timeout': args.timeout,
}
+matches = []
uri = BASE_URI + '?' + urllib.urlencode(query)
req = urllib2.urlopen(uri, json.dumps(search))
result = json.load(req)['hits']
for hit in result['hits']:
-db = hit['_index'].rsplit('_', 2)[0]
+db_name = hit['_index'].rsplit('_', 2)[0]
title = hit['_source']['title']
-pagename = '%s%s' % (PREFIX_NS[args.ns], title)
-print('{:20}{}'.format(db, pagename))
+page_name = '%s%s' % (PREFIX_NS[args.ns], title)
+bisect.insort(matches, (db_name, page_name))
+
+for db_name, page_name in matches:
+print('{:20}{}'.format(db_name, page_name))
print('(total: %s, shown: %s)' % (result['total'], len(result['hits'])))
--
To view, visit https://gerrit.wikimedia.org/r/154011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2d4d2dd3c3ffa8242ae65a76e83ebb6f63c57e7f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Helder.wiki helder.w...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use gender neutral pronouns - change (analytics...web)
jenkins-bot has submitted this change and it was merged.
Change subject: Use gender neutral pronouns
..
Use gender neutral pronouns
Change-Id: I068f08b59091589adaa703221277ab34e3f3ba93
---
M quarry/web/templates/user.html
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/quarry/web/templates/user.html b/quarry/web/templates/user.html
index c66848d..ed04284 100644
--- a/quarry/web/templates/user.html
+++ b/quarry/web/templates/user.html
@@ -26,7 +26,7 @@
a class=query-title
href=/query/{{star.query.id}}{{star.query.title}}/a
/li
{% else %}
-This user has not starred any of his queries yet.
+This user has not starred any of their queries yet.
{% endfor %}
/ul
/div
--
To view, visit https://gerrit.wikimedia.org/r/154040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I068f08b59091589adaa703221277ab34e3f3ba93
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: Set runners_* for role::beta::jobrunner - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: beta: Set runners_* for role::beta::jobrunner
..
beta: Set runners_* for role::beta::jobrunner
The :mediawiki::jobrunner class needs to be told how many runners to
use.
Bug: 69272
Change-Id: I5d500b287b27b7627af93e4618b4300d30d2be06
---
M manifests/role/beta.pp
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
Legoktm: Looks good to me, but someone else must approve
Hashar: Checked; Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/role/beta.pp b/manifests/role/beta.pp
index f39946a..5bf7eb2 100644
--- a/manifests/role/beta.pp
+++ b/manifests/role/beta.pp
@@ -127,7 +127,11 @@
include role::mediawiki::common
class { '::mediawiki::jobrunner':
-aggr_servers = [ '10.68.16.146' ],
-queue_servers = [ '10.68.16.146' ],
+aggr_servers= [ '10.68.16.146' ],
+queue_servers = [ '10.68.16.146' ],
+runners_basic = 5,
+runners_parsoid = 5,
+runners_upload = 2,
+runners_gwt = 1,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/152931
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5d500b287b27b7627af93e4618b4300d30d2be06
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bumping up version of wikimetrics module in vagrant - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged. Change subject: Bumping up version of wikimetrics module in vagrant .. Bumping up version of wikimetrics module in vagrant Change-Id: Ie398b90f6ba70578c9d452a26b3b51d9783bfc8e --- M puppet/modules/wikimetrics 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/wikimetrics b/puppet/modules/wikimetrics index 0e4af73..d0a4350 16 --- a/puppet/modules/wikimetrics +++ b/puppet/modules/wikimetrics -Subproject commit 0e4af7341f28f652466c31fe0ddd028dab5264cb +Subproject commit d0a43502b7e4d0066a39ecd05a85030d2b7624e3 -- To view, visit https://gerrit.wikimedia.org/r/154018 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie398b90f6ba70578c9d452a26b3b51d9783bfc8e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Nuria nu...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Language screenshot job should run on english beta labs - change (integration/jenkins-job-builder-config)
Vikassy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154042
Change subject: Language screenshot job should run on english beta labs
..
Language screenshot job should run on english beta labs
Change-Id: I0c3b80f7468dee4c8c8da06492a4203d9338c2b9
---
M jobs.yaml
1 file changed, 0 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/42/154042/1
diff --git a/jobs.yaml b/jobs.yaml
index c15e5df..baf91f8 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -319,7 +319,6 @@
- 'browsertests-{name}-language-screenshot-{platform}-{browser}-sauce':
browser: firefox
mediawiki_password_variable:
MEDIAWIKI_PASSWORD_LANGUAGESCREENSHOTBOT_WMFLABS_ORG
-mediawiki_url: test2.wikipedia.org
mediawiki_user: LanguageScreenshotBot
# WikiLove
--
To view, visit https://gerrit.wikimedia.org/r/154042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c3b80f7468dee4c8c8da06492a4203d9338c2b9
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Language screenshot job should run on english beta labs - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Language screenshot job should run on english beta labs
..
Language screenshot job should run on english beta labs
Change-Id: I0c3b80f7468dee4c8c8da06492a4203d9338c2b9
---
M jobs.yaml
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jobs.yaml b/jobs.yaml
index c15e5df..baf91f8 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -319,7 +319,6 @@
- 'browsertests-{name}-language-screenshot-{platform}-{browser}-sauce':
browser: firefox
mediawiki_password_variable:
MEDIAWIKI_PASSWORD_LANGUAGESCREENSHOTBOT_WMFLABS_ORG
-mediawiki_url: test2.wikipedia.org
mediawiki_user: LanguageScreenshotBot
# WikiLove
--
To view, visit https://gerrit.wikimedia.org/r/154042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c3b80f7468dee4c8c8da06492a4203d9338c2b9
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Zfilipin zfili...@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 slow Rolling Active Editor metric - change (analytics/wikimetrics)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix slow Rolling Active Editor metric
..
Fix slow Rolling Active Editor metric
There was a performance mistake in the previous version of the query.
The query was filtering on users only after collecting data from the
revision and archive tables. Filtering on users closer to the
subqueries against revision and archive tables speeds up execution a lot
because there of the indices on rev_user and ar_user.
Bug: 68596
Change-Id: Id992ee2030d6257eb681dff2cf4246750097f9af
---
M wikimetrics/metrics/rolling_active_editor.py
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Nuria: Looks good to me, approved
Milimetric: Looks good to me, but someone else must approve
jenkins-bot: Verified
Objections:
QChris: There's a problem with this change, please improve
diff --git a/wikimetrics/metrics/rolling_active_editor.py
b/wikimetrics/metrics/rolling_active_editor.py
index 3726f74..7897af0 100644
--- a/wikimetrics/metrics/rolling_active_editor.py
+++ b/wikimetrics/metrics/rolling_active_editor.py
@@ -86,10 +86,12 @@
revisions = session.query(rev_user, count)\
.filter(between(Revision.rev_timestamp, start_date, end_date))\
.group_by(Revision.rev_user)
+revisions = self.filter(revisions, user_ids, column=Revision.rev_user)
archived = session.query(ar_user, count)\
.filter(between(Archive.ar_timestamp, start_date, end_date))\
.group_by(Archive.ar_user)
+archived = self.filter(archived, user_ids, column=Archive.ar_user)
edits = revisions.union_all(archived).subquery()
edits_by_user = session.query(
@@ -98,9 +100,7 @@
)\
.group_by(edits.c.user_id)
-metric = self.filter(edits_by_user, user_ids, column=edits.c.user_id)
-
-metric_results = {r[0]: {self.id : r[1]} for r in metric.all()}
+metric_results = {r[0]: {self.id : r[1]} for r in edits_by_user.all()}
if user_ids is None:
return metric_results
--
To view, visit https://gerrit.wikimedia.org/r/149482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id992ee2030d6257eb681dff2cf4246750097f9af
Gerrit-PatchSet: 4
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric dandree...@wikimedia.org
Gerrit-Reviewer: Milimetric dandree...@wikimedia.org
Gerrit-Reviewer: Nuria nu...@wikimedia.org
Gerrit-Reviewer: QChris christ...@quelltextlich.at
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Nutcracker: move declaration to role::mediawiki; parametrize - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Nutcracker: move declaration to role::mediawiki; parametrize
..
Nutcracker: move declaration to role::mediawiki; parametrize
* Set owner / group / mode for config files.
* Only override nutcracker's default mbuf-size if caller requests it.
* Don't declare defaults. Especially if they conflict with nutcracker's!
* Don't assume a single server pool. Nutcracker supports arbitrarily many.
We'll probably want to exploit this to ease the migration to a UNIX domain
socket (if we choose to do that).
* Move declaration to role::mediawiki / role::beta.
* Fix Icinga alert to expect a single process.
Change-Id: Ifb4d25506ad5dddf046c3e6ba03f30541850d2be
---
M manifests/role/beta.pp
M manifests/role/mediawiki.pp
M modules/mediawiki/manifests/init.pp
M modules/nutcracker/manifests/init.pp
M modules/nutcracker/manifests/monitoring.pp
M modules/nutcracker/templates/config.yml.erb
A modules/nutcracker/templates/default.erb
7 files changed, 123 insertions(+), 80 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/beta.pp b/manifests/role/beta.pp
index 5bf7eb2..2c2c8c7 100644
--- a/manifests/role/beta.pp
+++ b/manifests/role/beta.pp
@@ -109,6 +109,26 @@
check_command =
'check_http_url!commons.wikimedia.beta.wmflabs.org|http://commons.wikimedia.beta.wmflabs.org/wiki/Main_Page',
}
+class { '::nutcracker':
+mbuf_size = '64k',
+pools = {
+'memcached' = {
+auto_eject_hosts = true,
+distribution = 'ketama',
+hash = 'md5',
+listen = '127.0.0.1:11212',
+preconnect = true,
+server_connections = 2,
+server_failure_limit = 3,
+timeout = 250,
+servers = [
+'10.68.16.14:11211',
+'10.68.16.15:11211',
+],
+},
+},
+}
+
# Beta application servers have some ferm DNAT rewriting rules (bug
# 45868) so we have to explicitly allow http (port 80)
ferm::service { 'http':
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index fb62624..681a6a4 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -10,6 +10,40 @@
include ::mediawiki
include ::nutcracker::monitoring
+class { '::nutcracker':
+mbuf_size = '64k',
+pools = {
+'memcached' = {
+auto_eject_hosts = true,
+distribution = 'ketama',
+hash = 'md5',
+listen = '127.0.0.1:11212',
+preconnect = true,
+server_connections = 2,
+server_failure_limit = 3,
+timeout = 250,
+servers = [
+'10.64.0.180:11211:1',
+'10.64.0.181:11211:1',
+'10.64.0.182:11211:1',
+'10.64.0.183:11211:1',
+'10.64.0.184:11211:1',
+'10.64.0.185:11211:1',
+'10.64.0.186:11211:1',
+'10.64.0.187:11211:1',
+'10.64.0.188:11211:1',
+'10.64.0.189:11211:1',
+'10.64.0.190:11211:1',
+'10.64.0.191:11211:1',
+'10.64.0.192:11211:1',
+'10.64.0.193:11211:1',
+'10.64.0.194:11211:1',
+'10.64.0.195:11211:1',
+],
+},
+},
+}
+
$log_aggregator = 'fluorine.eqiad.wmnet:8420'
class { '::mediawiki::php': fatal_log_file = udp://${log_aggregator} }
class { '::mediawiki::syslog': apache_log_aggregator = $log_aggregator }
diff --git a/modules/mediawiki/manifests/init.pp
b/modules/mediawiki/manifests/init.pp
index 5436484..e770d35 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -17,36 +17,6 @@
mode= '0444',
}
-if $::realm == 'labs' {
-$mw_mc_server_list = [
-'10.68.16.14:11211', # deployment-memc02.eqiad.wmflabs
-'10.68.16.15:11211', # deployment-memc03.eqiad.wmflabs
-]
-} else {
-$mw_mc_server_list = [
-'10.64.0.180:11211', # mc1001
-'10.64.0.181:11211', # mc1002
-'10.64.0.182:11211', # mc1003
-'10.64.0.183:11211', # mc1004
-'10.64.0.184:11211', # mc1005
-'10.64.0.185:11211', # mc1006
-'10.64.0.186:11211', # mc1007
-'10.64.0.187:11211', # mc1008
-
[MediaWiki-commits] [Gerrit] Updated MEDIAWIKI_API_UPLOAD_URL for language screenshot job... - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: Updated MEDIAWIKI_API_UPLOAD_URL for language screenshot job to production Commons .. Updated MEDIAWIKI_API_UPLOAD_URL for language screenshot job to production Commons Change-Id: I2b5b81662bf0aafcf9eb6fbd5ec7d1a906a2341f --- M macro.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Amire80: Looks good to me, approved Zfilipin: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/macro.yaml b/macro.yaml index 39ed49d..6bb83c1 100644 --- a/macro.yaml +++ b/macro.yaml @@ -98,7 +98,7 @@ || (echo -e \nJob has failed (exit code: $?).; false) if [[ ! -z $LANGUAGE_SCREENSHOT_CODE ]]; then -export MEDIAWIKI_API_UPLOAD_URL=http://commons.wikimedia.beta.wmflabs.org/w/api.php +export MEDIAWIKI_API_UPLOAD_URL=https://commons.wikimedia.org/w/api.php $WORKSPACE/vendor/bin/bundle exec ruby1.9.1 upload.rb fi -- To view, visit https://gerrit.wikimedia.org/r/147415 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2b5b81662bf0aafcf9eb6fbd5ec7d1a906a2341f Gerrit-PatchSet: 7 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: cloudbees Gerrit-Owner: Vikassy vikasyaligar...@gmail.com Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Zfilipin zfili...@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 502 on login for new users - change (analytics...web)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/154043 Change subject: Fix 502 on login for new users .. Fix 502 on login for new users Change-Id: I137e068561db712cdf9e77d9e87be13d32828427 --- M quarry/web/app.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web refs/changes/43/154043/1 diff --git a/quarry/web/app.py b/quarry/web/app.py index c57b71c..39938de 100644 --- a/quarry/web/app.py +++ b/quarry/web/app.py @@ -82,7 +82,7 @@ session['acces_token'] = access_token identity = handshaker.identify(access_token) wiki_uid = identity['sub'] -user = g.session.query(User).filter(User.wiki_uid == wiki_uid).one() +user = g.session.query(User).filter(User.wiki_uid == wiki_uid).first() if user is None: user = User(username=identity['username'], wiki_uid=wiki_uid) g.session.add(user) -- To view, visit https://gerrit.wikimedia.org/r/154043 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I137e068561db712cdf9e77d9e87be13d32828427 Gerrit-PatchSet: 1 Gerrit-Project: analytics/quarry/web Gerrit-Branch: master Gerrit-Owner: Yuvipanda yuvipa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix 502 on login for new users - change (analytics...web)
jenkins-bot has submitted this change and it was merged. Change subject: Fix 502 on login for new users .. Fix 502 on login for new users Change-Id: I137e068561db712cdf9e77d9e87be13d32828427 --- M quarry/web/app.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/quarry/web/app.py b/quarry/web/app.py index c57b71c..39938de 100644 --- a/quarry/web/app.py +++ b/quarry/web/app.py @@ -82,7 +82,7 @@ session['acces_token'] = access_token identity = handshaker.identify(access_token) wiki_uid = identity['sub'] -user = g.session.query(User).filter(User.wiki_uid == wiki_uid).one() +user = g.session.query(User).filter(User.wiki_uid == wiki_uid).first() if user is None: user = User(username=identity['username'], wiki_uid=wiki_uid) g.session.add(user) -- To view, visit https://gerrit.wikimedia.org/r/154043 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I137e068561db712cdf9e77d9e87be13d32828427 Gerrit-PatchSet: 1 Gerrit-Project: analytics/quarry/web Gerrit-Branch: master Gerrit-Owner: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable phplint job for labs-toollabs - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable phplint job for labs-toollabs .. Enable phplint job for labs-toollabs Job created in I61dec9b5397876d0f. Bug: 63687 Change-Id: I2971dd096884b67f42b6a529ab6bff451947adf5 --- M layout.yaml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 6481853..8e091b6 100644 --- a/layout.yaml +++ b/layout.yaml @@ -2017,6 +2017,9 @@ - name: labs/toollabs test: - labs-toollabs-debian-glue + - labs-toollabs-phplint +gate-and-submit: + - labs-toollabs-phplint - name: labs/tools/extdist test: -- To view, visit https://gerrit.wikimedia.org/r/153581 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2971dd096884b67f42b6a529ab6bff451947adf5 Gerrit-PatchSet: 5 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Addshore addshorew...@gmail.com Gerrit-Reviewer: Addshore addshorew...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Tim Landscheidt t...@tim-landscheidt.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] Skip spam check if one of the recipients is postmaster@ or a... - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154044
Change subject: Skip spam check if one of the recipients is postmaster@ or
abuse@
..
Skip spam check if one of the recipients is postmaster@ or abuse@
Right now spam reports to abuse@ can be rejected at the SMTP layer
if the spam score is too high. Let's avoid the issue altogether and
not run SpamAssassin on these.
Change-Id: I1ef3ab5606e4c47fb3e33c0554bc057c1277ff71
---
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/154044/1
diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index 958204e..66559a1 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -206,7 +206,8 @@
# Accept mail for postmaster without further policy checking,
# for compliance with the RFCs
- accept local_parts = postmaster
+ accept local_parts = postmaster : abuse
+ set acl_m2 = skip_spamd
% end -%
# Verify the recipient address for local domains, or require the
@@ -273,6 +274,9 @@
# the message is not too large
accept condition = ${if {$message_size}{400K}}
+ # Skip if so requested
+ accept condition = ${if eq{$acl_m2}{skip_spamd}}
+
# Add spam headers if score = 1
warn spam = nonexistent:true
condition = ${if {$spam_score_int}{10}{1}{0}}
--
To view, visit https://gerrit.wikimedia.org/r/154044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ef3ab5606e4c47fb3e33c0554bc057c1277ff71
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] nutcracker: used ordered_yaml() - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154045
Change subject: nutcracker: used ordered_yaml()
..
nutcracker: used ordered_yaml()
..rather than a hideous template.
Change-Id: I4e878ca45038e261032611d373fd1690126bfa54
---
M modules/nutcracker/manifests/init.pp
D modules/nutcracker/templates/config.yml.erb
2 files changed, 1 insertion(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/154045/1
diff --git a/modules/nutcracker/manifests/init.pp
b/modules/nutcracker/manifests/init.pp
index 879b79c..b3104d2 100644
--- a/modules/nutcracker/manifests/init.pp
+++ b/modules/nutcracker/manifests/init.pp
@@ -44,7 +44,7 @@
file { '/etc/nutcracker/nutcracker.yml':
ensure = $ensure,
-content = template('nutcracker/config.yml.erb'),
+content = ordered_yaml($pools),
owner = 'root',
group = 'root',
mode= '0444',
diff --git a/modules/nutcracker/templates/config.yml.erb
b/modules/nutcracker/templates/config.yml.erb
deleted file mode 100644
index 2ab8128..000
--- a/modules/nutcracker/templates/config.yml.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-%=
-require 'yaml'
-
-config = {}
-@pools.sort.each do |pool,settings|
-settings.sort.each do |k,v|
-settings[k] = case v.to_s
- when v.to_s.to_f.to_s then Float(v)
- when v.to_s.to_i.to_s then Integer(v)
- else v
-end
-end
-config[pool] = settings
-end
-config.to_yaml.gsub(/^---[^\n]*?\n/, '')
-%
--
To view, visit https://gerrit.wikimedia.org/r/154045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e878ca45038e261032611d373fd1690126bfa54
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] Fix div width issue in well underneath code area - change (analytics...web)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154046
Change subject: Fix div width issue in well underneath code area
..
Fix div width issue in well underneath code area
Change-Id: I888d8056a2d6691dd72b8632ab57319418c669fd
---
M quarry/web/templates/query/view.html
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web
refs/changes/46/154046/1
diff --git a/quarry/web/templates/query/view.html
b/quarry/web/templates/query/view.html
index 4331500..99f7a58 100644
--- a/quarry/web/templates/query/view.html
+++ b/quarry/web/templates/query/view.html
@@ -32,7 +32,7 @@
h3SQL/h3
textarea id=code{% if latest_rev %}{{ latest_rev.text
}}{%endif%}/textarea
/div
-div class=row well
+div class=well
div class='col-md-8 only-edit'
By running queries you agree to the a
href=https://wikitech.wikimedia.org/wiki/Wikitech:Labs_Terms_of_use;Labs
ToS/a and you irrevocably agree to release your SQL under a
href=https://creativecommons.org/publicdomain/zero/1.0/;CC0 License/a.
/div
--
To view, visit https://gerrit.wikimedia.org/r/154046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I888d8056a2d6691dd72b8632ab57319418c669fd
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduce default height of SQL query text area - change (analytics...web)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154047
Change subject: Reduce default height of SQL query text area
..
Reduce default height of SQL query text area
Change-Id: Ie2bead4a9de60070e4fa3604b093dd4ed3c225e5
---
M quarry/web/static/css/query/view.css
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web
refs/changes/47/154047/1
diff --git a/quarry/web/static/css/query/view.css
b/quarry/web/static/css/query/view.css
index 4ef0d85..a3921c3 100644
--- a/quarry/web/static/css/query/view.css
+++ b/quarry/web/static/css/query/view.css
@@ -27,7 +27,7 @@
.CodeMirror-scroll {
overflow-y: hidden;
overflow-x: auto;
-min-height: 250px;
+min-height: 144px;
}
#query-result-container {
--
To view, visit https://gerrit.wikimedia.org/r/154047
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2bead4a9de60070e4fa3604b093dd4ed3c225e5
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Followup I4049b666: Removing prefix exception for HTMLCheck... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Followup I4049b666: Removing prefix exception for
HTMLCheckMatrix
..
Followup I4049b666: Removing prefix exception for HTMLCheckMatrix
Change I4049b666 changed the way Preferences combines the prefix with
the row and column for HTMLCheckMatrix, but did not adjust the
corresponding code in User::getOptionFromUser().
Bug: 69146
Change-Id: I69ed9c875443ba44d1a5e12e51165ebf8d6d6a06
---
M includes/User.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Anomie: Looks good to me, but someone else must approve
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/User.php b/includes/User.php
index fe41187..7e846ad 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2733,7 +2733,7 @@
foreach ( $columns as $column ) {
foreach ( $rows as $row ) {
-
$checkmatrixOptions[$prefix-$column-$row] = true;
+
$checkmatrixOptions[$prefix$column-$row] = true;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/151972
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I69ed9c875443ba44d1a5e12e51165ebf8d6d6a06
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bsitu bs...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Yurik yu...@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 div width issue in well underneath code area - change (analytics...web)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix div width issue in well underneath code area
..
Fix div width issue in well underneath code area
Change-Id: I888d8056a2d6691dd72b8632ab57319418c669fd
---
M quarry/web/templates/query/view.html
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/quarry/web/templates/query/view.html
b/quarry/web/templates/query/view.html
index 4331500..99f7a58 100644
--- a/quarry/web/templates/query/view.html
+++ b/quarry/web/templates/query/view.html
@@ -32,7 +32,7 @@
h3SQL/h3
textarea id=code{% if latest_rev %}{{ latest_rev.text
}}{%endif%}/textarea
/div
-div class=row well
+div class=well
div class='col-md-8 only-edit'
By running queries you agree to the a
href=https://wikitech.wikimedia.org/wiki/Wikitech:Labs_Terms_of_use;Labs
ToS/a and you irrevocably agree to release your SQL under a
href=https://creativecommons.org/publicdomain/zero/1.0/;CC0 License/a.
/div
--
To view, visit https://gerrit.wikimedia.org/r/154046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I888d8056a2d6691dd72b8632ab57319418c669fd
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduce default height of SQL query text area - change (analytics...web)
jenkins-bot has submitted this change and it was merged.
Change subject: Reduce default height of SQL query text area
..
Reduce default height of SQL query text area
Change-Id: Ie2bead4a9de60070e4fa3604b093dd4ed3c225e5
---
M quarry/web/static/css/query/view.css
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/quarry/web/static/css/query/view.css
b/quarry/web/static/css/query/view.css
index 4ef0d85..a3921c3 100644
--- a/quarry/web/static/css/query/view.css
+++ b/quarry/web/static/css/query/view.css
@@ -27,7 +27,7 @@
.CodeMirror-scroll {
overflow-y: hidden;
overflow-x: auto;
-min-height: 250px;
+min-height: 144px;
}
#query-result-container {
--
To view, visit https://gerrit.wikimedia.org/r/154047
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2bead4a9de60070e4fa3604b093dd4ed3c225e5
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] shell_exports(): sort keys to stabalize output - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154048
Change subject: shell_exports(): sort keys to stabalize output
..
shell_exports(): sort keys to stabalize output
The standard hash order thing.
Change-Id: I77d82b7ba4cbf1efcbe2ae9c67ca2492b3391913
---
M modules/wmflib/lib/puppet/parser/functions/shell_exports.rb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/48/154048/1
diff --git a/modules/wmflib/lib/puppet/parser/functions/shell_exports.rb
b/modules/wmflib/lib/puppet/parser/functions/shell_exports.rb
index 71b0d96..4ea26eb 100644
--- a/modules/wmflib/lib/puppet/parser/functions/shell_exports.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/shell_exports.rb
@@ -41,6 +41,6 @@
vars, uppercase_keys = args
raise Puppet::ParseError, 'shell_exports() requires a hash argument'
unless vars.is_a? Hash
vars = Hash[vars.map { |k, v| [k.upcase, v] }] unless uppercase_keys ==
false
-vars.map { |k, v| export #{k}=#{v.to_pson} }.push('').join(\n)
+vars.sort.map { |k, v| export #{k}=#{v.to_pson} }.push('').join(\n)
end
end
--
To view, visit https://gerrit.wikimedia.org/r/154048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I77d82b7ba4cbf1efcbe2ae9c67ca2492b3391913
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] New Wikidata Build - 14/08/2014 10:00 - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged. Change subject: New Wikidata Build - 14/08/2014 10:00 .. New Wikidata Build - 14/08/2014 10:00 Change-Id: I6187a9a745d62c8a1d94f57f380bf5a91182f7ad --- M composer.lock M extensions/ValueView/README.md M extensions/ValueView/ValueView.php M extensions/ValueView/lib/jquery.ui/jquery.ui.ooMenu.js M extensions/ValueView/lib/jquery.ui/jquery.ui.suggester.js M extensions/ValueView/src/ExpertExtender/ExpertExtender.LanguageSelector.js M extensions/ValueView/tests/lib/jquery.ui/jquery.ui.suggester.tests.js M extensions/Wikibase/client/WikibaseClient.hooks.php M extensions/Wikibase/client/i18n/es.json M extensions/Wikibase/client/i18n/pt.json M extensions/Wikibase/client/i18n/qqq.json M extensions/Wikibase/client/i18n/zh-hant.json M extensions/Wikibase/client/includes/ChangeHandler.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php M extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php M extensions/Wikibase/client/includes/WikibaseClient.php M extensions/Wikibase/client/includes/hooks/InfoActionHookHandler.php M extensions/Wikibase/client/includes/hooks/LanguageLinkBadgeDisplay.php M extensions/Wikibase/client/includes/hooks/MovePageNotice.php M extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php M extensions/Wikibase/client/maintenance/populateInterwiki.php M extensions/Wikibase/client/tests/phpunit/MockClientStore.php M extensions/Wikibase/client/tests/phpunit/includes/ChangeHandlerTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RendererFactoryTest.php M extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php M extensions/Wikibase/client/tests/phpunit/includes/OtherProjectsSitesProviderTest.php M extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php M extensions/Wikibase/client/tests/phpunit/includes/hooks/LanguageLinkBadgeDisplayTest.php M extensions/Wikibase/lib/WikibaseLib.php M extensions/Wikibase/lib/config/WikibaseLib.default.php M extensions/Wikibase/lib/includes/DataValueFactory.php M extensions/Wikibase/lib/includes/Localizer/DispatchingExceptionLocalizer.php M extensions/Wikibase/lib/includes/Localizer/MessageExceptionLocalizer.php M extensions/Wikibase/lib/includes/Localizer/ParseExceptionLocalizer.php M extensions/Wikibase/lib/includes/Reporting/ReportingExceptionHandler.php M extensions/Wikibase/lib/includes/WikibaseDataTypeBuilders.php M extensions/Wikibase/lib/includes/changes/EntityChange.php M extensions/Wikibase/lib/includes/formatters/EntityIdHtmlLinkFormatter.php M extensions/Wikibase/lib/includes/formatters/EntityIdLabelFormatter.php M extensions/Wikibase/lib/includes/serializers/LegacyInternalEntitySerializer.php M extensions/Wikibase/lib/includes/serializers/SnakSerializer.php M extensions/Wikibase/lib/includes/store/CachingEntityRevisionLookup.php M extensions/Wikibase/lib/includes/store/EntityStore.php M extensions/Wikibase/lib/includes/store/UnresolvedRedirectException.php M extensions/Wikibase/lib/includes/store/sql/SqlEntityInfoBuilderFactory.php M extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php M extensions/Wikibase/lib/tests/phpunit/EntityRetrievingDataTypeLookupTest.php M extensions/Wikibase/lib/tests/phpunit/MockRepositoryTest.php M extensions/Wikibase/lib/tests/phpunit/NoBadDependencyUsageTest.php M extensions/Wikibase/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php M extensions/Wikibase/lib/tests/phpunit/changes/ItemChangeTest.php M extensions/Wikibase/lib/tests/phpunit/changes/TestChanges.php M extensions/Wikibase/lib/tests/phpunit/entity/EntityFactoryTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/EntityIdLabelFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/parsers/MonthNameUnlocalizerTest.php M extensions/Wikibase/lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php M extensions/Wikibase/lib/tests/phpunit/serializers/DispatchingEntitySerializerTest.php M extensions/Wikibase/lib/tests/phpunit/serializers/LegacyInternalEntitySerializerTest.php M extensions/Wikibase/lib/tests/phpunit/store/CachingEntityRevisionLookupTest.php M extensions/Wikibase/lib/tests/phpunit/store/ItemUsageIndexTest.php M extensions/Wikibase/lib/tests/phpunit/store/SiteLinkTableTest.php A extensions/Wikibase/repo/i18n/av.json M extensions/Wikibase/repo/i18n/gu.json M extensions/Wikibase/repo/i18n/pl.json M extensions/Wikibase/repo/i18n/pt.json M extensions/Wikibase/repo/i18n/sr-el.json M extensions/Wikibase/repo/i18n/zh-hant.json M extensions/Wikibase/repo/includes/WikibaseRepo.php M extensions/Wikibase/repo/includes/content/ItemContent.php M
[MediaWiki-commits] [Gerrit] Removed languages that fonts are missing - change (integration/jenkins-job-builder-config)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/154049 Change subject: Removed languages that fonts are missing .. Removed languages that fonts are missing Fonts are missing for Japanese and Chinese. The jobs should be restored when the fonts are installed. Change-Id: Iaace3ec1079dbd7392468cf451133ad1311a2fe9 --- M job_template.yaml 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/49/154049/1 diff --git a/job_template.yaml b/job_template.yaml index c9194dc..37bd8aa 100644 --- a/job_template.yaml +++ b/job_template.yaml @@ -41,7 +41,6 @@ - he - ilo - it - - ja - kn - mk - nb @@ -54,8 +53,6 @@ - uk - vi - yue - - zh-hans - - zh-hant - defaults: name: browsertests -- To view, visit https://gerrit.wikimedia.org/r/154049 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaace3ec1079dbd7392468cf451133ad1311a2fe9 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: cloudbees Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] nutcracker: used ordered_yaml() - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: nutcracker: used ordered_yaml()
..
nutcracker: used ordered_yaml()
..rather than a hideous template.
Change-Id: I4e878ca45038e261032611d373fd1690126bfa54
---
M modules/nutcracker/manifests/init.pp
D modules/nutcracker/templates/config.yml.erb
2 files changed, 1 insertion(+), 17 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/nutcracker/manifests/init.pp
b/modules/nutcracker/manifests/init.pp
index 879b79c..b3104d2 100644
--- a/modules/nutcracker/manifests/init.pp
+++ b/modules/nutcracker/manifests/init.pp
@@ -44,7 +44,7 @@
file { '/etc/nutcracker/nutcracker.yml':
ensure = $ensure,
-content = template('nutcracker/config.yml.erb'),
+content = ordered_yaml($pools),
owner = 'root',
group = 'root',
mode= '0444',
diff --git a/modules/nutcracker/templates/config.yml.erb
b/modules/nutcracker/templates/config.yml.erb
deleted file mode 100644
index 2ab8128..000
--- a/modules/nutcracker/templates/config.yml.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-%=
-require 'yaml'
-
-config = {}
-@pools.sort.each do |pool,settings|
-settings.sort.each do |k,v|
-settings[k] = case v.to_s
- when v.to_s.to_f.to_s then Float(v)
- when v.to_s.to_i.to_s then Integer(v)
- else v
-end
-end
-config[pool] = settings
-end
-config.to_yaml.gsub(/^---[^\n]*?\n/, '')
-%
--
To view, visit https://gerrit.wikimedia.org/r/154045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e878ca45038e261032611d373fd1690126bfa54
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] shell_exports(): sort keys to stabalize output - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: shell_exports(): sort keys to stabalize output
..
shell_exports(): sort keys to stabalize output
The standard hash order thing.
Change-Id: I77d82b7ba4cbf1efcbe2ae9c67ca2492b3391913
---
M modules/wmflib/lib/puppet/parser/functions/shell_exports.rb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/wmflib/lib/puppet/parser/functions/shell_exports.rb
b/modules/wmflib/lib/puppet/parser/functions/shell_exports.rb
index 71b0d96..4ea26eb 100644
--- a/modules/wmflib/lib/puppet/parser/functions/shell_exports.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/shell_exports.rb
@@ -41,6 +41,6 @@
vars, uppercase_keys = args
raise Puppet::ParseError, 'shell_exports() requires a hash argument'
unless vars.is_a? Hash
vars = Hash[vars.map { |k, v| [k.upcase, v] }] unless uppercase_keys ==
false
-vars.map { |k, v| export #{k}=#{v.to_pson} }.push('').join(\n)
+vars.sort.map { |k, v| export #{k}=#{v.to_pson} }.push('').join(\n)
end
end
--
To view, visit https://gerrit.wikimedia.org/r/154048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77d82b7ba4cbf1efcbe2ae9c67ca2492b3391913
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed languages for which fonts are missing - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: Removed languages for which fonts are missing .. Removed languages for which fonts are missing Fonts are missing for Japanese and Chinese. The jobs should be restored when the fonts are installed. Bug: 69535 Change-Id: Iaace3ec1079dbd7392468cf451133ad1311a2fe9 --- M job_template.yaml 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/job_template.yaml b/job_template.yaml index c9194dc..37bd8aa 100644 --- a/job_template.yaml +++ b/job_template.yaml @@ -41,7 +41,6 @@ - he - ilo - it - - ja - kn - mk - nb @@ -54,8 +53,6 @@ - uk - vi - yue - - zh-hans - - zh-hant - defaults: name: browsertests -- To view, visit https://gerrit.wikimedia.org/r/154049 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaace3ec1079dbd7392468cf451133ad1311a2fe9 Gerrit-PatchSet: 2 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: cloudbees Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: 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] Add role for PhpTags extension - change (mediawiki/vagrant)
Pastakhov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154051
Change subject: Add role for PhpTags extension
..
Add role for PhpTags extension
Change-Id: I3fd2efd08fb335a6045abd241725243f956cba43
---
A puppet/manifests/roles/phptags.pp
1 file changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/51/154051/1
diff --git a/puppet/manifests/roles/phptags.pp
b/puppet/manifests/roles/phptags.pp
new file mode 100644
index 000..3804431
--- /dev/null
+++ b/puppet/manifests/roles/phptags.pp
@@ -0,0 +1,15 @@
+# == Class: role::phptags
+# Configures PhpTags, an extension that implements the concept of Magic
expressions with PHP language syntax
+# in MediaWiki.
+class role::phptags {
+include role::mediawiki
+
+mediawiki::extension { 'PhpTags': }
+
+mediawiki::extension { 'PhpTagsFunctions':
+require = Mediawiki::Extension['PhpTags'],
+}
+mediawiki::extension { 'PhpTagsWiki':
+require = Mediawiki::Extension['PhpTags'],
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/154051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fd2efd08fb335a6045abd241725243f956cba43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Pastakhov pastak...@yandex.ru
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP Running language screenshot job using local Firefox - change (integration/jenkins-job-builder-config)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154052
Change subject: WIP Running language screenshot job using local Firefox
..
WIP Running language screenshot job using local Firefox
Change-Id: Iba1b693887d066339cff08773c91d1fcf3fa2d9f
---
M job_template.yaml
M jobs.yaml
2 files changed, 23 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/52/154052/1
diff --git a/job_template.yaml b/job_template.yaml
index 37bd8aa..364ebb3 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -15,6 +15,24 @@
- timed: 'H 3,18 * * *'
- job-template:
+name: 'browsertests-{name}-language-screenshot-{platform}-{browser}'
+defaults: browsertests
+project-type: matrix
+execution-strategy:
+ sequential: true
+axes:
+ - axis:
+type: label-expression
+name: label
+values:
+ - contintLabsSlave UbuntuPrecise
+ - axis:
+type: user-defined
+name: LANGUAGE_SCREENSHOT_CODE
+values:
+ - ja
+
+- job-template:
name: 'browsertests-{name}-language-screenshot-{platform}-{browser}-sauce'
defaults: browsertests
project-type: matrix
diff --git a/jobs.yaml b/jobs.yaml
index baf91f8..cb3a8df 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -320,6 +320,11 @@
browser: firefox
mediawiki_password_variable:
MEDIAWIKI_PASSWORD_LANGUAGESCREENSHOTBOT_WMFLABS_ORG
mediawiki_user: LanguageScreenshotBot
+ - 'browsertests-{name}-language-screenshot-{platform}-{browser}':
+browser: firefox
+headless: 'true'
+mediawiki_password_variable:
MEDIAWIKI_PASSWORD_LANGUAGESCREENSHOTBOT_WMFLABS_ORG
+mediawiki_user: LanguageScreenshotBot
# WikiLove
- project:
--
To view, visit https://gerrit.wikimedia.org/r/154052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba1b693887d066339cff08773c91d1fcf3fa2d9f
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove ResourceLoader dependencies to jquery and mediawiki - change (mediawiki...Wikibase)
Tobias Gritschacher has uploaded a new change for review. https://gerrit.wikimedia.org/r/154050 Change subject: Remove ResourceLoader dependencies to jquery and mediawiki .. Remove ResourceLoader dependencies to jquery and mediawiki Bug: 69468 Change-Id: Ieffc2f592bd044229ccf50bf48940e91d5659923 --- M lib/WikibaseLib.hooks.php M lib/resources/Resources.php M lib/resources/api/resources.php M lib/resources/experts/resources.php M lib/resources/parsers/resources.php 5 files changed, 0 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/50/154050/1 diff --git a/lib/WikibaseLib.hooks.php b/lib/WikibaseLib.hooks.php index 755af8d..1b9868e 100644 --- a/lib/WikibaseLib.hooks.php +++ b/lib/WikibaseLib.hooks.php @@ -264,7 +264,6 @@ 'tests/qunit/wikibase.store/store.EntityStore.tests.js', ), 'dependencies' = array( - 'jquery', 'wikibase.store.EntityStore', 'wikibase.tests.qunit.testrunner' ), @@ -300,7 +299,6 @@ 'tests/qunit/wikibase.sites.tests.js', ), 'dependencies' = array( - 'jquery', 'wikibase', 'wikibase.sites', 'wikibase.tests.qunit.testrunner', @@ -312,7 +310,6 @@ 'tests/qunit/wikibase.ValueViewBuilder.tests.js' ), 'dependencies' = array( - 'jquery', 'test.sinonjs', 'wikibase.ValueViewBuilder' ) diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php index 02a5922..a87d710 100644 --- a/lib/resources/Resources.php +++ b/lib/resources/Resources.php @@ -46,7 +46,6 @@ 'wikibase.Site.js', ), 'dependencies' = array( - 'jquery', 'mediawiki.util', 'util.inherit', 'wikibase', @@ -82,7 +81,6 @@ 'dependencies' = array( 'dataTypes.DataType', 'dataTypes.DataTypeStore', - 'jquery', 'mw.config.values.wbDataTypes', 'wikibase', ), @@ -179,7 +177,6 @@ 'json', 'user.tokens', 'mediawiki.api', - 'mediawiki', 'mw.config.values.wbRepo', 'wikibase', ) @@ -473,7 +470,6 @@ 'wikibase.ValueViewBuilder.js', ), 'dependencies' = array( - 'jquery', 'wikibase', 'jquery.valueview' ) diff --git a/lib/resources/api/resources.php b/lib/resources/api/resources.php index d3f54a9..36d3d51 100644 --- a/lib/resources/api/resources.php +++ b/lib/resources/api/resources.php @@ -30,7 +30,6 @@ ), 'dependencies' = array( 'json', - 'jquery', 'wikibase.api.__namespace', ) ), @@ -42,7 +41,6 @@ 'dependencies' = array( 'dataValues', 'json', - 'jquery', 'wikibase.api.__namespace', ) ), diff --git a/lib/resources/experts/resources.php b/lib/resources/experts/resources.php index 918bc70..f7dc9eb 100644 --- a/lib/resources/experts/resources.php +++ b/lib/resources/experts/resources.php @@ -42,7 +42,6 @@ 'EntityIdInput.js', ), 'dependencies' = array( - 'jquery', 'jquery.event.special.eachchange', 'jquery.valueview.Expert', 'jquery.valueview.experts.StringValue', diff --git a/lib/resources/parsers/resources.php b/lib/resources/parsers/resources.php index a4363eb..1c362f2 100644 --- a/lib/resources/parsers/resources.php +++
[MediaWiki-commits] [Gerrit] Add role for PhpTags extension - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Add role for PhpTags extension
..
Add role for PhpTags extension
Change-Id: I3fd2efd08fb335a6045abd241725243f956cba43
---
A puppet/manifests/roles/phptags.pp
1 file changed, 16 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/manifests/roles/phptags.pp
b/puppet/manifests/roles/phptags.pp
new file mode 100644
index 000..7df6604
--- /dev/null
+++ b/puppet/manifests/roles/phptags.pp
@@ -0,0 +1,16 @@
+# == Class: role::phptags
+# Configures PhpTags, an extension that implements the concept of Magic
+# expressions with PHP language syntax in MediaWiki.
+#
+class role::phptags {
+include role::mediawiki
+
+mediawiki::extension { 'PhpTags': }
+
+mediawiki::extension { 'PhpTagsFunctions':
+require = Mediawiki::Extension['PhpTags'],
+}
+mediawiki::extension { 'PhpTagsWiki':
+require = Mediawiki::Extension['PhpTags'],
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/154051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3fd2efd08fb335a6045abd241725243f956cba43
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Pastakhov pastak...@yandex.ru
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: fix ansi escapes for wmf-beta-autoupdater - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: beta: fix ansi escapes for wmf-beta-autoupdater
..
beta: fix ansi escapes for wmf-beta-autoupdater
* the ANSI escape to reset color was wrong. Fixed it up.
* changed colors scheme entirely
* created entry for level CRITICAL, although it is unused.
Change-Id: I8423bd8e9c072fb8b55622be20b34686e6ca0651
---
M modules/beta/templates/wmf-beta-autoupdate.py.erb
1 file changed, 11 insertions(+), 8 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/beta/templates/wmf-beta-autoupdate.py.erb
b/modules/beta/templates/wmf-beta-autoupdate.py.erb
index a7fe331..1cbd6b4 100755
--- a/modules/beta/templates/wmf-beta-autoupdate.py.erb
+++ b/modules/beta/templates/wmf-beta-autoupdate.py.erb
@@ -35,18 +35,21 @@
options = parse_args()
logging.basicConfig(level=options.log_level)
# Color codes http://www.tldp.org/HOWTO/Bash-Prompt-HOWTO/x329.html
-logging.addLevelName(
-logging.DEBUG, \033[0;37m%s\033[1;m %
+logging.addLevelName( # cyan
+logging.DEBUG, \033[36m%s\033[0m %
logging.getLevelName(logging.DEBUG))
-logging.addLevelName(
-logging.INFO, \033[1;33m%s\033[1;m %
+logging.addLevelName( # green
+logging.INFO, \033[32m%s\033[0m %
logging.getLevelName(logging.INFO))
-logging.addLevelName(
-logging.WARNING, \033[1;31m%s\033[1;m %
+logging.addLevelName( # yellow
+logging.WARNING, \033[33m%s\033[0m %
logging.getLevelName(logging.WARNING))
-logging.addLevelName(
-logging.ERROR, \033[1;41m%s\033[1;m %
+logging.addLevelName( # red
+logging.ERROR, \033[31m%s\033[0m %
logging.getLevelName(logging.ERROR))
+logging.addLevelName( # red background
+logging.CRITICAL, \033[41m%s\033[0m %
+logging.getLevelName(logging.CRITICAL))
logger = logging.getLogger('main')
--
To view, visit https://gerrit.wikimedia.org/r/152063
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8423bd8e9c072fb8b55622be20b34686e6ca0651
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Skip spam check if one of the recipients is postmaster@ or a... - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Skip spam check if one of the recipients is postmaster@ or
abuse@
..
Skip spam check if one of the recipients is postmaster@ or abuse@
Right now spam reports to abuse@ can be rejected at the SMTP layer
if the spam score is too high. Let's avoid the issue altogether and
not run SpamAssassin on these.
Change-Id: I1ef3ab5606e4c47fb3e33c0554bc057c1277ff71
---
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index 958204e..66559a1 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -206,7 +206,8 @@
# Accept mail for postmaster without further policy checking,
# for compliance with the RFCs
- accept local_parts = postmaster
+ accept local_parts = postmaster : abuse
+ set acl_m2 = skip_spamd
% end -%
# Verify the recipient address for local domains, or require the
@@ -273,6 +274,9 @@
# the message is not too large
accept condition = ${if {$message_size}{400K}}
+ # Skip if so requested
+ accept condition = ${if eq{$acl_m2}{skip_spamd}}
+
# Add spam headers if score = 1
warn spam = nonexistent:true
condition = ${if {$spam_score_int}{10}{1}{0}}
--
To view, visit https://gerrit.wikimedia.org/r/154044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1ef3ab5606e4c47fb3e33c0554bc057c1277ff71
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@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] Update to php codesniffer 1.4.8 - change (integration/phpcs)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154053
Change subject: Update to php codesniffer 1.4.8
..
Update to php codesniffer 1.4.8
Change-Id: I2711cface7e8589674759da56c148ac5305c88e5
---
M composer.lock
M vendor/autoload.php
M vendor/bin/phpcs
M vendor/composer/ClassLoader.php
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_namespaces.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
M vendor/squizlabs/php_codesniffer/CodeSniffer.php
M vendor/squizlabs/php_codesniffer/CodeSniffer/CLI.php
M vendor/squizlabs/php_codesniffer/CodeSniffer/CommentParser/AbstractParser.php
M vendor/squizlabs/php_codesniffer/CodeSniffer/Reports/Junit.php
M vendor/squizlabs/php_codesniffer/CodeSniffer/Reports/VersionControl.php
M vendor/squizlabs/php_codesniffer/CodeSniffer/Reports/Xml.php
M
vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Debug/JSHintSniff.php
M
vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php
M
vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php
M
vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php
M vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/PSR2/ruleset.xml
M
vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php
M
vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
M vendor/squizlabs/php_codesniffer/CodeSniffer/Tokenizers/PHP.php
M vendor/squizlabs/php_codesniffer/README.markdown
23 files changed, 295 insertions(+), 100 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/phpcs
refs/changes/53/154053/1
diff --git a/composer.lock b/composer.lock
index 0f9c3b3..14366b8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,22 +1,23 @@
{
_readme: [
This file locks the dependencies of your project to a known state,
-Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;
+Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
+This file is @generated automatically
],
-hash: f4e244a1cb6051d9654090e62b00f806,
+hash: 6f3c708e2a4324ba1de5fb7974354f66,
packages: [
{
name: squizlabs/php_codesniffer,
-version: 1.4.7,
+version: 1.4.8,
source: {
type: git,
url: https://github.com/squizlabs/PHP_CodeSniffer.git;,
-reference: df764a1604607ea61c4eeea5410666e27cb37a8b
+reference: d26daa8096ad2c8758677f0352597f8cda4722e0
},
dist: {
type: zip,
-url:
https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/df764a1604607ea61c4eeea5410666e27cb37a8b;,
-reference: df764a1604607ea61c4eeea5410666e27cb37a8b,
+url:
https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d26daa8096ad2c8758677f0352597f8cda4722e0;,
+reference: d26daa8096ad2c8758677f0352597f8cda4722e0,
shasum:
},
require: {
@@ -74,7 +75,7 @@
phpcs,
standards
],
-time: 2013-09-26 00:08:21
+time: 2013-11-25 22:07:04
}
],
packages-dev: [
@@ -87,6 +88,7 @@
stability-flags: [
],
+prefer-stable: false,
platform: [
],
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 2ecf628..a19e756 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -1,7 +1,7 @@
?php
-// autoload.php generated by Composer
+// autoload.php @generated by Composer
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit1be100bcbc5d0659bba7bc953ed5857d::getLoader();
+return ComposerAutoloaderInitd41e8c62304ef64ba1295f5c995f1425::getLoader();
diff --git a/vendor/bin/phpcs b/vendor/bin/phpcs
index 1be0fae..f0b9f9d 12
--- a/vendor/bin/phpcs
+++ b/vendor/bin/phpcs
@@ -1 +1,7 @@
-../squizlabs/php_codesniffer/scripts/phpcs
\ No newline at end of file
+#!/usr/bin/env sh
+SRC_DIR=`pwd`
+cd `dirname $0`
+cd ../squizlabs/php_codesniffer/scripts
+BIN_TARGET=`pwd`/phpcs
+cd $SRC_DIR
+$BIN_TARGET $@
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index bcf9809..4433649 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -42,19 +42,36 @@
*/
class ClassLoader
{
-private $prefixes = array();
-private $fallbackDirs = array();
+// PSR-4
+private $prefixLengthsPsr4 = array();
+private $prefixDirsPsr4 = array();
+private $fallbackDirsPsr4 = array();
+
+// PSR-0
+private
[MediaWiki-commits] [Gerrit] Bumping up version of wikimetrics module - change (operations/puppet)
Ottomata has submitted this change and it was merged. Change subject: Bumping up version of wikimetrics module .. Bumping up version of wikimetrics module Change-Id: I953ea5ee0ae270cdfba46e92955d94c7b83dabb1 --- M modules/wikimetrics 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/modules/wikimetrics b/modules/wikimetrics index 0e4af73..d0a4350 16 --- a/modules/wikimetrics +++ b/modules/wikimetrics -Subproject commit 0e4af7341f28f652466c31fe0ddd028dab5264cb +Subproject commit d0a43502b7e4d0066a39ecd05a85030d2b7624e3 -- To view, visit https://gerrit.wikimedia.org/r/154019 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I953ea5ee0ae270cdfba46e92955d94c7b83dabb1 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Nuria nu...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] hhvm: add Provides: php5 - change (operations...hhvm)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: hhvm: add Provides: php5
..
hhvm: add Provides: php5
Change-Id: I5c43a427ac2849d7ea665c0ac7eca4373925656f
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M debian/changelog
M debian/control
2 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/debian/changelog b/debian/changelog
index ad7ca35..0b241a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hhvm (3.3-dev+20140728+wmf4) trusty-wikimedia; urgency=low
+
+ * Add php5 to the 'provides' list for hhvm
+
+ -- Giuseppe Lavagetto glavage...@wikimedia.org Thu, 14 Aug 2014 12:29:40
+0200
+
hhvm (3.3-dev+20140728+wmf3) trusty-wikimedia; urgency=low
* lintian fixes
diff --git a/debian/control b/debian/control
index 11ee451..47ea383 100644
--- a/debian/control
+++ b/debian/control
@@ -64,7 +64,7 @@
Package: hhvm
Architecture: amd64
Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: ${hhvm:ApiVersion}
+Provides: ${hhvm:ApiVersion}, php5
Description: HipHop Virtual Machine, a JIT replacement for PHP
HHVM is a new open-source virtual machine designed for executing programs
written in PHP. HHVM uses a just-in-time (JIT) compilation approach to
--
To view, visit https://gerrit.wikimedia.org/r/154030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c43a427ac2849d7ea665c0ac7eca4373925656f
Gerrit-PatchSet: 2
Gerrit-Project: operations/debs/hhvm
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: 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] Allow CORS for all origins on Special:EntityData - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow CORS for all origins on Special:EntityData
..
Allow CORS for all origins on Special:EntityData
Nothing controversial there so this can safely be exposed
to all JavaScript users.
Change-Id: I07e24c6a0f96319d58f6570ab3c0cfa3493ed173
---
M repo/includes/LinkedData/EntityDataRequestHandler.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Aude: Looks good to me, approved
WikidataJenkins: Verified
Jeroen De Dauw: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/repo/includes/LinkedData/EntityDataRequestHandler.php
b/repo/includes/LinkedData/EntityDataRequestHandler.php
index a89b6f8..a3812d9 100644
--- a/repo/includes/LinkedData/EntityDataRequestHandler.php
+++ b/repo/includes/LinkedData/EntityDataRequestHandler.php
@@ -422,6 +422,7 @@
$smaxage = max( 0, min( 60 * 60 * 24 * 31, $smaxage ) );
$response-header( 'Content-Type: ' . $contentType . ';
charset=UTF-8' );
+ $response-header( 'Access-Control-Allow-Origin: *' );
if ( $lastModified ) {
$response-header( 'Last-Modified: ' . wfTimestamp(
TS_RFC2822, $lastModified ) );
--
To view, visit https://gerrit.wikimedia.org/r/152196
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I07e24c6a0f96319d58f6570ab3c0cfa3493ed173
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Magnus Manske magnusman...@googlemail.com
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Version 2.0 - change (mediawiki...SemanticDrilldown)
Yaron Koren has uploaded a new change for review. https://gerrit.wikimedia.org/r/154054 Change subject: Version 2.0 .. Version 2.0 Change-Id: I9785dd420384c7c5b79f9af13cbb774491326cad --- M INSTALL M README M SemanticDrilldown.php 3 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticDrilldown refs/changes/54/154054/1 diff --git a/INSTALL b/INSTALL index ec5da53..0d2bd06 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -[[Semantic Drilldown 1.5]] +[[Semantic Drilldown 2.0]] Contents: * Disclaimer diff --git a/README b/README index 23d4a14..f0b246f 100644 --- a/README +++ b/README @@ -12,13 +12,14 @@ == Credits == -Semantic Drilldown was mainly written by Yaron Koren and David Loomer. +Semantic Drilldown was mainly written by Yaron Koren. Important contributions were made by Sanyam Goyal as part of the 2010 -Google Summer of Code. +Google Summer of Code, by Ankit Garg as part of the 2011 Google Summer +of Code, and by David Loomer, MWJames and others. -Language translations were provided by many people; see the -file /languages/SD_Messages.php for the full listing. +Language translations were provided by many people; see the files in +the /i18n directory for the full listings. == Contact == diff --git a/SemanticDrilldown.php b/SemanticDrilldown.php index 7addf3d..a4f0c0c 100644 --- a/SemanticDrilldown.php +++ b/SemanticDrilldown.php @@ -13,7 +13,7 @@ if ( !defined( 'MEDIAWIKI' ) ) die(); -define( 'SD_VERSION', '2.0-alpha' ); +define( 'SD_VERSION', '2.0' ); $wgExtensionCredits[defined( 'SEMANTIC_EXTENSION_TYPE' ) ? 'semantic' : 'specialpage'][] = array( 'path'= __FILE__, -- To view, visit https://gerrit.wikimedia.org/r/154054 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9785dd420384c7c5b79f9af13cbb774491326cad Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticDrilldown Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove stray wfProfileOut call in EditEntity - change (mediawiki...Wikibase)
Hoo man has submitted this change and it was merged. Change subject: Remove stray wfProfileOut call in EditEntity .. Remove stray wfProfileOut call in EditEntity Change-Id: If1458984ac9c2142102c637cbc4271acda5aceb8 --- M repo/includes/EditEntity.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: WikidataJenkins: Verified Jeroen De Dauw: Looks good to me, approved jenkins-bot: Checked diff --git a/repo/includes/EditEntity.php b/repo/includes/EditEntity.php index 9486dd9..4e8c016 100644 --- a/repo/includes/EditEntity.php +++ b/repo/includes/EditEntity.php @@ -786,7 +786,6 @@ $this-status-fatal( 'edit-conflict' ); $this-errorType |= self::EDIT_CONFLICT_ERROR; - wfProfileOut( Wikibase- . __METHOD__ ); return $this-status; } } -- To view, visit https://gerrit.wikimedia.org/r/153113 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If1458984ac9c2142102c637cbc4271acda5aceb8 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Version 2.0 - change (mediawiki...SemanticDrilldown)
jenkins-bot has submitted this change and it was merged. Change subject: Version 2.0 .. Version 2.0 Change-Id: I9785dd420384c7c5b79f9af13cbb774491326cad --- M INSTALL M README M SemanticDrilldown.php 3 files changed, 7 insertions(+), 6 deletions(-) Approvals: Yaron Koren: Checked; Looks good to me, approved jenkins-bot: Verified diff --git a/INSTALL b/INSTALL index ec5da53..0d2bd06 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -[[Semantic Drilldown 1.5]] +[[Semantic Drilldown 2.0]] Contents: * Disclaimer diff --git a/README b/README index 23d4a14..f0b246f 100644 --- a/README +++ b/README @@ -12,13 +12,14 @@ == Credits == -Semantic Drilldown was mainly written by Yaron Koren and David Loomer. +Semantic Drilldown was mainly written by Yaron Koren. Important contributions were made by Sanyam Goyal as part of the 2010 -Google Summer of Code. +Google Summer of Code, by Ankit Garg as part of the 2011 Google Summer +of Code, and by David Loomer, MWJames and others. -Language translations were provided by many people; see the -file /languages/SD_Messages.php for the full listing. +Language translations were provided by many people; see the files in +the /i18n directory for the full listings. == Contact == diff --git a/SemanticDrilldown.php b/SemanticDrilldown.php index 7addf3d..a4f0c0c 100644 --- a/SemanticDrilldown.php +++ b/SemanticDrilldown.php @@ -13,7 +13,7 @@ if ( !defined( 'MEDIAWIKI' ) ) die(); -define( 'SD_VERSION', '2.0-alpha' ); +define( 'SD_VERSION', '2.0' ); $wgExtensionCredits[defined( 'SEMANTIC_EXTENSION_TYPE' ) ? 'semantic' : 'specialpage'][] = array( 'path'= __FILE__, -- To view, visit https://gerrit.wikimedia.org/r/154054 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9785dd420384c7c5b79f9af13cbb774491326cad Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticDrilldown Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: Yaron Koren yaro...@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] background-image in consistent way - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154056
Change subject: background-image in consistent way
..
background-image in consistent way
Change-Id: I74a9355ea50daf694dbc045affdfcf7bbedaf467
---
M modules/entrypoint/styles/ext.cx.entrypoint.less
M modules/header/styles/ext.cx.header.less
M modules/source/styles/ext.cx.source.selector.less
M modules/tools/styles/ext.cx.tools.less
M modules/tools/styles/ext.cx.tools.reference.less
5 files changed, 22 insertions(+), 27 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/56/154056/1
diff --git a/modules/entrypoint/styles/ext.cx.entrypoint.less
b/modules/entrypoint/styles/ext.cx.entrypoint.less
index 808f427..70a7cef 100644
--- a/modules/entrypoint/styles/ext.cx.entrypoint.less
+++ b/modules/entrypoint/styles/ext.cx.entrypoint.less
@@ -1,4 +1,5 @@
@import ../../base/styles/grid/agora-grid;
+@import mediawiki.mixins;
/* TODO remove when the grid is updated */
.hidden {
@@ -30,12 +31,9 @@
background-color: #fbfbfb;
.icon-close {
- /* @embed */
- background: transparent url('../images/close.png') no-repeat
scroll center center;
- /* @embed */
- background-image: -webkit-linear-gradient(transparent,
transparent), url('../images/close.svg');
- /* @embed */
- background-image: linear-gradient(transparent, transparent),
url('../images/close.svg');
+ .background-image-svg('../images/close.svg',
'../images/close.png');
+ background-position: center center;
+ background-repeat: no-repeat;
float: right;
padding: 15px;
cursor: pointer;
diff --git a/modules/header/styles/ext.cx.header.less
b/modules/header/styles/ext.cx.header.less
index 6caac05..ff218e8 100644
--- a/modules/header/styles/ext.cx.header.less
+++ b/modules/header/styles/ext.cx.header.less
@@ -1,4 +1,5 @@
@import ../../base/styles/grid/agora-grid;
+@import mediawiki.mixins;
.cx-header__logo {
.mw-ui-item;
@@ -63,12 +64,11 @@
@horizontal-margin: 15px;
float: right;
padding: @vertical-margin @horizontal-margin;
- /* @embed */
- background: url(../images/clear.png) no-repeat scroll 10px
center;
- /* @embed */
- background-image: -webkit-linear-gradient(transparent,
transparent), url(../images/clear.svg);
- /* @embed */
- background-image: linear-gradient(transparent, transparent),
url(../images/clear.svg);
+
+ .background-image-svg('../images/clear.svg',
'../images/clear.png');
+ background-attachment: scroll;
+ background-position: 10px center;
+ background-repeat: no-repeat;
background-size: 15px;
cursor: pointer;
clear: both;
diff --git a/modules/source/styles/ext.cx.source.selector.less
b/modules/source/styles/ext.cx.source.selector.less
index 9fa0b43..eb71247 100644
--- a/modules/source/styles/ext.cx.source.selector.less
+++ b/modules/source/styles/ext.cx.source.selector.less
@@ -58,10 +58,9 @@
-webkit-appearance: none;
[type=search] {
- /* @embed */
.background-image-svg('../../tools/images/search.svg',
'../../tools/images/search.png');
- background-repeat: no-repeat;
background-position: 5px center;
+ background-repeat: no-repeat;
background-size: 20px;
padding-left: 30px;
}
diff --git a/modules/tools/styles/ext.cx.tools.less
b/modules/tools/styles/ext.cx.tools.less
index ee0e444..4e3b71b 100644
--- a/modules/tools/styles/ext.cx.tools.less
+++ b/modules/tools/styles/ext.cx.tools.less
@@ -1,12 +1,11 @@
@import ../../base/styles/grid/agora-grid;
+@import mediawiki.mixins;
.card.search {
- /* @embed */
- background: url(../images/search.png) no-repeat scroll 10px center
#FF;
- /* @embed */
- background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/search.svg);
- /* @embed */
- background-image: linear-gradient(transparent, transparent),
url(../images/search.svg);
+ .background-image-svg('../images/search.svg', '../images/search.png');
+ background-color: #FFF;
+ background-position: 10px center;
+ background-repeat: no-repeat;
background-size: 25px;
padding: 0 10px 0 40px;
line-height: 2.5em;
@@ -23,4 +22,4 @@
.cx-tools__loading-indicator{
padding-top: 50px;
-}
\ No newline at end of file
+}
diff --git a/modules/tools/styles/ext.cx.tools.reference.less
b/modules/tools/styles/ext.cx.tools.reference.less
index 5f2a89e..2a83e76
[MediaWiki-commits] [Gerrit] Optimize pngs - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/154055 Change subject: Optimize pngs .. Optimize pngs modules/header/images/wikipedia-logo-landscape.png | Bin 16578 - 14382 bytes modules/tools/images/link_lightgray.png| Bin 18971 - 9444 bytes modules/tools/images/pasting.png | Bin 382 - 372 bytes modules/tools/images/search.png| Bin 1055 - 989 bytes Change-Id: Id1dc04dfa5b62630d287967a05a6bfea6494f80d --- M modules/header/images/wikipedia-logo-landscape.png M modules/tools/images/link_lightgray.png M modules/tools/images/pasting.png M modules/tools/images/search.png 4 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/55/154055/1 diff --git a/modules/header/images/wikipedia-logo-landscape.png b/modules/header/images/wikipedia-logo-landscape.png index 2d18f68..8638e36 100644 --- a/modules/header/images/wikipedia-logo-landscape.png +++ b/modules/header/images/wikipedia-logo-landscape.png Binary files differ diff --git a/modules/tools/images/link_lightgray.png b/modules/tools/images/link_lightgray.png index d51f35a..0879104 100644 --- a/modules/tools/images/link_lightgray.png +++ b/modules/tools/images/link_lightgray.png Binary files differ diff --git a/modules/tools/images/pasting.png b/modules/tools/images/pasting.png index 8cfc288..5a4eabc 100644 --- a/modules/tools/images/pasting.png +++ b/modules/tools/images/pasting.png Binary files differ diff --git a/modules/tools/images/search.png b/modules/tools/images/search.png index 968d894..8ec5f72 100644 --- a/modules/tools/images/search.png +++ b/modules/tools/images/search.png Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/154055 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1dc04dfa5b62630d287967a05a6bfea6494f80d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation 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 Vector from extensions - change (mediawiki...release)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/154057 Change subject: Remove Vector from extensions .. Remove Vector from extensions Change-Id: Iae64d7f08edd572ca33f0ae7155d7b34dd91232d --- M make-wmf-branch/default.conf 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release refs/changes/57/154057/1 diff --git a/make-wmf-branch/default.conf b/make-wmf-branch/default.conf index 04e0242..85c625b 100644 --- a/make-wmf-branch/default.conf +++ b/make-wmf-branch/default.conf @@ -142,7 +142,6 @@ 'UploadWizard', 'UserDailyContribs', 'UserMerge', - 'Vector', 'VectorBeta', 'VipsScaler', 'VisualEditor', -- To view, visit https://gerrit.wikimedia.org/r/154057 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae64d7f08edd572ca33f0ae7155d7b34dd91232d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master 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] Remove Vector from extensions - change (mediawiki...release)
jenkins-bot has submitted this change and it was merged. Change subject: Remove Vector from extensions .. Remove Vector from extensions Change-Id: Iae64d7f08edd572ca33f0ae7155d7b34dd91232d --- M make-wmf-branch/default.conf 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/make-wmf-branch/default.conf b/make-wmf-branch/default.conf index 04e0242..85c625b 100644 --- a/make-wmf-branch/default.conf +++ b/make-wmf-branch/default.conf @@ -142,7 +142,6 @@ 'UploadWizard', 'UserDailyContribs', 'UserMerge', - 'Vector', 'VectorBeta', 'VipsScaler', 'VisualEditor', -- To view, visit https://gerrit.wikimedia.org/r/154057 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iae64d7f08edd572ca33f0ae7155d7b34dd91232d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@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] Do not +2 on verified based just on linting - change (integration/zuul-config)
Jeroen De Dauw has uploaded a new change for review. https://gerrit.wikimedia.org/r/154058 Change subject: Do not +2 on verified based just on linting .. Do not +2 on verified based just on linting Change-Id: I75408d59ddf8e4702a32cfc9cb753a96dd339c55 --- M layout.yaml 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/58/154058/1 diff --git a/layout.yaml b/layout.yaml index 8e091b6..1e4181e 100644 --- a/layout.yaml +++ b/layout.yaml @@ -5534,10 +5534,6 @@ - mwext-Wikibase-jslint - mwext-Wikibase-lint - php-composer-validate -gate-and-submit: - - mwext-Wikibase-jslint - - mwext-Wikibase-lint - - php-composer-validate - name: mediawiki/extensions/WikibaseQuery template: -- To view, visit https://gerrit.wikimedia.org/r/154058 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I75408d59ddf8e4702a32cfc9cb753a96dd339c55 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Override group permissions on /etc/send_nsca.cfg on Hadoop w... - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154059
Change subject: Override group permissions on /etc/send_nsca.cfg on Hadoop
worker nodes
..
Override group permissions on /etc/send_nsca.cfg on Hadoop worker nodes
This allows Hadoop processes to run send_nsca.
Change-Id: I2529021517cb085dc526eacddb19231e290e0b14
---
M manifests/role/analytics/hadoop.pp
1 file changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/154059/1
diff --git a/manifests/role/analytics/hadoop.pp
b/manifests/role/analytics/hadoop.pp
index eadd7e0..b9d5aa2 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -401,7 +401,19 @@
# for generating alerts. We need the nsca-client package
# to do this remotely. Some oozie jobs use this,
# and it must be present on all datanodes.
-include icinga::monitor::nsca::client
+include role::analytics::hadoop::monitor::nsca::client
+}
+
+# == Class role::analytics::hadoop::monitor::nsca::client
+# This class exists in order to override the group ownership
+# and permissions of the /etc/send_nsca.cfg file. Hadoop
+# processes need to be able to read this file in order to
+# run send_nsca as part of Oozie submitted monitoring jobs.
+class role::analytics::hadoop::monitor::nsca::client inherits
icinga::monitor::nsca::client {
+File ['/etc/send_nsca.cfg'] {
+group = 'hadoop',
+mode = '0440',
+}
}
# == Class role::analytics::hadoop::standby
--
To view, visit https://gerrit.wikimedia.org/r/154059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2529021517cb085dc526eacddb19231e290e0b14
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ignore local browsertest files - change (mediawiki...Math)
Physikerwelt has uploaded a new change for review. https://gerrit.wikimedia.org/r/154060 Change subject: Ignore local browsertest files .. Ignore local browsertest files Change-Id: If4573c4ca0feb80a35a008133e55e91e82b68651 --- M .gitignore 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math refs/changes/60/154060/1 diff --git a/.gitignore b/.gitignore index ed865bf..868c8aa 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,5 @@ modules/MathJax/unpacked/jax/output/SVG/fonts/Latin-Modern modules/MathJax/unpacked/jax/output/SVG/fonts/Neo-Euler modules/MathJax/unpacked/jax/output/SVG/fonts/STIX-Web +tests/browser/.bundle +tests/browser/.gem -- To view, visit https://gerrit.wikimedia.org/r/154060 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If4573c4ca0feb80a35a008133e55e91e82b68651 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: Physikerwelt w...@physikerwelt.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Apply the ve.copy callback to all nodes, not just leaves - change (oojs/core)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154061
Change subject: Apply the ve.copy callback to all nodes, not just leaves
..
Apply the ve.copy callback to all nodes, not just leaves
Applying the callback only to leaves makes it impossible to use the
callback to alter the representation of arrays or object with `clone`
methods. It's also rather unpredictable, unless you know all the details
of the implementation of ve.copy. Invoking the callback on every node
is more regular and more capable.
Change-Id: I9a68b28cd145c03dacb6cee3bf8c53697d8bc071
---
M src/core.js
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/61/154061/1
diff --git a/src/core.js b/src/core.js
index 535019c..a9480cd 100644
--- a/src/core.js
+++ b/src/core.js
@@ -247,14 +247,14 @@
* Copies are deep, and will either be an object or an array depending on
`source`.
*
* @param {Object} source Object to copy
- * @param {Function} [callback] Applied to leaf values before they added to
the clone
+ * @param {Function} [callback] Applied to values before they added to the
clone
* @return {Object} Copy of source object
*/
oo.copy = function ( source, callback ) {
var key, sourceValue, sourceType, destination;
if ( typeof source.clone === 'function' ) {
- return source.clone();
+ return callback ? callback( source.clone() ) : source.clone();
}
destination = Array.isArray( source ) ? new Array( source.length ) : {};
@@ -282,7 +282,7 @@
}
}
- return destination;
+ return callback ? callback( destination ) : destination;
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/154061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a68b28cd145c03dacb6cee3bf8c53697d8bc071
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Additional python packages for stats servers - change (operations/puppet)
Ottomata has submitted this change and it was merged. Change subject: Additional python packages for stats servers .. Additional python packages for stats servers * python-boto - Amazon S3 access (needed to get zero sms logs) * python-pandas- Pivot tables processing * python-requests - Simple lib to make API calls * python-unidecode - Unicode simplification - converts everything to latin set Change-Id: I271e081b6fe3503725ef03aba6607c7abfded383 --- M manifests/misc/statistics.pp 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp index d8f76bb..d156ebd 100644 --- a/manifests/misc/statistics.pp +++ b/manifests/misc/statistics.pp @@ -113,6 +113,10 @@ 'python-dateutil', 'python-numpy', 'python-scipy', +'python-boto', # Amazon S3 access (needed to get zero sms logs) +'python-pandas',# Pivot tables processing +'python-requests', # Simple lib to make API calls +'python-unidecode', # Unicode simplification - converts everything to latin set ]: ensure = 'installed', } -- To view, visit https://gerrit.wikimedia.org/r/154004 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I271e081b6fe3503725ef03aba6607c7abfded383 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yurik yu...@wikimedia.org Gerrit-Reviewer: DarTar dtarabore...@wikimedia.org Gerrit-Reviewer: Milimetric dandree...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add symlinks - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/154062 Change subject: Add symlinks .. Add symlinks Change-Id: Id7f96eaf7defb591902f42c339edb2fb297532b2 --- A docroot/bits/static-1.24wmf17/extensions A docroot/bits/static-1.24wmf17/resources A docroot/bits/static-1.24wmf17/skins A w/static-1.24wmf17/extensions A w/static-1.24wmf17/resources A w/static-1.24wmf17/skins 6 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/62/154062/1 diff --git a/docroot/bits/static-1.24wmf17/extensions b/docroot/bits/static-1.24wmf17/extensions new file mode 12 index 000..910cd16 --- /dev/null +++ b/docroot/bits/static-1.24wmf17/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.24wmf17/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf17/resources b/docroot/bits/static-1.24wmf17/resources new file mode 12 index 000..87f6a5f --- /dev/null +++ b/docroot/bits/static-1.24wmf17/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.24wmf17/resources \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf17/skins b/docroot/bits/static-1.24wmf17/skins new file mode 12 index 000..cc057d7 --- /dev/null +++ b/docroot/bits/static-1.24wmf17/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.24wmf17/skins/ \ No newline at end of file diff --git a/w/static-1.24wmf17/extensions b/w/static-1.24wmf17/extensions new file mode 12 index 000..910cd16 --- /dev/null +++ b/w/static-1.24wmf17/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.24wmf17/extensions \ No newline at end of file diff --git a/w/static-1.24wmf17/resources b/w/static-1.24wmf17/resources new file mode 12 index 000..87f6a5f --- /dev/null +++ b/w/static-1.24wmf17/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.24wmf17/resources \ No newline at end of file diff --git a/w/static-1.24wmf17/skins b/w/static-1.24wmf17/skins new file mode 12 index 000..6ec7610 --- /dev/null +++ b/w/static-1.24wmf17/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.24wmf17/skins \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/154062 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id7f96eaf7defb591902f42c339edb2fb297532b2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master 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] group0 to 1.24wmf17 - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/154065 Change subject: group0 to 1.24wmf17 .. group0 to 1.24wmf17 Change-Id: Ib77df6cc49a305e2833efc4a73434c3fe4de29d4 --- M wikiversions.json 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/65/154065/1 diff --git a/wikiversions.json b/wikiversions.json index e654a28..8403724 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -467,7 +467,7 @@ lvwiktionary: php-1.24wmf16, map_bmswiki: php-1.24wmf16, mdfwiki: php-1.24wmf16, -mediawikiwiki: php-1.24wmf16, +mediawikiwiki: php-1.24wmf17, metawiki: php-1.24wmf16, mgwiki: php-1.24wmf16, mgwikibooks: php-1.24wmf16, @@ -733,9 +733,9 @@ tawikisource: php-1.24wmf16, tawiktionary: php-1.24wmf16, tenwiki: php-1.24wmf16, -test2wiki: php-1.24wmf16, +test2wiki: php-1.24wmf17, testwiki: php-1.24wmf17, -testwikidatawiki: php-1.24wmf16, +testwikidatawiki: php-1.24wmf17, tetwiki: php-1.24wmf16, tewiki: php-1.24wmf16, tewikibooks: php-1.24wmf16, -- To view, visit https://gerrit.wikimedia.org/r/154065 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib77df6cc49a305e2833efc4a73434c3fe4de29d4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master 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] Add symlinks - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add symlinks .. Add symlinks Change-Id: Id7f96eaf7defb591902f42c339edb2fb297532b2 --- A docroot/bits/static-1.24wmf17/extensions A docroot/bits/static-1.24wmf17/resources A docroot/bits/static-1.24wmf17/skins A w/static-1.24wmf17/extensions A w/static-1.24wmf17/resources A w/static-1.24wmf17/skins 6 files changed, 6 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/docroot/bits/static-1.24wmf17/extensions b/docroot/bits/static-1.24wmf17/extensions new file mode 12 index 000..910cd16 --- /dev/null +++ b/docroot/bits/static-1.24wmf17/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.24wmf17/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf17/resources b/docroot/bits/static-1.24wmf17/resources new file mode 12 index 000..87f6a5f --- /dev/null +++ b/docroot/bits/static-1.24wmf17/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.24wmf17/resources \ No newline at end of file diff --git a/docroot/bits/static-1.24wmf17/skins b/docroot/bits/static-1.24wmf17/skins new file mode 12 index 000..cc057d7 --- /dev/null +++ b/docroot/bits/static-1.24wmf17/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.24wmf17/skins/ \ No newline at end of file diff --git a/w/static-1.24wmf17/extensions b/w/static-1.24wmf17/extensions new file mode 12 index 000..910cd16 --- /dev/null +++ b/w/static-1.24wmf17/extensions @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.24wmf17/extensions \ No newline at end of file diff --git a/w/static-1.24wmf17/resources b/w/static-1.24wmf17/resources new file mode 12 index 000..87f6a5f --- /dev/null +++ b/w/static-1.24wmf17/resources @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.24wmf17/resources \ No newline at end of file diff --git a/w/static-1.24wmf17/skins b/w/static-1.24wmf17/skins new file mode 12 index 000..6ec7610 --- /dev/null +++ b/w/static-1.24wmf17/skins @@ -0,0 +1 @@ +/usr/local/apache/common-local/php-1.24wmf17/skins \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/154062 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id7f96eaf7defb591902f42c339edb2fb297532b2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@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] testwiki to 1.24wmf17 - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/154063 Change subject: testwiki to 1.24wmf17 .. testwiki to 1.24wmf17 Change-Id: Ie6d6dc92d1d670d5214a0a78ac07112298e2831f --- M wikiversions.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/63/154063/1 diff --git a/wikiversions.json b/wikiversions.json index 3ee3885..72f20d7 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -734,7 +734,7 @@ tawiktionary: php-1.24wmf16, tenwiki: php-1.24wmf16, test2wiki: php-1.24wmf16, -testwiki: php-1.24wmf16, +testwiki: php-1.24wmf17, testwikidatawiki: php-1.24wmf16, tetwiki: php-1.24wmf15, tewiki: php-1.24wmf15, @@ -882,4 +882,4 @@ zuwiki: php-1.24wmf15, zuwikibooks: php-1.24wmf16, zuwiktionary: php-1.24wmf16 -} \ No newline at end of file +} -- To view, visit https://gerrit.wikimedia.org/r/154063 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6d6dc92d1d670d5214a0a78ac07112298e2831f Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master 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] Wikipedias to 1.24wmf16 - change (operations/mediawiki-config)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154064
Change subject: Wikipedias to 1.24wmf16
..
Wikipedias to 1.24wmf16
Change-Id: Ifdb3570c2717d7ecaa9bc7c6872e83b8e8e8acb0
---
M wikiversions.json
1 file changed, 288 insertions(+), 288 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/64/154064/1
diff --git a/wikiversions.json b/wikiversions.json
index 72f20d7..e654a28 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,38 +1,38 @@
{
-aawiki: php-1.24wmf15,
+aawiki: php-1.24wmf16,
aawikibooks: php-1.24wmf16,
aawiktionary: php-1.24wmf16,
-abwiki: php-1.24wmf15,
+abwiki: php-1.24wmf16,
abwiktionary: php-1.24wmf16,
-acewiki: php-1.24wmf15,
+acewiki: php-1.24wmf16,
advisorywiki: php-1.24wmf16,
-afwiki: php-1.24wmf15,
+afwiki: php-1.24wmf16,
afwikibooks: php-1.24wmf16,
afwikiquote: php-1.24wmf16,
afwiktionary: php-1.24wmf16,
-akwiki: php-1.24wmf15,
+akwiki: php-1.24wmf16,
akwikibooks: php-1.24wmf16,
akwiktionary: php-1.24wmf16,
-alswiki: php-1.24wmf15,
+alswiki: php-1.24wmf16,
alswikibooks: php-1.24wmf16,
alswikiquote: php-1.24wmf16,
alswiktionary: php-1.24wmf16,
-amwiki: php-1.24wmf15,
+amwiki: php-1.24wmf16,
amwikiquote: php-1.24wmf16,
amwiktionary: php-1.24wmf16,
-angwiki: php-1.24wmf15,
+angwiki: php-1.24wmf16,
angwikibooks: php-1.24wmf16,
angwikiquote: php-1.24wmf16,
angwikisource: php-1.24wmf16,
angwiktionary: php-1.24wmf16,
-anwiki: php-1.24wmf15,
+anwiki: php-1.24wmf16,
anwiktionary: php-1.24wmf16,
arbcom_dewiki: php-1.24wmf16,
arbcom_enwiki: php-1.24wmf16,
arbcom_fiwiki: php-1.24wmf16,
arbcom_nlwiki: php-1.24wmf16,
-arcwiki: php-1.24wmf15,
-arwiki: php-1.24wmf15,
+arcwiki: php-1.24wmf16,
+arwiki: php-1.24wmf16,
arwikibooks: php-1.24wmf16,
arwikimedia: php-1.24wmf16,
arwikinews: php-1.24wmf16,
@@ -40,134 +40,134 @@
arwikisource: php-1.24wmf16,
arwikiversity: php-1.24wmf16,
arwiktionary: php-1.24wmf16,
-arzwiki: php-1.24wmf15,
-astwiki: php-1.24wmf15,
+arzwiki: php-1.24wmf16,
+astwiki: php-1.24wmf16,
astwikibooks: php-1.24wmf16,
astwikiquote: php-1.24wmf16,
astwiktionary: php-1.24wmf16,
-aswiki: php-1.24wmf15,
+aswiki: php-1.24wmf16,
aswikibooks: php-1.24wmf16,
aswikisource: php-1.24wmf16,
aswiktionary: php-1.24wmf16,
auditcomwiki: php-1.24wmf16,
-avwiki: php-1.24wmf15,
+avwiki: php-1.24wmf16,
avwiktionary: php-1.24wmf16,
-aywiki: php-1.24wmf15,
+aywiki: php-1.24wmf16,
aywikibooks: php-1.24wmf16,
aywiktionary: php-1.24wmf16,
-azwiki: php-1.24wmf15,
+azwiki: php-1.24wmf16,
azwikibooks: php-1.24wmf16,
azwikiquote: php-1.24wmf16,
azwikisource: php-1.24wmf16,
azwiktionary: php-1.24wmf16,
-barwiki: php-1.24wmf15,
-bat_smgwiki: php-1.24wmf15,
-bawiki: php-1.24wmf15,
+barwiki: php-1.24wmf16,
+bat_smgwiki: php-1.24wmf16,
+bawiki: php-1.24wmf16,
bawikibooks: php-1.24wmf16,
-bclwiki: php-1.24wmf15,
+bclwiki: php-1.24wmf16,
bdwikimedia: php-1.24wmf16,
-be_x_oldwiki: php-1.24wmf15,
+be_x_oldwiki: php-1.24wmf16,
betawikiversity: php-1.24wmf16,
-bewiki: php-1.24wmf15,
+bewiki: php-1.24wmf16,
bewikibooks: php-1.24wmf16,
bewikimedia: php-1.24wmf16,
bewikiquote: php-1.24wmf16,
bewikisource: php-1.24wmf16,
bewiktionary: php-1.24wmf16,
-bgwiki: php-1.24wmf15,
+bgwiki: php-1.24wmf16,
bgwikibooks: php-1.24wmf16,
bgwikinews: php-1.24wmf16,
bgwikiquote: php-1.24wmf16,
bgwikisource: php-1.24wmf16,
bgwiktionary: php-1.24wmf16,
-bhwiki: php-1.24wmf15,
+bhwiki: php-1.24wmf16,
bhwiktionary: php-1.24wmf16,
-biwiki: php-1.24wmf15,
+biwiki: php-1.24wmf16,
biwikibooks: php-1.24wmf16,
biwiktionary: php-1.24wmf16,
-bjnwiki: php-1.24wmf15,
-bmwiki: php-1.24wmf15,
+bjnwiki: php-1.24wmf16,
+bmwiki: php-1.24wmf16,
bmwikibooks: php-1.24wmf16,
bmwikiquote: php-1.24wmf16,
bmwiktionary: php-1.24wmf16,
-bnwiki: php-1.24wmf15,
+bnwiki: php-1.24wmf16,
bnwikibooks: php-1.24wmf16,
bnwikisource: php-1.24wmf16,
bnwiktionary: php-1.24wmf16,
boardgovcomwiki: php-1.24wmf16,
boardwiki: php-1.24wmf16,
-bowiki: php-1.24wmf15,
+bowiki: php-1.24wmf16,
bowikibooks: php-1.24wmf16,
bowiktionary: php-1.24wmf16,
-bpywiki: php-1.24wmf15,
-brwiki: php-1.24wmf15,
+bpywiki: php-1.24wmf16,
+brwiki: php-1.24wmf16,
brwikimedia: php-1.24wmf16,
brwikiquote: php-1.24wmf16,
brwikisource: php-1.24wmf16,
brwiktionary: php-1.24wmf16,
-bswiki: php-1.24wmf15,
+bswiki: php-1.24wmf16,
bswikibooks:
