[MediaWiki-commits] [Gerrit] Vector: Don't supress focus outline on watch star - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Vector: Don't supress focus outline on watch star
..
Vector: Don't supress focus outline on watch star
This is an old remnant that was intended to remove outline from
images inside anchor links. However the watch star is no longer
implemented this way and this is doing nothing. Except when
the element is focussed (using keyboard tab index), then this
rule is overriding the default :focus and causing the user to
potentially get confused since it is no longer clear where the
focus has gone to.
Bug: 64934
Change-Id: I57ee089c1ae18bb7a6c55ae17eab3a06f9e1f7d2
---
M skins/vector/components/watchstar.less
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
TheDJ: Looks good to me, approved
jenkins-bot: Verified
diff --git a/skins/vector/components/watchstar.less
b/skins/vector/components/watchstar.less
index b76a825..2c38516 100644
--- a/skins/vector/components/watchstar.less
+++ b/skins/vector/components/watchstar.less
@@ -5,7 +5,6 @@
#ca-watch.icon a {
margin: 0;
padding: 0;
- outline: none;
display: block;
width: 26px;
/* This hides the text but shows the background image */
--
To view, visit https://gerrit.wikimedia.org/r/131643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I57ee089c1ae18bb7a6c55ae17eab3a06f9e1f7d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Daniel Friesen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Rillke
Gerrit-Reviewer: TheDJ
Gerrit-Reviewer: Trevor Parscal
Gerrit-Reviewer: Waldir
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] minor changes * fixed german translation file * cosmetics to... - change (mediawiki...AccessControl)
Siebrand has submitted this change and it was merged.
Change subject: minor changes * fixed german translation file * cosmetics to
the code to avoid codestyle errors
..
minor changes
* fixed german translation file
* cosmetics to the code to avoid codestyle errors
Change-Id: If5a4c053df1eaf6f76f1a17531ec87ddf19feff7
---
M AccessControl.php
M changelog.txt
M i18n/de.json
3 files changed, 52 insertions(+), 44 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/AccessControl.php b/AccessControl.php
index 9c90714..ae577d7 100644
--- a/AccessControl.php
+++ b/AccessControl.php
@@ -23,7 +23,7 @@
'name' => 'AccessControlExtension',
'author'=> array( 'Aleš Kapica' ),
'url' =>
'http://www.mediawiki.org/wiki/Extension:AccessControl',
- 'version' => '2.4.0',
+ 'version' => '2.4.1',
'description' => 'Access control based on users lists.
Administrator rights need not be for it.',
'descriptionmsg'=> 'accesscontrol-desc',
);
@@ -62,9 +62,9 @@
return displayGroups();
}
-function accessControl( $obsahtagu ){
+function accessControl( $tagContent ){
$accessgroup = Array( Array(), Array() );
- $listaccesslist = explode( ",", $obsahtagu );
+ $listaccesslist = explode( ",", $tagContent );
foreach ( $listaccesslist as $accesslist ) {
if ( strpos( $accesslist, "(ro)" ) !== false ) {
$accesslist = trim( str_replace( "(ro)", "",
$accesslist ) );
@@ -73,7 +73,7 @@
$accessgroup[1] = array_merge( $accessgroup[1],
$group[1] );
} else {
$accesslist = trim( $accesslist );
- $group = makeGroupArray ($accesslist );
+ $group = makeGroupArray ( $accesslist );
$accessgroup[0] = array_merge( $accessgroup[0],
$group[0] );
$accessgroup[1] = array_merge( $accessgroup[1],
$group[1] );
}
@@ -98,7 +98,7 @@
break;
}
}
- return array( $userswrite , $usersreadonly );
+ return array( $userswrite, $usersreadonly );
}
function displayGroups() {
@@ -133,7 +133,7 @@
$gt = $Title->makeTitle( 10, $template );
if ( method_exists( 'WikiPage', 'getContent' ) ) {
$contentPage = new WikiPage( $gt );
- //return $contentPage->getContent()->getNativeData();
+ return $contentPage->getContent()->getNativeData();
} else {
// create Article and get the content
$contentPage = new Article( $gt, 0 );
@@ -141,12 +141,13 @@
}
}
-function getUsersFromPages( $skupina ) {
+function getUsersFromPages( $group ) {
/* Extracts the allowed users from the userspace access list */
$allowedAccess = Array();
$allow = Array();
$Title = new Title();
- $gt = $Title->makeTitle( 0, $skupina );
+// Remark: position to add code to use namespace from mediawiki
+ $gt = $Title->makeTitle( 0, $group );
if ( method_exists( 'WikiPage', 'getContent' ) ) {
$groupPage = new WikiPage( $gt );
$allowedUsers = $groupPage->getContent()->getNativeData();
@@ -206,13 +207,13 @@
$skok = $start + 2;
$templatepage = substr( $string, $skok, $end - $skok );
if ( substr( $templatepage, 0, 1 ) == '{' ) {
- // The check of included code
+ // The check of included code
$rights = fromTemplates( $templatepage );
} elseif ( substr( $templatepage, 0, 1 ) == ':' ) {
- // The check of included page
- $rights = allRightTags( getContentPage( 0, substr(
$templatepage, 1 ) ) );
- } elseif (ctype_alnum(substr( $templatepage, 0, 1 ) )) {
- // The check of included template
+ // The check of included page
+ $rights = allRightTags( getContentPage( 0,
substr( $templatepage, 1 ) ) );
+ } elseif ( ctype_alnum( substr( $templatepage, 0, 1 ) )) {
+ // The check of included template
if ( strpos( $templatepage, '|' ) > 0) {
$templatename = substr( $templatepage, 0,
strpos( $templatepage, '|' ) );
$rights = allRightTags( getContentPage( 10,
$templatename ) );
@@ -220,43 +221,43 @@
$rights = allRightTags( getContentPage( 10,
$templatepage ) );
}
[MediaWiki-commits] [Gerrit] i18n: consistency tweaks - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: i18n: consistency tweaks
..
i18n: consistency tweaks
- Add Special:MyLanguage
- Replace mediawiki.org by www.mediawiki.org
Change-Id: Id6afd840cf24f967f882ec75a34c8869b0ebfd80
---
M i18n/core/en.json
M i18n/groupdescriptions/en.json
2 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/core/en.json b/i18n/core/en.json
index 3c159ff..424855a 100644
--- a/i18n/core/en.json
+++ b/i18n/core/en.json
@@ -390,5 +390,5 @@
"translate-statsbar-tooltip-with-fuzzy": "$1% translated, $2% reviewed,
$3% outdated",
"translate-search-more-groups-info": "$1 more {{PLURAL:$1|group|groups}}",
"translate-ulsdep-title": "Configuration error",
-"translate-ulsdep-body": "Translate extension depends on the
[https://www.mediawiki.org/wiki/Extension:UniversalLanguageSelector Universal
Language Selector extension]."
+"translate-ulsdep-body": "Translate extension depends on the
[https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:UniversalLanguageSelector
Universal Language Selector extension]."
}
diff --git a/i18n/groupdescriptions/en.json b/i18n/groupdescriptions/en.json
index 283494c..8c54c32 100644
--- a/i18n/groupdescriptions/en.json
+++ b/i18n/groupdescriptions/en.json
@@ -2,22 +2,22 @@
"@metadata": {
"authors": []
},
-"translategroupdescriptions-desc": "Message group descriptions for
products supported by the [https://mediawiki.org/wiki/Extension:Translate
Translate] extension",
+"translategroupdescriptions-desc": "Message group descriptions for
products supported by the
[https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:Translate
Translate] extension",
"translate-group-desc-nodesc": "No description is available for this
message group",
"translate-group-desc-mediawikicore": "This message group contains the
messages used in the current alpha version of
[[Translating:MediaWiki|MediaWiki]] ({{CURRENTVERSION}})",
"translate-group-desc-mediawikimostused": "This message group contains the
[https://translatewiki.net/wiki/Most_often_used_messages_in_MediaWiki 500 most
often used messages] in [[Translating:MediaWiki|MediaWiki]]",
"translate-group-desc-mediawikiextensions": "Meta message group containing
all messages for supported extensions for [[Translating:MediaWiki|MediaWiki]]",
-"translate-group-desc-bluespice": "Meta message group containing all
messages for the MediaWiki [https://www.mediawiki.org/wiki/Extension:BlueSpice
Blue Spice] extensions",
-"translate-group-desc-collection": "Meta message group containing all
messages for the MediaWiki extension
[https://www.mediawiki.org/wiki/Extension:Collection Collection]",
-"translate-group-desc-flaggedrevs": "Meta message group containing all
messages for the MediaWiki extension
[https://www.mediawiki.org/wiki/Extension:FlaggedRevs FlaggedRevs]",
-"translate-group-desc-readerfeedback": "Meta message group containing all
messages for the MediaWiki extension
[https://www.mediawiki.org/wiki/Extension:ReaderFeedback ReaderFeedback]",
+"translate-group-desc-bluespice": "Meta message group containing all
messages for the MediaWiki
[https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:BlueSpice Blue
Spice] extensions",
+"translate-group-desc-collection": "Meta message group containing all
messages for the MediaWiki extension
[https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:Collection
Collection]",
+"translate-group-desc-flaggedrevs": "Meta message group containing all
messages for the MediaWiki extension
[https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:FlaggedRevs
FlaggedRevs]",
+"translate-group-desc-readerfeedback": "Meta message group containing all
messages for the MediaWiki extension
[https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:ReaderFeedback
ReaderFeedback]",
"translate-group-desc-semantic": "Meta message group containing all
messages for all [https://semantic-mediawiki.org/ Semantic MediaWiki]
extensions",
-"translate-group-desc-translate": "Meta message group containing all
messages for the MediaWiki extension
[https://www.mediawiki.org/wiki/Extension:Translate Translate]; please
familiarize yourself with its
[https://www.mediawiki.org/wiki/Help:Extension:Translate/Glossary glossary]",
-"translate-group-desc-universallanguageselector": "Meta message group
containing all messages for the MediaWiki extension
[https://www.mediawiki.org/wiki/Extension:UniversalLanguageSelector
UniversalLanguageSelector] (ULS) and related software packages",
-"translate-group-desc-visualeditor": "Meta message group containing all
messages for the MediaWiki extension
[https://www.mediawiki.org/wiki/Extension:VisualEditor VisualEditor] and
rela
[MediaWiki-commits] [Gerrit] Reset to the default user-select: text instead of user-selec... - change (mediawiki...UIFeedback)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131664
Change subject: Reset to the default user-select: text instead of user-select:
all
..
Reset to the default user-select: text instead of user-select: all
Bug: 64941
Change-Id: I9b476d207c4eb04fcdc2d46b9d22f9306a8075cd
---
M resources/ext.uiFeedback.js
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UIFeedback
refs/changes/64/131664/1
diff --git a/resources/ext.uiFeedback.js b/resources/ext.uiFeedback.js
index 5f26d02..bd3f561 100644
--- a/resources/ext.uiFeedback.js
+++ b/resources/ext.uiFeedback.js
@@ -268,12 +268,12 @@
$( 'body' ).css( '-user-select', 'none' );
}else{
/* hide */
- $( 'body' ).css( '-webkit-touch-callout', 'all'
);
- $( 'body' ).css( '-webkit-user-select', 'all' );
- $( 'body' ).css( '-khtml-user-select', 'all' );
- $( 'body' ).css( '-moz-user-select', 'all' );
- $( 'body' ).css( '-ms-user-select', 'all' );
- $( 'body' ).css( '-user-select', 'all' );
+ $( 'body' ).css( '-webkit-touch-callout',
'text' );
+ $( 'body' ).css( '-webkit-user-select', 'text'
);
+ $( 'body' ).css( '-khtml-user-select', 'text' );
+ $( 'body' ).css( '-moz-user-select', 'text' );
+ $( 'body' ).css( '-ms-user-select', 'text' );
+ $( 'body' ).css( '-user-select', 'text' );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/131664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b476d207c4eb04fcdc2d46b9d22f9306a8075cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UIFeedback
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] logrotate.d/eventlogging: maxage 90 days - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: logrotate.d/eventlogging: maxage 90 days
..
logrotate.d/eventlogging: maxage 90 days
Delete rotated logs older than 90 days.
Change-Id: Id08f23b9f215b9a6ab4dcbeced68dd5b87b97fa1
---
D files/logrotate/eventlogging
M modules/eventlogging/files/logrotate
M modules/eventlogging/manifests/init.pp
3 files changed, 8 insertions(+), 27 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/logrotate/eventlogging b/files/logrotate/eventlogging
deleted file mode 100644
index 45ecf71..000
--- a/files/logrotate/eventlogging
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/logrotate/eventlogging
-#
-
-/var/log/eventlogging/*.log {
- daily
- olddir /var/log/eventlogging/archive
- notifempty
- maxage 180
- rotate 1000
- dateext
- compress
- missingok
-}
diff --git a/modules/eventlogging/files/logrotate
b/modules/eventlogging/files/logrotate
index b3b07a4..53ce08d 100644
--- a/modules/eventlogging/files/logrotate
+++ b/modules/eventlogging/files/logrotate
@@ -1,13 +1,11 @@
-#
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/eventlogging/logrotate
-#
+# This file is managed by Puppet.
+# puppet:///modules/eventlogging/logrotate
/var/log/eventlogging/*.log {
daily
olddir /var/log/eventlogging/archive
notifempty
- maxage 180
+ maxage 90
rotate 1000
dateext
compress
diff --git a/modules/eventlogging/manifests/init.pp
b/modules/eventlogging/manifests/init.pp
index 829d835..ab968d6 100644
--- a/modules/eventlogging/manifests/init.pp
+++ b/modules/eventlogging/manifests/init.pp
@@ -39,10 +39,9 @@
# EventLogging tasks.
#
class eventlogging {
-include eventlogging::package
-include eventlogging::monitor
+include ::eventlogging::package
+include ::eventlogging::monitor
-# EventLogging jobs set 'eventlogging' gid & uid.
group { 'eventlogging':
ensure => present,
}
@@ -51,13 +50,12 @@
ensure => present,
gid=> 'eventlogging',
shell => '/bin/false',
-home => '/srv/eventlogging',
-managehome => true,
+home => '/nonexistent',
system => true,
+managehome => false,
}
-# The /etc/eventlogging.d file hierarchy contains instance
-# definition files.
+# Instance definition files.
file { [
'/etc/eventlogging.d',
'/etc/eventlogging.d/consumers',
--
To view, visit https://gerrit.wikimedia.org/r/131663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id08f23b9f215b9a6ab4dcbeced68dd5b87b97fa1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: Fix link text - change (mediawiki...CentralNotice)
jenkins-bot has submitted this change and it was merged. Change subject: i18n: Fix link text .. i18n: Fix link text Change-Id: I9d917050992bd74ea5a4fbde0d75a2a9c3f9c573 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 6eed605..9ea21a2 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -114,7 +114,7 @@ "centralnotice-banner-landing-pages": "Landing pages (comma-separated)", "centralnotice-banner-landing-pages-default": "e.g. JimmyAppeal01", "centralnotice-banner-mixins": "Mixins", - "centralnotice-banner-mixins-help": "Check each mixin that you want to be included during banner delivery. ([https://www.mediawiki.org/wiki/Extension:CentralNotice/Banner_mixins More information.])", + "centralnotice-banner-mixins-help": "Check each mixin that you want to be included during banner delivery. (See [https://www.mediawiki.org/wiki/Extension:CentralNotice/Banner_mixins Banner mixins] for more information.)", "centralnotice-geo": "Geotargeted", "centralnotice-countries": "Countries", "centralnotice-global-allocation": "Global allocation", -- To view, visit https://gerrit.wikimedia.org/r/131639 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d917050992bd74ea5a4fbde0d75a2a9c3f9c573 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: master Gerrit-Owner: Shirayuki Gerrit-Reviewer: Adamw Gerrit-Reviewer: Mwalker Gerrit-Reviewer: Siebrand Gerrit-Reviewer: Ssmith Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] logrotate.d/eventlogging: maxage 90 days - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131663
Change subject: logrotate.d/eventlogging: maxage 90 days
..
logrotate.d/eventlogging: maxage 90 days
Delete rotated logs older than 90 days.
Change-Id: Id08f23b9f215b9a6ab4dcbeced68dd5b87b97fa1
---
D files/logrotate/eventlogging
M modules/eventlogging/files/logrotate
M modules/eventlogging/manifests/init.pp
3 files changed, 8 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/63/131663/1
diff --git a/files/logrotate/eventlogging b/files/logrotate/eventlogging
deleted file mode 100644
index 45ecf71..000
--- a/files/logrotate/eventlogging
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/logrotate/eventlogging
-#
-
-/var/log/eventlogging/*.log {
- daily
- olddir /var/log/eventlogging/archive
- notifempty
- maxage 180
- rotate 1000
- dateext
- compress
- missingok
-}
diff --git a/modules/eventlogging/files/logrotate
b/modules/eventlogging/files/logrotate
index b3b07a4..53ce08d 100644
--- a/modules/eventlogging/files/logrotate
+++ b/modules/eventlogging/files/logrotate
@@ -1,13 +1,11 @@
-#
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/eventlogging/logrotate
-#
+# This file is managed by Puppet.
+# puppet:///modules/eventlogging/logrotate
/var/log/eventlogging/*.log {
daily
olddir /var/log/eventlogging/archive
notifempty
- maxage 180
+ maxage 90
rotate 1000
dateext
compress
diff --git a/modules/eventlogging/manifests/init.pp
b/modules/eventlogging/manifests/init.pp
index 829d835..ab968d6 100644
--- a/modules/eventlogging/manifests/init.pp
+++ b/modules/eventlogging/manifests/init.pp
@@ -39,10 +39,9 @@
# EventLogging tasks.
#
class eventlogging {
-include eventlogging::package
-include eventlogging::monitor
+include ::eventlogging::package
+include ::eventlogging::monitor
-# EventLogging jobs set 'eventlogging' gid & uid.
group { 'eventlogging':
ensure => present,
}
@@ -51,13 +50,12 @@
ensure => present,
gid=> 'eventlogging',
shell => '/bin/false',
-home => '/srv/eventlogging',
-managehome => true,
+home => '/nonexistent',
system => true,
+managehome => false,
}
-# The /etc/eventlogging.d file hierarchy contains instance
-# definition files.
+# Instance definition files.
file { [
'/etc/eventlogging.d',
'/etc/eventlogging.d/consumers',
--
To view, visit https://gerrit.wikimedia.org/r/131663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id08f23b9f215b9a6ab4dcbeced68dd5b87b97fa1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use proper DB packages on tendril and dbstore - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: Use proper DB packages on tendril and dbstore
..
Use proper DB packages on tendril and dbstore
Change-Id: I3805a5915805ebe2f3c68d98e41d8b53be201873
---
M manifests/role/mariadb.pp
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index b286636..ae82c66 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -44,8 +44,11 @@
description => 'tendril database server',
}
+class { 'mariadb::packages_wmf':
+mariadb10 => true,
+}
+
include standard
-include mariadb::packages_wmf
include passwords::misc::scripts
class { 'mariadb::config':
@@ -72,8 +75,9 @@
description => 'Delayed Slave',
}
-# No packages yet! MariaDB 10 beta tarball in /opt
-#include mariadb::packages
+class { 'mariadb::packages_wmf':
+mariadb10 => true,
+}
include standard
include passwords::misc::scripts
--
To view, visit https://gerrit.wikimedia.org/r/131662
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3805a5915805ebe2f3c68d98e41d8b53be201873
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
Gerrit-Reviewer: Springle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use proper DB packages on tendril and dbstore - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131662
Change subject: Use proper DB packages on tendril and dbstore
..
Use proper DB packages on tendril and dbstore
Change-Id: I3805a5915805ebe2f3c68d98e41d8b53be201873
---
M manifests/role/mariadb.pp
1 file changed, 7 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/131662/1
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index b286636..ae82c66 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -44,8 +44,11 @@
description => 'tendril database server',
}
+class { 'mariadb::packages_wmf':
+mariadb10 => true,
+}
+
include standard
-include mariadb::packages_wmf
include passwords::misc::scripts
class { 'mariadb::config':
@@ -72,8 +75,9 @@
description => 'Delayed Slave',
}
-# No packages yet! MariaDB 10 beta tarball in /opt
-#include mariadb::packages
+class { 'mariadb::packages_wmf':
+mariadb10 => true,
+}
include standard
include passwords::misc::scripts
--
To view, visit https://gerrit.wikimedia.org/r/131662
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3805a5915805ebe2f3c68d98e41d8b53be201873
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add links to documentation of multimedia-related roles - change (mediawiki/vagrant)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131661
Change subject: Add links to documentation of multimedia-related roles
..
Add links to documentation of multimedia-related roles
Change-Id: I530cfa7a2f2011c3608b76e79b3d18e18a239049
---
M puppet/manifests/roles/commonsmetadata.pp
M puppet/manifests/roles/multimedia.pp
M puppet/manifests/roles/multimediaviewer.pp
M puppet/manifests/roles/timedmediahandler.pp
M puppet/manifests/roles/uploadwizard.pp
5 files changed, 18 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/61/131661/1
diff --git a/puppet/manifests/roles/commonsmetadata.pp
b/puppet/manifests/roles/commonsmetadata.pp
index 727c398..707e260 100644
--- a/puppet/manifests/roles/commonsmetadata.pp
+++ b/puppet/manifests/roles/commonsmetadata.pp
@@ -1,7 +1,9 @@
# == Class: role::commonsmetadata
-# This role provisions the CommonsMetadata extension,
+# This role provisions the CommonsMetadata[1] extension,
# which adds image metadata extracted from the
# description page to the imageinfo API.
+#
+# [1] https://www.mediawiki.org/wiki/Extension:CommonsMetadata
class role::commonsmetadata {
include role::mediawiki
include role::multimedia
diff --git a/puppet/manifests/roles/multimedia.pp
b/puppet/manifests/roles/multimedia.pp
index 0876194..eb0dd5c 100644
--- a/puppet/manifests/roles/multimedia.pp
+++ b/puppet/manifests/roles/multimedia.pp
@@ -1,8 +1,13 @@
# == Class: role::multimedia
-# This class configures MediaWiki for multimedia development.
+# This class configures MediaWiki for multimedia development:
+# - installs ImageMagick
+# - raises file size limits
+# - configures [404 handler][1]
# It is meant to contain general configuration of shared use to other
# extensions that are commonly used by the multimedia team in
# development and testing.
+#
+# [1] https://www.mediawiki.org/wiki/Manual:Thumb.php#404_Handler
class role::multimedia {
include role::mediawiki
diff --git a/puppet/manifests/roles/multimediaviewer.pp
b/puppet/manifests/roles/multimediaviewer.pp
index 5a271ba..8ba394f 100644
--- a/puppet/manifests/roles/multimediaviewer.pp
+++ b/puppet/manifests/roles/multimediaviewer.pp
@@ -1,7 +1,9 @@
# == Class: role::multimediaviewer
-# This role provisions the MultimediaViewer extension,
+# This role provisions the [MultimediaViewer][1] extension,
# which shows images and their metadata in a lightbox
# when the user clicks on the thumbnails.
+#
+# [1] https://www.mediawiki.org/wiki/Extension:MultimediaViewer
class role::multimediaviewer {
include role::mediawiki
include role::multimedia
diff --git a/puppet/manifests/roles/timedmediahandler.pp
b/puppet/manifests/roles/timedmediahandler.pp
index 258d2d4..ee11e3e 100644
--- a/puppet/manifests/roles/timedmediahandler.pp
+++ b/puppet/manifests/roles/timedmediahandler.pp
@@ -1,6 +1,8 @@
# == Class: role::timedmediahandler
-# This role provisions the TimedMediaHandler extension,
+# This role provisions the [TimedMediaHandler][1] extension,
# which displays audio and video files and their captions.
+#
+# [1] https://www.mediawiki.org/wiki/Extension:TimedMediaHandler
class role::timedmediahandler {
include role::mediawiki
include role::multimedia
diff --git a/puppet/manifests/roles/uploadwizard.pp
b/puppet/manifests/roles/uploadwizard.pp
index b5d7e0b..40fe980 100644
--- a/puppet/manifests/roles/uploadwizard.pp
+++ b/puppet/manifests/roles/uploadwizard.pp
@@ -1,6 +1,8 @@
# == Class: role::uploadwizard
-# Configures a MediaWiki instance with UploadWizard, a JavaScript-driven
+# Configures a MediaWiki instance with [UploadWizard][1], a JavaScript-driven
# wizard interface for uploading multiple files.
+#
+# [1] https://www.mediawiki.org/wiki/Extension:UploadWizard
class role::uploadwizard {
include role::mediawiki
include role::eventlogging
--
To view, visit https://gerrit.wikimedia.org/r/131661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I530cfa7a2f2011c3608b76e79b3d18e18a239049
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Styling changes to padding, margin, color, and mw-ui-quiet - change (mediawiki...GuidedTour)
Phuedx has submitted this change and it was merged.
Change subject: Styling changes to padding, margin, color, and mw-ui-quiet
..
Styling changes to padding, margin, color, and mw-ui-quiet
Requested at
https://trello.com/c/MaqpJE5f/405-create-pre-edit-anonymous-editor-signup-invitation-guided-tour
,
except mw-ui-quiet which is based on a mockup
* Float quiet buttons to the left, and set margin-left and horizontal
padding to 0
* Lower whitespace above guider title
* Add more whitespace between description and buttons
* Set description color to #252525
Change-Id: If8e27c85fdda9a828c79edbfc298bc3d66008e6b
---
M modules/ext.guidedTour.less
1 file changed, 10 insertions(+), 0 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.guidedTour.less b/modules/ext.guidedTour.less
index 7e3a691..23323c2 100644
--- a/modules/ext.guidedTour.less
+++ b/modules/ext.guidedTour.less
@@ -18,6 +18,13 @@
margin-left: 6px;
float: right;
}
+
+ .mw-ui-quiet {
+ float: left;
+ margin-left: 0;
+ padding-left: 0;
+ padding-right: 0;
+ }
}
.guider_content {
@@ -25,6 +32,7 @@
color: #000;
font-size: 1.5em;
font-weight: bold;
+ padding-top: 0.1em;
margin-bottom: 4px;
border-bottom: none;
}
@@ -32,6 +40,8 @@
p {
font-size: 1em;
line-height: 1.3em;
+ color: #252525;
+ margin-bottom: 1.5em;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/131020
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If8e27c85fdda9a828c79edbfc298bc3d66008e6b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/GuidedTour
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen
Gerrit-Reviewer: MSyed
Gerrit-Reviewer: Mattflaschen
Gerrit-Reviewer: Phuedx
Gerrit-Reviewer: Robmoen
Gerrit-Reviewer: Swalling
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Edit captcha right arrow and save anon check icon tap fixes. - change (apps...wikipedia)
Mhurd has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131660
Change subject: Edit captcha right arrow and save anon check icon tap fixes.
..
Edit captcha right arrow and save anon check icon tap fixes.
Change-Id: Ie9fdd02e604d00be1d833a9794c0418e498d0089
---
M wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
1 file changed, 22 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/60/131660/1
diff --git a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
index b144098..4486a39 100644
--- a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
+++ b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
@@ -99,14 +99,23 @@
case NAVBAR_BUTTON_ARROW_RIGHT: /* for captcha submit button */
case NAVBAR_BUTTON_CHECK:
{
-if(NAV.navBarMode == NAVBAR_MODE_EDIT_WIKITEXT_WARNING){
-[self save];
-[self logEvent: @{@"action": @"abuseFilterWarningIgnore"}
-schema: LOG_SCHEMA_EDIT];
-}else{
-[self saveOrShowSignInActionSheetsIfNotLoggedIn];
+switch (NAV.navBarMode) {
+case NAVBAR_MODE_EDIT_WIKITEXT_WARNING:
+[self save];
+[self logEvent: @{@"action":
@"abuseFilterWarningIgnore"}
+schema: LOG_SCHEMA_EDIT];
+break;
+case NAVBAR_MODE_EDIT_WIKITEXT_CAPTCHA:
+[self save];
+break;
+case NAVBAR_MODE_EDIT_WIKITEXT_LOGIN_OR_SAVE_ANONYMOUSLY:
+// Login/SaveAnon buttons are already visible, so fake
out a "Save Anonymously" button tap.
+[self performPreviewChoiceAction:PREVIEW_CHOICE_SAVE];
+break;
+default:
+[self saveOrShowSignInActionSheetsIfNotLoggedIn];
+break;
}
-
}
break;
default:
@@ -305,7 +314,12 @@
UIView *tappedChildView = userInfo[@"tappedChild"];
if (tappedChildView) tappedItem = tappedChildView;
-switch (tappedItem.tag) {
+[self performPreviewChoiceAction:tappedItem.tag];
+}
+
+-(void)performPreviewChoiceAction:(PreviewChoices)choice
+{
+switch (choice) {
case PREVIEW_CHOICE_LOGIN_THEN_SAVE:{
self.saveAutomaticallyIfSignedIn = YES;
LoginViewController *loginVC =
[self.navigationController.storyboard
instantiateViewControllerWithIdentifier:@"LoginViewController"];
--
To view, visit https://gerrit.wikimedia.org/r/131660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9fdd02e604d00be1d833a9794c0418e498d0089
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adjust config for MariaDB 10 - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: Adjust config for MariaDB 10 .. Adjust config for MariaDB 10 Change-Id: I28a91c5c12c0160d35ee1066edb64efe57890d5a --- M templates/mariadb/tendril.my.cnf.erb 1 file changed, 8 insertions(+), 13 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/mariadb/tendril.my.cnf.erb b/templates/mariadb/tendril.my.cnf.erb index 177a9c6..8dcd9fc 100644 --- a/templates/mariadb/tendril.my.cnf.erb +++ b/templates/mariadb/tendril.my.cnf.erb @@ -8,8 +8,6 @@ [mysqld] -#log_bin -#log_slave_updates skip-external-locking skip-name-resolve temp-pool @@ -24,31 +22,28 @@ max_connections= 250 max_allowed_packet = 16M -sync_binlog= 0 -binlog_format = statement -expire_logs_days = 30 connect_timeout= 3 max_connect_errors = 10 query_cache_size = 0 query_cache_type = 0 event_scheduler= 1 +plugin-load= ha_tokudb +open-files-limit = 10 table_open_cache = 5000 table_definition_cache = 5000 transaction-isolation = READ-COMMITTED innodb_file_per_table = 1 -innodb_buffer_pool_size= <%= (Float(@memorysize.split[0]) * 0.85).round %>G -innodb_log_file_size = 5G +innodb_buffer_pool_size= 4G +innodb_log_file_size = 1G innodb_flush_log_at_trx_commit = 0 innodb_flush_method= O_DIRECT -innodb_thread_concurrency = 0 -innodb_io_capacity = 1000 -innodb_read_io_threads = 16 -innodb_write_io_threads= 8 -innodb_old_blocks_pct = 80 -innodb_old_blocks_time = 1000 aria_pagecache_buffer_size = 1G +tokudb_cache_size = 32G + +optimizer_switch='engine_condition_pushdown=on,optimize_join_buffer_size=on' +join_cache_level = 8 [mysqldump] -- To view, visit https://gerrit.wikimedia.org/r/131659 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I28a91c5c12c0160d35ee1066edb64efe57890d5a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adjust config for MariaDB 10 - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/131659 Change subject: Adjust config for MariaDB 10 .. Adjust config for MariaDB 10 Change-Id: I28a91c5c12c0160d35ee1066edb64efe57890d5a --- M templates/mariadb/tendril.my.cnf.erb 1 file changed, 8 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/59/131659/1 diff --git a/templates/mariadb/tendril.my.cnf.erb b/templates/mariadb/tendril.my.cnf.erb index 177a9c6..8dcd9fc 100644 --- a/templates/mariadb/tendril.my.cnf.erb +++ b/templates/mariadb/tendril.my.cnf.erb @@ -8,8 +8,6 @@ [mysqld] -#log_bin -#log_slave_updates skip-external-locking skip-name-resolve temp-pool @@ -24,31 +22,28 @@ max_connections= 250 max_allowed_packet = 16M -sync_binlog= 0 -binlog_format = statement -expire_logs_days = 30 connect_timeout= 3 max_connect_errors = 10 query_cache_size = 0 query_cache_type = 0 event_scheduler= 1 +plugin-load= ha_tokudb +open-files-limit = 10 table_open_cache = 5000 table_definition_cache = 5000 transaction-isolation = READ-COMMITTED innodb_file_per_table = 1 -innodb_buffer_pool_size= <%= (Float(@memorysize.split[0]) * 0.85).round %>G -innodb_log_file_size = 5G +innodb_buffer_pool_size= 4G +innodb_log_file_size = 1G innodb_flush_log_at_trx_commit = 0 innodb_flush_method= O_DIRECT -innodb_thread_concurrency = 0 -innodb_io_capacity = 1000 -innodb_read_io_threads = 16 -innodb_write_io_threads= 8 -innodb_old_blocks_pct = 80 -innodb_old_blocks_time = 1000 aria_pagecache_buffer_size = 1G +tokudb_cache_size = 32G + +optimizer_switch='engine_condition_pushdown=on,optimize_join_buffer_size=on' +join_cache_level = 8 [mysqldump] -- To view, visit https://gerrit.wikimedia.org/r/131659 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I28a91c5c12c0160d35ee1066edb64efe57890d5a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use TextExtracts and PageImages extensions - change (mediawiki...TwitterCards)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131658
Change subject: Use TextExtracts and PageImages extensions
..
Use TextExtracts and PageImages extensions
TextExtracts provides clean plain text summaries of article context,
and PageImages selects useful images to be used for display, as can
be seen by their usage in Popups. This adds a hard dependency
upon both extensions.
The extension now creates "summary" type cards, which works best
for Wikipedia-type content. We'll probably want to add galleries
and photo cards for Commons and other projects.
An internal API call is made to communicate with TextExtracts
and PageImages.
$wgTwitterCardsHandle was added to specify the site's twitter handle
rather than falling back to $wgSitename.
This also fixes bug 62134 since we no longer use WikiPage (which was
never necessary to begin with).
Bug: 62134
Change-Id: I8e22a7a13aada2fb3b446923cec13b8496b9bc7a
---
M TwitterCards.php
1 file changed, 61 insertions(+), 73 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwitterCards
refs/changes/58/131658/1
diff --git a/TwitterCards.php b/TwitterCards.php
index 4de577c..02a9e27 100644
--- a/TwitterCards.php
+++ b/TwitterCards.php
@@ -3,6 +3,7 @@
* TwitterCards
* Extensions
* @author Harsh Kothari (http://mediawiki.org/wiki/User:Harsh4101991)
+ * @author Kunal Mehta
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
*
* This program is free software; you can redistribute it and/or
@@ -15,102 +16,89 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-if ( !defined( 'MEDIAWIKI' ) ) die( "This is an extension to the MediaWiki
package and cannot be run standalone." );
+if ( !defined( 'MEDIAWIKI' ) ) {
+ die( "This is an extension to the MediaWiki package and cannot be run
standalone." );
+}
-$wgExtensionCredits['parserhook'][] = array (
+$wgExtensionCredits['other'][] = array (
'path' => __FILE__,
'name' => 'TwitterCards',
- 'author' => 'Harsh Kothari',
+ 'author' => array( 'Harsh Kothari', 'Kunal Mehta' ),
'descriptionmsg' => 'twittercards-desc',
'url' => 'https://www.mediawiki.org/wiki/Extension:TwitterCards',
);
+
+/**
+ * Set this to your wiki's twitter handle
+ * for example: '@wikipedia'
+ * @var string
+ */
+$wgTwitterCardsHandle = '';
$wgExtensionMessagesFiles['TwitterCardsMagic'] = __DIR__ .
'/TwitterCards.magic.php';
$wgMessagesDirs['TwitterCards'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['TwitterCards'] = __DIR__ . '/TwitterCards.i18n.php';
-$wgHooks['BeforePageDisplay'][] = 'efTwitterCardsHook';
+$wgHooks['BeforePageDisplay'][] = 'efTwitterCardsSummary';
/**
* Adds TwitterCards metadata for Images.
* This is a callback method for the BeforePageDisplay hook.
*
- * @param &$out OutputPage The output page
- * @param &$sk SkinTemplate The skin template
- * @return Boolean always true, to go on with BeforePageDisplay processing
+ * @param OutputPage &$out
+ * @param SkinTemplate &$sk
+ * @return bool
*/
-function efTwitterCardsHook( &$out, &$sk ) {
- global $wgLogo, $wgSitename, $wgUploadPath, $wgServer, $wgArticleId;
+function efTwitterCardsSummary( OutputPage &$out, SkinTemplate &$sk ) {
+ global $wgTwitterCardsHandle;
- $title = $out->getTitle();
- $isMainpage = $title->isMainPage();
-
- $meta = array();
- $meta["twitter:card"] = "photo"; // current proof of concept is
tailored to work with images
- $meta["twitter:site"] = $wgSitename;
-
- $dbr = wfGetDB( DB_SLAVE );
- $pageId = $out->getWikiPage()->getId();
- $res = $dbr->select(
- 'revision',
- 'rev_user_text',
- 'rev_page = "' . $pageId . '"',
- __METHOD__,
- array( 'ORDER BY' => 'rev_timestamp ASC limit 1' )
- );
- if ( $row = $res->fetchObject() ) {
- $meta["twitter:creator"] = $row->rev_user_text;
- }
-
- $meta["twitter:title"] = $title->getText();
- $img_name = $title->getText();
-
- if ( isset( $out->mDescription ) ) {
- // Uses the Description2 extension
- $meta["twitter:description"] = $out->mDescription;
- } else {
- // Gets description for content
- $dbr = wfGetDB( DB_SLAVE );
- $img_name = str_replace(' ', '_', $img_name); //TODO: use Title
object instead to get a proper title
- $res = $dbr->select(
- 'image',
- 'img_description',
- 'img_name = "' . $img_name . '"',
- __METHOD__,
- array( 'ORDER BY' => 'img_description ASC limit 1' )
- );
- if ( $row = $res->f
[MediaWiki-commits] [Gerrit] Replace db1020 with db1049 in s4 - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: Replace db1020 with db1049 in s4
..
Replace db1020 with db1049 in s4
Change-Id: I7706151d643e0b0b1583325cdcbc62fb4ecf3277
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index ab569d2..c58e3be 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -623,7 +623,7 @@
}
# eqiad dbs
-node /^db10(43|49|50|51|52|55|56|61|62)\.eqiad\.wmnet/ {
+node /^db10(43|50|51|52|55|56|61|62)\.eqiad\.wmnet/ {
class { 'role::coredb::s1':
innodb_file_per_table => true,
mariadb => true,
@@ -646,7 +646,7 @@
}
}
-node /^db10(04|11|20|40|42|59)\.eqiad\.wmnet/ {
+node /^db10(04|11|40|42|49|59)\.eqiad\.wmnet/ {
class { 'role::coredb::s4':
innodb_file_per_table => true,
mariadb => true,
--
To view, visit https://gerrit.wikimedia.org/r/131657
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7706151d643e0b0b1583325cdcbc62fb4ecf3277
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
Gerrit-Reviewer: Springle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace db1020 with db1049 in s4 - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131657
Change subject: Replace db1020 with db1049 in s4
..
Replace db1020 with db1049 in s4
Change-Id: I7706151d643e0b0b1583325cdcbc62fb4ecf3277
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/131657/1
diff --git a/manifests/site.pp b/manifests/site.pp
index ab569d2..c58e3be 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -623,7 +623,7 @@
}
# eqiad dbs
-node /^db10(43|49|50|51|52|55|56|61|62)\.eqiad\.wmnet/ {
+node /^db10(43|50|51|52|55|56|61|62)\.eqiad\.wmnet/ {
class { 'role::coredb::s1':
innodb_file_per_table => true,
mariadb => true,
@@ -646,7 +646,7 @@
}
}
-node /^db10(04|11|20|40|42|59)\.eqiad\.wmnet/ {
+node /^db10(04|11|40|42|49|59)\.eqiad\.wmnet/ {
class { 'role::coredb::s4':
innodb_file_per_table => true,
mariadb => true,
--
To view, visit https://gerrit.wikimedia.org/r/131657
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7706151d643e0b0b1583325cdcbc62fb4ecf3277
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add mattflaschen to mortals (following rename from 'mflaschen') - change (operations/puppet)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/131656 Change subject: Add mattflaschen to mortals (following rename from 'mflaschen') .. Add mattflaschen to mortals (following rename from 'mflaschen') This patch restores deployment rights for Matt Flaschen after they were inadvertantly stripped from him by change Iacec7bb90. Change-Id: I21f85064ae16cf6da6baa049533d670beb34cfca --- M manifests/admins.pp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/56/131656/1 diff --git a/manifests/admins.pp b/manifests/admins.pp index b8b5581..5c6bb4d 100644 --- a/manifests/admins.pp +++ b/manifests/admins.pp @@ -3848,7 +3848,8 @@ include accounts::krinkle include accounts::manybubbles # promoted per RT 5691 include accounts::maxsem -include accounts::mflaschen +include accounts::mflaschen # renamed to 'mattflaschen' +include accounts::mattflaschen include accounts::marktraceur include accounts::mhoover # access revoked include accounts::milimetric # promoted per RT 5982 -- To view, visit https://gerrit.wikimedia.org/r/131656 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I21f85064ae16cf6da6baa049533d670beb34cfca Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Queue Consumer(s) for two new "fredge" queues - change (wikimedia...crm)
Katie Horn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131655
Change subject: New Queue Consumer(s) for two new "fredge" queues
..
New Queue Consumer(s) for two new "fredge" queues
Current stability status: It Works On My Local.
Change-Id: Ib905a5370adbd1bddf3528ba689890df0aebc952
---
M drupal
A sites/all/modules/queue2civicrm/fredge/fredge_queue_consume.drush.inc
A sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.info
A sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.install
A sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
5 files changed, 495 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/55/131655/1
diff --git a/drupal b/drupal
index 3aadd3a..300f513 16
--- a/drupal
+++ b/drupal
-Subproject commit 3aadd3a0f6b08b1e75cca40c0f86c6a44dad27b1
+Subproject commit 300f51331d5b190db0e51ed0636c327b268a869b
diff --git
a/sites/all/modules/queue2civicrm/fredge/fredge_queue_consume.drush.inc
b/sites/all/modules/queue2civicrm/fredge/fredge_queue_consume.drush.inc
new file mode 100644
index 000..8bc6380
--- /dev/null
+++ b/sites/all/modules/queue2civicrm/fredge/fredge_queue_consume.drush.inc
@@ -0,0 +1,60 @@
+
+ */
+
+/**
+ * Implementation of hook_drush_command()
+ */
+function fredge_queue_consume_drush_command() {
+ $items = array();
+
+ $items['fredge-queue-consume'] = array(
+ 'description' => 'Populates the fredge database with messages
it pops off of one of several queues',
+'examples' => array(
+ 'drush fredge-queue-consume' => 'Shovels messages
straight into the database.',
+),
+ 'aliases' => array( 'fqc' ),
+ );
+ return $items;
+}
+
+/**
+ * Implementation of hook_drush_help()
+ *
+ * @param $section
+ * @return mixed
+ */
+function fredge_queue_consume_drush_help( $section ) {
+ switch ( $section ) {
+ case 'drush:fredge-queue-consume':
+ return dt( "Pulls fredge requests from a remote queue;
then uses the Civi API to opt them out.");
+ }
+}
+
+/**
+ * Generates translated versions of the fredge pages from the
+ * DonationInterface i18n files.
+ */
+function drush_fredge_queue_consume() {
+ watchdog('fredge', 'Executing: drush_fredge_queue_consume');
+ module_invoke( 'fredge', 'batch_process' );
+ $errors = drush_get_error_log();
+ if (!empty($errors)){
+ echo "\n***ERRORS***";
+ foreach($errors as $error=>$msgarray){
+ echo "\n$error: ";
+ foreach ($msgarray as $count=>$message){
+ echo "\n $message";
+ }
+ }
+ echo "\n\n";
+ exit(drush_get_error());
+ }
+}
+
diff --git a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.info
b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.info
new file mode 100644
index 000..7437b44
--- /dev/null
+++ b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.info
@@ -0,0 +1,6 @@
+name = WMF fredge Queue Consumer
+description = Raids several queues for fundraiser metrics-type noncritical
data.
+core = 7.x
+package = queue2civicrm
+configure = admin/config/queue2civicrm/fredge_qc
+dependencies[] = queue2civicrm
diff --git a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.install
b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.install
new file mode 100644
index 000..36b0b27
--- /dev/null
+++ b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.install
@@ -0,0 +1,229 @@
+push('fredge');
+
+ $tables = wmf_fredge_qc_get_schema_7001();
+
+ //If they're not there, create all 7001 tables
+ foreach ($tables as $table => $schema) {
+if (!db_table_exists($table)) {
+ db_create_table($table, $schema);
+}
+ }
+}
+
+/**
+ * This is for use by the actual fredge qc, so we don't have to duplicate code
+ * all over the place. Could get tricky down the road, because I'm just sort of
+ * guessing about what isn't going to suck later. If I guessed wrong, change
it.
+ * @return array tablename => schema
+ */
+function wmf_fredge_qc_get_current_schema() {
+ return wmf_fredge_qc_get_schema_7001();
+}
+
+/**
+ * Return an array of tablename => schema.
+ */
+function wmf_fredge_qc_get_schema_7001() {
+ $tables = array(
+/**
+ * payments_initial table
+ **/
+'payments_initial' => array(
+ 'description' => t('Tracks user experience through donation pipeline.'),
+ 'fields' => array(
+'id' => array(
+ 'type' => 'serial',
+ 'size' => 'big',
+ 'unsigned' => true,
+ 'not null' => true
+),
+'contribution_tracking_id' => array(
+ 'type' => 'int',
+ 'size' => 'normal',
+ 'not null' => false
+),
+'gate
[MediaWiki-commits] [Gerrit] Depool db1049 for maintenance. - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Depool db1049 for maintenance. .. Depool db1049 for maintenance. Change-Id: I0186979aa39149db195d05d7488db3eb56b7b1e6 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d46bcb1..a19973c 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -88,7 +88,7 @@ # no pool 'db1050' => 0, # 2.8TB sas 64GB, snapshot 'db1055' => 0, # watchlist, recentchangeslinked, contributions, logpager 'db1043' => 0, # 1.4TB sas 64GB, vslow, api, dump - 'db1049' => 300, # 2.8TB sas 64GB + # maintenance 'db1049' => 300, # 2.8TB sas 64GB 'db1051' => 400, # 2.8TB sas 96GB 'db1056' => 400, # 2.8TB sas 96GB 'db1061' => 500, # 2.8TB sas 128GB -- To view, visit https://gerrit.wikimedia.org/r/131654 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0186979aa39149db195d05d7488db3eb56b7b1e6 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Depool db1049 for maintenance. - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/131654 Change subject: Depool db1049 for maintenance. .. Depool db1049 for maintenance. Change-Id: I0186979aa39149db195d05d7488db3eb56b7b1e6 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/54/131654/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d46bcb1..a19973c 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -88,7 +88,7 @@ # no pool 'db1050' => 0, # 2.8TB sas 64GB, snapshot 'db1055' => 0, # watchlist, recentchangeslinked, contributions, logpager 'db1043' => 0, # 1.4TB sas 64GB, vslow, api, dump - 'db1049' => 300, # 2.8TB sas 64GB + # maintenance 'db1049' => 300, # 2.8TB sas 64GB 'db1051' => 400, # 2.8TB sas 96GB 'db1056' => 400, # 2.8TB sas 96GB 'db1061' => 500, # 2.8TB sas 128GB -- To view, visit https://gerrit.wikimedia.org/r/131654 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0186979aa39149db195d05d7488db3eb56b7b1e6 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clarify title - change (analytics...data)
Milimetric has submitted this change and it was merged.
Change subject: Clarify title
..
Clarify title
Change-Id: Id9bc354bfd5aebcf88f4902a7824af62dc98c611
---
M graphs/pageviews.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/graphs/pageviews.json b/graphs/pageviews.json
index 0b2cdc7..b3a32fb 100644
--- a/graphs/pageviews.json
+++ b/graphs/pageviews.json
@@ -1,7 +1,7 @@
{
"id": "pageviews",
"slug": "pageviews",
-"name": "Pageviews for All Wikimedia Projects",
+"name": "Pageviews for All Wikimedia Projects (mobile + desktop)",
"desc": "December 2009 - March 2010: Due to server problems, page view
counts from squid logs are too low, estimated underreporting 10%-25%. View
counts for all months have been normalized to 30 days.Unlike the
corresponding report with page
views by project here the following two sites are also counted: WikiData and the Wikipedia Main Portal
page.",
"root": {
"nodeType": "canvas",
--
To view, visit https://gerrit.wikimedia.org/r/131653
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id9bc354bfd5aebcf88f4902a7824af62dc98c611
Gerrit-PatchSet: 1
Gerrit-Project: analytics/reportcard/data
Gerrit-Branch: master
Gerrit-Owner: Milimetric
Gerrit-Reviewer: Milimetric
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clarify title - change (analytics...data)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131653
Change subject: Clarify title
..
Clarify title
Change-Id: Id9bc354bfd5aebcf88f4902a7824af62dc98c611
---
M graphs/pageviews.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/reportcard/data
refs/changes/53/131653/1
diff --git a/graphs/pageviews.json b/graphs/pageviews.json
index 0b2cdc7..b3a32fb 100644
--- a/graphs/pageviews.json
+++ b/graphs/pageviews.json
@@ -1,7 +1,7 @@
{
"id": "pageviews",
"slug": "pageviews",
-"name": "Pageviews for All Wikimedia Projects",
+"name": "Pageviews for All Wikimedia Projects (mobile + desktop)",
"desc": "December 2009 - March 2010: Due to server problems, page view
counts from squid logs are too low, estimated underreporting 10%-25%. View
counts for all months have been normalized to 30 days.Unlike the
corresponding report with page
views by project here the following two sites are also counted: WikiData and the Wikipedia Main Portal
page.",
"root": {
"nodeType": "canvas",
--
To view, visit https://gerrit.wikimedia.org/r/131653
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9bc354bfd5aebcf88f4902a7824af62dc98c611
Gerrit-PatchSet: 1
Gerrit-Project: analytics/reportcard/data
Gerrit-Branch: master
Gerrit-Owner: Milimetric
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 1a16b5a..ad2fdfb - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/131652 Change subject: Syncronize VisualEditor: 1a16b5a..ad2fdfb .. Syncronize VisualEditor: 1a16b5a..ad2fdfb Change-Id: Ie267623003a00b44ea488ed23627c7fb69a8d17e --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/52/131652/1 diff --git a/VisualEditor b/VisualEditor index 1a16b5a..ad2fdfb 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 1a16b5aa9ef7141d67ef2625a95a35ff559744ef +Subproject commit ad2fdfb66bd8e4152831fd2cc631fbc2fc06b867 -- To view, visit https://gerrit.wikimedia.org/r/131652 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie267623003a00b44ea488ed23627c7fb69a8d17e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 1a16b5a..ad2fdfb - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 1a16b5a..ad2fdfb .. Syncronize VisualEditor: 1a16b5a..ad2fdfb Change-Id: Ie267623003a00b44ea488ed23627c7fb69a8d17e --- 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 1a16b5a..ad2fdfb 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 1a16b5aa9ef7141d67ef2625a95a35ff559744ef +Subproject commit ad2fdfb66bd8e4152831fd2cc631fbc2fc06b867 -- To view, visit https://gerrit.wikimedia.org/r/131652 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie267623003a00b44ea488ed23627c7fb69a8d17e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ve.init.mw.ViewPageTarget: Actually animate the toolbar duri... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: ve.init.mw.ViewPageTarget: Actually animate the toolbar during
setup
..
ve.init.mw.ViewPageTarget: Actually animate the toolbar during setup
There was a slideDown() call, but this didn't do anything since
toolbars are visible and in the DOM by default.
As a temporary hack, hide it synchronously after creation and
then do the slideDown still.
This could ever so briefly cause a flash, though that didn't
happen in my testing.
This makes the experience smoother when we initialise the surface.
In particular the moment where we swap #bodyContent for our Surface
(which should look visually almost identical), before this change
it was still a bit of a flash since the Surface version has a
toolbar on top, and thus instead of swapping smoothly, we hide
content and show a similar piece of content that has an incompatible
offset from the top.
Bug: 64751
Change-Id: Id94974ba71fd887ce494d7b2b16ec62d43b18575
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
2 files changed, 15 insertions(+), 2 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 6fec20c..c222bcd 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -210,17 +210,29 @@
* @inheritdoc
*/
ve.init.mw.ViewPageTarget.prototype.setUpToolbar = function () {
- var $firstHeading = $( '#firstHeading' );
+ var $firstHeading;
// Parent method
ve.init.mw.Target.prototype.setUpToolbar.call( this );
+
+ // Keep it hidden so that we can slide it down smoothly (avoids sudden
+ // offset flash when original content is hidden, and replaced in-place
with a
+ // similar-looking surface).
+ // FIXME: This is not ideal, the parent class creates it and appends
+ // to target (visibly), only for us to hide it again 0ms later.
+ // Though we can't hide it by default because it needs visible
dimensions
+ // to compute stuff during setup.
+ this.toolbar.$bar.hide();
this.toolbar.enableFloatable();
this.toolbar.$element
.addClass( 've-init-mw-viewPageTarget-toolbar' );
+
// Move the toolbar to before #firstHeading if it exists
+ $firstHeading = $( '#firstHeading' );
if ( $firstHeading.length ) {
this.toolbar.$element.insertBefore( $firstHeading );
}
+
this.toolbar.$bar.slideDown( 'fast', ve.bind( function () {
// Check the surface wasn't torn down while the toolbar was
animating
if ( this.surface ) {
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 92506b3..f5371af 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -1311,7 +1311,8 @@
setTimeout( function () {
// Build model
var dmDoc = ve.dm.converter.getModelFromDom(
- doc, null,
+ doc,
+ null,
mw.config.get( 'wgVisualEditor' ).pageLanguageCode,
mw.config.get( 'wgVisualEditor' ).pageLanguageDir
);
--
To view, visit https://gerrit.wikimedia.org/r/131071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id94974ba71fd887ce494d7b2b16ec62d43b18575
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Robmoen
Gerrit-Reviewer: Trevor Parscal
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 parallel replication thread pool for analytics-slave. - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: Enable parallel replication thread pool for analytics-slave. .. Enable parallel replication thread pool for analytics-slave. Change-Id: I3832750824803fb4436ebe6aa57efe41918f9509 --- M templates/mariadb/analytics.my.cnf.erb 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/mariadb/analytics.my.cnf.erb b/templates/mariadb/analytics.my.cnf.erb index ef92e05..e984cf0 100644 --- a/templates/mariadb/analytics.my.cnf.erb +++ b/templates/mariadb/analytics.my.cnf.erb @@ -58,6 +58,7 @@ skip-slave-start slave_transaction_retries = 4294967295 +slave_parallel_threads = 4 # Eventlogging from m2 master m2.replicate-wild-do-table = log.% -- To view, visit https://gerrit.wikimedia.org/r/131651 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3832750824803fb4436ebe6aa57efe41918f9509 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle Gerrit-Reviewer: Springle 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 parallel replication thread pool for analytics-slave. - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/131651 Change subject: Enable parallel replication thread pool for analytics-slave. .. Enable parallel replication thread pool for analytics-slave. Change-Id: I3832750824803fb4436ebe6aa57efe41918f9509 --- M templates/mariadb/analytics.my.cnf.erb 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/51/131651/1 diff --git a/templates/mariadb/analytics.my.cnf.erb b/templates/mariadb/analytics.my.cnf.erb index ef92e05..e984cf0 100644 --- a/templates/mariadb/analytics.my.cnf.erb +++ b/templates/mariadb/analytics.my.cnf.erb @@ -58,6 +58,7 @@ skip-slave-start slave_transaction_retries = 4294967295 +slave_parallel_threads = 4 # Eventlogging from m2 master m2.replicate-wild-do-table = log.% -- To view, visit https://gerrit.wikimedia.org/r/131651 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3832750824803fb4436ebe6aa57efe41918f9509 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] 'Fix' the DiskFileDataStore - change (wikimedia...SmashPig)
Mwalker has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131650
Change subject: 'Fix' the DiskFileDataStore
..
'Fix' the DiskFileDataStore
If the problem is that we remove things too early, just dont
remove them :p.
This will leave a reasonable number of keys directories in
the temp directory. However, they are really generic (they
have names like correlationId) so it's not such a bad thing.
Change-Id: I545ab8ca8b1ad84f179f3e85d5f2cf05821f1bec
---
M Core/DataStores/DiskFileDataStore.php
1 file changed, 8 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig
refs/changes/50/131650/1
diff --git a/Core/DataStores/DiskFileDataStore.php
b/Core/DataStores/DiskFileDataStore.php
index bcd34a7..9b364b4 100644
--- a/Core/DataStores/DiskFileDataStore.php
+++ b/Core/DataStores/DiskFileDataStore.php
@@ -11,10 +11,6 @@
*
* Use the local file system as a backup high availability datastore.
*
- * TODO: Fix time of check to time of use errors in the cleanup functions
- * Under high load php cannot check and then do file system operations on
- * the key directories fast enough. You will get rmdir and mkdir errors.
- *
* @package SmashPig\Core\DataStores
*/
class DiskFileDataStore extends KeyedOpaqueDataStore {
@@ -287,7 +283,14 @@
}
/**
-* Removes an file system entry created by addKeyedLinkingFile. Will
remove empty directories
+* Removes an file system entry created by addKeyedLinkingFile.
+*
+* Will not attempt to remove empty directories because of time
+* of use problems (could potentially delete after something checks
+* for the folders existence but before it writes.) This will leave
+* a number of generic keys folders around the file system.
+*
+* TODO: Write a cleanup maintenance script for ^.
*
* @param string $key Name of key, e.g. 'correlationId'.
* @param string $value Value of the key.
@@ -301,31 +304,5 @@
DiskFileDataStore::escapeName( $value )
);
unlink( AutoLoader::makePath( $path, $linkName ) );
-
- // Do some cleanup if possible
- if ( $this->isDirEmpty( $path ) ) {
- rmdir( $path );
- }
- }
-
- /**
-* Determine if a file system directory is empty.
-*
-* @param string $dir Directory path
-*
-* @return bool True if empty
-*/
- protected function isDirEmpty( $dir ) {
- $retval = true;
-
- $handle = opendir( $dir );
- while ( ( $entry = readdir( $handle ) ) !== false ) {
- if ( $entry !== '.' && $entry !== '..' ) {
- $retval = false;
- break;
- }
- }
- closedir( $handle );
- return $retval;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/131650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I545ab8ca8b1ad84f179f3e85d5f2cf05821f1bec
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Mwalker
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add basic test framework - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131649
Change subject: Add basic test framework
..
Add basic test framework
WIP, need to write tests because these dummy ones are bunk.
Change-Id: Ida2d7de450fe0fe18d02533ca739c745c64de332
---
M public/javascripts/app.js
M public/javascripts/libs/backbone.js
A public/javascripts/main_test.js
A public/javascripts/tests/base_test.js
A public/javascripts/tests/maps_test.js
A public/npm-debug.log
D public/tests/main_test.js
M routes/index.js
M views/index.jade
M views/layout.jade
10 files changed, 94 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/49/131649/1
diff --git a/public/javascripts/app.js b/public/javascripts/app.js
index 2ea2c97..88dd829 100644
--- a/public/javascripts/app.js
+++ b/public/javascripts/app.js
@@ -6,4 +6,11 @@
return { init: init };
+});
+
+define(function() {
+var testTest = function(a, b) {
+return (a + b);
+};
+return testTest;
});
\ No newline at end of file
diff --git a/public/javascripts/libs/backbone.js
b/public/javascripts/libs/backbone.js
index 8958c79..5814032 100644
--- a/public/javascripts/libs/backbone.js
+++ b/public/javascripts/libs/backbone.js
@@ -4,6 +4,14 @@
// For all details and documentation:
// http://documentcloud.github.com/backbone
+
+define(function() {
+var testTest = function(a, b) {
+return (a + b);
+};
+return testTest;
+});
+
(function(){
// Initial Setup
diff --git a/public/javascripts/main_test.js b/public/javascripts/main_test.js
new file mode 100644
index 000..544a2bc
--- /dev/null
+++ b/public/javascripts/main_test.js
@@ -0,0 +1,28 @@
+"use strict";
+require.config({
+paths: {
+'QUnit': 'libs/qunit'
+},
+shim: {
+ 'QUnit': {
+ exports: 'QUnit',
+ init: function() {
+ QUnit.config.autoload = false;
+ QUnit.config.autostart = false;
+ }
+ }
+}
+});
+
+// require the unit tests.
+require(
+['QUnit', 'tests/base_test', 'tests/maps_test'],
+function(QUnit, base_test, maps_test) {
+// run the tests.
+base_test.run();
+maps_test.run();
+// start QUnit.
+QUnit.load();
+QUnit.start();
+}
+);
\ No newline at end of file
diff --git a/public/javascripts/tests/base_test.js
b/public/javascripts/tests/base_test.js
new file mode 100644
index 000..80a1bf0
--- /dev/null
+++ b/public/javascripts/tests/base_test.js
@@ -0,0 +1,13 @@
+"use strict";
+define(
+['libs/backbone'],
+function(appJS) {
+var run = function() {
+test('appJS should return the sum of the two supplied numbers.',
function() {
+equal(appJS(1,1), 2, 'The return should be 2.');
+equal(appJS(-2,1), -1, 'The return should be -1.');
+});
+};
+return {run: run}
+}
+);
\ No newline at end of file
diff --git a/public/javascripts/tests/maps_test.js
b/public/javascripts/tests/maps_test.js
new file mode 100644
index 000..80a1bf0
--- /dev/null
+++ b/public/javascripts/tests/maps_test.js
@@ -0,0 +1,13 @@
+"use strict";
+define(
+['libs/backbone'],
+function(appJS) {
+var run = function() {
+test('appJS should return the sum of the two supplied numbers.',
function() {
+equal(appJS(1,1), 2, 'The return should be 2.');
+equal(appJS(-2,1), -1, 'The return should be -1.');
+});
+};
+return {run: run}
+}
+);
\ No newline at end of file
diff --git a/public/npm-debug.log b/public/npm-debug.log
new file mode 100644
index 000..bf7c6e5
--- /dev/null
+++ b/public/npm-debug.log
@@ -0,0 +1,21 @@
+0 info it worked if it ends with ok
+1 verbose cli [ '/Users/sherahsmith/.nvm/v0.8.26/bin/node',
+1 verbose cli '/Users/sherahsmith/.nvm/v0.8.26/bin/npm',
+1 verbose cli 'start' ]
+2 info using npm@1.2.30
+3 info using node@v0.8.26
+4 verbose read json /Users/sherahsmith/workspace/dash/public/package.json
+5 error Error: ENOENT, open
'/Users/sherahsmith/workspace/dash/public/package.json'
+6 error If you need help, you may report this log at:
+6 error
+6 error or email it to:
+6 error
+7 error System Darwin 13.1.0
+8 error command "/Users/sherahsmith/.nvm/v0.8.26/bin/node"
"/Users/sherahsmith/.nvm/v0.8.26/bin/npm" "start"
+9 error cwd /Users/sherahsmith/workspace/dash/public
+10 error node -v v0.8.26
+11 error npm -v 1.2.30
+12 error path /Users/sherahsmith/workspace/dash/public/package.json
+13 error code ENOENT
+14 error errno 34
+15 verbose exit [ 34, true ]
diff --git a/public/tests/main_test.js b/public/tests/main_test.js
deleted file mode 100644
index 9358265..000
--- a/public/tests/main_test.js
+++ /dev/null
@@ -1 +0,0 @@
-console.log('testi
[MediaWiki-commits] [Gerrit] More Updates to Configuration - change (wikimedia...SmashPig)
Mwalker has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131648
Change subject: More Updates to Configuration
..
More Updates to Configuration
Follow up to: I29e13d8990674641b2a4a633410c116249b057da
Change-Id: I2e2912aee0828b041557b0db96c2572e0793
---
M Core/Configuration.php
M Core/Context.php
M Core/Listeners/ListenerBase.php
3 files changed, 27 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig
refs/changes/48/131648/1
diff --git a/Core/Configuration.php b/Core/Configuration.php
index 5065300..2fd0f07 100644
--- a/Core/Configuration.php
+++ b/Core/Configuration.php
@@ -23,7 +23,10 @@
protected $viewName = 'default';
/**
-* Obtains the current default configuration object. Typically the
object created by index.php
+* Obtains the current default configuration object. You should
probably be
+* using a context call instead of this. See Context->getConfiguration()
+*
+* Typically the object created by index.php
*
* @return Configuration
*/
diff --git a/Core/Context.php b/Core/Context.php
index 22f9879..8b91d65 100644
--- a/Core/Context.php
+++ b/Core/Context.php
@@ -31,6 +31,7 @@
*/
public static function get() {
if ( Context::$instance === null ) {
+ // Remove this once we know we aren't going to blow up
Logger::notice(
'Context being initialized as part of get()
request. Normally should use init() first.',
debug_backtrace( null )
@@ -80,10 +81,29 @@
return $this->sourceRevision;
}
- public function setConfiguration( Configuration $config ) {
+ /**
+* Sets a configuration object associated with this context.
+*
+* All calls to get configuration options need to happen through the
+* context object; which means that if we ever support changing
configurations
+* based on account; this will somehow require us to support either
+* stacked configurations or stacked contexts...
+*
+* @param Configuration $config
+*/
+ protected function setConfiguration( Configuration $config ) {
$this->config = $config;
}
+ /**
+* Gets the configuration object associated with the current context.
+*
+* Set the configuration using init()
+*
+* Use this instead of Configuration::getDefaultConfig();
+*
+* @return null|Configuration
+*/
public function getConfiguration() {
if ( $this->config ) {
return $this->config;
diff --git a/Core/Listeners/ListenerBase.php b/Core/Listeners/ListenerBase.php
index b14ee10..fffa26a 100644
--- a/Core/Listeners/ListenerBase.php
+++ b/Core/Listeners/ListenerBase.php
@@ -1,6 +1,6 @@
c = Core\Context::get()->getConfiguration();
+ $this->c = Context::get()->getConfiguration();
$this->inflightStore = $this->c->obj( 'data-store/inflight' );
}
--
To view, visit https://gerrit.wikimedia.org/r/131648
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e2912aee0828b041557b0db96c2572e0793
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Mwalker
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Raise redundancy back up for commonswiki_file as well - change (operations/mediawiki-config)
Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131647
Change subject: Raise redundancy back up for commonswiki_file as well
..
Raise redundancy back up for commonswiki_file as well
Change-Id: I8cc84faae899974d79257593c516f37737acdbb4
---
M wmf-config/CirrusSearch-common.php
1 file changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/47/131647/1
diff --git a/wmf-config/CirrusSearch-common.php
b/wmf-config/CirrusSearch-common.php
index 74c3401..2627c86 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -52,10 +52,6 @@
// Commons is special
if ( $wgDBname == 'commonswiki' ) {
$wgCirrusSearchNamespaceMappings[ NS_FILE ] = 'file';
-
- // Temporarily lower redundancy for commonswiki's file namespace to
save some space.
- // Should be $wgCirrusSearchReplicaCount['file'] = 2;
- $wgCirrusSearchReplicaCount['file'] = 1;
// So is everyone else, for using commons
} else {
$wgCirrusSearchExtraIndexes[ NS_FILE ] = array( 'commonswiki_file' );
--
To view, visit https://gerrit.wikimedia.org/r/131647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8cc84faae899974d79257593c516f37737acdbb4
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make JSON RC records specify the canonical server hostname - change (mediawiki/core)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131646
Change subject: Make JSON RC records specify the canonical server hostname
..
Make JSON RC records specify the canonical server hostname
Reviewers of Id819246a9 (Tim, Timo, Chad) have commented that it would be
preferable to identify wikis by their canonical hostname rather than the value
of $wgDBname. So, set that instead.
Change-Id: I503a0134a8613daddaae9d8df29a1e27fbfd93bc
---
M includes/rcfeed/MachineReadableRCFeedFormatter.php
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/46/131646/1
diff --git a/includes/rcfeed/MachineReadableRCFeedFormatter.php
b/includes/rcfeed/MachineReadableRCFeedFormatter.php
index e5077a2..d73ec8b 100644
--- a/includes/rcfeed/MachineReadableRCFeedFormatter.php
+++ b/includes/rcfeed/MachineReadableRCFeedFormatter.php
@@ -119,7 +119,11 @@
break;
}
- $packet['server_url'] = $wgCanonicalServer;
+ $parsedCanonicalServer = wfParseUrl( $wgCanonicalServer );
+ if ( isset( $parsedCanonicalServer['host'] ) ) {
+ $packet['server_url'] = $parsedCanonicalServer['host'];
+ }
+
$packet['server_script_path'] = $wgScriptPath ?: '/';
$packet['wiki'] = wfWikiID();
--
To view, visit https://gerrit.wikimedia.org/r/131646
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I503a0134a8613daddaae9d8df29a1e27fbfd93bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.mixins: Move .box-sizing mixin from mediawiki.ui u... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.mixins: Move .box-sizing mixin from mediawiki.ui
utilities
..
mediawiki.mixins: Move .box-sizing mixin from mediawiki.ui utilities
Very simple, very useful.
Change-Id: Icd3d992aaad3116fd09164e2e003619677d051bb
(cherry picked from commit 871875bed4b21e3b17d22046e121bf4e434b804b)
---
M resources/src/mediawiki.less/mediawiki.mixins.less
M resources/src/mediawiki.ui/mixins/utilities.less
2 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.less/mediawiki.mixins.less
b/resources/src/mediawiki.less/mediawiki.mixins.less
index 36f1bd4..6556af9 100644
--- a/resources/src/mediawiki.less/mediawiki.mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.mixins.less
@@ -64,3 +64,9 @@
-webkit-transition: @string;
transition: @string;
}
+
+.box-sizing(@value) {
+ -moz-box-sizing: @value;
+ -webkit-box-sizing: @value;
+ box-sizing: @value;
+}
diff --git a/resources/src/mediawiki.ui/mixins/utilities.less
b/resources/src/mediawiki.ui/mixins/utilities.less
index a201a4e..3d7b732 100644
--- a/resources/src/mediawiki.ui/mixins/utilities.less
+++ b/resources/src/mediawiki.ui/mixins/utilities.less
@@ -1,9 +1,3 @@
-.box-sizing(@value) {
- -moz-box-sizing: @value;
- -webkit-box-sizing: @value;
- box-sizing: @value;
-}
-
.agora-flush-left() {
float: left;
margin-left: 0;
--
To view, visit https://gerrit.wikimedia.org/r/131634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icd3d992aaad3116fd09164e2e003619677d051bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Category.subcategories() should yield objects that have the ... - change (pywikibot/core)
Russell Blau has uploaded a new change for review. https://gerrit.wikimedia.org/r/131644 Change subject: Category.subcategories() should yield objects that have the same properties, not just the same title, as the objects yielded by Category.members() .. Category.subcategories() should yield objects that have the same properties, not just the same title, as the objects yielded by Category.members() Change-Id: I4e31a22393ba1ce3216e0c6a65978fae8ec0c6d4 --- M pywikibot/page.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/44/131644/1 diff --git a/pywikibot/page.py b/pywikibot/page.py index 25e9046..0fb4826 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1809,7 +1809,7 @@ for member in self.site.categorymembers( self, namespaces=[14], step=step, total=total, content=content): -subcat = Category(self.site, member.title()) +subcat = Category(member) self._subcats.append(subcat) yield subcat if total is not None: -- To view, visit https://gerrit.wikimedia.org/r/131644 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e31a22393ba1ce3216e0c6a65978fae8ec0c6d4 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Russell Blau ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use subcategories() method instead of this roundabout method... - change (pywikibot/core)
Russell Blau has uploaded a new change for review. https://gerrit.wikimedia.org/r/131645 Change subject: Use subcategories() method instead of this roundabout method call. .. Use subcategories() method instead of this roundabout method call. Change-Id: Id125dade743028350148dfb00774a2dba3f3b77d --- M scripts/category_redirect.py 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/45/131645/1 diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 7aa1bc6..c60572a 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -264,8 +264,7 @@ # get a list of all members of the category-redirect category catpages = dict((c, None) -for c in self.site.categorymembers(redircat, - namespaces=[14])) +for c in redircat.subcategories()) # check the category pages for redirected categories pywikibot.output(u"") -- To view, visit https://gerrit.wikimedia.org/r/131645 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id125dade743028350148dfb00774a2dba3f3b77d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Russell Blau ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Vector: Don't supress focus outline on watch star - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131643
Change subject: Vector: Don't supress focus outline on watch star
..
Vector: Don't supress focus outline on watch star
This is an old remnant that was intended to remove outline from
images inside anchor links. However the watch star is no longer
implemented this way and this is doing nothing. Except when
the element is focussed (using keyboard tab index), then this
rule is overriding the default :focus and causing the user to
potentially get confused since it is no longer clear where the
focus has gone to.
Bug: 64934
Change-Id: I57ee089c1ae18bb7a6c55ae17eab3a06f9e1f7d2
---
M skins/vector/components/watchstar.less
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/43/131643/1
diff --git a/skins/vector/components/watchstar.less
b/skins/vector/components/watchstar.less
index b76a825..2c38516 100644
--- a/skins/vector/components/watchstar.less
+++ b/skins/vector/components/watchstar.less
@@ -5,7 +5,6 @@
#ca-watch.icon a {
margin: 0;
padding: 0;
- outline: none;
display: block;
width: 26px;
/* This hides the text but shows the background image */
--
To view, visit https://gerrit.wikimedia.org/r/131643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I57ee089c1ae18bb7a6c55ae17eab3a06f9e1f7d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix the reference close button - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix the reference close button
..
Fix the reference close button
Perform hygiene on close button -> cancel button to be consistent with
overlays in process
Bug: 64629
Change-Id: If0bd21f00c4a82582da8d74fb117eb91eae5ffcc
---
M javascripts/common/Drawer.js
M less/common/drawer.less
M templates/ReferencesDrawer.html
M templates/ctaDrawer.html
M templates/keepgoing/KeepGoingDrawer.html
5 files changed, 6 insertions(+), 7 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
Kaldari: Looks good to me, approved
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/common/Drawer.js b/javascripts/common/Drawer.js
index 75fb580..4441b6c 100644
--- a/javascripts/common/Drawer.js
+++ b/javascripts/common/Drawer.js
@@ -17,8 +17,7 @@
postRender: function() {
var self = this;
- // FIXME: Standardise on either close or cancel to be
consistent with Overlay.js
- this.$( '.close' ).click( function( ev ) {
+ this.$( '.cancel' ).click( function( ev ) {
ev.preventDefault();
self.hide();
} );
diff --git a/less/common/drawer.less b/less/common/drawer.less
index ee616b6..c396682 100644
--- a/less/common/drawer.less
+++ b/less/common/drawer.less
@@ -16,7 +16,7 @@
//
// Markup:
//
-// close
+// close
// hello
//
//
@@ -37,7 +37,7 @@
margin-top: .5em;
}
- a.close {
+ a.cancel {
padding: 0 0 1.2em;
display: block;
overflow: hidden;
diff --git a/templates/ReferencesDrawer.html b/templates/ReferencesDrawer.html
index d3189d5..9783797 100644
--- a/templates/ReferencesDrawer.html
+++ b/templates/ReferencesDrawer.html
@@ -1,4 +1,4 @@
-
+
{{title}}
{{{text}}}
diff --git a/templates/ctaDrawer.html b/templates/ctaDrawer.html
index 3164d7a..e43752a 100644
--- a/templates/ctaDrawer.html
+++ b/templates/ctaDrawer.html
@@ -1,4 +1,4 @@
-{{cancelMessage}}
+{{cancelMessage}}
{{content}}
{{loginCaption}}
diff --git a/templates/keepgoing/KeepGoingDrawer.html
b/templates/keepgoing/KeepGoingDrawer.html
index 4bfd35b..5829727 100644
--- a/templates/keepgoing/KeepGoingDrawer.html
+++ b/templates/keepgoing/KeepGoingDrawer.html
@@ -1,5 +1,5 @@
{{msg}}
- {{cancel}}
+ {{cancel}}
{{{nextLabel}}}
--
To view, visit https://gerrit.wikimedia.org/r/130786
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If0bd21f00c4a82582da8d74fb117eb91eae5ffcc
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Awjrichards
Gerrit-Reviewer: JGonera
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QA: Give VE more time to load in browser tests - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: QA: Give VE more time to load in browser tests .. QA: Give VE more time to load in browser tests When switching from the wikitext editor to VisualEditor we give the default 5 seconds of loading time for it to load. During this time not only does it need to load all its JavaScript but it also needs to re-initialise. Are you crazy Cucumber? 5 seconds to do all this magic?! Give it 20 seconds - much more reasonable and let our browsers test pass again. Change-Id: I8896e834a1fb074fab4f40ac22019864567cb6d0 --- M tests/browser/features/step_definitions/editor_ve_steps.rb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Kaldari: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/step_definitions/editor_ve_steps.rb b/tests/browser/features/step_definitions/editor_ve_steps.rb index 84b0431..a936357 100644 --- a/tests/browser/features/step_definitions/editor_ve_steps.rb +++ b/tests/browser/features/step_definitions/editor_ve_steps.rb @@ -1,5 +1,5 @@ Given(/^VisualEditor has loaded$/) do - on(ArticlePage).editor_ve_element.when_present.should exist + on(ArticlePage).editor_ve_element.when_present(20).should exist end Then(/^I see the VisualEditor$/) do -- To view, visit https://gerrit.wikimedia.org/r/131641 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8896e834a1fb074fab4f40ac22019864567cb6d0 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson Gerrit-Reviewer: Awjrichards Gerrit-Reviewer: Cmcmahon Gerrit-Reviewer: JGonera Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: Kaldari Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP JP Morgan upload and more generalization - change (wikimedia...crm)
Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131642
Change subject: WIP JP Morgan upload and more generalization
..
WIP JP Morgan upload and more generalization
Change-Id: Iab81ddb4e699f253c82c72eafd389794c97daec3
---
M sites/all/modules/offline2civicrm/ChecksFile.php
A sites/all/modules/offline2civicrm/JpMorganFile.php
M sites/all/modules/offline2civicrm/offline2civicrm.info
M sites/all/modules/offline2civicrm/offline2civicrm.module
4 files changed, 211 insertions(+), 115 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/42/131642/1
diff --git a/sites/all/modules/offline2civicrm/ChecksFile.php
b/sites/all/modules/offline2civicrm/ChecksFile.php
index 7798a32..c50b7a8 100644
--- a/sites/all/modules/offline2civicrm/ChecksFile.php
+++ b/sites/all/modules/offline2civicrm/ChecksFile.php
@@ -40,123 +40,11 @@
$row_index = 0;
while( ( $row = fgetcsv( $file, 0, ',', '"', '\\')) !== FALSE) {
-list($currency, $source_amount) = explode( " ", _get_value(
"Source", $row, $headers ) );
-$total_amount = floatval( trim( _get_value( "Total Amount", $row,
$headers ), '$' ) );
+$data = array_combine( array_keys( $headers ), $row );
-if ( abs( $source_amount - $total_amount ) > .01 ) {
-$pretty_msg = json_encode( array_combine( array_keys( $headers
), $row ) );
-watchdog( 'offline2civicrm', "Amount mismatch in row: " .
$pretty_msg, NULL, WATCHDOG_ERROR );
-throw new WmfException( 'INVALID_MESSAGE', "Amount mismatch
during checks import" );
-}
-
-$msg = array(
-"optout" => "1",
-"anonymous" => "0",
-"letter_code" => _get_value( "Letter Code", $row, $headers ),
-"contact_source" => "check",
-"language" => "en",
-"street_address" => _get_value( "Street Address", $row,
$headers ),
-"supplemental_address_1" => _get_value( "Additional Address
1", $row, $headers ),
-"city" => _get_value( "City", $row, $headers ),
-"state_province" => _get_value( "State", $row, $headers ),
-"postal_code" => _get_value( "Postal Code", $row, $headers ),
-"payment_method" => _get_value( "Payment Instrument", $row,
$headers ),
-"payment_submethod" => "",
-"check_number" => _get_value( "Check Number", $row, $headers ),
-"currency" => $currency,
-"original_currency" => $currency,
-"original_gross" => $total_amount,
-"fee" => "0",
-"gross" => $total_amount,
-"net" => $total_amount,
-"date" => strtotime( _get_value( "Received Date", $row,
$headers ) ),
-"no_thank_you" => _get_value( "No Thank You", $row, $headers ),
-"thankyou_date" => strtotime( _get_value( "Thank You Letter
Date", $row, $headers ) ),
-"postmark_date" => strtotime( _get_value( "Postmark Date",
$row, $headers ) ),
-"restrictions" => _get_value( "Restrictions", $row, $headers ),
-"gift_source" => _get_value( "Gift Source", $row, $headers ),
-"direct_mail_appeal" => _get_value( "Direct Mail Appeal",
$row, $headers ),
-"import_batch_number" => _get_value( "Batch", $row, $headers ),
-);
-
-$contype = _get_value( 'Contribution Type', $row, $headers );
-switch ( $contype ) {
-case "Merkle":
-$msg['gateway'] = "merkle";
-break;
-
-case "Arizona Lockbox":
-$msg['gateway'] = "arizonalockbox";
-break;
-
-case "Cash":
-$msg['contribution_type'] = "cash";
-break;
-
-default:
-throw new WmfException( 'INVALID_MESSAGE', "Contribution
Type '$contype' is unknown whilst importing checks!" );
-}
-
-// Attempt to get the organization name if it exists...
-// Merkle used the "Organization Name" column header where AZL
uses "Company"
-$orgname = _get_value( 'Organization Name', $row, $headers, FALSE
);
-if ( $orgname === FALSE ) {
-$orgname = _get_value( 'Company', $row, $headers, FALSE );
-}
-
-if( $orgname === FALSE ) {
-// If it's still false let's just assume it's an individual
-$msg['contact_type'] = "Individual";
-$msg["first_name"] = _get_value( "First Name", $row, $headers
);
-$msg["middle_name"] = _get_value( "Middle Name", $row,
$headers );
-$msg["last_name"]
[MediaWiki-commits] [Gerrit] QA: Give VE more time to load in browser tests - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/131641 Change subject: QA: Give VE more time to load in browser tests .. QA: Give VE more time to load in browser tests When switching from the wikitext editor to VisualEditor we give the default 5 seconds of loading time for it to load. During this time not only does it need to load all its JavaScript but it also needs to re-initialise. Are you crazy Cucumber? 5 seconds to do all this magic?! Give it 20 seconds - much more reasonable and let our browsers test pass again. Change-Id: I8896e834a1fb074fab4f40ac22019864567cb6d0 --- M tests/browser/features/editor_ve.feature M tests/browser/features/step_definitions/editor_ve_steps.rb 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/41/131641/1 diff --git a/tests/browser/features/editor_ve.feature b/tests/browser/features/editor_ve.feature index 194e03e..5c6c4ce 100644 --- a/tests/browser/features/editor_ve.feature +++ b/tests/browser/features/editor_ve.feature @@ -47,6 +47,7 @@ Then I do not see the VisualEditor overlay And I see a toast notification +@wip Scenario: Going back from save screen in VisualEditor Given I am on the "Selenium Edit Test" page And I click the edit button diff --git a/tests/browser/features/step_definitions/editor_ve_steps.rb b/tests/browser/features/step_definitions/editor_ve_steps.rb index 84b0431..a936357 100644 --- a/tests/browser/features/step_definitions/editor_ve_steps.rb +++ b/tests/browser/features/step_definitions/editor_ve_steps.rb @@ -1,5 +1,5 @@ Given(/^VisualEditor has loaded$/) do - on(ArticlePage).editor_ve_element.when_present.should exist + on(ArticlePage).editor_ve_element.when_present(20).should exist end Then(/^I see the VisualEditor$/) do -- To view, visit https://gerrit.wikimedia.org/r/131641 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8896e834a1fb074fab4f40ac22019864567cb6d0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Close drawers/toasts on a click event - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Close drawers/toasts on a click event
..
Close drawers/toasts on a click event
Note a Toast class extends the Drawer class hence the link
to the bug.
Bug: 64270
Change-Id: I461ab95ab4ba718cbfde55ce7a01e68d326bd8c8
---
M javascripts/common/Drawer.js
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/common/Drawer.js b/javascripts/common/Drawer.js
index 1456cce..75fb580 100644
--- a/javascripts/common/Drawer.js
+++ b/javascripts/common/Drawer.js
@@ -35,6 +35,10 @@
*/
show: function() {
var self = this;
+ // Allow the drawer itself to be clickable (e.g. for
copying and pasting references / clicking links in reference)
+ this.$el.on( M.tapEvent( 'click' ), function( ev ) {
+ ev.stopPropagation();
+ } );
if ( !self.isVisible() ) {
// use setTimeout to allow the browser to
redraw if render() was called
@@ -45,6 +49,7 @@
if ( !self.locked ) {
// ignore a possible click that
called show()
setTimeout( function() {
+ $( 'body' ).one(
M.tapEvent( 'click' ) + '.drawer', $.proxy( self, 'hide' ) );
$( window ).one(
'scroll.drawer', $.proxy( self, 'hide' ) );
// FIXME change when
micro.tap.js in stable
// can't use 'body'
because the drawer will be closed when
--
To view, visit https://gerrit.wikimedia.org/r/130782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I461ab95ab4ba718cbfde55ce7a01e68d326bd8c8
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Awjrichards
Gerrit-Reviewer: JGonera
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Properly handling no network access during account creation. - change (apps...wikipedia)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131640
Change subject: Properly handling no network access during account creation.
..
Properly handling no network access during account creation.
Bug: 64891
Change-Id: I196c6c1c77fe577ddb8b0f12cf919afdf19f1f22
---
M wikipedia/res/values-qq/strings.xml
M wikipedia/res/values/strings.xml
M wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
3 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/40/131640/1
diff --git a/wikipedia/res/values-qq/strings.xml
b/wikipedia/res/values-qq/strings.xml
index bcf6a3a..6c2a1dd 100644
--- a/wikipedia/res/values-qq/strings.xml
+++ b/wikipedia/res/values-qq/strings.xml
@@ -73,6 +73,7 @@
Menu item title for creating an
account
Message shown in a small
toast when account creation is successful.
* {{msg-mw|Accountcreatedtext|message}}
+ Message shown when the network is
unavailable during account creation
Text shown as a button at the end
of lists that let the user load more items.
{{Identical|Load more}}
Title for screen showing list
of edits by current user.
diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml
index 92378a9..cf3a5e2 100644
--- a/wikipedia/res/values/strings.xml
+++ b/wikipedia/res/values/strings.xml
@@ -93,6 +93,7 @@
Too many accounts created
from this IP address. Try again later.
This IP address has been
blocked from creating accounts.
Could not create
account
+No network connection
General
Free Wikipedia access from your mobile
operator (data charges waived)
Wikipedia Zero OFF (STANDARD DATA
CHARGES MAY APPLY)
diff --git
a/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
index 8db7042..e5c630d 100644
---
a/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
+++
b/wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
@@ -4,6 +4,7 @@
import android.content.*;
import android.os.*;
import android.support.v7.app.*;
+import android.util.Log;
import android.view.*;
import android.widget.*;
import com.mobsandgeeks.saripaar.*;
@@ -191,6 +192,13 @@
}
@Override
+public void onCatch(Throwable caught) {
+Log.d("Wikipedia", "Caught " + caught.toString());
+progressDialog.dismiss();
+Crouton.makeText(CreateAccountActivity.this,
R.string.create_account_no_network, Style.ALERT).show();
+}
+
+@Override
public void onFinish(final CreateAccountResult result) {
createAccountResult = result;
if (result instanceof CreateAccountCaptchaResult) {
--
To view, visit https://gerrit.wikimedia.org/r/131640
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I196c6c1c77fe577ddb8b0f12cf919afdf19f1f22
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] just include ldap::role::client::labs in role - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: just include ldap::role::client::labs in role
..
just include ldap::role::client::labs in role
just like virt0 does, do not include nss
Change-Id: I4839d346028cc22986ae07222dbf2303ef8c8f6c
---
M manifests/role/ldap.pp
1 file changed, 1 insertion(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/ldap.pp b/manifests/role/ldap.pp
index bf2ebda..35a6b47 100644
--- a/manifests/role/ldap.pp
+++ b/manifests/role/ldap.pp
@@ -2,9 +2,6 @@
# not necessarily LDAP server
class role::ldap::operations {
-class { 'ldap::role::client::labs':
-ldapincludes => ['openldap', 'nss', 'utils'],
-}
-
+include ldap::role::client::labs
include admins::ldap
}
--
To view, visit https://gerrit.wikimedia.org/r/131638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4839d346028cc22986ae07222dbf2303ef8c8f6c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: Fix link text - change (mediawiki...CentralNotice)
Shirayuki has uploaded a new change for review. https://gerrit.wikimedia.org/r/131639 Change subject: i18n: Fix link text .. i18n: Fix link text Change-Id: I9d917050992bd74ea5a4fbde0d75a2a9c3f9c573 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/39/131639/1 diff --git a/i18n/en.json b/i18n/en.json index 6eed605..9ea21a2 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -114,7 +114,7 @@ "centralnotice-banner-landing-pages": "Landing pages (comma-separated)", "centralnotice-banner-landing-pages-default": "e.g. JimmyAppeal01", "centralnotice-banner-mixins": "Mixins", - "centralnotice-banner-mixins-help": "Check each mixin that you want to be included during banner delivery. ([https://www.mediawiki.org/wiki/Extension:CentralNotice/Banner_mixins More information.])", + "centralnotice-banner-mixins-help": "Check each mixin that you want to be included during banner delivery. (See [https://www.mediawiki.org/wiki/Extension:CentralNotice/Banner_mixins Banner mixins] for more information.)", "centralnotice-geo": "Geotargeted", "centralnotice-countries": "Countries", "centralnotice-global-allocation": "Global allocation", -- To view, visit https://gerrit.wikimedia.org/r/131639 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d917050992bd74ea5a4fbde0d75a2a9c3f9c573 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: master Gerrit-Owner: Shirayuki ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't hit the API when creating a PageList - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't hit the API when creating a PageList
..
Don't hit the API when creating a PageList
Hitting the API for every search result is bad
m'kay?
Bug: 64932
Change-Id: Id278744f097798e0522df380902e56a5b1af39aa
---
M javascripts/common/Page.js
M javascripts/modules/PageList.js
2 files changed, 3 insertions(+), 0 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/common/Page.js b/javascripts/common/Page.js
index f6c938e..dd3bf6a 100644
--- a/javascripts/common/Page.js
+++ b/javascripts/common/Page.js
@@ -82,6 +82,7 @@
},
// FIXME: This assumes only one page can be rendered at one
time - emits a page-loaded event and sets wgArticleId
+ // FIXME: The Page object is pretty central and used more like
a model at times than a view. Time to introduce Models?
render: function( options ) {
var pageTitle = options.title, self = this,
$el = this.$el, _super = self._super;
diff --git a/javascripts/modules/PageList.js b/javascripts/modules/PageList.js
index 6d1460c..7a3821d 100644
--- a/javascripts/modules/PageList.js
+++ b/javascripts/modules/PageList.js
@@ -37,6 +37,8 @@
api.load( pages ).done( function() {
$li.each( function() {
var page = new Page( {
+ // FIXME: Set sections
so we don't hit the api (hacky)
+ sections: [],
title: $( this ).attr(
'title' ),
id: $( this ).data(
'id' )
} );
--
To view, visit https://gerrit.wikimedia.org/r/131636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id278744f097798e0522df380902e56a5b1af39aa
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Awjrichards
Gerrit-Reviewer: JGonera
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] just include ldap::role::client::labs in role - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131638
Change subject: just include ldap::role::client::labs in role
..
just include ldap::role::client::labs in role
just like virt0 does, do not include nss
Change-Id: I4839d346028cc22986ae07222dbf2303ef8c8f6c
---
M manifests/role/ldap.pp
1 file changed, 1 insertion(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/131638/1
diff --git a/manifests/role/ldap.pp b/manifests/role/ldap.pp
index bf2ebda..35a6b47 100644
--- a/manifests/role/ldap.pp
+++ b/manifests/role/ldap.pp
@@ -2,9 +2,6 @@
# not necessarily LDAP server
class role::ldap::operations {
-class { 'ldap::role::client::labs':
-ldapincludes => ['openldap', 'nss', 'utils'],
-}
-
+include ldap::role::client::labs
include admins::ldap
}
--
To view, visit https://gerrit.wikimedia.org/r/131638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4839d346028cc22986ae07222dbf2303ef8c8f6c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Regression: Always prevent default behaviour of main menu cl... - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Regression: Always prevent default behaviour of main menu click
event
..
Regression: Always prevent default behaviour of main menu click event
This is breaking our tests
We use the mousedown event but do not prevent the default click
event.
Follow up to I9b6ae95b6145eb8c9cfe2868ab49112b77ee1b2a
Change-Id: I16bbc9b6efdcda1afb6f83ccd4ab3a74e481cfbb
---
M javascripts/common/mainmenu.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/common/mainmenu.js b/javascripts/common/mainmenu.js
index 9090c01..90b4894 100644
--- a/javascripts/common/mainmenu.js
+++ b/javascripts/common/mainmenu.js
@@ -26,7 +26,7 @@
function initialize() {
// FIXME: duplicate code in application.js which is not
available here.
- var tapEvent = M.isBetaGroupMember() ? 'tap' : 'mousedown';
+ var tapEvent = M.isBetaGroupMember() ? 'tap' : 'click';
// make the input readonly to avoid accidental focusing when
closing menu
// (when JS is on, this input should not be used for typing
anyway)
--
To view, visit https://gerrit.wikimedia.org/r/131635
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16bbc9b6efdcda1afb6f83ccd4ab3a74e481cfbb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Awjrichards
Gerrit-Reviewer: JGonera
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: MaxSem
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 config.cmake for HHVM DSO build - change (mediawiki...luasandbox)
Tim Starling has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131637
Change subject: Add config.cmake for HHVM DSO build
..
Add config.cmake for HHVM DSO build
Requires https://github.com/facebook/hhvm/pull/2610 . Makes it possible
to create a luasandbox.so with "hphpize && cmake . && make".
Change-Id: I6d86adbc32fdd352b1fb0654bd246b4681465cdc
---
A config.cmake
1 file changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/luasandbox
refs/changes/37/131637/1
diff --git a/config.cmake b/config.cmake
new file mode 100644
index 000..9718cbb
--- /dev/null
+++ b/config.cmake
@@ -0,0 +1,16 @@
+INCLUDE(FindLua51)
+if (!LUA51_FOUND)
+ message(FATAL_ERROR "unable to find Lua 5.1")
+endif()
+
+HHVM_COMPAT_EXTENSION(luasandbox
+ alloc.c
+ data_conversion.c
+ library.c
+ luasandbox.c
+ timer.c
+ luasandbox_lstrlib.c)
+
+HHVM_ADD_INCLUDES(luasandbox ${LUA_INCLUDE_DIR})
+HHVM_LINK_LIBRARIES(luasandbox ${LUA_LIBRARIES})
+HHVM_SYSTEMLIB(luasandbox ext_luasandbox.php)
--
To view, visit https://gerrit.wikimedia.org/r/131637
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d86adbc32fdd352b1fb0654bd246b4681465cdc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: master
Gerrit-Owner: Tim Starling
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make the site work properly when accessed from other devices - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Make the site work properly when accessed from other devices
..
Make the site work properly when accessed from other devices
Previously $wgServer was always set to http://127.0.0.1:8080 and assets
(CSS, JS) would not be served if the site was accessed from another
device.
This is required for testing on mobile devices.
Change-Id: I6b3890ff376cac121be32f96d2eb00869cd875a5
---
M LocalSettings.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/LocalSettings.php b/LocalSettings.php
index 8b9bc69..f8f65a0 100644
--- a/LocalSettings.php
+++ b/LocalSettings.php
@@ -13,6 +13,10 @@
error_reporting( -1 );
ini_set( 'display_errors', 1 );
+if ( isset( $_SERVER['HTTP_HOST'] ) ) {
+ $wgServer = '//' . $_SERVER['HTTP_HOST'];
+}
+
$wgUploadDirectory = '/srv/images';
$wgUploadPath = '/images';
$wgArticlePath = "/wiki/$1";
--
To view, visit https://gerrit.wikimedia.org/r/131241
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b3890ff376cac121be32f96d2eb00869cd875a5
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: JGonera
Gerrit-Reviewer: JGonera
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't hit the API when creating a PageList - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131636
Change subject: Don't hit the API when creating a PageList
..
Don't hit the API when creating a PageList
Bug: 64932
Change-Id: Id278744f097798e0522df380902e56a5b1af39aa
---
M javascripts/common/Page.js
M javascripts/modules/PageList.js
2 files changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/36/131636/1
diff --git a/javascripts/common/Page.js b/javascripts/common/Page.js
index f6c938e..dd3bf6a 100644
--- a/javascripts/common/Page.js
+++ b/javascripts/common/Page.js
@@ -82,6 +82,7 @@
},
// FIXME: This assumes only one page can be rendered at one
time - emits a page-loaded event and sets wgArticleId
+ // FIXME: The Page object is pretty central and used more like
a model at times than a view. Time to introduce Models?
render: function( options ) {
var pageTitle = options.title, self = this,
$el = this.$el, _super = self._super;
diff --git a/javascripts/modules/PageList.js b/javascripts/modules/PageList.js
index 6d1460c..7a3821d 100644
--- a/javascripts/modules/PageList.js
+++ b/javascripts/modules/PageList.js
@@ -37,6 +37,8 @@
api.load( pages ).done( function() {
$li.each( function() {
var page = new Page( {
+ // FIXME: Set sections
so we don't hit the api (hacky)
+ sections: [],
title: $( this ).attr(
'title' ),
id: $( this ).data(
'id' )
} );
--
To view, visit https://gerrit.wikimedia.org/r/131636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id278744f097798e0522df380902e56a5b1af39aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Regression: Always prevent default behaviour of main menu cl... - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131635
Change subject: Regression: Always prevent default behaviour of main menu click
event
..
Regression: Always prevent default behaviour of main menu click event
This is breaking our tests
We use the mousedown event but do not prevent the default click
event.
Follow up to I9b6ae95b6145eb8c9cfe2868ab49112b77ee1b2a
Change-Id: I16bbc9b6efdcda1afb6f83ccd4ab3a74e481cfbb
---
M javascripts/common/mainmenu.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/35/131635/1
diff --git a/javascripts/common/mainmenu.js b/javascripts/common/mainmenu.js
index 9090c01..90b4894 100644
--- a/javascripts/common/mainmenu.js
+++ b/javascripts/common/mainmenu.js
@@ -26,7 +26,7 @@
function initialize() {
// FIXME: duplicate code in application.js which is not
available here.
- var tapEvent = M.isBetaGroupMember() ? 'tap' : 'mousedown';
+ var tapEvent = M.isBetaGroupMember() ? 'tap' : 'click';
// make the input readonly to avoid accidental focusing when
closing menu
// (when JS is on, this input should not be used for typing
anyway)
--
To view, visit https://gerrit.wikimedia.org/r/131635
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16bbc9b6efdcda1afb6f83ccd4ab3a74e481cfbb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.mixins: Move .box-sizing mixin from mediawiki.ui u... - change (mediawiki/core)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131634
Change subject: mediawiki.mixins: Move .box-sizing mixin from mediawiki.ui
utilities
..
mediawiki.mixins: Move .box-sizing mixin from mediawiki.ui utilities
Very simple, very useful.
Change-Id: Icd3d992aaad3116fd09164e2e003619677d051bb
(cherry picked from commit 871875bed4b21e3b17d22046e121bf4e434b804b)
---
M resources/src/mediawiki.less/mediawiki.mixins.less
M resources/src/mediawiki.ui/mixins/utilities.less
2 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/34/131634/1
diff --git a/resources/src/mediawiki.less/mediawiki.mixins.less
b/resources/src/mediawiki.less/mediawiki.mixins.less
index 36f1bd4..6556af9 100644
--- a/resources/src/mediawiki.less/mediawiki.mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.mixins.less
@@ -64,3 +64,9 @@
-webkit-transition: @string;
transition: @string;
}
+
+.box-sizing(@value) {
+ -moz-box-sizing: @value;
+ -webkit-box-sizing: @value;
+ box-sizing: @value;
+}
diff --git a/resources/src/mediawiki.ui/mixins/utilities.less
b/resources/src/mediawiki.ui/mixins/utilities.less
index a201a4e..3d7b732 100644
--- a/resources/src/mediawiki.ui/mixins/utilities.less
+++ b/resources/src/mediawiki.ui/mixins/utilities.less
@@ -1,9 +1,3 @@
-.box-sizing(@value) {
- -moz-box-sizing: @value;
- -webkit-box-sizing: @value;
- box-sizing: @value;
-}
-
.agora-flush-left() {
float: left;
margin-left: 0;
--
To view, visit https://gerrit.wikimedia.org/r/131634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd3d992aaad3116fd09164e2e003619677d051bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support precomputed data in GitInfo - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Support precomputed data in GitInfo
..
Support precomputed data in GitInfo
Support reading git repository information from a JSON file in the cache
directory. When present, this file serves to provide information needed
by getHead, getHeadSHA1, getHeadCommitDate, getCurrentBranch and a new
getRemoteUrl method. A GitInfo::precomputeValues method is also provided
which can generate the cache file for a given GitInfo instance.
This support can be combined with a deployment step to reduce the need
to repeatedly gather information from the .git files/git binary. It also
allows computing information that can be lost when directory structures
differ between deployment staging hosts and hosts running MediaWiki.
This change also adds memoization of computed values for a given GitInfo
instance which may provide a small performance boost even for
deployments which are not using precomputed cache files.
Bug: 53972
Change-Id: I66e058acc5a71e5d82644f85d819f49d6ee9d1e6
---
M includes/GitInfo.php
A tests/phpunit/data/gitinfo/info-testValidJsonData.json
A tests/phpunit/includes/GitInfoTest.php
3 files changed, 262 insertions(+), 86 deletions(-)
Approvals:
BryanDavis: Looks good to me, but someone else must approve
Krinkle: Looks good to me, but someone else must approve
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/GitInfo.php b/includes/GitInfo.php
index 6b092d9..dc2fff1 100644
--- a/includes/GitInfo.php
+++ b/includes/GitInfo.php
@@ -36,32 +36,90 @@
protected $basedir;
/**
+* Path to JSON cache file for pre-computed git information.
+*/
+ protected $cacheFile;
+
+ /**
+* Cached git information.
+*/
+ protected $cache = array();
+
+ /**
* Map of repo URLs to viewer URLs. Access via static method
getViewers().
*/
private static $viewers = false;
/**
-* @param string $dir The root directory of the repo where the .git dir
can be found
+* @param string $repoDir The root directory of the repo where .git can
be found
+* @param bool $usePrecomputed Use precomputed information if available
+* @see precomputeValues
*/
- public function __construct( $dir ) {
- $this->basedir = $dir . DIRECTORY_SEPARATOR . '.git';
- if ( is_readable( $this->basedir ) && !is_dir( $this->basedir )
) {
- $GITfile = file_get_contents( $this->basedir );
- if ( strlen( $GITfile ) > 8 && substr( $GITfile, 0, 8 )
=== 'gitdir: ' ) {
- $path = rtrim( substr( $GITfile, 8 ), "\r\n" );
- $isAbsolute = $path[0] === '/' || substr(
$path, 1, 1 ) === ':';
- $this->basedir = $isAbsolute ? $path : $dir .
DIRECTORY_SEPARATOR . $path;
+ public function __construct( $repoDir, $usePrecomputed = true ) {
+ $this->cacheFile = self::getCacheFilePath( $repoDir );
+ if ( $usePrecomputed &&
+ $this->cacheFile !== null &&
+ is_readable( $this->cacheFile )
+ ) {
+ $this->cache = FormatJson::decode(
+ file_get_contents( $this->cacheFile ),
+ true
+ );
+ }
+
+ if ( !$this->cacheIsComplete() ) {
+ $this->basedir = $repoDir . DIRECTORY_SEPARATOR .
'.git';
+ if ( is_readable( $this->basedir ) && !is_dir(
$this->basedir ) ) {
+ $GITfile = file_get_contents( $this->basedir );
+ if ( strlen( $GITfile ) > 8 &&
+ substr( $GITfile, 0, 8 ) === 'gitdir: '
+ ) {
+ $path = rtrim( substr( $GITfile, 8 ),
"\r\n" );
+ if ( $path[0] === '/' || substr( $path,
1, 1 ) === ':' ) {
+ // Path from GITfile is absolute
+ $this->basedir = $path;
+ } else {
+ $this->basedir = $repoDir .
DIRECTORY_SEPARATOR . $path;
+ }
+ }
}
}
}
/**
-* Return a singleton for the repo at $IP
+* Compute the path to the cache file for a given directory.
+*
+* @param string $repoDir The root directory of the repo where .git can
be found
+* @return string Path to GitInfo cache file in $wgCacheDirectory or
null if
[MediaWiki-commits] [Gerrit] API: Check return value from $gitInfo->getHeadCommitDate() - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: API: Check return value from $gitInfo->getHeadCommitDate()
..
API: Check return value from $gitInfo->getHeadCommitDate()
action=query&meta=siteinfo&siprop=extensions calls
$gitInfo->getHeadCommitDate() to attempt to find the commit date, but
does not check whether that function returned false before using the
value. This resulted in displaying the current date for "vcs-date" when
the function failed.
Bug: 64821
Change-Id: Ic39a74abe5160b3b7fbfb7c15323328d6b317560
(cherry picked from commit 986d3ef2c13aeaf8d172e89c30c2c2f93d9f1b55)
---
M includes/api/ApiQuerySiteinfo.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
MarkAHershberger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiQuerySiteinfo.php
b/includes/api/ApiQuerySiteinfo.php
index b7796ee..b0e9bd2 100644
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -567,7 +567,10 @@
$ret['vcs-system'] = 'git';
$ret['vcs-version'] =
$vcsVersion;
$ret['vcs-url'] =
$gitInfo->getHeadViewUrl();
- $ret['vcs-date'] = wfTimestamp(
TS_ISO_8601, $gitInfo->getHeadCommitDate() );
+ $vcsDate =
$gitInfo->getHeadCommitDate();
+ if ( $vcsDate !== false ) {
+ $ret['vcs-date'] =
wfTimestamp( TS_ISO_8601, $vcsDate );
+ }
} else {
$svnInfo =
SpecialVersion::getSvnInfo( $extensionPath );
if ( $svnInfo !== false ) {
--
To view, visit https://gerrit.wikimedia.org/r/131631
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic39a74abe5160b3b7fbfb7c15323328d6b317560
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
Gerrit-Owner: MarkAHershberger
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: MarkAHershberger
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Drop wgFlowCacheKey from CommonSettings.php - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Drop wgFlowCacheKey from CommonSettings.php
..
Drop wgFlowCacheKey from CommonSettings.php
We have a patch going live this thursday that changes the
representation of UUID's within the cache. For this to
work without issues the old and the new need to be on separate
cache versions(as defined in their Flow.php files).
Change-Id: Id1f2e0acf2cb1b8dffce0d9c39bdce3477f2e21f
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d477e51..ac416aa 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2388,7 +2388,6 @@
$wgFlowCluster = $wmgFlowCluster;
$wgFlowExternalStore = $wgDefaultExternalStore;
$wgFlowMaintenanceMode = $wmgFlowMaintenanceMode;
- $wgFlowCacheVersion = '4.2';
}
if ( $wmgUseDisambiguator ) {
--
To view, visit https://gerrit.wikimedia.org/r/131609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id1f2e0acf2cb1b8dffce0d9c39bdce3477f2e21f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: Ori.livneh
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 ClientSiteLinkLookupTest for contentlang != en - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131633
Change subject: Fix ClientSiteLinkLookupTest for contentlang != en
..
Fix ClientSiteLinkLookupTest for contentlang != en
This breaks on non-english wikis as Title::newFromText changed
the canonical "Talk" namespace name to a localized version, which
then no longer matches with the stored data..
Change-Id: Idb47630502c9a00ff01968e064879a860f86349d
---
M client/includes/ClientSiteLinkLookup.php
M client/tests/phpunit/includes/ClientSiteLinkLookupTest.php
2 files changed, 7 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/33/131633/1
diff --git a/client/includes/ClientSiteLinkLookup.php
b/client/includes/ClientSiteLinkLookup.php
index ce07858..e08f306 100644
--- a/client/includes/ClientSiteLinkLookup.php
+++ b/client/includes/ClientSiteLinkLookup.php
@@ -87,7 +87,10 @@
* @return Item|null
*/
private function getItem( Title $title ) {
- $itemId = $this->siteLinkLookup->getItemIdForLink(
$this->localSiteId, $title->getPrefixedText() );
+ $itemId = $this->siteLinkLookup->getItemIdForLink(
+ $this->localSiteId,
+ $title->getPrefixedText()
+ );
if ( $itemId === null ) {
return null;
diff --git a/client/tests/phpunit/includes/ClientSiteLinkLookupTest.php
b/client/tests/phpunit/includes/ClientSiteLinkLookupTest.php
index de6a9d5..0b54993 100644
--- a/client/tests/phpunit/includes/ClientSiteLinkLookupTest.php
+++ b/client/tests/phpunit/includes/ClientSiteLinkLookupTest.php
@@ -32,7 +32,7 @@
'badges' => array( 'Q4', 'Q123' )
),
'srwiki' => 'Foo sr',
- 'nlwiki' => 'Talk:Foo nl',
+ 'nlwiki' => 'ThisIsANamespace:Foo nl',
'dewiktionary' => 'Foo de word',
'enwiktionary' => 'Foo en word',
)
@@ -77,7 +77,7 @@
return array(
array( $sitelinks, 'dewiki', Title::newFromText( 'Foo
de' ), 'from dewiki title' ),
array( $sitelinks, 'enwiktionary', Title::newFromText(
'Foo en word' ), 'from enwiktionary title' ),
- array( $sitelinks, 'nlwiki', Title::newFromText(
'Talk:Foo nl' ), 'from nlwiki non-main namespace title' ),
+ array( $sitelinks, 'nlwiki', Title::newFromText(
'ThisIsANamespace:Foo nl' ), 'from nlwiki non-main namespace title' ),
array( array(), 'enwiki', Title::newFromText( 'Bar en'
), 'from nonexisting title' ),
array( array(), 'barwiki', Title::newFromText( 'Foo
bar' ), 'from nonexisting site' ),
);
@@ -102,7 +102,7 @@
return array(
array( $item->getSiteLink( 'enwiki' ), 'dewiki',
Title::newFromText( 'Foo de' ), 'enwiki', 'enwiki from dewiki title' ),
array( $item->getSiteLink( 'dewiktionary' ),
'enwiktionary', Title::newFromText( 'Foo en word' ), 'dewiktionary',
'dewiktionary from enwiktionary title' ),
- array( $item->getSiteLink( 'enwiki' ), 'nlwiki',
Title::newFromText( 'Talk:Foo nl' ), 'enwiki', 'enwiki from nlwiki non-main
namespace title' ),
+ array( $item->getSiteLink( 'enwiki' ), 'nlwiki',
Title::newFromText( 'ThisIsANamespace:Foo nl' ), 'enwiki', 'enwiki from nlwiki
non-main namespace title' ),
array( $item->getSiteLink( 'nlwiki' ), 'enwiki',
Title::newFromText( 'Foo en' ), 'nlwiki', 'non-main namespace nlwiki from
enwiki title' ),
array( null, 'enwiki', Title::newFromText( 'Bar en' ),
'dewiki', 'from nonexisting title' ),
array( null, 'barwiki', Title::newFromText( 'Foo bar'
), 'enwiki', 'from nonexisting site' ),
--
To view, visit https://gerrit.wikimedia.org/r/131633
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb47630502c9a00ff01968e064879a860f86349d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update url generation to use the new more specific methods - change (mediawiki...Flow)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131632
Change subject: Update url generation to use the new more specific methods
..
Update url generation to use the new more specific methods
Change-Id: I19fbd18baf858535d8b3f5b544e86bb3151878fb
---
M includes/BaseUrlGenerator.php
M includes/Block/TopicSummary.php
M includes/Formatter/RevisionFormatter.php
M includes/Formatter/TopicFormatter.php
M includes/Formatter/TopicListFormatter.php
M includes/UrlGenerator.php
6 files changed, 267 insertions(+), 137 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/32/131632/1
diff --git a/includes/BaseUrlGenerator.php b/includes/BaseUrlGenerator.php
index 401e5a5..841f2dd 100644
--- a/includes/BaseUrlGenerator.php
+++ b/includes/BaseUrlGenerator.php
@@ -57,7 +57,7 @@
* @param array $query Associative array of query parameters
* @return String URL
*/
- public function buildUrl( $title, $action = 'view', array $query =
array() ) {
+ protected function buildUrl( $title, $action = 'view', array $query =
array() ) {
if ( $action !== 'view' ) {
$query['action'] = $action;
}
@@ -155,10 +155,13 @@
* @return Title
* @throws FlowException
*/
- protected function resolveTitle( Title $title = null, UUID $workflowId
) {
- if ( $title ) {
+ protected function resolveTitle( Title $title = null, UUID $workflowId
= null ) {
+ if ( $title !== null ) {
return $title;
}
+ if ( $workflowId === null ) {
+ throw new FlowException( 'Either $title or $workflowId
must be provided' );
+ }
$alpha = $workflowId->getAlphadecimal();
if ( isset( $this->workflows[$alpha] ) ) {
return $this->workflows[$alpha]->getArticleTitle();
diff --git a/includes/Block/TopicSummary.php b/includes/Block/TopicSummary.php
index 0d729e3..bcc1127 100644
--- a/includes/Block/TopicSummary.php
+++ b/includes/Block/TopicSummary.php
@@ -280,13 +280,11 @@
$this->formatterRow,
\RequestContext::getMain()
);
} else {
-
$output['revision']['actions']['edit']['url'] = Container::get( 'url_generator'
)->buildUrl(
-
$this->workflow->getArticleTitle(),
- 'edit-topic-summary',
- array(
- 'workflow' =>
$this->workflow->getId(),
- )
- );
+ $output['revision']['actions']['edit']
= Container::get( 'url_generator' )
+ ->editTopicSummaryAction(
+
$this->workflow->getArticleTitle(),
+ $this->workflow->getId()
+ );
}
break;
diff --git a/includes/Formatter/RevisionFormatter.php
b/includes/Formatter/RevisionFormatter.php
index 1a14302..04a84f1 100644
--- a/includes/Formatter/RevisionFormatter.php
+++ b/includes/Formatter/RevisionFormatter.php
@@ -259,9 +259,9 @@
$section = new \ProfileSection( __METHOD__ );
$title = $row->workflow->getArticleTitle();
$action = $row->revision->getChangeType();
- $workflowId = $row->workflow->getId()->getAlphadecimal();
- $revId = $row->revision->getRevisionId()->getAlphadecimal();
- $postId = method_exists( $row->revision, 'getPostId' ) ?
$row->revision->getPostId()->getAlphadecimal() : null;
+ $workflowId = $row->workflow->getId();
+ $revId = $row->revision->getRevisionId();
+ $postId = method_exists( $row->revision, 'getPostId' ) ?
$row->revision->getPostId() : null;
$actionTypes = $this->permissions->getActions()->getValue(
$action, 'actions' );
if ( $actionTypes === null ) {
throw new FlowException( "No actions defined for
action: $action" );
@@ -276,152 +276,73 @@
if ( !$postId ) {
throw new FlowException( "$type called
without \$postId" );
}
- $links['reply'] = array(
- 'url' => $this->urlGenerator->buildUrl(
[MediaWiki-commits] [Gerrit] API: Check return value from $gitInfo->getHeadCommitDate() - change (mediawiki/core)
MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131631
Change subject: API: Check return value from $gitInfo->getHeadCommitDate()
..
API: Check return value from $gitInfo->getHeadCommitDate()
action=query&meta=siteinfo&siprop=extensions calls
$gitInfo->getHeadCommitDate() to attempt to find the commit date, but
does not check whether that function returned false before using the
value. This resulted in displaying the current date for "vcs-date" when
the function failed.
Bug: 64821
Change-Id: Ic39a74abe5160b3b7fbfb7c15323328d6b317560
(cherry picked from commit 986d3ef2c13aeaf8d172e89c30c2c2f93d9f1b55)
---
M includes/api/ApiQuerySiteinfo.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/31/131631/1
diff --git a/includes/api/ApiQuerySiteinfo.php
b/includes/api/ApiQuerySiteinfo.php
index b7796ee..b0e9bd2 100644
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -567,7 +567,10 @@
$ret['vcs-system'] = 'git';
$ret['vcs-version'] =
$vcsVersion;
$ret['vcs-url'] =
$gitInfo->getHeadViewUrl();
- $ret['vcs-date'] = wfTimestamp(
TS_ISO_8601, $gitInfo->getHeadCommitDate() );
+ $vcsDate =
$gitInfo->getHeadCommitDate();
+ if ( $vcsDate !== false ) {
+ $ret['vcs-date'] =
wfTimestamp( TS_ISO_8601, $vcsDate );
+ }
} else {
$svnInfo =
SpecialVersion::getSvnInfo( $extensionPath );
if ( $svnInfo !== false ) {
--
To view, visit https://gerrit.wikimedia.org/r/131631
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic39a74abe5160b3b7fbfb7c15323328d6b317560
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
Gerrit-Owner: MarkAHershberger
Gerrit-Reviewer: Anomie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Vagrant role for GWToolset - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Vagrant role for GWToolset
..
Vagrant role for GWToolset
Change-Id: I2a5bde31ee7a4317d6ec76bb3fe7b160d1d13bcf
---
A puppet/manifests/roles/gwtoolset.pp
A puppet/templates/gwtoolset-config.php.erb
2 files changed, 35 insertions(+), 0 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/manifests/roles/gwtoolset.pp
b/puppet/manifests/roles/gwtoolset.pp
new file mode 100644
index 000..753def1
--- /dev/null
+++ b/puppet/manifests/roles/gwtoolset.pp
@@ -0,0 +1,20 @@
+# == Class: role::gwtoolset
+# This role provisions the [GWToolset][1] extension,
+# which does mass image and metadata uploading
+# based on an XML description.
+#
+# [1] https://www.mediawiki.org/wiki/Extension:GWToolset
+class role::gwtoolset {
+include role::mediawiki
+include role::multimedia
+
+php::ini { 'GWToolset':
+settings => {
+memory_limit => '256M',
+}
+}
+
+mediawiki::extension { 'GWToolset':
+settings => template('gwtoolset-config.php.erb'),
+}
+}
diff --git a/puppet/templates/gwtoolset-config.php.erb
b/puppet/templates/gwtoolset-config.php.erb
new file mode 100644
index 000..30f7b85
--- /dev/null
+++ b/puppet/templates/gwtoolset-config.php.erb
@@ -0,0 +1,15 @@
+// https://www.mediawiki.org/wiki/Extension:GWToolset
+$wgAllowCopyUploads = true;
+$wgGroupPermissions['sysop']['gwtoolset'] = true;
+$wgGroupPermissions['sysop']['upload_by_url'] = true;
+
+$wgFileBackends[] = array(
+ 'name' => 'gwtoolset-backend',
+ 'class' => 'FSFileBackend',
+ 'lockManager'=> 'nullLockManager',
+ 'fileMode' => 0644,
+ 'basePath' => $IP . '/images/gwtoolset',
+);
+
+$wgGWTFileBackend = 'gwtoolset-backend';
+$wgGWTFBMaxAge = '1 week';
--
To view, visit https://gerrit.wikimedia.org/r/131429
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a5bde31ee7a4317d6ec76bb3fe7b160d1d13bcf
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Dan-nl
Gerrit-Reviewer: Gergő Tisza
Gerrit-Reviewer: MarkTraceur
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Catch and specially handle InvalidArgumentException - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Catch and specially handle InvalidArgumentException
..
Catch and specially handle InvalidArgumentException
Prevents exception messages when showing up
if a user manually goes to ?action=invalid.
Bug: 60936
Change-Id: I05d6be4a59db57c24bd9a11c499cb69f18feaa41
---
M includes/Exception/ExceptionHandling.php
1 file changed, 11 insertions(+), 0 deletions(-)
Approvals:
Bsitu: Looks good to me, approved
EBernhardson: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/Exception/ExceptionHandling.php
b/includes/Exception/ExceptionHandling.php
index 818cc49..5b88a26 100644
--- a/includes/Exception/ExceptionHandling.php
+++ b/includes/Exception/ExceptionHandling.php
@@ -186,6 +186,17 @@
}
/**
+* {@inheritDoc}
+*/
+ public function getHTML() {
+ // we only want a nice error message here, no stack trace
+ $rc = new RequestContext();
+ $output = $rc->getOutput();
+ $output->showErrorPage( $this->getPageTitle(),
$this->getErrorCode() );
+ return $output->getHTML();
+ }
+
+ /**
* Do not log exception resulting from input error
*/
function isLoggable() {
--
To view, visit https://gerrit.wikimedia.org/r/131455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I05d6be4a59db57c24bd9a11c499cb69f18feaa41
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie
Gerrit-Reviewer: Bsitu
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.mixins: Move .box-sizing mixin from mediawiki.ui u... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.mixins: Move .box-sizing mixin from mediawiki.ui
utilities
..
mediawiki.mixins: Move .box-sizing mixin from mediawiki.ui utilities
Very simple, very useful.
Change-Id: Icd3d992aaad3116fd09164e2e003619677d051bb
---
M resources/src/mediawiki.less/mediawiki.mixins.less
M resources/src/mediawiki.ui/mixins/utilities.less
2 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.less/mediawiki.mixins.less
b/resources/src/mediawiki.less/mediawiki.mixins.less
index 36f1bd4..6556af9 100644
--- a/resources/src/mediawiki.less/mediawiki.mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.mixins.less
@@ -64,3 +64,9 @@
-webkit-transition: @string;
transition: @string;
}
+
+.box-sizing(@value) {
+ -moz-box-sizing: @value;
+ -webkit-box-sizing: @value;
+ box-sizing: @value;
+}
diff --git a/resources/src/mediawiki.ui/mixins/utilities.less
b/resources/src/mediawiki.ui/mixins/utilities.less
index a201a4e..3d7b732 100644
--- a/resources/src/mediawiki.ui/mixins/utilities.less
+++ b/resources/src/mediawiki.ui/mixins/utilities.less
@@ -1,9 +1,3 @@
-.box-sizing(@value) {
- -moz-box-sizing: @value;
- -webkit-box-sizing: @value;
- box-sizing: @value;
-}
-
.agora-flush-left() {
float: left;
margin-left: 0;
--
To view, visit https://gerrit.wikimedia.org/r/127843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icd3d992aaad3116fd09164e2e003619677d051bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VisualEditor for cherry-picks - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update VisualEditor for cherry-picks .. Update VisualEditor for cherry-picks Change-Id: Iae2dee2650425ab58844ca6acf69f9ede2fba941 --- M extensions/VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/VisualEditor b/extensions/VisualEditor index eb2695f..08dfecf 16 --- a/extensions/VisualEditor +++ b/extensions/VisualEditor -Subproject commit eb2695f219bdb8b066ea0c1598c079a1323fa5bf +Subproject commit 08dfecfa22813e3b556a5d09b6661339d3d9c18c -- To view, visit https://gerrit.wikimedia.org/r/131630 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iae2dee2650425ab58844ca6acf69f9ede2fba941 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf3 Gerrit-Owner: Ori.livneh Gerrit-Reviewer: Ori.livneh 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 Flow to wmf/1.24wmf2 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update Flow to wmf/1.24wmf2 .. Update Flow to wmf/1.24wmf2 Updates embedded $wgFlowCacheVersion to match mediawiki-config repository. Patches applied: * I3c32d79d74a59abfe155174aa314250f1fe2a02a Change-Id: Ifc3fc8542134866ff9eba5d3f5ae68d162ba0048 --- M extensions/Flow 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/Flow b/extensions/Flow index be4a7b1..7011a68 16 --- a/extensions/Flow +++ b/extensions/Flow -Subproject commit be4a7b1e0e9d079c67a2f0ced9238ff5338e +Subproject commit 7011a68fa3fd60256e89ba61888ce17f968ccaf1 -- To view, visit https://gerrit.wikimedia.org/r/131603 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc3fc8542134866ff9eba5d3f5ae68d162ba0048 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf2 Gerrit-Owner: EBernhardson Gerrit-Reviewer: Ori.livneh 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 Flow to 1.24wmf3 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update Flow to 1.24wmf3 .. Update Flow to 1.24wmf3 Applies bugfixes to the flow links table handling, and sets up the wgFlowCacheVersion to match mediawiki-config as prep for the thursday deploy. Patches applied: * Ib806136e599d9fce421c79b78187469a37902d2a * I5ffa3e858a1c318566c675cb9da41e108e45dd03 * I8c0ec0ab9c2dc1e56c9c6d30e4b773a9f52bf653 * I3c32d79d74a59abfe155174aa314250f1fe2a02a Change-Id: I09072570c42d6b7ed2297a2e79e0bddc76d3bdaf --- M extensions/Flow 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/Flow b/extensions/Flow index 1398682..c51382b 16 --- a/extensions/Flow +++ b/extensions/Flow -Subproject commit 13986824197305df3c0032ced163b348ad5c6634 +Subproject commit c51382baa1cb273a272132f678aeb204584b561f -- To view, visit https://gerrit.wikimedia.org/r/131602 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I09072570c42d6b7ed2297a2e79e0bddc76d3bdaf Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf3 Gerrit-Owner: EBernhardson Gerrit-Reviewer: Ori.livneh 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 cherry-picks - change (mediawiki/core)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/131630 Change subject: Update VisualEditor for cherry-picks .. Update VisualEditor for cherry-picks Change-Id: Iae2dee2650425ab58844ca6acf69f9ede2fba941 --- M extensions/VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/30/131630/1 diff --git a/extensions/VisualEditor b/extensions/VisualEditor index eb2695f..08dfecf 16 --- a/extensions/VisualEditor +++ b/extensions/VisualEditor -Subproject commit eb2695f219bdb8b066ea0c1598c079a1323fa5bf +Subproject commit 08dfecfa22813e3b556a5d09b6661339d3d9c18c -- To view, visit https://gerrit.wikimedia.org/r/131630 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae2dee2650425ab58844ca6acf69f9ede2fba941 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf3 Gerrit-Owner: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QA: Add browser tests for presence of more link on history page - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: QA: Add browser tests for presence of more link on history page
..
QA: Add browser tests for presence of more link on history page
Allows us to ensure certain pages have a certain edit count.
Change-Id: I84c5cf7c46b7973e4ce554b1e19cfb3227306c50
---
M tests/browser/features/special_history.feature
M tests/browser/features/step_definitions/create_page_api_steps.rb
M tests/browser/features/step_definitions/special_history_steps.rb
M tests/browser/features/support/modules/url_module.rb
M tests/browser/features/support/pages/article_page.rb
A tests/browser/features/support/pages/article_page_info.rb
M tests/browser/features/support/pages/special_history_page.rb
7 files changed, 42 insertions(+), 5 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/special_history.feature
b/tests/browser/features/special_history.feature
index 56f5288..73e75f6 100644
--- a/tests/browser/features/special_history.feature
+++ b/tests/browser/features/special_history.feature
@@ -1,11 +1,15 @@
@chrome @en.m.wikipedia.beta.wmflabs.org @firefox @login @test2.m.wikipedia.org
-Feature: Special:History
+Feature: Special:History (Note test may take a long time to run on first run)
Background:
-Given I am in beta mode
- And the page "Selenium diff test" exists
+Given the page "Selenium diff test" exists and has at least 51 edits
+ And I am in beta mode
+ And I am on the "Selenium diff test" page
When I click on the history link in the last modified bar
+ Scenario: Check more button exists
+Then I see a more button
+
Scenario: Check components in diff summary
When I click the link in the header bar
Then The text of the first heading is "Selenium diff test"
diff --git a/tests/browser/features/step_definitions/create_page_api_steps.rb
b/tests/browser/features/step_definitions/create_page_api_steps.rb
index 90efe5f..c441f6d 100644
--- a/tests/browser/features/step_definitions/create_page_api_steps.rb
+++ b/tests/browser/features/step_definitions/create_page_api_steps.rb
@@ -64,3 +64,19 @@
on(APIPage).create "MediaWiki:mobile-frontend-terms-url", "Terms_of_use"
on(APIPage).create "MediaWiki:mobile-frontend-terms-text", "Terms of use"
end
+
+Given(/^the page "(.*?)" exists and has at least (\d+) edits$/) do |title,
min_edit_count|
+ # Page must first exist before we can get edit count information
+ step 'the page "' + title + '" exists'
+ min_edit_count = min_edit_count.to_i
+ visit(ArticlePage, :using_params => {:article_name => title +
'?action=info'})
+ # Open the third section which contains the edit count
+ on(ArticlePage).third_section_element.when_present.click
+ on(ArticlePage) do |page|
+edit_count = page.edit_count_element.text.to_i
+while edit_count < min_edit_count
+ edit_count += 1
+ on(APIPage).create title, "Test is used by Selenium web driver edit #" +
edit_count.to_s
+end
+ end
+end
diff --git a/tests/browser/features/step_definitions/special_history_steps.rb
b/tests/browser/features/step_definitions/special_history_steps.rb
index c3fd084..768d97f 100644
--- a/tests/browser/features/step_definitions/special_history_steps.rb
+++ b/tests/browser/features/step_definitions/special_history_steps.rb
@@ -25,3 +25,15 @@
Then(/^The last contribution summary shows the time of the last edit$/) do
on(SpecialHistoryPage).last_contribution_timestamp_element.should exist
end
+
+Then(/^I see a more button$/) do
+ on(SpecialHistoryPage).more_link_element.should exist
+end
+
+When(/^I click the more link$/) do
+ on(SpecialHistoryPage).more_link_element.click
+end
+
+Then(/^I see a previous button$/) do
+ on(SpecialHistoryPage).previous_link_element.should exist
+end
diff --git a/tests/browser/features/support/modules/url_module.rb
b/tests/browser/features/support/modules/url_module.rb
index 56e4f81..6c329e8 100644
--- a/tests/browser/features/support/modules/url_module.rb
+++ b/tests/browser/features/support/modules/url_module.rb
@@ -5,6 +5,6 @@
else
mediawiki_url = "http://127.0.0.1:80/w/index.php";
end
-"#{mediawiki_url}#{name}?useformat=mobile"
+"#{mediawiki_url}#{name}"
end
end
diff --git a/tests/browser/features/support/pages/article_page.rb
b/tests/browser/features/support/pages/article_page.rb
index 0413738..41a49ec 100644
--- a/tests/browser/features/support/pages/article_page.rb
+++ b/tests/browser/features/support/pages/article_page.rb
@@ -150,8 +150,11 @@
# sections
h2(:first_section, css: ".section_heading")
- div(:first_section_content, id: "content_block_0")
+ h2(:third_section, css: ".section_heading", index: 2)
# issues
a(:issues_stamp, css:".mw-mf-cleanup")
+
+ # page info (action=info)
+ td(:edit_count, css: "#mw-pageinfo-edits td", index: 1)
end
diff --git a/
[MediaWiki-commits] [Gerrit] Update EventLogging for Id23b37fbe - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update EventLogging for Id23b37fbe .. Update EventLogging for Id23b37fbe Change-Id: Ife6847a6b0ab9efaa4e5dc76935896ba461a8f93 --- M extensions/EventLogging 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/EventLogging b/extensions/EventLogging index 29e31e0..f3c1f86 16 --- a/extensions/EventLogging +++ b/extensions/EventLogging -Subproject commit 29e31e0ac72c360882ef056bb6c1fb33ce65ff7d +Subproject commit f3c1f86138a4326598e0826e59f198cd0d908b3b -- To view, visit https://gerrit.wikimedia.org/r/131626 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife6847a6b0ab9efaa4e5dc76935896ba461a8f93 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf2 Gerrit-Owner: Ori.livneh Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ensuring that the Search bar is visible when Back is pressed. - change (apps...wikipedia)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131629
Change subject: Ensuring that the Search bar is visible when Back is pressed.
..
Ensuring that the Search bar is visible when Back is pressed.
Bug: 64913
Change-Id: I42f1e002a5bae47f3cb993eed843a2ae4363b092
---
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
2 files changed, 9 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/29/131629/1
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index bb04a9f..f85b44d 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -172,6 +172,7 @@
String tag =
getSupportFragmentManager().getBackStackEntryAt(getSupportFragmentManager().getBackStackEntryCount()
- 1).getName();
curPageFragment = (PageViewFragment)
getSupportFragmentManager().findFragmentByTag(tag);
curPageFragment.show();
+searchAriclesFragment.ensureVisible();
}
}
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index 921c847..5acc9e0 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -266,6 +266,10 @@
searchHandler.sendMessageDelayed(searchMessage, DELAY_MILLIS);
}
+public void ensureVisible() {
+ViewAnimations.ensureTranslationY(getView(), 0);
+}
+
public void setDrawerLayout(DrawerLayout drawerLayout) {
this.drawerLayout = drawerLayout;
@@ -273,7 +277,7 @@
@Override
public void onDrawerSlide(View drawerView, float slideOffset) {
// Make sure that the entire search bar is visible
-ViewAnimations.ensureTranslationY(getView(), 0);
+ensureVisible();
// Animation for sliding drawer open and close
// -4dp seems to match how much farther GMail's indicator
goes, so sticking with it
// Shift left and right margins appropriately to make sure
that the rest of the layout does not shift
@@ -380,7 +384,7 @@
searchTermText.setText("");
}
// If search bar isn't fully visible, make it so!
-ViewAnimations.ensureTranslationY(getView(), 0);
+ensureVisible();
}
@Subscribe
@@ -399,7 +403,7 @@
searchTermText.setTextColor(Color.WHITE);
searchTermText.setHint(R.string.zero_search_hint);
searchBarMenuButton.setColorFilter(Color.WHITE);
-ViewAnimations.ensureTranslationY(getView(), 0);
+ensureVisible();
}
private void setNormalChrome() {
@@ -410,7 +414,7 @@
searchTermText.setHintTextColor(searchTermHintTextColor);
searchTermText.setHint(R.string.search_hint);
searchBarMenuButton.clearColorFilter();
-ViewAnimations.ensureTranslationY(getView(), 0);
+ensureVisible();
}
@Override
--
To view, visit https://gerrit.wikimedia.org/r/131629
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I42f1e002a5bae47f3cb993eed843a2ae4363b092
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Point language Beta Feature links to the right messages - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Point language Beta Feature links to the right messages .. Point language Beta Feature links to the right messages These were erroneously: * visualeditor-preference-experimental-info-link and * visualeditor-preference-experimental-discussion-link; should have been: * visualeditor-preference-language-info-link and * visualeditor-preference-language-discussion-link. Whoops. Change-Id: Ic2780c1d7a0fb5bc5673d1d3a7277661fd759bb3 --- M VisualEditor.hooks.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php index 0a8d323..9270760 100644 --- a/VisualEditor.hooks.php +++ b/VisualEditor.hooks.php @@ -312,8 +312,8 @@ 'ltr' => "$iconpath/betafeatures-icon-VisualEditor-language-ltr.svg", 'rtl' => "$iconpath/betafeatures-icon-VisualEditor-language-rtl.svg", ), - 'info-message' => 'visualeditor-preference-experimental-info-link', - 'discussion-message' => 'visualeditor-preference-experimental-discussion-link', + 'info-message' => 'visualeditor-preference-language-info-link', + 'discussion-message' => 'visualeditor-preference-language-discussion-link', 'requirements' => array( 'betafeatures' => array( 'visualeditor-enable', -- To view, visit https://gerrit.wikimedia.org/r/131506 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic2780c1d7a0fb5bc5673d1d3a7277661fd759bb3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: wmf/1.24wmf3 Gerrit-Owner: Jforrester Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QA: Fix lead photo uploads tests - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: QA: Fix lead photo uploads tests .. QA: Fix lead photo uploads tests Change-Id: I63ef45aa7d72aff1547f3cecf5e094141b51fd55 --- M tests/browser/features/uploads_lead.feature 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Kaldari: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/uploads_lead.feature b/tests/browser/features/uploads_lead.feature index 5f6aa65..7084bc7 100644 --- a/tests/browser/features/uploads_lead.feature +++ b/tests/browser/features/uploads_lead.feature @@ -1,11 +1,11 @@ -@chrome @en.m.wikipedia.beta.wmflabs.org @firefox @login @test2.m.wikipedia.org +@en.m.wikipedia.beta.wmflabs.org @firefox @login @test2.m.wikipedia.org Feature: Lead image uploads Background: Given I am logged in as a user with a > 0 edit count And I am on the "Nonexistent_page_abc" page And I click on the lead photo upload button - And upload file image.png + And I upload file "exif.jpg" Scenario: Opening upload preview Then I see the upload preview -- To view, visit https://gerrit.wikimedia.org/r/131628 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I63ef45aa7d72aff1547f3cecf5e094141b51fd55 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson Gerrit-Reviewer: Awjrichards Gerrit-Reviewer: Cmcmahon Gerrit-Reviewer: JGonera Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: Kaldari Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused backwards-compatibility code - change (mediawiki...SyntaxHighlight_GeSHi)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove unused backwards-compatibility code
..
Remove unused backwards-compatibility code
Change-Id: Iffa42d7579d882cd119851a075b6e63f670c02bc
---
M SyntaxHighlight_GeSHi.class.php
1 file changed, 1 insertion(+), 24 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php
index 3876f01..7a35433 100644
--- a/SyntaxHighlight_GeSHi.class.php
+++ b/SyntaxHighlight_GeSHi.class.php
@@ -199,27 +199,14 @@
* @return int
*/
static function getEncloseType( $args ) {
- // Since version 1.0.8 geshi can produce valid pre, but we need
to check for it
- if ( defined('GESHI_HEADER_PRE_VALID') ) {
- $pre = GESHI_HEADER_PRE_VALID;
- } else {
- $pre = GESHI_HEADER_PRE;
- }
-
// "Enclose" parameter
- $enclose = $pre;
+ $enclose = GESHI_HEADER_PRE_VALID;
if ( isset( $args['enclose'] ) ) {
if ( $args['enclose'] === 'div' ) {
$enclose = GESHI_HEADER_DIV;
} elseif ( $args['enclose'] === 'none' ) {
$enclose = GESHI_HEADER_NONE;
}
- }
-
- if( isset( $args['line'] ) && $pre === GESHI_HEADER_PRE ) {
- // Force mode to maintain valid XHTML, see
- //
http://sourceforge.net/tracker/index.php?func=detail&aid=1201963&group_id=114997&atid=670231
- $enclose = GESHI_HEADER_DIV;
}
return $enclose;
@@ -488,16 +475,6 @@
self::initialise();
$wgExtensionCredits['parserhook']['SyntaxHighlight_GeSHi']['version'] =
GESHI_VERSION;
return true;
- }
-
- /**
-* @see SyntaxHighlight_GeSHi::hSpecialVersion_GeSHi
-* @param $sp
-* @param $extensionTypes
-* @return bool
-*/
- public static function hOldSpecialVersion_GeSHi( &$sp, &$extensionTypes
) {
- return self::hSpecialVersion_GeSHi( $extensionTypes );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/131443
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iffa42d7579d882cd119851a075b6e63f670c02bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: TheDJ
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 typo: this.transclusionNode -> this.selectedNode - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix typo: this.transclusionNode -> this.selectedNode
..
Fix typo: this.transclusionNode -> this.selectedNode
this.transclusionNode doesn't exist. Also remove instanceof checks
as they are already done in #get(Selected|Reference)Node.
Bug: 64717
Change-Id: I7ff0133d1ad45edda8de2cbad459706dbaceb5f2
---
M modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js
index e734b1e..c5e4da4 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js
@@ -68,7 +68,7 @@
var branches, leaves, transclusionNode,
referenceNode = this.getReferenceNode();
- if ( referenceNode instanceof ve.dm.MWReferenceNode ) {
+ if ( referenceNode ) {
branches = referenceNode.getInternalItem().getChildren();
leaves = branches &&
branches.length === 1 &&
@@ -103,8 +103,8 @@
item = this.referenceModel.findInternalItem( surfaceModel );
if ( item ) {
- if ( this.transclusionNode instanceof ve.dm.MWTransclusionNode
) {
- this.transclusionModel.updateTransclusionNode(
surfaceModel, this.transclusionNode );
+ if ( this.selectedNode ) {
+ this.transclusionModel.updateTransclusionNode(
surfaceModel, this.selectedNode );
} else if ( obj !== null ) {
this.transclusionModel.insertTransclusionNode(
// HACK: This is trying to place the cursor
inside the first content branch node
@@ -150,9 +150,9 @@
ve.ui.MWCitationDialog.super.prototype.setup.call( this, data );
// Initialization
- if ( this.transclusionNode ) {
+ if ( this.selectedNode ) {
this.referenceNode = this.getReferenceNode();
- if ( this.referenceNode instanceof ve.dm.MWReferenceNode ) {
+ if ( this.referenceNode ) {
this.referenceModel =
ve.dm.MWReferenceModel.static.newFromReferenceNode(
this.referenceNode
);
--
To view, visit https://gerrit.wikimedia.org/r/131091
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ff0133d1ad45edda8de2cbad459706dbaceb5f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.24wmf3
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QA: Fix lead photo uploads tests - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/131628 Change subject: QA: Fix lead photo uploads tests .. QA: Fix lead photo uploads tests Change-Id: I63ef45aa7d72aff1547f3cecf5e094141b51fd55 --- M tests/browser/features/uploads_lead.feature 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/28/131628/1 diff --git a/tests/browser/features/uploads_lead.feature b/tests/browser/features/uploads_lead.feature index 5f6aa65..7084bc7 100644 --- a/tests/browser/features/uploads_lead.feature +++ b/tests/browser/features/uploads_lead.feature @@ -1,11 +1,11 @@ -@chrome @en.m.wikipedia.beta.wmflabs.org @firefox @login @test2.m.wikipedia.org +@en.m.wikipedia.beta.wmflabs.org @firefox @login @test2.m.wikipedia.org Feature: Lead image uploads Background: Given I am logged in as a user with a > 0 edit count And I am on the "Nonexistent_page_abc" page And I click on the lead photo upload button - And upload file image.png + And I upload file "exif.jpg" Scenario: Opening upload preview Then I see the upload preview -- To view, visit https://gerrit.wikimedia.org/r/131628 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I63ef45aa7d72aff1547f3cecf5e094141b51fd55 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't call legalSearchChars() statically so it can properly ... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't call legalSearchChars() statically so it can properly
inherit
..
Don't call legalSearchChars() statically so it can properly inherit
Change-Id: Iaabc10ce2905eefe9de8bceeec3290082ba9eb2e
---
M includes/search/SearchMssql.php
M includes/search/SearchMySQL.php
M includes/search/SearchOracle.php
M includes/search/SearchSqlite.php
4 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/search/SearchMssql.php b/includes/search/SearchMssql.php
index 3eef498..ed76ff8 100644
--- a/includes/search/SearchMssql.php
+++ b/includes/search/SearchMssql.php
@@ -132,7 +132,7 @@
*/
function parseQuery( $filteredText, $fulltext ) {
global $wgContLang;
- $lc = SearchEngine::legalSearchChars();
+ $lc = $this->legalSearchChars();
$this->searchTerms = array();
# @todo FIXME: This doesn't handle parenthetical expressions.
diff --git a/includes/search/SearchMySQL.php b/includes/search/SearchMySQL.php
index 345ced5..cc20d02 100644
--- a/includes/search/SearchMySQL.php
+++ b/includes/search/SearchMySQL.php
@@ -43,7 +43,7 @@
*/
function parseQuery( $filteredText, $fulltext ) {
global $wgContLang;
- $lc = SearchEngine::legalSearchChars(); // Minus format chars
+ $lc = $this->legalSearchChars(); // Minus format chars
$searchon = '';
$this->searchTerms = array();
diff --git a/includes/search/SearchOracle.php b/includes/search/SearchOracle.php
index 93427d1..c944152 100644
--- a/includes/search/SearchOracle.php
+++ b/includes/search/SearchOracle.php
@@ -171,7 +171,7 @@
*/
function parseQuery( $filteredText, $fulltext ) {
global $wgContLang;
- $lc = SearchEngine::legalSearchChars();
+ $lc = $this->legalSearchChars();
$this->searchTerms = array();
# @todo FIXME: This doesn't handle parenthetical expressions.
diff --git a/includes/search/SearchSqlite.php b/includes/search/SearchSqlite.php
index 1ac4946..6b1a6b2 100644
--- a/includes/search/SearchSqlite.php
+++ b/includes/search/SearchSqlite.php
@@ -42,7 +42,7 @@
*/
function parseQuery( $filteredText, $fulltext ) {
global $wgContLang;
- $lc = SearchEngine::legalSearchChars(); // Minus format chars
+ $lc = $this->legalSearchChars(); // Minus format chars
$searchon = '';
$this->searchTerms = array();
--
To view, visit https://gerrit.wikimedia.org/r/131590
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaabc10ce2905eefe9de8bceeec3290082ba9eb2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] include accounts in LDAP admin role, add demon - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: include accounts in LDAP admin role, add demon
..
include accounts in LDAP admin role, add demon
- add demon (he had these permissions without needing
sudo, because he had root on formey in the past)
- the users who get sudo need to be included as well, duh
- add wikidev group, this is always needed in all admin classes
RT #6134 (replace formey LDAP operations)
Change-Id: I70d4418fbb5a955cfb06f4108cee18ee752e398e
---
M manifests/admins.pp
1 file changed, 8 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/admins.pp b/manifests/admins.pp
index 9cd6782..b8b5581 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -4018,6 +4018,13 @@
# (formerly directly in site.pp and on formey, now on node silver)
class admins::ldap {
+$gid = '500' # 'wikidev' by default
+include groups::wikidev
+
+include accounts::robla
+include accounts::reedy
+include accounts::demon
+
$sudo_privs = [
'ALL = NOPASSWD: /usr/local/sbin/add-ldap-user',
'ALL = NOPASSWD: /usr/local/sbin/delete-ldap-user',
@@ -4026,7 +4033,7 @@
'ALL = NOPASSWD: /usr/local/sbin/add-labs-user',
]
-sudo_user { [ 'robla', 'reedy' ]: privileges => $sudo_privs }
+sudo_user { [ 'robla', 'reedy', 'demon' ]: privileges => $sudo_privs }
}
--
To view, visit https://gerrit.wikimedia.org/r/131597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I70d4418fbb5a955cfb06f4108cee18ee752e398e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] PostgreSQL: decode image.img_metadata - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: PostgreSQL: decode image.img_metadata
..
PostgreSQL: decode image.img_metadata
The img_metadata field was not being decoded from bytea into text.
This change to core fixes the reported problem with PdfHandler against
1.22.6, origin/REL1_23 and git head.
Bug: 59147
Change-Id: I285a317a57a29713af1f7f630b340278bd5400da
---
M includes/filerepo/file/LocalFile.php
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filerepo/file/LocalFile.php
b/includes/filerepo/file/LocalFile.php
index 4b8e590..b3d5d5d 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -496,6 +496,8 @@
$decoded['timestamp'] = wfTimestamp( TS_MW,
$decoded['timestamp'] );
+ $decoded['metadata'] = $this->repo->getSlaveDB()->decodeBlob(
$decoded['metadata'] );
+
if ( empty( $decoded['major_mime'] ) ) {
$decoded['mime'] = 'unknown/unknown';
} else {
--
To view, visit https://gerrit.wikimedia.org/r/129109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I285a317a57a29713af1f7f630b340278bd5400da
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jjanes
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Umherirrender
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add w.wiki, link to wikipedia.org - change (operations/dns)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/131627 Change subject: add w.wiki, link to wikipedia.org .. add w.wiki, link to wikipedia.org Change-Id: I9ffde60b020da1912b3dc5dc4fbeb1a3f24789fa --- A templates/w.wiki 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/27/131627/1 diff --git a/templates/w.wiki b/templates/w.wiki new file mode 12 index 000..f8431e2 --- /dev/null +++ b/templates/w.wiki @@ -0,0 +1 @@ +wikipedia.org \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/131627 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9ffde60b020da1912b3dc5dc4fbeb1a3f24789fa Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update EventLogging for Id23b37fbe - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update EventLogging for Id23b37fbe .. Update EventLogging for Id23b37fbe Change-Id: Idacfd0104b98db02af227ffbf608996ecde642f4 --- M extensions/EventLogging 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/EventLogging b/extensions/EventLogging index 29c2d9d..f3c1f86 16 --- a/extensions/EventLogging +++ b/extensions/EventLogging -Subproject commit 29c2d9d70b683c70a3493233f0ec405d8d28755e +Subproject commit f3c1f86138a4326598e0826e59f198cd0d908b3b -- To view, visit https://gerrit.wikimedia.org/r/131625 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idacfd0104b98db02af227ffbf608996ecde642f4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf3 Gerrit-Owner: Ori.livneh Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Test support for Nokia proxy fronting assigned cellular IP f... - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Test support for Nokia proxy fronting assigned cellular IP for
one subdomain.
..
Test support for Nokia proxy fronting assigned cellular IP for one subdomain.
Change-Id: I81b581a74242060dd35de46b1a72563c81360645
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index 9b5f8dd..febc0a1 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -236,6 +236,12 @@
if (!req.http.X-Forwarded-By) {
set req.http.X-CS = req.http.X-CS2;
}
+ } else if (req.http.X-CS2 == "310-260") {
+ if (req.http.X-Forwarded-By == "Nokiaprod" ||
req.http.X-Forwarded-By == "Nokiaqa") {
+ if (req.http.X-Subdomain == "ZERO" &&
req.http.host ~ "^en\.") {
+ set req.http.X-CS = req.http.X-CS2;
+ }
+ }
} else if (req.http.X-CS2 == "TEST") {
// Test carrier allows all proxies and SSL
set req.http.X-ZeroTLS = "1";
--
To view, visit https://gerrit.wikimedia.org/r/131540
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I81b581a74242060dd35de46b1a72563c81360645
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dr0ptp4kt
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update EventLogging for Id23b37fbe - change (mediawiki/core)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/131626 Change subject: Update EventLogging for Id23b37fbe .. Update EventLogging for Id23b37fbe Change-Id: Ife6847a6b0ab9efaa4e5dc76935896ba461a8f93 --- M extensions/EventLogging 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/26/131626/1 diff --git a/extensions/EventLogging b/extensions/EventLogging index 29e31e0..f3c1f86 16 --- a/extensions/EventLogging +++ b/extensions/EventLogging -Subproject commit 29e31e0ac72c360882ef056bb6c1fb33ce65ff7d +Subproject commit f3c1f86138a4326598e0826e59f198cd0d908b3b -- To view, visit https://gerrit.wikimedia.org/r/131626 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife6847a6b0ab9efaa4e5dc76935896ba461a8f93 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf2 Gerrit-Owner: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update EventLogging for Id23b37fbe - change (mediawiki/core)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/131625 Change subject: Update EventLogging for Id23b37fbe .. Update EventLogging for Id23b37fbe Change-Id: Idacfd0104b98db02af227ffbf608996ecde642f4 --- M extensions/EventLogging 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/25/131625/1 diff --git a/extensions/EventLogging b/extensions/EventLogging index 29c2d9d..f3c1f86 16 --- a/extensions/EventLogging +++ b/extensions/EventLogging -Subproject commit 29c2d9d70b683c70a3493233f0ec405d8d28755e +Subproject commit f3c1f86138a4326598e0826e59f198cd0d908b3b -- To view, visit https://gerrit.wikimedia.org/r/131625 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idacfd0104b98db02af227ffbf608996ecde642f4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf3 Gerrit-Owner: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename mflaschen to mattflaschen and change UID to match labs. - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Rename mflaschen to mattflaschen and change UID to match labs.
..
Rename mflaschen to mattflaschen and change UID to match labs.
Change-Id: Iacec7bb90328590961ffdef5b3bdf93cf489a497
---
M manifests/admins.pp
1 file changed, 11 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/admins.pp b/manifests/admins.pp
index 4401fa8..9cd6782 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -1030,11 +1030,22 @@
}
}
+# disabled in favor of mattflaschen
class mflaschen inherits baseaccount {
$username = 'mflaschen'
$realname = 'Matthew Flaschen'
$uid = '625'
$gid = '500'
+$enabled = false
+
+unixaccount { $realname: username => $username, uid => $uid, gid =>
$gid, enabled => $enabled }
+}
+
+class mattflaschen inherits baseaccount {
+$username = 'mattflaschen'
+$realname = 'Matthew Flaschen'
+$uid = '2662'
+$gid = '500'
unixaccount { $realname: username => $username, uid => $uid, gid =>
$gid, enabled => $enabled }
--
To view, visit https://gerrit.wikimedia.org/r/131624
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iacec7bb90328590961ffdef5b3bdf93cf489a497
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename mflaschen to mattflaschen and change UID to match labs. - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131624
Change subject: Rename mflaschen to mattflaschen and change UID to match labs.
..
Rename mflaschen to mattflaschen and change UID to match labs.
Change-Id: Iacec7bb90328590961ffdef5b3bdf93cf489a497
---
M manifests/admins.pp
1 file changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/24/131624/1
diff --git a/manifests/admins.pp b/manifests/admins.pp
index 4401fa8..9cd6782 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -1030,11 +1030,22 @@
}
}
+# disabled in favor of mattflaschen
class mflaschen inherits baseaccount {
$username = 'mflaschen'
$realname = 'Matthew Flaschen'
$uid = '625'
$gid = '500'
+$enabled = false
+
+unixaccount { $realname: username => $username, uid => $uid, gid =>
$gid, enabled => $enabled }
+}
+
+class mattflaschen inherits baseaccount {
+$username = 'mattflaschen'
+$realname = 'Matthew Flaschen'
+$uid = '2662'
+$gid = '500'
unixaccount { $realname: username => $username, uid => $uid, gid =>
$gid, enabled => $enabled }
--
To view, visit https://gerrit.wikimedia.org/r/131624
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacec7bb90328590961ffdef5b3bdf93cf489a497
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge master - change (mediawiki...Flow)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131623
Change subject: Merge master
..
Merge master
Change-Id: I55bf807c2b98b91b1c57508cd420136b2abaf6b2
---
M includes/BaseUrlGenerator.php
M includes/Block/Header.php
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/23/131623/1
diff --git a/includes/BaseUrlGenerator.php b/includes/BaseUrlGenerator.php
index 9305408..401e5a5 100644
--- a/includes/BaseUrlGenerator.php
+++ b/includes/BaseUrlGenerator.php
@@ -57,7 +57,7 @@
* @param array $query Associative array of query parameters
* @return String URL
*/
- protected function buildUrl( $title, $action = 'view', array $query =
array() ) {
+ public function buildUrl( $title, $action = 'view', array $query =
array() ) {
if ( $action !== 'view' ) {
$query['action'] = $action;
}
diff --git a/includes/Block/Header.php b/includes/Block/Header.php
index d53ddaa..ed1a740 100644
--- a/includes/Block/Header.php
+++ b/includes/Block/Header.php
@@ -177,7 +177,6 @@
'type' => $this->getName(),
'editToken' => $this->getEditToken(),
);
- $result->setIndexedTagName( $output, 'header' );
if ( $this->header === null ) {
$output['revision'] = array(
@@ -208,6 +207,7 @@
'errors' => $this->errors,
);
}
+
return $output;
}
--
To view, visit https://gerrit.wikimedia.org/r/131623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I55bf807c2b98b91b1c57508cd420136b2abaf6b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: frontend-rewrite
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'gerrit/master' into frontend-r... - change (mediawiki...Flow)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131622
Change subject: Merge remote-tracking branch 'gerrit/master' into
frontend-rewrite
..
Merge remote-tracking branch 'gerrit/master' into frontend-rewrite
Conflicts:
Hooks.php
includes/Block/Block.php
includes/Block/BoardHistory.php
includes/Block/Header.php
includes/Block/Topic.php
includes/Block/TopicList.php
includes/Block/TopicSummary.php
includes/Formatter/AbstractFormatter.php
includes/Formatter/BoardHistory.php
includes/Formatter/IRCLineUrlFormatter.php
includes/Formatter/RevisionFormatter.php
includes/View.php
includes/api/ApiQueryFlow.php
Change-Id: I09ec6b5ad1140a7e2a4b6d77baad29d173fead1c
---
M Hooks.php
M includes/Block/Block.php
M includes/Block/BoardHistory.php
M includes/Block/Header.php
M includes/Block/Topic.php
M includes/Block/TopicList.php
M includes/Block/TopicSummary.php
M includes/Formatter/AbstractFormatter.php
D includes/Formatter/BoardHistory.php
M includes/Formatter/IRCLineUrlFormatter.php
M includes/Formatter/RevisionFormatter.php
M includes/View.php
M includes/api/ApiQueryFlow.php
13 files changed, 12 insertions(+), 623 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/22/131622/1
diff --git a/Hooks.php b/Hooks.php
index 82bdce8..5d8f1ad 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -257,13 +257,9 @@
$container = Container::getContainer();
$view = new Flow\View(
$container['templating'],
-<<< HEAD (b68c36 Avoid Firefox errors in mw-ui.enhance)
$container['url_generator'],
- $output,
- $container['lightncandy']
-===
+ $container['lightncandy'],
$output
->>> BRANCH (3ce681 Merge "API: Use a standard edit token")
);
try {
diff --git a/includes/Block/Block.php b/includes/Block/Block.php
index f7d6384..4752b6c 100644
--- a/includes/Block/Block.php
+++ b/includes/Block/Block.php
@@ -2,11 +2,7 @@
namespace Flow\Block;
-<<< HEAD (b68c36 Avoid Firefox errors in mw-ui.enhance)
use Flow\Exception\InvalidInputException;
-===
-use ApiResult;
->>> BRANCH (3ce681 Merge "API: Use a standard edit token")
use Flow\Model\UUID;
use Flow\Model\Workflow;
use Flow\NotificationController;
@@ -49,11 +45,10 @@
* Templating is provided for convenience
*
* @param Templating $templating
-* @param ApiResult $result
* @param array $options
* @return array
*/
- function renderAPI( Templating $templating, ApiResult $result, array
$options );
+ function renderAPI( Templating $templating, array $options );
/**
* @return string Unique name among all blocks on an object
@@ -108,7 +103,7 @@
// until php 5.3.9, but MediaWiki requires PHP version 5.3.2 or later
(and
// some of our test machines are on 5.3.3).
//abstract public function render( Templating $templating, array
$options );
- //abstract public function renderAPI( Templating $templating, ApiResult
$result, array $options );
+ //abstract public function renderAPI( Templating $templating, array
$options );
//abstract public function commit();
public function init( $action, $user ) {
diff --git a/includes/Block/BoardHistory.php b/includes/Block/BoardHistory.php
index 63cc66f..4650f2b 100644
--- a/includes/Block/BoardHistory.php
+++ b/includes/Block/BoardHistory.php
@@ -2,7 +2,6 @@
namespace Flow\Block;
-use ApiResult;
use Flow\RevisionActionPermissions;
use Flow\Container;
use Flow\Templating;
@@ -45,23 +44,14 @@
throw new FlowException( 'deprecated' );
}
- public function renderAPI( Templating $templating, ApiResult $result,
array $options ) {
+ public function renderAPI( Templating $templating, array $options ) {
if ( $this->workflow->isNew() ) {
-<<< HEAD (b68c36 Avoid Firefox errors in mw-ui.enhance)
return array(
'type' => $this->getName(),
'revisions' => array(),
'links' => array(
-===
- $output = array(
- 0 => array(
- 'type' => 'board-history',
- 'empty' => '',
->>> BRANCH (3ce681 Merge "API: Use a standard edit token")
),
);
- $result->setIndexedTagName( $output, 'board-history' );
-
[MediaWiki-commits] [Gerrit] Fix viewing older Entity revisions - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131621
Change subject: Fix viewing older Entity revisions
..
Fix viewing older Entity revisions
This is done by constructing an EntityRevision object
with the old revision id instead of just using the current
(latest one) in EntityContent.
After having fixed that, we can use this EntityRevision
object to fetch the correct version of the Entity for
the deferred rendering (EntityViewPlaceholderExpander)
of the "In other languages" box.
Bug: 63309
Change-Id: Id6fbbc85148d5efe6545d5a91a99b5ec19e96665
---
M repo/includes/EntityView.php
M repo/includes/EntityViewPlaceholderExpander.php
M repo/includes/PropertyView.php
M repo/includes/actions/ViewEntityAction.php
M repo/includes/content/EntityContent.php
M repo/tests/phpunit/includes/content/EntityContentTest.php
6 files changed, 78 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/21/131621/1
diff --git a/repo/includes/EntityView.php b/repo/includes/EntityView.php
index 8007f59..7a9f7bb 100644
--- a/repo/includes/EntityView.php
+++ b/repo/includes/EntityView.php
@@ -242,7 +242,7 @@
$html .= $this->getHtmlForAliases( $entity, $editable );
$html .= $this->getHtmlForToc();
- $html .= $this->getHtmlForTermBox( $entity, $editable );
+ $html .= $this->getHtmlForTermBox( $entityRevision, $editable );
$html .= $this->getHtmlForClaims( $entity, $editable );
wfProfileOut( __METHOD__ );
@@ -297,18 +297,19 @@
}
/**
-* @param Entity $entity
+* @param EntityRevision $entityRevision
* @param bool $editable
*
* @return string
*/
- protected function getHtmlForTermBox( Entity $entity, $editable = true
) {
- if ( $entity->getId() ) {
+ protected function getHtmlForTermBox( EntityRevision $entityRevision,
$editable = true ) {
+ if ( $entityRevision->getEntity()->getId() ) {
// Placeholder for a termbox for the present item.
// EntityViewPlaceholderExpander must know about the
parameters used here.
return $this->textInjector->newMarker(
'termbox',
- $entity->getId()->getSerialization()
+
$entityRevision->getEntity()->getId()->getSerialization(),
+ $entityRevision->getRevision()
);
}
diff --git a/repo/includes/EntityViewPlaceholderExpander.php
b/repo/includes/EntityViewPlaceholderExpander.php
index 45e8f37..6601361 100644
--- a/repo/includes/EntityViewPlaceholderExpander.php
+++ b/repo/includes/EntityViewPlaceholderExpander.php
@@ -124,7 +124,7 @@
*
* @return string HTML to be substituted for the placeholder in the
output.
*/
- public function getHtmlForPlaceholder( $name ) {
+ public function getHtmlForPlaceholder( $name, $args ) {
$args = func_get_args();
$name = array_shift( $args );
@@ -132,9 +132,9 @@
$html = $this->expandPlaceholder( $name, $args );
return $html;
} catch ( MWException $ex ) {
- wfWarn( "Expansion of $name failed: " . $ex );
+ wfWarn( "Expansion of $name failed: " .
$ex->getMessage() );
} catch ( RuntimeException $ex ) {
- wfWarn( "Expansion of $name failed: " . $ex );
+ wfWarn( "Expansion of $name failed: " .
$ex->getMessage() );
}
return false;
@@ -143,21 +143,19 @@
/**
* Returns an argument from a list, first checking whether it is
present and has the correct type.
*
-* @param array $args the argument list
-* @param int $index the index of the desired argument
-* @param string $type the desired type of the argument
-* @param string $message the message to use if the argument is missing
or has the wrong type
+* @param string $entityId
*
-* @return mixed
+* @return EntityId
* @throws \InvalidArgumentException If the argument is missing or has
the wrong type
*/
- protected function extractArgument( $args, $index, $type, $message ) {
- // this should be the entity id, as per the call to
$injector->newMarker() in getInnerHtml
- if ( !isset( $args[$index] ) || gettype( $args[$index] ) !==
$type ) {
- throw new \InvalidArgumentException( $message );
+ private function getEntityIdFromString( $entityId ) {
+ if ( !is_string( $entityId ) ) {
+
[MediaWiki-commits] [Gerrit] PostgreSQL: Make l10n_cache.lc_value binary - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: PostgreSQL: Make l10n_cache.lc_value binary
..
PostgreSQL: Make l10n_cache.lc_value binary
Change-Id I427c6de5a0a29b43cff755db0eb8a750db620173 increases the
probability that a null byte will attempt to be stored in the
lc_value column. PostgreSQL does not allow that byte in a text
column, so convert the column to bytea.
If the column already contains corrupted data, the upgrade routine
might fail. To prevent this, delete the contents of the table before
changing the type.
Bug: 62098
Change-Id: Ie8368bde398b2ae4d3cfc9ee7bf35874bd2ded68
---
M includes/cache/LocalisationCache.php
M includes/installer/PostgresUpdater.php
M maintenance/postgres/tables.sql
3 files changed, 33 insertions(+), 3 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/cache/LocalisationCache.php
b/includes/cache/LocalisationCache.php
index 3bbf1bb..1153fd2 100644
--- a/includes/cache/LocalisationCache.php
+++ b/includes/cache/LocalisationCache.php
@@ -1171,7 +1171,7 @@
$row = $db->selectRow( 'l10n_cache', array( 'lc_value' ),
array( 'lc_lang' => $code, 'lc_key' => $key ),
__METHOD__ );
if ( $row ) {
- return unserialize( $row->lc_value );
+ return unserialize( $db->decodeBlob( $row->lc_value ) );
} else {
return null;
}
@@ -1233,7 +1233,7 @@
$this->batch[] = array(
'lc_lang' => $this->currentLang,
'lc_key' => $key,
- 'lc_value' => serialize( $value ) );
+ 'lc_value' => $this->dbw->encodeBlob( serialize( $value
) ) );
if ( count( $this->batch ) >= 100 ) {
$this->dbw->insert( 'l10n_cache', $this->batch,
__METHOD__ );
diff --git a/includes/installer/PostgresUpdater.php
b/includes/installer/PostgresUpdater.php
index 8f6aac7..e7aab8a 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -406,6 +406,7 @@
array( 'addPgField', 'recentchanges', 'rc_source',
"TEXT NOT NULL DEFAULT ''" ),
array( 'addPgField', 'page', 'page_links_updated',
"TIMESTAMPTZ NULL" ),
array( 'addPgField', 'mwuser', 'user_password_expires',
'TIMESTAMPTZ NULL' ),
+ array( 'changeFieldPurgeTable', 'l10n_cache',
'lc_value', 'bytea', "replace(lc_value,'\','')::bytea" ),
// 1.24
array( 'addPgField', 'page_props', 'pp_sortkey', 'float
NULL' ),
@@ -677,6 +678,35 @@
}
}
+ protected function changeFieldPurgeTable( $table, $field, $newtype,
$default ) {
+ ## For a cache table, empty it if the field needs to be
changed, because the old contents
+ ## may be corrupted. If the column is already the desired
type, refrain from purging.
+ $fi = $this->db->fieldInfo( $table, $field );
+ if ( is_null( $fi ) ) {
+ $this->output( "...ERROR: expected column $table.$field
to exist\n" );
+ exit( 1 );
+ }
+
+ if ( $fi->type() === $newtype ) {
+ $this->output( "...column '$table.$field' is already of
type '$newtype'\n" );
+ } else {
+ $this->output( "Purging data from cache table
'$table'\n" );
+ $this->db->query("DELETE from $table" );
+ $this->output( "Changing column type of '$table.$field'
from '{$fi->type()}' to '$newtype'\n" );
+ $sql = "ALTER TABLE $table ALTER $field TYPE $newtype";
+ if ( strlen( $default ) ) {
+ $res = array();
+ if ( preg_match( '/DEFAULT (.+)/', $default,
$res ) ) {
+ $sqldef = "ALTER TABLE $table ALTER
$field SET DEFAULT $res[1]";
+ $this->db->query( $sqldef );
+ $default = preg_replace( '/\s*DEFAULT
.+/', '', $default );
+ }
+ $sql .= " USING $default";
+ }
+ $this->db->query( $sql );
+ }
+ }
+
protected function setDefault( $table, $field, $default ) {
$info = $this->db->fieldInfo( $table, $field );
diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index 6a2c41d..abbfd3a 100644
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -678,7 +678,7 @@
CREATE TABLE l10n_cache (
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0bcab80..1a16b5a - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/131620 Change subject: Syncronize VisualEditor: 0bcab80..1a16b5a .. Syncronize VisualEditor: 0bcab80..1a16b5a Change-Id: Ia4aa590a707a8d0178f2b4a52a808051939bec1c --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/20/131620/1 diff --git a/VisualEditor b/VisualEditor index 0bcab80..1a16b5a 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 0bcab80d2a3e6fd6b7e101913dd59900a1becf05 +Subproject commit 1a16b5aa9ef7141d67ef2625a95a35ff559744ef -- To view, visit https://gerrit.wikimedia.org/r/131620 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia4aa590a707a8d0178f2b4a52a808051939bec1c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0bcab80..1a16b5a - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 0bcab80..1a16b5a .. Syncronize VisualEditor: 0bcab80..1a16b5a Change-Id: Ia4aa590a707a8d0178f2b4a52a808051939bec1c --- 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 0bcab80..1a16b5a 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 0bcab80d2a3e6fd6b7e101913dd59900a1becf05 +Subproject commit 1a16b5aa9ef7141d67ef2625a95a35ff559744ef -- To view, visit https://gerrit.wikimedia.org/r/131620 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia4aa590a707a8d0178f2b4a52a808051939bec1c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [browser test] refactor bullets test to use API etc. - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [browser test] refactor bullets test to use API etc.
..
[browser test] refactor bullets test to use API etc.
Get rid of all hard-coded values for both the target page
and also the text on the target page, which is now all set
in the .feature file.
Note that we're deconstructing the @make_selectable hook
by doing this. @make_selectable may become obsolete when
all the tests are refactored to use APIPage
Change-Id: Iad1b160d9d0274effb8504f276bd4816932d299c
---
M modules/ve-mw/test/browser/features/bullets.feature
M modules/ve-mw/test/browser/features/step_definitions/bullets_steps.rb
M modules/ve-mw/test/browser/features/step_definitions/shared_steps.rb
M modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
A modules/ve-mw/test/browser/features/support/pages/zarticlepage.rb
5 files changed, 39 insertions(+), 11 deletions(-)
Approvals:
Cmcmahon: Looks good to me, approved
Jforrester: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/ve-mw/test/browser/features/bullets.feature
b/modules/ve-mw/test/browser/features/bullets.feature
index ac5a29f..89bff7f 100644
--- a/modules/ve-mw/test/browser/features/bullets.feature
+++ b/modules/ve-mw/test/browser/features/bullets.feature
@@ -1,6 +1,10 @@
-@en.wikipedia.beta.wmflabs.org @firefox @login @make_selectable_line
@test2.wikipedia.org
+@en.wikipedia.beta.wmflabs.org @firefox @login @test2.wikipedia.org
Feature: VisualEditor Bullets, Numbering
+ Background:
+Given I go to the "Bullets VisualEditor Test" page with content "Bullets
VisualEditor Test"
+ And I make the text "Bullets VisualEditor Test" be selected
+
Scenario Outline: check strings for bullets and numbering
When I click
And I click Save page
diff --git
a/modules/ve-mw/test/browser/features/step_definitions/bullets_steps.rb
b/modules/ve-mw/test/browser/features/step_definitions/bullets_steps.rb
index 742eb7a..50e27e8 100644
--- a/modules/ve-mw/test/browser/features/step_definitions/bullets_steps.rb
+++ b/modules/ve-mw/test/browser/features/step_definitions/bullets_steps.rb
@@ -1,3 +1,9 @@
+Given(/^I go to the "(.+)" page with content "(.+)"$/) do |page_title,
page_content|
+ @wikitext = page_content
+ on(APIPage).create page_title, page_content
+ step "I am on the #{page_title} page"
+end
+
Given(/^I close the VE information window$/) do
pending # express the regexp above with the code you wish you had
end
@@ -24,9 +30,9 @@
Then(/^a \# is added in front of input string in the diff view$/) do
on(VisualEditorPage) do |page|
page.wait_until(10) do
- page.diff_view.include? "# This "
+ page.diff_view.include? "# #{@wikitext}"
end
-page.diff_view.should match Regexp.new(/^\# This is a new line/)
+page.diff_view.should match Regexp.new(/^\# #{@wikitext}/)
end
end
@@ -37,9 +43,9 @@
Then(/^a \* is added in front of input string in the diff view$/) do
on(VisualEditorPage) do |page|
page.wait_until(10) do
- page.diff_view.include? "* This "
+ page.diff_view.include? "* #{@wikitext}"
end
-page.diff_view.should match Regexp.new(/^\* This is a new line/)
+page.diff_view.should match Regexp.new(/^\* #{@wikitext}/)
end
end
@@ -50,18 +56,18 @@
Then(/^a \#\# is added in front of input string in the diff view$/) do
on(VisualEditorPage) do |page|
page.wait_until(10) do
- page.diff_view.include? "## This "
+ page.diff_view.include? "## #{@wikitext}"
end
-page.diff_view.should match Regexp.new(/^\#\# This is a new line/)
+page.diff_view.should match Regexp.new(/^\#\# #{@wikitext}/)
end
end
Then(/^a \*\* is added in front of input string in the diff view$/) do
on(VisualEditorPage) do |page|
page.wait_until(10) do
- page.diff_view.include? "** This "
+ page.diff_view.include? "** #{@wikitext}"
end
-page.diff_view.should match Regexp.new(/^\*\* This is a new line/)
+page.diff_view.should match Regexp.new(/^\*\* #{@wikitext}/)
end
end
@@ -73,9 +79,9 @@
Then(/^nothing is added in front of input string in the diff view$/) do
on(VisualEditorPage) do |page|
page.wait_until(10) do
- page.diff_view.include? "This "
+ page.review_failed_element.when_present.text.include? "No changes to
review"
end
-page.diff_view.should match Regexp.new(/^This is a new line/)
+page.review_failed_element.when_present.text.should match "No changes to
review"
end
end
diff --git
a/modules/ve-mw/test/browser/features/step_definitions/shared_steps.rb
b/modules/ve-mw/test/browser/features/step_definitions/shared_steps.rb
index 2a8c5bf..b9c4193 100644
--- a/modules/ve-mw/test/browser/features/step_definitions/shared_steps.rb
+++ b/modules/ve-mw/test/browser/features/step_definitions/shared_steps.rb
@@ -2,6 +2,18 @@
[MediaWiki-commits] [Gerrit] Tools: Add check for trailing whitespace to pre-commit hook - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/131619 Change subject: Tools: Add check for trailing whitespace to pre-commit hook .. Tools: Add check for trailing whitespace to pre-commit hook Change-Id: Ife0dd33c84e06fa035599f1afa7a7057481ae5e0 --- M scripts/pre-commit 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/19/131619/1 diff --git a/scripts/pre-commit b/scripts/pre-commit index 2a89023..b4cb6fd 100755 --- a/scripts/pre-commit +++ b/scripts/pre-commit @@ -3,6 +3,12 @@ # $ ln -s $PWD/scripts/pre-commit .git/hooks/pre-commit make jshint || exit 1 +# check for trailing whitespace +if [[ `git diff --cached --check` ]]; then + git diff --cached --check + exit 1 +fi + if git diff --name-only --cached | grep -P '\.js$' ; then make qunit || exit 1 fi -- To view, visit https://gerrit.wikimedia.org/r/131619 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife0dd33c84e06fa035599f1afa7a7057481ae5e0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Extract metadata panel scroll/log/animate logic into separat... - change (mediawiki...MultimediaViewer)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131618
Change subject: Extract metadata panel scroll/log/animate logic into separate
component
..
Extract metadata panel scroll/log/animate logic into separate component
Change-Id: I2441d64c094a9bfbae7a4712ff4c78efa13a62a7
---
M MultimediaViewer.php
M MultimediaViewerHooks.php
M resources/mmv/mmv.js
M resources/mmv/ui/mmv.ui.metadataPanel.js
M resources/mmv/ui/mmv.ui.metadataPanel.less
A resources/mmv/ui/mmv.ui.metadataPanelScroller.js
A resources/mmv/ui/mmv.ui.metadataPanelScroller.less
M tests/qunit/mmv/mmv.lightboxinterface.test.js
M tests/qunit/mmv/mmv.test.js
M tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js
A tests/qunit/mmv/ui/mmv.ui.metadataPanelScroller.test.js
11 files changed, 406 insertions(+), 324 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/18/131618/1
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index 5a3cc4a..6952143 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -452,10 +452,12 @@
'mmv.ui.metadataPanel' => $wgMediaViewerResourceTemplate + array(
'scripts' => array(
'mmv/ui/mmv.ui.metadataPanel.js',
+ 'mmv/ui/mmv.ui.metadataPanelScroller.js',
),
'styles' => array(
'mmv/ui/mmv.ui.metadataPanel.less',
+ 'mmv/ui/mmv.ui.metadataPanelScroller.less',
),
'dependencies' => array(
diff --git a/MultimediaViewerHooks.php b/MultimediaViewerHooks.php
index 754e9a6..466cf80 100644
--- a/MultimediaViewerHooks.php
+++ b/MultimediaViewerHooks.php
@@ -215,6 +215,7 @@
'tests/qunit/mmv/ui/mmv.ui.description.test.js',
'tests/qunit/mmv/ui/mmv.ui.fileUsage.test.js',
'tests/qunit/mmv/ui/mmv.ui.metadataPanel.test.js',
+
'tests/qunit/mmv/ui/mmv.ui.metadataPanelScroller.test.js',
'tests/qunit/mmv/ui/mmv.ui.progressBar.test.js',
'tests/qunit/mmv/ui/mmv.ui.permission.test.js',
'tests/qunit/mmv/ui/mmv.ui.stripeButtons.test.js',
diff --git a/resources/mmv/mmv.js b/resources/mmv/mmv.js
index b561267..ef1acc8 100755
--- a/resources/mmv/mmv.js
+++ b/resources/mmv/mmv.js
@@ -327,7 +327,7 @@
return;
}
- viewer.ui.panel.animateMetadataOnce();
+ viewer.ui.panel.scroller.animateMetadataOnce();
viewer.preloadDependencies();
} );
diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.js
b/resources/mmv/ui/mmv.ui.metadataPanel.js
index 7ee9710..0f281a8 100644
--- a/resources/mmv/ui/mmv.ui.metadataPanel.js
+++ b/resources/mmv/ui/mmv.ui.metadataPanel.js
@@ -32,56 +32,34 @@
mw.mmv.ui.Element.call( this, $container );
this.$controlBar = $controlBar;
-
- /** @property {Object} localStorage the window.localStorage
object */
- this.localStorage = localStorage;
-
- /**
-* Whether we've already fired an animation for the metadata
div in this lightbox session.
-* @property {boolean}
-* @private
-*/
- this.hasAnimatedMetadata = undefined;
-
/** @property {mw.mmv.HtmlUtils} htmlUtils - */
this.htmlUtils = new mw.mmv.HtmlUtils();
+ this.localStorage = localStorage;
this.initializeHeader();
this.initializeImageMetadata();
this.initializeAboutLinks();
}
-
oo.inheritClass( MetadataPanel, mw.mmv.ui.Element );
-
MPP = MetadataPanel.prototype;
MPP.attach = function() {
- var panel = this;
- this.handleEvent( 'keydown', function ( e ) {
- panel.keydown( e );
- } );
-
- $.scrollTo().on( 'scroll.mmvp', $.throttle( 250, function() {
- panel.scroll();
- } ) );
-
+ this.scroller.attach();
this.buttons.attach();
this.fileReuse.attach();
-
- // reset animation flag when the viewer is reopened
- this.hasAnimatedMetadata = !this.localStorage ||
this.localStorage.getItem( 'mmv.hasOpenedMetadata' );
};
MPP.unattach = function() {
+ this.scroller.unattach();
this.buttons.unattach();
this.fileReuse.unattach();
this.fileReuse.closeDialog();
this.clearEvents();
-
- $.scrollTo().off( 'scroll.mmvp' );
[MediaWiki-commits] [Gerrit] Updating scalable default in MediaSizeWidget - change (VisualEditor/VisualEditor)
Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131617
Change subject: Updating scalable default in MediaSizeWidget
..
Updating scalable default in MediaSizeWidget
Updating defaults when scalable is attached to media size widget.
This makes sure the defaults are loaded initially; they will change
later by the scalable default change event.
h/t Roan for figuring this out.
Change-Id: Ie45419a9f88694484d072dbc28d451fdc0ba06c1
---
M modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/17/131617/1
diff --git a/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
b/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
index 1075bc8..1fa98b2 100644
--- a/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
+++ b/modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
@@ -279,6 +279,7 @@
this.scalable.connect( this, { 'defaultSizeChange':
'onScalableDefaultSizeChange' } );
// Reset current dimensions to new scalable object
this.setCurrentDimensions( this.scalable.getCurrentDimensions() );
+ this.updateDefaultDimensions();
// If we don't have original dimensions, disable the full size button
if ( !this.scalable.getOriginalDimensions() ) {
--
To view, visit https://gerrit.wikimedia.org/r/131617
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie45419a9f88694484d072dbc28d451fdc0ba06c1
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't error if module has no parameters - change (mediawiki...ApiSandbox)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't error if module has no parameters
..
Don't error if module has no parameters
E.g. query prop=flowinfo gets actionInfo.parameters is undefined from
UiBuilder.js. This fixes the problem for me locally.
Change-Id: Idaad922635af8a5ffc6fda79e5109117114bc6d9
---
M resources/UiBuilder.js
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/UiBuilder.js b/resources/UiBuilder.js
index c88f359..0a79e8d 100644
--- a/resources/UiBuilder.js
+++ b/resources/UiBuilder.js
@@ -206,6 +206,9 @@
var params = '', i, length, param, name, $node, value,
prefix = this.prefix;
$.each( this.info, function ( action, actionInfo ) {
+ if ( !actionInfo.parameters ) {
+ return;
+ }
for ( i = 0, length =
actionInfo.parameters.length; i < length; i += 1 ) {
param = actionInfo.parameters[i];
name = prefix + actionInfo.prefix +
param.name;
--
To view, visit https://gerrit.wikimedia.org/r/131600
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idaad922635af8a5ffc6fda79e5109117114bc6d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApiSandbox
Gerrit-Branch: master
Gerrit-Owner: Spage
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] MAKE CUSTOM VAGRANT SETTINGS LESS SHOUTY - change (mediawiki/vagrant)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131616
Change subject: MAKE CUSTOM VAGRANT SETTINGS LESS SHOUTY
..
MAKE CUSTOM VAGRANT SETTINGS LESS SHOUTY
AN EARLY PATCHSET OF I689F7C129 USED A BASH SCRIPT TO DECLARE THESE VARIABLES,
WHICH INFORMED THE DECISION TO NAME THEM USING ALL-CAPITAL LETTERS. BUT IT'S
A BIT SHOUTY AND OBNOXIOUS, SO SWITCH TO LOWERCASE LETTERS INSTEAD.
Change-Id: I40942283aa2a774e4d8a9fde280b2700719c633d
---
M Vagrantfile
M puppet/modules/vagrant/templates/settings.yaml.erb
2 files changed, 27 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/16/131616/1
diff --git a/Vagrantfile b/Vagrantfile
index 46bf585..f14af64 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -35,41 +35,41 @@
# --
# These can be changed by making a `.settings.yaml` file that contains YAML
# replacements. Example:
-# BOX_NAME: "foo"
-# VAGRANT_RAM: 2048
-# FORWARD_PORTS:
+# box_name: "foo"
+# vagrant_ram: 2048
+# forward_ports:
# 27017: 31337
#
# Some roles may also provide new settings values. When applied these roles
# will require a `vagrant reload` call for their changes to take effect.
settings = Settings.new({
# The vagrant box to load on the VM
-'BOX_NAME' => 'precise-cloud',
+'box_name' => 'precise-cloud',
# Download URL for vagrant box. If you change this, also update
support/packager/urls.yaml .
-'BOX_URI' =>
'https://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box',
+'box_uri' =>
'https://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box',
# Amount of RAM to allocate to virtual machine in MB; must be numeric
-'VAGRANT_RAM' => 768,
+'vagrant_ram' => 768,
# Number of virtual CPUs to allocate to virtual machine; must be numeric
# If you are on a single-core system, change the following default to 1:
-'VAGRANT_CORES' => 2,
+'vagrant_cores' => 2,
# Static IP address for virtual machine
-'STATIC_IP' => '10.11.12.13',
+'static_ip' => '10.11.12.13',
# The port on the host that should be forwarded to the guest's HTTP server.
# Must be numeric.
-'HTTP_PORT' => 8080,
+'http_port' => 8080,
# You may provide a map of vm:host port pairs for Vagrant to forward.
# Keys and values must be numeric.
-'FORWARD_PORTS' => {},
+'forward_ports' => {},
# Enable puppet debug output?
# Must be boolean
-'PUPPET_DEBUG' => false,
+'puppet_debug' => false,
})
# Load role provided settings
@@ -92,8 +92,8 @@
# the file using another tool that implements SSL properly, and then
# point Vagrant to the downloaded file:
# $ vagrant box add precise-cloud /path/to/file/precise.box
-config.vm.box = settings['BOX_NAME']
-config.vm.box_url = settings['BOX_URI']
+config.vm.box = settings['box_name']
+config.vm.box_url = settings['box_uri']
if config.vm.respond_to? 'box_download_insecure' # Vagrant 1.2.6+
config.vm.box_download_insecure = true
end
@@ -105,11 +105,11 @@
config.vm.network :private_network, ip: settings['STATIC_IP']
config.vm.network :forwarded_port,
-guest: 80, host: settings['HTTP_PORT'].to_i, id: 'http'
+guest: 80, host: settings['http_port'].to_i, id: 'http'
# Forward additional ports
-if settings['FORWARD_PORTS']
-settings['FORWARD_PORTS'].each do |guest_port,host_port|
+if settings['forward_ports']
+settings['forward_ports'].each do |guest_port,host_port|
config.vm.network :forwarded_port,
:host => host_port.to_i, :guest => guest_port.to_i,
auto_correct: true
@@ -130,8 +130,8 @@
config.vm.provider :virtualbox do |vb|
# See http://www.virtualbox.org/manual/ch08.html for additional
options.
-vb.customize ['modifyvm', :id, '--memory',
settings['VAGRANT_RAM'].to_i]
-vb.customize ['modifyvm', :id, '--cpus',
settings['VAGRANT_CORES'].to_i]
+vb.customize ['modifyvm', :id, '--memory',
settings['vagrant_ram'].to_i]
+vb.customize ['modifyvm', :id, '--cpus',
settings['vagrant_cores'].to_i]
vb.customize ['modifyvm', :id, '--ostype', 'Ubuntu_64']
vb.customize ['modifyvm', :id, '--ioapic', 'on'] # Bug 51473
@@ -154,7 +154,7 @@
]
# For more output, uncomment the following line:
-if settings['PUPPET_DEBUG']
+if settings['puppet_debug']
puppet.options << '--debug'
end
diff --git a/puppet/modules/vagrant/templates/settings.yaml.erb
b/puppet/modules/vagrant/templates/settings.yaml.erb
index 7db9d86..1e8266b 100644
--- a/puppet/modules/vagrant/templates/settings.yaml.erb
+++ b/puppet/modules/vagrant/templates/settings
[MediaWiki-commits] [Gerrit] Added JSDuck5 custom tag support - change (mediawiki...GuidedTour)
jenkins-bot has submitted this change and it was merged.
Change subject: Added JSDuck5 custom tag support
..
Added JSDuck5 custom tag support
Change-Id: I5c11d40d3ca8d5a13828036e02cba2f756a3b4b4
---
A .docs/CustomTags.rb
D .docs/MetaTags.rb
M .docs/config.json
3 files changed, 136 insertions(+), 119 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.docs/CustomTags.rb b/.docs/CustomTags.rb
new file mode 100644
index 000..5e32a89
--- /dev/null
+++ b/.docs/CustomTags.rb
@@ -0,0 +1,134 @@
+# Custom tags for JSDuck 5.x
+# See also:
+# - https://github.com/senchalabs/jsduck/wiki/Tags
+# - https://github.com/senchalabs/jsduck/wiki/Custom-tags
+# -
https://github.com/senchalabs/jsduck/wiki/Custom-tags/7f5c32e568eab9edc8e3365e935bcb836cb11f1d
+require 'jsduck/tag/tag'
+
+class CommonTag < JsDuck::Tag::Tag
+ def initialize
+@html_position = POS_DOC + 0.1
+@repeatable = true
+ end
+
+ def parse_doc(scanner, position)
+if @multiline
+ return { :tagname => @tagname, :doc => :multiline }
+else
+ text = scanner.match(/.*$/)
+ return { :tagname => @tagname, :doc => text }
+end
+ end
+
+ def process_doc(context, tags, position)
+context[@tagname] = tags
+ end
+
+ def format(context, formatter)
+context[@tagname].each do |tag|
+ tag[:doc] = formatter.format(tag[:doc])
+end
+ end
+end
+
+class SourceTag < CommonTag
+ def initialize
+@tagname = :source
+@pattern = "source"
+super
+ end
+
+ def to_html(context)
+context[@tagname].map do |source|
+ <<-EOHTML
+Source
+#{source[:doc]}
+ EOHTML
+end.join
+ end
+end
+
+class UntilTag < CommonTag
+ def initialize
+@tagname = :until
+@pattern = "until"
+super
+ end
+
+ def to_html(context)
+<<-EOHTML
+ Until
+
+ This method provides browser compatibility for:
+ #{ context[@tagname].map {|tag| tag[:doc] }.join("\n") }
+
+EOHTML
+ end
+end
+
+class SeeTag < CommonTag
+ def initialize
+@tagname = :see
+@pattern = "see"
+super
+ end
+
+ def format(context, formatter)
+position = context[:files][0]
+context[@tagname].each do |tag|
+ tag[:doc] = '' + render_long_see(tag[:doc], formatter, position) +
''
+end
+ end
+
+ def to_html(context)
+<<-EOHTML
+ Related
+
+ #{ context[@tagname].map {|tag| tag[:doc] }.join("\n") }
+
+EOHTML
+ end
+
+ def render_long_see(tag, formatter, position)
+if tag =~ /\A([^\s]+)( .*)?\Z/m
+ name = $1
+ doc = $2 ? ': ' + $2 : ''
+ return formatter.format("{@link #{name}} #{doc}")
+else
+ JsDuck::Logger.warn(nil, 'Unexpected @see argument: "'+tag+'"', position)
+ return tag
+end
+ end
+end
+
+class ContextTag < CommonTag
+ def initialize
+@tagname = :this
+@pattern = 'this'
+super
+ end
+
+ def format(context, formatter)
+position = context[:files][0]
+context[@tagname].each do |tag|
+ tag[:doc] = render_long_context(tag[:doc], formatter, position)
+end
+ end
+
+ def to_html(context)
+<<-EOHTML
+ Context
+ #{ context[@tagname].last[:doc] }
+EOHTML
+ end
+
+ def render_long_context(tag, formatter, position)
+if tag =~ /\A([^\s]+)/m
+ name = $1
+ return formatter.format("`this` : {@link #{name}}")
+else
+ JsDuck::Logger.warn(nil, 'Unexpected @this argument: "'+tag+'"',
position)
+ return tag
+end
+ end
+end
diff --git a/.docs/MetaTags.rb b/.docs/MetaTags.rb
deleted file mode 100644
index 22e0f3b..000
--- a/.docs/MetaTags.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-# See also:
-# - https://github.com/senchalabs/jsduck/wiki/Tags
-# - https://github.com/senchalabs/jsduck/wiki/Custom-tags
-require 'jsduck/meta_tag'
-
-class SourceTag < JsDuck::MetaTag
- def initialize
-# This defines the name of the @tag
-@name = 'source'
- end
-
- # Generate HTML output for this tag.
- # One can make use of the #format method to easily support
- # Markdown and {@link} tags inside the contents of the tag.
- #
- # @param tags All matches of this tag on one class.
- def to_html(tags)
-'Source' + tags.map {|tag| format(tag) }.join("\n")
- end
-end
-
-class UntilTag < JsDuck::MetaTag
- def initialize
-@name = 'until'
- end
-
- # @param tags All matches of this tag on one class.
- def to_html(tags)
-return [
- 'Until',
- '',
- 'This method provides browser compatibility for:',
- tags.map {|tag| format(tag) }.join("\n"),
- ''
-]
- end
-end
-
-class SeeTag < JsDuck::MetaTag
- def initialize
-@name = 'see'
-@multiline = true
- end
-
- # @param tags All matches of this tag on one class.
- def to_html(tags)
-doc = []
-doc << 'Related'
-doc << [
-'',
-tags.map {|tag| render_long_see(tag) },
-'',
- ]
-doc
- e
[MediaWiki-commits] [Gerrit] Promoting copyvio EXIF confirm message to stable - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Promoting copyvio EXIF confirm message to stable
..
Promoting copyvio EXIF confirm message to stable
Change-Id: I09c1c76dd62a43c31b840337f2ac251fcfdd6d26
---
M includes/Resources.php
M javascripts/modules/routes.js
M javascripts/modules/uploads/PhotoUploadOverlay.js
M tests/browser/features/uploads_copyvio.feature
4 files changed, 6 insertions(+), 26 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 64bc572..a2b1225 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -377,6 +377,8 @@
'javascripts/modules/uploads/UploadTutorial.js',
'javascripts/modules/uploads/PhotoUploadProgress.js',
'javascripts/modules/uploads/PhotoUploadOverlay.js',
+ 'javascripts/externals/exif-js/binaryajax.js',
+ 'javascripts/externals/exif-js/exif.js',
),
'styles' => array(
'less/modules/uploads/UploadTutorial.less',
@@ -421,27 +423,6 @@
// PhotoUploadProgress.js
'mobile-frontend-image-uploading' => array( 'parse' ),
'mobile-frontend-image-cancel-confirm' => array(
'parse' ),
- ),
- ),
-
- // FIXME: move if EXIF checks go to stable
- 'mobile.uploads.exif' => $wgMFMobileResourceBoilerplate + array(
- 'scripts' => array(
- 'javascripts/externals/exif-js/binaryajax.js',
- 'javascripts/externals/exif-js/exif.js',
- ),
- ),
-
- 'mobile.uploads.stable' => $wgMFMobileResourceBoilerplate + array(
- 'dependencies' => array(
- 'mobile.uploads',
- ),
- ),
-
- 'mobile.uploads.beta' => $wgMFMobileResourceBoilerplate + array(
- 'dependencies' => array(
- 'mobile.uploads.exif',
- 'mobile.uploads',
),
),
diff --git a/javascripts/modules/routes.js b/javascripts/modules/routes.js
index efa808e..2d33a5c 100644
--- a/javascripts/modules/routes.js
+++ b/javascripts/modules/routes.js
@@ -18,7 +18,7 @@
// FIXME: find a generic way of showing loading (make showing a
loader
// part of OverlayManager?)
loadingOverlay.show();
- mw.loader.using( M.isBetaGroupMember() ? 'mobile.uploads.beta'
: 'mobile.uploads.stable', function() {
+ mw.loader.using( 'mobile.uploads', function() {
loadingOverlay.hide();
var UploadTutorialNew = M.require(
'modules/uploads/UploadTutorial' );
result.resolve( new UploadTutorialNew( { funnel: funnel
|| null } ) );
@@ -35,7 +35,7 @@
// FIXME: find a generic way of showing loading (make showing a
loader
// part of OverlayManager?)
loadingOverlay.show();
- mw.loader.using( M.isBetaGroupMember() ? 'mobile.uploads.beta'
: 'mobile.uploads.stable', function() {
+ mw.loader.using( 'mobile.uploads', function() {
loadingOverlay.hide();
var PhotoUploadOverlay = M.require(
'modules/uploads/PhotoUploadOverlay' );
result.resolve( new PhotoUploadOverlay( {
diff --git a/javascripts/modules/uploads/PhotoUploadOverlay.js
b/javascripts/modules/uploads/PhotoUploadOverlay.js
index 189dcda..675c09e 100644
--- a/javascripts/modules/uploads/PhotoUploadOverlay.js
+++ b/javascripts/modules/uploads/PhotoUploadOverlay.js
@@ -187,7 +187,7 @@
this._super();
- if ( this.file && M.isBetaGroupMember() ) {
+ if ( this.file ) {
EXIF.getData( this.file, function() {
if ( $.isEmptyObject( this.exifdata ) )
{
if ( window.confirm( mw.msg(
'mobile-frontend-photo-upload-copyvio' ) ) ) {
diff --git a/tests/browser/features/uploads_copyvio.feature
b/tests/browser/features/uploads_copyvio.feature
index 591c8cf..ae067d9 100644
--- a/tests/browser/features/uploads_copyvio.feature
+++ b/tests/browser/features/uploads_copyvio.feature
@@ -3,8 +3,7 @@
Feature: Image uploads copyvio notice
Background:
-Given I am in beta mode
- And I am logged in as a user with a > 0 edit count
+Given I am logged in as a user with a > 0 edit count
And I am on the "Nonexistent_page_abc" page
And I click on the lead photo upload button
--
To view, visit https://gerrit.wikimedia.org/r/131106
To unsubscribe, visit h
[MediaWiki-commits] [Gerrit] Added JSDuck5 custom tag support - change (mediawiki...GuidedTour)
Robmoen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/131615
Change subject: Added JSDuck5 custom tag support
..
Added JSDuck5 custom tag support
Change-Id: I5c11d40d3ca8d5a13828036e02cba2f756a3b4b4
---
A .docs/CustomTags.rb
D .docs/MetaTags.rb
M .docs/config.json
3 files changed, 135 insertions(+), 118 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GuidedTour
refs/changes/15/131615/1
diff --git a/.docs/CustomTags.rb b/.docs/CustomTags.rb
new file mode 100644
index 000..5e32a89
--- /dev/null
+++ b/.docs/CustomTags.rb
@@ -0,0 +1,134 @@
+# Custom tags for JSDuck 5.x
+# See also:
+# - https://github.com/senchalabs/jsduck/wiki/Tags
+# - https://github.com/senchalabs/jsduck/wiki/Custom-tags
+# -
https://github.com/senchalabs/jsduck/wiki/Custom-tags/7f5c32e568eab9edc8e3365e935bcb836cb11f1d
+require 'jsduck/tag/tag'
+
+class CommonTag < JsDuck::Tag::Tag
+ def initialize
+@html_position = POS_DOC + 0.1
+@repeatable = true
+ end
+
+ def parse_doc(scanner, position)
+if @multiline
+ return { :tagname => @tagname, :doc => :multiline }
+else
+ text = scanner.match(/.*$/)
+ return { :tagname => @tagname, :doc => text }
+end
+ end
+
+ def process_doc(context, tags, position)
+context[@tagname] = tags
+ end
+
+ def format(context, formatter)
+context[@tagname].each do |tag|
+ tag[:doc] = formatter.format(tag[:doc])
+end
+ end
+end
+
+class SourceTag < CommonTag
+ def initialize
+@tagname = :source
+@pattern = "source"
+super
+ end
+
+ def to_html(context)
+context[@tagname].map do |source|
+ <<-EOHTML
+Source
+#{source[:doc]}
+ EOHTML
+end.join
+ end
+end
+
+class UntilTag < CommonTag
+ def initialize
+@tagname = :until
+@pattern = "until"
+super
+ end
+
+ def to_html(context)
+<<-EOHTML
+ Until
+
+ This method provides browser compatibility for:
+ #{ context[@tagname].map {|tag| tag[:doc] }.join("\n") }
+
+EOHTML
+ end
+end
+
+class SeeTag < CommonTag
+ def initialize
+@tagname = :see
+@pattern = "see"
+super
+ end
+
+ def format(context, formatter)
+position = context[:files][0]
+context[@tagname].each do |tag|
+ tag[:doc] = '' + render_long_see(tag[:doc], formatter, position) +
''
+end
+ end
+
+ def to_html(context)
+<<-EOHTML
+ Related
+
+ #{ context[@tagname].map {|tag| tag[:doc] }.join("\n") }
+
+EOHTML
+ end
+
+ def render_long_see(tag, formatter, position)
+if tag =~ /\A([^\s]+)( .*)?\Z/m
+ name = $1
+ doc = $2 ? ': ' + $2 : ''
+ return formatter.format("{@link #{name}} #{doc}")
+else
+ JsDuck::Logger.warn(nil, 'Unexpected @see argument: "'+tag+'"', position)
+ return tag
+end
+ end
+end
+
+class ContextTag < CommonTag
+ def initialize
+@tagname = :this
+@pattern = 'this'
+super
+ end
+
+ def format(context, formatter)
+position = context[:files][0]
+context[@tagname].each do |tag|
+ tag[:doc] = render_long_context(tag[:doc], formatter, position)
+end
+ end
+
+ def to_html(context)
+<<-EOHTML
+ Context
+ #{ context[@tagname].last[:doc] }
+EOHTML
+ end
+
+ def render_long_context(tag, formatter, position)
+if tag =~ /\A([^\s]+)/m
+ name = $1
+ return formatter.format("`this` : {@link #{name}}")
+else
+ JsDuck::Logger.warn(nil, 'Unexpected @this argument: "'+tag+'"',
position)
+ return tag
+end
+ end
+end
diff --git a/.docs/MetaTags.rb b/.docs/MetaTags.rb
deleted file mode 100644
index 22e0f3b..000
--- a/.docs/MetaTags.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-# See also:
-# - https://github.com/senchalabs/jsduck/wiki/Tags
-# - https://github.com/senchalabs/jsduck/wiki/Custom-tags
-require 'jsduck/meta_tag'
-
-class SourceTag < JsDuck::MetaTag
- def initialize
-# This defines the name of the @tag
-@name = 'source'
- end
-
- # Generate HTML output for this tag.
- # One can make use of the #format method to easily support
- # Markdown and {@link} tags inside the contents of the tag.
- #
- # @param tags All matches of this tag on one class.
- def to_html(tags)
-'Source' + tags.map {|tag| format(tag) }.join("\n")
- end
-end
-
-class UntilTag < JsDuck::MetaTag
- def initialize
-@name = 'until'
- end
-
- # @param tags All matches of this tag on one class.
- def to_html(tags)
-return [
- 'Until',
- '',
- 'This method provides browser compatibility for:',
- tags.map {|tag| format(tag) }.join("\n"),
- ''
-]
- end
-end
-
-class SeeTag < JsDuck::MetaTag
- def initialize
-@name = 'see'
-@multiline = true
- end
-
- # @param tags All matches of this tag on one class.
- def to_html(tags)
-doc = []
-doc << 'Related'
-doc << [
-'',
-tags.map {|tag| re
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 03e4e65..0bcab80 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/131614 Change subject: Syncronize VisualEditor: 03e4e65..0bcab80 .. Syncronize VisualEditor: 03e4e65..0bcab80 Change-Id: I885a16f239af1d032a64d0cd20d212f5170e1c33 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/14/131614/1 diff --git a/VisualEditor b/VisualEditor index 03e4e65..0bcab80 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 03e4e6528f1c1d0f41377762c5598d6c03dc9e97 +Subproject commit 0bcab80d2a3e6fd6b7e101913dd59900a1becf05 -- To view, visit https://gerrit.wikimedia.org/r/131614 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I885a16f239af1d032a64d0cd20d212f5170e1c33 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
