[MediaWiki-commits] [Gerrit] Re-enable site-wide styles on Special:Preferences/UserLogin - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165979
Change subject: Re-enable site-wide styles on Special:Preferences/UserLogin
..
Re-enable site-wide styles on Special:Preferences/UserLogin
This mostly reverts commit 614d7e5c274d927f99bfc52ac3a1e6c7e5902408.
Many wikis use MediaWiki:Common.css and associated pages to create a
custom "theme" for their wiki, which would no longer load on login
or preference pages, creating an inconsistent UI.
This re-adds the difference in module origin for different types
(styles, scripts, etc.), and now OutputPage::disallowUserJs()
prevents user-level styles from running (User:Foo/common.css).
Bug: 71621
Change-Id: I1bf4dd1845b6952c3985e179fbea48181ffb8907
---
M includes/OutputPage.php
1 file changed, 35 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/79/165979/1
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 34d3ce6..3eb2cb1 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -179,12 +179,14 @@
protected $mFeedLinksAppendQuery = null;
- /**
-* @var int
-* The level of 'untrustworthiness' allowed for modules loaded on this
page.
+ /** @var array
+* What level of 'untrustworthiness' is allowed in CSS/JS modules
loaded on this page?
* @see ResourceLoaderModule::$origin
+* ResourceLoaderModule::ORIGIN_ALL is assumed unless overridden;
*/
- protected $mAllowedModuleOrigin = ResourceLoaderModule::ORIGIN_ALL;
+ protected $mAllowedModules = array(
+ ResourceLoaderModule::TYPE_COMBINED =>
ResourceLoaderModule::ORIGIN_ALL,
+ );
/** @var bool Whether output is disabled. If this is true, the
'output' method will do nothing. */
protected $mDoNothing = false;
@@ -1330,53 +1332,51 @@
}
/**
-* Restrict the page to loading modules bundled the software.
+* Do not allow scripts which can be modified by wiki users to load on
this page;
+* only allow scripts bundled with, or generated by, the software.
+* Site-wide styles are ok, since they can be used to create a custom
skin/theme,
+* but not user-specific ones.
*
-* Disallows the queue to contain any modules which can be modified by
wiki
-* users to load on this page.
+* @todo this should be given a more accurate name
*/
public function disallowUserJs() {
- $this->reduceAllowedModuleOrigin(
ResourceLoaderModule::ORIGIN_CORE_INDIVIDUAL );
+ $this->reduceAllowedModules(
+ ResourceLoaderModule::TYPE_SCRIPTS,
+ ResourceLoaderModule::ORIGIN_CORE_INDIVIDUAL
+ );
+ $this->reduceAllowedModules(
+ ResourceLoaderModule::TYPE_STYLES,
+ ResourceLoaderModule::ORIGIN_USER_SITEWIDE
+ );
}
/**
-* Get the level of JavaScript / CSS untrustworthiness allowed on this
page.
-*
+* Show what level of JavaScript / CSS untrustworthiness is allowed on
this page
* @see ResourceLoaderModule::$origin
-* @param string $type Unused: Module origin allowance used to be
fragmented by
-* ResourceLoaderModule TYPE_ constants.
+* @param string $type ResourceLoaderModule TYPE_ constant
* @return int ResourceLoaderModule ORIGIN_ class constant
*/
- public function getAllowedModules( $type = null ) {
- return $this->mAllowedModuleOrigin;
+ public function getAllowedModules( $type ) {
+ if ( $type == ResourceLoaderModule::TYPE_COMBINED ) {
+ return min( array_values( $this->mAllowedModules ) );
+ } else {
+ return isset( $this->mAllowedModules[$type] )
+ ? $this->mAllowedModules[$type]
+ : ResourceLoaderModule::ORIGIN_ALL;
+ }
}
/**
* Set the highest level of CSS/JS untrustworthiness allowed
*
* @deprecated since 1.24 Raising level of allowed untrusted content is
no longer supported.
-* Use reduceAllowedModuleOrigin() instead.
-*
+* Use reduceAllowedModules() instead
* @param string $type ResourceLoaderModule TYPE_ constant
-* @param int $level ResourceLoaderModule ORIGIN_ constant
+* @param int $level ResourceLoaderModule class constant
*/
public function setAllowedModules( $type, $level ) {
wfDeprecated( __METHOD__, '1.24' );
- $this->reduceAllowedModuleOrigin( $level );
- }
-
- /**
-* Limit the highest level of CSS/JS untrustworthiness allowed.
-*
-
[MediaWiki-commits] [Gerrit] Revert "Show talk button only when JS enabled or talk page n... - change (mediawiki...MobileFrontend)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165980
Change subject: Revert "Show talk button only when JS enabled or talk page not
empty"
..
Revert "Show talk button only when JS enabled or talk page not empty"
This reverts change I4311e23c6796548c91ace799ce66fb6d38242e17.
Follow up: I15ddbe7c85a30605572d906d66b955f2ef390718
Bug: 71570
Change-Id: I6ac91f2490401315c346ce0ccc371009bda2628f
---
M includes/skins/SkinMinervaAlpha.php
M javascripts/modules/talk/talk.js
2 files changed, 1 insertion(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/80/165980/1
diff --git a/includes/skins/SkinMinervaAlpha.php
b/includes/skins/SkinMinervaAlpha.php
index bdc6f6f..a120fd2 100644
--- a/includes/skins/SkinMinervaAlpha.php
+++ b/includes/skins/SkinMinervaAlpha.php
@@ -71,11 +71,7 @@
$class = 'count icon icon-32px icon-talk';
} else {
$talkLabel = wfMessage(
'mobile-frontend-talk-overlay-header' );
- // add hidden css class to hide talk button,
when no content there. Adding content
- // isn't possible without JS, so remove the
class in talk.js
- // FIXME: What, if the talk page uses Flow
(appears as new and don't
- // run talk.js, so it will be hidden with JS
enabled)
- $class = 'hidden icon icon-32px icon-talk';
+ $class = 'icon icon-32px icon-talk';
}
$menu = $tpl->data['page_actions'];
if ( isset( $menu['talk'] ) ) {
diff --git a/javascripts/modules/talk/talk.js b/javascripts/modules/talk/talk.js
index 534a827..3961106 100644
--- a/javascripts/modules/talk/talk.js
+++ b/javascripts/modules/talk/talk.js
@@ -24,8 +24,6 @@
function init() {
$( '#ca-talk a' ).
attr( 'href', '#/talk' );
- // enable Talk button (only to hide when JS disabled)
- $( '#ca-talk' ).removeClass( 'hidden' );
}
init();
--
To view, visit https://gerrit.wikimedia.org/r/165980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ac91f2490401315c346ce0ccc371009bda2628f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Changed heavy selector - change (mediawiki...BlueSpiceSkin)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165981
Change subject: Changed heavy selector
..
Changed heavy selector
I changed the weight of the css selector for #content color to be less
heavy. It otherwise interferes with some javescript components rendered
within #content
Change-Id: Iae5b430524ad55b10dd90c61cd11aed67842bc04
---
M resources/components/skin.font.less
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin
refs/changes/81/165981/1
diff --git a/resources/components/skin.font.less
b/resources/components/skin.font.less
index da8a3d6..f0290a7 100644
--- a/resources/components/skin.font.less
+++ b/resources/components/skin.font.less
@@ -27,6 +27,8 @@
font-family: icomoon;
}
#content{
+ color: @bs-color-content-default;
+
h1, h2, h3, h4, h5, h6{
font-family: @bs-font-default;
border-bottom: none;
@@ -55,9 +57,7 @@
a:hover{
text-decoration: underline;
}
- *{
- color: @bs-color-content-default;
- }
+
*[class*='icon-']:after,
*[class*='icon-']:before{
color: @bs-color-light-grey;
--
To view, visit https://gerrit.wikimedia.org/r/165981
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae5b430524ad55b10dd90c61cd11aed67842bc04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't run the performance test on IE - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/165982 Change subject: Don't run the performance test on IE .. Don't run the performance test on IE This seems like a copy pasta, I don't think that test was ever meant to work on IE. Change-Id: I586d5e44d9a42d490d7cacf4074a24f79e38b9bb --- M tests/browser/features/mmv_performance.feature 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/82/165982/1 diff --git a/tests/browser/features/mmv_performance.feature b/tests/browser/features/mmv_performance.feature index 1b1637c..e4a144e 100644 --- a/tests/browser/features/mmv_performance.feature +++ b/tests/browser/features/mmv_performance.feature @@ -1,4 +1,4 @@ -@en.wikipedia.beta.wmflabs.org @custom-browser @mediawiki.org @firefox @internet_explorer_8 @internet_explorer_9 @internet_explorer_10 @internet_explorer_11 @test2.wikipedia.org +@en.wikipedia.beta.wmflabs.org @custom-browser @mediawiki.org @firefox @chrome @test2.wikipedia.org Feature: Multimedia Viewer performance Background: -- To view, visit https://gerrit.wikimedia.org/r/165982 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I586d5e44d9a42d490d7cacf4074a24f79e38b9bb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Gilles ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Visual Editor Update - change (mediawiki...BlueSpiceExtensions)
Mglaser has submitted this change and it was merged. Change subject: Visual Editor Update .. Visual Editor Update this is an update of the VisualEditor from 4.0.11 to 4.0.12, needed for pasteImage. Several selection/range bugs for ie were fixed by this. many other things i didn't in detail, but should work Change-Id: I9c84c7c27e234a0a0b6f6a2ab29468b6f302767f --- M VisualEditor/resources/tinymce/classes/EditorCommands.js M VisualEditor/resources/tinymce/classes/FocusManager.js M VisualEditor/resources/tinymce/classes/Formatter.js M VisualEditor/resources/tinymce/classes/dom/Selection.js M VisualEditor/resources/tinymce/classes/html/Schema.js M VisualEditor/resources/tinymce/classes/ui/FormatControls.js M VisualEditor/resources/tinymce/classes/ui/Widget.js M VisualEditor/resources/tinymce/classes/util/Observable.js M VisualEditor/resources/tinymce/classes/util/Quirks.js M VisualEditor/resources/tinymce/plugins/image/plugin.js M VisualEditor/resources/tinymce/plugins/image/plugin.min.js M VisualEditor/resources/tinymce/plugins/importcss/plugin.js M VisualEditor/resources/tinymce/plugins/importcss/plugin.min.js M VisualEditor/resources/tinymce/plugins/insertdatetime/plugin.js M VisualEditor/resources/tinymce/plugins/insertdatetime/plugin.min.js M VisualEditor/resources/tinymce/plugins/link/plugin.js M VisualEditor/resources/tinymce/plugins/link/plugin.min.js M VisualEditor/resources/tinymce/plugins/media/plugin.js M VisualEditor/resources/tinymce/plugins/media/plugin.min.js M VisualEditor/resources/tinymce/plugins/paste/classes/Clipboard.js M VisualEditor/resources/tinymce/plugins/paste/classes/WordFilter.js M VisualEditor/resources/tinymce/plugins/paste/plugin.dev.js M VisualEditor/resources/tinymce/plugins/paste/plugin.js M VisualEditor/resources/tinymce/plugins/paste/plugin.min.js M VisualEditor/resources/tinymce/plugins/table/classes/Quirks.js M VisualEditor/resources/tinymce/plugins/table/plugin.dev.js M VisualEditor/resources/tinymce/plugins/table/plugin.js M VisualEditor/resources/tinymce/plugins/table/plugin.min.js M VisualEditor/resources/tinymce/tinymce.dev.js M VisualEditor/resources/tinymce/tinymce.jquery.dev.js M VisualEditor/resources/tinymce/tinymce.jquery.js M VisualEditor/resources/tinymce/tinymce.jquery.min.js M VisualEditor/resources/tinymce/tinymce.js M VisualEditor/resources/tinymce/tinymce.min.js 34 files changed, 976 insertions(+), 648 deletions(-) Approvals: Mglaser: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/165723 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c84c7c27e234a0a0b6f6a2ab29468b6f302767f Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: REL1_22 Gerrit-Owner: Tweichart Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pigpen Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: Smuggli Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] version update - change (mediawiki...GWToolset)
jenkins-bot has submitted this change and it was merged. Change subject: version update .. version update Change-Id: Ic7cef8aa26fcf95fd56665bbf15911af40d406ca --- M HISTORY M RELEASE-NOTES M includes/Constants.php 3 files changed, 125 insertions(+), 20 deletions(-) Approvals: Gilles: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY b/HISTORY index c984958..1378b80 100644 --- a/HISTORY +++ b/HISTORY @@ -1,3 +1,114 @@ +== GWToolset 0.3.7 == +MediaWiki_1.24/wmf20 +scheduled deploy: Tuesday, 09 September 2014 +https://www.mediawiki.org/wiki/MediaWiki_1.24/wmf20#GWToolset + +=== Missing translation === +https://gerrit.wikimedia.org/r/#/c/157034/ + + + +== GWToolset 0.3.6 == +MediaWiki_1.24/wmf19 +scheduled deploy: Tuesday, 02 September 2014 +https://www.mediawiki.org/wiki/MediaWiki_1.24/wmf19#GWToolset + +=== Check API Page Index for Missing === +https://gerrit.wikimedia.org/r/#/c/156512/ + +=== Improve duplicate and other contributors messages === +https://gerrit.wikimedia.org/r/#/c/156249/ + +=== PHP Notice: Undefined index: contributors === +https://gerrit.wikimedia.org/r/#/c/156248/ +https://bugzilla.wikimedia.org/show_bug.cgi?id=70024 + + + +== GWToolset 0.3.5 == +MediaWiki_1.24/wmf17 +scheduled deploy: Tuesday, 19 August 2014 +https://www.mediawiki.org/wiki/MediaWiki_1.24/wmf17#GWToolset + +=== Rm class entries for auto-loader that no longer exist === +https://gerrit.wikimedia.org/r/#/c/151026/ +https://bugzilla.wikimedia.org/show_bug.cgi?id=68637 + + + +== GWToolset 0.3.4 == +MediaWiki_1.24/wmf15 +scheduled deploy: Tuesday, 15 July 2014 +https://www.mediawiki.org/wiki/MediaWiki_1.24/wmf15#GWToolset + +=== Fix valid category check during preview form === +https://gerrit.wikimedia.org/r/#/c/148533/ +https://bugzilla.wikimedia.org/show_bug.cgi?id=68394 + + + +== GWToolset 0.3.3 == +MediaWiki_1.24/wmf13 +scheduled deploy: Tuesday, 15 July 2014 +https://www.mediawiki.org/wiki/MediaWiki_1.24/wmf13#GWToolset + +=== Modify $wgUser during the upload media file job === +https://gerrit.wikimedia.org/r/#/c/144044/ +https://bugzilla.wikimedia.org/show_bug.cgi?id=67504 + +=== Add code comment about how ScopedCallback works === +https://gerrit.wikimedia.org/r/#/c/144493/ + + + +== GWToolset 0.3.2 == +MediaWiki_1.24/wmf12 +scheduled deploy: Monday, 07 July 2014 +https://www.mediawiki.org/wiki/MediaWiki_1.24/wmf12#GWToolset + +=== Modify $wgUser during the upload media file job === +https://gerrit.wikimedia.org/r/#/c/144491/ +https://bugzilla.wikimedia.org/show_bug.cgi?id=67504 + + + +== GWToolset 0.3.1 == +MediaWiki_1.24/wmf11 +scheduled deploy: Tuesday, 01 July 2014 +https://www.mediawiki.org/wiki/MediaWiki_1.24/wmf11#GWToolset + +=== Modify $wgUser during the upload media file job === +https://gerrit.wikimedia.org/r/#/c/144490/ +https://bugzilla.wikimedia.org/show_bug.cgi?id=67504 + + + +== GWToolset 0.3.0 == +MediaWiki_1.24/wmf10 +scheduled deploy: Tuesday, 24 June 2014 +https://www.mediawiki.org/wiki/MediaWiki_1.24/wmf10#GWToolset + +=== Allow for custom templates === +https://gerrit.wikimedia.org/r/#/c/133684/ +https://bugzilla.wikimedia.org/show_bug.cgi?id=63889 + +=== complex categories === +https://gerrit.wikimedia.org/r/#/c/139410/ +https://bugzilla.wikimedia.org/show_bug.cgi?id=65620 + +=== Improved the punctuation and the readability of some messages === +https://gerrit.wikimedia.org/r/#/c/140339/ + +=== Make template wrapping optional === +https://gerrit.wikimedia.org/r/#/c/133476/ +https://bugzilla.wikimedia.org/show_bug.cgi?id=64060 +https://bugzilla.wikimedia.org/show_bug.cgi?id=65248 + +=== version update === +https://gerrit.wikimedia.org/r/#/c/139339/ + + + == GWToolset 0.2.4 == MediaWiki_1.24/wmf8 scheduled deploy: Tuesday, 10 June 2014 diff --git a/RELEASE-NOTES b/RELEASE-NOTES index dd53150..ba1f995 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -1,23 +1,17 @@ -== GWToolset 0.3.0 == -MediaWiki_1.24/wmf10 -scheduled deploy: Tuesday, 24 June 2014 -https://www.mediawiki.org/wiki/MediaWiki_1.24/wmf10#GWToolset +== GWToolset 0.3.8 == +MediaWiki_1.24/wmf21 +scheduled deploy: Tuesday, 16 September 2014 +https://www.mediawiki.org/wiki/MediaWiki_1.24/wmf21#GWToolset -== Allow for custom templates == -https://gerrit.wikimedia.org/r/#/c/133684/ -https://bugzilla.wikimedia.org/show_bug.cgi?id=63889 +=== Nicer phrasing for log-description-gwtoolset === +https://gerrit.wikimedia.org/r/#/c/159696/ -== complex categories == -https://gerrit.wikimedia.org/r/#/c/139410/ -https://bugzilla.wikimedia.org/show_bug.cgi?id=65620 +=== Improve category instructions === +https://gerrit.wikimedia.org/r/#/c/159036/ -== Improved the punctuation and the readability of some messages == -https://gerrit.wikimedia.org/r/#/c/140339/ +=== update INSTALL instructions === +https://gerrit.wikimedia.org/r/#/c/158625/ -== Make template wrapping optional == -https://gerrit.wikimedia.org/r/#/c/133476/ -https://bugzilla.wikimedia.o
[MediaWiki-commits] [Gerrit] PDF can't handle UTF-8 URLs. - change (mediawiki...latex_renderer)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165983
Change subject: PDF can't handle UTF-8 URLs.
..
PDF can't handle UTF-8 URLs.
Bug: 71547
Change-Id: I2f66fe26999132011b9930152d0aa230e66d4245
---
M lib/index.js
1 file changed, 1 insertion(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/latex_renderer
refs/changes/83/165983/1
diff --git a/lib/index.js b/lib/index.js
index 20a4f7d..bf2aeb2 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -707,6 +707,7 @@
return this.wrap('\\hyperlink{' + texEscapeTarget(href)
+ '}', node);
} else {
href = url.resolve(this.base, href);
+ href = encodeURI(href);
href = href.replace(/[#%\\]/g, '\\$&'); // escape TeX
specials
return this.wrap('\\href{' + href + '}', node);
}
--
To view, visit https://gerrit.wikimedia.org/r/165983
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f66fe26999132011b9930152d0aa230e66d4245
Gerrit-PatchSet: 1
Gerrit-Project:
mediawiki/extensions/Collection/OfflineContentGenerator/latex_renderer
Gerrit-Branch: master
Gerrit-Owner: Cscott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Changed heavy selector - change (mediawiki...BlueSpiceSkin)
Smuggli has submitted this change and it was merged.
Change subject: Changed heavy selector
..
Changed heavy selector
I changed the weight of the css selector for #content color to be less
heavy. It otherwise interferes with some javescript components rendered
within #content
Change-Id: Iae5b430524ad55b10dd90c61cd11aed67842bc04
---
M resources/components/skin.font.less
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
diff --git a/resources/components/skin.font.less
b/resources/components/skin.font.less
index da8a3d6..f0290a7 100644
--- a/resources/components/skin.font.less
+++ b/resources/components/skin.font.less
@@ -27,6 +27,8 @@
font-family: icomoon;
}
#content{
+ color: @bs-color-content-default;
+
h1, h2, h3, h4, h5, h6{
font-family: @bs-font-default;
border-bottom: none;
@@ -55,9 +57,7 @@
a:hover{
text-decoration: underline;
}
- *{
- color: @bs-color-content-default;
- }
+
*[class*='icon-']:after,
*[class*='icon-']:before{
color: @bs-color-light-grey;
--
To view, visit https://gerrit.wikimedia.org/r/165981
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae5b430524ad55b10dd90c61cd11aed67842bc04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pigpen
Gerrit-Reviewer: Smuggli
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] minor param doc fixups - change (mediawiki...TimedMediaHandler)
jenkins-bot has submitted this change and it was merged.
Change subject: minor param doc fixups
..
minor param doc fixups
Remove unused variable
Change-Id: I8c70df15cce3c9686d79fe7e485c7378cde9f371
---
M WebVideoTranscode/WebVideoTranscode.php
1 file changed, 9 insertions(+), 11 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WebVideoTranscode/WebVideoTranscode.php
b/WebVideoTranscode/WebVideoTranscode.php
index 704fd8d..8f5645b 100644
--- a/WebVideoTranscode/WebVideoTranscode.php
+++ b/WebVideoTranscode/WebVideoTranscode.php
@@ -156,7 +156,7 @@
'type' => 'video/webm;
codecs="vp8, vorbis"',
),
WebVideoTranscode::ENC_WEBM_720P =>
-array(
+ array(
'maxSize'=> '1280x720',
'videoQuality' => 7,
'audioQuality' => 3,
@@ -283,8 +283,9 @@
/**
* Get url for a transcode.
*
-* @param $file
-* @param $suffix Transcode key
+* @param $file File
+* @param $suffix string Transcode key
+* @return string
*/
static public function getTranscodedUrlForFile( $file, $suffix = '' ) {
return $file->getTranscodedUrl( self::getTranscodeFileBaseName(
$file, $suffix ) );
@@ -785,8 +786,6 @@
* @return array
*/
static public function getDerivativeSourceAttributes($file,
$transcodeKey, $options = array() ){
- $dataPrefix = in_array( 'nodata', $options )? '': 'data-';
-
$fileName = $file->getTitle()->getDbKey();
$src = self::getTranscodedUrlForFile( $file, $transcodeKey );
@@ -976,13 +975,12 @@
*/
public static function getMaxSize( $targetMaxSize ){
$maxSize = array();
- $targetMaxSize = explode('x', $targetMaxSize);
- if (count($targetMaxSize) == 1) {
- $maxSize['width'] = intval($targetMaxSize[0]);
- $maxSize['height'] = intval($targetMaxSize[0]);
+ $targetMaxSize = explode( 'x', $targetMaxSize );
+ $maxSize['width'] = intval( $targetMaxSize[0] );
+ if ( count( $targetMaxSize ) == 1 ) {
+ $maxSize['height'] = intval( $targetMaxSize[0] );
} else {
- $maxSize['width'] = intval($targetMaxSize[0]);
- $maxSize['height'] = intval($targetMaxSize[1]);
+ $maxSize['height'] = intval( $targetMaxSize[1] );
}
// check for zero size ( audio )
if( $maxSize['width'] === 0 || $maxSize['height'] == 0 ){
--
To view, visit https://gerrit.wikimedia.org/r/165216
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8c70df15cce3c9686d79fe7e485c7378cde9f371
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Reedy
Gerrit-Reviewer: Gilles
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 method name in test description - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165990
Change subject: Update method name in test description
..
Update method name in test description
Change-Id: Idf01c167b5c7f3d930b23778e72c242bb5b61c40
---
M modules/ve-mw/tests/ce/ve.ce.Surface.test.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/90/165990/1
diff --git a/modules/ve-mw/tests/ce/ve.ce.Surface.test.js
b/modules/ve-mw/tests/ce/ve.ce.Surface.test.js
index 9eebc58..b4b2819 100644
--- a/modules/ve-mw/tests/ce/ve.ce.Surface.test.js
+++ b/modules/ve-mw/tests/ce/ve.ce.Surface.test.js
@@ -9,7 +9,7 @@
/* Tests */
-QUnit.test( 'handleDelete', function ( assert ) {
+QUnit.test( 'handleLinearDelete', function ( assert ) {
var i,
cases = [
// This asserts that getRelativeRange (via
getRelativeOffset) doesn't try to
--
To view, visit https://gerrit.wikimedia.org/r/165990
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf01c167b5c7f3d930b23778e72c242bb5b61c40
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Backup /var/lib/jenking/config.xml on gallium - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165991
Change subject: WIP: Backup /var/lib/jenking/config.xml on gallium
..
WIP: Backup /var/lib/jenking/config.xml on gallium
Just define a standard backup
TODO: The backup::set should be moved to some role class, need to
discuss this.
Change-Id: Ib5b39b44b894b959e4277e5a7ea08ba614ce9b85
---
M manifests/role/backup.pp
M manifests/site.pp
2 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/91/165991/1
diff --git a/manifests/role/backup.pp b/manifests/role/backup.pp
index 90ca55e..e51316a 100644
--- a/manifests/role/backup.pp
+++ b/manifests/role/backup.pp
@@ -113,6 +113,9 @@
bacula::director::fileset { 'var-lib-archiva':
includes => [ '/var/lib/archiva' ],
}
+bacula::director::fileset { 'var-lib-jenkins-config':
+includes => [ '/var/lib/jenkins/config.xml' ],
+}
bacula::director::fileset { 'var-lib-gerrit2-review_site-git':
includes => [ '/var/lib/gerrit2/review_site/git' ]
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 865d9f2..cbf55f7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1208,6 +1208,9 @@
include role::ci::website
include role::zuul::production
+include backup::host
+backup::set {'var-lib-jenkins-config': }
+
# gallium received a SSD drive (RT #4916) mount it
file { '/srv/ssd':
ensure => 'directory',
--
To view, visit https://gerrit.wikimedia.org/r/165991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5b39b44b894b959e4277e5a7ea08ba614ce9b85
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove MW-specific mobile hack from core - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165993
Change subject: Remove MW-specific mobile hack from core
..
Remove MW-specific mobile hack from core
Moved to MW in Ica837abd.
Change-Id: I94491de87d9cc7d0ecbd971ae9efd4ef10850858
---
M src/ui/ve.ui.MobileContext.js
1 file changed, 0 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/93/165993/1
diff --git a/src/ui/ve.ui.MobileContext.js b/src/ui/ve.ui.MobileContext.js
index 3582737..32b2f2c 100644
--- a/src/ui/ve.ui.MobileContext.js
+++ b/src/ui/ve.ui.MobileContext.js
@@ -72,23 +72,3 @@
return deferred.promise();
};
-
-/**
- * @inheritdoc
- */
-ve.ui.MobileContext.prototype.getAvailableTools = function () {
- var tools = ve.ui.MobileContext.super.prototype.getAvailableTools.call(
this );
-
- // Filter out tools not supported in mobile mode
- // FIXME: This is a temporary hack. Ideally, we don't want to load any
code
- // that is not supported on a given platform. However, present
implementation
- // of citation dialog forces us to load tools that we don't want on
mobile.
- this.availableTools = tools.filter( function ( tool ) {
- return (
- tool.model instanceof ve.dm.LinkAnnotation ||
- ( tool.model instanceof ve.dm.MWReferenceNode &&
tool.tool !== ve.ui.MWReferenceDialogTool )
- );
- } );
-
- return this.availableTools;
-};
--
To view, visit https://gerrit.wikimedia.org/r/165993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94491de87d9cc7d0ecbd971ae9efd4ef10850858
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bring in MobileContext hack from core - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165992
Change subject: Bring in MobileContext hack from core
..
Bring in MobileContext hack from core
Filter out all tools except links and citations.
Change-Id: Ica837abd45f0ff02b49a44da617bc1fd8e9872d4
---
M VisualEditor.php
A modules/ve-mw/ui/ve.ui.MWMobileContext.js
A modules/ve-mw/ui/ve.ui.MWMobileSurface.js
3 files changed, 82 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/92/165992/1
diff --git a/VisualEditor.php b/VisualEditor.php
index fc6617a..4d59f40 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -703,6 +703,8 @@
// ui
'modules/ve-mw/ui/ve.ui.MWCommandRegistry.js',
+ 'modules/ve-mw/ui/ve.ui.MWMobileContext.js',
+ 'modules/ve-mw/ui/ve.ui.MWMobileSurface.js',
'modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js',
'modules/ve-mw/ui/widgets/ve.ui.MWTocItemWidget.js',
diff --git a/modules/ve-mw/ui/ve.ui.MWMobileContext.js
b/modules/ve-mw/ui/ve.ui.MWMobileContext.js
new file mode 100644
index 000..0e391b3
--- /dev/null
+++ b/modules/ve-mw/ui/ve.ui.MWMobileContext.js
@@ -0,0 +1,49 @@
+/*!
+ * VisualEditor UserInterface MobileContext class.
+ *
+ * @copyright 2011-2014 VisualEditor Team and others; see
http://ve.mit-license.org
+ */
+
+/**
+ * UserInterface context that displays inspector full screen.
+ *
+ * @class
+ * @extends ve.ui.MobileContext
+ *
+ * @constructor
+ * @param {ve.ui.Surface} surface
+ * @param {Object} [config] Configuration options
+ */
+ve.ui.MWMobileContext = function VeUiMWMobileContext() {
+ // Parent constructor
+ ve.ui.MWMobileContext.super.apply( this, arguments );
+
+ // Initialization
+ this.$element.addClass( 've-ui-mwMobileContext' );
+};
+
+/* Inheritance */
+
+OO.inheritClass( ve.ui.MWMobileContext, ve.ui.MobileContext );
+
+/* Methods */
+
+/**
+ * @inheritdoc
+ */
+ve.ui.MWMobileContext.prototype.getAvailableTools = function () {
+ var tools = ve.ui.MobileContext.super.prototype.getAvailableTools.call(
this );
+
+ // Filter out tools not supported in mobile mode
+ // FIXME: This is a temporary hack. Ideally, we don't want to load any
code
+ // that is not supported on a given platform. However, present
implementation
+ // of citation dialog forces us to load tools that we don't want on
mobile.
+ this.availableTools = tools.filter( function ( tool ) {
+ return (
+ tool.model instanceof ve.dm.LinkAnnotation ||
+ ( tool.model instanceof ve.dm.MWReferenceNode &&
tool.tool !== ve.ui.MWReferenceDialogTool )
+ );
+ } );
+
+ return this.availableTools;
+};
diff --git a/modules/ve-mw/ui/ve.ui.MWMobileSurface.js
b/modules/ve-mw/ui/ve.ui.MWMobileSurface.js
new file mode 100644
index 000..f7b095b
--- /dev/null
+++ b/modules/ve-mw/ui/ve.ui.MWMobileSurface.js
@@ -0,0 +1,31 @@
+/*!
+ * VisualEditor UserInterface MediaWiki MobileSurface class.
+ *
+ * @copyright 2011-2014 VisualEditor Team and others; see
http://ve.mit-license.org
+ */
+
+/**
+ * @class
+ * @extends ve.ui.MobileSurface
+ *
+ * @constructor
+ * @param {HTMLDocument|Array|ve.dm.LinearData|ve.dm.Document} dataOrDoc
Document data to edit
+ * @param {Object} [config] Configuration options
+ */
+ve.ui.MWMobileSurface = function VeUiMWMobileSurface() {
+ // Parent constructor
+ ve.ui.MWMobileSurface.super.apply( this, arguments );
+};
+
+/* Inheritance */
+
+OO.inheritClass( ve.ui.MWMobileSurface, ve.ui.MobileSurface );
+
+/* Methods */
+
+/**
+ * @inheritdoc
+ */
+ve.ui.MWMobileSurface.prototype.createContext = function () {
+ return new ve.ui.MWMobileContext( this, { $: this.$ } );
+};
--
To view, visit https://gerrit.wikimedia.org/r/165992
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica837abd45f0ff02b49a44da617bc1fd8e9872d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add white background to toolbar in MediaWiki theme - change (oojs/ui)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165994
Change subject: Add white background to toolbar in MediaWiki theme
..
Add white background to toolbar in MediaWiki theme
For floating toolbars.
Change-Id: Ia54799b08237f7f86a1f09195b5f5da0513a2e8f
---
M src/themes/mediawiki/tools.less
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/94/165994/1
diff --git a/src/themes/mediawiki/tools.less b/src/themes/mediawiki/tools.less
index c35bfa9..d701949 100644
--- a/src/themes/mediawiki/tools.less
+++ b/src/themes/mediawiki/tools.less
@@ -3,6 +3,7 @@
.theme-oo-ui-toolbar () {
&-bar {
border-bottom: solid 1px #ccc;
+ background: #fff;
.oo-ui-toolbar-bar {
border: none;
--
To view, visit https://gerrit.wikimedia.org/r/165994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia54799b08237f7f86a1f09195b5f5da0513a2e8f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: enable container-server statsd reporting - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165995
Change subject: swift: enable container-server statsd reporting
..
swift: enable container-server statsd reporting
Change-Id: Id6dc9f7e1becd27ddfb357f3b023b8205d824879
---
M hieradata/codfw.yaml
M manifests/role/swift.pp
M manifests/swift.pp
M modules/swift_new/manifests/storage.pp
M modules/swift_new/templates/container-server.conf.erb
M templates/swift/etc.swift.container-server.conf.erb
6 files changed, 21 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/165995/1
diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml
index 1e7a7a8..72807ef 100644
--- a/hieradata/codfw.yaml
+++ b/hieradata/codfw.yaml
@@ -29,6 +29,7 @@
#search_backup:
swift_new::hash_path_suffix: 'de4227064232ed08'
+swift_new::storage::statsd_host: 'statsd.eqiad.wmnet'
swift_new::proxy::proxy_address: 'http://ms-fe.svc.codfw.wmnet'
swift_new::proxy::statsd_host: 'statsd.eqiad.wmnet'
swift_new::proxy::backend_url_format: 'sitelang'
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 7231e22..e136030 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -379,7 +379,9 @@
include ::swift_new::params
include ::swift_new
include ::swift_new::ring
-include ::swift_new::storage
+class { '::swift_new::storage':
+statsd_metric_prefix =>
"swift.${::swift_new::params::swift_cluster}.${::hostname}",
+}
include ::swift_new::container_sync
include ::swift_new::storage::monitoring
diff --git a/manifests/swift.pp b/manifests/swift.pp
index c206209..6473df4 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -227,7 +227,10 @@
}
}
-class config {
+class config (
+$statsd_host = 'statsd.eqiad.wmnet',
+$statsd_metric_prefix = "swift.${cluster_name}.${::hostname}"
+){
require swift::storage::packages
class { 'rsync::server':
diff --git a/modules/swift_new/manifests/storage.pp
b/modules/swift_new/manifests/storage.pp
index 1f5be9c..0c7e696 100644
--- a/modules/swift_new/manifests/storage.pp
+++ b/modules/swift_new/manifests/storage.pp
@@ -1,4 +1,8 @@
-class swift_new::storage {
+class swift_new::storage (
+$statsd_host = undef,
+$statsd_metric_prefix = undef,
+$statsd_sample_rate_factor = '1',
+) {
package {
[ 'swift-account',
'swift-container',
diff --git a/modules/swift_new/templates/container-server.conf.erb
b/modules/swift_new/templates/container-server.conf.erb
index cd00257..6638cfe 100644
--- a/modules/swift_new/templates/container-server.conf.erb
+++ b/modules/swift_new/templates/container-server.conf.erb
@@ -3,11 +3,10 @@
devices = /srv/swift-storage/
workers = <%= @processorcount %>
db_preallocation = on
-# statsd collection is off for the initial deploy; on after figuring out
ganglia issues
-# log_statsd_host = localhost
-# log_statsd_port = 8125
-# log_statsd_default_sample_rate = 1
-# log_statsd_metric_prefix =
+log_statsd_host = <%= @statsd_host %>
+log_statsd_port = 8125
+log_statsd_metric_prefix = <%= @statsd_metric_prefix %>
+log_statsd_sample_rate_factor = <%= @statsd_sample_rate_factor %>
[pipeline:main]
diff --git a/templates/swift/etc.swift.container-server.conf.erb
b/templates/swift/etc.swift.container-server.conf.erb
index cd00257..94655f4 100644
--- a/templates/swift/etc.swift.container-server.conf.erb
+++ b/templates/swift/etc.swift.container-server.conf.erb
@@ -3,11 +3,10 @@
devices = /srv/swift-storage/
workers = <%= @processorcount %>
db_preallocation = on
-# statsd collection is off for the initial deploy; on after figuring out
ganglia issues
-# log_statsd_host = localhost
-# log_statsd_port = 8125
-# log_statsd_default_sample_rate = 1
-# log_statsd_metric_prefix =
+log_statsd_host = <%= @statsd_host %>
+log_statsd_port = 8125
+log_statsd_metric_prefix = <%= @statsd_metric_prefix %>
+log_statsd_sample_rate_factor = 1
[pipeline:main]
--
To view, visit https://gerrit.wikimedia.org/r/165995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6dc9f7e1becd27ddfb357f3b023b8205d824879
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use templates for all Wikidata jobs - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Use templates for all Wikidata jobs
..
Use templates for all Wikidata jobs
Some jobs require tests with specific tags to be executed.
For this to work I needed to introduce another parameter to
specify custom tags. Called it cucumber_tags. If it is not set
everything behaves as before. If it is set, only tests with the
specified tags will be executed.
Change-Id: I7d7e528024c849b939cb5b00a2d522ec39d50ff1
---
M browsertests.yaml
M job-templates-browsertests.yaml
M macro.yaml
3 files changed, 25 insertions(+), 3 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/browsertests.yaml b/browsertests.yaml
index e3139ed..d3bd8d4 100644
--- a/browsertests.yaml
+++ b/browsertests.yaml
@@ -30,7 +30,10 @@
cmcma...@wikimedia.org jforres...@wikimedia.org
qa-ale...@lists.wikimedia.org
- Wikidata: &emails-Wikidata-qa
-adrian.l...@wikimedia.de qa-ale...@lists.wikimedia.org
tobias.gritschac...@wikimedia.de
+qa-ale...@lists.wikimedia.org tobias.gritschac...@wikimedia.de
+
+ - Wikidata-devs: &emails-Wikidata-devs
+adrian.l...@wikimedia.de katie.filb...@wikimedia.de
qa-ale...@lists.wikimedia.org tobias.gritschac...@wikimedia.de
# CirrusSearch
- project:
@@ -528,7 +531,17 @@
repository_host: github.com/wmde
jobs:
- -
'browsertests-Wikidata-{name}-{mediawiki_url}-{platform}-{browser}-sauce'
+ - 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce'
+
+ - 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce':
+ name: PerformanceTests
+ cucumber_tags: '@performance_testing'
+ recipients: *emails-Wikidata-devs
+
+ - 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce':
+ name: SmokeTests
+ cucumber_tags: '@smoke'
+ recipients: *emails-Wikidata-devs
# WikiLove
- project:
diff --git a/job-templates-browsertests.yaml b/job-templates-browsertests.yaml
index 2da78b1..d2ab5a1 100644
--- a/job-templates-browsertests.yaml
+++ b/job-templates-browsertests.yaml
@@ -29,6 +29,7 @@
- shell: mkdir -p "$WORKSPACE/log/junit"
- browsertest-website-version:
browser: '{browser}'
+ cucumber_tags: '{cucumber_tags}'
headless: '{headless}'
folder: '{folder}'
mediawiki_password_variable: '{mediawiki_password_variable}'
@@ -68,7 +69,7 @@
- lang_list
- job-template:
-name:
'browsertests-Wikidata-{name}-{mediawiki_url}-{platform}-{browser}-sauce'
+name: 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce'
defaults: browsertests
triggers:
@@ -78,6 +79,7 @@
name: browsertests
node: contintLabsSlave && UbuntuPrecise
repository_host: 'gerrit.wikimedia.org/r'
+cucumber_tags: ''
properties:
- throttle:
@@ -104,6 +106,7 @@
- shell: mkdir -p "$WORKSPACE/log/junit"
- browsertest-website:
browser: '{browser}'
+ cucumber_tags: '{cucumber_tags}'
headless: '{headless}'
folder: '{folder}'
mediawiki_password_variable: '{mediawiki_password_variable}'
diff --git a/macro.yaml b/macro.yaml
index 2c238d3..d7b6845 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -659,6 +659,7 @@
- shell: |
# set up environment variables
export BROWSER={browser}
+ export CUCUMBER_TAGS={cucumber_tags}
export HEADLESS={headless}
export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php
export MEDIAWIKI_PASSWORD_VARIABLE={mediawiki_password_variable}
@@ -738,6 +739,8 @@
export LANGUAGE_SCREENSHOT_PATH="$WORKSPACE/log"
elif [[ $JOB_NAME == browsertests-Core-* ]]; then
CUCUMBER_PARAMETER="@clean"
+ elif [[ ! -z $CUCUMBER_TAGS ]]; then
+CUCUMBER_PARAMETER="$CUCUMBER_TAGS"
else
CUCUMBER_PARAMETER="@{mediawiki_url}"
fi
@@ -775,6 +778,7 @@
- shell: |
# set up environment variables
export BROWSER={browser}
+ export CUCUMBER_TAGS={cucumber_tags}
export HEADLESS={headless}
export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php
export MEDIAWIKI_PASSWORD_VARIABLE={mediawiki_password_variable}
@@ -852,6 +856,8 @@
if [[ ! -z $LANGUAGE_SCREENSHOT_CODE ]]; then
CUCUMBER_PARAMETER="@language_screenshot"
export LANGUAGE_SCREENSHOT_PATH="$WORKSPACE/log"
+ elif [[ ! -z $CUCUMBER_TAGS ]]; then
+CUCUMBER_PARAMETER="$CUCUMBER_TAGS"
else
CUCUMBER_PARAMETER="@{mediawiki_url}"
fi
--
To view, visit https://gerrit.wikimedia.org/r/165461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-M
[MediaWiki-commits] [Gerrit] Matching gifts added to the English letter again - change (wikimedia...crm)
Pcoombe has submitted this change and it was merged.
Change subject: Matching gifts added to the English letter again
..
Matching gifts added to the English letter again
Change-Id: Ic3fb0bae0f4595da92937fdf6a74980ebfa5cb99
---
M sites/all/modules/thank_you/templates/html/thank_you.en.html
1 file changed, 9 insertions(+), 8 deletions(-)
Approvals:
Pcoombe: Looks good to me, approved
diff --git a/sites/all/modules/thank_you/templates/html/thank_you.en.html
b/sites/all/modules/thank_you/templates/html/thank_you.en.html
index ab30e68..5d43975 100644
--- a/sites/all/modules/thank_you/templates/html/thank_you.en.html
+++ b/sites/all/modules/thank_you/templates/html/thank_you.en.html
@@ -25,19 +25,20 @@
Wikimedia Foundation
https://donate.wikimedia.org/";>donate.wikimedia.org
+Many employers will match employee contributions: please check with your
company to see if they have a https://wikimediafoundation.org/wiki/Matching_Gifts/form";>corporate
matching gift program.
+
For your records: Your donation, number {{ transaction_id }}, on {{
receive_date }} was {{ (currency ~ " " ~ amount) | l10n_currency(locale) }}.
{% if recurring %} This donation is part of a recurring subscription.
Monthly payments will be debited by the Wikimedia Foundation until you notify
us to stop. If you’d like to cancel the payments please see our https://wikimediafoundation.org/wiki/Special:LandingCheck?landing_page=Cancel_or_change_recurring_payments&basic=true&language={{
locale }}">easy cancellation instructions. {%endif%}
This letter may serve as a record of your donation. No goods or services
were provided, in whole or in part, for this contribution. The Wikimedia
Foundation, Inc. is a non-profit charitable corporation with 501(c)(3) tax
exempt status in the United States. Our address is 149 New Montgomery, 3rd
Floor, San Francisco, CA, 94105. U.S. tax-exempt number: 20-0049703
-
- Opt out option:
-
-We'd like to keep you as a donor informed of our community activities and
fundraisers. If you prefer however not to receive such emails from us, please
click below and we'll take you off the list.
-
-Unsubscribe
-
+Opt out option:
+
+We'd like to keep you as a donor informed of our community activities and
fundraisers. If you prefer however not to receive such emails from us, please
click below and we'll take you off the list.
+
+
+ Unsubscribe
-
\ No newline at end of file
+
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/165873
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3fb0bae0f4595da92937fdf6a74980ebfa5cb99
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Katie Horn
Gerrit-Reviewer: Pcoombe
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move layout to new /jjb/ subdirectory - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/165996 Change subject: Move layout to new /jjb/ subdirectory .. Move layout to new /jjb/ subdirectory This is to prepare the merge of the repositories integration/zuul-config and integration/jenkins-job-builder-config Change-Id: I739b148e90374a90eb495f0d5f40af54475ba5e1 --- R jjb/analytics.yaml R jjb/beta.yaml R jjb/browsertests.yaml R jjb/cxserver.yaml R jjb/defaults.yaml R jjb/doc.yaml R jjb/experiment.yaml R jjb/integration.yaml R jjb/job-templates-browsertests.yaml R jjb/job-templates.yaml R jjb/labs.yaml R jjb/macro-scm.yaml R jjb/macro.yaml R jjb/mediawiki-extensions.yaml R jjb/mediawiki-misc.yaml R jjb/mediawiki-services.yaml R jjb/mediawiki-skins.yaml R jjb/mediawiki-tools.yaml R jjb/mediawiki.yaml R jjb/misc.yaml R jjb/mobile.yaml R jjb/operations-apache-config.yaml R jjb/operations-debs.yaml R jjb/operations-misc.yaml R jjb/operations-mw-config.yaml R jjb/operations-puppet.yaml R jjb/parsoidsvc.yaml R jjb/phabricator.yaml R jjb/php-extensions.yaml R jjb/php.yaml R jjb/python-jobs.yaml R jjb/pywikibot.yaml R jjb/ruby-jobs.yaml R jjb/sartoris.yaml R jjb/search.yaml R jjb/translatewiki.yaml R jjb/wikidata.yaml R jjb/wm-bots.yaml R jjb/wm-bugzilla-wikibugs.yaml R jjb/wm-fundraising.yaml R jjb/wm-misc.yaml 41 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/96/165996/1 diff --git a/analytics.yaml b/jjb/analytics.yaml similarity index 100% rename from analytics.yaml rename to jjb/analytics.yaml diff --git a/beta.yaml b/jjb/beta.yaml similarity index 100% rename from beta.yaml rename to jjb/beta.yaml diff --git a/browsertests.yaml b/jjb/browsertests.yaml similarity index 100% rename from browsertests.yaml rename to jjb/browsertests.yaml diff --git a/cxserver.yaml b/jjb/cxserver.yaml similarity index 100% rename from cxserver.yaml rename to jjb/cxserver.yaml diff --git a/defaults.yaml b/jjb/defaults.yaml similarity index 100% rename from defaults.yaml rename to jjb/defaults.yaml diff --git a/doc.yaml b/jjb/doc.yaml similarity index 100% rename from doc.yaml rename to jjb/doc.yaml diff --git a/experiment.yaml b/jjb/experiment.yaml similarity index 100% rename from experiment.yaml rename to jjb/experiment.yaml diff --git a/integration.yaml b/jjb/integration.yaml similarity index 100% rename from integration.yaml rename to jjb/integration.yaml diff --git a/job-templates-browsertests.yaml b/jjb/job-templates-browsertests.yaml similarity index 100% rename from job-templates-browsertests.yaml rename to jjb/job-templates-browsertests.yaml diff --git a/job-templates.yaml b/jjb/job-templates.yaml similarity index 100% rename from job-templates.yaml rename to jjb/job-templates.yaml diff --git a/labs.yaml b/jjb/labs.yaml similarity index 100% rename from labs.yaml rename to jjb/labs.yaml diff --git a/macro-scm.yaml b/jjb/macro-scm.yaml similarity index 100% rename from macro-scm.yaml rename to jjb/macro-scm.yaml diff --git a/macro.yaml b/jjb/macro.yaml similarity index 100% rename from macro.yaml rename to jjb/macro.yaml diff --git a/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml similarity index 100% rename from mediawiki-extensions.yaml rename to jjb/mediawiki-extensions.yaml diff --git a/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml similarity index 100% rename from mediawiki-misc.yaml rename to jjb/mediawiki-misc.yaml diff --git a/mediawiki-services.yaml b/jjb/mediawiki-services.yaml similarity index 100% rename from mediawiki-services.yaml rename to jjb/mediawiki-services.yaml diff --git a/mediawiki-skins.yaml b/jjb/mediawiki-skins.yaml similarity index 100% rename from mediawiki-skins.yaml rename to jjb/mediawiki-skins.yaml diff --git a/mediawiki-tools.yaml b/jjb/mediawiki-tools.yaml similarity index 100% rename from mediawiki-tools.yaml rename to jjb/mediawiki-tools.yaml diff --git a/mediawiki.yaml b/jjb/mediawiki.yaml similarity index 100% rename from mediawiki.yaml rename to jjb/mediawiki.yaml diff --git a/misc.yaml b/jjb/misc.yaml similarity index 100% rename from misc.yaml rename to jjb/misc.yaml diff --git a/mobile.yaml b/jjb/mobile.yaml similarity index 100% rename from mobile.yaml rename to jjb/mobile.yaml diff --git a/operations-apache-config.yaml b/jjb/operations-apache-config.yaml similarity index 100% rename from operations-apache-config.yaml rename to jjb/operations-apache-config.yaml diff --git a/operations-debs.yaml b/jjb/operations-debs.yaml similarity index 100% rename from operations-debs.yaml rename to jjb/operations-debs.yaml diff --git a/operations-misc.yaml b/jjb/operations-misc.yaml similarity index 100% rename from operations-misc.yaml rename to jjb/operations-misc.yaml diff --git a/operations-mw-config.yaml b/jjb/operations-mw-config.yaml similarity index 100% rename from operations-mw-config.yaml rename to jjb/operations-mw-co
[MediaWiki-commits] [Gerrit] Move layout to new /jjb/ subdirectory - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: Move layout to new /jjb/ subdirectory .. Move layout to new /jjb/ subdirectory This is to prepare the merge of the repositories integration/zuul-config and integration/jenkins-job-builder-config Update paths in integration-jjb-config-diff. Change-Id: I739b148e90374a90eb495f0d5f40af54475ba5e1 --- R jjb/analytics.yaml R jjb/beta.yaml R jjb/browsertests.yaml R jjb/cxserver.yaml R jjb/defaults.yaml R jjb/doc.yaml R jjb/experiment.yaml R jjb/integration.yaml R jjb/job-templates-browsertests.yaml R jjb/job-templates.yaml R jjb/labs.yaml R jjb/macro-scm.yaml R jjb/macro.yaml R jjb/mediawiki-extensions.yaml R jjb/mediawiki-misc.yaml R jjb/mediawiki-services.yaml R jjb/mediawiki-skins.yaml R jjb/mediawiki-tools.yaml R jjb/mediawiki.yaml R jjb/misc.yaml R jjb/mobile.yaml R jjb/operations-apache-config.yaml R jjb/operations-debs.yaml R jjb/operations-misc.yaml R jjb/operations-mw-config.yaml R jjb/operations-puppet.yaml R jjb/parsoidsvc.yaml R jjb/phabricator.yaml R jjb/php-extensions.yaml R jjb/php.yaml R jjb/python-jobs.yaml R jjb/pywikibot.yaml R jjb/ruby-jobs.yaml R jjb/sartoris.yaml R jjb/search.yaml R jjb/translatewiki.yaml R jjb/wikidata.yaml R jjb/wm-bots.yaml R jjb/wm-bugzilla-wikibugs.yaml R jjb/wm-fundraising.yaml R jjb/wm-misc.yaml 41 files changed, 2 insertions(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/analytics.yaml b/jjb/analytics.yaml similarity index 100% rename from analytics.yaml rename to jjb/analytics.yaml diff --git a/beta.yaml b/jjb/beta.yaml similarity index 100% rename from beta.yaml rename to jjb/beta.yaml diff --git a/browsertests.yaml b/jjb/browsertests.yaml similarity index 100% rename from browsertests.yaml rename to jjb/browsertests.yaml diff --git a/cxserver.yaml b/jjb/cxserver.yaml similarity index 100% rename from cxserver.yaml rename to jjb/cxserver.yaml diff --git a/defaults.yaml b/jjb/defaults.yaml similarity index 100% rename from defaults.yaml rename to jjb/defaults.yaml diff --git a/doc.yaml b/jjb/doc.yaml similarity index 100% rename from doc.yaml rename to jjb/doc.yaml diff --git a/experiment.yaml b/jjb/experiment.yaml similarity index 100% rename from experiment.yaml rename to jjb/experiment.yaml diff --git a/integration.yaml b/jjb/integration.yaml similarity index 95% rename from integration.yaml rename to jjb/integration.yaml index bddec2b..8d078f4 100644 --- a/integration.yaml +++ b/jjb/integration.yaml @@ -88,11 +88,11 @@ export PY_COLORS=1 echo "Generating config for proposed patchset..." -tox -e venv -- jenkins-jobs test "$WORKSPACE/config" -o "$WORKSPACE/output-proposed" +tox -e venv -- jenkins-jobs test "$WORKSPACE/config/jjb" -o "$WORKSPACE/output-proposed" echo "Generating reference config from parent..." (cd $WORKSPACE/config; git checkout HEAD^) -tox -e venv -- jenkins-jobs test "$WORKSPACE/config" -o "$WORKSPACE/output-parent" +tox -e venv -- jenkins-jobs test "$WORKSPACE/config/jjb" -o "$WORKSPACE/output-parent" echo "" echo "File changed:" diff --git a/job-templates-browsertests.yaml b/jjb/job-templates-browsertests.yaml similarity index 100% rename from job-templates-browsertests.yaml rename to jjb/job-templates-browsertests.yaml diff --git a/job-templates.yaml b/jjb/job-templates.yaml similarity index 100% rename from job-templates.yaml rename to jjb/job-templates.yaml diff --git a/labs.yaml b/jjb/labs.yaml similarity index 100% rename from labs.yaml rename to jjb/labs.yaml diff --git a/macro-scm.yaml b/jjb/macro-scm.yaml similarity index 100% rename from macro-scm.yaml rename to jjb/macro-scm.yaml diff --git a/macro.yaml b/jjb/macro.yaml similarity index 100% rename from macro.yaml rename to jjb/macro.yaml diff --git a/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml similarity index 100% rename from mediawiki-extensions.yaml rename to jjb/mediawiki-extensions.yaml diff --git a/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml similarity index 100% rename from mediawiki-misc.yaml rename to jjb/mediawiki-misc.yaml diff --git a/mediawiki-services.yaml b/jjb/mediawiki-services.yaml similarity index 100% rename from mediawiki-services.yaml rename to jjb/mediawiki-services.yaml diff --git a/mediawiki-skins.yaml b/jjb/mediawiki-skins.yaml similarity index 100% rename from mediawiki-skins.yaml rename to jjb/mediawiki-skins.yaml diff --git a/mediawiki-tools.yaml b/jjb/mediawiki-tools.yaml similarity index 100% rename from mediawiki-tools.yaml rename to jjb/mediawiki-tools.yaml diff --git a/mediawiki.yaml b/jjb/mediawiki.yaml similarity index 100% rename from mediawiki.yaml rename to jjb/mediawiki.yaml diff --git a/misc.yaml b/jjb/misc.yaml similarity index 100% rename from misc.yaml rename to jjb/misc.yaml diff -
[MediaWiki-commits] [Gerrit] Display MathML when MathPlayer is installed - change (mediawiki...Math)
Frédéric Wang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165997
Change subject: Display MathML when MathPlayer is installed
..
Display MathML when MathPlayer is installed
When MathPlayer is installed, we show the MathML instead of the SVG fallback.
This will in particular allow the sync highlighting feature of MathPlayer.
This also introduces a ext.math.js module that could be used to do some
Javascript postprocessing.
Bug: 71748
Change-Id: I438a20032c312d12321ca4c5686bcfd107656b37
---
M Math.hooks.php
M Math.php
M MathMathML.php
M modules/ext.math.css
A modules/ext.math.js
5 files changed, 21 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math
refs/changes/97/165997/1
diff --git a/Math.hooks.php b/Math.hooks.php
index 65819a1..e315974 100644
--- a/Math.hooks.php
+++ b/Math.hooks.php
@@ -135,6 +135,7 @@
$parser->getOutput()->addModules( array(
'ext.math.mathjax.enabler' ) );
}
$parser->getOutput()->addModuleStyles( array( 'ext.math.styles'
) );
+ $parser->getOutput()->addModules( array( 'ext.math.scripts' ) );
// Writes cache if rendering was successful
$renderer->writeCache();
diff --git a/Math.php b/Math.php
index c85bdb9..0314aaa 100644
--- a/Math.php
+++ b/Math.php
@@ -235,6 +235,11 @@
'remoteExtPath' => 'Math/modules',
'styles' => 'ext.math.css',
);
+$wgResourceModules['ext.math.scripts'] = array(
+ 'localBasePath' => __DIR__ . '/modules',
+ 'remoteExtPath' => 'Math/modules',
+ 'scripts' => 'ext.math.js',
+);
// MathJax module
// If you modify these arrays, update ext.math.mathjax.enabler.js to ensure
diff --git a/MathMathML.php b/MathMathML.php
index b57d738..332454b 100644
--- a/MathMathML.php
+++ b/MathMathML.php
@@ -424,6 +424,9 @@
} else {
$class .= 'inline';
}
+ if ( !$fallback) {
+ $class .= ' mwe-math-mathml-a11y';
+ }
return $class;
}
/**
diff --git a/modules/ext.math.css b/modules/ext.math.css
index d8bffee..6b9b32b 100644
--- a/modules/ext.math.css
+++ b/modules/ext.math.css
@@ -10,8 +10,8 @@
/* Default style for MathML. */
.mwe-math-mathml-inline { display: inline !important; }
.mwe-math-mathml-display { display: block !important; margin-left: auto;
margin-right: auto; }
-.mwe-math-mathml-inline, .mwe-math-mathml-display {
-/* We try to hide the MathML formula in a way that still makes it
accessible to screen readers. */
+.mwe-math-mathml-a11y {
+/* We try to hide the MathML formula in a way that still makes it
accessible to accessibility tools. */
clip: rect(1px, 1px, 1px, 1px);
overflow: hidden;
position: absolute;
@@ -59,7 +59,7 @@
@-moz-document url-prefix() {
/* For Gecko browsers, hide the SVG fallback and show the MathML instead.
We override the style for SVG and MathML above */
-.mwe-math-mathml-inline, .mwe-math-mathml-display {
+.mwe-math-mathml-a11y {
clip: auto;
overflow: visible;
position: static;
diff --git a/modules/ext.math.js b/modules/ext.math.js
new file mode 100644
index 000..6e01642
--- /dev/null
+++ b/modules/ext.math.js
@@ -0,0 +1,9 @@
+( function ( $ ) {
+ 'use strict';
+ // If MathPlayer is installed we show the MathML rendering.
+ if (navigator.userAgent.indexOf('MathPlayer') > -1) {
+ $( 'span.mwe-math-mathml-a11y' ).removeClass(
'mwe-math-mathml-a11y' );
+ }
+ // FIXME: for browsers without SVG support, the fallback should be
+ // updated to point to PNG images.
+}( jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/165997
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I438a20032c312d12321ca4c5686bcfd107656b37
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Frédéric Wang
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initial .gitreview file - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/165998 Change subject: Initial .gitreview file .. Initial .gitreview file Change-Id: Ib34319741a50bd8972644dbaeee401635795a203 --- A .gitreview 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/98/165998/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..23f67c4 --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=integration/config.git +defaultbranch=master -- To view, visit https://gerrit.wikimedia.org/r/165998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib34319741a50bd8972644dbaeee401635795a203 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initial .gitreview file - change (integration/config)
Hashar has submitted this change and it was merged. Change subject: Initial .gitreview file .. Initial .gitreview file Change-Id: Ib34319741a50bd8972644dbaeee401635795a203 --- A .gitreview 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..23f67c4 --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=integration/config.git +defaultbranch=master -- To view, visit https://gerrit.wikimedia.org/r/165998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib34319741a50bd8972644dbaeee401635795a203 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Dummy jobs for integration/config - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/165999 Change subject: Dummy jobs for integration/config .. Dummy jobs for integration/config noop for now Change-Id: Ifbba9386c7a08a3e60e993deb313226b8446d5f9 --- M zuul/layout.yaml 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/99/165999/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 9615ba0..1f5291b 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1770,6 +1770,14 @@ projects: - name: gerrit + - name: integration/config +check: + - noop +test: + - noop +gate-and-submit: + - noop + - name: integration/jenkins template: - name: 'python-lint' -- To view, visit https://gerrit.wikimedia.org/r/165999 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifbba9386c7a08a3e60e993deb313226b8446d5f9 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Dummy jobs for integration/config - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Dummy jobs for integration/config .. Dummy jobs for integration/config noop for now Change-Id: Ifbba9386c7a08a3e60e993deb313226b8446d5f9 --- M zuul/layout.yaml 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 9615ba0..1f5291b 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1770,6 +1770,14 @@ projects: - name: gerrit + - name: integration/config +check: + - noop +test: + - noop +gate-and-submit: + - noop + - name: integration/jenkins template: - name: 'python-lint' -- To view, visit https://gerrit.wikimedia.org/r/165999 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifbba9386c7a08a3e60e993deb313226b8446d5f9 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: enable container-server statsd reporting - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift: enable container-server statsd reporting
..
swift: enable container-server statsd reporting
Change-Id: Id6dc9f7e1becd27ddfb357f3b023b8205d824879
---
M hieradata/codfw.yaml
M manifests/role/swift.pp
M manifests/swift.pp
M modules/swift_new/manifests/storage.pp
M modules/swift_new/templates/container-server.conf.erb
M templates/swift/etc.swift.container-server.conf.erb
6 files changed, 21 insertions(+), 13 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml
index 1e7a7a8..72807ef 100644
--- a/hieradata/codfw.yaml
+++ b/hieradata/codfw.yaml
@@ -29,6 +29,7 @@
#search_backup:
swift_new::hash_path_suffix: 'de4227064232ed08'
+swift_new::storage::statsd_host: 'statsd.eqiad.wmnet'
swift_new::proxy::proxy_address: 'http://ms-fe.svc.codfw.wmnet'
swift_new::proxy::statsd_host: 'statsd.eqiad.wmnet'
swift_new::proxy::backend_url_format: 'sitelang'
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 7231e22..e136030 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -379,7 +379,9 @@
include ::swift_new::params
include ::swift_new
include ::swift_new::ring
-include ::swift_new::storage
+class { '::swift_new::storage':
+statsd_metric_prefix =>
"swift.${::swift_new::params::swift_cluster}.${::hostname}",
+}
include ::swift_new::container_sync
include ::swift_new::storage::monitoring
diff --git a/manifests/swift.pp b/manifests/swift.pp
index c206209..4194fed 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -227,7 +227,10 @@
}
}
-class config {
+class config (
+$statsd_host = 'statsd.eqiad.wmnet',
+$statsd_metric_prefix =
"swift.${::swift::base::cluster_name}.${::hostname}"
+){
require swift::storage::packages
class { 'rsync::server':
diff --git a/modules/swift_new/manifests/storage.pp
b/modules/swift_new/manifests/storage.pp
index 1f5be9c..0c7e696 100644
--- a/modules/swift_new/manifests/storage.pp
+++ b/modules/swift_new/manifests/storage.pp
@@ -1,4 +1,8 @@
-class swift_new::storage {
+class swift_new::storage (
+$statsd_host = undef,
+$statsd_metric_prefix = undef,
+$statsd_sample_rate_factor = '1',
+) {
package {
[ 'swift-account',
'swift-container',
diff --git a/modules/swift_new/templates/container-server.conf.erb
b/modules/swift_new/templates/container-server.conf.erb
index cd00257..6638cfe 100644
--- a/modules/swift_new/templates/container-server.conf.erb
+++ b/modules/swift_new/templates/container-server.conf.erb
@@ -3,11 +3,10 @@
devices = /srv/swift-storage/
workers = <%= @processorcount %>
db_preallocation = on
-# statsd collection is off for the initial deploy; on after figuring out
ganglia issues
-# log_statsd_host = localhost
-# log_statsd_port = 8125
-# log_statsd_default_sample_rate = 1
-# log_statsd_metric_prefix =
+log_statsd_host = <%= @statsd_host %>
+log_statsd_port = 8125
+log_statsd_metric_prefix = <%= @statsd_metric_prefix %>
+log_statsd_sample_rate_factor = <%= @statsd_sample_rate_factor %>
[pipeline:main]
diff --git a/templates/swift/etc.swift.container-server.conf.erb
b/templates/swift/etc.swift.container-server.conf.erb
index cd00257..94655f4 100644
--- a/templates/swift/etc.swift.container-server.conf.erb
+++ b/templates/swift/etc.swift.container-server.conf.erb
@@ -3,11 +3,10 @@
devices = /srv/swift-storage/
workers = <%= @processorcount %>
db_preallocation = on
-# statsd collection is off for the initial deploy; on after figuring out
ganglia issues
-# log_statsd_host = localhost
-# log_statsd_port = 8125
-# log_statsd_default_sample_rate = 1
-# log_statsd_metric_prefix =
+log_statsd_host = <%= @statsd_host %>
+log_statsd_port = 8125
+log_statsd_metric_prefix = <%= @statsd_metric_prefix %>
+log_statsd_sample_rate_factor = 1
[pipeline:main]
--
To view, visit https://gerrit.wikimedia.org/r/165995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id6dc9f7e1becd27ddfb357f3b023b8205d824879
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi
Gerrit-Reviewer: Filippo Giunchedi
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Unsubscribe SemanticFormsUniqueValue, as it will be deleted - change (mediawiki/extensions)
QChris has uploaded a new change for review. https://gerrit.wikimedia.org/r/166001 Change subject: Unsubscribe SemanticFormsUniqueValue, as it will be deleted .. Unsubscribe SemanticFormsUniqueValue, as it will be deleted Change-Id: I9eb70f384ee41e900d8a3de9aada687e5710a838 --- M .gitmodules D SemanticFormsUniqueValue 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/01/166001/1 diff --git a/.gitmodules b/.gitmodules index 1a465fa..ebc5668 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2074,10 +2074,6 @@ path = SemanticFormsInputs url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SemanticFormsInputs.git branch = . -[submodule "SemanticFormsUniqueValue"] - path = SemanticFormsUniqueValue - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SemanticFormsUniqueValue.git - branch = . [submodule "SemanticGenealogy"] path = SemanticGenealogy url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SemanticGenealogy.git diff --git a/SemanticFormsUniqueValue b/SemanticFormsUniqueValue deleted file mode 16 index b321a46..000 --- a/SemanticFormsUniqueValue +++ /dev/null -Subproject commit b321a46f20fa89e2d7627ec5a2715dbf8846c240 -- To view, visit https://gerrit.wikimedia.org/r/166001 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9eb70f384ee41e900d8a3de9aada687e5710a838 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: QChris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Unsubscribe SemanticFormsDisplayTitle, as it will be deleted - change (mediawiki/extensions)
QChris has uploaded a new change for review. https://gerrit.wikimedia.org/r/166000 Change subject: Unsubscribe SemanticFormsDisplayTitle, as it will be deleted .. Unsubscribe SemanticFormsDisplayTitle, as it will be deleted Change-Id: Ie389c5c9b6965c56c9186c6faeb3ee36815a028a --- M .gitmodules D SemanticFormsDisplayTitle 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/00/166000/1 diff --git a/.gitmodules b/.gitmodules index 1a465fa..dd9d4cf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2066,10 +2066,6 @@ path = SemanticForms url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SemanticForms.git branch = . -[submodule "SemanticFormsDisplayTitle"] - path = SemanticFormsDisplayTitle - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SemanticFormsDisplayTitle.git - branch = . [submodule "SemanticFormsInputs"] path = SemanticFormsInputs url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SemanticFormsInputs.git diff --git a/SemanticFormsDisplayTitle b/SemanticFormsDisplayTitle deleted file mode 16 index e4e4dc6..000 --- a/SemanticFormsDisplayTitle +++ /dev/null -Subproject commit e4e4dc6f1812902151eaae8dc624b004602d47b1 -- To view, visit https://gerrit.wikimedia.org/r/166000 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie389c5c9b6965c56c9186c6faeb3ee36815a028a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: QChris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Unsubscribe PartitionQuery, as it will be deleted - change (mediawiki/extensions)
QChris has uploaded a new change for review. https://gerrit.wikimedia.org/r/166002 Change subject: Unsubscribe PartitionQuery, as it will be deleted .. Unsubscribe PartitionQuery, as it will be deleted Change-Id: Ia6943a759f20c9245d3f42c8bc36107ac755f4bf --- M .gitmodules D PartitionQuery 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/02/166002/1 diff --git a/.gitmodules b/.gitmodules index 1a465fa..1e048da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1634,10 +1634,6 @@ path = Parsoid url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Parsoid.git branch = . -[submodule "PartitionQuery"] - path = PartitionQuery - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PartitionQuery.git - branch = . [submodule "PdfBook"] path = PdfBook url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PdfBook.git diff --git a/PartitionQuery b/PartitionQuery deleted file mode 16 index f965acd..000 --- a/PartitionQuery +++ /dev/null -Subproject commit f965acd044b6e51d167676280ec0e507fdbda070 -- To view, visit https://gerrit.wikimedia.org/r/166002 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6943a759f20c9245d3f42c8bc36107ac755f4bf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: QChris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added initial Debian packaging - change (operations...apertium-es-pt)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Added initial Debian packaging
..
Added initial Debian packaging
Change-Id: I46b11d60e493765060b31533666c8ce85ea4ba4c
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 121 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..e44db28
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,36 @@
+apertium-es-pt (1.1.5+svn~57507-1) trusty; urgency=low
+
+ [ Tino Didriksen ]
+ * New upstream release based on SVN snapshot.
+
+ [ Kartik Mistry ]
+ * Added debian/watch file.
+
+ -- Kartik Mistry Wed, 08 Oct 2014 18:14:06 +0530
+
+apertium-es-pt (1.0.3-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Rebuild against apertium 3.1: fix build dependency and configure.ac
+accordingly; re-run autoconf. (Closes: #527789)
+
+ -- Stefano Zacchiroli Tue, 15 Sep 2009 16:22:51 +0200
+
+apertium-es-pt (1.0.3-2) unstable; urgency=low
+
+ * Fixed Build-Depends (Closes: #446594)
+
+ -- Francis Tyers Mon, 22 Oct 2007 16:27:44 +0100
+
+apertium-es-pt (1.0.3-1) unstable; urgency=low
+
+ * Depends on apertium 3.0, build system now autoconf
+
+ -- Francis Tyers Mon, 08 Oct 2007 08:30:42 +0100
+
+apertium-es-pt (0.9-1) unstable; urgency=low
+
+ * Initial release (Closes: #388151)
+
+ -- Francis Tyers Mon, 18 Sep 2006 21:42:00 +0100
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..8252d82
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,27 @@
+Source: apertium-es-pt
+Section: science
+Priority: optional
+Maintainer: Debian Science Team
+Uploaders: Tino Didriksen ,
+ Kartik Mistry
+Build-Depends: apertium (>= 3.3),
+ autotools-dev,
+ debhelper (>= 9.0),
+ dh-autoreconf,
+ gawk,
+ libapertium3-3.3-dev,
+ locales,
+ pkg-config (>= 0.21)
+Standards-Version: 3.9.6
+Homepage: http://apertium.org/
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-es-pt.git
+Vcs-Browser:
https://anonscm.debian.org/cgit/debian-science/packages/apertium-es-pt.git
+
+Package: apertium-es-pt
+Architecture: all
+Depends: apertium (>= 3.3), ${misc:Depends}, ${shlibs:Depends}
+Provides: apertium-pt-es
+Conflicts: apertium-pt-es
+Description: Apertium translation data for the Spanish-Portuguese pair
+ Data package providing Apertium language resources for translating
+ between the Spanish and Portuguese languages.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..8f6f23c
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,22 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://apertium.org/
+
+Files: *
+Copyright: 2014, Apertium Project Management Committee
+ See AUTHORS for more copyrights.
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see
[MediaWiki-commits] [Gerrit] Add initial Debian packaging - change (operations...apertium-es-ca)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Add initial Debian packaging
..
Add initial Debian packaging
Change-Id: I2287a32c0a5bd9635f18d48351fb8b578b590437
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 142 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..2207744
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,55 @@
+apertium-es-ca (1.2.1+svn~57448-1) trusty; urgency=low
+
+ [ Kartik Mistry ]
+ * New upstream SVN snapshot to fix regression with ca-es pair.
+ * debian/control:
++ Added missing Vcs-* fields.
+
+ -- Kartik Mistry Mon, 06 Oct 2014 13:05:47 +0530
+
+apertium-es-ca (1.2.1-1) experimental; urgency=low
+
+ [ Tino Didriksen ]
+ * New upstream release. Updated configure.ac/Makefile.am to build correctly.
+ * Updated debian/rules to use dh rules.
+
+ [ Kartik Mistry ]
+ * Added myself as Uploaders.
+ * wrap-and-sort control and other files.
+ * Added watch file.
+
+ -- Kartik Mistry Thu, 25 Sep 2014 13:49:31 +0530
+
+apertium-es-ca (1.1.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rebuild package to fix "Unknown error matching regexp" (Closes: #726590)
+
+ -- Kartik Mistry Mon, 07 Jul 2014 21:45:09 +
+
+apertium-es-ca (1.1.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Added depends with apertium-pcre2
+
+ -- Francis Tyers Sun, 01 Mar 2009 21:12:33 +
+
+apertium-es-ca (1.0.5-2) unstable; urgency=low
+
+ * Fixed build-depends (Closes: #447462)
+
+ -- Francis Tyers Mon, 22 Oct 2007 16:25:09 +0100
+
+apertium-es-ca (1.0.5-1) unstable; urgency=low
+
+ * Licence changed to GPL
+ * Depends on apertium-3.0
+
+ -- Francis Tyers Mon, 08 Oct 2007 08:51:46 +0100
+
+apertium-es-ca (1.0.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #320934)
+
+ -- Francis Tyers Mon, 18 Sep 2006 21:42:00 +0100
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..68c1518
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,29 @@
+Source: apertium-es-ca
+Section: science
+Priority: optional
+Maintainer: Debian Science Team
+Uploaders: Tino Didriksen ,
+ Kartik Mistry
+Build-Depends: apertium (>= 3.3),
+ autotools-dev,
+ debhelper (>= 9.0),
+ dh-autoreconf,
+ gawk,
+ libapertium3-3.3-dev,
+ locales,
+ pkg-config (>= 0.21)
+Standards-Version: 3.9.5
+Homepage: http://apertium.org/
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium.git
+Vcs-Browser:
https://anonscm.debian.org/cgit/debian-science/packages/apertium.git
+
+Package: apertium-es-ca
+Architecture: all
+Depends: apertium (>= 3.3), ${misc:Depends}, ${shlibs:Depends}
+Provides: apertium-ca-es
+Conflicts: apertium-ca-es
+Description: Apertium translation data for the Spanish-Catalan pair
+ This data package provides Apertium language resources for translating
+ between the Spanish (es) and Catalan (ca) languages.
+ .
+ This package also provides Catalan to Spanish language pair.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..8f6f23c
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,22 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://apertium.org/
+
+Files: *
+Copyright: 2014, Apertium Project Management Committee
+ See AUTHORS for more copyrights.
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see
[MediaWiki-commits] [Gerrit] mediawiki: collect hhvm stats - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166003
Change subject: mediawiki: collect hhvm stats
..
mediawiki: collect hhvm stats
Change-Id: I3b4d93a0fca7e7f48c6913623b0736ea78517259
Signed-off-by: Giuseppe Lavagetto
---
A modules/mediawiki/files/monitoring/collectors/hhvm.py
M modules/mediawiki/manifests/monitoring/webserver.pp
2 files changed, 64 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/03/166003/1
diff --git a/modules/mediawiki/files/monitoring/collectors/hhvm.py
b/modules/mediawiki/files/monitoring/collectors/hhvm.py
new file mode 100644
index 000..40b84da
--- /dev/null
+++ b/modules/mediawiki/files/monitoring/collectors/hhvm.py
@@ -0,0 +1,58 @@
+# coding=utf-8
+"""
+Collect stats from hhvm
+
+### Dependencies
+
+ * json
+ * urllib2
+
+"""
+
+import json
+import urllib2
+import diamond.collector
+
+class mw_hhvmCollector(diamond.collector.Collector):
+
+def get_default_config_help(self):
+pass
+
+def get_default_config(self):
+config = super(mw_hhvmCollector, self).get_default_config()
+config.update({
+'host': 'localhost:9002',
+'url': '/',
+'timeout': 5,
+})
+
+def collect(self):
+# publish stats with self.publish
+url = "http://{}{}".format(
+self.config['host']
+self.config['url']
+)
+headers = {
+'User-agent': 'diamond-hhvm-collector/1.0',
+}
+try:
+req = urllib2.Request(url, None, headers)
+response = urllib2.urlopen(req, None, self.config['timeout'])
+except urllib2.HTTPError as e:
+self.log.error(
+'Got error status code %d from the HTTP server',
+e.code)
+return
+except urllib2.URLError as e:
+self.log.error('Could not contact server on localhost')
+return
+
+try:
+data = json.load(response)
+for k, v in data.iteritems():
+self.publish(k, v)
+except:
+self.log.error(
+"error parsing and publishing data received:\n%s",
+response.read())
+return
diff --git a/modules/mediawiki/manifests/monitoring/webserver.pp
b/modules/mediawiki/manifests/monitoring/webserver.pp
index 310d1b0..bfe4612 100644
--- a/modules/mediawiki/manifests/monitoring/webserver.pp
+++ b/modules/mediawiki/manifests/monitoring/webserver.pp
@@ -10,6 +10,12 @@
}
else {
$endpoints = {}
+diamond::collector { 'hhvm_health':
+ensure => $ensure,
+source =>
'puppet:///modules/mediawiki/monitoring/collectors/hhvm.py',
+settings => { url => '/check-health' },
+require => Apache::Site['hhvm-admin'],
+}
}
# Basic vhost files
--
To view, visit https://gerrit.wikimedia.org/r/166003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b4d93a0fca7e7f48c6913623b0736ea78517259
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki: collect hhvm stats - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki: collect hhvm stats
..
mediawiki: collect hhvm stats
Change-Id: I3b4d93a0fca7e7f48c6913623b0736ea78517259
Signed-off-by: Giuseppe Lavagetto
---
A modules/mediawiki/files/monitoring/collectors/hhvm.py
M modules/mediawiki/manifests/monitoring/webserver.pp
2 files changed, 65 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/modules/mediawiki/files/monitoring/collectors/hhvm.py
b/modules/mediawiki/files/monitoring/collectors/hhvm.py
new file mode 100644
index 000..1ee9be3
--- /dev/null
+++ b/modules/mediawiki/files/monitoring/collectors/hhvm.py
@@ -0,0 +1,59 @@
+# coding=utf-8
+"""
+Collect stats from hhvm
+
+### Dependencies
+
+ * json
+ * urllib2
+
+"""
+
+import json
+import urllib2
+import diamond.collector
+
+
+class mw_hhvmCollector(diamond.collector.Collector):
+
+def get_default_config_help(self):
+pass
+
+def get_default_config(self):
+config = super(mw_hhvmCollector, self).get_default_config()
+config.update({
+'host': 'localhost:9002',
+'url': '/',
+'timeout': 5,
+})
+
+def collect(self):
+# publish stats with self.publish
+url = "http://{}{}".format(
+self.config['host']
+self.config['url']
+)
+headers = {
+'User-agent': 'diamond-hhvm-collector/1.0',
+}
+try:
+req = urllib2.Request(url, None, headers)
+response = urllib2.urlopen(req, None, self.config['timeout'])
+except urllib2.HTTPError as e:
+self.log.error(
+'Got error status code %d from the HTTP server',
+e.code)
+return
+except urllib2.URLError as e:
+self.log.error('Could not contact server on localhost')
+return
+
+try:
+data = json.load(response)
+for k, v in data.iteritems():
+self.publish(k, v)
+except:
+self.log.error(
+"error parsing and publishing data received:\n%s",
+response.read())
+return
diff --git a/modules/mediawiki/manifests/monitoring/webserver.pp
b/modules/mediawiki/manifests/monitoring/webserver.pp
index 310d1b0..bfe4612 100644
--- a/modules/mediawiki/manifests/monitoring/webserver.pp
+++ b/modules/mediawiki/manifests/monitoring/webserver.pp
@@ -10,6 +10,12 @@
}
else {
$endpoints = {}
+diamond::collector { 'hhvm_health':
+ensure => $ensure,
+source =>
'puppet:///modules/mediawiki/monitoring/collectors/hhvm.py',
+settings => { url => '/check-health' },
+require => Apache::Site['hhvm-admin'],
+}
}
# Basic vhost files
--
To view, visit https://gerrit.wikimedia.org/r/166003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b4d93a0fca7e7f48c6913623b0736ea78517259
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki: fix typo in resource dependency - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166004
Change subject: mediawiki: fix typo in resource dependency
..
mediawiki: fix typo in resource dependency
Change-Id: Ide0b1515d017744c0cbd6ddd5e0f3f950d66fad5
Signed-off-by: Giuseppe Lavagetto
---
M modules/mediawiki/manifests/monitoring/webserver.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/166004/1
diff --git a/modules/mediawiki/manifests/monitoring/webserver.pp
b/modules/mediawiki/manifests/monitoring/webserver.pp
index bfe4612..2ca7bf3 100644
--- a/modules/mediawiki/manifests/monitoring/webserver.pp
+++ b/modules/mediawiki/manifests/monitoring/webserver.pp
@@ -14,7 +14,7 @@
ensure => $ensure,
source =>
'puppet:///modules/mediawiki/monitoring/collectors/hhvm.py',
settings => { url => '/check-health' },
-require => Apache::Site['hhvm-admin'],
+require => Apache::Site['hhvm_admin'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/166004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide0b1515d017744c0cbd6ddd5e0f3f950d66fad5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki: fix typo in resource dependency - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki: fix typo in resource dependency
..
mediawiki: fix typo in resource dependency
Change-Id: Ide0b1515d017744c0cbd6ddd5e0f3f950d66fad5
Signed-off-by: Giuseppe Lavagetto
---
M modules/mediawiki/manifests/monitoring/webserver.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/modules/mediawiki/manifests/monitoring/webserver.pp
b/modules/mediawiki/manifests/monitoring/webserver.pp
index bfe4612..2ca7bf3 100644
--- a/modules/mediawiki/manifests/monitoring/webserver.pp
+++ b/modules/mediawiki/manifests/monitoring/webserver.pp
@@ -14,7 +14,7 @@
ensure => $ensure,
source =>
'puppet:///modules/mediawiki/monitoring/collectors/hhvm.py',
settings => { url => '/check-health' },
-require => Apache::Site['hhvm-admin'],
+require => Apache::Site['hhvm_admin'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/166004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ide0b1515d017744c0cbd6ddd5e0f3f950d66fad5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
Gerrit-Reviewer: Giuseppe Lavagetto
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add dir="auto" for labelview and alias list items - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Add dir="auto" for labelview and alias list items .. Add dir="auto" for labelview and alias list items otherwise, things like parenthesis in Arabic or other rtl are a bit messed up. We also need dir="rtl" or dir="ltr" in but should be done in a follow up patch. Change-Id: Ie0d960a5e9d1e08c07cd229cfa001143258ee94c --- M lib/resources/templates.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Thiemo Mättig (WMDE): Looks good to me, approved jenkins-bot: Verified diff --git a/lib/resources/templates.php b/lib/resources/templates.php index 448dcbb..7483a47 100644 --- a/lib/resources/templates.php +++ b/lib/resources/templates.php @@ -175,7 +175,7 @@ << - $2 + $2 $3 $4 @@ -213,7 +213,7 @@ $templates['wikibase-aliasesview-list-item'] = <<$1 +$1 HTML; $templates['wb-editsection'] = -- To view, visit https://gerrit.wikimedia.org/r/165487 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie0d960a5e9d1e08c07cd229cfa001143258ee94c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude Gerrit-Reviewer: Adrian Lang Gerrit-Reviewer: Amire80 Gerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Turn on building Cirrus index for faster regexes - change (operations/mediawiki-config)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/166005 Change subject: Turn on building Cirrus index for faster regexes .. Turn on building Cirrus index for faster regexes Change-Id: I8916a9873a64f61fdd95cbc6421a0cf86346fa3e --- M wmf-config/CirrusSearch-common.php 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/05/166005/1 diff --git a/wmf-config/CirrusSearch-common.php b/wmf-config/CirrusSearch-common.php index fe67e5c..287c5a9 100644 --- a/wmf-config/CirrusSearch-common.php +++ b/wmf-config/CirrusSearch-common.php @@ -49,6 +49,15 @@ # Ban the hebrew plugin, it is unstable $wgCirrusSearchBannedPlugins[] = 'elasticsearch-analysis-hebrew'; +# Build the ngram index to support fast regex matching +$wgCirrusSearchWikimediaExtraPlugin = array( + 'regex' => array( + 'build', + // 'use', Turn this on once it is built everywhere and remove this from CirrusSearch-labs.php + ), +); + + # Enable the "experimental" highlighter on all wikis $wgCirrusSearchUseExperimentalHighlighter = true; $wgCirrusSearchOptimizeIndexForExperimentalHighlighter = true; -- To view, visit https://gerrit.wikimedia.org/r/166005 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8916a9873a64f61fdd95cbc6421a0cf86346fa3e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Manybubbles ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] More clean up in SqlUsageTracker - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166006
Change subject: More clean up in SqlUsageTracker
..
More clean up in SqlUsageTracker
Oh wow, this was confusing. Sorry to say that. Some $entityIds
contained actual EntityId objects, other strings. An $entities array
should always contain Entity objects, not something else.
Change-Id: I360124c8df1896896c1183fe8567e6d5d979eb08
---
M client/includes/Usage/Sql/SqlUsageTracker.php
1 file changed, 28 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/06/166006/1
diff --git a/client/includes/Usage/Sql/SqlUsageTracker.php
b/client/includes/Usage/Sql/SqlUsageTracker.php
index b6cb82f..23aced6 100644
--- a/client/includes/Usage/Sql/SqlUsageTracker.php
+++ b/client/includes/Usage/Sql/SqlUsageTracker.php
@@ -127,13 +127,14 @@
}
/**
-* Returns the string serialization of an EntityId.
+* @param EntityId[] $entityIds
*
-* @param EntityId $entityId
-* @return string
+* @return string[]
*/
- private function getEntityIdSerialization( EntityId $entityId ) {
- return $entityId->getSerialization();
+ private function getEntityIdStrings( array $entityIds ) {
+ return array_map( function( EntityId $entityId ) {
+ return $entityId->getSerialization();
+ }, $entityIds );
}
/**
@@ -167,6 +168,7 @@
* @param EntityUsage[] $usages
*
* @throws InvalidArgumentException
+* @throws Exception
* @return EntityUsage[] Usages before the update, in the same form as
$usages
*/
public function trackUsedEntities( $pageId, array $usages ) {
@@ -290,16 +292,16 @@
* @param DatabaseBase $db
* @param int $pageId
* @param string $aspect
-* @param string[] $entityIds
+* @param string[] $entityIdStrings
*
* @return int The number of entries removed
*/
- private function removeAspectForPage( DatabaseBase $db, $pageId,
$aspect, array $entityIds ) {
- if ( empty( $entityIds ) ) {
+ private function removeAspectForPage( DatabaseBase $db, $pageId,
$aspect, array $entityIdStrings ) {
+ if ( empty( $entityIdStrings ) ) {
return 0;
}
- $batches = array_chunk( $entityIds, $this->batchSize );
+ $batches = array_chunk( $entityIdStrings, $this->batchSize );
$c = 0;
foreach ( $batches as $batch ) {
@@ -355,17 +357,17 @@
* Removes usage tracking for the given set of entities.
* This is used typically when entities were deleted.
*
-* @param EntityId[] $entities
+* @param EntityId[] $entityIds
*
-* @throws UsageTrackerException
+* @throws Exception
*/
- public function removeEntities( array $entities ) {
- if ( empty( $entities ) ) {
+ public function removeEntities( array $entityIds ) {
+ if ( empty( $entityIds ) ) {
return;
}
- $entityIds = array_map( array( $this,
'getEntityIdSerialization' ), $entities );
- $batches = array_chunk( $entityIds, $this->batchSize );
+ $entityIdStrings = $this->getEntityIdStrings( $entityIds );
+ $batches = array_chunk( $entityIdStrings, $this->batchSize );
$db = $this->beginAtomicSection( __METHOD__ );
@@ -449,20 +451,19 @@
/**
* @see UsageTracker::getPagesUsing
*
-* @param EntityId[] $entities
+* @param EntityId[] $entityIds
* @param array $aspects
*
* @return Iterator An iterator over page IDs.
* @throws UsageTrackerException
*/
- public function getPagesUsing( array $entities, array $aspects =
array() ) {
- if ( empty( $entities ) ) {
+ public function getPagesUsing( array $entityIds, array $aspects =
array() ) {
+ if ( empty( $entityIds ) ) {
return array();
}
- $entityIds = array_map( array( $this,
'getEntityIdSerialization' ), $entities );
-
- $where = array( 'eu_entity_id' => $entityIds );
+ $entityIdStrings = $this->getEntityIdStrings( $entityIds );
+ $where = array( 'eu_entity_id' => $entityIdStrings );
if ( !empty( $aspects ) ) {
$where['eu_aspect'] = $aspects;
@@ -501,10 +502,10 @@
$entityIdsBySerialization = array();
$entityIdStrings = array();
- foreach ( $entityIds as $id ) {
-
[MediaWiki-commits] [Gerrit] mediawiki: fix typo in python script - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166007
Change subject: mediawiki: fix typo in python script
..
mediawiki: fix typo in python script
Change-Id: If235149f0850b127f08fe69adb1e5ce61a003c2d
Signed-off-by: Giuseppe Lavagetto
---
M modules/mediawiki/files/monitoring/collectors/hhvm.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/07/166007/1
diff --git a/modules/mediawiki/files/monitoring/collectors/hhvm.py
b/modules/mediawiki/files/monitoring/collectors/hhvm.py
index 1ee9be3..b0620cf 100644
--- a/modules/mediawiki/files/monitoring/collectors/hhvm.py
+++ b/modules/mediawiki/files/monitoring/collectors/hhvm.py
@@ -30,7 +30,7 @@
def collect(self):
# publish stats with self.publish
url = "http://{}{}".format(
-self.config['host']
+self.config['host'],
self.config['url']
)
headers = {
--
To view, visit https://gerrit.wikimedia.org/r/166007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If235149f0850b127f08fe69adb1e5ce61a003c2d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki: fix typo in python script - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki: fix typo in python script
..
mediawiki: fix typo in python script
Change-Id: If235149f0850b127f08fe69adb1e5ce61a003c2d
Signed-off-by: Giuseppe Lavagetto
---
M modules/mediawiki/files/monitoring/collectors/hhvm.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/files/monitoring/collectors/hhvm.py
b/modules/mediawiki/files/monitoring/collectors/hhvm.py
index 1ee9be3..b0620cf 100644
--- a/modules/mediawiki/files/monitoring/collectors/hhvm.py
+++ b/modules/mediawiki/files/monitoring/collectors/hhvm.py
@@ -30,7 +30,7 @@
def collect(self):
# publish stats with self.publish
url = "http://{}{}".format(
-self.config['host']
+self.config['host'],
self.config['url']
)
headers = {
--
To view, visit https://gerrit.wikimedia.org/r/166007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If235149f0850b127f08fe69adb1e5ce61a003c2d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Apply coding convections for JavaScript - change (mediawiki...CodeEditor)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166008
Change subject: Apply coding convections for JavaScript
..
Apply coding convections for JavaScript
* Reorder functions to avoid forward references
* Remove unused variables saved and summary
* Fix whitespaces
* Avoid else after return
* Combine var blocks
Change-Id: I2a66645c24b9cce287c4196f2c4a762420ad80a0
---
M modules/jquery.codeEditor.js
1 file changed, 52 insertions(+), 54 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor
refs/changes/08/166008/1
diff --git a/modules/jquery.codeEditor.js b/modules/jquery.codeEditor.js
index 40fe8b9..d4482e8 100644
--- a/modules/jquery.codeEditor.js
+++ b/modules/jquery.codeEditor.js
@@ -1,6 +1,6 @@
/* Ace syntax-highlighting code editor extension for wikiEditor */
/*global require, ace, confirm */
-(function ( $, mw ) {
+( function ( $, mw ) {
$.wikiEditor.modules.codeEditor = {
/**
* Core Requirements
@@ -53,24 +53,24 @@
* function is to both classify the scope of changes as
'division' or 'character' and to prevent further
* processing of events which did not actually change
the content of the iframe.
*/
- 'keydown': function ( ) {
+ 'keydown': function () {
},
- 'change': function ( ) {
+ 'change': function () {
},
- 'delayedChange': function ( ) {
+ 'delayedChange': function () {
},
- 'cut': function ( ) {
+ 'cut': function () {
},
- 'paste': function ( ) {
+ 'paste': function () {
},
- 'ready': function ( ) {
+ 'ready': function () {
},
- 'codeEditorSubmit': function ( ) {
+ 'codeEditorSubmit': function () {
context.evt.codeEditorSync();
var i,
hasError = false,
annotations =
context.codeEditor.getSession().getAnnotations();
- for( i = 0; i < annotations.length; i++ ) {
+ for ( i = 0; i < annotations.length; i++ ) {
if ( annotations[i].type === 'error' ) {
hasError = true;
break;
@@ -80,7 +80,7 @@
return confirm( mw.msg(
'codeeditor-save-with-errors' ) );
}
},
- 'codeEditorSync': function ( ) {
+ 'codeEditorSync': function () {
context.$textarea.val(
context.$textarea.textSelection( 'getContents' ) );
}
@@ -95,7 +95,7 @@
'codeEditorToolbarIcon': function () {
// When loaded as a gadget, one may need to
override the wiki's own assets path.
var iconPath = mw.config.get(
'wgCodeEditorAssetsPath', mw.config.get( 'wgExtensionAssetsPath' ) ) +
'/CodeEditor/images/';
- return iconPath + (context.codeEditorActive ?
'code-selected.png' : 'code.png');
+ return iconPath + ( context.codeEditorActive ?
'code-selected.png' : 'code.png' );
},
'setupCodeEditorToolbar': function () {
// Drop out some formatting that isn't relevant
on these pages...
@@ -159,7 +159,7 @@
* Sets up the iframe in place of the textarea to allow
more advanced operations
*/
'setupCodeEditor': function () {
- var box, lang, basePath, container, editdiv,
session, resize, summary, AceLangMode;
+ var box, lang, basePath, container, editdiv,
session, resize, AceLangMode;
box = context.$textarea;
lang = mw.config.get(
'wgCodeEditorCurrentLanguage' );
@@ -228,10 +228,10 @@
// updated right away to actually use
the new style.
$( mw ).bind( 'LivePreviewPrepare',
context.evt.codeEditorSubmit );
- ace.config.loadModule( 'ace/mode/' +
lang, function() {
+
[MediaWiki-commits] [Gerrit] Merge integration/jenkins-job-builder-config.git - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/166010 Change subject: Merge integration/jenkins-job-builder-config.git .. Merge integration/jenkins-job-builder-config.git Conflicts: .gitignore .gitreview Change-Id: I25f83f304453c474d5a1187c5f216ebc95870d3f --- M .gitignore M .gitreview 2 files changed, 0 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/10/166010/1 diff --git a/.gitignore b/.gitignore index 005e6fb..ef6f216 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ -<<< HEAD (7bef36 Merge integration/zuul-config.git) *.pyc /.tox -=== # Ignore any dotfile ... .* # ... but whitelist some: @@ -12,4 +10,3 @@ *~ *.kate-swp .*.swp ->>> BRANCH (9f9691 Move layout to new /jjb/ subdirectory) diff --git a/.gitreview b/.gitreview index 537fa96..23f67c4 100644 --- a/.gitreview +++ b/.gitreview @@ -1,9 +1,5 @@ [gerrit] host=gerrit.wikimedia.org port=29418 -<<< HEAD (7bef36 Merge integration/zuul-config.git) project=integration/config.git -=== -project=integration/jenkins-job-builder-config.git ->>> BRANCH (9f9691 Move layout to new /jjb/ subdirectory) defaultbranch=master -- To view, visit https://gerrit.wikimedia.org/r/166010 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25f83f304453c474d5a1187c5f216ebc95870d3f Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge integration/zuul-config.git - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/166009 Change subject: Merge integration/zuul-config.git .. Merge integration/zuul-config.git Conflicts: .gitreview Change-Id: I2b67781746c411c4e7c2acb0400fec2a069c8c95 --- M .gitreview 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/09/166009/1 diff --git a/.gitreview b/.gitreview index 1702a37..23f67c4 100644 --- a/.gitreview +++ b/.gitreview @@ -1,9 +1,5 @@ [gerrit] host=gerrit.wikimedia.org port=29418 -<<< HEAD (377105 Initial .gitreview file) project=integration/config.git -=== -project=integration/zuul-config.git ->>> BRANCH (1b2537 Dummy jobs for integration/config) defaultbranch=master -- To view, visit https://gerrit.wikimedia.org/r/166009 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b67781746c411c4e7c2acb0400fec2a069c8c95 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge integration/zuul-config.git - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Merge integration/zuul-config.git .. Merge integration/zuul-config.git Conflicts: .gitreview Change-Id: I2b67781746c411c4e7c2acb0400fec2a069c8c95 --- M .gitreview 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitreview b/.gitreview index 1702a37..23f67c4 100644 --- a/.gitreview +++ b/.gitreview @@ -1,9 +1,5 @@ [gerrit] host=gerrit.wikimedia.org port=29418 -<<< HEAD (377105 Initial .gitreview file) project=integration/config.git -=== -project=integration/zuul-config.git ->>> BRANCH (1b2537 Dummy jobs for integration/config) defaultbranch=master -- To view, visit https://gerrit.wikimedia.org/r/166009 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2b67781746c411c4e7c2acb0400fec2a069c8c95 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge integration/jenkins-job-builder-config.git - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Merge integration/jenkins-job-builder-config.git .. Merge integration/jenkins-job-builder-config.git Conflicts: .gitignore .gitreview Change-Id: I25f83f304453c474d5a1187c5f216ebc95870d3f --- M .gitignore M .gitreview 2 files changed, 0 insertions(+), 7 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 005e6fb..ef6f216 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ -<<< HEAD (7bef36 Merge integration/zuul-config.git) *.pyc /.tox -=== # Ignore any dotfile ... .* # ... but whitelist some: @@ -12,4 +10,3 @@ *~ *.kate-swp .*.swp ->>> BRANCH (9f9691 Move layout to new /jjb/ subdirectory) diff --git a/.gitreview b/.gitreview index 537fa96..23f67c4 100644 --- a/.gitreview +++ b/.gitreview @@ -1,9 +1,5 @@ [gerrit] host=gerrit.wikimedia.org port=29418 -<<< HEAD (7bef36 Merge integration/zuul-config.git) project=integration/config.git -=== -project=integration/jenkins-job-builder-config.git ->>> BRANCH (9f9691 Move layout to new /jjb/ subdirectory) defaultbranch=master -- To view, visit https://gerrit.wikimedia.org/r/166010 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25f83f304453c474d5a1187c5f216ebc95870d3f Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/166011 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 --- A JENKINS A jenkins-testfile.py A jenkins.erb A jenkins.js A jenkins.php A jenkins.pp A jenkins.rb 7 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/11/166011/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.erb b/jenkins.erb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.erb diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php diff --git a/jenkins.pp b/jenkins.pp new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.pp diff --git a/jenkins.rb b/jenkins.rb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.rb -- To view, visit https://gerrit.wikimedia.org/r/166011 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: switch Zuul conf to new repository - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166012
Change subject: contint: switch Zuul conf to new repository
..
contint: switch Zuul conf to new repository
The Zuul configuration files used to be in integration/zuul-config it
has been moved to integration/config.git
git::clone will probably whine but I can fix whatever issue happens
manually.
Change-Id: I7995797199e076983c67ab29365372bd2f4dbe6e
---
M manifests/role/zuul.pp
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/166012/1
diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index 8ed7965..51d4c64 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -109,13 +109,13 @@
# Deploy Wikimedia Zuul configuration files.
#
# Describe the behaviors and jobs
-# Conf file is hosted in integration/zuul-config git repo
-git::clone { 'integration/zuul-config':
+# Conf file is hosted in integration/config git repo
+git::clone { 'integration/config':
directory => '/etc/zuul/wikimedia',
owner => zuul,
group => zuul,
mode => '0775',
-origin=>
'https://gerrit.wikimedia.org/r/p/integration/zuul-config.git',
+origin=> 'https://gerrit.wikimedia.org/r/p/integration/config.git',
branch=>
$role::zuul::configuration::server[$::realm]['config_git_branch'],
}
--
To view, visit https://gerrit.wikimedia.org/r/166012
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7995797199e076983c67ab29365372bd2f4dbe6e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused destroy event from listview, improve destroy m... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove unused destroy event from listview, improve destroy
method
..
Remove unused destroy event from listview, improve destroy method
Change-Id: I593197cec7f23f4cc017bc9a4a0ca685aa55dc9d
---
M lib/resources/jquery.wikibase/jquery.wikibase.listview.js
1 file changed, 4 insertions(+), 7 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
Jeroen De Dauw: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.listview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.listview.js
index 1fe9af7..f2e97cb 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.listview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.listview.js
@@ -55,9 +55,6 @@
*(1) {jQuery.Event}
*(2) {number} The item node's new index.
*(3) {number} Number of items in the list.
- *
- * @event destroy: Triggered when the widget has been destroyed.
- *(1) {jQuery.Event}
*/
$.widget( 'wikibase.listview', PARENT, {
/**
@@ -110,12 +107,12 @@
},
/**
-* @see $.widget.destroy
+* @see jQuery.TemplatedWidget.destroy
*/
destroy: function() {
- this.element.removeClass( this.widgetBaseClass );
- $.Widget.prototype.destroy.call( this );
- this._trigger( 'destroy' );
+ this._lia = null;
+ this._reusedItems = null;
+ PARENT.prototype.destroy.call( this );
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/165181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I593197cec7f23f4cc017bc9a4a0ca685aa55dc9d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang
Gerrit-Reviewer: Jeroen De Dauw
Gerrit-Reviewer: Thiemo Mättig (WMDE)
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused use Content - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/166013 Change subject: Remove unused use Content .. Remove unused use Content Uh, what was that? Just in case you ask: Yes, the @param comments are a bit pointless. But PHPStorm complains if they are incomplete. Change-Id: If9d64ba63796d59938cc88efeb34d0917153b4db --- M repo/includes/content/ItemContent.php M repo/includes/content/PropertyContent.php 2 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/13/166013/1 diff --git a/repo/includes/content/ItemContent.php b/repo/includes/content/ItemContent.php index 2e5b5f5..8883000 100644 --- a/repo/includes/content/ItemContent.php +++ b/repo/includes/content/ItemContent.php @@ -2,7 +2,6 @@ namespace Wikibase; -use Content; use InvalidArgumentException; use Language; use LogicException; @@ -200,6 +199,10 @@ /** * @see getEntityView() * +* @param FingerprintView $fingerprintView +* @param ClaimsView $claimsView +* @param Language $language +* * @return ItemView */ protected function newEntityView( diff --git a/repo/includes/content/PropertyContent.php b/repo/includes/content/PropertyContent.php index 41e659c..c1c4a98 100644 --- a/repo/includes/content/PropertyContent.php +++ b/repo/includes/content/PropertyContent.php @@ -2,7 +2,6 @@ namespace Wikibase; -use Content; use Language; use Wikibase\Repo\View\ClaimsView; use Wikibase\Repo\View\FingerprintView; @@ -107,6 +106,10 @@ /** * @see getEntityView() * +* @param FingerprintView $fingerprintView +* @param ClaimsView $claimsView +* @param Language $language +* * @return PropertyView */ protected function newEntityView( -- To view, visit https://gerrit.wikimedia.org/r/166013 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9d64ba63796d59938cc88efeb34d0917153b4db Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not use second parameter to jQuery constructor - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Do not use second parameter to jQuery constructor
..
Do not use second parameter to jQuery constructor
It's discouraged by our coding conventions:
https://www.mediawiki.org/wiki/Manual:Coding_conventions/JavaScript#Pitfalls.
Change-Id: I78239065e96f30623262b951ab3bb378a1b3ffea
---
M lib/resources/jquery.wikibase/snakview/snakview.js
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/snakview/snakview.js
b/lib/resources/jquery.wikibase/snakview/snakview.js
index 862f710..f387a9f 100644
--- a/lib/resources/jquery.wikibase/snakview/snakview.js
+++ b/lib/resources/jquery.wikibase/snakview/snakview.js
@@ -819,10 +819,9 @@
if( propertyId ) {
// property ID selected but apparently no
variation available to handle it
- this.$snakValue.append( $( '', {
- 'text': mw.msg(
'wikibase-snakview-choosesnaktype' ),
- 'class': this.widgetBaseClass +
'-unsupportedsnaktype'
- } ) );
+ $( '' ).text( mw.msg(
'wikibase-snakview-choosesnaktype' ) )
+ .addClass( this.widgetBaseClass +
'-unsupportedsnaktype' )
+ .appendTo( this.$snakValue );
// NOTE: instead of doing this here and
checking everywhere whether this._variation
// is set, we could as well use variations for
displaying system messages like
// this, e.g. having a UnsupportedSnakType
variation which is not registered for a
--
To view, visit https://gerrit.wikimedia.org/r/165184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78239065e96f30623262b951ab3bb378a1b3ffea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang
Gerrit-Reviewer: Thiemo Mättig (WMDE)
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adjust jobs for integration/config.git - change (integration/config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166014
Change subject: Adjust jobs for integration/config.git
..
Adjust jobs for integration/config.git
Phase out the legacy jjb and zuul config repositories.
Creates:
integration-config-yamllint
integration-config-tox-py27
I have reused some previous name, adjusting path/repo name where
relevant.
Change-Id: I05dcba34cbf4fbadc55093bf74d15d66b3103694
---
M jjb/integration.yaml
M zuul/layout.yaml
2 files changed, 27 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/14/166014/1
diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index 8d078f4..4951949 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -20,7 +20,7 @@
git checkout $ZUUL_COMMIT
echo "`date -R`> $ZUUL_COMMIT" >> /srv/jenkins-autodeploy
-# Pass zuul-config.git:zuul/layout.yaml to zuul-server layout validation
+# Pass integration/config.git:zuul/layout.yaml to zuul-server layout validation
# Requires zuul to be installed on the Jenkins host.
- job-template:
name: 'integration-zuul-layoutvalidation'
@@ -71,7 +71,7 @@
branches:
- master
- git:
- url: '$ZUUL_URL/integration/jenkins-job-builder-config'
+ url: '$ZUUL_URL/integration/config'
branches:
- '$ZUUL_COMMIT'
refspec: '$ZUUL_REF'
@@ -105,28 +105,24 @@
echo "Done."
echo "Carefully review the diff above before deploying the jobs and
merging the patch"
+
+- project:
+name: 'integration-config'
+toxenv:
+ - py27
+jobs:
+ - 'integration-jjb-config-diff'
+ - 'integration-zuul-layoutdiff'
+ - 'integration-zuul-layoutvalidation'
+ - '{name}-tox-{toxenv}'
+ - '{name}-yamllint'
+
- project:
name: 'integration-docroot'
jobs:
- 'integration-docroot-deploy'
- '{name}-phplint'
- '{name}-jslint'
-
-- project:
-name: 'integration-zuul-config'
-toxenv:
- - py27
-jobs:
- - 'integration-zuul-layoutdiff'
- - 'integration-zuul-layoutvalidation'
- - '{name}-yamllint'
- - '{name}-tox-{toxenv}'
-
-- project:
-name: 'integration-jjb-config'
-jobs:
- - '{name}-yamllint'
- - 'integration-jjb-config-diff'
- project:
name: 'integration-jenkins'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1f5291b..e252385 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1772,11 +1772,21 @@
- name: integration/config
check:
- - noop
+ - integration-config-yamllint
+ - integration-zuul-layoutdiff
+ - integration-zuul-layoutvalidation
test:
- - noop
+ - integration-config-tox-py27
+ - integration-config-yamllint
+ - integration-jjb-config-diff
+ - integration-zuul-layoutdiff
+ - integration-zuul-layoutvalidation
gate-and-submit:
- - noop
+ - integration-config-tox-py27
+ - integration-config-yamllint
+ - integration-jjb-config-diff
+ - integration-zuul-layoutdiff
+ - integration-zuul-layoutvalidation
- name: integration/jenkins
template:
@@ -1794,15 +1804,6 @@
- 'integration-jenkins-phpunit'
- 'integration-jenkins-yamllint'
- - name: integration/jenkins-job-builder-config
-# FIXME: make this 'check' whenever we have integration tests
-check-voter:
- - integration-jjb-config-yamllint
- - integration-jjb-config-diff
-gate-and-submit:
- - integration-jjb-config-yamllint
- - integration-jjb-config-diff
-
- name: integration/phpunit
test:
- integration-phpunit-mediawiki-REL1_22
@@ -1815,22 +1816,6 @@
- integration-phpunit-mediawiki-REL1_24
- integration-phpunit-mediawiki-master
- mediawiki-gate
-
- - name: integration/zuul-config
-check:
- - integration-zuul-config-yamllint
- - integration-zuul-layoutvalidation
- - integration-zuul-layoutdiff
-test:
- - integration-zuul-config-yamllint
- - integration-zuul-layoutvalidation
- - integration-zuul-layoutdiff
- - integration-zuul-config-tox-py27
-gate-and-submit:
- - integration-zuul-config-yamllint
- - integration-zuul-layoutvalidation
- - integration-zuul-layoutdiff
- - integration-zuul-config-tox-py27
- name: mediawiki/core
check:
--
To view, visit https://gerrit.wikimedia.org/r/166014
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I05dcba34cbf4fbadc55093bf74d15d66b3103694
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adjust jobs for integration/config.git - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Adjust jobs for integration/config.git
..
Adjust jobs for integration/config.git
Phase out the legacy jjb and zuul config repositories.
Creates:
integration-config-yamllint
integration-config-tox-py27
I have reused some previous name, adjusting path/repo name where
relevant.
Change-Id: I05dcba34cbf4fbadc55093bf74d15d66b3103694
---
M jjb/integration.yaml
M zuul/layout.yaml
2 files changed, 27 insertions(+), 46 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index 8d078f4..4951949 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -20,7 +20,7 @@
git checkout $ZUUL_COMMIT
echo "`date -R`> $ZUUL_COMMIT" >> /srv/jenkins-autodeploy
-# Pass zuul-config.git:zuul/layout.yaml to zuul-server layout validation
+# Pass integration/config.git:zuul/layout.yaml to zuul-server layout validation
# Requires zuul to be installed on the Jenkins host.
- job-template:
name: 'integration-zuul-layoutvalidation'
@@ -71,7 +71,7 @@
branches:
- master
- git:
- url: '$ZUUL_URL/integration/jenkins-job-builder-config'
+ url: '$ZUUL_URL/integration/config'
branches:
- '$ZUUL_COMMIT'
refspec: '$ZUUL_REF'
@@ -105,28 +105,24 @@
echo "Done."
echo "Carefully review the diff above before deploying the jobs and
merging the patch"
+
+- project:
+name: 'integration-config'
+toxenv:
+ - py27
+jobs:
+ - 'integration-jjb-config-diff'
+ - 'integration-zuul-layoutdiff'
+ - 'integration-zuul-layoutvalidation'
+ - '{name}-tox-{toxenv}'
+ - '{name}-yamllint'
+
- project:
name: 'integration-docroot'
jobs:
- 'integration-docroot-deploy'
- '{name}-phplint'
- '{name}-jslint'
-
-- project:
-name: 'integration-zuul-config'
-toxenv:
- - py27
-jobs:
- - 'integration-zuul-layoutdiff'
- - 'integration-zuul-layoutvalidation'
- - '{name}-yamllint'
- - '{name}-tox-{toxenv}'
-
-- project:
-name: 'integration-jjb-config'
-jobs:
- - '{name}-yamllint'
- - 'integration-jjb-config-diff'
- project:
name: 'integration-jenkins'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1f5291b..e252385 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1772,11 +1772,21 @@
- name: integration/config
check:
- - noop
+ - integration-config-yamllint
+ - integration-zuul-layoutdiff
+ - integration-zuul-layoutvalidation
test:
- - noop
+ - integration-config-tox-py27
+ - integration-config-yamllint
+ - integration-jjb-config-diff
+ - integration-zuul-layoutdiff
+ - integration-zuul-layoutvalidation
gate-and-submit:
- - noop
+ - integration-config-tox-py27
+ - integration-config-yamllint
+ - integration-jjb-config-diff
+ - integration-zuul-layoutdiff
+ - integration-zuul-layoutvalidation
- name: integration/jenkins
template:
@@ -1794,15 +1804,6 @@
- 'integration-jenkins-phpunit'
- 'integration-jenkins-yamllint'
- - name: integration/jenkins-job-builder-config
-# FIXME: make this 'check' whenever we have integration tests
-check-voter:
- - integration-jjb-config-yamllint
- - integration-jjb-config-diff
-gate-and-submit:
- - integration-jjb-config-yamllint
- - integration-jjb-config-diff
-
- name: integration/phpunit
test:
- integration-phpunit-mediawiki-REL1_22
@@ -1815,22 +1816,6 @@
- integration-phpunit-mediawiki-REL1_24
- integration-phpunit-mediawiki-master
- mediawiki-gate
-
- - name: integration/zuul-config
-check:
- - integration-zuul-config-yamllint
- - integration-zuul-layoutvalidation
- - integration-zuul-layoutdiff
-test:
- - integration-zuul-config-yamllint
- - integration-zuul-layoutvalidation
- - integration-zuul-layoutdiff
- - integration-zuul-config-tox-py27
-gate-and-submit:
- - integration-zuul-config-yamllint
- - integration-zuul-layoutvalidation
- - integration-zuul-layoutdiff
- - integration-zuul-config-tox-py27
- name: mediawiki/core
check:
--
To view, visit https://gerrit.wikimedia.org/r/166014
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I05dcba34cbf4fbadc55093bf74d15d66b3103694
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Hashar
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 config for $wgLanguageCode in OutputPage.php - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166015
Change subject: Use config for $wgLanguageCode in OutputPage.php
..
Use config for $wgLanguageCode in OutputPage.php
Follow-Up: I5e0ebc173631d1d1052de7ccee4ef839c7c1767f
Change-Id: Idd7fab9f8bf47fc303b5923327da67905e12e527
---
M includes/OutputPage.php
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/15/166015/1
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 34d3ce6..5176c2b 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2085,8 +2085,6 @@
* the object, let's actually output it:
*/
public function output() {
- global $wgLanguageCode;
-
if ( $this->mDoNothing ) {
return;
}
@@ -2140,7 +2138,7 @@
ob_start();
$response->header( 'Content-type: ' . $config->get( 'MimeType'
) . '; charset=UTF-8' );
- $response->header( 'Content-language: ' . $wgLanguageCode );
+ $response->header( 'Content-language: ' . $config->get(
'LanguageCode' ) );
// Avoid Internet Explorer "compatibility view" in IE 8-10, so
that
// jQuery etc. can work correctly.
--
To view, visit https://gerrit.wikimedia.org/r/166015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd7fab9f8bf47fc303b5923327da67905e12e527
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace widgetBaseClass in wbtooltip - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Replace widgetBaseClass in wbtooltip
..
Replace widgetBaseClass in wbtooltip
Change-Id: Ic81c3b3d1326831e001358bbadb352100ea44b77
---
M lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
1 file changed, 9 insertions(+), 13 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
b/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
index b052b5c..7d3d96f 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
@@ -88,7 +88,7 @@
this._tipsy = this.element.data( 'tipsy' );
- this.element.addClass( this.widgetBaseClass );
+ this.element.addClass( this.widgetFullName );
if( !this.options.permanent ) {
this.element
@@ -105,7 +105,7 @@
$( window )
.off( '.' + this.widgetName ) // Never need that event more
than once.
.on( 'resize.' + this.widgetName, function( event ) {
- $( '.' + self.widgetBaseClass ).each( function( i, node
) {
+ $( ':' + self.widgetFullName ).each( function( i, node
) {
var tooltip = $( node ).data( self.widgetName );
if(
@@ -133,7 +133,7 @@
this._tipsy = null;
// Detach window event handler if no widget instances are left:
- if( $( '.' + this.widgetBaseClass ).length === 0 ) {
+ if( $( ':' + this.widgetFullName ).length === 0 ) {
$( window ).off( '.' + this.widgetName );
}
@@ -214,7 +214,7 @@
this._tipsy.show();
- this._tipsy.$tip.addClass( this.widgetBaseClass + '-tip' );
+ this._tipsy.$tip.addClass( this.widgetFullName + '-tip' );
var offset = this._tipsy.$tip.offset(),
height = this._tipsy.$tip.height();
@@ -283,26 +283,22 @@
* @TODO: Error tooltip should be a separate tooltip derivative.
*/
_buildErrorTooltip: function() {
- var $message = $( '', {
- 'class': 'wb-error ' + this.widgetBaseClass + '-error'
- } );
+ var $message = $( '' ).addClass( 'wb-error ' +
this.widgetFullName + '-error' );
- var $mainMessage = $( '', {
- text: this.options.content.message
- } ).appendTo( $message );
+ var $mainMessage = $( '' ).text(
this.options.content.message ).appendTo( $message );
// Append detailed error message if given; hide it behind
toggle:
if( this.options.content.detailedMessage ) {
- $mainMessage.addClass( this.widgetBaseClass +
'-error-top-message' );
+ $mainMessage.addClass( this.widgetFullName +
'-error-top-message' );
var $detailedMessage = $( '', {
- 'class': this.widgetBaseClass +
'-error-details',
+ 'class': this.widgetFullName + '-error-details',
html: this.options.content.detailedMessage
} )
.hide();
var $toggler = $( '' )
- .addClass( this.widgetBaseClass +
'-error-details-link' )
+ .addClass( this.widgetFullName +
'-error-details-link' )
.text( mw.msg( 'wikibase-tooltip-error-details'
) )
.toggler( { $subject: $detailedMessage,
duration: 'fast' } );
--
To view, visit https://gerrit.wikimedia.org/r/165182
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic81c3b3d1326831e001358bbadb352100ea44b77
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang
Gerrit-Reviewer: Thiemo Mättig (WMDE)
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] rancid - remove pmtpa devices from router.db - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: rancid - remove pmtpa devices from router.db .. rancid - remove pmtpa devices from router.db Change-Id: If27d4837eb94796289115160781501fcc1ebc0b2 --- M files/misc/rancid/core/router.db 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/files/misc/rancid/core/router.db b/files/misc/rancid/core/router.db index d4ea46f..9492b2d 100644 --- a/files/misc/rancid/core/router.db +++ b/files/misc/rancid/core/router.db @@ -1,12 +1,8 @@ -cr2-pmtpa.wikimedia.org:juniper:up: -csw5-pmtpa.wikimedia.org:foundry:down: csw1-esams.wikimedia.org:foundry:down: br1-knams.wikimedia.org:foundry:down: csw2-esams.wikimedia.org:juniper:up: cr1-esams.wikimedia.org:juniper:up: cr2-knams.wikimedia.org:juniper:up: -mr1-pmtpa.mgmt.pmtpa.wmnet:juniper:up: -asw-d-pmtpa.mgmt.pmtpa.wmnet:juniper:up: cr1-eqiad.wikimedia.org:juniper:up: cr2-eqiad.wikimedia.org:juniper:up: asw-a-eqiad.mgmt.eqiad.wmnet:juniper:up: @@ -19,7 +15,6 @@ mr1-eqiad.mgmt.eqiad.wmnet:juniper:up: lab-ex4200-1.mgmt.eqiad.wmnet:juniper:down: lab-ex4500-1.mgmt.eqiad.wmnet:juniper:down: -msw2-pmtpa.mgmt.pmtpa.wmnet:juniper:up: pfw1-eqiad.wikimedia.org:juniper:up: cr1-ulsfo.wikimedia.org:juniper:up: cr2-ulsfo.wikimedia.org:juniper:up: -- To view, visit https://gerrit.wikimedia.org/r/165674 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If27d4837eb94796289115160781501fcc1ebc0b2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: Faidon Liambotis Gerrit-Reviewer: Mark Bergsma Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce LabelsChanger - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166017
Change subject: Introduce LabelsChanger
..
Introduce LabelsChanger
Change-Id: Ibf2cf0b69b97041020f13e311d8b4132691bbd16
---
M lib/resources/entityChangers/EntityChangersFactory.js
A lib/resources/entityChangers/LabelsChanger.js
M lib/resources/entityChangers/resources.php
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintview.js
M lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
M lib/resources/jquery.wikibase/resources.php
A lib/tests/qunit/entityChangers/LabelsChanger.tests.js
M lib/tests/qunit/entityChangers/resources.php
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintgroupview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintlistview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.labelview.tests.js
15 files changed, 233 insertions(+), 54 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/17/166017/1
diff --git a/lib/resources/entityChangers/EntityChangersFactory.js
b/lib/resources/entityChangers/EntityChangersFactory.js
index 86c9876..c4b660e 100644
--- a/lib/resources/entityChangers/EntityChangersFactory.js
+++ b/lib/resources/entityChangers/EntityChangersFactory.js
@@ -56,6 +56,13 @@
},
/**
+* @return {wikibase.entityChangers.LabelsChanger}
+*/
+ getLabelsChanger: function() {
+ return new MODULE.LabelsChanger( this._api,
this._revisionStore, this._entity );
+ },
+
+ /**
* @return {wikibase.entityChangers.ReferencesChanger}
*/
getReferencesChanger: function() {
diff --git a/lib/resources/entityChangers/LabelsChanger.js
b/lib/resources/entityChangers/LabelsChanger.js
new file mode 100644
index 000..f044897
--- /dev/null
+++ b/lib/resources/entityChangers/LabelsChanger.js
@@ -0,0 +1,74 @@
+/**
+ * @licence GNU GPL v2+
+ * @author Adrian Lang
+ */
+( function( wb, $ ) {
+ 'use strict';
+
+ var MODULE = wb.entityChangers;
+ /**
+* @param {wikibase.RepoApi}
+* @param {wikibase.RevisionStore}
+* @param {wikibase.datamodel.Entity}
+*/
+ var SELF = MODULE.LabelsChanger = function( api, revisionStore, entity
) {
+ this._api = api;
+ this._revisionStore = revisionStore;
+ this._entity = entity;
+ };
+
+ $.extend( SELF.prototype, {
+ /**
+* @type {wikibase.datamodel.Entity}
+*/
+ _entity: null,
+
+ /**
+* @type {wikibase.RevisionStore}
+*/
+ _revisionStore: null,
+
+ /**
+* @type {wikibase.RepoApi}
+*/
+ _api: null,
+
+ /**
+* @param {string} label
+* @param {string} language
+* @return {jQuery.Promise}
+* Resolved parameters:
+* - {string} The saved label
+* Rejected parameters:
+* - {wikibase.RepoApiError}
+*/
+ setLabel: function( label, language ) {
+ var self = this;
+ var deferred = $.Deferred();
+
+ this._api.setLabel(
+ this._entity.getId(),
+ this._revisionStore.getLabelRevision(),
+ label,
+ language
+ )
+ .done( function( result ) {
+ var savedLabel =
result.entity.labels[language].value;
+
+ // Update revision store:
+ self._revisionStore.setLabelRevision(
result.entity.lastrevid );
+
+ // FIXME: Maybe check API's return value?
+
+ // FIXME: Introduce Item.setLabels
+
+ deferred.resolve( savedLabel );
+ } )
+ .fail( function( errorCode, error ) {
+ deferred.reject(
wb.RepoApiError.newFromApiResponse( error, 'save' ) );
+ } );
+
+ return deferred.promise();
+ }
+ } );
+} ( wikibase, jQuery ) );
diff --git a/lib/resources/entityChangers/resources.php
b/lib
[MediaWiki-commits] [Gerrit] Introduce DescriptionsChanger - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166016
Change subject: Introduce DescriptionsChanger
..
Introduce DescriptionsChanger
Change-Id: I2f8c59c3e5721fa9eded6a3fbdfaa5b6348b75ff
---
A lib/resources/entityChangers/DescriptionsChanger.js
M lib/resources/entityChangers/EntityChangersFactory.js
M lib/resources/entityChangers/resources.php
M lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintview.js
M lib/resources/jquery.wikibase/resources.php
A lib/tests/qunit/entityChangers/DescriptionsChanger.tests.js
M lib/tests/qunit/entityChangers/resources.php
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.descriptionview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintgroupview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintlistview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.fingerprintview.tests.js
13 files changed, 226 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/16/166016/1
diff --git a/lib/resources/entityChangers/DescriptionsChanger.js
b/lib/resources/entityChangers/DescriptionsChanger.js
new file mode 100644
index 000..e39118b
--- /dev/null
+++ b/lib/resources/entityChangers/DescriptionsChanger.js
@@ -0,0 +1,74 @@
+/**
+ * @licence GNU GPL v2+
+ * @author Adrian Lang
+ */
+( function( wb, $ ) {
+ 'use strict';
+
+ var MODULE = wb.entityChangers;
+ /**
+* @param {wikibase.RepoApi}
+* @param {wikibase.RevisionStore}
+* @param {wikibase.datamodel.Entity}
+*/
+ var SELF = MODULE.DescriptionsChanger = function( api, revisionStore,
entity ) {
+ this._api = api;
+ this._revisionStore = revisionStore;
+ this._entity = entity;
+ };
+
+ $.extend( SELF.prototype, {
+ /**
+* @type {wikibase.datamodel.Entity}
+*/
+ _entity: null,
+
+ /**
+* @type {wikibase.RevisionStore}
+*/
+ _revisionStore: null,
+
+ /**
+* @type {wikibase.RepoApi}
+*/
+ _api: null,
+
+ /**
+* @param {string} description
+* @param {string} language
+* @return {jQuery.Promise}
+* Resolved parameters:
+* - {string} The saved description
+* Rejected parameters:
+* - {wikibase.RepoApiError}
+*/
+ setDescription: function( description, language ) {
+ var self = this;
+ var deferred = $.Deferred();
+
+ this._api.setDescription(
+ this._entity.getId(),
+ this._revisionStore.getDescriptionRevision(),
+ description,
+ language
+ )
+ .done( function( result ) {
+ var savedDescription =
result.entity.descriptions[language].value;
+
+ // Update revision store:
+ self._revisionStore.setDescriptionRevision(
result.entity.lastrevid );
+
+ // FIXME: Maybe check API's return value?
+
+ // FIXME: Introduce Item.setDescriptions
+
+ deferred.resolve( savedDescription );
+ } )
+ .fail( function( errorCode, error ) {
+ deferred.reject(
wb.RepoApiError.newFromApiResponse( error, 'save' ) );
+ } );
+
+ return deferred.promise();
+ }
+ } );
+} ( wikibase, jQuery ) );
diff --git a/lib/resources/entityChangers/EntityChangersFactory.js
b/lib/resources/entityChangers/EntityChangersFactory.js
index ad6e6aa..86c9876 100644
--- a/lib/resources/entityChangers/EntityChangersFactory.js
+++ b/lib/resources/entityChangers/EntityChangersFactory.js
@@ -49,6 +49,13 @@
},
/**
+* @return {wikibase.entityChangers.DescriptionsChanger}
+*/
+ getDescriptionsChanger: function() {
+ return new MODULE.DescriptionsChanger( this._api,
this._revisionStore, this._entity );
+ },
+
+ /**
* @return {wikibase.entityChangers.ReferencesChanger}
*/
getReferencesChanger: function() {
diff --git a/lib/resources/entityChangers/resources.php
[MediaWiki-commits] [Gerrit] Introduce SiteLinksChanger - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166018
Change subject: Introduce SiteLinksChanger
..
Introduce SiteLinksChanger
Change-Id: Ib315d4644e5d07910838ed96e62230104374f9cb
---
M lib/resources/entityChangers/EntityChangersFactory.js
A lib/resources/entityChangers/SiteLinksChanger.js
M lib/resources/entityChangers/resources.php
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M lib/resources/jquery.wikibase/resources.php
A lib/tests/qunit/entityChangers/SiteLinksChanger.tests.js
M lib/tests/qunit/entityChangers/resources.php
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinklistview.tests.js
M repo/resources/wikibase.ui.entityViewInit.js
14 files changed, 232 insertions(+), 68 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/18/166018/1
diff --git a/lib/resources/entityChangers/EntityChangersFactory.js
b/lib/resources/entityChangers/EntityChangersFactory.js
index c4b660e..8912320 100644
--- a/lib/resources/entityChangers/EntityChangersFactory.js
+++ b/lib/resources/entityChangers/EntityChangersFactory.js
@@ -68,5 +68,12 @@
getReferencesChanger: function() {
return new MODULE.ReferencesChanger( this._api,
this._revisionStore, this._entity );
},
+
+ /**
+* @return {wikibase.entityChangers.SiteLinksChanger}
+*/
+ getSiteLinksChanger: function() {
+ return new MODULE.SiteLinksChanger( this._api,
this._revisionStore, this._entity );
+ }
} );
}( wikibase, jQuery ) );
diff --git a/lib/resources/entityChangers/SiteLinksChanger.js
b/lib/resources/entityChangers/SiteLinksChanger.js
new file mode 100644
index 000..00363cc
--- /dev/null
+++ b/lib/resources/entityChangers/SiteLinksChanger.js
@@ -0,0 +1,84 @@
+/**
+ * @licence GNU GPL v2+
+ * @author Adrian Lang
+ */
+( function( wb, $ ) {
+ 'use strict';
+
+ var MODULE = wb.entityChangers;
+ /**
+* @param {wikibase.RepoApi}
+* @param {wikibase.RevisionStore}
+* @param {wikibase.datamodel.Entity}
+*/
+ var SELF = MODULE.SiteLinksChanger = function( api, revisionStore,
entity ) {
+ this._api = api;
+ this._revisionStore = revisionStore;
+ this._entity = entity;
+ };
+
+ $.extend( SELF.prototype, {
+ /**
+* @type {wikibase.datamodel.Entity}
+*/
+ _entity: null,
+
+ /**
+* @type {wikibase.RevisionStore}
+*/
+ _revisionStore: null,
+
+ /**
+* @type {wikibase.RepoApi}
+*/
+ _api: null,
+
+ /**
+* @param {wikibase.datamodel.SiteLink} siteLink
+* @param {string} language
+* @return {jQuery.Promise}
+* Resolved parameters:
+* - {string} The saved siteLink
+* Rejected parameters:
+* - {wikibase.RepoApiError}
+*/
+ setSiteLink: function( siteLink, language ) {
+ var self = this;
+ var deferred = $.Deferred();
+
+ this._api.setSitelink(
+ this._entity.getId(),
+ this._revisionStore.getSitelinksRevision(
siteLink.getSiteId() ),
+ siteLink.getSiteId(),
+ siteLink.getPageName(),
+ siteLink.getBadges()
+ )
+ .done( function( result ) {
+ var savedSiteLink = new wb.datamodel.SiteLink(
+ siteLink.getSiteId(),
+
result.entity.sitelinks[siteLink.getSiteId()].title
+ );
+
+ // Update revision store:
+ self._revisionStore.setSitelinksRevision(
+ result.entity.lastrevid,
+ siteLink.getSiteId()
+ );
+
+ // FIXME: Maybe check API's return value?
+
+ // FIXME: Introduce Item.setSiteLinks
+
+
[MediaWiki-commits] [Gerrit] Refine global event handling in non-isolated window managers - change (oojs/ui)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166019
Change subject: Refine global event handling in non-isolated window managers
..
Refine global event handling in non-isolated window managers
When we only have one HTML document, use event target filtering
to only block events originating from outside the dialog.
This doesn't completely stop parent window scrolling as events
emitted from inside the dialog can still bubble up.
Change-Id: If8423e37fef67c277a752015c9ac350f001847ce
---
M src/WindowManager.js
1 file changed, 7 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/19/166019/1
diff --git a/src/WindowManager.js b/src/WindowManager.js
index 7a28386..e1c7cee 100644
--- a/src/WindowManager.js
+++ b/src/WindowManager.js
@@ -184,8 +184,10 @@
*
* @param {jQuery.Event} e Mouse wheel event
*/
-OO.ui.WindowManager.prototype.onWindowMouseWheel = function () {
- return false;
+OO.ui.WindowManager.prototype.onWindowMouseWheel = function ( e ) {
+ // Kill all events in the parent window if the child window is isolated,
+ // or if the event didn't come from the child window
+ return !( this.shouldIsolate() || !$.contains(
this.getCurrentWindow().$frame[0], e.target ) );
};
/**
@@ -203,8 +205,9 @@
case OO.ui.Keys.UP:
case OO.ui.Keys.RIGHT:
case OO.ui.Keys.DOWN:
- // Prevent any key events that might cause scrolling
- return false;
+ // Kill all events in the parent window if the child
window is isolated,
+ // or if the event didn't come from the child window
+ return !( this.shouldIsolate() || !$.contains(
this.getCurrentWindow().$frame[0], e.target ) );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/166019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8423e37fef67c277a752015c9ac350f001847ce
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix [10-Oct-2014 15:08:03] PHP Fatal error: Cannot access p... - change (mediawiki...ImageTagging)
Jack Phoenix has uploaded a new change for review. https://gerrit.wikimedia.org/r/166020 Change subject: Fix [10-Oct-2014 15:08:03] PHP Fatal error: Cannot access protected property MediaTransformError::$height in ..\extensions\ImageTagging\ImageTagging_body.php on line 315 .. Fix [10-Oct-2014 15:08:03] PHP Fatal error: Cannot access protected property MediaTransformError::$height in ..\extensions\ImageTagging\ImageTagging_body.php on line 315 This would happen when the Special:TaggedImages page would contain one or more "images" where the actual image file was, for one reason or another, missing. Now missing images no longer break the special page. Change-Id: I5709fd4fc90adbdfa9b0dc2bb5fe0dafa68dc80d --- M ImageTagging_body.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ImageTagging refs/changes/20/166020/1 diff --git a/ImageTagging_body.php b/ImageTagging_body.php index 722d11c..cbaed11 100644 --- a/ImageTagging_body.php +++ b/ImageTagging_body.php @@ -312,7 +312,7 @@ $s .= ( $i % 4 == 0 ) ? '' : ''; $thumb = $img->transform( array( 'width' => 120, 'height' => 120 ), 0 ); - $vpad = floor( ( 150 - $thumb->height ) /2 ) - 2; + $vpad = floor( ( 150 - $thumb->getHeight() ) /2 ) - 2; $s .= '' . ''; # ATTENTION: The newline after is needed to accommodate HTMLTidy which -- To view, visit https://gerrit.wikimedia.org/r/166020 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5709fd4fc90adbdfa9b0dc2bb5fe0dafa68dc80d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ImageTagging Gerrit-Branch: master Gerrit-Owner: Jack Phoenix ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix [10-Oct-2014 15:08:03] PHP Fatal error: Cannot access p... - change (mediawiki...ImageTagging)
Jack Phoenix has submitted this change and it was merged. Change subject: Fix [10-Oct-2014 15:08:03] PHP Fatal error: Cannot access protected property MediaTransformError::$height in ..\extensions\ImageTagging\ImageTagging_body.php on line 315 .. Fix [10-Oct-2014 15:08:03] PHP Fatal error: Cannot access protected property MediaTransformError::$height in ..\extensions\ImageTagging\ImageTagging_body.php on line 315 This would happen when the Special:TaggedImages page would contain one or more "images" where the actual image file was, for one reason or another, missing. Now missing images no longer break the special page. Change-Id: I5709fd4fc90adbdfa9b0dc2bb5fe0dafa68dc80d --- M ImageTagging_body.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jack Phoenix: Verified; Looks good to me, approved diff --git a/ImageTagging_body.php b/ImageTagging_body.php index 722d11c..cbaed11 100644 --- a/ImageTagging_body.php +++ b/ImageTagging_body.php @@ -312,7 +312,7 @@ $s .= ( $i % 4 == 0 ) ? '' : ''; $thumb = $img->transform( array( 'width' => 120, 'height' => 120 ), 0 ); - $vpad = floor( ( 150 - $thumb->height ) /2 ) - 2; + $vpad = floor( ( 150 - $thumb->getHeight() ) /2 ) - 2; $s .= '' . ''; # ATTENTION: The newline after is needed to accommodate HTMLTidy which -- To view, visit https://gerrit.wikimedia.org/r/166020 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5709fd4fc90adbdfa9b0dc2bb5fe0dafa68dc80d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ImageTagging Gerrit-Branch: master Gerrit-Owner: Jack Phoenix Gerrit-Reviewer: Jack Phoenix ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwext-VisualEditor-qunit: Use git clean "-ff" instead "-f" - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/166021 Change subject: mwext-VisualEditor-qunit: Use git clean "-ff" instead "-f" .. mwext-VisualEditor-qunit: Use git clean "-ff" instead "-f" Follows-up a18bd75. Ensures any left over untracked directories that were used as (submodule) git repos from previous patch sets are also removed. Change-Id: I38fde56213f7e63a3d28859dd369a9bf1c5fae68 --- M jjb/mediawiki-extensions.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/21/166021/1 diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index fa70ba1..e0ced37 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -167,7 +167,7 @@ cd src/extensions/VisualEditor git submodule update --init git submodule status - git submodule foreach git clean -xqdf + git submodule foreach git clean -xdff -q - qunit publishers: - archive-log-dir -- To view, visit https://gerrit.wikimedia.org/r/166021 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I38fde56213f7e63a3d28859dd369a9bf1c5fae68 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Krinkle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift-synctool: enable/disable/show sync - change (operations/software)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift-synctool: enable/disable/show sync
..
swift-synctool: enable/disable/show sync
this is a first stab at container synchronization for swift, the tool
enable/disable/show container sync settings between two swift clusters.
TODO:
* multithread
* match container names with regexps like swiftrepl does
Change-Id: I719dcc652af787b1f4d234a5d1110784cd43c1ca
---
A swift-synctool/.pep8
A swift-synctool/sync_setup.py
2 files changed, 175 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Alexandros Kosiaris: Looks good to me, but someone else must approve
diff --git a/swift-synctool/.pep8 b/swift-synctool/.pep8
new file mode 100644
index 000..25e32a1
--- /dev/null
+++ b/swift-synctool/.pep8
@@ -0,0 +1,4 @@
+[pep8]
+# let me live my life of under-indentation
+# continuation line under-indented for visual indent [E128]
+ignore = E128
diff --git a/swift-synctool/sync_setup.py b/swift-synctool/sync_setup.py
new file mode 100755
index 000..4e3d146
--- /dev/null
+++ b/swift-synctool/sync_setup.py
@@ -0,0 +1,171 @@
+#!/usr/bin/env python
+# Manage container synchronization between two swift clusters
+# See also:
+# http://docs.openstack.org/developer/swift/overview_container_sync.html
+
+import argparse
+import logging
+import os
+import sys
+
+import swiftclient
+
+log = logging.getLogger(__name__)
+SYNC_DISABLE = 0
+SYNC_ENABLE = 1
+
+
+def _setup_source(connection, container, sync_key, sync_to):
+return _setup_container(connection, container,
+{'X-Container-Sync-Key': sync_key,
+ 'X-Container-Sync-To': sync_to})
+
+
+def _setup_destination(connection, container, sync_key):
+return _setup_container(connection, container,
+{'X-Container-Sync-Key': sync_key})
+
+
+def _setup_container(connection, container, headers):
+response_dict = {}
+connection.post_container(container, headers=headers,
+response_dict=response_dict)
+return response_dict
+
+
+def _setup_sync(action, source_connection, destination_connection, container,
+realm_key=None, sync_to=None, ignore_notfound=False):
+try:
+_setup_source(source_connection, container, realm_key, sync_to)
+except swiftclient.exceptions.ClientException as err:
+if err.http_status == 404 and ignore_notfound:
+log.warn('container %s not found at source, skipping', container)
+return
+else:
+raise
+
+try:
+_setup_destination(destination_connection, container, realm_key)
+except swiftclient.exceptions.ClientException as err:
+if action == SYNC_ENABLE and err.http_status == 404:
+log.info('creating container %s', container)
+destination_connection.put_container(container)
+_setup_destination(destination_connection, container, realm_key)
+elif action == SYNC_DISABLE and err.http_status == 404 \
+and ignore_notfound:
+log.warn('container %s not found at destination, skipping',
+container)
+return
+else:
+raise
+
+
+def show_sync(source_connection, destination_connection, containers):
+for container in containers:
+headers = destination_connection.head_container(container)
+sync_to = headers.get('x-container-sync-to', None)
+sync_key = headers.get('x-container-sync-key', None)
+if sync_to and sync_key:
+log.info('container %s sync: enabled %s' % (container, sync_to))
+else:
+log.info('container %s sync: disabled' % container)
+
+
+def enable_sync(source_connection, destination_connection,
+realm_name, realm_key, realm_cluster, containers, account_name=None,
+ignore_notfound=False):
+if account_name is None:
+storage_url, _ = destination_connection.get_auth()
+account_name = storage_url.rsplit('/', 1)[-1]
+
+for container in containers:
+log.info('enabling sync for %s', container)
+sync_to = '//%s' % '/'.join([realm_name, realm_cluster, account_name,
+container])
+_setup_sync(SYNC_ENABLE, source_connection, destination_connection,
+container, realm_key, sync_to, ignore_notfound)
+
+
+# XXX check if setting to empty value is enough to disable sync
+def disable_sync(source_connection, destination_connection, containers,
+ignore_notfound=False):
+for container in containers:
+log.info('disabling sync for %s', container)
+_setup_sync(SYNC_DISABLE, source_connection, destination_connection,
+container, '', '', ignore_notfound)
+
+
+def main():
+parser = argparse.ArgumentParser(
+description="Setup swift container synchronization")
+parser.add_argument('-A', '--auth', dest='au
[MediaWiki-commits] [Gerrit] Remove listview.liValue and unused listview.prefixedClass - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove listview.liValue and unused listview.prefixedClass
..
Remove listview.liValue and unused listview.prefixedClass
Change-Id: Ic39f1bc7d46fc04bff32266063f7f9611a9bc551
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js
M lib/resources/jquery.wikibase/jquery.wikibase.listview.js
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.listview.tests.js
M lib/tests/qunit/jquery.wikibase/toolbar/movetoolbar.tests.js
13 files changed, 9 insertions(+), 58 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
index 9f7672c..fe337ec 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
@@ -170,7 +170,6 @@
this.$listview.listview( {
listItemAdapter: new
$.wikibase.listview.ListItemAdapter( {
listItemWidget: $.wikibase.claimlistview,
- listItemWidgetValueAccessor: 'value',
newItemOptionsFn: function( value ) {
return {
value: value,
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
index 11e8366..ed9e1dc 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
@@ -206,7 +206,6 @@
.listview( {
listItemAdapter: new
$.wikibase.listview.ListItemAdapter( {
listItemWidget: listItemWidget,
- listItemWidgetValueAccessor: 'value',
newItemOptionsFn: function( value ) {
return {
value: value || null,
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
index bde5e84..a535865 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
@@ -244,7 +244,6 @@
$qualifiers.listview( {
listItemAdapter: new
$.wikibase.listview.ListItemAdapter( {
listItemWidget: $.wikibase.snaklistview,
- listItemWidgetValueAccessor: 'value',
newItemOptionsFn: function( value ) {
return {
value: value || null,
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
index bfac4d6..b754d0c 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
@@ -123,7 +123,6 @@
.listview( {
listItemAdapter: new
$.wikibase.listview.ListItemAdapter( {
listItemWidget: listItemWidget,
- listItemWidgetValueAccessor: 'value',
newItemOptionsFn: function( value ) {
return {
value: value,
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js
b/lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js
index a453f4d..39f5a2f 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js
@@ -33,9 +33,6 @@
* be created, the value will be null. The callback's context
is the ListItemAdapter
*
[MediaWiki-commits] [Gerrit] Make it up the user if he wants links on special page - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review. https://gerrit.wikimedia.org/r/166022 Change subject: Make it up the user if he wants links on special page .. Make it up the user if he wants links on special page Change-Id: Ic180418b06f76df69148fdcecd31b4780c79f9f7 --- M ExtendedSearch/ExtendedSearch.class.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/22/166022/1 diff --git a/ExtendedSearch/ExtendedSearch.class.php b/ExtendedSearch/ExtendedSearch.class.php index 0c2fb2c..ecf28d0 100644 --- a/ExtendedSearch/ExtendedSearch.class.php +++ b/ExtendedSearch/ExtendedSearch.class.php @@ -98,7 +98,7 @@ BsConfig::registerVar( 'MW::ExtendedSearch::LimitResults', 15, BsConfig::TYPE_INT|BsConfig::LEVEL_USER, 'bs-extendedsearch-pref-limitresultdef', 'int' ); BsConfig::registerVar( 'MW::ExtendedSearch::SearchFiles', true, BsConfig::TYPE_BOOL|BsConfig::LEVEL_USER, 'bs-extendedsearch-pref-searchfiles', 'toggle' ); BsConfig::registerVar( 'MW::ExtendedSearch::JumpToTitle', false, BsConfig::TYPE_BOOL|BsConfig::LEVEL_USER, 'bs-extendedsearch-pref-jumptotitle', 'toggle' ); - BsConfig::registerVar( 'MW::ExtendedSearch::ShowCreateSugg', true, BsConfig::TYPE_BOOL|BsConfig::LEVEL_PUBLIC, 'bs-extendedsearch-pref-showcreatesugg', 'toggle' ); + BsConfig::registerVar( 'MW::ExtendedSearch::ShowCreateSugg', true, BsConfig::TYPE_BOOL|BsConfig::LEVEL_USER, 'bs-extendedsearch-pref-showcreatesugg', 'toggle' ); BsConfig::registerVar( 'MW::ExtendedSearch::ShowFacets', true, BsConfig::TYPE_BOOL|BsConfig::LEVEL_USER, 'bs-extendedsearch-pref-showfacets', 'toggle' ); BsConfig::registerVar( 'MW::ExtendedSearch::ShowAutocomplete', true, BsConfig::TYPE_BOOL|BsConfig::LEVEL_PUBLIC, 'bs-extendedsearch-pref-showautocomplete', 'toggle' ); BsConfig::registerVar( 'MW::ExtendedSearch::ShowCreSugInAc', true, BsConfig::TYPE_BOOL|BsConfig::LEVEL_USER, 'bs-extendedsearch-pref-showcresuginac', 'toggle' ); -- To view, visit https://gerrit.wikimedia.org/r/166022 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic180418b06f76df69148fdcecd31b4780c79f9f7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Smuggli ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Apply coding conventions for JavaScript - change (mediawiki...CodeEditor)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166023
Change subject: Apply coding conventions for JavaScript
..
Apply coding conventions for JavaScript
* Fix closure invocation
* Avoid global variablesin closure
* Avoid unused variable
* Fix whitespaces
Change-Id: I67552a67e8ab493e5af8717c11668430886ee468
---
M modules/ext.codeEditor.geshi.js
1 file changed, 10 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor
refs/changes/23/166023/1
diff --git a/modules/ext.codeEditor.geshi.js b/modules/ext.codeEditor.geshi.js
index 6bafa2b..791dd5e 100644
--- a/modules/ext.codeEditor.geshi.js
+++ b/modules/ext.codeEditor.geshi.js
@@ -4,7 +4,7 @@
* Needs some code de-dup with the full-page JS/CSS page editing.
*/
/*global require, ace */
-(function ( $, mw ) {
+( function ( $, mw ) {
$( function () {
var $sources, setupEditor, openEditor;
@@ -16,7 +16,7 @@
var $link, $edit;
$link = $( '' )
- .text( mediaWiki.msg( 'editsection' ) )
+ .text( mw.msg( 'editsection' ) )
.attr( 'href', '#' )
.attr( 'title', 'Edit this code section' )
.click( function ( event ) {
@@ -41,7 +41,7 @@
if ( matches ) {
geshiLang = matches[1];
}
- mediaWiki.loader.using( 'ext.codeEditor.ace.modes',
function () {
+ mw.loader.using( 'ext.codeEditor.ace.modes', function
() {
var map, $container, $save, $cancel, $controls,
setLanguage, closeEditor;
// @fixme de-duplicate
@@ -84,12 +84,12 @@
$langDropDown
.val( geshiLang )
.appendTo( $label )
- .change( function ( ) {
+ .change( function () {
setLanguage( $( this ).val() );
} );
$save = $( '' )
- .text( mediaWiki.msg( 'savearticle' ) )
- .click( function ( ) {
+ .text( mw.msg( 'savearticle' ) )
+ .click( function () {
// horrible hack ;)
var src, tag;
@@ -154,11 +154,9 @@
} );
};
- $sources.each( function ( i, div ) {
- var $div = $( div );
- setupEditor( $div );
+ $sources.each( function () {
+ setupEditor( $( this ) );
} );
}
-});
-})( jQuery, mediaWiki );
-
+} );
+}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/166023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I67552a67e8ab493e5af8717c11668430886ee468
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwext-VisualEditor-qunit: Use git clean "-ff" instead "-f" - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: mwext-VisualEditor-qunit: Use git clean "-ff" instead "-f" .. mwext-VisualEditor-qunit: Use git clean "-ff" instead "-f" Follows-up a18bd75. Ensures any left over untracked directories that were used as (submodule) git repos from previous patch sets are also removed. Change-Id: I38fde56213f7e63a3d28859dd369a9bf1c5fae68 --- M jjb/mediawiki-extensions.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index fa70ba1..e0ced37 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -167,7 +167,7 @@ cd src/extensions/VisualEditor git submodule update --init git submodule status - git submodule foreach git clean -xqdf + git submodule foreach git clean -xdff -q - qunit publishers: - archive-log-dir -- To view, visit https://gerrit.wikimedia.org/r/166021 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38fde56213f7e63a3d28859dd369a9bf1c5fae68 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Turn on building Cirrus index for faster regexes - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Turn on building Cirrus index for faster regexes .. Turn on building Cirrus index for faster regexes Change-Id: I8916a9873a64f61fdd95cbc6421a0cf86346fa3e --- M wmf-config/CirrusSearch-common.php 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Chad: Looks good to me, but someone else must approve Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CirrusSearch-common.php b/wmf-config/CirrusSearch-common.php index fe67e5c..287c5a9 100644 --- a/wmf-config/CirrusSearch-common.php +++ b/wmf-config/CirrusSearch-common.php @@ -49,6 +49,15 @@ # Ban the hebrew plugin, it is unstable $wgCirrusSearchBannedPlugins[] = 'elasticsearch-analysis-hebrew'; +# Build the ngram index to support fast regex matching +$wgCirrusSearchWikimediaExtraPlugin = array( + 'regex' => array( + 'build', + // 'use', Turn this on once it is built everywhere and remove this from CirrusSearch-labs.php + ), +); + + # Enable the "experimental" highlighter on all wikis $wgCirrusSearchUseExperimentalHighlighter = true; $wgCirrusSearchOptimizeIndexForExperimentalHighlighter = true; -- To view, visit https://gerrit.wikimedia.org/r/166005 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8916a9873a64f61fdd95cbc6421a0cf86346fa3e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Manybubbles Gerrit-Reviewer: Chad Gerrit-Reviewer: Manybubbles Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] smtp service -> polonium, remove imap service - change (operations/dns)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: smtp service -> polonium, remove imap service .. smtp service -> polonium, remove imap service switch the "smtp" service name over from sanger to polonium remove the "imap" service name Change-Id: I6384d7feaaf0ab631f494346f525339f9b20d08f --- M templates/wikimedia.org 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 4150ff1..2e74d1f 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -437,7 +437,6 @@ icinga 1H IN CNAMEneon icinga-admin1H IN A208.80.154.14 -imap1H IN A208.80.152.187 ; sanger integration 1H IN CNAMEmisc-web-lb.eqiad irc 1H IN CNAMEargon @@ -470,7 +469,7 @@ secure 600 IN DYNA geoip!text-addrs -smtp1H IN A208.80.152.187 ; sanger +smtp1H IN A208.80.154.90 ; polonium stream 1H IN CNAMEstream-lb.eqiad -- To view, visit https://gerrit.wikimedia.org/r/164262 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6384d7feaaf0ab631f494346f525339f9b20d08f Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: BBlack Gerrit-Reviewer: Faidon Liambotis Gerrit-Reviewer: Mark Bergsma Gerrit-Reviewer: Matanya Gerrit-Reviewer: coren 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 Job to run ResourcesTest for WikibaseRepo - change (integration/config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166024
Change subject: Add Job to run ResourcesTest for WikibaseRepo
..
Add Job to run ResourcesTest for WikibaseRepo
It happened several times that we introduced bad dependencies
to Wikibase JavaScript Resources. Running the test that checks
resources should avoid that in the future.
Change-Id: Ie334342dd899d67ccc9806f41884822a226133c3
---
M jjb/wikidata.yaml
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/24/166024/1
diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index a1e0af5..316b91e 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -145,6 +145,12 @@
- 'mwext-Wikibase-{kind}-tests':
ext-name: 'Wikibase'
+kind: repo-resources
+repoorclient: 'repo'
+phpunit-params: '--filter ResourcesTest'
+
+ - 'mwext-Wikibase-{kind}-tests':
+ext-name: 'Wikibase'
kind: client
repoorclient: 'client'
dependencies: 'Scribunto'
--
To view, visit https://gerrit.wikimedia.org/r/166024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie334342dd899d67ccc9806f41884822a226133c3
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Tobias Gritschacher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove Tampa nas servers - change (operations/dns)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: remove Tampa nas servers
..
remove Tampa nas servers
Change-Id: Ibb859e97c93f79c9049360c856acb929c9c74c32
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 0 insertions(+), 15 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index e03583c..5d05638 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -25,10 +25,6 @@
200 1H IN PTR vrrp-gw-2.pmtpa.wmnet.
202 1H IN PTR ae0-2.cr2-pmtpa.wikimedia.org.
-253 1H IN PTR nas1-a.pmtpa.wmnet.
-254 1H IN PTR nas1-b.pmtpa.wmnet.
-
-
; asw* DEPRECATED, put in management network
$ORIGIN 1.0.{{ zonename }}.
@@ -116,12 +112,8 @@
51 1H IN PTR WMF3848.mgmt.pmtpa.wmnet.
52 1H IN PTR WMF3847.mgmt.pmtpa.wmnet.
53 1H IN PTR WMF3846.mgmt.pmtpa.wmnet.
-61 1H IN PTR nas1-a.mgmt.pmtpa.wmnet.
-62 1H IN PTR nas1-b.mgmt.pmtpa.wmnet.
63 1H IN PTR WMF3838.mgmt.pmtpa.wmnet.
64 1H IN PTR WMF3837.mgmt.pmtpa.wmnet.
-66 1H IN PTR nas1-a-e0m.mgmt.pmtpa.wmnet.
-67 1H IN PTR nas1-b-e0m.mgmt.pmtpa.wmnet.
68 1H IN PTR WMF3641.mgmt.pmtpa.wmnet.
69 1H IN PTR WMF3639.mgmt.pmtpa.wmnet.
70 1H IN PTR WMF3640.mgmt.pmtpa.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index d157a22..3ff46c9 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -37,8 +37,6 @@
config-master 1H IN CNAMEpalladium.eqiad.wmnet.
puppet 1H IN CNAMEpalladium.eqiad.wmnet.
syslog 1H IN CNAMElithium.eqiad.wmnet.
-nas1-a 1H IN A10.0.0.253
-nas1-b 1H IN A10.0.0.254
; GENERATES
@@ -64,9 +62,6 @@
asw-d3-pmtpa1H IN A10.1.1.24
cr2-pmtpa 1H IN A10.1.1.18
-
-nas1-a 1H IN A10.1.8.61
-nas1-b 1H IN A10.1.8.62
ps1-c1-pmtpa1H IN A10.1.5.20
ps1-c2-pmtpa1H IN A10.1.5.21
@@ -94,8 +89,6 @@
wmf3930 1H IN A10.1.8.25
ts-array4a 1H IN A10.1.8.17
ts-array4b 1H IN A10.1.8.18
-nas1-a-e0m 1H IN A10.1.8.66
-nas1-b-e0m 1H IN A10.1.8.67
WMF3639 1H IN A10.1.8.69
WMF3640 1H IN A10.1.8.70
WMF3641 1H IN A10.1.8.68
--
To view, visit https://gerrit.wikimedia.org/r/165412
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb859e97c93f79c9049360c856acb929c9c74c32
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow setting the browser-timeout in browsertests - change (integration/config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166025
Change subject: Allow setting the browser-timeout in browsertests
..
Allow setting the browser-timeout in browsertests
This allows browsertest projects to change the default browser-timeout.
This is already supported in the mediawiki-selenium gem.
See: https://github.com/wikimedia/mediawiki-selenium#028-2014-03-06
Change-Id: Ia56df27e9cdfe57cf9558e5c64ea1bd58c9ef051
---
M jjb/job-templates-browsertests.yaml
M jjb/macro.yaml
2 files changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/25/166025/1
diff --git a/jjb/job-templates-browsertests.yaml
b/jjb/job-templates-browsertests.yaml
index d2ab5a1..f2a7ae0 100644
--- a/jjb/job-templates-browsertests.yaml
+++ b/jjb/job-templates-browsertests.yaml
@@ -29,6 +29,7 @@
- shell: mkdir -p "$WORKSPACE/log/junit"
- browsertest-website-version:
browser: '{browser}'
+ browser_timeout: '{browser_timeout}'
cucumber_tags: '{cucumber_tags}'
headless: '{headless}'
folder: '{folder}'
@@ -78,6 +79,7 @@
- defaults:
name: browsertests
node: contintLabsSlave && UbuntuPrecise
+browser_timeout: ''
repository_host: 'gerrit.wikimedia.org/r'
cucumber_tags: ''
@@ -106,6 +108,7 @@
- shell: mkdir -p "$WORKSPACE/log/junit"
- browsertest-website:
browser: '{browser}'
+ browser_timeout: '{browser_timeout}'
cucumber_tags: '{cucumber_tags}'
headless: '{headless}'
folder: '{folder}'
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index d7b6845..ca69cd2 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -659,6 +659,7 @@
- shell: |
# set up environment variables
export BROWSER={browser}
+ export BROWSER_TIMEOUT={browser_timeout}
export CUCUMBER_TAGS={cucumber_tags}
export HEADLESS={headless}
export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php
@@ -778,6 +779,7 @@
- shell: |
# set up environment variables
export BROWSER={browser}
+ export BROWSER_TIMEOUT={browser_timeout}
export CUCUMBER_TAGS={cucumber_tags}
export HEADLESS={headless}
export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php
--
To view, visit https://gerrit.wikimedia.org/r/166025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia56df27e9cdfe57cf9558e5c64ea1bd58c9ef051
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Tobias Gritschacher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use mediawiki.api.parse - change (mediawiki...CodeEditor)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166026
Change subject: Use mediawiki.api.parse
..
Use mediawiki.api.parse
Change-Id: I9106245c6c0ee98093155c8b9a8f92b270bde063
---
M CodeEditor.php
M modules/ext.codeEditor.geshi.js
2 files changed, 10 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor
refs/changes/26/166026/1
diff --git a/CodeEditor.php b/CodeEditor.php
index 2363b41..b4d2402 100644
--- a/CodeEditor.php
+++ b/CodeEditor.php
@@ -104,7 +104,8 @@
'messages' => array(
'editsection',
'savearticle'
- )
+ ),
+ 'dependencies' => 'mediawiki.api.parse',
) + $tpl;
// Experimental feature; not ready yet.
diff --git a/modules/ext.codeEditor.geshi.js b/modules/ext.codeEditor.geshi.js
index 6bafa2b..569a6ea 100644
--- a/modules/ext.codeEditor.geshi.js
+++ b/modules/ext.codeEditor.geshi.js
@@ -91,26 +91,19 @@
.text( mediaWiki.msg( 'savearticle' ) )
.click( function ( ) {
// horrible hack ;)
- var src, tag;
+ var src, tag, api = new
mw.Api();
src =
codeEditor.getSession().getValue();
tag = '' + src + '';
- $.ajax( mw.config.get(
'wgScriptPath' ) + '/api' + mw.config.get( 'wgScriptExtension' ), {
- data: {
- action: 'parse',
- text: tag,
- format: 'json'
- },
- type: 'POST',
- success: function (
data ) {
- var $html = $(
data.parse.text['*'] );
-
$div.replaceWith( $html );
- setupEditor(
$html );
+ api.parse( tag )
+ .done( function ( html ) {
+ var $html = $( html );
+ $div.replaceWith( $html
);
+ setupEditor( $html );
- closeEditor();
-
event.preventDefault();
- }
+ closeEditor();
+ event.preventDefault();
} );
} );
$cancel = $( '' )
--
To view, visit https://gerrit.wikimedia.org/r/166026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9106245c6c0ee98093155c8b9a8f92b270bde063
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] qunit-cleanup: rm -f when deleting file - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/166027 Change subject: qunit-cleanup: rm -f when deleting file .. qunit-cleanup: rm -f when deleting file The builders might fail to create the symbolic link in the Apache workspace, in such a case the publisher should not complain. So pass -f to rm to skip the error. The job definitely fails already. Change-Id: I211d0da992060f4575cc843fc754ab16ff6eed62 --- M jjb/macro.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/27/166027/1 diff --git a/jjb/macro.yaml b/jjb/macro.yaml index d7b6845..c245571 100644 --- a/jjb/macro.yaml +++ b/jjb/macro.yaml @@ -349,7 +349,7 @@ - postbuildscript: builders: - shell: | - rm "/srv/localhost/qunit/$BUILD_TAG" + rm -f "/srv/localhost/qunit/$BUILD_TAG" # Options are confusing, setting them both to false ensures the # postbuildscript is ALWAYS run. onsuccess: False -- To view, visit https://gerrit.wikimedia.org/r/166027 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I211d0da992060f4575cc843fc754ab16ff6eed62 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Display an informational message on Special:ChallengeStandin... - change (mediawiki...Challenge)
Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166028
Change subject: Display an informational message on Special:ChallengeStandings
when there are no stats yet
..
Display an informational message on Special:ChallengeStandings when there are
no stats yet
Change-Id: Ifdd919ca3e58f52cfb8d7b5d61bc1c7419b70343
---
M ChallengeStandings.php
M i18n/en.json
M i18n/fi.json
3 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Challenge
refs/changes/28/166028/1
diff --git a/ChallengeStandings.php b/ChallengeStandings.php
index 1961b8a..25e19ed 100644
--- a/ChallengeStandings.php
+++ b/ChallengeStandings.php
@@ -79,6 +79,14 @@
$out .= '';
+ // No rows = nothing to display. This is the case usually when
the
+ // extension was recently installed, as the users haven't yet
had the
+ // time to challenge each other. Display an informational
message in
+ // that case.
+ if ( $dbr->numRows( $res ) === 0 ) {
+ $out = $this->msg( 'challengestandings-empty'
)->parse();
+ }
+
$this->getOutput()->addHTML( $out );
}
}
\ No newline at end of file
diff --git a/i18n/en.json b/i18n/en.json
index c59a1a1..da47e0c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -71,6 +71,7 @@
"challengehistory-view-standings": "View standings",
"challengestandings": "Challenge Standings",
"challengestandings-challengeuser": "challenge user",
+ "challengestandings-empty": "There are no challenge standings. Why
don't you [[Special:ChallengeUser|challenge someone]]?",
"challengestandings-l": "L",
"challengestandings-t": "T",
"challengestandings-title": "{{SITENAME}} Challenge Standings",
diff --git a/i18n/fi.json b/i18n/fi.json
index 48f3d66..9ef5c1c 100644
--- a/i18n/fi.json
+++ b/i18n/fi.json
@@ -63,6 +63,7 @@
"challengehistory-view-standings": "Tarkastele tilastoja",
"challengestandings": "Haastetilastot",
"challengestandings-challengeuser": "haasta käyttäjä",
+ "challengestandings-empty": "Haastetilastot ovat tyhjät. Miksi et
[[Special:ChallengeUser|haastaisi jotakuta]]?",
"challengestandings-l": "H",
"challengestandings-t": "T",
"challengestandings-title": "{{GRAMMAR:genitive|{{SITENAME
haastetilastot",
--
To view, visit https://gerrit.wikimedia.org/r/166028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifdd919ca3e58f52cfb8d7b5d61bc1c7419b70343
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Challenge
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Create mediawiki-selenium-bundle-rspec - change (integration/config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166029
Change subject: Create mediawiki-selenium-bundle-rspec
..
Create mediawiki-selenium-bundle-rspec
Depends on ruby2.0 apparently so the bundle macro need to be migrated to
Trusty instances and ruby2 installed on them.
Change-Id: Ia59a6c10951383ce8b5dc789d616afcf9bf36319
---
M jjb/mediawiki-misc.yaml
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/29/166029/1
diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index 37ae056..cfce0e4 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -43,6 +43,9 @@
- '{name}-gembuild'
- '{name}-bundle-{bundlecommand}':
bundlecommand:
+ - rspec
+ - '{name}-bundle-{bundlecommand}':
+ bundlecommand:
- yard
- '{name}-bundle-yard-publish'
--
To view, visit https://gerrit.wikimedia.org/r/166029
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia59a6c10951383ce8b5dc789d616afcf9bf36319
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Display an informational message on Special:ChallengeStandin... - change (mediawiki...Challenge)
Jack Phoenix has submitted this change and it was merged.
Change subject: Display an informational message on Special:ChallengeStandings
when there are no stats yet
..
Display an informational message on Special:ChallengeStandings when there are
no stats yet
Change-Id: Ifdd919ca3e58f52cfb8d7b5d61bc1c7419b70343
---
M ChallengeStandings.php
M i18n/en.json
M i18n/fi.json
3 files changed, 10 insertions(+), 0 deletions(-)
Approvals:
Jack Phoenix: Verified; Looks good to me, approved
diff --git a/ChallengeStandings.php b/ChallengeStandings.php
index 1961b8a..25e19ed 100644
--- a/ChallengeStandings.php
+++ b/ChallengeStandings.php
@@ -79,6 +79,14 @@
$out .= '';
+ // No rows = nothing to display. This is the case usually when
the
+ // extension was recently installed, as the users haven't yet
had the
+ // time to challenge each other. Display an informational
message in
+ // that case.
+ if ( $dbr->numRows( $res ) === 0 ) {
+ $out = $this->msg( 'challengestandings-empty'
)->parse();
+ }
+
$this->getOutput()->addHTML( $out );
}
}
\ No newline at end of file
diff --git a/i18n/en.json b/i18n/en.json
index c59a1a1..da47e0c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -71,6 +71,7 @@
"challengehistory-view-standings": "View standings",
"challengestandings": "Challenge Standings",
"challengestandings-challengeuser": "challenge user",
+ "challengestandings-empty": "There are no challenge standings. Why
don't you [[Special:ChallengeUser|challenge someone]]?",
"challengestandings-l": "L",
"challengestandings-t": "T",
"challengestandings-title": "{{SITENAME}} Challenge Standings",
diff --git a/i18n/fi.json b/i18n/fi.json
index 48f3d66..9ef5c1c 100644
--- a/i18n/fi.json
+++ b/i18n/fi.json
@@ -63,6 +63,7 @@
"challengehistory-view-standings": "Tarkastele tilastoja",
"challengestandings": "Haastetilastot",
"challengestandings-challengeuser": "haasta käyttäjä",
+ "challengestandings-empty": "Haastetilastot ovat tyhjät. Miksi et
[[Special:ChallengeUser|haastaisi jotakuta]]?",
"challengestandings-l": "H",
"challengestandings-t": "T",
"challengestandings-title": "{{GRAMMAR:genitive|{{SITENAME
haastetilastot",
--
To view, visit https://gerrit.wikimedia.org/r/166028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifdd919ca3e58f52cfb8d7b5d61bc1c7419b70343
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Challenge
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set redirlinks indexed tag name on list=backlinks - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166030
Change subject: Set redirlinks indexed tag name on list=backlinks
..
Set redirlinks indexed tag name on list=backlinks
Bug: 71907
Follow-Up: I32381c0f082d2f8e063af99ee353ae003c163c23
Change-Id: I4af6000c146e60cd6e3fbda42fcc7bef2952c4ba
---
M includes/api/ApiQueryBacklinks.php
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/30/166030/1
diff --git a/includes/api/ApiQueryBacklinks.php
b/includes/api/ApiQueryBacklinks.php
index e344236..428fdcb 100644
--- a/includes/api/ApiQueryBacklinks.php
+++ b/includes/api/ApiQueryBacklinks.php
@@ -287,6 +287,7 @@
$res = $this->select( __METHOD__ );
$count = 0;
+ $result = $this->getResult();
foreach ( $res as $row ) {
$ns = $this->hasNS ? $row->{$this->bl_ns} : NS_FILE;
@@ -318,6 +319,10 @@
$parentID =
$this->pageMap[$ns][$row->{$this->bl_title}];
// Put all the results in an array first
$this->resultArr[$parentID]['redirlinks'][$row->page_id] = $a;
+ $result->setIndexedTagName(
+
$this->resultArr[$parentID]['redirlinks'],
+ $this->bl_code
+ );
} else {
$resultPageSet->processDbRow( $row );
}
--
To view, visit https://gerrit.wikimedia.org/r/166030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4af6000c146e60cd6e3fbda42fcc7bef2952c4ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia-fundraising-civicrm - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/166031 Change subject: wikimedia-fundraising-civicrm .. wikimedia-fundraising-civicrm An integration job for Wikimedia fundraising team. Eventually reproduce whatever is done at https://github.com/civicrm/civicrm-buildkit/tree/master/app/config/wmff though using the Zuul cloner. Change-Id: Ib9a9a1414c6136c9d3186e36a5e759e95580ba25 --- M jjb/wm-fundraising.yaml 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/31/166031/1 diff --git a/jjb/wm-fundraising.yaml b/jjb/wm-fundraising.yaml index 3bbfe46..70370ad 100644 --- a/jjb/wm-fundraising.yaml +++ b/jjb/wm-fundraising.yaml @@ -1,3 +1,29 @@ +- job-template: +name: 'wikimedia-fundraising-civicrm' +builders: + - shell: /srv/deployment/integration/slave-scripts/bin/civi-ci-create-dbs.sh + - zuul-cloner: + projects: > + mediawiki/extensions/DonationInterface + wikimedia/fundraising/crm + wikimedia/fundraising/crm/civicrm + wikimedia/fundraising/crm/drupal + wikimedia/fundraising/phpmailer + wikimedia/fundraising/twig +publishers: + - postbuildscript: + builders: + - shell: /srv/deployment/integration/slave-scripts/bin/civi-ci-drop-dbs.sh + # Confusing options follow. Need to have them both set to false to + # ensure the postbuildscript is ALWAYS run. + onsuccess: false + onfailure: false + +- project: +name: 'wikimedia-fundraising-civicrm' +jobs: + - 'wikimedia-fundraising-civicrm' + - project: name: 'wikimedia-fundraising-tools' -- To view, visit https://gerrit.wikimedia.org/r/166031 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9a9a1414c6136c9d3186e36a5e759e95580ba25 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Do not require auth for listing instance info - change (mediawiki...OpenStackManager)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166032
Change subject: [WIP] Do not require auth for listing instance info
..
[WIP] Do not require auth for listing instance info
Change-Id: Idc43ece235cae461997608a70bbb866ad3ff7d61
---
M api/ApiListNovaInstances.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/32/166032/1
diff --git a/api/ApiListNovaInstances.php b/api/ApiListNovaInstances.php
index be90e63..e414972 100644
--- a/api/ApiListNovaInstances.php
+++ b/api/ApiListNovaInstances.php
@@ -15,6 +15,8 @@
}
public function run() {
+ global $wgOpenStackManagerLDAPUsername;
+
$params = $this->extractRequestParams();
$project = OpenStackNovaProject::getProjectByName(
$params['project'] );
if ( !$project ) {
@@ -26,7 +28,7 @@
$this->dieUsage( 'Must be logged in to use this API',
'notloggedin' );
}
- $user = new OpenStackNovaUser();
+ $user = new OpenStackNovaUser( $wgOpenStackManagerLDAPUsername
);
if ( !$user->exists() ) {
$this->dieUsage( 'NovaUser does not exist', 'baduser' );
}
--
To view, visit https://gerrit.wikimedia.org/r/166032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc43ece235cae461997608a70bbb866ad3ff7d61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reenable Apache lint check - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/166033 Change subject: Reenable Apache lint check .. Reenable Apache lint check The MediaWiki apache lint checker has been broken since we migrated the configuration files from operations/apache-config.git to Puppet. * Use Zuul cloner so we can trigger the job from both repositories. * Instrucsts Zuul cloner that operations/puppet fallback branch is named 'production' * Tweak the configuration files using sed. That is not ideal honestly. Updates job operations-apache-config-lint Bug: 70068 Change-Id: I6b1123f6583db572abc08b6d35856b821a70208b --- M jjb/operations-apache-config.yaml 1 file changed, 30 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/33/166033/1 diff --git a/jjb/operations-apache-config.yaml b/jjb/operations-apache-config.yaml index e3b1813..424d0d7 100644 --- a/jjb/operations-apache-config.yaml +++ b/jjb/operations-apache-config.yaml @@ -1,25 +1,20 @@ - job-template: name: 'operations-apache-config-lint' -defaults: use-remote-zuul # only works there cause it needs mod_rewrite which is not on other slaves # apparently. node: gallium - triggers: - zuul builders: - # Snapshot operations/mediawiki-config.git which contains - # the Apache document roots. + # Phase 1, assert redirects.dat has been updated + - zuul-cloner: + projects: "--project-branch operations/puppet=production operations/puppet" - shell: | -git archive \ ---remote=/srv/ssd/gerrit/operations/mediawiki-config.git \ ---prefix=mediawiki-config/ \ -master \ -| ( cd "$WORKSPACE" && tar xf -) - - - shell: | +#!/bin/bash -eu echo "Regenerating redirects.conf should not have changed" +cd src/operations/puppet/modules/mediawiki/files/apache/sites/redirects + ./refreshDomainRedirects set +e @@ -35,16 +30,35 @@ echo "Continuing.." fi + # Phase2, lint Apache configuration files + - zuul-cloner: + projects: "operations/mediawiki-config" + - shell: | -/bin/sed -i s%/etc/apache2/[^/]*/%% *.conf -/bin/sed -i s%/usr/local/apache/conf/%% *.conf -/bin/sed -i s%/usr/local/apache/common/%$WORKSPACE/mediawiki-config/% *.conf +#!/bin/bash -eu +export CI_APACHE_SERVER_ROOT="$WORKSPACE/src/operations/puppet/modules/mediawiki/files/apache" + +# Generate list of .conf files +find "$CI_APACHE_SERVER_ROOT" -type f -name '*.conf' > apache_files.txt +# Pass commands on them +while read apache_file; do +echo "Tweaking $apache_file" +/bin/sed -i "s%/etc/apache2/[^/]*/%$CI_APACHE_SERVER_ROOT%" $apache_file +/bin/sed -i "s%/srv/mediawiki/%$WORKSPACE/src/operations/mediawiki-config/%" $apache_file +done < apache_files.txt + +# Hijack unexisting 'apache' username +/bin/sed -i -r "s/(User|Group) apache/\1 $USER/" \ +"$CI_APACHE_SERVER_ROOT/apache2.conf" + +ln -f -s $CI_APACHE_SERVER_ROOT/sites $CI_APACHE_SERVER_ROOT/sites-enabled + /usr/sbin/apache2 -t \ --d "$WORKSPACE" \ +-d "$CI_APACHE_SERVER_ROOT" \ -C 'Include /etc/apache2/mods-enabled/*.load' \ -C 'Include /etc/apache2/mods-enabled/*.conf' \ -C 'Include /etc/apache2/mods-available/expires.load' \ --f all.conf +-f apache2.conf - project: name: 'operations-apache-config' -- To view, visit https://gerrit.wikimedia.org/r/166033 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b1123f6583db572abc08b6d35856b821a70208b Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (WIP) migrate mw doxygen to zuul-cloner and Trusty (WIP) - change (integration/config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166034
Change subject: (WIP) migrate mw doxygen to zuul-cloner and Trusty (WIP)
..
(WIP) migrate mw doxygen to zuul-cloner and Trusty (WIP)
Generated at:
https://integration.wikimedia.org/ci/job/hashar-mediawiki-core-doxygen-publish/
Ubuntu Trusty has doxygen 1.8.6
It is quite slow on labs instances :-/
Bug: 46771
Change-Id: I1fd6d23917c2098dbdad37d9e718335616207f68
---
M jjb/mediawiki.yaml
1 file changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/34/166034/1
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index fe52f9f..a13e80b 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -102,6 +102,22 @@
builders:
- shell:
"/srv/deployment/integration/slave-scripts/tools/mwcore-docgen.sh"
+- job:
+name: 'hashar-mediawiki-core-doxygen-publish'
+node: contintLabsSlave && UbuntuTrusty
+concurrent: false
+triggers:
+ - zuul
+builders:
+ - zuul-cloner:
+ projects: "mediawiki/core"
+ - shell: |
+ mkdir -p build/doc
+ TARGET_BASEDIR="$WORKSPACE/build/doc"
/srv/deployment/integration/slave-scripts/tools/mwcore-docgen.sh
+ - push-doc:
+ docsrc: 'build/doc'
+ docdest: 'hashar'
+
- job-template:
name: '{name}-whitespaces'
node: hasSlaveScripts && UbuntuPrecise
--
To view, visit https://gerrit.wikimedia.org/r/166034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1fd6d23917c2098dbdad37d9e718335616207f68
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use jQuery.noop - change (mediawiki...CodeEditor)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166035
Change subject: Use jQuery.noop
..
Use jQuery.noop
This avoids the definition of several empty functions.
Change-Id: Ic6fe5c46e1ed90217c1935dd0a87c6b97a0ad513
---
M modules/jquery.codeEditor.js
1 file changed, 6 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor
refs/changes/35/166035/1
diff --git a/modules/jquery.codeEditor.js b/modules/jquery.codeEditor.js
index 40fe8b9..e836722 100644
--- a/modules/jquery.codeEditor.js
+++ b/modules/jquery.codeEditor.js
@@ -53,18 +53,12 @@
* function is to both classify the scope of changes as
'division' or 'character' and to prevent further
* processing of events which did not actually change
the content of the iframe.
*/
- 'keydown': function ( ) {
- },
- 'change': function ( ) {
- },
- 'delayedChange': function ( ) {
- },
- 'cut': function ( ) {
- },
- 'paste': function ( ) {
- },
- 'ready': function ( ) {
- },
+ 'keydown': $.noop,
+ 'change': $.noop,
+ 'delayedChange': $.noop,
+ 'cut': $.noop,
+ 'paste': $.noop,
+ 'ready': $.noop,
'codeEditorSubmit': function ( ) {
context.evt.codeEditorSync();
var i,
--
To view, visit https://gerrit.wikimedia.org/r/166035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6fe5c46e1ed90217c1935dd0a87c6b97a0ad513
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add mediawiki.userSuggest to Special:ListFiles - change (mediawiki/core)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/166036 Change subject: Add mediawiki.userSuggest to Special:ListFiles .. Add mediawiki.userSuggest to Special:ListFiles This gives a suggestion list when typing a username on that special page Change-Id: I9960325f27eddb6ea0b3317b00996ccb91c51994 --- M includes/specials/SpecialListfiles.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/36/166036/1 diff --git a/includes/specials/SpecialListfiles.php b/includes/specials/SpecialListfiles.php index 2a97abc..bf17a20 100644 --- a/includes/specials/SpecialListfiles.php +++ b/includes/specials/SpecialListfiles.php @@ -519,6 +519,7 @@ ); } + $this->getOutput()->addModules( 'mediawiki.userSuggest' ); $fields['user'] = array( 'type' => 'text', 'name' => 'user', @@ -527,6 +528,7 @@ 'default' => $this->mUserName, 'size' => '40', 'maxlength' => '255', + 'cssclass' => 'mw-autocomplete-user', // used by mediawiki.userSuggest ); $fields['ilshowall'] = array( -- To view, visit https://gerrit.wikimedia.org/r/166036 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9960325f27eddb6ea0b3317b00996ccb91c51994 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] diamond: correct collector class name - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/166037 Change subject: diamond: correct collector class name .. diamond: correct collector class name Change-Id: I56370ba333fad1d13e379f4724113df2eee8d734 Signed-off-by: Giuseppe Lavagetto --- M modules/mediawiki/files/monitoring/collectors/hhvm.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/37/166037/1 diff --git a/modules/mediawiki/files/monitoring/collectors/hhvm.py b/modules/mediawiki/files/monitoring/collectors/hhvm.py index b0620cf..69e7a72 100644 --- a/modules/mediawiki/files/monitoring/collectors/hhvm.py +++ b/modules/mediawiki/files/monitoring/collectors/hhvm.py @@ -14,7 +14,7 @@ import diamond.collector -class mw_hhvmCollector(diamond.collector.Collector): +class hhvm_healthCollector(diamond.collector.Collector): def get_default_config_help(self): pass -- To view, visit https://gerrit.wikimedia.org/r/166037 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56370ba333fad1d13e379f4724113df2eee8d734 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] diamond: correct collector class name - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: diamond: correct collector class name .. diamond: correct collector class name Change-Id: I56370ba333fad1d13e379f4724113df2eee8d734 Signed-off-by: Giuseppe Lavagetto --- M modules/mediawiki/files/monitoring/collectors/hhvm.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/modules/mediawiki/files/monitoring/collectors/hhvm.py b/modules/mediawiki/files/monitoring/collectors/hhvm.py index b0620cf..69e7a72 100644 --- a/modules/mediawiki/files/monitoring/collectors/hhvm.py +++ b/modules/mediawiki/files/monitoring/collectors/hhvm.py @@ -14,7 +14,7 @@ import diamond.collector -class mw_hhvmCollector(diamond.collector.Collector): +class hhvm_healthCollector(diamond.collector.Collector): def get_default_config_help(self): pass -- To view, visit https://gerrit.wikimedia.org/r/166037 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I56370ba333fad1d13e379f4724113df2eee8d734 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto Gerrit-Reviewer: Giuseppe Lavagetto ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix access level and remove unnecessary redefinitions - change (mediawiki...Scribunto)
Jackmcbarn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166038
Change subject: Fix access level and remove unnecessary redefinitions
..
Fix access level and remove unnecessary redefinitions
In I019c24d1, some member variables were accidentally changed from public
to protected. This restores those, and also fixes unnecessary
redefinitions in Scribunto_LuaModule.
Change-Id: Ib0232a5adcd9ad7ea5c0f4413ba06c42b5506d7b
---
M common/Base.php
M engines/LuaCommon/LuaCommon.php
2 files changed, 3 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto
refs/changes/38/166038/1
diff --git a/common/Base.php b/common/Base.php
index 1fbf945..a360844 100644
--- a/common/Base.php
+++ b/common/Base.php
@@ -283,17 +283,17 @@
/**
* @var ScribuntoEngineBase
*/
- protected $engine;
+ public $engine;
/**
* @var string
*/
- protected $code;
+ public $code;
/**
* @var string
*/
- protected $chunkName;
+ public $chunkName;
/**
* @param ScribuntoEngineBase $engine
diff --git a/engines/LuaCommon/LuaCommon.php b/engines/LuaCommon/LuaCommon.php
index 4221431..28563c9 100644
--- a/engines/LuaCommon/LuaCommon.php
+++ b/engines/LuaCommon/LuaCommon.php
@@ -806,23 +806,9 @@
class Scribunto_LuaModule extends ScribuntoModuleBase {
/**
-* @var Scribunto_LuaEngine
-*/
- protected $engine;
-
- /**
* @var string
*/
protected $initChunk;
-
- /**
-* @param Scribunto_LuaEngine $engine
-* @param string $code
-* @param string $chunkName
-*/
- public function __construct( Scribunto_LuaEngine $engine, $code,
$chunkName ) {
- parent::__construct( $engine, $code, $chunkName );
- }
public function validate() {
try {
--
To view, visit https://gerrit.wikimedia.org/r/166038
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0232a5adcd9ad7ea5c0f4413ba06c42b5506d7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add mediawiki.userSuggest to Special:[Deleted]Contributions - change (mediawiki/core)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/166039 Change subject: Add mediawiki.userSuggest to Special:[Deleted]Contributions .. Add mediawiki.userSuggest to Special:[Deleted]Contributions This gives a suggestion list when typing a username Change-Id: I59ca64f21de3182adeb01fbea8dc13ebc0fc4367 --- M includes/specials/SpecialContributions.php M includes/specials/SpecialDeletedContributions.php 2 files changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/39/166039/1 diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php index 5631c3a..580b8e9 100644 --- a/includes/specials/SpecialContributions.php +++ b/includes/specials/SpecialContributions.php @@ -485,6 +485,8 @@ $filterSelection = Html::rawElement( 'td', array( 'colspan' => 2 ), '' ); } + $this->getOutput()->addModules( 'mediawiki.userSuggest' ); + $labelNewbies = Xml::radioLabel( $this->msg( 'sp-contributions-newbies' )->text(), 'contribs', @@ -505,9 +507,15 @@ 'target', $this->opts['target'], 'text', - array( 'size' => '40', 'required' => '', 'class' => 'mw-input mw-ui-input-inline' ) + - ( $this->opts['target'] ? array() : array( 'autofocus' ) - ) + array( + 'size' => '40', + 'required' => '', + 'class' => array( + 'mw-input', + 'mw-ui-input-inline', + 'mw-autocomplete-user', // used by mediawiki.userSuggest + ), + ) + ( $this->opts['target'] ? array() : array( 'autofocus' ) ) ); $targetSelection = Html::rawElement( 'td', diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php index 68f2c46..1b665f6 100644 --- a/includes/specials/SpecialDeletedContributions.php +++ b/includes/specials/SpecialDeletedContributions.php @@ -533,6 +533,8 @@ $f .= "\t" . Html::hidden( $name, $value ) . "\n"; } + $this->getOutput()->addModules( 'mediawiki.userSuggest' ); + $f .= Xml::openElement( 'fieldset' ); $f .= Xml::element( 'legend', array(), $this->msg( 'sp-contributions-search' )->text() ); $f .= Xml::tags( @@ -546,7 +548,10 @@ 'text', array( 'size' => '20', - 'required' => '' + 'required' => '', + 'class' => array( + 'mw-autocomplete-user', // used by mediawiki.userSuggest + ), ) + ( $options['target'] ? array() : array( 'autofocus' ) ) ) . ' '; $f .= Html::namespaceSelector( -- To view, visit https://gerrit.wikimedia.org/r/166039 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59ca64f21de3182adeb01fbea8dc13ebc0fc4367 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] diamond: fix collector - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166040
Change subject: diamond: fix collector
..
diamond: fix collector
Change-Id: I2935cb2fed72e354ed9bd898593a961c2118f68b
Signed-off-by: Giuseppe Lavagetto
---
M modules/mediawiki/files/monitoring/collectors/hhvm.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/40/166040/1
diff --git a/modules/mediawiki/files/monitoring/collectors/hhvm.py
b/modules/mediawiki/files/monitoring/collectors/hhvm.py
index 69e7a72..a077376 100644
--- a/modules/mediawiki/files/monitoring/collectors/hhvm.py
+++ b/modules/mediawiki/files/monitoring/collectors/hhvm.py
@@ -20,7 +20,7 @@
pass
def get_default_config(self):
-config = super(mw_hhvmCollector, self).get_default_config()
+config = super(hhvm_healthCollector, self).get_default_config()
config.update({
'host': 'localhost:9002',
'url': '/',
--
To view, visit https://gerrit.wikimedia.org/r/166040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2935cb2fed72e354ed9bd898593a961c2118f68b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] diamond: fix collector - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: diamond: fix collector
..
diamond: fix collector
Change-Id: I2935cb2fed72e354ed9bd898593a961c2118f68b
Signed-off-by: Giuseppe Lavagetto
---
M modules/mediawiki/files/monitoring/collectors/hhvm.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/files/monitoring/collectors/hhvm.py
b/modules/mediawiki/files/monitoring/collectors/hhvm.py
index 69e7a72..a077376 100644
--- a/modules/mediawiki/files/monitoring/collectors/hhvm.py
+++ b/modules/mediawiki/files/monitoring/collectors/hhvm.py
@@ -20,7 +20,7 @@
pass
def get_default_config(self):
-config = super(mw_hhvmCollector, self).get_default_config()
+config = super(hhvm_healthCollector, self).get_default_config()
config.update({
'host': 'localhost:9002',
'url': '/',
--
To view, visit https://gerrit.wikimedia.org/r/166040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2935cb2fed72e354ed9bd898593a961c2118f68b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove mailhost setting from smokeping - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/166042 Change subject: Remove mailhost setting from smokeping .. Remove mailhost setting from smokeping It was not used anyway because Net::SMTP perl package was not installed on the server and the corresponding if was failing. Thus is was failing back to using the binary configured in sendmail (in pathnames file). Do note however that even if that is not configured it will again fallback to using /usr/lib/sendmail. Change-Id: I9d67f60e11045558edb337c89e5f9ed52c7f9b11 --- M modules/smokeping/files/config.d/General 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/42/166042/1 diff --git a/modules/smokeping/files/config.d/General b/modules/smokeping/files/config.d/General index a06a72d..657e701 100644 --- a/modules/smokeping/files/config.d/General +++ b/modules/smokeping/files/config.d/General @@ -8,7 +8,6 @@ owner= Wikimedia Foundation contact = n...@wikimedia.org -mailhost = smtp.wikimedia.org # NOTE: do not put the Image Cache below cgi-bin # since all files under cgi-bin will be executed ... this is not # good for images. -- To view, visit https://gerrit.wikimedia.org/r/166042 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d67f60e11045558edb337c89e5f9ed52c7f9b11 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add mediawiki.userSuggest to Special:NewPages - change (mediawiki/core)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/166041 Change subject: Add mediawiki.userSuggest to Special:NewPages .. Add mediawiki.userSuggest to Special:NewPages This gives a suggestion list when typing a username Change-Id: Ia3c8c99e5d78adbdc7ef8e7000ab454c8954ec46 --- M includes/specials/SpecialNewpages.php 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/41/166041/1 diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php index 0b70bb7..3a74e7a 100644 --- a/includes/specials/SpecialNewpages.php +++ b/includes/specials/SpecialNewpages.php @@ -221,6 +221,8 @@ list( $tagFilterLabel, $tagFilterSelector ) = $tagFilter; } + $this->getOutput()->addModules( 'mediawiki.userSuggest' ); + $form = Xml::openElement( 'form', array( 'action' => wfScript() ) ) . Html::hidden( 'title', $this->getPageTitle()->getPrefixedDBkey() ) . Xml::fieldset( $this->msg( 'newpages' )->text() ) . @@ -262,7 +264,10 @@ Xml::label( $this->msg( 'newpages-username' )->text(), 'mw-np-username' ) . ' ' . - Xml::input( 'username', 30, $userText, array( 'id' => 'mw-np-username' ) ) . + Xml::input( 'username', 30, $userText, array( + 'id' => 'mw-np-username', + 'class' => 'mw-autocomplete-user', // used by mediawiki.userSuggest + ) ) . ' ' . ' -- To view, visit https://gerrit.wikimedia.org/r/166041 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3c8c99e5d78adbdc7ef8e7000ab454c8954ec46 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove smtp.wikimedia.org - change (operations/dns)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/166043 Change subject: Remove smtp.wikimedia.org .. Remove smtp.wikimedia.org As mark pointed out in 4fa1110, smtp.wikimedia.org was meant only for authenticated submissions. I was led to believe it was still being used by smokeping due to its (non-functional) configuration. That configuration was amended in 07f985a62 so now we remove the non working anymore record Change-Id: I0902216c884cc45cc5535665829fbadc8c85499a --- M templates/wikimedia.org 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/43/166043/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index d5843dc..3e9f7df 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -460,8 +460,6 @@ secure 600 IN DYNA geoip!text-addrs -smtp1H IN A208.80.154.90 ; polonium - stream 1H IN CNAMEstream-lb.eqiad svn 5M IN CNAMEantimony.wikimedia.org. -- To view, visit https://gerrit.wikimedia.org/r/166043 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0902216c884cc45cc5535665829fbadc8c85499a Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Alexandros Kosiaris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set redirlinks indexed tag name on list=backlinks - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Set redirlinks indexed tag name on list=backlinks
..
Set redirlinks indexed tag name on list=backlinks
Bug: 71907
Follow-Up: I32381c0f082d2f8e063af99ee353ae003c163c23
Change-Id: I4af6000c146e60cd6e3fbda42fcc7bef2952c4ba
---
M includes/api/ApiQueryBacklinks.php
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiQueryBacklinks.php
b/includes/api/ApiQueryBacklinks.php
index e344236..52445d2 100644
--- a/includes/api/ApiQueryBacklinks.php
+++ b/includes/api/ApiQueryBacklinks.php
@@ -287,6 +287,7 @@
$res = $this->select( __METHOD__ );
$count = 0;
+ $result = $this->getResult();
foreach ( $res as $row ) {
$ns = $this->hasNS ? $row->{$this->bl_ns} : NS_FILE;
@@ -318,6 +319,10 @@
$parentID =
$this->pageMap[$ns][$row->{$this->bl_title}];
// Put all the results in an array first
$this->resultArr[$parentID]['redirlinks'][$row->page_id] = $a;
+ $result->setIndexedTagName(
+
$this->resultArr[$parentID]['redirlinks'],
+ $this->bl_code
+ );
} else {
$resultPageSet->processDbRow( $row );
}
--
To view, visit https://gerrit.wikimedia.org/r/166030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4af6000c146e60cd6e3fbda42fcc7bef2952c4ba
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: Umherirrender
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] codfw es servers production ip allocation - change (operations/dns)
RobH has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166044
Change subject: codfw es servers production ip allocation
..
codfw es servers production ip allocation
setting codfw es server ip addresses
Change-Id: I35b32ef4b1d37ad2962eeaf7fb920d39eb1e59b2
RT: 8368
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/44/166044/1
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 5d05638..5912c90 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2439,6 +2439,11 @@
22 1H IN PTR ms-be2004.codfw.wmnet.
23 1H IN PTR ms-fe2001.codfw.wmnet.
24 1H IN PTR ms-fe2002.codfw.wmnet.
+25 1H IN PTR es2001.codfw.wmnet.
+26 1H IN PTR es2002.codfw.wmnet.
+27 1H IN PTR es2005.codfw.wmnet.
+28 1H IN PTR es2006.codfw.wmnet.
+29 1H IN PTR es2007.codfw.wmnet.
$ORIGIN 1.192.{{ zonename }}.
1 1H IN PTR lvs2001.codfw.wmnet.
@@ -2477,6 +2482,11 @@
24 1H IN PTR ms-be2008.codfw.wmnet.
25 1H IN PTR ms-fe2003.codfw.wment.
26 1H IN PTR ms-fe2004.codfw.wmnet.
+27 1H IN PTR es2003.codfw.wmnet.
+28 1H IN PTR es2004.codfw.wmnet.
+29 1H IN PTR es2008.codfw.wmnet.
+30 1H IN PTR es2009.codfw.wmnet.
+31 1H IN PTR es2010.codfw.wmnet.
$ORIGIN 17.192.{{ zonename }}.
1 1H IN PTR vl2018-eth1.lvs2001.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 3ff46c9..6fe2608 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2020,6 +2020,16 @@
db2040 1H IN A10.192.32.11
db2041 1H IN A10.192.32.12
db2042 1H IN A10.192.32.13
+es2001 1H IN A10.192.0.25
+es2002 1H IN A10.192.0.26
+es2003 1H IN A10.192.16.27
+es2004 1H IN A10.192.16.28
+es2005 1H IN A10.192.0.27
+es2006 1H IN A10.192.0.28
+es2007 1H IN A10.192.0.29
+es2008 1H IN A10.192.16.29
+es2009 1H IN A10.192.16.30
+es2010 1H IN A10.192.16.31
lvs2001 1H IN A10.192.1.1
lvs2002 1H IN A10.192.1.2
lvs2003 1H IN A10.192.1.3
--
To view, visit https://gerrit.wikimedia.org/r/166044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I35b32ef4b1d37ad2962eeaf7fb920d39eb1e59b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: RobH
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add mediawiki.userSuggest to Special:UserRights - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166045
Change subject: Add mediawiki.userSuggest to Special:UserRights
..
Add mediawiki.userSuggest to Special:UserRights
This gives a suggestion list when typing a username
Change-Id: I35dc9c4cf62c7a7ff5214d804d65b4ac9feeb897
---
M includes/specials/SpecialUserrights.php
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/45/166045/1
diff --git a/includes/specials/SpecialUserrights.php
b/includes/specials/SpecialUserrights.php
index cefdad0..6ca57aa 100644
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -415,6 +415,8 @@
* Output a form to allow searching for a user
*/
function switchForm() {
+ $this->getOutput()->addModules( 'mediawiki.userSuggest' );
+
$this->getOutput()->addHTML(
Html::openElement(
'form',
@@ -433,7 +435,10 @@
'username',
30,
str_replace( '_', ' ', $this->mTarget ),
- array( 'autofocus' => true )
+ array(
+ 'autofocus' => true,
+ 'class' => 'mw-autocomplete-user', //
used by mediawiki.userSuggest
+ )
) . ' ' .
Xml::submitButton( $this->msg( 'editusergroup'
)->text() ) .
Html::closeElement( 'fieldset' ) .
--
To view, visit https://gerrit.wikimedia.org/r/166045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I35dc9c4cf62c7a7ff5214d804d65b4ac9feeb897
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] codfw es servers production ip allocation - change (operations/dns)
RobH has submitted this change and it was merged.
Change subject: codfw es servers production ip allocation
..
codfw es servers production ip allocation
setting codfw es server ip addresses
Change-Id: I35b32ef4b1d37ad2962eeaf7fb920d39eb1e59b2
RT: 8368
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 20 insertions(+), 0 deletions(-)
Approvals:
RobH: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 5d05638..5912c90 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2439,6 +2439,11 @@
22 1H IN PTR ms-be2004.codfw.wmnet.
23 1H IN PTR ms-fe2001.codfw.wmnet.
24 1H IN PTR ms-fe2002.codfw.wmnet.
+25 1H IN PTR es2001.codfw.wmnet.
+26 1H IN PTR es2002.codfw.wmnet.
+27 1H IN PTR es2005.codfw.wmnet.
+28 1H IN PTR es2006.codfw.wmnet.
+29 1H IN PTR es2007.codfw.wmnet.
$ORIGIN 1.192.{{ zonename }}.
1 1H IN PTR lvs2001.codfw.wmnet.
@@ -2477,6 +2482,11 @@
24 1H IN PTR ms-be2008.codfw.wmnet.
25 1H IN PTR ms-fe2003.codfw.wment.
26 1H IN PTR ms-fe2004.codfw.wmnet.
+27 1H IN PTR es2003.codfw.wmnet.
+28 1H IN PTR es2004.codfw.wmnet.
+29 1H IN PTR es2008.codfw.wmnet.
+30 1H IN PTR es2009.codfw.wmnet.
+31 1H IN PTR es2010.codfw.wmnet.
$ORIGIN 17.192.{{ zonename }}.
1 1H IN PTR vl2018-eth1.lvs2001.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 3ff46c9..6fe2608 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2020,6 +2020,16 @@
db2040 1H IN A10.192.32.11
db2041 1H IN A10.192.32.12
db2042 1H IN A10.192.32.13
+es2001 1H IN A10.192.0.25
+es2002 1H IN A10.192.0.26
+es2003 1H IN A10.192.16.27
+es2004 1H IN A10.192.16.28
+es2005 1H IN A10.192.0.27
+es2006 1H IN A10.192.0.28
+es2007 1H IN A10.192.0.29
+es2008 1H IN A10.192.16.29
+es2009 1H IN A10.192.16.30
+es2010 1H IN A10.192.16.31
lvs2001 1H IN A10.192.1.1
lvs2002 1H IN A10.192.1.2
lvs2003 1H IN A10.192.1.3
--
To view, visit https://gerrit.wikimedia.org/r/166044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I35b32ef4b1d37ad2962eeaf7fb920d39eb1e59b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: RobH
Gerrit-Reviewer: RobH
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove smtp.wikimedia.org - change (operations/dns)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Remove smtp.wikimedia.org .. Remove smtp.wikimedia.org As mark pointed out in 4fa1110, smtp.wikimedia.org was meant only for authenticated submissions. I was led to believe it was still being used by smokeping due to its (non-functional) configuration. That configuration was amended in 07f985a62 so now we remove the non working anymore record Change-Id: I0902216c884cc45cc5535665829fbadc8c85499a --- M templates/wikimedia.org 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wikimedia.org b/templates/wikimedia.org index d5843dc..3e9f7df 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -460,8 +460,6 @@ secure 600 IN DYNA geoip!text-addrs -smtp1H IN A208.80.154.90 ; polonium - stream 1H IN CNAMEstream-lb.eqiad svn 5M IN CNAMEantimony.wikimedia.org. -- To view, visit https://gerrit.wikimedia.org/r/166043 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0902216c884cc45cc5535665829fbadc8c85499a Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Alexandros Kosiaris Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove mailhost setting from smokeping - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Remove mailhost setting from smokeping .. Remove mailhost setting from smokeping It was not used anyway because Net::SMTP perl package was not installed on the server and the corresponding "if" was failing. Thus it was failing back to using the binary configured in sendmail (in pathnames file). Do note however that even if that is not configured it will again fallback to using /usr/lib/sendmail which is a valid link to exim4 in our environment Change-Id: I9d67f60e11045558edb337c89e5f9ed52c7f9b11 --- M modules/smokeping/files/config.d/General 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/smokeping/files/config.d/General b/modules/smokeping/files/config.d/General index a06a72d..657e701 100644 --- a/modules/smokeping/files/config.d/General +++ b/modules/smokeping/files/config.d/General @@ -8,7 +8,6 @@ owner= Wikimedia Foundation contact = n...@wikimedia.org -mailhost = smtp.wikimedia.org # NOTE: do not put the Image Cache below cgi-bin # since all files under cgi-bin will be executed ... this is not # good for images. -- To view, visit https://gerrit.wikimedia.org/r/166042 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d67f60e11045558edb337c89e5f9ed52c7f9b11 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: Faidon Liambotis Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: ruby2.0 on Trusty slaves - change (operations/puppet)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/166046 Change subject: contint: ruby2.0 on Trusty slaves .. contint: ruby2.0 on Trusty slaves Change-Id: Ia3958f4201e72f5669a00caf9195d95c0662d77c --- M modules/contint/manifests/packages/labs.pp 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/46/166046/1 diff --git a/modules/contint/manifests/packages/labs.pp b/modules/contint/manifests/packages/labs.pp index 95664e3..7ce87a6 100644 --- a/modules/contint/manifests/packages/labs.pp +++ b/modules/contint/manifests/packages/labs.pp @@ -86,6 +86,11 @@ 'python3.4', # Let us compile python modules: 'python3.4-dev', + +'ruby2.0', +# bundle/gem compile ruby modules: +'ruby2.0-dev', + ]: ensure => present, } } -- To view, visit https://gerrit.wikimedia.org/r/166046 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3958f4201e72f5669a00caf9195d95c0662d77c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] diamond: fix collector (again) - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/166047 Change subject: diamond: fix collector (again) .. diamond: fix collector (again) Change-Id: I5db672a6ba08968f72a4c1d1dcfb9b578c568d1b Signed-off-by: Giuseppe Lavagetto --- M modules/mediawiki/files/monitoring/collectors/hhvm.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/47/166047/1 diff --git a/modules/mediawiki/files/monitoring/collectors/hhvm.py b/modules/mediawiki/files/monitoring/collectors/hhvm.py index a077376..2035f25 100644 --- a/modules/mediawiki/files/monitoring/collectors/hhvm.py +++ b/modules/mediawiki/files/monitoring/collectors/hhvm.py @@ -26,6 +26,7 @@ 'url': '/', 'timeout': 5, }) +return config def collect(self): # publish stats with self.publish -- To view, visit https://gerrit.wikimedia.org/r/166047 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5db672a6ba08968f72a4c1d1dcfb9b578c568d1b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
