[MediaWiki-commits] [Gerrit] (bug 45978) Correct case of Special:Userrights' canonical name - change (mediawiki/core)
IAlex has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53134
Change subject: (bug 45978) Correct case of Special:Userrights' canonical name
..
(bug 45978) Correct case of Special:Userrights' canonical name
Fix for I50796216 (17e17ba).
The error is PHP Notice: Found alias defined for Userrights when
searching for special page aliases for UserRights. Case mismatch?
Bug: 45978
Change-Id: Ib82bd38d0229af7571f2ab3c0470fa0f0384b635
---
M includes/SkinTemplate.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/34/53134/1
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index a7e567c..c8c0fe5 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1246,7 +1246,7 @@
$sur = new UserrightsPage;
if ( $sur-userCanExecute( $this-getUser() ) ) {
$nav_urls['userrights'] = array(
- 'href' = self::makeSpecialUrlSubpage(
'UserRights', $rootUser )
+ 'href' = self::makeSpecialUrlSubpage(
'Userrights', $rootUser )
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/53134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib82bd38d0229af7571f2ab3c0470fa0f0384b635
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex ialex.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45553) WIP: Indicate that users cannot proofread their ... - change (mediawiki...Translate)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53135
Change subject: (bug 45553) WIP: Indicate that users cannot proofread their own
translations
..
(bug 45553) WIP: Indicate that users cannot proofread their own translations
Change-Id: I2980447fd62bc9d8eb28fb42dfd0cf29e944bcd0
---
M Translate.i18n.php
M Translate.php
M resources/css/ext.translate.proofread.css
A resources/images/user-small.png
A resources/images/user-small.svg
M resources/js/ext.translate.proofread.js
M resources/js/ext.translate.special.translate.js
7 files changed, 34 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/35/53135/1
diff --git a/Translate.i18n.php b/Translate.i18n.php
index c93898e..bf24378 100644
--- a/Translate.i18n.php
+++ b/Translate.i18n.php
@@ -480,6 +480,7 @@
'tux-message-filter-result' = 'Found $1 {{PLURAL:$1|result|results}}
for $2',
'tux-message-filter-advanced-button' = 'Advanced search',
'tux-message-filter-optional-messages-label' = 'Optional messages',
+ 'tux-proofread-translated-by-self' = 'Translated by you',
'tux-empty-list-all' = 'This message group is empty',
'tux-empty-list-all-guide' = 'Select a different message group to
translate',
@@ -1007,6 +1008,8 @@
'tux-message-filter-advanced-button' = 'Button label for searching the
messages using [[Special:SearchTranslations]].
{{Identical|Advanced search}}',
'tux-message-filter-optional-messages-label' = 'A label for a
checkbox. Checking the box causes message editor to show optional messages.',
+ 'tux-proofread-translated-by-self' = 'A small notification that
appears in a proofreading box, saying that that message was translated by the
current user.
+$1 is the username, which can be used for GENDER.',
'tux-empty-list-all' = '{{Tuxspec|7}} This is a heading.',
'tux-empty-list-all-guide' = '{{Tuxspec|7}} This is a secondary guide
text.',
'tux-empty-list-translated' = '{{Tuxspec|7}} This is a heading.',
@@ -12030,6 +12033,7 @@
'tux-message-filter-result' = 'Found $1 {{PLURAL:$1|נמצאה תוצאה
אחת|נמצאו $1 תוצאות}} עבור $2',
'tux-message-filter-advanced-button' = 'חיפוש מתקדם',
'tux-message-filter-optional-messages-label' = 'הודעות אופציונליות',
+ 'tux-proofread-translated-by-self' = '{{GENDER:$1|אתה|את}} תרגמת את
זה',
'tux-empty-list-all' = 'קבוצת ההודעות הזאת ריקה',
'tux-empty-list-all-guide' = 'נא לבחור קבוצת הודעות אחרת לתרגום',
'tux-empty-list-translated' = 'אין הודעות מתורגמות',
diff --git a/Translate.php b/Translate.php
index ebc809a..8e66e66 100644
--- a/Translate.php
+++ b/Translate.php
@@ -289,6 +289,7 @@
'translate-edit-askpermission',
'tux-editor-outdated-warning',
'tux-editor-outdated-warning-diff-link',
+ 'tux-proofread-translated-by-self',
'tux-editor-close-tooltip',
'tux-editor-expand-tooltip',
'tux-editor-collapse-tooltip',
diff --git a/resources/css/ext.translate.proofread.css
b/resources/css/ext.translate.proofread.css
index d97aa49..0ab62db 100644
--- a/resources/css/ext.translate.proofread.css
+++ b/resources/css/ext.translate.proofread.css
@@ -54,6 +54,13 @@
right: -5px;
}
+.translated-by-self {
+ float: right;
+ text-align: right;
+ font-size: x-small;
+ margin-right: 5px;
+}
+
.tux-proofread-status {
top: -10px;
}
diff --git a/resources/images/user-small.png b/resources/images/user-small.png
new file mode 100644
index 000..f05b202
--- /dev/null
+++ b/resources/images/user-small.png
Binary files differ
diff --git a/resources/images/user-small.svg b/resources/images/user-small.svg
new file mode 100644
index 000..082d047
--- /dev/null
+++ b/resources/images/user-small.svg
@@ -0,0 +1,9 @@
+?xml version=1.0 encoding=UTF-8?
+!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) --
+!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
+svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg;
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px width=15px
height=15px viewBox=0 0 15 15 enable-background=new 0 0 15 15
xml:space=preserve
+g
+ path fill=#D1D3D4
d=M12.281,4.776c0,2.639-2.142,4.783-4.78,4.783c-2.64,0-4.779-2.144-4.779-4.783
C2.722,2.138,4.861,0,7.501,0C10.14,0,12.281,2.138,12.281,4.776z/
+ path fill=#D1D3D4
d=M13.36,8.609h-0.947c-1.031,1.625-2.844,2.707-4.912,2.707c-2.068,0-3.883-1.082-4.914-2.707H1.645
c-0.445,0-0.799,0.358-0.799,0.801v4.795C0.846,14.641,1.199,15,1.645,15H13.36c0.44,0,0.794-0.359,0.794-0.795V9.41
C14.154,8.968,13.801,8.609,13.36,8.609z/
+/g
+/svg
\ No newline at end of file
diff --git
[MediaWiki-commits] [Gerrit] show OpenID icons also in the table of associated OpenIDs in... - change (mediawiki...OpenID)
Wikinaut has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53136
Change subject: show OpenID icons also in the table of associated OpenIDs in
OpenID preferences
..
show OpenID icons also in the table of associated OpenIDs in OpenID preferences
version 3.05 20130311
Change-Id: Ib169a06a609b6df884a26792b8695e228f859d19
---
M CHANGES
M OpenID.hooks.php
M OpenID.php
3 files changed, 7 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenID
refs/changes/36/53136/2
diff --git a/CHANGES b/CHANGES
index 7e7aa7e..44dca24 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
CHANGES
===
+3.05 20130311 show OpenID icons also in the table of associated OpenIDs in
OpenID preferences
3.04 20130310 fix bug45323 add deletion of trusted sites to OpenID
Preferences
3.03 20130310 fix bug45928 change deprecated wgAllowRealName to
wgHiddenPrefs checks
3.02 20130309 when used as Provider, show the own OpenID in OpenID
preference tab
diff --git a/OpenID.hooks.php b/OpenID.hooks.php
index bc459cc..df100db 100644
--- a/OpenID.hooks.php
+++ b/OpenID.hooks.php
@@ -128,7 +128,10 @@
* @return string
*/
private static function getAssociatedOpenIDsTable( $user ) {
- global $wgLang;
+ global $wgLang, $wgOpenIDLoginLogoUrl;
+
+ $openIDLogo = Xml::element( 'img', array( 'src' =
$wgOpenIDLoginLogoUrl, 'alt' = 'OpenID' ), '' );
+
$openid_urls_registration =
SpecialOpenID::getUserOpenIDInformation( $user );
$delTitle = SpecialPage::getTitleFor( 'OpenIDConvert', 'Delete'
);
@@ -150,7 +153,7 @@
$rows .= Xml::tags( 'tr', array(),
Xml::tags( 'td',
array(),
- Xml::element( 'a', array( 'href' =
$url_reg-uoi_openid ), $url_reg-uoi_openid )
+ $openIDLogo . nbsp; . Xml::element(
'a', array( 'href' = $url_reg-uoi_openid ), $url_reg-uoi_openid )
) .
Xml::tags( 'td',
array(),
diff --git a/OpenID.php b/OpenID.php
index 827d2cd..2435e78 100644
--- a/OpenID.php
+++ b/OpenID.php
@@ -29,7 +29,7 @@
exit( 1 );
}
-define( 'MEDIAWIKI_OPENID_VERSION', '3.04 20130310' );
+define( 'MEDIAWIKI_OPENID_VERSION', '3.05 20130311' );
$path = dirname( __FILE__ );
set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR .
get_include_path() );
--
To view, visit https://gerrit.wikimedia.org/r/53136
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib169a06a609b6df884a26792b8695e228f859d19
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/OpenID
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] show OpenID icons also in the table of associated OpenIDs in... - change (mediawiki...OpenID)
Wikinaut has submitted this change and it was merged.
Change subject: show OpenID icons also in the table of associated OpenIDs in
OpenID preferences
..
show OpenID icons also in the table of associated OpenIDs in OpenID preferences
version 3.05 20130311
Change-Id: Ib169a06a609b6df884a26792b8695e228f859d19
---
M CHANGES
M OpenID.hooks.php
M OpenID.php
3 files changed, 7 insertions(+), 3 deletions(-)
Approvals:
Wikinaut: Verified; Looks good to me, approved
diff --git a/CHANGES b/CHANGES
index 7e7aa7e..44dca24 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
CHANGES
===
+3.05 20130311 show OpenID icons also in the table of associated OpenIDs in
OpenID preferences
3.04 20130310 fix bug45323 add deletion of trusted sites to OpenID
Preferences
3.03 20130310 fix bug45928 change deprecated wgAllowRealName to
wgHiddenPrefs checks
3.02 20130309 when used as Provider, show the own OpenID in OpenID
preference tab
diff --git a/OpenID.hooks.php b/OpenID.hooks.php
index bc459cc..df100db 100644
--- a/OpenID.hooks.php
+++ b/OpenID.hooks.php
@@ -128,7 +128,10 @@
* @return string
*/
private static function getAssociatedOpenIDsTable( $user ) {
- global $wgLang;
+ global $wgLang, $wgOpenIDLoginLogoUrl;
+
+ $openIDLogo = Xml::element( 'img', array( 'src' =
$wgOpenIDLoginLogoUrl, 'alt' = 'OpenID' ), '' );
+
$openid_urls_registration =
SpecialOpenID::getUserOpenIDInformation( $user );
$delTitle = SpecialPage::getTitleFor( 'OpenIDConvert', 'Delete'
);
@@ -150,7 +153,7 @@
$rows .= Xml::tags( 'tr', array(),
Xml::tags( 'td',
array(),
- Xml::element( 'a', array( 'href' =
$url_reg-uoi_openid ), $url_reg-uoi_openid )
+ $openIDLogo . nbsp; . Xml::element(
'a', array( 'href' = $url_reg-uoi_openid ), $url_reg-uoi_openid )
) .
Xml::tags( 'td',
array(),
diff --git a/OpenID.php b/OpenID.php
index 827d2cd..2435e78 100644
--- a/OpenID.php
+++ b/OpenID.php
@@ -29,7 +29,7 @@
exit( 1 );
}
-define( 'MEDIAWIKI_OPENID_VERSION', '3.04 20130310' );
+define( 'MEDIAWIKI_OPENID_VERSION', '3.05 20130311' );
$path = dirname( __FILE__ );
set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR .
get_include_path() );
--
To view, visit https://gerrit.wikimedia.org/r/53136
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib169a06a609b6df884a26792b8695e228f859d19
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/OpenID
Gerrit-Branch: master
Gerrit-Owner: Wikinaut m...@tgries.de
Gerrit-Reviewer: Wikinaut m...@tgries.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [OpenID] Fix message key - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/53138 Change subject: [OpenID] Fix message key .. [OpenID] Fix message key Spotted by Shirayuki https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Openid-urls-url/en Change-Id: I6936babbe6bf68fb372cbd3290db9a1ec8ec0085 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/38/53138/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 126a245..67cbeda 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -858,7 +858,7 @@ Open ID aliasfile = OpenID/OpenID.alias.php -optional = prefs-openid, Openid-urls-url,openid-urls-registration-date-time +optional = prefs-openid, openid-urls-url, openid-urls-registration-date-time Open Graph Meta magicfile = OpenGraphMeta/OpenGraphMeta.magic.php -- To view, visit https://gerrit.wikimedia.org/r/53138 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6936babbe6bf68fb372cbd3290db9a1ec8ec0085 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [OpenID] Fix message key - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [OpenID] Fix message key .. [OpenID] Fix message key Spotted by Shirayuki https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Openid-urls-url/en Change-Id: I6936babbe6bf68fb372cbd3290db9a1ec8ec0085 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 126a245..67cbeda 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -858,7 +858,7 @@ Open ID aliasfile = OpenID/OpenID.alias.php -optional = prefs-openid, Openid-urls-url,openid-urls-registration-date-time +optional = prefs-openid, openid-urls-url, openid-urls-registration-date-time Open Graph Meta magicfile = OpenGraphMeta/OpenGraphMeta.magic.php -- To view, visit https://gerrit.wikimedia.org/r/53138 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6936babbe6bf68fb372cbd3290db9a1ec8ec0085 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 42712) Show video position hovering over playhead - change (mediawiki...TimedMediaHandler)
J has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53139
Change subject: (bug 42712) Show video position hovering over playhead
..
(bug 42712) Show video position hovering over playhead
Change-Id: I0218658c0a658c97495de46829a57de75fe6c025
---
M MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
1 file changed, 14 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/39/53139/1
diff --git
a/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
b/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
index c2ec2c9..0e08d61 100644
--- a/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
+++ b/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
@@ -2656,6 +2656,20 @@
.addClass( ui-state-highlight
ui-corner-all mw_buffer)
);
+ // Show video timeline position on hover and
when dragging playhead
+ function showPosition(event) {
+ var pos = ( event.clientX -
$playHead.offset().left ) / $playHead.width();
+ var time = mw.seconds2npt( parseFloat(
embedPlayer.getDuration() ) * pos + (embedPlayer.startTimeSec || 0) );
+ $playHead.attr('title', time);
+ }
+ $playHead.on({
+ mouseenter: showPosition,
+ mouseleave: function(event) {
+ $playHead.attr({title: ''});
+ },
+ mousemove: showPosition
+ });
+
return $playHead;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/53139
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0218658c0a658c97495de46829a57de75fe6c025
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: J jger...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45978) Correct case of Special:Userrights' canonical name - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45978) Correct case of Special:Userrights' canonical name
..
(bug 45978) Correct case of Special:Userrights' canonical name
Fix for I50796216 (17e17ba).
The error is PHP Notice: Found alias defined for Userrights when
searching for special page aliases for UserRights. Case mismatch?
Bug: 45978
Change-Id: Ib82bd38d0229af7571f2ab3c0470fa0f0384b635
---
M includes/SkinTemplate.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index a7e567c..c8c0fe5 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1246,7 +1246,7 @@
$sur = new UserrightsPage;
if ( $sur-userCanExecute( $this-getUser() ) ) {
$nav_urls['userrights'] = array(
- 'href' = self::makeSpecialUrlSubpage(
'UserRights', $rootUser )
+ 'href' = self::makeSpecialUrlSubpage(
'Userrights', $rootUser )
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/53134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib82bd38d0229af7571f2ab3c0470fa0f0384b635
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IAlex ialex.w...@gmail.com
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: devunt dev...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update jquery.ime from upstream - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Update jquery.ime from upstream
..
Update jquery.ime from upstream
* Fixes bug 44992
* Improvements to click event handling
Change-Id: I2146340051b937cb51e7f296fd947262c781d712
---
M lib/jquery.ime/jquery.ime.js
1 file changed, 18 insertions(+), 11 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js
index 40e4ed3..1cba5eb 100644
--- a/lib/jquery.ime/jquery.ime.js
+++ b/lib/jquery.ime/jquery.ime.js
@@ -1,4 +1,4 @@
-/*! jquery.ime - v0.1.0 - 2013-03-06
+/*! jquery.ime - v0.1.0 - 2013-03-11
* https://github.com/wikimedia/jquery.ime
* Copyright (c) 2013 Santhosh Thottingal; Licensed GPL, MIT */
( function ( $ ) {
@@ -536,8 +536,9 @@
},
focus: function () {
- // Hide all other IME settings
+ // Hide all other IME settings and collapse open menus
$( 'div.imeselector' ).hide();
+ $( 'div.imeselector-menu' ).removeClass( 'open' );
this.$imeSetting.show();
this.resetTimer();
},
@@ -555,16 +556,24 @@
return false;
},
+ toggle: function () {
+ if ( this.$menu.hasClass( 'open' ) ) {
+ this.hide();
+ } else {
+ this.show();
+ }
+ },
+
/**
* Bind the events and listen
*/
listen: function () {
var imeselector = this;
- $( 'html' ).on( 'click.ime', function () {
- imeselector.hide();
- if ( imeselector.$element.is( ':hidden' ) ) {
- imeselector.$imeSetting.hide();
+ imeselector.$imeSetting.on( 'click.ime', function ( e )
{
+ var t = $( e.target );
+ if ( t.hasClass( 'imeselector-toggle' ) ) {
+ imeselector.toggle();
}
} );
@@ -604,8 +613,6 @@
e.stopPropagation();
e.preventDefault();
} );
-
- imeselector.$imeSetting.on( 'click.ime', $.proxy(
this.show, this ) );
imeselector.$element.on( 'focus.ime', function ( e ) {
imeselector.selectLanguage(
imeselector.decideLanguage() );
@@ -667,7 +674,7 @@
- this.$imeSetting.outerWidth();
room = $( window ).height() - top;
if ( room this.$imeSetting.outerHeight() ) {
- top = top - this.$imeSetting.outerHeight();
+ top = position.top -
this.$imeSetting.outerHeight();
this.$menu.css( 'top',
- (
this.$menu.outerHeight() +
@@ -927,9 +934,9 @@
);
}
- var selectorTemplate = 'div class=imeselector'
+ var selectorTemplate = 'div class=imeselector imeselector-toggle'
+ 'a class=ime-name imeselector-toggle href=#/a'
- + 'b class=ime-setting-caret/b/div',
+ + 'b class=ime-setting-caret imeselector-toggle/b/div',
MutationObserver = window.MutationObserver ||
window.WebKitMutationObserver
|| window.MozMutationObserver;
--
To view, visit https://gerrit.wikimedia.org/r/52777
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2146340051b937cb51e7f296fd947262c781d712
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Eloquence e...@wikimedia.org
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (Bug 45423) Add Loading... while translation helpers are l... - change (mediawiki...Translate)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53140
Change subject: (Bug 45423) Add Loading... while translation helpers are
loading
..
(Bug 45423) Add Loading... while translation helpers are loading
Instead of adding the 'Loading...' text, I am using the rotating spin
used in other parts of extension to indicate loading
Change-Id: I3ee5e3db3641afa51357fcf9b7d301e3042a47d0
---
M resources/js/ext.translate.editor.helpers.js
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/40/53140/1
diff --git a/resources/js/ext.translate.editor.helpers.js
b/resources/js/ext.translate.editor.helpers.js
index 924d182..c1cc7ad 100644
--- a/resources/js/ext.translate.editor.helpers.js
+++ b/resources/js/ext.translate.editor.helpers.js
@@ -397,11 +397,15 @@
var translateEditor = this,
api = new mw.Api();
+ translateEditor.$editor.find( '.infocolumn' )
+ .addClass( 'tux-loading-indicator' );
api.get( {
action: 'translationaids',
title: this.message.title,
format: 'json'
} ).done( function ( result ) {
+ translateEditor.$editor.find( '.infocolumn' )
+ .removeClass( 'tux-loading-indicator' );
if ( !result.helpers ) {
mw.log( 'API did not return any
translation helpers.' );
return false;
--
To view, visit https://gerrit.wikimedia.org/r/53140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ee5e3db3641afa51357fcf9b7d301e3042a47d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Consistent permissions for all the images - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged. Change subject: Consistent permissions for all the images .. Consistent permissions for all the images Some images had rwxrwxr-x permissions. Set everything to rw-rw-r--. Change-Id: Id02641d00cc2661413dad7f75e8e2158258c39ff --- M resources/images/check-sprite.svg M resources/images/edit-mark.svg M resources/images/outdated.svg M resources/images/translate.svg 4 files changed, 0 insertions(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/images/check-sprite.svg b/resources/images/check-sprite.svg old mode 100755 new mode 100644 diff --git a/resources/images/edit-mark.svg b/resources/images/edit-mark.svg old mode 100755 new mode 100644 diff --git a/resources/images/outdated.svg b/resources/images/outdated.svg old mode 100755 new mode 100644 diff --git a/resources/images/translate.svg b/resources/images/translate.svg old mode 100755 new mode 100644 -- To view, visit https://gerrit.wikimedia.org/r/53040 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id02641d00cc2661413dad7f75e8e2158258c39ff Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix deprecated User:edittoken() to getEditToken() method - change (mediawiki...OpenID)
Wikinaut has uploaded a new change for review. https://gerrit.wikimedia.org/r/53141 Change subject: fix deprecated User:edittoken() to getEditToken() method .. fix deprecated User:edittoken() to getEditToken() method Change-Id: Ib7629c8e631478f9581cf65a0999daaff0c13690 --- M SpecialOpenIDConvert.body.php M SpecialOpenIDServer.body.php 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenID refs/changes/41/53141/1 diff --git a/SpecialOpenIDConvert.body.php b/SpecialOpenIDConvert.body.php index a786bfd..53577b9 100644 --- a/SpecialOpenIDConvert.body.php +++ b/SpecialOpenIDConvert.body.php @@ -223,7 +223,7 @@ ) . Xml::submitButton( wfMessage( 'openiddelete-button' )-text() ) . \n . Html::Hidden( 'url', $openid ) . \n . - Html::Hidden( 'wpEditToken', $wgUser-editToken( $openid ) ) . \n . + Html::Hidden( 'wpEditToken', $wgUser-getEditToken( $openid ) ) . \n . Xml::closeElement( 'form' ) ); } diff --git a/SpecialOpenIDServer.body.php b/SpecialOpenIDServer.body.php index adf588f..1e9cec4 100644 --- a/SpecialOpenIDServer.body.php +++ b/SpecialOpenIDServer.body.php @@ -611,7 +611,7 @@ ) . Xml::submitButton( wfMessage( 'openid-trusted-sites-delete-confirmation-button-text' )-text() ) . \n . Html::Hidden( 'url', $trustedSiteToBeDeleted ) . \n . - Html::Hidden( 'wpEditToken', $wgUser-editToken( $trustedSiteToBeDeleted ) ) . \n . + Html::Hidden( 'wpEditToken', $wgUser-getEditToken( $trustedSiteToBeDeleted ) ) . \n . Xml::closeElement( 'form' ) ); } -- To view, visit https://gerrit.wikimedia.org/r/53141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7629c8e631478f9581cf65a0999daaff0c13690 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OpenID Gerrit-Branch: master Gerrit-Owner: Wikinaut m...@tgries.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix deprecated User:edittoken() to getEditToken() method - change (mediawiki...OpenID)
Wikinaut has submitted this change and it was merged. Change subject: fix deprecated User:edittoken() to getEditToken() method .. fix deprecated User:edittoken() to getEditToken() method Change-Id: Ib7629c8e631478f9581cf65a0999daaff0c13690 --- M SpecialOpenIDConvert.body.php M SpecialOpenIDServer.body.php 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Wikinaut: Verified; Looks good to me, approved diff --git a/SpecialOpenIDConvert.body.php b/SpecialOpenIDConvert.body.php index a786bfd..53577b9 100644 --- a/SpecialOpenIDConvert.body.php +++ b/SpecialOpenIDConvert.body.php @@ -223,7 +223,7 @@ ) . Xml::submitButton( wfMessage( 'openiddelete-button' )-text() ) . \n . Html::Hidden( 'url', $openid ) . \n . - Html::Hidden( 'wpEditToken', $wgUser-editToken( $openid ) ) . \n . + Html::Hidden( 'wpEditToken', $wgUser-getEditToken( $openid ) ) . \n . Xml::closeElement( 'form' ) ); } diff --git a/SpecialOpenIDServer.body.php b/SpecialOpenIDServer.body.php index adf588f..1e9cec4 100644 --- a/SpecialOpenIDServer.body.php +++ b/SpecialOpenIDServer.body.php @@ -611,7 +611,7 @@ ) . Xml::submitButton( wfMessage( 'openid-trusted-sites-delete-confirmation-button-text' )-text() ) . \n . Html::Hidden( 'url', $trustedSiteToBeDeleted ) . \n . - Html::Hidden( 'wpEditToken', $wgUser-editToken( $trustedSiteToBeDeleted ) ) . \n . + Html::Hidden( 'wpEditToken', $wgUser-getEditToken( $trustedSiteToBeDeleted ) ) . \n . Xml::closeElement( 'form' ) ); } -- To view, visit https://gerrit.wikimedia.org/r/53141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib7629c8e631478f9581cf65a0999daaff0c13690 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OpenID Gerrit-Branch: master Gerrit-Owner: Wikinaut m...@tgries.de Gerrit-Reviewer: Wikinaut m...@tgries.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [CharRangeSpan] Register extension - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/53142 Change subject: [CharRangeSpan] Register extension .. [CharRangeSpan] Register extension Change-Id: I68bad9d0adeceab76d7abdb37d3407719b7b9020 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/42/53142/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 67cbeda..9720945 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -138,6 +138,8 @@ Char Insert #magicfile = CharInsert/CharInsert.i18n.magic.php +Char Range Span + Checkpoint Check User -- To view, visit https://gerrit.wikimedia.org/r/53142 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68bad9d0adeceab76d7abdb37d3407719b7b9020 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [CharRangeSpan] Register extension - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [CharRangeSpan] Register extension .. [CharRangeSpan] Register extension Change-Id: I68bad9d0adeceab76d7abdb37d3407719b7b9020 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 67cbeda..9720945 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -138,6 +138,8 @@ Char Insert #magicfile = CharInsert/CharInsert.i18n.magic.php +Char Range Span + Checkpoint Check User -- To view, visit https://gerrit.wikimedia.org/r/53142 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I68bad9d0adeceab76d7abdb37d3407719b7b9020 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (Bug 45433) - Floating/sticking headers/footers should be ad... - change (mediawiki...Translate)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53143
Change subject: (Bug 45433) - Floating/sticking headers/footers should be
adjusted when filtering
..
(Bug 45433) - Floating/sticking headers/footers should be adjusted when
filtering
Change-Id: I2a2f797d51e755ea302a9f586f80ebe41d5d8108
---
M resources/js/ext.translate.messagetable.js
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/43/53143/1
diff --git a/resources/js/ext.translate.messagetable.js
b/resources/js/ext.translate.messagetable.js
index 3e4d226..62c7781 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -317,6 +317,10 @@
} );
$( '.tux-message-filter-box-clear'
).removeClass( 'hide' );
}
+
+ // Trigger a scroll event for the window to make sure
all floating toolbars
+ // are in their position.
+ $( window ).trigger( 'scroll' );
},
resize: function () {
--
To view, visit https://gerrit.wikimedia.org/r/53143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a2f797d51e755ea302a9f586f80ebe41d5d8108
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [GettingStarted] Ignore empty messages - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/53144 Change subject: [GettingStarted] Ignore empty messages .. [GettingStarted] Ignore empty messages Spotted by Toliño https://translatewiki.net/wiki/Thread:Translating_talk:MediaWiki/About_MediaWiki:Gettingstarted-task-1/en,_MediaWiki:Gettingstarted-task-2/en_and_MediaWiki:Gettingstarted-task-3/en Change-Id: Ib2c02fbf8826b02f985653f41123d6a95545af16 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/44/53144/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 9720945..8d60269 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -560,6 +560,8 @@ Getting Started aliasfile = GettingStarted/GettingStarted.alias.php +ignored = gettingstarted-msg +ignored = gettingstarted-task-1, gettingstarted-task-2, gettingstarted-task-3 Git 2 Pages -- To view, visit https://gerrit.wikimedia.org/r/53144 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2c02fbf8826b02f985653f41123d6a95545af16 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [GettingStarted] Ignore empty messages - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [GettingStarted] Ignore empty messages .. [GettingStarted] Ignore empty messages Spotted by Toliño https://translatewiki.net/wiki/Thread:Translating_talk:MediaWiki/About_MediaWiki:Gettingstarted-task-1/en,_MediaWiki:Gettingstarted-task-2/en_and_MediaWiki:Gettingstarted-task-3/en Change-Id: Ib2c02fbf8826b02f985653f41123d6a95545af16 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 9720945..8d60269 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -560,6 +560,8 @@ Getting Started aliasfile = GettingStarted/GettingStarted.alias.php +ignored = gettingstarted-msg +ignored = gettingstarted-task-1, gettingstarted-task-2, gettingstarted-task-3 Git 2 Pages -- To view, visit https://gerrit.wikimedia.org/r/53144 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib2c02fbf8826b02f985653f41123d6a95545af16 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] puppetized motd of bots project of labs - change (operations/puppet)
Petrb has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53145
Change subject: puppetized motd of bots project of labs
..
puppetized motd of bots project of labs
Change-Id: I6862c2b33500f05be1eff749eb29aa8a02d682df
---
A files/labs/bots/motd.tail
A manifests/labs/bots/bots.pp
2 files changed, 32 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/53145/1
diff --git a/files/labs/bots/motd.tail b/files/labs/bots/motd.tail
new file mode 100644
index 000..4bc263c
--- /dev/null
+++ b/files/labs/bots/motd.tail
@@ -0,0 +1,19 @@
+-
+ __
+ ( \_
+ |) ) ___ _| |_ ___
+ | __ ( / _ (_ _)/___)
+ | |__) ) |_| || |_|___ |
+ |__/ \___/ \__|___/
+ project
+-
+
+This is a server of bots project, the collaborative environment
+to run and operate bots for wikimedia project. In case you
+need a help, you can contact one of following sysadmins:
+
+Petrb (petan), Damian Zaremba (Damianz), Ryan Lane,
+Adam Shorland (addshore)
+
+Important: don't forget to run command log message after every
+ system change
diff --git a/manifests/labs/bots/bots.pp b/manifests/labs/bots/bots.pp
new file mode 100644
index 000..325cb03
--- /dev/null
+++ b/manifests/labs/bots/bots.pp
@@ -0,0 +1,13 @@
+# bots.pp
+
+class bots::motd {
+
+ file { /etc/motd.tail:
+ path = /etc/motd.tail,
+ owner = root,
+ group = root,
+ mode = 0440,
+ source = puppet:///files/labs/bots/motd.tail,
+ ensure = present;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/53145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6862c2b33500f05be1eff749eb29aa8a02d682df
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Petrb benap...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (Bug 45434) - [TUX] Unclear filtering completion status - change (mediawiki...Translate)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53146
Change subject: (Bug 45434) - [TUX] Unclear filtering completion status
..
(Bug 45434) - [TUX] Unclear filtering completion status
Change-Id: Ica2f9b1ddbf38a1d5b2d2b05a23f7922dd33197a
---
M resources/js/ext.translate.messagetable.js
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/46/53146/1
diff --git a/resources/js/ext.translate.messagetable.js
b/resources/js/ext.translate.messagetable.js
index 3e4d226..47c6f0d 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -317,6 +317,8 @@
} );
$( '.tux-message-filter-box-clear'
).removeClass( 'hide' );
}
+
+ this.$loader.trigger( 'appear' );
},
resize: function () {
--
To view, visit https://gerrit.wikimedia.org/r/53146
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica2f9b1ddbf38a1d5b2d2b05a23f7922dd33197a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduce size of SVG images - change (mediawiki...Translate)
Pginer has uploaded a new change for review. https://gerrit.wikimedia.org/r/53148 Change subject: Reduce size of SVG images .. Reduce size of SVG images Vector image assets have been reduced in size by simplifying the internal markup without affecting the visuals. Grouping of elements and noise introduced by graphic editors have been removed Change-Id: I79ec7a339852967e8430747103fcc54135135d4a --- M resources/images/check-sprite.svg M resources/images/close.svg M resources/images/contract-ltr.svg M resources/images/contract-rtl.svg M resources/images/edit-mark.svg M resources/images/expand-ltr.svg M resources/images/expand-rtl.svg M resources/images/label-clock.svg M resources/images/label-flag.svg M resources/images/label-page-tick.svg M resources/images/label-page.svg M resources/images/label-pen.svg M resources/images/label-tick.svg M resources/images/outdated.svg M resources/images/project.svg M resources/images/search.svg M resources/images/translate.svg M resources/images/view-list-hi.svg M resources/images/view-list.svg M resources/images/view-page-hi.svg M resources/images/view-page.svg M resources/images/view-proofread-hi.svg M resources/images/view-proofread.svg 23 files changed, 489 insertions(+), 220,079 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/48/53148/1 -- To view, visit https://gerrit.wikimedia.org/r/53148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I79ec7a339852967e8430747103fcc54135135d4a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Pginer pgi...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix spelling of Overridden. Per http://translatewiki.net/w... - change (mediawiki...SemanticMaps)
Shirayuki has uploaded a new change for review. https://gerrit.wikimedia.org/r/53149 Change subject: Fix spelling of Overridden. Per http://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Semanticmaps-kml-text/en_(5) .. Fix spelling of Overridden. Per http://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Semanticmaps-kml-text/en_(5) Change-Id: I0bd6f945bde20afb5e0cfa7efeb60c646bc994c4 --- M SemanticMaps.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMaps refs/changes/49/53149/1 diff --git a/SemanticMaps.i18n.php b/SemanticMaps.i18n.php index 9544e13..33109fb 100644 --- a/SemanticMaps.i18n.php +++ b/SemanticMaps.i18n.php @@ -47,7 +47,7 @@ 'semanticmaps-par-geocodecontrol' = 'Show the geocoding control.', - 'semanticmaps-kml-text' = 'The text associated with each page. Overriden by the additional queried properties if any.', + 'semanticmaps-kml-text' = 'The text associated with each page. Overridden by the additional queried properties if any.', 'semanticmaps-kml-title' = 'The default title for results', 'semanticmaps-kml-linkabsolute' = 'Should links be absolute (as opposed to relative)', 'semanticmaps-kml-pagelinktext' = 'The text to use for the links to the page, in which $1 will be replaced by the page title', -- To view, visit https://gerrit.wikimedia.org/r/53149 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0bd6f945bde20afb5e0cfa7efeb60c646bc994c4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticMaps Gerrit-Branch: master Gerrit-Owner: Shirayuki shirayuk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Triggering remove event in the edittoolbar widget - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53151
Change subject: Triggering remove event in the edittoolbar widget
..
Triggering remove event in the edittoolbar widget
If the widget interacting with the edittoolbar widget does not feature a
remove method,
the edittoolbar will trigger a remove event. Consequently, there is no need
to implement
a remove method in the interaction widget.
Change-Id: I4194df1cd2380364597d939686dfcc8eae7f0b61
---
M lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/51/53151/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
b/lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
index a0e13a1..9a40864 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
@@ -117,8 +117,7 @@
this.toolbar = new wb.ui.Toolbar();
this.editGroup = new wb.ui.Toolbar.EditGroup( {
- displayRemoveButton:
- ( this.options.enableRemove
$.isFunction( this._interactionWidget.remove ) )
+ displayRemoveButton: this.options.enableRemove
} );
this.toolbar.addElement( this.editGroup );
@@ -142,7 +141,11 @@
this.editGroup.on( 'remove', function( e ) {
e.preventDefault(); // Prevent
auto-transforming toolbar to non-edit mode.
self.toggleActionMessage( { message:
'wikibase-remove-inprogress' } );
- self._interactionWidget.remove();
+ if ( $.isFunction(
self._interactionWidget.remove ) ) {
+ self._interactionWidget.remove();
+ } else {
+ self._interactionWidget._trigger(
'remove' );
+ }
} );
var prefix = this._interactionWidget.widgetEventPrefix;
--
To view, visit https://gerrit.wikimedia.org/r/53151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4194df1cd2380364597d939686dfcc8eae7f0b61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45159) Splitting snaklistview from referenceview - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53152
Change subject: (bug 45159) Splitting snaklistview from referenceview
..
(bug 45159) Splitting snaklistview from referenceview
This change set separates the responsibilities of the snaklistview widget from
the ones
of the referenceviewwidget. Now, the snaklistview is actually manages just a
list of snaks
while the referenceview just adds some additional functionality regarding the
handling of
references. Furthermore, the statementview manages removing the referenceviews.
Change-Id: Id677e6a6387661f00945d6b5dcaa8603705530cb
---
M lib/resources/Resources.php
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
4 files changed, 221 insertions(+), 196 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/52/53152/1
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index e9489ab..b919fc2 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -463,6 +463,7 @@
),
'dependencies' = array(
'jquery.wikibase.snakview',
+ 'wikibase.utilities',
),
'messages' = array(
'wikibase-claimview-snak-tooltip',
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index 946b967..f0bf43d 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -21,9 +21,19 @@
widgetBaseClass: 'wb-referenceview',
/**
-* @see jQuery.claimview._create
+* Reference object represented by this view.
+* @type {wb.Reference}
+*/
+ _reference: null,
+
+ /**
+* @see jQuery.wikibase.snaklistview._create
*/
_create: function() {
+ if ( this.option( 'value' ) ) {
+ this._reference = this.option( 'value' );
+ this.option( 'value', this._reference.getSnaks() );
+ }
PARENT.prototype._create.call( this );
this._updateReferenceHashClass( this.value() );
},
@@ -46,30 +56,43 @@
},
/**
-* Returns the current reference represented by the view. In case of an
empty reference view,
-* without any snak values set yet, null will be returned.
+* Sets/Returns the current reference represented by the view. In case
of an empty reference
+* view, without any snak values set yet, null will be returned.
+* @see jQuery.wikibase.snaklistview.value
* @since 0.4
*
+* @param {wb.Reference} [reference] New reference to be set
* @return {wb.Reference|null}
*/
- value: function() {
- var self = this,
- snaks = [];
-
- $.each( this._listview.items(), function( i, item ) {
- var liInstance =
self._listview.listItemAdapter().liInstance( $( item ) );
- if ( liInstance.snak() ) {
- snaks.push( liInstance.snak() );
+ value: function( reference ) {
+ if ( reference ) {
+ if ( !( value instanceof wb.Reference ) ) {
+ throw new Error( 'Value has to be an instance
of wikibase.Reference' );
}
- } );
-
- if ( this._reference ) {
- return new wb.Reference( snaks,
this._reference.getHash() );
- } else if ( snaks.length 0 ) {
- return new wb.Reference( snaks );
+ this._reference = reference;
+ return this._reference;
} else {
- return null;
+ var snakList = PARENT.prototype.value.call( this );
+
+ if ( this._reference ) {
+ return new wb.Reference( snakList,
this._reference.getHash() );
+ } else if ( snakList ) {
+ return new wb.Reference( snakList );
+ } else {
+ return null;
+ }
}
+ },
+
+ /**
+* Forwards to _saveReferenceApiCall implementing the abstract method of
+* jquery.wikibase.snaklistview.
+* @see jQuery.wikibase.snaklistview._saveSnakList
+*
+* @return {jQuery.promise}
+*/
+
[MediaWiki-commits] [Gerrit] (bug 45159) Enabling multiple snaks per reference - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53153
Change subject: (bug 45159) Enabling multiple snaks per reference
..
(bug 45159) Enabling multiple snaks per reference
With this change set, it is possible to specify multiple snaks per reference
with the
first snak being some kind of main snak. Removing it will remove the whole
reference.
Change-Id: I488eb71028d209973b6397b1b20ad05eba83c80f
---
M lib/resources/Resources.php
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M lib/resources/wikibase.css
6 files changed, 222 insertions(+), 48 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/53/53153/1
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index b919fc2..44ab2ab 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -462,7 +462,9 @@
'jquery.wikibase/jquery.wikibase.snaklistview.js',
),
'dependencies' = array(
+ 'jquery.wikibase.listview',
'jquery.wikibase.snakview',
+ 'jquery.wikibase.toolbarcontroller',
'wikibase.utilities',
),
'messages' = array(
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index 0767b63..9ff07ac 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -74,12 +74,18 @@
return function( event, origin ) {
// TODO: at some point, this should rather
disable/enable the widgets for editing,
// there could be other ways for entering
edit mode than using the toolbar!
+
+ var originToolbars = ( origin ) ? $( origin
).find( '.wb-ui-toolbar' ) : null;
+
// find and disable/enable all toolbars in this
edit view except,...
self.element.find( '.wb-ui-toolbar' ).each(
function() {
var $toolbar = $( this ),
toolbar = $toolbar.data(
'wb-toolbar' );
- // ... don't disable toolbar if it has
an edit group which is in edit mode!
- if( $toolbar.children(
'.wb-ui-toolbar-editgroup-ineditmode' ).length === 0
+ // ... don't disable toolbar if it has
an edit group which is in edit mode
+ // or if the toolbar is a sub-element
of the origin.
+ if (
+ $toolbar.children(
'.wb-ui-toolbar-editgroup-ineditmode' ).length === 0
+( !originToolbars ||
$.inArray( this, originToolbars ) === -1 )
// Checking if toolbar is
defined is done for the purpose of debugging only;
// Toolbar may only be
undefined under some weird circumstances, e.g. when
// doing $( 'body' ).empty()
for debugging.
@@ -101,18 +107,18 @@
// TODO: this should rather listen to 'valueviewstartediting'
once implemented!
$( this.element )
.on( 'statementviewafterstartediting
referenceviewafterstartediting', function( event ) {
- $( wb ).trigger( 'startItemPageEditMode' );
+ $( wb ).trigger( 'startItemPageEditMode',
[event.target] );
} )
.on( 'snakviewstopediting', function( event, dropValue ) {
// snak view got already removed from the DOM on
snakviewafterstopediting
if ( dropValue ) {
- $( wb ).trigger( 'stopItemPageEditMode' );
+ $( wb ).trigger( 'stopItemPageEditMode',
[event.target] );
}
} )
.on( 'statementviewafterstopediting statementviewafterremove '
+ 'referenceviewafterstopediting
referenceviewafterremove',
function( event ) {
- $( wb ).trigger( 'stopItemPageEditMode' );
+ $( wb ).trigger(
[MediaWiki-commits] [Gerrit] (bug 45159) Separated toolbar for editing a reference's snaks - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53154
Change subject: (bug 45159) Separated toolbar for editing a reference's snaks
..
(bug 45159) Separated toolbar for editing a reference's snaks
Instead of having a simulated main snak, a toolbar above a reference's list of
snaks
will control starting/stopping edit mode for the reference's snaks.
Change-Id: I3b31dd7e240a779b2a036e43cc568d0ed3709c02
---
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
M lib/resources/templates.php
M lib/resources/wikibase.css
M selenium/lib/modules/reference_module.rb
5 files changed, 32 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/54/53154/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index 1e13478..0f318b5 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -21,14 +21,6 @@
widgetBaseClass: 'wb-referenceview',
/**
-* (Additional) default options.
-* @see jQuery.Widget.options
-*/
- options: {
- removeFirstSnak: false
- },
-
- /**
* Reference object represented by this view.
* @type {wb.Reference}
*/
@@ -85,7 +77,7 @@
var snakList = PARENT.prototype.value.call( this );
if ( this._reference ) {
- return new wb.Reference( snakList,
this._reference.getHash() );
+ return new wb.Reference( snakList || [],
this._reference.getHash() );
} else if ( snakList ) {
return new wb.Reference( snakList );
} else {
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
index 5371376..3906188 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
@@ -19,12 +19,6 @@
* set initially. If this is null, the view will start edit mode upon
initialization.
* Default: null
*
- * @option removeFirstSnak {boolean} Defines whether it should be possible to
remove the first snak
- * just like the other snaks by displaying a remove link next to the
snakview. If false,
- * there will be no remove link next to the first snak which allows
an other toolbar
- * to be diplayed in that location.
- * Default: true
- *
* @option helpMessage {string} End-user message explaining how to use the
snaklistview widget. The
* message is most likely to be used inside the tooltip of the toolbar
corresponding to
* the snaklistview.
@@ -74,7 +68,6 @@
'$listview': '.wb-snaklistview-listview'
},
value: null,
- removeFirstSnak: true,
helpMessage: mw.msg( 'wikibase-claimview-snak-new-tooltip' )
},
@@ -219,9 +212,7 @@
snakview.startEditing();
- if ( self.option( 'removeFirstSnak' ) || i 0
) {
- self._createRemoveToolbar( $( item ) );
- }
+ self._createRemoveToolbar( $( item ) );
} );
// Append add toolbar to add new snaks:
@@ -426,6 +417,10 @@
snakList = new wb.SnakList(),
isValid = true;
+ if ( this._listview.items().length === 0 ) {
+ return false;
+ }
+
$.each( this._listview.items(), function( i, item ) {
var snakview = self._lia.liInstance( $( item ) );
diff --git a/lib/resources/templates.php b/lib/resources/templates.php
index 8c379e6..e376e07 100644
--- a/lib/resources/templates.php
+++ b/lib/resources/templates.php
@@ -123,8 +123,10 @@
$templates['wb-snaklistview'] =
HTML
div class=wb-snaklistview
+ div class=wb-snaklistview-heading
+ div class=wb-snaklistview-toolbar$2/div !-- edit section
--
+ /div
div class=wb-snaklistview-listview$1/div !-- wb-listview --
- div class=wb-snaklistview-toolbar$2/div !-- edit section --
/div
HTML;
diff --git a/lib/resources/wikibase.css b/lib/resources/wikibase.css
index 25ade7f..a5c2cc8 100644
--- a/lib/resources/wikibase.css
+++ b/lib/resources/wikibase.css
@@ -628,10 +628,28 @@
.wb-referenceview {
position: relative;
-
[MediaWiki-commits] [Gerrit] Modifying desc: span is HTML tag. - change (mediawiki...CharRangeSpan)
Shirayuki has uploaded a new change for review. https://gerrit.wikimedia.org/r/53155 Change subject: Modifying desc: span is HTML tag. .. Modifying desc: span is HTML tag. Change-Id: Ib875f3f7e2deba0e5c194156108523c89cf71dc3 --- M CharRangeSpan.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CharRangeSpan refs/changes/55/53155/1 diff --git a/CharRangeSpan.i18n.php b/CharRangeSpan.i18n.php index d9f4dae..c242495 100644 --- a/CharRangeSpan.i18n.php +++ b/CharRangeSpan.i18n.php @@ -4,7 +4,7 @@ $messages = array(); $messages['en'] = array( - 'charrangespan-desc' = Wraps any characters in defined ranges within defined span tags, + 'charrangespan-desc' = 'Wraps any characters in defined ranges within defined codelt;spangt;/code tags', ); $messages['qqq'] = array( -- To view, visit https://gerrit.wikimedia.org/r/53155 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib875f3f7e2deba0e5c194156108523c89cf71dc3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CharRangeSpan Gerrit-Branch: master Gerrit-Owner: Shirayuki shirayuk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused argument in method call - change (mediawiki...Wikibase)
John Erling Blad has uploaded a new change for review. https://gerrit.wikimedia.org/r/53156 Change subject: Remove unused argument in method call .. Remove unused argument in method call Change-Id: I9d9615360212f865f7d3aada26af8cea6ea3e9f4 --- M repo/maintenance/pruneChanges.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/56/53156/1 diff --git a/repo/maintenance/pruneChanges.php b/repo/maintenance/pruneChanges.php index 40cbe98..9ee56b6 100644 --- a/repo/maintenance/pruneChanges.php +++ b/repo/maintenance/pruneChanges.php @@ -58,7 +58,7 @@ exit( 5 ); } - $this-pruneChanges( $numDays, $force ); + $this-pruneChanges( $numDays ); $this-output( date( 'H:i:s' ) . done, exiting\n ); unlink( $pidfile ); // delete lockfile on normal exit -- To view, visit https://gerrit.wikimedia.org/r/53156 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d9615360212f865f7d3aada26af8cea6ea3e9f4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: John Erling Blad john.b...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (Bug 45434) - [TUX] Unclear filtering completion status - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: (Bug 45434) - [TUX] Unclear filtering completion status
..
(Bug 45434) - [TUX] Unclear filtering completion status
Change-Id: Ica2f9b1ddbf38a1d5b2d2b05a23f7922dd33197a
---
M resources/js/ext.translate.messagetable.js
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.messagetable.js
b/resources/js/ext.translate.messagetable.js
index 3e4d226..47c6f0d 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -317,6 +317,8 @@
} );
$( '.tux-message-filter-box-clear'
).removeClass( 'hide' );
}
+
+ this.$loader.trigger( 'appear' );
},
resize: function () {
--
To view, visit https://gerrit.wikimedia.org/r/53146
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica2f9b1ddbf38a1d5b2d2b05a23f7922dd33197a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Pginer pgi...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduce size of SVG images - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged. Change subject: Reduce size of SVG images .. Reduce size of SVG images Vector image assets have been reduced in size by simplifying the internal markup without affecting the visuals. Grouping of elements and noise introduced by graphic editors have been removed Change-Id: I79ec7a339852967e8430747103fcc54135135d4a --- M resources/images/check-sprite.svg M resources/images/close.svg M resources/images/contract-ltr.svg M resources/images/contract-rtl.svg M resources/images/edit-mark.svg M resources/images/expand-ltr.svg M resources/images/expand-rtl.svg M resources/images/label-clock.svg M resources/images/label-flag.svg M resources/images/label-page-tick.svg M resources/images/label-page.svg M resources/images/label-pen.svg M resources/images/label-tick.svg M resources/images/outdated.svg M resources/images/project.svg M resources/images/search.svg M resources/images/translate.svg M resources/images/view-list-hi.svg M resources/images/view-list.svg M resources/images/view-page-hi.svg M resources/images/view-page.svg M resources/images/view-proofread-hi.svg M resources/images/view-proofread.svg 23 files changed, 489 insertions(+), 220,079 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/53148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I79ec7a339852967e8430747103fcc54135135d4a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Pginer pgi...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move misc::monitoring to where it belongs - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53157
Change subject: Move misc::monitoring to where it belongs
..
Move misc::monitoring to where it belongs
Change-Id: If17ba1cd469ac73171a78d572667d7e36f539971
---
M manifests/ganglia.pp
A manifests/misc/monitoring.pp
2 files changed, 28 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/53157/1
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 9d7cb23..7ecd212 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -533,31 +533,3 @@
}
}
-
-class misc::monitoring::htcp-loss {
- system_role { misc::monitoring::htcp-loss: description = HTCP
packet loss monitor }
-
- File {
- require = File[/usr/lib/ganglia/python_modules],
- notify = Service[gmond]
- }
-
- # Ganglia
- file {
- /usr/lib/ganglia/python_modules/htcpseqcheck.py:
- source =
puppet:///files/ganglia/plugins/htcpseqcheck.py;
- /usr/lib/ganglia/python_modules/htcpseqcheck_ganglia.py:
- source =
puppet:///files/ganglia/plugins/htcpseqcheck_ganglia.py;
- /usr/lib/ganglia/python_modules/util.py:
- source = puppet:///files/ganglia/plugins/util.py;
- /usr/lib/ganglia/python_modules/compat.py:
- source = puppet:///files/ganglia/plugins/compat.py;
- /etc/ganglia/conf.d/htcpseqcheck.pyconf:
- # Disabled due to excessive memory and CPU usage -- TS
- notify = Service[gmond],
- ensure = absent;
- #require = File[/etc/ganglia/conf.d],
- #source =
puppet:///files/ganglia/plugins/htcpseqcheck.pyconf;
- }
-}
-
diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp
new file mode 100644
index 000..311f27a
--- /dev/null
+++ b/manifests/misc/monitoring.pp
@@ -0,0 +1,28 @@
+# misc/monitoring.pp
+
+class misc::monitoring::htcp-loss {
+ system_role { misc::monitoring::htcp-loss: description = HTCP
packet loss monitor }
+
+ File {
+ require = File[/usr/lib/ganglia/python_modules],
+ notify = Service[gmond]
+ }
+
+ # Ganglia
+ file {
+ /usr/lib/ganglia/python_modules/htcpseqcheck.py:
+ source =
puppet:///files/ganglia/plugins/htcpseqcheck.py;
+ /usr/lib/ganglia/python_modules/htcpseqcheck_ganglia.py:
+ source =
puppet:///files/ganglia/plugins/htcpseqcheck_ganglia.py;
+ /usr/lib/ganglia/python_modules/util.py:
+ source = puppet:///files/ganglia/plugins/util.py;
+ /usr/lib/ganglia/python_modules/compat.py:
+ source = puppet:///files/ganglia/plugins/compat.py;
+ /etc/ganglia/conf.d/htcpseqcheck.pyconf:
+ # Disabled due to excessive memory and CPU usage -- TS
+ notify = Service[gmond],
+ ensure = absent;
+ #require = File[/etc/ganglia/conf.d],
+ #source =
puppet:///files/ganglia/plugins/htcpseqcheck.pyconf;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/53157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If17ba1cd469ac73171a78d572667d7e36f539971
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fully qualify global variables - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53158
Change subject: Fully qualify global variables
..
Fully qualify global variables
Change-Id: If20420ca7c6311dfd52bdaf9b1490c8bd9ef1f5f
---
M manifests/ganglia.pp
1 file changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/53158/1
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 7ecd212..58e9623 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -19,24 +19,24 @@
class ganglia {
- if $hostname in $decommissioned_servers {
+ if $::hostname in $::decommissioned_servers {
$cluster = decommissioned
$deaf = no
} else {
- if ! $cluster {
+ if ! $::cluster {
$cluster = misc
}
# aggregator should not be deaf (they should listen)
# ganglia_aggregator for production are defined in site.pp;
# for labs, 'deaf = no' is defined in gmond.conf.labsstub
- if $ganglia_aggregator {
+ if $::ganglia_aggregator {
$deaf = no
} else {
$deaf = yes
}
}
- if $realm == labs {
+ if $::realm == labs {
$authority_url = http://ganglia.wmflabs.org;
# labs does not use multicast so needs an explict gmetad_host
$gmetad_host = 10.4.0.79
@@ -46,13 +46,13 @@
$location = unspecified
- $ip_prefix = $site ? {
+ $ip_prefix = $::site ? {
pmtpa = 239.192.0,
eqiad = 239.192.1,
esams = 239.192.20,
}
- $name_suffix = ${site}
+ $name_suffix = ${::site}
# NOTE: Do *not* add new clusters *per site* anymore,
# the site name will automatically be appended now,
@@ -154,7 +154,7 @@
# and a different IP prefix will be used.
# gmond.conf template variables
- if $realm == labs {
+ if $::realm == labs {
# use project names for cluster names in labs
$cname = $instanceproject
}
@@ -242,7 +242,7 @@
ensure = latest;
}
- if $realm == labs {
+ if $::realm == labs {
$gridname = wmflabs
# for labs, just generate a stub gmetad configuration
without data_source lines
$gmetad_conf = gmetad.conf.labsstub
@@ -253,7 +253,7 @@
$gridname = Wikimedia
$gmetad_conf = gmetad.conf
$authority_url = http://ganglia.wikimedia.org;
- case $hostname {
+ case $::hostname {
# manutius runs gmetad to get varnish data into
torrus
# unlike other servers, manutius uses the
default rrd_rootdir
# neon needs gmetad for ganglios
@@ -334,7 +334,7 @@
}
# for labs, gmond.conf and gmetad.conf are generated every 4
hours by a cron job
- if $realm == labs {
+ if $::realm == labs {
file { /etc/ganglia/gmond.conf.labsstub:
source =
puppet:///files/ganglia/gmond.conf.labsstub,
mode = 0444,
@@ -403,7 +403,7 @@
class {'webserver::php5': ssl = 'true'; }
- if $realm == labs {
+ if $::realm == labs {
$ganglia_servername = ganglia.wmflabs.org
$ganglia_serveralias = aggregator1.pmtpa.wmflabs
$ganglia_webdir = /usr/share/ganglia-webfrontend
@@ -509,7 +509,7 @@
# TODO(ssmollett): install ganglia-webfrontend package in production,
# using appropriate conf.php
- if $realm == labs {
+ if $::realm == labs {
package { ganglia-webfrontend:
ensure = latest;
}
--
To view, visit https://gerrit.wikimedia.org/r/53158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If20420ca7c6311dfd52bdaf9b1490c8bd9ef1f5f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45639) Messages from wrong message group displayed - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45639) Messages from wrong message group displayed
..
(bug 45639) Messages from wrong message group displayed
While switching the modes and groups, message table need to be cleared properly.
Change-Id: Iabba3e8187caf0f8215452dede042fa2c5204636
---
M resources/js/ext.translate.messagetable.js
1 file changed, 12 insertions(+), 1 deletion(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.messagetable.js
b/resources/js/ext.translate.messagetable.js
index 3e4d226..3b6e8fb 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -26,7 +26,8 @@
changes = changes || {};
// Clear current messages
- $( '.tux-messagelist' ).empty();
+ $( '.tux-messagelist' ).trigger( 'clear' );
+
// Change the properties that are provided
if ( changes.filter !== undefined ) {
$loader.data( 'filter', changes.filter );
@@ -88,6 +89,8 @@
$( '.tux-message-filter-box' ).focus().val( ''
).trigger( 'input' );
} );
+ this.$container.on( 'clear', $.proxy(
messageTable.clear, messageTable ) );
+
this.$loader.appear( function () {
messageTable.load();
}, {
@@ -108,6 +111,14 @@
} );
},
+ /**
+* Clear the message table
+*/
+ clear: function () {
+ $( '.tux-messagelist' ).empty();
+ this.messages = [];
+ },
+
add: function ( message ) {
if ( this.mode === 'translate' ) {
this.addTranslate( message );
--
To view, visit https://gerrit.wikimedia.org/r/51981
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iabba3e8187caf0f8215452dede042fa2c5204636
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initial version of a Ganglia plugin for Ceph - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Initial version of a Ganglia plugin for Ceph
..
Initial version of a Ganglia plugin for Ceph
Change-Id: I777c3f3fad534d715fe297639bd5e25a04128437
---
A files/ganglia/plugins/ceph.py
1 file changed, 97 insertions(+), 0 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/ganglia/plugins/ceph.py b/files/ganglia/plugins/ceph.py
new file mode 100644
index 000..6b1f35a
--- /dev/null
+++ b/files/ganglia/plugins/ceph.py
@@ -0,0 +1,97 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+ceph.py
+Gather ceph OSD data for ganglia.
+Written by Mark Bergsma m...@wikimedia.org
+
+
+from subprocess import Popen, PIPE
+import json, os, sys
+
+stats_cache = {}
+metric_types = {}
+ceph_path = /usr/bin/ceph
+
+instances = ['']
+
+def metric_init(params):
+ global ceph_path, instances, stats_cache, metrics, metric_types
+
+ ceph_path = params.get('ceph', ceph_path)
+
+ instances = params.get('instances', ).split(',')
+
+ stats_cache = {}
+ metrics = []
+ metric_types = {}
+ for instance in instances:
+ metric_types[instance] = json.load(Popen([ceph_path,
--admin-daemon, /var/run/ceph/ceph-osd.%s.asok % instance, perf,
schema], stdout=PIPE).stdout)
+
+ for section in metric_types[instance]:
+ if section not in (osd, filestore): continue
+ for metric, properties in
metric_types[instance][section].iteritems():
+ name = instance + . + section.encode('ascii')
+ . + metric.encode('ascii')
+ counter = bool(properties['type'] 0b1000)
+ valtype = (properties['type'] 0b10 == 0b10)
and 'uint' or 'float'
+ metric_properties = {
+ 'name': name,
+ 'call_back': get_value,
+ 'time_max': 15,
+ 'value_type': valtype,
+ 'units': ( counter and 'N/s' or 'N' ),
+ 'slope': ( counter and positive or
both ),
+ 'format': ( valtype == uint and r'%u'
or r'%f' ),
+ 'description': %s %s %
(section.encode('ascii'), metric.encode('ascii')),
+ 'groups': ceph + instance
+ }
+ metrics.append(metric_properties)
+
+ return metrics
+
+def get_value(metric):
+ global stats_cache, metric_types
+
+ instance, section, metric_name = metric.split('.', 2)
+ if instance not in stats_cache or metric_name not in
stats_cache[instance][section]:
+ get_stats()
+
+ type = metric_types[instance][section][metric_name]['type']
+ if type 0b100 0:
+ # Average
+ try:
+ values =
stats_cache[instance][section].pop(metric_name, {'sum': 0, 'avgcount': 0})
+ if type 1 == 1:
+ return float(values['sum'] / values['avgcount'])
+ else:
+ return int(values['sum'] / values['avgcount'])
+ except:
+ return 0
+ else:
+ return stats_cache[instance][section].pop(metric_name, 0)
+
+def get_stats():
+ global stats_cache, instances, GAUGE_METRICS
+
+ for instance in instances:
+ stats_cache[instance] = json.load(Popen([ceph_path,
--admin-daemon, /var/run/ceph/ceph-osd.%s.asok % instance, perf, dump],
stdout=PIPE).stdout)
+
+ return stats_cache
+
+def metric_cleanup():
+ pass
+
+if __name__ == '__main__':
+ params = { 'instances': sys.argv[1] }
+
+ metrics = metric_init(params)
+
+ print # Ceph plugin for Ganglia Monitor, automatically generated
config file\n
+ print modules {\n\tmodule {\n\t\tname = \ceph\\n\t\tlanguage =
\python\\n\t\tpath = \ceph.py\\n
+ print \t\tparam instances {\n\t\t\tvalue = \%s\\n\t\t} %
,.join(instances)
+ print \t}\n}\n
+
+ print collection_group {\n\tcollect_every = 15\n\ttime_threshold =
15\n
+ for metric_properties in metrics:
+ print \tmetric {\n\t\tname = '%(name)s'\n\t\ttitle =
'%(description)s'\n\t} % metric_properties
+ print }
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/52988
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I777c3f3fad534d715fe297639bd5e25a04128437
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
[MediaWiki-commits] [Gerrit] Move misc::monitoring to where it belongs - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Move misc::monitoring to where it belongs
..
Move misc::monitoring to where it belongs
Change-Id: If17ba1cd469ac73171a78d572667d7e36f539971
---
M manifests/ganglia.pp
A manifests/misc/monitoring.pp
2 files changed, 28 insertions(+), 28 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 9d7cb23..7ecd212 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -533,31 +533,3 @@
}
}
-
-class misc::monitoring::htcp-loss {
- system_role { misc::monitoring::htcp-loss: description = HTCP
packet loss monitor }
-
- File {
- require = File[/usr/lib/ganglia/python_modules],
- notify = Service[gmond]
- }
-
- # Ganglia
- file {
- /usr/lib/ganglia/python_modules/htcpseqcheck.py:
- source =
puppet:///files/ganglia/plugins/htcpseqcheck.py;
- /usr/lib/ganglia/python_modules/htcpseqcheck_ganglia.py:
- source =
puppet:///files/ganglia/plugins/htcpseqcheck_ganglia.py;
- /usr/lib/ganglia/python_modules/util.py:
- source = puppet:///files/ganglia/plugins/util.py;
- /usr/lib/ganglia/python_modules/compat.py:
- source = puppet:///files/ganglia/plugins/compat.py;
- /etc/ganglia/conf.d/htcpseqcheck.pyconf:
- # Disabled due to excessive memory and CPU usage -- TS
- notify = Service[gmond],
- ensure = absent;
- #require = File[/etc/ganglia/conf.d],
- #source =
puppet:///files/ganglia/plugins/htcpseqcheck.pyconf;
- }
-}
-
diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp
new file mode 100644
index 000..311f27a
--- /dev/null
+++ b/manifests/misc/monitoring.pp
@@ -0,0 +1,28 @@
+# misc/monitoring.pp
+
+class misc::monitoring::htcp-loss {
+ system_role { misc::monitoring::htcp-loss: description = HTCP
packet loss monitor }
+
+ File {
+ require = File[/usr/lib/ganglia/python_modules],
+ notify = Service[gmond]
+ }
+
+ # Ganglia
+ file {
+ /usr/lib/ganglia/python_modules/htcpseqcheck.py:
+ source =
puppet:///files/ganglia/plugins/htcpseqcheck.py;
+ /usr/lib/ganglia/python_modules/htcpseqcheck_ganglia.py:
+ source =
puppet:///files/ganglia/plugins/htcpseqcheck_ganglia.py;
+ /usr/lib/ganglia/python_modules/util.py:
+ source = puppet:///files/ganglia/plugins/util.py;
+ /usr/lib/ganglia/python_modules/compat.py:
+ source = puppet:///files/ganglia/plugins/compat.py;
+ /etc/ganglia/conf.d/htcpseqcheck.pyconf:
+ # Disabled due to excessive memory and CPU usage -- TS
+ notify = Service[gmond],
+ ensure = absent;
+ #require = File[/etc/ganglia/conf.d],
+ #source =
puppet:///files/ganglia/plugins/htcpseqcheck.pyconf;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/53157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If17ba1cd469ac73171a78d572667d7e36f539971
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fully qualify global variables - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Fully qualify global variables
..
Fully qualify global variables
Change-Id: If20420ca7c6311dfd52bdaf9b1490c8bd9ef1f5f
---
M manifests/ganglia.pp
1 file changed, 12 insertions(+), 12 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 7ecd212..58e9623 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -19,24 +19,24 @@
class ganglia {
- if $hostname in $decommissioned_servers {
+ if $::hostname in $::decommissioned_servers {
$cluster = decommissioned
$deaf = no
} else {
- if ! $cluster {
+ if ! $::cluster {
$cluster = misc
}
# aggregator should not be deaf (they should listen)
# ganglia_aggregator for production are defined in site.pp;
# for labs, 'deaf = no' is defined in gmond.conf.labsstub
- if $ganglia_aggregator {
+ if $::ganglia_aggregator {
$deaf = no
} else {
$deaf = yes
}
}
- if $realm == labs {
+ if $::realm == labs {
$authority_url = http://ganglia.wmflabs.org;
# labs does not use multicast so needs an explict gmetad_host
$gmetad_host = 10.4.0.79
@@ -46,13 +46,13 @@
$location = unspecified
- $ip_prefix = $site ? {
+ $ip_prefix = $::site ? {
pmtpa = 239.192.0,
eqiad = 239.192.1,
esams = 239.192.20,
}
- $name_suffix = ${site}
+ $name_suffix = ${::site}
# NOTE: Do *not* add new clusters *per site* anymore,
# the site name will automatically be appended now,
@@ -154,7 +154,7 @@
# and a different IP prefix will be used.
# gmond.conf template variables
- if $realm == labs {
+ if $::realm == labs {
# use project names for cluster names in labs
$cname = $instanceproject
}
@@ -242,7 +242,7 @@
ensure = latest;
}
- if $realm == labs {
+ if $::realm == labs {
$gridname = wmflabs
# for labs, just generate a stub gmetad configuration
without data_source lines
$gmetad_conf = gmetad.conf.labsstub
@@ -253,7 +253,7 @@
$gridname = Wikimedia
$gmetad_conf = gmetad.conf
$authority_url = http://ganglia.wikimedia.org;
- case $hostname {
+ case $::hostname {
# manutius runs gmetad to get varnish data into
torrus
# unlike other servers, manutius uses the
default rrd_rootdir
# neon needs gmetad for ganglios
@@ -334,7 +334,7 @@
}
# for labs, gmond.conf and gmetad.conf are generated every 4
hours by a cron job
- if $realm == labs {
+ if $::realm == labs {
file { /etc/ganglia/gmond.conf.labsstub:
source =
puppet:///files/ganglia/gmond.conf.labsstub,
mode = 0444,
@@ -403,7 +403,7 @@
class {'webserver::php5': ssl = 'true'; }
- if $realm == labs {
+ if $::realm == labs {
$ganglia_servername = ganglia.wmflabs.org
$ganglia_serveralias = aggregator1.pmtpa.wmflabs
$ganglia_webdir = /usr/share/ganglia-webfrontend
@@ -509,7 +509,7 @@
# TODO(ssmollett): install ganglia-webfrontend package in production,
# using appropriate conf.php
- if $realm == labs {
+ if $::realm == labs {
package { ganglia-webfrontend:
ensure = latest;
}
--
To view, visit https://gerrit.wikimedia.org/r/53158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If20420ca7c6311dfd52bdaf9b1490c8bd9ef1f5f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Run gmond as user 'ganglia' instead of 'nobody' - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53159
Change subject: Run gmond as user 'ganglia' instead of 'nobody'
..
Run gmond as user 'ganglia' instead of 'nobody'
Change-Id: I449d4fb302441095d003cd79b6de50dde7ea91b1
---
M templates/ganglia/gmond_template.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/53159/1
diff --git a/templates/ganglia/gmond_template.erb
b/templates/ganglia/gmond_template.erb
index 13afc0c..2d33e1a 100644
--- a/templates/ganglia/gmond_template.erb
+++ b/templates/ganglia/gmond_template.erb
@@ -3,7 +3,7 @@
globals {
daemonize = yes
setuid = yes
- user = nobody
+ user = ganglia
debug_level = 0
max_udp_msg_len = 1472
mute = no
--
To view, visit https://gerrit.wikimedia.org/r/53159
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I449d4fb302441095d003cd79b6de50dde7ea91b1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45651) Fix for snakview.isInitialSnak - change (mediawiki...Wikibase)
Henning Snater has submitted this change and it was merged.
Change subject: (bug 45651) Fix for snakview.isInitialSnak
..
(bug 45651) Fix for snakview.isInitialSnak
Before this fix, the Toolbar didn't change when clicking edit on a Claim with
a PropertyValue
main Snak which uses a data value type which doesn't match the Snak's
Property's DataType's data
value type.
- patch set 2: fix for wb.Snak.prototype.equals. Can compare to non-Snak values
now.
Change-Id: I179c161c8dbf97c2787a0fad0dda99637a8d42a4
---
M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
M lib/resources/wikibase.datamodel/wikibase.Snak.js
2 files changed, 19 insertions(+), 6 deletions(-)
Approvals:
Henning Snater: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
index e504b6b..1e7d237 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
@@ -415,6 +415,11 @@
/**
* Returns whether the current snak matches the one the snakview has
been initialized with.
+*
+* TODO/FIXME: think about logic behind true being returned if initial
and current Snaks are
+* null. Perhaps a 'hasChanged' or 'isInitialValue'
function would be conceptually
+* less confusing, though, different in their result.
+*
* @since 0.4
*
* @return {boolean}
@@ -423,7 +428,11 @@
var snak = this.snak(),
initialSnak = this.initialSnak();
- return ( !initialSnak !snak || !!initialSnak snak.equals(
initialSnak ) );
+ if( !initialSnak !snak ) {
+ // no snaks at all, but we consider this situation as
having same Snaks anyhow.
+ return true;
+ }
+ return snak snak.equals( initialSnak );
},
/**
diff --git a/lib/resources/wikibase.datamodel/wikibase.Snak.js
b/lib/resources/wikibase.datamodel/wikibase.Snak.js
index 9fe6586..6016c97 100644
--- a/lib/resources/wikibase.datamodel/wikibase.Snak.js
+++ b/lib/resources/wikibase.datamodel/wikibase.Snak.js
@@ -64,14 +64,18 @@
* Returns whether this Snak is equal to another Snak. This means that
their property and type
* are the same, as well as any other attributes they might have
depending on their Snak type.
*
-* @param {wb.Snak} snak
+* @param {wb.Snak|*} that
* @return {Boolean}
*/
- equals: function( snak ) {
- return snak === this
+ equals: function( that ) {
+ if( !( that instanceof this.constructor ) ) {
+ return false;
+ }
+
+ return that === this
|| (
- this.getPropertyId() === snak.getPropertyId()
-this.getType() === snak.getType()
+ this.getPropertyId() === that.getPropertyId()
+this.getType() === that.getType()
);
},
--
To view, visit https://gerrit.wikimedia.org/r/51883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I179c161c8dbf97c2787a0fad0dda99637a8d42a4
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Werner daniel.wer...@wikimedia.de
Gerrit-Reviewer: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fully qualify global variables - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53160
Change subject: Fully qualify global variables
..
Fully qualify global variables
Change-Id: I63639eb5eeaaeab5d1c9d7f97c3499defb925a7b
---
M templates/ganglia/gmond_template.erb
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/53160/1
diff --git a/templates/ganglia/gmond_template.erb
b/templates/ganglia/gmond_template.erb
index 2d33e1a..cdd004d 100644
--- a/templates/ganglia/gmond_template.erb
+++ b/templates/ganglia/gmond_template.erb
@@ -14,7 +14,7 @@
gexec = no
send_metadata_interval = 60
-% if realm == labs and has_variable?(instancename) then %
+% if scope.lookupvar(::realm) == labs and has_variable?(instancename)
then %
override_hostname = %= instancename %
% end %
@@ -39,7 +39,7 @@
/* Feel free to specify as many udp_send_channels as you like. Gmond
used to only support having a single channel */
-% if realm == labs then %
+% if scope.lookupvar(::realm) == labs then %
% if has_variable?(project_gid) then %
udp_send_channel {
host = %= gmetad_host %
--
To view, visit https://gerrit.wikimedia.org/r/53160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I63639eb5eeaaeab5d1c9d7f97c3499defb925a7b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (testing) added qunit eachchange-tests to selenium - change (mediawiki...Wikibase)
Tobias Gritschacher has uploaded a new change for review. https://gerrit.wikimedia.org/r/53161 Change subject: (testing) added qunit eachchange-tests to selenium .. (testing) added qunit eachchange-tests to selenium Change-Id: If15616a15b7b73b9be0e99a9f8274e9ed860f8fc --- M repo/tests/selenium/qunit/qunit_spec.rb 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/61/53161/1 diff --git a/repo/tests/selenium/qunit/qunit_spec.rb b/repo/tests/selenium/qunit/qunit_spec.rb index 29882e0..3ba0244 100644 --- a/repo/tests/selenium/qunit/qunit_spec.rb +++ b/repo/tests/selenium/qunit/qunit_spec.rb @@ -42,6 +42,13 @@ page.qunitTestFail?.should be_false end end +it run eachchange tests do + on_page(QUnitPage) do |page| +page.call_qunit(WIKI_REPO_URL + Special:JavaScriptTest/qunit?filter=eachchange) +page.wait_for_qunit_tests +page.qunitTestFail?.should be_false + end +end it run jQuery.ui tests do on_page(QUnitPage) do |page| page.call_qunit(WIKI_REPO_URL + Special:JavaScriptTest/qunit?filter=jQuery.ui) -- To view, visit https://gerrit.wikimedia.org/r/53161 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If15616a15b7b73b9be0e99a9f8274e9ed860f8fc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix weird copy-paste issue - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/53162 Change subject: Fix weird copy-paste issue .. Fix weird copy-paste issue Change-Id: I46fae0382fa9682380e6dd81a3ab1c04b20c5f10 --- M bin/update-wikia 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/62/53162/1 diff --git a/bin/update-wikia b/bin/update-wikia index 34e66d2..e389231 100755 --- a/bin/update-wikia +++ b/bin/update-wikia @@ -1,4 +1,4 @@ -#!binsh +#!/bin/sh # Quick script for updating, processing and exporting Wikia MediaWiki extensions. set -e MYDIR=/resources/`whoami` -- To view, visit https://gerrit.wikimedia.org/r/53162 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I46fae0382fa9682380e6dd81a3ab1c04b20c5f10 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bug fixes - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53163
Change subject: Bug fixes
..
Bug fixes
Change-Id: I3d05902f430a1b60ec09a0a3315a1878e661e483
---
M files/ganglia/plugins/ceph.py
1 file changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/63/53163/1
diff --git a/files/ganglia/plugins/ceph.py b/files/ganglia/plugins/ceph.py
index 6b1f35a..f299624 100644
--- a/files/ganglia/plugins/ceph.py
+++ b/files/ganglia/plugins/ceph.py
@@ -53,15 +53,17 @@
global stats_cache, metric_types
instance, section, metric_name = metric.split('.', 2)
- if instance not in stats_cache or metric_name not in
stats_cache[instance][section]:
+ try:
+ stats_cache[instance][section][metric_name]
+ except KeyError:
get_stats()
- type = metric_types[instance][section][metric_name]['type']
- if type 0b100 0:
+ t = metric_types[instance][section][metric_name]['type']
+ if t 0b100 0:
# Average
try:
- values =
stats_cache[instance][section].pop(metric_name, {'sum': 0, 'avgcount': 0})
- if type 1 == 1:
+ values = stats_cache[instance][section].pop(metric_name)
+ if t 1 == 1:
return float(values['sum'] / values['avgcount'])
else:
return int(values['sum'] / values['avgcount'])
@@ -71,7 +73,7 @@
return stats_cache[instance][section].pop(metric_name, 0)
def get_stats():
- global stats_cache, instances, GAUGE_METRICS
+ global stats_cache, instances
for instance in instances:
stats_cache[instance] = json.load(Popen([ceph_path,
--admin-daemon, /var/run/ceph/ceph-osd.%s.asok % instance, perf, dump],
stdout=PIPE).stdout)
--
To view, visit https://gerrit.wikimedia.org/r/53163
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d05902f430a1b60ec09a0a3315a1878e661e483
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45821) Fix prev diff link to work in special:contributi... - change (mediawiki...Wikibase)
John Erling Blad has submitted this change and it was merged.
Change subject: (bug 45821) Fix prev diff link to work in special:contributions
etc.
..
(bug 45821) Fix prev diff link to work in special:contributions etc.
Change-Id: I84648b1ef5d595d1f95883c5f1864878b549849e
---
M repo/includes/actions/ViewEntityAction.php
1 file changed, 16 insertions(+), 5 deletions(-)
Approvals:
John Erling Blad: Verified; Looks good to me, approved
diff --git a/repo/includes/actions/ViewEntityAction.php
b/repo/includes/actions/ViewEntityAction.php
index 165c26e..b8074ca 100644
--- a/repo/includes/actions/ViewEntityAction.php
+++ b/repo/includes/actions/ViewEntityAction.php
@@ -32,19 +32,30 @@
/**
* Returns the content of the page in the revision being viewed.
*
+* @todo split out the get revision id stuff, add tests and see if
+* any core code can be shared here
+*
* @return EntityContent|null
*/
protected function getContent() {
$queryValues = $this-getRequest()-getQueryValues();
- $revisionId = 0;
+ $title = $this-getTitle();
+ $revisionId = array_key_exists( 'oldid', $queryValues )
is_int( $queryValues['oldid'] ) ?
+ $queryValues['oldid'] : $title-getLatestRevID();
if ( array_key_exists( 'diff', $queryValues ) ) {
- $revisionId = $queryValues[ 'diff' ];
- } elseif ( array_key_exists( 'oldid', $queryValues ) ) {
- $revisionId = $queryValues[ 'oldid' ];
+ $diffValue = $queryValues['diff'];
+
+ if ( $diffValue === 'prev' ) {
+ $revisionId = $title-getPreviousRevisionID(
$revisionId );
+ } else if ( $diffValue === 'next' ) {
+ $revisionId = $title-getNextRevisionID(
$revisionId );
+ } else {
+ $revisionId = intval( $diffValue );
+ }
}
- $revision = \Revision::newFromTitle( $this-getTitle(),
$revisionId );
+ $revision = \Revision::newFromTitle( $title, $revisionId );
if ( $revision !== null ) {
return $revision-getContent();
--
To view, visit https://gerrit.wikimedia.org/r/53147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I84648b1ef5d595d1f95883c5f1864878b549849e
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: John Erling Blad john.b...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Triggering remove event in the edittoolbar widget - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: Triggering remove event in the edittoolbar widget
..
Triggering remove event in the edittoolbar widget
If the widget interacting with the edittoolbar widget does not feature a
remove method,
the edittoolbar will trigger a remove event. Consequently, there is no need
to implement
a remove method in the interaction widget.
Change-Id: I4194df1cd2380364597d939686dfcc8eae7f0b61
---
M lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
b/lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
index a0e13a1..9a40864 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
@@ -117,8 +117,7 @@
this.toolbar = new wb.ui.Toolbar();
this.editGroup = new wb.ui.Toolbar.EditGroup( {
- displayRemoveButton:
- ( this.options.enableRemove
$.isFunction( this._interactionWidget.remove ) )
+ displayRemoveButton: this.options.enableRemove
} );
this.toolbar.addElement( this.editGroup );
@@ -142,7 +141,11 @@
this.editGroup.on( 'remove', function( e ) {
e.preventDefault(); // Prevent
auto-transforming toolbar to non-edit mode.
self.toggleActionMessage( { message:
'wikibase-remove-inprogress' } );
- self._interactionWidget.remove();
+ if ( $.isFunction(
self._interactionWidget.remove ) ) {
+ self._interactionWidget.remove();
+ } else {
+ self._interactionWidget._trigger(
'remove' );
+ }
} );
var prefix = this._interactionWidget.widgetEventPrefix;
--
To view, visit https://gerrit.wikimedia.org/r/53151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4194df1cd2380364597d939686dfcc8eae7f0b61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Unpuppetizing udp2log and fundraising stuff from europium un... - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53164
Change subject: Unpuppetizing udp2log and fundraising stuff from europium until
Jeff and I get coordinated.
..
Unpuppetizing udp2log and fundraising stuff from europium until Jeff and I get
coordinated.
Change-Id: Ic648e2cd894e4bcd15c96779e788d57bae0cb800
---
M manifests/site.pp
1 file changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/53164/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 0e1efe4..58338aa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -653,25 +653,25 @@
include
accounts::dsc,
accounts::datasets,
- accounts::dandreescu,
- misc::udp2log::utilities,
- misc::udp2log
+ accounts::dandreescu
+# misc::udp2log::utilities,
+# misc::udp2log
# locke's udp2log instance stores logs
# mainly in /a/squid.
# TODO: Move log_directory to /var/log/udp2log
- misc::udp2log::instance { locke: log_directory = /a/squid }
+# misc::udp2log::instance { locke: log_directory = /a/squid }
# fundraising banner log pipeline
- include misc::fundraising::udp2log_rotation
+# include misc::fundraising::udp2log_rotation
# Set up an rsync daemon module for udp2log logrotated
# archives. This allows stat1 to copy logs from the
# logrotated archive directory
- class { misc::udp2log::rsyncd:
- path= /a/squid,
- require = Misc::Udp2log::Instance[locke],
- }
+# class { misc::udp2log::rsyncd:
+# path= /a/squid,
+# require = Misc::Udp2log::Instance[locke],
+# }
}
# es1 equad
--
To view, visit https://gerrit.wikimedia.org/r/53164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic648e2cd894e4bcd15c96779e788d57bae0cb800
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pass through error message to VE if Parsoid is unreachable. - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53165
Change subject: Pass through error message to VE if Parsoid is unreachable.
..
Pass through error message to VE if Parsoid is unreachable.
The Status is marked as 'ok' if it completes with errors. We need
to check for the Status is 'good' as well, and if not we can
pass through the error.
MWHttpRequest only sets fatal errors so it can be assumed that if
the Status is not 'good' then there is one error in the error array.
Bug: 45916
Change-Id: Icb2d0253faaf4e00a9a1fe3091458b914e5b7579
---
M ApiVisualEditor.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/65/53165/1
diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 25decf5..936c3cb 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -39,8 +39,10 @@
if ( $status-isOK() ) {
$content = $req-getContent();
- } else {
+ } else if ( $status-isGood() ) {
$this-dieUsage( $req-getContent(),
'parsoidserver-http-'.$req-getStatus() );
+ } else if ( $errors = $status-getErrorsArray() ) {
+ $this-dieUsage( $errors[0][1],
'parsoidserver-'.$errors[0][0] );
}
if ( $content === false ) {
--
To view, visit https://gerrit.wikimedia.org/r/53165
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb2d0253faaf4e00a9a1fe3091458b914e5b7579
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Unpuppetizing udp2log and fundraising stuff from europium un... - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Unpuppetizing udp2log and fundraising stuff from europium until
Jeff and I get coordinated.
..
Unpuppetizing udp2log and fundraising stuff from europium until Jeff and I get
coordinated.
Change-Id: Ic648e2cd894e4bcd15c96779e788d57bae0cb800
---
M manifests/site.pp
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 0e1efe4..58338aa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -653,25 +653,25 @@
include
accounts::dsc,
accounts::datasets,
- accounts::dandreescu,
- misc::udp2log::utilities,
- misc::udp2log
+ accounts::dandreescu
+# misc::udp2log::utilities,
+# misc::udp2log
# locke's udp2log instance stores logs
# mainly in /a/squid.
# TODO: Move log_directory to /var/log/udp2log
- misc::udp2log::instance { locke: log_directory = /a/squid }
+# misc::udp2log::instance { locke: log_directory = /a/squid }
# fundraising banner log pipeline
- include misc::fundraising::udp2log_rotation
+# include misc::fundraising::udp2log_rotation
# Set up an rsync daemon module for udp2log logrotated
# archives. This allows stat1 to copy logs from the
# logrotated archive directory
- class { misc::udp2log::rsyncd:
- path= /a/squid,
- require = Misc::Udp2log::Instance[locke],
- }
+# class { misc::udp2log::rsyncd:
+# path= /a/squid,
+# require = Misc::Udp2log::Instance[locke],
+# }
}
# es1 equad
--
To view, visit https://gerrit.wikimedia.org/r/53164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic648e2cd894e4bcd15c96779e788d57bae0cb800
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix weird copy-paste issue - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Fix weird copy-paste issue .. Fix weird copy-paste issue Change-Id: I46fae0382fa9682380e6dd81a3ab1c04b20c5f10 --- M bin/update-wikia 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/bin/update-wikia b/bin/update-wikia index 34e66d2..e389231 100755 --- a/bin/update-wikia +++ b/bin/update-wikia @@ -1,4 +1,4 @@ -#!binsh +#!/bin/sh # Quick script for updating, processing and exporting Wikia MediaWiki extensions. set -e MYDIR=/resources/`whoami` -- To view, visit https://gerrit.wikimedia.org/r/53162 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I46fae0382fa9682380e6dd81a3ab1c04b20c5f10 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] $ganglia_aggregator is not top level - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53166
Change subject: $ganglia_aggregator is not top level
..
$ganglia_aggregator is not top level
Change-Id: I8e2a64b8f843db1a22a4c9ec2512e0a0e1a64ade
---
M manifests/ganglia.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/66/53166/1
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 58e9623..20ac17e 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -29,7 +29,7 @@
# aggregator should not be deaf (they should listen)
# ganglia_aggregator for production are defined in site.pp;
# for labs, 'deaf = no' is defined in gmond.conf.labsstub
- if $::ganglia_aggregator {
+ if $ganglia_aggregator {
$deaf = no
} else {
$deaf = yes
--
To view, visit https://gerrit.wikimedia.org/r/53166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e2a64b8f843db1a22a4c9ec2512e0a0e1a64ade
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] $ganglia_aggregator is not top level - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: $ganglia_aggregator is not top level
..
$ganglia_aggregator is not top level
Change-Id: I8e2a64b8f843db1a22a4c9ec2512e0a0e1a64ade
---
M manifests/ganglia.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mark Bergsma: Verified; Looks good to me, approved
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 58e9623..20ac17e 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -29,7 +29,7 @@
# aggregator should not be deaf (they should listen)
# ganglia_aggregator for production are defined in site.pp;
# for labs, 'deaf = no' is defined in gmond.conf.labsstub
- if $::ganglia_aggregator {
+ if $ganglia_aggregator {
$deaf = no
} else {
$deaf = yes
--
To view, visit https://gerrit.wikimedia.org/r/53166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e2a64b8f843db1a22a4c9ec2512e0a0e1a64ade
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed many small spelling mistakes and php docs, var decl. - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixed many small spelling mistakes and php docs, var decl.
..
Fixed many small spelling mistakes and php docs, var decl.
Change-Id: I1508ed7eb77e5e4f700fb63955d626c4f5915840
---
M includes/api/ApiBase.php
M includes/api/ApiEditPage.php
M includes/api/ApiFormatJson.php
M includes/api/ApiLogin.php
M includes/api/ApiParamInfo.php
M includes/api/ApiProtect.php
M includes/api/ApiQuery.php
M includes/api/ApiQueryAllImages.php
M includes/api/ApiQueryAllPages.php
M includes/api/ApiQueryBacklinks.php
M includes/api/ApiQueryCategoryInfo.php
M includes/api/ApiQueryDuplicateFiles.php
M includes/api/ApiQueryImageInfo.php
M includes/api/ApiQueryInfo.php
M includes/api/ApiQueryLangLinks.php
M includes/api/ApiQueryLogEvents.php
M includes/api/ApiQueryQueryPage.php
M includes/api/ApiQueryRandom.php
M includes/api/ApiQueryRecentChanges.php
M includes/api/ApiQueryRevisions.php
M includes/api/ApiQueryUserContributions.php
M includes/api/ApiQueryWatchlist.php
M includes/api/ApiResult.php
M includes/api/ApiSetNotificationTimestamp.php
M includes/api/ApiUpload.php
25 files changed, 54 insertions(+), 28 deletions(-)
Approvals:
devunt: Looks good to me, but someone else must approve
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index b82aadf..f953bb1 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -189,7 +189,7 @@
* @return ApiResult
*/
public function getResult() {
- // Main module has getResult() method overriden
+ // Main module has getResult() method overridden
// Safety - avoid infinite loop:
if ( $this-isMain() ) {
ApiBase::dieDebug( __METHOD__, 'base method was called
on main module. ' );
@@ -582,7 +582,7 @@
* The array can also contain a boolean under the key PROP_LIST,
* indicating whether the result is a list.
*
-* Don't call this functon directly: use getFinalResultProperties() to
+* Don't call this function directly: use getFinalResultProperties() to
* allow hooks to modify descriptions as needed.
*
* @return array|bool False on no properties
@@ -795,7 +795,7 @@
}
/**
-* Callback function used in requireOnlyOneParameter to check whether
reequired parameters are set
+* Callback function used in requireOnlyOneParameter to check whether
required parameters are set
*
* @param $x object Parameter to check is not null/false
* @return bool
@@ -838,7 +838,7 @@
if ( $userWatching ) {
return true;
}
- # If no user option was passed, use
watchdefault or watchcreation
+ # If no user option was passed, use
watchdefault or watchcreations
if ( is_null( $userOption ) ) {
$userOption = $titleObj-exists()
? 'watchdefault' :
'watchcreations';
@@ -1268,7 +1268,7 @@
'badipaddress' = array( 'code' = 'invalidip', 'info' =
Invalid IP address specified ),
'ipb_expiry_invalid' = array( 'code' = 'invalidexpiry',
'info' = Invalid expiry time ),
'ipb_already_blocked' = array( 'code' = 'alreadyblocked',
'info' = The user you tried to block was already blocked ),
- 'ipb_blocked_as_range' = array( 'code' = 'blockedasrange',
'info' = IP address \\$1\ was blocked as part of range \\$2\. You can't
unblock the IP invidually, but you can unblock the range as a whole. ),
+ 'ipb_blocked_as_range' = array( 'code' = 'blockedasrange',
'info' = IP address \\$1\ was blocked as part of range \\$2\. You can't
unblock the IP individually, but you can unblock the range as a whole. ),
'ipb_cant_unblock' = array( 'code' = 'cantunblock', 'info' =
The block you specified was not found. It may have been unblocked already ),
'mailnologin' = array( 'code' = 'cantsend', 'info' = You
are not logged in, you do not have a confirmed email address, or you are not
allowed to send email to other users, so you cannot send email ),
'ipbblocked' = array( 'code' = 'ipbblocked', 'info' = 'You
cannot block or unblock users while you are yourself blocked' ),
diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index dc449b8..cba3489 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -58,6 +58,8 @@
// array_shift( $titles );
$redirValues = array();
+
+
[MediaWiki-commits] [Gerrit] Run gmond as user 'ganglia' instead of 'nobody' - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Run gmond as user 'ganglia' instead of 'nobody'
..
Run gmond as user 'ganglia' instead of 'nobody'
Change-Id: I449d4fb302441095d003cd79b6de50dde7ea91b1
---
M templates/ganglia/gmond_template.erb
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/ganglia/gmond_template.erb
b/templates/ganglia/gmond_template.erb
index 13afc0c..ae6bed6 100644
--- a/templates/ganglia/gmond_template.erb
+++ b/templates/ganglia/gmond_template.erb
@@ -3,7 +3,11 @@
globals {
daemonize = yes
setuid = yes
+% if scope.lookupvar(::lsbdistcodename) == hardy) then -%
user = nobody
+% else -%
+ user = ganglia
+% end -%
debug_level = 0
max_udp_msg_len = 1472
mute = no
--
To view, visit https://gerrit.wikimedia.org/r/53159
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I449d4fb302441095d003cd79b6de50dde7ea91b1
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fully qualify global variables - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Fully qualify global variables
..
Fully qualify global variables
Change-Id: I63639eb5eeaaeab5d1c9d7f97c3499defb925a7b
---
M templates/ganglia/gmond_template.erb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/ganglia/gmond_template.erb
b/templates/ganglia/gmond_template.erb
index ae6bed6..39cb5ad 100644
--- a/templates/ganglia/gmond_template.erb
+++ b/templates/ganglia/gmond_template.erb
@@ -18,7 +18,7 @@
gexec = no
send_metadata_interval = 60
-% if realm == labs and has_variable?(instancename) then %
+% if scope.lookupvar(::realm) == labs and has_variable?(instancename)
then %
override_hostname = %= instancename %
% end %
@@ -43,7 +43,7 @@
/* Feel free to specify as many udp_send_channels as you like. Gmond
used to only support having a single channel */
-% if realm == labs then %
+% if scope.lookupvar(::realm) == labs then %
% if has_variable?(project_gid) then %
udp_send_channel {
host = %= gmetad_host %
--
To view, visit https://gerrit.wikimedia.org/r/53160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I63639eb5eeaaeab5d1c9d7f97c3499defb925a7b
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix syntax - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53167
Change subject: Fix syntax
..
Fix syntax
Change-Id: I9aa1185e4f32367604e38ccb8c89ddd30aec914d
---
M templates/ganglia/gmond_template.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/53167/1
diff --git a/templates/ganglia/gmond_template.erb
b/templates/ganglia/gmond_template.erb
index 39cb5ad..ed3b7e4 100644
--- a/templates/ganglia/gmond_template.erb
+++ b/templates/ganglia/gmond_template.erb
@@ -3,7 +3,7 @@
globals {
daemonize = yes
setuid = yes
-% if scope.lookupvar(::lsbdistcodename) == hardy) then -%
+% if scope.lookupvar(::lsbdistcodename) == hardy then -%
user = nobody
% else -%
user = ganglia
--
To view, visit https://gerrit.wikimedia.org/r/53167
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9aa1185e4f32367604e38ccb8c89ddd30aec914d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bug fixes - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Bug fixes
..
Bug fixes
Change-Id: I3d05902f430a1b60ec09a0a3315a1878e661e483
---
M files/ganglia/plugins/ceph.py
1 file changed, 8 insertions(+), 6 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/ganglia/plugins/ceph.py b/files/ganglia/plugins/ceph.py
index 6b1f35a..f299624 100644
--- a/files/ganglia/plugins/ceph.py
+++ b/files/ganglia/plugins/ceph.py
@@ -53,15 +53,17 @@
global stats_cache, metric_types
instance, section, metric_name = metric.split('.', 2)
- if instance not in stats_cache or metric_name not in
stats_cache[instance][section]:
+ try:
+ stats_cache[instance][section][metric_name]
+ except KeyError:
get_stats()
- type = metric_types[instance][section][metric_name]['type']
- if type 0b100 0:
+ t = metric_types[instance][section][metric_name]['type']
+ if t 0b100 0:
# Average
try:
- values =
stats_cache[instance][section].pop(metric_name, {'sum': 0, 'avgcount': 0})
- if type 1 == 1:
+ values = stats_cache[instance][section].pop(metric_name)
+ if t 1 == 1:
return float(values['sum'] / values['avgcount'])
else:
return int(values['sum'] / values['avgcount'])
@@ -71,7 +73,7 @@
return stats_cache[instance][section].pop(metric_name, 0)
def get_stats():
- global stats_cache, instances, GAUGE_METRICS
+ global stats_cache, instances
for instance in instances:
stats_cache[instance] = json.load(Popen([ceph_path,
--admin-daemon, /var/run/ceph/ceph-osd.%s.asok % instance, perf, dump],
stdout=PIPE).stdout)
--
To view, visit https://gerrit.wikimedia.org/r/53163
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d05902f430a1b60ec09a0a3315a1878e661e483
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (testing) added qunit eachchange-tests to selenium - change (mediawiki...Wikibase)
Anja Jentzsch has submitted this change and it was merged. Change subject: (testing) added qunit eachchange-tests to selenium .. (testing) added qunit eachchange-tests to selenium Change-Id: If15616a15b7b73b9be0e99a9f8274e9ed860f8fc --- M repo/tests/selenium/qunit/qunit_spec.rb 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Anja Jentzsch: Verified; Looks good to me, approved diff --git a/repo/tests/selenium/qunit/qunit_spec.rb b/repo/tests/selenium/qunit/qunit_spec.rb index 29882e0..3ba0244 100644 --- a/repo/tests/selenium/qunit/qunit_spec.rb +++ b/repo/tests/selenium/qunit/qunit_spec.rb @@ -42,6 +42,13 @@ page.qunitTestFail?.should be_false end end +it run eachchange tests do + on_page(QUnitPage) do |page| +page.call_qunit(WIKI_REPO_URL + Special:JavaScriptTest/qunit?filter=eachchange) +page.wait_for_qunit_tests +page.qunitTestFail?.should be_false + end +end it run jQuery.ui tests do on_page(QUnitPage) do |page| page.call_qunit(WIKI_REPO_URL + Special:JavaScriptTest/qunit?filter=jQuery.ui) -- To view, visit https://gerrit.wikimedia.org/r/53161 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If15616a15b7b73b9be0e99a9f8274e9ed860f8fc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: Anja Jentzsch anja.jentz...@wikimedia.de Gerrit-Reviewer: Henning Snater henning.sna...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix syntax - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Fix syntax
..
Fix syntax
Change-Id: I9aa1185e4f32367604e38ccb8c89ddd30aec914d
---
M templates/ganglia/gmond_template.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mark Bergsma: Verified; Looks good to me, approved
diff --git a/templates/ganglia/gmond_template.erb
b/templates/ganglia/gmond_template.erb
index 39cb5ad..ed3b7e4 100644
--- a/templates/ganglia/gmond_template.erb
+++ b/templates/ganglia/gmond_template.erb
@@ -3,7 +3,7 @@
globals {
daemonize = yes
setuid = yes
-% if scope.lookupvar(::lsbdistcodename) == hardy) then -%
+% if scope.lookupvar(::lsbdistcodename) == hardy then -%
user = nobody
% else -%
user = ganglia
--
To view, visit https://gerrit.wikimedia.org/r/53167
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9aa1185e4f32367604e38ccb8c89ddd30aec914d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused argument in method call - change (mediawiki...Wikibase)
Anja Jentzsch has submitted this change and it was merged. Change subject: Remove unused argument in method call .. Remove unused argument in method call Change-Id: I9d9615360212f865f7d3aada26af8cea6ea3e9f4 --- M repo/maintenance/pruneChanges.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Anja Jentzsch: Verified; Looks good to me, approved diff --git a/repo/maintenance/pruneChanges.php b/repo/maintenance/pruneChanges.php index 40cbe98..9ee56b6 100644 --- a/repo/maintenance/pruneChanges.php +++ b/repo/maintenance/pruneChanges.php @@ -58,7 +58,7 @@ exit( 5 ); } - $this-pruneChanges( $numDays, $force ); + $this-pruneChanges( $numDays ); $this-output( date( 'H:i:s' ) . done, exiting\n ); unlink( $pidfile ); // delete lockfile on normal exit -- To view, visit https://gerrit.wikimedia.org/r/53156 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d9615360212f865f7d3aada26af8cea6ea3e9f4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: John Erling Blad john.b...@wikimedia.de Gerrit-Reviewer: Anja Jentzsch anja.jentz...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add method to get EntityId for a SiteLink - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53169
Change subject: Add method to get EntityId for a SiteLink
..
Add method to get EntityId for a SiteLink
Change-Id: I9be83d2a259bae686f946f3879430903aab8b8a6
---
M lib/includes/store/SiteLinkTable.php
M lib/tests/phpunit/store/SiteLinkTableTest.php
2 files changed, 30 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/69/53169/1
diff --git a/lib/includes/store/SiteLinkTable.php
b/lib/includes/store/SiteLinkTable.php
index 42d902f..9853e90 100644
--- a/lib/includes/store/SiteLinkTable.php
+++ b/lib/includes/store/SiteLinkTable.php
@@ -163,6 +163,8 @@
/**
* @see SiteLinkLookup::getItemIdForLink
*
+* @todo may want to deprecate this or change it to always return
entity id object only
+*
* @since 0.1
*
* @param string $globalSiteId
@@ -187,6 +189,22 @@
}
/**
+* @since 0.4
+*
+* @param SiteLink $siteLink
+*
+* return EntityId|null
+*/
+ public function getEntityIdForSiteLink( SiteLink $siteLink ) {
+ $numericItemId = $this-getItemIdForLink(
+ $siteLink-getSite()-getGlobalId(),
+ $siteLink-getPage()
+ );
+
+ return is_int( $numericItemId ) ? new EntityId(
Item::ENTITY_TYPE, $numericItemId ) : null;
+ }
+
+ /**
* @see SiteLinkLookup::getConflictsForItem
*
* @since 0.1
diff --git a/lib/tests/phpunit/store/SiteLinkTableTest.php
b/lib/tests/phpunit/store/SiteLinkTableTest.php
index dc92722..37f9b14 100644
--- a/lib/tests/phpunit/store/SiteLinkTableTest.php
+++ b/lib/tests/phpunit/store/SiteLinkTableTest.php
@@ -103,6 +103,18 @@
* @depends testSaveLinksOfItem
* @dataProvider itemProvider
*/
+ public function testGetEntityIdForSiteLink( Item $item ) {
+ $siteLinks = $item-getSiteLinks();
+
+ foreach( $siteLinks as $siteLink ) {
+ $this-assertEquals( $item-getId(),
$this-siteLinkTable-getEntityIdForSiteLink( $siteLink ) );
+ }
+ }
+
+ /**
+* @depends testSaveLinksOfItem
+* @dataProvider itemProvider
+*/
public function testCountLinks( $item ) {
$this-assertEquals(
count( $item-getSiteLinks() ),
--
To view, visit https://gerrit.wikimedia.org/r/53169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9be83d2a259bae686f946f3879430903aab8b8a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initial debian packaging using git-buildpackage - change (operations...kafka)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53170
Change subject: Initial debian packaging using git-buildpackage
..
Initial debian packaging using git-buildpackage
Change-Id: I7d825e5a29e9c0f743e72d9a8637f98d7b8d962c
---
A debian/README.debian
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/dirs
A debian/docs
A debian/install.sh
A debian/kafka.upstart.conf
A debian/postrm
A debian/preinst
A debian/rules
A debian/source/format
13 files changed, 189 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/kafka
refs/changes/70/53170/1
diff --git a/debian/README.debian b/debian/README.debian
new file mode 100644
index 000..9690589
--- /dev/null
+++ b/debian/README.debian
@@ -0,0 +1,4 @@
+To build, use git-buildpackage with a build area outside of the main directory:
+
+git-buildpackage --git-pristine-tar --git-export-dir=../kafka-build
--git-debian-branch=deb
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..ac8c842
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+kafka (0.7.2-1) unstable; urgency=low
+
+ * Initial Debian Packaging
+
+ -- Andrew Otto (WMF) o...@wikimedia.org Thu, 28 Feb 2013 20:40:29 +
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..9c510af
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,15 @@
+Source: kafka
+Section: utils
+Priority: extra
+Maintainer: Andrew Otto o...@wikimedia.org
+Build-Depends: debhelper (= 8.0.0), javahelper (=0.25)
+Build-Depends-Indep: default-jdk | sun-java6-jdk
+Standards-Version: 3.9.2
+Homepage: http://kafka.apache.org/downloads.html
+
+Package: kafka
+Architecture: any
+Depends: ${misc:Depends}, upstart
+Description: Apache Kafka is a distributed publish-subscribe messaging system.
+ Kafka provides a publish-subscribe solution that can handle all activity
+ stream data and processing on a consumer-scale web site.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..f214dca
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,31 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: kafka
+Source: url://example.com
+
+Files: *
+Copyright: years put author's name and email here
+ years likewise for another author
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2013 Andrew Otto o...@wikimedia.org
+License: Apache-2.0
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the License);
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an AS IS BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache version 2.0 license
+ can be found in /usr/share/common-licenses/Apache-2.0.
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 000..7523658
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,4 @@
+/usr/lib/kafka
+/etc/kafka
+/var/log/kafka
+/etc/init
\ No newline at end of file
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 000..b43bf86
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/install.sh b/debian/install.sh
new file mode 100755
index 000..477256c
--- /dev/null
+++ b/debian/install.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+basedir=$1
+destdir=$2
+
+# Install all files in $basedir
+# (minus the debian/ and config/ directory)
+# into $destdir
+for file in $(ls $basedir | grep -v 'debian' | grep -v 'config'); do
+cp -r $file $destdir/$file
+done
diff --git a/debian/kafka.upstart.conf b/debian/kafka.upstart.conf
new file mode 100644
index 000..61827cd
--- /dev/null
+++ b/debian/kafka.upstart.conf
@@ -0,0 +1,25 @@
+# Kafka Broker Service
+
+description Kafka Broker
+
+start on runlevel [2345]
+stop on starting rc RUNLEVEL=[016]
+
+respawn
+respawn limit 2 5
+
+env HOME=/etc/kafka
+env KAFKA_HOME=/usr/lib/kafka
+umask 007
+
+kill timeout 300
+
+pre-start script
+#Sanity checks
+[ -r $HOME/server.properties ]
+end script
+
+setuid kafka
+setgid kafka
+
+exec $KAFKA_HOME/bin/kafka-server-start.sh $HOME/server.properties
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 000..942a30f
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1 @@
+deluser kafka
\ No newline at end of file
diff
[MediaWiki-commits] [Gerrit] Fix mwlib.rl exports not getting committed - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/53171 Change subject: Fix mwlib.rl exports not getting committed .. Fix mwlib.rl exports not getting committed Change-Id: I8c9736453e1d85c451c168da8782a5fcd22e33d7 --- M bin/repocommit 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/71/53171/1 diff --git a/bin/repocommit b/bin/repocommit index 9f8b8b2..1c4f2fc 100755 --- a/bin/repocommit +++ b/bin/repocommit @@ -133,7 +133,7 @@ elif [ $PROJECT = mwlib ] then - gitcommitNoCheck $PROJECT + gitcommitNoCheck $PROJECT.rl elif [ $PROJECT = okawix ] then -- To view, visit https://gerrit.wikimedia.org/r/53171 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8c9736453e1d85c451c168da8782a5fcd22e33d7 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] added i18n to specialpage changed the userrights - change (mediawiki...UIFeedback)
Lbenedix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53172
Change subject: added i18n to specialpage changed the userrights
..
added i18n to specialpage
changed the userrights
Change-Id: I36b860d190bca7906f621fc28a3aabe6a1d62d07
---
M SpecialUiFeedback.php
M UiFeedback.i18n.php
M UiFeedback.php
3 files changed, 171 insertions(+), 98 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UIFeedback
refs/changes/72/53172/1
diff --git a/SpecialUiFeedback.php b/SpecialUiFeedback.php
index c4c5992..371899b 100644
--- a/SpecialUiFeedback.php
+++ b/SpecialUiFeedback.php
@@ -19,13 +19,13 @@
$output_text = '';
if(!$can_read){
-$output_text = 'You have not the right permissions to see that
Page';
+$output_text = wfMessage( 'ui-feedback-special-no-permission'
)-text();
}else{ /* can read */
/* Arrays for Output */
$importance_array = array('','--','-', '0', '+', '++');
-$happened_array = array('','did not work as expected','got
confused', 'missing feature', 'other');
-$bool_array = array('no', 'yes');
-$status_array = array('open','in review','closed','declined');
+$happened_array = array('',wfMessage(
'ui-feedback-special-happened-1' )-text(), wfMessage(
'ui-feedback-special-happened-2' )-text(), wfMessage(
'ui-feedback-special-happened-3' )-text(), wfMessage(
'ui-feedback-special-happened-4' )-text());
+$bool_array = array(wfMessage( 'ui-feedback-special-no'
)-text(),wfMessage( 'ui-feedback-special-no' )-text(),wfMessage(
'ui-feedback-special-no' )-text(),wfMessage( 'ui-feedback-special-no'
)-text(), wfMessage( 'ui-feedback-special-yes' )-text());
+$status_array = array(wfMessage(
'ui-feedback-special-status-open' )-text(),wfMessage(
'ui-feedback-special-status-in-review' )-text(),wfMessage(
'ui-feedback-special-status-closed' )-text(),wfMessage(
'ui-feedback-special-status-declined' )-text());
/* get Request-data */
@@ -50,8 +50,8 @@
$conditions = 'id ='.$id;
}else{
$conditions = 'status in ('.(($filter_status !==
'')?$filter_status:'-1').') and '. /* if no checkbox is selected filter for -1
(which will not be found - empty result) */
-'type in ('.(($filter_type !==
'')?$filter_type:'-1').') and '.
-'importance in ('.(($filter_importance !==
'')?$filter_importance:'-1').')';
+'type in ('.(($filter_type !== '')?$filter_type:'-1').')
and '.
+'importance in ('.(($filter_importance !==
'')?$filter_importance:'-1').')';
}
$res = $dbr-select(
array('uifeedback'),
@@ -88,31 +88,31 @@
|__| |__|/__| \___ __|
\/ */
$output_text .= 'div class=filters';
-$output_text .= 'h2Filter/h2';
+$output_text .= 'h2'.wfMessage( 'ui-feedback-special-filter'
)-text().'/h2';
$output_text .= 'form action='.$_SERVER['PHP_SELF'].'
method=GET';
$output_text .= 'table style=border-collapse:
separate;border-spacing: 10px 5px;';
$output_text .= 'tr';
-$output_text .= 'thStatus/th';
-$output_text .= 'thImportance/th';
-$output_text .= 'thType/th';
+$output_text .= 'th'.wfMessage(
'ui-feedback-special-table-head-status' )-text().'/th';
+$output_text .= 'th'.wfMessage(
'ui-feedback-special-table-head-importance' )-text().'/th';
+$output_text .= 'th'.wfMessage(
'ui-feedback-special-table-head-type' )-text().'/th';
$output_text .= '/tr';
$output_text .= 'tr';
-$output_text .= 'tdlabelinput type=checkbox
name=filter_status value=0
'.((strpos('#'.$filter_status,'0'))?'checked':'').'open/label/td';
-$output_text .= 'tdlabelinput type=checkbox
name=filter_importance value=0
'.((strpos('#'.$filter_importance,'0'))?'checked':'').'undefined/label/td';
-$output_text .= 'tdlabelinput type=checkbox
name=filter_type value=1
'.((strpos('#'.$filter_type,'1'))?'checked':'').'Screenshot/label/td';
+$output_text .= 'tdlabelinput type=checkbox
name=filter_status value=0
'.((strpos('#'.$filter_status,'0'))?'checked':'').''.wfMessage(
'ui-feedback-special-status-open' )-text().'/label/td';
+$output_text .= 'tdlabelinput type=checkbox
name=filter_importance value=0
'.((strpos('#'.$filter_importance,'0'))?'checked':'').''.wfMessage(
'ui-feedback-special-undefined' )-text().'/label/td';
+$output_text
[MediaWiki-commits] [Gerrit] Don't keep any archived gerrit sshd logs - change (operations/puppet)
Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53173
Change subject: Don't keep any archived gerrit sshd logs
..
Don't keep any archived gerrit sshd logs
Change-Id: I49e51d30d13c6a6254dca92c1bcbb60ff7676281
---
M manifests/gerrit.pp
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/53173/1
diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp
index 94a3c57..c2f39f4 100644
--- a/manifests/gerrit.pp
+++ b/manifests/gerrit.pp
@@ -375,6 +375,13 @@
user = root,
hour = 1
}
+
+ cron { clear_gerrit_sshd_log:
+ # Don't keep any archived sshd logs.
+ command = rm /var/lib/gerrit2/review_site/logs/sshd_log.*
+ user = root,
+ hour = 1
+ }
}
# Setup the `gerritslave` account on any host that wants to receive
--
To view, visit https://gerrit.wikimedia.org/r/53173
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I49e51d30d13c6a6254dca92c1bcbb60ff7676281
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon ch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45159) Splitting snaklistview from referenceview - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: (bug 45159) Splitting snaklistview from referenceview
..
(bug 45159) Splitting snaklistview from referenceview
This change set separates the responsibilities of the snaklistview widget from
the ones
of the referenceviewwidget. Now, the snaklistview is actually manages just a
list of snaks
while the referenceview just adds some additional functionality regarding the
handling of
references. Furthermore, the statementview manages removing the referenceviews.
Change-Id: Id677e6a6387661f00945d6b5dcaa8603705530cb
---
M lib/resources/Resources.php
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
4 files changed, 221 insertions(+), 196 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index e9489ab..b919fc2 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -463,6 +463,7 @@
),
'dependencies' = array(
'jquery.wikibase.snakview',
+ 'wikibase.utilities',
),
'messages' = array(
'wikibase-claimview-snak-tooltip',
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index 946b967..f0bf43d 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -21,9 +21,19 @@
widgetBaseClass: 'wb-referenceview',
/**
-* @see jQuery.claimview._create
+* Reference object represented by this view.
+* @type {wb.Reference}
+*/
+ _reference: null,
+
+ /**
+* @see jQuery.wikibase.snaklistview._create
*/
_create: function() {
+ if ( this.option( 'value' ) ) {
+ this._reference = this.option( 'value' );
+ this.option( 'value', this._reference.getSnaks() );
+ }
PARENT.prototype._create.call( this );
this._updateReferenceHashClass( this.value() );
},
@@ -46,30 +56,43 @@
},
/**
-* Returns the current reference represented by the view. In case of an
empty reference view,
-* without any snak values set yet, null will be returned.
+* Sets/Returns the current reference represented by the view. In case
of an empty reference
+* view, without any snak values set yet, null will be returned.
+* @see jQuery.wikibase.snaklistview.value
* @since 0.4
*
+* @param {wb.Reference} [reference] New reference to be set
* @return {wb.Reference|null}
*/
- value: function() {
- var self = this,
- snaks = [];
-
- $.each( this._listview.items(), function( i, item ) {
- var liInstance =
self._listview.listItemAdapter().liInstance( $( item ) );
- if ( liInstance.snak() ) {
- snaks.push( liInstance.snak() );
+ value: function( reference ) {
+ if ( reference ) {
+ if ( !( value instanceof wb.Reference ) ) {
+ throw new Error( 'Value has to be an instance
of wikibase.Reference' );
}
- } );
-
- if ( this._reference ) {
- return new wb.Reference( snaks,
this._reference.getHash() );
- } else if ( snaks.length 0 ) {
- return new wb.Reference( snaks );
+ this._reference = reference;
+ return this._reference;
} else {
- return null;
+ var snakList = PARENT.prototype.value.call( this );
+
+ if ( this._reference ) {
+ return new wb.Reference( snakList,
this._reference.getHash() );
+ } else if ( snakList ) {
+ return new wb.Reference( snakList );
+ } else {
+ return null;
+ }
}
+ },
+
+ /**
+* Forwards to _saveReferenceApiCall implementing the abstract method of
+* jquery.wikibase.snaklistview.
+* @see jQuery.wikibase.snaklistview._saveSnakList
+*
+* @return {jQuery.promise}
+*/
+ _saveSnakList: function() {
+
[MediaWiki-commits] [Gerrit] (bug 45952) Reenable TimedText namespace on foundationwiki - change (operations/mediawiki-config)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/53174 Change subject: (bug 45952) Reenable TimedText namespace on foundationwiki .. (bug 45952) Reenable TimedText namespace on foundationwiki To fix a page that was created in this namespace before this config was required Change-Id: I6c69fa3ce1c26fe7a8b2b697737d1d382089401f --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/74/53174/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3883f14..76b2e4b 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10254,6 +10254,7 @@ 'enwiki' = true, 'test2wiki' = true, 'testwiki' = true, + 'foundationwiki' = true, ), 'wmgUseVisualEditor' = array( -- To view, visit https://gerrit.wikimedia.org/r/53174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c69fa3ce1c26fe7a8b2b697737d1d382089401f Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk kren...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45159) Separated toolbar for editing a reference's snaks - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: (bug 45159) Separated toolbar for editing a reference's snaks
..
(bug 45159) Separated toolbar for editing a reference's snaks
Instead of having a simulated main snak, a toolbar above a reference's list of
snaks
will control starting/stopping edit mode for the reference's snaks.
Change-Id: I3b31dd7e240a779b2a036e43cc568d0ed3709c02
---
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
M lib/resources/templates.php
M lib/resources/wikibase.css
M selenium/lib/modules/reference_module.rb
5 files changed, 33 insertions(+), 31 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index 1e13478..0f318b5 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -21,14 +21,6 @@
widgetBaseClass: 'wb-referenceview',
/**
-* (Additional) default options.
-* @see jQuery.Widget.options
-*/
- options: {
- removeFirstSnak: false
- },
-
- /**
* Reference object represented by this view.
* @type {wb.Reference}
*/
@@ -85,7 +77,7 @@
var snakList = PARENT.prototype.value.call( this );
if ( this._reference ) {
- return new wb.Reference( snakList,
this._reference.getHash() );
+ return new wb.Reference( snakList || [],
this._reference.getHash() );
} else if ( snakList ) {
return new wb.Reference( snakList );
} else {
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
index 5371376..b25d460 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
@@ -19,12 +19,6 @@
* set initially. If this is null, the view will start edit mode upon
initialization.
* Default: null
*
- * @option removeFirstSnak {boolean} Defines whether it should be possible to
remove the first snak
- * just like the other snaks by displaying a remove link next to the
snakview. If false,
- * there will be no remove link next to the first snak which allows
an other toolbar
- * to be diplayed in that location.
- * Default: true
- *
* @option helpMessage {string} End-user message explaining how to use the
snaklistview widget. The
* message is most likely to be used inside the tooltip of the toolbar
corresponding to
* the snaklistview.
@@ -74,7 +68,6 @@
'$listview': '.wb-snaklistview-listview'
},
value: null,
- removeFirstSnak: true,
helpMessage: mw.msg( 'wikibase-claimview-snak-new-tooltip' )
},
@@ -219,9 +212,7 @@
snakview.startEditing();
- if ( self.option( 'removeFirstSnak' ) || i 0
) {
- self._createRemoveToolbar( $( item ) );
- }
+ self._createRemoveToolbar( $( item ) );
} );
// Append add toolbar to add new snaks:
@@ -426,6 +417,10 @@
snakList = new wb.SnakList(),
isValid = true;
+ if ( this._listview.items().length === 0 ) {
+ return false;
+ }
+
$.each( this._listview.items(), function( i, item ) {
var snakview = self._lia.liInstance( $( item ) );
@@ -448,9 +443,7 @@
enterNewItem: function() {
var $newLi = this._listview.addItem();
- if ( this._listview.items().length 1 ) {
- this._createRemoveToolbar( $newLi );
- }
+ this._createRemoveToolbar( $newLi );
this.startEditing();
diff --git a/lib/resources/templates.php b/lib/resources/templates.php
index 8c379e6..e376e07 100644
--- a/lib/resources/templates.php
+++ b/lib/resources/templates.php
@@ -123,8 +123,10 @@
$templates['wb-snaklistview'] =
HTML
div class=wb-snaklistview
+ div class=wb-snaklistview-heading
+ div class=wb-snaklistview-toolbar$2/div !-- edit section
--
+ /div
div class=wb-snaklistview-listview$1/div !-- wb-listview --
- div class=wb-snaklistview-toolbar$2/div
[MediaWiki-commits] [Gerrit] Add function to get formatted parser error in span tag - change (mediawiki/core)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53175
Change subject: Add function to get formatted parser error in span tag
..
Add function to get formatted parser error in span tag
to help reduce duplication of code in core parser functions, extensions, etc.
and improve consistency.
Change-Id: Ibf9c3cd4e2ee755867eb6e5baab5479c03572f43
---
M includes/parser/Parser.php
1 file changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/75/53175/1
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 2c46ee7..7e6691f 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -5879,4 +5879,24 @@
}
return $parsedWidthParam;
}
+
+ /**
+* Get formatted error html
+*
+* @since 1.21
+*
+* @param $messageKey string
+* @param $params[]
+*
+* @return string
+*/
+ public function formatError( $messageKey, $params = null ) {
+ $msg = is_array( $params ) ? wfMessage( $messageKey, $params
)-text() : wfMessage( $messageKey );
+
+ return \Html::element(
+ 'span',
+ array( 'class' = 'error' ),
+ $msg
+ );
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/53175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf9c3cd4e2ee755867eb6e5baab5479c03572f43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix some stupid mistakes - change (mediawiki...WikimediaMaintenance)
Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53176
Change subject: Fix some stupid mistakes
..
Fix some stupid mistakes
- Need '' to ignore default settings
- Silly variable typos
- Don't check for int-style skins in bogus check, it
causes false counts and is already handled above
Change-Id: I69e34b0fd1e3fb81054dddfa8085701ba3dc1bc7
---
M cleanupSkinPrefs.php
1 file changed, 6 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance
refs/changes/76/53176/1
diff --git a/cleanupSkinPrefs.php b/cleanupSkinPrefs.php
index 3fe5122..039ca3e 100644
--- a/cleanupSkinPrefs.php
+++ b/cleanupSkinPrefs.php
@@ -50,6 +50,8 @@
# Current skins
$currentSkins = array_keys( Skin::getSkinNames() );
+ # Plus an empty string for default
+ $currentSkins[] = '';
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
@@ -59,7 +61,7 @@
$res = (int)$dbr-selectField( 'user_properties', 'COUNT(*) as
count',
array( 'up_property' = 'skin', 'up_value' =
array_keys( $cleanupMap ) ), __METHOD__ );
$this-output( $res users with old integer-style skin
preferences\n );
- if( !$countOnly $count 0 ) {
+ if( !$countOnly $res 0 ) {
$this-output( Updating... );
foreach( $cleanupMap as $old = $new ) {
$dbw-update( 'user_properties', array(
'up_value' = $new ),
@@ -70,9 +72,10 @@
}
$res = (int)$dbr-selectField( 'user_properties', 'COUNT(*) as
count',
- array( 'up_property' = 'skin', 'up_value NOT IN (' .
$dbr-makeList( $currentSkins ) . ')' ), __METHOD__ );
+ array( 'up_property' = 'skin', 'up_value NOT IN (' .
$dbr-makeList( $currentSkins ) . ')' ), __METHOD__ )
+ - $res;
$this-output( $res users with bogus skin properties\n );
- if( !$countOnly $count 0 ) {
+ if( !$countOnly $res 0 ) {
$this-output( Updating... );
$dbw-delete( 'user_properties',
array( 'up_property' = 'skin', 'up_value NOT
IN (' . $dbw-makeList( $currentSkins ) . ')' ), __METHOD__ );
--
To view, visit https://gerrit.wikimedia.org/r/53176
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I69e34b0fd1e3fb81054dddfa8085701ba3dc1bc7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Demon ch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixes for e288e4036 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixes for e288e4036
..
Fixes for e288e4036
Changed static calls to instance functions.
Make BitmapHandler::rotate() non-static.
We don't have a Bitmap class. It should have
been falling back to BitmapHandler class.
(JpegHandler ← ExifBitmapHandler ← BitmapHandler)
Change-Id: I17be410456b00cef2ded8d6e2282ae0de4785695
---
M includes/api/ApiImageRotate.php
M includes/media/Bitmap.php
M includes/media/ExifBitmap.php
M includes/media/Jpeg.php
4 files changed, 13 insertions(+), 13 deletions(-)
Approvals:
Anomie: Looks good to me, approved
devunt: Looks good to me, but someone else must approve
J: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/api/ApiImageRotate.php b/includes/api/ApiImageRotate.php
index 3815d41..80a8078 100644
--- a/includes/api/ApiImageRotate.php
+++ b/includes/api/ApiImageRotate.php
@@ -134,7 +134,7 @@
*/
private function getPageSet() {
if ( $this-mPageSet === null ) {
- $this-mPageSet = new ApiPageSet( $this, 0, NS_FILE);
+ $this-mPageSet = new ApiPageSet( $this, 0, NS_FILE );
}
return $this-mPageSet;
}
diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 0ad862d..c31c46b 100644
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -634,7 +634,7 @@
# Escape glob chars
$path = preg_replace( '/[*?\[\]{}]/', '\0', $path );
- return self::escapeMagickPath( $path, $scene );
+ return $this-escapeMagickPath( $path, $scene );
}
/**
@@ -644,7 +644,7 @@
*/
function escapeMagickOutput( $path, $scene = false ) {
$path = str_replace( '%', '%%', $path );
- return self::escapeMagickPath( $path, $scene );
+ return $this-escapeMagickPath( $path, $scene );
}
/**
@@ -762,26 +762,26 @@
* @since 1.21
* @return bool
*/
- public static function rotate( $file, $params ) {
+ public function rotate( $file, $params ) {
global $wgImageMagickConvertCommand;
- $rotation = ( $params[ 'rotation' ] + self::getRotation( $file
) ) % 360;
+ $rotation = ( $params[ 'rotation' ] + $this-getRotation( $file
) ) % 360;
$scene = false;
$scaler = self::getScalerType( null, false );
switch ( $scaler ) {
case 'im':
$cmd = wfEscapeShellArg(
$wgImageMagickConvertCommand ) . .
- wfEscapeShellArg(
self::escapeMagickInput( $params[ 'srcPath' ], $scene ) ) .
+ wfEscapeShellArg(
$this-escapeMagickInput( $params[ 'srcPath' ], $scene ) ) .
-rotate -$rotation .
- wfEscapeShellArg(
self::escapeMagickOutput( $params[ 'dstPath' ] ) ) . 21;
+ wfEscapeShellArg(
$this-escapeMagickOutput( $params[ 'dstPath' ] ) ) . 21;
wfDebug( __METHOD__ . : running ImageMagick:
$cmd\n );
wfProfileIn( 'convert' );
$retval = 0;
$err = wfShellExec( $cmd, $retval, $env );
wfProfileOut( 'convert' );
if ( $retval !== 0 ) {
- self::logErrorForExternalProcess(
$retval, $err, $cmd );
+ $this-logErrorForExternalProcess(
$retval, $err, $cmd );
return new MediaTransformError(
'thumbnail_error', 0, 0, $err );
}
return false;
diff --git a/includes/media/ExifBitmap.php b/includes/media/ExifBitmap.php
index 1a761f3..1671ab2 100644
--- a/includes/media/ExifBitmap.php
+++ b/includes/media/ExifBitmap.php
@@ -190,7 +190,7 @@
}
$data = $file-getMetadata();
- return self::getRotationForExif( $data );
+ return $this-getRotationForExif( $data );
}
/**
diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php
index cd6f18c..355cab3 100644
--- a/includes/media/Jpeg.php
+++ b/includes/media/Jpeg.php
@@ -66,10 +66,10 @@
* @since 1.21
* @return bool
*/
- public static function rotate( $file, $params ) {
+ public function rotate( $file, $params ) {
global $wgJpegTran;
- $rotation = ( $params[ 'rotation' ] + self::getRotation( $file
) ) % 360;
+ $rotation = (
[MediaWiki-commits] [Gerrit] Readd $runningQueuedFunctions - change (mediawiki...code-utils)
jenkins-bot has submitted this change and it was merged.
Change subject: Readd $runningQueuedFunctions
..
Readd $runningQueuedFunctions
Dropped by Hashar in change 37509, but needed by later changesets
for supporting anonymous functions.
Change-Id: Ie629624dcc4a83eba09211505d41e438ec5ae304
---
M check-vars.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Demon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/check-vars.php b/check-vars.php
index d03f6d4..dfe9bc3 100755
--- a/check-vars.php
+++ b/check-vars.php
@@ -378,6 +378,7 @@
function execute() {
global $IP;
$currentToken = null;
+ $runningQueuedFunctions = false;
foreach ( $this-mTokens as $token ) {
if ( self::isMeaningfulToken( $currentToken ) )
@@ -575,7 +576,7 @@
if ( isset(
$this-mFunctionGlobals[ $token[1] ] ) ) {
$this-mFunctionGlobals[ $token[1] ][0] ++;
} elseif (
$this-shouldBeGlobal( $token[1] ) ) {
- if (
$this-mStatus == self::IN_FUNCTION_PARAMETERS ) {
+ if (
$this-mStatus == self::IN_FUNCTION_PARAMETERS $runningQueuedFunctions ) {
// It will be a global passed in the use clause of the anonymous function
$this-mFunctionGlobals[ $token[1] ] = array( 0, 0, $token[2] );
} else {
--
To view, visit https://gerrit.wikimedia.org/r/48254
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie629624dcc4a83eba09211505d41e438ec5ae304
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/code-utils
Gerrit-Branch: master
Gerrit-Owner: Platonides platoni...@gmail.com
Gerrit-Reviewer: Demon ch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert 'no' is already in global blacklist - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Revert 'no' is already in global blacklist .. Revert 'no' is already in global blacklist This reverts commit 7201380abc4b3781e0e5d775eb86f9045096757b Change-Id: Ib4a733c8550c89e297f6c13455504792b54c4ea7 --- M groups/OpenStreetMap/WaymarkedTrails.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/OpenStreetMap/WaymarkedTrails.yaml b/groups/OpenStreetMap/WaymarkedTrails.yaml index 51e2fe9..b481aa1 100644 --- a/groups/OpenStreetMap/WaymarkedTrails.yaml +++ b/groups/OpenStreetMap/WaymarkedTrails.yaml @@ -32,6 +32,8 @@ sourcePattern: %GROUPROOT%/waymarked-trails-site/django/locale/%CODE%/LC_MESSAGES/django.po definitionFile: %GROUPROOT%/waymarked-trails-site/django/locale/qot/LC_MESSAGES/django.po targetPattern: waymarked-trails-site/django/locale/%CODE%/LC_MESSAGES/django.po + codeMap: +no: x-invalidLanguageCode header: | # This file is part of the Waymarked Trails Map Project -- To view, visit https://gerrit.wikimedia.org/r/53177 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib4a733c8550c89e297f6c13455504792b54c4ea7 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clear refs for a group after references are emitted for the ... - change (mediawiki...Parsoid)
GWicke has submitted this change and it was merged.
Change subject: Clear refs for a group after references are emitted for the
group.
..
Clear refs for a group after references are emitted for the group.
* A references tag for a group can appear multiple times on a page.
Ex: en:List_of_number-one_albums_from_the_1960s_%28UK%29 uses
{{Reflist|group=lower-alpha}} more than once, and each reflist
tag emits references accumulated since the previous references
output. This requires clearing the refs for the group after it
is emitted.
* Parsoid wasn't clearing the group's refs. This resulted in
duplicate ref output which in turn crashed template encapsulation
code that relies on template ids being unique.
* This patch fixes it which fixes the crasher on
en:List_of_number-one_albums_from_the_1960s_%28UK%29
* No change in parser test results.
Change-Id: I48ba9c3fe2249c6ef1c1bf068c22c7985fa16e8f
---
M js/lib/ext.Cite.js
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
GWicke: Verified; Looks good to me, approved
diff --git a/js/lib/ext.Cite.js b/js/lib/ext.Cite.js
index 2d10811..09b4c35 100644
--- a/js/lib/ext.Cite.js
+++ b/js/lib/ext.Cite.js
@@ -230,6 +230,9 @@
new KV('typeof',
'mw:Object/References')
], dataAttribs)
].concat( listItems, [ new EndTagTk( 'ol' ) ] );
+
+ // Clear the emitted ref groups
+ group.refs = [];
} else {
res = genPlaceholderTokens(this.manager.env, token,
references /);
}
--
To view, visit https://gerrit.wikimedia.org/r/51586
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48ba9c3fe2249c6ef1c1bf068c22c7985fa16e8f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Record correct normalized href attribute for extlinks. - change (mediawiki...Parsoid)
GWicke has submitted this change and it was merged.
Change subject: Record correct normalized href attribute for extlinks.
..
Record correct normalized href attribute for extlinks.
* Fixes RTing of snippets like [http://foo.com?a=a035;b bar]
* Also got rid of stale dataAttribs.gc attribute from tokenizer.
* 3 more wt2wt tests green.
* Fixes RTing of en:Maverick House Publishers.
Change-Id: Ie3aba841405717a22bffca9448ae58568a53bdd7
---
M js/lib/ext.core.LinkHandler.js
M js/lib/pegTokenizer.pegjs.txt
2 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
MarkTraceur: Looks good to me, but someone else must approve
GWicke: Verified; Looks good to me, approved
diff --git a/js/lib/ext.core.LinkHandler.js b/js/lib/ext.core.LinkHandler.js
index 72bac31..eee9876 100644
--- a/js/lib/ext.core.LinkHandler.js
+++ b/js/lib/ext.core.LinkHandler.js
@@ -839,7 +839,11 @@
href = Sanitizer._stripIDNs( href );
}
- aStart.addNormalizedAttribute( 'href', href, origHref );
+ // targetOff covers all spaces before content
+ // and we need src without those spaces.
+ var tsr0 = dataAttribs.tsr[0] + 1,
+ tsr1 = dataAttribs.targetOff -
(token.getAttribute('spaces') || '').length;
+ aStart.addNormalizedAttribute( 'href', href,
env.page.src.substring(tsr0, tsr1) );
cb( {
tokens: [aStart].concat(content, [new EndTagTk('a')])
} );
diff --git a/js/lib/pegTokenizer.pegjs.txt b/js/lib/pegTokenizer.pegjs.txt
index 2570b62..cf8e24a 100644
--- a/js/lib/pegTokenizer.pegjs.txt
+++ b/js/lib/pegTokenizer.pegjs.txt
@@ -743,9 +743,6 @@
//}
//console.warn( 'extlink text: ' + pp( text ) );
var dataAttribs = { targetOff: targetOff };
-if ( content === '' ) {
-dataAttribs.gc = 1;
-}
dataAttribs.tsr = [pos0, pos];
return [
new SelfclosingTagTk( 'extlink', [
--
To view, visit https://gerrit.wikimedia.org/r/51600
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3aba841405717a22bffca9448ae58568a53bdd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix some stupid mistakes in cleanupSkinPrefs - change (mediawiki...WikimediaMaintenance)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix some stupid mistakes in cleanupSkinPrefs
..
Fix some stupid mistakes in cleanupSkinPrefs
- Need '' to ignore default settings
- Silly variable typos
- Don't check for int-style skins in bogus check, it
causes false counts and is already handled above
Change-Id: I69e34b0fd1e3fb81054dddfa8085701ba3dc1bc7
---
M cleanupSkinPrefs.php
1 file changed, 7 insertions(+), 4 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/cleanupSkinPrefs.php b/cleanupSkinPrefs.php
index 3fe5122..453d312 100644
--- a/cleanupSkinPrefs.php
+++ b/cleanupSkinPrefs.php
@@ -50,6 +50,8 @@
# Current skins
$currentSkins = array_keys( Skin::getSkinNames() );
+ # Plus an empty string for default
+ $currentSkins[] = '';
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
@@ -59,7 +61,7 @@
$res = (int)$dbr-selectField( 'user_properties', 'COUNT(*) as
count',
array( 'up_property' = 'skin', 'up_value' =
array_keys( $cleanupMap ) ), __METHOD__ );
$this-output( $res users with old integer-style skin
preferences\n );
- if( !$countOnly $count 0 ) {
+ if( !$countOnly $res 0 ) {
$this-output( Updating... );
foreach( $cleanupMap as $old = $new ) {
$dbw-update( 'user_properties', array(
'up_value' = $new ),
@@ -69,13 +71,14 @@
$this-output( done.\n );
}
+ $dontChange = array_merge( $currentSkins, array_keys(
$cleanupMap ) );
$res = (int)$dbr-selectField( 'user_properties', 'COUNT(*) as
count',
- array( 'up_property' = 'skin', 'up_value NOT IN (' .
$dbr-makeList( $currentSkins ) . ')' ), __METHOD__ );
+ array( 'up_property' = 'skin', 'up_value NOT IN (' .
$dbr-makeList( $dontChange ) . ')' ), __METHOD__ );
$this-output( $res users with bogus skin properties\n );
- if( !$countOnly $count 0 ) {
+ if( !$countOnly $res 0 ) {
$this-output( Updating... );
$dbw-delete( 'user_properties',
- array( 'up_property' = 'skin', 'up_value NOT
IN (' . $dbw-makeList( $currentSkins ) . ')' ), __METHOD__ );
+ array( 'up_property' = 'skin', 'up_value NOT
IN (' . $dbw-makeList( $dontChange ) . ')' ), __METHOD__ );
$this-output( done.\n );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/53176
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I69e34b0fd1e3fb81054dddfa8085701ba3dc1bc7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Demon ch...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: OliverKeyes oke...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 44674) Entity search: Prevent closing suggestion list - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: (bug 44674) Entity search: Prevent closing suggestion list
..
(bug 44674) Entity search: Prevent closing suggestion list
The change set prevents the suggestion list of the entity selector replacing
the native
search box from closing if there are no actual suggestions. If there are no
suggestions,
the link to the full-text search will remain visible.
- patch set 4: rebase
- patch set 5: minor fix regarding event handling
Change-Id: I0069a6b1ae1f6264c2a59c29bafffbb6b520a946
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
M repo/resources/wikibase.ui.entitysearch.js
2 files changed, 25 insertions(+), 10 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
index 55cfd66..ae85f8b 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
@@ -51,7 +51,7 @@
* @option messages['more'] {String} (optional) Label of the link to display
more suggestions.
* Default value: 'more'
*
- * @option emulateSearch {boolean} (optional) Allows emulating the behaviour
of a search box by
+ * @option emulateSearchBox {boolean} (optional) Allows emulating the
behaviour of a search box by
* linking the entities to their corresponding pages. Instead of
selecting an entity, the
* whole page will be redirected to the entity page.
* Default value: false
@@ -117,7 +117,7 @@
'aliases-label': mwMsgOrString(
'wikibase-aliases-label', 'also known as:' ),
'more': mwMsgOrString(
'wikibase-entityselector-more', 'more' )
},
- emulateSearch: false // TODO: Allow setting a custom
target to trigger the redirect on
+ emulateSearchBox: false // TODO: Allow setting a custom
target to trigger the redirect on
},
/**
@@ -193,7 +193,7 @@
// and select it
if ( event.keyCode === $.ui.keyCode.ENTER ) {
- if ( self.options.emulateSearch
self.selectedEntity() ) {
+ if ( self.options.emulateSearchBox
self.selectedEntity() ) {
// Prevent submitting search
form since we want to redirect directly to the
// entity.
event.stopImmediatePropagation();
@@ -231,7 +231,7 @@
$( event.target ).closest(
'.ui-menu-item' ).data( 'item.autocomplete' );
self._setEntity( item );
- if ( self.options.emulateSearch ) {
+ if ( self.options.emulateSearchBox ) {
window.location.href = item.url;
}
@@ -344,7 +344,22 @@
* @see ui.suggester.close
*/
close: function( event ) {
- if ( !event || !event.originalEvent ||
event.originalEvent.type !== 'programmatic' ) {
+ var originalType = ( event event.originalEvent
event.originalEvent.type )
+ ? event.originalEvent.type
+ : null;
+
+ // When emulating a search box and there is a custom
item, only close the list of
+ // suggestions when blurring or when there is no text
in the input box.
+ if (
+ this.options.emulateSearchBox
this.options.customListItem
+originalType !== 'blur' originalType !==
'programmatic'
+this.element.val() !== ''
+ ) {
+ // Reset list content leaving just the custom
item.
+ this.offset = 0;
+ this.menu.element.children().remove();
+ this.menu.refresh();
+ } else {
// Do not close the list of suggestions when
programmatically selecting an entity
// (e.g by typing an exact, unique entity
label), allowing the user to check that
// the typed string actually matches a single
entity.
@@ -486,13 +501,13 @@
}
[MediaWiki-commits] [Gerrit] Round 1 of Japan Localization feedback changes - change (mediawiki...DonationInterface)
Katie Horn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53178
Change subject: Round 1 of Japan Localization feedback changes
..
Round 1 of Japan Localization feedback changes
Change-Id: I7319346377c5263f914d549e85a9b2d9995e3324
---
M adyen_gateway/adyen.adapter.php
M gateway_common/DataValidator.php
M gateway_common/DonationData.php
M gateway_common/gateway.adapter.php
A globalcollect_gateway/forms/html/_personal-information/JP.html
M globalcollect_gateway/globalcollect.adapter.php
6 files changed, 52 insertions(+), 8 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/78/53178/1
diff --git a/adyen_gateway/adyen.adapter.php b/adyen_gateway/adyen.adapter.php
index ce3cef8..788c6cf 100644
--- a/adyen_gateway/adyen.adapter.php
+++ b/adyen_gateway/adyen.adapter.php
@@ -294,7 +294,7 @@
protected function stage_amount( $type = 'request' ) {
switch ( $type ) {
case 'request':
- if ( in_array(
$this-staged_data['currency_code'], $this-non_fractional_currencies ) ) {
+ if ( !DataValidator::is_fractional_currency(
$this-staged_data['currency_code'] ) ) {
$this-staged_data['amount'] = floor(
$this-staged_data['amount'] );
}
diff --git a/gateway_common/DataValidator.php b/gateway_common/DataValidator.php
index 9f8abff..9eedd0a 100644
--- a/gateway_common/DataValidator.php
+++ b/gateway_common/DataValidator.php
@@ -961,4 +961,21 @@
}
return false;
}
+
+ /**
+* More of a validation helper function. If an amount is ever expressed
for
+* the fractional currencies defined in this function,
+* they should not have an associated fractional amount (so: full
integers only).
+* @param string $currency_code The three-digit currency code.
+* @return boolean
+*/
+ public static function is_fractional_currency( $currency_code ){
+ // these currencies cannot have cents.
+ $non_fractional_currencies = array( 'CLP', 'DJF', 'IDR', 'JPY',
'KMF', 'KRW', 'MGA', 'PYG', 'VND', 'XAF', 'XOF', 'XPF' );
+
+ if ( in_array( strtoupper( $currency_code ),
$non_fractional_currencies ) ) {
+ return false;
+ }
+ return true;
+ }
}
diff --git a/gateway_common/DonationData.php b/gateway_common/DonationData.php
index a3b10ef..98f7e0d 100644
--- a/gateway_common/DonationData.php
+++ b/gateway_common/DonationData.php
@@ -636,7 +636,9 @@
return;
}
- $this-setVal( 'amount', number_format( $this-getVal( 'amount'
), 2, '.', '' ) );
+ if ( DataValidator::is_fractional_currency( $this-getVal(
'currency_code' ) ) ){
+ $this-setVal( 'amount', number_format( $this-getVal(
'amount' ), 2, '.', '' ) );
+ }
$this-expunge( 'amountGiven' );
$this-expunge( 'amountOther' );
}
diff --git a/gateway_common/gateway.adapter.php
b/gateway_common/gateway.adapter.php
index ded564d..8058db4 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -157,8 +157,6 @@
protected $url;
protected $transactions;
- public $non_fractional_currencies = array();
-
/**
* $payment_methods will be defined by the adapter.
*
@@ -269,9 +267,7 @@
$external_data = $testData;
}
}
- // these currencies cannot have cents.
- $this-non_fractional_currencies = array( 'CLP', 'DJF', 'IDR',
'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'VND', 'XAF', 'XOF', 'XPF' );
-
+
$this-dataObj = new DonationData( get_called_class(),
self::getGlobal( 'Test' ), $external_data );
$this-setValidationErrors(
$this-getOriginalValidationErrors() );
diff --git a/globalcollect_gateway/forms/html/_personal-information/JP.html
b/globalcollect_gateway/forms/html/_personal-information/JP.html
new file mode 100644
index 000..22188b4
--- /dev/null
+++ b/globalcollect_gateway/forms/html/_personal-information/JP.html
@@ -0,0 +1,29 @@
+tr
+ td colspan=2
+ h3
class=cc_header%donate_interface-cc-form-header-personal%img
src=@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif
style=vertical-align:baseline;margin-left:8px;/h3
+ /td
+/tr
+tr
+ td colspan=2
+ input class=halfwidth name=lname value=@lname
type=text placeholder=%donate_interface-donor-lname% id=lnameinput
class=halfwidth leftmar name=fname value=@fname
[MediaWiki-commits] [Gerrit] (Bug 45854) Unset the cgroup if we don't have a memory limit - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/53179 Change subject: (Bug 45854) Unset the cgroup if we don't have a memory limit .. (Bug 45854) Unset the cgroup if we don't have a memory limit We only create the cgroup if there's a memory limit, but it tried to always cleanup it, regardless if it was used or not, resulting in a «/sys/fs/cgroup/memory/mediawiki/job/32466/tasks: No such file or directory» error, when run with MW_CGROUP='mediawiki'; MW_MEM_LIMIT=0 Change-Id: I7fdb545b336ead62aa743b1bc3afdbfba2c3113f (cherry picked from commit e77397fc1de324dfc6d7b515e9440bd564311dd9) --- M includes/limit.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/79/53179/1 diff --git a/includes/limit.sh b/includes/limit.sh index 44b9edc..bc1988d 100644 --- a/includes/limit.sh +++ b/includes/limit.sh @@ -36,6 +36,8 @@ else ulimit -v $MW_MEM_LIMIT fi +else + MW_CGROUP= fi if [ $MW_FILE_SIZE_LIMIT -gt 0 ]; then ulimit -f $MW_FILE_SIZE_LIMIT -- To view, visit https://gerrit.wikimedia.org/r/53179 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7fdb545b336ead62aa743b1bc3afdbfba2c3113f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.21wmf11 Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Platonides platoni...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (Bug 45854) Unset the cgroup if we don't have a memory limit - change (mediawiki/core)
Aaron Schulz has submitted this change and it was merged. Change subject: (Bug 45854) Unset the cgroup if we don't have a memory limit .. (Bug 45854) Unset the cgroup if we don't have a memory limit We only create the cgroup if there's a memory limit, but it tried to always cleanup it, regardless if it was used or not, resulting in a «/sys/fs/cgroup/memory/mediawiki/job/32466/tasks: No such file or directory» error, when run with MW_CGROUP='mediawiki'; MW_MEM_LIMIT=0 Change-Id: I7fdb545b336ead62aa743b1bc3afdbfba2c3113f (cherry picked from commit e77397fc1de324dfc6d7b515e9440bd564311dd9) --- M includes/limit.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Aaron Schulz: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/includes/limit.sh b/includes/limit.sh index 44b9edc..bc1988d 100644 --- a/includes/limit.sh +++ b/includes/limit.sh @@ -36,6 +36,8 @@ else ulimit -v $MW_MEM_LIMIT fi +else + MW_CGROUP= fi if [ $MW_FILE_SIZE_LIMIT -gt 0 ]; then ulimit -f $MW_FILE_SIZE_LIMIT -- To view, visit https://gerrit.wikimedia.org/r/53179 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7fdb545b336ead62aa743b1bc3afdbfba2c3113f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.21wmf11 Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Platonides platoni...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix broken FormatAction tests. - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53180
Change subject: Fix broken FormatAction tests.
..
Fix broken FormatAction tests.
The ve.Surface constructor was recently changed, but the instantiation
in the FormatAction tests was not updated accordingly.
The constructor now requires a ve.init.Target object.
Bug: 39597
Change-Id: Ia4193fbab5c63007ed057009bf9a39f1f9d18fb7
---
M modules/ve/test/actions/ve.FormatAction.test.js
M modules/ve/test/index.php
2 files changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/80/53180/1
diff --git a/modules/ve/test/actions/ve.FormatAction.test.js
b/modules/ve/test/actions/ve.FormatAction.test.js
index 478c350..81a912d 100644
--- a/modules/ve/test/actions/ve.FormatAction.test.js
+++ b/modules/ve/test/actions/ve.FormatAction.test.js
@@ -11,7 +11,7 @@
function runConverterTest( assert, range, type, attributes, expectedSelection,
expectedData, label ) {
var dom = ve.createDocumentFromHTML( ve.dm.example.isolationHTML ),
- surface = new ve.Surface( $('div'), dom ),
+ surface = new ve.Surface( new ve.init.Target( $('div') ),
dom ),
formatAction = new ve.FormatAction( surface ),
data = ve.copyArray(
surface.getModel().getDocument().getFullData() );
diff --git a/modules/ve/test/index.php b/modules/ve/test/index.php
index 4cc1a4c..4a45302 100644
--- a/modules/ve/test/index.php
+++ b/modules/ve/test/index.php
@@ -18,10 +18,12 @@
script src=../../ve/ve.EventEmitter.js/script
script src=../../ve/init/ve.init.js/script
script src=../../ve/init/ve.init.Platform.js/script
+ script src=../../ve/init/ve.init.Target.js/script
script src=../../ve/ve.debug.js/script
!-- Standalone Init --
script src=../../ve/init/sa/ve.init.sa.js/script
script src=../../ve/init/sa/ve.init.sa.Platform.js/script
+ script src=../../ve/init/sa/ve.init.sa.Target.js/script
script
?php
require( '../../../VisualEditor.i18n.php' );
--
To view, visit https://gerrit.wikimedia.org/r/53180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4193fbab5c63007ed057009bf9a39f1f9d18fb7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Entity selector: Using user language when in MediaWiki context - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: Entity selector: Using user language when in MediaWiki context
..
Entity selector: Using user language when in MediaWiki context
patch set 3: rebase
Change-Id: I001bd969c234b520b889f8f9c09fe1b924f0d79b
---
M lib/resources/jquery.valueview.views/wikibaseItem.js
M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js
M repo/resources/wikibase.ui.entitysearch.js
5 files changed, 8 insertions(+), 13 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
diff --git a/lib/resources/jquery.valueview.views/wikibaseItem.js
b/lib/resources/jquery.valueview.views/wikibaseItem.js
index 9a7251c..b3eaeef 100644
--- a/lib/resources/jquery.valueview.views/wikibaseItem.js
+++ b/lib/resources/jquery.valueview.views/wikibaseItem.js
@@ -54,8 +54,6 @@
* @private
*/
_buildInputDom: function() {
- var language = mw.config.get( 'wgUserLanguage' );
-
return $( 'textarea/', {
'class': this.widgetBaseClass + '-input',
'type': 'text',
@@ -64,8 +62,6 @@
.inputAutoExpand( { expandWidth: false,
expandHeight:true, suppressNewLine: true } )
.entityselector( {
url: mw.util.wikiScript( 'api' ),
- language: language,
- type: 'item',
selectOnAutocomplete: true
} )
.eachchange( function( event, oldValue ) {
@@ -76,7 +72,7 @@
id: ui.item.id,
label: {}
};
- itemData.label[ language ] = ui.item.label;
+ itemData.label[ mw.config.get( 'wgUserLanguage'
) ] = ui.item.label;
// update local store with newest information
about selected item
// TODO: create more sophisticated local store
interface rather than accessing
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
index ae85f8b..1856547 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
@@ -16,7 +16,9 @@
*
* @option url {String} URL to retrieve results from.
*
- * @option language {String} Code of the language results shall be fetched in.
+ * @option language {String} (optional when in MediaWiki context) Code of the
language results shall
+ * be fetched in. Required if not in MediaWiki context.
+ * Default value: User language (when in MediaWiki context)
*
* @option type {String} (optional) Entity type that will be queried for
results.
* Default value: 'item'
@@ -106,7 +108,7 @@
*/
options: {
url: null,
- language: null,
+ language: ( IS_MW_CONTEXT ) ? mw.config.get(
'wgUserLanguage' ) : null,
type: 'item',
limit: null,
selectOnAutocomplete: false,
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
index 1e75366..cfd542a 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
@@ -182,12 +182,10 @@
* @return {jQuery}
*/
_buildPropertySelector: function() {
- var self = this,
- language = mw.config.get( 'wgUserLanguage' );
+ var self = this;
return $( 'input/' ).entityselector( {
url: mw.util.wikiScript( 'api' ),
- language: language,
type: 'property'
} )
.prop( 'placeholder', mw.msg(
'wikibase-snakview-property-input-placeholder' ) )
@@ -204,6 +202,7 @@
// entity chosen in entity selector but we still need
the data type of the entity, so
// we have to make a separate API call:
var api = new wb.RepoApi(),
+ language = mw.config.get( 'wgUserLanguage' ),
entityId = ui.item.id;
// Display spinner as long as the value
[MediaWiki-commits] [Gerrit] Updated builder-corrected-tag fixup to add placeholders always. - change (mediawiki...Parsoid)
GWicke has submitted this change and it was merged.
Change subject: Updated builder-corrected-tag fixup to add placeholders always.
..
Updated builder-corrected-tag fixup to add placeholders always.
* echo |foo would parse to an empty string because this would
parse to a tr-token which the builder strips but leaves behind
a mw:StartTag meta-marker. findBuilderCorrectedTags function
wasn't properly processing these markers and possibly other
markers as well.
* Fixed addPlaceholderMeta helper function to be smarter and fix
this up. With this patch, this wikitext snippet now parses and
RTs correctly. There are notes in the file about possible
improvements which makes this text editable (currently VE will
likely ignore content wrapped in mw:Placeholder metas).
* 2 more wt2wt tests now green.
* Improves RT-ing of en:Drum tabs.
Change-Id: I259bd235b8b11bff706a30a13f29723c21cef892
---
M js/lib/mediawiki.DOMPostProcessor.js
1 file changed, 46 insertions(+), 13 deletions(-)
Approvals:
GWicke: Verified; Looks good to me, approved
diff --git a/js/lib/mediawiki.DOMPostProcessor.js
b/js/lib/mediawiki.DOMPostProcessor.js
index 8426339..66e70c4 100644
--- a/js/lib/mediawiki.DOMPostProcessor.js
+++ b/js/lib/mediawiki.DOMPostProcessor.js
@@ -1450,19 +1450,49 @@
}
}
- function addPlaceholderMeta( node, dp, name ) {
- var placeHolder = node.ownerDocument.createElement('meta'),
- // TODO: pass in more precise source!
- endSrc = dp.src ||
- ( DU.hasLiteralHTMLMarker(dp) ?
- '/' + name + '' : '' );
+ function addPlaceholderMeta( node, dp, name, opts ) {
+ var src = dp.src;
- if (!endSrc dp.tsr) {
- endSrc = env.page.src.substring(dp.tsr[0], dp.tsr[1]);
+ if (!src) {
+ if (dp.tsr) {
+ src = env.page.src.substring(dp.tsr[0],
dp.tsr[1]);
+ } else if (opts.tsr) {
+ src = env.page.src.substring(opts.tsr[0],
opts.tsr[1]);
+ } else if (DU.hasLiteralHTMLMarker(dp)) {
+ if (opts.start) {
+ src = + name + ;
+ } else if (opts.end) {
+ src = / + name + ;
+ }
+ }
}
- if ( endSrc ) {
+
+ if ( src ) {
+ var placeHolder;
+
+ /**
+* SSS FIXME: We can do better with these checks and
introducing
+* plain text instead of a placeholder. However, in
some cases,
+* it does introduce nowiki escaping if this src has
leading spaces
+* that could be parsed as pres.
+*
+* A possibly fix for this is to wrap this in a span
with a public
+* attribute that tells WTS that this doesn't need
escaping which
+* would have to be cleared by VE if that text gets
edited.
+*
+* Another fix would be for nowiki escaping to get
smarter.
+*
+* But for now, leaving this note in place and using
placeholders.
+*
+ if (opts.start (name === 'tr' || name === 'td' ||
name === 'th')) {
+ placeHolder =
node.ownerDocument.createTextNode(src);
+ } else {
+ }
+ **/
+
+ placeHolder = node.ownerDocument.createElement('meta'),
placeHolder.setAttribute('typeof', 'mw:Placeholder');
- DU.setDataParsoid(placeHolder, {src: endSrc});
+ DU.setDataParsoid(placeHolder, {src: src});
// Insert the placeHolder
node.parentNode.insertBefore(placeHolder, node);
@@ -1562,17 +1592,20 @@
// Not found, the tag
was stripped. Insert an
// mw:Placeholder for
round-tripping
//console.log('autoinsertedEnd', c.innerHTML, c.parentNode.innerHTML);
- addPlaceholderMeta(c,
dp, expectedName);
+ addPlaceholderMeta(c,
dp, expectedName, {end: true});
}
} else if (
[MediaWiki-commits] [Gerrit] Add method to get EntityId for a SiteLink - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Add method to get EntityId for a SiteLink
..
Add method to get EntityId for a SiteLink
Change-Id: I9be83d2a259bae686f946f3879430903aab8b8a6
---
M lib/includes/store/SiteLinkTable.php
M lib/tests/phpunit/store/SiteLinkTableTest.php
2 files changed, 30 insertions(+), 0 deletions(-)
Approvals:
Daniel Kinzler: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/store/SiteLinkTable.php
b/lib/includes/store/SiteLinkTable.php
index 42d902f..9853e90 100644
--- a/lib/includes/store/SiteLinkTable.php
+++ b/lib/includes/store/SiteLinkTable.php
@@ -163,6 +163,8 @@
/**
* @see SiteLinkLookup::getItemIdForLink
*
+* @todo may want to deprecate this or change it to always return
entity id object only
+*
* @since 0.1
*
* @param string $globalSiteId
@@ -187,6 +189,22 @@
}
/**
+* @since 0.4
+*
+* @param SiteLink $siteLink
+*
+* return EntityId|null
+*/
+ public function getEntityIdForSiteLink( SiteLink $siteLink ) {
+ $numericItemId = $this-getItemIdForLink(
+ $siteLink-getSite()-getGlobalId(),
+ $siteLink-getPage()
+ );
+
+ return is_int( $numericItemId ) ? new EntityId(
Item::ENTITY_TYPE, $numericItemId ) : null;
+ }
+
+ /**
* @see SiteLinkLookup::getConflictsForItem
*
* @since 0.1
diff --git a/lib/tests/phpunit/store/SiteLinkTableTest.php
b/lib/tests/phpunit/store/SiteLinkTableTest.php
index dc92722..37f9b14 100644
--- a/lib/tests/phpunit/store/SiteLinkTableTest.php
+++ b/lib/tests/phpunit/store/SiteLinkTableTest.php
@@ -103,6 +103,18 @@
* @depends testSaveLinksOfItem
* @dataProvider itemProvider
*/
+ public function testGetEntityIdForSiteLink( Item $item ) {
+ $siteLinks = $item-getSiteLinks();
+
+ foreach( $siteLinks as $siteLink ) {
+ $this-assertEquals( $item-getId(),
$this-siteLinkTable-getEntityIdForSiteLink( $siteLink ) );
+ }
+ }
+
+ /**
+* @depends testSaveLinksOfItem
+* @dataProvider itemProvider
+*/
public function testCountLinks( $item ) {
$this-assertEquals(
count( $item-getSiteLinks() ),
--
To view, visit https://gerrit.wikimedia.org/r/53169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9be83d2a259bae686f946f3879430903aab8b8a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup in SiteLinkTableTest - change (mediawiki...Wikibase)
Daniel Kinzler has submitted this change and it was merged.
Change subject: Cleanup in SiteLinkTableTest
..
Cleanup in SiteLinkTableTest
add protected variable to use across tests in the class
Change-Id: Ic62d508374f6bd5f2f4f0fe25805588a5a5e97a1
---
M lib/tests/phpunit/store/SiteLinkTableTest.php
1 file changed, 14 insertions(+), 13 deletions(-)
Approvals:
Daniel Kinzler: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/tests/phpunit/store/SiteLinkTableTest.php
b/lib/tests/phpunit/store/SiteLinkTableTest.php
index a2f50b0..dc92722 100644
--- a/lib/tests/phpunit/store/SiteLinkTableTest.php
+++ b/lib/tests/phpunit/store/SiteLinkTableTest.php
@@ -25,6 +25,15 @@
*/
class SiteLinkTableTest extends \MediaWikiTestCase {
+ protected $siteLinkTable;
+
+ public function setUp() {
+ parent::setUp();
+
+ // @todo mock object
+ $this-siteLinkTable = \Wikibase\StoreFactory::getStore(
'sqlstore' )-newSiteLinkCache();
+ }
+
public function constructorProvider() {
return array(
array( 'its_a_table_name' ),
@@ -73,9 +82,7 @@
$this-markTestSkipped( Skipping because you're
running it on a WikibaseClient instance. );
}
- $siteLinkTable = \Wikibase\StoreFactory::getStore( 'sqlstore'
)-newSiteLinkCache();
-
- $res = $siteLinkTable-saveLinksOfItem( $item );
+ $res = $this-siteLinkTable-saveLinksOfItem( $item );
$this-assertTrue( $res );
}
@@ -84,9 +91,7 @@
* @dataProvider itemProvider
*/
public function testGetSiteLinksOfItem( $item ) {
- $siteLinkTable = \Wikibase\StoreFactory::getStore( 'sqlstore'
)-newSiteLinkCache();
-
- $siteLinks = $siteLinkTable-getSiteLinksForItem(
$item-getId() );
+ $siteLinks = $this-siteLinkTable-getSiteLinksForItem(
$item-getId() );
$this-assertEquals(
$item-getSiteLinks(),
@@ -99,11 +104,9 @@
* @dataProvider itemProvider
*/
public function testCountLinks( $item ) {
- $siteLinkTable = \Wikibase\StoreFactory::getStore( 'sqlstore'
)-newSiteLinkCache();
-
$this-assertEquals(
count( $item-getSiteLinks() ),
- $siteLinkTable-countLinks( array(
$item-getId()-getNumericId() ) )
+ $this-siteLinkTable-countLinks( array(
$item-getId()-getNumericId() ) )
);
}
@@ -112,15 +115,13 @@
* @dataProvider itemProvider
*/
public function testDeleteLinksOfItem( $item ) {
- $siteLinkTable = \Wikibase\StoreFactory::getStore( 'sqlstore'
)-newSiteLinkCache();
-
$this-assertTrue(
- $siteLinkTable-deleteLinksOfItem( $item-getId() ) !==
false
+ $this-siteLinkTable-deleteLinksOfItem( $item-getId()
) !== false
);
$this-assertEquals(
array(),
- $siteLinkTable-getSiteLinksForItem( $item-getId() )
+ $this-siteLinkTable-getSiteLinksForItem(
$item-getId() )
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/53168
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic62d508374f6bd5f2f4f0fe25805588a5a5e97a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: John Erling Blad john.b...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Round 1 of Japan Localization feedback changes - change (mediawiki...DonationInterface)
Mwalker has submitted this change and it was merged.
Change subject: Round 1 of Japan Localization feedback changes
..
Round 1 of Japan Localization feedback changes
Change-Id: I7319346377c5263f914d549e85a9b2d9995e3324
---
M adyen_gateway/adyen.adapter.php
M gateway_common/DataValidator.php
M gateway_common/DonationData.php
M gateway_common/gateway.adapter.php
A globalcollect_gateway/forms/html/_personal-information/JP.html
M globalcollect_gateway/globalcollect.adapter.php
6 files changed, 52 insertions(+), 8 deletions(-)
Approvals:
Mwalker: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/adyen_gateway/adyen.adapter.php b/adyen_gateway/adyen.adapter.php
index ce3cef8..788c6cf 100644
--- a/adyen_gateway/adyen.adapter.php
+++ b/adyen_gateway/adyen.adapter.php
@@ -294,7 +294,7 @@
protected function stage_amount( $type = 'request' ) {
switch ( $type ) {
case 'request':
- if ( in_array(
$this-staged_data['currency_code'], $this-non_fractional_currencies ) ) {
+ if ( !DataValidator::is_fractional_currency(
$this-staged_data['currency_code'] ) ) {
$this-staged_data['amount'] = floor(
$this-staged_data['amount'] );
}
diff --git a/gateway_common/DataValidator.php b/gateway_common/DataValidator.php
index 9f8abff..9eedd0a 100644
--- a/gateway_common/DataValidator.php
+++ b/gateway_common/DataValidator.php
@@ -961,4 +961,21 @@
}
return false;
}
+
+ /**
+* More of a validation helper function. If an amount is ever expressed
for
+* the fractional currencies defined in this function,
+* they should not have an associated fractional amount (so: full
integers only).
+* @param string $currency_code The three-digit currency code.
+* @return boolean
+*/
+ public static function is_fractional_currency( $currency_code ){
+ // these currencies cannot have cents.
+ $non_fractional_currencies = array( 'CLP', 'DJF', 'IDR', 'JPY',
'KMF', 'KRW', 'MGA', 'PYG', 'VND', 'XAF', 'XOF', 'XPF' );
+
+ if ( in_array( strtoupper( $currency_code ),
$non_fractional_currencies ) ) {
+ return false;
+ }
+ return true;
+ }
}
diff --git a/gateway_common/DonationData.php b/gateway_common/DonationData.php
index a3b10ef..98f7e0d 100644
--- a/gateway_common/DonationData.php
+++ b/gateway_common/DonationData.php
@@ -636,7 +636,9 @@
return;
}
- $this-setVal( 'amount', number_format( $this-getVal( 'amount'
), 2, '.', '' ) );
+ if ( DataValidator::is_fractional_currency( $this-getVal(
'currency_code' ) ) ){
+ $this-setVal( 'amount', number_format( $this-getVal(
'amount' ), 2, '.', '' ) );
+ }
$this-expunge( 'amountGiven' );
$this-expunge( 'amountOther' );
}
diff --git a/gateway_common/gateway.adapter.php
b/gateway_common/gateway.adapter.php
index ded564d..8058db4 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -157,8 +157,6 @@
protected $url;
protected $transactions;
- public $non_fractional_currencies = array();
-
/**
* $payment_methods will be defined by the adapter.
*
@@ -269,9 +267,7 @@
$external_data = $testData;
}
}
- // these currencies cannot have cents.
- $this-non_fractional_currencies = array( 'CLP', 'DJF', 'IDR',
'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'VND', 'XAF', 'XOF', 'XPF' );
-
+
$this-dataObj = new DonationData( get_called_class(),
self::getGlobal( 'Test' ), $external_data );
$this-setValidationErrors(
$this-getOriginalValidationErrors() );
diff --git a/globalcollect_gateway/forms/html/_personal-information/JP.html
b/globalcollect_gateway/forms/html/_personal-information/JP.html
new file mode 100644
index 000..22188b4
--- /dev/null
+++ b/globalcollect_gateway/forms/html/_personal-information/JP.html
@@ -0,0 +1,29 @@
+tr
+ td colspan=2
+ h3
class=cc_header%donate_interface-cc-form-header-personal%img
src=@script_path/extensions/DonationInterface/gateway_forms/includes/padlock.gif
style=vertical-align:baseline;margin-left:8px;/h3
+ /td
+/tr
+tr
+ td colspan=2
+ input class=halfwidth name=lname value=@lname
type=text placeholder=%donate_interface-donor-lname% id=lnameinput
class=halfwidth leftmar name=fname value=@fname type=text
placeholder=%donate_interface-donor-fname% id=fname
+
[MediaWiki-commits] [Gerrit] Make sure Parsoid doesn't get snobbish and treat non-html5 t... - change (mediawiki/core)
GWicke has submitted this change and it was merged. Change subject: Make sure Parsoid doesn't get snobbish and treat non-html5 tags badly. .. Make sure Parsoid doesn't get snobbish and treat non-html5 tags badly. * A recent patch to handle extension tags broke handling of html4 tags like big, center, etc. * The new test make sure we catch such regressions before going to RT testing. Change-Id: Ia1f9247d2172d2d4c8d39cce838f896cf9e81fd7 --- M tests/parser/parserTests.txt 1 file changed, 21 insertions(+), 0 deletions(-) Approvals: GWicke: Verified; Looks good to me, approved diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt index 492edb6..cbb687a 100644 --- a/tests/parser/parserTests.txt +++ b/tests/parser/parserTests.txt @@ -513,6 +513,27 @@ !! end ### +### Non-html5 tags +### + +!! test +Non-html5 tags should be accepted +!! input +center''foo''/center +big''foo''/big +font''foo''/font +strike''foo''/strike +tt''foo''/tt +!! result +centerifoo/i/center +pbigifoo/i/big +fontifoo/i/font +strikeifoo/i/strike +ttifoo/i/tt +/p +!! end + +### ### nowiki test cases ### -- To view, visit https://gerrit.wikimedia.org/r/52320 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia1f9247d2172d2d4c8d39cce838f896cf9e81fd7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org Gerrit-Reviewer: GWicke gwi...@wikimedia.org Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed typo - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixed typo
..
Fixed typo
Change-Id: Iaea6e61c423265bb4340106a2ddeec4c3649ffaf
---
M multiversion/MWScript.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/multiversion/MWScript.php b/multiversion/MWScript.php
index 493a89e..323cdde 100644
--- a/multiversion/MWScript.php
+++ b/multiversion/MWScript.php
@@ -65,7 +65,7 @@
# Maintenance.php will treat $argv[1] as the wiki if it doesn't start
'-'
if ( !isset( $argv[1] ) || !preg_match( '/^([^-]|--wiki(=|$))/',
$argv[1] ) ) {
if ( in_array( $relFile, $wikiless ) ) {
- # Assumme aawiki as Maintenance.php does.
+ # Assume aawiki as Maintenance.php does.
$argv = array_merge( array( $argv[0], --wiki=aawiki
), array_slice( $argv, 1 ) );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/53181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaea6e61c423265bb4340106a2ddeec4c3649ffaf
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix wikimania pages like [[wm2006:Proceedings:LP1]] - change (operations/mediawiki-config)
Reedy has submitted this change and it was merged.
Change subject: fix wikimania pages like [[wm2006:Proceedings:LP1]]
..
fix wikimania pages like [[wm2006:Proceedings:LP1]]
The old https://wikimania2006.wikimedia.org/wiki/Proceedings:LP1 now appears at
https://wikimania2006.wikimedia.org/wiki/Internal:LP1
Old URL was broken in I51bfaada9c4f48610423156.
Change-Id: I1e9387f475670e1a9d780cd1af0fcbd53c2cd252
---
M wmf-config/InitialiseSettings.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Reedy: Verified; Looks good to me, approved
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 3883f14..40c1597 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4261,10 +4261,14 @@
// @}
# wikimania wikis @{
- 'wikimania' = array(
+ 'wikimania2005wiki' = array(
100 = 'Internal',
101 = 'Internal_talk',
),
+ 'wikimania' = array(
+ 100 = 'Proceedings',
+ 101 = 'Proceedings_talk',
+ ),
# @}
# specials wikis @{
--
To view, visit https://gerrit.wikimedia.org/r/53133
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e9387f475670e1a9d780cd1af0fcbd53c2cd252
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jeremyb jer...@tuxmachine.com
Gerrit-Reviewer: GreenReaper greenrea...@hotmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Jeremyb jer...@tuxmachine.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (Bug 45881) Stop use of entity ids with wrong prefix - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: (Bug 45881) Stop use of entity ids with wrong prefix
..
(Bug 45881) Stop use of entity ids with wrong prefix
It seems to me that this fix is sufficient and it is only the explicitly given
entity id that is misinterpreted.
Change-Id: Iafaca93b79d5ee2d7b9cd72d2a24fae5ba0f8d51
---
M repo/includes/api/SearchEntities.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/SearchEntities.php
b/repo/includes/api/SearchEntities.php
index 2da7df9..f8e31b4 100644
--- a/repo/includes/api/SearchEntities.php
+++ b/repo/includes/api/SearchEntities.php
@@ -98,7 +98,7 @@
$page =
EntityContentFactory::singleton()-getWikiPageForId( $entityId );
if ( $page-exists() ) {
$entityContent = $page-getContent();
- if ( $entityContent instanceof
\Wikibase\EntityContent ) {
+ if ( ( $entityContent instanceof
\Wikibase\EntityContent ) ( $entityContent-getEntity()-getType() ===
$params['type'] ) ) {
$ids[] = $entityId;
}
}
@@ -115,6 +115,7 @@
$ids = array_merge( $ids, $this-searchEntities(
$params['language'], $params['search'], $params['type'], $limit, true ) );
$ids = array_unique( $ids );
}
+
// reduce any overflow
$ids = array_slice ( $ids, 0, $limit );
--
To view, visit https://gerrit.wikimedia.org/r/52876
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iafaca93b79d5ee2d7b9cd72d2a24fae5ba0f8d51
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: John Erling Blad john.b...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed @param tags to conform with Doxygen format. - change (mediawiki/core)
Parent5446 has uploaded a new change for review. https://gerrit.wikimedia.org/r/53182 Change subject: Fixed @param tags to conform with Doxygen format. .. Fixed @param tags to conform with Doxygen format. Doxygen expects parameter types to come before the parameter name in @param tags. Used a quick regex to switch everything around where possible. This only fixes cases where a primitve variable (or a primitive followed by other types) is the variable type. Other cases will need to be fixed manually. Change-Id: Ic59fd20856eb0489d70f3469a56ebce0efb3db13 --- M includes/Action.php M includes/Article.php M includes/AuthPlugin.php M includes/AutoLoader.php M includes/Autopromote.php M includes/Block.php M includes/Category.php M includes/CategoryPage.php M includes/CategoryViewer.php M includes/Categoryfinder.php M includes/ChangeTags.php M includes/ChangesFeed.php M includes/ChangesList.php M includes/Collation.php M includes/ConfEditor.php M includes/Cookie.php M includes/CryptRand.php M includes/DataUpdate.php M includes/DeferredUpdates.php M includes/EditPage.php M includes/Exception.php M includes/Export.php M includes/ExternalEdit.php M includes/ExternalUser.php M includes/Fallback.php M includes/Feed.php M includes/FeedUtils.php M includes/FileDeleteForm.php M includes/FormOptions.php M includes/GitInfo.php M includes/GlobalFunctions.php M includes/HTMLForm.php M includes/HistoryBlob.php M includes/Hooks.php M includes/Html.php M includes/HttpFunctions.php M includes/IP.php M includes/ImageGallery.php M includes/ImagePage.php M includes/Import.php M includes/Init.php M includes/Licenses.php M includes/LinkFilter.php M includes/Linker.php M includes/LinksUpdate.php M includes/Message.php M includes/MessageBlobStore.php M includes/MimeMagic.php M includes/Namespace.php M includes/OutputPage.php M includes/PHPVersionError.php M includes/Pager.php M includes/PathRouter.php M includes/Preferences.php M includes/PrefixSearch.php M includes/ProtectionForm.php M includes/RecentChange.php M includes/Revision.php M includes/Sanitizer.php M includes/SiteConfiguration.php M includes/SiteStats.php M includes/Skin.php M includes/SkinTemplate.php M includes/SpecialPage.php M includes/SpecialPageFactory.php M includes/Status.php M includes/StreamFile.php M includes/StringUtils.php M includes/StubObject.php M includes/Timestamp.php M includes/Title.php M includes/UIDGenerator.php M includes/User.php M includes/UserMailer.php M includes/UserRightsProxy.php M includes/WebRequest.php M includes/WebResponse.php M includes/WikiError.php M includes/WikiMap.php M includes/WikiPage.php M includes/Xml.php M includes/XmlTypeCheck.php M includes/ZhClient.php M includes/ZipDirectoryReader.php M includes/actions/CreditsAction.php M includes/actions/HistoryAction.php M includes/actions/InfoAction.php M includes/api/ApiBase.php M includes/api/ApiDelete.php M includes/api/ApiFormatBase.php M includes/api/ApiImageRotate.php M includes/api/ApiMain.php M includes/api/ApiModuleManager.php M includes/api/ApiPageSet.php M includes/api/ApiPurge.php M includes/api/ApiQuery.php M includes/api/ApiQueryAllUsers.php M includes/api/ApiQueryBase.php M includes/api/ApiQueryImageInfo.php M includes/api/ApiQueryInfo.php M includes/api/ApiQueryRecentChanges.php M includes/api/ApiResult.php M includes/api/ApiUpload.php M includes/cache/BacklinkCache.php M includes/cache/CacheDependency.php M includes/cache/FileCacheBase.php M includes/cache/GenderCache.php M includes/cache/LinkBatch.php M includes/cache/LinkCache.php M includes/cache/LocalisationCache.php M includes/cache/MessageCache.php M includes/cache/SquidUpdate.php M includes/cache/UserCache.php M includes/clientpool/RedisConnectionPool.php M includes/content/AbstractContent.php M includes/content/Content.php M includes/content/ContentHandler.php M includes/content/TextContent.php M includes/content/WikitextContent.php M includes/dao/DBAccessBase.php M includes/db/CloneDatabase.php M includes/db/Database.php M includes/db/DatabaseError.php M includes/db/DatabaseMssql.php M includes/db/DatabaseMysql.php M includes/db/DatabaseOracle.php M includes/db/DatabasePostgres.php M includes/db/DatabaseSqlite.php M includes/db/DatabaseUtility.php M includes/db/IORMTable.php M includes/db/LBFactory.php M includes/db/LBFactory_Multi.php M includes/db/LBFactory_Single.php M includes/db/LoadBalancer.php M includes/db/LoadMonitor.php M includes/db/ORMRow.php M includes/db/ORMTable.php M includes/debug/Debug.php M includes/diff/DifferenceEngine.php M includes/externalstore/ExternalStore.php M includes/externalstore/ExternalStoreDB.php M includes/externalstore/ExternalStoreMedium.php M includes/filebackend/FSFile.php M includes/filebackend/FSFileBackend.php M includes/filebackend/FileBackend.php M includes/filebackend/FileBackendMultiWrite.php M includes/filebackend/FileBackendStore.php M includes/filebackend/FileOp.php M
[MediaWiki-commits] [Gerrit] (bug 43524) Restrict upload on itwikivoyage to sysops - change (operations/mediawiki-config)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/53183 Change subject: (bug 43524) Restrict upload on itwikivoyage to sysops .. (bug 43524) Restrict upload on itwikivoyage to sysops Bug: 43524 Change-Id: I636852089a26fd742265a04392598674c54d8185 --- M wmf-config/InitialiseSettings.php 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/83/53183/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 40c1597..68bb3a2 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -7022,8 +7022,14 @@ 'sysop' = array( 'autopatrol' = true ), ), 'itwikivoyage' = array( - 'autopatrolled' = array( 'autopatrol' = true ), // Bug 43327 + 'autopatrolled' = array( + 'autopatrol' = true, // Bug 43327 + 'upload' = false // Bug 43524 + ), 'sysop' = array( 'upload' = true ), // Bug 43524 + 'user' = array( 'upload' = false ), // Bug 43524 + 'confirmed' = array( 'upload' = false ), // Bug 43524 + 'autoconfirmed' = array( 'upload' = false ), // Bug 43524 ), 'itwiktionary' = array( 'user' = array( 'upload' = false ), -- To view, visit https://gerrit.wikimedia.org/r/53183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I636852089a26fd742265a04392598674c54d8185 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk kren...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix broken FormatAction tests. - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix broken FormatAction tests.
..
Fix broken FormatAction tests.
The ve.Surface constructor was recently changed, but the instantiation
in the FormatAction tests was not updated accordingly.
The constructor now requires a ve.init.Target object.
Bug: 39597
Change-Id: Ia4193fbab5c63007ed057009bf9a39f1f9d18fb7
---
M modules/ve/test/actions/ve.FormatAction.test.js
M modules/ve/test/index.php
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/test/actions/ve.FormatAction.test.js
b/modules/ve/test/actions/ve.FormatAction.test.js
index 478c350..a39fcae 100644
--- a/modules/ve/test/actions/ve.FormatAction.test.js
+++ b/modules/ve/test/actions/ve.FormatAction.test.js
@@ -11,7 +11,7 @@
function runConverterTest( assert, range, type, attributes, expectedSelection,
expectedData, label ) {
var dom = ve.createDocumentFromHTML( ve.dm.example.isolationHTML ),
- surface = new ve.Surface( $('div'), dom ),
+ surface = new ve.Surface( new ve.init.Target( $( 'div' ) ),
dom ),
formatAction = new ve.FormatAction( surface ),
data = ve.copyArray(
surface.getModel().getDocument().getFullData() );
diff --git a/modules/ve/test/index.php b/modules/ve/test/index.php
index 4cc1a4c..4a45302 100644
--- a/modules/ve/test/index.php
+++ b/modules/ve/test/index.php
@@ -18,10 +18,12 @@
script src=../../ve/ve.EventEmitter.js/script
script src=../../ve/init/ve.init.js/script
script src=../../ve/init/ve.init.Platform.js/script
+ script src=../../ve/init/ve.init.Target.js/script
script src=../../ve/ve.debug.js/script
!-- Standalone Init --
script src=../../ve/init/sa/ve.init.sa.js/script
script src=../../ve/init/sa/ve.init.sa.Platform.js/script
+ script src=../../ve/init/sa/ve.init.sa.Target.js/script
script
?php
require( '../../../VisualEditor.i18n.php' );
--
To view, visit https://gerrit.wikimedia.org/r/53180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4193fbab5c63007ed057009bf9a39f1f9d18fb7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Robmoen rm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed @param tags to conform with Doxygen format. - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Fixed @param tags to conform with Doxygen format. .. Fixed @param tags to conform with Doxygen format. Doxygen expects parameter types to come before the parameter name in @param tags. Used a quick regex to switch everything around where possible. This only fixes cases where a primitve variable (or a primitive followed by other types) is the variable type. Other cases will need to be fixed manually. Change-Id: Ic59fd20856eb0489d70f3469a56ebce0efb3db13 --- M includes/Action.php M includes/Article.php M includes/AuthPlugin.php M includes/AutoLoader.php M includes/Autopromote.php M includes/Block.php M includes/Category.php M includes/CategoryPage.php M includes/CategoryViewer.php M includes/Categoryfinder.php M includes/ChangeTags.php M includes/ChangesFeed.php M includes/ChangesList.php M includes/Collation.php M includes/ConfEditor.php M includes/Cookie.php M includes/CryptRand.php M includes/DataUpdate.php M includes/DeferredUpdates.php M includes/EditPage.php M includes/Exception.php M includes/Export.php M includes/ExternalEdit.php M includes/ExternalUser.php M includes/Fallback.php M includes/Feed.php M includes/FeedUtils.php M includes/FileDeleteForm.php M includes/FormOptions.php M includes/GitInfo.php M includes/GlobalFunctions.php M includes/HTMLForm.php M includes/HistoryBlob.php M includes/Hooks.php M includes/Html.php M includes/HttpFunctions.php M includes/IP.php M includes/ImageGallery.php M includes/ImagePage.php M includes/Import.php M includes/Init.php M includes/Licenses.php M includes/LinkFilter.php M includes/Linker.php M includes/LinksUpdate.php M includes/Message.php M includes/MessageBlobStore.php M includes/MimeMagic.php M includes/Namespace.php M includes/OutputPage.php M includes/PHPVersionError.php M includes/Pager.php M includes/PathRouter.php M includes/Preferences.php M includes/PrefixSearch.php M includes/ProtectionForm.php M includes/RecentChange.php M includes/Revision.php M includes/Sanitizer.php M includes/SiteConfiguration.php M includes/SiteStats.php M includes/Skin.php M includes/SkinTemplate.php M includes/SpecialPage.php M includes/SpecialPageFactory.php M includes/Status.php M includes/StreamFile.php M includes/StringUtils.php M includes/StubObject.php M includes/Timestamp.php M includes/Title.php M includes/UIDGenerator.php M includes/User.php M includes/UserMailer.php M includes/UserRightsProxy.php M includes/WebRequest.php M includes/WebResponse.php M includes/WikiError.php M includes/WikiMap.php M includes/WikiPage.php M includes/Xml.php M includes/XmlTypeCheck.php M includes/ZhClient.php M includes/ZipDirectoryReader.php M includes/actions/CreditsAction.php M includes/actions/HistoryAction.php M includes/actions/InfoAction.php M includes/api/ApiBase.php M includes/api/ApiDelete.php M includes/api/ApiFormatBase.php M includes/api/ApiImageRotate.php M includes/api/ApiMain.php M includes/api/ApiModuleManager.php M includes/api/ApiPageSet.php M includes/api/ApiPurge.php M includes/api/ApiQuery.php M includes/api/ApiQueryAllUsers.php M includes/api/ApiQueryBase.php M includes/api/ApiQueryImageInfo.php M includes/api/ApiQueryInfo.php M includes/api/ApiQueryRecentChanges.php M includes/api/ApiResult.php M includes/api/ApiUpload.php M includes/cache/BacklinkCache.php M includes/cache/CacheDependency.php M includes/cache/FileCacheBase.php M includes/cache/GenderCache.php M includes/cache/LinkBatch.php M includes/cache/LinkCache.php M includes/cache/LocalisationCache.php M includes/cache/MessageCache.php M includes/cache/SquidUpdate.php M includes/cache/UserCache.php M includes/clientpool/RedisConnectionPool.php M includes/content/AbstractContent.php M includes/content/Content.php M includes/content/ContentHandler.php M includes/content/TextContent.php M includes/content/WikitextContent.php M includes/dao/DBAccessBase.php M includes/db/CloneDatabase.php M includes/db/Database.php M includes/db/DatabaseError.php M includes/db/DatabaseMssql.php M includes/db/DatabaseMysql.php M includes/db/DatabaseOracle.php M includes/db/DatabasePostgres.php M includes/db/DatabaseSqlite.php M includes/db/DatabaseUtility.php M includes/db/IORMTable.php M includes/db/LBFactory.php M includes/db/LBFactory_Multi.php M includes/db/LBFactory_Single.php M includes/db/LoadBalancer.php M includes/db/LoadMonitor.php M includes/db/ORMRow.php M includes/db/ORMTable.php M includes/debug/Debug.php M includes/diff/DifferenceEngine.php M includes/externalstore/ExternalStore.php M includes/externalstore/ExternalStoreDB.php M includes/externalstore/ExternalStoreMedium.php M includes/filebackend/FSFile.php M includes/filebackend/FSFileBackend.php M includes/filebackend/FileBackend.php M includes/filebackend/FileBackendMultiWrite.php M includes/filebackend/FileBackendStore.php M includes/filebackend/FileOp.php M includes/filebackend/FileOpBatch.php M
[MediaWiki-commits] [Gerrit] (bug 45952) Reenable TimedText namespace on foundationwiki - change (operations/mediawiki-config)
Reedy has submitted this change and it was merged. Change subject: (bug 45952) Reenable TimedText namespace on foundationwiki .. (bug 45952) Reenable TimedText namespace on foundationwiki To fix a page that was created in this namespace before this config was required Change-Id: I6c69fa3ce1c26fe7a8b2b697737d1d382089401f --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 40c1597..d4630a1 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10258,6 +10258,7 @@ 'enwiki' = true, 'test2wiki' = true, 'testwiki' = true, + 'foundationwiki' = true, ), 'wmgUseVisualEditor' = array( -- To view, visit https://gerrit.wikimedia.org/r/53174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c69fa3ce1c26fe7a8b2b697737d1d382089401f Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk kren...@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45636) Namespace configuration for it.wikivoyage - change (operations/mediawiki-config)
Reedy has submitted this change and it was merged. Change subject: (bug 45636) Namespace configuration for it.wikivoyage .. (bug 45636) Namespace configuration for it.wikivoyage Namespaces deleted: - 102: Elezione - 103: Discussioni elezione - 106: Notizie - 107: Discussioni notizie Change-Id: Id5db3aef8cbef8f9a55ce3f58337c746d7e463d1 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index d4630a1..60ac301 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -4552,12 +4552,10 @@ 'itwikivoyage' = array( 100 = 'Portale', 101 = 'Discussioni_portale', - 102 = 'Elezione', - 103 = 'Discussioni_elezione', + //102 and 103 (Elezione) deleted per bug 45636 104 = 'Tematica', 105 = 'Discussioni_tematica', - 106 = 'Notizie', - 107 = 'Discussioni_notizie', + //106 and 107 (Notizie) deleted per bug 45636 ), 'elwiki' = array( 100 = 'Πύλη', -- To view, visit https://gerrit.wikimedia.org/r/52449 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id5db3aef8cbef8f9a55ce3f58337c746d7e463d1 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson dereck...@espace-win.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 43524) Restrict upload on itwikivoyage to sysops - change (operations/mediawiki-config)
Reedy has submitted this change and it was merged. Change subject: (bug 43524) Restrict upload on itwikivoyage to sysops .. (bug 43524) Restrict upload on itwikivoyage to sysops Bug: 43524 Change-Id: I636852089a26fd742265a04392598674c54d8185 --- M wmf-config/InitialiseSettings.php 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Reedy: Verified; Looks good to me, approved diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 60ac301..a25598a 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -7020,8 +7020,14 @@ 'sysop' = array( 'autopatrol' = true ), ), 'itwikivoyage' = array( - 'autopatrolled' = array( 'autopatrol' = true ), // Bug 43327 + 'autopatrolled' = array( + 'autopatrol' = true, // Bug 43327 + 'upload' = false // Bug 43524 + ), 'sysop' = array( 'upload' = true ), // Bug 43524 + 'user' = array( 'upload' = false ), // Bug 43524 + 'confirmed' = array( 'upload' = false ), // Bug 43524 + 'autoconfirmed' = array( 'upload' = false ), // Bug 43524 ), 'itwiktionary' = array( 'user' = array( 'upload' = false ), -- To view, visit https://gerrit.wikimedia.org/r/53183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I636852089a26fd742265a04392598674c54d8185 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk kren...@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixing Dan's account - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53184
Change subject: Fixing Dan's account
..
Fixing Dan's account
Change-Id: I1e7e9270e89c8abb106458fe3f8c4a401d38d4c8
---
M manifests/admins.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/53184/1
diff --git a/manifests/admins.pp b/manifests/admins.pp
index 772b048..b66abcf 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -2298,7 +2298,7 @@
Ssh_authorized_key { require = Unixaccount[$realname] }
ssh_authorized_key {
dan@DAndreescu-ThinkPad-T420s:
- ensure = absent,
+ ensure = present,
user= $username,
type= ssh-rsa,
key =
B3NzaC1yc2EDAQABAAABAQDAOgZWjHAoVJF6hJCrDUjVuiZiNeW1GudEfkFJS4ORo+WpVaMjwrILGThrriIYZNEIQNEf4l+7ht2l7/9g7e0j56NxXX3NJftJWRKOk1d7s57CKZAdvcbQ4G+L/Tyed+qZj9JurHdMstcVo50nd6S/UvbvDAdieXHemhZLtFcqPBQj66XDJkGzm0U9eW49lB1qCzcQnsNQbxRbV39RsSgIU9YHeGWMsglI227nZX6Lvd6/Vvz2VsFR5xtdPBHQ170XqbRylZQaBaR1lmRz9Aa7dSKSbNgGYAUNkzijILhBccJK1Iulmh/yDFPm6ZVWFaezinbCspXnvCIdJfG9EoLx;
--
To view, visit https://gerrit.wikimedia.org/r/53184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e7e9270e89c8abb106458fe3f8c4a401d38d4c8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixing Dan's account - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Fixing Dan's account
..
Fixing Dan's account
Change-Id: I1e7e9270e89c8abb106458fe3f8c4a401d38d4c8
---
M manifests/admins.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/admins.pp b/manifests/admins.pp
index 772b048..b66abcf 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -2298,7 +2298,7 @@
Ssh_authorized_key { require = Unixaccount[$realname] }
ssh_authorized_key {
dan@DAndreescu-ThinkPad-T420s:
- ensure = absent,
+ ensure = present,
user= $username,
type= ssh-rsa,
key =
B3NzaC1yc2EDAQABAAABAQDAOgZWjHAoVJF6hJCrDUjVuiZiNeW1GudEfkFJS4ORo+WpVaMjwrILGThrriIYZNEIQNEf4l+7ht2l7/9g7e0j56NxXX3NJftJWRKOk1d7s57CKZAdvcbQ4G+L/Tyed+qZj9JurHdMstcVo50nd6S/UvbvDAdieXHemhZLtFcqPBQj66XDJkGzm0U9eW49lB1qCzcQnsNQbxRbV39RsSgIU9YHeGWMsglI227nZX6Lvd6/Vvz2VsFR5xtdPBHQ170XqbRylZQaBaR1lmRz9Aa7dSKSbNgGYAUNkzijILhBccJK1Iulmh/yDFPm6ZVWFaezinbCspXnvCIdJfG9EoLx;
--
To view, visit https://gerrit.wikimedia.org/r/53184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e7e9270e89c8abb106458fe3f8c4a401d38d4c8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reformatted some array parameter docs. - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/53187 Change subject: Reformatted some array parameter docs. .. Reformatted some array parameter docs. Change-Id: Ie9eefd3693e82f483a9ef0da3f972452ae7bf49e --- M includes/filebackend/FileBackend.php M includes/filebackend/FileBackendStore.php M includes/filebackend/SwiftFileBackend.php 3 files changed, 34 insertions(+), 34 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/87/53187/1 diff --git a/includes/filebackend/FileBackend.php b/includes/filebackend/FileBackend.php index 00fd6fb..f40b8c1 100644 --- a/includes/filebackend/FileBackend.php +++ b/includes/filebackend/FileBackend.php @@ -684,7 +684,7 @@ * except they are only applied *if* the directory/container had to be created. * These flags should always be set for directories that have private files. * -* @param $params Array +* @param array $params * $params include: * - dir: storage directory * - noAccess : try to deny file access (since 1.20) @@ -712,7 +712,7 @@ * access to the storage user representing end-users in web requests. * This is not guaranteed to actually do anything. * -* @param $params Array +* @param array $params * $params include: * - dir: storage directory * - noAccess : try to deny file access @@ -740,7 +740,7 @@ * access to the storage user representing end-users in web requests. * This essentially can undo the result of secure() calls. * -* @param $params Array +* @param array $params * $params include: * - dir: storage directory * - access : try to allow file access @@ -767,7 +767,7 @@ * Backends using key/value stores may do nothing unless the directory * is that of an empty container, in which case it will be deleted. * -* @param $params Array +* @param array $params * $params include: * - dir: storage directory * - recursive : recursively delete empty subdirectories first (since 1.20) @@ -806,7 +806,7 @@ * Check if a file exists at a storage path in the backend. * This returns false if only a directory exists at the path. * -* @param $params Array +* @param array $params * $params include: * - src: source storage path * - latest : use the latest available data @@ -817,7 +817,7 @@ /** * Get the last-modified timestamp of the file at a storage path. * -* @param $params Array +* @param array $params * $params include: * - src: source storage path * - latest : use the latest available data @@ -829,7 +829,7 @@ * Get the contents of a file at a storage path in the backend. * This should be avoided for potentially large files. * -* @param $params Array +* @param array $params * $params include: * - src: source storage path * - latest : use the latest available data @@ -849,7 +849,7 @@ * * @see FileBackend::getFileContents() * -* @param $params Array +* @param array $params * $params include: * - srcs: list of source storage paths * - latest : use the latest available data @@ -862,7 +862,7 @@ /** * Get the size (bytes) of a file at a storage path in the backend. * -* @param $params Array +* @param array $params * $params include: * - src: source storage path * - latest : use the latest available data @@ -878,7 +878,7 @@ * - size : the file size (bytes) * Additional values may be included for internal use only. * -* @param $params Array +* @param array $params * $params include: * - src: source storage path * - latest : use the latest available data @@ -889,7 +889,7 @@ /** * Get a SHA-1 hash of the file at a storage path in the backend. * -* @param $params Array +* @param array $params * $params include: * - src: source storage path * - latest : use the latest available data @@ -901,7 +901,7 @@ * Get the properties of the file at a storage path in the backend. * This gives the result of FSFile::getProps() on a local copy of the file. * -* @param $params Array +* @param array $params * $params include: * - src: source storage path * - latest : use the
[MediaWiki-commits] [Gerrit] (DRAFT) QUnit: Fix more missing assertion numbers - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53188
Change subject: (DRAFT) QUnit: Fix more missing assertion numbers
..
(DRAFT) QUnit: Fix more missing assertion numbers
Change-Id: I214b3d4da46f3f3bb0fcde313ac2d82439e40e3c
---
M tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
M
tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js
2 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/88/53188/1
diff --git a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
index deff5b0..e7ee90d 100644
--- a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
@@ -635,7 +635,7 @@
} );
/** FIXME: the diff output is not very readeable. */
- QUnit.test( 'bug 32047 - caption must be before thead', function (
assert ) {
+ QUnit.test( 'bug 32047 - caption must be before thead', 1, function (
assert ) {
var $table;
$table = $(
'table class=sortable' +
@@ -655,7 +655,7 @@
);
} );
- QUnit.test( 'data-sort-value attribute, when available, should override
sorting position', function ( assert ) {
+ QUnit.test( 'data-sort-value attribute, when available, should override
sorting position', 2, function ( assert ) {
var $table, data;
// Example 1: All cells except one cell without data-sort-value,
@@ -925,7 +925,7 @@
}
);
- QUnit.test( 'Sorting images using alt text', function ( assert ) {
+ QUnit.test( 'Sorting images using alt text', 1, function ( assert ) {
var $table = $(
'table class=sortable' +
'trthTHEAD/th/tr' +
@@ -942,7 +942,7 @@
);
} );
- QUnit.test( 'Sorting images using alt text (complex)', function (
assert ) {
+ QUnit.test( 'Sorting images using alt text (complex)', 1, function (
assert ) {
var $table = $(
'table class=sortable' +
'trthTHEAD/th/tr' +
@@ -963,7 +963,7 @@
);
} );
- QUnit.test( 'Sorting images using alt text (with format
autodetection)', function ( assert ) {
+ QUnit.test( 'Sorting images using alt text (with format
autodetection)', 1, function ( assert ) {
var $table = $(
'table class=sortable' +
'trthTHEAD/th/tr' +
diff --git
a/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js
b/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js
index 9389651..ee854ae 100644
---
a/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js
+++
b/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js
@@ -3,7 +3,7 @@
// TODO: verify checkboxes == [ 'nsassociated', 'nsinvert' ]
- QUnit.test( 'all namespace disable checkboxes', function ( assert ) {
+ QUnit.test( 'all namespace disable checkboxes', 8, function ( assert
) {
var selectHtml, $env, $options;
// from Special:Recentchanges
--
To view, visit https://gerrit.wikimedia.org/r/53188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I214b3d4da46f3f3bb0fcde313ac2d82439e40e3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (Bug 38620) Removed words left column from MediaWiki:Conte... - change (mediawiki...Contest)
Siebrand has submitted this change and it was merged.
Change subject: (Bug 38620) Removed words left column from
MediaWiki:Contest-contest-contestants-text
..
(Bug 38620) Removed words left column from
MediaWiki:Contest-contest-contestants-text
Change-Id: Ia6a7886ca40c048a0853153bde323110695b2571
---
M Contest.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/Contest.i18n.php b/Contest.i18n.php
index 3e5f85a..3a9ce83 100644
--- a/Contest.i18n.php
+++ b/Contest.i18n.php
@@ -161,7 +161,7 @@
'contest-contest-days-ago' = '$1, $2 {{PLURAL:$2|day|days}} ago',
'contest-contest-days-left' = '$1, in $2 {{PLURAL:$2|day|days}}',
'contest-contest-contestants' = 'Contestants',
- 'contest-contest-contestants-text' = 'Click on the entry ID in the
left column to judge an individual entry.',
+ 'contest-contest-contestants-text' = 'Click on the entry ID to judge
an individual entry.',
'contest-contest-reminder-mail' = 'Reminder email',
'contest-contest-reminder-page' = 'The content for the reminder email
comes from [[$1|this page]].',
'contest-contest-send-reminder' = 'Send reminder',
--
To view, visit https://gerrit.wikimedia.org/r/51193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6a7886ca40c048a0853153bde323110695b2571
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Contest
Gerrit-Branch: master
Gerrit-Owner: Rahul21 rahul14...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: PleaseStand pleasest...@live.com
Gerrit-Reviewer: Rahul21 rahul14...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
