[MediaWiki-commits] [Gerrit] Document the unique features of cxpublish - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/193900 Change subject: Document the unique features of cxpublish .. Document the unique features of cxpublish Change-Id: I59ce3a8658f5708eed607d4720496d465f949a20 --- M api/ApiContentTranslationPublish.php 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/00/193900/1 diff --git a/api/ApiContentTranslationPublish.php b/api/ApiContentTranslationPublish.php index 9a03cb8..24c9392 100644 --- a/api/ApiContentTranslationPublish.php +++ b/api/ApiContentTranslationPublish.php @@ -1,8 +1,16 @@ ?php /** * Saving a page created in ContentTranslation. - * The main change from usual saving is that a tag is added. - * Borrows heavily from ApiVisualEditorEdit. + * This is largely the usual MediaWiki page creation sequence, + * but with the following added features: + * - HTML from the translation interface's contenteditable is converted to wiki syntax. + * - A tag is added. + * - The edit summary shows a link to the revision from which the translation was made. + * - Optionally, a template is added if the article appears to have a lot of machine translation. + * - Categories are hidden in nowiki if the page is not published to the main space. + * - Information about the translated page is saved to the central ContentTranslation database. + * - MediaWiki CAPTCHA is supported, if needed. + * This borrows heavily from ApiVisualEditorEdit. * * @file * @copyright See AUTHORS.txt -- To view, visit https://gerrit.wikimedia.org/r/193900 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59ce3a8658f5708eed607d4720496d465f949a20 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix qqq - change (mediawiki...Mask)
Isarra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193902
Change subject: Fix qqq
..
Fix qqq
Change-Id: Idc49cd6737ba0fbf55ba940159f50aa8af72a48a
---
M i18n/qqq.json
1 file changed, 9 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Mask
refs/changes/02/193902/1
diff --git a/i18n/qqq.json b/i18n/qqq.json
old mode 100644
new mode 100755
index c3f6e86..eb578d8
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -3,8 +3,13 @@
authors: []
},
mask-desc: {{desc|name=Mask}},
- whatlinkshere-short: Short link to [[special:whatlinkshere]].
Appears in page links.,
- refresh: Appears in page links.,
- menu-left: Label for top menu (left),
- menu-right: Label for top menu (right)
+ mask-whatlinkshere: Short link to [[special:whatlinkshere]]. Appears
in page links.,
+ mask-refresh: Refresh/purge page link. Appears in page links.,
+ mask-menu-left-label: Label for Project top navigation menu (left in
ltr languages),
+ mask-menu-right-label: Label for other top navigation menu (right in
ltr languages),
+ mask-menu-left: {{ignore}}\nProject menu contents; uses only other
messages,
+ mask-menu-right: {{ignore}}\nNavigation menu contents; uses only
other messages,
+ mask-aboutsite-url: Target for aboutsite link,
+ mask-index: Label for index/all pages link,
+ mask-index-url: {{ignore}}\nTarget page for 'index' link
}
--
To view, visit https://gerrit.wikimedia.org/r/193902
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc49cd6737ba0fbf55ba940159f50aa8af72a48a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Mask
Gerrit-Branch: master
Gerrit-Owner: Isarra zhoris...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Explicitly mark HTMLCacheUpdateJob jobs that are recursive f... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Explicitly mark HTMLCacheUpdateJob jobs that are recursive for
clarity
..
Explicitly mark HTMLCacheUpdateJob jobs that are recursive for clarity
Change-Id: I75dbe719ef034d4714d4d8262d1dee9fa78ba76b
---
M includes/deferred/HTMLCacheUpdate.php
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/deferred/HTMLCacheUpdate.php
b/includes/deferred/HTMLCacheUpdate.php
index e02cfbc..79a10e6 100644
--- a/includes/deferred/HTMLCacheUpdate.php
+++ b/includes/deferred/HTMLCacheUpdate.php
@@ -43,11 +43,11 @@
}
public function doUpdate() {
-
$job = new HTMLCacheUpdateJob(
$this-mTitle,
array(
'table' = $this-mTable,
+ 'recursive' = true
) + Job::newRootJobParams( // overall refresh links
job info
htmlCacheUpdate:{$this-mTable}:{$this-mTitle-getPrefixedText()}
)
@@ -63,6 +63,5 @@
$job-run(); // just do the purge query now
} );
}
-
}
}
--
To view, visit https://gerrit.wikimedia.org/r/190735
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75dbe719ef034d4714d4d8262d1dee9fa78ba76b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix transfer of reference contents from removed reference - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193959
Change subject: Fix transfer of reference contents from removed reference
..
Fix transfer of reference contents from removed reference
We unconditionally retrieved originalHtml from itemNode,
even if there was no data-mw.body.id, so as long as
the reference itself wasn't edited, we would never overwrite
data-mw. This meant that if the ref with the contents
was deleted, the contents wouldn't be transfered to the
first ref tag with that name like they're supposed to be.
The solution is to only look at originalHtml from itemNode
if data-mw.body.id is set.
Change-Id: Ib87491b6fa6a77d62384158f8e8f7dcc2a36c23a
---
M modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/59/193959/1
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
index 70e800a..d2c74e7 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
@@ -157,7 +157,8 @@
);
itemNodeHtml = itemNodeWrapper.innerHTML; // Returns '' if
itemNodeWrapper is empty
originalHtml = ve.getProp( mwData, 'body', 'html' ) ||
- itemNode.getAttribute( 'originalHtml' ) || '';
+ ( ve.getProp( mwData, 'body', 'id' ) !== undefined
itemNode.getAttribute( 'originalHtml' ) ) ||
+ '';
originalHtmlWrapper.innerHTML = originalHtml;
// Only set body.html if itemNodeHtml and originalHtml are
actually different
if ( !originalHtmlWrapper.isEqualNode( itemNodeWrapper ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/193959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib87491b6fa6a77d62384158f8e8f7dcc2a36c23a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.25wmf18
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Visual tweaks to Read more (w/Vibha) and other bottom nati... - change (apps...wikipedia)
Mhurd has submitted this change and it was merged.
Change subject: Visual tweaks to Read more (w/Vibha) and other bottom native
bits.
..
Visual tweaks to Read more (w/Vibha) and other bottom native bits.
Read more now sized by intrinsic content size of its search results
so it resizes vertically automatically to accommodate the number of
results found by the search results controller.
Set kWMFReadMoreNumberOfArticles to 6 to see it in action.
Better scaling of bottom tracking bits on iPad.
Fixed rounding of glyph icons on iPad in OptionsFooterViewController.
The native options footer is also now the scroll limiter rather than
the legal footer. ie it can't be scroll up off the top of the screen.
Better containment of Read More elements (the title label, the search
results container, spacing etc) with a xib.
Moved add child view controller to container view method to category.
Tapping native footer elements when TOC open now properly closes
the TOC.
Used Masonry a bit. Found what may be a bug. Opened a ticket here:
https://github.com/Masonry/Masonry/issues/165
Change-Id: I13ef29462a3e2867631c322d90f79536acde470e
---
M Wikipedia.xcodeproj/project.pbxproj
M wikipedia/Base.lproj/Main_iPhone.storyboard
A wikipedia/Categories/UIViewController+WMFChildViewController.h
A wikipedia/Categories/UIViewController+WMFChildViewController.m
A wikipedia/Custom Views/WMFIntrinsicContentSizeAwareTableView.h
A wikipedia/Custom Views/WMFIntrinsicContentSizeAwareTableView.m
M wikipedia/View Controllers/SearchResults/SearchResultsController.h
M wikipedia/View Controllers/SearchResults/SearchResultsController.m
R wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.h
R wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.m
R wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.xib
R wikipedia/View
Controllers/WebView/Footer/SubFooters/Options/WMFOptionsFooterViewController.h
R wikipedia/View
Controllers/WebView/Footer/SubFooters/Options/WMFOptionsFooterViewController.m
R wikipedia/View
Controllers/WebView/Footer/SubFooters/Options/WMFOptionsFooterViewController.xib
A wikipedia/View
Controllers/WebView/Footer/SubFooters/ReadMore/WMFReadMoreViewController.h
A wikipedia/View
Controllers/WebView/Footer/SubFooters/ReadMore/WMFReadMoreViewController.m
A wikipedia/View
Controllers/WebView/Footer/SubFooters/ReadMore/WMFReadMoreViewController.xib
A wikipedia/View Controllers/WebView/Footer/WMFWebViewFooterViewController.h
A wikipedia/View Controllers/WebView/Footer/WMFWebViewFooterViewController.m
A wikipedia/View Controllers/WebView/Footer/WMFWebViewFooterViewController.xib
R wikipedia/View Controllers/WebView/WMFWebViewFooterContainerView.h
R wikipedia/View Controllers/WebView/WMFWebViewFooterContainerView.m
M wikipedia/View Controllers/WebView/WebViewController.m
M wikipedia/View Controllers/WebView/WebViewController_Private.h
24 files changed, 621 insertions(+), 221 deletions(-)
Approvals:
Fjalapeno: Looks good to me, but someone else must approve
Mhurd: Verified; Looks good to me, approved
Bgerstle: Looks good to me, but someone else must approve
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index 638fec7..5a8776f 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -39,7 +39,6 @@
04292FF8185FBB0B002A13FC /* SearchResultsController.m in
Sources */ = {isa = PBXBuildFile; fileRef = 04292FF7185FBB0B002A13FC /*
SearchResultsController.m */; };
0429300A18604898002A13FC /* SavedPagesResultCell.m in Sources
*/ = {isa = PBXBuildFile; fileRef = 0429300418604898002A13FC /*
SavedPagesResultCell.m */; };
0429301018604898002A13FC /* SavedPagesViewController.m in
Sources */ = {isa = PBXBuildFile; fileRef = 0429300918604898002A13FC /*
SavedPagesViewController.m */; };
- 042950CF1A9D0901009BE784 /*
WebViewBottomTrackingContainerView.m in Sources */ = {isa = PBXBuildFile;
fileRef = 042950CE1A9D0901009BE784 /* WebViewBottomTrackingContainerView.m */;
};
042950D41A9D3BA7009BE784 /* UIColor+WMFHexColor.m in Sources */
= {isa = PBXBuildFile; fileRef = 042950D31A9D3BA7009BE784 /*
UIColor+WMFHexColor.m */; };
042A5B2619253D2A0095E172 /* CenterNavController.m in Sources */
= {isa = PBXBuildFile; fileRef = 042A5B2019253D2A0095E172 /*
CenterNavController.m */; };
042A5B2919253E570095E172 /* TopMenuViewController.m in Sources
*/ = {isa = PBXBuildFile; fileRef = 042A5B2819253E570095E172 /*
TopMenuViewController.m */; };
@@ -49,17 +48,11 @@
042B3996192EAEEA0066B270 /* ShareMenuSavePageActivity.m in
Sources */ = {isa = PBXBuildFile; fileRef = 042B3995192EAEEA0066B270 /*
ShareMenuSavePageActivity.m */; };
[MediaWiki-commits] [Gerrit] image gallery design updates - change (apps...wikipedia)
Mhurd has submitted this change and it was merged.
Change subject: image gallery design updates
..
image gallery design updates
- tweak layout styling of gallery chrome
- tweak metadata presentation
- copyright glyph size, positioning, fallback
- owner size Uploader unknown. fallback
- minor refactor (UIButton+FrameUtils)
Change-Id: I7f561e52c9f4eb484731e33137a6a8c86996c32e
---
M Wikipedia.xcodeproj/project.pbxproj
M Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia.xcscheme
A wikipedia/Categories/UIButton+FrameUtils.h
A wikipedia/Categories/UIButton+FrameUtils.m
A wikipedia/Categories/UILabel+WMFStyling.h
A wikipedia/Categories/UILabel+WMFStyling.m
A wikipedia/Categories/UIView+WMFFrameUtils.h
A wikipedia/Categories/UIView+WMFFrameUtils.m
M wikipedia/View Controllers/Image Gallery/WMFImageGalleryDetailOverlayView.m
M wikipedia/View Controllers/Image Gallery/WMFImageGalleryDetailOverlayView.xib
M wikipedia/View Controllers/Image Gallery/WMFImageGalleryViewController.m
M wikipedia/en.lproj/Localizable.strings
M wikipedia/qqq.lproj/Localizable.strings
13 files changed, 333 insertions(+), 195 deletions(-)
Approvals:
Mhurd: Verified; Looks good to me, approved
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index 4229507..4a83ca2 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -209,6 +209,8 @@
954BA118838BF8BA6B01C34A /* libPods-WikipediaUnitTests.a in
Frameworks */ = {isa = PBXBuildFile; fileRef = 8CE61C6963F825760822A28A /*
libPods-WikipediaUnitTests.a */; };
BC118C0F1A95894D0072E4D8 /* WikipediaAppUtils.m in Sources */ =
{isa = PBXBuildFile; fileRef = C9180EC318AED30C006C1DCA /* WikipediaAppUtils.m
*/; };
BC118C101A9589720072E4D8 /* AssetsFile.m in Sources */ = {isa =
PBXBuildFile; fileRef = 04272E791940EEBC00CC682F /* AssetsFile.m */; };
+ BC2CBB8E1AA10F400079A313 /* UIView+WMFFrameUtils.m in Sources
*/ = {isa = PBXBuildFile; fileRef = BC2CBB8D1AA10F400079A313 /*
UIView+WMFFrameUtils.m */; };
+ BC2CBB8F1AA10F400079A313 /* UIView+WMFFrameUtils.m in Sources
*/ = {isa = PBXBuildFile; fileRef = BC2CBB8D1AA10F400079A313 /*
UIView+WMFFrameUtils.m */; };
BC42735D1A7C73B300068882 /* NSArray+Predicate.m in Sources */ =
{isa = PBXBuildFile; fileRef = 04CBAC7219A9B786009F3D7E /* NSArray+Predicate.m
*/; };
BC42735E1A7C73B300068882 /* NSArray+PredicateTests.m in Sources
*/ = {isa = PBXBuildFile; fileRef = BC8309C81A7C370B003FC5C7 /*
NSArray+PredicateTests.m */; };
BC50C37F1A83C784006DC7AF /* WMFNetworkUtilities.m in Sources */
= {isa = PBXBuildFile; fileRef = BC50C37E1A83C784006DC7AF /*
WMFNetworkUtilities.m */; };
@@ -306,6 +308,8 @@
BCB66A0C1A85183000C7B1FE /* NSString+WMFHTMLParsing.m in
Sources */ = {isa = PBXBuildFile; fileRef = BCB66A0B1A85183000C7B1FE /*
NSString+WMFHTMLParsing.m */; };
BCB66A0D1A85183000C7B1FE /* NSString+WMFHTMLParsing.m in
Sources */ = {isa = PBXBuildFile; fileRef = BCB66A0B1A85183000C7B1FE /*
NSString+WMFHTMLParsing.m */; };
BCB66A101A851C9B00C7B1FE /* MWKImageListTests.m in Sources */ =
{isa = PBXBuildFile; fileRef = BCB66A0F1A851C9B00C7B1FE /* MWKImageListTests.m
*/; };
+ BCC185D81A9E5628005378F8 /* UILabel+WMFStyling.m in Sources */
= {isa = PBXBuildFile; fileRef = BCC185D71A9E5628005378F8 /*
UILabel+WMFStyling.m */; };
+ BCC185E01A9EC836005378F8 /* UIButton+FrameUtils.m in Sources */
= {isa = PBXBuildFile; fileRef = BCC185DF1A9EC836005378F8 /*
UIButton+FrameUtils.m */; };
BCC185E81A9FA498005378F8 /*
UICollectionViewFlowLayout+AttributeUtils.m in Sources */ = {isa =
PBXBuildFile; fileRef = BCC185E71A9FA498005378F8 /*
UICollectionViewFlowLayout+AttributeUtils.m */; };
BCC185E91A9FA498005378F8 /*
UICollectionViewFlowLayout+AttributeUtils.m in Sources */ = {isa =
PBXBuildFile; fileRef = BCC185E71A9FA498005378F8 /*
UICollectionViewFlowLayout+AttributeUtils.m */; };
C42D947E1A937DAC00A4871A /* SavedArticlesFetcher.m in Sources
*/ = {isa = PBXBuildFile; fileRef = C42D947D1A937DAC00A4871A /*
SavedArticlesFetcher.m */; };
@@ -728,6 +732,8 @@
17A2F22335C5256576CEDBDD /*
Pods-WikipediaUnitTests.release.xcconfig */ = {isa = PBXFileReference;
includeInIndex = 1; lastKnownFileType = text.xcconfig; name =
Pods-WikipediaUnitTests.release.xcconfig; path = Pods/Target Support
Files/Pods-WikipediaUnitTests/Pods-WikipediaUnitTests.release.xcconfig;
sourceTree = group; };
357504E50DA104E39C6ACFEB /* Pods.release.xcconfig */ = {isa =
PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name =
Pods.release.xcconfig; path = Pods/Target Support
Files/Pods/Pods.release.xcconfig; sourceTree = group; };
[MediaWiki-commits] [Gerrit] Update dependencies including packagist wm deps - change (wikimedia...crm)
jenkins-bot has submitted this change and it was merged.
Change subject: Update dependencies including packagist wm deps
..
Update dependencies including packagist wm deps
Also updating recurring_globalcollect.module to use new adapter
function addRequestData instead of old addData, and 'stealth
dependency' path to DonationInterface i18n messages.
Change-Id: I27a90343b6fc878b437df4c88841ab5532bfba9f
---
M composer.json
M composer.lock
M sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
M sites/all/modules/wmf_communication/MediaWikiMessages.php
M vendor
5 files changed, 92 insertions(+), 60 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 6a4f0f6..f803580 100644
--- a/composer.json
+++ b/composer.json
@@ -12,23 +12,13 @@
],
license: GPL-2.0,
type: project,
-repositories: [
-{
-type: vcs,
-url:
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/DonationInterface.git;
-},
-{
-type: vcs,
-url:
https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/SmashPig.git;
-}
-],
support: {
irc: irc://irc.freenode.org/wikimedia-fundraising
},
require: {
cogpowered/finediff: 0.*,
-wikimedia/DonationInterface: dev-drupal,
-wikimedia/SmashPig: dev-master,
+wikimedia/donation-interface: dev-master,
+wikimedia/smash-pig: dev-master,
fusesource/stomp-php: 2.*,
phpmailer/phpmailer: 5.2.6,
phpseclib/phpseclib: 0.3.7,
diff --git a/composer.lock b/composer.lock
index 8abfb36..bc68c53 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
This file is @generated automatically
],
-hash: 118d4f47ff407c79a3a6d54fe95442cd,
+hash: 9871c3a8b44fbca95bd7eb8937cd980d,
packages: [
{
name: cogpowered/finediff,
@@ -105,6 +105,48 @@
stomp
],
time: 2013-02-23 17:34:44
+},
+{
+name: minfraud/http,
+version: v1.60,
+source: {
+type: git,
+url: https://github.com/maxmind/ccfd-api-php.git;,
+reference: 553ceffe363185e20e17045d5058aba2154a6faf
+},
+dist: {
+type: zip,
+url:
https://api.github.com/repos/maxmind/ccfd-api-php/zipball/553ceffe363185e20e17045d5058aba2154a6faf;,
+reference: 553ceffe363185e20e17045d5058aba2154a6faf,
+shasum:
+},
+type: library,
+autoload: {
+files: [
+src/HTTPBase.php,
+src/CreditCardFraudDetection.php,
+src/TelephoneVerification.php
+]
+},
+notification-url: https://packagist.org/downloads/;,
+license: [
+LGPL-2.1+
+],
+authors: [
+{
+name: MaxMind, Inc.,
+email: supp...@maxmind.com,
+homepage: http://www.maxmind.com/;
+}
+],
+description: MaxMind minFraud HTTP API,
+homepage: https://github.com/maxmind/ccfd-api-php;,
+keywords: [
+fraud,
+maxmind,
+minfraud
+],
+time: 2014-07-23 16:34:20
},
{
name: phpmailer/phpmailer,
@@ -261,24 +303,24 @@
},
{
name: symfony/event-dispatcher,
-version: v2.3.23,
+version: v2.3.25,
target-dir: Symfony/Component/EventDispatcher,
source: {
type: git,
url: https://github.com/symfony/EventDispatcher.git;,
-reference: 36a40695d94e948d7a85347db0b12ba446c400fa
+reference: 49d3432269d092b8d325b58615815fdbe93f49cb
},
dist: {
type: zip,
-url:
https://api.github.com/repos/symfony/EventDispatcher/zipball/36a40695d94e948d7a85347db0b12ba446c400fa;,
-reference: 36a40695d94e948d7a85347db0b12ba446c400fa,
+url:
https://api.github.com/repos/symfony/EventDispatcher/zipball/49d3432269d092b8d325b58615815fdbe93f49cb;,
+reference: 49d3432269d092b8d325b58615815fdbe93f49cb,
shasum:
},
require: {
php: =5.3.3
},
require-dev: {
-symfony/dependency-injection: ~2.0
+symfony/dependency-injection: ~2.0,=2.0.5
},
suggest: {
[MediaWiki-commits] [Gerrit] Text color for quiet buttons should not be lightened - change (mediawiki/core)
Kaldari has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193987
Change subject: Text color for quiet buttons should not be lightened
..
Text color for quiet buttons should not be lightened
This is part of the effort to synchronize button styles between
MediaWiki UI and OOjs UI. According to the designers, the text
colors for quiet buttons should be the raw non-quiet equivalent
button background colors (not lightened).
Bug: T88449
Change-Id: Ib6ff7167a62c03d0b0427a7161d396e11e173046
---
M resources/src/mediawiki.less/mediawiki.ui/mixins.less
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/87/193987/1
diff --git a/resources/src/mediawiki.less/mediawiki.ui/mixins.less
b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
index a51fe9c..92d0a76 100644
--- a/resources/src/mediawiki.less/mediawiki.ui/mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
@@ -108,9 +108,7 @@
:hover,
:focus {
- // lessphp doesn't implement tint, see above
- // color: tint(@textColor, 20%);
- color: mix(#fff, @textColor, 20%);
+ color: @textColor;
}
:active,
--
To view, visit https://gerrit.wikimedia.org/r/193987
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6ff7167a62c03d0b0427a7161d396e11e173046
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Kaldari rkald...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix invalid use of border shorthand syntax - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix invalid use of border shorthand syntax
..
Fix invalid use of border shorthand syntax
The shorthand syntax is:
border-width || border-style || color
https://developer.mozilla.org/en-US/docs/Web/CSS/border#Syntax
Most browsers tolerate shorthand values in the wrong order if
they can find certain keywords (like solid), but that doesn't
make it right.
Change-Id: Ia244a50704d0f70e249766bb63c416019c27f821
---
M src/themes/apex/elements.less
M src/themes/apex/layouts.less
M src/themes/apex/tools.less
M src/themes/apex/widgets.less
M src/themes/apex/windows.less
M src/themes/mediawiki/common.less
M src/themes/mediawiki/layouts.less
M src/themes/mediawiki/tools.less
M src/themes/mediawiki/widgets.less
M src/themes/mediawiki/windows.less
10 files changed, 39 insertions(+), 39 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/themes/apex/elements.less b/src/themes/apex/elements.less
index b78d83a..cd8dd07 100644
--- a/src/themes/apex/elements.less
+++ b/src/themes/apex/elements.less
@@ -141,7 +141,7 @@
.oo-ui-flaggedElement {
-progressive {
.oo-ui-buttonElement-button {
- border: solid 1px @progressive-border;
+ border: 1px solid @progressive-border;
.oo-ui-vertical-gradient(@progressive-gradient-start,
@progressive-gradient-end);
:hover,
@@ -153,14 +153,14 @@
.oo-ui-widget-enabled
.oo-ui-buttonElement-button:active,
.oo-ui-buttonElement-active
.oo-ui-buttonElement-button,
.oo-ui-buttonElement-pressed
.oo-ui-buttonElement-button {
- border: solid 1px @progressive-border;
+ border: 1px solid @progressive-border;
.oo-ui-vertical-gradient(@progressive-gradient-end,
@progressive-gradient-start);
}
}
-constructive {
.oo-ui-buttonElement-button {
- border: solid 1px @constructive-border;
+ border: 1px solid @constructive-border;
.oo-ui-vertical-gradient(@constructive-gradient-start,
@constructive-gradient-end);
:hover,
@@ -172,7 +172,7 @@
.oo-ui-widget-enabled
.oo-ui-buttonElement-button:active,
.oo-ui-buttonElement-active
.oo-ui-buttonElement-button,
.oo-ui-buttonElement-pressed
.oo-ui-buttonElement-button {
- border: solid 1px @constructive-border;
+ border: 1px solid @constructive-border;
.oo-ui-vertical-gradient(@constructive-gradient-end,
@constructive-gradient-start);
}
}
diff --git a/src/themes/apex/layouts.less b/src/themes/apex/layouts.less
index 305cdb5..ef1a755 100644
--- a/src/themes/apex/layouts.less
+++ b/src/themes/apex/layouts.less
@@ -10,7 +10,7 @@
}
-outlinePanel {
- border-right: solid 1px #ddd;
+ border-right: 1px solid #ddd;
.oo-ui-outlineControlsWidget {
box-shadow: 0 0 0.25em rgba(0,0,0,0.25);
diff --git a/src/themes/apex/tools.less b/src/themes/apex/tools.less
index 96e88bb..f40b55f 100644
--- a/src/themes/apex/tools.less
+++ b/src/themes/apex/tools.less
@@ -2,7 +2,7 @@
.theme-oo-ui-toolbar () {
-bar {
- border-bottom: solid 1px #ccc;
+ border-bottom: 1px solid #ccc;
.oo-ui-vertical-gradient(#fff, #F1F7FB);
.oo-ui-toolbar-bar {
@@ -33,7 +33,7 @@
.theme-oo-ui-toolGroup () {
margin: 0.3em;
border-radius: 0.25em;
- border: solid 1px transparent;
+ border: 1px solid transparent;
.oo-ui-transition(border-color 300ms ease-in-out);
.oo-ui-widget-enabled {
@@ -50,7 +50,7 @@
.theme-oo-ui-barToolGroup () {
.oo-ui-tool {
margin: -1px 0 -1px -1px;
- border: solid 1px transparent;
+ border: 1px solid transparent;
:first-child {
border-top-left-radius: 0.25em;
@@ -172,7 +172,7 @@
.oo-ui-toolGroup-tools {
top: 2em;
margin: 0 -1px;
- border: solid 1px #ccc;
+
[MediaWiki-commits] [Gerrit] Remove unnecessary checks in td/th tag handlers from 7608aeab - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193942
Change subject: Remove unnecessary checks in td/th tag handlers from 7608aeab
..
Remove unnecessary checks in td/th tag handlers from 7608aeab
* wrapperUnmodified flag is set in the main loop of WTS and is
protected by the same check that were present in the checks
removed here.
Change-Id: I3d843f0b1df5dd60b3cd89d6712d0b7e89d21e00
---
M lib/wts.TagHandlers.js
1 file changed, 0 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/42/193942/1
diff --git a/lib/wts.TagHandlers.js b/lib/wts.TagHandlers.js
index 19dc89f..230c8f3 100644
--- a/lib/wts.TagHandlers.js
+++ b/lib/wts.TagHandlers.js
@@ -614,10 +614,6 @@
},
th: {
handle: function (node, state, cb, wrapperUnmodified) {
- if
(!state.serializer.origSrcValidInEditedContext(state, node)) {
- wrapperUnmodified = false;
- }
-
var dp = DU.getDataParsoid( node ), res,
usableDP = stxInfoValidForTableCell(state,
node),
startTagSrc = usableDP ? dp.startTagSrc : ,
@@ -654,10 +650,6 @@
},
td: {
handle: function (node, state, cb, wrapperUnmodified) {
- if
(!state.serializer.origSrcValidInEditedContext(state, node)) {
- wrapperUnmodified = false;
- }
-
var dp = DU.getDataParsoid(node), res,
usableDP = stxInfoValidForTableCell(state,
node),
startTagSrc = usableDP ? dp.startTagSrc : ,
--
To view, visit https://gerrit.wikimedia.org/r/193942
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d843f0b1df5dd60b3cd89d6712d0b7e89d21e00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adds code linting via uncrustify. - change (apps...wikipedia)
Mhurd has submitted this change and it was merged.
Change subject: Adds code linting via uncrustify.
..
Adds code linting via uncrustify.
Install the pre-commit git hook by running ./scripts/setup_git_hooks.sh
Uncrustify all files manually by running ./scripts/uncrustify_all.h
Update README for dependencies, install instructions, etc…
Things to look at:
- The setup_git_hooks.sh installs the git hook
- Committing runs the git hook, which:
- Uncrustifies all files in code base
- Prevents the commit when any file is uncrustified
- Allows the commit if no files are uncrustified
- WikipediaUnitTests/WMFCodingStyle.m is along the lines of what we discussed
- README updates are satisfactory
Change-Id: I59f060b0916cc037bbba541e0e3e677b90a03e4b
---
M README.md
M Wikipedia.xcodeproj/project.pbxproj
A WikipediaUnitTests/WMFCodingStyle.h
A WikipediaUnitTests/WMFCodingStyle.m
A scripts/pre-commit.sh
A scripts/setup_git_hooks.sh
A scripts/uncrustify_all.sh
A uncrustify.cfg
8 files changed, 915 insertions(+), 3 deletions(-)
Approvals:
Fjalapeno: Looks good to me, but someone else must approve
Mhurd: Verified; Looks good to me, approved
Bgerstle: Looks good to me, but someone else must approve
diff --git a/README.md b/README.md
index 4829e47..5d2c833 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,14 @@
* IRC chat: #wikimedia-mobile on irc.freenode.net
# Dependencies
-This project uses [CocoaPods](cocoapods.org) to manage Objective-C
dependencies and [npm](https://www.npmjs.com/) to manage web dependencies.
Please see the `Podfile` and `www/package.json` for a comprehensive list. The
web dependencies (in the www folder) are managed with . Please see for a list
of dependencies.
+## [CocoaPods](cocoapods.org)
+To manage Objective-C dependencies. See the `Podfile` for a comprehensive
list.
+## [npm](https://www.npmjs.com/)
+Manage web dependencies. See `www/package.json` for a comprehensive list.
+## [Grunt](http://gruntjs.com)
+Compile LESS files and other grunt work.
+## [Uncrustify](http://uncrustify.sourceforge.net)
+Code Beautifier
# Setup
## Prerequisites
@@ -32,6 +39,10 @@
- NodeJS: The web portion of the app is built using [npm](npmjs.com) to
install node packages and [grunt](http://gruntjs.com) to manage tasks.
_[nodenv](https://github.com/OiNutter/nodenv) is recommended for managing
multiple node versions._
+
+- [Uncrustify](http://uncrustify.sourceforge.net) for formatting source code
to conform to our Style Guide. You can install with homebrew ```brew install
uncrustify```
+
+ _[BBUncrustifyPlugin](https://github.com/benoitsan/BBUncrustifyPlugin-Xcode)
is an easy way to uncrustify files within the Xcode UI.
## Building
Once all the dependencies are installed, you'll have to do a couple of things
before firing up Xcode and running the app:
@@ -60,12 +71,13 @@
Please file bugs at
[bugzilla.wikimedia.org](https://bugzilla.wikimedia.org/enter_bug.cgi?product=Wikipedia%20App);
use the iOS App component.
# Submitting patches
+Before submitting a patch be sure to use Uncrustify to format your code (See
installation instructions above). To make it easy, you can install a pre commit
hook by running the script ```/scripts/setup_git_hooks.sh``` or by using the
BBUncrustifyPlugin as mentioned above.
+
See [mediawiki.org's Gerrit page](https://www.mediawiki.org/wiki/Gerrit) for
general information about contributing to Wikimedia project source code hosted
in Gerrit -- use the project name apps/ios/wikipedia in place of
mediawiki/core etc.
You can also follow or fork from our [GitHub
mirror](https://github.com/wikimedia/apps-ios-wikipedia). Note that pull
requests submitted through GitHub must be manually copied over to Gerrit for
review and merge (though there is a bot we plan to enable to simplify this).
Please include unit tests with any new code where possible.
-
# Architecture
This generation of the Wikipedia reader app is built around native UI chrome
(menus, toolbars, search UI, preferences, caching, etc) to improve startup
time, responsiveness and nativey look-n-feel versus a previous HTML-based
approach using PhoneGap/Apache Cordova.
@@ -82,4 +94,3 @@
Volunteer contributions are welcome!
We can be reached during California office hours (and sometimes outside them)
in IRC: #wikimedia-mobile on irc.freenode.net.
-
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index 42de168..e5312cc 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -190,6 +190,7 @@
BC50C3831A83C88F006DC7AF /* WMFJoinedPropertyParametersTests.m
in Sources */ = {isa = PBXBuildFile; fileRef = BC50C3821A83C88F006DC7AF /*
WMFJoinedPropertyParametersTests.m */; };
BC50C3841A83C96D006DC7AF /* WMFNetworkUtilities.m in Sources */
= {isa = PBXBuildFile; fileRef =
[MediaWiki-commits] [Gerrit] Fix transfer of reference contents from removed reference - change (mediawiki...VisualEditor)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193956
Change subject: Fix transfer of reference contents from removed reference
..
Fix transfer of reference contents from removed reference
We unconditionally retrieved originalHtml from itemNode,
even if there was no data-mw.body.id, so as long as
the reference itself wasn't edited, we would never overwrite
data-mw. This meant that if the ref with the contents
was deleted, the contents wouldn't be transfered to the
first ref tag with that name like they're supposed to be.
The solution is to only look at originalHtml from itemNode
if data-mw.body.id is set.
Change-Id: Ib87491b6fa6a77d62384158f8e8f7dcc2a36c23a
---
M modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/56/193956/1
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
index 4945117..f6c4503 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
@@ -156,7 +156,8 @@
);
itemNodeHtml = itemNodeWrapper.innerHTML; // Returns '' if
itemNodeWrapper is empty
originalHtml = ve.getProp( mwData, 'body', 'html' ) ||
- itemNode.getAttribute( 'originalHtml' ) || '';
+ ( ve.getProp( mwData, 'body', 'id' ) !== undefined
itemNode.getAttribute( 'originalHtml' ) ) ||
+ '';
originalHtmlWrapper.innerHTML = originalHtml;
// Only set body.html if itemNodeHtml and originalHtml are
actually different
if ( !originalHtmlWrapper.isEqualNode( itemNodeWrapper ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/193956
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib87491b6fa6a77d62384158f8e8f7dcc2a36c23a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert wikitech: remove nutcracker - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Revert wikitech: remove nutcracker
..
Revert wikitech: remove nutcracker
This broke logins on wikitech
This reverts commit f83c4191b7e2351366199d7178374cb541ff4f04.
Change-Id: I5a1ac2831bdcf600c0890eb9034735572a7d
---
M hieradata/hosts/silver.yaml
M manifests/role/nova.pp
M modules/openstack/manifests/openstack-manager.pp
3 files changed, 21 insertions(+), 6 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/silver.yaml b/hieradata/hosts/silver.yaml
index 496a8ee..4e2d615 100644
--- a/hieradata/hosts/silver.yaml
+++ b/hieradata/hosts/silver.yaml
@@ -2,5 +2,3 @@
cluster: virt
admin::groups:
- deployment
-memcached::ip: 127.0.0.1
-memcached::port: 11212
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 22d6382..61282f5 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -213,12 +213,27 @@
certificate = $certificate,
}
+include ::nutcracker::monitoring
include ::mediawiki::packages::php5
include ::scap::scripts
-service { 'nutcracker':
-ensure = absent,
-before = Service['memcached']
+class { '::nutcracker':
+mbuf_size = '64k',
+pools = {
+'memcached' = {
+auto_eject_hosts = true,
+distribution = 'ketama',
+hash = 'md5',
+listen = '127.0.0.1:11212',
+preconnect = true,
+server_connections = 2,
+server_failure_limit = 3,
+timeout = 250,
+servers = [
+'127.0.0.1:11000:1',
+],
+},
+},
}
}
diff --git a/modules/openstack/manifests/openstack-manager.pp
b/modules/openstack/manifests/openstack-manager.pp
index da891fd..d1ca7f3 100644
--- a/modules/openstack/manifests/openstack-manager.pp
+++ b/modules/openstack/manifests/openstack-manager.pp
@@ -17,7 +17,9 @@
before = Package['memcached'],
}
-include memcached
+class { 'memcached':
+ip = '127.0.0.1',
+}
}
$controller_hostname = $novaconfig['controller_hostname']
--
To view, visit https://gerrit.wikimedia.org/r/193968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5a1ac2831bdcf600c0890eb9034735572a7d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@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 Nutcracker should be 'stopped' rather than 'absent' - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193967
Change subject: Revert Nutcracker should be 'stopped' rather than 'absent'
..
Revert Nutcracker should be 'stopped' rather than 'absent'
(This patchset broke logins on wikitech)
This reverts commit ef7089a5278649ef86e542487f7b11e801688d59.
Change-Id: I818f55482559c07046b067a0edbc8bcd4cac2c68
---
M manifests/role/nova.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/193967/1
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 1646435..22d6382 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -217,7 +217,7 @@
include ::scap::scripts
service { 'nutcracker':
-ensure = stopped,
+ensure = absent,
before = Service['memcached']
}
}
--
To view, visit https://gerrit.wikimedia.org/r/193967
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I818f55482559c07046b067a0edbc8bcd4cac2c68
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Add Special:UsersWhoWillBeRenamed - change (mediawiki...CentralAuth)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193969
Change subject: [WIP] Add Special:UsersWhoWillBeRenamed
..
[WIP] Add Special:UsersWhoWillBeRenamed
* Needs qqq
* Batching is broken because blocks are looked up individually
* Needs some intro text?
Change-Id: I977bcb43bd84040c71b158c9201a59c15140a118
---
M CentralAuth.alias.php
M CentralAuth.php
M i18n/en.json
A includes/specials/SpecialUsersWhoWillBeRenamed.php
4 files changed, 162 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/69/193969/1
diff --git a/CentralAuth.alias.php b/CentralAuth.alias.php
index 5856de1..7437304 100644
--- a/CentralAuth.alias.php
+++ b/CentralAuth.alias.php
@@ -25,6 +25,7 @@
'GlobalRenameRequest' = array( 'GlobalRenameRequest' ),
'GlobalRenameQueue' = array( 'GlobalRenameQueue' ),
'SulRenameWarning' = array( 'SulRenameWarning' ),
+ 'UsersWhoWillBeRenamed' = array( 'UsersWhoWillBeRenamed' ),
);
/** Afrikaans (Afrikaans) */
@@ -845,4 +846,4 @@
/** Chinese (Hong Kong) (中文（香港）) */
$specialPageAliases['zh-hk'] = array(
'GlobalGroupMembership' = array( '全域用戶權限' ),
-);
\ No newline at end of file
+);
diff --git a/CentralAuth.php b/CentralAuth.php
index e867280..7aff834 100644
--- a/CentralAuth.php
+++ b/CentralAuth.php
@@ -314,6 +314,7 @@
$wgAutoloadClasses['CentralAuthTestCaseUsingDatabase'] =
$caBase/tests/CentralAuthTestCaseUsingDatabase.php;
$wgAutoloadClasses['CentralAuthTestUser'] =
$caBase/tests/CentralAuthTestUser.php;
+$wgAutoloadClasses['SpecialUsersWhoWillBeRenamed'] =
$caBase/includes/specials/SpecialUsersWhoWillBeRenamed.php;
$wgAutoloadClasses['UsersToRenameDatabaseUpdates'] =
$caBase/includes/UsersToRename/UsersToRenameDatabaseUpdates.php;
// only used by maintenance/sendConfirmAndMigrateEmail.php
@@ -427,6 +428,7 @@
$wgSpecialPages['GlobalRenameUser'] = 'SpecialGlobalRenameUser';
$wgSpecialPages['GlobalRenameProgress'] = 'SpecialGlobalRenameProgress';
$wgSpecialPages['GlobalUserMerge'] = 'SpecialGlobalUserMerge';
+$wgSpecialPages['UsersWhoWillBeRenamed'] = 'SpecialUsersWhoWillBeRenamed';
$wgSpecialPageGroups['CentralAuth'] = 'users';
$wgSpecialPageGroups['MergeAccount'] = 'login';
$wgSpecialPageGroups['GlobalGroupMembership'] = 'users';
diff --git a/i18n/en.json b/i18n/en.json
index 2a392f4..82deb95 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -530,5 +530,9 @@
apihelp-setglobalaccountstatus-example-2: Unlock and suppress the
global account for [[User:Example]] with reason \I can\,
centralauth-log-gblrename-oldname: Previous username:,
centralauth-contribs-locked: This account is globally locked.\nSee
[[Special:CentralAuth/$1|global account details]] for more information.,
- centralauth-contribs-locked-log: This account is globally
locked.\nThe latest lock log entry is provided below for reference:
+ centralauth-contribs-locked-log: This account is globally
locked.\nThe latest lock log entry is provided below for reference:,
+ userswhowillberenamed: Users who will be renamed,
+ centralauth-uwbr-name: User name,
+ centralauth-uwbr-registration: Registration date,
+ centralauth-uwbr-editcount: Edit count
}
diff --git a/includes/specials/SpecialUsersWhoWillBeRenamed.php
b/includes/specials/SpecialUsersWhoWillBeRenamed.php
new file mode 100644
index 000..41e0f00
--- /dev/null
+++ b/includes/specials/SpecialUsersWhoWillBeRenamed.php
@@ -0,0 +1,153 @@
+?php
+
+class SpecialUsersWhoWillBeRenamed extends SpecialPage {
+ public function __construct() {
+ parent::__construct( 'UsersWhoWillBeRenamed' );
+ }
+
+ public function execute() {
+ $this-setHeaders();
+ $pager = new UsersWhoWillBeRenamedPager( $this,
$this-getContext() );
+ $this-getOutput()-addParserOutput( $pager-getFullOutput() );
+ }
+}
+
+/**
+ * Paginated table of search results.
+ * @ingroup Pager
+ */
+class UsersWhoWillBeRenamedPager extends TablePager {
+
+ /**
+* @var SpecialPage $owner
+*/
+ protected $owner;
+ /**
+* @var $mFieldNames array
+*/
+ protected $mFieldNames;
+
+ /**
+* @var User[]
+*/
+ protected $users = array();
+
+ /**
+* @param SpecialPage $owner Containing page
+* @param IContextSource $context
+*/
+ public function __construct( SpecialPage $owner, IContextSource
$context ) {
+ $this-owner = $owner;
+ $this-mDb = CentralAuthUser::getCentralSlaveDB();
+ $this-setLimit( 25 );
+ parent::__construct( $context );
+ }
+
+ public function getQueryInfo() {
+ return array(
+ 'tables' = 'users_to_rename',
+ 'fields'
[MediaWiki-commits] [Gerrit] Make annotation inspector getMode method trim - change (VisualEditor/VisualEditor)
Trevor Parscal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193971
Change subject: Make annotation inspector getMode method trim
..
Make annotation inspector getMode method trim
In cases where you selected a linked word plus adjacent spaces, the inspector
would be in insert mode instead of edit mode, because getSelectedModels() only
returns models that cover the whole selection (unless you use the all argument,
but we weren't doing so here because that's farther from the behavior we want).
This differs from how annotation inspectors actually work because they have
special behavior in getSetupProcess that trims the fragment before deciding if
there's a model to be edited. By adding trimming to the getMode() method we can
ensure that insert mode is used correctly.
Change-Id: I354059843b770fb12996bf9473c29daa6952de7e
---
M src/ui/inspectors/ve.ui.AnnotationInspector.js
M src/ui/inspectors/ve.ui.FragmentInspector.js
2 files changed, 27 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/71/193971/1
diff --git a/src/ui/inspectors/ve.ui.AnnotationInspector.js
b/src/ui/inspectors/ve.ui.AnnotationInspector.js
index 27b546f..014bc21 100644
--- a/src/ui/inspectors/ve.ui.AnnotationInspector.js
+++ b/src/ui/inspectors/ve.ui.AnnotationInspector.js
@@ -131,6 +131,18 @@
/**
* @inheritdoc
*/
+ve.ui.FragmentInspector.prototype.getMode = function () {
+ if ( this.fragment ) {
+ // Trim the fragment before getting selected models to match
the behavior of
+ // #getSetupProcess
+ return
this.fragment.trimLinearSelection().getSelectedModels().length ? 'edit' :
'insert';
+ }
+ return '';
+};
+
+/**
+ * @inheritdoc
+ */
ve.ui.AnnotationInspector.prototype.getActionProcess = function ( action ) {
if ( action === 'remove' ) {
return new OO.ui.Process( function () {
diff --git a/src/ui/inspectors/ve.ui.FragmentInspector.js
b/src/ui/inspectors/ve.ui.FragmentInspector.js
index fdc7432..8046e0c 100644
--- a/src/ui/inspectors/ve.ui.FragmentInspector.js
+++ b/src/ui/inspectors/ve.ui.FragmentInspector.js
@@ -65,6 +65,21 @@
};
/**
+ * Get a symbolic mode name.
+ *
+ * @localdoc If the fragment being inspected selects at least one model the
mode will be `edit`,
+ * otherwise the mode will be `insert`
+ *
+ * @return {string} Symbolic mode name
+ */
+ve.ui.FragmentInspector.prototype.getMode = function () {
+ if ( this.fragment ) {
+ return this.fragment.getSelectedModels().length ? 'edit' :
'insert';
+ }
+ return '';
+};
+
+/**
* @inheritdoc
*/
ve.ui.FragmentInspector.prototype.initialize = function () {
@@ -116,23 +131,6 @@
.next( function () {
this.actions.setMode( this.getMode() );
}, this );
-};
-
-/**
- * Get a symbolic mode name.
- *
- * If the fragment being inspected selects at least one model the mode will be
`edit`, otherwise
- * the mode will be `insert`.
- *
- * @return {string} Symbolic mode name
- */
-ve.ui.FragmentInspector.prototype.getMode = function () {
- if ( this.fragment ) {
- // TODO: Filter out incompatible models before checking the
length, in practice this works
- // but theoretically you could have models selected that are
not being inspected
- return this.fragment.getSelectedModels().length ? 'edit' :
'insert';
- }
- return '';
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/193971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I354059843b770fb12996bf9473c29daa6952de7e
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal tpars...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] 10.in-addr.arpa - indentation fixes - change (operations/dns)
Dzahn has submitted this change and it was merged.
Change subject: 10.in-addr.arpa - indentation fixes
..
10.in-addr.arpa - indentation fixes
It's not really all of them but getting there.
Didn't want to make it too large nor too small.
Change-Id: If6f0cfcbde8d0ca844da0a25367c8d3f46cbf6da
---
M templates/10.in-addr.arpa
1 file changed, 77 insertions(+), 77 deletions(-)
Approvals:
BBlack: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 0ccc066..81c4bc8 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -24,18 +24,18 @@
$ORIGIN 2.2.{{ zonename }}.
-1 1H IN PTR appservers.svc.eqiad.wmnet.
-3 1H IN PTR hhvm-api.svc.eqiad.wmnet.
-16 1H IN PTR zotero.svc.eqiad.wmnet.
-17 1H IN PTR restbase.svc.eqiad.wmnet.
-18 1H IN PTR cxserver.svc.eqiad.wmnet.
-19 1H IN PTR citoid.svc.eqiad.wmnet.
-20 1H IN PTR mathoid.svc.eqiad.wmnet.
-21 1H IN PTR rendering.svc.eqiad.wmnet.
-22 1H IN PTR api.svc.eqiad.wmnet.
-23 1H IN PTR bits.svc.eqiad.wmnet.
-24 1H IN PTR upload.svc.eqiad.wmnet.
-25 1H IN PTR text.svc.eqiad.wmnet.
+1 1H IN PTR appservers.svc.eqiad.wmnet.
+3 1H IN PTR hhvm-api.svc.eqiad.wmnet.
+16 1H IN PTR zotero.svc.eqiad.wmnet.
+17 1H IN PTR restbase.svc.eqiad.wmnet.
+18 1H IN PTR cxserver.svc.eqiad.wmnet.
+19 1H IN PTR citoid.svc.eqiad.wmnet.
+20 1H IN PTR mathoid.svc.eqiad.wmnet.
+21 1H IN PTR rendering.svc.eqiad.wmnet.
+22 1H IN PTR api.svc.eqiad.wmnet.
+23 1H IN PTR bits.svc.eqiad.wmnet.
+24 1H IN PTR upload.svc.eqiad.wmnet.
+25 1H IN PTR text.svc.eqiad.wmnet.
26 1H IN PTR mobile.svc.eqiad.wmnet.
27 1H IN PTR ms-fe.svc.eqiad.wmnet.
28 1H IN PTR parsoid.svc.eqiad.wmnet.
@@ -320,30 +320,30 @@
92 1H IN PTR mw1062.eqiad.wmnet.
93 1H IN PTR mw1063.eqiad.wmnet.
94 1H IN PTR mw1064.eqiad.wmnet.
-95 1H IN PTR cp1058.eqiad.wmnet.
-96 1H IN PTR cp1059.eqiad.wmnet.
-97 1H IN PTR cp1060.eqiad.wmnet.
-98 1H IN PTR cp1061.eqiad.wmnet.
-99 1H IN PTR cp1062.eqiad.wmnet.
-100 1H IN PTR cp1063.eqiad.wmnet.
-101 1H IN PTR cp1064.eqiad.wmnet.
-102 1H IN PTR cp1065.eqiad.wmnet.
-103 1H IN PTR cp1066.eqiad.wmnet.
-104 1H IN PTR cp1067.eqiad.wmnet.
-105 1H IN PTR cp1068.eqiad.wmnet.
-106 1H IN PTR cp1069.eqiad.wmnet.
-107 1H IN PTR cp1070.eqiad.wmnet.
-108 1H IN PTR elastic1001.eqiad.wmnet.
-109 1H IN PTR elastic1002.eqiad.wmnet.
-110 1H IN PTR elastic1003.eqiad.wmnet.
-111 1H IN PTR elastic1004.eqiad.wmnet.
-112 1H IN PTR elastic1005.eqiad.wmnet.
-113 1H IN PTR elastic1006.eqiad.wmnet.
+95 1H IN PTR cp1058.eqiad.wmnet.
+96 1H IN PTR cp1059.eqiad.wmnet.
+97 1H IN PTR cp1060.eqiad.wmnet.
+98 1H IN PTR cp1061.eqiad.wmnet.
+99 1H IN PTR cp1062.eqiad.wmnet.
+100 1H IN PTR cp1063.eqiad.wmnet.
+101 1H IN PTR cp1064.eqiad.wmnet.
+102 1H IN PTR cp1065.eqiad.wmnet.
+103 1H IN PTR cp1066.eqiad.wmnet.
+104 1H IN PTR cp1067.eqiad.wmnet.
+105 1H IN PTR cp1068.eqiad.wmnet.
+106 1H IN PTR cp1069.eqiad.wmnet.
+107 1H IN PTR cp1070.eqiad.wmnet.
+108 1H IN PTR elastic1001.eqiad.wmnet.
+109 1H IN PTR elastic1002.eqiad.wmnet.
+110 1H IN PTR elastic1003.eqiad.wmnet.
+111 1H IN PTR elastic1004.eqiad.wmnet.
+112 1H IN PTR elastic1005.eqiad.wmnet.
+113 1H IN PTR elastic1006.eqiad.wmnet.
120 1H IN PTR snapshot1001.eqiad.wmnet.
121 1H IN PTR snapshot1002.eqiad.wmnet.
-161 1H IN PTR lanthanum.eqiad.wmnet.
-162 1H IN PTR rbf1001.eqiad.wmnet.
-163 1H IN PTR rbf1002.eqiad.wmnet.
+161 1H IN PTR lanthanum.eqiad.wmnet.
+162 1H IN PTR rbf1001.eqiad.wmnet.
+163 1H IN PTR rbf1002.eqiad.wmnet.
164 1H IN PTR strontium.eqiad.wmnet.
165 1H IN PTR dbproxy1001.eqiad.wmnet.
166 1H IN PTR dbproxy1002.eqiad.wmnet.
@@ -390,39 +390,39 @@
$ORIGIN 1.64.{{ zonename }}.
-1 1H IN PTR vl1017-eth0.lvs1001.wikimedia.org.
-2 1H IN PTR vl1017-eth0.lvs1002.wikimedia.org.
-3 1H IN PTR vl1017-eth0.lvs1003.wikimedia.org.
-4 1H IN PTR vl1017-eth1.lvs1004.wikimedia.org.
-5 1H IN PTR vl1017-eth1.lvs1005.wikimedia.org.
-6 1H IN PTR vl1017-eth1.lvs1006.wikimedia.org.
+1 1H IN PTR vl1017-eth0.lvs1001.wikimedia.org.
+2 1H IN PTR vl1017-eth0.lvs1002.wikimedia.org.
+3 1H IN PTR vl1017-eth0.lvs1003.wikimedia.org.
+4 1H IN PTR vl1017-eth1.lvs1004.wikimedia.org.
+5 1H IN PTR vl1017-eth1.lvs1005.wikimedia.org.
+6 1H IN PTR vl1017-eth1.lvs1006.wikimedia.org.
; 10.64.4.0/24 - labs-support1-a-eqiad
[MediaWiki-commits] [Gerrit] Update dependencies including packagist wm deps - change (wikimedia...vendor)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/193977 Change subject: Update dependencies including packagist wm deps .. Update dependencies including packagist wm deps Deleted wikimedia/**/.git, wikimeida/**/.gitmodules, wikimedia/**/.gitreview. Till Composer makes it easier to check in vendor/, we'll just have to rm -rf vendor/wikimedia before each composer upgrade. Change-Id: I1a70d9a32ea304e92df9a73faaa7fd39c57d7487 --- D .gitmodules M autoload.php M composer/ClassLoader.php M composer/autoload_classmap.php M composer/autoload_files.php M composer/autoload_psr4.php M composer/autoload_real.php M composer/installed.json A minfraud/http/COPYING A minfraud/http/Changes A minfraud/http/README.md A minfraud/http/composer.json A minfraud/http/examples/minfraud.php A minfraud/http/examples/telephone-verification.php A minfraud/http/src/CreditCardFraudDetection.php A minfraud/http/src/HTTPBase.php A minfraud/http/src/TelephoneVerification.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/Event.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventDispatcher.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventSubscriberInterface.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/GenericEvent.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/LICENSE M symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json M symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist M symfony/http-foundation/Symfony/Component/HttpFoundation/AcceptHeader.php M symfony/http-foundation/Symfony/Component/HttpFoundation/BinaryFileResponse.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Cookie.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/Exception/FileException.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/Exception/FileNotFoundException.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/Exception/UploadException.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesserInterface.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/UploadedFile.php M symfony/http-foundation/Symfony/Component/HttpFoundation/IpUtils.php M symfony/http-foundation/Symfony/Component/HttpFoundation/LICENSE M symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php M symfony/http-foundation/Symfony/Component/HttpFoundation/ResponseHeaderBag.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/SessionInterface.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php M
[MediaWiki-commits] [Gerrit] Include mediawiki.org pageviews - change (analytics...source)
Ottomata has submitted this change and it was merged. Change subject: Include mediawiki.org pageviews .. Include mediawiki.org pageviews MediaWiki.org pageviews should be included, and currently aren't. Rather than screw with the structure of the existing regular expressions (which neatly handle *.wikimedia and *.wiki* projects, respectively) I've converted the wikidata string (which must be handled distinctly due to the www.) into a regular expression and incorporated mediawiki.org Also included is a unit test. Everyone loves unit tests. Change-Id: I3a80cb75f175f715f0a369879ee2851217d0ffd1 --- M changelog.md M refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java M refinery-core/src/test/resources/pageview_test_data.csv 3 files changed, 6 insertions(+), 2 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/changelog.md b/changelog.md index c2c5a7d..4e09776 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,7 @@ ## v0.0.8-SNAPSHOT * Stop counting edit attempts as pageviews * Start counting www.wikidata.org hits +* Start counting www.mediawiki.org hits ## v0.0.7 * Add Referer classifier diff --git a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java index b4d195a..3a9bfda 100644 --- a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java +++ b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java @@ -38,7 +38,9 @@ + inews|ipedia|iquote|isource|tionary|iversity|ivoyage))\\.org$ ); -private static final String uriHostWikidataString = www.wikidata.org; +private static final Pattern uriHostOtherProjectsPattern = Pattern.compile( +(wikidata|mediawiki)\\.org$ +); private static final Pattern uriPathPattern = Pattern.compile( ^(/sr(-(ec|el))?|/w(iki)?|/zh(-(cn|hans|hant|hk|mo|my|sg|tw))?)/ @@ -175,7 +177,7 @@ // or a 'project' domain, e.g. en.wikipedia.org ( patternIsFound(uriHostWikimediaDomainPattern, uriHost) -|| stringContains(uriHost, uriHostWikidataString) +|| patternIsFound(uriHostOtherProjectsPattern, uriHost) || patternIsFound(uriHostProjectDomainPattern, uriHost) ) // Either a pageview's uriPath will match the first pattern, diff --git a/refinery-core/src/test/resources/pageview_test_data.csv b/refinery-core/src/test/resources/pageview_test_data.csv index 9ba352e..fb99fd3 100644 --- a/refinery-core/src/test/resources/pageview_test_data.csv +++ b/refinery-core/src/test/resources/pageview_test_data.csv @@ -14,6 +14,7 @@ Is Pageview – Desktop - Chinese zh-sg, true,false,174.62.175.93,-,zh.wikipedia.org,/zh-sg/Wikipedia:首页,-,200,text/html,Five-test plan Is Pageview – Desktop - Chinese zh-tw, true,false,174.62.175.94,-,zh.wikipedia.org,/zh-tw/Wikipedia:首页,-,200,text/html,Five-test plan Is Pageview – Wikidata, true, true,174.62.175.94,-,www.wikidata.org,/wiki/Q5651758,-,200,text/html,Five-test plan +Is Pageview – MediaWiki, true, true,174.62.175.94,-,www.mediawiki.org,/wiki/Gerrit/git-review,-,200,text/html,Five-test plan Is Not Pageview - http_status != 200, false,true,174.62.175.95,-, en.wikipedia.org, /wiki/Nopppes,-,400,text/html ,turnip Is Not Pageview - content_type does not match, false,true,174.62.175.96,-, en.wikipedia.org, /wiki/Nopppes,-,200, image/png, turnip Is Not Pageview - API stupidity: it outputs a 200 status code and text/html as a MIME type on certain classes of error., false, false,174.62.175.97,-, en.wikipedia.org, /w/api.php,-,200, text/html, turnip -- To view, visit https://gerrit.wikimedia.org/r/193982 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3a80cb75f175f715f0a369879ee2851217d0ffd1 Gerrit-PatchSet: 2 Gerrit-Project: analytics/refinery/source Gerrit-Branch: master Gerrit-Owner: OliverKeyes oke...@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] wmf-reimage: use ipv4 for initial ssh - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193960
Change subject: wmf-reimage: use ipv4 for initial ssh
..
wmf-reimage: use ipv4 for initial ssh
Change-Id: Icf18cdc567d5d58feabbcadef3c8bfd4943db1c2
---
M modules/puppetmaster/files/wmf-reimage
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/193960/1
diff --git a/modules/puppetmaster/files/wmf-reimage
b/modules/puppetmaster/files/wmf-reimage
index 9ba281f..8e2fbb7 100755
--- a/modules/puppetmaster/files/wmf-reimage
+++ b/modules/puppetmaster/files/wmf-reimage
@@ -120,9 +120,9 @@
function enable_and_run_puppet {
nodename=${1}
log Enabling puppet
-ssh -i /root/.ssh/new_install -o StrictHostKeyChecking=no -o
UserKnownHostsFile=/dev/null -o GlobalKnownHostsFile=/dev/null ${nodename}
puppet agent --enable
+ssh -4 -i /root/.ssh/new_install -o StrictHostKeyChecking=no -o
UserKnownHostsFile=/dev/null -o GlobalKnownHostsFile=/dev/null ${nodename}
puppet agent --enable
log Spawning the first puppet run as well
-ssh -q -i /root/.ssh/new_install -o StrictHostKeyChecking=no -o
UserKnownHostsFile=/dev/null -o GlobalKnownHostsFile=/dev/null ${nodename}
puppet agent -t ${nodename}.puppetrun.log 21
+ssh -4 -q -i /root/.ssh/new_install -o StrictHostKeyChecking=no -o
UserKnownHostsFile=/dev/null -o GlobalKnownHostsFile=/dev/null ${nodename}
puppet agent -t ${nodename}.puppetrun.log 21
log The first puppet run is ongoing, you can see what the result is in
the file ${PWD}/${nodename}.puppetrun.log
}
--
To view, visit https://gerrit.wikimedia.org/r/193960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf18cdc567d5d58feabbcadef3c8bfd4943db1c2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix transfer of reference contents from removed reference - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix transfer of reference contents from removed reference
..
Fix transfer of reference contents from removed reference
We unconditionally retrieved originalHtml from itemNode,
even if there was no data-mw.body.id, so as long as
the reference itself wasn't edited, we would never overwrite
data-mw. This meant that if the ref with the contents
was deleted, the contents wouldn't be transfered to the
first ref tag with that name like they're supposed to be.
The solution is to only look at originalHtml from itemNode
if data-mw.body.id is set.
Change-Id: Ib87491b6fa6a77d62384158f8e8f7dcc2a36c23a
---
M modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
index 4945117..f6c4503 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
@@ -156,7 +156,8 @@
);
itemNodeHtml = itemNodeWrapper.innerHTML; // Returns '' if
itemNodeWrapper is empty
originalHtml = ve.getProp( mwData, 'body', 'html' ) ||
- itemNode.getAttribute( 'originalHtml' ) || '';
+ ( ve.getProp( mwData, 'body', 'id' ) !== undefined
itemNode.getAttribute( 'originalHtml' ) ) ||
+ '';
originalHtmlWrapper.innerHTML = originalHtml;
// Only set body.html if itemNodeHtml and originalHtml are
actually different
if ( !originalHtmlWrapper.isEqualNode( itemNodeWrapper ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/193956
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib87491b6fa6a77d62384158f8e8f7dcc2a36c23a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Trevor Parscal tpars...@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] wmf-reimage: use ipv4 for initial ssh - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: wmf-reimage: use ipv4 for initial ssh
..
wmf-reimage: use ipv4 for initial ssh
Change-Id: Icf18cdc567d5d58feabbcadef3c8bfd4943db1c2
---
M modules/puppetmaster/files/wmf-reimage
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/puppetmaster/files/wmf-reimage
b/modules/puppetmaster/files/wmf-reimage
index 9ba281f..8e2fbb7 100755
--- a/modules/puppetmaster/files/wmf-reimage
+++ b/modules/puppetmaster/files/wmf-reimage
@@ -120,9 +120,9 @@
function enable_and_run_puppet {
nodename=${1}
log Enabling puppet
-ssh -i /root/.ssh/new_install -o StrictHostKeyChecking=no -o
UserKnownHostsFile=/dev/null -o GlobalKnownHostsFile=/dev/null ${nodename}
puppet agent --enable
+ssh -4 -i /root/.ssh/new_install -o StrictHostKeyChecking=no -o
UserKnownHostsFile=/dev/null -o GlobalKnownHostsFile=/dev/null ${nodename}
puppet agent --enable
log Spawning the first puppet run as well
-ssh -q -i /root/.ssh/new_install -o StrictHostKeyChecking=no -o
UserKnownHostsFile=/dev/null -o GlobalKnownHostsFile=/dev/null ${nodename}
puppet agent -t ${nodename}.puppetrun.log 21
+ssh -4 -q -i /root/.ssh/new_install -o StrictHostKeyChecking=no -o
UserKnownHostsFile=/dev/null -o GlobalKnownHostsFile=/dev/null ${nodename}
puppet agent -t ${nodename}.puppetrun.log 21
log The first puppet run is ongoing, you can see what the result is in
the file ${PWD}/${nodename}.puppetrun.log
}
--
To view, visit https://gerrit.wikimedia.org/r/193960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf18cdc567d5d58feabbcadef3c8bfd4943db1c2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Single read next item at the bottom of articles. - change (apps...wikipedia)
Dbrant has uploaded a new change for review. https://gerrit.wikimedia.org/r/193974 Change subject: [WIP] Single read next item at the bottom of articles. .. [WIP] Single read next item at the bottom of articles. Change-Id: Ifdc7080749c4a97c01b265c1586f287797fc0ab9 TODO: implement a/b switch based on app install ID. --- M wikipedia/res/layout/fragment_page.xml A wikipedia/res/layout/group_bottom_content.xml M wikipedia/res/values-qq/strings.xml M wikipedia/res/values/strings.xml M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java M wikipedia/src/main/java/org/wikipedia/page/SuggestionsTask.java M wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java A wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandlerOld.java A wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentInterface.java M wikipedia/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java 10 files changed, 648 insertions(+), 155 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/74/193974/1 diff --git a/wikipedia/res/layout/fragment_page.xml b/wikipedia/res/layout/fragment_page.xml index 0f4fbda..b9674de 100644 --- a/wikipedia/res/layout/fragment_page.xml +++ b/wikipedia/res/layout/fragment_page.xml @@ -95,11 +95,14 @@ android:layout_gravity=bottom android:orientation=vertical android:visibility=gone + +!-- Old read more section, to be removed when the time is right. -- LinearLayout android:id=@+id/read_more_container android:layout_width=match_parent android:layout_height=wrap_content -android:orientation=vertical +android:orientation=vertical +android:visibility=gone TextView style=?android:textAppearanceLarge android:layout_width=wrap_content @@ -115,6 +118,9 @@ android:layout_width=match_parent android:layout_height=0dp/ /LinearLayout +!-- New read next section, to supersede the one above. -- +include layout=@layout/group_bottom_content / + LinearLayout android:layout_width=match_parent android:layout_height=wrap_content diff --git a/wikipedia/res/layout/group_bottom_content.xml b/wikipedia/res/layout/group_bottom_content.xml new file mode 100644 index 000..8b1c4a4 --- /dev/null +++ b/wikipedia/res/layout/group_bottom_content.xml @@ -0,0 +1,80 @@ +?xml version=1.0 encoding=utf-8? + +LinearLayout xmlns:android=http://schemas.android.com/apk/res/android; +android:id=@+id/read_next_container +android:layout_width=match_parent +android:layout_height=wrap_content +android:orientation=vertical +TextView +style=?android:textAppearanceLarge +android:layout_width=wrap_content +android:layout_height=wrap_content +android:paddingLeft=@dimen/activity_horizontal_margin +android:paddingRight=@dimen/activity_horizontal_margin +android:paddingBottom=16dp +android:fontFamily=serif +android:textSize=24sp +android:text=@string/read_next_section/ +FrameLayout +android:id=@+id/read_next_images_container +android:layout_width=match_parent +android:layout_height=200dp +!-- dummy LinearLayout container for 2.3 support. +Remove when we drop support for 2.3. -- +LinearLayout +android:layout_width=match_parent +android:layout_height=match_parent +org.wikipedia.page.leadimages.ImageViewWithFace +android:id=@+id/read_next_image_1 +android:layout_width=match_parent +android:layout_height=match_parent +android:scaleType=centerCrop +android:background=@android:color/white/ +/LinearLayout +ImageView +android:id=@+id/read_next_image_placeholder +android:layout_width=match_parent +android:layout_height=match_parent +android:scaleType=centerCrop +android:src=?attr/lead_image_drawable +android:contentDescription=@null/ +FrameLayout +android:id=@+id/read_next_title_container +android:layout_width=match_parent +android:layout_height=wrap_content +android:orientation=vertical +android:layout_gravity=bottom +android:background=@drawable/lead_title_gradient +TextView +android:id=@+id/read_next_title_text +android:layout_width=match_parent +
[MediaWiki-commits] [Gerrit] re-enable cp1064 uplaod backend in eqiad - change (operations/puppet)
BBlack has submitted this change and it was merged. Change subject: re-enable cp1064 uplaod backend in eqiad .. re-enable cp1064 uplaod backend in eqiad Change-Id: I131f222c54564ca98817695024af2d5967c40ba5 --- M manifests/role/cache.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index 885989c..ca4fadb 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -143,7 +143,7 @@ 'cp1061.eqiad.wmnet', 'cp1062.eqiad.wmnet', 'cp1063.eqiad.wmnet', -#'cp1064.eqiad.wmnet', +'cp1064.eqiad.wmnet', ], 'esams' = [ 'cp3003.esams.wikimedia.org', -- To view, visit https://gerrit.wikimedia.org/r/193976 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I131f222c54564ca98817695024af2d5967c40ba5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] re-enable cp1064 uplaod backend in eqiad - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/193976 Change subject: re-enable cp1064 uplaod backend in eqiad .. re-enable cp1064 uplaod backend in eqiad Change-Id: I131f222c54564ca98817695024af2d5967c40ba5 --- M manifests/role/cache.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/76/193976/1 diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index 885989c..ca4fadb 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -143,7 +143,7 @@ 'cp1061.eqiad.wmnet', 'cp1062.eqiad.wmnet', 'cp1063.eqiad.wmnet', -#'cp1064.eqiad.wmnet', +'cp1064.eqiad.wmnet', ], 'esams' = [ 'cp3003.esams.wikimedia.org', -- To view, visit https://gerrit.wikimedia.org/r/193976 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I131f222c54564ca98817695024af2d5967c40ba5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync up with Parsoid parserTests. - change (mediawiki/core)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193980
Change subject: Sync up with Parsoid parserTests.
..
Sync up with Parsoid parserTests.
This now aligns with Parsoid commit 7608aeabdc1e47ce3dbfffd3ded85eecad647260
Change-Id: I4cb8f04b9d7988e5138c8f040fadeb0b7a9348f9
---
M tests/parser/parserTests.txt
1 file changed, 158 insertions(+), 107 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/80/193980/1
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index dec9338..32c7a39 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -6238,6 +6238,27 @@
|}
!! end
+!!test
+Testing serialization after deletion of table cells
+!!options
+parsoid={
+ modes: [wt2wt],
+ changes: [
+[#x, remove]
+ ]
+}
+!!wikitext
+{|
+!h1 !!h2 !!h3
+| id=x |c1 {{!}}{{!}}{{!}}c2 |||c3
+|}
+!! wikitext/edited
+{|
+!h1 !!h2 !!h3
+|c2 |||c3
+|}
+!!end
+
###
### Internal links
###
@@ -19732,13 +19753,13 @@
C ref name=y /
references /
!! html
-pA span about=#mwt2 class=reference id=cite_ref-1 rel=dc:references
typeof=mw:Extension/ref
data-mw='{name:ref,body:{html:foo},attrs:{}}'a
href=#cite_note-1[1]/a/span
-B span about=#mwt4 class=reference id=cite_ref-x_2-0
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,body:{html:foo},attrs:{name:x}}'a
href=#cite_note-x-2[2]/a/span
+pA span about=#mwt2 class=reference id=cite_ref-1 rel=dc:references
typeof=mw:Extension/ref
data-mw='{name:ref,body:{id:mw-reference-text-cite_note-1},attrs:{}}'a
href=#cite_note-1[1]/a/span
+B span about=#mwt4 class=reference id=cite_ref-x_2-0
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,body:{id:mw-reference-text-cite_note-x-2},attrs:{name:x}}'a
href=#cite_note-x-2[2]/a/span
C span about=#mwt6 class=reference id=cite_ref-y_3-0
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,attrs:{name:y}}'a
href=#cite_note-y-3[3]/a/span/p
-ol class=references typeof=mw:Extension/references
data-mw='{name:references,attrs:{}}'
-li id=cite_note-1span rel=mw:referencedBya
href=#cite_ref-1↑/a/span foo/li
-li id=cite_note-x-2span rel=mw:referencedBya
href=#cite_ref-x_2-0↑/a/span foo/li
-li id=cite_note-y-3span rel=mw:referencedBya
href=#cite_ref-y_3-0↑/a/span/li
+ol class=references typeof=mw:Extension/references about=#mwt8
data-mw='{name:references,attrs:{}}'
+li about=#cite_note-1 id=cite_note-1span rel=mw:referencedBya
href=#cite_ref-1↑/a/span span id=mw-reference-text-cite_note-1
class=mw-reference-textfoo/span/li
+li about=#cite_note-x-2 id=cite_note-x-2span rel=mw:referencedBya
href=#cite_ref-x_2-0↑/a/span span id=mw-reference-text-cite_note-x-2
class=mw-reference-textfoo/span/li
+li about=#cite_note-y-3 id=cite_note-y-3span rel=mw:referencedBya
href=#cite_ref-y_3-0↑/a/span span id=mw-reference-text-cite_note-y-3
class=mw-reference-text/span/li
/ol
!!end
@@ -19751,10 +19772,10 @@
B ref name=x /
references /
!! html
-pA span about=#mwt2 class=reference id=cite_ref-x_1-0
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,body:{html:foo},attrs:{name:x}}'a
href=#cite_note-x-1[1]/a/span
+pA span about=#mwt2 class=reference id=cite_ref-x_1-0
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,body:{id:mw-reference-text-cite_note-x-1},attrs:{name:x}}'a
href=#cite_note-x-1[1]/a/span
B span about=#mwt4 class=reference id=cite_ref-x_1-1
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,attrs:{name:x}}'a
href=#cite_note-x-1[1]/a/span/p
-ol class=references typeof=mw:Extension/references
data-mw='{name:references,attrs:{}}'
-li id=cite_note-x-1span rel=mw:referencedBy↑ a
href=#cite_ref-x_1-01.0/a a href=#cite_ref-x_1-11.1/a/span foo/li
+ol class=references typeof=mw:Extension/references about=#mwt6
data-mw='{name:references,attrs:{}}'
+li about=#cite_note-x-1 id=cite_note-x-1span rel=mw:referencedBy↑ a
href=#cite_ref-x_1-01.0/a a href=#cite_ref-x_1-11.1/a/span span
id=mw-reference-text-cite_note-x-1 class=mw-reference-textfoo/span/li
/ol
!!end
@@ -19768,11 +19789,11 @@
C ref name= x /
references /
!! html
-pA span about=#mwt2 class=reference id=cite_ref-x_1-0
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,body:{html:foo},attrs:{name:x}}'a
href=#cite_note-x-1[1]/a/span
+pA span about=#mwt2 class=reference id=cite_ref-x_1-0
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,body:{id:mw-reference-text-cite_note-x-1},attrs:{name:x}}'a
href=#cite_note-x-1[1]/a/span
B span about=#mwt4 class=reference id=cite_ref-x_1-1
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,attrs:{name:x}}'a
href=#cite_note-x-1[1]/a/span
C span about=#mwt6 class=reference id=cite_ref-x_1-2
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,attrs:{name:x}}'a
href=#cite_note-x-1[1]/a/span/p
-ol class=references
[MediaWiki-commits] [Gerrit] Include mediawiki.org pageviews - change (analytics...source)
OliverKeyes has uploaded a new change for review. https://gerrit.wikimedia.org/r/193982 Change subject: Include mediawiki.org pageviews .. Include mediawiki.org pageviews MediaWiki.org pageviews should be included, and currently aren't. Rather than screw with the structure of the existing regular expressions (which neatly handle *.wikimedia and *.wiki* projects, respectively) I've converted the wikidata string (which must be handled distinctly due to the www.) into a regular expression and incorporated mediawiki.org Also included is a unit test. Everyone loves unit tests. Change-Id: I3a80cb75f175f715f0a369879ee2851217d0ffd1 --- M refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java M refinery-core/src/test/resources/pageview_test_data.csv 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source refs/changes/82/193982/1 diff --git a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java index b4d195a..3a9bfda 100644 --- a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java +++ b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java @@ -38,7 +38,9 @@ + inews|ipedia|iquote|isource|tionary|iversity|ivoyage))\\.org$ ); -private static final String uriHostWikidataString = www.wikidata.org; +private static final Pattern uriHostOtherProjectsPattern = Pattern.compile( +(wikidata|mediawiki)\\.org$ +); private static final Pattern uriPathPattern = Pattern.compile( ^(/sr(-(ec|el))?|/w(iki)?|/zh(-(cn|hans|hant|hk|mo|my|sg|tw))?)/ @@ -175,7 +177,7 @@ // or a 'project' domain, e.g. en.wikipedia.org ( patternIsFound(uriHostWikimediaDomainPattern, uriHost) -|| stringContains(uriHost, uriHostWikidataString) +|| patternIsFound(uriHostOtherProjectsPattern, uriHost) || patternIsFound(uriHostProjectDomainPattern, uriHost) ) // Either a pageview's uriPath will match the first pattern, diff --git a/refinery-core/src/test/resources/pageview_test_data.csv b/refinery-core/src/test/resources/pageview_test_data.csv index 9ba352e..fb99fd3 100644 --- a/refinery-core/src/test/resources/pageview_test_data.csv +++ b/refinery-core/src/test/resources/pageview_test_data.csv @@ -14,6 +14,7 @@ Is Pageview – Desktop - Chinese zh-sg, true,false,174.62.175.93,-,zh.wikipedia.org,/zh-sg/Wikipedia:首页,-,200,text/html,Five-test plan Is Pageview – Desktop - Chinese zh-tw, true,false,174.62.175.94,-,zh.wikipedia.org,/zh-tw/Wikipedia:首页,-,200,text/html,Five-test plan Is Pageview – Wikidata, true, true,174.62.175.94,-,www.wikidata.org,/wiki/Q5651758,-,200,text/html,Five-test plan +Is Pageview – MediaWiki, true, true,174.62.175.94,-,www.mediawiki.org,/wiki/Gerrit/git-review,-,200,text/html,Five-test plan Is Not Pageview - http_status != 200, false,true,174.62.175.95,-, en.wikipedia.org, /wiki/Nopppes,-,400,text/html ,turnip Is Not Pageview - content_type does not match, false,true,174.62.175.96,-, en.wikipedia.org, /wiki/Nopppes,-,200, image/png, turnip Is Not Pageview - API stupidity: it outputs a 200 status code and text/html as a MIME type on certain classes of error., false, false,174.62.175.97,-, en.wikipedia.org, /w/api.php,-,200, text/html, turnip -- To view, visit https://gerrit.wikimedia.org/r/193982 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3a80cb75f175f715f0a369879ee2851217d0ffd1 Gerrit-PatchSet: 1 Gerrit-Project: analytics/refinery/source Gerrit-Branch: master Gerrit-Owner: OliverKeyes oke...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix invalid use of border shorthand syntax - change (oojs/ui)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193901
Change subject: Fix invalid use of border shorthand syntax
..
Fix invalid use of border shorthand syntax
The shorthand syntax is:
border-width || border-style || color
https://developer.mozilla.org/en-US/docs/Web/CSS/border#Syntax
Most browsers tolerate shorthand values in the wrong order if
they can find certain keywords (like solid), but that doesn't
make it right.
Change-Id: Ia244a50704d0f70e249766bb63c416019c27f821
---
M src/themes/apex/elements.less
M src/themes/apex/layouts.less
M src/themes/apex/tools.less
M src/themes/apex/widgets.less
M src/themes/apex/windows.less
M src/themes/mediawiki/common.less
M src/themes/mediawiki/layouts.less
M src/themes/mediawiki/tools.less
M src/themes/mediawiki/widgets.less
M src/themes/mediawiki/windows.less
10 files changed, 39 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/01/193901/1
diff --git a/src/themes/apex/elements.less b/src/themes/apex/elements.less
index b78d83a..cd8dd07 100644
--- a/src/themes/apex/elements.less
+++ b/src/themes/apex/elements.less
@@ -141,7 +141,7 @@
.oo-ui-flaggedElement {
-progressive {
.oo-ui-buttonElement-button {
- border: solid 1px @progressive-border;
+ border: 1px solid @progressive-border;
.oo-ui-vertical-gradient(@progressive-gradient-start,
@progressive-gradient-end);
:hover,
@@ -153,14 +153,14 @@
.oo-ui-widget-enabled
.oo-ui-buttonElement-button:active,
.oo-ui-buttonElement-active
.oo-ui-buttonElement-button,
.oo-ui-buttonElement-pressed
.oo-ui-buttonElement-button {
- border: solid 1px @progressive-border;
+ border: 1px solid @progressive-border;
.oo-ui-vertical-gradient(@progressive-gradient-end,
@progressive-gradient-start);
}
}
-constructive {
.oo-ui-buttonElement-button {
- border: solid 1px @constructive-border;
+ border: 1px solid @constructive-border;
.oo-ui-vertical-gradient(@constructive-gradient-start,
@constructive-gradient-end);
:hover,
@@ -172,7 +172,7 @@
.oo-ui-widget-enabled
.oo-ui-buttonElement-button:active,
.oo-ui-buttonElement-active
.oo-ui-buttonElement-button,
.oo-ui-buttonElement-pressed
.oo-ui-buttonElement-button {
- border: solid 1px @constructive-border;
+ border: 1px solid @constructive-border;
.oo-ui-vertical-gradient(@constructive-gradient-end,
@constructive-gradient-start);
}
}
diff --git a/src/themes/apex/layouts.less b/src/themes/apex/layouts.less
index 305cdb5..ef1a755 100644
--- a/src/themes/apex/layouts.less
+++ b/src/themes/apex/layouts.less
@@ -10,7 +10,7 @@
}
-outlinePanel {
- border-right: solid 1px #ddd;
+ border-right: 1px solid #ddd;
.oo-ui-outlineControlsWidget {
box-shadow: 0 0 0.25em rgba(0,0,0,0.25);
diff --git a/src/themes/apex/tools.less b/src/themes/apex/tools.less
index 96e88bb..f40b55f 100644
--- a/src/themes/apex/tools.less
+++ b/src/themes/apex/tools.less
@@ -2,7 +2,7 @@
.theme-oo-ui-toolbar () {
-bar {
- border-bottom: solid 1px #ccc;
+ border-bottom: 1px solid #ccc;
.oo-ui-vertical-gradient(#fff, #F1F7FB);
.oo-ui-toolbar-bar {
@@ -33,7 +33,7 @@
.theme-oo-ui-toolGroup () {
margin: 0.3em;
border-radius: 0.25em;
- border: solid 1px transparent;
+ border: 1px solid transparent;
.oo-ui-transition(border-color 300ms ease-in-out);
.oo-ui-widget-enabled {
@@ -50,7 +50,7 @@
.theme-oo-ui-barToolGroup () {
.oo-ui-tool {
margin: -1px 0 -1px -1px;
- border: solid 1px transparent;
+ border: 1px solid transparent;
:first-child {
border-top-left-radius: 0.25em;
@@ -172,7 +172,7 @@
.oo-ui-toolGroup-tools {
top: 2em;
margin: 0 -1px;
- border:
[MediaWiki-commits] [Gerrit] Restore previous toolbar items margins and padding - change (oojs/ui)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193957
Change subject: Restore previous toolbar items margins and padding
..
Restore previous toolbar items margins and padding
Banged at it with blunt instruments until it looked close enough to
the proper design, which was accidentally damanged in 92398aa4.
* Added 0.25em more padding to the right of popup tools.
* In MediaWiki theme, replaced some margin with padding.
Bug: T91135
Change-Id: Ia5ccaf45dc2282402cf28a49beb2a1a7c69bbb7f
---
M src/themes/apex/tools.less
M src/themes/mediawiki/tools.less
2 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/57/193957/1
diff --git a/src/themes/apex/tools.less b/src/themes/apex/tools.less
index f40b55f..4f6488d 100644
--- a/src/themes/apex/tools.less
+++ b/src/themes/apex/tools.less
@@ -178,7 +178,7 @@
}
.oo-ui-tool-link {
- margin: 0.25em 0 0.25em 0.25em;
+ padding: 0.25em 0 0.25em 0.25em;
.oo-ui-iconElement-icon {
height: 1.5em;
@@ -214,7 +214,7 @@
.oo-ui-tool {
border: 1px solid transparent;
margin: -1px 0;
- padding: 0 0.25em 0 0;
+ padding: 0 0.5em 0 0;
-active {
.oo-ui-widget-enabled {
@@ -288,7 +288,7 @@
}
.oo-ui-tool {
- padding: 0 0.75em 0 0.25em;
+ padding: 0 1em 0 0.25em;
-link {
.oo-ui-iconElement-icon {
diff --git a/src/themes/mediawiki/tools.less b/src/themes/mediawiki/tools.less
index 7c4c408..1d506b2 100644
--- a/src/themes/mediawiki/tools.less
+++ b/src/themes/mediawiki/tools.less
@@ -143,7 +143,7 @@
}
.oo-ui-tool-link {
- margin: 0.25em 0 0.25em 0.25em;
+ padding: 0.25em 0 0.25em 0.25em;
.oo-ui-iconElement-icon {
height: 1.5em;
@@ -165,7 +165,7 @@
.theme-oo-ui-listToolGroup () {
.oo-ui-tool {
- padding: 0 0.5em 0 0.25em;
+ padding: 0 0.75em 0 0.25em;
.oo-ui-widget-enabled {
:hover {
@@ -242,7 +242,7 @@
}
.oo-ui-tool {
- padding: 0 0.75em 0 0.25em;
+ padding: 0 1em 0 0.25em;
-link {
.oo-ui-iconElement-icon {
--
To view, visit https://gerrit.wikimedia.org/r/193957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5ccaf45dc2282402cf28a49beb2a1a7c69bbb7f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: bf51864..58a6853 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/193962 Change subject: Syncronize VisualEditor: bf51864..58a6853 .. Syncronize VisualEditor: bf51864..58a6853 Change-Id: Ife1ec461410b0614a2fc2f91e6e9877c64ce2d60 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/62/193962/1 diff --git a/VisualEditor b/VisualEditor index bf51864..58a6853 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit bf5186469049f73aad35c3c1686aecbe47c2bd8d +Subproject commit 58a685386bb465f5a7ac6478b6794e7f3c8f7ef3 -- To view, visit https://gerrit.wikimedia.org/r/193962 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife1ec461410b0614a2fc2f91e6e9877c64ce2d60 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Promote Share a Fact to all build flavours except production... - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Promote Share a Fact to all build flavours except production
release.
..
Promote Share a Fact to all build flavours except production release.
Change-Id: I1c5e387a8d7f21c81791361cf03b56c26b5e7ba6
---
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index d8f81c2..72f3c2d 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -845,7 +845,7 @@
// If its tag is non-null, it means that the ActionMode is one of ours
(History,
// Saved Pages, or Find In Page). Otherwise, it must be the default
WebView text-
// highlighting ActionMode, in which case we'll invoke the Share
adapter!
-if (WikipediaApp.getInstance().getReleaseType() ==
WikipediaApp.RELEASE_ALPHA
+if (WikipediaApp.getInstance().getReleaseType() !=
WikipediaApp.RELEASE_PROD
currentActionMode == null
mode.getTag() == null
textSelectedShareAdapter != null) {
@@ -862,7 +862,7 @@
}
public void share(PageTitle title) {
-if (WikipediaApp.getInstance().getReleaseType() ==
WikipediaApp.RELEASE_ALPHA) {
+if (WikipediaApp.getInstance().getReleaseType() !=
WikipediaApp.RELEASE_PROD) {
noTextSelectedShareAdapter.share();
} else {
// TODO: remove once above block is promoted to production
--
To view, visit https://gerrit.wikimedia.org/r/193866
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c5e387a8d7f21c81791361cf03b56c26b5e7ba6
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Deskana dga...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@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] Nutcracker should be 'stopped' rather than 'absent' - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193966
Change subject: Nutcracker should be 'stopped' rather than 'absent'
..
Nutcracker should be 'stopped' rather than 'absent'
Change-Id: I2df21ce00df7e26db0c83592ba1b7043391d3f02
---
M manifests/role/nova.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/66/193966/1
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 22d6382..1646435 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -217,7 +217,7 @@
include ::scap::scripts
service { 'nutcracker':
-ensure = absent,
+ensure = stopped,
before = Service['memcached']
}
}
--
To view, visit https://gerrit.wikimedia.org/r/193966
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2df21ce00df7e26db0c83592ba1b7043391d3f02
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] populateListOfUsersToRename: Set $attachableWikis into the c... - change (mediawiki...CentralAuth)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193970
Change subject: populateListOfUsersToRename: Set $attachableWikis into the cache
..
populateListOfUsersToRename: Set $attachableWikis into the cache
Follow up from f68863aec61f0b2a11
Change-Id: I8ae3519f6cbe63125a58ab82ef8122f7afcec96e
---
M maintenance/populateListOfUsersToRename.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/70/193970/1
diff --git a/maintenance/populateListOfUsersToRename.php
b/maintenance/populateListOfUsersToRename.php
index 7d025e7..7192ecd 100644
--- a/maintenance/populateListOfUsersToRename.php
+++ b/maintenance/populateListOfUsersToRename.php
@@ -97,7 +97,7 @@
}
}
}
- $cache-set( $row-name, $home );
+ $cache-set( $row-name,
$attachableWikis );
}
if ( !in_array( $row-wiki, $attachableWikis )
) {
--
To view, visit https://gerrit.wikimedia.org/r/193970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ae3519f6cbe63125a58ab82ef8122f7afcec96e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Share a fact heuristic text enhancements - change (apps...wikipedia)
Dr0ptp4kt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193973
Change subject: Share a fact heuristic text enhancements
..
Share a fact heuristic text enhancements
Additionally, transparent images now have a white background.
Change-Id: I0cbe4b4fb4ee4d5a52efd23792e173e3857a8541
---
M Wikipedia.xcodeproj/project.pbxproj
A WikipediaUnitTests/NSString+_WMFHTMLParsingTests.m
M wikipedia/Categories/NSString+Extras.h
M wikipedia/Categories/NSString+Extras.m
M wikipedia/Categories/NSString+WMFHTMLParsing.h
M wikipedia/Categories/NSString+WMFHTMLParsing.m
M wikipedia/View Controllers/ShareCard/WMFShareCardViewController.m
M wikipedia/View Controllers/ShareCard/WMFShareOptionsViewController.m
8 files changed, 207 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/73/193973/1
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index ef9816b..36a9274 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -290,14 +290,15 @@
BCB66A0C1A85183000C7B1FE /* NSString+WMFHTMLParsing.m in
Sources */ = {isa = PBXBuildFile; fileRef = BCB66A0B1A85183000C7B1FE /*
NSString+WMFHTMLParsing.m */; };
BCB66A0D1A85183000C7B1FE /* NSString+WMFHTMLParsing.m in
Sources */ = {isa = PBXBuildFile; fileRef = BCB66A0B1A85183000C7B1FE /*
NSString+WMFHTMLParsing.m */; };
BCB66A101A851C9B00C7B1FE /* MWKImageListTests.m in Sources */ =
{isa = PBXBuildFile; fileRef = BCB66A0F1A851C9B00C7B1FE /* MWKImageListTests.m
*/; };
+ BCC185E81A9FA498005378F8 /*
UICollectionViewFlowLayout+AttributeUtils.m in Sources */ = {isa =
PBXBuildFile; fileRef = BCC185E71A9FA498005378F8 /*
UICollectionViewFlowLayout+AttributeUtils.m */; };
+ BCC185E91A9FA498005378F8 /*
UICollectionViewFlowLayout+AttributeUtils.m in Sources */ = {isa =
PBXBuildFile; fileRef = BCC185E71A9FA498005378F8 /*
UICollectionViewFlowLayout+AttributeUtils.m */; };
C42D947E1A937DAC00A4871A /* SavedArticlesFetcher.m in Sources
*/ = {isa = PBXBuildFile; fileRef = C42D947D1A937DAC00A4871A /*
SavedArticlesFetcher.m */; };
C42D94861A937DE000A4871A /* WMFBorderButton.m in Sources */ =
{isa = PBXBuildFile; fileRef = C42D94831A937DE000A4871A /* WMFBorderButton.m
*/; };
C42D94871A937DE000A4871A /* WMFProgressLineView.m in Sources */
= {isa = PBXBuildFile; fileRef = C42D94851A937DE000A4871A /*
WMFProgressLineView.m */; };
C42D94BC1A95405000A4871A /* NSArray+WMFExtensions.m in Sources
*/ = {isa = PBXBuildFile; fileRef = C42D94BB1A95405000A4871A /*
NSArray+WMFExtensions.m */; };
- BCC185E81A9FA498005378F8 /*
UICollectionViewFlowLayout+AttributeUtils.m in Sources */ = {isa =
PBXBuildFile; fileRef = BCC185E71A9FA498005378F8 /*
UICollectionViewFlowLayout+AttributeUtils.m */; };
- BCC185E91A9FA498005378F8 /*
UICollectionViewFlowLayout+AttributeUtils.m in Sources */ = {isa =
PBXBuildFile; fileRef = BCC185E71A9FA498005378F8 /*
UICollectionViewFlowLayout+AttributeUtils.m */; };
C46FBA4B1A8530EE00C5730F /* Pods-acknowledgements.plist in
Resources */ = {isa = PBXBuildFile; fileRef = C46FBA4A1A8530EE00C5730F /*
Pods-acknowledgements.plist */; };
C90799BA1A8564C60044E13C /* WMFShareOptionsViewController.m in
Sources */ = {isa = PBXBuildFile; fileRef = C90799B91A8564C60044E13C /*
WMFShareOptionsViewController.m */; };
+ C909A8FE1AA501D8003E46B8 /* NSString+ExtrasTests.m in Sources
*/ = {isa = PBXBuildFile; fileRef = C909A8FD1AA501D8003E46B8 /*
NSString+ExtrasTests.m */; };
C913C89C1A94019A00BEEAF0 /* WMFSuggestedPagesFunnel.m in
Sources */ = {isa = PBXBuildFile; fileRef = C913C89B1A94019A00BEEAF0 /*
WMFSuggestedPagesFunnel.m */; };
C9180EC418AED30C006C1DCA /* WikipediaAppUtils.m in Sources */ =
{isa = PBXBuildFile; fileRef = C9180EC318AED30C006C1DCA /* WikipediaAppUtils.m
*/; };
C91A86F41A8BCB680088A801 /* WMFShareCardImageContainer.m in
Sources */ = {isa = PBXBuildFile; fileRef = C91A86F31A8BCB680088A801 /*
WMFShareCardImageContainer.m */; };
@@ -807,6 +808,8 @@
BCB66A0A1A85183000C7B1FE /* NSString+WMFHTMLParsing.h */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path
= NSString+WMFHTMLParsing.h; sourceTree = group; };
BCB66A0B1A85183000C7B1FE /* NSString+WMFHTMLParsing.m */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
path = NSString+WMFHTMLParsing.m; sourceTree = group; };
BCB66A0F1A851C9B00C7B1FE /* MWKImageListTests.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= MWKImageListTests.m; sourceTree = group; };
+
[MediaWiki-commits] [Gerrit] static bugzilla: add links to all bugs/activities - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: static bugzilla: add links to all bugs/activities .. static bugzilla: add links to all bugs/activities Add links to subpages with all bugs/activites to the index.html Adding the files themselves and the entire docroot seemed too much ( 3.5G) but i wanted to keep the index file in sync. Bug:T85140 Change-Id: I4bff9cca0a5ba8d2d18884e11100977d35edb229 --- M modules/bugzilla/files/static-bz-index.html 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/bugzilla/files/static-bz-index.html b/modules/bugzilla/files/static-bz-index.html index 214869a..88feab6 100644 --- a/modules/bugzilla/files/static-bz-index.html +++ b/modules/bugzilla/files/static-bz-index.html @@ -24,6 +24,12 @@ pLinks in the original Bugzilla format such as a href=show_bug.cgi?id=42show_bug.cgi?id=42/a or a href=show_activity.cgi?id=23show_activity.cgi?id=23/a also work and are internal redirects to the HTML files./p pSo you can simply add static- to old Bugzilla URLs to get here./p + +ul +lia href=all_bugs.htmllinks to all bugs/a/li +lia href=all_activities.htmllinks to all activities/a/li +/ul + /body /html -- To view, visit https://gerrit.wikimedia.org/r/193858 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4bff9cca0a5ba8d2d18884e11100977d35edb229 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] associate images using URLs - change (apps...wikipedia)
Mhurd has submitted this change and it was merged.
Change subject: associate images using URLs
..
associate images using URLs
- Use source URLs to determine whether image info corresponds to an
image
- Lazily calculate and cache the regex output used to calculate filename
from URL
- some other minor things (fix for unit tests)
edit: use @synthesize instead of explicit ivar
Bug: T89914
Change-Id: I862704957b81ab39646368851028e48931ae67d2
---
M MediaWikiKit/MediaWikiKit/MWKImage.m
M MediaWikiKit/MediaWikiKit/MWKImageInfo+MWKImageComparison.h
M MediaWikiKit/MediaWikiKit/MWKImageInfo+MWKImageComparison.m
M MediaWikiKit/MediaWikiKit/MWKImageInfo.h
M MediaWikiKit/MediaWikiKit/MWKImageInfo.m
M MediaWikiKit/MediaWikiKitTests/MWKImageListTests.m
M Wikipedia.xcodeproj/project.pbxproj
M wikipedia/Base.lproj/Main_iPhone.storyboard
M wikipedia/View Controllers/Image Gallery/WMFImageGalleryViewController.m
A wikipedia/mw-utils/WMFImageURLParsing.h
A wikipedia/mw-utils/WMFImageURLParsing.m
11 files changed, 75 insertions(+), 56 deletions(-)
Approvals:
Mhurd: Verified; Looks good to me, approved
diff --git a/MediaWikiKit/MediaWikiKit/MWKImage.m
b/MediaWikiKit/MediaWikiKit/MWKImage.m
index 34876f3..2f41f69 100644
--- a/MediaWikiKit/MediaWikiKit/MWKImage.m
+++ b/MediaWikiKit/MediaWikiKit/MWKImage.m
@@ -9,6 +9,13 @@
#import UIKit/UIKit.h
#import WikipediaAppUtils.h
#import MediaWikiKit.h
+#import WMFImageURLParsing.h
+
+@interface MWKImage ()
+{
+NSString* _fileNameNoSizePrefix;
+}
+@end
@implementation MWKImage
@@ -17,6 +24,8 @@
self = [super initWithSite:article.site];
if (self) {
_article = article;
+
+// fileNameNoSizePrefix is lazily derived from this property, so be
careful if _sourceURL needs to be re-set
_sourceURL = [url copy];
_dateLastAccessed = nil;
@@ -72,16 +81,7 @@
+(NSString *)fileNameNoSizePrefix:(NSString *)sourceURL
{
-if (!sourceURL) { return nil; }
-
-NSString *fileName = [sourceURL lastPathComponent];
-NSRegularExpression *re = [NSRegularExpression
regularExpressionWithPattern:@^\\d+px-(.*)$ options:0 error:nil];
-NSArray *matches = [re matchesInString:fileName options:0
range:NSMakeRange(0, [fileName length])];
-if ([matches count]) {
-return [fileName substringWithRange:[matches[0] rangeAtIndex:1]];
-} else {
-return fileName;
-}
+return WMFParseImageNameFromSourceURL(sourceURL);
}
+ (NSString*)canonicalFilenameFromSourceURL:(NSString *)sourceURL
@@ -101,9 +101,12 @@
}
}
--(NSString *)fileNameNoSizePrefix
+-(NSString*)fileNameNoSizePrefix
{
-return [MWKImage fileNameNoSizePrefix:self.sourceURL];
+if (!_fileNameNoSizePrefix) {
+_fileNameNoSizePrefix = [MWKImage fileNameNoSizePrefix:self.sourceURL];
+}
+return _fileNameNoSizePrefix;
}
-(id)dataExport
diff --git a/MediaWikiKit/MediaWikiKit/MWKImageInfo+MWKImageComparison.h
b/MediaWikiKit/MediaWikiKit/MWKImageInfo+MWKImageComparison.h
index a8d6d2c..19ed0e6 100644
--- a/MediaWikiKit/MediaWikiKit/MWKImageInfo+MWKImageComparison.h
+++ b/MediaWikiKit/MediaWikiKit/MWKImageInfo+MWKImageComparison.h
@@ -9,11 +9,7 @@
#import MWKImageInfo.h
#import MWKImage.h
-FOUNDATION_EXPORT NSString* const MWKImageAssociationKeyPath;
-
@interface MWKImageInfo (MWKImageComparison)
-
-- (id)imageAssociationValue;
- (BOOL)isAssociatedWithImage:(MWKImage*)image;
@@ -21,7 +17,7 @@
@interface MWKImage (MWKImageInfoComparison)
-- (id)infoAssociationValue;
+@property (nonatomic, readonly) id infoAssociationValue;
- (BOOL)isAssociatedWithInfo:(MWKImageInfo*)info;
diff --git a/MediaWikiKit/MediaWikiKit/MWKImageInfo+MWKImageComparison.m
b/MediaWikiKit/MediaWikiKit/MWKImageInfo+MWKImageComparison.m
index 7d08be2..6e6e540 100644
--- a/MediaWikiKit/MediaWikiKit/MWKImageInfo+MWKImageComparison.m
+++ b/MediaWikiKit/MediaWikiKit/MWKImageInfo+MWKImageComparison.m
@@ -10,18 +10,11 @@
#import MWKImage.h
#import WikipediaAppUtils.h
-NSString* const MWKImageAssociationKeyPath = @canonicalFilename;
-
@implementation MWKImageInfo (MWKImageComparison)
-
-- (id)imageAssociationValue
-{
-return self.canonicalFilename;
-}
- (BOOL)isAssociatedWithImage:(MWKImage *)image
{
-return [self.canonicalFilename isEqualToString:image.canonicalFilename];
+return [self.imageAssociationValue isEqual:image.infoAssociationValue];
}
@end
@@ -30,7 +23,7 @@
- (id)infoAssociationValue
{
-return self.canonicalFilename;
+return self.fileNameNoSizePrefix;
}
- (BOOL)isAssociatedWithInfo:(MWKImageInfo *)info
diff --git a/MediaWikiKit/MediaWikiKit/MWKImageInfo.h
b/MediaWikiKit/MediaWikiKit/MWKImageInfo.h
index 6f88475..1942037 100644
--- a/MediaWikiKit/MediaWikiKit/MWKImageInfo.h
+++ b/MediaWikiKit/MediaWikiKit/MWKImageInfo.h
@@ -34,6 +34,9 @@
/// Name of the entity owning this image.
@property (nonatomic, readonly, copy)
[MediaWiki-commits] [Gerrit] WIP: T90517: Add missing updates to modification flags in P ... - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193981
Change subject: WIP: T90517: Add missing updates to modification flags in P
handler
..
WIP: T90517: Add missing updates to modification flags in P handler
* Not sure if this is the right fix yet.
* I might move the updates out of serializer state and into the
main loop of WTS which might actually be better and cleaner.
* The changes to selser tests all seem good.
* Will require a new selser test before in the final version.
* The test in the bug report now serializes properly.
Change-Id: I4a5f7c35c30558c61be48ce1f639ccf79493e055
---
M lib/wts.TagHandlers.js
M tests/parserTests-blacklist.js
2 files changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/81/193981/1
diff --git a/lib/wts.TagHandlers.js b/lib/wts.TagHandlers.js
index 230c8f3..42b7bde 100644
--- a/lib/wts.TagHandlers.js
+++ b/lib/wts.TagHandlers.js
@@ -710,6 +710,13 @@
handle: function(node, state, cb) {
// XXX: Handle single-line mode by switching to HTML
handler!
state.serializeChildren(node, cb, null);
+
+ // FIXME: Since there are no cb(..) calls for this node,
+ // we never enter emitSepAndOutput where this state is
updated.
+ // So, for onw, we update it here. Alternatively, this
update
+ // should happen in the main loop of WTS.
+ state.prevNodeUnmodified = state.currNodeUnmodified;
+ state.currNodeUnmodified = false;
},
sepnls: {
before: function(node, otherNode, state) {
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 0cd6ecc..e21d4e1 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -2770,20 +2770,20 @@
add(selser, References: 5. ref tags in references should be processed while
ignoring all other content [0,2,0], A ref name=\a\ /\nB ref
name=\b\bar/ref\n\nky16pugtafywrk9\n\nreferences\nref
name=\a\foo/ref\nThis should just get lost.\n/references);
add(selser, References: 9. Generate missing references list at the end
[0,4,0,3,0], A reffoo/ref\nB ref
group=\inexistent\bar/ref\n\nb7ysmcsq3gd86w29);
add(selser, References: 9. Generate missing references list at the end
[4,4,0,4,0], lvnt8vr7angq4cxr\n\nwue4r5n3y3a3jtt9rhjjeyvdl0qtcsor);
-add(selser, References: 9. Generate missing references list at the end
[[2,0,2,0],0,0,3,0], 7xhpxcasifwdn29A reffoo/ref562x1ybv3p3w61or\nB ref
group=\inexistent\bar/ref);
+add(selser, References: 9. Generate missing references list at the end
[[2,0,2,0],0,0,3,0], 7xhpxcasifwdn29A reffoo/ref562x1ybv3p3w61or\nB ref
group=\inexistent\bar/ref\n);
add(selser, References: 9. Generate missing references list at the end
[3,0,0,2,0], \ntkairlq0upfa8aor\n);
add(selser, References: 9. Generate missing references list at the end
[[0,0,2,0],2,0,0,0], A reffoo/refdjzbwa2njauivn29\nB ref
group=\inexistent\bar/ref\n\nxfjjewhbw1k2zkt9\n);
add(selser, References: 9. Generate missing references list at the end
[4,2,0,3,0], q1p2la2weglul3di\n\nwd4bqvoes653766r\n);
add(selser, References: 9. Generate missing references list at the end
[0,3,0,0,0], A reffoo/ref\nB ref group=\inexistent\bar/ref);
-add(selser, References: 9. Generate missing references list at the end
[[0,0,4,0],0,0,4,0], A reffoo/refgpnrlcm305a2x1orref
group=\inexistent\bar/refctwao900ott3ayvi);
-add(selser, References: 9. Generate missing references list at the end
[[0,0,4,0],0,0,3,0], A reffoo/ref0byd6o7cb9jxlxrref
group=\inexistent\bar/ref);
+add(selser, References: 9. Generate missing references list at the end
[[0,0,4,0],0,0,4,0], A reffoo/refgpnrlcm305a2x1orref
group=\inexistent\bar/ref\nctwao900ott3ayvi);
+add(selser, References: 9. Generate missing references list at the end
[[0,0,4,0],0,0,3,0], A reffoo/ref0byd6o7cb9jxlxrref
group=\inexistent\bar/ref\n);
add(selser, References: 9. Generate missing references list at the end
[[3,0,0,0],3,0,0,0], reffoo/ref\nB ref group=\inexistent\bar/ref);
add(selser, References: 9. Generate missing references list at the end
[3,3,0,0,0], );
add(selser, References: 9. Generate missing references list at the end
[[4,0,4,0],2,0,4,0], hrabkskjen7mn29reffoo/refjrecig5npts2a9k9ref
group=\inexistent\bar/ref\n\nwci03bzp3f9cz0k9\nyhh3izw25u9s5rk9);
add(selser, References: 9. Generate missing references list at the end
[4,3,0,2,0], tjzrngic8rhvkj4ixv4c3yomv5yfzuxr\n);
add(selser, References: 9. Generate missing references list at the end
[2,3,0,0,0], p5fvot19vi996bt9\n\nA reffoo/ref\nB ref
group=\inexistent\bar/ref);
add(selser, References: 9. Generate missing references list at the end
[[4,0,0,0],3,0,0,0],
[MediaWiki-commits] [Gerrit] Use wikitext instead of page prop when checking for existing... - change (mediawiki...TemplateData)
jenkins-bot has submitted this change and it was merged.
Change subject: Use wikitext instead of page prop when checking for existing
TemplateData
..
Use wikitext instead of page prop when checking for existing TemplateData
On the edit page, we show the user a message if a related page
(parent of /doc page, or vice versa) already has templatedata.
This check was wrongly detecting that the parent page has templatedata
when editing '/doc'. The check shouldn't use the 'templatedata' API
since that also includes transcluded templatedata.
Look in the wikitext content instead.
Change-Id: I9788e2beb0809ac3e676a90cd0dfe519c005afc9
---
M modules/ext.templateDataGenerator.ui.js
1 file changed, 22 insertions(+), 11 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
Mooeypoo: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/ext.templateDataGenerator.ui.js
b/modules/ext.templateDataGenerator.ui.js
index 0c886cb..285f5c5 100644
--- a/modules/ext.templateDataGenerator.ui.js
+++ b/modules/ext.templateDataGenerator.ui.js
@@ -158,19 +158,30 @@
// Check if there's already a templatedata in a
related page
relatedPage = isDocPage ? parentPage : pageName
+ '/doc';
editOpenDialogButton.setDisabled( true );
- mw.TemplateData.Model.static.getApi(
relatedPage, true )
+ mw.TemplateData.Model.static.getApi(
relatedPage )
.then( function ( result ) {
- var msg;
- if ( !$.isEmptyObject(
result.pages ) ) {
- // HACK: Setting a link
in the messages doesn't work. The bug report offers
- // a somewhat hacky
work around that includes setting a separate message
- // to be parsed.
- //
https://phabricator.wikimedia.org/T49395#490610
- msg = mw.message(
'templatedata-exists-on-related-page', relatedPage ).plain();
- mw.messages.set( {
'templatedata-string-exists-hack-message': msg } );
- msg = mw.message(
'templatedata-string-exists-hack-message' ).parse();
+ var msg, matches, content,
+ response =
result.query.pages[ result.query.pageids[0] ];
+ // HACK: When checking whether
a related page (parent for /doc page or
+ // vice versa) already has a
templatedata string, we shouldn't
+ // ask for the 'templatedata'
action but rather the actual content
+ // of the related page,
otherwise we get embedded templatedata and
+ // wrong information is
presented.
+ if ( response.missing ===
undefined ) {
+ content =
response.revisions[0]['*'];
+ matches =
content.match( /templatedata/i );
+ // There's a
templatedata string
+ if ( matches ) {
+ // HACK:
Setting a link in the messages doesn't work. The bug report offers
+ // a somewhat
hacky work around that includes setting a separate message
+ // to be parsed.
+ //
https://phabricator.wikimedia.org/T49395#490610
+ msg =
mw.message( 'templatedata-exists-on-related-page', relatedPage ).plain();
+
mw.messages.set( { 'templatedata-string-exists-hack-message': msg } );
+ msg =
mw.message( 'templatedata-string-exists-hack-message' ).parse();
-
editArea.setNoticeMessage( msg, 'error', true );
+
editArea.setNoticeMessage( msg, 'error', true );
+
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (wikimedia...crm)
Ejegg has submitted this change and it was merged. Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 3ee214f Update dependencies including packagist wm deps be8957f Update drupal submodule Change-Id: Ibf8b835ee3b3e3b6b973a7edb98957f3da45d4de --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Ejegg: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/193983 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibf8b835ee3b3e3b6b973a7edb98957f3da45d4de Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@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] Merge branch 'master' into deployment - change (wikimedia...crm)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/193983 Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 3ee214f Update dependencies including packagist wm deps be8957f Update drupal submodule Change-Id: Ibf8b835ee3b3e3b6b973a7edb98957f3da45d4de --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/83/193983/1 -- To view, visit https://gerrit.wikimedia.org/r/193983 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf8b835ee3b3e3b6b973a7edb98957f3da45d4de Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] set bnx2x num_queues on cache nodes in late_command - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: set bnx2x num_queues on cache nodes in late_command
..
set bnx2x num_queues on cache nodes in late_command
Change-Id: If203336549f57257aafa5362a827214432193faa
---
M modules/install-server/files/autoinstall/scripts/late_command
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/install-server/files/autoinstall/scripts/late_command
b/modules/install-server/files/autoinstall/scripts/late_command
index ac4def3..ed4b967 100644
--- a/modules/install-server/files/autoinstall/scripts/late_command
+++ b/modules/install-server/files/autoinstall/scripts/late_command
@@ -26,8 +26,12 @@
# kernel update + optimized mkfs for all cache nodes
# (the upgrade is to grab our updated firmware packages first for initramfs...)
+# (the crazy PHYS_CORES thing is to get the bnx2x option set before the first
boot,
+# otherwise we'd need a reboot after puppet sets up the same file on the
first run)
case `hostname` in \
amssq[0-9]*|cp[1234]*|dysprosium)
+ PHYS_CORES=$(chroot /target /usr/bin/ruby -e require
'pathname'; print
Pathname::glob('/sys/devices/system/cpu/cpu[0-9]*/topology/thread_siblings_list').map{|x|
File.open(x,'r').read().split(',')[0] }.sort.uniq.count)
+ chroot /target /bin/sh -c echo options bnx2x
num_queues=$PHYS_CORES /etc/modprobe.d/rps.conf
chroot /target apt-get -y upgrade
apt-install linux-image-3.19
mke2fs -F -F -t ext4 -T huge -O sparse_super2 -m 0 -L
sda3-varnish /dev/sda3
--
To view, visit https://gerrit.wikimedia.org/r/193857
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If203336549f57257aafa5362a827214432193faa
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] If users match email with the global account winner, don't r... - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: If users match email with the global account winner, don't
rename them
..
If users match email with the global account winner, don't rename them
Change-Id: I352a32580c99a0ec5c5670cf99c15b6c6e98a803
---
M maintenance/populateListOfUsersToRename.php
1 file changed, 22 insertions(+), 4 deletions(-)
Approvals:
CSteipp: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/populateListOfUsersToRename.php
b/maintenance/populateListOfUsersToRename.php
index 2dd99e9..7d025e7 100644
--- a/maintenance/populateListOfUsersToRename.php
+++ b/maintenance/populateListOfUsersToRename.php
@@ -71,19 +71,37 @@
$this-lName = $row-name;
$this-lWiki = $row-wiki;
if ( $cache-has( $row-name ) ) {
- $home = $cache-get( $row-name );
+ $attachableWikis = $cache-get(
$row-name );
} else {
$ca = new CentralAuthUser( $row-name );
+ $attachableWikis = array();
+ $unattached = $ca-queryUnattached();
if ( $ca-exists() ) {
$home = $ca-getHomeWiki();
+ $attachableWikis[] = $home;
+ foreach ( $unattached as $wiki
= $info ) {
+ if (
$ca-getEmailAuthenticationTimestamp()
+ $info['email']
=== $ca-getEmail() !is_null( $info['emailAuthenticated'] )
+ ) {
+
$attachableWikis[] = $wiki;
+ }
+ }
} else {
- $home = $ca-chooseHomeWiki(
$ca-queryUnattached() );
+ $home = $ca-chooseHomeWiki(
$unattached );
+ $attachableWikis[] = $home;
+ if (
$unattached[$home]['email'] isset( $unattached[$home]['emailAuthenticated']
) ) {
+ foreach ( $unattached
as $wiki = $info ) {
+ if ( $wiki !==
$home $unattached[$home]['email'] === $info['email'] isset(
$info['emailAuthenticated'] ) ) {
+
$attachableWikis[] = $wiki;
+ }
+ }
+ }
}
$cache-set( $row-name, $home );
}
- if ( $home !== $row-wiki ) {
- // Unattached account which is not on
the home wiki,
+ if ( !in_array( $row-wiki, $attachableWikis )
) {
+ // Unattached account which is not
attachable,
// so they're getting renamed :(
$insertRows[] = (array)$row;
}
--
To view, visit https://gerrit.wikimedia.org/r/193497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I352a32580c99a0ec5c5670cf99c15b6c6e98a803
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix transfer of reference contents from removed reference - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix transfer of reference contents from removed reference
..
Fix transfer of reference contents from removed reference
We unconditionally retrieved originalHtml from itemNode,
even if there was no data-mw.body.id, so as long as
the reference itself wasn't edited, we would never overwrite
data-mw. This meant that if the ref with the contents
was deleted, the contents wouldn't be transfered to the
first ref tag with that name like they're supposed to be.
The solution is to only look at originalHtml from itemNode
if data-mw.body.id is set.
Change-Id: Ib87491b6fa6a77d62384158f8e8f7dcc2a36c23a
---
M modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
index 4945117..f6c4503 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
@@ -156,7 +156,8 @@
);
itemNodeHtml = itemNodeWrapper.innerHTML; // Returns '' if
itemNodeWrapper is empty
originalHtml = ve.getProp( mwData, 'body', 'html' ) ||
- itemNode.getAttribute( 'originalHtml' ) || '';
+ ( ve.getProp( mwData, 'body', 'id' ) !== undefined
itemNode.getAttribute( 'originalHtml' ) ) ||
+ '';
originalHtmlWrapper.innerHTML = originalHtml;
// Only set body.html if itemNodeHtml and originalHtml are
actually different
if ( !originalHtmlWrapper.isEqualNode( itemNodeWrapper ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/193958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib87491b6fa6a77d62384158f8e8f7dcc2a36c23a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.25wmf19
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@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] wikitech: remove nutcracker - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: wikitech: remove nutcracker
..
wikitech: remove nutcracker
Since wikitech uses its own, local memcache instance, it makes no sense
to connect to it through nutcracker for the time being.
Change-Id: I6091ef19c7861e7354c6948171cbfe1fc3866c59
---
M hieradata/hosts/silver.yaml
M manifests/role/nova.pp
M modules/openstack/manifests/openstack-manager.pp
3 files changed, 6 insertions(+), 21 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/silver.yaml b/hieradata/hosts/silver.yaml
index 4e2d615..496a8ee 100644
--- a/hieradata/hosts/silver.yaml
+++ b/hieradata/hosts/silver.yaml
@@ -2,3 +2,5 @@
cluster: virt
admin::groups:
- deployment
+memcached::ip: 127.0.0.1
+memcached::port: 11212
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 61282f5..22d6382 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -213,27 +213,12 @@
certificate = $certificate,
}
-include ::nutcracker::monitoring
include ::mediawiki::packages::php5
include ::scap::scripts
-class { '::nutcracker':
-mbuf_size = '64k',
-pools = {
-'memcached' = {
-auto_eject_hosts = true,
-distribution = 'ketama',
-hash = 'md5',
-listen = '127.0.0.1:11212',
-preconnect = true,
-server_connections = 2,
-server_failure_limit = 3,
-timeout = 250,
-servers = [
-'127.0.0.1:11000:1',
-],
-},
-},
+service { 'nutcracker':
+ensure = absent,
+before = Service['memcached']
}
}
diff --git a/modules/openstack/manifests/openstack-manager.pp
b/modules/openstack/manifests/openstack-manager.pp
index d1ca7f3..da891fd 100644
--- a/modules/openstack/manifests/openstack-manager.pp
+++ b/modules/openstack/manifests/openstack-manager.pp
@@ -17,9 +17,7 @@
before = Package['memcached'],
}
-class { 'memcached':
-ip = '127.0.0.1',
-}
+include memcached
}
$controller_hostname = $novaconfig['controller_hostname']
--
To view, visit https://gerrit.wikimedia.org/r/193341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6091ef19c7861e7354c6948171cbfe1fc3866c59
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VisualEditor for Ib87491b6 - change (mediawiki/core)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/193964 Change subject: Update VisualEditor for Ib87491b6 .. Update VisualEditor for Ib87491b6 Change-Id: If88a6c4a385c5e0efe51a68c22979b7c3a3fb394 --- M extensions/VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/64/193964/1 diff --git a/extensions/VisualEditor b/extensions/VisualEditor index 31ce740..e3c60a3 16 --- a/extensions/VisualEditor +++ b/extensions/VisualEditor -Subproject commit 31ce740f4d1c2dc46b709f834b2258a5c74367b9 +Subproject commit e3c60a3e8204bf857d259b974b980945bdd7dc6c -- To view, visit https://gerrit.wikimedia.org/r/193964 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If88a6c4a385c5e0efe51a68c22979b7c3a3fb394 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf18 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] Include search consistently - change (analytics...source)
OliverKeyes has uploaded a new change for review. https://gerrit.wikimedia.org/r/193985 Change subject: Include search consistently .. Include search consistently It's possible to go to, say, en.wikipedia.org/?search=foobarbazqux or even en.wikipedia.org/wiki/an_article?search=foobarbazqux, because MediaWiki is trying to kill me. Search pages are manually-accessed HTML pages, and it's looking a lot like the iOS search includes this structure. So, this patch includes them explicitly. Change-Id: I9312cbfcc3987c6a70c3c95a288ce4cefc91dc31 --- M refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java M refinery-core/src/test/resources/pageview_test_data.csv 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source refs/changes/85/193985/1 diff --git a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java index 3a9bfda..c909e7a 100644 --- a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java +++ b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java @@ -47,7 +47,7 @@ ); private static final Pattern uriQueryPattern = Pattern.compile( -\\?((cur|old)id|title)= +\\?((cur|old)id|title|search)= ); private static final Pattern uriPathUnwantedSpecialPagesPattern = Pattern.compile( diff --git a/refinery-core/src/test/resources/pageview_test_data.csv b/refinery-core/src/test/resources/pageview_test_data.csv index fb99fd3..90ec27d 100644 --- a/refinery-core/src/test/resources/pageview_test_data.csv +++ b/refinery-core/src/test/resources/pageview_test_data.csv @@ -15,6 +15,7 @@ Is Pageview – Desktop - Chinese zh-tw, true,false,174.62.175.94,-,zh.wikipedia.org,/zh-tw/Wikipedia:首页,-,200,text/html,Five-test plan Is Pageview – Wikidata, true, true,174.62.175.94,-,www.wikidata.org,/wiki/Q5651758,-,200,text/html,Five-test plan Is Pageview – MediaWiki, true, true,174.62.175.94,-,www.mediawiki.org,/wiki/Gerrit/git-review,-,200,text/html,Five-test plan +Is Pageview – iOS search, true,false,174.62.175.94,-,en.wikipedia.org,/,?search=afdfsdfsd,200,text/html,Five-test plan Is Not Pageview - http_status != 200, false,true,174.62.175.95,-, en.wikipedia.org, /wiki/Nopppes,-,400,text/html ,turnip Is Not Pageview - content_type does not match, false,true,174.62.175.96,-, en.wikipedia.org, /wiki/Nopppes,-,200, image/png, turnip Is Not Pageview - API stupidity: it outputs a 200 status code and text/html as a MIME type on certain classes of error., false, false,174.62.175.97,-, en.wikipedia.org, /w/api.php,-,200, text/html, turnip -- To view, visit https://gerrit.wikimedia.org/r/193985 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9312cbfcc3987c6a70c3c95a288ce4cefc91dc31 Gerrit-PatchSet: 1 Gerrit-Project: analytics/refinery/source Gerrit-Branch: master Gerrit-Owner: OliverKeyes oke...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: bf51864..58a6853 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: bf51864..58a6853 .. Syncronize VisualEditor: bf51864..58a6853 Change-Id: Ife1ec461410b0614a2fc2f91e6e9877c64ce2d60 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index bf51864..58a6853 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit bf5186469049f73aad35c3c1686aecbe47c2bd8d +Subproject commit 58a685386bb465f5a7ac6478b6794e7f3c8f7ef3 -- To view, visit https://gerrit.wikimedia.org/r/193962 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife1ec461410b0614a2fc2f91e6e9877c64ce2d60 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix transfer of reference contents from removed reference - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix transfer of reference contents from removed reference
..
Fix transfer of reference contents from removed reference
We unconditionally retrieved originalHtml from itemNode,
even if there was no data-mw.body.id, so as long as
the reference itself wasn't edited, we would never overwrite
data-mw. This meant that if the ref with the contents
was deleted, the contents wouldn't be transfered to the
first ref tag with that name like they're supposed to be.
The solution is to only look at originalHtml from itemNode
if data-mw.body.id is set.
Change-Id: Ib87491b6fa6a77d62384158f8e8f7dcc2a36c23a
---
M modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
index 70e800a..d2c74e7 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
@@ -157,7 +157,8 @@
);
itemNodeHtml = itemNodeWrapper.innerHTML; // Returns '' if
itemNodeWrapper is empty
originalHtml = ve.getProp( mwData, 'body', 'html' ) ||
- itemNode.getAttribute( 'originalHtml' ) || '';
+ ( ve.getProp( mwData, 'body', 'id' ) !== undefined
itemNode.getAttribute( 'originalHtml' ) ) ||
+ '';
originalHtmlWrapper.innerHTML = originalHtml;
// Only set body.html if itemNodeHtml and originalHtml are
actually different
if ( !originalHtmlWrapper.isEqualNode( itemNodeWrapper ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/193959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib87491b6fa6a77d62384158f8e8f7dcc2a36c23a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.25wmf18
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@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] Nutcracker should be 'stopped' rather than 'absent' - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Nutcracker should be 'stopped' rather than 'absent'
..
Nutcracker should be 'stopped' rather than 'absent'
Change-Id: I2df21ce00df7e26db0c83592ba1b7043391d3f02
---
M manifests/role/nova.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 22d6382..1646435 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -217,7 +217,7 @@
include ::scap::scripts
service { 'nutcracker':
-ensure = absent,
+ensure = stopped,
before = Service['memcached']
}
}
--
To view, visit https://gerrit.wikimedia.org/r/193966
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2df21ce00df7e26db0c83592ba1b7043391d3f02
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@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] archivebot: don't prepend namespace to templates in template... - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: archivebot: don't prepend namespace to templates in template
namespace
..
archivebot: don't prepend namespace to templates in template namespace
Change-Id: I953ff403275a280c6eab02be7afd794ca7db47d2
---
M scripts/archivebot.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/archivebot.py b/scripts/archivebot.py
index 6c9a9d3..6563a83 100644
--- a/scripts/archivebot.py
+++ b/scripts/archivebot.py
@@ -427,7 +427,7 @@
def attr2text(self):
return '{{%s\n%s\n}}' \
- % (self.tpl.title(),
+ % (self.tpl.title(withNamespace=(self.tpl.namespace() != 10)),
'\n'.join(['|%s = %s' % (a, self.get_attr(a))
for a in self.saveables()]))
--
To view, visit https://gerrit.wikimedia.org/r/193366
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I953ff403275a280c6eab02be7afd794ca7db47d2
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Whym w...@whym.org
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Nutcracker should be 'stopped' rather than 'absent' - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Revert Nutcracker should be 'stopped' rather than 'absent'
..
Revert Nutcracker should be 'stopped' rather than 'absent'
(This patchset broke logins on wikitech)
This reverts commit ef7089a5278649ef86e542487f7b11e801688d59.
Change-Id: I818f55482559c07046b067a0edbc8bcd4cac2c68
---
M manifests/role/nova.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 1646435..22d6382 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -217,7 +217,7 @@
include ::scap::scripts
service { 'nutcracker':
-ensure = stopped,
+ensure = absent,
before = Service['memcached']
}
}
--
To view, visit https://gerrit.wikimedia.org/r/193967
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I818f55482559c07046b067a0edbc8bcd4cac2c68
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@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] populateListOfUsersToRename: Set $attachableWikis into the c... - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: populateListOfUsersToRename: Set $attachableWikis into the cache
..
populateListOfUsersToRename: Set $attachableWikis into the cache
Follow up from f68863aec61f0b2a11
Change-Id: I8ae3519f6cbe63125a58ab82ef8122f7afcec96e
---
M maintenance/populateListOfUsersToRename.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
CSteipp: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/populateListOfUsersToRename.php
b/maintenance/populateListOfUsersToRename.php
index 7d025e7..7192ecd 100644
--- a/maintenance/populateListOfUsersToRename.php
+++ b/maintenance/populateListOfUsersToRename.php
@@ -97,7 +97,7 @@
}
}
}
- $cache-set( $row-name, $home );
+ $cache-set( $row-name,
$attachableWikis );
}
if ( !in_array( $row-wiki, $attachableWikis )
) {
--
To view, visit https://gerrit.wikimedia.org/r/193970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ae3519f6cbe63125a58ab82ef8122f7afcec96e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: CSteipp cste...@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] VE: Apply overflow fix on header - change (mediawiki...MobileFrontend)
TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193984
Change subject: VE: Apply overflow fix on header
..
VE: Apply overflow fix on header
Without this, the bottom border can cross over any floating content,
which be ugly.
Change-Id: Ia2ab31acb4f4b89c3550254a064e484def087fda
---
M less/modules/editor/VisualEditorOverlay.less
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/84/193984/1
diff --git a/less/modules/editor/VisualEditorOverlay.less
b/less/modules/editor/VisualEditorOverlay.less
index 19bab58..c4e9e53 100644
--- a/less/modules/editor/VisualEditorOverlay.less
+++ b/less/modules/editor/VisualEditorOverlay.less
@@ -7,6 +7,7 @@
h1, h2 {
margin-bottom: .5em;
border-bottom: solid 1px @sectionBorderColor;
+ overflow: hidden;
}
// Styling for images (as output by Parsiod)
--
To view, visit https://gerrit.wikimedia.org/r/193984
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2ab31acb4f4b89c3550254a064e484def087fda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: TheDJ hartman.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix WP app being advertized on non-WP sites like Commons - change (operations/mediawiki-config)
MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193988
Change subject: Fix WP app being advertized on non-WP sites like Commons
..
Fix WP app being advertized on non-WP sites like Commons
Involves adding a 'wikipedia' wiki group from wikipedia.dblist
Bug: T91174
Change-Id: I71211bfd24b703e9192d18849645129b2c454990
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/88/193988/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index a66d3e5..9f17b51 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -171,7 +171,7 @@
$wikiTags = array();
foreach ( array( 'private', 'fishbowl', 'special', 'closed',
'flaggedrevs', 'small', 'medium',
'large', 'wikimania', 'wikidata', 'wikidataclient',
'visualeditor-default',
- 'echowikis', 'commonsuploads', 'nonbetafeatures',
'group0' ) as $tag ) {
+ 'echowikis', 'commonsuploads', 'nonbetafeatures',
'group0', 'wikipedia' ) as $tag ) {
$dblist = array_map( 'trim', file( getRealmSpecificFilename(
$IP/../$tag.dblist ) ) );
if ( in_array( $wgDBname, $dblist ) ) {
$wikiTags[] = $tag;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index c1b484f..e2bd883 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12737,7 +12737,7 @@
),
'wmgMFAppPackageId' = array(
'default' = false,
- 'wiki' = 'org.wikipedia',
+ 'wikipedia' = 'org.wikipedia',
),
# trademark status
--
To view, visit https://gerrit.wikimedia.org/r/193988
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71211bfd24b703e9192d18849645129b2c454990
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem maxsem.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix transfer of reference contents from removed reference - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193958
Change subject: Fix transfer of reference contents from removed reference
..
Fix transfer of reference contents from removed reference
We unconditionally retrieved originalHtml from itemNode,
even if there was no data-mw.body.id, so as long as
the reference itself wasn't edited, we would never overwrite
data-mw. This meant that if the ref with the contents
was deleted, the contents wouldn't be transfered to the
first ref tag with that name like they're supposed to be.
The solution is to only look at originalHtml from itemNode
if data-mw.body.id is set.
Change-Id: Ib87491b6fa6a77d62384158f8e8f7dcc2a36c23a
---
M modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/58/193958/1
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
index 4945117..f6c4503 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js
@@ -156,7 +156,8 @@
);
itemNodeHtml = itemNodeWrapper.innerHTML; // Returns '' if
itemNodeWrapper is empty
originalHtml = ve.getProp( mwData, 'body', 'html' ) ||
- itemNode.getAttribute( 'originalHtml' ) || '';
+ ( ve.getProp( mwData, 'body', 'id' ) !== undefined
itemNode.getAttribute( 'originalHtml' ) ) ||
+ '';
originalHtmlWrapper.innerHTML = originalHtml;
// Only set body.html if itemNodeHtml and originalHtml are
actually different
if ( !originalHtmlWrapper.isEqualNode( itemNodeWrapper ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/193958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib87491b6fa6a77d62384158f8e8f7dcc2a36c23a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.25wmf19
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add an icon to hidden templates - change (mediawiki...VisualEditor)
Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193975
Change subject: Add an icon to hidden templates
..
Add an icon to hidden templates
Check if, after being fully rendered, a template is effectively
empty. If it is, add an icon and style to it so it displays for
the user and is clickable.
Bug: T51806
Change-Id: I11b9f0aba3398a3deb3e755051366e174a28e586
---
M VisualEditor.php
M modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
A modules/ve-mw/ce/styles/nodes/ve.ce.MWTransclusionNode.css
3 files changed, 50 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/75/193975/1
diff --git a/VisualEditor.php b/VisualEditor.php
index a2d5fb3..5d78415 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -1323,6 +1323,9 @@
'modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js',
),
+ 'styles' = array(
+
'modules/ve-mw/ce/styles/nodes/ve.ce.MWTransclusionNode.css'
+ ),
'dependencies' = array(
'ext.visualEditor.mwcore',
),
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
index 7258696..8726100 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
@@ -24,6 +24,7 @@
// Mixin constructors
ve.ce.FocusableNode.call( this );
+ OO.ui.IconElement.call( this, $.extend( {}, config, { $icon:
this.$element } ) );
ve.ce.GeneratedContentNode.call( this );
};
@@ -33,6 +34,7 @@
OO.mixinClass( ve.ce.MWTransclusionNode, ve.ce.FocusableNode );
OO.mixinClass( ve.ce.MWTransclusionNode, ve.ce.GeneratedContentNode );
+OO.mixinClass( ve.ce.MWTransclusionNode, OO.ui.IconElement );
/* Static Properties */
@@ -96,7 +98,7 @@
* @param {Object} response Response data
*/
ve.ce.MWTransclusionNode.prototype.onParseSuccess = function ( deferred,
response ) {
- var contentNodes, $placeHolder;
+ var contentNodes;
if ( !response || response.error || !response.visualeditor ||
response.visualeditor.result !== 'success' ) {
return this.onParseError.call( this, deferred );
@@ -111,22 +113,35 @@
contentNodes = Array.prototype.slice.apply(
contentNodes[0].childNodes );
}
- // Check if the final result of the imported template is empty.
- // If it is empty, put an inline placeholder inside it so that it can
- // be accessible to users (either to remove or edit)
- if ( contentNodes.length === 0 ) {
- $placeHolder = this.$( 'span' )
- .css( { display: 'block' } )
- // adapted from ve.ce.BranchNode.$blockSlugTemplate
- // IE support may require using nbsp;
- .html( '#xFEFF;' );
-
- contentNodes.push( $placeHolder[0] );
- }
deferred.resolve( contentNodes );
};
/**
+ * Extend the ve.ce.GeneratedContentNode render method to check for hidden
templates.
+ *
+ * Check if the final result of the imported template is empty.
+ * If it is empty, set the icon to be the template icon so that it can
+ * be accessible to users (either to remove or edit)
+ *
+ * @see ve.ce.GeneratedContentNode#render
+ */
+ve.ce.MWTransclusionNode.prototype.render = function ( generatedContents ) {
+ // Call parent mixin
+ ve.ce.GeneratedContentNode.prototype.render.call( this,
generatedContents );
+
+ // Since render relpaces this.$element with a new node, we need to make
sure
+ // our iconElement is defined again to be this.$element
+ this.setIconElement( this.$element );
+ this.$element.addClass( 've-ce-mwTransclusionNode' );
+ if ( $( generatedContents ).text().trim().length === 0 ) {
+ // If the template length is empty, set up the icon
+ this.setIcon( 'template' );
+ } else {
+ this.setIcon( null );
+ }
+};
+
+/**
* @inheritdoc
*/
ve.ce.MWTransclusionNode.prototype.getRenderedDomElements = function (
domElements ) {
diff --git a/modules/ve-mw/ce/styles/nodes/ve.ce.MWTransclusionNode.css
b/modules/ve-mw/ce/styles/nodes/ve.ce.MWTransclusionNode.css
new file mode 100644
index 000..226c3cd
--- /dev/null
+++ b/modules/ve-mw/ce/styles/nodes/ve.ce.MWTransclusionNode.css
@@ -0,0 +1,19 @@
+/*!
+ * VisualEditor ContentEditable MediaWiki MWTransclusionNode styles.
+ *
+ * @copyright 2011-2015 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+/*csslint regex-selectors:false, overqualified-elements:false */
+
+.ve-ce-mwTransclusionNode.oo-ui-iconElement {
+ display: inline-block;
+ vertical-align:
[MediaWiki-commits] [Gerrit] Special:RecordImpression: include sample rate - change (mediawiki...CentralNotice)
jenkins-bot has submitted this change and it was merged.
Change subject: Special:RecordImpression: include sample rate
..
Special:RecordImpression: include sample rate
In preparation for add-hoc adjustable sample rates for
Special:RecordImpression, we send back data on the rate of
client-side sampling. This is important to ensure correct
interpretation of the data.
Bug: T45250
Change-Id: I8dfaa935b6c07fac3e0fe66acc1a5cb4206fae16
---
M modules/ext.centralNotice.bannerController/bannerController.js
1 file changed, 16 insertions(+), 4 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.centralNotice.bannerController/bannerController.js
b/modules/ext.centralNotice.bannerController/bannerController.js
index 30a1b62..3858c02 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -273,13 +273,25 @@
// Record banner impression using old-style URL
recordImpression: function( data ) {
- var url = new mw.Uri( mw.config.get(
'wgCentralBannerRecorder' ) );
+ var sampleRate,
+ url = new mw.Uri( mw.config.get(
'wgCentralBannerRecorder' ) );
- if ( mw.centralNotice.onlySampleRI
- ( Math.random() mw.config.get(
'wgCentralNoticeSampleRate' ) ) ) {
- return;
+ if ( mw.centralNotice.onlySampleRI ) {
+
+ sampleRate = mw.config.get(
'wgCentralNoticeSampleRate' );
+
+ if ( Math.random() sampleRate ) {
+ return;
+ }
+
+ } else {
+ sampleRate = 1;
}
+ // Record the sample rate to ensure the resulting data
can be
+ // interpreted.
+ $.extend( data, { sampleRate: sampleRate } );
+
url.extend( data );
(new Image()).src = url.toString();
},
--
To view, visit https://gerrit.wikimedia.org/r/193777
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8dfaa935b6c07fac3e0fe66acc1a5cb4206fae16
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Mwalker mwal...@khaosdev.com
Gerrit-Reviewer: Ssmith ssm...@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] Populate User::$idCacheByName in User::loadFromRow() if poss... - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193979
Change subject: Populate User::$idCacheByName in User::loadFromRow() if possible
..
Populate User::$idCacheByName in User::loadFromRow() if possible
Change-Id: I4c7dab517ca6b7adcdec0c945e21d6be0b7b7d66
---
M includes/User.php
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/79/193979/1
diff --git a/includes/User.php b/includes/User.php
index 7025717..03ac4fd 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1240,6 +1240,10 @@
$all = false;
}
+ if ( isset( $row-user_id ) isset( $row-user_name ) ) {
+ self::$idCacheByName[$row-user_name] = $row-user_id;
+ }
+
if ( isset( $row-user_editcount ) ) {
$this-mEditCount = $row-user_editcount;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/193979
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c7dab517ca6b7adcdec0c945e21d6be0b7b7d66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] move dbtree into its own subrepository, rm here - change (operations/software)
Dzahn has submitted this change and it was merged.
Change subject: move dbtree into its own subrepository, rm here
..
move dbtree into its own subrepository, rm here
The dbtree tool has moved into its own subrepository at
operations/software/dbtree (I9acda817c57b1c2)
Formerly the code was in 2 separate locations (T90837)
and we would like puppet to git clone it without having to
checkout subdirectories.
Bug:T90837
Change-Id: I50c54c4fe1311f737ad93de6d26e3f64083534b4
---
A dbtree/README
D dbtree/inc/.htaccess
D dbtree/inc/config.template.php
D dbtree/inc/sanity.php
D dbtree/inc/template.php
D dbtree/inc/tree.php
D dbtree/index.php
7 files changed, 6 insertions(+), 1,324 deletions(-)
Approvals:
Springle: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/dbtree/README b/dbtree/README
new file mode 100644
index 000..1ba8ee4
--- /dev/null
+++ b/dbtree/README
@@ -0,0 +1,6 @@
+This tool has moved into its own subrepository at
+operations/software/dbtree
+
+git clone https://gerrit.wikimedia.org/r/p/operations/software/dbtree
+
+Bug:T90837
diff --git a/dbtree/inc/.htaccess b/dbtree/inc/.htaccess
deleted file mode 100644
index 14249c5..000
--- a/dbtree/inc/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all
\ No newline at end of file
diff --git a/dbtree/inc/config.template.php b/dbtree/inc/config.template.php
deleted file mode 100644
index df45605..000
--- a/dbtree/inc/config.template.php
+++ /dev/null
@@ -1,11 +0,0 @@
-?php
-
-$db_host = 'host';
-$db_user = 'user';
-$db_pass = 'pass';
-$db_name = 'name';
-
-function e($msg)
-{
- error_log($msg);
-}
\ No newline at end of file
diff --git a/dbtree/inc/sanity.php b/dbtree/inc/sanity.php
deleted file mode 100644
index 61c2586..000
--- a/dbtree/inc/sanity.php
+++ /dev/null
@@ -1,975 +0,0 @@
-?php
-
-function backtrace()
-{
-ob_start();
-debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-e(ob_get_clean());
-}
-
-function map()
-{
-return call_user_func_array('array_map', func_get_args());
-}
-
-function reduce($func, $array, $init=null)
-{
-return array_reduce($array, $func, $init);
-}
-
-function filter($func, $array)
-{
-return array_filter($array, $func);
-}
-
-function str($arg, $j='')
-{
-if (is_array($arg))
-$arg = join($j, $arg);
-return strval($arg);
-}
-
-function bool($v)
-{
-return $v ? true: false;
-}
-
-function keys($a)
-{
-return is_array($a) ? array_keys($a): array( str($a) );
-}
-
-function vals($a)
-{
-return is_array($a) ? array_values($a): array( str($a) );
-}
-
-function all($a)
-{
-return reduce(function($a, $b) { return $a $b; }, $a, true);
-}
-
-function any($a)
-{
-return reduce(function($a, $b) { return $a || $b; }, $a, false);
-}
-
-function any_null($a)
-{
-return reduce(function($a, $b) { return $a || is_null($b); }, $a, false);
-}
-
-function any_empty($a)
-{
-return reduce(function($a, $b) { return $a || empty($b); }, $a, false);
-}
-
-// Retrieve a field from an array (say, $_REQUEST) and cast it to a certain
type,
-// or fall back on the default value.
-function expect($arr, $key, $type='string', $def=null)
-{
-if (is_array($arr) array_key_exists($key, $arr))
-{
-// type can be an array of types
-if (is_array($type))
-{
-$index = array_search($arr[$key], $type);
-return ($index !== false) ? $type[$index]: $def;
-}
-// type can be a string of types | separated
-$types = explode('|', strtolower($type));
-foreach ($types as $type)
-{
-// anything PHP thinks is true becomes proper true.
-if ($type == 'bool' || $type == 'boolean')
-return ($arr[$key]) ? true: false;
-if (is_numeric($arr[$key]))
-{
-if ($type == 'number')
-return $arr[$key];
-if ($type == 'int' || $type == 'integer' || $type == 'signed')
-return (int)$arr[$key];
-if ($type == 'float' || $type == 'decimal')
-return (float)$arr[$key];
-if (($type == 'uint' || $type == 'unsigned')
intval($arr[$key]) = 0)
-return (int)$arr[$key];
-if (($type == 'pint' || $type == 'positive')
intval($arr[$key]) 0)
-return (int)$arr[$key];
-}
-if ($type == 'hex' is_scalar($arr[$key])
preg_match('/^(0x)?[0-9a-fA-F]+$/', $arr[$key]))
-return hexdec($arr[$key]);
-if (($type == 'str' || $type == 'string') is_scalar($arr[$key]))
-return trim(sprintf(%s, $arr[$key]));
-if ($type == 'array' is_array($arr[$key]))
-return $arr[$key];
-if ($type == 'object' is_object($arr[$key]))
-return
[MediaWiki-commits] [Gerrit] Add blank.gif for performance.wikimedia.org for T88361 - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: Add blank.gif for performance.wikimedia.org for T88361 .. Add blank.gif for performance.wikimedia.org for T88361 Change-Id: I085dc7b49ee54ffcfad369363673f51ae82ab781 --- A files/performance/blank.gif 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/files/performance/blank.gif b/files/performance/blank.gif new file mode 100644 index 000..2799b45 --- /dev/null +++ b/files/performance/blank.gif Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/193963 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I085dc7b49ee54ffcfad369363673f51ae82ab781 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add blank.gif for performance.wikimedia.org for T88361 - change (operations/puppet)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/193963 Change subject: Add blank.gif for performance.wikimedia.org for T88361 .. Add blank.gif for performance.wikimedia.org for T88361 Change-Id: I085dc7b49ee54ffcfad369363673f51ae82ab781 --- A files/performance/blank.gif 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/63/193963/1 diff --git a/files/performance/blank.gif b/files/performance/blank.gif new file mode 100644 index 000..2799b45 --- /dev/null +++ b/files/performance/blank.gif Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/193963 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I085dc7b49ee54ffcfad369363673f51ae82ab781 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VisualEditor for Ib87491b6 - change (mediawiki/core)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/193965 Change subject: Update VisualEditor for Ib87491b6 .. Update VisualEditor for Ib87491b6 Change-Id: Ie249acec6779c62479f81d0ca2f899b38fd0077b --- M extensions/VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/65/193965/1 diff --git a/extensions/VisualEditor b/extensions/VisualEditor index 423ab46..5fb6e76 16 --- a/extensions/VisualEditor +++ b/extensions/VisualEditor -Subproject commit 423ab462a6a29138384052b87e681027b7173894 +Subproject commit 5fb6e768c936566330d79b9706d7dbb7b7ce27f8 -- To view, visit https://gerrit.wikimedia.org/r/193965 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie249acec6779c62479f81d0ca2f899b38fd0077b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf19 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] initial commit - moved from operations/software - change (operations...dbtree)
Dzahn has submitted this change and it was merged.
Change subject: initial commit - moved from operations/software
..
initial commit - moved from operations/software
The existing files from the dbtree directory in operations/software
moved over here into its own repository.
Bug:T90837
Change-Id: I9acda817c57b1c2d2d618d8224eb3a724460f813
---
A inc/.htaccess
A inc/config.template.php
A inc/sanity.php
A inc/template.php
A inc/tree.php
A index.php
6 files changed, 1,324 insertions(+), 0 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/inc/.htaccess b/inc/.htaccess
new file mode 100644
index 000..14249c5
--- /dev/null
+++ b/inc/.htaccess
@@ -0,0 +1 @@
+Deny from all
\ No newline at end of file
diff --git a/inc/config.template.php b/inc/config.template.php
new file mode 100644
index 000..df45605
--- /dev/null
+++ b/inc/config.template.php
@@ -0,0 +1,11 @@
+?php
+
+$db_host = 'host';
+$db_user = 'user';
+$db_pass = 'pass';
+$db_name = 'name';
+
+function e($msg)
+{
+ error_log($msg);
+}
\ No newline at end of file
diff --git a/inc/sanity.php b/inc/sanity.php
new file mode 100644
index 000..61c2586
--- /dev/null
+++ b/inc/sanity.php
@@ -0,0 +1,975 @@
+?php
+
+function backtrace()
+{
+ob_start();
+debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+e(ob_get_clean());
+}
+
+function map()
+{
+return call_user_func_array('array_map', func_get_args());
+}
+
+function reduce($func, $array, $init=null)
+{
+return array_reduce($array, $func, $init);
+}
+
+function filter($func, $array)
+{
+return array_filter($array, $func);
+}
+
+function str($arg, $j='')
+{
+if (is_array($arg))
+$arg = join($j, $arg);
+return strval($arg);
+}
+
+function bool($v)
+{
+return $v ? true: false;
+}
+
+function keys($a)
+{
+return is_array($a) ? array_keys($a): array( str($a) );
+}
+
+function vals($a)
+{
+return is_array($a) ? array_values($a): array( str($a) );
+}
+
+function all($a)
+{
+return reduce(function($a, $b) { return $a $b; }, $a, true);
+}
+
+function any($a)
+{
+return reduce(function($a, $b) { return $a || $b; }, $a, false);
+}
+
+function any_null($a)
+{
+return reduce(function($a, $b) { return $a || is_null($b); }, $a, false);
+}
+
+function any_empty($a)
+{
+return reduce(function($a, $b) { return $a || empty($b); }, $a, false);
+}
+
+// Retrieve a field from an array (say, $_REQUEST) and cast it to a certain
type,
+// or fall back on the default value.
+function expect($arr, $key, $type='string', $def=null)
+{
+if (is_array($arr) array_key_exists($key, $arr))
+{
+// type can be an array of types
+if (is_array($type))
+{
+$index = array_search($arr[$key], $type);
+return ($index !== false) ? $type[$index]: $def;
+}
+// type can be a string of types | separated
+$types = explode('|', strtolower($type));
+foreach ($types as $type)
+{
+// anything PHP thinks is true becomes proper true.
+if ($type == 'bool' || $type == 'boolean')
+return ($arr[$key]) ? true: false;
+if (is_numeric($arr[$key]))
+{
+if ($type == 'number')
+return $arr[$key];
+if ($type == 'int' || $type == 'integer' || $type == 'signed')
+return (int)$arr[$key];
+if ($type == 'float' || $type == 'decimal')
+return (float)$arr[$key];
+if (($type == 'uint' || $type == 'unsigned')
intval($arr[$key]) = 0)
+return (int)$arr[$key];
+if (($type == 'pint' || $type == 'positive')
intval($arr[$key]) 0)
+return (int)$arr[$key];
+}
+if ($type == 'hex' is_scalar($arr[$key])
preg_match('/^(0x)?[0-9a-fA-F]+$/', $arr[$key]))
+return hexdec($arr[$key]);
+if (($type == 'str' || $type == 'string') is_scalar($arr[$key]))
+return trim(sprintf(%s, $arr[$key]));
+if ($type == 'array' is_array($arr[$key]))
+return $arr[$key];
+if ($type == 'object' is_object($arr[$key]))
+return $arr[$key];
+if ($type == 'csv' is_scalar($arr[$key]))
+return strlen($arr[$key]) ? preg_split('/\s*,\s*/',
trim($arr[$key])) : array();
+if ($type == 'json' is_scalar($arr[$key]) strlen($arr[$key]))
+return json_decode($arr[$key], true);
+// type can be a callback function to filter a value
+if (is_string($type) function_exists($type))
+return $type($arr[$key], $def);
+}
+}
+return $def;
+}
+
+// Robust htmlentities
+function escape($str)
+{
+$charsets = array(
+'UTF-8',
+'ISO-8859-1',
+'ISO-8859-15',
+
[MediaWiki-commits] [Gerrit] Revert wikitech: remove nutcracker - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193968
Change subject: Revert wikitech: remove nutcracker
..
Revert wikitech: remove nutcracker
This broke logins on wikitech
This reverts commit f83c4191b7e2351366199d7178374cb541ff4f04.
Change-Id: I5a1ac2831bdcf600c0890eb9034735572a7d
---
M hieradata/hosts/silver.yaml
M manifests/role/nova.pp
M modules/openstack/manifests/openstack-manager.pp
3 files changed, 21 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/68/193968/1
diff --git a/hieradata/hosts/silver.yaml b/hieradata/hosts/silver.yaml
index 496a8ee..4e2d615 100644
--- a/hieradata/hosts/silver.yaml
+++ b/hieradata/hosts/silver.yaml
@@ -2,5 +2,3 @@
cluster: virt
admin::groups:
- deployment
-memcached::ip: 127.0.0.1
-memcached::port: 11212
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 22d6382..61282f5 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -213,12 +213,27 @@
certificate = $certificate,
}
+include ::nutcracker::monitoring
include ::mediawiki::packages::php5
include ::scap::scripts
-service { 'nutcracker':
-ensure = absent,
-before = Service['memcached']
+class { '::nutcracker':
+mbuf_size = '64k',
+pools = {
+'memcached' = {
+auto_eject_hosts = true,
+distribution = 'ketama',
+hash = 'md5',
+listen = '127.0.0.1:11212',
+preconnect = true,
+server_connections = 2,
+server_failure_limit = 3,
+timeout = 250,
+servers = [
+'127.0.0.1:11000:1',
+],
+},
+},
}
}
diff --git a/modules/openstack/manifests/openstack-manager.pp
b/modules/openstack/manifests/openstack-manager.pp
index da891fd..d1ca7f3 100644
--- a/modules/openstack/manifests/openstack-manager.pp
+++ b/modules/openstack/manifests/openstack-manager.pp
@@ -17,7 +17,9 @@
before = Package['memcached'],
}
-include memcached
+class { 'memcached':
+ip = '127.0.0.1',
+}
}
$controller_hostname = $novaconfig['controller_hostname']
--
To view, visit https://gerrit.wikimedia.org/r/193968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a1ac2831bdcf600c0890eb9034735572a7d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mount sysfs for PHYS_CORES in late_command - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: mount sysfs for PHYS_CORES in late_command
..
mount sysfs for PHYS_CORES in late_command
Change-Id: I1d6cafc426610895158c9674ba8a58bbf55fb0ae
---
M modules/install-server/files/autoinstall/scripts/late_command
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/install-server/files/autoinstall/scripts/late_command
b/modules/install-server/files/autoinstall/scripts/late_command
index ed4b967..5afed93 100644
--- a/modules/install-server/files/autoinstall/scripts/late_command
+++ b/modules/install-server/files/autoinstall/scripts/late_command
@@ -30,7 +30,9 @@
# otherwise we'd need a reboot after puppet sets up the same file on the
first run)
case `hostname` in \
amssq[0-9]*|cp[1234]*|dysprosium)
+ mount -t sysfs none /target/sys
PHYS_CORES=$(chroot /target /usr/bin/ruby -e require
'pathname'; print
Pathname::glob('/sys/devices/system/cpu/cpu[0-9]*/topology/thread_siblings_list').map{|x|
File.open(x,'r').read().split(',')[0] }.sort.uniq.count)
+ umount /target/sys
chroot /target /bin/sh -c echo options bnx2x
num_queues=$PHYS_CORES /etc/modprobe.d/rps.conf
chroot /target apt-get -y upgrade
apt-install linux-image-3.19
--
To view, visit https://gerrit.wikimedia.org/r/193972
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1d6cafc426610895158c9674ba8a58bbf55fb0ae
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make ce.BranchNode#updateTagName do what its documentation says - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Make ce.BranchNode#updateTagName do what its documentation says
..
Make ce.BranchNode#updateTagName do what its documentation says
Actually transfer classes, and transfer the contentEditable property too.
This allows us to set classes and cE in the constructor instead
of on setup.
Also rewrite updateTagName to use DOM methods, and update TableCellNode
to have its teardown listener remove the classes added by its setup
listener (it previously got away with not doing that because updateTagName
didn't behave as documented).
Change-Id: I7547a2228754332b907f36d9705b9987b12d1091
---
M src/ce/nodes/ve.ce.TableCellNode.js
M src/ce/ve.ce.BranchNode.js
2 files changed, 27 insertions(+), 9 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ce/nodes/ve.ce.TableCellNode.js
b/src/ce/nodes/ve.ce.TableCellNode.js
index d9243aa..25f38b1 100644
--- a/src/ce/nodes/ve.ce.TableCellNode.js
+++ b/src/ce/nodes/ve.ce.TableCellNode.js
@@ -65,6 +65,16 @@
};
/**
+ * @inheritdoc
+ */
+ve.ce.TableCellNode.prototype.onTeardown = function () {
+ // Parent method
+ ve.ce.TableCellNode.super.prototype.onTeardown.call( this );
+
+ this.$element.removeClass( 've-ce-tableCellNode
ve-ce-tableCellNode-data ve-ce-tableCellNode-header' );
+};
+
+/**
* Get the HTML tag name.
*
* Tag name is selected based on the model's style attribute.
diff --git a/src/ce/ve.ce.BranchNode.js b/src/ce/ve.ce.BranchNode.js
index f87a6ff..3e3ceca 100644
--- a/src/ce/ve.ce.BranchNode.js
+++ b/src/ce/ve.ce.BranchNode.js
@@ -117,28 +117,36 @@
/**
* Update the DOM wrapper.
*
- * WARNING: The contents, .data( 'view' ) and any classes the wrapper already
has will be moved to
- * the new wrapper, but other attributes and any other information added using
$.data() will be
- * lost upon updating the wrapper. To retain information added to the wrapper,
subscribe to the
- * 'teardown' and 'setup' events.
+ * WARNING: The contents, .data( 'view' ), the contentEditable property and
any classes the wrapper
+ * already has will be moved to the new wrapper, but other attributes and any
other information
+ * added using $.data() will be lost upon updating the wrapper. To retain
information added to the
+ * wrapper, subscribe to the 'teardown' and 'setup' events.
*
* @method
* @fires teardown
* @fires setup
*/
ve.ce.BranchNode.prototype.updateTagName = function () {
- var $wrapper,
+ var wrapper,
tagName = this.getTagName();
if ( tagName !== this.tagName ) {
this.emit( 'teardown' );
- $wrapper = this.$( document.createElement( tagName ) );
+ wrapper = document.createElement( tagName );
+ // Copy classes
+ wrapper.className = this.$element[0].className;
+ // Copy contentEditable
+ wrapper.contentEditable = this.$element[0].contentEditable;
// Move contents
- $wrapper.append( this.$element.contents() );
+ while ( this.$element[0].firstChild ) {
+ wrapper.appendChild( this.$element[0].firstChild );
+ }
// Swap elements
- this.$element.replaceWith( $wrapper );
+ if ( this.$element[0].parentNode ) {
+ this.$element[0].parentNode.replaceChild( wrapper,
this.$element[0] );
+ }
// Use new element from now on
- this.$element = $wrapper;
+ this.$element = $( wrapper );
this.emit( 'setup' );
// Remember which tag name we are using now
this.tagName = tagName;
--
To view, visit https://gerrit.wikimedia.org/r/193824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7547a2228754332b907f36d9705b9987b12d1091
Gerrit-PatchSet: 3
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Krinkle krinklem...@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] mount sysfs for PHYS_CORES in late_command - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193972
Change subject: mount sysfs for PHYS_CORES in late_command
..
mount sysfs for PHYS_CORES in late_command
Change-Id: I1d6cafc426610895158c9674ba8a58bbf55fb0ae
---
M modules/install-server/files/autoinstall/scripts/late_command
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/193972/1
diff --git a/modules/install-server/files/autoinstall/scripts/late_command
b/modules/install-server/files/autoinstall/scripts/late_command
index ed4b967..5afed93 100644
--- a/modules/install-server/files/autoinstall/scripts/late_command
+++ b/modules/install-server/files/autoinstall/scripts/late_command
@@ -30,7 +30,9 @@
# otherwise we'd need a reboot after puppet sets up the same file on the
first run)
case `hostname` in \
amssq[0-9]*|cp[1234]*|dysprosium)
+ mount -t sysfs none /target/sys
PHYS_CORES=$(chroot /target /usr/bin/ruby -e require
'pathname'; print
Pathname::glob('/sys/devices/system/cpu/cpu[0-9]*/topology/thread_siblings_list').map{|x|
File.open(x,'r').read().split(',')[0] }.sort.uniq.count)
+ umount /target/sys
chroot /target /bin/sh -c echo options bnx2x
num_queues=$PHYS_CORES /etc/modprobe.d/rps.conf
chroot /target apt-get -y upgrade
apt-install linux-image-3.19
--
To view, visit https://gerrit.wikimedia.org/r/193972
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d6cafc426610895158c9674ba8a58bbf55fb0ae
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Special:RecordImpression: sample for allocation gaps, too - change (mediawiki...CentralNotice)
jenkins-bot has submitted this change and it was merged.
Change subject: Special:RecordImpression: sample for allocation gaps, too
..
Special:RecordImpression: sample for allocation gaps, too
Bug: T45250
Change-Id: Id0cfce8bdf89464988292f644920048d66997ece
---
M modules/ext.centralNotice.bannerController/bannerController.js
1 file changed, 10 insertions(+), 16 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.centralNotice.bannerController/bannerController.js
b/modules/ext.centralNotice.bannerController/bannerController.js
index 6d14d7d..30a1b62 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -188,12 +188,8 @@
// a random banner.
if ( mw.centralNotice.chooseBannerOnClient ) {
- // If the server sent no choices to begin with,
set a flag
- // so record impressions will only send a
sample of results
- if ( mw.cnBannerControllerLib.choiceData.length
=== 0 ) {
- mw.centralNotice.onlySampleRI = true;
-
- } else {
+ // Continue only if the server sent choices
+ if ( mw.cnBannerControllerLib.choiceData.length
0 ) {
// If the server did send one or more
choices: let the
// processing begin!
@@ -203,13 +199,10 @@
// the user's logged-in status and
device pass this filter.
mw.cnBannerControllerLib.filterChoiceData();
- // Again check if there are choices
available. If no, set
- // record impressions to only sample.
If yes, continue
- // processing.
- if (
mw.cnBannerControllerLib.choiceData.length === 0 ) {
- mw.centralNotice.onlySampleRI =
true;
+ // Again check if there are choices
available. This result may
+ // have changed following the above
call to filterChoiceData().
+ if (
mw.cnBannerControllerLib.choiceData.length 0 ) {
- } else {
// Do all things bucket.
Retrieve or generate buckets for all
// the campaigns remaining in
choiceData. Then update expiry
// dates and remove expired
buckets as necessary.
@@ -244,10 +237,11 @@
} );
} else {
- // Call insertBanner to trigger a call
to
- // Special:RecordImpression to register
the empty result.
- // TODO Refactor and register that the
banner wasn't even
- // fetched.
+ // Call insertBanner and set the
onlySampleRI flag to true
+ // to sample empty results and return
them via
+ // Special:RecordImpression.
+ // TODO Refactor
+ mw.centralNotice.onlySampleRI = true;
mw.centralNotice.insertBanner( false );
}
--
To view, visit https://gerrit.wikimedia.org/r/193767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id0cfce8bdf89464988292f644920048d66997ece
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Mwalker mwal...@khaosdev.com
Gerrit-Reviewer: Ssmith ssm...@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] Avoid excluding Wikidata pageviews - change (analytics...source)
Ottomata has submitted this change and it was merged. Change subject: Avoid excluding Wikidata pageviews .. Avoid excluding Wikidata pageviews Wikidata pageviews are currently excluded because they all have the uriHost 'www.wikidata.org' - which is ignored to avoid including 'www.wikipedia.org/foobarbaz' hits that somehow 200. This patch removes wikidata from the host patterns (which deliberately filter out www) and instead includes it as a string which is individually checked. It also includes a unit test specifically for wikidata (once burned, twice shy, right?) Change-Id: I1d6a23d54a949dcacd850cc1e45c6cc1a019032d --- M changelog.md M refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java M refinery-core/src/test/resources/pageview_test_data.csv 3 files changed, 7 insertions(+), 1 deletion(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/changelog.md b/changelog.md index bed32bb..c2c5a7d 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,6 @@ ## v0.0.8-SNAPSHOT * Stop counting edit attempts as pageviews +* Start counting www.wikidata.org hits ## v0.0.7 * Add Referer classifier diff --git a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java index 7a255a1..b4d195a 100644 --- a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java +++ b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/Pageview.java @@ -34,9 +34,11 @@ private static final Pattern uriHostProjectDomainPattern = Pattern.compile( (?!www)\\. // not starting with www -+ (wik(ibooks|idata| // match project domains ending in .org ++ (wik(ibooks| // match project domains ending in .org + inews|ipedia|iquote|isource|tionary|iversity|ivoyage))\\.org$ ); + +private static final String uriHostWikidataString = www.wikidata.org; private static final Pattern uriPathPattern = Pattern.compile( ^(/sr(-(ec|el))?|/w(iki)?|/zh(-(cn|hans|hant|hk|mo|my|sg|tw))?)/ @@ -173,6 +175,7 @@ // or a 'project' domain, e.g. en.wikipedia.org ( patternIsFound(uriHostWikimediaDomainPattern, uriHost) +|| stringContains(uriHost, uriHostWikidataString) || patternIsFound(uriHostProjectDomainPattern, uriHost) ) // Either a pageview's uriPath will match the first pattern, diff --git a/refinery-core/src/test/resources/pageview_test_data.csv b/refinery-core/src/test/resources/pageview_test_data.csv index 80933b5..9ba352e 100644 --- a/refinery-core/src/test/resources/pageview_test_data.csv +++ b/refinery-core/src/test/resources/pageview_test_data.csv @@ -13,9 +13,11 @@ Is Pageview – Desktop - Chinese zh-my, true,false,174.62.175.92,-,zh.wikipedia.org,/zh-my/Wikipedia:首页,-,200,text/html,Five-test plan Is Pageview – Desktop - Chinese zh-sg, true,false,174.62.175.93,-,zh.wikipedia.org,/zh-sg/Wikipedia:首页,-,200,text/html,Five-test plan Is Pageview – Desktop - Chinese zh-tw, true,false,174.62.175.94,-,zh.wikipedia.org,/zh-tw/Wikipedia:首页,-,200,text/html,Five-test plan +Is Pageview – Wikidata, true, true,174.62.175.94,-,www.wikidata.org,/wiki/Q5651758,-,200,text/html,Five-test plan Is Not Pageview - http_status != 200, false,true,174.62.175.95,-, en.wikipedia.org, /wiki/Nopppes,-,400,text/html ,turnip Is Not Pageview - content_type does not match, false,true,174.62.175.96,-, en.wikipedia.org, /wiki/Nopppes,-,200, image/png, turnip Is Not Pageview - API stupidity: it outputs a 200 status code and text/html as a MIME type on certain classes of error., false, false,174.62.175.97,-, en.wikipedia.org, /w/api.php,-,200, text/html, turnip Is Not Pageview – App request for non-page content, false, false,174.62.175.98,-, en.wikipedia.org, /w/api.php,?action=queryformat=jsontitles=Fooprop=pageimagespiprop=thumbnailpithumbsize=96pilimit=1 ,200, application/json, WikipediaApp/1.2.3 Is Not Pageview – Non-App request for page content, false, false,174.62.175.99,-, en.wikipedia.org, /w/api.php,?action=mobileviewsections=0,200, application/json, TributeApp/1.2.3 Is Not Pageview – edit attempt,false,true,174.62.175.82,-,en.wikipedia.org, /wiki/Horseshoe_crab,?action=edit,200,text/html, turnip +Is not pageview – non-wikidata raw domain,false, false,174.62.175.82,-,www.wikipedia.org,-,-,200,text/html, turnip -- To view, visit https://gerrit.wikimedia.org/r/193513 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d6a23d54a949dcacd850cc1e45c6cc1a019032d Gerrit-PatchSet: 3 Gerrit-Project: analytics/refinery/source Gerrit-Branch: master Gerrit-Owner: OliverKeyes
[MediaWiki-commits] [Gerrit] Update dependencies including packagist wm deps - change (wikimedia...crm)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193978
Change subject: Update dependencies including packagist wm deps
..
Update dependencies including packagist wm deps
Also updating recurring_globalcollect.module to use new adapter
function addRequestData instead of old addData.
Change-Id: I27a90343b6fc878b437df4c88841ab5532bfba9f
---
M composer.json
M composer.lock
M sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
M vendor
4 files changed, 91 insertions(+), 59 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/78/193978/1
diff --git a/composer.json b/composer.json
index 6a4f0f6..f803580 100644
--- a/composer.json
+++ b/composer.json
@@ -12,23 +12,13 @@
],
license: GPL-2.0,
type: project,
-repositories: [
-{
-type: vcs,
-url:
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/DonationInterface.git;
-},
-{
-type: vcs,
-url:
https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/SmashPig.git;
-}
-],
support: {
irc: irc://irc.freenode.org/wikimedia-fundraising
},
require: {
cogpowered/finediff: 0.*,
-wikimedia/DonationInterface: dev-drupal,
-wikimedia/SmashPig: dev-master,
+wikimedia/donation-interface: dev-master,
+wikimedia/smash-pig: dev-master,
fusesource/stomp-php: 2.*,
phpmailer/phpmailer: 5.2.6,
phpseclib/phpseclib: 0.3.7,
diff --git a/composer.lock b/composer.lock
index 8abfb36..bc68c53 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
This file is @generated automatically
],
-hash: 118d4f47ff407c79a3a6d54fe95442cd,
+hash: 9871c3a8b44fbca95bd7eb8937cd980d,
packages: [
{
name: cogpowered/finediff,
@@ -105,6 +105,48 @@
stomp
],
time: 2013-02-23 17:34:44
+},
+{
+name: minfraud/http,
+version: v1.60,
+source: {
+type: git,
+url: https://github.com/maxmind/ccfd-api-php.git;,
+reference: 553ceffe363185e20e17045d5058aba2154a6faf
+},
+dist: {
+type: zip,
+url:
https://api.github.com/repos/maxmind/ccfd-api-php/zipball/553ceffe363185e20e17045d5058aba2154a6faf;,
+reference: 553ceffe363185e20e17045d5058aba2154a6faf,
+shasum:
+},
+type: library,
+autoload: {
+files: [
+src/HTTPBase.php,
+src/CreditCardFraudDetection.php,
+src/TelephoneVerification.php
+]
+},
+notification-url: https://packagist.org/downloads/;,
+license: [
+LGPL-2.1+
+],
+authors: [
+{
+name: MaxMind, Inc.,
+email: supp...@maxmind.com,
+homepage: http://www.maxmind.com/;
+}
+],
+description: MaxMind minFraud HTTP API,
+homepage: https://github.com/maxmind/ccfd-api-php;,
+keywords: [
+fraud,
+maxmind,
+minfraud
+],
+time: 2014-07-23 16:34:20
},
{
name: phpmailer/phpmailer,
@@ -261,24 +303,24 @@
},
{
name: symfony/event-dispatcher,
-version: v2.3.23,
+version: v2.3.25,
target-dir: Symfony/Component/EventDispatcher,
source: {
type: git,
url: https://github.com/symfony/EventDispatcher.git;,
-reference: 36a40695d94e948d7a85347db0b12ba446c400fa
+reference: 49d3432269d092b8d325b58615815fdbe93f49cb
},
dist: {
type: zip,
-url:
https://api.github.com/repos/symfony/EventDispatcher/zipball/36a40695d94e948d7a85347db0b12ba446c400fa;,
-reference: 36a40695d94e948d7a85347db0b12ba446c400fa,
+url:
https://api.github.com/repos/symfony/EventDispatcher/zipball/49d3432269d092b8d325b58615815fdbe93f49cb;,
+reference: 49d3432269d092b8d325b58615815fdbe93f49cb,
shasum:
},
require: {
php: =5.3.3
},
require-dev: {
-symfony/dependency-injection: ~2.0
+symfony/dependency-injection: ~2.0,=2.0.5
},
suggest: {
symfony/dependency-injection: ,
@@ -311,21 +353,21 @@
[MediaWiki-commits] [Gerrit] Update dependencies including packagist wm deps - change (wikimedia...vendor)
Ejegg has submitted this change and it was merged. Change subject: Update dependencies including packagist wm deps .. Update dependencies including packagist wm deps Deleted wikimedia/**/.git, wikimeida/**/.gitmodules, wikimedia/**/.gitreview. Till Composer makes it easier to check in vendor/, we'll just have to rm -rf vendor/wikimedia before each composer upgrade. Change-Id: I1a70d9a32ea304e92df9a73faaa7fd39c57d7487 --- D .gitmodules M autoload.php M composer/ClassLoader.php M composer/autoload_classmap.php M composer/autoload_files.php M composer/autoload_psr4.php M composer/autoload_real.php M composer/installed.json A minfraud/http/COPYING A minfraud/http/Changes A minfraud/http/README.md A minfraud/http/composer.json A minfraud/http/examples/minfraud.php A minfraud/http/examples/telephone-verification.php A minfraud/http/src/CreditCardFraudDetection.php A minfraud/http/src/HTTPBase.php A minfraud/http/src/TelephoneVerification.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/Event.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventDispatcher.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventSubscriberInterface.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/GenericEvent.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/LICENSE M symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php M symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json M symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist M symfony/http-foundation/Symfony/Component/HttpFoundation/AcceptHeader.php M symfony/http-foundation/Symfony/Component/HttpFoundation/BinaryFileResponse.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Cookie.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/Exception/FileException.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/Exception/FileNotFoundException.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/Exception/UploadException.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesser.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/ExtensionGuesserInterface.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesser.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeGuesserInterface.php M symfony/http-foundation/Symfony/Component/HttpFoundation/File/UploadedFile.php M symfony/http-foundation/Symfony/Component/HttpFoundation/IpUtils.php M symfony/http-foundation/Symfony/Component/HttpFoundation/LICENSE M symfony/http-foundation/Symfony/Component/HttpFoundation/Request.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Response.php M symfony/http-foundation/Symfony/Component/HttpFoundation/ResponseHeaderBag.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Flash/AutoExpireFlashBag.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/SessionBagInterface.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/SessionInterface.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php M symfony/http-foundation/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php M
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 6642e4f..bf51864 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 6642e4f..bf51864 .. Syncronize VisualEditor: 6642e4f..bf51864 Change-Id: I47959160231a32a93f4f829801b59fc0844d204c --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 6642e4f..bf51864 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 6642e4f0bcd23abca5e043ccdf76af975e749796 +Subproject commit bf5186469049f73aad35c3c1686aecbe47c2bd8d -- To view, visit https://gerrit.wikimedia.org/r/193955 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I47959160231a32a93f4f829801b59fc0844d204c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 6642e4f..bf51864 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/193955 Change subject: Syncronize VisualEditor: 6642e4f..bf51864 .. Syncronize VisualEditor: 6642e4f..bf51864 Change-Id: I47959160231a32a93f4f829801b59fc0844d204c --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/55/193955/1 diff --git a/VisualEditor b/VisualEditor index 6642e4f..bf51864 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 6642e4f0bcd23abca5e043ccdf76af975e749796 +Subproject commit bf5186469049f73aad35c3c1686aecbe47c2bd8d -- To view, visit https://gerrit.wikimedia.org/r/193955 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47959160231a32a93f4f829801b59fc0844d204c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove MediaWikiKit tests from xcscheme - change (apps...wikipedia)
Mhurd has submitted this change and it was merged. Change subject: remove MediaWikiKit tests from xcscheme .. remove MediaWikiKit tests from xcscheme Change-Id: I298a19e7bf47cebe59025e5cdd639f76bd178f58 --- M Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia.xcscheme 1 file changed, 1 insertion(+), 25 deletions(-) Approvals: Mhurd: Verified; Looks good to me, approved diff --git a/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia.xcscheme b/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia.xcscheme index a33c7a0..ba5ba7e 100644 --- a/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia.xcscheme +++ b/Wikipedia.xcodeproj/xcshareddata/xcschemes/Wikipedia.xcscheme @@ -14,7 +14,7 @@ buildForAnalyzing = YES BuildableReference BuildableIdentifier = primary - BlueprintIdentifier = D80BB003220739F3D195A038 + BlueprintIdentifier = 03A98BDF68FB2304C1A60393 BuildableName = libPods.a BlueprintName = Pods ReferencedContainer = container:Pods/Pods.xcodeproj @@ -56,20 +56,6 @@ buildForAnalyzing = NO BuildableReference BuildableIdentifier = primary - BlueprintIdentifier = D48405AC19E473E7006F4139 - BuildableName = MediaWikiKitTests.xctest - BlueprintName = MediaWikiKitTests - ReferencedContainer = container:MediaWikiKit/MediaWikiKit.xcodeproj -/BuildableReference - /BuildActionEntry - BuildActionEntry -buildForTesting = YES -buildForRunning = NO -buildForProfiling = NO -buildForArchiving = NO -buildForAnalyzing = NO -BuildableReference - BuildableIdentifier = primary BlueprintIdentifier = BC4273511A7C736800068882 BuildableName = WikipediaUnitTests.xctest BlueprintName = WikipediaUnitTests @@ -84,16 +70,6 @@ shouldUseLaunchSchemeArgsEnv = YES buildConfiguration = Debug Testables - TestableReference -skipped = NO -BuildableReference - BuildableIdentifier = primary - BlueprintIdentifier = D48405AC19E473E7006F4139 - BuildableName = MediaWikiKitTests.xctest - BlueprintName = MediaWikiKitTests - ReferencedContainer = container:MediaWikiKit/MediaWikiKit.xcodeproj -/BuildableReference - /TestableReference TestableReference skipped = NO BuildableReference -- To view, visit https://gerrit.wikimedia.org/r/193764 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I298a19e7bf47cebe59025e5cdd639f76bd178f58 Gerrit-PatchSet: 3 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Bgerstle bgers...@wikimedia.org Gerrit-Reviewer: Dr0ptp4kt ab...@wikimedia.org Gerrit-Reviewer: Fjalapeno cfl...@wikimedia.org Gerrit-Reviewer: Mhurd mh...@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] Clarified RequestContext doc comment - change (mediawiki/core)
BryanDavis has submitted this change and it was merged. Change subject: Clarified RequestContext doc comment .. Clarified RequestContext doc comment Change-Id: Ibb2a30634b192f4bc77e0b6b1afebc65b2ed3ec9 --- M includes/context/RequestContext.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php index 89ccd0b..89a0f3d 100644 --- a/includes/context/RequestContext.php +++ b/includes/context/RequestContext.php @@ -1,6 +1,6 @@ ?php /** - * Request-dependant objects containers. + * Container for request-dependant objects and site configuration * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -- To view, visit https://gerrit.wikimedia.org/r/193264 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb2a30634b192f4bc77e0b6b1afebc65b2ed3ec9 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add 'centralauth-uwbr-intro' override - change (mediawiki...WikimediaMessages)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193986
Change subject: Add 'centralauth-uwbr-intro' override
..
Add 'centralauth-uwbr-intro' override
Change-Id: I977bcb43bd84040c71b158c9201a59c15140a118
---
M WikimediaMessages.php
M i18n/wikimedia/en.json
M i18n/wikimedia/qqq.json
3 files changed, 3 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages
refs/changes/86/193986/1
diff --git a/WikimediaMessages.php b/WikimediaMessages.php
index 0ae7ea1..668e288 100644
--- a/WikimediaMessages.php
+++ b/WikimediaMessages.php
@@ -131,6 +131,7 @@
'sidebar',
'sulrenamewarning-usenew',
'centralauth-contribs-locked',
+ 'centralauth-uwbr-intro',
);
if ( in_array( $lcKey, $keys, true ) ) {
diff --git a/i18n/wikimedia/en.json b/i18n/wikimedia/en.json
index 5ff5fef..c2fbec4 100644
--- a/i18n/wikimedia/en.json
+++ b/i18n/wikimedia/en.json
@@ -236,6 +236,7 @@
wikimedia-globalrenamequeue-email-body-rejected: The request to
rename \$1\ to \$2\ could not be completed.\n\nFor more information, please
visit this help page:
https://meta.wikimedia.org/wiki/Help:Unified_login#Frequently_asked_questions.
To discuss your rename request, you can post on this page:
https://meta.wikimedia.org/wiki/Talk:Steward_requests/Username_changes. You
must still log in to your current account name first.,
wikimedia-sulrenamewarning-usenew: From now on you need to log in
using your new username strong$1/strong. Your new username is unique to you
across every Wikimedia project, and if you are logged in to one project and
visit another, your account will carry over with you. The
[[:m:Special:MyLanguage/Help:Unified_login|Unified login help page]] has more
information about single-user login, as well as a list of frequently asked
questions. If you need to update your email address or to change your password
in your [[Special:Preferences|preferences]], now might be a good time to do
so.\n\nThank you for participating on Wikimedia projects.,
wikimedia-centralauth-contribs-locked: This account is globally
locked.\nSee [[m:Special:CentralAuth/$1|global account details]] for more
information.,
+ wikimedia-centralauth-uwbr-intro: This page lists users registered
with this wiki who will be renamed due to [[m:Single User Login finalisation
announcement|single-user login finalization]]. More information on
[[m:Help:Unified login|unified login]]. Users can request a rename at any time
using [[Special:GlobalRenameRequest]].,
right-viewdeletedfile: View files and pages in the {{ns:file}} and
{{ns:file_talk}} namespaces that are deleted,
securepoll-dblist-securepollglobal: Board Election
}
diff --git a/i18n/wikimedia/qqq.json b/i18n/wikimedia/qqq.json
index 66d6524..fe0f07e 100644
--- a/i18n/wikimedia/qqq.json
+++ b/i18n/wikimedia/qqq.json
@@ -261,6 +261,7 @@
wikimedia-globalrenamequeue-email-body-rejected: Email body for
rejected request.\n\n* $1 is the old username.\n* $2 is the new username.\n* $3
is the message left by the user who processed the request.,
wikimedia-sulrenamewarning-usenew: Instructions to user to login
with new name in the future\n\n* $1 is the user's new name,
wikimedia-centralauth-contribs-locked: This is displayed on
[[Special:Contributions]] for locked accounts when we cannot display the log
entry. Parameters:\n* $1 - the username,
+ wikimedia-centralauth-uwbr-intro: Introduction text displayed above
[[Special:UsersWhoWillBeRenamed]],
right-viewdeletedfile: {{doc-right|viewdeletedfile}}\nRight
equivalent to having both {{msg-mw|right-deletedhistory}} and
{{msg-mw|right-deletedtext}}, but only in the file and file_talk namespaces.,
securepoll-dblist-securepollglobal: Name used in the dropdown on
[[Special:SecurePoll/create]] for the list of wikis allowed to vote for Board
elections
}
--
To view, visit https://gerrit.wikimedia.org/r/193986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I977bcb43bd84040c71b158c9201a59c15140a118
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (wikimedia...crm)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/193991 Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 743f441 Upgrade 'services' and 'ctools' drupal modules Change-Id: I93b3cb0218ff6525a87dc98ef184b037cc1577a5 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/91/193991/1 -- To view, visit https://gerrit.wikimedia.org/r/193991 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I93b3cb0218ff6525a87dc98ef184b037cc1577a5 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg eeggles...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync up with Parsoid parserTests. - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync up with Parsoid parserTests.
..
Sync up with Parsoid parserTests.
This now aligns with Parsoid commit 7608aeabdc1e47ce3dbfffd3ded85eecad647260
Change-Id: I4cb8f04b9d7988e5138c8f040fadeb0b7a9348f9
---
M tests/parser/parserTests.txt
1 file changed, 158 insertions(+), 107 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
Cscott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index dec9338..32c7a39 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -6238,6 +6238,27 @@
|}
!! end
+!!test
+Testing serialization after deletion of table cells
+!!options
+parsoid={
+ modes: [wt2wt],
+ changes: [
+[#x, remove]
+ ]
+}
+!!wikitext
+{|
+!h1 !!h2 !!h3
+| id=x |c1 {{!}}{{!}}{{!}}c2 |||c3
+|}
+!! wikitext/edited
+{|
+!h1 !!h2 !!h3
+|c2 |||c3
+|}
+!!end
+
###
### Internal links
###
@@ -19732,13 +19753,13 @@
C ref name=y /
references /
!! html
-pA span about=#mwt2 class=reference id=cite_ref-1 rel=dc:references
typeof=mw:Extension/ref
data-mw='{name:ref,body:{html:foo},attrs:{}}'a
href=#cite_note-1[1]/a/span
-B span about=#mwt4 class=reference id=cite_ref-x_2-0
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,body:{html:foo},attrs:{name:x}}'a
href=#cite_note-x-2[2]/a/span
+pA span about=#mwt2 class=reference id=cite_ref-1 rel=dc:references
typeof=mw:Extension/ref
data-mw='{name:ref,body:{id:mw-reference-text-cite_note-1},attrs:{}}'a
href=#cite_note-1[1]/a/span
+B span about=#mwt4 class=reference id=cite_ref-x_2-0
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,body:{id:mw-reference-text-cite_note-x-2},attrs:{name:x}}'a
href=#cite_note-x-2[2]/a/span
C span about=#mwt6 class=reference id=cite_ref-y_3-0
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,attrs:{name:y}}'a
href=#cite_note-y-3[3]/a/span/p
-ol class=references typeof=mw:Extension/references
data-mw='{name:references,attrs:{}}'
-li id=cite_note-1span rel=mw:referencedBya
href=#cite_ref-1↑/a/span foo/li
-li id=cite_note-x-2span rel=mw:referencedBya
href=#cite_ref-x_2-0↑/a/span foo/li
-li id=cite_note-y-3span rel=mw:referencedBya
href=#cite_ref-y_3-0↑/a/span/li
+ol class=references typeof=mw:Extension/references about=#mwt8
data-mw='{name:references,attrs:{}}'
+li about=#cite_note-1 id=cite_note-1span rel=mw:referencedBya
href=#cite_ref-1↑/a/span span id=mw-reference-text-cite_note-1
class=mw-reference-textfoo/span/li
+li about=#cite_note-x-2 id=cite_note-x-2span rel=mw:referencedBya
href=#cite_ref-x_2-0↑/a/span span id=mw-reference-text-cite_note-x-2
class=mw-reference-textfoo/span/li
+li about=#cite_note-y-3 id=cite_note-y-3span rel=mw:referencedBya
href=#cite_ref-y_3-0↑/a/span span id=mw-reference-text-cite_note-y-3
class=mw-reference-text/span/li
/ol
!!end
@@ -19751,10 +19772,10 @@
B ref name=x /
references /
!! html
-pA span about=#mwt2 class=reference id=cite_ref-x_1-0
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,body:{html:foo},attrs:{name:x}}'a
href=#cite_note-x-1[1]/a/span
+pA span about=#mwt2 class=reference id=cite_ref-x_1-0
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,body:{id:mw-reference-text-cite_note-x-1},attrs:{name:x}}'a
href=#cite_note-x-1[1]/a/span
B span about=#mwt4 class=reference id=cite_ref-x_1-1
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,attrs:{name:x}}'a
href=#cite_note-x-1[1]/a/span/p
-ol class=references typeof=mw:Extension/references
data-mw='{name:references,attrs:{}}'
-li id=cite_note-x-1span rel=mw:referencedBy↑ a
href=#cite_ref-x_1-01.0/a a href=#cite_ref-x_1-11.1/a/span foo/li
+ol class=references typeof=mw:Extension/references about=#mwt6
data-mw='{name:references,attrs:{}}'
+li about=#cite_note-x-1 id=cite_note-x-1span rel=mw:referencedBy↑ a
href=#cite_ref-x_1-01.0/a a href=#cite_ref-x_1-11.1/a/span span
id=mw-reference-text-cite_note-x-1 class=mw-reference-textfoo/span/li
/ol
!!end
@@ -19768,11 +19789,11 @@
C ref name= x /
references /
!! html
-pA span about=#mwt2 class=reference id=cite_ref-x_1-0
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,body:{html:foo},attrs:{name:x}}'a
href=#cite_note-x-1[1]/a/span
+pA span about=#mwt2 class=reference id=cite_ref-x_1-0
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,body:{id:mw-reference-text-cite_note-x-1},attrs:{name:x}}'a
href=#cite_note-x-1[1]/a/span
B span about=#mwt4 class=reference id=cite_ref-x_1-1
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,attrs:{name:x}}'a
href=#cite_note-x-1[1]/a/span
C span about=#mwt6 class=reference id=cite_ref-x_1-2
rel=dc:references typeof=mw:Extension/ref
data-mw='{name:ref,attrs:{name:x}}'a
href=#cite_note-x-1[1]/a/span/p
-ol class=references
[MediaWiki-commits] [Gerrit] ProgressBar: Add description and example - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: ProgressBar: Add description and example
..
ProgressBar: Add description and example
Change-Id: Icf9596d9076ff49e8a16375b971d2b25a15def30
---
M src/widgets/ProgressBarWidget.js
1 file changed, 34 insertions(+), 6 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/widgets/ProgressBarWidget.js b/src/widgets/ProgressBarWidget.js
index 2a208aa..1755437 100644
--- a/src/widgets/ProgressBarWidget.js
+++ b/src/widgets/ProgressBarWidget.js
@@ -1,12 +1,40 @@
/**
- * Progress bar widget.
+ * Progress bars visually display the status of an operation, such as a
download,
+ * and can be either determinate or indeterminate:
+ *
+ * - **determinate** process bars show the percent of an operation that is
complete.
+ *
+ * - **indeterminate** process bars use a visual display of motion to indicate
that an operation
+ * is taking place. Because the extent of an indeterminate operation is
unknown, the bar does
+ * not use percentages.
+ *
+ * The value of the `progress` configuration determines whether the bar is
determinate or indeterminate.
+ *
+ * @example
+ * // Examples of determinate and indeterminate progress bars.
+ * var progressBar1=new OO.ui.ProgressBarWidget( {
+ * progress: 33
+ * } );
+ *
+ * var progressBar2=new OO.ui.ProgressBarWidget( {
+ * progress: false
+ * } );
+ * // Create a FieldsetLayout to layout progress bars
+ * var fieldset = new OO.ui.FieldsetLayout;
+ * fieldset.addItems( [
+ *new OO.ui.FieldLayout( progressBar1, {label : 'Determinate', align :
'top'}),
+ *new OO.ui.FieldLayout( progressBar2, {label : 'Indeterminate', align
: 'top'})
+ * ] );
+ * $( 'body' ).append( fieldset.$element );
*
* @class
* @extends OO.ui.Widget
*
* @constructor
* @param {Object} [config] Configuration options
- * @cfg {number|boolean} [progress=false] Initial progress percent or false
for indeterminate
+ * @cfg {number|boolean} [progress=false] The type of progress bar
(determinate or indeterminate).
+ * To create a determinate progress bar, specify a number that reflects the
initial percent complete.
+ * By default, the progress bar is indeterminate.
*/
OO.ui.ProgressBarWidget = function OoUiProgressBarWidget( config ) {
// Configuration initialization
@@ -43,18 +71,18 @@
/* Methods */
/**
- * Get progress percent
+ * Get the percent of the progress that has been completed. Indeterminate
progresses will return `false`.
*
- * @return {number} Progress percent
+ * @return {number|boolean} Progress percent
*/
OO.ui.ProgressBarWidget.prototype.getProgress = function () {
return this.progress;
};
/**
- * Set progress percent
+ * Set the percent of the process completed or `false` for an indeterminate
process.
*
- * @param {number|boolean} progress Progress percent or false for indeterminate
+ * @param {number|boolean} progress Progress percent or `false` for
indeterminate
*/
OO.ui.ProgressBarWidget.prototype.setProgress = function ( progress ) {
this.progress = progress;
--
To view, visit https://gerrit.wikimedia.org/r/193869
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf9596d9076ff49e8a16375b971d2b25a15def30
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Kmenger kmen...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add extension.json - change (mediawiki...BetaFeatures)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194014
Change subject: Add extension.json
..
Add extension.json
$wgBetaFeatures should probably become an attribute (or just removed outright,
I see no uses of it...) but that can be done in a follow up.
Bug: T87884
Change-Id: Iec1be9b150ec426a1a4f0a544a1b089b1419c0cf
---
A extension.json
1 file changed, 110 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BetaFeatures
refs/changes/14/194014/1
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..b6b4560
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,110 @@
+{
+ name: BetaFeatures,
+ version: 0.1,
+ author: [
+ MarkTraceur (Mark Holmquist)
+ ],
+ url: https://www.mediawiki.org/wiki/Extension:BetaFeatures;,
+ descriptionmsg: betafeatures-desc,
+ license-name: GPL-2.0+,
+ type: other,
+ config: {
+ BetaFeaturesWhitelist: null,
+ BetaFeatures: []
+ },
+ ExtensionMessagesFiles: {
+ BetaFeaturesAlias: BetaFeatures.alias.php
+ },
+ APIListModules: {
+ betafeatures: ApiQueryBetaFeatures
+ },
+ Hooks: {
+ UserSaveOptions: [
+ BetaFeaturesHooks::updateUserCounts
+ ],
+ GetPreferences: [
+ BetaFeaturesHooks::getPreferences
+ ],
+ PersonalUrls: [
+ BetaFeaturesHooks::getBetaFeaturesLink
+ ],
+ UnitTestsList: [
+ BetaFeaturesHooks::getUnitTestsList
+ ],
+ LoadExtensionSchemaUpdates: [
+ BetaFeaturesHooks::getSchemaUpdates
+ ],
+ MakeGlobalVariablesScript: [
+ BetaFeaturesHooks::onMakeGlobalVariablesScript
+ ],
+ ExtensionTypes: [
+ BetaFeaturesHooks::onExtensionTypes
+ ]
+ },
+ MessagesDirs: {
+ BetaFeatures: [
+ i18n
+ ]
+ },
+ ResourceModules: {
+ ext.betaFeatures: {
+ scripts: [
+ betafeatures.js
+ ],
+ styles: [
+ betafeatures.less
+ ],
+ dependencies: [
+ jquery.client
+ ],
+ targets: [
+ mobile,
+ desktop
+ ]
+ },
+ ext.betaFeatures.styles: {
+ styles: [
+ betafeatures.nojs.less
+ ],
+ targets: [
+ mobile,
+ desktop
+ ],
+ position: top
+ },
+ ext.betaFeatures.popup: {
+ scripts: [
+ ext.betaFeatures.popup.js
+ ],
+ dependencies: [
+ jquery.tipsy
+ ],
+ messages: [
+ betafeatures-tooltip
+ ]
+ }
+ },
+ ResourceFileModulePaths: {
+ localBasePath: resources,
+ remoteExtPath: BetaFeatures/resources
+ },
+ JobClasses: {
+ updateBetaFeaturesUserCounts: UpdateBetaFeatureUserCountsJob
+ },
+ SpecialPages: {
+ BetaFeatures: SpecialBetaFeatures
+ },
+ AutoloadClasses: {
+ BetaFeaturesHooks: BetaFeaturesHooks.php,
+ BetaFeaturesMissingFieldException: BetaFeaturesHooks.php,
+ NewHTMLCheckField: includes/NewHTMLCheckField.php,
+ HTMLFeatureField: includes/HTMLFeatureField.php,
+ HTMLTextBlockField: includes/HTMLTextBlockField.php,
+ HTMLHorizontalRuleField:
includes/HTMLHorizontalRuleField.php,
+ BetaFeatures: includes/BetaFeaturesUtil.php,
+ UpdateBetaFeatureUserCountsJob:
includes/UpdateBetaFeatureUserCountsJob.php,
+ ApiQueryBetaFeatures: includes/ApiListBetaFeatures.php,
+ SpecialBetaFeatures: includes/SpecialBetaFeatures.php,
+ BetaFeaturesTestCase: tests/BetaFeaturesTestCase.php
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/194014
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec1be9b150ec426a1a4f0a544a1b089b1419c0cf
[MediaWiki-commits] [Gerrit] Add extension.json - change (mediawiki...DisableAccount)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194033
Change subject: Add extension.json
..
Add extension.json
Bug: T88048
Change-Id: I9fa3f87f3e099440f8e680fcc95895a220d67353
---
M DisableAccount.php
A extension.json
2 files changed, 35 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DisableAccount
refs/changes/33/194033/1
diff --git a/DisableAccount.php b/DisableAccount.php
index 613b563..7ba0e05 100644
--- a/DisableAccount.php
+++ b/DisableAccount.php
@@ -2,6 +2,11 @@
// DisableAccount extension: quick extension to disable an account.
// Written by Andrew Garrett, 2010-12-02
+/**
+ * This PHP entry point is deprecated. Please use wfLoadExtension() and the
extension.json file instead.
+ * See https://www.mediawiki.org/wiki/Manual:Extension_registration for more
details.
+ */
+
$wgExtensionCredits['other'][] = array(
'path' = __FILE__,
'name' = 'Disable Account',
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..b1f15f1
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,30 @@
+{
+ name: Disable Account,
+ author: [
+ Andrew Garrett
+ ],
+ url: https://www.mediawiki.org/wiki/Extension:DisableAccount;,
+ descriptionmsg: disableaccount-desc,
+ type: other,
+ ExtensionMessagesFiles: {
+ DisableAccountAliases: DisableAccount.alias.php
+ },
+ MessagesDirs: {
+ DisableAccount: [
+ i18n
+ ]
+ },
+ LogActionsHandlers: {
+ block/disableaccount: DisableAccountLogFormatter
+ },
+ AvailableRights: [
+ disableaccount
+ ],
+ SpecialPages: {
+ DisableAccount: SpecialDisableAccount
+ },
+ AutoloadClasses: {
+ SpecialDisableAccount: DisableAccount_body.php,
+ DisableAccountLogFormatter: DisableAccountLogFormatter.php
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/194033
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fa3f87f3e099440f8e680fcc95895a220d67353
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DisableAccount
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move DisableAccountLogFormatter to separate file - change (mediawiki...DisableAccount)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194032
Change subject: Move DisableAccountLogFormatter to separate file
..
Move DisableAccountLogFormatter to separate file
Change-Id: I7e8a475588a6d137efc270d034f48b2088c61842
---
M DisableAccount.php
A DisableAccountLogFormatter.php
2 files changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DisableAccount
refs/changes/32/194032/1
diff --git a/DisableAccount.php b/DisableAccount.php
index 4ff4fb0..613b563 100644
--- a/DisableAccount.php
+++ b/DisableAccount.php
@@ -10,14 +10,13 @@
'descriptionmsg' = 'disableaccount-desc',
);
-$dir = __DIR__ . '/';
-
$wgMessagesDirs['DisableAccount'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['DisableAccount'] = $dir . 'DisableAccount.i18n.php';
-$wgExtensionMessagesFiles['DisableAccountAliases'] = $dir .
'DisableAccount.alias.php';
+$wgExtensionMessagesFiles['DisableAccount'] = __DIR__ .
'/DisableAccount.i18n.php';
+$wgExtensionMessagesFiles['DisableAccountAliases'] = __DIR__ .
'/DisableAccount.alias.php';
// Special page classes
-$wgAutoloadClasses['SpecialDisableAccount'] = $dir . 'DisableAccount_body.php';
+$wgAutoloadClasses['SpecialDisableAccount'] = __DIR__ .
'/DisableAccount_body.php';
+$wgAutoloadClasses['DisableAccountLogFormatter'] = __DIR__ .
'/DisableAccountLogFormatter.php';
$wgSpecialPages['DisableAccount'] = 'SpecialDisableAccount';
// Add permission required to use Special:DisableAccount
@@ -25,14 +24,3 @@
// Log
$wgLogActionsHandlers['block/disableaccount'] = 'DisableAccountLogFormatter';
-
-class DisableAccountLogFormatter extends LogFormatter {
- protected function getMessageParameters() {
- $params = parent::getMessageParameters();
- if ( count( $params ) == 3 ) {
- // Deal with old log entries which don't have this set
(needed for GENDER support)
- $params[3] = $this-entry-getTarget()-getRootText();
- }
- return $params;
- }
-}
diff --git a/DisableAccountLogFormatter.php b/DisableAccountLogFormatter.php
new file mode 100644
index 000..3072bbc
--- /dev/null
+++ b/DisableAccountLogFormatter.php
@@ -0,0 +1,12 @@
+?php
+
+class DisableAccountLogFormatter extends LogFormatter {
+ protected function getMessageParameters() {
+ $params = parent::getMessageParameters();
+ if ( count( $params ) == 3 ) {
+ // Deal with old log entries which don't have this set
(needed for GENDER support)
+ $params[3] = $this-entry-getTarget()-getRootText();
+ }
+ return $params;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/194032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e8a475588a6d137efc270d034f48b2088c61842
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DisableAccount
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mw-install-sqlite: Expose tmpfs dir as TMPDIR - change (integration/jenkins)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194038
Change subject: mw-install-sqlite: Expose tmpfs dir as TMPDIR
..
mw-install-sqlite: Expose tmpfs dir as TMPDIR
Bug: T70563
Bug: T91070
Change-Id: Ife1585ed2f737234bdb7f6383b395971e45870cd
---
M bin/mw-install-sqlite.sh
M bin/mw-set-env.sh
M bin/mw-teardown.sh
3 files changed, 14 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/38/194038/1
diff --git a/bin/mw-install-sqlite.sh b/bin/mw-install-sqlite.sh
index 136970a..b6dc4ee 100755
--- a/bin/mw-install-sqlite.sh
+++ b/bin/mw-install-sqlite.sh
@@ -2,7 +2,7 @@
. /srv/deployment/integration/slave-scripts/bin/mw-set-env.sh
-mkdir -p $MW_DB_PATH
+mkdir -p $MW_TMPDIR
# Ensure LocalSettings does not exist
rm -f $MW_INSTALL_PATH/LocalSettings.php
@@ -12,15 +12,15 @@
php maintenance/install.php \
--confpath ${MW_INSTALL_PATH} \
--dbtype=sqlite \
- --dbname=$MW_DB_NAME \
- --dbpath=$MW_DB_PATH \
+ --dbname=my_wiki \
+ --dbpath=$MW_TMPDIR \
--pass testpass \
sqlitetest \
WikiAdmin
# Installer creates files as 644 jenkins:jenkins
# Make the parent dir and files writable by Apache (bug 47639)
-# - $MW_DB_NAME.sqlite
+# - my_wiki.sqlite
# - wikicache.sqlite, wikicache.sqlite-shm, wikicache.sqlite-wal (since
I864272af0)
-chmod 777 $MW_DB_PATH
-chmod 777 $MW_DB_PATH/*
+chmod 777 $MW_TMPDIR
+chmod 777 $MW_TMPDIR/*
diff --git a/bin/mw-set-env.sh b/bin/mw-set-env.sh
index 376e414..b1f651a 100755
--- a/bin/mw-set-env.sh
+++ b/bin/mw-set-env.sh
@@ -15,19 +15,16 @@
done;
export MW_INSTALL_PATH
-# We sometime have a tmpfs to use, that speeds up sqlite
+# All slaves should have tmpfs mounted, use if available
if [ -d $HOME/tmpfs ]; then
- # We can not use JOB_NAME has a job identifier since when running in
- # parallel we will have a race condition. Instead use the trailing part
of
- # the WORKSPACE which would be 'foo', 'foo@1', 'foo@2'
+ # Don't use JOB_NAME since that is not unique when running concurrent
builds (T91070).
+ # Instead use the trailing part of $WORKSPACE which will be 'foo',
'foo@2'.
# Trailing slash is important there.
- MW_DB_PATH=$HOME/tmpfs/`basename $WORKSPACE`
+ export TMPDIR=$HOME/tmpfs/`basename $WORKSPACE`
+ export MW_TMPDIR=$TMPDIR
else
- MW_DB_PATH=$WORKSPACE/data
+ export MW_TMPDIR=$WORKSPACE/data
fi
-export MW_DB_PATH
-
-export MW_DB_NAME=build${BUILD_NUMBER}
export LOG_DIR=$WORKSPACE/log
diff --git a/bin/mw-teardown.sh b/bin/mw-teardown.sh
index 86ca892..ced559d 100755
--- a/bin/mw-teardown.sh
+++ b/bin/mw-teardown.sh
@@ -2,5 +2,5 @@
. /srv/deployment/integration/slave-scripts/bin/mw-set-env.sh
-# Teardown tmp db dir created via mw-set-env.sh / mw-install-sqlite.sh
-rm -rf ${MW_DB_PATH}
+# Teardown tmp dbs created via mw-set-env.sh / mw-install-sqlite.sh
+rm -rf $MW_TMPDIR
--
To view, visit https://gerrit.wikimedia.org/r/194038
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife1585ed2f737234bdb7f6383b395971e45870cd
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (wikimedia...crm)
Ejegg has submitted this change and it was merged. Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 743f441 Upgrade 'services' and 'ctools' drupal modules Change-Id: I93b3cb0218ff6525a87dc98ef184b037cc1577a5 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Ejegg: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/193991 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93b3cb0218ff6525a87dc98ef184b037cc1577a5 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 58a6853..4b840ab - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 58a6853..4b840ab .. Syncronize VisualEditor: 58a6853..4b840ab Change-Id: I61dfcc6f4820d1d8d4943ca8ec3fc01f9f03edeb --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 58a6853..4b840ab 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 58a685386bb465f5a7ac6478b6794e7f3c8f7ef3 +Subproject commit 4b840ab725139b1ff19a573995f3804a2b5d5a3d -- To view, visit https://gerrit.wikimedia.org/r/193993 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I61dfcc6f4820d1d8d4943ca8ec3fc01f9f03edeb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update certain Global North/South values - change (wikimedia/wikimania-scholarships)
jenkins-bot has submitted this change and it was merged.
Change subject: Update certain Global North/South values
..
Update certain Global North/South values
Change-Id: Iedef271e68e490974f3ff9d0d5f39386c885e579
---
A data/db/migrations/20150302-01-update-globalns.sql
M data/db/schema.mysql
2 files changed, 10 insertions(+), 7 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/data/db/migrations/20150302-01-update-globalns.sql
b/data/db/migrations/20150302-01-update-globalns.sql
new file mode 100644
index 000..19310b0
--- /dev/null
+++ b/data/db/migrations/20150302-01-update-globalns.sql
@@ -0,0 +1,3 @@
+UPDATE iso_countries
+ SET globalns = 'Global South'
+ WHERE code in ( 'BA', 'BG', 'HR', 'MK', 'ME', 'MD', 'RS' );
\ No newline at end of file
diff --git a/data/db/schema.mysql b/data/db/schema.mysql
index ebbf2bb..98fbc36 100644
--- a/data/db/schema.mysql
+++ b/data/db/schema.mysql
@@ -112,12 +112,12 @@
,('AW','Aruba','South/Latin America','Global South')
,('AX','Aland Islands','Europe','Global North')
,('AZ','Azerbaijan','CIS','Global South')
-,('BA','Bosnia and Herzegovina','Europe','Global North')
+,('BA','Bosnia and Herzegovina','Europe','Global South')
,('BB','Barbados','South/Latin America','Global South')
,('BD','Bangladesh','Asia Pacific','Global South')
,('BE','Belgium','Europe','Global North')
,('BF','Burkina Faso','Africa','Global South')
-,('BG','Bulgaria','Europe','Global North')
+,('BG','Bulgaria','Europe','Global South')
,('BH','Bahrain','Arab States','Global South')
,('BI','Burundi','Africa','Global South')
,('BJ','Benin','Africa','Global South')
@@ -193,7 +193,7 @@
,('HK','Hong Kong','Asia Pacific','Global North')
,('HM','Heard Island and McDonald Islands','Asia Pacific','Global South')
,('HN','Honduras','South/Latin America','Global South')
-,('HR','Croatia','Europe','Global North')
+,('HR','Croatia','Europe','Global South')
,('HT','Haiti','South/Latin America','Global South')
,('HU','Hungary','Europe','Global North')
,('ID','Indonesia','Asia Pacific','Global South')
@@ -234,12 +234,12 @@
,('LY','Libya','Arab States','Global South')
,('MA','Morocco','Arab States','Global South')
,('MC','Monaco','Europe','Global North')
-,('MD','Republic of Moldova','Europe','Global North')
-,('ME','Montenegro','Europe','Global North')
+,('MD','Republic of Moldova','Europe','Global South')
+,('ME','Montenegro','Europe','Global South')
,('MF','Saint Martin','South/Latin America','Global South')
,('MG','Madagascar','Africa','Global South')
,('MH','Marshall Islands','Asia Pacific','Global South')
-,('MK','Macedonia','Europe','Global North')
+,('MK','Macedonia','Europe','Global South')
,('ML','Mali','Africa','Global South')
,('MM','Myanmar','Asia Pacific','Global South')
,('MN','Mongolia','Asia Pacific','Global South')
@@ -285,7 +285,7 @@
,('QA','Qatar','Arab States','Global South')
,('RE','Reunion','Asia Pacific','Global South')
,('RO','Romania','Europe','Global North')
-,('RS','Serbia','Europe','Global North')
+,('RS','Serbia','Europe','Global South')
,('RU','Russian Federation','Europe','Global North')
,('RW','Rwanda','Africa','Global South')
,('SA','Saudi Arabia','Arab States','Global South')
--
To view, visit https://gerrit.wikimedia.org/r/193853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iedef271e68e490974f3ff9d0d5f39386c885e579
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Niharika29 niharikakohl...@gmail.com
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Promote the Language tool Beta Feature to always-on status - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Promote the Language tool Beta Feature to always-on status .. Promote the Language tool Beta Feature to always-on status No complaints in over nine months. Time to just make this available. Change-Id: I601699573c0d50384720e5a1f0098c7f780de8cf --- M VisualEditor.hooks.php M VisualEditor.php D betafeatures-icon-VisualEditor-language-ltr.svg D betafeatures-icon-VisualEditor-language-rtl.svg M extension.json M modules/ve-mw/i18n/en.json M modules/ve-mw/i18n/qqq.json M modules/ve-mw/init/ve.init.mw.Target.js 8 files changed, 3 insertions(+), 161 deletions(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php index 13c09ab..b4725da 100644 --- a/VisualEditor.hooks.php +++ b/VisualEditor.hooks.php @@ -346,23 +346,6 @@ ) ); - $preferences['visualeditor-enable-language'] = array( - 'version' = '1.0', - 'label-message' = 'visualeditor-preference-language-label', - 'desc-message' = 'visualeditor-preference-language-description', - 'screenshot' = array( - 'ltr' = $iconpath/betafeatures-icon-VisualEditor-language-ltr.svg, - 'rtl' = $iconpath/betafeatures-icon-VisualEditor-language-rtl.svg, - ), - 'info-message' = 'visualeditor-preference-language-info-link', - 'discussion-message' = 'visualeditor-preference-language-discussion-link', - 'requirements' = array( - 'betafeatures' = array( - 'visualeditor-enable', - ), - ), - ); - /* Disabling Beta Features option for generic content for now $preferences['visualeditor-enable-mwalienextension'] = array( 'version' = '1.0', diff --git a/VisualEditor.php b/VisualEditor.php index a2d5fb3..d021c33 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -1533,7 +1533,6 @@ // Remember to also set defaults in $wgDefaultUserOptions! $wgVisualEditorPreferenceModules = array( 'visualeditor-enable-experimental' = 'ext.visualEditor.experimental', - 'visualeditor-enable-language' = 'ext.visualEditor.language', //'visualeditor-enable-mwalienextension' = 'ext.visualEditor.mwalienextension', ); diff --git a/betafeatures-icon-VisualEditor-language-ltr.svg b/betafeatures-icon-VisualEditor-language-ltr.svg deleted file mode 100644 index 1ad2e5f..000 --- a/betafeatures-icon-VisualEditor-language-ltr.svg +++ /dev/null @@ -1,66 +0,0 @@ -?xml version=1.0 encoding=UTF-8 standalone=no? -svg xmlns=http://www.w3.org/2000/svg; width=264 height=162 viewBox=0 0 264 162 -g id=g3120-2 -path id=polygon3122-9 fill=#fff d=M.5 151.749v-151.249h263v151.749l-9 6.705v-116.454h-39v112.6l-4.393-3.731-7.607 5.33v-114.199h-155v110.85l-9.751 8.03-13.916-10.019-11.467 9.996z/ -g id=g3124-5 -path d=M263 1v150.998l-8 5.96v-115.958h-40v112.02l-3.274-2.781-.589-.498-.633.441-6.504 4.556v-113.738h-156v111.1l-9.257 7.66-13.295-9.57-.645-.463-.598.521-10.864 9.47-12.341-9.219v-150.499h262m1-1h-264v152l13.391 10 11.474-10 13.891 10 10.244-8.4v-110.6h154v114.66l8.078-5.66 4.922 4.18v-113.18h38v116.95l10-7.45v-152.5z id=path3126-5 fill=#e5e5e5/ -/g -/g -path d=M203 157.66v-114.66h-154v110.6l2.145-1.6 12.555 10 13.809-10 14.229 10 12.972-10 12.973 10 13.811-10 12.136 10 13.391-10 14.229 10 12.972-10 12.974 10 5.804-4.34z id=path3128-1 fill=#e5e5e5/ -path d=M11 36c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14 14-14-6.268-14-14z id=Ellipse-2 fill=#e5e5e5/ -path d=M254 159.95v-116.95h-38v113.18l7.551 5.82 13.811-10 13.891 10 2.747-2.05z id=path3131-8 fill=#e5e5e5/ -path d=M38 107v-35h-25v35h25z id=path3133-5 fill=#e5e5e5/ -path d=M232.51 5h26v6h-26v-6z id=path3135-8 fill=#e5e5e5/ -path id=rect3137-5 fill=#e5e5e5 d=M208.51 5h22v6h-22z/ -path d=M142 6v4h-92v-4h92m1-1h-94v6h94v-6z id=path3139-9 fill=#e5e5e5/ -path id=rect3141-9 fill=#e5e5e5 d=M184.51 5h22v6h-22z/ -path id=rect3143-3 fill=#e5e5e5 d=M161.51 5h13v6h-13z/ -path id=rect3145-7 fill=#e5e5e5 d=M176.51 5h6v6h-6z/ -path id=rect3147-6 fill=#e5e5e5 d=M153.51 5h6v6h-6z/ -path id=rect3149-5 fill=#e5e5e5 d=M9 5h32v6h-32z/ -path d=M2 14.5h260 id=path3151-9 fill=#e5e5e5 stroke=#e5e5e5/ -path id=rect3153-5 fill=#e5e5e5 d=M52 7h2v2h-2z/ -path d=M38 59v-5h-25v5h25z id=path3155-4 fill=#e5e5e5/ -g id=g3157-6 -path d=M202.957 157.619v-114.661h-154v110.601l2.145-1.6 12.556 10 13.809-10 14.229 10 12.972-10 12.973 10 13.811-10 12.136 10
[MediaWiki-commits] [Gerrit] puppetize dbtree config file to connect to tendril - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: puppetize dbtree config file to connect to tendril
..
puppetize dbtree config file to connect to tendril
dbtree needs a config file with the db user and password
to connect to tendril. so puppetize the config file as a template.
Noticed private repo already had class passwords::tendril with a
db_user and db_pass being used in mariadb module.
But on neon we use a different user, tendril_web (/srv/tendril/lib/config.php)
I took the user and password from there and added them to private
puppet repo as db_user_web / db_pass_web.
Bug:T90837
Change-Id: Id1e2309a24e3b9870a293ea59c66c6d9c8d799d5
---
M modules/noc/manifests/init.pp
A modules/noc/templates/dbtree.config.php.erb
2 files changed, 26 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/noc/manifests/init.pp b/modules/noc/manifests/init.pp
index 66cbbaf..90f66f6 100644
--- a/modules/noc/manifests/init.pp
+++ b/modules/noc/manifests/init.pp
@@ -14,11 +14,10 @@
include ::apache::mod::cgi
include ::apache::mod::ssl
-# Monitoring
-monitoring::service { 'http-noc':
-description = 'HTTP-noc',
-check_command =
'check_http_url!noc.wikimedia.org!http://noc.wikimedia.org'
-}
+# dbtree config
+include passwords::tendril
+$tendril_user_web = $passwords::tendril::db_user_web
+$tendril_pass_web = $passwords::tendril::db_pass_web
file { '/srv/mediawiki/docroot/noc/dbtree':
ensure = 'directory',
@@ -34,4 +33,18 @@
require = File['/srv/mediawiki/docroot/noc/dbtree'],
}
+file { '/srv/mediawiki/docroot/noc/dbtree/inc/config.php':
+ensure = 'present',
+owner = 'mwdeploy',
+group = 'mwdeploy',
+content = template('noc/dbtree.config.php.erb'),
+}
+
+# Monitoring
+monitoring::service { 'http-noc':
+description = 'HTTP-noc',
+check_command =
'check_http_url!noc.wikimedia.org!http://noc.wikimedia.org'
+}
+
}
+
diff --git a/modules/noc/templates/dbtree.config.php.erb
b/modules/noc/templates/dbtree.config.php.erb
new file mode 100644
index 000..bcaca18
--- /dev/null
+++ b/modules/noc/templates/dbtree.config.php.erb
@@ -0,0 +1,8 @@
+?php
+
+$db_host = 'db1011.eqiad.wmnet';
+$db_user = '%= @tendril_user_web %';
+$db_pass = '%= @tendril_pass_web %';
+$db_name = 'tendril';
+
+function e($msg) {}
--
To view, visit https://gerrit.wikimedia.org/r/193505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id1e2309a24e3b9870a293ea59c66c6d9c8d799d5
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 58a6853..4b840ab - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/193993 Change subject: Syncronize VisualEditor: 58a6853..4b840ab .. Syncronize VisualEditor: 58a6853..4b840ab Change-Id: I61dfcc6f4820d1d8d4943ca8ec3fc01f9f03edeb --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/93/193993/1 diff --git a/VisualEditor b/VisualEditor index 58a6853..4b840ab 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 58a685386bb465f5a7ac6478b6794e7f3c8f7ef3 +Subproject commit 4b840ab725139b1ff19a573995f3804a2b5d5a3d -- To view, visit https://gerrit.wikimedia.org/r/193993 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I61dfcc6f4820d1d8d4943ca8ec3fc01f9f03edeb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] User only requires history access to see the username on a r... - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: User only requires history access to see the username on a
revision
..
User only requires history access to see the username on a revision
Change-Id: I77269c7f14fb9072648b242d563f1cc038efd3be
(cherry picked from commit 47e0a9497bd945ae42eb77b70470829a8ad1929f)
---
M includes/Templating.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Templating.php b/includes/Templating.php
index bcdb7fe..b209983 100644
--- a/includes/Templating.php
+++ b/includes/Templating.php
@@ -86,7 +86,7 @@
* @throws FlowException
*/
public function getUserLinks( AbstractRevision $revision ) {
- if ( !$revision-isModerated()
!$this-permissions-isAllowed( $revision, 'view' ) ) {
+ if ( !$revision-isModerated()
!$this-permissions-isAllowed( $revision, 'history' ) ) {
throw new FlowException( 'Insufficient permissions to
see userlinks for rev_id = ' . $revision-getRevisionId()-getAlphadecimal() );
}
--
To view, visit https://gerrit.wikimedia.org/r/193752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77269c7f14fb9072648b242d563f1cc038efd3be
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.25wmf18
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable CORS support logging on beta - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Enable CORS support logging on beta
..
Enable CORS support logging on beta
Soft-depends on I9bc940337a83146f8ecbe8a546c31c93b17161f1
Bug: T507
Change-Id: I82ebf8a9def3359ff78a23a441856ef38e8dd07a
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
3 files changed, 9 insertions(+), 0 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index a66d3e5..b6ce293 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1917,6 +1917,7 @@
require_once( $IP/extensions/ImageMetrics/ImageMetrics.php );
$wgImageMetricsSamplingFactor = $wmgImageMetricsSamplingFactor;
$wgImageMetricsLoggedinSamplingFactor =
$wmgImageMetricsLoggedinSamplingFactor;
+ $wgImageMetricsCorsSamplingFactor = $wmgImageMetricsCorsSamplingFactor;
}
if ( $wmgUsePopups ) {
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index f05f78a..287ad17 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -358,6 +358,10 @@
'default' = 1,
),
+ 'wmgImageMetricsCorsSamplingFactor' = array(
+ 'default' = 1,
+ ),
+
'wmgUseVectorBeta' = array(
'default' = true,
),
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index cba9829..33e667c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12229,6 +12229,10 @@
'default' = 10,
),
+'wmgImageMetricsCorsSamplingFactor' = array(
+ 'default' = false,
+),
+
// -- Shared Parsoid start --
'wmgUseParsoid' = array(
--
To view, visit https://gerrit.wikimedia.org/r/182767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I82ebf8a9def3359ff78a23a441856ef38e8dd07a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Chad 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] fix sysctl application on jessie - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: fix sysctl application on jessie
..
fix sysctl application on jessie
Change-Id: I1c8c4086e940b9896fd597d60304ce79ce35bdef
---
M modules/sysctl/manifests/init.pp
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
BBlack: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/sysctl/manifests/init.pp b/modules/sysctl/manifests/init.pp
index 9895b89..23d63bb 100644
--- a/modules/sysctl/manifests/init.pp
+++ b/modules/sysctl/manifests/init.pp
@@ -17,7 +17,10 @@
}
exec { 'update_sysctl':
-command = '/usr/sbin/service procps start',
+command = $::initsystem ? {
+systemd = '/bin/systemctl restart systemd-sysctl.service',
+default = '/usr/sbin/service procps start',
+},
refreshonly = true,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/194000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c8c4086e940b9896fd597d60304ce79ce35bdef
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for tap on small images not causing gallery view to appear. - change (apps...wikipedia)
Mhurd has uploaded a new change for review. https://gerrit.wikimedia.org/r/194021 Change subject: Fix for tap on small images not causing gallery view to appear. .. Fix for tap on small images not causing gallery view to appear. To test, go to Fish on enwiki, then go to the Muscular system section. The swim bladder image will not respond to tap. With this patch it does. Background: We don't want to route tiny chrome images, of which there are many, to our custom data store. The original threshold I had chosen was 100x100, which is too large. The image gallery code assumes that if you are seeing an image, it has been routed to the data store (how else could you tap it if you couldn't see it). With the threshold set to 100x100, images that are large enough to be reasonably expected to be tappable were not being routed to the data store. Change-Id: I510b457d86c2b950f5adb1d8698c554eb73aefd6 --- M wikipedia/Defines/Defines.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/21/194021/1 diff --git a/wikipedia/Defines/Defines.h b/wikipedia/Defines/Defines.h index 6630a3b..2a7c0b2 100644 --- a/wikipedia/Defines/Defines.h +++ b/wikipedia/Defines/Defines.h @@ -42,7 +42,7 @@ #define HIDE_KEYBOARD_ON_SCROLL_THRESHOLD 55.0f -#define THUMBNAIL_MINIMUM_SIZE_TO_CACHE CGSizeMake(100, 100) +#define THUMBNAIL_MINIMUM_SIZE_TO_CACHE CGSizeMake(35, 35) #define EDIT_SUMMARY_DOCK_DISTANCE_FROM_BOTTOM 68.0f -- To view, visit https://gerrit.wikimedia.org/r/194021 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I510b457d86c2b950f5adb1d8698c554eb73aefd6 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Mhurd mh...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update cxserver to 7e011bd - change (mediawiki...deploy)
jenkins-bot has submitted this change and it was merged. Change subject: Update cxserver to 7e011bd .. Update cxserver to 7e011bd Changes: * 7e011bd Add Azerbaijani (az) as source and target language * b097079 Add Vietnamese (vi) as source and target language Change-Id: I4b79c01a306a0d93cdfda4cdcaf34f0bbdef9ac4 --- M src 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/src b/src index ea36ee8..7e011bd 16 --- a/src +++ b/src -Subproject commit ea36ee80ffbdf925e6aa49c81f62da5d7fc19e86 +Subproject commit 7e011bdc82cb73e17cdaeae7403a6eb99b81678e -- To view, visit https://gerrit.wikimedia.org/r/194039 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4b79c01a306a0d93cdfda4cdcaf34f0bbdef9ac4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver/deploy Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: KartikMistry kartik.mis...@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] content: Add Right To Be Forgotten Section - change (wikimedia/TransparencyReport-private)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/193996 Change subject: content: Add Right To Be Forgotten Section .. content: Add Right To Be Forgotten Section Change-Id: Iee3e7e9d61db9d708ab6fda1b0a30e8de6dbbc81 --- M locales/en.yml M source/localizable/content.html.erb 2 files changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private refs/changes/96/193996/1 diff --git a/locales/en.yml b/locales/en.yml index fd5e82a..591eb50 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -73,6 +73,12 @@ story2_body: A photographer left his camera unattended in a national park in a href='//en.wikipedia.org/wiki/North_Sulawesi'North Sulawesi/a, a href='//en.wikipedia.org/wiki/Indonesia'Indonesia/a. A female a href='//en.wikipedia.org/wiki/Celebes_crested_macaque'crested black macaque monkey/a got ahold of the camera and took a series of pictures, including some self-portraits. The pictures were featured in an online newspaper article and eventually posted to a href='//commons.wikimedia.org/'Commons/a. We received a takedown request from the photographer, claiming that he owned the copyright to the photographs. We didn't agree, so we denied the request. story3_title: Aboriginal LanguagebrsmallJuly 2012/small story3_body: A Tasmanian aboriginal language center demanded the removal of the a href='//en.wikipedia.org'English Wikipedia/a a href='//en.wikipedia.org/wiki/Palawa_kani'article on 'palawa kani'/a, claiming copyright over the entirety of the language. We refused to remove the article because copyright law simply cannot be used to stop people from using an entire language or to prevent general discussion about the language. Such a broad claim would have chilled free speech and negatively impacted research, education, and public discourse—activities that Wikimedia serves to promote. +forgotten_title: Right To Be Forgotten Requests +forgotten_intro: pLast year, a European court decision, Google Spain v. AEPD and Mario Costeja González, granted individuals the ability to request that search engines “de-index” content about them under the so-called “right to be forgotten” doctrine. We believe that denying people access to relevant and neutral information is antagonistic to the values of the Wikimedia movement and have made a statement opposing the decision./ppHowever, under the theory of the 'right to be forgotten', we have started receiving direct requests to remove content from Wikimedia projects. Below, you will find more information about the requests we have received.*/ppsmall* Please note that the information below only reflects requests made directly to us. Wikimedia project pages continue to disappear from search engine results without any notice, much less, request to us. We have a dedicated page where we post the notices about attempts to remove links to Wikimedia projects that we have received from the search engines who provide such notices as part of their own commitments to transparency. But we suspect that many search engines are not even giving notice, which we find contrary to core principles of free expression, due process, and transparency./small/p +forgotten_quote: Because if you don’t stand up for the stuff you don’t like, when they come for the stuff you do like, you’ve already lost. +forgotten_cite: a href='//en.wikipedia.org/wiki/Neil_Gaiman'Neil Gaiman/a +total_number_of_forgotten_requests: Total number of requests +number_of_forgotten_requests_granted: Number of requests granted dmca_title: DMCA Takedown Notices dmca_intro: pThe Wikimedia community is made up of creators, collectors, and consumers of free knowledge. While most material appearing on Wikimedia projects is in the a href='//en.wikipedia.org/wiki/Public_domain'public domain/a or a href='//en.wikipedia.org/wiki/Free_license'freely licensed/a, on occasion, copyrighted material makes its way onto the projects./ppThe a href='//en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act'Digital Millennium Copyright Act/a (DMCA) safe harbor provision requires us to remove infringing material if we receive a proper takedown request. We thoroughly evaluate each DMCA takedown request to ensure that it is a href='/faq.html#dmca_valid_proper'valid/a. We only remove allegedly infringing content when we believe that a request is valid and we are a href='/faq.html#transparent_dmca'transparent/a about that removal. If we do not believe a request to be valid, we will push back as appropriate. To learn more about DMCA procedures, see our a href ='//wikimediafoundation.org/wiki/DMCA_Policy'DMCA policy/a./ppBelow, we provide information about the DMCA takedown notices we have received in the past and how we responded to them./p quote2: A well-functioning copyright law carefully
[MediaWiki-commits] [Gerrit] content: Add new quote - change (wikimedia/TransparencyReport-private)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/193995 Change subject: content: Add new quote .. content: Add new quote Change-Id: I01b3a4c2f18355ecd643f5b5479c73daca87531f --- M locales/en.yml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private refs/changes/95/193995/1 diff --git a/locales/en.yml b/locales/en.yml index 678c95b..fd5e82a 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -65,8 +65,8 @@ total_number_of_dmca_requests: Total Number of DMCA Takedown Requests lead: h2Imagine a world in which span class='blackout'every single human being can freely share in the sum of all knowledge./span/h2 intro: pThe Wikimedia projects make up one of the world's largest repositories of human knowledge. With that much information, someone is bound to get upset by some of the content from time to time. While the vast majority of content disputes are a href='/faq.html#resolve_content_disputes'resolved by users/a themselves, in some extreme cases the Wikimedia Foundation may receive a legal demand to override our users./ppThe Wikimedia projects are yours, not ours. People just like you from around the world write, upload, edit, and curate all of the content. Therefore, we believe users should decide what belongs on Wikimedia projects whenever legally possible./ppBelow, you will find more information about the number of requests we receive, where they come from, and how they could impact free knowledge. You can also learn more about how we fight for freedom of speech through our user assistance programs in the a href='/faq.html#im_being_sued'FAQ/a./p -quote: We change people through conversation, not through censorship. -cite: a href='//en.wikipedia.org/wiki/Jay-Z'Jay Z/asmallMusician (a href='//en.wikipedia.org/wiki/Decoded_%28book%29'2010/a)/small +quote: If all printers were determined not to print anything till they were sure it would offend nobody, there would be very little printed. +cite: a href='//en.wikipedia.org/wiki/Benjamin_Franklin'Benjamin Franklin/a story1_title: French Intelligence AgencybrsmallMarch 2013/small story1_body: A a href='//en.wikipedia.org/wiki/Direction_centrale_du_renseignement_int%C3%A9rieur'French intelligence agency/a summoned a Wikipedia user to its offices, and threatened him with severe criminal penalties if he did not use his administrative rights to delete information about a a href='//fr.wikipedia.org/wiki/Station_hertzienne_militaire_de_Pierre-sur-Haute'military base/a from a href='//fr.wikipedia.org/'French Wikipedia/a that the agency deemed classified. The supposedly classified information was actually publicly available because the military had provided interviews and a tour of the base to local reporters. We defended the user involved and fought to keep the content up on Wikipedia. a href='//meta.wikimedia.org/wiki/Legal_and_Community_Advocacy/Statement_on_France'Read more.../a story2_title: Monkey SelfiebrsmallJanuary 2014/small -- To view, visit https://gerrit.wikimedia.org/r/193995 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01b3a4c2f18355ecd643f5b5479c73daca87531f Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/TransparencyReport-private Gerrit-Branch: master Gerrit-Owner: Prtksxna psax...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] privacy: Add Voluntary Disclosures section - change (wikimedia/TransparencyReport-private)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193998
Change subject: privacy: Add Voluntary Disclosures section
..
privacy: Add Voluntary Disclosures section
Change-Id: I113b8de8780778e92099e1f72a1681fab2dca535
---
M locales/en.yml
M source/localizable/privacy.html.erb
2 files changed, 22 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private
refs/changes/98/193998/1
diff --git a/locales/en.yml b/locales/en.yml
index f93673b..faf1142 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -57,6 +57,9 @@
request_type: Request Type
information_produced_title: Information Produced?
by_country: By Country
+voluntary_disclosures_title: Voluntary Disclosures
+voluntary_disclosures_intro: pOn rare occasions, we become aware of
concerning statements on the Wikimedia projects, like a suicide threat or bomb
threat. We take these statements seriously and assess each one individually. As
appropriate, we contact the authorities to help resolve the issue./ppBelow,
you will find more information about these unusual, voluntary disclosures,
broken down by project and by country. These charts show the number of requests
we received to conduct an investigation and the number of reports we ultimately
made to the appropriate authorities./ppThe stories below are real. They are
also meant to be illustrative of the kinds of situations that would warrant a
possible voluntary disclosure of user information. Please note that these
specific stories may not have occurred during the precise time frame that this
transparency report covers. Some variables, such as the privacy of our users,
may require our postponing the reporting of certain stories./p
+total_number_of_voluntary_disclosures: Total number of disclosures
content:
title: Requests for ContentbrAlteration amp; Takedown
diff --git a/source/localizable/privacy.html.erb
b/source/localizable/privacy.html.erb
index eb8f070..7c15d96 100644
--- a/source/localizable/privacy.html.erb
+++ b/source/localizable/privacy.html.erb
@@ -148,6 +148,25 @@
/div
+div class=clear/div
+br / br / br / br /
+
+div class=col-md-3
+ section class=scorecard
+h2%= t('dates.jul') % 2012 – %= t('dates.jun') % 2014/h2
+dl
+ dt%= t('privacy.total_number_of_voluntary_disclosures') %/dt
+ dd18/dd
+/dl
+ /section
+/div
+
+div class=col-md-8
+ h2%= t('privacy.voluntary_disclosures_title') %/h2
+ %= t('privacy.voluntary_disclosures_intro') %
+/div
+
+
!-- Translations for JS --
input type=hidden id=t_total_requests value=%=
t('privacy.total_requests') %
input type=hidden id=t_information_produced value=%=
t('privacy.information_produced') %
--
To view, visit https://gerrit.wikimedia.org/r/193998
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I113b8de8780778e92099e1f72a1681fab2dca535
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport-private
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] content: Fix markup in the Right to be Forgotten section - change (wikimedia/TransparencyReport-private)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/193999 Change subject: content: Fix markup in the Right to be Forgotten section .. content: Fix markup in the Right to be Forgotten section Change-Id: Id1421c77f0790372834974ca58c427d67d13d5a1 --- M locales/en.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private refs/changes/99/193999/1 diff --git a/locales/en.yml b/locales/en.yml index faf1142..5453942 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -77,7 +77,7 @@ story3_title: Aboriginal LanguagebrsmallJuly 2012/small story3_body: A Tasmanian aboriginal language center demanded the removal of the a href='//en.wikipedia.org'English Wikipedia/a a href='//en.wikipedia.org/wiki/Palawa_kani'article on 'palawa kani'/a, claiming copyright over the entirety of the language. We refused to remove the article because copyright law simply cannot be used to stop people from using an entire language or to prevent general discussion about the language. Such a broad claim would have chilled free speech and negatively impacted research, education, and public discourse—activities that Wikimedia serves to promote. forgotten_title: Right To Be Forgotten Requests -forgotten_intro: pLast year, a European court decision, Google Spain v. AEPD and Mario Costeja González, granted individuals the ability to request that search engines “de-index” content about them under the so-called “right to be forgotten” doctrine. We believe that denying people access to relevant and neutral information is antagonistic to the values of the Wikimedia movement and have made a statement opposing the decision./ppHowever, under the theory of the 'right to be forgotten', we have started receiving direct requests to remove content from Wikimedia projects. Below, you will find more information about the requests we have received.*/ppsmall* Please note that the information below only reflects requests made directly to us. Wikimedia project pages continue to disappear from search engine results without any notice, much less, request to us. We have a dedicated page where we post the notices about attempts to remove links to Wikimedia projects that we have received from the search engines who provide such notices as part of their own commitments to transparency. But we suspect that many search engines are not even giving notice, which we find contrary to core principles of free expression, due process, and transparency./small/p +forgotten_intro: pLast year, a European court decision, a href='//en.wikipedia.org/wiki/Google_Spain_v_AEPD_and_Mario_Costeja_Gonz%C3%A1lez'Google Spain v. AEPD and Mario Costeja González/a, granted individuals the ability to request that search engines “de-index” content about them under the so-called “a href='//en.wikipedia.org/wiki/Right_to_be_forgotten'right to be forgotten/a” doctrine. We believe that denying people access to relevant and neutral information is antagonistic to the values of the Wikimedia movement and have made a a href='//blog.wikimedia.org/2014/08/06/european-court-decision-punches-holes-in-free-knowledge/'statement/a opposing the decision./ppHowever, under the theory of the 'right to be forgotten', we have started receiving direct requests to remove content from Wikimedia projects. Below, you will find more information about the requests we have received.*/ppsmall* Please note that the information below only reflects requests made directly to us. Wikimedia project pages continue to disappear from search engine results without any notice, much less, request to us. We have a dedicated page where we post the notices about attempts to remove links to Wikimedia projects that we have received from the search engines who provide such notices as part of their own commitments to transparency. But we suspect that many search engines are not even giving notice, which we find contrary to core principles of free expression, due process, and transparency./small/p forgotten_quote: Because if you don’t stand up for the stuff you don’t like, when they come for the stuff you do like, you’ve already lost. forgotten_cite: a href='//en.wikipedia.org/wiki/Neil_Gaiman'Neil Gaiman/a total_number_of_forgotten_requests: Total number of requests -- To view, visit https://gerrit.wikimedia.org/r/193999 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1421c77f0790372834974ca58c427d67d13d5a1 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/TransparencyReport-private Gerrit-Branch: master Gerrit-Owner: Prtksxna psax...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into wmf_deploy - change (mediawiki...CentralNotice)
AndyRussG has uploaded a new change for review. https://gerrit.wikimedia.org/r/194002 Change subject: Merge branch 'master' into wmf_deploy .. Merge branch 'master' into wmf_deploy Change-Id: I4071b2e1c0b995d786c7260d417ace38a1229db0 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/02/194002/1 -- To view, visit https://gerrit.wikimedia.org/r/194002 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4071b2e1c0b995d786c7260d417ace38a1229db0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: wmf_deploy Gerrit-Owner: AndyRussG andrew.green...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Send app install ID with saved pages events - change (apps...wikipedia)
Mhurd has submitted this change and it was merged.
Change subject: Send app install ID with saved pages events
..
Send app install ID with saved pages events
Change-Id: I058e8e2a5fe7c945663549df8dd5b5a27646591c
---
M wikipedia/EventLogging/SavedPagesFunnel.h
M wikipedia/EventLogging/SavedPagesFunnel.m
2 files changed, 18 insertions(+), 2 deletions(-)
Approvals:
Mhurd: Verified; Looks good to me, approved
diff --git a/wikipedia/EventLogging/SavedPagesFunnel.h
b/wikipedia/EventLogging/SavedPagesFunnel.h
index b33f74f..d146a99 100644
--- a/wikipedia/EventLogging/SavedPagesFunnel.h
+++ b/wikipedia/EventLogging/SavedPagesFunnel.h
@@ -10,7 +10,7 @@
@interface SavedPagesFunnel : EventLoggingFunnel
-@property NSString *appInstallID;
+@property NSString *appInstallId;
-(id)init;
diff --git a/wikipedia/EventLogging/SavedPagesFunnel.m
b/wikipedia/EventLogging/SavedPagesFunnel.m
index 1e5b9af..94ab1fa 100644
--- a/wikipedia/EventLogging/SavedPagesFunnel.m
+++ b/wikipedia/EventLogging/SavedPagesFunnel.m
@@ -8,6 +8,9 @@
#import SavedPagesFunnel.h
+static NSString* const kEventDataAssertVerbiage = @Event data not present;
+static NSString* const kAppInstallIdKey = @appInstallID;
+
@implementation SavedPagesFunnel
-(id)init
@@ -15,7 +18,7 @@
// http://meta.wikimedia.org/wiki/Schema:MobileWikiAppSavedPages
self = [super initWithSchema:@MobileWikiAppSavedPages version:10375480];
if (self) {
-self.appInstallID = [self persistentUUID:@ReadingAction];
+self.appInstallId = [self persistentUUID:@ReadingAction];
}
return self;
}
@@ -58,5 +61,18 @@
[self log:@{@action: @editafterrefresh}];
}
+-(NSDictionary*)preprocessData:(NSDictionary*)eventData
+{
+if (!eventData) {
+NSAssert(false, @%@ : %@,
+ kEventDataAssertVerbiage,
+ eventData);
+return nil;
+}
+NSMutableDictionary *dict = [eventData mutableCopy];
+dict[kAppInstallIdKey] = self.appInstallId;
+return [dict copy];
+}
+
@end
--
To view, visit https://gerrit.wikimedia.org/r/193893
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I058e8e2a5fe7c945663549df8dd5b5a27646591c
Gerrit-PatchSet: 2
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt ab...@wikimedia.org
Gerrit-Reviewer: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
